2246 files changed, 0 insertions, 557253 deletions

diff --git a/ACE.DSW b/ACE.DSW
deleted file mode 100644
index bfdfb40ff40..00000000000
--- a/ACE.DSW
+++ /dev/null
@@ -1,1217 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Atomic_Op_Test"=.\tests\Atomic_Op_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Barrier_Test"=.\tests\Barrier_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Buffer_Stream_Test"=.\tests\Buffer_Stream_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "CPP_inclient"=.\examples\IPC_SAP\SOCK_SAP\CPP_inclient.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "CPP_inserver"=.\examples\IPC_SAP\SOCK_SAP\CPP_inserver.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "C_inclient"=.\examples\IPC_SAP\SOCK_SAP\SOCK_SAP.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "C_inserver"=.\examples\IPC_SAP\SOCK_SAP\C_inserver.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Conn_Test"=.\tests\Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Enum_Interfaces_Test"=.\tests\Enum_Interfaces_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Event_Server"=.\examples\ASX\Event_Server\Event_Server\Event_Server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Exceptions"=.\examples\Reactor\ReactorEx\Exceptions.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Future_Test"=.\tests\Future_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Handle_Set_Test"=.\tests\Handle_Set_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Hash_Map_Manager_Test"=.\tests\Hash_Map_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "IOStream_Test"=.\tests\IOStream_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Log_Msg"=.\examples\Log_Msg\Log_Msg.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "MM_Shared_Memory_Test"=.\tests\MM_Shared_Memory_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Map_Manager_Test"=.\tests\Map_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Mem_Map_Test"=.\tests\Mem_Map_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Message_Block_Test"=.\tests\Message_Block_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Message_Queue_Notifications_Test"=.\tests\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Message_Queue_Test"=.\tests\Message_Queue_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Multithreading"=.\examples\Reactor\ReactorEx\Multithreading.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Mutex_Test"=.\tests\Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Naming_Test"=.\tests\Naming_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Network_Events"=.\examples\Reactor\ReactorEx\Network_Events.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Pipe_Test"=.\tests\Pipe_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Priority_Buffer_Test"=.\tests\Priority_Buffer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Priority_Task_Test"=.\tests\Priority_Task_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Process"=.\examples\OS\Process\Process.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Process_Mutex_Test"=.\tests\Process_Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Process_Strategy_Test"=.\tests\Process_Strategy_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reactor_Exceptions_Test"=.\tests\Reactor_Exceptions_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reactor_Notify_Test"=.\tests\Reactor_Notify_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reactor_Timer_Test"=.\tests\Reactor_Timer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reactors_Test"=.\tests\Reactors_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reader_Writer_Test"=.\tests\Reader_Writer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Recursive_Mutex_Test"=.\tests\Recursive_Mutex_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Registration"=.\examples\Reactor\ReactorEx\Registration.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Removals"=.\examples\Reactor\ReactorEx\Removals.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SOCK_Test"=.\tests\SOCK_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SPIPE_Test"=.\tests\SPIPE_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SString_Test"=.\tests\SString_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SV_Shared_Memory_Test"=.\tests\SV_Shared_Memory_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Semaphore_Test"=.\tests\Semaphore_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Service_Config_Test"=.\tests\Service_Config_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Sigset_Ops_Test"=.\tests\Sigset_Ops_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Simple_Message_Block_Test"=.\tests\Simple_Message_Block_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TSS_Test"=.\tests\TSS_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Talker"=.\examples\Reactor\ReactorEx\Talker.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Task_Test"=.\tests\Task_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Thread_Manager_Test"=.\tests\Thread_Manager_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Thread_Pool_Test"=.\tests\Thread_Pool_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Time_Service_Test"=.\tests\Time_Service_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Time_Value_Test"=.\tests\Time_Value_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Timeouts"=.\examples\Reactor\ReactorEx\Timeouts.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Timer_Queue_Test"=.\tests\Timer_Queue_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Tokens_Test"=.\tests\Tokens_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Transceiver"=.\examples\ASX\Event_Server\Transceiver\transceiver.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UPIPE_Event_Server"=.\examples\ASX\UPIPE_Event_Server\UPIPE_Event_Server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UPIPE_SAP_Test"=.\tests\UPIPE_SAP_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "acceptor"=.\examples\Connection\blocking\acceptor.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "auto_event"=.\examples\Threads\test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "barrier1"=.\examples\Threads\barrier1.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "barrier2"=.\examples\Threads\barrier2.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "cancel"=.\examples\Threads\cancel.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "client"=.\examples\Connection\non_blocking\non_blocking.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "connector"=.\examples\Connection\blocking\SPIPE.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "future1"=.\examples\Threads\future1.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "future2"=.\examples\Threads\future2.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "iterator"=.\examples\Registry\Registry.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "manual_event"=.\examples\Threads\manual_event.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "multiple_contexts"=.\examples\Naming\multiple_contexts.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "netsvcs"=.\netsvcs\lib\netsvcs.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "non_existent"=.\examples\Naming\non_existent.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "notification"=.\examples\Reactor\Misc\notification.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ntalker"=.\examples\Reactor\Ntalker\ntalker.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "process_mutex"=.\examples\Threads\process_mutex.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "process_semaphore"=.\examples\Threads\process_semaphore.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "reader_writer"=.\examples\Threads\reader_writer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "recursive_mutex"=.\examples\Threads\recursive_mutex.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\examples\Connection\non_blocking\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server_loggerd"=".\examples\Logger\Acceptor-server\server_loggerd.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "servers"=.\netsvcs\servers\servers.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "task_four"=.\examples\Threads\task_four.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "task_one"=.\examples\Threads\task_one.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "task_three"=.\examples\Threads\task_three.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "task_two"=.\examples\Threads\task_two.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "test_multiple_loops"=.\examples\Reactor\Proactor\test_multiple_loops.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "test_proactor"=.\examples\Reactor\Proactor\test_proactor.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "test_timeout"=.\examples\Reactor\Proactor\test_timeout.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "thread_manager"=.\examples\Threads\thread_manager.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "thread_pool"=.\examples\Threads\thread_pool.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "thread_specific"=.\examples\Threads\thread_specific.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "timer_queue"=.\examples\Reactor\Misc\Misc.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "token"=.\examples\Threads\token.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "tss1"=.\examples\Threads\tss1.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "tss2"=.\examples\Threads\tss2.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "update"=.\examples\Registry\update.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "writers"=.\examples\Naming\Naming.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/COPYING b/COPYING
deleted file mode 100644
index cc021e42434..00000000000
--- a/COPYING
+++ /dev/null
@@ -1,35 +0,0 @@
-COPYRIGHT INFORMATION FOR ACE
-
-ACE is copyrighted by Douglas C. Schmidt and his research group at
-Washington University, Copyright (c) 1993-1997, all rights reserved.
-You are free to do anything you like with the ACE source code (and
-object code produced from the source).  For instance, you can include
-it in commercial software, as long as you include this copyright
-statement along with code built using ACE.
-
-You are under no obligation to freely redistribute any of your source
-code that is built using ACE.  Please note, however, that you may not
-do anything to the ACE code that will prevent it from being
-distributed freely (such as copyrighting it yourself or claiming
-authorship of the ACE code).
-
-ACE is provided as is with no warranties of any kind including the
-warranties of design, merchantibility and fitness for a particular
-purpose, noninfringement, or arising from a course of dealing, usage
-or trade practice.
-
-ACE is provided with no support and without any obligation on the part
-of Washington University, its employees, or students to assist in its
-use, correction, modification or enhancement.
-
-Washington University, its employees, and students shall have no
-liability with respect to the infringement of copyrights, trade
-secrets or any patents by ACE or any part thereof.
-
-In no event will Washington University, its employees, or students be
-liable for any lost revenue or profits or other special, indirect and
-consequential damages.
-
-        Douglas C. Schmidt 
-        schmidt@cs.wustl.edu 
-
diff --git a/ChangeLog-97b b/ChangeLog-97b
deleted file mode 100644
index cb3e925925f..00000000000
--- a/ChangeLog-97b
+++ /dev/null
@@ -1,9182 +0,0 @@
-Tue Nov 25 16:18:49 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.4, released Tue Nov 25 16:18:49 1997.
-
-Tue Nov 25 16:03:09 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile: fixed Version.h generation to work properly when
-          $$beta is undefined.
-
-Mon Nov 24 10:33:34 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.56, released Mon Nov 24 10:33:34 1997.
-
-Sun Nov 23 13:32:02 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/IOStream.h: removed DIGITAL_UNIX from #include decision,
-          so now it just depends on DEC_CXX and its version.  Thanks to
-          Dani Flexer <danif@ivory-sw.com> for this fix.
-
-        * netsvcs/lib/Server_Logging_Handler.cpp: updated template
-          instantiations to match recent change to Server_Logging_Handler_T.h.
-
-Sat Nov 22 19:16:35 1997    <irfan@TWOSTEP>
-
-	* tests/Process_Strategy_Test.cpp:
-
-	  main: Removed signal handling code.  It is unnecessary since we
- 	  do not use kill() anymore.
-
-	  Process_Strategy: This subclass of ACE_Process_Strategy
- 	  overwrites the process creation method to include connection
- 	  counting.
-
-	  connection_completed: Made sure that the Reactor is woken up
- 	  after all the connections have completed.
-
-	* ace/Priority_Reactor.cpp (init_bucket): Removed extra code.
-
-	* ace/Acceptor.cpp (activate_svc_handler): open svc_handler only
- 	  if result is 0.  Also removed extra tracing code.
-
-	* ace/Handle_Set.i (reset): Purify is reporting a UMR
- 	  (uninitialized memory copy) when copying a Handle_Set.  This
- 	  comes from the mask fd_set not being memset to 0 by FD_ZERO.
-  	  This is therefore a harmless error.
-
-	* tests/Priority_Reactor_Test.cpp (main): The ordering of
- 	  auto_ptrs is very subtle....  "auto_ptr<ACE_Reactor> reactor"
- 	  should come before "auto_ptr<ACE_Select_Reactor> impl", i.e.,
- 	  the implementation should be destroyed *before* the forwarding
- 	  class.  This is apparent when the implementation class is
- 	  removing registered event handlers that hold a pointer to the
- 	  forwarding class.
-
-Sat Nov 22 16:04:07 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* ace/Message_Queue.cpp:
-	  Fixed some formating problems in the ACE_Message_Queue::dump
-	  method, thanks to Arturo Montes <mitosys@colomsat.net.co> for
-	  finding this one.
-
-Sat Nov 22 14:38:22 1997  Steve Huston  <shuston@riverace.com>
-
-	* ace/config-aix-4.2.x.h: Added ACE_TLI_TCP_DEVICE "/dev/xti/tcp".
-	  This fixes Riverace problem ID P32; AIX now joins HP-UX in
-	  supporting XTI/TLI, but not everything (problem P27).
-
-	* ace/UPIPE_Connector.h:
-	* ace/TLI_Connector.h:	Added meta-type information PEER_ADDR and
-	  PEER_STREAM.  Fixes Riverace problem ID P37.
-
-	* apps/JAWS/server/HTTP_Server.cpp: Added 'const' to "char *prog".
-	  Fixes Riverace problem P36.
-
-	* examples/Connection/misc/test_upipe.cpp:
- 	* examples/Connection/non_blocking/CPP-connector.cpp:
-	* examples/Threads/process_mutex.cpp:
-	* examples/Threads/process_semaphore.cpp:
-	  Added 'const' to "char *" - can't initialize a char * with
-	  a const string.  Fixes Riverace problem ID P38, P40.
-
-	* examples/Threads/thread_specific.cpp, tss1.cpp:  Moved the Errno
-	  class out to a new file, thread_specific.h.  AIX xlC needs to have
-	  the class in a .h file for template generation.  Fixes Riverace
-	  problem P42.
-	* examples/Threads/Makefile: Make sure that, on AIX, the tempinc
-	  directory is cleared before building each new program.
-
-	* performance-tests/Synch-Benchmarks/Makefile: Changed SHLIB to use
-	  $(SOEXT) rather than .so.  Fixes Riverace problem ID P41.
-
-	* tests/Thread_Pool_Test.cpp: Moved 'this->getq(mb)' out of an
-	  ACE_ASSERT.  Thanks to Arturo Montes <mitosys@colomsat.net.co>
-	  for finding this.
-
-Sat Nov 22 05:44:10 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-	* tests/Process_Strategy_Test.cpp (main): Shuffled things around
-	  in fork() block.  This is fun.
-
-	* ace/Strategies_T.cpp (activate_svc_handler): Added an
-	  ACE_UNUSED_ARG macro to muffle g++.
-
-	* tests/Process_Strategy_Test.cpp (handle_close): Added a return
-	  type specifier.  Without it, g++ laments.
-
-	* ace/Acceptor.cpp (activate_svc_handler): Should be if (open (...) ==
-	  -1) then error, not if (open (...) != -1) then error.
-
-	* ace/ACE.cpp (set_handle_limit): Removed a duplicated ACE_TRACE
-	  macro.
-
-Sat Nov 22 00:26:11 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-	* ace/Thread_Manager.cpp (close): Activated automatic wait on
-	  close functionality.  I think I get it right this time.
-
-Fri Nov 21 19:59:37 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* ace/IPC_SAP.cpp:
-	  Added a couple of ACE_NOTREACHED protections. Thanks to Brian
-	  Mendel <bmendel@mdc.com> for reporting this.
-
-Fri Nov 21 17:12:48 1997    <nw1@CHA-CHA>
-
-	* ace/Thread_Manager.cpp (close): Deactivated automatic wait on
- 	  close for now.  It doesn't seem to work on Solaris.
-
-	* ace/Thread_Manager.{h,cpp} (wait): Added codes to remove detached
- 	  threads.  This function can be activated selectively.  I added
- 	  this so we can ignore detached threads when closing down the
- 	  default thread manager.
-
-	  (close): Activated the code to wait (join) all threads managed
- 	  by the thread manager.  It will ask wait function to remove all
- 	  detached thread first (and so they won't be counted into threads
- 	  we are waiting for.)
-
-Fri Nov 21 13:22:25 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.55, released Fri Nov 21 13:22:25 1997.
-
-Fri Nov 21 12:18:28 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* ace/Acceptor.cpp,Strategy_T.cpp: Removed the use of gotos.  See
- 	  Dijkstra '67 for motivation...
-
-	* tests/Process_Strategy_Test.cpp (open): Make sure that we set
- 	  the Reactor of the Svc_Handler to 0 if we're running the
- 	  threading test.
-
-	* tests/Reactor_Notify_Test.cpp: Added back THR_BOUND to
-	  make things work on Solaris.
-
-Fri Nov 21 02:23:47 1997    <irfan@TWOSTEP>
-
-	* tests/Process_Strategy_Test.cpp:
-
-	  - The event loop execution was based on a fragile timeout
- 	    mechanism.  This was changed to a more robust mechanism that
- 	    counts the connections.
-
-	  - The unlinking of the file was moved from the server to the
- 	    client.  This is necessary since there maybe multiple server
- 	    processes that cannot really coordinate when the file should
- 	    be removed.
-
-	* ace/Strategies_T.cpp (ACE_Concurrency_Strategy):
- 	  ACE_Concurrency_Strategy and all three of the subclasses
- 	  (ACE_Reactive_Strategy, ACE_Process_Strategy, and
- 	  ACE_Thread_Strategy) were messed up.  Only ACE_Reactive_Strategy
- 	  was (trying) to set the correct blocking mode of the socket.
-  	  Therefore, moved the socket mode setting code to the base class,
- 	  ACE_Concurrency_Strategy, so that all the classes can share it.
-
-	  This did create one problem though.  If the implementation of
- 	  the reactor uses event associations (i.e., WFMO_Reactor), we
- 	  cannot try to set the socket mode since the registration of the
- 	  svc_handler caused an event association to be created for the
- 	  socket and by default (thanks Microslush) the socket is set to
- 	  non-blocking mode.  If the user is excepting to have a socket in
- 	  blocking mode, he is in for a surprise.  Maybe we should return
- 	  a failure if the user is expecting a socket in blocking mode.
-  	  This is probably too harsh for now.
-
-	* tests/Future_Test.cpp (open): Added THR_DETACHED since we don't
- 	  wait for this thread.
-
-	* tests/Reactor_Notify_Test.cpp (open): Changed THR_BOUND to
- 	  THR_DETACHED since we don't wait for this thread.
-
-	* tests/IOStream_Test.cpp (server): Make sure to close the socket
- 	  in ACE_SOCK_Acceptor and ACE_SOCK_IOStream.
-
-	* ace/WFMO_Reactor.cpp (open): When I changed open() last, I
- 	  ignored the order of the registeration of notify_handler_ and
- 	  wakeup_all_threads_handler_.  Unfortunately, the order of the
- 	  two registrations is very important since the optimization for
- 	  owner thread takes advantage of this ordering.  Therefore,
- 	  revert the order of registertion to notify_handler_ followed by
- 	  wakeup_all_threads_handler_.
-
-	* tests/version_tests/run_all_tests.bat: Added new bat file to
- 	  make the running of all the different configurations easier.
-
-	* tests/version_tests/version_tests.{mak,mdp}: Added a mammoth
- 	  testing scheme that is used to test all 8 configurations of the
- 	  tests under Win32.  These 8 configurations are:
-
-	  DLL Debug
-	  DLL Release
-	  DLL Unicode Debug
-	  DLL Unicode Release
-	  static Debug
-	  static Release
-	  static Unicode Debug
-	  static Unicode Release
-
-	  run_tests.bat from the test directory can then be used to run
- 	  these various configurations.  run_tests.bat was also extended
- 	  to allow the user to purify the tests.  Simply execute
- 	  run_tests.bat with the purify command line option.
-
-Thu Nov 20 17:43:15 1997    <nw1@COYOTE>
-
-	* ace/Thread_Manager.cpp (kill_thr): Changed to prevent thread
- 	  manager from "discard" a thread when a certain operation is not
- 	  supported by the operation system.  Removed the mechanism that
- 	  preserves errno during "thread removal."  We no longer remove
- 	  thread right after an error occured.
-
-Thu Nov 20 17:53:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* examples/Shared_Malloc/test_multiple_mallocs.cpp (main): Make
- 	  sure make sure that the semaphores created by the program are
- 	  released as well as the storage files deleted.  Thanks to Tom
- 	  Arbuckle <arbuckle@uran.informatik.uni-bonn.de> for reporting
- 	  this.
-
-	* ace: Added a new version of config-osf1-3.2.h.  Thanks to Dani
- 	  Flexer <danif@ivory-sw.com> for updating this.
-
-Thu Nov 20 18:22:24 1997  Steve Huston  <shuston@riverace.com>
-
-	* ace/README
-	  ace/TLI.h
-	  ace/TLI_Acceptor.h
-	  ace/TLI_Connector.h
-	  Changed from using hardcoded "/dev/tcp" as the XTI device name to
-	  a new config-related define, ACE_TLI_TCP_DEVICE.  If the config
-	  doesn't set one, it defaults to "/dev/tcp".  Thanks to Steve Coy
-	  <stevec@magna.com.au> for zeroing in on this problem in HP-UX.
-
-	  ace/config-hpux-10.x.h:  ACE_TLI_TCP_DEVICE is "/dev/inet_cots".
-	  Note that XTI won't work 100% well on HP still - this is Riverace
-	  problem ID P27.
-
-	* netsvcs/lib/Server_Logging_Handler_T.h: Hardcoded to always use
-	  ACE_SOCK_Stream (and friends) rather than ACE_TLI_Stream and friends.
-	  XTI doesn't work real well on some platforms (particularly HP-UX
-	  and AIX).  When they're fixed, this can be undone (Riverace problem
-	  ID P28).
-
-	* examples/IPC_SAP/TLI_SAP/CPP-client.cpp: Changed 'char *host' to
-	  'const char *host' so it can be initialized from a const char string.
-
-Thu Nov 20 14:19:57 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tests/Priority_Reactor_Test.h:
-	* tests/Priority_Reactor_Test.cpp:
-	  The test has a limited execution time now, and only reports a
- 	  warning if runs out of time. This may be due to some failed
- 	  connections, but it is hard to avoid that.  On the other hand
- 	  the default time should be large enough, in our machines the
- 	  test only takes 14 seconds, so 60 seconds should be enough.
-  	  NOTE: this problem reveals a problem *only* in the test itself
- 	  not in ACE_Priority_Reactor.
-
-Thu Nov 20 11:29:51 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Timer_{Heap,List}_T.{h,cpp}: added
-          ACE_Timer_{Heap,List}::get_first () accessors.  Thanks to
-          Stephen Henry <shenry@mdc.com> for this suggestion.
-
-Thu Nov 20 11:27:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.54, released Thu Nov 20 11:27:44 1997.
-
-Thu Nov 20 10:45:08 1997    <irfan@TWOSTEP>
-
-	* tests/MT_SOCK_Test.cpp: Uncommented socket close call.
-
-	* ace/WFMO_Reactor.cpp (open): Open the notification handler
- 	  *after* the timer queue has been created.
-
-	* ace/ACE.cpp (get_ip_interfaces): Changed rep() to fast_rep() to
- 	  prevent memory leak.
-
-	* ace/Reactor.cpp (ACE_Reactor): Fixed error of not creating any
- 	  Reactors on UNIX.
-
-Thu Nov 20 08:36:54 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-	* ace/Thread_Manager.{h,cpp}:  Added a dummy argument to internal
-	  thread functions.  Without them, MSVC wrongly optimizes codes
-	  and the stack were all clobbered when entering these functions.
-
-Wed Nov 19 23:24:03 1997    <nw1@CHA-CHA>
-
-	* ace/Reactor.cpp: Rearragned macros so we use Select_Reactor as
- 	  default if we don't have Winsock2.  Irfan did it, not me.
-
-Wed Nov 19 22:11:20 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.53, released Wed Nov 19 22:11:20 1997.
-
-Wed Nov 19 15:55:52 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* config-netbsd.h: NetBSD 1.3alpha has a better MSYNC. Commented out
-	ACE_HAS_BROKEN_NETBSD_MSYNC
-
-Wed Nov 19 14:26:36 1997  Nanbor Wang  <nw1@lindy.cs.wustl.edu>
-
-	* stdcpp.h, OS.h: Changed ACE_CONFIG_H to ACE_USER_CONFIG_H.  It
-	conflicts with the macro in various configuration files.
-
-Wed Nov 19 15:55:45 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* ace/config-sunos5.*.h: Replaced all uses of ACE_HAS_UNICODE with
- 	  ACE_HAS_XPG4_MULTIBYTE_CHAR.  At this point, I think only NT has
- 	  the UNICODE macro now.  Thanks to Steve Huston for validating
- 	  this.
-
-	* STL/bstring.h: Added a special-case for BorlandC++.  However, I
- 	  think this can be generalized for all compilers.  Thanks to
- 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
-
-	* ace/OS: Fixed strpbrk() to handle the const char * and char *
- 	  cases of ANSI C++.  Thanks to Valik Solorzano Barboza
- 	  <valik@xs4all.nl> for reporting this.
-
-	* ace/OS.h: Added a special case for _MSC_VER since BC++ doesn't
- 	  have wchar.h!  Thanks to Valik Solorzano Barboza
- 	  <valik@xs4all.nl> for reporting this.
-
-Wed Nov 19 13:43:33 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* Merged the purify testing into run_tests.  Just use
-
-	  "run_tests purify ..."
-
-	  to purify instead of running the tests.  If you thought this
-	  batch file looked bad before....
-
-Wed Nov 19 12:17:50 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-	* ace/{OS,stdcpp}.h (ACE_CONFIG_H): Added this macro to protect
-	  config.h from getting included multiple times.
-
-	* ace/stdcpp.h:  Reverted include OS.h back to config.h.
-
-Wed Nov 19 09:20:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.52, released Wed Nov 19 09:20:05 1997.
-
-Wed Nov 19 07:54:44 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* ace/ACE.cpp (crc32): Reverted the COMPUTE macro back to its
- 	  original value.  For some reason, the version given by Valik was
- 	  failing.
-
-	* ace/SV_Semaphore_Complex.cpp (open): Make sure initialize the
- 	  sem_number_ data member, though this isn't actually used for
- 	  anything.
-
-	* ace/ACE.cpp: Added a #ifdef for __unix since this is the only
- 	  case where we'll actually have the ifreq autoptr.  Thanks to
- 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
-
-	* ace/Log_Record.cpp (print): Added a work around for a really
- 	  lame bug with BORLANDC.  Thanks to Valik Solorzano Barboza
- 	  <valik@xs4all.nl> for reporting this.
-
-Wed Nov 19 04:22:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.51, released Wed Nov 19 04:22:38 1997.
-
-Wed Nov 19 04:02:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* include/makeinclude/rules.local.GNU (show_uninit): It seems
- 	  there was a missing '@' at the beginning of the line.  Thanks to
- 	  Hans Rohnert for reporting this.
-
-	* tests/Process_Strategy_Test.cpp (handle_input): Fixed Irfan's
- 	  code, which keeps breaking ACE ;-).
-
-Wed Nov 19 01:55:06 1997    <irfan@TWOSTEP>
-
-	* ace/WFMO_Reactor.cpp (resume_handler_i, suspend_handler_i,
- 	  unbind_i): Since things don't happen immediately in the
- 	  WFMO_Reactor world, we must make sure that this request is not a
- 	  duplicate.  If so we must ignore it.
-
-	* ace/Asynch_Acceptor.cpp (open): Fixed addr type mismatch problem.
-
-	* tests/UPIPE_SAP_Test.cpp (main): Make sure to close the socket
- 	  in ACE_UPIPE_Acceptor.
-
-	* tests/SPIPE_Test.cpp (server): Make sure to close the socket in
- 	  ACE_SPIPE_Acceptor.
-
-	* tests/SOCK_Test.cpp (spawn): Make sure to close the socket in
- 	  ACE_SOCK_Acceptor.
-
-	* tests/Reactor_Notify_Test.cpp (Supplier_Task): Make sure to
- 	  close the pipe down.
-
-	* tests/Process_Strategy_Test.cpp (handle_input): Fixed ACE_DEBUG
- 	  statement to pass the correct number of arguments.
-
-	* tests/MT_SOCK_Test.cpp (spawn): Make sure to close the socket in
- 	  ACE_SOCK_Acceptor.
-
-	* tests/Reactor_Exceptions_Test.cpp (main): Make sure to close the
- 	  socket in ACE_SOCK_Dgram.
-
-	* tests/run_purify_tests.bat: Added "mkdir purify_results".
-
-	* tests/run_tests.bat, run_purify_tests.bat: Changed explicit name
- 	  of bat file (e.g., run_tests, run_purify_tests) to %0.  This
- 	  will allow the bat file to be used from other directories.
-
-	* ace/config-win32-common.h: Removed extraneous define of
- 	  ACE_HAS_TEMPLATE_INSTANTIATION.
-
-Wed Nov 19 00:37:22 1997    <nw1@COYOTE>
-
-	* ace/stdcpp.h: Changed to use "ace/OS.h" instead of using
- 	  "ace/config.h" directly to avoid redefinition of user defined
- 	  macros.
-
-	* ace/Log_Msg.cpp (close): Disable Win32 to delete
- 	  ACE_Log_Msg::instance ().  On Win32, this should be done by
- 	  ACE_TSS_Cleanup.
-
-	* ace/OS.cpp (cleanup_tss): Enabled Win32 to call
- 	  ACE_Log_Msg::close.  This is required to properly release
- 	  resourses held by ACE_Log_Msg_Manager.
-
-Tue Nov 18 19:28:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* ace/Select_Reactor.cpp (unbind),
-	  ace/WFMO_Reactor.cpp (handle_signal): Fixed a large number of
- 	  bugs with non-portable "scope of the for loop counter"...
-  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
- 	  reporting this.
-
-	* ace/Thread_Manager: Added == and != operators for
- 	  ACE_Thread_Descriptor to fix things with BORLANDC's template
- 	  mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
- 	  for reporting this.
-
-	* ace/Select_Reactor: Added == and != operators for
- 	  ACE_Event_Tuple to fix things with BORLANDC's template
- 	  mechanism.  Thanks to Valik Solorzano Barboza <valik@xs4all.nl>
- 	  for reporting this.
-
-	* ace/OS.i (tempnam): Fixed a typo -- WIN32 should be ACE_WIN32.
-  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
- 	  reporting this.
-
-	* ace/OS.h: Reordered the ACE_SEH_* macros so they work correctly
- 	  with BORLANDC.  Thanks to Valik Solorzano Barboza
- 	  <valik@xs4all.nl> for reporting this.
-
-	* ace/OS: Added operator== and operator!= for ACE_Cleanup_Info so
- 	  that it will work correctly with BORLANDC's template mechanism.
-  	  Thanks to Valik Solorzano Barboza <valik@xs4all.nl> for
- 	  reporting this.
-
-	* ace/config-win32-common.h: Added
- 	  ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for BORLANDC.  Thanks to
- 	  Valik Solorzano Barboza <valik@xs4all.nl> for reporting this.
-
-	* ace/Filecache.cpp: Fixed a bug with BORLANDC.  Thanks to Valik
- 	  Solorzano Barboza <valik@xs4all.nl> for reporting this.
-
-	* ace/ACE.cpp (crc32): Added some parens to the COMPUTE macro to
- 	  make it easier to grok.  Thanks to Valik Solorzano Barboza
- 	  <valik@xs4all.nl> for reporting this.
-
-Tue Nov 18 16:27:32 1997    <irfan@TWOSTEP>
-
-	* ace/Log_Msg.cpp (log): Added a %D option to Log_Msg for
- 	  "month/day/year hour:minute:second:microsecond". Thanks to John
- 	  Mulhern <9107@MN3.LAWSON.lawson.com> for suggesting this.
-
-	* ace/config-win32-common.h: If __ACE_INLINE__ is defined to be 0,
- 	  we will undefine it.
-
-Tue Nov 18 15:59:37 1997  Steve Huston  <shuston@riverace.com>
-
-	* ace/IOStream.cpp: In underflow() and overflow(), use base() to
-	  check for buffer in use in every case - not just without
-	  ACE_HAS_STANDARD_CPP_LIBRARY==1.  Thanks to James CE Johnson
-	  (jcej@lads.com) for this fix.
-
-	* tests/MT_SOCK_Test.cpp: Allow the test to run even if not all of
-	  the proceses can be forked.
-
-Tue Nov 18 15:27:37 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-        * ace/Timer_Queue_Adapters.cpp: Reordered include files.  Thanks
-          to Torbjorn Lindgren <tl@funcom.no> for noticing the problem.
-
-Tue Nov 18 11:40:18 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/IOStream.(cpp h): Added:   &&(ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-          to the #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) lines to only use
-          the new iostreams things if that's been selected by the config file.
-          In ACE_Streambuf::overflow(), changed:
-             if (!eback())  to    if (!pbase())
-
-Tue Nov 18 08:23:53 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Thread_Pool_Test.cpp (open): Moved the activate() method
-          from the Thread_Pool constructor to the open() hook since the
-          Thread_Pool class invoked ACE_Task::activate, indirectly invokes
-          Thread_Pool::svc.  There existed a miniscule probability this
-          code would have crashed since on extremely broken C++ compilers
-          the virtual member function Thread_Pool::svc may not correctly
-          initialized in Thread_Pool constructor (i.e., it might point to
-          ACE_Task_Base::svc() at this point).  The chance of this
-          happening is incredibly remote, but it's still a good ideal to
-          put the call in the open() method so we can check the return
-          value in the application.  Thanks to Arturo for pointing this
-          out.
-
-Tue Nov 18 05:40:53 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (inet_aton): on Chorus only, use the native
-          ::inet_aton ().  Thanks to Wei for pointing this out.
-
-        * ace/OS.cpp (gethostby{addr,name}): on VxWorks only, don't htonl
-          the input address because it already should be in network byte
-          order.  Store the output address in network byte order.  Thanks
-          to Wei for noticing this error.
-
-        * include/makeinclude/wrapper_macros.GNU: add -DACE_PURIFY to
-          CFLAGS if purify make flag is set, and -DACE_QUANTIFY if
-          quantify is set.  Thanks to Chris Cleeland for this suggestion.
-
-        * ace/Memory_Pool.cpp (ACE_Shared_Memory_Pool): reordered
-          initializers to match declaration order.
-
-        * etc/purify.solaris2: added suppression of pthread_setcanceltype
-          BSW.
-
-Tue Nov 18 00:11:26 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.50, released Tue Nov 18 00:11:26 1997.
-
-Mon Nov 17 22:35:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * examples/Shared_Malloc/test_malloc.cpp: Added some additional
-          calls to Malloc::instance ()->remove () to cleanup all the
-          semaphore locks.  Thanks to Tom Arbuckle
-          <arbuckle@uran.informatik.uni-bonn.de> for reporting this.
-
-        * ace/Memory_Pool.cpp (init_acquire): Fixed a problem caused by
-          failing to initialize the minimum_bytes_ field in the
-          ACE_Shared_Memory_Pool class.  Thanks to Tom Arbuckle
-          <arbuckle@uran.informatik.uni-bonn.de> for reporting this.
-
-        * examples/Shared_Malloc/test_malloc.cpp: Updated the Shared
-          Malloc test program to use the Singleton Thread Manager.
-
-Mon Nov 17 18:09:06 1997    <nw1@CUECA>
-
-        * All eight different configurations of ACE passed all tests on
-          our Alpha/NT.
-
-Mon Nov 17 15:37:52 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/INET_Addr.cpp (get_host_name): on VxWorks only, moved
-          ::hostGetByAddr code block to _after_ the check for the
-          address being INADDR_ANY.  Without that check, get_host_name ()
-          never returns the caller's own hostname.
-
-        * netsvcs/lib/Makefile: the first line of the Local Target
-          (Server_Logging_Handler.*) override mysteriously disappeared.
-
-Mon Nov 17 02:09:57 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.49, released Mon Nov 17 02:09:57 1997.
-
-Mon Nov 17 02:03:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/IOStream_T.cpp: Added a few more fixes for KCC C++ and its
-          standard C++ library support.
-
-Mon Nov 17 01:34:34 1997    <nw1@COYOTE>
-
-        * netsvcs/servers/main.cpp (main): Removed daemon and changed to
-          use the singleton service configurator.  Thanks to John Mulhern
-          and Stephen Coy for tracing this down and Irfan for coming out
-          with the fix.
-
-Sun Nov 16 21:58:51 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/*.dsp, ace/*.dsp: Added Release, Unicode Debug, and
-          Unicode Release versions for each of the tests.
-
-          Also found out that precompiled headers take up insane
-          amounts of disk space when used with ACE and also slows
-          the compilation down.  I turned it off for the tests and
-          for the ace libraries
-
-Sun Nov 16 13:34:29 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking):
-          Changed the line
-
-          status = con.complete (sock);
-
-          to
-
-          if (sock.get_handle () != ACE_INVALID_HANDLE)
-            status = con.complete (sock);
-
-          The change worksaround a core dump due the the following
-          conditions:
-
-          - the find_another_host function in SOCK_Connector_Test comes
-            up with the entry for an NT machine.
-
-          - the ACE_OS::connect call at line 64 of SOCK_Connector.cpp
-            "successfully" fails returning -1 but in this case
-            errno is set to ECONNREFUSED.
-
-          - Since errno is not EINPROGRESS or EWOULDBLOCK the
-            ACE_SOCK_Stream 'new_stream' close member function is called
-            which, besides closing the "handle", also sets it to
-            ACE_INVALID_HANDLE.
-
-          - Since the errno was ECONNREFUSED the 'if' test at line 97 of
-            SOCK_Connector_Test.cpp is true and the next statement
-
-            status = con.complete (sock);
-
-            is called causing a core dump since sock.get_handle() is
-            ACE_INVALID_HANDLE (-1 on Solaris).
-
-          Thanks to Jack Erickson <jack@pinion.com> for reporting this.
-
-        * ace/OS: Cast away the constness of the parameters to _tempnam()
-          for Borland C++.  Thanks to Valik Solrzano Barboza
-          <valik@xs4all.nl> for this.
-
-        * ace/config-unixware-2.1.2-g++.h: Changed
-          ACE_HAS_OSF1_GETTIMEOFDAY to ACE_HAS_SVR4_GETTIMEOFDAY.  Thanks
-          to John Connett <jrc@skylon.demon.co.uk> for reporting this.
-
-        * ace/SPIPE_Addr.cpp (set): Fixed a problem where we were
-          potentially writing into character constants.  Thanks to Darrell
-          Brunsch for finding this.
-
-        * ace/Get_Opt.cpp (operator): We need to make sure that all uses
-          of ACE_OS::strchr() are consistent with respect to const
-          correctness.  Thanks to Darrell Brunsch for finding this.
-
-        * ace/config-win32-common.h: Added a few minor changes for Borland
-          C++.  Thanks to Valik Solrzano Barboza <valik@xs4all.nl> for
-          this.
-
-        * ace/Log_Record.cpp (print): Changed the formal parameter from
-          "const char host_name[]" to "const char *hostname" so that we
-          can assign this in the function if necessary.  Thanks to Valik
-          Solrzano Barboza <valik@xs4all.nl> for this.
-
-        * ace/OS.cpp: Moved the constructor for ACE_Cleanup_Info into the
-          OS.cpp since it doesn't really need to be inline.
-
-        * ace/WFMO_Reactor.cpp (notify): Replaced a "sizeof
-          ACE_Notification_Buffer" with "sizeof
-          (ACE_Notification_Buffer)".  It's odd that the first approach
-          (which is incorrect) isn't flagged by MSVC++...  Thanks to Valik
-          Solrzano Barboza <valik@xs4all.nl> for this.
-
-        * ace/OS.i (sema_init): Added an ACE_ALLOCATOR_RETURN in the
-          appropriate spot.
-
-        * ace/ACE.cpp: Moved the implementation of strsplit_r() into the
-          ACE.cpp file since it's rather long...
-
-        * ace/OS: To be more conformant to the standard C++ library,
-          I've added a pair of methods for strstr(), strchr(), strrchr(),
-          etc. e.g., the function signature strstr(const char*, const
-          char*) is replaced by the two declarations:
-
-          const char *strstr (const char* s1, const char* s2);
-          char *strstr (char* s1, const char* s2);"
-
-          Thanks to Valik Solrzano Barboza <valik@xs4all.nl> for this.
-
-        * ace: Added "ace.idl", which is a config file for Borland C++
-          5.x.  Thanks to Valik Solrzano Barboza <valik@xs4all.nl> for
-          this.
-
-        * include/makeinclude/platform_linux_kcc.GNU (SOFLAGS): Improved
-          this file a bit to work better with NULL pointers.  Thanks to
-          Ben Eng <ben@jetpen.com> for reporting this.
-
-        * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp (main):
-          Changed allocator to alloc to avoid conflicts with STL.  Thanks
-          to Ben Eng <ben@jetpen.com> for reporting this.
-
-        * ace/config-linux-kcc.h: Added some fixes for the KCC compiler.
-          Thanks to Ben Eng <ben@jetpen.com> for reporting this.
-
-        * ace/IOStream: Added fixes for the standard C++ library.  Thanks
-          to Ben Eng <ben@jetpen.com> for reporting this.
-
-Sat Nov 15 17:31:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * Ran "make depend" on all of ACE.
-
-Sat Nov 15 15:55:52 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/Priority_Reactor_Test.cpp: Removed the writer->peer().close()
-          call from client() that I added yesterday.  ACE_Svc_Handler::destroy
-          will end up doing the close - thanks to Irfan for pointing this out.
-
-Sat Nov 15 01:31:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.48, released Sat Nov 15 01:31:58 1997.
-
-Fri Nov 14 23:36:12 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * ace/{OS,ACE}.{h,i} (strsplit_r): Moved strsplit_r from ACE_OS to
-          ACE, which is where it should go.
-
-        * ace/ACE.cpp (ldfind): Changed uses of strsplit_r to be scoped
-          under ACE rather than ACE_OS.
-
-Fri Nov 14 22:57:04 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-vxworks*.h: added ACE_LACKS_NETDB_REENTRANT_FUNCTIONS.
-          This is necessary for the gethostby{addr,name}_r support added
-          yesterday.
-
-Fri Nov 14 18:42:23 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/Priority_Reactor_Test.cpp: Fixed client to close its socket
-          before exiting from the thread/process.
-
-Fri Nov 14 17:41:40 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/OS.i: Fixed some typos in strsplit_r().
-
-        * ace/OS.h: Moved the ACE_ALLOCATOR* stuff from Malloc_T.h to
-          OS.h, which is where it belongs.
-
-        * examples/Reactor/Dgram: Reformatted some of the example
-          code to make it more readable.
-
-Fri Nov 14 17:08:00 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * ace/OS.i (strsplit_r): Added fixes so that this properly returns
-          the last piece.  Thanks to Scott Herscher <scott@expersoft.com> for
-          submitting this!  Also beefed up the comments.
-
-        * ace/OS.h: Added definitions to work around VxWorks' lack of
-          proper ANSI C/C++ prototypes for the functions found in
-          <arpa/inet.h>.  The definitions were taken from Solaris 2.5.1, but
-          appear to work just fine.  For now this is only in effect when
-          compiling with the Green Hills (ghs) environment, but it should
-          probably be used for others (such as g++) as well.
-
-Fri Nov 14 01:10:33 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.47, released Fri Nov 14 01:10:33 1997.
-
-Fri Nov 14 00:14:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.* (gethostbyaddr_r,gethostbyname_r): added VxWorks
-          support.
-
-Thu Nov 13 20:29:18 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.46, released Thu Nov 13 20:29:18 1997.
-
-Thu Nov 13 19:11:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/config-sunos5.4.*: Solaris 2.4 doesn't support the ualarm()
-          call unless you use the (broken) /usr/ucb/cc compiler.  Here's a
-          patch for $ACE_ROOT/ace/config-sunos5.4-sunc++-4.x.h to fix the
-          problem.  Thanks to Caleb Epstein
-          <epstein_caleb_unix@jpmorgan.com> for reporting this.
-
-Thu Nov 13 19:25:50 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * include/makeinclude/platform_irix6.x-sgic++.GNU:
-          Updated comment on when should the user disable the use of
-          -lpthread
-
-Thu Nov 13 18:18:16 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Containers.h, Containers.cpp, Hash_Map_Manager.cpp, Malloc_T.h:
-          Removed the conditional code for the macro
-          ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR.  The workaround for
-          this compiler bug is to remove "this->" from the object pointer
-          used in the ACE_DES_FREE_TEMPLATE macro invocation.  This compiler
-          bug is HP case SR5003396259 for future reference.
-
-        * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_ANSI_CASTS; removed
-          ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR (both for aC++ only).
-
-        * ace/README: Removed ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR, as
-          it is no longer used.
-
-Thu Nov 13 16:51:40 1997    <nw1@CHA-CHA>
-
-        * ace/OS.h:  Added two new macros ACE_FACTORY_DECLARE and
-          ACE_FACTORY_DEFINE.  Changed definitions of
-          ACE_SVC_FACTORY_DECLARE AND ACE_SVC_FACTORY_DEFINE to use these
-          two macros.  Refer to changes of the ACE_Export related macros
-          below, you can now declare/define your service factories as,
-
-               ACE_FACTORY_DECLARE (FOOBAR, fac_class);
-               ACE_FACTORY_DEFINE (FOOBAR, fac_class);
-
-          This will ensure they get define properly and proper decoration
-          will be added.
-
-Thu Nov 13 16:52:31 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: Removed all ! defined
-          (ACE_HAS_FSU_PTHREAD).  Thanks to ARTURO MONTES
-          <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/config-gcc-2.7.2.h: Added ACE_HAS_TEMPLATE_SPECIALIZATION.
-          Thanks to ARTURO MONTES <mitosys@colomsat.net.co> for reporting
-          this.
-
-        * ace/config-fsu-pthread.h: added ACE_LACKS_THREAD_PROCESS_SCOPING.
-          Thanks to ARTURO MONTES <mitosys@colomsat.net.co> for reporting
-          this.
-
-        * ace/OS.h: Separate definition of proper export flag for
-          platforms from setting these flags for building/not building
-          DLL.  I keep ACE_Export and ACE_Svc_Export to remain backward
-          compatibality but now, they are defined using the new "common"
-          definition.  This changes is made in hope that it will simplify
-          codes generated by TAO_IDL compiler.
-
-          Several new directives are added to these file.  These common
-          directives will be set to proper values (macros) according to
-          the platform we use.  They are:
-
-                ACE_Proper_Export_Flag
-                ACE_Proper_Import_Flag
-                ACE_EXPORT_SINGLETON_DECLATATION(T)
-                ACE_IMPORT_SINGLETON_DECLARATION(T)
-                ACE_PROPER_SINGLETON_INSTANTIATION(T)
-
-          I use them to define ACE_Export and ACE_Svc_Export.  I hope it
-          is easier to define your own export decoration flag now.  Here
-          is an example.  Say you want to define an export flag for your
-          DLL file : foobar.dll.  First, you need to add the following to
-          a common header file:
-
-          // Here are definition for FOO_BAR library.
-          #if defined (FOOBAR_HAS_DLL) && (FOOBAR_HAS_DLL == 1)
-          #  if defined (FOOBAR_BUILD_DLL)
-          #    define FOOBAR_Export ACE_Proper_Export_Flag
-          #    define FOOBAR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-          #    define FOOBAR_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-          #  else
-          #    define FOOBAR_Export ACE_Proper_Import_Flag
-          #    define FOOBAR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-          #    define FOOBAR_SINGLETON_INSTANTIATION(T)
-          #  endif /* FOOBAR_BUILD_DLL */
-          #else /* ! FOOBAR_HAS_DLL */
-          #  define FOOBAR_Export
-          #  define FOOBAR_SINGLETON_DECLARATION(T)
-          #  define FOOBAR_SINGLETON_INSTANTIATION(T)
-          #endif /* FOOBAR_HAS_DLL */
-
-          Be sure to include "ace/OS.h" before these definitions so that
-          the macros they use will be properly initialized.  After you've
-          done this, on Win32, define "FOOBAR_HAS_DLL=1" if you want to
-          build DLL, define it as "FOOBAR_HAS_DLL=0" if you want to build
-          static library.  In your library project file, you must define
-          the directives FOOBAR_BUILD_DLL and decorate classes/objects you
-          want to export with FOOBAR_Export so that they can be declared
-          automatically according whether you are building/linking with
-          static library or dynamic library.
-
-Thu Nov 13 05:47:42 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: added ACE_TSS_Singleton<ACE_Dynamic,
-          ACE_Null_Mutex> instantiation, for the recent Svc_Handler
-          change.
-
-        * ace/Object_Manager.h (default_mask): moved out of ACE_MT_SAFE
-          protection.
-
-        * ace/OS.{h,i},config-vxworks-ghs-1.8.h,README (strlen,strcpy):
-          protect declarations of wchar versions with
-          ACE_HAS_WCHAR_TYPEDEFS_CHAR.  GreenHills typedefs wchar to char.
-
-        * ace/Singleton.cpp: register ACE_TSS_Singletons for cleanup with
-          Object_Manager.
-
-        * ace/OS.{i,cpp} (gethostbyaddr): added VxWorks support.
-
-Thu Nov 13 02:06:58 1997  Chris Cleeland  <cleeland@macarena.cs.wustl.edu>
-
-        * ace/Signal.i: Changed to use new Object Manager member.
-
-        * ace/Object_Manager.cpp: Added a new member to the Object
-        Manager--default_mask.  This is the default signal mask employed
-        by ACE_Sig_Set.  Moving the object into the OM saves cycles b/c we
-        only construct it once and just re-use every time.
-
-        * ace/Handle_Set.cpp: Added two new macros--ACE_DIV_BY_WORDSIZE and
-        ACE_MULT_BY_WORDSIZE--which either divide or multiply the argument
-        by ACE_Handle_Set::WORDSIZE.  The manner in which this is
-        accomplished is governed by the #define
-        ACE_USE_SHIFT_FOR_EFFICIENCY--when defined, ACE tries to use
-        shifts to implement multiplication and division rather than actual
-        multiply and divide operations.  Currently this is disabled.
-
-Wed Nov 12 19:13:05 1997    <irfan@TWOSTEP>
-
-        * ace/Svc_Handler: Changed hand written tss singleton to
-          ACE_TSS_Singleton.  Lot of (unnecessary) code disappeared.
-          Thanks to David Levine for suggesting this.
-
-        * ace/Object_Manager: Removed ACE_SVC_HANDLER_LOCK.
-
-Wed Nov 12 16:29:15 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * platform_netbsd.GNU: added /usr/lib/c++rtO.o to SOBUILD to
-          insure that static objects' ctors are called.
-
-Wed Nov 12 00:20:38 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{i,cpp} (inet_ntoa): use VxWorks' native inet_ntoa.  It's
-          not documented but it works.
-
-        * ace/OS.cpp (gethostbyname): on VxWorks, load static first_addr on
-          every call, not just the first.
-
-        * include/makeinclude/rules.local.GNU: removed extra "fi" in
-          install operation.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: removed +w from
-          CFLAGS because it generates too many spurious warnings.
-
-        * ace/TTY_IO.cpp (control): commented out unused local variable
-          c_line.  Thanks to Amos Shapira <amos@gezernet.co.il> for
-          reporting this.
-
-        * ace/OS.{h,i} (hostname): added Chorus support.  Thanks to Wei
-          for the patches.
-
-Tue Nov 11 23:44:17 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.45, released Tue Nov 11 23:44:17 1997.
-
-Tue Nov 11 21:26:36 1997  Douglas C. Schmidt  <schmidt@lindy.cs.wustl.edu>
-
-        * platform_sunos5_sunc++.GNU, platform_irix6.x-sgic++.GNU, rules.local.GNU:
-	  Added some minor fixes.
-
-Tue Nov 11 20:18:27 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * Makefile: Added the tests and netsvcs directory to
-          RELEASE_LIB_FILES since this is pretty important to determine
-          whether ACE works.  Thanks to Chuck Gehr and Steve Coy for this
-          suggestion.
-
-        * tests/UNIXclerk.conf: Changed "merengue" to "localhost."
-          Thanks to Steve Coy for this suggestion.
-
-        * ace/config-lynxos.h (getopt): Missing 't' from const => see
-          getopt prototype parameter list.  Thanks to Manojkumar Acharya
-          <mja@cvsf325.gpt.co.uk>.
-
-Tue Nov 11 08:09:16 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (inet_aton): declare local ip_addr as an ACE_UINT32
-          instead of a long.  Real programmers have 64-bit longs.
-
-        * ace/INET_Addr.cpp (get_host_name): added ACE_UNUSED_ARG (len);
-          for VxWorks only.
-
-Tue Nov 11 13:19:46 1997  Torbjorn Lindgren  <tl@funcom.com>
-
-        * include/makeinclude/rules.local.GNU: Fixed so that the ACE
-        makefiles doesn't create circular symlinks (happens if
-        something fails when building libACE.* with "make -k", or when
-        doing parallel builds). It's now possible to do parallel
-        builds of libACE.* without having to clean up a mess afterwards.
-
-        * include/makeinclude/platform_irix6.x-sgic++.GNU: Removed
-        .so build with links instead (ace/apps/examples/tests and my own
-        programs all work well with this, and the manual seems to suggest
-        that it hasn't ever been necessary on this platform)
-
-        * ace/config-irix6.x-sgic++-nothreads.h: Added
-        ACE_HAS_XPG4_MULTIBYTE_CHAR for SGI IRIX 6.[2-5].
-
-Tue Nov 11 04:50:06 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-        * examples/Reactor/Multicast/server.cpp (handle_timeout): Fixed a
-          typo.  Thanks to Sandro Doro <doros@aureus.sublink.org> for
-          reporting this.
-
-Tue Nov 11 04:20:09 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.44, released Tue Nov 11 04:20:09 1997.
-
-Tue Nov 11 01:44:39 1997    <irfan@TWOSTEP>
-
-        * examples/Naming/test_open.cpp (main): Added a new naming test
-          that binds to the net_local server and tries to bind entries to
-          it.
-
-        * netsvcs/lib/Name_Handler.cpp: Added a new class called
-          Naming_Context.  This helper class adds the correct default
-          constructor to the ACE_Naming_Context class so that we can use
-          it in ACE_Singleton.
-
-          Previously, each Name_Handler was getting its own
-          Naming_Context.  This is obviously incorrect as the mapping
-          address in already occupied by the first Name_Handler.
-          Therefore, the Naming_Context was changed into a Singleton
-          accessable by all Name_Handlers.
-
-        * ace/WFMO_Reactor.cpp (handle_additions && handle_deletions):
-          Changed code to make sure that we should not make the upcall
-          until all the internal data structures have been updated.  This
-          is to protect against upcalls that try to deregister again.
-
-Tue Nov 11 01:28:50 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.43, released Tue Nov 11 01:28:50 1997.
-
-Mon Nov 10 21:30:04 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * INET_Addr.cpp: In the ACE_INET_Addr::get_host_name (char
-        hostname[], size_t len) method, an unnecessary local variable
-        called "name" was being used and the actual parameter "hostname"
-        was never getting updated. The local variable is now removed and
-        we use the actual parameter everywhere.
-
-Mon Nov 10 20:44:43 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * etc/ACE-guidelines.html: Added a section for ACE Design Rules,
-          and added a design rule about sentinels.
-
-Mon Nov 10 18:11:05 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * ace/Singleton.h (ACE_TSS_Singleton): Changed ACE_TSS<TYPE> to
-          ACE_TSS_TYPE (TYPE), so that the ACE_TSS_TYPE macro (defined in
-          OS.h) gets used. (Irfan's suggestion.)
-
-Mon Nov 10 17:02:40 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/OS.h: Reformatted the #ifdef structure of the
-          ACE_HAS_XPG4_MULTIBYTE_CHAR to conform to ACE usage.
-
-        * ace/Service_Repository.cpp: The close() method needed a '\n' in
-          one of the debug messages.  Thanks to Steve Coy for reporting
-          this.
-
-Mon Nov 10 14:09:24 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h, OS.i, README:  Added new macro, ACE_HAS_XPG4_MULTIBYTE_CHAR
-          for platforms which supply wchar.h and wide character functions.
-          Added the use if it in OS.h, and use the functions in OS.i,
-          strlen and strcpy with wchar_t arguments.
-
-        * ace/config-hpux-10.x.h, config-aix-4.2.x.h, config-mvs.h,
-          config-sunos5.5-sunc++-4.x.h: Added ACE_HAS_XPG4_MULTIBYTE_CHAR.
-
-Mon Nov 10 13:33:02 1997    <irfan@TWOSTEP>
-
-        * ace/OS.h (ACE_WRITE_GUARD): Added macros for ACE_WRITE_GUARD and
-          ACE_READ_GUARD. Thanks to Brian Raven <Brian.Raven@liffe.com>
-          for suggesting this.
-
-        * tests/Thread_Mutex_Test.cpp: Modified version of Mutex_Test that
-          exclusively works on a Thread_Mutex.
-
-        * tests/Mutex_Test.cpp: Removed this test.  It have been
-          superseded by Thread_Mutex_Test and Process_Mutex_Test.
-
-        * ace/OS.i (thread_mutex_trylock): Fixed the return value and
-          errno for this system call such that it is consistent with other
-          trylock calls.
-
-Mon Nov 10 10:21:55 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/INET_Addr.cpp: updated gethostbyname/addr support for
-          Chorus.  Thanks to Wei Chiang <chiang@tele.nokia.fi> for
-          the patches for this fix.
-
-        * ace/config-chorus.h: disabled ACE_LACKS_SOCKETPAIR.  Thanks
-          to Wei for this fix, also.
-
-        * tests/Thread_Mutex_Test.cpp (test): don't compile this function
-          if ACE_HAS_THREADS is not defined.
-
-        * tests/IOStream_Test.cpp (main): removed extra % at end of
-          ACE_ERROR_RETURN message.
-
-        * etc/ace_ld,include/makeinclude/platform_vxworks5.x_g++.GNU:
-          added ace_ld, a drop-in replacement for ld that supports munching.
-          We need to munch for VxWorks/g++.
-
-        * ACE-INSTALL.html: updated VxWorks info to mention requirement
-          for perl with VxWorks/g++.  And, LD_LIBRARY_PATH must be set
-          to find the ACE libraries on the host if using TAO.
-
-Sun Nov 09 23:29:43 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.42, released Sun Nov 09 23:29:43 1997.
-
-Sun Nov 09 22:18:30 1997    <irfan@TWOSTEP>
-
-        * ace/config-win32-common.h (ACE_HAS_ANSI_CASTS): VC++ compilers
-          support ANSI style casts.
-
-        * ace/OS.h (ACE_static_cast): Added ANSI style cast macros to ACE.
-          Thanks to Stephen Coy <stevec@magna.com.au> for suggesting this.
-
-Sun Nov  9 21:34:16 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/OS: Enhanced ACE_OS so that it *always* defines
-          implementations for the wchar_t versions of strlen() and
-          strcpy(), even if the platform doesn't explicitly support
-          UNICODE.  This is necessary since TAO needs these functions.
-
-        * ace/OS.h: Added a typedef for wchar_t to handle the case where
-          the OS doesn't support UNICODE.
-
-        * ace/ACE.cpp: Added hex character routines from TAO since they
-          are generally useful.
-
-        * ace/OS.h: Moved the TAO-specific #defines into TAO, where they
-          belong.  Thanks to David Levine and Chris Cleeland for insisting
-          on this...
-
-Sun Nov 09 17:55:50 1997    <nw1@COYOTE>
-
-        * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (open):
-          Removed codes that reset a socket's non-blocking flag.  This has
-          been taken care of by ACE_Acceptor::activate_svc_handler now and
-          resetting this flag twice on NT caused us grief.  Thanks to
-          Georges Ata <George_ata@srt.ccmail.compuserve.com> for reporting
-          the bug.
-
-        * ace/ACE.i (hex2byte,nibble2hex): Replaced ACE_INLINE to inline
-          for these two functions.  Functions in this file are always
-          inlined.
-
-        * ace/config-win32-common.h (ACE_LACKS_RLIMIT): Added this flags
-          so we don't need to treat ACE_WIN32 specially.
-
-        * ace/OS.i (getrlimit,setrlimit): Removed unnecessary conditional
-          flag ACE_WIN32.
-
-        * ace/Thread_Manager.cpp (wait): Merged the two blocks within this
-          function so that we can avoid relase/acquire lock
-          unnecessarily.  Thanks to Doug for his careful scrutiny.
-
-Sun Nov 09 09:27:24 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Thread_manager.cpp (wait): removed unused local,
-          threads_waited_on.
-
-Sat Nov 08 23:20:50 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.41, released Sat Nov 08 23:20:50 1997.
-
-Sat Nov  8 15:46:30 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/INET_Addr.cpp: Enhanced the get_host_name() functions so
-          that if the sin_addr.s_addr == INADDR_ANY we assume that we're a
-          server, and we return our "hostname".
-
-        * Added a number of minor fixes for UNIXWARE with G++.  Thanks to
-          Michael Rueger <m_rueger@syscomp.de> for reporting these.
-
-        * ace/Thread_Manager.h: Both Irix5 and VxWorks have problems with
-          local typedefs with GCC.  Thanks to Laura Paterno
-          <lpaterno@d0chb.fnal.gov> for reporting this.
-
-        * ace/Timer_Queue_Adapters.cpp: Changed some errant uses of lock_
-          to mutex_.  Thanks to David Levine for reporting this.
-
-        * ace/ACE.cpp: set_handle_limit() was buggy because it never
-          increased the handle limit.  With this change we do not need
-          special code in ACE_Select_Reactor with ACE_LACKS_RLIMIT because
-          this is managed in ACE::set_handle_limit.  Thanks to Arturo for
-          this fix.
-
-        * ace/Select_Reactor.cpp (open): We no longer need to
-          conditionally compile for ACE::set_handle_limit().  Thanks to
-          Arturo for this fix.
-
-Fri Nov  7 18:53:13 1997  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-        * ace/config-netbsd.h: Added file for NetBSD 1.2G.
-
-        * tests/SOCK_Connector_Test.cpp (fail_no_listener_nonblocking):
-          Added ECONNREFUSED as a "valid failure", alongwith EWOULDBLOCK.
-
-        * ace/OS.i (msync): msync on NetBSD takes only two parameters as
-          opposed to the usual three. (It doesnt have the "flags"
-          parameter.)  The ACE_HAS_BROKEN_NETBSD_MSYNC flag works around
-          that.
-
-Fri Nov  7 16:04:35 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: Added a missing '>' for one of the
-          template specializations.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for reporting this.
-
-        * ace/OS.cpp: ACE_OS::ACE_OS is defined in OS.cpp, which causes
-          the compiler to complain about multiple definitions.  Other
-          ACE_CLASS_IS_NAMESPACE doesn't have constructors, which is why
-          they work.  Thanks to Torbjorn Lindgren <tl@funcom.no> for
-          reporting this.
-
-Fri Nov 07 15:14:51 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Threads/tss1.cpp: replaced ACE_SYNCH_1 and _2 with
-          _DECL and _USE.
-
-        * ace/config-linux{,-common}.h: created config-linux-common.h
-          and moved alpha-specific defines to it.
-
-        * ace/FILE_Addr.cpp (set): explicitly declare int return type.
-
-        * performance-tests/Misc/preempt.cpp (get_options): DEC CXX didn't
-          like conversion of -1 to u_int, so changed return type to int and
-          all ACE_ERROR_RETURNs to return -1.
-
-Fri Nov 07 10:05:12 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.40, released Fri Nov 07 10:05:12 1997.
-
-Fri Nov  7 09:58:09 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Connector.cpp (fini): Added a call to
-          ACE_Map_Manager::close() in fini() since the destructor may not
-          be called.  Thanks to Eric C. Newton <ecn@smart.net> for
-          reporting this.
-
-        * ace/{FILE,SPIPE}_Addr.cpp (set): Added a return value.  Thanks
-          to Marios Zikos <zikos@csi.forth.gr> for reporting this.
-
-Fri Nov 07 02:45:55 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.39, released Fri Nov 07 02:45:55 1997.
-
-Fri Nov  7 01:06:08 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/Message_Queue: Added a new method called deactivated(),
-          which returns true if the queue has been deactivated.  Thanks to
-          Wei Chiang <chiang@tele.nokia.fi> for reporting this.
-
-        * ace/{config-chorus.h,OS.cpp}: Added a new macro called
-          ACE_CHORUS_DEFAULT_MIN_STACK_SIZE.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for reporting this.
-
-        * ace/DEV_Addr.cpp,
-          ace/FILE_Addr.cpp,
-          ace/SPIPE_Addr.cpp,
-          ace/INET_Addr.cpp,
-          ace/UNIX_Addr.cpp: Fixed the set(const Foo &) method so that
-          it correctly detects cases where we're passed in a
-          ACE_Addr::sap_any.  This is a total hack...
-
-        * ace/{OS.h,Addr.cpp}: Added a new AF_ANY flag, which is set to -1.
-
-Thu Nov  6 23:05:14 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * Changed the obtusely named ACE_SYNCH_1 and ACE_SYNCH_2 macros to
-          ACE_SYNCH_DECL and ACE_SYNCH_USE, respectively.  Thanks to Mike
-          Kamrad <J.M.KAMRAD.II@cdev.com> for suggesting this.
-
-        * ace/Select_Reactor.cpp, ace/ACE.cpp: Broaded the comparison so
-          that we only try to use {set|get}rlimit() if ACE_LACKS_RLIMIT is
-          *false*.  Thanks to Arturo Montes <mitosys@colomsat.net.co> for
-          reporting this.
-
-        * ace/Object_Manager: Added support for
-          get_singleton_lock(ACE_Mutex *).  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/Connector.cpp: If connect_n() fails make sure to return -1.
-          Thanks to Stephen Coy <stevec@magna.com.au> for pointing out the
-          problem.
-
-        * ace/config-sco-5.0.0.h: Removed the ACE_LACKS_RLIMIT flag.
-          Thanks to Arturo Montes <mitosys@colomsat.net.co> for reporting
-          this.
-
-        * tests: Changed all uses of "localhost" to
-          ACE_DEFAULT_SERVER_HOST.  This solves some problems with MVS.
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
-
-        * examples/Timer_Queue: Changed COMMAND to CMD so it won't
-          conflict with the HP/YUX compiler.  Thanks to Sandro Doro
-          <doros@aureus.sublink.org> for reporting this.
-
-Thu Nov 06 22:13:01 1997    <irfan@TWOSTEP>
-
-        * examples/Connection/blocking/SPIPE-connector.cpp (init): Fixed
-          odd looking typecast.
-
-        * ace: Changed the comparison &local_sap == &ACE_Addr::sap_any to
-          local_sap == ACE_Addr::sap_any.  Thanks to Steve Coy
-          <stevec@magna.com.au> for pointing out that the default
-          parameter const ACE_Addr &local_sap = ACE_Addr::sap_any will
-          cause a copy of sap_any to be made and passed to the method,
-          invalidating the memory address comparison.
-
-          The following files were effected:
-
-          Asynch_Acceptor.cpp
-          SOCK_Acceptor.cpp
-          SOCK_CODgram.cpp
-          SOCK_Dgram.cpp
-          TLI_Acceptor.cpp
-          TLI_Connector.cpp
-
-        * ace/Addr.cpp: Made sure that the type and size of
-          ACE_Addr::sap_any does not match the type and size of any other
-          Addr type.  This is necessary for local_addr==ACE_Addr::sap_any
-          to return 0 when local_addr is anything other than
-          ACE_Addr::sap_any.
-
-        * ace/Synch_T.h: Fixed all the ACE_SYNCH_* defines.  Thanks to
-          Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing the
-          problems.
-
-Thu Nov 06 18:30:42 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Addr.(h i), DEV_Addr.(h i), FILE_Addr.(h i), INET_Addr.(h
-          cpp), SPIPE_Addr.(h i), UNIX_Addr.(h i): Changed the operators
-          == and != to be non-virtual, and to accept the 'sap' argument as
-          its own type (not ACE_Addr for all of them).  The
-          implementations of the operators compare type-specific data
-          without having to check the inherited type member.  Thanks to
-          Steve Coy <stevec@magna.com.au> and Irfan and Nanbor for a huge
-          amount of work on these changes.  *** NOTE - there is still some
-          SOCK_Connector problems related to these changes on HP-UX.  The
-          hunt continues.
-
-        * ace/Connector.cpp (connect_n): return -1 if any of the connect
-          attempts fail.
-
-        * tests/Reactor_Performance_Test.cpp: Don't crash if any of the
-          client's connect attempts fail.
-
-        * ace/Reactor.h: Added #include "ace/Handle_Set.h" - AIX needs the
-          class definition when generating templates in programs.
-
-        * tests/Map_Manager_Test.cpp: Don't even try if the compiler doesn't
-          have template specialization working correctly.
-
-        * tests/Priority_Reactor_Test.h: Added #include "ace/SOCK_Stream.h"
-          so AIX could generate template code correctly.
-
-        * tests/Reactor_Performance_Test.cpp: Moved class definitions out to
-          Reactor_Performance_Test.h (new file) to allow AIX to generate
-          templates.
-
-        * tests/SOCK_Connector_Test.cpp: Added a couple more checks to make
-          sure the local host is not the test target, and changed from using
-          port 4242 to 42000 (there is actually a program on AIX which listens
-          at port 4242).
-
-        * tests/Thread_Manager_Test.cpp: Moved a class definition out to
-          Thread_Manager_Test.h (new file) to allow AIX to use it in template
-          generation.
-
-        * tests/Timer_Queue_Test.cpp: Limit the number of iterations to 2000.
-
-Thu Nov  6 16:51:36 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * tests/SOCK_Connector_Test.cpp (find_another_host): Added
-          ACE_NETBSD to the #if define around gethostent.
-
-Thu Nov 06 00:08:01 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.38, released Thu Nov 06 00:08:01 1997.
-
-Wed Nov  5 21:32:36 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/Service_Repository.cpp (close): Looking in the
-          Service_Repository while shutting it down does really bad
-          things.  Some careful changes to the loop in
-          Service_Repository::close() fixed this.  Thanks to Eric
-          C. Newton <ecn@smart.net> for reporting this.
-
-        * Added new support for SCO UNIX with no threads.  Thanks to
-          Arturo Montes <mitosys@colomsat.net.co> for reporting this.
-
-Wed Nov 05 20:31:36 1997    <irfan@TWOSTEP>
-
-        * ace/Connector.cpp (close): Added an explicit close() method for
-          the Strategy_Connector.  This closes down all Strategy_Connector
-          specific things and then calls close() on the base class.  Also
-          modified the destructor to call this routine.
-
-Wed Nov  5 17:09:05 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.cpp (cleanup_tss): Rearranged how TSS'es get cleanup on
-          Win32.  This was causing a tiny memory leak on NT.
-
-Wed Nov  5 15:03:31 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Thread_Manager.{h,cpp}:  Changed the data type of
-          terminated_thr_queue_ back to
-          ACE_Unbounded_Queue<ACE_Thread_Descriptor>.
-
-Wed Nov 05 14:16:27 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (mutex_trylock): Fixed code for ACE_HAS_DCE_DRAFT4_THREADS
-          (HP-UX) to process the returned status correctly.  Thanks to
-          Robert Head <rhead@virtc.com> for reporting this.
-
-Wed Nov 05 13:01:49 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.cpp (daemonize): added ACE_UNUSED_ARG (close_all_handles)
-          if ACE_LACKS_FORK.
-
-Wed Nov 05 01:06:53 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.37, released Wed Nov 05 01:06:53 1997.
-
-Tue Nov 04 23:11:41 1997    <nw1@COYOTE>
-
-        * ace/Thread_Manager.h: Added an ACE_Unbounded_Queue to
-          collect threads that need to be removed.  We can no longer
-          remove thread descriptors directly from <thr_list_> because that
-          would clobber the integrity of the double-linked list.  Changed
-          the data type of <terminated_thr_queue_> from
-          ACE_Unbounded_Queue<ACE_Thread_Descriptor> to
-          ACE_Unbounded_Queue<ACE_Descriptor*> to reduce the codes
-          generated.
-
-        * ace/Thread_Manager.cpp:  Reordered several thread operations so they
-          won't remove thread descriptor directly while traversing the
-          <thr_list_>.  Removed #ifdef <VXWORKS> from template
-          instantiation section because now VxWorks needs it too.
-
-        * ace/Container.{h,cpp}:  Added more check on validities of passed in
-          node to ACE_Double_Linked_List::remove_element.  Also changed
-          the function to reset a node's <prev_> and <next_> to prevent
-          double removal of a node, which messes up the list structure.
-
-        * ace/ace_{dll,lib}.dsp: Excluded Acceptor.cpp from make
-          explicitly.  Moving this file to "template file folder" was not
-          enough.
-
-Tue Nov  4 18:03:51 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/config-sco*.h: Added #define ACE_DEFAULT_CLOSE_ALL_FILES 0
-          to the SCO Unix config files.
-
-        * ace/ACE.cpp: Added a new macro called
-          ACE_DEFAULT_CLOSE_ALL_FILES to workaround a bug with SCO Unix.
-          Thanks to Arturo Montes <mitosys@colomsat.net.co> for reporting
-          this.
-
-        * The ACE developer's drinking song:
-
-          100 little bugs in the code,
-          100 bugs in the code,
-          fix one bug, compile it again,
-          101 little bugs in the code.
-          101 little bugs in the code.....
-
-          Thanks to Steve Huston for appreciating the humor in this ;-).
-
-        * ace/Containers.cpp (insert_head): Added some minor stylistic
-          fixes.
-
-        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptor):
-          Changed
-
-          if (ACE_Reactor::instance ()->register_handler
-              (&this->acceptor_, ACE_Event_Handler::ACCEPT_MASK) == -1)
-
-          to:
-
-          if (this->acceptor_.open(this->options ().acceptor_port_,
-            ACE_Reactor::instance (), this->options ().blocking_semantics_) == -1)
-
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
-
-        * apps/Gateway/Gateway/Gateway.cpp (parse_args): Changed
-
-          ACE_Get_Opt get_opt (argc, argv, "abC:cdP:pq:t:vw:", 0);
-
-          to:
-
-          ACE_Get_Opt get_opt (argc, argv, "abC:cdP:p:q:t:vw:", 0);
-
-          Thanks to Ganesh Pai <gpai@voicetek.com> for reporting this.
-
-Tue Nov  4 18:13:52 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp (cancel):
-        Initialized act pointer variable to 0, which was causing
-        core dump in linux.  In general, all pointers should be
-        initialized.  This should have been warned by the compiler.
-        Thanks to Sandro Doro <doros@aureus.sublink.org> for
-        pointing this out.
-
-Tue Nov  4 11:14:35 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Containers.cpp: Fixed some stylistic ambiguities.
-
-Tue Nov 04 10:12:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_hpux.GNU: added +a1 to CFLAGS
-          to select ANSI C, instead of the default K+R C.  This is
-          required with the current ace/Object_Manager.cpp, because
-          it initialized autos using aggregates (via the
-          ACE_STATIC_SVC_DEFINE macro).  Thanks to Neil B. Cohen
-          <nbc@metsci.com> for helping to sort this out.
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: changed
-          another lock () to mutex ().
-
-        * tests/run_tests.vxworks: added MT_SOCK_Test.
-
-Tue Nov 04 04:13:23 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.36, released Tue Nov 04 04:13:23 1997.
-
-Tue Nov 04 03:50:57 1997    <irfan@TWOSTEP>
-
-        * ace/Addr.i (operator == && operator !=): Comparison of
-          sap.addr_type_ should be with this->addr_type_ and not with 0.
-
-Mon Nov  3 23:18:33 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * ace/Synch_T.cpp (dump): change the field lock_ to mutex_.
-
-Mon Nov  3 22:37:58 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Timer_Wheel_T.cpp:
-        * ace/Timer_List_T.cpp:
-        * ace/Timer_Hash_T.cpp:  Changed the use of lock_ to mutex_.
-
-        * ace/OS.cpp (cleanup_tss): Added TSS cleanup codes for Win32 when
-          non-main threads are exiting.  Without them, Thread_Manager won't
-          cleanup its thread table correctly.
-
-        * ace/SV_Semaphore_Complex.cpp (close): Changed to return 0
-          only when this->key_ == -1 instead of <= -1.  This was causing
-          semaphore leaks on Solaris.
-
-        * ace/UNIX_Addr.i (operator ==):
-        * ace/SPIPE_Addr.i (operator ==):
-        * ace/FILE_Addr.i (operator ==):
-        * ace/DEV_Addr.i (operator ==):
-        * ace/INET_Addr.cpp (operator ==):  Added checking for the same
-          Addr types for addresses under comparison.  Thanks to Stephen
-          Coy <stevec@magna.com.au> for pointing out the problem.
-
-Mon Nov 03 18:32:42 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * ace/Proactor.cpp:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Queue_T.cpp:
-        * ace/Timer_Heap_T.cpp:
-        * ace/Synch_T.h:
-        * ace/Synch_T.cpp:
-        * ace/Atomic_Op.i:
-          Changed the method name from lock() to mutex(), otherwise the
-          lame HP/C++ compiler gets completely confused. Also changed the
-          field from lock_ to mutex_
-
-Mon Nov  3 17:15:17 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h: Removed "class ace_dewarn_gplusplus;" from the
-          ACE_CLASS_IS_NAMESPACE macro.  Produces warnings on AIX and
-          shouldn't be needed.
-
-Mon Nov  3 15:49:18 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Connector.cpp (connect): "Fixed" so that the service handler
-          pointer passed in by the caller doesn't change until the connect
-          completes without errors.
-
-Mon Nov 03 08:15:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Managed_Object.[hi] (get_preallocated_{object,array}):
-          inlined function definitions into the class header so that
-          it compiles on AIX 4.1 w/ xlC 3.01.  Thanks to Bob Lyng
-          <rlyng@synertech.highmark.com> for reporting this problem,
-          at to Steve H. for testing the fix.
-
-        * include/makeinclude/{platform_linux*.GNU,wrapper_macros.GNU},
-          netsvcs/lib/Makefile: suppress -g when compiling ace/Timer_Hash.cpp
-          and netsvcs/lib/Server_Logging_Handler.cpp on Linux only.
-          (It really only needs to be suppressed on Linux/Alpha.)
-
-        * apps/Gateway/Gateway: protect instantiation of
-          ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
-          with ACE_HAS_THREADS.
-
-        * ace/{Naming_Context.cpp,Service_Config.cpp,Object_Manager.cpp}:
-          moved ACE_Naming_Service and ACE_Service_Manager static service
-          objects to ACE_Object_Manager.
-
-          With this change, the ACE library no longer has any static
-          objects that require destruction.
-
-        * ace/Object_Manager.h: added documenation of
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER config #define.
-
-        * performance-tests/Misc/preempt.cpp: cleaned up cleanup so that
-          it compiles cleanly.
-
-Sun Nov 02 18:09:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.35, released Sun Nov 02 18:09:14 1997.
-
-Sun Nov  2 15:31:45 1997  Douglas C. Schmidt  <schmidt@polka.cs.wustl.edu>
-
-        * ace/Select_Reactor.i (cancel_timer): Make sure that we don't try
-          to call cancel() through a NULL this->timer_queue_.  Thanks to
-          Stephen Coy <stevec@wsa.com.au> for reporting this.
-
-        * ace/ACE.cpp (set_handle_limit): Fixed a subtle bug that occurs
-          if the OS doesn't like non-initialized rlimit structs.  Thanks
-          to Stephen Coy <stevec@wsa.com.au> for reporting this.
-
-        * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp (main):
-          Renamed allocator to my_alloc to work around wonderful STL and
-          GCC problems...  Thanks to Ben Eng <ben@jetpen.com> for
-          reporting this.
-
-        * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: Removed
-          unused constant SHMSZ.  Thanks to Ben Eng <ben@jetpen.com> for
-          reporting this.
-
-        * examples/Reactor/Misc/test_time_value.cpp (operator<<): Removed
-          the "dec" stream manipulator since it isn't portable.  Thanks to
-          Ben Eng <ben@jetpen.com> for reporting this.
-
-        * performance-tests/Misc/preempt.cpp (main): Cleaned up this test
-          so it compiles on non-threaded platforms.  Thanks to Ben Eng
-          <ben@jetpen.com> for reporting this.
-
-        * examples/Timer_Queue/main_*.cpp (main): std::auto_ptr does not
-          have an operator= that accepts a raw pointer.  Therefore, we
-          must assign raw pointers to an auto_ptr via the constructor.
-          Thanks to Ben Eng <ben@jetpen.com> for reporting this.
-
-        * apps/Gateway/Gateway/Proxy_Handler.cpp: Make sure we distinguish
-          between ACE_NULL_SYNCH and ACE_MT_SYNCH since these will be
-          different on all platforms, whereas ACE_SYNCH will be the same
-          as ACE_NULL_SYNCH on platforms without threads.  Thanks to Ben
-          Eng <ben@jetpen.com> for reporting this.
-
-        * ace: Removed lots of uses of NULL and replaced them with 0.
-          This works around bugs with lame C++ compilers that treat NULL
-          as (void *).  Thanks to Ben Eng <ben@jetpen.com> for reporting
-          this.
-
-        * ace/Thread.i (spawn): Replaced "stack" with "thr_stack" to work
-          around bugs with lame C++ compilers and STL.  Thanks to Evgeny
-          Beskrovny <evgeny_beskrovny@icomverse.com> for reporting this.
-
-Sat Nov  1 11:55:05 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/config-irix5.3-g++.h,
-          ace/config-irix5.3-sgic++.h: Removed the ACE_HAS_SYS_SIGLIST
-          macro since it doesn't seem to be working.  Thanks to Laura
-          Paterno <lpaterno@d0chb.fnal.gov> for reporting this.
-
-        * include/makeinclude/platform_chorus.GNU: Tidied up
-          platform_chorus.GNU a bit.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for this.
-
-Fri Oct 31 14:35:37 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (thr_create): on Chorus, double the stack size to
-          avoid bad problems.  Thanks to Wei Chang <chiang@tele.nokia.fi>
-          for diagnosting this.
-
-        * ace/Hash_Map_Manager.cpp (unbind_i): set the int_id
-          reference argument instead of ignoring it.  Thanks to
-          Wei Chang <chiang@tele.nokia.fi> for providing the patch.
-
-        * ace/OS.h,README: wrapped #include of dlfcn.h with
-          ACE_HAS_DLFCN_H_BROKEN_EXTERN_C to support RedHat 4.2
-          Linux 2.0.30/Alpha.
-
-        * ace/OS.i,README: added ACE_HAS_GETRUSAGE_PROTO support, for
-          platforms that have a getrusage () prototype that is
-          different from the one in OS.i.
-
-        * ace/config-linux.h: added added some #defines to enable
-          builds on RedHat 4.2/Linux 2.0.30/Alpha.
-
-        * include/makeinclude/platform-linux.GNU: added -pipe and
-          bumped optimization level up to -O3.
-
-        * ace/Thread_Manager.cpp (wait_task): no-op if thr_list_
-          size is 0.  wait_task () can be called under that condition
-          (after Thread_Manager::wait () has returned) from an
-          ACE_Stream destructor, through ACE_Module::close () and
-          ACE_Task_Base.wait ().  Without this change, wait_task ()
-          allocated a copy_table array of size 0.  Sun C++ leaked
-          that array, according to Purify.
-
-        * ace/Service_Config.*,Object_Manager.cpp: moved static
-          ACE_Service_Config::signal_handler_ to Object_Manager.
-
-        * include/makeinclude/rules.local.GNU (show_statics,show_uninit):
-          added $(TOOLENV) to allow specification of full path to nm.
-          Thanks to Wei Chiang <chiang@tele.nokia.fi> for this suggestion.
-
-        * include/makeinclude/platform_chorus.GNU: added trailing "/"
-          to TOOLENV definition, so that it can be empty when not used.
-
-        * ACE-INSTALL.html,include/makeinclude/wrapper_macros.GNU:
-          added documentation for ACE show_statics and show_uninit targets.
-          These are only supported with g++.
-
-Fri Oct 31 00:53:52 1997    <irfan@TWOSTEP>
-
-        * The following five changes were suggested by Stephen Coy
-          <stevec@wsa.com.au>.  Thanks Stephen.
-
-        * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed friend
-          ace_dewarn_gplusplus to friend class ace_dewarn_gplusplus.
-
-        * ace/Malloc_T.h: Move the #include files to just after the
-          declaration of the macros, otherwise Containers.cpp will be
-          #included before the definition of the various allocator macros
-          (such as ACE_ALLOCATOR_RETURN) have been seen (when
-          ACE_TEMPLATES_REQUIRE_SOURCE is defined).
-
-        * ace/Hash_Map_Manager.cpp (close_i): Changed &table[i] to
-          &table_[i].
-
-        * ace/Containers.h: The ACE_Node destructor needs to be publicly
-          accessible in order to support the
-          ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR fix.  Unfortunately,
-          making the template function
-          ACE_Destructor_Template_For_HPUX_aCC_Only a friend does not seem
-          to work (although it should).
-
-        * ace/ACE.cpp (ldfind): Changed path_entry from char* to
-          const char*.
-
-        * tests/Priority_Reactor_Test.cpp (main): Fixed auto_ptr usage.
-          Thanks to Jack Erickson (jack@pinion.com) for pointing this out.
-
-        * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed the macro to not
-          include the destructor.  This causes undefined destructor
-          problems on Win32.  Also added ACE_UNIMPLEMENTED_FUNC macros
-          around the remain functions.
-
-Thu Oct 30 21:22:47 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: added auto Svc_Conf_[ly].cpp patches.
-
-        * etc/Svc_Conf_[ly].cpp.diff,README: the ace/Svc_Conf_[ly].cpp
-          patches, and instructions for updating them.
-
-Thu Oct 30 19:54:50 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.34, released Thu Oct 30 19:54:50 1997.
-
-Thu Oct 30 17:49:56 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Priority_Task_Test.cpp (main): Moved "int status" out of
-          the #if defined (ACE_HAS_THREADS) so that it will compile when
-          the platform *doesn't* have threads.
-
-        * ace/Synch_T.i (ACE_TSS): Added a missing ':' that was causing
-          problems on platforms that lack threads.  Thanks to Laura
-          Paterno <lpaterno@d0chb.fnal.gov> for helping to track this
-          down.
-
-        * ace/Signal.cpp (register_handler): Make sure not to use
-          SA_SIGINFO if we're running on LynxOS.  At some point, we'll
-          want to generalize this, once enough OS platforms support POSIX
-          real-time signals.  Thanks to Kirill.Rybaltchenko
-          <Kirill.Rybaltchenko@cern.ch> for reporting this.
-
-        * include/makeinclude/platform_chorus.GNU (CXX): Replaced
-          DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
-          Wei Chiang for this.
-
-        * ace/OS.cpp: It's not valid to set the NULL_key to anything other
-          than implicit initialization.  In particular, if we set it to -1
-          it breaks on pthreads systems...  Thanks to Check Gehr for
-          reporting this.
-
-        * ace/config-irix5.3*++.h: Added ACE_NEEDS_SYSTIME_H.  Thanks to
-          Laura Paterno <lpaterno@d0chb.fnal.gov> for reporting the
-          problem.
-
-        * ace/OS.h: Moved the unistd.h files back down to where
-          they originally were defined since this was unnecessary.
-
-        * include/makeinclude/platform_chorus.GNU (CXX): Replaced
-          DCFLAGS += -g with DCFLAGS += -gstabs+.  Thanks to
-          Wei Chiang for this.
-
-Thu Oct 30 17:41:19 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/OS.h: Stray semi-colon removed from ACE_CLASS_IS_NAMESPACE
-          macro.
-
-Thu Oct 30 17:04:52 1997    <irfan@TWOSTEP>
-
-        * ace/OS.h (ACE_CLASS_IS_NAMESPACE): Changed the macro to not
-          include the destructor.  This causes undefined destructor
-          problems on Win32.  Also added ACE_UNIMPLEMENTED_FUNC macros
-          around the remain functions.
-
-Thu Oct 30 10:50:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/OS.h: Added new macro--ACE_CLASS_IS_NAMESPACE ()--to
-          designate that a class is being used as a pseudo-namespace.  It
-          declares private CTOR, Copy CTOR, and DTOR, as well as a friend
-          declaration in order to de-warn on g++.  Typical usage would be
-          something like:
-
-          class FooBarNamespace
-          {
-            ACE_CLASS_IS_NAMESPACE (FooBarNamespace);
-
-          public:
-            static ...
-          };
-
-          The ACE_OS class has been updated to use this.
-
-        * ace/ACE.h: Updated class ACE to use the new
-          ACE_CLASS_IS_NAMESPACE ().
-
-        * ace/OS.i (getopt): Changed ACE_LACKS_SOME_POSIX_PROTOTYPES back
-          to ACE_LACKS_POSIX_PROTOTYPES so that a clean build on Linux is
-          achievable now.
-        (msgsnd): Corrected errant spelling from
-          ACE_LACKS_POSIX_SOME_PROTOTYPES to
-          ACE_LACKS_SOME_POSIX_PROTOTYPES.
-
-Thu Oct 30 06:14:58 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile,ACE-INSTALL: removed ACE-INSTALL from CVS control.
-          It will only be created when a release is made in
-          /project/adaptive/ACE_wrappers, and not put under CVS control.
-
-        * ace/Manager_Object.h: added ACE_INLINE specifier to
-          get_preallocated_object/array declarations.  Thanks to
-          Torbjorn Lindgren <tl@funcom.no> for reporting this.
-
-        * ace/Synch.cpp: removed duplicate
-          ACE_Write_Guard<ACE_RW_Thread_Mutex> instantiation.  Thanks to
-          Torbjorn Lindgren <tl@funcom.no> for reporting this.
-
-        * tests/Conn_Test.cpp: fixed template instantiation pragmas.
-          Thanks to Torbjorn Lindgren <tl@funcom.no>, again.
-
-        * tests/SPIPE_Test.cpp: replaced ACE_UNUSED_ARG of client and server
-          with conditional compilation of those functions.  Thanks to
-          Torbjorn Lindgren <tl@funcom.no> for snagging this.
-
-        * ace/OS.{h,cpp},Object_Manager.cpp (tss_open,tss_close): removed
-          tss_open () dynamic allocation option because it wasn't used.
-          Removed tss_close() because it was a no-op without tss_open ()
-          dynamic allocation.
-
-        * ace/OS.cpp (tss_open): On VxWorks, don't check for 0 tss_base ().
-          It's not always 0 on program startup, especially if a program
-          has been previously run by the shell directly, without spawning
-          a new task to run it.
-
-        * ace/OS.*: added ACE_TSS_EMULATION support for non-scalar
-          ACE_thread_key_t.  Thanks to Chuck Gehr <gehr@sweng.stortek.com>
-          for motivating this.
-
-        * ace/config-mvs.h: added ACE_HAS_NONSCALAR_THREAD_KEY_T.  It
-          is only used with ACE_HAS_TSS_EMULATION, which currently is
-          not supported on MVS.
-
-        * ace/OS.cpp (ACE_Thread_Adapter::invoke): cleaned up this function.
-
-Thu Oct 30 03:25:13 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Hash_Map_Manager.cpp (close_i): Can't use ACE_DES*
-          template.  Have I been here before?
-
-Thu Oct 30 03:03:41 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Hash_Map_Manager.cpp (close_i): Changed to use ACE_DES* macros.
-
-        * ace/OS.h: Moved ACE_Allocator related macros to Malloc_T.h
-
-        * ace/Malloc_T.h: Moved ACE_Allocator related macros from OS.h.
-          Added two macros ACE_DES_NOFREE and ACE_DES_NOFREE_TEMPLATE to
-          call objects' destructors explicitly.  This is required to
-          take care of some "broken" compilers.  Thanks to Stephen Coy
-          <stevec@magna.com.au> for providing the fix for HP-UX aCC.
-
-        * ace/README:
-        * ace/config-hpux-10.x-hpc++.h: Added flag
-          ACE_HAS_HPUX_ACC_BROKEN_TEMPLATE_DESTRUCTOR.
-
-Thu Oct 30 02:56:25 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.33, released Thu Oct 30 02:56:25 1997.
-
-Thu Oct 30 01:03:21 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/LOCK_SOCK_Acceptor.cpp: Added a #include of "ace/Synch.h" so
-          that the Conn_Test.cpp will compile on HP/UX.  Thanks to Stephen
-          Coy <stevec@magna.com.au> for reporting this.
-
-Wed Oct 29 22:55:15 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-vxworks5.x-g++.h:
-        * ace/config-unixware-2.1.2-g++.h:
-        * ace/config-unixware-2.01-g++.h:
-        * ace/config-sunos5.5-g++.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos4-g++.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-osf1-4.0-g++.h:
-        * ace/config-linux.h:
-        * ace/config-linux-pthread.h:
-        * ace/config-linux-lxpthreads.h:
-        * ace/config-irix6.x-g++.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-hpux-10.x-g++.h:
-        * ace/config-gcc-2.7.2.h:
-        * ace/config-freebsd.h:
-        * ace/config-freebsd-pthread.h:
-        * ace/config-chorus.h:
-        * ace/config-aix-4.1.x.h:
-        * ace/README: Removed ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR.
-          It is no longer in use.
-
-Wed Oct 29 21:12:55 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/README: Added a new macro called ACE_LACKS_SOCKET_BUFSIZ,
-          which is enabled on VxWorks.
-
-        * ace/OS.h: Added a new macro called
-          ACE_DEFAULT_MAX_SOCKET_BUFSIZ, which is set to 65536.
-
-        * ace/OS: Changed the tolower() method to to_lower() so that it
-          won't conflict if there's a macro with the same name.
-
-        * ace/OS.h: #include <unistd.h> before ACE_Time_Value as long as
-          ACE_LACKS_UNISTD_H is false.  Added this flag to the VxWorks and
-          Win32 config.h files.
-
-        * ace/OS.h: Added a special #define for IRIX5, which seems to put
-          timeval in a strange file...  Also, moved this #include to
-          *before* ACE_Time_Value.  Thanks to Carlos O'Ryan for suggesting
-          this and to Laura Paterno <lpaterno@d0chb.fnal.gov> for
-          reporting the problem in the first place.
-
-        * ace: Changes all uses of the overly long
-          ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS to
-          ACE_LACKS_SOME_POSIX_PROTOTYPES.  However, I'm not really sure
-          how this relates to the ACE_LACKS_POSIX_PROTOTYPES macro.  I
-          suspect we probably only need one of these...
-
-        * ace/OS.h: Added a new ACE_HAS_STDARG_THR_DEST to handle
-          weirdness with LynxOS.  Thanks to Kirill.Rybaltchenko
-          <Kirill.Rybaltchenko@cern.ch> for reporting this.
-
-        * ace: OS.h,config-lynxos.h: Added a new ACE_LACKS_GETOPT_PROTO
-          for LynxOS.  Thanks to Kirill.Rybaltchenko
-          <Kirill.Rybaltchenko@cern.ch> for reporting this.
-
-        * ace/config-lynxos.h: Replaced
-          ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS with
-          ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCTIONS.  Thanks to
-          Kirill.Rybaltchenko <Kirill.Rybaltchenko@cern.ch> for reporting
-          this.
-
-Wed Oct 29 22:17:03 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-hpux-10.x-hpc++.h (ACE_HAS_TEMPLATE_SPECIALIZATION):
-          Moved to C++ section.  Restored ACE_TEMPLATE_REQUIRE_SOURCE in
-          C++ section.  Thanks to Stephen Coy <stevec@magna.com.au> for
-          providing the fix (patiently.)
-
-Wed Oct 29 20:30:55 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/OS.i (strlen): Moved it earlier so that it would be declared
-          inline before use.
-
-        * ace/OS.i (strcasecmp): Removed spurious semi-colons (how did
-          they get in there?).
-
-Wed Oct 29 18:51:12 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.{h,i}: Added strcasecmp functionality for NT
-
-Wed Oct 29 15:56:01 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp: replaced ACE_TSS_REF_TABLE with a reference count to
-          remove dynamic allocation from ACE_TSS_Info.  Also, enabled call
-          of ACE_Task close hook before calling TSS destructors.
-
-        * ace/OS.cpp: changed a few TSS 0 keys to ACE_OS::NULL_key.
-
-        * ace/Thread_Manager.cpp (ace_thread_manager_adapter): with
-          TSS_EMULATION, moved the call of tss_close () from here to
-          ACE_Thread_Adapter::invoke () so that it can be called after
-          the task's close hook, if any.
-
-        * ace/{OS.h,Log_Msg.h,Object_Manager.cpp} (cleanup_tss): added
-          an argument to indicate whether the main thread is calling or not.
-
-        * ace/OS.i (ACE_TSS_Emulation::next_key): start key values at
-          0 instead of 1, because it's easier to deal with arrays of
-          keys then.  That also corresponds with the starting key value
-          on Windows NT.
-
-        * ace/IOStream.h: DEC_CXX #includes now depend on compiler version.
-          Thanks to James Johnson <jcej@lads.com> for providing the fix.
-
-Wed Oct 29 10:32:16 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-lynxos.h: fixed ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS
-          and added getopt () declaration.
-
-        * include/makeinclude/platform_lynxos.GNU: updated LIBS.
-
-        Thanks to Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch> for
-        the above fixes.
-
-        * etc/purify.solaris2: added another _thrp_exit UMR.
-
-        * include/makeinclude/wrapper_macros.GNU: added login (LOGNAME)
-          and compiler (CXX) to Purify/Quantify cache names.
-
-Wed Oct 29 08:40:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.32, released Wed Oct 29 08:40:38 1997.
-
-Wed Oct 29 07:39:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Synch.cpp: Added an explicit template instantiations for
-          ACE_Guard<ACE_Process_Mutex>.
-
-        * ace/LOCK_SOCK_Acceptor.h: Removed the typedef of
-          ACE_SOCK_Acceptor with a full expansion of the name to fix a G++
-          bug.
-
-        * tests/Conn_Test.cpp: Fixed a template instantiation problem.
-
-        * ACE-INSTALL.html: Pointed out that ACE is ported to LynxOS and
-          Chorus.
-
-        * ACE-INSTALL.html: Added information about cloning that explains
-          how you must to build a config.h and platform_macros.GNU in
-          cloned directory.  Thanks to Arturo for this.
-
-        * bin/Makefile: Added
-          $(ACE_ROOT)/include/makeinclude/platform_macros.GNU to Makefile
-          so we can compile clone on any ACE platform.  Thanks to Arturo
-          for this.
-
-        * include/makefiles: Added new platform file for SCO UNIX with
-          nothreads.  Thanks to Arturo for this.
-
-        * ace: Added new config files for SCO UNIX with nothreads.
-          Thanks to Arturo for this.
-
-        * apps/JAWS/server/HTTP_Server.cpp: Fixed the typedef for
-          ACE_LOCK_SOCK_Acceptor.  Thanks to Hans Rohnert for reporting
-          this.
-
-        * tests/Conn_Test.cpp: Changed template instantiations from
-          SOCK_ACCEPTOR to LOCK_SOCK_ACCEPTOR.  Thanks to Han Rohnert for
-          reporting this.
-
-Wed Oct 29 02:10:37 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.31, released Wed Oct 29 02:10:37 1997.
-
-Wed Oct 29 01:25:54 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tests/Conn_Test.cpp: Modified Conn_Test to fully integrate
-          Irfan's new LOCK_SOCK_Acceptor.  This new implementation is
-          truly the "mother of all Conn_Tests" ;-).
-
-        * ace/LOCK_SOCK_Acceptor.cpp (lock): Added a lock() accessor
-          method to the new ACE_LOCK_SOCK_Acceptor so that we can remove
-          the lock (somehow).
-
-Wed Oct 29 00:29:52 1997    <irfan@TWOSTEP>
-
-        * apps/JAWS/server: Fixed Win32 related compilation errors.
-
-        * ace/OS.h (SIGUSR1 and SIGUSR2): Added new defines for these two
-          signals.
-
-        * ace/LOCK_SOCK_Acceptor: New class added to ACE (it was
-          originally a class in JAWS).  It specialize ACE_SOCK_Acceptor to
-          lock around <accept>.  This class is particular useful if you
-          want to have multiple threads accepting on the same endpoint and
-          the system does not support have thread safe accept.  Thanks to
-          James Hu who initially wrote this class for JAWS.  Thanks also
-          to Johannes Gutleber <Johannes.Gutleber@cern.ch> who decided to
-          use this in the Conn_Test.
-
-        * tests/Conn_Test.cpp: Updated to use the new LOCK_SOCK_Acceptor.
-
-        * apps/JAWS/server/HTTP_Server.h: Updated to use the new
-          LOCK_SOCK_Acceptor.
-
-        * apps/JAWS/server/HTTP_Server_T.*: These files are no longer
-          necessary since this class has been absorbed into ACE.
-
-        * tests: Fixed auto_ptr use in:
-
-          Notify_Performance_Test.cpp
-          Priority_Reactor_Test.cpp
-          Reactor_Performance_Test.cpp
-
-          Thanks to Jack Erickson (jack@pinion.com) for pointing this out.
-
-Tue Oct 28 11:26:39 1997  Nanbor Wang  <nw1@CHA-CHA>
-
-        * ace/ace_{dll,lib}.dsp:  Moved Acceptor.cpp from Source file
-          folders to Template file folders.  Thanks to Satheesh Kumar
-          <satheesh@aspectdv.com> for pointing this out.
-
-Tue Oct 28 05:44:56 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (thr_create): use pthread_attr_setprio instead of
-          *_setsched with DCETHREADS, and check return values of
-          ACE_OS::thr_[gs]etconcurrency ().  Thanks to Stephen Coy
-          <stevec@magna.com.au> for tracking these problems down.
-
-        * tests/Priority_Task_Test.cpp (svc): removed ACE_ASSERT and
-          replaced with setting of error flag.  This allows the test
-          to continue and gather more possibly useful information.
-
-        * tests/Conn_Test.cpp: 1) Added template instantiations.
-          2) Re-enabled with DEC_CXX.  3) Removed THR_DETACHED flags.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: suppress warnings
-          about unreachable statments.
-
-        * ACE-INSTALL.html: Conn_Test now runs with DEC_CXX 6.0.
-
-Tue Oct 28 00:38:58 1997    <irfan@TWOSTEP>
-
-        * ace/Strategies_T:
-
-          ACE_Recycling_Strategy - Added new class ACE_Recycling_Strategy.
-          It defines the interface (and default implementation) for
-          specifying a recycling strategy for a SVC_HANDLER.  This
-          strategy acts as a consular to the Svc_Handler, preparing it for
-          the tough times ahead when the Svc_Handler will be recycled.
-
-          ACE_NOOP_Concurrency_Strategy - Added new class
-          ACE_NOOP_Concurrency_Strategy.  It implements a no-op activation
-          strategy in order to avoid calling open on a recycled
-          svc_handler multiple times.
-
-          ACE_Cached_Connect_Strategy - Added a ACE_Creation_Strategy,
-          ACE_Concurrency_Strategy, and ACE_Recycling_Strategy to the
-          cached connector.  This gives it more flexibility than by simply
-          providing template methods.  This is similar to the Strategy
-          Connector.
-
-          ACE_Cached_Connect_Strategy - Added new template methods for
-          certain key occasions in the cached connector: make_svc_handler,
-          activate_svc_handler, assign_recycler, and
-          prepare_for_recycling.
-
-        * tests/Conn_Test.cpp (client): Updated the tests such that it
-          uses a null activation strategy.
-
-Mon Oct 27 22:17:54 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * OS.h: Added the ACE_NESTED_CLASS macro to deal with those
-        compilers that do not allow a fully scoped type name appearing
-        inside a scope in which it was defined.
-
-Mon Oct 27 22:17:32 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (exit): don't use the cache when finding
-          the thread ID.  The cache is in the ACE_Log_Msg instance, and
-          it might have been deleted already.
-
-Mon Oct 27 20:33:07 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.30, released Mon Oct 27 20:33:07 1997.
-
-Mon Oct 27 18:03:06 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ACE-INSTALL.html (HREF): Added NT/Alpha to supporting platforms
-          list.  Added hyperlink to ACE newsgroup.  Added hyperlink to
-          FreeBSD homepage.  Minor changes to Win32 intstallation guide.
-
-Mon Oct 27 17:50:16 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU (PRELIB):
-          Changed PRELIB in platform_sco5.0.0-mit-pthread.GNU,
-          platform_sco5.0.0-fsu-pthread.GNU to @true, so we can generate
-          the TAO_IDL compiler.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-Mon Oct 27 14:26:10 1997    <irfan@TWOSTEP>
-
-        * ace/Synch_T (ACE_TSS): When ACE does not have thread specific
-          storage, ACE_TSS will be a simple pointer holder. Previously, it
-          had a instance as a member, now it has a pointer to an instance.
-
-        * ace/WFMO_Reactor.cpp (update_state): Fixed a bug in the
-          WFMO_Reactor.  wakeup_all_threads() used to be an internal
-          method that was called when changes were made to the state of
-          the reactor.  When wakeup_all_threads() became public, there was
-          no code in place to handle explicit user wakeups.  In
-          particular, the wakeup_all_threads event was never reset.
-          Thanks to Evgeny Beskrovny <evgeny_beskrovny@icomverse.com> for
-          pointing out this bug.
-
-        * ace/OS.i (ACE_FAIL_RETURN): Added mapping from
-          ERROR_PATH_NOT_FOUND to ENOENT.  Thanks to David Brackman
-          <dbrackma@OhioEE.com> for suggesting this.
-
-Mon Oct 27 11:36:39 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (exit_cleanup_i): removed protection against recursive
-          calls.  This protection no longer is necessary, because
-          ACE_TSS_Cleanup () is only called by ACE_Thread_Adapter::invoke ().
-          It was problematic because it used the ACE_Allocator instance.
-
-        * ace/config-vxworks*.h,README: added ACE_LACKS_FCNTL.
-
-        * ace/OS.i,ACE.cpp: replaced #ifdef VXWORKS with #ifdef
-          ACE_LACKS_FCNTL.
-
-        * ace/ACE.i (get_flags): return 0 if ACE_LACKS_FCNTL.  It would
-          be better to store ACE's notion of the flags associated with
-          the handle so that they could be returned, but this works for now.
-
-        * tests/run_tests.vxworks: re-enabled Reactors_Test, because it
-          works with the ACE_LACKS_FCNTL mods.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: -pthread instead of
-          -lpthread in LIBS.  Thanks to James Johnson <jcej@lads.com> for
-          pointing this out.
-
-        * ACE-INSTALL.html: added info on bin/create_ace_build.
-
-Mon Oct 27 11:11:33 1997  Nanbor Wang  <nw1@CUECA>
-
-        * netsvcs/servers/servers.dsp
-        * netsvcs/lib/netsvcs.dsp:
-        * tests/*.dsp:
-        * ace/ace_{dll,lib}.dsp: Added project configurations for Alpha
-          machines.  Configurations are named by adding "Alpha" in front
-          of the original config names, e.g., "Win32 Alpha Unicode Debug.
-
-Mon Oct 27 06:40:18 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU (show_uninit): Added a
-          missing semi-colon for one of the install rules.  Thanks to
-          Manojkumar Acharya <mja@cvsf325.gpt.co.uk> for reporting this.
-
-        * ace/Synch_T.h: Make sure that ACE_Guard::remove() calls
-          this->lock_->remove() rather than this->lock_->release().
-          Thanks to Johannes Gutleber <Johannes.Gutleber@cern.ch> for
-          reporting this.
-
-Mon Oct 27 00:20:13 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-hpux-10.x-hpc++.h: Added directive
-          ACE_HAS_TEMPLATE_SPECIALIZATION.  Thanks to Stephen Coy
-          <stevec@wsa.com.au> for reporting this.
-
-Sun Oct 26 22:17:57 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.29, released Sun Oct 26 22:17:57 1997.
-
-Sun Oct 26 20:03:57 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/IPC_SAP.cpp,
-          ace/IO_SAP.cpp: Make sure that we don't use fcntl() when
-          we're compiling on VXWORKS since it's not defined...
-
-        * examples/Connection/non_blocking/CPP-connector.cpp: Changed the
-          method named idle() to uninitialized() since idle() is now
-          defined on ACE_Svc_Handler.
-
-        * ace/OS.h: Added the TAO_DEFAULT_SERVER_PORT to OS.h.
-
-        * tests/Conn_Test.cpp (cached_connect): Added a new variable
-          called "n_client_iterations" to control how many times each
-          client thread tries to connect with the Cached_Connector.
-
-Sun Oct 26 16:56:32 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * include/makeinclude/platform_linux_lxpthread.GNU (CFLAGS): Added
-        -pipe to the compile options.
-
-Sun Oct 26 11:04:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Hash_Map_Manager.cpp (unbind): added ACE_UNUSED_ARG (int_id).
-
-        * tests/Conn_Test.cpp (server): added ACE_UNUSED_ARG (options).
-          And, added template instantations.
-
-        * tests/Conn_Test.cpp (cached_connect): changed type of loop index i
-          to int to avoid signed/unsigned comparison.
-
-        * ace/Strategies_T.h: added #include of ace/Strategies.h.  Thanks to
-          James Johnson <jcej@lads.com> for reporting this.
-
-Sun Oct 26 10:01:01 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Connector.cpp (open):  The original fix failed to replace
-          strategies under some circumstances.
-
-        * ace/OS.{h,cpp} (sprintf): Removed ACE_OS::sprintf (wchat_t, char).
-          It didn't ever work.
-
-        * ace/Connector.cpp (open): Added check if we had previously
-          allocated various strategies and deleted these objects before
-          allocating new objects.  The original codes caused memory leaks
-          and possible segmentation faults if it got called twice.  We
-          probably need a do-nothing constructor (the current constructor
-          calls open.)  However, this may break other codes.
-
-Sun Oct 26 01:00:07 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.28, released Sun Oct 26 01:00:07 1997.
-
-Sun Oct 26 00:50:00 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (close): Since the connect() method on
-          ACE_Connector closes the svc_handler if failure occurs, we
-          shouldn't do that again unless we succeed in connecting.
-
-        * ace/OS.h: Moved the CORBA portability macros from
-          CORBA_Handler.h into OS.h so they will be accessible from TAO.
-
-        * ace/Filecache.cpp (finish): Replaced filename_ with filename()
-          so that "const correctness" would work with template
-          specialization.  Go figure!
-
-        * TAO/tests/IDL_Cubit/Makefile: Enhanced the "realclean" target to
-          remove the generated IDL stubs and skeletons.
-
-        * ace/OS.cpp (ace_sysconf_dump): Made a minor change to OS.cpp
-          to fix some typos.  Thanks to Wei Chiang <chiang@tele.nokia.fi>
-          for reporting this.
-
-Sun Oct 26 00:06:17 1997    <irfan@TWOSTEP>
-
-        * ace/Strategies_T.cpp (~ACE_Cached_Connect_Strategy): Must set
-          recycler to 0 before calling close, else the svc_handler will
-          try to purge itself from the cache.
-
-        * tests/Conn_Test.cpp (client): Updated to use the new connection
-          recycling scheme.
-
-        * ace/Hash_Map_Manager:
-
-        - ACE_Hash_Map_Reverse_Iterator: Added reverse iterator.
-
-        - ACE_Hash_Map_Entry: Added a prev pointer to the entry.  Thus
-          changing the bucket chains into doubly linked lists.  Because of
-          this, it was necessary to change the way the list was being
-          managed.  Sentinels were created for each bucket.
-
-          This also changed (a) the way the iterators worked, (b) made it
-          easy to delete entries when you have one (this scheme allows the
-          entries to be easily used as ACTs).
-
-        - New methods (bind, trybind, rebind, find): These methods allow
-          the users to get access to ACE_Hash_Map_Entry of the node in
-          question.  This allows the user to treat the entry as an ACT and
-          get access to the key (in case the user is interested in
-          changing the key).  These methods are only valid since the
-          implementation of Hash_Map_Manager uses linked lists where nodes
-          are never copied.  These methods cannot be added to Map_Manager
-          since it uses an array of nodes, where the your data may get
-          copied to another node when the size of the Map_Manager changes.
-
-        * ace/Strategies (ACE_Connection_Recycling_Strategy): Added a new
-          abstract strategy for recycling connections.
-
-        * ace/Strategies_T:
-
-        - ACE_Cached_Connect_Strategy: ACE_Cached_Connect_Strategy now
-          implements the ACE_Connection_Recycling_Strategy interface.
-          This allows Svc_Handlers to cache themselves with
-          ACE_Cached_Connect_Strategy when they become idle.  It also
-          allows them to purge themselves from the connection cache when
-          the Svc_Handlers close down.
-
-          Also added ~ACE_Cached_Connect_Strategy that will cleanup up the
-          connection cache.
-
-        - ACE_Hash_Addr: ACE_Hash_Addr is the key for the hash map used by
-          ACE_Cached_Connect_Strategy.  Previously it kept the Svc_Handler
-          pointer in the key in order to find out if it was busy or not.
-          Now the <in_use> flag has been moved from the Svc_Handler into
-          the key.  The also saves the Hash_Addr from requiring
-          Svc_Handler as a template parameter.
-
-          Also updated ACE_Hash_Addr::operator== such that if the
-          Svc_Handler is busy, it does not bother to check compare the
-          addresses but simply returns false.
-
-        * ace/Svc_Handler.cpp: Added the ability for a Svc_Handler to
-          recycle itself.  idle() can be called when the Svc_Handler is
-          done serving a particular connection and can how be recycled.
-          The Svc_Handler now also has a pointer to a recycler that is
-          responsible for managing the connections.  The recycler is
-          usually a Cached_Connector.
-
-        * ace/Filecache.cpp (ACE_Hash_Map_Entry): Added a new constructor
-          specialization as the ACE_Hash_Map_Entry now has two
-          constructors.
-
-        * tests/Hash_Map_Manager_Test.cpp (ACE_Hash_Map_Entry): Added a
-          new constructor specialization as the ACE_Hash_Map_Entry now has
-          two constructors.
-
-        * tests/Reactor_Exceptions_Test.cpp (class My_Reactor): Added the
-          other handle_events method.  Thanks to Stephen Coy
-          (coys@mail.ns.wsa.com.au) for pointing this out.
-
-        * ace/Strategies_T.cpp (hash_i): This default routine is no good.
-          It uses a complicated scheme that calculate a hash value.
-          Unfortunately, there is no guarantee that this hash algorithm
-          will produce the same hash value for the same address.
-          Therefore, it is better just to return a consistent hash value
-          rather than an erroneous one.  I have choosen 0 of the return
-          value.  Even though this will cause all the entries to be hashed
-          to the 0 bucket, atleast they will be found.  Users should
-          override this to provide better hashing.
-
-          (compare_i): Memcmp is not the correct default action.
-          !(b1==b2) is the correct comparison, though this will assume
-          that the addresses will have a comparison operation.
-
-        * ace/Mem_Map.cpp (close and close_handle): close() is doing too
-          much.  It is closing the handle and unmapping the file.
-          Changing this method might effect code that depends on this
-          behavior.  Therefore, we create a seperated method
-          close_handle() that only closes down the handle, and does not
-          unmap the file.  Thanks to Jeff Richards (jrichard@OhioEE.com)
-          for pointing this out.
-
-        * ace/Strategies_T.cpp (connect_svc_handler): If connect() failed
-          because of timeouts, we have to reject the connection entirely.
-          This is necessary since currently there is no way for the
-          non-blocking connects to complete and for the <Connector> to
-          notify the cache of the completion of connect().  Therefore if
-          errno is EWOULDBLOCK, it is changed to ENOTSUP and -1 is
-          returned.
-
-Sat Oct 25 17:41:57 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
-        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp:
-        * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp:
-        * examples/Timer_Queue/main_async.cpp:
-        * examples/Timer_Queue/main_reactor.cpp:
-        * examples/Timer_Queue/main_thread.cpp:
-          Added "#pragma instantiate" for template instantiations on
-          platforms that use pragmas instead, like SGI.
-
-Sat Oct 25 4:44:00 1997  Carlos O'Ryan <coryan@cs.wustl.edu>
-
-        * Today at 06:44 hours (Santiago, 04:44 St. Louis) Fernanda O'Ryan
-          has joined the ACE family.  She was born 3040 gr in weight and
-          50 cm length.  She has absolutely no experience in CORBA, C++ or
-          programming in general.  Therefore, she is the ultimate Java
-          programmer.
-
-Sat Oct 25 10:13:56 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Singleton.h: added comment about best ACE_LOCK types to use.
-
-        * Makefile (TIMESTAMP): replace tab with spaces in ChangeLog entry.
-
-        * tests/Conn_Test.cpp (main): fixed typo, spawn_threads instead of
-          spawn_thread.  Also, protected definitions of spawn_processes ()
-          and spawn_threads () to avoid compiler warnings about unused static
-          functions.
-
-Sat Oct 25 01:02:34 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.27, released Sat Oct 25 01:02:34 1997.
-
-Fri Oct 24 17:39:08 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * ace/ACE.cpp: Changed all the ACE_BIT_ENABLED () == 0 macros to
-          ACE_BIT_DISABLED() since the logic is clearer.
-
-        * ace/SOCK_Acceptor.cpp (shared_accept): Improved the handling of
-          timed accepts.  The original implementation was prone to race
-          conditions if there were multiple processes all doing timed
-          connects on the *same acceptor socket*!  That's because select()
-          and accept() are not performed atomically.  Now, we're smarted
-          about handling this...
-
-        * tests/Conn_Test.cpp: Simplified the shutdown logic, which
-          appeared to have race conditions.
-
-        * tests/Conn_Test.cpp: Modified this test to spawn off a number of
-          server processes, all of which will listen for connections on
-          the same acceptor port.  This demonstrates a useful idiom for
-          writing connection-oriented concurrent server pools.
-
-        * netsvcs/lib/Server_Logging_Handler_T: Fixed this code so that if
-          we're on an HP/UX that has broken templates we don't use the
-          Base_Optimizer.  Thanks to Per Andersson for providing this fix.
-
-        * ace/Thread_Manager: Added a destructor for ACE_Thread_Descriptor
-          to keep some compilers happy.  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for reporting this.
-
-        * ace/Task.cpp (ACE_Task_Base_cleanup):  Changed
-          ACE_Task_Base::cleanup (object);
-
-          to:
-
-          ACE_Task_Base::cleanup (object, 0);
-
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for reporting
-          this.
-
-        * ace/Thread_Manager.cpp (find_thread): Fixed another problem with
-          == being used to compare threads rather than
-          ACE_OS::thr_equal().  Thanks to Chuck Gehr
-          <gehr@sweng.stortek.com> for reporting this.
-
-Fri Oct 24 17:11:14 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * Thread_Timer_Queue_Test.cpp (shutdown_timer): added logic to
-          cancel preemptively or voluntarily, the dispatching thread,
-          depending on whether the platoform supports pthread_cancel().
-
-        * Timer_Queue_Adapters.cpp (ACE_Thread_Timer_Queue_Adapter): Added
-          initialization of <active_> flag to 1, active mode.  We assume
-          we start in active mode.  Added an internal variable <thr_id_>
-          that stores the thread id of the currently running thread.  The
-          motivation behind this is to be able to cancel this thread
-          whenever we are shutting down.  It is initialized to
-          ACE_OS::NULL_thread.
-
-        * Timer_Queue_Adapters.cpp (svc): Assign the <thr_id_> with the
-          current running thread ID, using ACE_Thread::self ().
-
-        * Timer_Queue_Adapters.h (ACE_Thread_Timer_Queue_Adapter): Added
-          default <ACE_Thread_Manager> to be
-          ACE_Thread_Manager::instance()
-
-        * Timer_Queue_Adapters.h (activate): Override the default
-          <activate> method to be able to enforce one thread of execution
-          per timer queue.  Does make much sense to have more than one
-          managing the timer queue, and like Doug said too many weird
-          things can happen...
-
-        * Timer_Queue_Adapters.i (thr_id): Added this method to access the
-          thread ID of this task.
-
-        * Timer_Queue_Adapters.i (activate): Call
-          ACE_Task_Base::activate() with n_threads = 1 to ensure that a
-          single thread is spawned.
-
-Fri Oct 24 10:00:02 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (wait_grp):  Fixed a bug.  Should wait on
-          threads with same grp_id, not task.
-
-Fri Oct 24 09:24:14 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Select_Reactor.cpp (open): cast return value of
-          ACE_::max_handles () to size_t to avoid signed/unsigned comparison.
-
-        * ace/Singleton.cpp,Object_Manager.{h,cpp}: (get_singleton_lock):
-          dynamically allocate ACE_Thread_Mutex and ACE_RW_Thread_Mutex locks,
-          so we end up with one lock per ACE_Singleton instantiation.
-
-        * ace/OS.cpp (ACE_TSS_Info, Win32 and VxWorks only): changed type
-          of ACE_TSS_TABLE from ACE_Unbounded_Stack to fixed-size ACE_Array.
-          With this change, we avoid some use of ACE_Allocator when
-          destroying TSS objects.  There are two more changes required to
-          completely remove the ACE_Allocator use.
-
-        * tests/TSS_Test.cpp (worker): added printout of iteration count.
-
-Fri Oct 24 01:53:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.26, released Fri Oct 24 01:53:58 1997.
-
-Thu Oct 23 19:05:08 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * netsvcs/clients/Naming/Client/Makefile
-          netsvcs/clients/Naming/Dump_Restore/Makefile
-
-          The lines:
-
-          SHLIB   = libClient_Test.so
-          SHLIB   = libDump_Restore.so
-
-          need to be
-
-          SHLIB   = libClient_Test.$(SOEXT)
-          SHLIB   = libDump_Restore.$(SOEXT)
-
-          Thanks to Stephen Coy <stevec@magna.com.au> for reporting this.
-
-        * ace/Thread_Manager.cpp (find_hthread): Replaced the call
-
-          if (iter.next ()->thr_handle_ == h_id)
-
-          to
-
-          if (ACE_OS::thr_equal (iter.next ()->thr_handle_, h_id))
-
-          since the other one isn't portable to Pthreads.  Thanks to
-          Stephen Coy <stevec@magna.com.au> for reporting this.
-
-        * ace/Hash_Map_Manager.cpp: Removed the sentinel in the
-          Hash_Map_Manager.  Sentinels are evil since they require us to
-          hold write locks, even when we're doing finds!
-
-        * ace/ACE.cpp (max_handles): By default, we now try to use the
-          getrlimit() function before sysconf() since sysconf() doesn't
-          work "correctly" for NO _SC_OPEN_MAX (i.e., it just returns the
-          original value, which might have been changed by setrlimit().
-          What a pain...
-
-        * ace/ACE.cpp (max_handles): If FD_SETSIZE is enabled return
-          this as the number of handles.  This isn't perfect, but it's
-          probably better than returning -1.
-
-        * ace/Select_Reactor.cpp (open): Added a call to
-          ACE::set_handle_limit() if the requested size for the Reactor is
-          greater than the current max number of descriptors in the
-          process.  Also check to make sure that the user isn't ask for
-          more than the FD_SETSIZE.  Thanks to Neil Lavelle
-          <nlavelle@imcl.com> for motivating this.
-
-        * ace/Thread_Manager: Changed the name THR_FUNC to
-          ACE_THR_MEMBER_FUNC since it's now a global typedef on VxWorks
-          and we don't have to have clashes with other names.
-
-        * ace/Thread_Manager.h: There are mutually incompatible bugs with
-          VxWorks and MVS.  Therefore, we have to conditionally compile
-          the THR_FUNC differently for these two platforms.  Thanks to
-          Chuck Gehr <gehr@sweng.stortek.com> for reporting this.
-
-        * ace/OS.cpp (thr_create): Added a fix to set the Chorus stack
-          size correctly.  Thanks to Wei Chiang <chiang@tele.nokia.fi> for
-          reporting this.
-
-        * ace/OS.cpp: Added a new method ace_sysconf_dump() to dump the
-          state of the configuration.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for reporting this.
-
-        * ace/Singleton.cpp (dump): There was a typo in the dump() method
-          for ACE_TSS_Singleton, it should be
-          ACE_TSS_Singleton::instance_i().  I've fixed this.
-
-Thu Oct 23 23:19:24 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Filecache.cpp: Removed template method specialization of
-          shared_find.  No longer needed since Hash_Map_Manager has been
-          changed to no longer rely on sentinel_.
-
-        * ace/Thread_Manager.cpp (various):
-          Hacked 'til it compiled.  (Chased down syntax errors.)
-
-Thu Oct 23 22:52:17 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (shutdown_timer):
-          Added a line to call the cancel method on the timer queue task
-          when we are shutting down; this is wrapped around #if's to only
-          include this only when the platformm supports pthread_cancel().
-
-        * ace/Timer_Queue_Adapters.cpp (svc): Added some POSIX thread
-          cancellation points to make sure the mutex that the condition
-          variable uses is unlocked before the thread is cancelled.
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (list_timer):
-          Deleted unnecessary cancellation points.  Since we are not
-          blocking on a condition variable, we don't need to guard the
-          code.
-
-Thu Oct 23 22:07:03 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (wait_task,wait_grp): We should also
-          check for thread creation flags when collection information for
-          threads belong to this group and don't try to join those threads
-          created with THR_DETACHED or THR_DAEMON.
-
-Thu Oct 23 21:22:16 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ACE-INSTALL.html: Copied some documentation about makefile flags
-          from include/makeinclude/wrapper_macros.GNU and added a section
-          for this.
-
-Thu Oct 23 20:37:44 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Array.*: added ACE_Array_Iterator.
-
-Thu Oct 23 17:28:11 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Mem_Map.i (close_filemapping_handle): Moved this above its
-          uses in the file so that g++ would de-warn.
-
-Thu Oct 23 15:30:17 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Timer_Hash_T.h, Timer_Hash.cpp, Timer_Heap_T.h, Timer_Heap.cpp,
-          Timer_List_T.h, Timer_List.cpp, Timer_Queue_T.h, Timer_Queue.cpp,
-          Timer_Wheel_T.h, Timer_Wheel.cpp: Replaced all occurences of
-          ACE_HPUX_BROKEN_TEMPLATES with ACE_HAS_BROKEN_HPUX_TEMPLATES.
-
-Wed Oct 22 23:23:29 1997  Nanbor Wang    <nw1@COYOTE>
-
-        * ace/ACE_Library.*, ace_lib.dsp: Made naming convention uniform
-          for some less used ACE library.  They are called:  aced.dll,
-          ace.dll, aceud.dll, aceu.dll, acesd.lib, aces.lib, aceusd.lib
-          and aceus.lib.  If you are using ACE on NT, you know what they
-          mean.  ;-)
-
-Wed Oct 22 21:22:35 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Object_Manager.{h,cpp}: Added support for ACE_RW_Thread_Mutex
-          ACE_Singleton lock type.  Thanks to Nanbor for suggesting this,
-          because TAO needs it.
-
-          Also, removed at_exit registration of dynamically allocated
-          ACE_Static_Object_Lock because Object_Manager instance isn't
-          available for registration when it's created.  Instead, handle
-          this lock as a special case in the Object_Manager destructor.
-
-        * ace/Singleton.cpp,Object_Manager.cpp: check for shutting_down ()
-          as well as starting_up () when deciding whether to use a
-          preallocated lock.  Preallocated locks are not available at those
-          times.
-
-        * tests/Reactor_Performance_Test.cpp (client): removed declaration
-          of loop index "i" because it shadowed a local.  Also, the loop
-          index declaration caused a signed/unsigned comparison.
-
-        * ace/Singleton.cpp: temporarily disabled ACE_Guards until
-          the lock acquistion is fixed.
-
-Wed Oct 22 17:53:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Connector.cpp: In connect(), changed the
-          (local != ACE_Addr::sap_any) to be value comparison,
-          not pointer comparison.  Works on compilers which construct
-          temporaries when a const reference is passed (like HP aC++), and
-          also when a user passes an ACE_Addr which they construct to look
-          just like an ACE_Addr::sap_any.  Thanks to Stephen Coy
-          <stevec@magna.com.au> for finding this.
-
-Wed Oct 22 16:43:25 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (client): Corrected some code
-          that wasn't logical (but compiled!) in the connect_n() test.
-
-Wed Oct 22 13:27:47 1997  Douglas C. Schmidt  <schmidt@watusi.cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (client): Revised the
-          connection portion of this test to use the newly revised
-          connect_n() method on Connector.
-
-        * ace/Connector.cpp (connect_n): Revised the connect_n() method so
-          that it keeps track of which connections succeeded and which
-          failed.
-
-Wed Oct 22 07:23:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (getpgid): fixed (commented) ACE_TRACE identifer.
-          Thanks to Eric Newton <ecn@smart.net> for reporting this.
-
-        * ace/Singleton.{h,cpp},Object_Manager.{h,cpp}: moved
-          ace_singleton_lock_ to Object_Manager.  ace_singleton_lock_
-          was a static data member:  in addition to the usual troubles
-          associated with being a static, it was a static member of a
-          template class.  g++ can't handle those, so we used a local
-          static; initialization of that static was not thread safe.
-
-          The fix relies on knowledge from the Object_Manager about
-          whether the program is in static construction phase or not.
-          A critical assumption is that construction of static objects
-          does not spawn threads.  With that assumption, we know that
-          there is only one (main) thread in the program prior to the
-          Object_Manager instance being constructed.  At that time,
-          locking is not needed.  The ACE_{TSS_}Singleton::instance ()
-          methods rely on the state of the Object_Manager:  if it has
-          not been constructed yet, then they don't guard allocation
-          of their singleton instance.
-
-          The Object_Manager constructs four locks (of types ACE_Null_Mutex,
-          ACE_Thread_Mutex, ACE_Recursive_Thread_Mutex, and
-          ACE_RW_Thread_Mutex) for use only by ACE_Singleton classes.
-          After the Object_Manager has been constructed, ACE_{TSS_}Singleton
-          instantiations use one of those locks to guard their allocation of
-          a new instance, via double-checked locking.
-
-          This change has one impact, then:
-          ACE_{TSS_}Singleton users are limited to the following types
-          for their ACE_LOCK instantiation parameters:  ACE_Null_Mutex,
-          ACE_Thread_Mutex, ACE_Recursive_Thread_Mutex, and
-          ACE_RW_Thread_Mutex.  If another type is needed, it can be
-          easily added to the ACE_Object_Manager:  another overloaded
-          get_singleton_lock () function and preallocated lock would
-          have to be added.
-
-          As noted in Singleton.h, the best types of ACE_LOCKs to use
-          for instantiating ACE_Singleton are ACE_Recursive_Thread_Mutex
-          and ACE_Null_Mutex.
-
-          In addition to the above change, I made these two other
-          changes:
-          1) ACE_Static_Object_Lock::instance ():  dynamically allocate
-             a lock if the Object_Manager has not been constructed yet.
-             This approach replaces the static lock that was necessary
-             to allow the static services to be constructed.
-
-          2) Consolidated the singleton_ access in ACE_TSS_Singleton
-             via a singleton_i () internal accessor function.  Now,
-             ACE_TSS_Singleton looks just like ACE_Singleton.
-
-        * ACE-INSTALL.html: updated DEC CXX 6.0 build/test status.
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
-          (handle_timeout): convert arg to long if ACE_HAS_64BIT_LONGS.
-
-        * examples/Shared_Malloc/test_malloc.cpp (worker): convert arg to
-          long if ACE_HAS_64BIT_LONGS.
-
-        * examples/Timer_Queue/Driver.cpp (run_test,parse_commands):
-          added ACE_NOTREACHED.
-
-        * examples/Logger/simple-server/Logging_Handler.cpp (handle_close):
-          removed declaration of unused arg "mask".
-
-        * include/makeinclude/rules.local.GNU: added show_statics and
-          show_uninit targets.  They show the statics (that have static
-          destructor calls) and uninitialized data in the object files
-          in the current directory.  They work best (or at all) on object
-          files compiled by g++.
-
-Wed Oct 22 05:04:07 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.25, released Wed Oct 22 05:04:07 1997.
-
-Tue Oct 21 22:55:36 1997    <irfan@TWOSTEP>
-
-        * ace/WFMO_Reactor: Removed ACE_Event_Handler::CLOSE_MASK and the
-          explicit registration for the closing of sockets from
-          WFMO_Reactor.  This is essentially for compatibility with UNIX
-          programs.  UNIX does not have a CLOSE_MASK and the notification
-          of the closing of a socket is implicit in the socket becoming
-          read ready.  Therefore when you register for
-          ACE_Event_Handler::READ_MASK with WFMO_Reactor, you will
-          register for FD_READ and FD_CLOSE.  When FD_CLOSE is triggered,
-          handle_input() will be called on the Event_Handler.  As on UNIX,
-          read() will return 0 and the programmer will be able to tell
-          that the socket has actually closed down.
-
-          Arguably, this is lame for Win32 programmers as they have the
-          explicit close notification, but portability and existing code
-          base wins in this case.
-
-          One other change. When an event_handler returns -1 from the
-          callback, unbind() is called with ALL_EVENTS_MASK rather than
-          the NULL_MASK.
-
-          The upcall routine still needs to threat the two masks
-          separately. (FD_CLOSE | FD_READ) will not work as both maybe
-          simultaneously enabled. Therefore handle_input() maybe be called
-          twice (once for FD_READ and once for FD_CLOSE) unless the user
-          returns -1 from the first callback.
-
-        * ace/Event_Handler: Removed the CLOSE_MASK.
-
-        * examples/Logger/simple-server/Logging_Handler.cpp: Minor fixes.
-
-        * examples/Logger/Acceptor-server/server_loggerd.cpp: Minor
-          changes. No need to register the acceptor with the
-          Reactor. Acceptor::open() does that.
-
-        * examples/Reactor/ReactorEx/test_network_events: Removed the use
-          of CLOSE_MASK.
-
-        * tests/Reactor_Performance_Test: Removed the use of CLOSE_MASK.
-
-Tue Oct 21 21:48:54 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.[hi]: moved ACE_PTHREAD_CLEANUP_PUSH/POP definitions from
-          OS.i to OS.h.  Also, added #ifdef ACE_HAS_PTHREADS protection
-          before ! defined ACE_LACKS_PTHREAD_CLEANUP so that only PThreads
-          platforms need add ACE_LACS_PTHREAD_CLEANUP.
-
-        * tests/Notify_Performance_Test.cpp: added #include of
-          ace/Thread_Manager.h.  It's needed on OSF-1.
-
-Tue Oct 21 21:09:35 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp (ACE_MMAP_Memory_Pool): Oops.  Souldn't
-          access options when it is 0.
-
-Tue Oct 21 12:58:30 1997  Nanbor Wang   <nw1@CHA-CHA>
-
-        * ace/Log_Msg.{h,cpp}: (thr_desc):  Modified the method so it take
-          an extra argument of type ACE_Thread_Manager* and uses it to
-          block execution until thread manager release its lock.
-
-        * ace/Thread_Manager.{h,cpp} (acquire_release):  Added this new
-          method whose only function is to grab the thread manager's
-          lock.  This function ensure that a newly spawned thread won't
-          try to access its thread descriptor before it is fully built.
-
-        * ace/OS.cpp (inherit_log_msg): Modified to cache the thread
-          descriptor of spawned thread in TSS Log_Msg after it has been
-          created and block the execution of new thread until thread
-          manager releases the lock (i.e., fills in all the information.)
-
-        * ace/OS.h (ACE_Thread_Adapter):  Added one more argument of type
-          ACE_Thread_Descriptor* to the constructor with default value 0.
-
-        * ace/OS.cpp (invoke):  If the thread descriptor ptr is not zero
-          in thread arguemnt, then, we'll wait till the thread manger
-          fills in the formation and cache the value in TSS Log_Meg.
-
-        * ace/Thread_Manager (spawn_i):  Changed to pass in the thread
-          descriptor of the newly spawned thread to thread adapter so it
-          can cache it in TSS Log_Msg.  This must be created before
-          spawning the thread.  If all goes well, we'll need to append the
-          thread descriptor into the double-linked list in the thread
-          manager.
-          (append_thr):  Added a new argument of type Thread_Descriptor*
-          with default value 0.  If we pass in a thread descriptor,
-          append_thr won't try to create on itself.
-
-Tue Oct 21 21:34:35 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.24, released Tue Oct 21 21:34:35 1997.
-
-Tue Oct 21 14:14:33 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.h:
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
-          Use the typedef for Upcall to define the base Timer_Queue.
-          Input_Task inherits from ACE_Task_Base, no need for ACE_Task<>
-          here.
-
-Tue Oct 21 13:45:53 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/config-irix6.x-sgic++-nothreads.h: Added ACE_HAS_TERM_IOCTLS
-          for SGI.  Thanks to Jeffrey Peterson
-          <jpeterson@fallschurch.esys.com> for reporting htis.
-
-        * TAO/tests/Thruput_test/server.cpp (main): Changed BOA_init()
-          to POA_init().
-
-Tue Oct 21 12:58:30 1997    <nw1@CHA-CHA>
-
-        * ace/OS.h (ACE_SINGLETON_DECLARATION):
-          (ACE_SINGLETON_INSTANTIATION):
-          (ACE_SVC_SINGLETON_DECLARATION):
-          (ACE_SVC_SINGLETON_INSTANTIATION): Added these new macros.  Each
-          of them takes one argument which is the ACE_Singleton class.
-          All these craps are needed because MSVCs very kindly instantiate
-          the template codes for you.  This ends up producing two
-          ACE_Singleton objects, one in DLL and one in user program.  What
-          these macros do is to supress the template code instantiation in
-          user program and force compilers to instantiate these codes in
-          DLL.  On other platforms, these macros simply expand to empty
-          strings.   Here is a simple use case.  Say we have a class
-          called <foobar> which we want to make it a singleton using
-          ACE_Singleton template in our own DLL.  In file <foobar.h>, add
-          a line like this,
-
-             ACE_SVC_SINGLETON_DECLARATION (ACE_Singleton<foobar>);
-
-          and it will be expanded to suitabe code to export the class or
-          supress another template instantiation outside DLL depending on
-          whether ACE_BUILD_SVC_DLL is defined or not.  In file
-          <foobar.cpp>, add a line,
-
-             ACE_SVC_SINGLETON_INSTANTIATION (ACE_Singleton<foobar>);
-
-          at the end of the file to instantiate the template object in
-          DLL.  Notice that there is a bug in MSVC 4.2 and you'll have to
-          write up a DEF file to export the template interface
-          explicitly.
-
-          These macros should be integrated with the case when
-          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION but because of the VC
-          4.2's bug, it will cause too much trouble to export all these
-          symbols for external access.  Therefore, I'll leave them as they
-          are now.
-
-          BTW, these is no templatized singleton object within ACE that
-          needs to be exported at this moment.
-
-Tue Oct 21 07:14:24 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Svc_Conf_l.cpp: fixed compile warnings on g++.
-
-        * ace/Timer_{Heap,List,Wheel}_T.cpp: replaced NULL with 0 because
-          some compilers, such as GHS, define NULL as (void *) 0.  So, it
-          sometimes needs to be cast to be used.  Thanks to Brian Mendel
-          for reporting this.
-
-        * ace/Thread_Manager.cpp (wait): removed thr_yield () hack because
-          it's not needed with Nanbor's Thread_Manager fix.
-
-        * tests/test_config.h (ACE_END_TEST): removed sleep hack with
-          threading because it's not needed with Nanbor's Thread_Manager fix.
-
-        * include/makeinclude/platform_vxworks*.GNU: added VXWORKS=1 macro,
-          for use by individual Makefiles to suppress VxWorks builds.
-
-        * examples/System_V_IPC: suppress VxWorks builds because the builds
-          fail, and the examples wouldn't run anyways.
-
-        * netsvcs/lib/TS_Server_Handler.cpp: only instantiate
-          ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> if ! ACE_HAS_TLI
-          because without TLI, the instantiation is in
-          Client_Logging_Handler.cpp.
-
-        * examples/Shared_Malloc/test_persistence.cpp: added #include of
-          iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: removed
-          instantiation of ACE_TSS<ACE_Dynamic> because it is in
-          ace/Thread_Manager.cpp.
-
-Tue Oct 21 02:23:26 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.23, released Tue Oct 21 02:23:26 1997.
-
-Tue Oct 21 02:18:56 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * examples/Makefile: Things are happier now, so we've added back
-          the Timer_Queue directory to the Makefile.
-
-        * examples/Timer_Queue: Added lots of annoying template
-          specializations so that the timer queue tests now work with GCC.
-
-        * ace/Svc_Conf.l: Changed the regular expression for a
-          {string} so that it maches the null string (i.e., "").
-
-Tue Oct 21 01:07:58 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * examples/Timer_Queue:
-          Added documentation and fixed some warnings from the unused
-          arguments in some member functions.  Cleaned up some .h files of
-          unnecessary template instantiations.
-
-Tue Oct 21 01:01:12 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Thread_Manager.h: Added more comments.
-
-        * ace/Thread_Manager.{h,cpp}:  Added a parameter <size> to
-          Thread_Manager's constructor with default value 0.  This
-          parameter is currently unused and put in for backward
-          compatibility.
-          (open):  Putting back this method for backward compatibility.
-          This is currently a no-op.  Thanks to David for reporting this.
-          Also modify some mis-inform comments.
-
-Mon Oct 20 22:34:46 1997    <irfan@TWOSTEP>
-
-        * ace/OS.i (open): Moved Win32 specific errno mappings from open()
-          to ACE_FAIL_RETURN. Also updated the wide-character version of
-          open().
-
-Mon Oct 20 14:07:37 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/config-hpux-10.x.h: Added #define ACE_DEFAULT_BASE_ADDR
-          ((char *) 0x80000000) so that the various mmap() tests
-          will work on HP/UX.  Thanks to Stephen Coy <stevec@magna.com.au>
-          for reporting this.
-
-        * ace/OS.i: Fixed the implementation of ACE_OS::cond_timedwait()
-          so that it will work on VxWorks.  Thanks to David Levine for
-          chasing this down and doing most of the changes.
-
-        * ace/OS.h: Added a new special case for _KCC so that its
-          ACE_UNUSED_ARG will work properly.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for reporting this.
-
-Mon Oct 20 22:23:42 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/Sigset_Ops_Test.cpp (main): It is not legal too for
-          sigismember to return 0 if we pass an invalid signal to it.
-          Thanks to Stephen Coy <stevec@magna.com.au> for fixing this.
-
-        * Thread_Manager.*:  Replace the thr_table_ with a double-linked
-          list thr_list_.  With this change, we can cache the thread
-          descriptor entries in TSS area.  Then, when accessing thread
-          descriptor from a spawned thread's context, we don't have to
-          search thru the whole list in order to find the corresponding
-          thread descriptor.  Double-linked list and caching also make
-          adding/removing thread descriptor entries very fast.  At this
-          moment, we need to do a linear search when we try to access the
-          cached pointer the first time.  This overhead is expected to
-          removed shortly.  The will be some memory leaks at this moment
-          because I haven't implemented the code to clean up the list when
-          a thread manager gets deleted.  Will fix it soon.
-
-        * Log_Msg.{h,cpp}: Removed thr_state methods, variable, and thr_id
-          methods and variable and replace them with thr_desc which cache
-          the pointer to the thread descriptor structure.
-
-        * Containers.*: Added two new template classes
-          ACE_Double_Linked_List and ACE_Double_Linked_List_Iterator.
-          These two classes implement the very fundamental data structure
-          of double-linked list.  Although this is not actually a
-          container class, I couldn't find a better place to put these
-          classes.
-
-        * ace/Filecache.*
-        * ace/FIFO.*
-        * ace/FIFO_Send.*
-        * ace/FIFO_Recv.*
-        * ace/FIFO_Send_Msg.*
-        * ace/FIFO_Recv_Msg.*
-        * ace/Memory_Pool.* (ACE_MMAP_Memory_Pool_Options,
-          ACE_MMAP_Memory_Pool): Added one member variable to these class
-          so users can specify the LPSECURITY_ATTRIBUTES object they want
-          to use with them.
-          (map_file, init_inquire): Pass the security attribute to
-          underlying memory map object.
-
-        * ace/Mem_Map.* (ACE_Mem_Map, map, open, map_it): Added a new
-          function parameter LPSECURITY_ATTRIBUTES.  It will be passed
-          down to ACE_OS::mmap or ACE_OS::open.  This is only used on
-          Win32.
-
-Mon Oct 20 08:48:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h, config-hpux-10.x.h:  Added a new definition,
-          ACE_HAS_TIUSER_H_BROKEN_EXTERN_C - HP-UX's tiuser.h has
-          def for t_errno/_terrno() outside of an extern "C" block,
-          so in this case, wrap #include <tiuser.h> in our own
-          extern "C" block.  HP support call W3711856.
-
-Mon Oct 20 07:49:54 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile (TIMESTAMP): moved chmod after cvs commit.
-
-        * include/makeinclude/platform_sunos{4,5}_sunc++*.GNU: don't
-          create Templates.DB/Modules.DB, because that should have been
-          Module.DB, and it's not needed anyways.
-
-        * ace/config-vxworks-ghs-1.8.h: removed ACE_HAS_VERBOSE_NOTSUP.
-
-        * tests/run_tests.vxworks: re-enabled Buffer_Stream_Test now that
-          ACE_OS::cond_timedwait () is supported on VxWorks.
-
-        * examples/IPC_SAP/TLI_SAP/ftp-server.cpp (main): removed call
-          to ACE_Thread_Manager::open () because it no longer is available.
-
-Mon Oct 20 02:04:19 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.22, released Mon Oct 20 02:04:19 1997.
-
-Mon Oct 20 02:01:43 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * examples/Makefile: Removed the Timer_Queue directory from the
-          Makefile until Sergio has fixed all the examples for GCC.
-
-Sun Oct 19 21:15:10 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * examples/Timer_Queue: Added a new testing framework for
-          various types of ACE_Time_Queue usecases, e.g., threaded,
-          reactive, and asynchronous.
-          The new classes are:
-          <Timer_Queue_Test_Driver> which factors out the common code for
-            different type of Timer queue implementations, for example the parsing,
-            the input reading, and leaves the implementation of display_menu() for
-            example, to subclasses.
-          <Async_Timer_Queue_Test_Driver> the asynchronous version of the timer
-            queue, uses signals.
-          <Reactor_Timer_Queue_Test_Driver> implements the reactive timer queue
-            test driver using <ACE_Reactor>
-          <Thread_Timer_Queue_Test_Driver> the threaded implementation of the
-            timer queue.
-          <Command> this class is used to specify operations on the timer queue
-            independently of their implementation.  Thsi allows different
-            implementations of the timer queue to have different ways of
-            doing the operations without the base class having to know that.
-            See the Command pattern.
-          Added some helper functions into the <Input_Task> class.
-
-
-Sun Oct 19 18:07:31 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace: Added new config files for SCO OpenServer with a new initial scheme
-          to make config files:
-
-          - The config to SCO OpenServer has been changed to separate OS
-            specific flags, threads and compiler flags.
-
-          - For SCO OpenServer the base config file is config-sco-5.0.0.h
-
-          - Pthreads base files are config-fsu-pthread.h and
-            config-mit-pthread for FSU and MIT pthreads.
-
-          - The compiler file has been named config-gcc-2.7.2.h, this is
-            base config file for GNU gcc 2.7.2
-
-          To build a config file for SCO using GNU gcc 2.7.2 would be:
-
-          #include "ace/config-gcc-2.7.2.h"
-          #include "ace/config-sco-5.0.0.h"
-
-          We would obtain ACE config file for SCO OpenServer with GNU gcc
-          2.7.2 with no threads.  To build a config file for SCO using GNU
-          gcc 2.7.2 with FSU pthread would be:
-
-          #include "ace/config-gcc-2.7.2.h"
-          #include "ace/config-sco-5.0.0.h"
-          #include "ace/config-fsu-pthread.h"
-
-          Thanks to Arturo Montes <mitosys@colomsat.net.co> for these
-          changes.
-
-        * ace/OS.i (open): Modified ACE_OS::open() so that it sets errno
-          to EACCES when the requested file is in use.  Thanks to Edan
-          Ayal <edana@vdo.net> for reporting this.
-
-Sun Oct 19 17:55:34 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * etc/purify.solaris2: the contents of my ~/.purify file
-          for Solaris 2.x.  The ACE tests purify cleanly with it.
-
-Sun Oct 19 13:49:17 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * ace/Proactor.cpp:
-          The mutex vs lock name change strikes back, this time under NT.
-
-        * tests/Conn_Test.h:
-        * tests/Conn_Test.cpp:
-          The Svc_Handler was cached, but it had the default
-          handle_close() method, which destroys the object.  The new
-          version leaks a bit of memory, but it seems that it never
-          crashes.
-
-Sat Oct 18 09:13:29 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Synch_T.cpp (lock): Moved the frigging lock method of
-          Atomic_Op into the *.cpp file to work around bugs with earlier
-          versions of the horribleHP/UX C++ compiler.  Thanks to Neil
-          Cohen for reporting this.
-
-Sat Oct 18 07:43:29 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile (release): oops, removed "echo" that was used to
-          disable CVS commit, for testing.
-
-        * ace/Thread_Manager.{h,cpp},Object_Manager.{h,cpp}: moved
-          ace_thread_exit_lock_ to Object_Manager.
-
-        * include/makeinclude/rules.local.GNU: added $(TEMPLATE_REPOSITORY)
-          to OBJDIRS, so that individual platforms can add template
-          repository directories for creation.
-
-        * include/makeinclude/platform_sunos{4,5}_sunc++*.GNU: added
-          TEMPLATE_REPOSITORY with Templates.DB and Templates.DB/Modules.DB.
-          We can build without any warnings with Sun C++ now.
-
-Sat Oct 18 00:17:26 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.21, released Sat Oct 18 00:17:26 1997.
-
-Fri Oct 17 22:51:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Timer_Queue_Adapters.h:
-        * ace/Timer_Queue_Adapters.i:
-        * ace/Timer_Queue_Adapters.cpp:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Queue_T.i:
-        * ace/Timer_Queue_T.cpp:
-        * ace/Timer_List_T.cpp:
-        * ace/Timer_Wheel_T.cpp:
-        * ace/Timer_Hash_T.cpp:
-          Changed the accessor name for the lock_ field from mutex() to
-          lock(), we know this can cause trouble on HP-UX, but only if the
-          function is inline; so it was moved to the .cpp file.
-
-        * ace/Timer_Queue_Adapters.h:
-        * ace/Timer_Queue_Adapters.i:
-          Changed the method name from lock() to mutex(), this should
-          workaround a bug in the HP/C++ compiler.
-
-        * ace/Timer_Hash.cpp:
-        * ace/Timer_Hash_T.h:
-        * ace/Timer_Heap.cpp:
-        * ace/Timer_Heap_T.h:
-        * ace/Timer_List.cpp:
-        * ace/Timer_List_T.h:
-        * ace/Timer_Queue.cpp:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Wheel.cpp:
-        * ace/Timer_Wheel_T.h:
-          Workaround HP/C++ compiler bug, we cannot include the .cpp file
-          from the header file, but it must be included in the point of
-          instantiation.
-
-Fri Oct 17 18:34:00 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Atomic_Op.i (lock): Added an accessor to ACE_Atomic_Op to
-          return a reference to the underlying lock.  Thanks to Janusz
-          Stopa <jstopa@Bear.COM> for suggesting this.
-
-Fri Oct 17 15:36:26 1997    <nw1@CHA-CHA>
-
-        * ACE/config-win32-common.h: Added a directive to disable warning
-          of using Microsoft template instantiation control extension.
-
-Fri Oct 17 06:31:20 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Atomic_Op.i (operator=): rsh.value () instead of just rhs.
-
-        * Makefile (release): added ACE_VERSION string to ace/Version.h.
-          The MS Resource-Compiler doesn't implement the preprocessor
-          # operator, so ACE_VERSION supplies the concatenated version
-          string.  Thanks to Matthias for suggesting this.
-
-        * ace/Svc_Handler.{h,cpp},Object_Manager.{h,cpp}: moved
-          ace_svc_handler_lock_ to Object_Manager.  This lock was
-          created once per Svc_Handler instantiation.  It has been
-          replaced by a single lock for all instantiations.  That
-          shouldn't be a problem because there are so few Svc_Handler
-          instantiations, and the lock is only used for singleton
-          creation using double-checked locking.
-
-Fri Oct 17 01:19:35 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.20, released Fri Oct 17 01:19:35 1997.
-
-Fri Oct 17 00:05:55 1997    <irfan@TWOSTEP>
-
-        * ace/OS: Added ACE_Export to declarations to:
-          ace_mutex_lock_cleanup_adapter, ftruncate, ace_thread_adapter
-
-        * ace/OS.cpp (readv, writev): Moved ACE_Export directive from
-          OS.cpp to OS.i.
-
-        * ace/Atomic_Op (operator TYPE): operator TYPE() of Atomic_Op has
-          been deprecated and removed. Because both user-defined
-          conversions and user-defined operators were defined on
-          Atomic_Op, it was possible to get ambiguities between the
-          user-defined operators and the built-in operators. Therefore,
-          operator TYPE() has been removed and explicit accessor value()
-          has been added. Thanks to Stephen Coy <stevec@magna.com.au> for
-          suggesting this.
-
-        * ace/Atomic_Op (operator!=): Add new operator.
-
-        * tests/Atomic_Op_Test.cpp: Previously we had foo.operator== (5).
-          It was necessary to resolve the ambiguities between the
-          user-defined operators and the built-in operators. Since we have
-          removed the automagic type conversion, we can go back to writing
-          foo == 5.
-
-        * ACE: Atomic Op related minor changes:
-
-          ace/Malloc.cpp (dump):
-          tests/Future_Test.cpp (main):
-          tests/Reactors_Test.cpp (handle_input):
-          example/Threads/{future1.cpp future2.cpp manual_event.cpp task_two.cpp tss2.cpp}:
-          examples/Reactor/Misc/test_reactors.cpp:
-
-        * tests/Notify_Performance_Test.cpp:
-        * tests/Reactor_Performance_Test.cpp:
-
-          Moved explicit template instantiation code to ACE_HAS_THREADS
-          part for the test. Thanks to Stephen Coy <stevec@magna.com.au>
-          for pointing this out.
-
-Thu Oct 16 20:44:40 1997  James C Hu  <jxh@cs.wustl.edu>
-
-        * ace/Message_Block.cpp: Changed how continuations are released in
-          the Message_Block::release_i() method to use an iteration rather
-          than recursion.  This is to avoid a stack overflow problem
-          encountered by Janusz Stopa.
-
-        * ace/OS.cpp: Added ACE_Export to the declarations of ::writev and
-          ::readv.  These are emulation implementations for systems that
-          don't support them natively.  Was not being resolved correctly
-          on NT.  Hopefully this will fix it.  Fix suggested by Rob Head
-          (rhead@virtc.com).
-
-Thu Oct 16 14:21:34 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Proactor.cpp: Replaced #include "ace/Servie_Config.h" with
-          #include "ace/Object_Manager.h" for declaration of
-          ACE_Static_Object_Lock.
-
-Thu Oct 16 10:22:48 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Timer_Heap_T.h:
-          Fixed comment on the Heap_Iterator, it said "Iterates over an
-          <ACE_Timer_*Hash*_T>").
-
-Thu Oct 16 08:43:50 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (sema_trywait): on VxWorks only, fixed to set errno to
-          EBUSY if the semaphore couldn't be taken.  Thanks to Doug for
-          suggesting this fix.
-
-        * performance-tests/Misc/preempt.cpp (main): fixed program name.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: OCFLAGS instead of OFLAGS.
-
-        * tests/test_config.h (VxWorks): restored the removal of the log
-          file, because it again appears to be necessary.
-
-        * tests/run_tests.vxworks: updated VxWorks tests status.
-
-        * ace/OS.cpp,Token_Invariants.{h,cpp},Object_Manager.{h,cpp}:
-          moved ace_os_monitor_lock and ACE_Token_Invariants_Creation_Lock
-          to Object_Manager.
-
-Thu Oct 16 02:26:12 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.19, released Thu Oct 16 02:26:12 1997.
-
-Thu Oct 16 02:07:54 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Priority_Reactor_Test.cpp: Added a "max_retries" flag to
-          keep the test from hanging forever...  Thanks to Stephen Coy
-          <stevec@magna.com.au> for motivating this.
-
-        * tests/Priority_Reactor_Test.h: Changed
-
-          class Read_Handler : public ACE_Svc_Handler<<ACE_SOCK_Stream, ACE_INET_Addr, ACE_SYNCH>
-
-          to
-
-          class Read_Handler : public ACE_Svc_Handler<<ACE_SOCK_STREAM, ACE_SYNCH>
-
-          and the same for the Write_Handler.  Thanks to the ever vigilant
-          Stephen Coy <stevec@magna.com.au> for reporting this.
-
-Thu Oct 16 01:18:48 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.cpp (socket_init): Changed to use ACE_UNUSED_ARG.
-
-        * ace/SV_Semaphore_Simple.cpp (name_2_key): Explicitly cast the
-          return value to (key_t).  It was causing problem on Win32.
-
-Wed Oct 15 22:47:30 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/ACE.h:
-        * ace/ACE.cpp:
-          Added an implementation of the ISO 8802-3 standard 32 bits CRC,
-          but for strings only. The implementation was taken from the
-          FreeBSD code.
-
-        * ace/SV_Semaphore_Simple.cpp: Improved the hashing algorithm to
-          assign a "unique" key for semaphore keys using an string.  This
-          solves a problem detected by Mark L. Boriack
-          (Mark.L.Boriack@cpmx.saic.com): under OSF/1 the were too many
-          collitions with the default arguments for ACE_Process_Mutex.
-          Note that this is only a problem if no name is given to it.
-
-        * ace/Log_Msg.cpp: ACE_Log_Msg_message_queue_ was not initialized
-          in platforms without threads.
-
-        * ace/Containers.h: Added a duplicate ACE_Ubounded_Stack_Iterator
-          to the NANBOR_EXP_CHANGES block.
-
-        * ace/OS.h (ACE_DES_FREE_TEMPLATE): Removed unneeded concatenation
-          that was getting the HP/aCC compiler a bit confused. Thanks to
-          Stephen Coy <stevec@magna.com.au> for pointing out the problem
-          and then reminding me of actually adding the solution to ACE.
-
-Wed Oct 15 11:07:47 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/OS.i: Fixed the flock_trywrlock() and flock_tryrdlock() so
-          that they both set errno = EBUSY if they lock is already held.
-
-        * ace/OS.i (mutex_trylock): Make the VxWorks version consistent
-          with the other versions by returning -1 and setting errno to
-          EBUSY.  Thanks to David Levine for reporting this.
-
-        * ace/Synch.h: Updated the documentation to clarify what the
-          return value is from the tryacquire() methods.
-
-        * ace/OS.i (mutex_trylock): On NT, if we try to acquire a mutex
-          that's already locked we'll return -1 and set errno to EBUSY
-          rather than ETIME to be consistent with Pthreads.  Please see
-          the following entry to understand why this doesn't break
-          existing code ;-).
-
-        * ace/OS.h: Added a #define for EBUSY on NT.  We'll make it the
-          same as ETIME to avoid breaking existing code!
-
-        * tests/Process_Strategy_Test.cpp (main): Ignore SIGCHLD in the
-          child.
-
-Wed Oct 15 14:59:41 1997    <nw1@CHA-CHA>
-
-        * tests/run_tests.bat: Added Reactor_Performance_Test and
-          Notify_Performance_Test to one button test script.
-
-        * tests/tests.dsw: Added Reactor_Performance_Test.dsp and
-          Notify_Performance_Test.dsp.
-
-Wed Oct 15 07:21:05 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.{h,i},Version.h: added ACE version macros, and static
-          functions to access them in class ACE.
-
-        * Makefile (release): updates ace/Version.h based on contents of
-          VERSION.
-
-        * tests/Time_Value_Test.cpp:  added test of ACE version accessors.
-
-        * ace/OS.cpp,Object_Manager.cpp: changed ACE_TSS_CLEANUP_LOCK
-          from an ACE_Thread_Mutex to an ACE_Recursive_Thread_Mutex.
-
-        * ace/OS.h: define ACE_NOTREACHED as empty on DEC_CXX (and
-          on ghs instead of VXWORKS).
-
-        * tests/TSS_Test.cpp (worker): convert void *c to long if
-          ACE_HAS_64BIT_LONGS to avoid DEC cxx compiler warning.
-
-        * examples/Threads/thread_specific.cpp (worker): convert void *c
-          to long if ACE_HAS_64BIT_LONGS.  Changed name of "lock" to
-          "printf_lock" to avoid collision with lock () in DEC cxx
-          iostream.hxx.
-
-        * examples/threads/tss1.cpp: removed unused static "lock".
-
-        * examples/IPC_SAP/TLI_SAP/ftp-server.cpp (read_file): convert
-          void *fd to long if ACE_HAS_64BIT_LONGS.  And, put "n" in
-          ACE_UNUSED_ARG. (main): put "return 0" in ACE_NOTREACHED.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: minor cleanup, incl.
-          addition of -use_ld_input to SOFLAGS.
-
-        * include/makeinclude/platform_osf1_4.0_g++.GNU: added "c" to
-          ARFLAGS.
-
-        * tests/Future_Test.cpp,examples/Threads/future[12].cpp
-          (Method_Object_Name): removed extraneous ";" after function
-          definition.
-
-        * netsvcs/lib/Base_Optimizer.h: adding missing, default "public"
-          access specifier.
-
-        * apps/JAWS/Server/HTTP_Config.h: added "class" to friend HTTP_Config
-          declaration in HTTP_Config_Info.
-
-        * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: removed unused variable
-          "MAXLINE".
-
-        * examples/IPC_SAP/TLI_SAP/db-server.cpp (main): wrapped "return 0"
-          with ACE_NOTREACHED.
-
-        * examples/Reactor/Misc/test_timer_queue.cpp (handle_timeout):
-          convert void *arg to long if ACE_HAS_64BIT_LONGS.
-
-        * examples/Service_Configurator/IPC-tests/client/
-          local_fifo_client_test.cpp: removed unused variable BUF_LEN.
-
-        * examples/Shared_Malloc/test_persistence.cpp:
-          removed unused Employee ostream << operator.
-
-        * tests/Conn_Test.cpp: neutered Conn_Test on DEC_CXX.  It
-          doesn't build on DEC cxx 5.5 due to apparent template
-          instantiation problems.  Thanks to James Johnson for
-          reporting that.  And it doesn't terminate when built with
-          DEC cxx (beta) 6.0.
-
-        * ace/Thread_Manager.h: removed parens from (???) because
-          g++ got upset about encountering a trigraph.
-
-        * tests/{Notify,Reactor}_Performance_Test.cpp: added
-          ACE_UNUSED_ARG (handle).
-
-        * tests/Makefile,run_tests.sh: added Reactor_Performance_Test and
-          Notify_Performance_Test.
-
-        * tests/run_tests.vxworks: added test status of
-          Reactor_Performance_Test (doesn't appear to do anything,
-          but doesn't return) and Notify_Performance_Test (fcntl
-          not supported).
-
-Wed Oct 15 01:48:36 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Containers.{h,i,cpp}:
-        * ace/Thread_Manager.{h,i,cpp}:  Start modifying these files.
-          Will work on them for a day or two.  You guys shouldn't worry
-          about these changes affecting anything because I surround my
-          changes with #ifdef (NANBOR_EXP_CHANGES) my changes  #else
-          original codes #endif.  More details change log will be added
-          once I get them all working.
-
-Tue Oct 14 23:54:21 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.18, released Tue Oct 14 23:54:21 1997.
-
-Tue Oct 14 20:27:28 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * tests/Priority_Reactor_Test.cpp:
-          Added a debug message to find out who terminates the reactor
-          thread.
-
-        * tests/Priority_Reactor_Test.cpp:
-          The children could not connect sometimes, this will cause the
-          test to hang, waiting for those failed connections.
-          I added a simple exponential backoff strategy to retry
-          connections until they succeed.
-
-Tue Oct 14 17:48:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x-hpc++.h: Set ACE_LACKS_SIGNED_CHAR for
-          both C++ and aC++, not just C++.  Thanks to Stephen Coy and
-          David Levine for finding this.
-
-Tue Oct 14 03:26:17 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/OS.h: Moved <sys/types.h> to earlier in the file so that
-          u_int will be defined.  Thanks to Neil B. Cohen <nbc@metsci.com>
-          for reporting this.
-
-        * ace/OS.cpp (uname): Added a workaround for the fact that
-          Chorus doesn't support uname().  Thanks to Wei Chiang for
-          this fix.
-
-Tue Oct 14 08:02:20 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Managed_Object.{h,cpp} (ACE_Cleanup_Adapter): added virtual
-          destructor, needed by some compilers for vtable placement.
-          Thanks to Stephen Coy <stevec@magna.com.au> for this patch.
-
-        * ace/Svc_Conf_y.cpp: commented out unused args and wrapped
-          assignments in "if" conditionals to avoid g++ warnings.
-
-        * ace/Object_Manager.{h,cpp},Synch.{h,cpp}: moved
-          ACE_Static_Object_Lock from Synch.{h,cpp} to Object_Manager.{h,cpp}.
-          This allows it to be absorbed into the ACE_Object_Manager's
-          preallocated locks.  The ACE_Static_Object_Lock interface
-          isn't really needed any more, but has been kept for backward
-          compatibility.
-
-        * ace/Object_Manager.cpp: use a static ACE_Static_Object_Lock,
-          temporarily, because the ACE static services needs it.
-
-        * ace/Malloc.cpp,Reactor.cpp,Service_Repository.cpp: added
-          #include "ace/Object_Manager.h" for ACE_Static_Object_Lock.
-
-        * ace/Thread_Manager.h: moved ACE_Thread_Manager::THR_FUNC typedef
-          outside the class declaration to avoid compilation problems on
-          g++/VxWorks/i960 with -g.  THR_FUNC is only used by protected
-          ACE_Thread_Manager methods so this doesn't widen the public
-          interface.  Thanks to Aaron Valdivia <avaldivia@hns.com> for
-          reporting this and verifying the fix.
-
-        * tests/IOStream_Test.cpp (client): multiply floats by 1.0 instead
-          of 1 to avoid bad code generation on g++/VxWorks/i960.  Thanks to
-          Aaron Valdivia <avaldivia@hns.com> for reporting this.
-
-        * tests/Buffer_Stream_Test.cpp: removed unused static thread_manager.
-          It caused core dump during destruction of static objects with
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-
-        * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp (handle_timeout):
-          removed declaration of unused arg "tv".
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp (main):
-          removed declarations of unused args "argc" and "argv".  And,
-          updated template instantiations.
-
-        * ace/OS.h: use "complex" ACE_UNUSED_ARG for DEC_CXX.
-
-        * ace/Reactor.i (implementation): moved definition to top of
-          file to prevent use before definition.
-
-        * ace/ARGV.cpp (ACE_ARGV): removed extraneous ; function definition.
-
-        * ace/config-osf1-4.0.h: removed ACE_NEEDS_DEV_IO_CONVERSION.
-
-        * tests/Time_Value_Test.cpp: ACE_HAS_64BIT_LONGS instead of
-          ACE_HAS_64BIT_LONG.
-
-Tue Oct 14 03:13:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.17, released Tue Oct 14 03:13:38 1997.
-
-Tue Oct 14 03:10:00 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Service_Types.cpp (fini): Backed out the following change
-          until we figure out how to keep existing Svc_Handler code from
-          dying...  Thanks to Nanbor for reporting this.
-
-        * ace/Service_Types.cpp: Changed the implementation so that we
-          bypass the default cleanup originally done in
-          ACE_Service_Type_Impl::fini() and instead perform the cleanup in
-          ACE_Service_Object_Type::fini (void).  Thanks to Alex Chan
-          <Alex.Chan@Aspect.com> for reporting this.
-
-        * ace/Svc_Conf.y: Make sure that the Module has the same name as
-          the Module_Type object from the svc.conf file.  We need to do
-          this because the Stream_Type::fini() method removes each module
-          by the name given in the configuration file (stored in the
-          Module_Type object).  But the Stream::remove() method compares
-          this name against the name stored in the Module.  So the object
-          is deleted, but never removed from the list.  Another traversal
-          of the list causes a crash...  Thanks to Eric Newton for
-          suggesting this fix.
-
-        * ace/OS.cpp (invoke): Added call to AfxEndThread insides
-          ACE_TSS_Cleanup::exit() such that the same cleanup would not be
-          executed again when threads exit in ace_thread_adapter() in
-          OS.cpp.  Thanks to Alex Chan <Alex.Chan@Aspect.com> for
-          reporting this.
-
-        * ace/Service_Config.cpp (process_directives): Avoid reporting
-          lex/yacc leakage since there is nothing we could do about it.
-          Thanks to Alex Chan <Alex.Chan@Aspect.com> for reporting this.
-
-        * ace/Svc_Conf.y: Removed duplicate call to symbol() to avoid the
-          problem that dynamic service objects are created twice.  Thanks
-          to Alex Chan <Alex.Chan@Aspect.com> for reporting this.
-
-        * examples/Reactor/FIFO/client.cpp (main): Fixed the call to
-          fifo_sender.send () so that it passes msg rather than &msg.
-          Thanks to Sandro Doro <doros@aureus> for reporting this.
-
-Tue Oct 14 02:49:02 1997    <irfan@TWOSTEP>
-
-        * tests/Notify_Performance_Test.cpp: New performance test. This
-          test is used to time the notification mechanisms of the
-          ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be
-          tested. The notify() mechanism can also be tested with or
-          without data.
-
-        * tests/Reactor_Performance_Test.cpp: New performance test. This
-          test is used to time the dispatching mechanisms of the
-          ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be
-          tested.
-
-        * ace/Svc_Handler.cpp (shutdown): Change READ_MASK | WRITE_MASK to
-          ALL_EVENTS_MASK.
-
-        * ace/Atomic_Op (value): Added an explicit value accessor.
-
-Mon Oct 13 23:07:15 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Process_Strategy_Test.cpp (handle_signal): Removed the
-          ACE_DEBUG calls in the child reader signal handler.  This was
-          causing all sorts of random problems due to the asynchronous
-          nature of signals.  Thanks to David Levine for pointing this
-          out.
-
-Mon Oct 13 16:27:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tests/Priority_Reactor_Test.h:
-        * tests/Priority_Reactor_Test.cpp:
-          Fixed wrong header file, thanks to Irfan (irfan@cs.wustl.edu)
-
-        * examples/Shared_Malloc/test_persistence.cpp:
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
-          Added a couple of ACE_NOTREACHED, thanks to Torbjorn Lindgren
-          <tl@funcom.no> for pointing out this one.
-
-        * ace/Priority_Reactor.cpp:
-          Added some more template specializations.
-
-        * tests/Priority_Reactor_Test.cpp:
-          Fixed a number of bugs: hostname not initialized when creating
-          the server address.
-          The Svc_Handler base class should be instantiated using the
-          ACE_*_STREAM macros.
-          The code for non-threaded platforms was broken.
-          Thanks to Irfan <irfan@cs.wustl.edu>
-
-        * tests/Priority_Task_Test.cpp:
-          We use the new ACE_Sched_Priority_Iterator.
-
-        * include/makeinclude/platform_irix6.x-32_sgic++.GNU:
-        * include/makeinclude/platform_irix6.x-n32_sgic++.GNU:
-          Removed this old config files, they have been superseeded by
-          platform_irix6.x_sgic++.GNU.
-
-Mon Oct 13 15:41:32 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Select_Reactor.i, Priority_Reactor.i: Moved code for the
-          ACE_Event_Tuple struct from Priority_Reactor.i to Select_Reactor.i.
-
-        * ace/Priority_Reactor.cpp: added #include Malloc_T.h to build on AIX.
-
-        * ace/Synch_T.h, Timer_Queue_Adapters.h - added a template argument
-          to the non-ACE_HAS_TEMPLATE_TYPEDEFS, multi-threaded version of
-          the ACE_SYNCH_CONDITION macro - of the 3 possibilities for its
-          definition, this is the only case which requires a template
-          argument.  Timer_Queue_Adapters.h is the only user of the definition,
-          and it was changed to not supply the template argument.
-
-        * tests/Conn_Test.h:
-        * tests/Process_Strategy_Test.h: Added #include "ace/SOCK_Stream.h"
-
-Mon Oct 13 13:42:05 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp (svc):
-          Added a macro to define L_cuserid on Win32.
-
-Mon Oct 13 13:44:40 1997    <irfan@TWOSTEP>
-
-        * ace/Priority_Reactor: Fixed a gross violation of ACE coding
-          standard. Changed bucket to bucket_.
-
-Mon Oct 13 12:58:01 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i: moved ACE_OS::strcasecmp () definition after
-          ACE_OS::strlen () to prevent use before definition.
-
-        * ace/Priority_Reactor.i: reordered initializers to match
-          declaration order.
-
-        * ace/Sched_Params.i: reordered function definitions to prevent
-          uses before definitions.
-
-        * ace/Thread_Manager.cpp (ACE_Thread_Descriptor ctor): reordered
-          initializers to match declaration order.  (spawn_i): added
-          ACE_UNUSED_ARG (t_handle) without WTHREADS.
-
-        * ace/Thread_Manager.cpp (wait): moved all of the "join" block
-          inside the #ifndef VXWORKS so that it compiles on VxWorks.
-
-        * ace/Strategies_T.cpp (ACE_NOOP_Creation_Strategy<SVC_HANDLER>::
-          make_svc_handler): removed unused arg declaration to avoid
-          compiler warning.
-
-        * ace/Svc_Conf_y.cpp: commented out unused args and wrapped
-          assignments in "if" conditionals to avoid g++ warnings.
-
-        * tests/Priority_Reactor_Test.cpp (handle_input): added
-          ACE_UNUSED_ARG (h).
-
-        * examples/Connection/non_blocking/CPP-connector.cpp (handle_signal):
-          added ACE_UNUSED_ARG (signum).
-
-Mon Oct 13 03:25:45 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.16, released Mon Oct 13 03:25:45 1997.
-
-Mon Oct 13 03:18:33 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Thread_Manager.h: Removed the following code from
-          ACE_Thread_Control:
-
-          #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-          static ACE_Thread_Mutex ace_thread_lock_;
-          // Lock the creation of the Singleton.
-          #endif /* defined (ACE_MT_SAFE) */
-
-          What on earth was this doing here?!  Thanks to Stephen Coy
-          <stevec@magna.com.au> for reporting this.
-
-Mon Oct 13 00:10:00 1997    <irfan@TWOSTEP>
-
-        * tests/Atomic_Op_Test.cpp (main): Changed "foo == 5L" to
-          "foo.operator== (5L)" because the former was breaking some
-          compilers (e.g., HP/UX aCC).
-
-        * ace/Connector.h (open): Removed the defaults arguments since
-          some compilers complain about the two open()s being
-          indistinguishable.
-
-Sun Oct 12 23:51:57 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/{Synch_T,Atomic_Op}: All the relational operators should
-          return int (really return bool) rather than TYPE.
-
-Sun Oct 12 18:41:01 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * tests/Priority_Reactor_Test.cpp:
-          Added several missing template specializations.
-
-        * ace/Priority_Reactor.cpp:
-          Fixed typo (#pragme for #pragma).
-          Added several missing template instantiation.
-
-        * ace/Timer_Queue_Adapters.cpp:
-          The includes were missing and there was a minor syntax error.
-
-Sun Oct 12 16:16:15 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/ace_{dll,lib}.dsp: Added Timer_Queue_Adapters.cpp into
-          project files.
-
-        * tests: Added a new test Priority_Reactor_Test.
-
-        * ace/Timer_Queue_Adapters.{h,i}: Added or moved the line that
-          instructs edit mode to use on emace to the first line.  Also
-          added ACE_Export to classes in this file.
-
-        * ace/Timer_Queue_Adapters.cpp: Added proper inclusion of the
-          header file.  Corrected a syntax error.
-
-        * examples/Timer_Queue/Timer_Queue.dsw:  Added a new project
-          Thread_Timer_Queue_Test.dsp.
-
-        * tests/run_tests.{bat,sh}: Added MT_SOCK_Test and
-          Priority_Reactor_Test into one-buttoned test set.
-
-Sun Oct 12 16:53:32 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/examples/Service_Configurator/IPC-tests/server: Reformatted
-          and recommented the code a bit.
-
-        * ace/OS: Added 3 new ACE #defines:
-
-          #define ACE_ONE_SECOND_IN_MSECS 1000L
-          #define ACE_ONE_SECOND_IN_USECS 1000000L
-          #define ACE_ONE_SECOND_IN_NSECS 1000000000L
-
-          This is much easier to read than trying to keep track of the
-          000s!  Then, replaced all uses of the original values with the
-          new symbolic constants.
-
-        * ace/Timer_List.cpp: Removed an explicit template instantiation
-          of ACE_Async_Timer_Queue_Adapter<>.  Why was it here in the
-          first place?
-
-        * ace: Created a new group of Timer_Queue_Adapters files and moved
-          the Async and Thread adapters into this file. This reduces the
-          amount of coupling in the ACE library and removes problems with
-          circular includes.
-
-        * ace/Timer_Queue_T: Added a new ACE_Thread_Timer_Queue_Adapter,
-          which makes it possible to use a timer queue in a thread
-          automagically.  Thanks to Carlos O'Ryan for writing this.
-
-        * examples/Timer_Queue: Began to integrate Carlo's new thread
-          timer queue test.
-
-        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Changed the
-          timer queue from a Timer_List to a Timer_Heap.
-
-        * examples/Makefile (DIRS): Added Timer_Queue to the list of DIRS
-          to build.
-
-Sun Oct 12 16:45:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Sched_Params.h:
-          Added some comments.
-
-        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
-          Added some comments and template specializations.
-
-        * examples/Naming/Makefile:
-          There is no need to set LDLIBS to add local object files
-          anymore, using FILES is enough.
-
-Sun Oct 12 03:35:37 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * examples/Timer_Queue: Added a new directory for testing of
-          various usages of timer queue.
-
-        * tests/Async_Timer_Queue_Test: Moved to examples/Timer_Queue.
-          It doesn't really belong to tests/ directory.
-
-        * ace/ACE.cpp (register_stdin_handler): Must register the reactor
-          we are using to the event handler.
-          (read_adapter): Must notify the reactor when we are done with
-          handling stdin event.
-
-Sun Oct 12 00:26:56 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Makefile:
-        * ace/Priority_Reactor.h:
-        * ace/Priority_Reactor.i:
-        * ace/Priority_Reactor.cpp:
-          Augmentes Select_Reactor, adding priority based dispatching for
-          the I/O Event_Handlers, the only feature supported is
-          dispatching in the order defined by the priorities.
-          Each Event_Handler defines its priority, if the priority is out
-          of range the culprit is "punished" by dispatching at the lowest
-          priority.
-          Care has been exercised to avoid dynamic memory allocation.
-
-        * tests/Makefile:
-        * tests/Priority_Reactor_Test.h:
-        * tests/Priority_Reactor_Test.cpp:
-          Added small tests of the Priority_Reactor, the test runs an
-          Acceptor on the main thread and creates several threads (or
-          processes if the plaform does not support threads) that connect
-          to this Acceptor. The writing threads send several short
-          messages, the main thread receives them using one Svc_Handler
-          per writer, dispatched at different priorities.
-          The test itself is interesting, it shows how to write very
-          simple Svc_Handler, Connectors and Acceptors.
-
-        * ace/Select_Reactor.h:
-        * ace/Select_Reactor.cpp:
-          The dispatching of all the handles in a "group" (READ, WRITE or
-          EXCEPT) was encapsulated in a single routine.
-
-        * ace/Malloc_T.cpp:
-          In the Cached_Allocator memory was allocated as an arrays of
-          char, it must be released the same way.
-
-        * ace/Sched_Params.h:
-        * ace/Sched_Params.i:
-          Added a new class (ACE_Sched_Priority_Iterator) to iterate over
-          the priorities.
-
-        * tests/Priority_Task_Test.cpp:
-          Added some comments.
-
-Sat Oct 10 16:23:49 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/SOCK_Connector_Test.cpp: Passes the test if the should-fail
-          non-blocking test fails for any reason - not limited to ECONNREFUSED
-          or ENOTCONN.
-
-Sat Oct 11 16:02:33 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.15, released Sat Oct 11 16:02:33 1997.
-
-Sat Oct 11 14:38:16 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/SOCK_Connector.cpp (complete): Fixed a typo with
-          ACE_NON_BLOCKING_BUG_DELAY.  Thanks to John Zeb Dhom"
-          <zeb@ibm.net> for reporting this.
-
-        * tests/MT_SOCK_Test.cpp (client): Slightly revised the client
-          function so that it doesn't try to use non-blocking connects if
-          it's on a Win32 platform that has bugs with non-blocking
-          connects.
-
-        * ace/SOCK_Connector.cpp: It appears that connect() can set the
-          ETIMEDOUT errno if the connection times out (whatever that
-          means).  Therefore, I need to check for that errno, rather than
-          ETIME after calling connect().
-
-        * tests/SOCK_Connector_Test.cpp: Added a check for ETIMEDOUT
-          since this appears to be set by some platforms (e.g.,
-          SGI).
-
-Sat Oct 11 02:52:10 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.14, released Sat Oct 11 02:52:10 1997.
-
-Sat Oct 11 02:10:29 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * examples/Logger/simple-server/Makefile:
-        * examples/Mem_Map/IO-tests/Makefile:
-        * examples/Reactor/Multicast/Makefile:
-        * examples/Service_Configurator/Misc/Makefile:
-          Fixed some more problems with the Makefiles for binaries; I took
-          the chance and added RCS ids on the Makefiles
-
-Fri Oct 10 18:39:39 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Service_Config_Test.cpp: Moved the static member function
-          called cleanup() out into a stand-alone extern "C" function
-          called test_singleton_cleanup() to workaround MVS C++ compiler
-          bugs.  Thanks to Chuck Gehr for reporting this.
-
-        * ace/Task.cpp: Solved the age old MVS C++ problem where we can't
-          register C++ static member functions as C callback functions.
-          The solution here was to create a C wrapper to do the callback.
-          Thanks to Chuck Gehr for reporting this.
-
-        * tests/Service_Config_Test.cpp: Made the destructor of
-          Test_Singleton public to work around bugs with the MVS C++
-          compiler.  Thanks to Chuck Gehr for reporting this.
-
-        * ace/ACE,
-          ace/Proactor,
-          ace/SOCK_Connector,
-          ace/SPIPE_Connector,
-          ace/Acceptor,
-          tests/Conn_Test: Changed ETIMEDOUT errno to ETIME errno to be
-          consistent throughout ACE.  There should be no uses of
-          ETIMEDOUT in ACE or the test apps and examples.
-
-        * ace/ACE.cpp (handle_timed_complete): Only assume that we've
-          timed out if the return value from select() == 0 *and* the
-          timeout value isn't NULL...
-
-        * ace/Object_Manager.h: Replaced the use of ACE_MT() in the header
-          file with a #ifdef.  This solves problems that arise when ACE_MT
-          is defined as "nothing" when MT_SAFE is not defined. As a code
-          which has "ACE_MT();" becomes just ";" and fail to compile.
-          Thanks to Avraham Nash <ANash@Engagetech.com> for reporting
-          this.
-
-Fri Oct 10 19:55:50 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * examples/ASX/CCM_App/Makefile:
-        * include/makeinclude/rules.bin.GNU:
-          I have re-applied Steve Huston changes from Oct 01, the change
-          was (IMHO) useful and made compilation cleaner.
-
-        * examples/ASX/Event_Server/Event_Server/Makefile:
-          Fixed problem that made compilation fail.
-
-Fri Oct 10 19:52:44 1997    <nw1@CHA-CHA>
-
-        * ace/OS.h:
-        * ace/Connector.cpp:
-        * ace/SOCK_Connector.cpp: Added new #define
-          ACE_NON_BLOCKING_BUG_DELAY and replace their uses from some
-          magic numbers to this constant.
-
-Fri Oct 10 19:27:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/rules.bin.GNU
-          examples/ASX/CCM_App/Makefile
-             Removed the changes to these files added Oct 01.
-
-Fri Oct 10 15:21:07 1997    <irfan@TWOSTEP>
-
-        * examples/Connection/non_blocking/CPP-connector.cpp
-          (disconnecting): Remove this method. It was not being used. Also
-          rewrote some parts of handle_close to make the code simple.
-
-        * ace/Connector.cpp (create_AST): The register_handler() method
-          now needs to explicitly be given the handle to wait on. This is
-          because the get_handle() method of Connector has been
-          depricated.
-
-        * examples/Connection/non_blocking/test_sock_connector.cpp (main):
-          Since this test waits on the STDIN handle to become ready, we
-          have to make sure that the WFMO_Reactor is used on Win32. This
-          is necessary since select() on NT does not support waiting on
-          STDIN.
-
-        * examples/Connection/non_blocking/CPP-connector.cpp (open): On
-          Win32, the std handle must be registered directly (and not as a
-          socket).  On non-Win32, the std handle must be registered as a
-          normal handle with the READ mask. Since on Win32, STDIN is used
-          directly as an waitable handle, handle_signal will be called
-          instead of handle_input. Therefore, we had to add handle_signal
-          to the event_handler.
-
-Fri Oct 10 15:16:47 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/WFMO_Reactor.{h,cpp}:
-        * ace/Select_Reactor.{h,cpp}:
-        * ace/Reactor_Impl.h:
-        * ace/Reactor.h:  Added 2 new functions in ACE_Reactor class so we
-          can replace the signal handler and timer queue the reactor is
-          using.  Notice that you should do this before you start the
-          reactor, otherwise, you may loose your scheduled timed events.
-
-Fri Oct 10 14:49:40 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * bin/man2html: Added a new set rul -e 's/^$/<P>/g', which
-          correctly preserves paragraph boundaries.  Regenerated all of
-          the ACE html documentation so that it is much better formatted.
-
-Fri Oct 10 11:08:02 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tests/run_tests.sh:
-          We remove the log file before running a test, we also check for
-          the log file existance before running run_test.check on
-          it. Thanks to Dean Clamons <dean@n5170a.nrl.navy.mil> for
-          helping us with this.
-
-        * tests/run_tests.check:
-          IRIX egrep does not support -q, we redirect the output the
-          /dev/null instead.
-
-Fri Oct 10 01:46:07 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.13, released Fri Oct 10 01:46:07 1997.
-
-Thu Oct  9 22:23:56 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: Moved the explicit template
-          instantiations for ACE_Unbounded_Queue out of the complicated
-          #ifdef since we also want this to compile even if we don't have
-          threads.
-
-        * tests/MT_SOCK_Test.cpp: Revised the code so that it uses
-          processes on UNIX rather than threads.
-
-        * tests/SOCK_Test.cpp (spawn): Cleaned up the code to make it
-          correct.
-
-        * ace/Get_Opt.cpp (ACE_Get_Opt): Changed the third argument to the
-          ACE_Get_Opt constructor be changed from `char *' to `const char
-          *'.  Thanks to Eric Newton for suggesting this.
-
-Thu Oct 09 18:43:14 1997    <irfan@TWOSTEP>
-
-        * ace/Strategies_T.cpp (connect_svc_handler): Added
-          synchronization to the method as the setting of the in_use bit
-          in the service handler must be done atomically with the finding
-          and binding of the service handler in the cache.
-
-        * tests/Conn_Test.cpp (client_connections): Added multithreading
-          to the test in order to test out the new MT features of the
-          Connector.
-
-        * ace/OS.cpp (invoke): Somehow there was a bug introduced in
-          ACE_Thread_Adapter::invoke where the user entry point was being
-          called twice!
-
-Thu Oct 09 17:54:31 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.12, released Thu Oct 09 17:54:31 1997.
-
-Thu Oct  9 17:46:59 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp:
-          Added explicit instantiation of
-          ACE_Unbounded_Queue_Iterator<ACE_Thread_Descriptor>, it seems to
-          be needed on Linux and other platforms; thanks to Huiying Shen
-          <shen@environ.org> for pointing out this one.
-
-        * ace/OS.h:
-        * ace/OS.i:
-          Reverted the change that added support for
-          pthread_setconcurrency on IRIX, the function was supposed to be
-          undocumented, but present on the libraries, I could not find it
-          in any of the SGI machines we have access to.; not even
-
-        * ace/Thread_Manager.cpp:
-          On IRIX/SGIC++ we need to instantiate ACE_Node too.
-
-        * ace/SOCK.h:
-          Moved the open() method to the public interface, it is used by
-          ACE_SOCK_Connector.
-
-Wed Oct  8 20:01:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/SOCK_Connector: Modified the ACE_SOCK_Connector so that it
-          doesn't maintain state and doesn't inherit from ACE_SOCK.
-          Therefore, we can have multiple threads using the same
-          ACE_SOCK_Connector simultaneously without any reentrancy
-          problems.
-
-        * ace/SOCK.h: Moved the open() method into the public part of the
-          class so it can be used in ACE_SOCK_Connector::connect().
-
-        * ace/Connector.h: Removed the this->connector_ from the
-          ACE_Connector class in order to make this pattern work correctly
-          with multi-threaded programs.  Also removed the connector()
-          accessor (which was never useful anyway).
-
-        * ace/SOCK.cpp (open): Explicitly test setsockopt() for -1 in case
-          of failure.
-
-        * tests/SOCK_Test.cpp (server): Revised this test to reflect the
-          fact that it doesn't iterate, but only runs one client and one
-          server.
-
-        * tests: Added a new test for multi-threaded sockets called
-          MT_SOCK_Test.cpp.  Thanks to Bob Laferriere
-          <laferrie@gsao.med.ge.com> for motivating this test.
-
-Wed Oct  8 12:09:46 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.i (strcasecmp): Oops, we forgot to compare the strlen
-          first.  Thanks to Murphy Ivan <Ivan.Murphy@med.siemens.de> for
-          fixing the bug.
-
-        * ace/OS.h: Added THR_DAEMON macro definition for Win32 (et. al.?)
-          to avoid compilation error.
-          Removed ACE_HAS_BROKEN_TEMPLATE_DESTRUCTOR and related macros.
-
-Wed Oct  8 09:52:20 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Parse_Node.cpp:
-          Fixed the minor syntax error *again*.
-
-Tue Oct  7 17:10:51 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/Token_Manager.cpp:
-          Added a defined(ACE_MT_SAFE) protection around the lock creation
-          on ACE_Token_Manager::instance(), otherwise it would not work on
-          platforms without threads. Thanks to "Neil B. Cohen"
-          <nbc@metsci.com> for pointing this one out.
-
-Tue Oct  7 07:07:45 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Parse_Node.cpp (symbol): Added an ACE_ERROR_RETURN instead
-          of an ACE_RETURN to bail out if an error occurs.  Thanks to Eric
-          Newton for reporting this.
-
-Tue Oct  7 10:57:48 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/OS.h:
-          Added a prototype for pthread_setconcurrency when
-          ACE_HAS_IRIX62_THREADS is defined. This function is undocumented
-          but was needed by some users.
-
-        * ace/Parse_Node.cpp:
-          Fixed a minor syntax error.
-
-Tue Oct 07 06:58:40 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.11, released Tue Oct 07 06:58:40 1997.
-
-Tue Oct  7 02:51:55 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/TSS_Test.cpp (main):
-        * tests/Task_Test.cpp (main):
-        * tests/Barrier_Test.cpp (main): Removed thread_handles[] since we
-          don't need to join the thread explicitly anymore.
-
-        * ace/Thread_Manager.{h,cpp}:  Added an ACE_Unbounded_Quque to
-          collect terminated threads so that we can later join the threads
-          automatically by issuing a ACE_Thread_Manager::wait().  Some
-          typos are also fixed.  Next step will be to replace current
-          thr_table_ with a hash table and store an index to this table
-          in TSS.
-
-Mon Oct  6 22:16:45 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Thread_Manager: Added a new task() method to
-          ACE_Thread_Manager that returns a pointer to the current
-          ACE_Task_Base we're executing in if this thread is indeed
-          running in an ACE_Task_Base, else return 0.  Thanks to Ari Erev
-          <ari_erev@icomverse.com> and John Neystadt for suggesting this.
-
-        * ace/Thread_Manager: Moved the task_ pointer from the public part
-          of the ACE_Thread_Descriptor class into the private part of the
-          class and added an inline accessor instead.
-
-        * ace/{Parse_Node.{h,cpp},Svc_Conf.y}: Added support to enable
-          dynamically allocate objects from factory functions that have
-          been pre-registered with the Service Configurator instead of
-          relying on dynamic loading.  The new config file syntax would be
-          (note the colons):
-
-          dynamic joe Service_Object * : make_queue() active
-          dynamic bob Service_Object * : make_queue() active
-
-          Functions are found in the list of statically defined functions
-          for static services.  Thanks to Eric C. Newton <ecn@smart.net>
-          for this fix.
-
-Mon Oct  6 13:00:19 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/CORBA_Handler.cpp: Removed the use of reactor_ in the .cpp
-          file too; we are using the ACE_Event_Handler reactor_ (which is
-          a base class).
-
-Sat Oct 04 17:40:30 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.10, released Sat Oct 04 17:40:30 1997.
-
-Sat Oct  4 11:57:25 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * apps/Orbix-Examples/Event_Comm/{Supplier,Consumer}/Makefile:
-          Changed a typo where /src/ was being used instead of /libsrc/.
-          Thanks to Jean-Marc STRAUSS <strauss@objectif.fr> for reporting
-          this.
-
-        * examples/Connection/non_blocking/CPP-connector.cpp (init):
-          Removed the initialization of the local address.  This is
-          error-prone and confusing to use.  Thanks to Huiying Shen
-          <shen@environ.org> for reporting this.
-
-        * ace/SV_Semaphore_Simple: Added support for IPC_EXCL in order to
-          determine, upon creating the semaphore, if it already exists
-          (which means a bad key was selected), another daemon is still
-          running or the previous daemon didn't remove its resources.  I
-          have this implemented now by first opening the semaphore and if
-          that fails then creating it.  To support this, added another
-          enum, ACE_EXCL = IPC_EXCL, to the class header.
-          Also, changed the ACE_SV_Semaphore_Simple::open( key_t, ... )
-          method to use
-
-          if (ACE_BIT_ENABLED (flags, IPC_CREAT))
-
-          rather than
-
-          if (flags == IPC_CREAT)
-
-          Thanks to Michael McKnight <mcknight@signalsoftcorp.com> for
-          reporting this.
-
-        * ace: Replaced all uses of the template param LOCK with ACE_LOCK
-          to avoid conflicts with some systems that have a macro named
-          LOCK.
-
-        * ace/IOStream_T.h: Added ACE_LACKS_ACE_IOSTREAM to the
-          IOStream_T.* files.  Thanks to Torbjorn Lindgren <tl@funcom.no>
-          for reporting this.
-
-        * ace/{Proactor,Service_Config,ACE_Sig_Handler}: Removed the use
-          of sig_atomic_t as a return type.  Thanks to Torbjorn Lindgren
-          <tl@funcom.no> for reporting this.
-
-Sat Oct 04 03:14:46 1997    <irfan@TWOSTEP>
-
-        * ace/WFMO_Reactor.cpp (add_network_events_i): While looking
-          through all entries in the current (and suspended) handles for a
-          matching handle, we need to skip those that have been scheduled
-          for deletion). Also changed ACE_BIT_STRICTLY_ENABLED to
-          ACE_BIT_ENABLED.
-
-        * ace/Select_Reactor.cpp (bit_ops): Since CONNECT is no longer a
-          logical OR of READ and WRITE, we have to explicitly make sure
-          that enable the handle in the correct wait sets.
-
-        * ace/Event_Handler.h: Changed the values of the event
-          masks. CONNECT is no longer a logical OR of READ and WRITE. It
-          was its own unique value.
-
-        * ace/OS.h: Removed ACE_BIT_STRICTLY_ENABLED. It did not do what I
-          thought it would do.
-
-        * ace/Connector.cpp (handle_output): Added code that tries to find
-          out if the reactor uses event associations for the handles it
-          waits on. If so we need to reset it. This is necessary for
-          asynchronous connects.
-
-        * ace/SOCK_Connector.i (reset_new_handle): Added new method on all
-          connectors to reset event associations of handles.
-
-Fri Oct 03 21:20:26 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: disable INSTALL in $(ACE_ROOT)/ace Makefile,
-          because it's not needed and it creates circular symlinks when
-          the library build fails.
-
-Fri Oct  3 11:39:45 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Thread_Manager: Added a new flags_ field to
-          ACE_Thread_Descriptor and changed the insert_thr() and
-          append_thr() methods to update this flag so that we can keep
-          track of whether the thread was created "detached" or not.
-
-        * ace/Reactor.cpp (event_loop_done): Replaced the use of
-          sig_atomic_t with int to workaround bugs with KAI C++.  Thanks
-          to Torbjorn Lindgren <tl@funcom.no> for reporting this.
-
-        * ace/CORBA_Handler: Removed the reactor() accessors since they
-          are subsumed by the methods in ACE_Event_Handler.  Thanks to
-          Jean-Marc STRAUSS <strauss@objectif.fr> for reporting this.
-
-Thu Oct 02 15:38:34 1997    <irfan@TWOSTEP>
-
-        * Reactor: Renamed reset_new_handle to uses_event_associations.
-
-        * ace/FIFO_Recv.cpp (ACE_FIFO_Recv): aux_handle_ must correctly be
-          initialized to ACE_INVALID_HANDLE. Thanks to Sandro Doro
-          <doros@aureus> for reporting this.
-
-Thu Oct 02 11:21:37 1997  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_{aix aix4.2}.GNU: added the
-          shared_libs_only = 0 and static_libs = 1 settings since C Set++
-          builds the shared libs from the static.
-
-        * ace/OS.h: Removed spaces around '##' in ACE_DES_FREE_TEMPLATE macro.
-
-        * ace/Strategies_T.cpp: added #include "ace/Thread_Manager.h"
-
-        * ace/Managed_Object.h: Added <TYPE> template arg in the "unimplemented
-          function" section.
-
-Thu Oct 02 10:46:18 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Malloc.h: added some comments on rationale and use of
-          ACE_MALLOC_ALIGN.
-
-Wed Oct 01 19:08:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/rules.bin.GNU: correctly builds programs
-          with multiple object modules.
-
-        * examples/ASX/CCM_App/Makefile: needed some adjustment to work with
-          new rules.bin.GNU, above.
-
-Wed Oct 01 14:11:03 1997    <nw1@CHA-CHA>
-
-        * ace/Remote_Name_Space.cpp (resolve): We need to allocate one more
-          space than what strlen reports.
-
-Wed Oct 01 12:45:51 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.cpp (count_interfaces, get_handle): changed "unix" to
-          "__unix" because DEC CXX doesn't #define "unix".  Thanks to
-          Billy Quinn <bquinn@lads.com> for reporting this.
-
-        * ace/High_Res_Timer.h: added comment from Gabe
-          <begeddov@proaxis.com> about ACE_OS::gethrtime () drift on MP
-          machines.
-
-        * ace/OS.i (gethrtime, Solaris only): removed ACE_OSCALL_RETURN
-          wrapper around ::gethrtime () because it was broken (the type
-          was int) and not necessary (::gethrtime () should never fail),
-          so we can remove its overhead.
-
-        * tests/Time_Value_Test.cpp: undef ACE_NO_INLINE in the
-          ACE_U_LongLong test hacks.
-
-        * tests/SV_Shared_Memory_Test.cpp: delay construction of allocator
-          until first needed because it needs something that the
-          ACE_Object_Manager constructs.
-
-        * tests/run_tests.vxworks: added console printout before each test.
-
-Tue Sep 30 21:42:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.9, released Tue Sep 30 21:42:58 1997.
-
-Tue Sep 30 17:15:14 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Filecache.{h,cpp}: I removed the static locks in the
-          Filecache and made them local member objects.  Since Filecache
-          is usually a singleton, no more memory is required this way.
-
-        * tests/Hash_Map_Manager_Test.cpp: Added some code to test the
-          Hash_Map_Manager_Iterator.  This is to show Bob Laferriere that
-          it works.
-
-Tue Sep 30 13:41:14 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
-          (handle_input):
-        * examples/Reactor/ReactorEx/test_network_events.cpp (handle_input):
-        * examples/Logger/simple-server/Logging_Acceptor.cpp
-          (handle_input): Changed to use reset_new_handle () for querying
-          whether we need to reset handles or not.
-
-Tue Sep 30 08:35:15 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Atomic_Op.i: added CVS header.
-
-        * ace/Object_Manager.{h,cpp}: removed Filecache arrays, because
-          Filecache no longer needs them.
-
-        * ace/Filecache.{h,cpp}: removed unused static Filecache::lock_.
-
-        * tests/test_config.h: Added 1 second sleep to ACE_END_TEST to
-          allow all threads to terminate gracefully.
-          VxWorks only: removed the hack removal of the log file, because
-          it no longer appears to be necessary.
-
-        * tests/TSS_Test_Errno.h,TSS_Test.cpp: dynamically allocate
-          Errno::lock_ to try to avoid problem with cleanup of statics
-          on VxWorks.  It doesn't solve the problem, all of the time.
-          There are still statics in the ACE library, which could be
-          causing it.
-
-Tue Sep 30 01:35:28 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Naming_Context.cpp (close, close_down): Separated these two
-          functions calls.  Close now only release the name_space_
-          resource and close_down release all resources.  Close should be
-          use when changing the name_space.
-
-Mon Sep 29 22:29:46 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Strategies_T.cpp (accept_svc_handler ):
-        * ace/Service_Manager.cpp (handle_input):
-        * ace/Acceptor.cpp (handle_input, accept_svc_handler): Changed to
-          use reset_new_handle () for querying whether we need to reset
-          handles or not.
-
-        * ace/Reactor.{h,i} (reset_new_handle):
-        * ace/Reactor_Impl.h (reset_new_handle):
-        * ace/Select_Reactor.{h,i} (reset_new_handle):
-        * ace/WFMO_Reactor.{h,i} (reset_new_handle): Added this new method
-          so we can determine whether the implementation of the reactor
-          requires us to decouple the event a handle inherit from accept.
-          This scheme doesn't depend on the RTTI support of compilers.
-          Thanks to Irfan for the tips.
-
-Mon Sep 29 21:28:02 1997    <irfan@TWOSTEP>
-
-        * ace/Synch (ACE_Recursive_Thread_Mutex): Methods were added to
-          ACE_Recursive_Thread_Mutex so that it has a consistent interface
-          with other locking mechanisms.  Thanks to Phil Logan
-          <phill@in.ot.com.au> for submitting these changes.
-
-Mon Sep 29 13:28:05 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (thr_setconcurrency): added support on Irix 6.x, using
-          its ::pthread_setconcurrency ().  Thanks to Felix Popp
-          <fxpopp@immd9.informatik.uni-erlangen.de> for letting us know
-          about this Irix 6.2/3 system function, and for testing it out.
-
-        * ace/ACE.cpp (handle_timed_complete) force recv check on VxWorks
-          because its read handle is always not set.  Thanks to Steve for
-          helping track down the problem.  We might want to consider doing
-          it this way on Unix platforms, as well, according to Steve.
-
-        * apps/JAWS/server/HTTP_Server_T.cpp (accept): fixed typo,
-          "remote_address" instead of "remote_adrress".
-
-        * tests/Time_Value_Test.cpp (test_ace_u_longlong): replaced
-          ACE_ASSERTs with calls to a static function that prints out
-          why the test failed.  Also, disabled test of ACE_U_LongLong
-          if ACE_HAS_64BIT_LONG.
-
-        * ace/OS.h: 1) Use u_long for ACE_hrtime_t if ACE_HAS_64BIT_LONGS.
-          2) Added ACE_NO_INLINE support to allow wrapper_macros.GNU to
-          disable inlining from the command line.  3) Added
-          ACE_HAS_VERBOSE_NOTSUP support.
-
-        * include/makeinclude/wrapper_macros.GNU: added "inline" flag to
-          allow enabling/disabling of inlining from the command line or
-          platform_macros.GNU.
-
-        * ace/config-vxworks*.h: added ACE_HAS_VERBOSE_NOTSUP.
-
-Mon Sep 29 11:15:10 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.h (ace_cleanup_destroyer): Made this an export function.
-
-Sat Sep 27 17:04:48 1997    <irfan@TWOSTEP>
-
-        * ace/Reactor: Added new methods to be able to set and get the
-          implementation class being used by the reactor. The set method
-          is protected and should be used with care, specially while
-          changing the implementation class midway through an
-          application. Also both the methods are virtual, and user can
-          subclass to change their behavior. The internal code of the
-          reactor also changed to now use these methods exclusively rather
-          than the the raw data variables.
-
-        * ace/Acceptor.cpp (handle_input): When using the WFMO_Reactor, we
-          need to reset the event association for the newly created
-          handle. This is because the newly created handle will inherit
-          the properties of the listen handle, including its event
-          associations. Therefore two changes were made:
-
-          - A new directive (flag) was added to all the acceptors
-            (LSOCK_Acceptor, SOCK_Acceptor, SPIPE_Acceptor, TLI_Acceptor,
-            and UPIPE_Acceptor) to reset the event associations of the
-            newly created handle. Currently only the SOCK_Acceptor pays
-            attentions to this directive, others just ignore it. This flag
-            had to be added to all the acceptors for interface
-            compatibility and also to make sure that the Acceptor template
-            code works correctly.
-
-          - A dynamic_cast was necessary to determine at run-time which
-            implementation of the Reactor we are using. But because this
-            code is limited to Win32, there should be no problems doing
-            the dynamic_cast.
-
-          The same thing as above needed to be done to:
-
-          - ACE_Accept_Strategy::accept_svc_handler (ace/Strategies_T.cpp)
-
-          - ACE_Service_Manager::handle_input (ace/Service_Manager.cpp)
-
-          - LOCK_SOCK_Acceptor::accept (apps/JAWS/server/HTTP_Server_T.h)
-
-          - Logging_Acceptor.cpp::handle_input (examples/Logger/simple-server/Logging_Acceptor.cpp)
-
-          - Network_Listener::handle_input (examples/Reactor/ReactorEx/test_network_events.cpp)
-
-          - Handle_R_Stream::handle_input (examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i)
-
-Sat Sep 27 20:03:29 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_sunc++_orbix.GNU:
-          Activated exceptions by default too, since they are used by
-          Orbix anyway.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-          Some libraries were missing and the locations were not
-          completely accurate.
-
-        * ace/config-sunos5.5-sunc++-4.x-orbix.h:
-          I let the MT Orbix as the default, since that is the
-          configuration here and that was implicit in the platform*.GNU
-          files.
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Added flags to the IDL compiler to emit support for both
-          CORBA::Any (-A) and the BOAImpl (-B) approach for the server
-          side implementations.
-
-        * ace/CORBA_Handler.cpp:
-          The full definition for Thread_Manager was missing, I added an
-          include for it.
-
-Sat Sep 27 07:59:18 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU,
-          platform_{chorus,lynxos,vxworks*}.GNU:
-          default to building shared libs only, except on Chorus,
-          LynxOS, and VxWorks.  While the "shared_libs_only=1" make
-          flag is still supported, it is no longer necessary because
-          it is the default.
-
-          To revert to the prior behavior of building both shared and
-          static libraries, add "static_libs=1" to either your make
-          command invocation or your include/makeinclude/platform_macros.GNU.
-
-Sat Sep 27 00:45:10 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * examples/OS/Process/README (imore):
-        * examples/OS/Process/Makefile:
-        * examples/OS/Process/imore.cpp:  Added a new example: imore.
-
-        * ace/SOCK_Stream.cpp (close, close_reader, close_writer): Moved
-          invalid handlers checking from close to close_reader and
-          close_writer.
-
-Fri Sep 26 14:28:36 1997  Nanbor Wang  <nw1@CHA-CHA>
-
-        * tests/SPIPE_Test.cpp:
-        * tests/Process_Strategy_Test: Changed the macro "ACE_LACKS_EXEC"
-          to "ACE_LACKS_FORK".
-
-        * ace/SOCK_Stream.cpp (close): Added checking for invalid handle
-          before shutting down the write end.
-
-Fri Sep 26 11:55:27 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Malloc.h: Use signed math in the preprocessor calculations
-          for ACE_CONTROL_BLOCK_ALIGN_LONGS (and all of its contributing
-          factors).
-
-        * ace/ACE.cpp: Fixed the TLI/BSD checks in handle_timed_complete.
-
-        * tests/SOCK_Connector_Test.cpp: Added ENOTCONN as a valid fail
-          condition (in addition to ECONNREFUSED).
-
-Fri Sep 26 05:11:40 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/SOCK_Acceptor.cpp (shared_accept): Made the newly added
-          WSAEventSelect code unreachable.  It caused several test program
-          hung when performing socket recieving.  Don't know why this is
-          happening.  According to the online manual, this should be the
-          right thing to do.  Some more Access Violations to be fix
-          tomorrow.  Oh, I mean, today.
-
-Fri Sep 26 01:22:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/OS: Made a few changes to OS.h and OS.i to stop compiler
-          warnings.  Thanks to Wei Chiang <chiang@tele.nokia.fi> for
-          reporting this.
-
-        * ace/config-chorus.h: Added ACE_LACKS_RLIMIT and removed
-          ACE_LACKS_SIGACTION.  Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for reporting this.
-
-        * ace/TLI_Connector.cpp (complete): Changed the call to
-          ACE::handle_timed_complete() to use the new parameter.
-
-        * ace/ACE: Added an extra parameter to the call to
-          ACE::handle_timed_complete() to indicate (at run-time) that this
-          is being called via a TLI interface.  Thanks to the
-          ever-vigilant Steve Huston for suggesting this.
-
-        * tests/SOCK_Connector_Test.cpp: "ACEified" the new test program.
-
-Thu Sep 25 23:27:38 1997    <irfan@TWOSTEP>
-
-        * ace/config-win32.h: Error in directives: it should be "Define
-          ACE_HAS_WINSOCK2 to 0 in your config.h file if you do *not* want
-          to compile with WinSock 2.0.". The typo was a 1 instead of the
-          0. Thanks to Gonzalo A. Diethelm <gonzo@ing.puc.cl> for pointing
-          this out.
-
-Thu Sep 25 20:33:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Message_Queue.h: Changed the *_i() methods to be virtual so
-          that we can change the queueing mechanism by subclassing from
-          ACE_Message_Queue.  Thanks to Eric Newton <ecn@smart.net> for
-          this suggestion.
-
-        * ace/Timer_List_T.cpp (ACE_Timer_List_Iterator_T): Changed
-          listParam to timer_list to keep programming style consistent...
-
-Thu Sep 25 17:06:42 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i - ACE_OS::cond_timedwait - HP's threads return
-          EAGAIN on timeout from pthread_cond_timedwait, so adjust that
-          to ETIME.
-
-        * tests/SOCK_Connector_Test.cpp - will now try to find another
-          host to run the connect to.  Won't try on Win32 or VxWorks
-          though.
-
-Thu Sep 25 15:25:53 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Object_Manager.cpp,OS.cpp: moved socket_init to Object_Manager
-          ctor and socket_fini to Object_Manager dtor, to be sure that
-          WinSock gets initialized early and closed late.
-
-        * ace/SOCK.{h,cpp}: removed dummy_ static now that the
-          Object_Manager initializes WinSock.
-
-          No, I'm not a Win32 wizard all of the sudden.  Thanks to
-          Irfan and Nanbor for directing these changes.
-
-        * tests/run_tests.vxworks: commented out tests that don't run
-          productively on VxWorks: SV_Shared_Memory_Test,
-          Reactor_Exceptions_Test, SPIPE_Test, and UPIPE_SAP_Test.
-
-Thu Sep 25 03:50:27 1997    <irfan@TWOSTEP>
-
-        * ace/OS.i (thr_getspecific): Must restore errno if no errors have
-          occured.
-
-        * ace/Log_Msg.cpp (close): Must close the message queue *before*
-          destruction since there is no destructor for the queue.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (fini): fini must close
-          and unregister the acceptor. Closing the socket is simply not
-          enough.
-
-Thu Sep 25 01:39:47 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Containers.{i,cpp}:  Commented out all ACE_TRACE macros in
-          ACE_Unbounded_Queue<T> so that they won't cause SIGSEGV when we
-          turn the tracing on.  Unbounded_Queue is used in Object_Manager
-          which must be initialize before most of other objects.
-
-Wed Sep 24 23:37:19 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.i (thr_getspecific): On NT, added check whether
-          ::GetLastError() is NO_ERROR when ::TlsGetValue() return 0.
-
-Wed Sep 24 13:37:02 1997    <irfan@TWOSTEP>
-
-        * ace/config-win32-common.h (ACE_LACKS_FORK): Added in macro to
-          distinguish between ACE_LACKS_FORK and ACE_LACKS_EXEC. Also
-          updated config-chorus.h, config-vxworks-ghs-1.8.h, and
-          config-vxworks5.x-g++.h.
-
-        * ace/OS.h (ACE_WIN32CALL_RETURN && ACE_WIN32CALL): Added new
-          macros to distinguish between Win32 calls that set GetLastError
-          and those that set errno. Also updated ACE_OSCALL_RETURN and
-          ACE_OSCALL such that they do not set errno to GetLastError. This
-          is because these calls automatically set errno.
-
-          Updates OS.* files to reflect these changes.
-
-        * ace/SOCK_Acceptor.cpp (shared_accept): Make sure to reset the
-          event association inherited by the new handle.
-
-        * ace/WFMO_Reactor.i (unbind): Added a check for invalid handles
-          being passed in for removals.
-
-Wed Sep 24 10:34:29 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/OS.h:
-          Under HP-UX and g++ <dl.h> must be included for dynamic loading,
-          not <cxxdl.h>; thanks to Warren Thompson (wthompson@altaira.com)
-          for helping us with this one.
-
-Wed Sep 24 09:36:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Managed_Object.{h,i},Object_Manager.{h,cpp}: removed
-          ACE_Managed_Object get_object () interface.  It wasn't
-          used anywhere; it was originally intended to support preallocated
-          objects but turned out to not be necessary.  I think that it would
-          be more useful to make it possible to instantiate
-          ACE_Managed_Object instead, and have it implicitly register
-          with the ACE_Object_Manager.
-
-        * ace/Timer_List_T.cpp (ACE_Timer_List_Iterator_T):
-          changed name of "list" argument ot "listParam" to resolve name
-          conflict with STL.  Thanks to Brian Mendel for reporting this.
-
-        * tests/run_tests.check: print out filename with error messages.
-
-Tue Sep 23 17:11:44 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/config-hpux-10.x-g++.h:
-          Added A ACE_LACKS_TIMESPEC_T, thanks to Warren Thompson
-          (wthompson@altaira.com) for this one.
-
-        * include/makeinclude/platform_hpux_gcc.GNU:
-          Added a -D_REENTRANT define, to enable reentrant methods, thanks
-          to Warren Thompson (wthompson@altaira.com) and Steve Huston
-          (shuston@riverace.com) for pointing out this.
-
-        * ace/config-hpux-10.x.h:
-          Added an small comment to clarify that DCE/threads must be
-          installed if threading is wanted, they are an optional product
-          for HP-UX.
-
-Tue Sep 23 10:13:57 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Select_Reactor.cpp: added #include of ace/Thread.h.
-          Thanks to Vladimir Schipunov <vlad@staff.prodigy.com> for
-          reporting this.
-
-        * ace/Object_Manager.cpp: added #include of ace/Malloc.h.
-          Thanks to Vladimir Schipunov <vlad@staff.prodigy.com> for
-          reporting this.
-
-        * ace/config-aix-4.1.x.h: added ACE_HAS_PTHREAD_T and
-          ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR #defines.
-          Thanks to Vladimir Schipunov <vlad@staff.prodigy.com> for
-          reporting the build problem on AIX 4.1, and to
-          Torbjorn Lindgren <tl@funcom.no> for providing these fixes.
-
-        * ace/Token_Manager.{h,cpp},Object_Manager.{h,cpp}:
-          preallocate ACE_Token_Manager creation lock.
-
-        * ace/Object_Manager.cpp: use ACE_Cleanup_Adapter<TYPE[COUNT]>
-          for preallocated arrays.
-
-Mon Sep 22 16:51:44 1997    <irfan@TWOSTEP>
-
-        * ace/OS.i (open): Changed code so that (_O_CREAT | _O_TRUNC)
-          means CREATE_ALWAYS. Thanks to Dave Brackman
-          (dbrackma@OhioEE.com) for pointing this out.
-
-Mon Sep 22 11:01:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/SOCK_Connector_Test.cpp, Makefile, run_tests.sh - added new
-          test to exercise ACE_SOCK_Connector focusing on fail conditions.
-
-Mon Sep 22 07:11:21 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Message_Block.cpp (clone): check this block's cont ()
-          instead of the new block's cont_ when cloning the continuation
-          messages.  Thanks to Eric Newton <ecn@smart.net> for tracking
-          down this problem with failing to clone continuation blocks,
-          and for providing the fix.
-
-        * ace/OS.{h,i} (ACE_U_LongLong): added operator!=, and made args
-          const to ctor, operator/, hi, and lo member functions.
-
-        * ace/Managed_Object.[hi]: renamed ACE_Managed_Cleanup to
-          ACE_Cleanup_Adapter because it doesn't implicitly register
-          itself with the ACE_Object_Manager.
-
-        * ace/ACE.cpp: moved ACE_Object_Manager_Destroyer to
-          Object_Manager.cpp because the ACE_Object_Manager should
-          always be linked into executables now, even if libACE is
-          statically linked.
-
-        * ace/Filecache.{h,cpp},Signal.{h,cpp} preallocate locks for
-          Filecache and Signal in ACE_Object_Manager.
-
-        * ace/Object_Manager.{h,cpp}: 1) renamed ACE_Managed_Cleanup to
-          ACE_Cleanup_Adapter.  2) Moved ACE_Object_Manager_Destroyer from
-          ACE.cpp to Object_Manager.cpp. 3) Added Filecache and Signal locks.
-
-        * ace/Singleton.*: removed instance (TYPE *) member function because
-          it wasn't being used.  And, it allows us to store the contained
-          instance_ as an object instead of a pointer, saving a dynamic
-          memory allocation on construction.
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU: added $(MUNCHED)
-          to PRELINK, to allow applications to add libraries or object
-          files to be munched.
-
-        * ace/stdcpp.h: stdarg.h must be #included before stdio.h on LynxOS.
-
-Sat Sep 20 17:32:23 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Object_Manager.{h,cpp},Managed_Object.*,
-          CORBA_Handler.{h,cpp},Dump.{h,cpp},Log_Msg.cpp,OS.cpp
-          revised ACE_Object_Manager interface for preallocated objects.
-
-          Also, added documentation of ACE_Object_Manager interface to
-          Object_Manager.h and Managed_Object.h.
-
-        * ace/CORBA_Handler.cpp,Dump.cpp,OS.cpp: use ACE_MT with
-          preallocated locks.
-
-        * include/makeinclude/platform_*.GNU,wrapper_macros.GNU:
-          moved -O out of wrapper_macros.GNU and into each platform
-          file's OC[C]FLAGS to support "optimize" make flag.
-
-          I moved -O and similar compile flags out of CFLAGS and/or
-          CCFLAGS and into OCFLAGS and/or OCCFLAGS.  This allows the
-          ACE make system to support the "optimize" flag.  It operates
-          similar to the "debug" flag, i.e., you can set "optimize=1"
-          or "optimize=0" in your platform_macros.GNU file to enable
-          or disable optimization.  You can use the same syntax to
-          get the same effect from the "make" command line, e.g.,
-          "make optimize=1 debug=0".
-
-          I added optimize=1 to platform_*.GNU files that had -O, etc.,
-          in their C[C]FLAGS.  Therefore, there should be no net effect
-          from this change on any platform.
-
-        * include/makeinclude/wrapper_macros.GNU:
-          I _removed_ the disabling of "debug" when "optimize=1" is
-          enabled.  This _will_ have a net effect:  if you were relying
-          on "debug" to be disabled when you enabled "optimize=1",
-          you'll be surprised.  The change supports platforms that
-          allow "debug" and "optimize" simultaneously.
-
-          Because I had added the disabling of "debug" recently,
-          and because "optimize=1" wasn't supported well, if at all,
-          I'd be suprised if any is actually affected by this change.
-
-Sat Sep 20 11:47:14 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/Timer_Queue_T.cpp:
-          Changed the return type to <int>, to match its declaration. The
-          intent was to error error values, which are declared as <int>
-          throughout ACE.
-
-Sat Sep 20 08:07:36 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (gethrtime): on Linux only, removed "volatile" qualifier
-          from declaration of local variable "now".  I don't think that
-          it's necessary.  It causes compilation failure with g++ because
-          the ACE_U_LongLong copy constructor won't take a volatile
-          argument.  Thanks to Sandro Doro <doros@aureus.sublink.org> for
-          tracking down this problem.
-
-        * tests/Time_Value_Test.cpp: reverted to test ACE_U_LongLong on
-          all platforms except WIN32.  It works properly on Linux with
-          the removal of volatile from ACE_OS::gethrtime's "now".  Thanks
-          to Sandro Doro <doros@aureus.sublink.org> for figuring this one
-          out.
-
-Fri Sep 19 18:49:50 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * ace/config-irix6.x-g++.h:
-        * include/makeinclude/platform_irix6.x_g++.GNU:
-          Added support for IRIX 6.x w/gcc, thanks to Celeste E. Copeland
-          (celeste@altaira.com) for this.
-
-Thu Sep 18 19:33:02 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * Douglas added the following changes while going through the
-          Async_Timer_Queue.
-
-        * ace/Timer_Queue_T.h: Factored out the code for handling
-          ualarm().
-
-        * ace/Timer_Queue_T.cpp (handle_signal): Cleanedup the logic
-          for rescheduling a ualarm() after expiring a timer.
-
-        * tests/Async_Timer_Queue_Test.cpp (signal_handler): Changed the
-          use of ACE_DEBUG to ACE_ERROR to ensure that the call doesn't
-          magically disappear if ACE_NDEBUG is enabled.
-
-Fri Sep 19 18:05:48 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (log): Changed the send() to a send_n() so that
-          all the data gets written...
-
-Fri Sep 19 14:52:53 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (get_handle): Can't use
-          ACE_ERROR_RETURN here because ACE_HANDLE is a void* on NT, not
-          int.
-
-        * examples/Reactor/Misc: Added reactors.dsp signals_1.dsp
-          signals_2.dsp.
-
-        * ace/OS.cpp (thr_exit): Commented out the call to
-          ACE_TSS_Cleanup::exit () because ACE_OS::thr_exit is actually
-          called from ACE_TSS_Cleanup::exit ().
-
-Fri Sep 19 12:50:37 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL*,ace/README: added more documentation of requirement
-          for explicit main (int, char *[]) arguments and int return type
-          with ACE_HAS_NONSTATIC_OBJECT_MANAGER (on VxWorks).
-
-Thu Sep 18 22:45:09 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (close): Fixed a
-          typo: it's output_ not outout_.  Thanks to David for
-          pointing this out.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp: Make sure to clean up
-          all our resources (e.g., acceptor-mode and data-mode sockets)
-          when we close down.
-
-        * netsvcs/servers/main.cpp (main): Restored the entire contents of
-          main().
-
-        * tests/Semaphore_Test.cpp: Updated the test to use a temporary
-          ACE_Time_Value variable that is passed to
-          ACE_Semaphore::acquire() so that we don't have problems with
-          reference anachronisms...  Thanks to David Levine for reporting
-          this.
-
-        * ace/Log_Msg.cpp: Changed over to using ACE_SPIPEs for the
-          logging mechanism rather than ACE_FIFOs to conform to the
-          changes to Client_Logging_Handler.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-          Completely rewrote the Client Logging Daemon so that it uses
-          ACE_SPIPEs by default, rather than ACE_FIFOs.  This is more
-          portable and makes it easier to write a generic client logging
-          daemon...  If a platform doesn't support ACE_SPIPEs, then we
-          revert to using sockets.
-
-Thu Sep 18 21:56:33 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_TSS_Cleanup::exit): Masked out codes that relate
-          to freeing TSS keys and remove key entries from TSS cleanup
-          table.  I removed it here to avoid race condition.
-          (ACE_TSS_Cleanup::free_all_key_left): Added this function to
-          free all left over TSS keys and remove them from TSS cleanup
-          table when the program exits.  It is only called from
-          ACE_OS::cleanup_tss.
-          (ACE_OS::cleanup_tss):  Added call to
-          ACE_TSS_Cleanup::free_all_key_left when ACE_WIN32 or
-          ACE_HAS_TSS_EMULATION are defined.
-
-Thu Sep 18 16:30:24 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Semaphore_Test: protected declarations of test_timeout_count
-          and timeouts because they're not used on Solaris.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp: added template
-          instantiations.
-
-Thu Sep 18 09:04:40 1997    <irfan@TWOSTEP>
-
-        * ace/Dynamic: Changed the way ACE_Dynamic worked. Instead of
-          keeping the "this" pointer of the object in question, we are now
-          simply keeping a flag that indicates whether the object was
-          dynamically created. The trick to this approach is to make sure
-          to reset the flag in the constructor. The "this" pointer
-          approach was broken when used with multiple inheritance, because
-          of "shearing" of the "this" pointer to get to the base
-          Svc_Handler class.
-
-Thu Sep 18 01:12:36 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.8, released Thu Sep 18 01:12:36 1997.
-
-Wed Sep 17 22:47:20 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/ACE: Added two new varargs methods for send() and recv().
-          These are modeled after the ones that are in, e.g., ACE_SOCK_IO.
-
-        * ace/Log_Msg.cpp (open): In the UNICODE version the compiler
-          complains about mixed wchar/char usage in Log_Msg.cpp:
-
-          Log_Msg.cpp(468) : error C2665: 'ACE_INET_Addr::ACE_INET_Addr' :
-          none of the 8 overloads can convert parameter 1
-          from type 'const unsigned short *'
-
-          I fixed it modifing the connect() call from
-
-          status = con.connect (*ACE_Log_Msg_message_queue,
-                                ACE_INET_Addr (logger_key));
-
-          to
-
-          status = con.connect (*ACE_Log_Msg_message_queue,
-                                ACE_INET_Addr
-                                (ACE_MULTIBYTE_STRING(logger_key)));
-
-          Thanks to Dieter Quehl <dietrich.quehl@med.siemens.de> for
-          reporting this.
-
-        * ace/SV_Semaphore_Simple.h: By default, we want the flags to
-          perform a SEM_UNDO.  Thanks to Sandro Doro
-          <doros@aureus.sublink.org> for reporting this.
-
-        * tests/Makefile (BIN): Added Semaphore_Test.cpp to the Makefile.
-          Thanks to Sandro Doro <doros@aureus.sublink.org> for reporting
-          this.
-
-        * tests/Async_Timer_Queue_Test.cpp: If you want to print a '\',
-          you need to make it a \\...  Thanks to David for noticing this.
-
-        * apps/JAWS/clients/Blobby/Blob_Handler.h: There was a missing
-          #include for "ace/SOCK_Stream.h".
-
-        * netsvcs/lib/Client_Logging_Handler: Reimplemented this service
-          so that it uses sockets on Win32 to receive logging messages
-          from clients.
-
-        * ace/Log_Msg.cpp: Enhanced ACE_Log_Msg::log() so that it now uses
-          sockets on Win32 platforms to work around the lack of FIFOs.
-
-        * ace/Log_Record.h: Revised the field layout of the ACE_Log_Record
-          so that the length field comes first.  This is necessary for the
-          framing mechanisms used throughout ACE in various
-          configurations.
-
-Wed Sep 17 15:17:38 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Filecache.cpp: ACE_Filecache::finish should check to see if
-          the file passed in is NULL before attempting to grab the
-          associated hash lock.  Reported by Samuel Melamed
-          <sam@vdo.net>.
-
-Wed Sep 17 13:51:25 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * bin/auto_compile:
-          I setup autoflush on the logfile, it makes debugging and non
-          crontab usage a bit easier.
-
-Wed Sep 17 12:59:34 1997    <irfan@TWOSTEP>
-
-        * ace/Local_Name_Space_T.cpp: Fixed warnings caused by SEH macros.
-
-Wed Sep 17 01:07:40 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.7, released Wed Sep 17 01:07:40 1997.
-
-Tue Sep 16 23:34:36 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/servers/main.cpp (main): The use of braces was incorrect
-          so that some services were being prematurely closed...
-
-        * ace: Added a new flag called ACE_LACKS_FIFO to distinguish the
-          (lack of) features on Win32...
-
-        * ace/Timer_Queue_T: Added an expire() wrapper for the
-          Async_Timer_Queue_Adapter.
-
-        * ace/OS: Added a wrapper for strpbrk() and wcspbrk().  Thanks to
-          Bob Olson <olson@jeeves.mcs.anl.gov> and Irfan for pointing out
-          the need for this.
-
-Tue Sep 16 18:03:58 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * bin/auto_compile:
-          It wouldn't report an error when run_tests.sh scream "FAILED",
-          now it does.
-
-Tue Sep 16 08:30:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i: Changed a couple of ACE_UNUSED(arg) to ACE_UNUSED_ARG(arg)
-
-Mon Sep 15 12:08:38 1997    <irfan@TWOSTEP>
-
-        * ace/Reactor (register_handler): Originally this interface was
-          available for all platforms, but because ACE_HANDLE is an int on
-          non-Win32 platforms, compilers are not able to tell the
-          difference between
-          register_handler(ACE_Event_Handler*,ACE_Reactor_Mask) and
-          register_handler(ACE_Event_Handler*,ACE_HANDLE). Therefore, we
-          have restricted this method to Win32 only.
-
-        * ace/WFMO_Reactor.h: Removed non-Win32 version of the
-          WFMO_Reactor. This is no longer required in the new scheme.
-
-        * ace/XtReactor:
-
-          Added remove_handler_i(const ACE_Handle_Set &,ACE_Reactor_Mask)
-          to make the compiler happy.
-
-          Also changed ACE_Reactor_Handle_Set to ACE_Select_Reactor_Handle_Set.
-
-        * ace/Select_Reactor.cpp (ACE_Select_Reactor_Token): Added set/get
-          select_reactor methods.
-
-        * ace/OS.h (ACE_SEH_TRY): Changed ACE_SEH_TRY from nothing to
-          "if(1)" on non-Win32 platforms. This should stop some compilers
-          from complaining about unreachable code.
-
-Mon Sep 15 11:37:49 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * include/makeinclude/platform_hpux.GNU:
-          Added -D_REENTRANT to enable the _r functions.
-
-Mon Sep 15 09:40:57 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * bin/auto_compile:
-          Enabled the shared_libs_only flags to speed up compilations (and
-          reduce disk space usage).
-
-Sun Sep 14 22:36:17 1997    <irfan@TWOSTEP>
-
-        * ace/Select_Reactor.h: Added a no-op constructor for
-          ACE_Select_Reactor_Token to make the compiler happy.
-
-Sun Sep 14 21:02:31 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * all Makefiles: ran "make depend" to update all ACE Makefiles.
-
-        * include/makeinclude/platform_irix6.x-32_sgic++.GNU,
-          platform_tandem.GNU: added debug = 1, to disable ACE_NDEBUG.
-
-        * ace/Acceptor.cpp: added #include of ace/Handle_Set.h so that
-          it will compile on g++/Solaris.
-
-        * ace/Managed_Object.h: added #include of ace/OS.h because
-          ACE_Cleanup class is used.
-
-        * ace/Managed_Object.cpp: only #include ace/Synch.h if
-          ACE_TEMPLATES_REQUIRE_SOURCE is not defined.  The #include
-          appears to be necessary with Digital Unix.  But, it causes
-          inline functions warnings with g++, both with inlining
-          enabled and disabled.  Circular #includes are evil :-)
-
-        * ace/Select_Reactor.h: removed "," at end of DEFAULT_SIZE
-          enum definition.
-
-        * ace/Select_Reactor.i (register_handler): added ACE_UNUSED_ARGS.
-
-        * ace/Select_Reactor.i: moved ACE_Select_Reactor::size () after
-          ACE_Select_Reactor_Handler_Repository::size () to prevent use
-          before definition.
-
-        * ace/Select_Reactor.cpp: added template instantiation.
-
-        * ace/Svc_Conf_y.cpp: commented out unused args and wrapped
-          assignments in "if" conditionals to avoid g++ warnings.
-
-        * ace/Token_Manager.h: inserting missing "public" access control
-          specifier for ACE_Cleanup.
-
-        * ace/OS.{h,cpp} (gethrtime, Linux only): inlined and added Alpha
-          support.
-
-        * ace/config-linux*.h: only define ACE_HAS_PENTIUM if i386 is defined.
-
-Sun Sep 14 10:35:57 1997    <irfan@TWOSTEP>
-
-        * ace/Reactor: The Reactor classes (ACE_Reactor and ACE_ReactorEx)
-          have changed.  The motivation for this change was to allow users
-          to program abstractly and use the most efficient implementation
-          available on their platform.  At the same time, we wanted to
-          make the changes required by the users kept to a minimal.
-
-          Here is a layout of the new Reactor hierarchy in ACE (an example
-          of the GOF Bridge Pattern).  Thanks to Thomas Jordan
-          (Thomas_Jordan@deluxedata.com) for suggesting this new design.
-
-
-                        Reactor -----> Reactor_Impl
-                                          ^
-                                          |
-                                --------------------
-                                ^                  ^
-                                |                  |
-                         Select_Reactor         WFMO_Reactor
-
-          Reactor:
-
-            The Reactor class now becomes an interface class that contains
-            a pointer to an implementation class. All methods of the
-            Reactor class forward all calls to the appropriate
-            implementation class.  Users can pass in their own
-            implementation class.  If an implementation class is not
-            supplied at creation time, the following default rules apply:
-
-            On non-Win32 platforms: An instance of the Select_Reactor
-            class will be created and used as the implementation.
-
-            On Win32 platforms: An instance of the WFMO_Reactor class will
-            be created and used as the implementation.  This default
-            behavior can be overwritten at compile-time by setting the
-            ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL flag. In this case, an
-            instance of the Select_Reactor class will be created and used
-            as the implementation.
-
-          Reactor_Impl:
-
-             Reactor_Impl is an abstract class (i.e., the Bridge).
-             Select_Reactor and WFMO_Reactor inherit from this class.
-
-          Select_Reactor:
-
-             Previously known as the Reactor class.  This class implements
-             the Reactor_Impl interface by using the select() system
-             call. This implementation is available on all platforms
-             (including Win32).
-
-          WFMO_Reactor:
-
-             WFMO (Wait For Multiple Objects) Reactor, previously known as
-             the ReactorEx class.  This class implements the Reactor_Impl
-             interface by using the WaitForMultipleObjects() system call.
-             This implementation is currently only available on Win32
-             platforms.
-
-          Code changes for users:
-
-             The higher authorities of ACE have decided that ReactorEx was
-             a "goofy" name and made little sense in the new hierarchy.
-             Therefore users using the old ReactorEx will have to change
-             over to start using the Reactor class (and make sure that the
-             implementation class being used is WFMO_Reactor).
-
-             Also users that have extended Reactor or ReactorEx must
-             now subclass from Select_Reactor or WFMO_Reactor,
-             respectively.
-
-        * ace/ReactorEx:
-
-          The ReactorEx interface has been extended to be identical to the
-          Reactor interface.  Some of these new operations will not be
-          supported in this version.  However, we will have interface
-          compatability at this point. This allows the creation of the new
-          Reactor hierarchy in ACE.
-
-          Removed all static (singleton) methods from ReactorEx. These are
-          not necessary anymore since ReactorEx will become an
-          implementation class. Reactor will take over this functionality.
-
-          Changed methods names from resume_all to resume_handlers and
-          suspend_all to suspend_handlers. This increases the similarity
-          between ReactorEx and Reactor.
-
-          Add a lock_adapter so that we can return an ACE_Lock form of our
-          internal lock.
-
-          Added signal handling capabilities to ReactorEx.
-
-          Added handler, requeue_position, mask_ops, and ready_ops
-          operations.  However, they are not supported in this
-          version. They are mostly here for interface compatibility with
-          Reactor.
-
-          Added a size() accessor that returns the current size of the
-          ReactorEx's internal descriptor table.
-
-          Added an initialized() accessor that returns true if ReactorEx
-          has been successfully initialized, else false.
-
-        * ace/Reactor:
-
-          The Reactor interface has been extended to be identical to the
-          ReactorEx interface.  Some of these new operations will not be
-          supported in this version.  However, we will have interface
-          compatability at this point. This allows the creation of the new
-          Reactor hierarchy in ACE.
-
-          Added resume_handler(ACE_Handle_Set &) and
-          suspend_handler(ACE_Handle_Set &) to the Reactor.  This
-          increases the similarity between ReactorEx and Reactor.
-
-          Add a lock_adapter so that we can return an ACE_Lock form of our
-          internal lock. This changes the signature of the return type
-          from ACE_Reactor_Lock to ACE_Lock.
-
-          Added a size() accessor that returns the current size of the
-          Reactor's internal descriptor table.
-
-          Added wakeup_all_thread() operation. Currently it just does a
-          notify.
-
-          Added alertable_handle_events() operation.  Currently it just
-          calls handle_events().
-
-          Added register_handler (that take event handles) operations.
-          However, they are not supported in this version. They are mostly
-          here for interface compatibility with ReactorEx.
-
-        * ace/XtReactor: Now inherits from Select_Reactor instead of
-          Reactor.
-
-        * ace/Timer_Queue_T.h: Removed the inclusion of Time_Value.h. This
-          file does not exist anymore
-
-        * ace/Synch_T (ACE_Lock_Adapter): Changed the implementation of
-          the adapter such that the user is allowed to (optionally) pass
-          in the locking mechanism.
-
-        * ace/Strategies: Removed ACE_ReactorEx_Notification_Strategy.
-
-        * ace/Service_Config: Updated Service_Config so that all ReactorEx
-          and Proactor methods are removed. ReactorEx does not exist any
-          longer and Proactor methods are available as statics methods on
-          the Proactor class.
-
-        * ace/OS.h (ACE_DEFAULT_SELECT_REACTOR_SIZE): Changed
-          ACE_DEFAULT_REACTOR_SIZE to ACE_DEFAULT_SELECT_REACTOR_SIZE.
-          There is no default size dictated by the Reactor class anymore.
-
-        * ace/Local_Tokens,Token: Added new methods: acquire_read,
-          acquire_write, tryacquire_read, tryacquire_write.  These methods
-          allow the Tokens to be used by the ACE_Lock_Adapter class.
-
-        * ace/Handle_Set.h (MAXSIZE): Changed ACE_DEFAULT_REACTOR_SIZE to
-          ACE_DEFAULT_SELECT_REACTOR_SIZE.  There is no default size
-          dictated by the Reactor class anymore.
-
-        * ace/Event_Handler: Removed the Proactor and ReactorEx pointers
-          from Event_Handler.  The Proactor has its own event handler
-          (ACE_Handler), and the ReactorEx does not exist anymore.
-
-        * ace/Proactor:
-
-          Changed Proactor to work with the new Reactor.
-
-          Updated Proactor to bring it upto date with the recent changes
-          to the Timer_Queue.
-
-        * tests:
-
-          Removed the ACE_NEW_THREAD macro. With the new thread adapter,
-          the log stream for the new thread will automatically be set to
-          the creator thread's stream.  Therefore, this macro is not
-          needed.
-
-          Removed the inclusion of Service_Config.h. All tests are now
-          accessing the singletons that are supported by the class directly.
-
-        * examples/Reactor/Proactor: Updated examples to use and access
-          the new Reactor class instead of the old ReactorEx.
-
-        * examples/Reactor/ReactorEx: Updated examples to use and access
-          the new Reactor class instead of the old ReactorEx.
-
-Sun Sep 14 09:50:22 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Singleton.i (ACE_Singleton): Moved the definition of the
-          ACE_Singleton default constructor into the *.i file.  In
-          general, it's not a good idea to put definitions in *.h files.
-
-        * tests/test_config.h: Improved the #undef scheme for ACE_NDEBUG.
-
-Sat Sep 13 23:51:55 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
-
-        * ace/ACE_Library.{mak,mdp}: Removed Service_Record.cpp and added
-          Service_Type.cpp in project file.
-
-        * ace/:  Removed ace.{mak,mdp} and replaced them with
-          ACE_Library.{mak,mdp}.  MSVC 4.2 insists to change the release
-          version DLL from our original setting "ace.{dll,lib}" to "ACE
-          dynamic Library.{dll,lib}".  This is so far the only known
-          method to get around this.
-
-        * netsvcs/servers/servers.{dsw,dsp}: Changed the output filenames
-          of debug version from maind.exe to main.exe.
-
-        * netsvcs/lib/netsvcs.{dsw,dsp}: Changed the output filenames of
-          debug version from netsvcsd.{dll,lib} to netsvcs.{dll,lib}.
-
-        * ace/ace.dsw:
-        * ace/ace_{dll,lib}.dsp: Removed Service_Record.cpp and added
-          Service_Type.cpp.
-
-        * ace/Log_Msg.cpp (open): Fixed a typo.
-
-        * ace/Reactor.cpp: Fixed a typo.
-
-Sat Sep 13 17:23:22 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.6, released Sat Sep 13 17:23:22 1997.
-
-Sat Sep 13 12:11:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests: #include "test_config.h" before all the other files so
-          that we always have the ACE_ASSERT enabled...  Thanks to Carlos
-          for noticing this.
-
-        * ace/Reactor.cpp: Added Arturo's improvements for suspending and
-          resuming Event_Handlers.
-
-        * tests/Reactors_Test.cpp: As a result of the new changes to
-          ACE_Thread_Manager, the Reactors_Test now seems to be working
-          fine.
-
-        * ace/Thread_Manager.cpp (append_thr): When we append a new
-          Thr_Descriptor make sure to zero-out the cleanup_info_ fields
-          since otherwise horrible things will happen...
-
-        * ace/Reactor: Added a new ACE_Reactor_Handle_Set called
-          suspend_set_ and updated the suspend_i() and resume_i() method
-          to use this set to store the ready bits that are enabled when we
-          suspend and resume and Event_Handler, respectively.  Thanks to
-          Arturo for this suggestion.
-
-        * tests/TSS_Test.cpp (main): Had to move the allocation and
-          deletion of TSS_Error into the ACE_HAS_THREADS section since
-          otherwise this test doesn't work when threading is disabled.
-
-        * tests/Thread_Manager_Test.cpp: Move the template specialization
-          inside of the ACE_HAS_THREADS macro since otherwise this test
-          doesn't work when threading is disabled.
-
-        * ace/Thread_Manager.cpp: Arrgh!  Must initialize the cleanup_info
-          fields to 0 in the constructor for ACE_Thread_Descriptor!  This
-          should fix a nasty bug...
-
-        * tests/Async_Timer_Queue_Test.cpp: Continued to improve the
-          documentation in the test of the ACE_Async_Timer_Queue_Adapter.
-
-        * ace/Timer_Queue_T.cpp (schedule): Oops, must pass &this->mask_
-          to ACE_Sig_Set rather than this->mask_.
-
-        * ace/Object_Manager.cpp: Changed #include
-          "ace/Service_Repository.h" to #include "ace/Service_Config.h"
-          since we now call ACE_Service_Config::close().
-
-        * ace/Service_Types: Removed a nasty circular dependency by simply
-          having each of the ACE_Service_Type_Impl subclasses take const
-          void *'s rather than their specific type (i.e., ACE_Stream or
-          ACE_Module, etc.).  This turns out not to be a problem since we
-          treated them as const void *'s internally anyhow...
-
-        * ace/Strategies_T.cpp: Fixed a bug in ACE_DLL_Strategy:
-
-          ACE_Service_Type_Impl stp = new ACE_Service_Object_Type (svc_handler, this->svc_name_);
-
-          should be
-
-          ACE_Service_Type_Impl *stp = new ACE_Service_Object_Type (svc_handler, this->svc_name_)
-
-          I wonder how this ever compiled?!
-
-Fri Sep 12 13:26:50 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Mem_Map.cpp (close): Removed the following code in the
-          close() method that appears to be redundant with the code in
-          unmap():
-
-              if (this->file_mapping_ != this->handle_
-                  && this->file_mapping_ != ACE_INVALID_HANDLE)
-                ACE_OS::close (this->file_mapping_);
-
-          Also cleaned up the close() code so that it doesn't try to close
-          the handle multiple times, even if close() is called more than
-          once.  Thanks to Beged-Dov <begeddov@proaxis.com> for reporting
-          this.
-
-        * tests/Async_Timer_Queue_Test.cpp: Improved the structure of the
-          program and finished implementing the new feature that makes it
-          possible to avoid blocking SIGQUIT.
-
-        * ace/Timer_Queue_T: Added support for an ACE_Sig_Set that can be
-          passed into the constructor of ACE_Async_Timer_Queue_Adapter.
-          This will enable us to selectively block only certain signals.
-
-        * ace/Signal: Added a new constructor for ACE_Sig_Set that takes
-          ACE_Sig_Set * and also improved the documentation of the
-          constructor interfaces.
-
-Fri Sep 12 13:46:04 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.[hi],Log_Msg.h,config-lynxos.h,
-          include/makeinclude/platform_lynxos.GNU: added LynxOS port,
-          provided by Dave Mayerhoefer <davem@lynx.com>.  Note how few
-          files were affected.  What's even more amazing is the very small
-          number, 8, of very minor code changes to OS.[hi] and Log_Msg.h.
-          This is a tribute to the maturity of
-          <a href="http://www.lynx.com>LynxOS</a>, a POSIX-conforming,
-          multiprocess, and multithreaded real-time operating system.
-          And to the maturity of ACE.
-
-Fri Sep 12 12:53:20 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1-4.0.h: added
-          ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR.
-
-        * ace/Managed_Object.cpp: added #include "ace/Synch.h".
-
-        * ace/Strategies_T.cpp: added #include "ace/Service_Types.h".
-
-        Thanks to James Johnson for the three fixes above.
-
-        * ace/Service_Types.cpp: #include Service_Types.i instead of
-          Service_Record.i.
-
-        * ace/Synch_T.cpp: added #include "ace/Log_Msg.h".  I don't know
-          what change caused this to be necessary, but tests/TSS_Test
-          wouldn't build without it.
-
-        * ace/Log_Msg.cpp (instance): preallocate ACE_Log_Msg instance lock.
-
-Thu Sep 11 21:07:25 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Service_Object.h: Moved the ACE_Service_Type class into the
-          Service_Object.h file since this is "publically" visible to
-          applications.
-
-        * ace/Service_Types.h: Improved the documentation of the
-          ACE_Service_Type subclass implementations.
-
-        * ace/Service_Types: Changed the name next_ to link_ to be
-          consistent with the accessor name.
-
-        * ace: Renamed Service_Record.{h,i,cpp} to Service_Types.{h,i,cpp}
-          to reflect the recent change in names.
-
-        * ace/Service_Object.h: Renamed ACE_Service_Type to
-          ACE_Service_Type_Impl and ACE_Service_Record to ACE_Service_Type
-          in order to emphasize the use of the Bridge pattern.  Thanks to
-          Eric Newton for motivating this.
-
-        * ace/Svc_Conf.y: Removed the warning about Service name being
-          different from Module name.  I'm not sure why this was
-          complaining in the first place.  Thanks to Eric Newton for
-          pointing this out.
-
-        * netsvcs/lib/README: The entry point for the time service client
-          is _make_ACE_TS_Clerk_Processor and not
-          _make_ACE_TS_Clerk_Connector.  Thanks to Ivan for pointing this
-          out.
-
-Thu Sep 11 10:59:12 1997    <nw1@CHA-CHA>
-
-        * ace/Connector.cpp (handle_output): Increased the idle time
-          before we check the status of a non-blocking connection from 1
-          ms to 35 ms when ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS is
-          defined (i.e., Win32.)  This is very odd but wait a whole lot
-          longer seems to solve the problem.
-
-        * ace/Log_Msg.cpp (close): On Win32, ACE_Log_Msg_Manager needs to
-          delete main thread's ACE_Log_Msg instance also.
-
-Thu Sep 11 10:37:00 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * ace/ACE.cpp:
-        * ace/INET_Addr.cpp:
-        * ace/Log_Msg.h:
-        * ace/Memory_Pool.h:
-        * ace/OS.h:
-        * ace/OS.i:
-        * ace/Parse_Node.cpp:
-        * ace/Strategies_T.h:
-        * bin/clone.cpp:
-        * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h:
-          I checked the use of MAXNAMELEN vs. MAXPATHLEN; all buffers
-          intended to keep full filenames should have at least
-          MAXPATHLEN+1 chars.
-          Only buffers that will keep basenames (without any directories)
-          should have MAXNAMELEN+1 bytes.
-          I also added a new macro ACE_MAX_FULLY_QUALIFIED_NAME_LEN which
-          is the maximum number of characters for a fully qualified
-          internet hostname.
-          There remain one obscure usage of these macros in ace/Malloc.h
-          and Local_Naming_Space_T.{h,cpp}, but a quick fix broke
-          something, I will try again soon.
-
-Thu Sep 11 08:52:36 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (thr_key_detach): check to see if the
-          ACE_TSS_Cleanup lock has been constructed, and not
-          destructed, before attempting to use it.  Statics are evil.
-
-        * ace/Log_Msg.cpp (~ACE_Log_Msg): release guard before calling
-          ACE_Log_Msg_Manager::close (), because that deletes the lock.
-
-        * ace/Managed_Object.{h,cpp} (get_object): changed type of "id"
-          to int because it will often be passed an enum.  Pass "id" by
-          value to get_object (int id), for preallocated objects.
-
-        * ace/Object_Manager.{h,cpp}: added ACE_LOG_MSG_INSTANCE_LOCK,
-          and ACE_PREALLOCATE_OBJECT macro.
-
-        * include/makeinclude/wrapper_macros.GNU: ignore shared_libs_only
-          in modules that only build a static lib.  Fixed shared_libs_only
-          by removing OBJDIRS, unless BIN is undefined, and VDIR.  Removed
-          SHOBJ from both shared_libs_only and static_libs_only because
-          they're unused.
-
-        * include/makeinclude/rules.local.GNU: added lib*.*_pure* to
-          clean.local target, to remove Purified libraries.
-
-        * examples/Connection/non_blocking/Makefile,
-          examples/Service_Configurator/IPC-tests/server/Makefile:
-          removed -L./ from LDFLAGS because it's redundant:
-          wrapper_macros.GNU adds it.
-
-Wed Sep 10 22:58:10 1997  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (exit): Reordered the code so that it
-          will keep the lock held long enough to copy out the thread exit
-          hook but will release the lock before calling this hook.
-
-Wed Sep 10 11:04:08 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5-g++.h: added
-          ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS.
-
-        * include/makeinclude/wrapper_macros.GNU: added PIC= with
-          static_libs_only, and added list of supported make flags.
-
-        * include/makeinclude/wrapper_macros.GNU: added support for
-          debug=0, etc.  Also, made debug, optimize, and profile
-          flags independent instead of exclusive.  Thanks to Per
-          Andersson for suggesting this.
-
-        * include/makeinclude/platform_*.GNU: replaced "CFLAGS +=
-          $(DCFLAGS) with debug=1 so that debugging can easily be
-          disabled.  Thanks to Per Andersson and James CE Johnson
-          for noticing this deficiency.
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU: removed
-          "-I. -I$(ACE_ROOT)" from CFLAGS because it duplicates the
-          INCLDIRS set in wrapper_root.GNU.
-
-Wed Sep 10 10:35:06 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.3.5, released Wed Sep 10 10:35:06 1997.
-
-Wed Sep 10 10:25:41 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (exit): copy the thread exit hook before
-          releasing the guard, and call it after releasing the guard.
-
-        * examples/Shared_Malloc/test_malloc.cpp (spawn): added (char *)
-          cast of slave_name () to avoid compilation warnings on Solaris.
-
-Wed Sep 10 00:43:04 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
-
-        * ace/Makefile: Added Managed_Object to template sources.
-
-        * ace/Object_Manager.{h,cpp}: * ace/Managed_Object.{h,cpp}:
-          Separate ACE_Managed_Object to a new set of file.
-
-Tue Sep  9 23:41:56 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Reactors_Test.cpp (main): Check to see if wait() returns
-          -1 and then test to see what's gone wrong!
-
-        * ace/OS.h: Added a "fake" #define for SIGALRM so that programs
-          will *compile* on platforms like Chorus.  Thanks to Wei Chiang
-          for reporting this.
-
-        * examples/Shared_Malloc/test_malloc.cpp (spawn): HP/UX doesn't
-          seem to like const char *const argv[] being given an initializer
-          list.  I've fixed this to be just plain ol' char *argv[].
-          Thanks to Sandro Doro for reporting this.
-
-        * ace/Handle_Set.i (clr_bit): Replaced SOCKET with ACE_SOCKET so
-          this will compile on UNIX.
-
-Tue Sep 09 17:16:21 1997    <irfan@TWOSTEP>
-
-        * ace/Proactor: Updated Proactor to bring it upto date with the
-          recent changes to the Timer_Queue.
-
-        * ace/Handle_Set.i (clr_bit and set_bit): These methods now change
-          the size_ member of the class on Win32.  This is necessary since
-          the ACE_Handle_Set::operator fd_set *() accessor has been
-          optimized for size_ == 0.
-
-Tue Sep 09 09:14:07 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (cleanup_tss): On WIN32 and with ACE_HAS_TSS_EMULATION,
-          delete the ACE_TSS_Cleanup instance instead of registering it for
-          cleanup via the ACE_Object_Manager's at_exit ().  This should allow
-          applications to use ACE_Log_Msg in their at_exit () hooks.  Thanks
-          to Wei Chiang <chiang@tele.nokia.fi> for reporting this problem.
-
-        * ace/Object_Manager.{h,cpp}: added guard of internal structures.
-          (dtor): call at_exit hooks before calling cleanup_tss, now that
-          the ACE_TSS_Cleanup instance is no longer registered for an at_exit
-          call.  (at_exit): set errno instead of returning different values
-          on error.  Added ACE_Managed_Object template class, intended for
-          use in replacing static instances.
-
-        * ace/Thread_Manager.cpp (exit): release guard before running the
-          thread exit hooks.  This should help avoid deadlocks, in case
-          one of those hooks needs to operate on the Thread_Manager.
-
-        * ace/CORBA_Handler.{h,cpp},Dump.{h,cpp},Object_Manager.{h,cpp}:
-          preallocate locks for CORBA_Handler and Dump in ACE_Object_Manager.
-          Statics are evil.
-
-        * ace/Synch.{h,cpp},OS.cpp,Object_Manager.{h,cpp}: removed
-          ACE_TSS_Cleanup_Lock and replaced it with a preallocated mutex
-          in OS.cpp.  Thanks to Nanbor for reporting problems at shutdown
-          with the old ACE_TSS_Cleanup_Lock static instance.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: when building
-          libraries only, don't use CC to create individual .shobj/*.so
-          files.  The .so files are not needed to build libraries, because
-          libraries are built with -G.  (They are needed to avoid upsetting
-          the ACE make rules, so they're created as links to their
-          corresponding .o files.)  The .so files are still needed when
-          building executables in order to get all template instantiations.
-
-        * include/makeinclude/platform_sunos5_g++.GNU: removed unused
-          SOLINK definitions.
-
-Mon Sep  8 18:38:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Handle_Set_Test.cpp: It is possible for the order to get
-          the handles (using the iterator) will not agree with insert
-          order in ACE_Unbounded_Queue. It's best to use
-          ACE_Unbounded_Set.  Thanks to Arturo for this fix.
-
-Mon Sep  8 17:43:43 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Timer_{List,Wheel,Hash,Heap}_T.cpp: The iter() method now
-          returns a pointer to an iterator that is in a reset state
-          instead of an unknown one.
-
-Mon Sep  8 14:05:15 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/ACE.cpp (read_adapter): Removed ACE_Thread_Control object in
-          this function.  This is now taken care of by ACE_Thread_Manager.
-          (register_stdin_handler): This function no longer uses
-          ACE_Stdin_Args to pass in thread manager into read_adapter.
-
-        * ace/ACE.h (ACE): Removed class ACE_Stdin_Args, because it is no
-          longer needed.
-
-Mon Sep 08 11:49:02 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/run_tests.sh: moved log file checks out to separate file,
-          run_tests.check.
-
-        * tests/run_tests.vxworks: added one-button test for VxWorks.
-          Check it out, Darrell.
-
-        * ace/Filecache.cpp: commented out unused constants [RW]COPY_FLAGS.
-
-Mon Sep 08 08:26:52 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.3.4, released Mon Sep 08 08:26:52 1997.
-
-Sat Sep  6 10:41:17 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * ace/Malloc.h:
-          sizeof() must be casted to int in ACE_CONTROL_BLOCK_ALIGN_LONGS
-          otherwise unsigned int arithmetic is used, thus obtaining
-          unexpected results.
-
-Sat Sep 06 09:07:02 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * OS.{h,cpp}: added ACE_Cleanup base class and
-          ace_cleanup_destroyer adapter.
-
-        * Object_Manager.*: added at_exit () interface for ACE_Cleanup objects.
-
-        * Singleton.{h,cpp},Token_Invariants.{h,cpp},Token_Manager.{h,cpp}:
-          base on ACE_Cleanup, so that simpler ACE_Object_Manager::at_exit ()
-          can be used.
-
-        * performance-tests/Misc/Makefile: moved $(BIN) files from FILES
-          to SRC so that they don't get put into libPerf.
-
-Sat Sep  6 02:36:31 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/test_config.h (set_output): Added openning flag ios::trunc
-          explicitly if we are not appending to the opening ofstream.
-          This is required by standard CPP iostream libraries on NT (i.e.,
-          we can't use ios::out alone when ofstream.open a file.)
-
-Sat Sep  6 00:21:33 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-         * ace/Synch_T.h: Added new constructors:
-
-           ACE_Guard(ACE_LOCK& l) : lock_(&l)
-           { this->owner_ = this->acquire(); }
-
-           ACE_Read_Guard(ACE_LOCK& m) : ACE_Guard(&m)
-           { this->owner_ = this->acquire_read(); }
-
-           ACE_Write_Guard(ACE_LOCK& m) : ACE_Guard(&m)
-           { this->owner_ = this->acquire_write(); }
-
-           Remove default argument to current Guard classes.
-
-           ACE_Guard(ACE_LOCK&l, int block)
-           ACE_Read_Guard(ACE_LOCK& m, int block)
-           ACE_Write_Guard(ACE_LOCK&m, int block)
-           with the current semantic.
-
-           This change allows OS platforms with
-           ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION or ACE_HAS ??? PRAGMA
-           ???, to> invoke common case constructor in a more efficient
-           way.  Thanks to Arturo for this.
-
-        * ace/Synch_T.h: ACE_Guard's destructor should be:
-
-          ~ACE_Guard() { this->release(); }
-
-          and not
-
-          ~ACE_Guard() { if (this->owner_ != -1) this->release(); }
-
-          because ACE_Guard::release has this test.  Thanks to Arturo for
-          reporting this.
-
-        * ace/ARGV.cpp: Declared the char* parameters for the ACE_ARGV
-          class constructors as const.  Since they are copied in the
-          constructors, this is a safe thing to do.  This makes it easier
-          to pass the result of string::c_str() to it.  Thanks to Stephen
-          Coy <stevec@magna.com.au> for this suggestion.
-
-        * ace/Thread_Manager.cpp: We were missing a Guard in the
-          ACE_Thread_Manager::at_exit() method.
-
-        * ace/config-sunos5.5-sunc++-4.x.h: It appears that we need to set
-          ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS for Solaris 2.5 since otherwise
-          wierd things happen randomly.  This is based on the following man
-          page entry for pthread_exit():
-
-          Do not call pthread_exit() from a cancellation cleanup handler
-          or destructor function that will be invoked as a result of
-          either an implicit or explicit call to pthread_exit().
-
-        * ace/Thread_Manager.cpp (run_thread_exit_hooks): Once the cleanup
-          hook(s) are called we set the value of the cleanup hook variable
-          to 0 to avoid false matches later on.
-
-Fri Sep  5 21:57:44 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Containers.i (is_empty):
-        * ace/Malloc.cpp (instance): Commented out ACE_TRACE in these
-          routines.  They were causing recursive call if we used TRACE.
-          Thanks to Craig Perras <craig.perras@CyberSafe.COM> for solving
-          this.
-
-        * ace/Handle_Set.i (fd_set *): Added conditional compilation code
-          for Win32 platforms.  This is because we don't maintain <size_>
-          on Win32 and, therefore, can't depend on it.
-
-Fri Sep  5 19:05:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp (main): moved delete
-          signal_catcher into the ACE_HAS_THREADS part of the main()
-          function.
-
-        * ace/Reactor.cpp (check_handles): When handle_error was optimized
-          with fstat we put NULL value to second argument.  It requires a
-          value to SCO OpenServer to work.  Therefore, I added struct stat
-          temp and changed ACE_OS::fstat(handle, NULL) by
-          ACE_OS::fstat(handle, &temp);  Thanks to Arturo for fixing this.
-
-        * examples/Threads/process_manager.cpp (sig_handler): Fixed a bug
-          where the thread was exiting if no more children existed.
-          Thanks to Avraham Nash <ANash@Engagetech.com> for reporting
-          this.
-
-        * ace/Handle_Set: Added the following performance enhancements:
-
-          . Assignment operator to optimize size == 0.
-
-          . min_handle to manage the case when the Handle_Set start in
-            handle different of zero.
-
-          . A new iterator algorithm tuned for select function calls.
-
-          Thank to Arturo for these enhancements.
-
-        * ace/config-aix-4.1.x.h: Added ACE_LACKS_TIMESPEC_T.  Thanks to
-          Rob Head (rhead@virtc.com) for reporting this.
-
-        * ace/OS.cpp (fork_exec): Changed the logic so that we don't
-          create a new console window on Win32.  This isn't done on UNIX,
-          so there's no point in doing it here.  Thanks to Jeff Richard
-          <jrichard@OhioEE.com> for pointing this out.
-
-        * ace/Reactor.cpp: The call to
-          ACE_Reactor_Handler_Repository::open() in the constructor of
-          ACE_Reactor should check for == -1!  Thanks to Brian Mendel for
-          reporting this.
-
-        * ace/Reactor.cpp (remove_handler): Fixed a braino where the
-          conditional compile for NSIG should have been > 0 rather than ==
-          0.  Thanks to fixing this codeKaren Amestoy
-          <kamestoy@CCGATE.HAC.COM> for reporting this fix.
-
-Fri Sep 05 16:17:50 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Misc/preempt.cpp: added command line options,
-          and explanation on how to interpret the results.
-
-Thu Sep 04 10:26:11 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp: (tss_open): removed paren from around type in "new"
-          statement, because GHS (and ANSI C++) compilers will choke on it.
-          Thanks to Brian Mendel <brian.r.mendel@boeing.com> for reporting
-          this.
-
-        * ace/Thread_Manager.cpp: (ACE_Thread_Descriptor ctor): zero out
-          cleanup_hook_ in cleanup_info_ because we read it later on.
-          (dump): added guard because thr_table_ is accessed.  (wait):
-          hacked in thr_yield () to give waited threads a chance to clean
-          up before continuing.
-
-        * ace/OS.h (ACE_Cleanup_Info): added default ctor.
-
-        * ace/Log_Msg.cpp (close): delete main thread's Log_Msg instance,
-          on Solaris if ACE_HAS_EXCEPTIONS is not defined, because main
-          thread TSS dtors apparently don't get called.
-
-        * ace/Token_Manager.{h,cpp}: register ACE_Token_Manager singleton
-          for deletion with ACE_Object_Manager.
-
-        * ace/Token_Invariants.{h,cpp}: register ACE_Token_Invariant_Manager
-          singleton for deletion with ACE_Object_Manager.
-
-        * ace/Naming_Context.cpp (close) moved deletion of "name_options_"
-          from dtor to close (), because when Service_Repository is closed,
-          it calls close () instead of deleting the service.
-
-        * ace/Process_Strategy.cpp (handle_signal): suppress printouts during
-          shutdown, to prevent using ACE_Log_Msg while it's being deleted.
-
-        * ace/Timer_List.cpp: replace ACE_Recursive_Thread_Mutex with
-          ACE_SYNCH_RECURSIVE_MUTEX, for non-threaded platforms.
-
-        * tests/Reactors_Test (~Test_Task): moved ASSERT after the printout,
-          so we can see why it failed.  (svc): added printout with thread ID.
-          (main): deleted reactor at end of test to prevent leak.
-
-        * tests/SPIPE_Test (client): increased sleep time to 10 sec,
-          because a long delay is needed with Purify.
-
-        * tests/UPIPE_Test (connector): added 5 second sleep to give
-          acceptor a chance to start up.
-
-        * include/makeinclude/wrapper_macros.GNU: added -max_threads=100 to
-          Quantify options.
-
-        * include/makeinclude/rules.local.GNU: added *.sym to clean target.
-
-Thu Sep 04 09:39:08 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.3.3, released Thu Sep 04 09:39:08 1997.
-
-Thu Sep 04 08:48:13 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU: added shared_libs_only
-          and static_libs_only build options.  Only static_libs_only
-          has been tested successfully.
-
-        * include/makeinclude/rules.lib.GNU: added INSTALL support for
-          shared_libs_only and static_libs_only.
-
-        * include/makeinclude/platform_vxworks*.GNU: use static_libs_only.
-
-        * ace/OS.cpp: moved tss_open ()/tss_close () calls from invoke ()
-          to ace_thread_adapter.
-
-        * examples/Threads/auto_event.cpp,manual_event.cpp,
-          process_manager.cpp,reader_writer.cpp,tss2.cpp:
-          cast spawn entry point to ACE_THR_FUNC.
-
-        * examples/Threads/task_four.cpp (Invoker_Task): rearranged
-          initializers to match declaration order.
-
-        * examples/Threads/thread_specific.cpp (worker): use
-          ACE_OS::printf () instead of printf (), and print out the
-          ACE_hthread_t instead of the ACE_thread_t.
-
-        * examples/IPC_SAP/SPIPE_SAP/client.cpp,consumer_msg.cpp,
-          consumer_read.cpp,producer_msg.cpp,producer_read.cpp,server.cpp:
-          moved #include of shared.h inside ACE_HAS_STREAM_PIPES protection
-          to avoid compilation warnings on unsupported platforms.
-
-        * examples/Reactor/Ntalker/ntalker.cpp (main): removed unused "argc".
-
-        * examples/*/*.cpp,netsvcs/clients/Tokens/mutex/test_mutex.cpp:
-          added args to main ().
-
-Wed Sep  3 21:38:18 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * ace/config-irix6.x-sgic++.h:
-          IRIX uses pthread_sigmask to manage per-thread signal mask,
-          thanks to Gonzalo Diethelm (gonzo@ing.puc.cl) for pointing out
-          this one.
-
-        * ace/OS.h:
-          Removed an initial '#' for a comment line, thanks to Gonzalo
-          Diethelm (gonzo@ing.puc.cl) for pointing out this one.
-
-        * ace/Timer_Hash_T.cpp:
-        * ace/Timer_Hash_T.h:
-        * ace/Timer_Heap_T.cpp:
-        * ace/Timer_Heap_T.h:
-        * ace/Timer_List.cpp:
-        * ace/Timer_List_T.cpp:
-        * ace/Timer_List_T.h:
-        * ace/Timer_Queue_T.cpp:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Wheel_T.cpp:
-        * ace/Timer_Wheel_T.h:
-          In the word of its author: Modified the iterators kept in each
-          of these classes so that they are constructed dynamically on the
-          heap after the Queue has been properly initialized. Otherwise,
-          the iterators try to iterate over a non-initialized queue, and
-          fail miserably (usually dumping core).
-          Once more thanks to Gonzalo Diethelm (gonzo@ing.puc.cl) for this
-          changes.
-
-        * tests/UPIPE_SAP_Test.cpp:
-          Gonzalo improved the error message.
-
-        * ace/README:
-          Gonzalo updated the documentation for some macros.
-
-Wed Sep 03 15:21:46 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: define ACE_TSS macros with ACE_HAS_TSS_EMULATION,
-          and renamed some ACE_TSS_Emulation methods.
-
-        * ace/OS.i: allow TSS_Emulation storage to be on thread stack,
-          instead of always dynamically allocating it.
-
-        * ace/OS.cpp (ACE_Thread_Adapter::invoke): allocate TSS_Emulation
-          storage on thread stack.  (ACE_TSS_Cleanup::exit): only call
-          a TSS destructor if the thread's value is non-zero.
-
-        * ace/Thread_Manager.cpp: support TSS_Emulation.
-
-        * ace/Thread_Manager.cpp (resize): zero out unused cleanup_hooks
-          in thr_table_; (run_thread_exit_hooks): check for zero cleanup
-          hook before calling.
-
-        * ace/Synch_T.*: allow ACE_HAS_TSS_EMULATION _or_
-          ACE_HAS_THREAD_SPECIFIC_STORAGE.
-
-        * ace/Object_Manager.{h,cpp}: allocate main thread's TSS_Emulation
-          storage in the ACE_Object_Manager instance.
-
-        * ace/Log_Msg.h: befriend ACE_OS::cleanup_tss () instead of
-          ACE_Object_Manager, because the cleanup path is now indirect
-          from the ACE_Object_Manager.
-
-        * ace/Log_Msg.cpp: use TSS_Emulation on VxWorks, so
-          VxWorks-specific code was removed.
-
-        * ace/Task.cpp: removed unused #include of ace/Dynamic.h.  (It had
-          been used for template instantiations, but they were moved.)
-          Also, removed unused #include of ace/Object_Manager.h.
-
-        * ace/Svc_Handler.{h,cpp}: register Svc_Handler singleton for
-          deletion with the ACE_Object_Manager.
-
-        * tests/Process_Strategy_Test (Options): added a destructor so that
-          the dynamically allocated concurrency_strategy_ can be deleted.
-
-Wed Sep  3 08:05:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Block.h: Corrected comment on release(void) - the
-          underlying ACE_Data_Block's refcount is decremented; the
-          ACE_Message_Block is always deleted.
-
-Tue Sep  2 18:26:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Task: Revised the ACE_Task_Base::svc_run() method to
-          register a thread exit hook (ACE_Task_Base::cleanup())
-
-        * ace/Task: Added a static method called cleanup() that can serve
-          as a thread exit hook to ensure that close() is always called
-          when a task exits a thread.
-
-        * ace/Thread_Manager: Added the first-cut implementation of the
-          thread exit hooks.  This one is butt-simple -- just allowing a
-          single hook per-thread, but that should be enough to get us over
-          the hump...
-
-        * ace/OS.h: Moved the object_info_t type from Object_Manager.h and
-          renamed it to ACE_Cleanup_Info since we will use it with the
-          Thread_Manager and the Object_Manager.
-
-        * ChangeLog-97b: Emptied out the ChangeLog-97b file until
-          we move the ChangeLog to this file...
-
-        * ace/OS.h: Moved the <ACE_CLEANUP_FUNC> typedef from the
-          ACE_Object_Manager into global scope so that it can also be used
-          by the ACE_Thread_Manager.
-
-        * ace/DEV_IO: Moved the get_remote_addr() and get_local_addr()
-          from the DEV class to the DEV_IO class, which seems to be more
-          consistent with how they should be used.
-
-        * ace/FILE_IO: Added the get_remote_addr() and get_local_addr()
-          methods to FILE_IO.  Now we should be able to use this with the
-          Connector pattern.  Thanks to Stephen Coy
-          <coys@mail.ns.wsa.com.au> for reporting this.
-
-        * ace/DEV_Connector*h, ace/FILE*.h: Added "traits" for PEER_ADDR
-          and PEER_STREAM.  Now we should be able to use this with the
-          Connector pattern.  Thanks to Stephen Coy
-          <coys@mail.ns.wsa.com.au> for reporting this.
-
-        * tests/Async_Timer_Queue_Test.cpp (main): Replaced the use of
-          fputs() with read() so that it will be signal-safe.  Thanks to
-          Carlos for pointing out the need for this.
-
-        * ace/Task: All the complex ACE_Task_Exit logic has been moved out
-          of the Task file and into the Thread_Manager file.  This will
-          both simplify and generalize the behavior of cleanups on thread
-          exit.
-
-Tue Sep  2 14:42:52 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-chorus.h (ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR):
-          Added this directive for Chorus uses g++.  Thanks to David
-          Levine for pointing this out.
-
-Mon Sep 01 21:31:25 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ChangeLog-97b,Makefile,bin/create_ace_build: ChangeLog is no longer
-          a symbolic link, but instead is the most recent ChangeLog file.
-          ChangeLog-97b was moved to ChangeLog.
-
-        * ace/Timer_Queue_T.cpp (schedule): added ACE_UNUSED_ARGs for act
-          and interval.
-
-        * ace/OS.h: changed ACE_SEH_EXCEPT and ACE_SEH_FINALLY from null
-          to "while (0)" on all platforms except ACE_WIN32.  Thanks to
-          Nanbor for this bit of macro wizardry.
-
-        * ace/OS.i (tss_base): cast VxWorks TCB spare field to a void **&
-          instead of a void **, because the function returns a reference
-          to it.
-
-        * ace/OS.cpp: protected definition of
-          ACE_TSS_Emulation::tss_collection_ on VxWorks, where it's not used.
-
-        * ace/OS.cpp (ACE_Thread_Adapter::invoke) don't exit the thread
-          with TSS_EMULATION, except on WIN32.  (thr_create) On VxWorks,
-          use thread adapter as entry point instead of func (via macros).
-
-        * ace/config-vxworks*.h: added ACE_HAS_TSS_EMULATION, with
-          ACE_DEFAULT_THREAD_KEYS set to 16, and ACE_LACKS_UNIX_SIGNALS.
-
-        * tests/Async_Timer_Queue_Test.cpp: added template instantiations.
-
-        * tests/IOStream_Test.cpp: no longer need to dynamically allocate
-          the ACE_SOCK_IOStreams with the recent ACE_Thread_Manager changes.
-          That was causing occasional problems with unsafe deletion of the
-          underlying ostreams.  Thanks to James Johnson for consulting on
-          this intermittent (nasty) problem.
-
-        * tests/SPIPE_Test.cpp: (main) added ACE_UNUSED_ARG of client
-          and server.
-
-        * tests/Thread_Manager_Test (worker): added ACE_UNUSED_ARG (thr_mgr)
-          if ACE_LACKS_UNIX_SIGNALS, and added template instantiations.
-
-        * tests/Thread_Manager_Test.cpp: dynamically allocate the
-         signal_catcher so that we can destroy it before the main
-         thread's TSS is cleaned up.
-
-        * tests/TSS_Test.cpp: dynamically allocate TSS_Error so that we
-          can ensure its deletion before that of ACE_Object_Manager.
-          Also, makde the code a little easier to change the number of threads.
-
-        * include/makeinclude/wrapper_macros.GNU: added Purify options to
-          ignore SIGINT and set max threads to 100.
-
-Mon Sep  1 10:53:39 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Handle_Set: Added an assignment operator that is optimized
-          for the case when the right-hand side is 0.
-
-        * ace/OS: The ACE_THR_C_FUNC macro was confusing for Win32.  We've
-          replaced this with the original UNIX typedef and will just use
-          LPTHREAD_START_ROUTINE for Win32.
-
-        * tests/Thread_Manager_Test.cpp (main): Revised this test so that
-          we don't have race conditions for suspend() and resume().
-
-        * tests/Tokens_Test.cpp (run_test): Removed the use of
-          THR_SUSPENDED and resume_all() since this is broken due to race
-          conditions and other hazards implicit in using suspend() and
-          resume() on threads.
-
-        * ace/Handle_Set.cpp: There were several ACE_INLINE methods in the
-          Handle_Set.cpp file.  I've removed the ACE_INLINE flag.
-
-        * tests/SPIPE_Test.cpp: If ACE doesn't have STREAM pipes on a
-          platform (or we aren't on NT) then don't try to run this test.
-          Thanks to James CE Johnson <ace-users@lads.com> for reporting
-          this.
-
-        * ace/config-sunos5.[45]-g++.h: ACE defines _REENTRANT in
-          config.h.  Application using classes of ACE can conflict by
-          using compilation option as -D_REENTRANT.  I fixed this by
-          surrounding the define as:
-
-          #if !defined (_REENTRANT)
-          #define _REENTRANT
-          #endif /* _REENTRANT */
-
-          Thanks to Jean-Marc Strauss <strauss@limeil.cea.fr> for
-          reporting this.
-
-        * ace/Timer_Queue_T.h: We need to #include "ace/Signal.h" since
-          our Async_Timer_Queue_Adapter needs it.  Thanks to Neil Cohen
-          for reporting this.
-
-        * ace/Reactor.cpp (check_handles): Optimized the check for invalid
-          handles by using fstat() rather than select() on non-Win32
-          platforms.  Thanks to Arturo for suggesting this optimization.
-
-Mon Sep  1 17:52:10 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Timer_Heap_T.cpp: Changed cancel (id ...) to check for
-          previously expired/cancelled timers
-
-Mon Sep 01 08:43:37 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Synch.cpp: added #include of Object_Manager.h.
-          Thanks to Edan Ayal <edana@vdo.net> for reporting this.
-
-Mon Sep  1 00:46:05 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
-
-        * ace/README: Added explanation for ACE_HAS_STL_MAP_CONFILICT.
-
-        * ace/OS.h: Added conditional compilation directive
-          ACE_HAS_STL_MAP_CONFLICT.  This is used when users want to
-          compile ACE with STL library and the STL map class conflicts
-          with map structure in <net/if.h>.
-
-        * ace/config-unixware-2.1.2-g++.h:
-        * ace/config-unixware-2.01-g++.h:
-        * ace/config-osf1-4.0-g++.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-hpux-10.x-g++.h:
-        * ace/config-linux-pthread.h:
-        * ace/config-linux-lxpthreads.h:
-        * ace/config-linux.h:
-        * ace/config-freebsd.h:
-        * ace/config-freebsd-pthread.h:
-          Added ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR flag for all
-          config files which apparently use g++.
-
-        * ace/config-vxworks-g++.h:
-        * ace/config-vxworks5.x-g++.h:
-        * ace/config-sunos4-g++.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.5-g++.h:
-          Moved ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR closer to
-          other template-related directives.
-
-Sun Aug 31 22:56:30 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.2, released Sun Aug 31 22:56:30 1997.
-
-Sun Aug 31 22:36:08 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Async_Timer_Queue_Test.cpp: Need to #include "Timer_List.h"
-          rather than "Timer_Queue.h".
-
-        * ace: Added ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT for all
-          config.h files.
-
-        * ace/Handle_Set.cpp (count_bits): Continued to optimize this
-          method.  Now, if ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT enabled
-          it will use a very fast loop that only runs for as many bits
-          that are enabled in the bitset.  This approach also doesn't have
-          to access the Global Offset Table in shared libraries, which is
-          a win.  Thanks to Arturo for contributing this.
-
-        * tests/Async_Timer_Queue_Test.cpp: Generalized this test to use
-          the new ACE_Async_Timer_Queue_Adapter.
-
-        * ace/Timer_Queue_T: Added the new ACE_Async_Timer_Queue_Adapter,
-          which makes it possible to encapsulate any of the ACE Timer
-          Queue mechanisms into a asynchronous signal-handling context.
-
-        * ace/OS.i: If the platform doesn't support ualarm() (and it
-          doesn't lack UNIX signals) then we'll use alarm() rather
-          than ualarm().  Clearly, this isn't as good as ualarm(),
-          but it's better than nothing.
-
-        * ace/OS.i: I'd missed replacing
-
-          ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS
-
-          with
-
-          ACE_LACKS_POSIX_PROTOTYPES_FOR_SOME_FUNCS
-
-          in OS.i.  Thanks to James CE Johnson  <ace-users@lads.com> for
-          pointing this out.
-
-Sun Aug 31 09:58:35 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Princess Diana was killed today in a senseless auto accident in
-          Paris, France.  This is a very tragic ending to a very promising
-          life ahead of her.
-
-Sun Aug 31 15:08:00 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Async_Timer_Queue_Test.cpp: fixed and added some
-          ACE_UNUSED_ARG's.
-
-        * netsvcs/clients/Tokens/invariant/invariant.cpp (run_mutex,
-            run_reader_writer),
-          netsvcs/clients/Tokens/mutex/test_mutex.cpp (run_test),
-          netsvcs/clients/Tokens/rw_lock/rw_locks.cpp (run_thread):
-          removed unused argument "vp".
-
-        * ace/ACE.i (log2): moved "log" declaration outside of the
-          for loop because its used after the loop.
-
-        * ace/Task.cpp (instance) only register for destruction with
-          ACE_Object_Manager when creating a new instance_.
-
-        * ace/Thread_Manager.cpp (ACE_Thread_Control::exit) with TSS
-          emulation, don't exit the thread.  Instead,
-          ACE_Thread_Adpater::invoke () will do it after cleaning up TSS.
-
-        * ace/Synch{h,cpp}: (ACE_TSS_Cleanup_Lock) register for
-          destruction with ACE_Object_Manager.
-
-        * ace/OS.*: major cleanup of ACE_TSS_Emulation, esp. how it
-          interacts with ACE_TSS_Cleanup::exit ().
-
-Sat Aug 30 17:30:24 1997  Steve Huston  <shuston@riverace.com>
-
-        * Removed these config files:
-                config-hpux-10.x-aCC.h
-                config-hpux-10.x-decthreads.h
-                config-hpux-10.x-nothread.h
-          config-hpux-10.x-hpc++.h should be used with HP compilers on
-          HP-UX 10.x.
-
-Sat Aug 30 14:58:42 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Signal.cpp (ACE_Sig_Action): Added a new constructor that
-          also takes an ACE_Sig_Set & *and* registers the handler...
-
-        * ace/Handle_Set.cpp (count_bits): Added a newly optimized
-          algorithm for cases where
-          ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT.  Thanks to Arturo for
-          this suggestion.
-
-        * ace/config-sco-5.0.0*.h: Added ACE_HAS_LONG_FDMASK for all the
-          SCO files.  Thanks to Arturo for suggesting this.
-
-        * ace/Signal: Added a new mutator method to reassign an
-          ACE_Sig_Set to an ACE_Sig_Action.
-
-        * ace/Handle_Set.i: If the size of the fd_set is 0 then operator
-          fd_set *() just returns 0.  This will help to optimize the
-          performance of the Reactor.  Thanks to Arturo for suggesting
-          this.
-
-        * ace/Handle_Set.cpp (count_bits): Added yet another improvement
-          to remove the "i" iterator.  Thanks to Arturo for this!
-
-        * ace/Log_Msg.cpp (log): Used the new ACE_Log_Record::priority()
-          method in place of the type() method so that the priorities are
-          handled correctly.
-
-        * ace/Log_Record: Added two new methods that get/set the
-          "priority" of an ACE_Log_Record.  This value computed as the
-          base 2 log of the value of the corresponding ACE_Log_Priority
-          enumeral (which are all powers of two).  We need this mapping
-          function so that we can use the priorities as parameters to the
-          putpmsg() function (which can only map between 0-255).  Thanks
-          to Per Andersson for finding this stuff!
-
-        * ace/ACE: Added a new method to compute the base2 logarithm of a
-          number.
-
-        * Replaced all uses of ACE_Thread_Control since this is now
-          handled by the ACE_Thread_Manager.
-
-        * ace/Thread_Manager.cpp (spawn_i): Make sure to pass "this" to
-          the ACE_Thread_Adapter if we're constructing it in the
-          ACE_Thread_Manager::spawn_i() method.
-
-        * ace/OS.i (cond_timedwait): Added a special check to see if
-          timeout != 0, in which case we just call ACE_OS::cond_wait().
-          Therefore, VxWorks can now use ACE_OS::cond_timedwait(), as long
-          as the timeout == 0!  This simplifies certain internal ACE code.
-          Thanks to David Levine for pointing this out.
-
-        * ace/Handle_Set.cpp (count_bits):  Changed the code from
-
-          for (int i = 0; i < sizeof (u_long); i++)
-            {
-              rval += ACE_Handle_Set::nbits_[n & 0xff];
-              n >>= 8;
-            }
-
-          to
-
-          for (int i = 0; n != 0; i++)
-            {
-              rval += ACE_Handle_Set::nbits_[n & 0xff];
-              n >>= 8;
-            }
-
-          in order to speed it up in the "best case."  Thanks to Arturo
-          Montes <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/Thread.cpp (spawn_n): Added a test to make sure that the
-          thread_ids is != 0 before we assign into this.
-
-Fri Aug 29 22:45:21 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-vxworks-g++.h:
-        * ace/config-vxworks5.x-g++.h:
-        * ace/config-sunos4-g++.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.5-g++.h:
-          Added flag ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR to these
-          config files.
-
-        * ace/README: Added explanation of flag
-          "ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR."
-          When calling a template class'es destructor explicitly, if you
-          must use "ptr->FOO<BAR>::~FOO ();" but not
-          "ptr->FOO<BAR>::~FOO<BAR> ();" then, you must add this flag to
-          your config file.
-
-        * ace/OS.h (ACE_DES_FREE_TEMPLATE): Added this new macro to cope
-          with the fact that compilers require different syntax when
-          calling destructor of template classes explicitly.  This macro
-          takes four arguments, POINTER, DEALLOCATOR, CLASS, and
-          TEMPLATE_PARAMETER.  To deallocate a pointer allocated by
-          ACE_NEW_MALLOC and you need to call FOO<BAR> class'es
-          destructor, you'll write:
-
-            ACE_DES_FREE_TEMPLATE (ptr, alloc->free, FOO, <BAR>);
-
-        * ace/Containers.cpp: Changed to use ACE_DES_FREE_TEMPLATE to iron
-          out differences among compilers.
-
-Fri Aug 29 15:31:50 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.*,Synch.{h,cpp},Object_Manager.cpp: started adding
-          support for TSS emulation.
-
-        * ace/OS.h: declare class ostream if
-          ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * tests/Async_Timer_Queue_Test.cpp (parse_commands): fixed
-          sscanf format specifiers to match argument types; (main):
-          fixed ACE_ERROR_RETURN parens; protected bulk of code with
-          ACE_HAS_UALARM so that the test will build cleanly on
-          platforms without it.
-
-Fri Aug 29 00:43:27 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Synch.cpp (wait): Simpified the call to
-          ACE_OS::cond_timedwait() to avoid an extra test.  Thanks to
-          Arturo for pointing this out.
-
-        * ace/TTY_IO: Added native support for TSETA.  Thanks to Arturo for
-          this.
-
-        * ace/Strategies_T.cpp: Finished integrating the ACE_DLL_Strategy
-          implementation, which is used in TAO.  Thanks to Satheesh Kumar
-          MG <satheesh@india.aspectdv.com> for motivating this.
-
-        * ace/Synch_T.h: Clarified the constructor for ACE_TSS that takes
-          a TYPE * as an argument.  Note that this only initializes the
-          TSS value in the *calling* thread, but not any other threads
-          that may come along later on.  Thanks to Bob Laferriere
-          <laferrie@gsao.med.ge.com> for helping to clarify this.
-
-        * ace/Synch_T.h: Removed stray semi-colons from some of the
-          ACE_SYNCH_* macros.  Thanks for Wei Chiang for reporting this.
-
-Fri Aug 29 11:40:10 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.cpp:  Added cast for ace_thread_adapter.
-
-        * ace/OS.h:  Changed name of ACE_Thread_Adapter's constructor's
-          fourth parameter from tm to tmgr since tm conflicted with
-          another tm.
-
-        * ace/Thread_Manager.cpp: In spawn_i, changed the last parameter
-          given to spawn to thread_args.  Also had to add a cast for
-          ace_thread_adapter.
-
-Fri Aug 29 06:44:05 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.h (ACE_DES_FREE): Added this macro which will call
-          designate destructor before freeing the memory.  This is a
-          matching macro that should go with ACE_NEW_MALLOC and
-          ACE_NEW_MALLOC_RETURN which allocate memory using designate
-          allocator then call the user specified constructor explicitly.
-
-        * ace/Containers.cpp: Many memory deallocations of container's
-          nodes were changed to use the new macro which deletes objects
-          correctly.
-
-          Thanks very, very much to Ivan Murphy for torturing various
-          test programs and reporting those tests which fail the
-          excruciation.
-
-Fri Aug 29 01:26:38 1997    <irfan@TWOSTEP>
-
-        * ace/ReactorEx.cpp: Added two new methods to ReactorEx -
-          schedule_wakeup() and cancel_wakeup().  Also fixed some bugs
-          related to our local copy of network_events_ not getting updated
-          properly. Thanks to Edan Ayal <edana@vdo.net> for pointing out
-          the two missing functions.
-
-Thu Aug 28 20:12:23 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: Added a new ace_thread_manager_adapter()
-          function, which is similar to the ace_thread_adapter function
-          used in ACE_OS::thr_create().  However, the new function ensures
-          that threads spawned by an ACE_Thread_Manager are automatically
-          registered and deregistered from the Thread Manager.
-
-        * ace/ACE.h (inherit_log_msg): Factored out the functionality to
-          inherit the logging features if the parent thread has an
-          ACE_Log_Msg instance in thread-specific storage.  This function
-          is called in several places (e.g., OS.cpp and
-          Thread_Manager.cpp), so it pays to factor it out.
-
-        * ace/OS.h (ACE_Thread_Adapter): Added a new data member that
-          keeps track of which thread entry point function we will pass to
-          the underlying OS thread creation routine.  The default value is
-          ace_thread_adapter, but this can be overridden to do different
-          things...
-
-        * ace/OS,
-          ace/Thread: Extended thr_create() so that if an
-          ACE_Thread_Adapter is passed to it this is used in lieu of the
-          func and arg parameters.  This reduces the amount of dynamic
-          allocation and indirection required with the new
-          ACE_Thread_Manager.
-
-        * ace/Task.h: Removed the ACE_Thread_Control data member from the
-          ACE_Task_Exit class since it now belongs to the
-          ACE_Thread_Manager instead...
-
-        * ace/OS.cpp: Move the ACE_Thread_Adapter out of the OS.cpp file
-          and made it a first-class citizen of ACE.  We can put this
-          to good use in the new ACE_Thread_Manager.
-
-        * ace/OS.cpp: The ACE_Thread_Adapter is now the default behavior
-          in ACE.  If you don't want to use it for whatever reason,
-          you'll need to set the ACE_NO_THREAD_ADAPTER macro.
-
-        * ace/config-sco-5.0.0-fsu-pthread.h: Added
-          ACE_LACKS_CONST_TIMESPEC_PTR.  Thanks to Arturo for this.
-
-        * ace/Synch.cpp (wait): Removed the reference assignment and just
-          take the address of this->mutex_.lock_.  Also, removed the
-          additional check for abstime == 0 in order to speed up the
-          common case.  Thanks to Arturo for these suggestions.
-
-Thu Aug 28 20:02:03 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3.1, released Thu Aug 28 20:02:03 1997.
-
-Thu Aug 28 00:21:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Strategies_T.cpp (ACE_Thread_Strategy): Added reasonable
-          values to the default constructor.  Thanks to Stephen Coy
-          <stevec@wsa.com.au> for reporting this.
-
-        * ace/config-irix6.x-sgic++-*.h: Added ACE_HAS_UALARM.  Thanks to
-          Amos Shapira <amos@gezernet.co.il> for reporting this.
-
-        * ace/config-aix-4.*.h: Added ACE_HAS_UALARM.  Thanks to Cary
-          Clark for reporting this.
-
-        * ace/config-hpux-10.x*.h: Added ACE_HAS_UALARM.  Thanks to Cary
-          Clark for reporting this.
-
-        * ace/config-osf1*.h: Added ACE_HAS_UALARM.  Thanks to Thilo
-          for reporting this.
-
-        * ace/config-mvs.h: Added ACE_HAS_UALARM.  Thanks to Chuck Gehr
-          for reporting this.
-
-        * tests/Async_Timer_Queue_Test.cpp: Added a new test that will
-          illustrate how to implement an asynchronously invoked
-          Timer_Queue using UNIX SIGALRM signals.
-
-Thu Aug 28 19:32:07 1997    <irfan@TWOSTEP>
-
-        * examples/Reactor/ReactorEx: Added two new applications
-          (test_registry_changes.cpp and test_console_input.cpp) to show
-          some more features of ReactorEx. test_registry_changes.cpp shows
-          how to monitor the Registry using ReactorEx.
-          test_console_input.cpp shows how to use ReactorEx to get
-          notified when input shows up on the console.
-
-Thu Aug 28 18:07:37 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Timer_{List,Heap,Wheel,Hash}_T.cpp: Changed the behavior
-          of the iterator to automatically initialize when the iterator
-          is constructed.
-
-Thu Aug 28 10:43:35 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Task.{h,cpp} (ACE_Task_Exit::instance) added call to
-          ACE_Object_Manager::at_exit () to clean up the singleton at
-          program termination.
-
-Thu Aug 28 03:25:52 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
-
-        * tests/Task_Test.cpp (Barrier_Task):
-        * tests/TSS_Test.cpp (main): Added an array  to collect thread
-          handles in order to clean them up.  Thanks to Ivan Murphy
-          for pointing this out.
-
-        * ace/Thread_Manager.{h,cpp} (spawn_n):
-        * ace/Task.{h,cpp} (activate):
-          Added an extra argument ACE_hthread_t thread_handles[] with
-          default value 0.  We need this argument to collect handles of
-          spwaned/activated threads.  On NT, we have to join terminated
-          threads explicitly to prevent handles leak.  Thanks to Ivan
-          Murphy for digging this out.
-
-Wed Aug 27 10:48:25 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace: Changed all occurrences of ACE_LACKS_RLIMIT_PROTO to
-          ACE_LACKS_RLIMIT_PROTOTYPE, ACE_LACKS_POSIX_PROTO to
-          ACE_LACKS_POSIX_PROTOTYPES, and ACE_LACKS_SYSV_MSQ_PROTOS to
-          ACE_LACKS_SYSV_MSQ_PROTOTYPES to be more consistent.
-
-        * ace/config-sunos5.x*.h: Added ACE_HAS_UALARM to all the Solaris
-          config files.  However, also had to add ACE_LACKS_UALARM_PROTOTYPE
-          since Solaris strangely doesn't provide this prototype.
-
-        * ace/OS.h: Added an ACE_Time_Value version of ACE_OS::ualarm().
-
-        * ace/Signal: Added a new constructor for ACE_Sig_Action that
-          takes an ACE_Sig_Set parameter.
-
-        * ace/Signal: Added a sigset() accessor method.
-
-        * ace/config-unixware-2.1.2-g++.h: Added ACE_HAS_UALARM.  Thanks
-          to Ganesh Pai <gpai@voicetek.com> for reporting this.
-
-        * ace/OS.h: Added a default value of 0 to ACE_OS::time().
-
-        * ace/Synch.i (ACE_Thread_Mutex_Guard): Rearranged the code so
-          that we can inline the acquire(), tryacquire(), and release()
-          methods properly.  Thanks to David Levine for pointing this out.
-
-        * ace/OS.h: Added ACE_OS support for the ualarm() method.  If your
-          platform supports ualarm() please send me email so I can set the
-          ACE_HAS_UALARM flag in your config.h file.
-
-        * tests/Makefile: Added an asynchronous timer queue test.
-
-        * examples/IOStream/server/iostream_server.cpp: Added a new macro
-          to work around the fact that some C++ compiles don't grok
-          template typedefs.  Thanks to Oleg Krivosheev <kriol@fnal.gov>
-          for pointing this out.
-
-        * ace/OS,
-          ace/Task.cpp:
-          Installed a bunch of patches for FSU pthreads.  Thanks to Arturo
-          Montes <mitosys@colomsat.net.co> for sending this.
-
-        * Makefile: Added a line to the release script that will
-          automatically generate an ACE-INSTALL text file from the
-          ACE-INSTALL.html file.  Thanks to Oleg Krivosheev
-          <kriol@fnal.gov> for suggesting this.
-
-        * performance-tests/Misc/Makefile: Added $(BIN) to the FILE target
-          so that "make depend" will work.  Thanks to David Levine for
-          pointing this out.
-
-        * ace/Synch.i: Eliminated unnecessary assignment to this->owner_.
-          Thanks to Chris for pointing this out.
-
-        * ace/OS.i (msgctl): Added a "struct" to the definition of
-          msqid_ds.  Thanks to Steve Hickman <SHICKMAN@cobra.mcit.com> for
-          reporting this.
-
-Thu Aug 28 01:07:21 1997    <irfan@TWOSTEP>
-
-        * examples/Reactor/ReactorEx/test_directory_changes.cpp: Added a
-          new example application.  This application tests the working of
-          ReactorEx when users are interested in changes in the
-          filesystem.
-
-Wed Aug 27 22:06:23 1997  Nanbor Wang  <nw1@lambada.cs.wustl.edu>
-
-        * *.{mak,mdp,dsw,dsp}: Updated ACE's library names on Win32 as
-          below.  Only Microsoft's Win95 and Windows NT are effected.
-
-          Version             Dynamic Library       Static Livrary
-          ------------------  --------------------  -----------------
-          Debug               aced.lib, aced.dll    acesd.lib
-          Release             ace.lib, ace.dll      aces.lib
-          Debug w/ UNICODE    aceud.lib, aceud.dll  acesud.lib
-          Release w/ UNICODE  aceu.lib, aceu.dll    acesu.lib
-
-          Thanks to John Morey <jmorey@tbi.com> for suggesting this and
-          Darrell for updating VC 5.0's makefiles.
-
-        * ace/config-freebsd[-pthread].h (ACE_HAS_UALARM): FreeBSD does has
-          ualarm.
-
-Wed Aug 27 10:52:59 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Synch_T.h (CTOR): Eliminated unnecessary assignment to
-          this->owner_.
-
-Wed Aug 27 09:32:57 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Singleton.cpp (instance): removed full qualification of
-          "instance_" in ACE_NEW_RETURN macro, because it confused
-           the Sun C++ 4.2 preprocessor.
-
-        * ace/Singleton.cpp: added support for ACE_HAS_SIG_C_FUNC platforms,
-          e.g., on MVS.  At least I tried to.  The cleanup function,
-          on ACE_HAS_SIG_C_FUNC platforms only, doesn't call the object's
-          destructor.  It just deallocates the storage.  That should be
-          good enough; I don't think it's worth trying to do more than that.
-
-        * ace/Synch.cpp (close_singleton): removed call to
-          ACE_Allocator::close_singleton (), because this method is
-          only called if ACE_HAS_THREADS.
-
-        * ace/Object_Manager.cpp (dtor): added call to
-          ACE_Allocater::close_singleton (), and protected call to
-          ACE_Static_Object_Lock::close_singleton () with ACE_HAS_THREADS.
-
-        * tests/Time_Value_Test.cpp: disabled ACE_U_LongLong test
-          on ACE_WIN32 platforms, because that class is never used
-          there.  Thanks to Nanbor for finding this.
-
-        * performance-tests/Misc/preempt.cpp,Makefile: added preempt
-          test, which tests for thread preemption.
-
-Tue Aug 26 13:59:01 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler_T.cpp: Changed the symbol
-          "SS" to "SST" to avoid a namespace collision with UnixWare.
-          Thanks to Ganesh Pai <gpai@voicetek.com> for pointing this out.
-
-        * ace: Added a new config file to sco using FSU pthreads.  Thanks
-          to Arturo Montes <mitosys@colomsat.net.co> for sending this.
-
-        * include/makeinclude: Added a new platform macros file to sco
-          using FSU pthreads.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for sending this.
-
-Tue Aug 26 22:06:14 1997    <irfan@TWOSTEP>
-
-        * examples/Reactor/ReactorEx: Added two new applications for
-          testing some of the new features of ReactorEx.  Added
-          documentation and renamed some of the older test files to make
-          it easier to comprehend the examples.
-
-Tue Aug 26 11:47:29 1997    <irfan@TWOSTEP>
-
-        * ace/OS.i (mutex_trylock): Changed this method to make it deal
-          correctly with abandoned mutexes. Also added a new mutex_trylock
-          method that allows the user to know if the mutex was abandoned
-          (through an extra out parameter).  Also fixed
-          ACE_OS::cond_timedwait(), ACE_OS::cond_wait(),
-          ACE_OS::event_wait(), ACE_OS::event_timedwait() and
-          ACE_OS::sema_wait() to remove extra checks for WAIT_ABANDONED,
-          since we are not dealing with mutexes in these methods.  Thanks
-          to Ivan Murphy <Ivan.Murphy@med.siemens.de> for pointing this
-          out.
-
-Tue Aug 26 11:06:45 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h,config-vxworks5.x-g++.h:
-          split ACE_HAS_RENAMED_MAIN into ACE_MAIN and
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-
-        * ace/ACE.cpp: only create the ACE_Object_Manager_Destroyer
-          if not ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-
-        * ace/Object_Manager.{h,cpp}: dynamically allocated the
-          contained ACE_Unbounded_Queue to so that it can be deallocated
-          before the ACE_Allocator is destroyed.
-
-        * ace/Singleton.{h,cpp}: register all ACE_Singletons for
-          cleanup with the ACE_Object_Manager.
-
-        * ace/Synch.{h,cpp}: renamed ACE_Static_Object_Lock::atexit () to
-          close_singleton (), and removed the unused atexit hook.
-
-        * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::close): delete the
-          main thread's Log_Msg.
-
-        * ace/config-vxworks-ghs-1.8.h: added ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-
-        * tests/Time_Value_Test.cpp: added tests of ACE_U_LongLong.
-
-        * tests/Atomic_Op_Test.cpp (main): added arguments to main ().
-
-        * tests/Barrier_Test.cpp (main): delete thread_handles array
-          to prevent memory leak.
-
-        * examples/Reactor/Misc/test_signals_2.cpp (main): changed
-          type of second arg from "char *" to "char *[]".
-
-Mon Aug 25 14:13:57 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * ace/OS.h:
-          Changed the return type of sendmsg_timedwait from sszie_t to
-          ssize_t, this should only affect platforms where
-          ACE_LACKS_TIMEDWAIT_PROTOTYPES, further it was definitely wrong
-          before.
-          Thanks to ARTURO MONTES <mitosys@colomsat.net.co> for pointing
-          out this one.
-
-Mon Aug 25 10:15:06 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Message_Queue.cpp (notify): fixed ACE_TRACE message.
-
-        * examples/ASX/UPIPE_Event_Server/event_server.cpp,
-          examples/Connection/misc/test_upipe.cpp,
-          examples/Connection/non_blocking/test_*.cpp,
-          examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp,
-          examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp,
-          examples/Misc/test_dump.cpp,
-          examples/Reactor/FIFO/client.cpp,
-          examples/Reactor/Misc/test_*.cpp,
-          examples/Reactor/Proactor/test_multiple_loops.cpp,
-          examples/Reactor/Proactor/test_timeout.cpp,
-          examples/Reactor/ReactorEx/test_timeout.cpp,
-          examples/Reactor/ReactorEx/test_exceptions.cpp,
-          examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp,
-          examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp,
-          examples/Shared_Malloc/test_multiple_mallocs.cpp,
-          examples/System_V_IPC/SV_Message_Queues/*MQ_*.cpp,
-          examples/System_V_IPC/SV_Semaphores/Semaphores_?.cpp,
-          examples/Threads/process_mutex.cpp,
-          examples/Threads/recursive_mutex.cpp,
-          examples/Threads/tss1.cpp,
-          examples/Threads/thread_specific.cpp,
-          examples/Threads/token.cpp,
-          examples/Threads/wfmo.cpp,
-          tests/Simple_Message_Block_Test.cpp,
-          tests/Hash_Map_Manager_Test.cpp:
-          added arguments to main () to support redeclaring it on VxWorks.
-
-          From now on, we should always declare main () with arguments, e.g.,
-          int
-          main (int, char *[])
-
-Sun Aug 24 10:27:33 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/Future_Test.cpp (Scheduler): Removed the non-existent
-          friend class Method_ObjectWork.  Thanks to Sandro Doro
-          <doros@aureus.sublink.org> for reporting this problem.
-
-        * ace/Message_Block.h: Clarified in the comments that the length()
-          of a Message_Block is 0 until the wr_ptr() is explicitly set.
-          Thanks to Amos Shapira <amos@gezernet.co.il> for pointing out
-          the need for this.
-
-Sat Aug 23 14:43:27 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.3, released Sat Aug 23 14:43:27 1997.
-
-Sat Aug 23 14:40:32 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Released the long-awaited ACE 4.3.  Good night sweet prince:
-          And flights of angels sing thee to thy rest.
-
-Sat Aug 23 00:44:09 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler.cpp: Make sure that we
-          explicitly instantiate ACE_Svc_Handler<LOGGING_PEER_STREAM,
-          ACE_NULL_SYNCH> whether or not we're building with threads
-          since otherwise we get link errors.
-
-Fri Aug 22 20:58:49 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_TSS_Cleanup):  Changed the lock for
-          ACE_TSS_Cleanup from a static object to a singleton to avoid the
-          nasty detruction order problem.  This only effects Win32.
-
-        * ace/Synch.{h,cpp}: Added a new singleton lock
-          "ACE_TSS_Cleanup_Lock" for Win32 platform.  This object is
-          expect to be put under ACE_Object_Manager's control and will
-          probably gone/changed in the near future.
-
-Fri Aug 22 18:48:17 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * ACE-install.sh:
-          I updated the information on IRIX. Now we know for a fact it
-          compiles on IRIX 6.x, but we are not certain on IRIX 5.X.
-
-        * bin/auto_compile_wrapper:
-          I have tried to make it clear that auto_compile_wrapper must be
-          tailored on each site. The email address is invalid and the
-          script should just crash the
-
-        * ace/OS.i (cond_timedwait):
-          It used to always dereference the timeout parameter, which could
-          be 0 (heading for a
-          Sthreads use timestruc_t instead of timespec_t, thanks to
-          Ganesh Pai <gpai@voicetek.com> for pointing out this one and to
-          Steve Huston <shuston@riverace.com> for explaining to us what
-          was going on.
-
-Fri Aug 22 08:46:39 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks*.GNU:
-          unset SHLIB to fix builds without PRELIB.
-
-        * netsvcs/lib/Logging_Strategy.cpp,
-          examples/Threads/task_three.cpp: include fstream.h and
-          iostream.h if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * examples/ASX/UPIPE_Event_Server/event_server.cpp,
-          examples/Log_Msg/test_log_msg.cpp,
-          examples/Reactor/Misc/test_time_value.cpp,
-          examples/Logger/Accepter-server/server_loggerd.cpp:
-          #include iostream.h if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp (svc):
-          replaced an iostream printout with an ACE_DEBUG call.
-
-        * examples/Misc/test_read_buffer.cpp,
-                        test_dump.cpp,
-                   Mem_Map/IO-tests/test_io.cpp:
-          replaced bare OS calls with ACE_OS calls.
-
-        * examples/Reactor/Misc/notification.cpp (Thread_Handler):
-          added cast of svc_run to ACE_THR_FUNC.
-
-Thu Aug 21 22:38:19 1997  Carlos O'Ryan  <coryan@polka.cs.wustl.edu>
-
-        * bin/auto_compile:
-          This tool will checkout ACE_wrapper from CVS, use
-          bin/create_ace_build to update a clone directory, compile ace
-          and tests in that clone directory and then run run_tests.sh.
-          If there is any problem it will report it to email.
-
-        * bin/auto_compile_wrapper:
-          The former needs some configuration information and a proper
-          enviroment, hence it may not be invoked directly from your
-          crontab. This tool is used for that purpose.
-
-        * apps/Gateway/Gateway/Makefile:
-        * apps/JAWS/server/Makefile:
-        * examples/Connection/non_blocking/Makefile:
-        * examples/IPC_SAP/DEV_SAP/reader/Makefile:
-        * examples/IPC_SAP/DEV_SAP/writer/Makefile:
-        * examples/Service_Configurator/IPC-tests/server/Makefile:
-        * netsvcs/clients/Naming/Client/Makefile:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile:
-        * performance-tests/Synch-Benchmarks/Makefile:
-          No need to defines LIBS=-lACE here, it is already done in
-          wrapper_macros.GNU. Thanks to Cary Clark <claca@iccokc.com> for
-          pointing out this one.
-
-        * bin/create_ace_build:
-          New flag -a to create all symlinks using absolute paths, it
-          helps when the build directory is a symlink too.
-
-        * include/makeinclude/platform_irix6.x-sgic++.GNU:
-          ACE now compiles with little or no warnings, I kept the linker
-          warnings deactivated though.
-          -ptall does not work any more. I added a comment on that.
-
-        * ace/OS.h:
-        * apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp:
-        * apps/JAWS/clients/Blobby/Blob_Handler.cpp:
-        * apps/JAWS/server/HTTP_Server.cpp:
-        * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp:
-        * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp:
-        * examples/IPC_SAP/SPIPE_SAP/producer_read.cpp:
-        * examples/Reactor/Dgram/CODgram.cpp:
-        * examples/Reactor/Dgram/Dgram.cpp:
-        * examples/Reactor/Misc/test_demuxing.cpp:
-        * examples/Reactor/Misc/test_reactors.cpp:
-        * examples/Reactor/Misc/test_signals_2.cpp:
-        * examples/Threads/barrier2.cpp:
-        * examples/Threads/process_manager.cpp:
-        * examples/Threads/task_three.cpp:
-        * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp:
-        * netsvcs/clients/Tokens/collection/collection.cpp:
-        * netsvcs/clients/Tokens/mutex/test_mutex.cpp:
-        * performance-tests/Misc/childbirth_time.cpp:
-        * tests/Reactor_Exceptions_Test.cpp:
-        * tests/Reactors_Test.cpp:
-        * tests/SOCK_Test.cpp:
-          New macro ACE_NOTREACHED. Some compilers will issue warnings on
-          unreached statements with things like:
-            int foo()
-            {
-              if (bar) {
-                return 0;
-              } else {
-                return 1;
-              }
-              return 0; // warning here
-            }
-          but if we remove the last return some other compiler will issue
-          warnings on leaving the function with no return value.
-          This macro tries to deal with that, all we have to do is to
-          write the last line like:
-            int foo()
-            {
-              if (bar) {
-                return 0;
-              } else {
-                return 1;
-              }
-              ACE_NOTREACHED(return 0); // No warning now!!!
-            }
-          IMHO it also serves as a form of documentation.
-
-Thu Aug 21 21:00:35 1997    <irfan@TWOSTEP>
-
-        * ace/Auto_Ptr: Changed auto_ptr implementation to be as close
-          to the C++ specification as possible. Things that are still
-          missing are:
-          (a) std namespace
-          (b) member templates implementations
-          (c) making the constructors explicit
-
-        * ace/OS.h (ACE_BIT_STRICTLY_ENABLED): Added new macro to check if
-          a bit is strictly enabled in a word.  This is necessary when the
-          bit would be a combination of bits, and therefore, just
-          comparing against != 0 (like ACE_BIT_ENABLED does) is not enough
-          and comparing == BIT is necessary.
-
-Thu Aug 21 19:28:28 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU (depend.local): If TAO_ROOT
-          is not set, don't try using it in sed.
-
-        * bin/g++dep: Check the existence of the TAO_ROOT environment
-          variable before adding it to the relative pathname replacement
-          strategy.
-
-Thu Aug 21 16:29:02 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: added THR_JOINABLE and THR_SCHED_FIFO/RR/DEFAULT
-          to STHREADS, WTHREADS, and non-threaded platforms.  On VxWorks
-          only, set NSIG to _NSIGS + 1.
-
-        * ace/config-vxworks*.h: removed ACE_HAS_POSIX_SEM now that we
-          emulate it for VxWorks.
-
-        * tests/Priority_Task_Test.cpp: use THR_SCHED_FIFO unconditionally
-          now that it's defined on all platforms.
-
-        * include/makeinclude/platform_chorus.GNU,
-                              platform_hpux_gcc.GNU,
-                              platform_linux*.GNU,
-                              platform_m88k.GNU,
-                              platform_osf1_4.0_g++.GNU,
-                              platform_sco*.GNU,
-                              platform_sunos*_g++.GNU,
-                              platform_unixware_g++.GNU,
-          g++ only: replaced PRELIB with "true" because it's not
-          needed for template instantiation.  The old PRELIB no longer
-          worked without -lACE being added to LIBS in individual Makfiles.
-          The only reason to leave PRELIB defined to something is so that
-          the shared object definitions will be correct in rules.lib.GNU.
-          That should be fixed after 4.3 is released.
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
-          PRELIB no longer needed with explicit template instantiation.
-
-Thu Aug 21 12:38:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x.h: Removed extraneous #endif
-
-Thu Aug 21 12:21:16 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.h (THR_JOINABLE): Defined this macro for Win32 as 0.
-
-Wed Aug 20 22:36:52 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.44, released Wed Aug 20 22:36:52 1997.
-
-Wed Aug 20 18:28:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x.h: Made some definitions dependent on the
-          HP-UX version that is compiling the code.
-
-        * ace/Filecache.(cpp h): Moved the definition of ACE_Filecache_Object
-          from .cpp to .h to help AIX xlC's template instantiator along.
-
-        * apps/Gateway/Peer/Peer.(cpp h): Moved the definition of Peer_Handler
-          from .cpp to .h to help AIX xlC's template instantiator along.
-
-        * include/makeinclude/platform_(hpux hpux_aCC hpux_gcc).GNU:  Added
-          a compiler option to define HPUX_VERS with the current OS version.
-          Used in the config-hpux-10.x.h file.
-
-Wed Aug 20 13:44:16 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-        * ace/config-unixware-2.1.2-g++.h:
-          Unixware does not define timespec_t. Thanks to Ganesh Pai
-          <gpai@voicetek.com> for pointing out this one.
-
-Wed Aug 20 11:37:44 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.bin.GNU,platform_vxworks5.x_g++.GNU:
-          added POSTLINK to build symbol table.
-
-Wed Aug 20 07:43:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.43, released Wed Aug 20 07:43:14 1997.
-
-Tue Aug 19 08:25:28 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/Barrier_Test.cpp: Added THR_JOINABLE to the flags for
-          creating threads - allows join to work on platforms that create
-          threads detached by default (i.e. AIX).
-
-        * tests/Process_Strategy_Test.cpp: If the final ACE_OS::kill() fails,
-          don't ACE_OS::wait() for the process.
-
-        * ace/config-aix-4.2.x.h: Added ACE_HAS_BROKEN_POSIX_TIME.  Commented
-          out ACE_HAS_AIX_BROKEN_SOCKET_HEADER.  Added ACE_HAS_PTHREAD_T,
-          and will now not use tid_t for any ACE types.  Rearranged things
-          to start clarifying items.
-
-        * ace/config-hpux-10.x.h: Removed ACE_HAS_SETKIND_NP and adjusted
-          other, more meaningful, threads-related definitions to match what
-          HP 10.10 and 10.20 have for threads.  This matches changes to OS.*
-
-        * ace/OS.(h i cpp): Removed use of ACE_SETKIND_NP in an effort to
-          simplify the variety of threads-capability definitions.  The only
-          platforms which used ACE_HAS_SETKIND_NP were HP-UX (see above) and
-          OSF/1 V3.2 (which has the same threads package as HP-UX).  OSF/1
-          V3.2 may require some adjustments per this change - it probably
-          should be changed to match HP-UX.  OSF/1 V4 (aka Digital UNIX)
-          is not affected by this change.
-
-        * ace/Log_Msg.cpp: Changed the 't' format (thread ID) to call
-          thread_self() directly on AIX.
-
-Mon Aug 18 21:39:33 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.42, released Mon Aug 18 21:39:33 1997.
-
-Mon Aug 18 20:22:14 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * apps/Gateway/Peer/Makefile:
-          No need to define LIBS=-lACE here, its already done in
-          wrapper_macros.GNU.  Thanks to Cary Clark <claca@iccokc.com>
-          for helping in this effort.
-
-Mon Aug 18 19:54:36 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.{h,i} (open, mutex_init, sema_init, event_init, mmap):
-          Added an extra argument LPSECURITY_ATTRIBUTE with default value
-          0 to all these methods so that we can modify objects' security
-          attributes when needed.  Thanks to Ivan Murphy for pointing this
-          out.
-
-Mon Aug 18 19:50:13 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-        * examples/Service_Configurator/Makefile:
-        * examples/Service_Configurator/IPC-tests/server/Makefile:
-        * apps/Gateway/Gateway/Makefile:
-        * examples/Connection/non_blocking/Makefile:
-          $(SOEXT) must be used instead of just .so, the former does not
-          work on all platforms, notably HP-UX.  Thanks to Cary Clark
-          <claca@iccokc.com> for helping in this effort.
-
-Mon Aug 18 19:46:27 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/OS.i:
-          Added support for the missing netdb reentrant functions, even
-          under IRIX 6.2 with no threads.  Thanks Paul Roman
-          <proman@npac.syr.edu> for reporting this.
-
-Mon Aug 18 12:53:16 1997  David Levine  <levine@merengue.cs.wustl.edu>
-
-        * tests/Barrier_Test.cpp (tester): VxWorks doesn't support
-          thr_join().  Therefore, we need to work around it for now.
-          Maybe Wind River will fix it at some point.
-
-Mon Aug 18 12:38:52 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.2.x.h: Removed ACE_HAS_SVR4_TIME, added
-          ACE_LACKS_TIMESPEC_T.
-
-Mon Aug 18 12:00:31 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/config-mvs.h:
-          MVS does not define timespec_t either.  Thanks to Chuck
-          Gehr for reporting this.
-
-Mon Aug 18 10:41:05 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/OS.h:
-        * ace/README:
-          On some platforms timespec_t is not defined. We added a new
-          config macro (ACE_LACKS_TIMESPEC_T) to handle that and we do a
-          typedef to solve the problem.
-
-        * ace/config-freebsd-pthread.h:
-        * ace/config-freebsd.h:
-        * ace/config-linux-lxpthreads.h:
-        * ace/config-linux-pthread.h:
-        * ace/config-linux.h:
-          These are *some* config files that needed changes due to the new
-          timespec_t stuff.
-
-Mon Aug 18 09:34:11 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_Thread_Adapter): rearranged initializers to
-          match declaration order.
-
-        * ace/Log_Record.h: declare "class ostream" if
-          ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION Log_Record.h.
-
-        * ace/IOStream.h,Log_Msg.cpp,Log_Record.cpp,
-          tests/test_config.h: include iostream.h instead of ace/stdcpp.h
-          if ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * ace/config-vxworks*.h: added ACE_LACKS_TIMESPEC_T.
-
-Sun Aug 17 20:58:56 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.41, released Sun Aug 17 20:58:56 1997.
-
-Sun Aug 17 17:02:53 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/config-irix6.x-sgic++-nothreads.h:
-        * ace/config-irix6.x-sgic++.h:
-        * include/makeinclude/platform_irix6.x-sgic++.GNU:
-          Finally a single config.h and platform_macros.GNU file can be use
-          for all the IRIX 6.X versions.
-          On SGI machines we need a higher value for
-          ACE_DEFAULT_BASE_ADDR, we used 1024*1024*1024, which works on
-          our site, but your mileage may vary.
-
-        * include/makeinclude/platform_irix6.2_sgic++.GNU:
-        * include/makeinclude/platform_irix6.4_sgic++.GNU:
-        * ace/config-irix6.2-sgic++-nothreads.h:
-        * ace/config-irix6.2-sgic++.h:
-        * ace/config-irix6.4-sgic++-nothreads.h:
-        * ace/config-irix6.4-sgic++.h:
-          These files are no longer needed, see above.
-
-        * ace/README:
-        * ace/ACE.cpp:
-        * ace/OS.h:
-        * ace/OS.i:
-        * ace/Profile_Timer.cpp:
-        * ace/Profile_Timer.h:
-          We no longer use timestruct_t in ACE, it is a SYSVism; we use
-          timespec_t instead.  Hence we have no need for the config
-          macro ACE_HAS_SVR4_TIME, but we keep it there for future
-          reference.
-
-        * tests/Reader_Writer_Test.cpp:
-          On IRIX using ACE_Thread::yield() degraded performance for
-          multiprocessor machines, but worse, the test will not behave as
-          expected: instead of interleaving read/write locks over the
-          RW_Mutex it will make all the write locks first and then the read
-          locks.  The test uses ACE_OS::sleep() for yielding the CPU,
-          and it uses different pauses for each thread (see code for
-          details). Further, it yields the CPU *before* taking the
-          lock, to give other threads a chance.
-
-Sat Aug 16 18:17:10 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.40, released Sat Aug 16 18:17:10 1997.
-
-Sat Aug 16 18:13:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/ReactorEx.cpp (add_network_events_i): Revised the code to
-          use the ACE_BIT_CMP_MASK and ACE_SET_BITS macros to simplify the
-          code.
-
-        * ace/OS.h: Added a new macro called ACE_BIT_CMP_MASK which checks
-          if a "bit-wise" & with a word == a particular mask.
-
-        * ace/OS.cpp (thr_create): If we're in the Pthreads implementation
-          then we assume that ACE_thread_t and ACE_hthread_t are the same.
-          If this *isn't* correct on some platform, please let us know.
-          Thanks to Carlos O'Ryan <coryan@cs.wustl.edu>.
-
-        * ace/Auto_Ptr.cpp: Reverted the changes of ACE_Auto_Ptr to
-          auto_ptr since we want to be Standard C++ Library compliant.
-          However, we only define auto_ptr if ACE_HAS_STANDARD_CPP_LIBRARY
-          is *not* enabled.
-
-        * Removed the INSTALL file since this is redundant with the HTML
-          version of this file (ACE-INSTALL.html).  Thanks to David Levine
-          for doing the legwork to merge this.
-
-Sat Aug 16 15:11:24 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Auto_Ptr.h: Put in an #include <memory> (for auto_ptr) if
-          the standard C++ library is being used.
-
-        * ace/Auto_Ptr.*: Changed the checks for ACE_HAS_STANDARD_CPP_LIBRARY
-          to also check to see if it is defined to 0 (which means the same
-          as it not being defined).
-
-        * ace/ReactorEx.cpp: Changed the use of auto_ptr to work with
-          the one in the Standard C++ library.
-
-        * ace/config-win32-common.h: Added ACE_HAS_BROKEN_NESTED_TEMPLATES
-          and ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER for the MSVC versions
-          that need them.
-
-        * ace/Registry.cpp: changed some variable names from iterator to
-          iter to prevent conflicts with another variable
-
-        * ace/Registry.cpp:
-          STL/bstring.h:
-
-          Changed references of NPOS to Istring::npos
-
-Sat Aug 16 14:17:07 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * ace/Auto_Ptr.i:
-        * ace/Auto_Ptr.cpp:
-          Some code was only included if ACE_HAS_STANDARD_CPP_LIBRARY was
-          defined; but the intention was exactly the opposite.
-
-Sat Aug 16 14:33:26 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * README,FAQ,Makefile: changed references from INSTALL file
-          to ACE-INSTALL.html.
-
-Fri Aug 15 19:51:52 1997    <irfan@TWOSTEP>
-
-        * ace/Auto_Ptr.h: A rarely used piece of ACE code has changed
-          names because of name conflicts with the Microsoft Standard C++
-          Library. The change is from auto_ptr to ACE_Auto_Ptr. A perl
-          script ($ACE_ROOT/bin/auto_ptr.perl) is provided for users to
-          change their code accordingly.
-
-          The following files were effected:
-
-          ace: ACE.cpp Auto_Ptr.cpp Auto_Ptr.h Auto_Ptr.i OS.h
-               ReactorEx.cpp Service_Config.cpp Service_Object.h
-
-          examples/Threads: future1.cpp future2.cpp test_future1.cpp
-                            test_future2.cpp
-
-          tests: Future_Test.cpp
-
-Fri Aug 15 17:41:28 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.39, released Fri Aug 15 17:41:28 1997.
-
-Fri Aug 15 13:33:04 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.h (ACE_DEFAULT_GLOBALNAME_W): Moved pathname delimiter
-          from ACE_DEFAULT_{LOCAL|GLOBAL}NAME_* to
-          ACE_DEFUALT_NAMESPACE_DIR on NT.  We need to append local/global
-          name to get a unique mutex name for naming service.  NT won't
-          let us put a backslash in lock name. ;(
-
-Fri Aug 15 14:50:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile: Moved ARGV from the TEMPLATES section to the FILES
-          section; now builds on AIX.
-
-        * ace/config-hpux-10.x.h: Don't redefine _HPUX_SOURCE.  Move the
-          ACE_HAS_REENTRANT_FUNCTIONS and ACE_CTIME_R_RETURNS_INT to the
-          build-with-threads section.  Thanks to Neil Cohen <nbc@metsci.com>
-          for helping to flush these problems out.
-
-        * tests/Makefile: If building on AIX, wipe out the tempinc directory
-          before each compilation to keep the driver from compiling all
-          prior programs' template instantiations in every link step.
-
-Fri Aug 15 13:07:26 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Signal.cpp (remove_handler): Added some additional
-          parameters to ACE_Sig_Action usages in order to get this stuff
-          to compile with G++ on SunOS 4.1.4.  Thanks to Kumar Neelakantan
-          <kneelaka@PaineWebber.COM> for reporting this.
-
-        * ACE version 4.2.38, released Thu Aug 14 23:07:26 1997.
-
-Fri Aug 15 13:33:04 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Naming_Context.cpp (ACE_Naming_Context): Moved the deletion
-          of name_options_ from close to dtor of this class so that we can
-          reconfigure the naming context.
-
-Fri Aug 15 10:28:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.cpp: Changed uname() for Win32 so it returns information
-          for Windows 95 and NT.
-
-Thu Aug 14 18:06:37 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/OS.[hi] (strsplit_r): Added a new method which splits a
-          string separated by tokens, similar to the way that perl's
-          split() works.  This is different from the strtok() family b/c
-          for the string ":/foo:/bar::boo", strtok() would return "/foo",
-          "/bar", "boo", while strsplit_r() returns "", "/foo", "/bar",
-          "", "boo".  This method is also properly re-entrant, and thus
-          safe to use among multiple threads.
-
-        * ace/ACE.cpp (ldfind): Fixed this so that it now properly deals
-          with paths containing empty components intended to indicate
-          'current directory'.
-
-Thu Aug 14 17:30:36 1997  Steve Huston <shuston@riverace.com>
-
-        * ace/config-hpux-10.x.h - Add ACE_LACKS_CONST_STRBUF_PTR, remove
-          ACE_HAS_POSIX_SEM, clarify comments regarding setting of
-          _CMA_NOWRAPPERS_ - thanks to Cary Clark <claca@iccokc.com> for
-          helping in this effort.
-
-Thu Aug 14 16:14:47 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/High_Res_Timer.cpp (print_ave,print_total): fixed format
-          specification for total_secs to be lu instead of lld.
-
-Thu Aug 14 14:06:37 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/ARGV.cpp: Completed the explicit template instantiations for
-          this component.
-
-Thu Aug 14 11:27:03 1997  Edward Everett Anderson  <eea1@polka.cs.wustl.edu>
-
-        * ace/ARGV.* (argv):
-
-        * Added another behavior to ACE_ARGV -- a user can iteratively
-          build the parameter set with add().  Made the class more
-          consistent so that accessors work no matter which constructor is
-          used.
-
-Thu Aug 14 10:14:37 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * Made several changes to allow ACE to work with the new standard
-          C++ header files, such as <cstdio> and the built in STL.  Thanks
-          to Matthias Kerkhoff <make@cs.tu-berlin.de> for these changes.
-          The default is to use the old headers, unless the
-          ACE_HAS_STANDARD_CPP_LIBRARY is defined as 1.
-
-        * ace/config-win32-common.h:
-          ace/config-win32.h:
-
-          - Added ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB flag to
-            distinguish compilers who have the standard C++ library
-            declared in the namespace std and those who use the global
-            namespace for it
-
-          - Enabled ACE_HAS_SIG_ATOMIC_T and ACE_HAS_TYPENAME_KEYWORD for
-            MSVC 5
-
-          - Changed the semantics of ACE_HAS_STANDARD_CPP_LIBRARY from
-            [defined/undefined] to [(undefined or defined as 0)/defined != 0]
-            to allow the choice between the old iostream and standard C++
-            library for those platforms that support both
-
-          - Don't define the ACE_LACKS_IOSTREAM_FX when building with MSVC
-            5.0 and the standard C++ library.
-
-          - If __ACE_INLINE__ is defined as 0, config-win32-common.h
-            undefines __ACE_INLINE__ to decrease the size of libraries and
-            executables.
-
-        * ace/IOStream.cpp: Moved the #ifdef ACE_LACKS_ACE_IOSTREAM up to the
-          proper place
-
-        * ace/IOStream.h:
-          ace/IOStream_T.h:
-          ace/Log_Msg.cpp:
-          ace/Log_Msg.h:
-          ace/Log_Record.cpp:
-          ace/Log_Record.h:
-          examples/ASX/Message_Queue/*.dsp:
-          examples/OS/Process/*.dsp:
-          examples/Threads/*.dsp:
-          examples/Threads/barrier2.cpp:
-          examples/Threads/task_three.cpp:
-          netsvcs/lib/Logging_Strategy.cpp:
-
-          Updated to including stdcpp.h instead of <iostream.h>,
-          <iomanip.h>, <fstream.h>, etc.
-
-        * ace/OS.h: Updated to use stdcpp.h instead of including the
-          normal C headers.  Moved the includes into stdcpp.h to allow
-          switching between the old and new versions
-
-        * ace/Registry.h: Changed to use the standard C++ headers for STL
-          and added a typedef Name_Component and Binding to
-          ACE_Registry::* to help some unresolved problems.
-
-        * tests/Hash_Map_Manager_Test.cpp:
-          tests/test_config.h:
-
-          Updated to #include ace/stdcpp.h instead of <iostream.h> and
-          <fstream.h>
-
-        * ace/stdcpp.h: Updated to include more of the new standard C++
-          header files, and also promote some of the iostream classes to
-          the global namespace.
-
-        * ace/ace.dsp:
-
-          - Added some folders like Templates and Documentation
-          - Added some files that were missing to the project
-          - Enabled function level linking for debug projects
-          - Set it to "Not using MFC"
-          - Removed wsock32.lib from the project settings (since
-            config-win32-common.h will tell the linker to use the correct
-            winsock library)
-          - Removed some other unnecessary libraries (OLE) from the
-            project.
-
-Wed Aug 13 23:02:45 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.37, released Wed Aug 13 23:02:45 1997.
-
-Wed Aug 13 13:26:27 1997  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * tests/Barrier_Test.cpp (main): Fixed the test of the ACE_Barrier
-          class so that it doesn't leak handles.  This also illustrates
-          the use of the ACE_Thread::join() and
-          ACE_Thread_Manager::spawn_n() methods.  Thanks to Ivan Murphy
-          for pointing this out.
-
-        * ace/Thread_Manager.cpp (spawn_n): Note that if we get a null
-          thread_ids parameter we shouldn't try to index into it!
-
-        * include/makeinclude/rules.local.GNU (OBJDIRS): Added
-          so_locations to the list of directories cleaned up during a make
-          clean/realclean.  Thanks to Amos Shapira for reporting this.
-
-        * ACE version 4.2.36, released Wed Aug 13 07:30:10 1997.
-
-        * include/makeinclude/platform_irix6.[x-]32_sgic++.GNU: Added a
-          -Wl,-woff,133 to LDFLAGS to make the linker shutup about branch
-          instructions that might degrade performance
-          (what does this mean?).  Thanks to Amos for this.
-
-        * tests/test_config.h: Fixed a typo (ourput_file() should be
-          output_file()).  How on earth did this ever work?!  Thanks to
-          Amos Shapira for reporting this.
-
-        * ace/Message_Queue.cpp: Added a couple of new ACE_UNUSED_ARGs
-          Thanks to Amos Shapira for reporting this.
-
-        * ace/OS.cpp (gethrtime): ACE_OS::gethrtime should cast its return
-          value to ACE_hrtime_t instead of (u_long long).  Thanks to
-          Amos Shapira for reporting this.
-
-Wed Aug 13 14:51:47 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/SString.[i,cpp]: moved some inline methods from the .i into
-          the .cpp so the Win32 Unicode Release compiles with inlining.
-
-Wed Aug 13 01:14:08 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/test_config.h (ACE_NEW_THREAD): Removed
-          ACE_Log_Msg::set_flags/clr_flags from this macro because
-          ACE_Log_Msg::flags is a static variable.  We really don't need
-          to reset them when creating new threads.  Once VxWorks can also
-          inherit ACE_Log_Msg's properties, we no longer need this macro.
-
-        * ace/Log_Msg.h: Added trace_depth() functions.  They are required
-          for inheriting ACE_Log_Msg's properties.
-
-        * ace/OS.cpp: Changed ACE_Thread_Adapter implementation so that
-          newly created threads will inherit properties from their parent
-          threads.  This is the default behavior and is valid on all
-          platform except VxWorks.  If you don't want it and would like to
-          arrange the properties propagation yourself, you must define
-          ACE_THREADS_DONT_INHERIT_LOG_MSG in your ace/config.h file.  Now,
-          creating a new thread will go thru ace_thread_adapter on all
-          platform except VxWorks.  If ACE_THREADS_DONT_INHERIT_LOG_MSG is
-          defined but your platform defines ACE_HAS_THR_C_FUNC or
-          ACE_WIN32, creating new threads still need to use
-          ace_thread_adapter.  This change also fixes a previous problem
-          which let threads access another thread's TSS.
-
-Tue Aug 12 21:57:30 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * etc/ACE-guidelines.html: added.
-
-Tue Aug 12 16:54:33 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Added Chuck Gehr's explanation of how to build ACE for MVS to
-          the ACE-INSTALL.html file at http://www.cs.wustl.edu/~schmidt/.
-
-        * ace/OS.i: changed the name of ACE_U_LongLong::dump() to
-          ACE_U_LongLong::output().  Also moved some of the code that was
-          inlined in the class definition into the *.i file.
-
-        * netsvcs/lib/Server_Logging_Handler.cpp: Added a template
-          specialization for ACE_Atomic_Op<ACE_Thread_Mutex, u_long> to
-          make things link with SGI and other systems that have long
-          different than int.  Thanks to Amos Shapira for reporting this.
-
-        * ace/Reactor.cpp (close): Removed the #ifdefs around
-          notify_handler_.open () and notify_handler_.close() since this
-          is now supposed to be available on all build configurations.
-          Thansk to Stefan Ericsson for reporting this.
-
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-          Removed a static variable that seemed to be causing problems for
-          SGI C++.  Also, removed the now unnecessary "inherited" from
-          Handle_Thr_Acceptor.
-
-        * examples/ASX/UPIPE_Event_Server/Peer_Router.h,
-        * netsvcs/lib/Log_Message_Receiver.h: Added an
-          ACE_UNIMPLEMENTED_FUNC macro for the assignment operator to work
-          around silly "features" of SGI C++...
-
-        * include/makeinclude/platform_irix6.[x-]32_sgic++.GNU: Added some
-          additional patches to suppress warning code.  Thanks to Torbjorn
-          Lindgren <tl@funcom.no> for this fix.
-
-        * include/makeinclude/platform_mvs.GNU: Changed all occurrences of
-          "MVSLIB" to "ACELIB".  Thanks to Chuck Gehr for reporting this.
-
-Tue Aug 12 15:03:42 1997  Steve Huston <shuston@riverace.com>
-
-        * ace/Timer_Hash_T.cpp, Timer_Wheel_T.cpp: Replaced references to
-          ACE_High_Res_Timer::gettimeofday with ACE_OS::gettimeofday.
-          The High Res version is deprecated, and doesn't work correctly
-          on HP-UX.
-
-Tue Aug 12 07:51:02 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.35, released Tue Aug 12 07:51:02 1997.
-
-Mon Aug 11 22:30:39 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU: disabled
-          automatic template instantiation, because we use explicit
-          template instantiation, via a #pragma, with Green Hills.
-          Thanks to Brian Mendel <brian.r.mendel@boeing.com> for
-          finding the compiler options.
-
-Mon Aug 11 17:45:44 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.cpp (ace_thread_adapter): Changed the code so that TSS
-          ACE_Log_Msg will get created and put into cleanup stack first no
-          matter there is other ACE_Log_Msg instances or not.  This fixed
-          the "order of destruction" problem on Win32 platform.  Thanks to
-          Irfan for digging this out and helping solving it.
-
-Mon Aug 11 07:25:29 1997    <irfan@TWOSTEP>
-
-        * examples/Reactor/ReactorEx/test_reactorEx.cpp: Updated this
-          example to use the new Proactor and Asynch IO interfaces.
-
-        * ace/Connector.cpp (activate_svc_handler): Fixed the "leak" of
-          svc_handler in case of error. Thanks to Wei Chiang
-          <chiang@tele.nokia.fi> for reporting this.
-
-Mon Aug 11 01:11:26 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.34, released Mon Aug 11 01:11:26 1997.
-
-Mon Aug 11 01:06:02 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Message_Queue.cpp (enqueue_tail_i): Inadvertantly
-          added "signal_dequeue_waiters()" where I meant
-          "signal_enqueue_waiters()."
-
-        * include/makeinclude/wrapper_macros.GNU: Fixed a typo in the
-          wrapper_macros.GNU file that was causing link errors.
-
-Sun Aug 10 11:35:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Message_Queue.cpp: To make sure that we have correctly
-          signaled waiters the signal_enqueue_waiters() and
-          signal_dequeue_waiters() methods now check the return value from
-          the semaphore release if ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is
-          enabled.
-
-        * include/makeinclude/wrapper_macros.GNU (VLDLIBS): Added a
-          new macro called ACELIB that can be used to make it easier
-          to enable static linking for ACE, i.e.:
-
-          ACELIB = -Bstatic -lACE -Bdynamic
-
-          or
-
-          ACELIB = $(ACE_ROOT)/ace/libACE.a
-
-          Can be added to the individual platform_macros.GNU file.  This
-          allowed us to remove special code for MVS in wrapper_macros.GNU.
-          Thanks to Chuck Gehr for this fix.
-
-        * netsvcs/lib: Added some comments after the #endifs.
-
-        * ace/Filecache.cpp (insert_i): Updated the code so that we use
-          ACE_NEW_RETURN rather than operator new.  This macro will
-          protect against failed allocations.
-
-Sat Aug  9 22:08:50 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace: Added two new config files:
-
-          config-irix6.x-sgic++.h
-          config-irix6.x-sgic++-nothreads.h
-
-          This should hopefully consolidate the SGI platform
-          configuration.  Thanks to Torbjorn Lindgren <tl@funcom.no> for
-          this fix.
-
-        * include/makeinclude: Added two new platform macro files:
-
-          platform_irix6.x-n32_sgic++.GNU:
-          platform_irix6.x-32_sgic++.GNU
-
-          This should hopefully consolidate the SGI platform macros.
-          Thanks to Torbjorn Lindgren <tl@funcom.no> for this fix.
-
-        * ace/Filecache.cpp: Fixed the syntax of the SGI pragma stuff.
-          Thanks to Torbjorn Lindgren <tl@funcom.no> for reporting this.
-
-        * ace/Name_Request_Reply.h: Changed MAX_NAME_LEN to MAX_NAME_LENGTH
-          to avoid problems with Solaris 2.6.  Thanks to Thanh Ma <tma@encore.com>
-          for reporting this.
-
-Sat Aug  9 12:10:35 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/config-win32-common.h (ACE_HAS_WINSOCK2):
-        * ace/config-win32.h (ACE_HAS_WINSOCK2): Rearranged definition of
-          this so that users can overwrite the default setting and choose
-          older Winsock if they want.  No action needed for most NT
-          useres. Thanks to jmorey@tbi.com (John Morey) for pointing this
-          out.
-
-Sat Aug 09 11:28:36 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Profile_Timer.i: ACE_HAS_GETRUSAGE and !ACE_HAS_PRUSAGE
-          platforms now use ACE_OS::gettimeofday rather than
-          ACE_High_Res_Timer::gettimeofday in start() and stop() methods.
-
-        * tests/Sigset_Ops_Test.cpp: adjusted test for sigismember() with
-          out-of-range signum to separately test return value and errno.
-          Also, returns non-zero from program on failed test.
-
-Fri Aug 08 17:39:43 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.33, released Fri Aug 08 17:39:43 1997.
-
-Fri Aug 08 02:50:31 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Message_Queue: Factored out the code that differs depending
-          on whether we are using the optimized ACE_Message_Queue
-          implementation (i.e., VxWorks and NT).  This change makes it
-          easier to maintain the code.  Thanks to Darrell for helping with
-          this.
-
-        * ace/Log_Msg.cpp (close): Fixed a couple of typos in this code,
-          in particular, we need to make sure that we don't call
-          ACE_Log_Msg_Manager::close() if we aren't multi-threaded.
-
-        * ACE version 4.2.32, released Fri Aug 08 02:50:31 1997.
-
-Fri Aug  8 13:17:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/OS.* (strtoul): Added the OS function strtoul() to turn
-          strings into unsigned longs.
-
-Fri Aug  8 12:26:54 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Msg.cpp: Fixed some comments and removed unused code
-          I erroneously added August 6.
-
-        * ace/config-hpux-10.x.h: Fixed to not always compile tracing code.
-
-        * tests/test_config.h: ACE_END_TEST and ACE_END_LOG macros direct
-          log output back to stderr when shutting off the file output.
-
-        * tests/TSS_Test.cpp: Removed ACE_Thread_Control object from the main
-          thread - it served no purpose and didn't work on HP-UX (due to
-          a documented pthread_exit restriction).  Also changed a 'delete
-          ptr' to a call on operator delete (void *).
-
-Fri Aug  8 09:17:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Service_Repository.h (operations.): Improved documentation
-          on find().
-
-Fri Aug  8 00:01:43 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (close): Moved ACE_Log_Msg::close() out of
-          ACE_MT_SAFE block so it always exists.  This function only takes
-          care of non-VxWorks platforms.
-
-          (instance): Removed at_exit() call since the instances will be
-          taken of by TSS_Cleanup.
-
-        * ace/Object_Manager.cpp (~ACE_Object_Manager): Removed condition
-          compilation so it always calls ACE_Log_Msg::close().
-
-Thu Aug  7 23:36:26 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Reactor.h: Added the renew() method and the notify_handler_
-          data member to all compilation cases, not just for
-          multi-threading.
-
-        * ace/Service_Config.h: Clarified the fact that argv[0] is the
-          program name.  Thanks to Chris Cleeland for pointing this out.
-
-        * ace/config-mvs.h: Added the ACE_HAS_TEMPLATE_SPECIALIZATION flag
-          thanks to Chuck Gehr.
-
-        * include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on
-          exceptions and turned off implicit template instantiation.
-          Thanks to Amos Shapira <amos@gezernet.co.il> for reporting the
-          former.
-
-        * ace/config-irix6.2-sgic++.h: Also added the
-          ACE_HAS_TEMPLATE_SPECIALIZATION flag and changed the
-          platform_irix6.2.GNU file to not implicitly initialize
-          templates.  If this breaks something, please let me know.
-
-        * ace/config-irix6.2-sgic++.h: Added the ACE_HAS_EXCEPTIONS flag.
-          Thanks to Amos Shapira <amos@gezernet.co.il> for reporting this.
-          However, there is some question as to whether this will work.
-          If it doesn't, please let me know.
-
-        * ace/Reactor: Moved the ACE_Reactory_Notify class out from the
-          ACE_MT_SAFE section into the main code since this should work
-          for non-threaded builds, as well.  Thanks to Stefan Ericsson
-          <uabsjen@osd.ericsson.se> for reporting this.
-
-        * ace/config-chorus.h: Added the ACE_HAS_TEMPLATE_SPECIALIZATION
-          flag.  Thanks to Wei Chiang for this.
-
-Thu Aug  7 19:09:35 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/Hash_Map_Manager_Test.cpp - split definition of Dumb_String
-          class to a new header, Hash_Map_Manager_Test.h.  This makes AIX
-          C Set ++ happy.
-
-        * tests/Process_Strategy_Test.cpp - split definitions of Options
-          and Counting_Service classes to Process_Strategy_Test.h for AIX
-          C Set ++'s benefit.
-
-Thu Aug  7 15:27:28 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.h: Fixed typo in the definition of ACE_SYNCH_1 and
-          ACE_SYNCH_2 for ACE_HAS_OPTIMIZED_MESSAGE_QUEUE
-
-Thu Aug  7 13:05:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Strategies_T.h: Changed the argument to ACE_DLL_Strategy
-          from ACE_Service_Config to ACE_Service_Repository, which is more
-          concrete.
-
-        * bin/g++dep (REL): Added sed rule so that TAO's dependencies are
-          set relative to $TAO_ROOT as well as $ACE_ROOT when the '-r'
-          option is utilized.
-
-        * include/makeinclude/platform_linux_lxpthread.GNU (CCFLAGS): The
-          -Wall option can now be used.  It only generates two warnings
-          throughout all of ACE!
-
-        * include/makeinclude/rules.local.GNU (depend.local): Modified
-          this target so that TAO's dependencies are set relative to
-          $TAO_ROOT as well as $ACE_ROOT.
-
-Thu Aug  7 12:03:48 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Filecache.{h,cpp}: Fixed unused variable found by Amos
-          Shapira.  Fixed TEMPLATE_SPECIALIZATION dependency, sort of.  Do
-          not attempt to use Filecache if you do not support
-          TEMPLATE_SPECIALIZATION.
-
-Thu Aug 07 00:19:12 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.31, released Thu Aug 07 00:19:12 1997.
-
-Wed Aug  6 22:20:54 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Synch_T.h: Replaced all uses of ACE_Null_Condition_Mutex
-          with ACE_Null_Condition, which is much more straightforward...
-
-        * ASNMP: Added Mike MacFaden's changes for IRIX.
-
-Wed Aug  6 16:37:51 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Hash_Map_Manager.cpp: Changed implementation back to use a
-          single sentinel_ rather than an array of them.
-
-        * ace/Filecache.{h,cpp}: Total re-implementations.  Fewer locks
-          acquired and released when there is a cache hit.
-
-Wed Aug 06 12:55:26 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/Log_Msg.(h cpp):
-                (ACE_Log_Msg_Manager) - Removed most of the non-VxWorks
-          pieces - there's just a lock left; the instances_ was removed
-                (ACE_Log_Msg) - Use ACE_Object_Manager to remove per-thread
-          instances of ACE_Log_Msg rather than using ACE_Log_Msg_Manager.
-          The use of an ACE_Unbounded_Set to hold the ACE_Log_Msg pointers
-          in previous versions caused some non-tail recursion problems when
-          tracing was enabled.
-          Uses an instance count to know when it's safe to free the dynamically
-          allocated class-static memory.
-
-        * ace/Trace.(h cpp): Added new static member function:
-             int is_tracing(void)   - returns 1 if tracing is enabled, else 0.
-
-        * ace/Object_Manager.(h cpp): Added a flag to indicate the object is
-          being destroyed - during destruction, ACE_Object_Manager now refuses
-          to register any new memory pointers.  Also turns tracing off during
-          destruction - ACE_Log_Msg makes use of ACE_Object_Manager, so we
-          don't want ACE_Log_Msg instance being deleted, then created for a
-          ACE_TRACE, then deleted, then created,...
-
-Wed Aug 06 03:35:41 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.30, released Wed Aug 06 03:35:41 1997.
-
-Wed Aug  6 00:13:27 1997  Nanbor Wang  <nw1@dingo.wolfpack.cs.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler.cpp: We only need to
-          instantiate ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_SYNCH> when
-          ACE_HAS_THREADS.  Otherwise, we'll have duplicate symbols
-          defined on platforms that do not support threads.
-
-Tue Aug  5 19:52:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Containers: Added a new reset method for ACE_Unbounded_Set.
-          Thanks to Arturo Montes <mitosys@colomsat.net.co> for
-          reporting this.
-
-        * ace: Changed most uses of ACE_LACKS_COND_T to
-          ACE_HAS_OPTIMIZED_MESSAGE_QUEUE to make it possible to toggle
-          between the emulated condition variable implementation of
-          ACE_Message_Queue and the semaphore implementation.  We need
-          this until we fully test out the semaphore implementation of
-          ACE_Message_Queue.
-
-        * ace/Object_Manager.cpp (ACE_Object_Manager): Only call the
-          ACE_Log_Msg::close() method if ACE_MT_SAFE is enabled!  Thanks
-          to Satoshi Ueno <satoshi.ueno@gs.com> for reporting this.
-
-        * ace/Malloc.h: Added a fix for misalignment of data in the
-          ACE_CONTROL_BLOCK_ALIGN_LONGS macro.  Thanks to Fred LaBar
-          <flabar@fallschurch.esys.com> for this fix.
-
-        * ace/ACE.cpp: (enter_recv_timedwait,enter_send_timedwait): Always
-          give val a default value of 0 to make Purify happy.  Thanks to
-          David Levine for reporting this.
-
-        * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp,
-          netsvcs/clients/Tokens/manual/manual.cpp,
-          netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp:
-          Removed unreachable statements.  Thanks to Cherif Sleiman
-          <sleiman@research.moore.com> for reporting this deficiency and
-          testing the fix.
-
-Tue Aug  5 16:41:06 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Synch_T.h: Added some more ACE_LACKS_COND_T changes for compilers
-          without template typdefs.
-
-Tue Aug  5 11:50:43 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Message_Queue.h: Fixed typos for the case when
-          ACE_LACKS_COND_T.
-
-Tue Aug 05 11:02:11 1997    <irfan@TWOSTEP>
-
-        * tests/Atomic_Op_Test.cpp (main): Made sure that on platforms
-          without threads, we don't try to run this test.
-
-Tue Aug 05 09:15:40 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU: removed
-          -no_prelink from LDFLAGS because ghs 1.8.8 doesn't support it.
-          Thanks to Cherif Sleiman <sleiman@research.moore.com> for
-          reporting this.
-
-        * ace/Service_Record.cpp: added #include "ace/Stream_Modules.h"
-          to support template instantiation on GreenHills, at least.
-          Thanks to Cherif Sleiman <sleiman@research.moore.com> for
-          reporting this deficiency and testing the fix.
-
-        * ace/config-vxworks-ghs-1.8.h: added
-          ACE_LACKS_LINEBUFFERED_STREAMBUF.  Thanks to Cherif Sleiman
-          <sleiman@research.moore.com> for reporting this.
-
-Mon Aug  4 22:47:54 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Message_Queue: Fixed consistency problems in naming notfull
-          vs.  not_full.  Thanks to David Levine for finding this.
-
-        * ace/Message_Queue: Added specialized support for cases where
-          ACE_LACKS_COND_T (e.g., VxWorks and NT).  This scheme uses
-          ACE_Thread_Semaphores in this case, which should be more
-          efficient).
-
-        * ace/Synch_T.h: Added a new set of macros and typedefs for
-          ACE_SYNCH_SEMAPHORE.
-
-        * examples/ASX/Message_Queue: Cleaned up all the Message_Queue
-          examples.
-
-        * examples/ASX/Message_Queue/buffer_stream.cpp: Added a
-          NUL-terminator to the program so that it won't break.  Thanks to
-          Darrell for finding this.
-
-        * ace/Reactor.cpp (wait_for_multiple_events): Fixed some
-          stylistic problems in the Reactor.
-
-        * ace/Synch.cpp (ace_static_object_lock_atexit): Changed from:
-
-          extern "C" static void
-
-          to:
-
-          extern "C" void
-
-          Thanks to Chuck Gehr <gehr@sweng.stortek.com> for this.
-
-Mon Aug  4 14:03:22 1997  Steve Huston  <shuston@riverace.com>
-
-        * tests/Enum_Interfaces_Test.cpp: return non-zero if test fails.
-
-Mon Aug  4 12:03:29 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/Semaphore_Test: Redid to test timed waits in a more
-          reasonably fashion.
-
-Mon Aug  4 11:43:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/OS: Continued to cleanup the problems with inconsistent
-          variants of sendmsg() and writev() on VxWorks.  Thanks to Cherif
-          Sleiman <sleiman@research.moore.com> for reporting this.
-
-        * ace/OS.i (sema_wait): Fixed the implementation on NT so that
-          errno = ETIME.
-
-        * tests/Semaphore_Test.cpp: Cleaned up the programming style a
-          bit.
-
-        * ace/OS (writev): Removed the ACE_WRITEV_TYPE from the
-          ACE_OS::writev() method and instead put this as a cast on the
-          internal call to ::writev().  This is much cleaner and should
-          fix a bug introduced last night.  Thanks Cherif Sleiman
-          <sleiman@research.moore.com> for reporting this.
-
-        * ace/Synch: Added a new release() method to ACE_Semaphore that
-          enables a caller to release multiple waiters.  Thanks to Darrell
-          Brunsch <brunsch@cs.wustl.edu> for noticing this.
-
-Mon Aug  4 12:03:29 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/Semaphore_Test: Redid to test timed waits in a more
-          reasonably fashion.
-
-Sun Aug 03 23:47:13 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.29, released Sun Aug 03 23:47:13 1997.
-
-Sun Aug  3 22:18:33 1997  Douglas C. Schmidt  <schmidt@cumbia.cs.wustl.edu>
-
-        * tests/Atomic_Op_Test.cpp: Added template specialization so that
-          David won't have to ;-)
-
-        * ace/ACE: Added a new, complete set of send/recv operations with
-          timeouts.  These implement the following methods:
-
-          read, readv, write, writev, recv, recvfrom, recvmsg, send, sendto, sendmsg.
-
-          The implementation provides two flavors: MIT pthread support, an
-          ACE portable support.  To use MIT pthread support, you must to
-          define ACE_HAS_READ_TIMEDWAIT, ACE_HAS_READV_TIMEDWAIT,
-          ACE_HAS_WRITE_TIMEDWAIT, ACE_HAS_RECV_TIMEDWAIT,
-          ACE_HAS_RECVFROM_TIMEDWAIT, ACE_HAS_RECVMSG_TIMEDWAIT,
-          ACE_HAS_SEND_TIMEDWAIT, ACE_HAS_SENDTO_TIMEDWAIT and
-          ACE_HAS_SENDMSG_TIMEDWAIT respectively.  See the config.h file
-          for SCO UNIX for an example.
-
-          This new approach is not only more powerful (since it takes
-          advantage of OS-level mechanisms when they exist), but it also
-          greatly improves the modularity of the code and provides a
-          wider range of supported functionality.  Thanks to Arturo
-          Montes <mitosys@colomsat.net.co> for this new feature.
-
-        * ace/ACE.cpp: Added comments to the ACE_Object_Manager_Destroyer
-          class.
-
-        * ace/OS.h: Redid all the function prototypes for class ACE_OS so
-          that it's easier to read the arguments.
-
-        * ace/config-sco-5.0.0-mit-pthread.h: Added the new macros that
-          enable timed reads and writes.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for this new feature.
-
-        * ace: Added a corresponding #endif /* FOO */ for all #if defined
-          (FOO) in ACE.
-
-        * ace: Changed all uses of ACE_IOStream_T to ACE_IOStream to
-          be more consistent with other uses of templates in ACE.
-          Thanks to Thilo for reporting this (and thanks to David
-          for not being offended ;-)).
-
-        * ace/OS.i (operator/): Removed "const" from both the OS.h and
-          OS.i files for ACE_U_LongLong::operator/.  It is redundant,
-          potentially confusing, and gives warnings on some compilers!
-
-Sun Aug 03 21:20:12 1997    <irfan@TWOSTEP>
-
-        * tests/Atomic_Op_Test.cpp: Added new test to test the Atomic
-          Operations Class in ACE.  On platforms like Win32, ACE uses
-          template specialization to use native implementations provided
-          by the OS to accelarate these operations.
-
-        * ace/config-win32-common.h (ACE_HAS_INTERLOCKED_EXCHANGEADD):
-          Added macro to config file. This macro is automatically set true
-          for NT4.0 systems or greater.
-
-        * ace/Atomic_Op.i: On Win32 platforms, this code will be included
-          as template source code and will not be inlined. Therefore, we
-          first turn off ACE_INLINE, set it to be nothing, include this
-          code, and then turn ACE_INLINE back to its original setting. All
-          this nonsense is necessary since the generic template code that
-          needs to be specialized cannot be inlined, else the compiler
-          will ignore the specialization code. Also, the specialization
-          code *must* be inlined or the compiler will ignore the
-          specializations.
-
-          The creation of this new file is necessary for non-Win32
-          platforms to continue to inline the code as before.
-
-        * ace/Synch_T.cpp: This file must include Atomic_Op.i if
-          ACE_INLINE has not be turned on.  If it is, this file must be
-          included by Synch_T.h.
-
-        * ace/Synch.cpp: Moved the specialization code from Synch.cpp to
-          Atomic_Op.i.  This is necessary, otherwise the compiler will
-          ignore the specialization.
-
-Sun Aug 03 10:51:34 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1-4.0*.h: added #define ACE_HAS_LONGLONG_T.
-          Thanks to Thilo for reporting that OSF1-4.0 does.
-
-Sat Aug 02 23:51:19 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.28, released Sat Aug 02 23:51:19 1997.
-
-        * ace/TTY_IO.cpp (control): Fixed a bug when using 8 bits for
-           character due to ISTRIP flag setting for device.  Thanks to
-           Arturo Montes <mitosys@colomsat.net.co> for reporting this bug.
-
-        * ACE-categories: Updated the list of ACE classes to reflect
-          recent changes.
-
-        * ASNMP: Added the new ACE+SNMP release courtesy of Mike
-          MacFaden <mrm@cisco.com>.  This builds cleanly on Solaris,
-          but it looks like there are a bunch of non-portable features
-          that won't compile cleanly on all the other platforms.
-          Therefore, until Mike or others get this stuff fully portable,
-          it won't be build by default in the top-level ACE Makefile.
-
-        * ace/OS.h (class ACE_U_LongLong): Reformatted this a bit.
-
-        * ace/SV_Semaphore_Simple.i: Removed the #include of
-          SV_Semaphore_Simple.h since it seems unnecessary and is causing
-          problems for TAO.
-
-        * ace/IOStream_T.h (ACE_IOStream_T): Removed the unneeded ';' at
-          the end of the ACE_UNIMPLEMENTED_FUNC macros since this was
-          causing compiler errors.
-
-Sat Aug 02 13:11:22 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Synch.cpp (ACE_Static_Object_Lock::instance): commented
-          out call to ::atexit () because it causes shutdown problems
-          on DEC CXX, HP/UX, and AIX.  Many thanks to James Johnson
-          for tenaciously tracking this one down, to Thilo and Steve
-          for assisting, and to all who reported the problem.
-
-        * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::open,close): neutered
-          on VxWorks, only, so that it will compile.
-
-Fri Aug  1 21:33:18 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * netsvcs/lib/netsvcs.mak: Added post compilation command that
-          copies DLL to ace/ directory because netsvcs/main.exe must have
-          this file in search path.
-
-        * ace/Read_Buffer.cpp (ACE_Read_Buffer): Used ACE_OS::fdopen
-          instead of ::fdopen because it caused compilation error on NT.
-
-Fri Aug  1 17:25:04 1997  Chris Cleeland  <cleeland@swarm.cs.wustl.edu>
-
-        * include/makeinclude/platform_irix6.4_sgic++.GNU (CCFLAGS): Used
-          -ptnone and -no_prelink in order to get SGI to compile properly.
-
-        * ace/config-irix6.4-sgic++.h (ACE_HAS_EXCEPTIONS): Added
-          ACE_HAS_EXCEPTIONS to this config.
-
-        * ace/IOStream_T.h (ACE_IOStream_T): Wrapped send, recv, send_n,
-          and recv_n with the ACE_UNIMPLEMENTED_FUNC macro.
-
-Fri Aug  1 17:08:32 1997  Nanbor Wang  <nw1@waltz.cs.wustl.edu>
-
-        * ace/ace.mak:  Put OS.cpp back into the makefile.
-
-        * ace/config-win32-common.h: Commented out checking of
-          ACE_HAS_WINSOCK2 when we are using NT 4.0 and above.  The
-          original check prevented us from using winsock2.
-
-        * ace/Thread_Manager.cpp:
-        * ace/Service_Repository.cpp:
-        * ace/ReactorEx.cpp:
-        * ace/Reactor.cpp:
-        * ace/Proactor.cpp:
-        * ace/Malloc.cpp:
-        * ace/Synch.{h,cpp}:  Changed the lock held by
-          ACE_Static_Object_Lock from ACE_Thread_Mutex to
-          ACE_Recurssive_Thread_Mutex.
-
-        * ace/Timer_Heap_T.cpp (ACE_Timer_Heap_T): Something was missing
-          here.....
-
-Fri Aug  1 13:39:13 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/TTY_IO.cpp (control): Removed the special M_UNIX code for
-          SCO_OpenServer.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-        * ace/Read_Buffer.cpp (ACE_Read_Buffer): Mistakenly used int
-          rather than ACE_HANDLE for one of the constructors in
-          ACE_Read_Buffer.
-
-        * ace/OS.cpp (readv): Fixed a braino that manifests itself on
-          Chorus because I put the ACE_READV_TYPE in the wrong place.
-          Thanks to Wei Chiang for reporting this.
-
-Fri Aug  1 14:31:22 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/Timer_Queue_Test.cpp:  removed casts from pointers to ints
-          (when a act was compared with a number) and instead used a cast
-          on the integer values.  This gets rid of warnings on platforms
-          where the sizeof a pointer is larger than the sizeof an int.
-
-Fri Aug 01 12:10:28 1997    <irfan@TWOSTEP>
-
-        * ace/Synch_T: Changed parameter passing for ACE_Atomic_Op from
-          const TYPE to const TYPE &.
-
-        * ace/Synch.cpp: These specializations have been added to
-          ACE_Atomic_Op to make the implementation faster on Win32 that
-          has OS support for doing this quickly through methods like
-          InterlockedIncrement and InterlockedDecrement.
-
-        * ace/SV_Semaphore_Complex.cpp (open): Fixed more compiler
-          warnings:
-
-          IOStream.cpp Naming_Context.cpp Read_Buffer.cpp
-          SV_Semaphore_Complex.cpp SV_Semaphore_Complex.i
-
-Fri Aug  1 11:57:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/Containers.h (ACE_Fixed_Set): Eliminated declaration for
-          unnecessary ACE_Fixed_Set(size_t) CTOR.
-
-        * ace/OS.h: Simplified the typedef of ACE_hrtime_t so that it's an
-          unsigned long long whenever ACE_HAS_LONG_LONG_T is defined.
-
-Fri Aug 01 10:12:26 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf1-4.0.h: added ACE_HAS_TEMPLATE_SPECIALIZATION.
-          Thanks to Thilo for verifying that this is supported with DEC CXX.
-
-        * ace/config-irix6.4-sgic++*.h: added ACE_TEMPLATES_REQUIRE_SOURCE
-          and ACE_REQUIRES_FUNC_DEFINITIONS.
-
-        * ace/OS.h,README: added ACE_REQUIRES_FUNC_DEFINITIONS support.
-
-        * ace/{Free_List.h,Remote_Tokens.h,Synch_T.h,Timer_*_T.h}:
-          wrapped unimplemented template class copy constructors and
-          assignment operators with ACE_UNIMPLEMENTED_FUNC.
-
-        * tests/Service_Config_Test.cpp: removed templates to avoid
-          problems with finicky compilers, and added check of destruction
-          ordering.
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU: added
-          -no_prelink to LDFLAGS.
-
-Fri Aug 01 00:14:46 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.27, released Fri Aug 01 00:14:46 1997.
-
-Thu Jul 31 21:51:01 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (open): fixed memory leak.
-
-Thu Jul 31 21:41:10 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Service_Config_Test.cpp (run_test): You won't shout as I...
-
-        * ace/Object_Manager.cpp (instance): ... fiddle about ;-)
-
-Thu Jul 31 17:39:56 1997    <irfan@TWOSTEP>
-
-        * ace: The following files were modified to avoid the
-          "unreferenced formal parameter" and other warnings from the
-          compiler:
-
-          ACE.cpp Asynch_IO.cpp Asynch_IO.h INET_Addr.cpp OS.cpp OS.h OS.i
-          Proactor.cpp Reactor.cpp ReactorEx.cpp ReactorEx.i
-          SOCK_Dgram_Bcast.cpp Service_Config.cpp
-
-Thu Jul 31 16:46:44 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config*.h: replaced "ACE_REQUIRES_TEMPLATE_SPECIALIZATION"
-          with "ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION".
-
-        * ace/config-vxworks-ghs-1.8.h,config-irix6.4-sgic++*.h: added
-          ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA.
-
-        * all .cpp files that had "ACE_REQUIRES_TEMPLATE_SPECIALIZATION":
-          replaced with "ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION" and
-          added #pragma instantiate for Edision Design Group compilers,
-          e.g., SGI and Green Hills.
-
-Thu Jul 31 16:25:33 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/Synch.i (acquire): Added the timed acquire() interface to
-          ACE_Semaphore.
-
-Thu Jul 31 11:10:17 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/run_tests.bat: Redid this file completely making it
-          much smarter about running tests.  Instead of just blindly
-          executing the tests, it checks the return values to see if
-          an error occured and also outputs relevant errors from the
-          log file if the test was unsuccessful.
-
-          It's a remarkable example of batch programming wizardry.
-
-Thu Jul 31 10:39:04 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/INET_Addr.cpp: initialized error variable in
-          gethostname to stop warnings when inlining is on.
-
-Thu Jul 31 09:46:50 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Timer_Heap_T.cpp: changed cancel(id) to check the timer
-          id to make sure it is in range (not negative and not larger
-          than the current size of the heap)
-
-Thu Jul 31 07:32:26 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Malloc_T.{i,cpp},Timer_Queue_T.i: replaced LOCK with ACE_LOCK.
-          Thanks to Thilo for supplying patches.
-
-        * ace/config-sunos5.5-g++.h: #define ACE_MALLOC_ALIGN to be 8.
-
-        * ace/Object_Manager.*: renamed cleanup () to at_exit ().
-
-        * Log_Msg.{h,cpp},Object_Manager.cpp: let ACE_Object_Manager
-          clean up the global ACE_Log_Msg_Manager.
-
-        * Service_Config_Test.cpp: added test of
-          ACE_Object_Manager::at_exit ().
-
-Wed Jul 30 20:30:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK_Dgram.h: Added an = 0 to the flags parameter to recv().
-          Thanks to Michael MacFaden for pointing out the inconsistency.
-
-        * ace/OS.cpp (thr_create): Added support for the SCHED_IO policy,
-          which is supported by MIT Pthreads.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for this fix.
-
-        * ace/SOCK_Dgram.h: Added a comment to clarify how to delete the
-          elements of the iovec array.  Thanks to Mike MacFaden for
-          clarifying this.
-
-        * ace/Reactor.h: Changed the comment for schedule_timer() to use
-          delta_timer rather than delay.
-
-        * ace/Connector: Updated the timer cancellation id to be long
-          rather than int.
-
-        * examples/Reactor/Misc/notification.cpp: Timers are now working
-          happily on Chorus, so we can revert the Chorus-specific patches.
-          Thanks to Wei Chiang for reporting this.
-
-        * ace/SOCK_Dgram.cpp (recv): The timed recv() method must return
-          -1 on a timeout to meet its documented specification.  Thanks to
-          Joseph Cross <joseph.k.cross@lmco.com> for reporting this
-          problem.
-
-        * ace/OS.i (readv): Added a fix for Chorus, which has a different
-          readv() prototype than normal operating systems.  Thanks to Wei
-          Chiang for reporting this.
-
-Wed Jul 30 20:02:21 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
-
-        * ace/Hash_Map_Manager.{h,cpp}: changed the *_i methods to use
-          shared_find() method to ease template specialization efforts.
-          Also, added a new shared_find() method.  Added a parameter to
-          each to allow the passing in of the calculated hash value.
-
-Wed Jul 30 16:43:34 1997    <irfan@TWOSTEP>
-
-        * ace/config-win32-common.h: If _DEBUG is not set (that is, we are
-          building the Release version), we will turn on __ACE_INLINE__.
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for
-          suggesting this.
-
-Wed Jul 30 06:53:30 1997  Matthias Kerkhoff <make@cs.tu-berlin.de>
-
-        * The use of the following configuration #defines in the entire
-          ACE distribution has been changed:
-
-          - ACE_HAS_WINNT4
-          - ACE_HAS_MFC
-          - ACE_HAS_STRICT
-          - ACE_MT_SAFE
-          - ACE_HAS_DLL
-          - ACE_HAS_SVC_DLL
-          - ACE_HAS_WINSOCK2
-          - ACE_HAS_ORBIX
-          - ACE_HAS_MT_ORBIX
-
-          In previous ACE-versions, code blocks depending on one of these
-          defines have been guarded by an #if defined(ACE_XXX_OPTION).
-          Therefore it has been necessary to define the default
-          configuration unconditionally in config-win32.h.
-
-          The #if statements in the source files have been changed to
-
-          #if defined(ACE_XXX_OPTION) && (ACE_XXX_OPTION != 0)
-
-          while the default configuration in config-win32.h will only be used,
-          if it has not been overridden from the compilers command line (i.e.) :
-
-          #if !defined(ACE_XXX_OPTION)
-             #define ACE_XXX_OPTION  1
-          #endif
-
-Wed Jul 30 14:46:33 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Malloc.cpp:
-        * ace/Proactor.cpp:
-        * ace/ReactorEx.cpp:
-        * ace/Reactor.cpp:
-        * ace/Service_Repository.cpp:
-        * ace/Thread_Manager.cpp:
-        * ace/Synch.{h,cpp}: Changed ACE_Static_Object_Lock::get_lock ()
-          to instance () to emphasize that it's a singleton.
-
-        * ace/Containers.cpp:  Fixed the problem caused by
-          ACE_Unbounded_Stacknotkeeping its size currectly. Thanks for
-          Matthias Kerkhoff <make@cs.tu-berlin.de> for sending us the
-          patch.
-
-        * ace/OS.cpp (exit): Corrected a bug in ACE_TSS_Cleanup::exit ().
-          It innocently uses default ctor to copy info_arr.  And things
-          get out of hand when info_arr[] gets destructed.  Thanks very
-          much for Matthias Kerkhoff <make@cs.tu-berlin.de> for digging
-          this out and sending us the patch.
-
-Wed Jul 30 13:36:55 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-vxworks-ghs-1.8.h: added #ifdef ppc wrapper around
-          #define of ACE_HAS_POWERPC, because GreenHills #defines that.
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU: replaced
-          indlib.o LIBS with newer ghsbltin.o and ghsmath.o.
-
-        * ace/OS.h: use the same ACE_UNUSED_ARG definition with ghs as
-          with other compilers.
-
-        * ace/Object_Manager.*: revised interface, but still in flux.
-          cleanup () should work for process-wide registration, but is
-          untested.
-
-Wed Jul 30 11:13:57 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/config-linux*.h (ACE_HAS_LONGLONG_T): These configs
-          file incorrectly had ACE_HAS_LONGLONG rather than
-          ACE_HAS_LONGLONG_T.
-
-        * ace/OS.cpp (gethrtime): Added 'volatile' keyword to insure that
-          the automatic variables 'most' and 'least' don't get put into
-          registers.  Putting this in stopped the SIGSEGV that was occurring
-          in Linux.
-
-Wed Jul 30 06:53:30 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.26, released Wed Jul 30 06:53:30 1997.
-
-Wed Jul 30 04:36:39 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Containers.{h,cpp}: Added back new parameterized allocation
-          strategy version.  Finally.
-
-        * ace/Synch.cpp (atexit): Moved ACE_Allocator here because only
-          here, we can be sure that no other user defined memory
-          activities are going on.  This is becoming even more
-          interesting now....  Perhaps we should move all
-          close_singleton's here?
-
-        * ace/Service_Config.cpp (close_singletons): Removed
-          ACE_Allocator::close_singleton () from this function because we
-          still need ACE_Allocator to "free" static objects' memory.
-
-        * ace/Synch.{h,cpp}: Added a new class ACE_Static_Object_Lock
-          which provides a lock when instantiating static objects.
-
-        * ace/Thread_Manager.cpp: Removed ace_thread_manager_lock_,
-        * ace/Service_Repository.cpp: Removed ace_service_repository_lock_,
-        * ace/ReactorEx.cpp: Removed ace_reactorex_lock_,
-        * ace/Reactor.cpp: Removed ace_reactor_lock_,
-        * ace/Proactor.cpp: Removed ace_proactor_lock_,
-        * ace/Malloc.cpp: Removed ace_malloc_lock_,
-          and replace them with a global single lock
-          ACE_Static_Object_Lock::get_lock ().
-
-Tue Jul 29 16:25:48 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ace/OS.cpp (thr_create): Explicitly flagged 'stack' and 'size'
-          as unused arguments.
-
-        * ace/Memory_Pool.cpp (handle_signal): Explicitly flagged siginfo
-          as an unused argument, and moved the decl of offset into the
-          conditional block in which it's used.
-
-        * ace/OS.i (dlerror): Added explicit cast of the return value to
-          (char*) because on Linux dlerror() returns const char*, while on
-          Solaris it's char*.
-
-        * ace/config-linux-lxpthreads.h: Created new flag
-          ACE_LACKS_POSIX_PROTO_FOR_SOME_FUNCS that can be used when only
-          certain functions are missing POSIX prototypes.  This eliminates
-          more warnings with -Wall
-
-        * ace/ACE.cpp (max_handles): Added return statement for the
-          RLIMIT_NOFILE case.
-          (count_interfaces): Removed unused variables.
-
-Tue Jul 29 15:10:35 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.i: Changed sema_wait to take in a const ACE_Time_Value
-
-Tue Jul 29 12:41:27 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * ace/config-sco-5.0.0-mit-pthread.h: Added the
-          ACE_LACKS_PWD_FUNCTIONS macro.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-Tue Jul 29 13:10:00 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Signal.h: Moved inclusion of "Containers.h" to the bottom of
-          this file so everything is defined properly before use.
-
-Tue Jul 29 12:36:24 1997    <irfan@TWOSTEP>
-
-        * tests/Message_Queue_Test.cpp (main): Removed dynamic allocation
-          of the string array.
-
-Tue Jul 29 12:15:49 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Proactor.cpp
-        * ace/Reactor.cpp:
-        * ace/ReactorEx.cpp: Changed the default Timer Queue to
-          Timer Heap instead of Timer List.
-
-Tue Jul 29 07:59:04 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile,TAO/Makefile: change mode of updated ChangeLog-*
-          file to 644 after updating it, when building a release
-          with TIMESTAMP enabled.
-
-        * ace/OS.cpp (sched_params): added some more initializations
-          to 0 to avoid Purify warnings about unitialized memory reads.
-
-        * ace/Object_Manager.cpp (~ACE_Object_Manager): removed unused
-          variable "i".  Thanks to Amos Shapira <amos@gezernet.co.il>
-          for reporting this.
-
-        * ace/Service_Record.{h,i} Parse_Node.{h,cpp} (handle,open_handle):
-          removed "const" from ACE_SHLIB_HANDLE return value.  Thanks
-          to the several people who noted compiler warnings from this.
-
-        * ace/Naming_Context.cpp: added delete of this->name_options_;
-          (dtor,fini): call this->close ().
-
-        * tests/IOStream_Test.cpp (client,server): use ACE_NEW_RETURN
-          instead of new.
-
-Tue Jul 29 01:53:18 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/OS.h: Added two new macros ACE_NEW_MALLOC_RETURN and
-          ACE_NEW_MALLOC.  Theses are similiar to ACE_ALLOCATOR_RETURN and
-          ACE_ALLOCATOR that allow memory allocation using user defined
-          functions.  However, these two macros will call specified
-          constructor after memory is being allocated.
-
-        * ace/Containers.{h,cpp}: Decoupled memory allocation strategy for
-          ACE_Unbounded_Stack, ACE_Unbounded_Set, ACE_Unbounded_Queue.
-          Users can now specified their own memory allocation strategies
-          if needed.  If not specified, the default ACE_Allocator will be
-          used.
-
-Tue Jul 29 00:56:54 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.25, released Tue Jul 29 00:56:54 1997.
-
-Mon Jul 28 16:23:26 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.nested.GNU: added missing
-          semicolon at end of last statement.  Thanks to Amos
-          Shapira <amos@gezernet.co.il> for providing this fix.
-
-        * ace/OS.h (VxWorks only): only #include <stdarg.h> before
-          <vxWorks.h> for GreenHills.  Thanks to Dave Moore
-          <dave.moore@gecm.com> for reporting a problem without this
-          fix with g++/VxWorks 5.3.1 for PowerPC target.
-          Also, commented out g++ string.h hack.  It no longer appears
-          to be necessary.
-
-        * tests/README: added VxWorks 5.3.1 test status.
-
-        * tests/SPIPE_Test.cpp (main): fixed #ifdefs so that it compiles.
-
-        * ace/OS.i: (strtok_r): replaced NULL with 0.  NULL is #defined
-          as (void *) 0 on VxWorks, so it causes compile warnings.
-          Thanks to Dave Mayerhoefer <davem@lynx.com> for reporting
-          this problem.
-
-        * ace/Object_Manager.{h,cpp},Makefile: added this class to
-          shutdown ACE library services, and reclaim their storage,
-          at program termination.
-
-        * ace/ACE.cpp: added hook to call ACE_Object_Manager destructor
-          in this file.  It's in this file so that it's sure to be
-          linked in to executables that statically link libACE.a.
-
-        * ace/Service_Config.{h,cpp}: (close): delete ACE_STATIC_SVCS
-          instance, which is now saved in static_svcs_.  Also, removed
-          LM_SHUTDOWN call, because the logger apparently gets shutdown
-          now with everything else (with ACE_Object_Manager).
-
-        * ace/Object_Manager.* (delete_at_exit,delete_array_at_exit):
-          made these (inline) static functions, with return values.
-
-        * tests/IOStream_Test.cpp (client,server): explicitly destroy
-          (and create) ACE_SOCK_IOStream instances, because they don't
-          get destroyed on Solaris.  They're on the stack of separate
-          threads, so maybe the problem is related to not cleaning up
-          TSS on Solaris.  Thanks to James CE Johnson <jcej@lads.com>
-          for some efficient debugging work, and for verifying that the
-          original code works properly on Linux.
-
-Mon Jul 28 21:59:09 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/ace.mak: Added file Object_Manager.cpp.
-
-        * ace/OS.h: Added #define RTLD_LAZY when
-          ACE_HAS_SVR4_DYNAMIC_LINKING and RTLD_LAZY is not defined.
-          FreeBSD 2.2.1 "forgot" to put in this definition.  Thanks to
-          Satoshi Ueno for reporting this.
-
-Mon Jul 28 13:27:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Object_Manager: Made a few minor stylistic updates.
-
-        * netsvcs/servers/main.cpp (main): Updated this test program to
-          utilize the new ACE_Service_Object_Ptr class.
-
-        * ace/Service_Object.h: Added a new smart pointer call
-          ACE_Service_Object_Ptr, which generalizes functionality that was
-          previously in the ./netsvcs/server/main.cpp file.  Thanks to Wei
-          Chiang for this suggestion.
-
-        * examples/Threads/process_manager.cpp (parse_args): Removed the
-          unused n_processes global variable.  Thanks to Amos Shapira for
-          reporting this.
-
-        * tests/SPIPE_Test.cpp (main): Cleaned up the #ifdef structure
-          to remove compiler warnings.  Thanks to Amos Shapira for
-          this.
-
-        * tests/Handle_Set_Test.cpp (test_performance): Removed an unused
-          ACE_HANDLE handle definition.  Thanks to Amos Shapira for
-          reporting this.
-
-        * ace/OS.i (sema_init): Swapped else and #endif to avoid
-          a compile error when ACE_LACKS_NAMED_POSIX_SEM is false.
-          Thanks to Wei Chiang for reporting this.
-
-        * ace/OS.cpp (rwlock_init): Added a cast to (const void *) to keep
-          certain compilers from complaining.  Thanks to Thilo and
-          Amos Shapira for reporting this.
-
-        * ace/OS.i (sema_wait): *tv should have been &tv.  Thanks to Thilo
-          for reporting this.
-
-Mon Jul 28 13:57:21 1997  James C Hu <jxh@swarm.cs.wustl.edu>
-
-        * ace/config-irix6.4-sgic++.h: Added template specialization #def.
-
-Sun Jul 27 20:47:01 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Handle_Set_Test.cpp: Instantiate templates with
-          ACE_HANDLE instead of int.
-
-        * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp (main): use
-          ACE_OS::fprintf () instead of cerr.
-
-Sun Jul 27 20:10:26 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.2.24, released Sun Jul 27 20:10:26 1997.
-
-Sun Jul 27 16:03:30 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/Handle_Set_Test.cpp (test_boundaries): Changed class of
-          queue from ACE_Unbounded_Queue<int> to
-          ACE_Unbounded_Queue<ACE_HANDLE> so it declares the right data
-          type.
-
-        * ace/Synch.cpp (ACE_Process_Mutex):
-        * ace/OS.cpp (rwlock_init):
-        * ace/ACE.cpp (unique_name): Memories for placing unique_name are
-          now declared using ACE_UNIQUE_NAME_LEN.  When calling
-          ACE::unique_name, the length is also specified using
-          ACE_UNIQUE_NAME_LEN because using "sizeof (buffer)" also caused
-          problem if we are using UNICODE.
-
-        * ace/OS.h: Added a new directive ACE_UNIQUE_NAME_LEN to specified
-          the maximum length of an "unique name."
-
-Sun Jul 27 15:32:08 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Handle_Set_Test.cpp (main): uncommented
-          test_duplicates () and test_performance () calls, and added
-          ACE_Unbounded_Queue_Iterator<int> specialization.
-
-Sun Jul 27 14:25:33 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * tests/Handle_Set_Test.cpp (test_boundaries): Added a better test
-          to ensure that the ACE_Handle_Set_Iterators are working
-          correctly.  This works by inserting the handles in a queue and
-          then making sure that they are the same values we receive from
-          the iterator.
-
-        * ace/Handle_Set.i (operator): Fixed a subtle bug in the
-          ACE_Handle_Set_Iterator implementation.  We need to make
-          sure that we increment the handle_index_ to the beginning
-          of the next word whenever we've examined all the bits in
-          the current word.  Thanks to David Levine for noticing this
-          problem.
-
-Sun Jul 27 09:06:29 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.lib.GNU: replaced hard-coded ".so"
-          with "$(SOEXT)".
-
-        * include/makeinclude/rules.local.GNU: added/completed support
-          for "$(SOEXT)", and "$(VSHDIR)" instead of always hard-coding
-          them as ".so" and ".shobj/".
-
-        * include/makeinclude/wrapper_macros.GNU: added support for
-          override of "$(VSHDIR)" in platform_macros.GNU.
-
-        * apps/JAWS/clients/{Blobby,Caching}/Makefile,
-          apps/JAWS/stress_testing/Makefile,
-          apps/Orbix-Examples/Event_Comm/{Consumer,Supplier}/Makefile,
-          examples/ASX/Event_Server/Event_Server/Makefile,
-          examples/ASX/UPIPE_Event_Server/Makefile,
-          examples/Logger/simple-server/Makefile,
-          examples/Mem_Map/IO-tests/Makefile,
-          examples/Naming/Makefile,
-          examples/Reactor/Multicast/Makefile,
-          examples/Service_Configurator/Misc/Makefile,
-          examples/Shared_Malloc/Makefile:
-          replaced hard-coded ".shobj" with "$(VSHDIR)" in LDLIBS definitions.
-
-        * include/makeinclude/platform_vxworks5.x_{g++,ghs}.GNU:
-          added overrides of .so build rules to change them .o builds.
-
-        The above changes allow builds of modules that specify .shobj/*.so
-        on VxWorks, by mapping those objects to .obj/*.o.
-
-Sun Jul 27 03:07:35 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/ACE.cpp (unique_name): Added __TEXT macro to the format
-          string in sprintf to avoid a nasty problem when using UNICODE on
-          NT.
-
-Sat Jul 26 21:12:07 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ReactorEx.cpp: added a couple of ACE_UNUSED_ARG's.
-
-        * examples/Logger/simple-server/Logging_Handler.cpp (handle_input):
-          replace use of cerr with stderr (by using default arg of
-          ACE_Log_Record::print ()).
-
-        * examples/Shared_Malloc/test_multiple_mallocs.cpp (main): use
-          ACE_OS::printf () instead of cout.
-
-        * examples/Shared_Malloc/test_persistence.cpp: added #include
-          of iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-Sat Jul 26 15:55:43 1997    <irfan@TWOSTEP>
-
-        * ace/Malloc_T.cpp (ACE_Cached_Allocator): Changed (T *) to
-          (T*). VC++ did not like the former.
-
-        * The entire ACE distribution was updated to use the new singleton
-          methods.  The old singleton methods in Service_Config have been
-          deprecated and users are encouraged not to use these methods
-          anymore.  It may not be supported in future releases.  The
-          replacement is the instance() methods in the individual classes.
-          For example, ACE_Service_Config::reactor() is replaced by
-          ACE_Reactor::instance().  A perl script has been added
-          (ACE_wrappers/bin/Service_Config.perl) to allow users to change
-          their code over to the new methods.
-
-          These changes will hopefully help in reducing the compile-time
-          dependencies in ACE source files and allow smaller custom ACE
-          libraries to be compiled.
-
-          Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for making
-          these changes.
-
-Sat Jul 26 15:44:45 1997  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * ace/Malloc_T.cpp (ACE_Cached_Allocator): I think we want to
-          say "sizeof (T)" rather than "sizeof (T *)".
-
-        * ace/FILE_IO.i (recv_n): There is a minor bug fix to be made in
-          FILE_IO.i.  The method ACE_FILE_IO::recv_n() should call
-          ACE::read_n(), not ACE::recv_n().  Similarly, the method
-          ACE_FILE_IO::send_n() should call ACE::write_n(), not
-          ACE::send_n().  The functions ::recv() and ::send() are intended
-          only for *socket* I/O, and return failure conditions when
-          applied to *file* I/O.  Thanks to David Brackman
-          <dbrackman@OhioEE.com> for reporting this.
-
-        * ace: Changed all LOCK names to ACE_LOCK to avoid clashes
-          with macros in the KAI C++ compiler.  Thanks to Jeff
-          R. Hayes <Jeff.Hayes@osi.com> for pointing this out.
-
-        * ace/Malloc_T.i: Added ACE_INLINE to some methods that weren't
-          getting inlined.
-
-        * ace/OS.i: Added an implementation of timed semaphores for the
-          POSIX threading APIs.  Also cleaned up the return values from
-          sema_wait() so that it always returns -1 if an error occurs
-          (originally, it was returning -2, which is confusing).  Also
-          cleaned up the rd_lock() and wr_lock() methods in the same way.
-
-Sat Jul 26 16:00:05 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Malloc_T.cpp (ACE_Cached_Allocator): fixed typo, sizeof (T*)
-          instead of sizeof (*T).
-
-        * Proactor.cpp (instance): fixed signature in non-WIN32
-          version.  (run_event_loop): added ACE_UNUSED_ARG (tv).
-
-Fri Jul 25 12:08:47 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.[hi]: finished VxWorks (non-POSIX) semaphore implementation.
-
-        * ace/Process.cpp (spawn): with GreenHills compiler only (for
-          VxWorks), call ACE_NOTSUP_RETURN instead of spawning via execve.
-          GreenHills 1.8.8 loses its lunch on the ACE_OS::execve () call.
-          Thanks to Dave Mayerhoefer <davem@lynx.com> for reporting
-          this problem.
-
-        * tests/Mem_Map_Test.cpp (create_test_file): delete array "mybuf"
-          to prevent memory leak.
-
-        * tests/Message_Queue_Test.cpp (main): delete "buffer"
-          elements at end of test to prevent memory leaks.
-
-        * performance-tests/Misc/context_switch_time.cpp: use
-          ACE_Sched_Params for platform-independent thread priority
-          assignment.  Also, modified Yield_Test so that only one thread
-          writes the test's timer.
-
-        * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp (svc):
-          replaced an iostream printout with an ACE_DEBUG call.
-
-        * examples/ASX/UPIPE_Event_Server/event_server.cpp: added
-          #include of iostream.h with ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION.
-
-        * examples/IPC_SAP/FILE_SAP/client.cpp: require 2 args instead
-          of 1; mask file mode with 0777 (octal); and use
-          ACE_OS::printf () instead of cout.
-
-Fri Jul 25 00:46:22 1997    <irfan@TWOSTEP>
-
-        * ace/Synch: Added documentation for Condition variables.  Thanks
-          to Jeff <jmg@trivida.com> for pointing out the lack of
-          documentation.
-
-Thu Jul 24 11:48:05 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile,TAO/Makefile: added a filter to exclude backup and
-          [.]#* files from releases.  Thanks to Carlos O'Ryan
-          <coryan@mat.puc.cl> for reporting this problem.
-
-        * include/makeinclude/platform_*.GNU: inserted CVS/RCS
-          keyword string.
-
-        * performance-tests/Misc/basic_perf.cpp (per_iteration):
-          added support for ACE_U_LongLong.
-
-        * performance-tests/Misc/childbirth_time.cpp:
-          (prof_fork,prof_native_thread): added ACE_UNUSED_ARGs
-          for unsupported platforms.  (prof_ace_os_thread): added
-          (ACE_THR_FUNC) cast of first arg to ACE_OS::thr_create () call.
-
-        * performance-tests/Misc/test_naming.cpp (find): replaced cerr
-          statement with an ACE_DEBUG.
-
-        * examples/Misc/test_read_buffer.cpp: replaced bare OS calls
-          with ACE_OS calls.
-
-Thu Jul 24 11:35:37 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Timer_Heap_T.cpp:  Fixed a problem with reschedule()
-          corrupting the free list in Timer Heap.  Thanks to
-          James Crawford <jamesc@in.ot.com.au>, Silvano Peruzzi
-          <silvanop@in.ot.com.au>, and Stuart Powell <stuartp@in.ot.com.au>
-          for the fix.
-
-Wed Jul 23 23:29:15 1997    <irfan@TWOSTEP>
-
-        * ace/Message_Block.cpp (size): Changed the comparison from
-          (length < this->max_size_) to (length <= this->max_size_).
-          Thanks to Paul <proman@npac.syr.edu> for suggesting this change.
-
-Wed Jul 23 21:54:23 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Shared_Malloc/test_malloc.cpp (spawn): cast argv
-          argument to (char *const *) for call to ACE_OS::execv ().
-
-Wed Jul 23 16:40:39 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/ACE.cpp (get_ip_interfaces): ACE'ified codes for NT.  UNIX
-          part will come later.
-
-        * ace/Malloc_T.cpp (ACE_Cached_Allocator): Changed to use raw
-          memory allocation method for memory pool.
-
-        * ace/OS.h (ACE_TEXT_STRING): Added this #define macro to switch
-          between ACE_WString and ACE_CString according to the usage of
-          UNICODE.
-
-Wed Jul 23 14:43:11 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Timer_Queue_Test.cpp(main): delete timer_id array at
-          the end of the test to avoid a memory leak.
-
-Wed Jul 23 13:40:39 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * ace/Process.cpp (ACE_Tokenizer::next): Moved checking of string
-          termination after checking delimiter and preserve_designator so
-          that we can use this class to tokenize multiple null terminated
-          strings cascaded together (using \0 as delimitor.)  Notice tne
-          combined strings must be terminated with two null chars.  I need
-          to use this class in ACE::get_ip_interfaces.
-
-        * ace/Malloc_T.{h,i}:  Changed the implementation of
-          ACE_Cached_Mem_Pool_Node from using union to a plain pointer.
-          This is because some C++ compilers don't allow union member to
-          have copy constructor.  Thanks to Tim to dig this out.
-
-Wed Jul 23 12:58:04 1997  Steve Huston  <shuston@riverace.com>
-
-        * ace/CORBA_Ref.cpp: Added #include "ace/Log_Msg.h" to catch the
-          ACE_DEBUG macro.
diff --git a/STL/ACE_Changes b/STL/ACE_Changes
deleted file mode 100644
index 902fb94c94c..00000000000
--- a/STL/ACE_Changes
+++ /dev/null
@@ -1,53 +0,0 @@
-This version of STL was obtained from
-http://www.rahul.net/terris/.  This is a modified version of the
-implementation that comes with VC++4.0.  Please see readme2.stl for
-details. 
-
-The following modification have been made for compilation with VC++4.x
-
-________________________________________
-
-vector.h (line 85)
-________________________________________
-
-
-    /*
-     *  This is cause the VC++ compiler sucks
-     *  and does not recognize nested classes properly
-     *       
-     */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
-	start = static_allocator.allocate(n);
-	uninitialized_fill_n(start, n, value);
-	finish = start + n;
-	end_of_storage = finish;
-    }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
-
-
-________________________________________
-
-bstring.h (line 1102)
-________________________________________
-
-
-    /* 
-     * This should be correctly scoped
-     *
-     * if (cap == ::reserve)
-     */
-
-    if (cap == std::reserve)
-    {
-       len = 0;
-       res = size;
-       ptr = new charT [res];
-    }
-    /* 
-     * This should be correctly scoped
-     *
-     *     else if ((cap == ::default_size) && (size != NPOS))
-     */
-
-    else if ((cap == std::default_size) && (size != NPOS))
diff --git a/STL/readme2.stl b/STL/readme2.stl
deleted file mode 100644
index 5132bc1189b..00000000000
--- a/STL/readme2.stl
+++ /dev/null
@@ -1,272 +0,0 @@
-STL2.ZIP
-
-Standard Template Library for Visual C++ 4.0 
-and Related Classes
-
-Revised 10/15/96 - Bug fixes and change to bit_vector.
-
-This version supports DLLs and threading.  You must use critical
-sections around code that uses the same container in different
-threads.  These features come at a price -- since memory
-usage is not optimal, this code may use more memory and
-may be slower.
-
-+ General strategy: Remove all statics except the
-  static allocator objects.  
-+ Vectors were not affected.
-+ Major changes made to tree.h
-+ Stability: Very stable.
-
-This code should be considered for experimental use only.  There
-are still statics lurking in some functions; these functions
-are not thread-safe.
-
--------------------------
-Fix for bit_vector
--------------------------
-This version also has a fix for bit_vector, which doesn't really
-work with VC++ 4.x.  Please include bvector.cpp in your
-project if you use bit_vector.  This fixes the linker errors
-that occur if you use bector.h in multiple .cpp files.
-
--------------------------
-Disclaimer
--------------------------
-Code is provided without warranty, liability, or technical support.
-
-STL.H and PTR.H are freely distributable and can be 
-modified in any way.
-
---------------------------------
-STRING.H does not compile.
---------------------------------
-
-"D. Pirzadeh" <ddp@crl.com> Explains how to fix:
-
-First, I got compile errors in "bstring.h"
-and changed it as follows to correct:
-        line 1104               "::reserve" -> "std::reserve"
-        line 1110               "::default_size" -> "std::default_size"
-
-Also, I got an INTERNAL COMPILER ERROR with Visual C++ v4.0 when I did the fol-
-lowing:
-        class xyz : public std::string { }
-
-I fixed it with:
-        typedef std::string XyzString;
-        class xyz : public XyzString { }
-
---------------------------------
-Changes made to STL distribution
---------------------------------
-
-These files were modified from the STL distribution shipped with 
-Microsoft Visual C++ 4.0.  The files here are a complete,
-working version of the STL.  These files have been tested with
-MFC applications.
-
-Changes were made to practically all header files.  Look for
-comments like:
-
-*Added by...
-*Changed by...
- 
-------------------
-Usage Instructions
-------------------
-
-Set the preprocessor variable NOMINMAX.
-
-As Microsoft recommends, the STL is compiled in the std namespace.
-
-When including these files, do **not** do this:
-
-	namespace std
-	{
-	  #include <vector.h>
-	}
-
-Instead, do this:
-
-	#include <vector.h>
-
-Recommended usage:
-
-	First, include:
-
-	#include <afxwin.h>
-	#include <afxext.h>
-	#include <afxtempl.h>
-
-	Then include the STL header files.
-
--------------------
-Support for CString
--------------------
-The stl.h file contains code written by me.  The file contains
-operators that will allow you to use CString objects with STL
-containers and functions.
-
-!!!! CString will not work with STL unless you include <stl.h> !!!!
-
--------------------------------------------
-Helper functions for pointers-in-containers
--------------------------------------------
-There is a file called stl.h which contains two functions:
-  SequenceDelete
-  MapDelete
-These functions send "delete" to all of the objects in a container.
-
-If you don't like this approach, you can use a supplied "pointer
-wrapper" class.
-
-There is a file called ptr.h which contains a class called Ptr 
-that can be used exactly like a pointer.  The object has a pointer 
-inside it that points to an object of any class.  When a Ptr object 
-is deleted, "delete" is sent to its underlying pointer.  Ptr can be 
-used with any STL container, as it has a copy constructor and 
-assignment operator, which transfers "ownership" of the pointer from 
-the source object to the destination object.  Ptr is from the book 
-Design Patterns by Gamma et al -- see the Proxy pattern.  
-
-The Ptr class makes memory leaks impossible, because it deletes
-objects automatically when the container is deleted, or when 
-functions like "delete" are used.
-
-Example:
-
-  This is a vector of CStrings:
-
-  std::vector< Ptr<CString> > StringVector;
-
-  StringVector.push_back( Ptr( new CString( "hello" ) ) );
-  StringVector.push_back( Ptr( new CString( "This is another string" ) ) );
-
-------------------------
-Common Problems with STL
-------------------------
-
-1) Compiler error: != is ambiguous
-
-   Solution: put the following line at the beginning of the method
-             that caused the error:
-
-   using namespace std;
-
-2) When using maps, the debugger crashes.
-
-   This is because symbols for maps (actually, for the "pair")
-   get truncated to 255 characters.  Solution:  Turn off the
-   variables window in the debugger.  Don't try to look at
-   a symbol that has been truncated.  This is not an STL-specific
-   bug --  It's a bug in the debugger.
-
-3) All sorts of compile errors in STL header files
-
-   Make sure the preprocessor variable NOMINMAX is defined
-
-
-4) Compiler errors about "operator < is not available", etc.
-   The class involved has global comparison operators.
-
-   Solution:
-   Write "routers" in the std namespace to the global namespace.
-   Example (see also stl.h - this is how CString is able
-   to work with STL):
-
-	namespace std
-	{
-		BOOL operator < ( const MyClass & rLhs,
-				  const AnotherClass & rRhs )
-		{
-		return ::operator < ( rLhs, rRhs );
-		}
-	}
-
-   See also 5.
-
-5) When you use find() or another algorithm, the compiler
-   complains that it cannot find the == or < operators.
-
-If your code compiles without any error messages, then disregard
-this section.  However, if you get errors like "cannot convert
-first argument from const class X" then read on. 
-
-I am assuming that your code is calling an STL algorithm like
-std::sort() or std::find().  If you're not, I can't help
-you.
-
-There is apparently a bug in the Microsoft compiler regarding
-namespaces.  Namespaces cannot locate global 
-functions that reside in the global namespace.  For example, 
-the binary == operator.
-
-Maybe this is a bug, maybe it isn't.  This is not clear
-to me.  However, I do know what works and have tried many other
-approaches that do not work.  If you have a better solution I
-would appreciate it if you could let me know about it. 
-
-So, if you declare your own class and want to use algorithms 
-like find() on an STL container, you have two choices:
-
-(1) Declare == as a member function.
-(2) Declare global operators == and !=.
-
-(1) simply works.  There will come a time, however, when (1)
-won't satisfy your needs.  If A == B, then B == A.  You can't
-do this using member functions if A and B are from different 
-classes.
-
-If you choose (2), you must add the != operator to the std
-namespace.  There are two ways to do this.  First, you can do
-this:
-   namespace std
-   { 
-     inline operator != ( const MyClass &rLhs, const MyClass &rRhs )
-     {
-       return ::operator != ( rLhs, rRhs );
-     }
-   }
-This "routes" != from the std namespace to the global namespace.
-
-Note that ( lhs != rhs ) can be derived from the == operator
-as !( lhs == rhs ).  There is a macro in STL.H, 
-STL_DECLARE_GLOBAL_NE, that does this derivation. 
-This derivation will not work when for whatever reason, !(lhs == rhs)
-is not the same as ( lhs != rhs ).
-
-The following example shows what you have to do for find().  Other
-algorithms require you to declare <, <=, and >= too.  See the
-macros STL_DECLARE_GLOBAL_GE, STL_DECLARE_GLOBAL_LT, and
-STL_GLOBAL_LE.  These macros derive new comparison operators
-from "operator <( const T&, const T& )".
-
-class MyClass
-{
-  public:
-  
-  int units;
-  CString description;
-};
-
-// We want to be able to test two MyClass objects against each other
-// in STL.  Need to create a global operator for this purpose.
-// Since we use find(), we need to declare not-equal too.
-bool operator == ( const MyClass &, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, MyClass )
-
-// These operators test for a matching description.
-// We do A == B and B == A to be consistent.
-bool operator == ( const MyClass&, const CString & );
-bool operator == ( const CString&, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, CString )
-STL_DECLARE_GLOBAL_NE( CString, MyClass )
-
-6. Errors when creating vectors that have vectors and deques
-   that have deques.
-
-   Solution:  Provide atruments to the constructor.
-
-    std::vector< std::vector<int> >
-      TwoDimensional( 0, std::vector<int>() );
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
deleted file mode 100644
index 0c40916fb67..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Orbix Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark 
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp orbix_marshal_client.cpp orbix_marshal_server.cpp \
-		  orbix_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o orbix_marshal_client.o client.o
-
-ifdef dsi
-MARSHAL_SERVER_OBJS = orbix_marshal_impl.o orbix_marshal_server.o server.o
-else
-MARSHAL_SERVER_OBJS = marshalS.o orbix_marshal_impl.o orbix_marshal_server.o server.o
-endif
-BIN = client server
-
-BUILD = $(BIN)
-
-#CLIENT_LIBS	= -lITini -liiop -lorbix
-#SERVER_LIBS	= -lITini -liiop -lDSI -lorbix -lIRclt
-CLIENT_LIBS	= -liiop -lorbix
-SERVER_LIBS	= -liiop -lDSI -lorbix -lIRclt
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-# include Orbix specific file
-include /project/mambo/gokhale/CONFIG/orbixsol2s4.mk
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT)/Benchmark
-
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(SERVER_LIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(CLIENT_LIBS) $(POSTLINK)
-
-marshal.h marshalC.cpp marshalS.cpp: marshal.idl
-	$(IDL) $(IDLFLAGS) $< 
-
-clean:
-	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
-	$(MAKE) realclean
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
deleted file mode 100644
index 690221a2b4e..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "orbix_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Orbix_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Orbix_Marshal_Client_Proxy>  driver (new
-							     Orbix_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
deleted file mode 100644
index 77c4651cfc3..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
+++ /dev/null
@@ -1,1325 +0,0 @@
-
-#ifndef marshal_h
-#define marshal_h
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _IDL_SEQUENCE_any_defined
-#define _IDL_SEQUENCE_any_defined
-
-class _IDL_SEQUENCE_any {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    CORBA::any* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_any& operator= (const _IDL_SEQUENCE_any&);
-    _IDL_SEQUENCE_any (const _IDL_SEQUENCE_any&);
-
-    _IDL_SEQUENCE_any (CORBA::ULong max);
-    _IDL_SEQUENCE_any (CORBA::ULong max, CORBA::ULong length, CORBA::any* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_any ();
-
-    ~_IDL_SEQUENCE_any ();
-
-    static CORBA::any* allocbuf(CORBA::ULong nelems);
-    static void freebuf(CORBA::any* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    CORBA::any& operator [] (CORBA::ULong IT_i);
-
-    const CORBA::any& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_any;
-
-#ifndef _IDL_SEQUENCE_anyVarH
-#define _IDL_SEQUENCE_anyVarH
-
-#ifndef _IDL_SEQUENCE_anyvPtr
-#define _IDL_SEQUENCE_anyvPtr
-typedef _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_vPtr;
-typedef const _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_any_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_any_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_any;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_any_var (const _IDL_SEQUENCE_any_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_any_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_any_var (_IDL_SEQUENCE_any *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_any_var &operator= (_IDL_SEQUENCE_any *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_any_var &operator= (const _IDL_SEQUENCE_any_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_any;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_any_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_any* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_any_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_any_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_any& () const { return * _ptr;}
-
-    const CORBA::any& operator[] (CORBA::ULong index) const;
-
-    CORBA::any& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_any *_ptr;
-    private:
-    _IDL_SEQUENCE_any_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_any_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-#ifndef _Marshal_defined
-#define _Marshal_defined
-class Marshal_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Marshal_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Marshal_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Marshal_dispatch () {}
-
-   Marshal_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Marshal_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Marshal;
-
-#ifndef MarshalPtr
-#define MarshalPtr
-
-typedef Marshal* Marshal_ptr;
-
-typedef Marshal* MarshalRef;
-
-#endif
-
-
-#ifndef MarshalForwH
-#define MarshalForwH
-CORBA::ObjectRef Marshal_getBase (void *);
-void Marshal_release (Marshal *, CORBA::Environment &IT_env);
-void Marshal_release (Marshal_ptr);
-Marshal* Marshal_duplicate (Marshal_ptr, CORBA::Environment &IT_env);
-Marshal* Marshal_duplicate (Marshal_ptr );
-Marshal_ptr Marshal_nil (CORBA::Environment &IT_env);
-Marshal_ptr Marshal_nil ();
-#endif
-#define Marshal_IMPL "Marshal"
-
-
-class Marshal;
-
-typedef Marshal MarshalProxy;
-#define Marshal_IR "Marshal"
-#define Marshal_IMPL "Marshal"
-
-#ifndef MarshalPtr
-#define MarshalPtr
-
-typedef Marshal* Marshal_ptr;
-
-typedef Marshal* MarshalRef;
-
-#endif
-
-class Marshal: public virtual CORBA::Object  {
-public:
-        Marshal (char *IT_OR);
-    Marshal (ObjectReference *IT_OR);
-    Marshal () : CORBA::Object  (1) {}
-protected:
-    Marshal_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Marshal_ptr _duplicate(
-            Marshal_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Marshal* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Marshal* _bind (CORBA::Environment &IT_env);
-   static Marshal* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Marshal* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-private:
-    static const void* IT_impl;
-public:
-    static Marshal_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Marshal_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Marshal_Marshal_Struct_defined
-#define Marshal_Marshal_Struct_defined
-
-struct Marshal_Struct {
-    CORBA::Short s;
-    CORBA::Long l;
-    CORBA::Char c;
-    CORBA::Octet o;
-    CORBA::Double d;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-    Marshal_Struct(const Marshal_Struct &);
-    Marshal_Struct();
-    ~Marshal_Struct();
-    Marshal_Struct& operator= (const Marshal_Struct&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Struct;
-
-#ifndef Marshal_Marshal_StructVarH
-#define Marshal_Marshal_StructVarH
-
-#ifndef Marshal_Marshal_StructvPtr
-#define Marshal_Marshal_StructvPtr
-typedef Marshal_Struct* Marshal_Struct_vPtr;
-typedef const Marshal_Struct* Marshal_Struct_cvPtr;
-#endif
-
-class Marshal_Struct_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Struct_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Struct;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Struct_var (const Marshal_Struct_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Struct_var () {
-        _ptr =  new Marshal_Struct;
-;
-    }
-
-    Marshal_Struct_var (Marshal_Struct *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Struct_var &operator= (Marshal_Struct *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Struct_var &operator= (const Marshal_Struct_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Struct;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Struct_var () {
-        delete _ptr;
-    }
-
-    Marshal_Struct* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Struct_cvPtr () const { return _ptr;}
-    operator Marshal_Struct_vPtr& () { return _ptr;}
-    operator Marshal_Struct& () const { return * _ptr;}
-
-    protected:
-    Marshal_Struct *_ptr;
-    private:
-    Marshal_Struct_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Struct_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-static const CORBA::TypeCode_ptr _tc_discrim;
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th,e_6th, IT__ENUM_Marshal_discrim=CORBA_ULONG_MAX};
-
-#ifndef Marshal_Marshal_Union_defined
-#define Marshal_Marshal_Union_defined
-
-struct Marshal_Union {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        CORBA::Char _c_;
-        CORBA::Octet _o_;
-        CORBA::Double _d_;
-        Marshal_Struct * _ms_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Marshal::e_0th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_0th;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Marshal::e_1st))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_1st;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    CORBA::Char c () const {
-        return _c_;
-    }
-
-    void c (CORBA::Char IT_member) {
-        if (isSet && (__d != Marshal::e_2nd))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_2nd;
-        isSet = 1;
-        _c_ = IT_member;
-    }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Marshal::e_3rd))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_3rd;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Double d () const {
-        return _d_;
-    }
-
-    void d (CORBA::Double IT_member) {
-        if (isSet && (__d != Marshal::e_4th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_4th;
-        isSet = 1;
-        _d_ = IT_member;
-    }
-
-    Marshal_Struct& ms () {
-        return (*_ms_);
-    }
-
-    const Marshal_Struct& ms () const {
-        return (*_ms_);
-    }
-
-    void ms (const Marshal_Struct& IT_member) {
-        if (isSet && (__d != Marshal::e_6th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_6th;
-
-        if (!isSet) {
-            _ms_ = new Marshal_Struct;
-            isSet = 1;
-        }
-        *(_ms_) = IT_member;
-    }
-
-
-    Marshal_Union();
-    Marshal_Union(const Marshal_Union &);
-    ~Marshal_Union();
-    Marshal_Union& operator= (const Marshal_Union&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Union;
-
-#ifndef Marshal_Marshal_UnionVarH
-#define Marshal_Marshal_UnionVarH
-
-#ifndef Marshal_Marshal_UnionvPtr
-#define Marshal_Marshal_UnionvPtr
-typedef Marshal_Union* Marshal_Union_vPtr;
-typedef const Marshal_Union* Marshal_Union_cvPtr;
-#endif
-
-class Marshal_Union_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Union_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Union;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Union_var (const Marshal_Union_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Union_var () {
-        _ptr = NULL;
-    }
-
-    Marshal_Union_var (Marshal_Union *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Union_var &operator= (Marshal_Union *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Union_var &operator= (const Marshal_Union_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Union;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Union_var () {
-        delete _ptr;
-    }
-
-    Marshal_Union* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Union_cvPtr () const { return _ptr;}
-    operator Marshal_Union_vPtr& () { return _ptr;}
-    operator Marshal_Union& () const { return * _ptr;}
-
-    protected:
-    Marshal_Union *_ptr;
-    private:
-    Marshal_Union_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Union_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-static const CORBA::TypeCode_ptr _tc_AnySeq;
-
-typedef _IDL_SEQUENCE_any AnySeq;
-typedef const _IDL_SEQUENCE_any AnySeq_IT_const;
-
-typedef _IDL_SEQUENCE_any_var AnySeq_var;
-
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-
-struct Marshal_Recursive;
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    Marshal_Recursive* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal_Recursive* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    static Marshal_Recursive* allocbuf(CORBA::ULong nelems);
-    static void freebuf(Marshal_Recursive* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    Marshal_Recursive& operator [] (CORBA::ULong IT_i);
-
-    const Marshal_Recursive& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-static const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive;
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr;
-typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;}
-
-    const Marshal_Recursive& operator[] (CORBA::ULong index) const;
-
-    Marshal_Recursive& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr;
-    private:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-#ifndef Marshal_Marshal_Recursive_defined
-#define Marshal_Marshal_Recursive_defined
-
-struct Marshal_Recursive {
-    CORBA::any value;
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive next;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-    Marshal_Recursive(const Marshal_Recursive &);
-    Marshal_Recursive();
-    ~Marshal_Recursive();
-    Marshal_Recursive& operator= (const Marshal_Recursive&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Recursive;
-
-#ifndef Marshal_Marshal_RecursiveVarH
-#define Marshal_Marshal_RecursiveVarH
-
-#ifndef Marshal_Marshal_RecursivevPtr
-#define Marshal_Marshal_RecursivevPtr
-typedef Marshal_Recursive* Marshal_Recursive_vPtr;
-typedef const Marshal_Recursive* Marshal_Recursive_cvPtr;
-#endif
-
-class Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Recursive_var (const Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    Marshal_Recursive_var (Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Recursive_var &operator= (Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Recursive_var &operator= (const Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator Marshal_Recursive_vPtr& () { return _ptr;}
-    operator Marshal_Recursive& () const { return * _ptr;}
-
-    protected:
-    Marshal_Recursive *_ptr;
-    private:
-    Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-        virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-extern const CORBA::TypeCode_ptr _tc_MarshalRef;
-
-#ifndef MarshalVarH
-#define MarshalVarH
-
-#ifndef MarshalvPtr
-#define MarshalvPtr
-typedef Marshal* Marshal_vPtr;
-typedef const Marshal* Marshal_cvPtr;
-#endif
-
-class Marshal_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_var &IT_s) {
-        {
-            _ptr = Marshal_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_var (const Marshal_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_var () {
-        _ptr = Marshal_nil ();
-    }
-
-    Marshal_var (Marshal *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_var &operator= (Marshal *IT_p) {
-        Marshal_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_var &operator= (const Marshal_var &IT_s) {
-        Marshal_release (_ptr);
-        _ptr = Marshal_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_var () {
-        Marshal_release (_ptr);
-    }
-
-    Marshal* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_cvPtr () const { return _ptr;}
-    operator Marshal_vPtr& () { return _ptr;}
-
-    protected:
-    Marshal *_ptr;
-    private:
-    Marshal_var &operator= (const CORBA::_var &IT_s);
-    Marshal_var (const CORBA::_var &IT_s);
-    Marshal_var &operator= (const CORBA::_mgr &IT_s);
-    Marshal_var &operator= (const CORBA::_SeqElem &IT_s);
-    Marshal_var (const CORBA::_mgr &IT_s);
-    Marshal_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef MarshalMgrH
-#define MarshalMgrH
-
-class Marshal_mgr : public CORBA::_mgr
-{
-    public:
-
-    Marshal_mgr () {
-        _ptr = Marshal_nil ();
-        _release = 1;
-    }
-
-    Marshal_mgr (const Marshal_mgr &IT_s) {
-        _ptr = Marshal_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Marshal_mgr &operator= (Marshal *IT_p) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Marshal_mgr &operator= (const Marshal_mgr &IT_s) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = Marshal_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Marshal_mgr &operator= (Marshal_var &IT_s) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = Marshal_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Marshal_mgr () {
-        if (_release)
-            Marshal_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Marshal* () const {
-        return (Marshal*) _ptr;
-    }
-
-    Marshal_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Marshal *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Marshal_mgr Marshal_mgr_IT_const;
-#endif
-
-#ifndef MarshalSeqElemH
-#define MarshalSeqElemH
-
-class Marshal_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Marshal_SeqElem (Marshal_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Marshal_SeqElem &operator= (Marshal_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Marshal_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Marshal_SeqElem &operator= (const Marshal_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Marshal_release (*(_ptr));
-            *(_ptr) = Marshal_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Marshal_ptr () const {
-        return _ptr ? (Marshal_ptr) (*_ptr) : Marshal_nil(); 
-    }
-
-    Marshal_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Marshal_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Marshal(X) Marshal##X
-
-#define DEF_TIE_Marshal(X) \
-	class Marshal##X : public virtual Marshal {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Marshal##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Marshal(), m_obj(objp) {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,m,l,Marshal_IR,m_obj);	\
-	   }								\
-	   Marshal##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Marshal() {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,IT_m,Marshal_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Marshal##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_short (  s1, s2,IT_env);\
-}\
-	\
-virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_long (  l1, l2,IT_env);\
-}\
-	\
-virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_octet (  o1, o2,IT_env);\
-}\
-	\
-virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_char (  c1, c2,IT_env);\
-}\
-	\
-virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_double (  d1, d2,IT_env);\
-}\
-	\
-virtual void test_struct (const Marshal::Marshal_Struct& ms1, Marshal::Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_struct (  ms1, ms2,IT_env);\
-}\
-	\
-virtual void test_union (const Marshal::Marshal_Union& u1, Marshal::Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_union (  u1, u2,IT_env);\
-}\
-	\
-virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_any (  a1, a2,IT_env);\
-}\
-	\
-virtual void test_sequence (const Marshal::AnySeq& as1, Marshal::AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_sequence (  as1, as2,IT_env);\
-}\
-	\
-virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, Marshal::Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_recursive (  mr1, mr2,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Marshal	\
-virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_short (  s1, s2,IT_env);\
-}\
-	\
-virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_long (  l1, l2,IT_env);\
-}\
-	\
-virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_octet (  o1, o2,IT_env);\
-}\
-	\
-virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_char (  c1, c2,IT_env);\
-}\
-	\
-virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_double (  d1, d2,IT_env);\
-}\
-	\
-virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_struct (  ms1, ms2,IT_env);\
-}\
-	\
-virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_union (  u1, u2,IT_env);\
-}\
-	\
-virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_any (  a1, a2,IT_env);\
-}\
-	\
-virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_sequence (  as1, as2,IT_env);\
-}\
-	\
-virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_recursive (  mr1, mr2,IT_env);\
-}\
-
-
-
-
-class MarshalProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   MarshalProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Marshal_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern MarshalProxyFactoryClass MarshalProxyFactory;
-
-class MarshalBOAImpl : public virtual Marshal  {
-public:
-    MarshalBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Marshal_IR))
-    m_pptr = new Marshal_dispatch ( (Marshal*)this,
-   	 (CORBA::Object*)this, m, l, Marshal_IR, this);
-}
-
-        virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-#define _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    Marshal::Marshal_Recursive* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal::Marshal_Recursive* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    static Marshal::Marshal_Recursive* allocbuf(CORBA::ULong nelems);
-    static void freebuf(Marshal::Marshal_Recursive* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i);
-
-    const Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive;
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-#define _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-#define _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr;
-typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;}
-
-    const Marshal::Marshal_Recursive& operator[] (CORBA::ULong index) const;
-
-    Marshal::Marshal_Recursive& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr;
-    private:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Union& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Union*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, Marshal_ptr IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal_ptr& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, Marshal::discrim IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::discrim& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_any& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_any*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Struct& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Struct*& IT_t);
-
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl b/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl
deleted file mode 100644
index 16d60e1064f..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl
+++ /dev/null
@@ -1,88 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
deleted file mode 100644
index 94058ebac1a..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
+++ /dev/null
@@ -1,1334 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Orbix marshal benchmark
-// 
-// = FILENAME
-//    orbix_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-//#define USE_INIT
-#include "orbix_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Orbix_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA::Object_ptr target;
-  char *markerserver;
-  int mlen=0, slen=0; // length of marker and service name
-
-#if 0
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix");
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-#endif
-
-  // create a marker server
-  if (options.service_name ())
-    slen = ACE_OS::strlen (options.service_name ());
-  if (options.object_name ())
-    mlen = ACE_OS::strlen (options.object_name ());
-
-  if (slen > 0)
-    {
-      markerserver = new char [mlen+slen+1+1];
-      ACE_OS::sprintf (markerserver, "%s:%s", (mlen ? options.object_name ():""),
-		   options.service_name ()); 
-      ACE_DEBUG ((LM_DEBUG, "markerserver = %s\n", markerserver));
-    }
-  else // server name is required
-    {
-      markerserver = NULL;
-    }
-
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  try {
-    target = Marshal::_bind (markerserver, options.hostname ());
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "failed to bind: " << &se << endl;
-      return 0;
-    }
-  if (CORBA::is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA::is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Orbix_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Orbix_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Orbix_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Short s1, s2;
-  s1 = 3;
-  ref_->test_short (s1, s2);
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Long l1, l2;
-  l1 = 256;
-  ref_->test_long (l1, l2);
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA::Octet o1, o2;
-  o1 = (CORBA::Octet) 127;
-  ref_->test_octet (o1, o2);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA::Char c1, c2;
-  c1 = 'B';
-  ref_->test_char (c1, c2);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA::Double d1, d2;
-  d1 = 3.1415;
-  ref_->test_double (d1, d2);
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms;
-
-  // first test an enumerated case
-  //  u1._d (Marshal::e_1st); Orbix does this on its own
-  u1.l (4567);
-
-  ref_->test_union (u1, u2);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-      return -1;
-    }
-
-  // now test the default case
-  // In Orbix, setting each field like this will not work because the poor
-  // Union has no clue what discriminant it must set to.
-#if 0
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-#endif
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u1.ms (ms);
-
-  ref_->test_union (u1, u2);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  ref_->test_any (a1, a2);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	  return 0;
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	  return -1;
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u.ms (ms);
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2);
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Short s1, s2;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1;
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2);
-  *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2;
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= s2;
-
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Long l1, l2;
-
-  l1 = 256;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= l1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= l2;
-
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Octet o1, o2;
-
-  o1 = (CORBA::Octet) 127;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2);
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Char c1, c2;
-
-  c1 = 'B';
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2);
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Double d1, d2;
-
-  d1 = 3.1415;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= d1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= d2;
-
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, *ms2=0;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, ms2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= ms2;
-
-  if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-      ms1.d == ms2->d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, *u2 = 0;
-  Marshal::Marshal_Struct ms;
-
-
-  // first test an enumerated case
-  //  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if ( (u1._d () == u2->_d()) && (u1.l () == u2->l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  delete u2;
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-
-  // test the default case
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u1.ms (ms);
-  u2 = 0;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if (u1.ms ().s == u2->ms ().s && u1.ms ().l == u2->ms ().l && u1.ms ().c == u2->ms ().c && u1.ms ().o == u2->ms ().o &&
-      u1.ms ().d == u2->ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= a1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*a2);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u.ms (ms);
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= as1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= as2;
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
deleted file mode 100644
index c1d06d03c06..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Orbix Benchmark
-// 
-// = FILENAME
-//    orbix_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_ORBIX_MARSHAL_CLIENT_H_)
-#define _ORBIX_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include Orbix specific include files
-#include "marshal.h"  // generated by IDL compiler
-
-class Orbix_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Orbix_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  Orbix client size specialization of the CORBA Marshal proxy class
-public:
-  Orbix_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Orbix_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA::ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i
deleted file mode 100644
index 1165f92fde8..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Orbix_Marshal_Client_Proxy::Orbix_Marshal_Client_Proxy (void)
-  : orb_ (CORBA::ORB::_nil ()),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Orbix_Marshal_Client_Proxy::~Orbix_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA::release (ref_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
deleted file mode 100644
index 877b8bd1626..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-#include "orbix_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2,
-			      CORBA::Environment &IT_env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2,
-			     CORBA::Environment &IT_env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2,
-			      CORBA::Environment &IT_env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2,
-			     CORBA::Environment &IT_env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2,
-			       CORBA::Environment &IT_env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			       CORBA::Environment &IT_env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA::Environment &IT_env)
-{
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2,
-			    CORBA::Environment &IT_env)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-				 CORBA::Environment &IT_env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-				  CORBA::Environment &IT_env)
-{
-}
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-void
-Marshal_DSI_Impl::invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr
-			  ep, CORBA::Environment &IT_env)
-{
-  ACE_DEBUG ((LM_DEBUG, "************ inside invoke **********\n"));
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req.op_name (IT_env), "test_short"))
-    {
-      test_short_skel (req);
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_sequence"))
-    {
-    }
-}
-
-void
-Marshal_DSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = 5*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-// all the helper functions for the DSI class
-void 
-Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest& req)
-{
-  CORBA::NVList_ptr short_nv;
-  CORBA::Any *any_s1, *any_s2;
-  CORBA::Short s1 = 0, s2 = 0;
-
-  orb_->create_list (2, short_nv); // parse 2 args
-  any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0);
-  any_s2 = new CORBA::Any (CORBA::_tc_short, &s2, 0);
-  short_nv->add_value ("s1", *any_s1, CORBA::ARG_IN);
-  short_nv->add_value ("s2", *any_s2, CORBA::ARG_OUT);
-
-  req.params (short_nv);
-
-  test_short (s1, s2);
-  ACE_DEBUG ((LM_DEBUG, ">>>>>>>s1 = %d and s2 = %d\n<<<<<<<<", s1, s2));
-}
-
-void 
-Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest& req)
-{
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
deleted file mode 100644
index 850e99c2bee..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#if !defined (ORBIX_MARSHAL_IMPL_H)
-#define ORBIX_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshal.h"
-
-
-class Marshal_SSI_Impl 
-  : public virtual MarshalBOAImpl
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA::Short s1,
-			   CORBA::Short& s2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test short
-	
-  virtual void test_long (CORBA::Long l1,
-			  CORBA::Long& l2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test long
-	
-  virtual void test_octet (CORBA::Octet o1,
-			   CORBA::Octet& o2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test octet
-	
-  virtual void test_char (CORBA::Char c1,
-			  CORBA::Char& c2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test char
-	
-  virtual void test_double (CORBA::Double d1,
-			    CORBA::Double& d2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			    Marshal::Marshal_Struct& ms2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			   Marshal::Marshal_Union& u2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test union
-	
-  virtual void test_any (const CORBA::Any& a1,
-			 CORBA::Any *& a2,
-			 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test any
-	
-  /*
-  virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			      Marshal::AnySeq *& a2,
-			      CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test sequence
-
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			       CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test struct
-	
-};
-
-class Marshal_DSI_Impl : public CORBA::DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-public:
-  Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-private:
-  virtual void invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr,
-		       CORBA::Environment&IT_env =
-		       CORBA::IT_chooseDefaultEnv()); 
-  // This method is a must
-
-  void test_short (CORBA::Short s1,
-		   CORBA::Short& s2);
-  // test short
-	
-  void test_long (CORBA::Long l1,
-		  CORBA::Long& l2);
-  // test long
-	
-  void test_octet (CORBA::Octet o1,
-		   CORBA::Octet& o2);
-  // test octet
-	
-  void test_char (CORBA::Char c1,
-		  CORBA::Char& c2);
-  // test char
-	
-  void test_double (CORBA::Double d1,
-		    CORBA::Double& d2);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2);
-  // test union
-	
-  void test_any (const CORBA::Any& a1,
-		 CORBA::Any *& a2);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2);
-  // test sequence
-
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-private:
-  //= helper functions - they behave as if they were skeletons
-  void test_short_skel (CORBA::ServerRequest& req);
-  void test_long_skel (CORBA::ServerRequest& req);
-  void test_octet_skel (CORBA::ServerRequest& req);
-  void test_char_skel (CORBA::ServerRequest& req);
-  void test_double_skel (CORBA::ServerRequest& req);
-  void test_struct_skel (CORBA::ServerRequest& req);
-  void test_union_skel (CORBA::ServerRequest& req);
-  void test_any_skel (CORBA::ServerRequest& req);
-  void test_sequence_skel (CORBA::ServerRequest& req);
-  void test_recursive_skel (CORBA::ServerRequest& req);
-
-  // we need the orb to create argument lists (NVList) for us
-  CORBA::ORB_ptr orb_; // not owned by us
-
-#if 0
-  CORBA::NVList_ptr short_nv_;
-  CORBA::NVList_ptr long_nv_;
-  CORBA::NVList_ptr octet_nv_;
-  CORBA::NVList_ptr char_nv_;
-  CORBA::NVList_ptr double_nv_;
-  CORBA::NVList_ptr struct_nv_;
-  CORBA::NVList_ptr union_nv_;
-  CORBA::NVList_ptr any_nv_;
-  CORBA::NVList_ptr seq_nv_;
-  CORBA::NVList_ptr recursive_nv_;
-  CORBA::Any_ptr result_; // void result
-#endif
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (ORBIX_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i
deleted file mode 100644
index 4ea7ef56421..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i
+++ /dev/null
@@ -1,27 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : MarshalBOAImpl (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// constructor
-ACE_INLINE
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name)
-  : orb_ (orb)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = CORBA::ORB::_nil ();
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
deleted file mode 100644
index fb060a2b5e8..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Orbix marshal benchmark
-// 
-// = FILENAME
-//    orbix_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-//#define USE_INIT
-
-#include "orbix_marshal_server.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Orbix_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-
-#if 0
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix");
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv, "Orbix_BOA");
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-#endif
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      //      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      this->dsi_ = new Marshal_DSI_Impl (&CORBA::Orbix, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      try {
-	// we need to do a setImpl
-	//this->boa_->setImpl ("Marshal", *this->dsi_);
-	CORBA::Orbix.setImpl ("Marshal", *this->dsi_);
-      }
-      catch (CORBA::SystemException &se)
-	{
-	  cerr << "system exception in obj_is_ready" << se << endl;
-	}
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "Calling impl is ready\n"));
-  try {
-    // call impl_is_ready
-    //    this->boa_->impl_is_ready ((char *)options.service_name ());
-    CORBA::Orbix.impl_is_ready ("marshalDSI");
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "system exception: " << se << endl;
-    }
-
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
deleted file mode 100644
index fe72344a8bb..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Orbix Benchmark
-// 
-// = FILENAME
-//    orbix_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_ORBIX_MARSHAL_SERVER_H_)
-#define _ORBIX_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "orbix_marshal_impl.h"
-
-// include Orbix specific include files
-#include "marshal.h"  // generated by IDL compiler
-
-class Orbix_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Orbix_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Orbix_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA::ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA::BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i
deleted file mode 100644
index f6c5fe36fd3..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Orbix_Marshal_Server_Proxy::Orbix_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Orbix_Marshal_Server_Proxy::~Orbix_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA::release (boa_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_client b/TAO/Benchmark/Marshal_Test/Orbix/run_client
deleted file mode 100755
index b0f7503d7bc..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_client
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T l
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T o
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T c
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T d
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T S
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T U
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T A
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T Q
-#client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T R
-#
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T l
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T o
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T c
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T d
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T S
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T U
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T A
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T Q
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi
deleted file mode 100755
index f44f488aee7..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -n marshalDSI -T s
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -n marshalDSI -T s
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server
deleted file mode 100755
index 19dc309e0dc..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server
+++ /dev/null
@@ -1 +0,0 @@
-putit marshalDSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P D -I V -o dsi_marshal -n marshalDSI"
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi
deleted file mode 100755
index 9a1ca614e4e..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server
deleted file mode 100755
index a0af5a0dcf4..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server
+++ /dev/null
@@ -1 +0,0 @@
-putit marshalSSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P S -I V -o ssi_marshal -n marshalSSI"
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
deleted file mode 100644
index dd6902a012d..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "orbix_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Orbix_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Orbix_Marshal_Server_Proxy>  driver (new
-							     Orbix_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile
deleted file mode 100644
index 048d0705dbc..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Tao Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark -lTAO
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp tao_marshal_client.cpp tao_marshal_server.cpp \
-		  tao_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o tao_marshal_client.o client.o
-
-MARSHAL_SERVER_OBJS = marshalC.o marshalS.o tao_marshal_impl.o tao_marshal_server.o server.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -I$(TAO_ROOT)/tao/compat
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clean:
-	rm -f core *.o *~ client server
-	$(MAKE) realclean
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/client.cpp b/TAO/Benchmark/Marshal_Test/TAO/client.cpp
deleted file mode 100644
index b38fef81023..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "tao_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Tao_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Tao_Marshal_Client_Proxy>  driver (new
-							     Tao_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl b/TAO/Benchmark/Marshal_Test/TAO/marshal.idl
deleted file mode 100644
index 7ddc5423db4..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      case e_5th:
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
deleted file mode 100644
index 3a8b4465fba..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-#include <stdio.h>
-#include "marshalC.h"
-
-// constructor
-Marshal::Marshal(STUB_Object *refdata)
-  : CORBA_Object(refdata)
-{
-}
-
-// static duplicate method
-Marshal_ptr Marshal::_duplicate(Marshal_ptr obj)
-{
-  void *dupl;
-
-  if (obj)
-    {
-      obj->AddRef();
-    }
-  return obj;
-}
-
-// static _narrow method
-Marshal_ptr Marshal::_narrow(CORBA_Object_ptr obj)
-{
-  CORBA_Environment env;
-  if (obj->_is_a("IDL:Marshal:1.0", env)){
-    STUB_Object *istub;
-    if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){
-      return Marshal::_nil();
-    }
-    Marshal_ptr new_obj = new Marshal(istub);
-    return Marshal::_duplicate(new_obj);
-  }
-  return Marshal::_nil();
-}
-
-Marshal_ptr Marshal::_nil()
-{
-  return (Marshal_ptr)NULL;
-}
-
-Marshal::Marshal_Union::Marshal_Union(const Marshal::Marshal_Union& obj) 
-{
-  _disc = obj._d();
-  switch (_disc) {
-  case e_0th:
-    __s = obj.__s;
-    break;
-  case e_1st:
-    __l = obj.__l;
-    break;
-  case e_2nd:
-    __c = obj.__c;
-    break;
-  case e_3rd:
-    __o = obj.__o;
-    break;
-  case e_4th:
-    __d = obj.__d;
-    break;
-  case e_5th:
-  default:
-    __ms = obj.__ms;
-    break;
-  }
-}
-
-Marshal::Marshal_Union& Marshal::Marshal_Union::operator=(const Marshal::Marshal_Union& obj)
-{
-  _disc = obj._d();
-  switch (_disc) {
-  case e_0th:
-    __s = obj.__s;
-    break;
-  case e_1st:
-    __l = obj.__l;
-    break;
-  case e_2nd:
-    __c = obj.__c;
-    break;
-  case e_3rd:
-    __o = obj.__o;
-    break;
-  case e_4th:
-    __d = obj.__d;
-    break;
-  case e_5th:
-  default:
-    __ms = obj.__ms;
-    break;
-  }
-  return *this;
-}
-
-// AnySeq methods
-Marshal::AnySeq::AnySeq (CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Any [this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-Marshal::AnySeq::AnySeq (CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Any *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-Marshal::AnySeq::~AnySeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void Marshal::AnySeq::length (CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Any *temp = new CORBA_Any [newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof (CORBA_Any)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Any));
-  this->_length = newlen;
-}
-
-CORBA_ULong Marshal::AnySeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Any &Marshal::AnySeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Any& Marshal::AnySeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-/***************** TypeCodes **************/
-// In the typecode, all repoIDs and names are omitted by providing their length
-// as 1 that stands for the NULL terminator
-
-// encapsulated parameters for struct Marshal_Struct typecode
-static const CORBA_Long _oc_Marshal_Struct [] = {
-  MY_BYTE_SEX,   // byte order
-  1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0")
-  1, 0, // struct name (15, "Marshal_Struct") omitted
-  5,     // 5 struct elements
-
-  // short
-  1, 0,  // should be 2, "s",  
-  tk_short,
-
-  // long
-  1, 0, // should be 2, "l",
-  tk_long,
-
-  // char
-  1, 0, // should be 2, "c",
-  tk_char,
-
-  // octet
-  1, 0, // should be 2, "o",
-  tk_octet,
-
-  // double
-  1, 0, // should be 2, "d",
-  tk_double,
-};
-
-
-static CORBA_TypeCode _tc__tc_Marshal_Struct (tk_struct, 
-					      sizeof _oc_Marshal_Struct, 
-					      (unsigned char *) &_oc_Marshal_Struct,
-					      CORBA_B_FALSE);
-CORBA_TypeCode_ptr Marshal::_tc_Marshal_Struct = &_tc__tc_Marshal_Struct;
-
-
-static const CORBA_Long _oc_discrim [] = {
-  MY_BYTE_SEX,          // byte order flag (TRICKY)
-  1, 0, // should be 20, "IDL:Marshal/discrim",
-  1, 0, // should be   8, "discrim",   
-  7,          // 7 elements in the enum
-  
-  1, 0, // 6, "e_0th",       // omitted member name, "e_0th"
-  1, 0, // 6, "e_1st",       // omitted member name, "e_1st"
-  1, 0, // 6, "e_2nd",       // omitted member name, "e_2nd"
-  1, 0, // 6, "e_3rd",       // omitted member name, "e_3rd" 
-  1, 0, // 6, "e_4th",       // omitted member name, "e_4th" 
-  1, 0, // 6, "e_5th",       // omitted member name, "e_5th"
-  1, 0  //6, "e_6th"       // omitted member name, "e_6th"
-};
-
-static CORBA_TypeCode _tc__tc_discrim (tk_enum, 
-				       sizeof _oc_discrim, 
-				       (unsigned char *) &_oc_discrim,
-				       CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_discrim = &_tc__tc_discrim;
-
-// Union
-static const CORBA_Long _oc_Marshal_Union [] = 
-{
-   MY_BYTE_SEX,          // byte order flag (TRICKY)
-   1, 0, // 26, "IDL:Marshal/Marshal_Union",       // omitted repository/type ID
-   1, 0, // 14, "Marshal_Union",       // union name
-   
-   //
-   // discriminant typecode:
-   //
-
-   tk_enum,    // tk_enum
-   80,         // encapsulation length
-     MY_BYTE_SEX,
-     1, 0,         // repoID
-     1, 0,         // name
-     7,                  // 7 elements in the enum
-   
-     1, 0,       // e_Oth
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,       // e_6th
-
-   5,       	// default member index (zero based)
-   6,       	// number of union members
-   
-   // the 1st union branch arm
-   Marshal::e_0th,       // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 2nd union branch arm
-   Marshal::e_1st,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-
-   // the 3rd union branch arm
-   Marshal::e_2nd,      // member label value
-   1, 0,        // omitted member name, "c"
-   tk_char,     // member typecode
-   
-   // the 4th union branch arm
-   Marshal::e_3rd,      // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 5th union branch arm
-   Marshal::e_4th,      // member label value
-   1, 0,       // omitted member name, "d"
-   tk_double,
-
-   // the 6th union branch
-   Marshal::e_5th, // member label value
-   1, 0,           // omitted member name, "ms"
-   tk_struct,  // tk_struct
-   84,  // encapsulation length
-   
-     MY_BYTE_SEX,   // byte order
-     1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0")
-     1, 0, // struct name (15, "Marshal_Struct") omitted
-     5,     // 5 struct elements
-
-     // short
-     1, 0,  // should be 2, "s",  
-     tk_short,
-
-     // long
-     1, 0, // should be 2, "l",
-     tk_long,
-
-     // char
-     1, 0, // should be 2, "c",
-     tk_char,
-
-     // octet
-     1, 0, // should be 2, "o",
-     tk_octet,
-
-     // double
-     1, 0, // should be 2, "d",
-     tk_double,
- 
-   // default case
-   6,    // 7th member, default index val
-   1, 0, // struct name "ms"
-   ~0,   // indirected typecode
-   -108  // has to point to tk_struct in this stream
-};
-
-static CORBA_TypeCode _tc__tc_Marshal_Union (tk_union, 
-					     sizeof _oc_Marshal_Union, 
-					     (unsigned char *) &_oc_Marshal_Union,
-					     CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_Marshal_Union = &_tc__tc_Marshal_Union;
-
-// AnySeq
-static const CORBA_Long _oc_AnySeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_any,  // sequence of any
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_AnySeq (tk_sequence,
-					      sizeof
-					      _oc_AnySeq, 
-					      (unsigned char *)
-					      &_oc_AnySeq,
-					      CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_AnySeq = &_tc__tc_AnySeq; 
-
-/***************** All the methods ********************/
-// test_short
-static const TAO_Param_Data marshal_test_short_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Short, PARAM_IN, 0},
-  {_tc_CORBA_Short, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_short_calldata = {
-  "test_short",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_short_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_short (CORBA_Short s1, CORBA_Short &s2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_short_calldata, 0, &s1, &s2);
-}
-
-// test_long
-static const TAO_Param_Data marshal_test_long_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Long, PARAM_IN, 0},
-  {_tc_CORBA_Long, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_long_calldata = {
-  "test_long",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_long_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_long (CORBA_Long l1, CORBA_Long &l2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_long_calldata, 0, &l1, &l2);
-}
-
-// test_octet
-static const TAO_Param_Data marshal_test_octet_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Octet, PARAM_IN, 0},
-  {_tc_CORBA_Octet, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_octet_calldata = {
-  "test_octet",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_octet_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_octet (CORBA_Octet o1, CORBA_Octet &o2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_octet_calldata, 0, &o1, &o2);
-}
-
-// test_char
-static const TAO_Param_Data marshal_test_char_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Char, PARAM_IN, 0},
-  {_tc_CORBA_Char, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_char_calldata = {
-  "test_char",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_char_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_char (CORBA_Char c1, CORBA_Char &c2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_char_calldata, 0, &c1, &c2);
-}
-
-// test_double
-static const TAO_Param_Data marshal_test_double_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Double, PARAM_IN, 0},
-  {_tc_CORBA_Double, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_double_calldata = {
-  "test_double",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_double_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_double (CORBA_Double d1, CORBA_Double &d2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call (env, &marshal_test_double_calldata, 0, &d1, &d2);
-}
-
-// test_struct
-static const TAO_Param_Data marshal_test_struct_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {Marshal::_tc_Marshal_Struct, PARAM_IN, 0},
-  {Marshal::_tc_Marshal_Struct, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_struct_calldata = {
-  "test_struct",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_struct_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_struct (const Marshal::Marshal_Struct &ms1, Marshal::Marshal_Struct
-			   &ms2, CORBA_Environment &env) 
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_struct_calldata, 0, &ms1, &ms2);
-}
-
-// test_union
-static const TAO_Param_Data marshal_test_union_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {Marshal::_tc_Marshal_Union, PARAM_IN, 0},
-  {Marshal::_tc_Marshal_Union, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_union_calldata = {
-  "test_union",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_union_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_union (const Marshal_Union &u1, Marshal::Marshal_Union
-			   &u2, CORBA_Environment &env) 
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call (env, &marshal_test_union_calldata, 0, &u1, &u2);
-}
-
-// test_any
-static const TAO_Param_Data marshal_test_any_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Any, PARAM_IN, 0},
-  {_tc_CORBA_Any, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_any_calldata = {
-  "test_any",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_any_paramdata[0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_any (const CORBA_Any &a1, CORBA_Any *&a2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_any_calldata, 0, &a1, &a2);
-}
-
-// test_sequence
-static const TAO_Param_Data marshal_test_sequence_paramdata [] = {
-  { _tc_CORBA_Void, PARAM_RETURN, 0},
-  { Marshal::_tc_AnySeq, PARAM_IN, 0},
-  { Marshal::_tc_AnySeq, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_sequence_calldata = {
-  "test_sequence",  // opname
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-  &marshal_test_sequence_paramdata [0],
-  0, 0
-};
-
-// stub
-void Marshal::test_sequence (const Marshal::AnySeq &as1, Marshal::AnySeq *&as2,
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_sequence_calldata, 0, &as1, &as2);
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
deleted file mode 100644
index 505de16fafb..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef MARSHAL_C_H
-#define MARSHAL_C_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tao/orb.h"
-#include "tao/orbobj.h"
-#include "tao/object.h"
-#include "tao/stub.h"
-#include "tao/typecode.h"
-#include "tao/cdr.h"
-
-class Marshal;
-typedef Marshal *Marshal_ptr;
-typedef Marshal_ptr MarshalRef;
-
-class Marshal: public virtual CORBA_Object
-{
-public:
-  static Marshal_ptr _duplicate (Marshal_ptr obj);
-  static Marshal_ptr _narrow (CORBA_Object_ptr obj);
-  static Marshal_ptr _nil ();
-
-  struct Marshal_Struct {
-    CORBA_Short	s;
-    CORBA_Long	l;
-    CORBA_Char	c;
-    CORBA_Octet	o;
-    CORBA_Double	d;
-  };
-  static CORBA_TypeCode_ptr _tc_Marshal_Struct;
-
-  enum discrim {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd,
-    e_4th,
-    e_5th,
-    e_6th
-  };
-
-  static CORBA_TypeCode_ptr _tc_discrim;
-
-  class Marshal_Union
-  {
-  private:
-    discrim	_disc;
-    CORBA_Short	__s;
-    CORBA_Long	__l;
-    CORBA_Char	__c;
-    CORBA_Octet	__o;
-    CORBA_Double	__d;
-    Marshal::Marshal_Struct	__ms;
-  public:
-    Marshal_Union() : _disc(discrim(0)) {}
-    ~Marshal_Union() {}
-    Marshal_Union(const Marshal_Union& obj);
-    Marshal_Union& operator=(const Marshal_Union& obj);
-	
-    void _d(discrim val) { _disc = val; }
-    discrim _d() const { return _disc; }
-	
-    void s(CORBA_Short val) {
-      __s = val;
-      _disc = Marshal::e_0th;
-    }
-    CORBA_Short s() const { return __s; }
-	
-    void l(CORBA_Long val) {
-      __l = val;
-      _disc = Marshal::e_1st;
-    }
-    CORBA_Long l() const { return __l; }
-	
-    void c(CORBA_Char val) {
-      __c = val;
-      _disc = Marshal::e_2nd;
-    }
-    CORBA_Char c() const { return __c; }
-	
-    void o(CORBA_Octet val) {
-      __o = val;
-      _disc = Marshal::e_3rd;
-    }
-    CORBA_Octet o() const { return __o; }
-	
-    void d(CORBA_Double val) {
-      __d = val;
-      _disc = Marshal::e_4th;
-    }
-    CORBA_Double d() const { return __d; }
-	
-    void ms(const Marshal::Marshal_Struct& val) {
-      __ms = val;
-      _disc = Marshal::e_5th;
-    }
-    const Marshal::Marshal_Struct& ms() const { return __ms; }
-    Marshal::Marshal_Struct& ms() { return __ms; }
-	
-  };
-	
-  static CORBA_TypeCode_ptr _tc_Marshal_Union;
-
-  class AnySeq
-  {
-  public:
-    static CORBA_Any *allocbuf (CORBA_ULong nelems);
-    static void freebuf (CORBA_Any *data);
-    AnySeq (CORBA_ULong max=0);
-    AnySeq (CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Any *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    AnySeq (const AnySeq&);
-    ~AnySeq ();
-    CORBA_ULong maximum () const;
-    void length (CORBA_ULong);
-    CORBA_ULong length () const;
-    CORBA_Any &operator[] (CORBA_ULong index);
-    const CORBA_Any &operator[] (CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Any *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_AnySeq;
-
-
-  // now the methods
-  virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env);
-	
-  virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env);
-	
-  virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env);
-	
-  virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env);
-	
-  virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
-	
-  virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
-	
-  virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env);
-	
-  virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env);
-	
-  virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env);
-	
-#if 0
-  virtual void test_recursive(const Marshal::Marshal_Recursive& mr1,
-			      Marshal::Marshal_Recursive *& mr2,
-			      CORBA_Environment &env);
-#endif
-
-protected:
-  Marshal() {}
-  Marshal(STUB_Object *refdata);
-  virtual ~Marshal() {}
-
-private:
-  Marshal(const Marshal &) {}
-  void operator=(const Marshal &) {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
deleted file mode 100644
index c265e7c9c2f..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include <iostream.h>
-#include "marshalS.h"
-
-static const TAO_operation_db_entry Marshal_operations[] = {
-  {"_is_a", &_skel_Marshal::_Marshal_is_a_skel},
-  { "test_short", &_skel_Marshal::_Marshal_test_short_skel},
-  { "test_long", &_skel_Marshal::_Marshal_test_long_skel},
-  { "test_octet", &_skel_Marshal::_Marshal_test_octet_skel},
-  { "test_char", &_skel_Marshal::_Marshal_test_char_skel},
-  { "test_double", &_skel_Marshal::_Marshal_test_double_skel},
-  { "test_struct", &_skel_Marshal::_Marshal_test_struct_skel},
-  { "test_union", &_skel_Marshal::_Marshal_test_union_skel},
-  { "test_any", &_skel_Marshal::_Marshal_test_any_skel},
-  { "test_sequence", &_skel_Marshal::_Marshal_test_sequence_skel},
-  { 0, 0 }
-};
-
-TAO_Dynamic_Hash_OpTable tao_Marshal_optable(Marshal_operations, 10,
-					     // 9 + 1 operations on our 
-					     // interface 
-					     20);
-// constructor
-_skel_Marshal::_skel_Marshal (const char *obj_name)
-{
-  const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_Marshal_optable;     // operation database
-  CORBA_Long i;
-
-  // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-  data->profile.port = oa->get_addr().get_port_number();
-  data->profile.object_key.length = ACE_OS::strlen(obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy (data->profile.object_key.buffer, obj_name,
-		  data->profile.object_key.length); // set the object key
-  this->set_parent(data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind(data->profile.object_key, this);// register ourselves
-}
-
-// skeletons
-void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-#if 0
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(_tc_CORBA_Short);
-  Marshal_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  Marshal::ShortSeq *value = (Marshal::ShortSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (Marshal_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendShortSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-#endif
-
-  // One immediate thought is to do the following:
-  // define a specialized marshal factory derived from TAO_Marshal_Factory
-  // then:
-  // CDR compiledStream (req._incoming.next, req._incoming.remaining,
-  // byte_order, consume_buf = 0, instance of our marshal factory
-}
-
-void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
-					    CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
-					    CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					   CORBA_Object_ptr obj, 
-					   CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_is_a_skel (
-					CORBA_ServerRequest	&req,
-					CORBA_Object_ptr    obj,
-					CORBA_Environment		&env
-					)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:Marshal:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
deleted file mode 100644
index 5980be4f737..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef MARSHAL_S_H
-#define MARSHAL_S_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "marshalC.h"
-#include "tao/connect.h"
-#include "tao/orb.h"
-#include "tao/params.h"
-#include "tao/iiopobj.h"
-#include "tao/optable.h"  // for registering our methods
-#include "tao/corbacom.h"
-#include "tao/nvlist.h"
-#include "tao/orbobj.h"
-#include "tao/debug.h"
-
-
-class _skel_Marshal;
-typedef _skel_Marshal *_skel_Marshal_ptr;
-typedef _skel_Marshal *_skel_Marshal_ref;
-
-class _skel_Marshal: public Marshal
-{
-public:
-  // pure virtual functions implemented by the implementation class
-  virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env) = 0;
-	
-  virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env) = 0;
-	
-  virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env) = 0;
-	
-  virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env) = 0;
-	
-  virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env) = 0;
-	
-  virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env) = 0;
-	
-
-  // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
-  static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
-  static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
-  static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
-protected:
-  _skel_Marshal (const char *obj_name = 0);
-  virtual ~_skel_Marshal () {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/server.cpp b/TAO/Benchmark/Marshal_Test/TAO/server.cpp
deleted file mode 100644
index 930322be5c3..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "tao_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Tao_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Tao_Marshal_Server_Proxy>  driver (new
-							     Tao_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
deleted file mode 100644
index 157050ba3d8..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
+++ /dev/null
@@ -1,1424 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Tao marshal benchmark
-// 
-// = FILENAME
-//    tao_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-#include "tao_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Tao_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA_Object_ptr target;
-  CORBA_Environment env;
-  CORBA_String str; // IOR
-  fstream iorfile; // persistent storage
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  str = CORBA_string_alloc(500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("ior.txt", ios::in);
-  iorfile >> ((char *)str);
-  iorfile.close();
-
-  cout << "Read IOR string as: " << ((char *)str) << endl;
-
-  target = this->orb_->string_to_object(str, env);
-  if (env.exception() != 0){
-    ACE_DEBUG ((LM_ERROR, "str to obj failed"));
-    return 1;
-  }
-  CORBA_string_free(str);
-
-#if 0
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  target = Marshal::_bind (options.object_name (), options.hostname ());
-  if (CORBA_is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-#endif
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA_is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Tao_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Tao_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Tao_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA_Short s1, s2;
-  CORBA_Environment env;
-
-  s1 = 3;
-  ref_->test_short (s1, s2, env);
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA_Long l1, l2;
-  CORBA_Environment env;
-
-  l1 = 256;
-  ref_->test_long (l1, l2, env);
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA_Octet o1, o2;
-  CORBA_Environment env;
-
-  o1 = (CORBA_Octet) 127;
-  ref_->test_octet (o1, o2, env);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA_Char c1, c2;
-  CORBA_Environment env;
-
-  c1 = 'B';
-  ref_->test_char (c1, c2, env);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA_Double d1, d2;
-  CORBA_Environment env;
-
-  d1 = 3.1415;
-  ref_->test_double (d1, d2, env);
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2, env);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  ref_->test_union (u1, u2, env);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-    }
-
-  // now test the default case
-  u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using
-			  // the default case
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA_Octet) 127;
-  u1.ms ().d = 3.1415;
-
-  ref_->test_union (u1, u2, env);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA_Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-  CORBA_Environment env;
-
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  //  a1 <<= ms1;  // not in TAO yet
-  a1.replace (Marshal::_tc_Marshal_Struct, &ms1, 0, env);
-
-  a2 = new CORBA_Any;
-
-  // now test it
-  ref_->test_any (a1, a2, env);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-  CORBA_Environment env;
-
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA_Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA_Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-#if 0 // to be supported later
-  as1[0] <<= (CORBA_Short)3;
-  as1[1] <<= (CORBA_Long) 256;
-  as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127);
-  as1[3] <<= CORBA_Any::from_char ('B');
-  as1[4] <<= (CORBA_Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-#endif
-  as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env);
-  as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); 
-  as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env);
-  as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); 
-  as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); 
-  as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct
-		  (ms), 1, env);
-  as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env);
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2, env);
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type (), env))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-#if 0
-int
-Tao_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-  CORBA_Environment env;
-
-
-  mr1.value <<= (CORBA_Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA_Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2, env);
-  }
-  catch (CORBA_SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-#endif
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Tao_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Short s1, s2;
-  CORBA_Environment env;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add (CORBA_ARG_IN)->value ()) <<= s1;
-  arglist->add_value ("s1", CORBA_Any (_tc_CORBA_Short, &s1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA_ARG_OUT)->value ()->replace (CORBA__tc_short, &s2);
-  //  *(arglist->add (CORBA_ARG_OUT)->value ()) <<= s2;
-  arglist->add_value ("s2", CORBA_Any (_tc_CORBA_Short, &s2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= s2;
-  s2 = *(CORBA_Short *)arglist->item(1)->value()->value();
-
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Long l1, l2;
-  CORBA_Environment env;
-
-  l1 = 256;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= l1;
-  arglist->add_value ("l1", CORBA_Any (_tc_CORBA_Long, &l1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_long, &l2);
-  arglist->add_value ("l2", CORBA_Any (_tc_CORBA_Long, &l2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= l2;
-  l2 = *(CORBA_Long *)arglist->item (1)->value ()->value ();
-
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Octet o1, o2;
-  CORBA_Environment env;
-
-  o1 = (CORBA_Octet) 127;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_octet (o1);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_octet, &o2);
-  arglist->add_value ("o1", CORBA_Any (_tc_CORBA_Octet, &o1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("o2", CORBA_Any (_tc_CORBA_Octet, &o2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= CORBA_Any::to_octet (o2);
-  o2 = *(CORBA_Octet *)arglist->item (1)->value ()->value ();
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Char c1, c2;
-  CORBA_Environment env;
-
-  c1 = 'B';
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_char (c1);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_char, &c2);
-  arglist->add_value ("c1", CORBA_Any (_tc_CORBA_Char, &c1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("c2", CORBA_Any (_tc_CORBA_Char, &c2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= CORBA_Any::to_char (c2);
-  c2 = *(CORBA_Char *)arglist->item (1)->value ()->value ();
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Double d1, d2;
-  CORBA_Environment env;
-
-  d1 = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= d1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_double, &d2);
-  arglist->add_value ("d1", CORBA_Any (_tc_CORBA_Double, &d1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("d2", CORBA_Any (_tc_CORBA_Double, &d2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= d2;
-  d2 = *(CORBA_Double *)arglist->item (1)->value ()->value ();
-
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= ms1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2);
-  arglist->add_value ("ms1", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("ms2", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= ms2;
-  ms2 = *(Marshal::Marshal_Struct *)arglist->item (1)->value ()->value ();
-
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= u1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= u2;
-  u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value ();
-
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-
-  // now test the default case
-  u1._d (Marshal::e_5th); // e_6th doesn't work
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA_Octet) 127;
-  u1.ms ().d = 3.1415;
-
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= u1;
-  //arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= u2;
-  u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value ();
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA_Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-  CORBA_Environment env;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  //  a1 <<= ms1;
-  a1.replace (Marshal::_tc_Marshal_Struct, &ms1, CORBA_B_FALSE, env);
-
-  a2 = new CORBA_Any;
-
-  // now test it
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= a1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_any, a2);
-  arglist->add_value ("a1", CORBA_Any (_tc_CORBA_Any, &a1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("a2", CORBA_Any (_tc_CORBA_Any, a2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= (*a2);
-  a2->replace (_tc_CORBA_Any, (CORBA_Any *)arglist->item (1)->value ()->value
-	      (), 1, env);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-  CORBA_Environment env;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA_Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA_Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-#if 0
-  as1[0] <<= (CORBA_Short)3;
-  as1[1] <<= (CORBA_Long) 256;
-  as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127);
-  as1[3] <<= CORBA_Any::from_char ('B');
-  as1[4] <<= (CORBA_Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-#endif
-  as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env);
-  as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); 
-  as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env);
-  as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); 
-  as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); 
-  as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct
-		  (ms), 1, env);
-  as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env);
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= as1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  arglist->add_value ("as1", CORBA_Any (Marshal::_tc_AnySeq, &as1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("o2", CORBA_Any (Marshal::_tc_AnySeq, as2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= (*as2);
-  *as2 = *(Marshal::AnySeq *)arglist->item (1)->value ()->value ();
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type (), env))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-#if 0
-int
-Tao_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA_Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA_Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA_SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
deleted file mode 100644
index 0bf7ef78660..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Tao Benchmark
-// 
-// = FILENAME
-//    tao_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_TAO_MARSHAL_CLIENT_H_)
-#define _TAO_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include Tao specific include files
-#include "marshalC.h"  // generated by IDL compiler
-#include "tao/nvlist.h"
-
-class Tao_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Tao_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  Tao client size specialization of the CORBA Marshal proxy class
-public:
-  Tao_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Tao_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA_ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i
deleted file mode 100644
index 2606962892b..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Tao_Marshal_Client_Proxy::Tao_Marshal_Client_Proxy (void)
-  : orb_ (0),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Tao_Marshal_Client_Proxy::~Tao_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA_release (ref_);
-
-  // release the ORB
-  CORBA_release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
deleted file mode 100644
index 6d5005f83ad..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
+++ /dev/null
@@ -1,650 +0,0 @@
-#include "tao_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA_Short s1,
-			      CORBA_Short &s2,
-			      CORBA_Environment &env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA_Long l1,
-			     CORBA_Long &l2,
-			      CORBA_Environment &env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA_Octet o1,
-			      CORBA_Octet &o2,
-			      CORBA_Environment &env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA_Char c1,
-			     CORBA_Char &c2,
-			      CORBA_Environment &env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA_Double d1,
-			       CORBA_Double &d2,
-			      CORBA_Environment &env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			      CORBA_Environment &env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA_Environment &env)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA_Any &a1,
-			    CORBA_Any *&a2,
-			      CORBA_Environment &env)
-{
-  a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-			      CORBA_Environment &env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-#if 0
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-			      CORBA_Environment &env)
-{
-}
-#endif
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-static const TAO_operation_db_entry Marshal_DSI_operations[] = {
-  {"_is_a", &Marshal_DSI_Impl::_Marshal_is_a_skel},
-  { "test_short", &Marshal_DSI_Impl::_Marshal_test_short_skel},
-  { "test_long", &Marshal_DSI_Impl::_Marshal_test_long_skel},
-  { "test_octet", &Marshal_DSI_Impl::_Marshal_test_octet_skel},
-  { "test_char", &Marshal_DSI_Impl::_Marshal_test_char_skel},
-  { "test_double", &Marshal_DSI_Impl::_Marshal_test_double_skel},
-  { "test_struct", &Marshal_DSI_Impl::_Marshal_test_struct_skel},
-  { "test_union", &Marshal_DSI_Impl::_Marshal_test_union_skel},
-  { "test_any", &Marshal_DSI_Impl::_Marshal_test_any_skel},
-  { "test_sequence", &Marshal_DSI_Impl::_Marshal_test_sequence_skel},
-  { 0, 0 }
-};
-
-// Note that we use a linear table because rest of the DSI implementations we
-// compare with also use linear search in their "invoke" method.
-TAO_Linear_OpTable tao_Marshal_DSI_optable (Marshal_DSI_operations, 10);
-
-// constructor
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *obj_name)
-  : orb_ (orb)
-  //,CORBA_DynamicImplementation ("Marshal", obj_name) // interface name is necessary
-{
-  // Note that this is a HACK to achieve DSI behavior. But this way we can
-  // cleanly integrate ourselves with the dispatch mechanism of the OA.
-
-  const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_Marshal_DSI_optable;     // operation database
-  CORBA_Long i;
-
-  // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup (oa->get_addr ().get_host_name ());
-  data->profile.port = oa->get_addr ().get_port_number ();
-  data->profile.object_key.length = ACE_OS::strlen (obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy (data->profile.object_key.buffer, obj_name,
-		  data->profile.object_key.length); // set the object key
-  this->set_parent (data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind (data->profile.object_key, this);// register ourselves
-}
-
-void
-Marshal_DSI_Impl::invoke (CORBA_ServerRequest& req, CORBA_Environment &env)
-{
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req.op_name (), "test_short"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_sequence"))
-    {
-    }
-}
-
-// simulate the skeletons
-void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:Marshal:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
-void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_s1 (_tc_CORBA_Short);
-  CORBA_Any               any_s2 (_tc_CORBA_Short);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Short s1, s2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_s1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_s2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  s1 = *(CORBA_Short *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_short (s1, s2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Short, &s2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_l1 (_tc_CORBA_Long);
-  CORBA_Any               any_l2 (_tc_CORBA_Long);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Long l1, l2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_l1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_l2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  l1 = *(CORBA_Long *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_long (l1, l2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Long, &l2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_o1 (_tc_CORBA_Octet);
-  CORBA_Any               any_o2 (_tc_CORBA_Octet);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Octet o1, o2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_o1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_o2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  o1 = *(CORBA_Octet *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_octet (o1, o2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Octet, &o2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					       CORBA_Object_ptr obj, 
-					       CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_c1 (_tc_CORBA_Char);
-  CORBA_Any               any_c2 (_tc_CORBA_Char);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Char c1, c2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_c1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_c2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  c1 = *(CORBA_Char *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_char (c1, c2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Char, &c2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_d1 (_tc_CORBA_Double);
-  CORBA_Any               any_d2 (_tc_CORBA_Double);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Double d1, d2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_d1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_d2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  d1 = *(CORBA_Double *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_double (d1, d2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Double, &d2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_ms1 (Marshal::_tc_Marshal_Struct);
-  CORBA_Any               any_ms2 (Marshal::_tc_Marshal_Struct);
-  Marshal_DSI_Impl*       impl;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_ms1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_ms2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // note that the second parameter being an out parameter, we are allocating
-  // it from heap and filling it up. We will then insert it into the Any that
-  // will get written to the stream. We should have done this for the
-  // primitives too, but somehow they worked (because nothing got written onto
-  // the stack frame onto which they existed, but this phenomenon was occuring
-  // here and possibly will occur for the rest of the case
-  ms1 = *(Marshal::Marshal_Struct *) nv1->value ()->value ();
-  ms2 = new Marshal::Marshal_Struct;
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_struct (ms1, *ms2, env);
-
-  nv2->value ()->replace (Marshal::_tc_Marshal_Struct, ms2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_u1 (Marshal::_tc_Marshal_Union);
-  CORBA_Any               any_u2 (Marshal::_tc_Marshal_Union);
-  Marshal_DSI_Impl*       impl;
-  Marshal::Marshal_Union u1, *u2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_u1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_u2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  u1 = *(Marshal::Marshal_Union *) nv1->value ()->value ();
-  u2 = new Marshal::Marshal_Union;
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_union (u1, *u2, env);
-
-  nv2->value ()->replace (Marshal::_tc_Marshal_Union, u2, 0, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any *a1=0, *a2=0;
-  CORBA_Any               any_a1 (_tc_CORBA_Any, &a1);
-  CORBA_Any               any_a2 (_tc_CORBA_Any);
-  Marshal_DSI_Impl*       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_a1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_a2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  a1 = (CORBA_Any *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_any (*a1, a2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Any, a2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						   CORBA_Object_ptr obj, 
-						   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_as1 (Marshal::_tc_AnySeq);
-  CORBA_Any               any_as2 (Marshal::_tc_AnySeq);
-  Marshal_DSI_Impl*       impl;
-  Marshal::AnySeq  *as1, *as2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_as1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_as2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  as1 = (Marshal::AnySeq *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_sequence (*as1, as2, env);
-
-  nv2->value ()->replace (Marshal::_tc_AnySeq, as2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-// private methods of our DSI class
-void
-Marshal_DSI_Impl::test_short (CORBA_Short s1,
-			      CORBA_Short &s2,
-			      CORBA_Environment &env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA_Long l1,
-			     CORBA_Long &l2,
-			     CORBA_Environment &env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA_Octet o1,
-			      CORBA_Octet &o2,
-			      CORBA_Environment &env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA_Char c1,
-			     CORBA_Char &c2,
-			     CORBA_Environment &env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA_Double d1,
-			       CORBA_Double &d2,
-			       CORBA_Environment &env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			       CORBA_Environment &env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA_Environment &env)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA_Any &a1,
-			    CORBA_Any *&a2,
-			    CORBA_Environment &env)
-{
-  a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-				 CORBA_Environment &env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-#if 0
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-				  CORBA_Environment &env)
-{
-}
-#endif
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
deleted file mode 100644
index 0ecec0fc87c..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#if !defined (TAO_MARSHAL_IMPL_H)
-#define TAO_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshalS.h"
-//#include "tao/dynimpl.h"
-
-class Marshal_SSI_Impl 
-  : public virtual _skel_Marshal
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA_Short s1,
-			  CORBA_Short& s2,
-			   CORBA_Environment &env);
-  // test short
-	
-  virtual void test_long (CORBA_Long l1,
-			 CORBA_Long& l2,
-			   CORBA_Environment &env);
-  // test long
-	
-  virtual void test_octet (CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			   CORBA_Environment &env);
-  // test octet
-	
-  virtual void test_char (CORBA_Char c1,
-			 CORBA_Char& c2,
-			   CORBA_Environment &env);
-  // test char
-	
-  virtual void test_double (CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			   CORBA_Environment &env);
-  // test union
-	
-  virtual void test_any (const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			   CORBA_Environment &env);
-  // test any
-	
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2,
-			   CORBA_Environment &env);
-  // test sequence
-
-#if 0
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			   CORBA_Environment &env);
-  // test struct
-#endif
-	
-};
-
-class Marshal_DSI_Impl : public CORBA_Object //: public CORBA_DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-  // =NOTES
-  // We do not have a DynamicImplementation as yet. So we do a trick here. We
-  // simulate the skeletons here and these call the private methods defined below:
-public:
-  Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-  virtual void invoke (CORBA_ServerRequest & req, CORBA_Environment &env);
-  // This method is a must, but of no use
-
-  // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
-  static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
-  static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
-  static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
-private:
-  void test_short (CORBA_Short s1,
-		   CORBA_Short& s2,
-		   CORBA_Environment &env);
-  // test short
-	
-  void test_long (CORBA_Long l1,
-		  CORBA_Long& l2,
-		  CORBA_Environment &env);
-  // test long
-	
-  void test_octet (CORBA_Octet o1,
-		   CORBA_Octet& o2,
-		   CORBA_Environment &env);
-  // test octet
-	
-  void test_char (CORBA_Char c1,
-		  CORBA_Char& c2,
-		  CORBA_Environment &env);
-  // test char
-	
-  void test_double (CORBA_Double d1,
-		    CORBA_Double& d2,
-		    CORBA_Environment &env);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2,
-		    CORBA_Environment &env);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2,
-		   CORBA_Environment &env);
-  // test union
-	
-  void test_any (const CORBA_Any& a1,
-		 CORBA_Any *& a2,
-		 CORBA_Environment &env);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2,
-		      CORBA_Environment &env);
-  // test sequence
-
-#if 0
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2,
-		       CORBA_Environment &env);
-  // test struct
-#endif
-	
-  // we need the orb to create argument lists (NVList) for us
-  CORBA_ORB_ptr orb_; // not owned by us
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (TAO_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i
deleted file mode 100644
index aee9bc6b043..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : _skel_Marshal (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = 0;//CORBA::ORB::_nil ();
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
deleted file mode 100644
index ed6a5a041c7..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Tao marshal benchmark
-// 
-// = FILENAME
-//    tao_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "tao_marshal_server.h"
-#include <iostream.h>
-#include <fstream.h>
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Tao_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA_Environment env;
-  CORBA_String str; // for the IOR string
-  fstream iorfile;  // persistent storage for IOR
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.boa_init_args (argc);
-
-  char *foo [] = {"-OAhost","mambo"}; argc = 2;
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, foo, "ROA");//(argc, (char *const *)argv);
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      // register with the BOA
-      //      this->boa_->obj_is_ready (this->ssi_);
-
-      // get a stringified representation of the object reference created above
-      str = this->orb_->object_to_string (this->dsi_, env);
-      if (env.exception() != 0)
-	{
-	  //	  print_exception (env.exception(), "object_to_string", stdout);
-	  return 1;
-	}
-
-      // save the IOR in persistent storage so that clients can read this and obtain
-      // object references. We need to do this since we do not yet have some kind
-      // of a naming service that will allow clients to "bind" to desired objects
-      iorfile.open ("./ior.txt", ios::out);
-      iorfile << ((char *)str) << endl;
-      iorfile.close ();
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      //      this->boa_->obj_is_ready (this->dsi_);
-
-      // get a stringified representation of the object reference created above
-      str = this->orb_->object_to_string (this->dsi_, env);
-      if (env.exception() != 0)
-	{
-	  ACE_DEBUG ((LM_ERROR, "cannot get IOR from DSI object" ));
-	  //	  print_exception (env.exception(), "object_to_string", stdout);
-	  return 1;
-	}
-
-      // save the IOR in persistent storage so that clients can read this and obtain
-      // object references. We need to do this since we do not yet have some kind
-      // of a naming service that will allow clients to "bind" to desired objects
-      iorfile.open ("./ior.txt", ios::out);
-      iorfile << ((char *)str) << endl;
-      iorfile.close ();
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-
-  ACE_Reactor::run_event_loop (); // should be replaced by impl_is_ready
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
deleted file mode 100644
index adbd782c3d3..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Tao Benchmark
-// 
-// = FILENAME
-//    tao_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_TAO_MARSHAL_SERVER_H_)
-#define _TAO_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "tao_marshal_impl.h"
-
-// include Tao specific include files
-#include "marshalS.h"  // generated by IDL compiler
-
-class Tao_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Tao_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Tao_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA_ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA_BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i
deleted file mode 100644
index 721a329c03b..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Tao_Marshal_Server_Proxy::Tao_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Tao_Marshal_Server_Proxy::~Tao_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA_release (boa_);
-
-  // release the ORB
-  CORBA_release (orb_);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
deleted file mode 100644
index 93cfc461a32..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the VisiBroker Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark -lorb
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp visi_marshal_client.cpp visi_marshal_server.cpp \
-		  visi_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o visi_marshal_client.o client.o
-
-MARSHAL_SERVER_OBJS = marshalC.o marshalS.o visi_marshal_impl.o visi_marshal_server.o server.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-# include VisiBroker specific file
-include /project/mambo/gokhale/CONFIG/orbeline_defaults.mk
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -D_PMC_INCLUDE_DSI
-
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-marshalC.h marshalS.h marshalC.cpp marshalS.cpp: marshal.idl
-	$(IDL) $(IDLFLAGS) $< 
-
-clean:
-	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
-	$(MAKE) realclean
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
deleted file mode 100644
index ed996e4b9e0..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "visi_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Visi_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Visi_Marshal_Client_Proxy>  driver (new
-							     Visi_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl b/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl
deleted file mode 100644
index 7ddc5423db4..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      case e_5th:
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client b/TAO/Benchmark/Marshal_Test/VisiBroker/run_client
deleted file mode 100755
index 2a35700495f..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o marshal -T s
-client -i 1 -h mambo -R s -P S -o marshal -T l
-client -i 1 -h mambo -R s -P S -o marshal -T o
-client -i 1 -h mambo -R s -P S -o marshal -T c
-client -i 1 -h mambo -R s -P S -o marshal -T d
-client -i 1 -h mambo -R s -P S -o marshal -T S
-client -i 1 -h mambo -R s -P S -o marshal -T U
-client -i 1 -h mambo -R s -P S -o marshal -T A
-client -i 1 -h mambo -R s -P S -o marshal -T Q
-#client -i 1 -h mambo -R s -P S -o marshal -T R
-#
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o marshal -T s
-client -i 1 -h mambo -R s -P D -o marshal -T l
-client -i 1 -h mambo -R s -P D -o marshal -T o
-client -i 1 -h mambo -R s -P D -o marshal -T c
-client -i 1 -h mambo -R s -P D -o marshal -T d
-client -i 1 -h mambo -R s -P D -o marshal -T S
-client -i 1 -h mambo -R s -P D -o marshal -T U
-client -i 1 -h mambo -R s -P D -o marshal -T A
-client -i 1 -h mambo -R s -P D -o marshal -T Q
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server b/TAO/Benchmark/Marshal_Test/VisiBroker/run_server
deleted file mode 100755
index c5ff4cdc2f0..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server
+++ /dev/null
@@ -1 +0,0 @@
-server -R r -P S -I V -o marshal
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
deleted file mode 100644
index 2706589fa93..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "visi_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Visi_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Visi_Marshal_Server_Proxy>  driver (new
-							     Visi_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
deleted file mode 100644
index 3801165cc8b..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
+++ /dev/null
@@ -1,1344 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Visibroker marshal benchmark
-// 
-// = FILENAME
-//    visi_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "visi_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Visi_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA::Object_ptr target;
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  target = Marshal::_bind (options.object_name (), options.hostname ());
-  if (CORBA::is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA::is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Visi_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Visi_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Visi_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Short s1, s2;
-  s1 = 3;
-  ref_->test_short (s1, s2);
-  if (s1 == s2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Long l1, l2;
-  l1 = 256;
-  ref_->test_long (l1, l2);
-  if (l1 == l2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA::Octet o1, o2;
-  o1 = (CORBA::Octet) 127;
-  ref_->test_octet (o1, o2);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA::Char c1, c2;
-  c1 = 'B';
-  ref_->test_char (c1, c2);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA::Double d1, d2;
-  d1 = 3.1415;
-  ref_->test_double (d1, d2);
-  if (d1 == d2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  ref_->test_union (u1, u2);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-      return -1;
-    }
-
-  // now test the default case
-  u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using
-			  // the default case
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-
-  ref_->test_union (u1, u2);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  ref_->test_any (a1, a2);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	  return 0;
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	  return -1;
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA::Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2);
-
-#if 0
-  // the following is extremely weird. I do not understand why it is not the
-  // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it.
-  if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union))
-    {
-      cerr << "6th elem has union typecode" << endl;
-    }
-  else
-    {
-      cerr << "6th elem doesnot have union typecode" << endl;
-      cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl;
-    }
-#endif
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-#if 0
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-#endif
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-#if 0
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-#endif
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Visi_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Short s1, s2;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1;
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2);
-  *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2;
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= s2;
-
-  if (s1 == s2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Long l1, l2;
-
-  l1 = 256;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= l1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= l2;
-
-  if (l1 == l2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Octet o1, o2;
-
-  o1 = (CORBA::Octet) 127;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2);
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Char c1, c2;
-
-  c1 = 'B';
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2);
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Double d1, d2;
-
-  d1 = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= d1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= d2;
-
-  if (d1 == d2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= ms2;
-
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-
-  // now test the default case
-  u1._d (Marshal::e_5th); // e_6th doesn't work
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= a1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*a2);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA::Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= as1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*as2);
-
-#if 0
-  // the following is extremely weird. I do not understand why it is not the
-  // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it.
-  if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union))
-    {
-      cerr << "6th elem has union typecode" << endl;
-    }
-  else
-    {
-      cerr << "6th elem doesnot have union typecode" << endl;
-      cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl;
-    }
-#endif
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-#if 0
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-#endif
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-#if 0
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-#endif
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
deleted file mode 100644
index d45a5f0b773..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Visibroker Benchmark
-// 
-// = FILENAME
-//    visi_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_VISI_MARSHAL_CLIENT_H_)
-#define _VISI_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include VisiBroker specific include files
-#include "marshalC.h"  // generated by IDL compiler
-#include "pmcext.h"    // VisiBroker extensions
-
-#if 0
-// Define an event handler specific to this class
-class marshal_event_handler: public PMC_EXT::ClientEventHandler
-{
-  // =TITLE
-  // marshal_event_handler
-  // =DESCRIPTION
-  // event handler. Specifically, we use this to set socket buffer and no delay
-  // flags
-public:
-  void bind_succeeded(CORBA::Object_ptr obj,
-		      const PMC_EXT::ConnectionInfo &);
-  // on success from a bind call, set the desired quantities
-};
-#endif
-
-class Visi_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Visi_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  VisiBroker client size specialization of the CORBA Marshal proxy class
-public:
-  Visi_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Visi_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA::ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i
deleted file mode 100644
index fb8c5823848..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Visi_Marshal_Client_Proxy::Visi_Marshal_Client_Proxy (void)
-  : orb_ (CORBA_ORB::_nil ()),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Visi_Marshal_Client_Proxy::~Visi_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA::release (ref_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
deleted file mode 100644
index 7ae2a3f04e9..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-#include "visi_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-void
-Marshal_DSI_Impl::invoke (CORBA::ServerRequest_ptr req)
-{
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req->op_name (), "test_short"))
-    {
-      test_short_skel (req);
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_sequence"))
-    {
-    }
-}
-
-void
-Marshal_DSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = 5*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-// all the helper functions for the DSI class
-void 
-Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest_ptr req)
-{
-  CORBA::NVList_var short_nv_;
-  CORBA::Any *any_s1, *any_s2;
-  CORBA::Short s1=0, 
-    *s2=0;
-
-  orb_->create_list (0, short_nv_);
-
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ()));
-
-  any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0);
-  s2 = new CORBA::Short;
-  any_s2 = new CORBA::Any (CORBA::_tc_short, s2, 1);
-
-  short_nv_->add_value ("s1", *any_s1, CORBA::ARG_IN);
-  // if I do the next line, I get CORBA::Marshal exception from
-  // req->params. I don't know why
-  short_nv_->add_value ("s2", *any_s2, CORBA::ARG_OUT);
-  // However, the following line works. I think I know what is the
-  // problem. Since the 2nd argument is a ARG_OUT, we cannot add_value. We must
-  // just tell it what type to expect and leave it to the ORB to allocate the
-  // memory 
-  //short_nv_->add_item ("s2", CORBA::ARG_OUT);
-  // My explanation is confirmed if I use the following in which case I get a
-  // marshaling exception. Thus, for OUT args, only add_item works.
-  // *(short_nv_->add (CORBA::ARG_OUT)->value ()) <<= s2;
-
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ()));
-
-  try {
-    req->params (short_nv_);
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "System Exception doing params: " << se << endl;
-    }
-  cout << "after params" << endl;
-  *(short_nv_->item (0)->value ()) >>= s1;
-  ACE_DEBUG ((LM_DEBUG, "s1 = %d\n", s1));
-  test_short (s1, *s2);
-  //  *(short_nv_->item (1)->value ()) <<= s2;
-  ACE_DEBUG ((LM_DEBUG, "s1 = %d, s2 = %d\n", s1, *s2));
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ after the call has %d nodes\n", short_nv_->count ()));
-}
-
-void 
-Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest_ptr req)
-{
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
deleted file mode 100644
index 20938f49cde..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#if !defined (VISI_MARSHAL_IMPL_H)
-#define VISI_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshalS.h"
-
-
-class Marshal_SSI_Impl 
-  : public virtual _sk_Marshal
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
-  // test short
-	
-  virtual void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
-  // test long
-	
-  virtual void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
-  // test octet
-	
-  virtual void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
-  // test char
-	
-  virtual void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
-  // test union
-	
-  virtual void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
-  // test any
-	
-  /*
-  virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
-  // test sequence
-
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-};
-
-class Marshal_DSI_Impl : public CORBA::DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-public:
-  Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-  virtual void invoke (CORBA::ServerRequest_ptr req);
-  // This method is a must
-
-private:
-  void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
-  // test short
-	
-  void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
-  // test long
-	
-  void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
-  // test octet
-	
-  void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
-  // test char
-	
-  void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
-  // test union
-	
-  void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
-  // test sequence
-
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-private:
-  //= helper functions - they behave as if they were skeletons
-  void test_short_skel (CORBA::ServerRequest_ptr req);
-  void test_long_skel (CORBA::ServerRequest_ptr req);
-  void test_octet_skel (CORBA::ServerRequest_ptr req);
-  void test_char_skel (CORBA::ServerRequest_ptr req);
-  void test_double_skel (CORBA::ServerRequest_ptr req);
-  void test_struct_skel (CORBA::ServerRequest_ptr req);
-  void test_union_skel (CORBA::ServerRequest_ptr req);
-  void test_any_skel (CORBA::ServerRequest_ptr req);
-  void test_sequence_skel (CORBA::ServerRequest_ptr req);
-  void test_recursive_skel (CORBA::ServerRequest_ptr req);
-
-  // we need the orb to create argument lists (NVList) for us
-  CORBA::ORB_ptr orb_; // not owned by us
-
-#if 0
-  CORBA::NVList_ptr short_nv_;
-  CORBA::NVList_ptr long_nv_;
-  CORBA::NVList_ptr octet_nv_;
-  CORBA::NVList_ptr char_nv_;
-  CORBA::NVList_ptr double_nv_;
-  CORBA::NVList_ptr struct_nv_;
-  CORBA::NVList_ptr union_nv_;
-  CORBA::NVList_ptr any_nv_;
-  CORBA::NVList_ptr seq_nv_;
-  CORBA::NVList_ptr recursive_nv_;
-  CORBA::Any_ptr result_; // void result
-#endif
-};
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (VISI_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i
deleted file mode 100644
index b9eefcfbd12..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : _sk_Marshal (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// constructor
-ACE_INLINE
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name)
-  : orb_ (orb),
-    CORBA::DynamicImplementation ("Marshal", obj_name) // interface name is necessary
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = CORBA::ORB::_nil ();
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
deleted file mode 100644
index 1a81241a843..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Visibroker marshal benchmark
-// 
-// = FILENAME
-//    visi_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "visi_marshal_server.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Visi_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv);
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      // register with the BOA
-      this->boa_->obj_is_ready (this->ssi_);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      try {
-      this->boa_->obj_is_ready (this->dsi_);
-      }
-      catch (CORBA::SystemException &se)
-	{
-	  cerr << "system exception in obj_is_ready" << se << endl;
-	}
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  
-  try {
-    // call impl_is_ready
-    this->boa_->impl_is_ready ();
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "system exception: " << se << endl;
-    }
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
deleted file mode 100644
index bfe9b1d9879..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Visibroker Benchmark
-// 
-// = FILENAME
-//    visi_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_VISI_MARSHAL_SERVER_H_)
-#define _VISI_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "visi_marshal_impl.h"
-
-// include VisiBroker specific include files
-#include "marshalS.h"  // generated by IDL compiler
-#include "pmcext.h"    // VisiBroker extensions
-
-class Visi_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Visi_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Visi_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA::ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA::BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i
deleted file mode 100644
index 3c83a78af29..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Visi_Marshal_Server_Proxy::Visi_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Visi_Marshal_Server_Proxy::~Visi_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA::release (boa_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile
deleted file mode 100644
index 9f5327741bf..00000000000
--- a/TAO/Benchmark/benchmark/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the CORBA_Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LIBNAME  = libbenchmark
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-FILES 	= driver \
-	  marshal_options \
-	  marshal_results \
-	  marshal_proxy
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-LDLIBS = -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) $(VLIB)
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I$(TAO_ROOT)/Benchmark/
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/driver.o .shobj/driver.so: driver.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/driver.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/marshal_options.o .shobj/marshal_options.so: marshal_options.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/marshal_results.o .shobj/marshal_results.so: marshal_results.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i
-.obj/marshal_proxy.o .shobj/marshal_proxy.so: marshal_proxy.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.h \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/Benchmark/benchmark/driver.cpp b/TAO/Benchmark/benchmark/driver.cpp
deleted file mode 100644
index b2e5a413cdb..00000000000
--- a/TAO/Benchmark/benchmark/driver.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "benchmark/driver.h"
-
-template <class T>
-CORBA_Benchmark_Driver<T>::CORBA_Benchmark_Driver (T *proxy)
-  : proxy_ (proxy)
-{
-}
-
-template <class T>
-CORBA_Benchmark_Driver<T>::~CORBA_Benchmark_Driver (void)
-{
-  delete proxy_;
-}
-
-template <class T>
-int
-CORBA_Benchmark_Driver<T>::run (int argc, char *argv[])
-{
-  // The run method delegates the task of parsing the command line options to
-  // the options data member
-  if (this->options_.parse_args (argc, argv) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot parse arguments\n"));
-      return -1;
-    }
-
-#if 0
-  // get a handle to the proxy
-  this->proxy_ = this->options_.make_proxy ();
-  if (this->proxy_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot make proxy\n"));
-      return -1;
-    }
-#endif
-
-  // The driver delegates the task of running the test to the newly created
-  // proxy 
-  if (this->proxy_->run (this->options_, this->results_) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot run\n"));
-      return -1;
-    }
-
-  // The driver delegates the task of printing the results to the TTCP_Results
-  // class 
-  if (this->results_.print_results () == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot print results\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-
diff --git a/TAO/Benchmark/benchmark/driver.h b/TAO/Benchmark/benchmark/driver.h
deleted file mode 100644
index 06a928125f6..00000000000
--- a/TAO/Benchmark/benchmark/driver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    driver.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_BENCHMARK_DRIVER_H_)
-#define _CORBA_BENCHMARK_DRIVER_H_
-
-#include "ace/Log_Msg.h"
-
-template <class PROXY>
-class CORBA_Benchmark_Driver
-{
-  // = TITLE
-  //    CORBA Benchmark Driver.
-  //
-  // = DESCRIPTION
-  //    This class encapsulates all the driver common to the CORBA benchmark
-  //    tests. It provides a template to run the benchmarking code. The real
-  //    work will be done by the PROXY class.
-public:
-
-  CORBA_Benchmark_Driver (PROXY *p);
-  // Constructor.
-
-  ~CORBA_Benchmark_Driver (void);
-  // Destructor
-
-  int run (int argc, char *argv[]);
-  // This is the starting point of all CORBA benchmark tests.
-  // Returns 0 on success, -1 on error.
-
-private:
-  PROXY *proxy_;
-  // the actual object that will do the work
-
-  PROXY::RESULTS results_;
-  // Storage of test results.
-
-  PROXY::OPTIONS options_;
-  // CORBA test command line options
-};
-
-#endif /* CORBA_BENCHMARK_DRIVER_H */
diff --git a/TAO/Benchmark/benchmark/marshal_options.cpp b/TAO/Benchmark/benchmark/marshal_options.cpp
deleted file mode 100644
index 2473032f5da..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_options.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_options.h"
-#include "ace/Get_Opt.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_options.i"
-#endif /* __ACE_INLINE__ */
-
-static char *usage_string = 
-"Marshal_Test available options: \n\
--d                      : set debug ON \n\
--D                      : set TCP NO DELAY on \n\
--n <service name>       : set the service name\n\
--s <snd sock bufsize>   : set sender sock buf \n\
--r <rcv sock bufsize>   : set recv sock buf \n\
--h <hostname>           : hostname to listen/connect \n\
--p <portnum>            : port num to listen \n\
--i <iters>              : number of iters \n\
--R <ROLE>               : s(ender)/r(eceiver) \n\
--T <datatype>           : s(hort)/l(ong)/d(ouble)/o(ctet)/c(har)/\n\
-                          S(truct)/U(nion)/A(ny)/(se)Q/R(ecursive)\n\
--P <policy>             : S(II/SI)/D(II/SI) depending on role \n\
--I <CORBA impl>         : O(rbix)/V(isiBroker)/T(AO)\n\
--o <obj name>           : obj to bind to \n\
--f <filename>           : filename to store results \n\
-";
-
-int
-CORBA_Marshal_Options::Usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "%s\n", usage_string));
-  return -1;
-}
-
-int
-CORBA_Marshal_Options::parse_args (int argc, char *argv [])
-{
-  int c; // option letter used
-  ACE_Get_Opt get_opt (argc, argv, "dDn:s:r:h:p:i:R:T:P:I:o:f:");
-
-  //  ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Options::parse_args\n"));
-
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'd': // debug
-	  this->debug (1);
-	  break;
-	case 'D': // TCP NODELAY
-	  this->disable_nagle (1);
-	  break;
-	case 'n':
-	  this->service_name (get_opt.optarg);
-	  break;
-	case 's': // sender socket size
-	  this->snd_socket_queue_size (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'r': // receive socket size
-	  this->rcv_socket_queue_size (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'h': // hostname
-	  this->hostname (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	case 'p': // port number
-	  this->port (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'i': // port number
-	  this->iterations (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'R': // role
-	  switch (*get_opt.optarg)
-	    {
-	    case 'S': // sender
-	    case 's': // sender
-	      this->role (SENDER);
-	      break;
-	    case 'R': // receiver
-	    case 'r': // receiver
-	      this->role (RECEIVER);
-	      break;
-	    default:
-	      return this->Usage ();
-	    }
-	  break;
-	case 'T': // data type to test
-	  switch (*get_opt.optarg)
-	    {
-	    case 's': // short
-	      this->data_type (SHORT);
-	      break;
-	    case 'd': // double
-	      this->data_type (DOUBLE);
-	      break;
-	    case 'o': // octet
-	      this->data_type (OCTET);
-	      break;
-	    case 'c': // char
-	      this->data_type (CHAR);
-	      break;
-	    case 'S': // Struct
-	      this->data_type (STRUCT);
-	      break;
-	    case 'U': // Union
-	      this->data_type (UNION);
-	      break;
-	    case 'A': // Any
-	      this->data_type (ANY);
-	      break;
-	    case 'Q': // Sequence
-	      this->data_type (SEQUENCE);
-	      break;
-	    case 'R': // Recursive
-	      this->data_type (RECURSIVE);
-	      break;
-	    case 'l': // long, also the default
-	    default:
-	      this->data_type (LONG);
-	      break;
-	    }
-	  break;
-	case 'P': // policy
-	  switch (*get_opt.optarg)
-	    {
-	    case 'S':
-	    case 's':
-	      this->policy (STATIC);
-	      break;
-	    case 'D':
-	    case 'd':
-	      this->policy (DYNAMIC);
-	      break;
-	    default:
-	      return this->Usage ();
-	    }
-	  break;
-	case 'I': // impl
-	  switch (*get_opt.optarg)
-	    {
-	    case 'O': // Orbix
-	      this->proxy_type (ORBIX);
-	      break;
-	    case 'V': // VisiBroker
-	      this->proxy_type (VISIBROKER);
-	      break;
-	    case 'T': // TAO
-	      this->proxy_type (TAO);
-	      break;
-	    }
-	  break;
-	case 'o': // obj name
-	  this->object_name (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	case 'f': // file name to save results
-	  this->filename (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	default:  // error
-	  return this->Usage ();
-	}
-    }
-  return 0;
-}
-
-int
-CORBA_Marshal_Options::orb_init_args (int &argc, char *argv [])
-{
-  char buffer [200];
-
-  argc = 0;
-  switch (this->proxy_type_)
-    {
-    case ORBIX:
-      break;
-    case VISIBROKER:
-      {
-	ACE_OS::memset (buffer, '\0', 200);
-	if (snd_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer, "-ORBsendbufsize %d", snd_socket_queue_size_);
-	    orb_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-
-	ACE_OS::memset (buffer, '\0', 200);
-	if (rcv_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer, "-ORBrcvbufsize %d", rcv_socket_queue_size_);
-	    orb_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-      }
-      break;
-    case TAO:
-      break;
-    }
-  ACE_OS::memset (buffer, '\0', 200);
-  ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ());
-  return 0;
-}
-
-static char buffer [20][200];
-
-int
-CORBA_Marshal_Options::boa_init_args (int &argc, char *argv [])
-{
-  argc = 0;
-  switch (this->proxy_type_)
-    {
-    case ORBIX:
-      break;
-    case VISIBROKER:
-      {
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (snd_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAsendbufsize %d", snd_socket_queue_size_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (rcv_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OArcvbufsize %d", rcv_socket_queue_size_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (port_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAport %d", port_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (hostname_ != 0 && role_ == RECEIVER)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAipaddr %s", hostname_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-      }
-      break;
-    case TAO:
-      {
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (port_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAport %d", port_);
-	    //	    boa_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (hostname_ != 0 && role_ == RECEIVER)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAhostname %s", hostname_);
-	    //	    boa_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-      }
-      break;
-    }
-  //  ACE_OS::memset (buffer, '\0', 200);
-  //  ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ());
-  return 0;
-}
-
diff --git a/TAO/Benchmark/benchmark/marshal_options.h b/TAO/Benchmark/benchmark/marshal_options.h
deleted file mode 100644
index 49639cd74f1..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_options.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_MARSHAL_OPTIONS_H_)
-#define _CORBA_MARSHAL_OPTIONS_H_
-
-#include "ace/OS.h"
-#include "ace/SString.h"
-
-class CORBA_Marshal_Options
-{
-  // = TITLE
-  //    CORBA_Marshal_Options
-  // = DESCRIPTION
-  //    An encapsulation of all the CORBA_MARSHAL test parameters.  This is
-  //    used to communicate between the ACE_CORBA_Marshal_Driver and all
-  //    specializations of CORBA_Marshal_Proxy. It must be noted that not all
-  //    options will be valid for a given specialization of CORBA_Marshal_Proxy. This is
-  //    a "all-encompassing" class.
-public:
-  // The following data types will be tested
-  enum DATATYPE 
-  {
-    NO_DATATYPE,
-    SHORT,
-    LONG,
-    DOUBLE,
-    CHAR,
-    OCTET,
-    STRUCT,
-    UNION,
-    ANY,
-    SEQUENCE,
-    RECURSIVE
-  };
-
-  // The following CORBA implementations will be tested
-  enum PROXY_TYPE 
-  {
-    NO_PROXY,
-    TAO, 
-    ORBIX, 
-    VISIBROKER
-  };
-
-  // Invocation policy
-  enum POLICY 
-  {
-    NO_POLICY,
-    STATIC,  // SII, SSI
-    DYNAMIC  // DII, DSI
-  };
-
-  // what role do we play?
-  enum ROLE 
-  {
-    NO_ROLE,
-    SENDER,
-    RECEIVER
-  };
-
-  CORBA_Marshal_Options (void);
-  // Construction.  Sets default values.
-
-  ~CORBA_Marshal_Options (void);
-  // Destructor
-
-  int parse_args (int argc, char *argv[]);
-  // Parse command line arguments.  This decides what type of CORBA_MARSHAL
-  // test to run.
-
-  // All the command line options
-
-  //= Get/Set the data type to be sent/received
-  CORBA_Marshal_Options::DATATYPE data_type (void);
-  void data_type (CORBA_Marshal_Options::DATATYPE);
-
-  //= Get/set the proxy type
-  CORBA_Marshal_Options::PROXY_TYPE proxy_type (void);
-  void proxy_type (CORBA_Marshal_Options::PROXY_TYPE);
-
-  //= Get/Set the policy used by clients/servers for communication
-  CORBA_Marshal_Options::POLICY policy (void);
-  void policy (CORBA_Marshal_Options::POLICY);
-
-  //= Get/Set whether we are client or server (sender/receiver)
-  CORBA_Marshal_Options::ROLE role (void);
-  void role (CORBA_Marshal_Options::ROLE);
-
-  //= Get/Set the hostname client connects to or the interface on which the
-  //server listens to
-  const char *hostname (void);
-  void hostname (const char *);
-
-  //= Get/set the port number on which the server listens
-  short port (void);
-  void port (short);
-  
-  //= Get/Set the object name (to which to connect to)
-  const char *object_name (void);
-  void object_name (const char *);
-
-  //= Get/Set the service name (for impl is ready)
-  const char *service_name (void);
-  void service_name (const char *);
-
-  // = Get/set receive sockbufsize.
-  int rcv_socket_queue_size (void);
-  void rcv_socket_queue_size (int);
-
-  // = Get/set send sockbufsize.
-  int snd_socket_queue_size (void);
-  void snd_socket_queue_size (int);
-
-  // = Get/set whether to use TCP_NODELAY or not
-  unsigned short disable_nagle (void);
-  void disable_nagle (unsigned short);
-
-  // = Get/set whether to print debug messages.
-  unsigned short debug (void);
-  void debug (unsigned short);
-
-  // =Get/Set filename to store results
-  const char *filename (void);
-  void filename (const char *fname);
-
-  // =Get/set number of iterations
-  int iterations (void);
-  void iterations (int iter);
-
-  int Usage (void);
-  // prints a usage message and always returns -1
-
-  int orb_init_args (int &argc, char * argv []);
-  // return a string that will be passed to the ORB init method based on the
-  // other options and proxy type
-
-  int boa_init_args (int &argc, char * argv []);
-  // return a string that will be passed to the BOA init method based on the
-  // other options and proxy type
-
-private:
-  const char *object_name_;
-  // name of the object.
-  
-  const char *service_name_;
-  // name of the service.
-  
-  CORBA_Marshal_Options::DATATYPE data_type_;
-  // data type to send/receive
-
-  CORBA_Marshal_Options::PROXY_TYPE proxy_type_;
-  // the proxy type, e.g., ACE, Orbix, VisiBroker, etc
-
-  CORBA_Marshal_Options::POLICY policy_;
-  // communications policy used by the communicating entity
-
-  CORBA_Marshal_Options::ROLE role_;
-  // Are we creating a sender or receiver?
-
-  int rcv_socket_queue_size_;
-  // Size of socket queue.
-
-  int snd_socket_queue_size_;
-  // Size of socket queue.
-
-  unsigned short disable_nagle_;
-  // Nagle must be stopped.
-
-  unsigned short debug_;
-  // Should we print debug messages?
-
-  short port_;
-  // Port for socket connections to use.
-
-  const  char *hostname_;
-  // Host for senders to connect to. and servers to listen on
-
-  const char *filename_;
-  // filename in which to store the results
-
-  int iterations_;
-  // number of times to run the same test
-
-  ACE_CString orb_init_args_;
-  // arguments to orb_init
-
-  ACE_CString boa_init_args_;
-  // arguments to boa_init
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_options.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_options.i b/TAO/Benchmark/benchmark/marshal_options.i
deleted file mode 100644
index cb3506aa35f..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.i
+++ /dev/null
@@ -1,233 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_options.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-// constructor
-ACE_INLINE
-CORBA_Marshal_Options::CORBA_Marshal_Options (void)
-  : object_name_ (0),
-    data_type_ (CORBA_Marshal_Options::NO_DATATYPE),
-    proxy_type_ (CORBA_Marshal_Options::NO_PROXY),
-    policy_ (CORBA_Marshal_Options::NO_POLICY),
-    role_ (CORBA_Marshal_Options::NO_ROLE),
-    rcv_socket_queue_size_ (-1),
-    snd_socket_queue_size_ (-1),
-    disable_nagle_ (0),
-    debug_ (0),
-    hostname_ (0),
-    port_ (-1),
-    iterations_ (0)
-{
-}
-
-    
-// destructor
-ACE_INLINE
-CORBA_Marshal_Options::~CORBA_Marshal_Options (void)
-{
-}
-
-// set the data type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::data_type (CORBA_Marshal_Options::DATATYPE dt)
-{
-  data_type_ = dt;
-}
-
-// get the data type to be transferred
-ACE_INLINE CORBA_Marshal_Options::DATATYPE
-CORBA_Marshal_Options::data_type (void)
-{
-  return data_type_;
-}
-
-// set the proxy type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::proxy_type (CORBA_Marshal_Options::PROXY_TYPE pt)
-{
-  proxy_type_ = pt;
-}
-
-// get the data type to be transferred
-ACE_INLINE CORBA_Marshal_Options::PROXY_TYPE
-CORBA_Marshal_Options::proxy_type (void)
-{
-  return proxy_type_;
-}
-
-// set the policy type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::policy (CORBA_Marshal_Options::POLICY inv)
-{
-  policy_ = inv;
-}
-
-// get the policy type to be transferred
-ACE_INLINE CORBA_Marshal_Options::POLICY
-CORBA_Marshal_Options::policy (void)
-{
-  return policy_;
-}
-
-// set the role type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::role (CORBA_Marshal_Options::ROLE my_role)
-{
-  role_ = my_role;
-}
-
-// get the role type to be transferred
-ACE_INLINE CORBA_Marshal_Options::ROLE
-CORBA_Marshal_Options::role (void)
-{
-  return role_;
-}
-
-// set the hostname
-ACE_INLINE void
-CORBA_Marshal_Options::hostname (const char *hname)
-{
-  hostname_ = hname;
-}
-
-// get the hostname
-ACE_INLINE const char*
-CORBA_Marshal_Options::hostname (void)
-{
-  return hostname_;
-}
-
-// set the post
-ACE_INLINE void
-CORBA_Marshal_Options::port (short portnum)
-{
-  port_ = portnum;
-}
-
-// get the port
-ACE_INLINE short
-CORBA_Marshal_Options::port (void)
-{
-  return port_;
-}
-
-// set the object name
-ACE_INLINE void
-CORBA_Marshal_Options::object_name (const char *objname)
-{
-  object_name_ = objname;
-}
-
-// get the object name
-ACE_INLINE const char *
-CORBA_Marshal_Options::object_name (void)
-{
-  return object_name_;
-}
-
-// set the service name
-ACE_INLINE void
-CORBA_Marshal_Options::service_name (const char *srvname)
-{
-  service_name_ = srvname;
-}
-
-// get the service name
-ACE_INLINE const char *
-CORBA_Marshal_Options::service_name (void)
-{
-  return service_name_;
-}
-
-// set the receive sock size
-ACE_INLINE void
-CORBA_Marshal_Options::rcv_socket_queue_size (int socksize)
-{
-  rcv_socket_queue_size_ = socksize;
-}
-
-// get the receive sock size
-ACE_INLINE int
-CORBA_Marshal_Options::rcv_socket_queue_size (void)
-{
-  return rcv_socket_queue_size_;
-}
-
-// set the sender sock size
-ACE_INLINE void
-CORBA_Marshal_Options::snd_socket_queue_size (int socksize)
-{
-  snd_socket_queue_size_ = socksize;
-}
-
-// get the snd sock size
-ACE_INLINE int
-CORBA_Marshal_Options::snd_socket_queue_size (void)
-{
-  return snd_socket_queue_size_;
-}
-
-// set whether Nagle algo is to be disabled
-ACE_INLINE void
-CORBA_Marshal_Options::disable_nagle (unsigned short val)
-{
-  disable_nagle_ = (val ? 1 : 0);
-}
-
-// get whether Nagle algo is disabled
-ACE_INLINE unsigned short
-CORBA_Marshal_Options::disable_nagle (void)
-{
-  return disable_nagle_;
-}
-
-// set whether debug is to be disabled
-ACE_INLINE void
-CORBA_Marshal_Options::debug (unsigned short val)
-{
-  debug_ = (val ? 1 : 0);
-}
-
-// get whether debug is disabled
-ACE_INLINE unsigned short
-CORBA_Marshal_Options::debug (void)
-{
-  return debug_;
-}
-
-// set the filename
-ACE_INLINE void
-CORBA_Marshal_Options::filename (const char *fname)
-{
-  filename_ = fname;
-}
-
-// get the filename
-ACE_INLINE const char*
-CORBA_Marshal_Options::filename (void)
-{
-  return filename_;
-}
-
-// set the iterations
-ACE_INLINE void
-CORBA_Marshal_Options::iterations (int iter)
-{
-  iterations_ = iter;
-}
-
-// get the iterations
-ACE_INLINE int
-CORBA_Marshal_Options::iterations (void)
-{
-  return iterations_;
-}
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.cpp b/TAO/Benchmark/benchmark/marshal_proxy.cpp
deleted file mode 100644
index aa6aa1e631c..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_proxy.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_proxy.i"
-#endif /* __ACE_INLINE__ */
-
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.h b/TAO/Benchmark/benchmark/marshal_proxy.h
deleted file mode 100644
index de81ccf95ea..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_proxy.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_CORBA_MARSHAL_PROXY_H_)
-#define _CORBA_MARSHAL_PROXY_H_
-
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-
-class CORBA_Marshal_Proxy
-{
-  // = TITLE
-  //    Abstract handle for all CORBA_Marshal tests.
-  // = DESCRIPTION
-  //   The IMPL class is the CORBA specific class which does the real work. The
-  //   IMPL class must support the run method
-public:
-  typedef CORBA_Marshal_Options OPTIONS;
-  typedef CORBA_Marshal_Results RESULTS;
-
-  CORBA_Marshal_Proxy (void);
-  // constructor
-
-  virtual ~CORBA_Marshal_Proxy (void);
-  // destructor
-
-  virtual int run (OPTIONS &, RESULTS &) = 0;
-  // run the test
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_proxy.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.i b/TAO/Benchmark/benchmark/marshal_proxy.i
deleted file mode 100644
index 746651741b3..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.i
+++ /dev/null
@@ -1,10 +0,0 @@
-
-ACE_INLINE
-CORBA_Marshal_Proxy::CORBA_Marshal_Proxy (void)
-{
-}
-
-ACE_INLINE
-CORBA_Marshal_Proxy::~CORBA_Marshal_Proxy (void)
-{
-}
diff --git a/TAO/Benchmark/benchmark/marshal_results.cpp b/TAO/Benchmark/benchmark/marshal_results.cpp
deleted file mode 100644
index 416827a08d7..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_results.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_results.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_results.i"
-#endif /* __ACE_INLINE__ */
-
-int 
-CORBA_Marshal_Results::log_results (void)
-{
-  return 0;
-}
-
-int
-CORBA_Marshal_Results::print_results (void)
-{
-  //  ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Results::print_results\n"));
-
-  return 0; // success
-}
diff --git a/TAO/Benchmark/benchmark/marshal_results.h b/TAO/Benchmark/benchmark/marshal_results.h
deleted file mode 100644
index 5f7647c77a3..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_results.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_MARSHAL_RESULTS_H_)
-#define _CORBA_MARSHAL_RESULTS_H_
-
-#include "ace/Profile_Timer.h"
-
-class CORBA_Marshal_Results
-{
-public:
-  CORBA_Marshal_Results (void);
-  // Construction.
-
-  ~CORBA_Marshal_Results (void);
-  // destructor.
-
-  void clear (void);
-  // Clear all results.
-
-  ACE_Profile_Timer::ACE_Elapsed_Time & elapsed_time (void);
-  // Get the elapsed time.
-
-  ACE_Profile_Timer::Rusage elapsed_rusage (void);
-  // compute the rusage
-
-  int start_timer (void);
-  // starts a profile timer.
-
-  int stop_timer (void);
-  // stops the profile timer.
-
-  void filename (const char *fname);
-  // set the name of the file to store results
-
-  int log_results (void);
-  // log results
-
-  int print_results (void);
-  // prints the results
-
-private:
-
-  // = Used for performance statistics
-  ACE_Profile_Timer timer_;
-  ACE_Profile_Timer::ACE_Elapsed_Time et_;
-  ACE_Profile_Timer::Rusage rusage_;
-
-  double elapsed_time_;
-  // Real elapsed time in seconds.
-
-  const char *filename_;
-  // filename
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_results.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_results.i b/TAO/Benchmark/benchmark/marshal_results.i
deleted file mode 100644
index 85c6dfce5f9..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.i
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_results.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-ACE_INLINE
-CORBA_Marshal_Results::CORBA_Marshal_Results (void)
-  : filename_ (0),
-    elapsed_time_ (0)
-{
-}
-
-ACE_INLINE
-CORBA_Marshal_Results::~CORBA_Marshal_Results (void)
-{
-}
-
-ACE_INLINE int
-CORBA_Marshal_Results::start_timer (void)
-{
-  return this->timer_.start ();
-}
-
-ACE_INLINE int
-CORBA_Marshal_Results::stop_timer (void)
-{
-  return this->timer_.stop ();
-}
-
-ACE_INLINE ACE_Profile_Timer::ACE_Elapsed_Time &
-CORBA_Marshal_Results::elapsed_time (void)
-{
-  (void) this->timer_.elapsed_time (this->et_);
-  return this->et_;
-}
-
-ACE_INLINE ACE_Profile_Timer::Rusage
-CORBA_Marshal_Results::elapsed_rusage (void)
-{
-  (void) this->timer_.elapsed_rusage (this->rusage_);
-  return this->rusage_;
-}
-
-ACE_INLINE void
-CORBA_Marshal_Results::filename (const char *fname)
-{
-  this->filename_ = fname;
-}
-
-
diff --git a/TAO/COPYING b/TAO/COPYING
deleted file mode 100644
index c64992e2875..00000000000
--- a/TAO/COPYING
+++ /dev/null
@@ -1,40 +0,0 @@
-COPYRIGHT INFORMATION FOR TAO
-
-TAO is copyrighted by Douglas C. Schmidt and his research group at
-Washington University, Copyright (c) 1997, all rights reserved.  In
-addition, some portions of TAO (particularly the IIOP protocol engine)
-are copyrighted by SunSoft (see the ./IIOP/lib/COPYING.sun file for
-more details).  Likewise, TAO relies heavily on ACE, which is also
-copyrighted by Douglas C. Schmidt and his research group at Washington
-University (see the ../COPYING file for more details).
-
-You are free to do anything you like with the Wash. U. portions of
-TAO's source code (and object code produced from the source).  For
-instance, you can include it in commercial software, as long as you
-include this copyright statement along with code built using TAO.
-
-You are under no obligation to freely redistribute any of your source
-code that is built using TAO.  Please note, however, that you may not
-do anything to the ACE code that will prevent it from being
-distributed freely (such as copyrighting it or claiming authorship).
-
-TAO is provided as is with no warranties of any kind including the
-warranties of design, merchantibility and fitness for a particular
-purpose, noninfringement, or arising from a course of dealing, usage
-or trade practice.
-
-TAO is provided with no support and without any obligation on the part
-of Washington University, its employees, or students to assist in its
-use, correction, modification or enhancement.
-
-Washington University, its employees, and students shall have no
-liability with respect to the infringement of copyrights, trade
-secrets or any patents by TAO or any part thereof.
-
-In no event will Washington University, its employees, or students be
-liable for any lost revenue or profits or other special, indirect and
-consequential damages.
-
-        Douglas C. Schmidt 
-        schmidt@cs.wustl.edu 
-
diff --git a/TAO/COPYING.sun b/TAO/COPYING.sun
deleted file mode 100644
index 7cd6795a942..00000000000
--- a/TAO/COPYING.sun
+++ /dev/null
@@ -1,67 +0,0 @@
-This notice applies to all files in this software distribution that
-were originally derived from SunSoft IIOP code (these files contain
-Sun Microsystems copyright notices).
-
-COPYRIGHT AND LICENSING
------------------------
-
-Copyright 1995 Sun Microsystems, Inc.
-Printed in the United States of America.
-All Rights Reserved.
-
-This software product (LICENSED PRODUCT), implementing the Object
-Management Group's "Internet Inter-ORB Protocol", is protected by
-copyright and is distributed under the following license restricting
-its use.  Portions of LICENSED PRODUCT may be protected by one or more
-U.S. or foreign patents, or pending applications.
-
-LICENSED PRODUCT is made available for your use provided that you
-include this license and copyright notice on all media and
-documentation and the software program in which this product is
-incorporated in whole or part.
-
-You may copy, modify, distribute, or sublicense the LICENCED PRODUCT
-without charge as part of a product or software program developed by
-you, so long as you preserve the functionality of interoperating with
-the Object Management Group's "Internet Inter-ORB Protocol" version
-one.  However, any uses other than the foregoing uses shall require
-the express written consent of Sun Microsystems, Inc.
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of the LICENSED PRODUCT as permitted herein.
-
-This license is effective until terminated by Sun for failure to
-comply with this license.  Upon termination, you shall destroy or
-return all code and documentation for the LICENSED PRODUCT.
-
-LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND
-INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A
-PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY
-OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
-WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
-PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
-LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
-CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and
-FAR 52.227-19.
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
deleted file mode 100644
index 6ab438f62bd..00000000000
--- a/TAO/ChangeLog-98c
+++ /dev/null
@@ -1,13391 +0,0 @@
-Tue Apr 14 07:16:21 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile: added CONTROLLED_FILES macro.  Thanks to Doug
-          for reporting this.
-
-        * INSTALL,Makefile: removed INSTALL from CVS control.
-
-Tue Apr 14 00:51:45 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.14 released.
-
-Sat Apr 11 20:02:32 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.13, released Sat Apr 11 20:02:32 1998.
-
-Sat Apr 11 10:00:09 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.java:
-          modified to be used only when the DOVE Browser is running as
-          an Java Application.
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowserApplet.java:
-          used when the DOVE Browser is running as an Applet.
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/*: minor changes to handle
-          the afore mentioned changes.
-
-Fri Apr 10 15:11:44 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/GIOP.cpp (message_name): Fixed a missing increment by 1
-          code.  Thanks to Sumedh for noticing the bug.
-
-Fri Apr 10 10:41:04 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/tmplinst.cpp:
-          Added a missing template instantiation.
-
-Fri Apr 10 04:38:36 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_typedef.cpp: The changes made by me in the
-        log entry mentioned just below had some flaws. I had sort of
-        blidly applied it to a case in the "visit_typedef" node of the
-        be_visitor_typedef_ci class. I was resetting the alias context
-        before the code generation action was taken as aooposed to doing
-        it after the action was taken. Thanks to Seth Widoff for sending
-        the bug report.
-
-Thu Apr  9 21:57:52 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/POAS.cpp: Fixed up the POA to use the new
-          ACE_Static_Allocator_Base stuff.
-
-        * tao/Operation_Table: Added an additional parameter to the
-          TAO_Dynamic_Hash_OpTable constructor so that we can pass in the
-          ACE_Static_Allocator_Base.  Also, changed the code to use the
-          base/member initialization section, which is more efficient.
-
-Thu Apr  9 22:53:21 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: We now use the
-        ACE_Static_Allocator_Base to define a static allocator for the
-        Dynamic Operation Hash Table. Using this approach will finally
-        solve the seg faults in the static destructors.
-
-        * TAO_IDL/be/{be_visitor_args, be_visitor_array, be_visitor_field,
-        be_visitor_exception, be_visitor_operation, be_visitor_typedef,
-        be_visitor_union, be_visitor_union_branch}.cpp: The visit_typedef
-        operation on all the classes in these files was setting the
-        TAO_Visitor_Context's alias state to the typedef node being
-        visited. However, we were not resetting this context alias state
-        after the action has been taken. This broke code for a scenario
-        shown in a dummy IDL below:
-
-               typedef X Y;
-               struct foo { ... };
-               struct bar {
-                 Y y_field;
-                 long long_field;
-               };
-        In the code generation for the struct "bar" (for that matter for
-        unions, exceptions, sequences, and others), when we are generating
-        the code for the field whose type is "Y", we set the alias
-        context, it gets set to Y and we use its primitive type which is X
-        to do the "accept". However, we do not reset the alias context. As
-        a result, when we are generating the code for the long_field, the
-        alias context is still "Y" which leads our IDL compiler to
-        generate code that says "Y long_field;" rather than "long
-        long_field;". This is now fixed.
-
-Thu Apr  9 20:15:41 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (init): Added code to
-        recognize the -o option to output the Naming Service ior to a file
-        to avoid setting the NameService env. variable when multiple
-        naming services are running.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp: Added a
-        naming_service_ior () method to return the ior of the Naming
-        Service.
-
-Thu Apr  9 19:25:44 1998  Michael Kircher <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/PushConsumer.java,
-                  orbsvcs/tests/Simulator/DOVEMIB/DOVEMIB.cpp.
-                  orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.cpp:
-                  Had to conform to the new RtecScheduler.set ( ..) method,
-                  some parameters were added.
-
-        * docs/releasenotes/index.html: Enhanced description of the DOVE
-
-Thu Apr  9 10:07:34 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i:
-          Fixed warnings in convertion from 64 bit ints to 32 bit
-          ints. This is a classical example of a "good" cast, we know the
-          numbers will be in range (unless something *really* bad happens,
-          like), so the conversion will work.
-
-Wed Apr 08 10:02:16 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/make_release: added this script that creates ACE and/or
-          TAO releases.
-
-        * Makefile: added support for make_release.  See comments at
-          the top of the Makefile.  The old release mechanism has
-          been retained; to use it:  make release-old.
-
-        * tao/ORB.cpp (ORB_init): added missing __FILE__ to printout.
-          Thanks to Tom Brusehaver <tgb@cozy.netco.com> for reporting
-          this.
-
-        * orbsvcs/Runtime_Scheduler.{h,i},
-          orbsvcs/orbsvcs/Config_Scheduler.{h,i} (set):
-          removed const from Criticality and Info_Type arguments.  Thanks
-          to Doug and Irfan for reporting this.
-
-Wed Apr 08 07:41:53 1998  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/{default.bld, tao.bld}: Updated VxWorks GHS Build files.
-
-        * orbsvcs/default.bld,
-          orbsvcs/orbsvcs/orbsvcs.bld,
-          orbsvcs/Event_Service/Event_Service.bld,
-          orbsvcs/Scheduling_Service/Scheduling_Service.bld,
-          orbsvcs/Naming_Service/Naming_Service.bld,
-          orbsvcs/Dump_Schedule/Dump_Schedule.bld:
-              Updated VxWorks GHS Build files.
-
-        * tests/Cubit/TAO/IDL_Cubit/{default.bld,IDL_Cubit.bld}:
-              Updated VxWorks GHS Build files.
-
-Wed Apr 08 00:31:08 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init): If the host is not supplied by the
-          user, we will go ahead and call ACE_OS::hostname immediately.
-          This will help later down the road, since ACE_OS::hostname will
-          not have to be called each time an IIOP_Profile is created.
-
-        * tao/IIOP_Object.cpp (set): Changed the calls to get_host_addr()
-          to get_host_name().  The name is more readable than the IP
-          address.
-
-        * tao/ORB_Core.cpp (init): If the user explicitly specifies
-          -ORBport 0, we choose a port and start listening.  This will
-          make sure that all IORs produced will be correct.  If -ORBport 0
-          is not specified, lazy listening is done as usual (on
-          orb->run()).
-
-Tue Apr  7 18:25:09 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * tests/Quoter/quoter.idl: Extended the interface by a Factory
-          Finder.
-
-        * tests/Quoter/QuoterFactoryFinder.{cpp,h}: Server and
-          Implementation of the Factory Finder.
-
-Tue Apr  7 16:22:09 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_global.cpp:
-          Changed a buffer size from MAXNAMELEN to MAXPATHLEN, the former
-          is very small in some systems, plus the fact is that a fullpath
-          can be use in that buffer, so MAXPATHLEN is the right constant.
-
-Tue Apr 07 10:55:53 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/ss: generate port numbers based on
-          uid, and set TAO_ROOT (based on ACE_ROOT) if it's not set.
-          This utility should be moved, maybe up two directories?
-
-        * orbsvcs/orbsvcs/{Makefile,RtecScheduler.idl,Runtime_Scheduler.*,
-            Scheduler_Factor.*},
-          orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp,Event_Channel.cpp,
-            ReactorTask.cpp,
-          orbsvcs/orbsvcs/Sched/Config_Scheduler.{h,cpp},DynSched.*,
-            SchedEntry.*,Scheduler.cpp,Strategy_Scheduler.{h,cpp},
-          orbsvcs/tests/EC_Multiple/EC_Multiple.cpp,
-          orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          merged DynSched into liborbsvcs.
-
-        * orbsvcs/tests/Sched/Makefile: added.
-
-        * orbsvcs/tests/Sched/DynSched_Test.cpp: builds on Suns.  And
-          runs!
-
-Mon Apr  6 14:43:13 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Connect.cpp:
-          The process would crash if it was unable to resolve an address
-          to a name, even though it was only used in a debugging
-          message. Thanks to Keith Nicewarner <knicewar@sanders.com> for
-          pointing out this.
-
-Mon Apr 06 09:59:22 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thruput/tao/utils.cpp: hacked so that it will compile
-          on VxWorks and Chorus.  It won't run properly, though.  The
-          file should be updated to use ACE_Profile_Timer instead of
-          using rusage directly.
-
-        * TAO_IDL/Makefile: moved include of rules.local.GNU to after
-          include of rules.bin.GNU.  Without this change, tao_idl doesn't
-          get build on LynxOS.
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): ACE_OS::mktemp ()
-          instead of mktemp ().
-
-Sun Apr 05 18:05:26 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/{ DOVEBrowser.java,
-          DemoCore.java, PushConsumerFactory.java }:
-          The Browser accepts now the parameter -ORBnameserviceior.
-
-Sun Apr 05 10:04:57 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile: don't regenerate files using TAO's IDL compiler.
-          Instead, always use what's in our CVS repository, or in the TAO
-          distribution.
-
-        * tao/Makefile: use fakesvcconf = 1 if shared_libs is not defined,
-          instead of if CROSS-COMPILE is not defined.
-
-Sat Apr 04 21:25:43 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.12, released Sat Apr 04 21:25:43 1998.
-
-Sat Apr  4 17:43:08 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/Operation_Table.cpp: Removed the call to hash_.close() since
-          the Hash_Map_Manager destructor handles this already.
-
-Sat Apr  4 15:50:29 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence.cpp,
-          TAO_IDL/be_include/be_visitor_sequence.h: Added a case to
-          support sequence of exceptions.
-
-Sat Apr 04 07:45:33 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.h: don't use u_longlong_t on Suns if
-          ACE_LACKS_U_LONGLONG_T is defined.
-
-        * tests/Cubit/TAO/MT_Cubit/client.cpp (do_priority_inversion_test):
-          moved declaration of loop index "i" out of two for loops, and
-          declared as u_int instead of int to prevent signed/unsigned
-          comparison.
-
-Sat Apr  4 04:26:49 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface_fwd.cpp: We were not checking if
-        the node was imported. Due to this, code was getting generated for
-        forward declared interfaces from "#include"d IDL files.
-
-        * TAO_IDL/be/be_visitor_sequence.cpp: We were not calling
-        "nested_type_name" while generating the return type of the
-        operator [] in the sequence var class. As a result, a fully scoped
-        name was getting generated instead of a relative scoped name which
-        the MSVC++ compiler does not like.
-
-        * TAO_IDL/be/be_visitor_exception.cpp: For "typedefed" nodes, we
-        were using their base types to generate the code. This is fixed.
-
-        In addition, some files from the above and others were modified to
-        correct some formatting problems in the generated code.
-
-Sat Apr  4 00:24:01 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/client.cpp: Fixed a typo where
-          "i" was being defined twice in the same block of code.
-
-Fri Apr  3 18:40:49 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: Minor changes for
-        Chorus.  Cleanup code.
-
-Fri Apr  3 18:39:21 1998  Steve Huston  <shuston@riverace.com>
-
-        * tests/POA/On_Demand_Activation/Makefile: Changed LSRC to SRC to
-          match today's changes to ACE's rules.bin.GNU.
-
-Fri Apr  3 17:43:07 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/CDR.h:
-        * tao/orbconf.h:
-        * tao/CDR.cpp:
-          Added configuration macros to enable swap on write, and to
-          disable swap on read.
-          Also increased the default size of a CDR buffer.
-
-        * tests/CDR/Makefile:
-        * tests/CDR/growth.cpp:
-          Added another simple test of the CDR buffer, this one tries to
-          measure performance.
-
-Fri Apr  3 17:15:22 1998  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/Makefile: The sources that go into the compiler are
-          listed in SRC, not LSRC.  This matches a change in ACE's
-          include/makeinclude/rules.bin.GNU.
-
-Fri Apr  3 17:07:18 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tao/TAO_Internal.cpp (FAKE_SVC_ENTRY):
-        * tao/orbconf.h: Made minor changes to have the fake service
-        configurator receive its values through macros, instead of
-        changing the ".cpp" file.  Seems cleaner this way.
-
-Fri Apr  3 15:35:39 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/client.h, client.cpp: All PropertySet
-        methods and the Iterator class methods tested.
-
-Fri Apr  3 08:59:16 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/CDR.cpp:
-          Null strings are transmitted as empty strings.
-          Fixed
-
-        * tao/IIOP_ORB.cpp:
-          Ensure that CDR buffer created from the IOR string is properly
-          aligned.
-
-        * tao/Server_Request.cpp:
-          More checking for exceptions while decoding parameters and we
-          print an error message if decoding fails.
-
-        * tao/Typecode.cpp:
-          Only the first byte of the encapsulation stores the byte order,
-          the next three bytes are ignored because the <kind> is stored as
-          a long.
-
-        * tao/decode.cpp:
-          Removed dead code, improve error message when decoding object
-          references and fix an off by one error in ObjRef::decode.
-
-        * tao/encode.cpp:
-          When encoding Object References an encapsulated stream is
-          created in place, I debugged the computation of the length for
-          that stream and left some debug messages commented out.
-          The support for encoding null strings and wstrings as empty
-          strings is in the CDR classes, no need to duplicate the effort
-          here.
-
-        * tao/Connect.cpp:
-          Cosmetic changes.
-
-Fri Apr 03 09:01:00 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (start_servants):
-          changed local "ior_file" to "ior_f" because it shadowed
-          the global and caused compile failure with g++.
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (start_servants):
-          check return values of activate calls.
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (run_tests):
-          added default case to switch statement.
-
-        * tao/Sequence*.{i,cpp}: use ACE_CAST_CONST instead of const
-          in reinterpret casts, to keep all compilers happy.
-
-Thu Apr 02 15:49:16 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/tests/Cubit/TAO/MT_Cubit/client.dsp:
-        * tao/tests/Cubit/TAO/MT_Cubit/server.dsp: Updated project file.
-
-        * tao/ORB_Core.{h,i,cpp} (create_and_set_root_poa): Added this
-          private method to create and set the root poa of the calling
-          ORB_Core.
-          (root_poa): Make sure this function will always return a valid
-          poa pointer (thru the use of create_and_set_root_poa above.)
-
-        * tao/ORB.cpp (resolve_poa): Moved the creation of poa into
-          ORB_Core.
-
-Wed Apr  1 23:39:04 1998  Sergio Flores  <sergio@flamenco.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.h:
-        * tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.h: Fixed some bugs and added
-        some comments.
-
-Wed Apr 01 22:37:59 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/Default_Servant/client.cpp: Fixed options parsing.
-
-        * tao/Servant_Base.h: Added TAO_Export to
-          TAO_DynamicImplementation.
-
-Wed Apr  1 17:33:04 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit: Cleaned up the formatting of the code
-          to conform to the TAO programming style.
-
-Wed Apr  1 11:07:53 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/VisCompFactory.java:
-          Implemented a Factory pattern to generate the Visualization
-          Components and the Java class loader is now used to instantiate
-          the JavaBeans Visualization Components.
-
-        * orbsvcs/tests/Simulator/DOVEBrowser, DOVEMIB and Event Supplier
-          are running under NT properly.
-
-Wed Apr 01 09:44:31 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init,fini): Removed calls to
-          ACE_OS::socket_init and ACE_OS::socket_fini because they are
-          taken care of by ACE already.
-
-Wed Apr  1 09:46:53 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        The following fix was also made by Carlos simultaneously. Here is
-        the reason what was going wrong.
-
-        * tao/IIOP_Interpreter.cpp: In calc_nested_size_alignment_i, there
-          was a bug in which we were initializing the CDR stream for
-          nested parameters with an incorrect size. This was due to the
-          fact that we were computing the byte order outside and then
-          initializing the stream with 4 less bytes. However, the
-          constructor of the TAO_InputCDR was also computing the byteorder
-          using wrong locations in the bytestream. This is now fixed.
-
-        * tests/Param_Test: Added barebones implementation to test
-          Anys. This is still not complete because we still have to work
-          on getting Anys in TAO to work correctly and get rid of the
-          memory management problems we are having.
-
-Wed Apr  1 09:41:07 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/IIOP_Interpreter.cpp (calc_nested_size_and_alignment_i):
-           Fixed nested strem interpretation.
-
-Wed Apr  1 08:56:24 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao: Renamed ResultFromScode to TAO_ResultFromScode to avoid
-          clashes with MFC functions.  Thanks to David Janello
-          <djanello@cccis.com> for reporting this.
-
-Tue Mar 31 21:01:30 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init): Fixed a typo.
-
-Tue Mar 31 20:18:36 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Server):
-        Added code to remove the IOR_Multicase event handler in the destructor.
-
-Tue Mar 31 19:50:48 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (Cubit_Server): Removed the
-        naming service unbind code from the destructor as the naming
-        server is a component and not an external server. Also they will
-        be destructed when the ~Cubit_Server is called.
-
-Tue Mar 31 19:30:03 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (Cubit_Server): Added a
-        check in the destructor to unbind the cubit_factory from the
-        naming service.
-
-Tue Mar 31 15:15:53 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Sequence.h:
-        * tao/Sequence.i:
-        * tao/Sequence_T.h:
-        * tao/Sequence_T.i:
-          g++ does not like typedefs inside templates, and we were abusing
-          them in the sequences.
-
-        * tests/CDR/tc.cpp:
-          Fixed formatting problems.
-
-        * tests/Param_Test/tmplinst.cpp:
-          Added missing template instantiations.
-
-Tue Mar 31 11:10:34 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.h (String_out):  Added the infamous TAO_Export macro.
-
-Tue Mar 31 14:38:29 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/Sequence_T.i (replace): Make sure to cast this->buffer_
-          to (T *) to make compilers like GCC happy!
-
-Tue Mar 31 13:34:36 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (svc): dereference
-          cb_factory with .in ().
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (start_servants): declare
-          iorFile outside the conditional statement.
-
-        * tests/Cubit/TAO/MT_Cubit/cubit.idl: added comments and RCS Id
-          string.
-
-        * tests/Cubit/TAO/MT_Cubit/{client,server}.cpp: fixed priority
-          assignments so that they work on all platforms.
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h: fixed fabs() to negate
-          the argument if less than 0.
-
-Tue Mar 31 11:05:23 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/CDR.h:
-        * tao/CDR.cpp:
-        * tao/decode.cpp:
-        * tao/Typecode.cpp:
-          Added constructor for encapsulated streams to the TAO_InputCDR
-          class; this was causing problems on Intel machines.
-
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-          We end #if/#endif blocks using C style comments (/* */) as
-          opposed to C++ style (// )
-
-        * tao/Sequence.i:
-        * tao/Sequence.cpp:
-        * tao/Sequence_T.i:
-        * tao/Sequence_T.cpp:
-          Fixed a lot of const-correctness problems, thanks to J, Russell
-          Noteworthy <rnosewor@objectsciences.com> for putting me on this
-          track.
-
-        * tests/Param_Test/tmplinst.cpp:
-        * tests/Param_Test/tests.cpp:
-        * tests/Param_Test/param_test_i.h:
-        * tests/Param_Test/param_test_i.cpp:
-        * tests/Param_Test/param_test.idl:
-          The test now includes all kind of sequences: of basic types, of
-          structs, of strings, of objects; both bounded and unbounded.
-          Unfortunately only compilation is verified, I still have to add
-          code to verify functionality.
-
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-          Unproper code was generated for bounded sequences of strings.
-
-        * tao/IIOP_ORB.cpp:
-          Added some debug messages to verify that collocation works.
-
-        * orbsvcs/tests/EC_Multiple/README:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.h:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-          Now that the ORB supports collocation we can create a collocated
-          EC, but that requires a smarter startup.
-          It seems that the ECP is not receiving all the messages it
-          should.
-          The main purpose of the change was to verify that collocation
-          works and it seems to do so.
-
-        * tao/Connect.cpp:
-          We set the flag to expect input *before* making the
-          request. This alleviates (but does not solve) the problems of
-          using several threads and a global ORB: in such a configuration
-          it is possible that one thread is running the event loop, but
-          another makes a request, if the reply is received before the
-          flag is set the ORB believes it has received an out-of-order
-          reply and shutdowns the connection.
-          The real solution is to use the leader-follower model.
-
-        * tao/decode.cpp:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-          Cosmetic changes.
-
-Mon Mar 30 21:38:32 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (fini): Added a call to ACE_OS::socket_fini ().
-
-        * tao/IIOP_ORB.cpp (_get_collocated_object): Changed to call
-          TAO_ORB_Core_instance ()-> root_poa () instead of
-          this->resolve_poa ().  Thanks to Carlos for tracing this down.
-
-Mon Mar 30 17:59:30 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB_Core.i: Only _NOT_ specialize
-          ACE_Hash_Addr<ACE_INET_Addr> when ACE needs to instantiate
-          template explicitly and it is not inlined.
-
-Mon Mar 30 13:13:07 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Typecode.cpp:
-          Fixed cast that dropped constness when only reinterpret_cast was
-          needed; thanks to David Levine (levine@cs.wustl.edu) for
-          detecting this.
-
-        * tao/Server_Request.cpp:
-          bytes_remaining was called in a debug message (not seen in
-          Solaris); thanks to Nanbor Wang (nanbor@cs.wustl.edu) for
-          reporting this.
-
-Mon Mar 30 12:28:02 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB_Core.i: only specialize ACE_Hash_Addr<ACE_INET_Addr>
-          with ACE inlining enabled, to avoid link collision with the
-          instantiation in Connect.cpp.
-
-        * tao/CDR.cpp (TAO_OuputCDR ctors): rearranged initializations
-          to match declaration order.
-
-        * tao/t-sizes.cpp: #include "tao/corba.h" instead of "tao/orb.h".
-
-Mon Mar 30 10:28:05 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Implemented new classes to manipulate CDR streams, this classes
-          separate input (interpretation) and output (creation) of the
-          streams; in an attempt to make the interface more robust.
-          The new classes provide methods to write and read strings and
-          arrays, this is currently used in very few places, but it could
-          provide a big performance boost.
-
-          The change affected the following files:
-
-        * TAO/tao/Align.h:
-        * TAO/tao/CDR.cpp:
-        * TAO/tao/CDR.h:
-        * TAO/tao/CDR.i:
-        * TAO/tao/Connect.cpp:
-        * TAO/tao/Connect.h:
-        * TAO/tao/Exception.cpp:
-        * TAO/tao/GIOP.cpp:
-        * TAO/tao/GIOP.h:
-        * TAO/tao/GIOP.i:
-        * TAO/tao/IIOP_Interpreter.cpp:
-        * TAO/tao/IIOP_Interpreter.h:
-        * TAO/tao/IIOP_ORB.cpp:
-        * TAO/tao/ORB.h:
-        * TAO/tao/Server_Request.cpp:
-        * TAO/tao/Server_Request.h:
-        * TAO/tao/Server_Request.i:
-        * TAO/tao/Typecode.cpp:
-        * TAO/tao/Typecode.h:
-        * TAO/tao/decode.cpp:
-        * TAO/tao/deep_copy.cpp:
-        * TAO/tao/deep_free.cpp:
-        * TAO/tao/encode.cpp:
-        * TAO/tao/orbconf.h:
-        * TAO/tao/params.h:
-          In most cases it was only a matter of changing the class name
-          and the method invocations.
-
-        * tests/Param_Test/options.cpp:
-          Use CORBA::string_copy instead of ACE::strdup because we delete
-          the buffer with CORBA::string_free.
-
-        * tests/Cubit/TAO/IDL_Cubit/client.cpp:
-          I limited the size of the sequences, otherwise the test time
-          grows non-linearly with the number of loops.
-
-        * tests/Param_Test/README:
-          The test can also check string sequences, but the option to do
-          so (-t strseq) was not documented.
-
-        * tests/CDR/basic_types.cpp:
-          The test is run several times; this is useful when trying to
-          verify performance.
-
-Sun Mar 29 03:09:17 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/IIOP_ORB.{h,i,cpp}: Added an optimize_collocation_objects_
-          flag to turn optimization for collocation objects on and off.
-
-        * tao/ORB_Core.cpp: Added an initialization argument
-          -ORBcollocation to make ORB aware of collocation objects or
-          not.  The default is on.
-
-        * doc/Options.html: Added documentation for -ORBcollocation.
-
-Fri Mar 27 20:08:24 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp (NS_NamingContext):
-          Changed to get lock from the ORB.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Update the source file list.
-
-        * tao/ORB.h: Added TAO_Export to class CORBA_ORB_var.
-
-        * tao/params.cpp: Removed the extra inclusion of <params.i>.
-
-Fri Mar 27 14:10:34 1998  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/driver/drv_preproc.cpp: (also see my entry from 09:50)
-          Removed explicit char * operator call, and use the conversion
-          as it was before.  However, I needed to change the ?: operator to
-          an if/else for AIX xlC to compile it correctly.
-
-Fri Mar 27 13:38:04 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * orbsvcs/IOR_Multicast.{h,cpp}:
-        * orbsvcs/Makefile:
-        * orbsvcs/Naming/Naming_Utils.{h,cpp}:
-        I moved the Ior_Multicast.{h,cpp} files up a directory and changed
-        the class name to TAO_IOR_Multicast. It didn't logically belong
-        in the Naming directory, since other bootstrappable services
-        require it.
-
-Fri Mar 27 11:47:58 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/IIOP_ORB.*,IIOP_Object.{h,cpp},Request.{h,cpp},Server_Request.*,
-          Exception.*,params.*,Connect.*,default_{client,server}.*,corba.h:
-          #include the .i file in the .h/.cpp files instead of corba.h.
-
-        * tests/Demux_Test/client.cpp: #include ace/stream.h instead of
-          system headers, and use ACE_OS::gethrtime () instead of
-          gethrtime ().
-
-        * orbsvcs/orbsvcs/Event/Reactor_Task.cpp (ACE_ES_Reactor_Task): always
-          use ACE_OS::gettimeofday ().  ACE_High_Res_Timer::gettimeofday ()
-          now takes an argument, so it's not compatible with what
-          ACE_Timer_Queue needs.  And it didn't seem necessary to have
-          separate code for VxWorks.  And the hrtimer on WIN32 is flakely
-          on multiple-CPU machines.
-
-        * tao/IIOP_ORB.cpp: added ACE_Unbounded_Set_Iterator template
-          instantiation.
-
-Fri Mar 27 09:50:52 1998  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/driver/drv_preproc.cpp: Use explicit char * operator on
-          cpp_path (AIX xlC requires this).  Added CVS Id.
-
-        * tao/Sequence_T.h: Fully qualify the template type when used as a
-          function return.
-
-Fri Mar 27 04:45:46 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.h: Added two pure virtual functions
-          _register_collocation and _get_collocated_servant to CORBA_ORB
-          class so the derived classes have their own implementations.
-          (resolve_poa,resolve_poa_current): Changed these two functions
-          from private methods to protected methods.  I need to access
-          them from IIOP_ORB.
-
-        * tao/IIOP_ORB.{h,cpp} (_register_collocation): Added this new
-          method to record connection end points an IIOP ORB owns.
-          (_get_collocated_servant): Added this new method which uses a
-          passed in STUB_Object to determine whether a requested object is
-          collocated or not.  If it's a collocated object, returns the
-          servant of that object and we can use that to create a
-          collocated object reference.
-          (object_to_string): Added code to register object end point with
-          IIOP ORB.
-          (iiop_string_to_object): Added code to check whether a requested
-          object is collocated or not and return a collocated object if it
-          fits to do so.
-
-        * tao/ORB_Core.cpp (preconnect): Added code to register success
-          preconnections to IIOP's end point repository.
-
-        * tao/decode.cpp (TAO_Marshal_ObjRef::decode): Added code to
-          optimize against collocation objects.
-
-Thu Mar 27 10:57:02 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEMIB: New version of the DOVE
-                  MIB.
-
-                * orbsvcs/tests/Simulator/README: Updated.
-
-                * docs/releasenotes/index.html: Updated.
-
-Thu Mar 26 21:24:59 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.*,corba.h (CORBA_ORB::shutdown): uninlined, so that
-          ORB.i can be #included properly.
-
-        * tao/CDR.{h,cpp},GIOP.{h,cpp},corba.h: #include the .i file
-          in the .h/.cpp files instead of corba.h.
-
-        * TAO_IDL/fe/y.tab.cpp: wrapped a couple of assignments in
-          conditionals with parens.
-
-Thu Mar 26 17:28:24 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.11, released Thu Mar 26 17:28:24 1998.
-
-Thu Mar 26 10:07:02 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEMIB: Checked in a first draft
-          of the DOVE Management Information Base (DOVE MIB). A README
-          will be available with further details.
-
-Thu Mar 26 08:31:02 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.yy: We were setting the name of a sequence (named
-        sequence) when the code for client header generation was
-        invoked. However, in cases where we import some definitions, we
-        never go into the code generation code for that type. As a result,
-        such imported typedefed (a.k.a named) sequences remained
-        nameless. So when the time came to emit their name, it resulted in
-        a segmentation fault.
-
-        We fix this by setting the name of the sequence in the parsing
-        stage itself.
-
-        Thanks to Torben Worm (tworm@cs.wustl.edu) for reporting the bug
-        to me.
-
-        Changed files also include y.tab.cpp and y.tab.h
-
-        * TAO_IDL/be/be_visitor_sequence.cpp: Minor correction to get the
-        formatting right.
-
-        * TAO_IDL/be/be_decl.cpp: Simplified the logic of converting a
-        name into a padded long array. The original logic caused problems
-        on NT/PC because of its "little-endian" nature. This was causing
-        the repoIDs and names (represented as longs) undergo byte
-        swapping.
-
-Thu Mar 26 06:29:09 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Marshal.{h,cpp},ORB.*,Object.{h,cpp},corba.h:
-          #include the .i file in the .h/.cpp files instead of corba.h.
-
-Wed Mar 25 22:55:02 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Servant_Base.h:
-        * tao/Object.cpp:
-          Collocated objects (even if their dynamic type is simply
-          CORBA_Object) can use the servant to resolve the _is_a()
-          calls.
-
-Wed Mar 25 22:06:19 1998  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-        * tao/TAO.cpp: Added accessors for child/root poa.
-
-Wed Mar 25 15:10:48 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/encode.cpp: In the encoding of exceptions, we were not
-        encoding its repository ID. This is now fixed.
-
-Wed Mar 25 11:11:47 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.h: use ACE_UINT32 instead of u_char for CORBA_Boolean
-          with Green Hills on Chorus, to work around a compiler bug.
-          The bug is revealed with accessing the root_poa, by
-          TAO/tests/POA/RootPOA/RootPOA.
-
-        * tao/ORB.{h,cpp}: changed type of open_called_ and
-          should_shutdown_ flags from CORBA::Boolean to u_int, because
-          they're ACE_Atomic_Ops.  This allows CORBA::Boolean to be
-          a typedef of bool.  Without this change, bool would be required
-          to support all of the arithmetic operations that ACE_Atomic_Op
-          needs, and that's not standard.
-
-        * orbsvcs/tests/Logger/{clnt.cpp,logger_i.*,svr.cpp},
-          orbsvcs/orbsvcs/Naming/{Ior_Multicast.cpp,Naming_Utils.cpp},
-          tests/Thruput/TAO/server.cpp:
-          removed unnecessary #include of ace/streams.h.
-
-        * tao/Makefile,tests/Cubit/TAO/IDL_Cubit/Makefile,
-          tests/NestedUpcall/Makefile:
-          removed CPPFLAGS, LDFLAGS, and DCFLAGS because they duplicated
-          what's already in taoconfig.mk or platform_macros.GNU.
-
-Wed Mar 25 09:08:44 1998  Torben Worm  <tworm@cumbia.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Added comment to the concurrency
-        control service section. The implementation of the concurrency
-        control service is discontinued due to unclear specs.
-
-Wed Mar 25 02:36:06 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/NestedUpcall/server.cpp: Renamed tao_util.h to TAO.h.
-
-Tue Mar 24 19:13:35 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/Server_Request.cpp: There was a lot of messy code on the
-        outgoing path from skeleton to the wire. Specifically, we were
-        mixing system exceptions with user defined exceptions. This has
-        been fixed and is under testing.
-
-        * TAO_IDL/be/{be_visitor_exception, be_exception}.cpp: The generated
-        typecode for Exceptions erroneously had a "tk_struct" TypeCode
-        kind. This has been fixed to be "tk_except".
-
-        * TAO_IDL/be/be_visitor_operation.cpp: Handling of oneway operations
-        in the server skeletons was buggy. It is now fixed.
-
-        * TAO_IDL/be/be_predefined_type.cpp: TypeCodes for pseudo objects
-        were not getting properly generated. This is now fixed.
-
-Tue Mar 24 14:51:33 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp (gen_server_skeletons): Changed
-          op_name() to operation ().
-
-        * TAO_IDL/be/be_visitor_operation.cpp (visit_operation): Added a
-          return statement.
-
-        * tao/IIOP_Object.cpp: Initialze
-          TAO_Synchronous_Cancellation_Required::old_type_.
-
-Tue Mar 24 14:07:08 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/Server_Request.{h, i, cpp}: Made the class compliant with
-        the latest CORBA v2.2. Added some extensions. There were some
-        subtle bugs related to user defined exceptions that were not being
-        reported back to the caller. Modified the constructor to take a
-        GIOP_RequestHeader as a parameter.
-
-        * tao/IIOP_Interpreter.{h, cpp}: Removed the "struct_traverse" and
-        "union_traverse" methods as they were no longer used.
-
-        * tao/Typecode.{h, cpp}: Removed the original interpreter
-        "traverse" as it is no longer used since its logic is included in
-        the different encode and decode methods.
-
-        * tao/POA.cpp: changed the usage of "op_name" to "operation" since
-        that is the correct method name of the ServerRequest class
-        according to the CORBA v2.2 spec.
-
-        * tao/POAS.cpp: Massive changes made to use the new style of
-        skeleton code that the IDL compiler generates
-
-        * tao/{Servant_Base, Operation_Table}.{h, cpp}: The "_find" and
-        "_bind" operations now take a "const char *opname" rather than
-        "CORBA::String  &opname".
-
-        * tao/Connect.cpp: Server_Request creation now uses the modified
-        constructor.
-
-        * TAO_IDL/be/{be_visitor_operation, be_interpretive}.cpp: Added
-        another visitor that generates the exceptionlist for the client
-        stub.
-
-        * TAO_IDL/be/be_visitor_interface.cpp: Change in generated code to
-        use the "operation" method on class Server_Request rather than the
-        non-compliant "op_name".
-
-        * TAO_IDL/be/be_visitor_sequence.cpp: Minor correction to get some
-        formatting in generated code correct.
-
-        * TAO_IDL/be_include/be_codegen.h: Added a state for exception
-        list generation
-
-        * TAO_IDL/be_include/be_visitor_operation.h: Added a new visitor
-        for exception list generation.
-
-Tue Mar 24 11:01:33 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO.dsp:  Added Stub.cpp into the project.
-
-Tue Mar 24 07:29:20 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile,Any.{h,cpp},NVList.*,ORB.h,ORB_Core.{h,cpp},
-          Stub.{h,i,cpp},Typecode.{h,cpp},corba.h:
-          #include the .i file in the .h/.cpp file instead of corba.h
-
-        * tao/ORB.cpp (wscpy): removed, because we now use ACE_OS::wscpy ()
-          instead.
-
-Mon Mar 23 19:44:11 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB: CORBA_ORB no longer inherits from IUnknown.
-
-        * tao/IIOP_Object.cpp (set): A valid key must be provided, else
-          the function will fail.  Also removed all cases where the key
-          was given a default value (of "0").
-
-        * tao/IIOP_ORB.cpp (QueryInterface): Removed this method.
-
-Mon Mar 23 13:20:12 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/tests/Simulator/DOVEBrowser/WeaponsVisComp.java:
-          Found some uninitialized variables and fixed the problem.
-          This component should now be more stable.
-
-Mon Mar 23 10:42:12 1998  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/DynSched.{cpp,h,i}
-          orbsvcs/orbsvcs/Sched/SchedEntry.{cpp,h,i}
-          orbsvcs/orbsvcs/Sched/Strategy_Scheduler.{cpp,h,i}
-
-          Merged in the final round of timeline fixes from the
-          files in the old scheduler directory into the ones
-          in the new directory.
-
-        * orbsvcs/tests/Sched/DynSched_Test.cpp
-
-          Added directory orbsvcs/tests/Sched and checked in a
-          copy of DynSched_Test.cpp, the file used to test the
-          offline behavior of the dynamic scheduler locally.
-          This file will serve as the basis of a real TAO test
-          for the on and off line behaviors of the dynamic
-          scheduler when it is fully integrated into TAO.
-
-Mon Mar 23 09:18:12 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Dump_Schedule/Makefile,orbsvcs/Event_Service/Makefile,
-          orbsvcs/Scheduling_Service/Makefile,
-          orbsvcs/tests/Event_Latency/Makefile,
-          orbsvcs/tests/EC_Multiple:
-          replaced orbsvcs/orbsvcs/orbsvcs with orbsvcs/orbsvcs in some
-          dependencies.
-
-        * tao/ORB.{h,cpp},tao/POA.cpp,tao/encode.cpp,
-          TAO_IDL/ast/ast_generator.cpp,TAO_IDL/be/be_generator.cpp:
-          migrated to ACE_OS::WChar.  That has a size of 32 bits.
-          Thanks to Irfan for this recommendation.
-
-        * tao/ORB.cpp (wstring_copy): changed null check at beginning
-          from "if (*str)" to "if (!str)".
-
-        * tao/Sequence_T.cpp (allocbuf): added missing ; at end of
-          ACE_NEW_RETURN statement.
-
-        * TAO_IDL/fe/Makefile,lex.yy.cpp,lex.yy.cpp.diff:  replaced
-          #includes of standard headers with #include of OS.h so that
-          ace/config.h is #included first.  The allows config.h to
-          #defined _REENTRANT before stdio.h is #included, for example.
-
-        * tao/Makefile: marked Object_KeyC.* and POA[SC].* files as
-          .PRECIOUS so that gmake avoids deleting them.  Thanks to
-          Chris Cleeland for this suggestion.
-
-Mon Mar 23 03:20:47 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.10, released Mon Mar 23 03:20:47 1998.
-
-Mon Mar 23 01:19:19 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init): It is ok not to have a svc.conf file,
-          therefore check should be:
-
-          if (result != 0 && errno != ENOENT)
-
-Mon Mar 23 01:17:18 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/corba.h: Moved Request.i up a notch in the corba.h file so
-          that it will be defined correctly!  This obviates the need for
-          Nanbor's fix below!
-
-Sun Mar 22 23:19:42 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Request.cpp: Include Request.i conditionally.
-
-        * tao/Object.h: Added macro TAO_Export to class CORBA_Object_var
-          and class CORBA_Object_ptr.
-
-Sun Mar 22 21:54:57 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface: Made full_coll_name() a NON-const
-          method to work around a bug with GCC...
-
-        * TAO/tao: Moved a bunch of inline methods from *.i files into
-          *.cpp files to avoid warnings from G++.  I don't know why it
-          complains but not inlining this code shouldn't matter unless we
-          find that these functions get called a lot via profiling...
-          Thanks to David Levine for pointing this out.
-
-Sun Mar 22 14:04:31 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/tao.{dsp,dsw}: Updated Project files.
-
-        * tao/Exception.{i,cpp}: Conditionally include its inline file.
-          Added codes for copy ctor and assignment operator for
-          CORBA_UserException and CORBA_SystemException.
-
-Sun Mar 22 13:05:15 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao: Added comments, made some modifications, and refined some
-        class definitions. Changes were made to a large number of files.
-
-Sun Mar 22 08:00:08 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Naming_Service.h: Renamed tao_util.h to TAO.h.
-
-        * tao: Removed the CORBA_Cls.* files (since they conflict with the
-          overall naming scheme) and merged them into the ORB.h class.
-
-Sun Mar 22 03:52:39 1998  Sergio Flores  <sergio@lambada.cs.wustl.edu>
-
-        * tao/TAO_Internal.cpp (open_services): "this" may only be used
-        inside a nonstatic member function.
-
-Sun Mar 22 02:58:29 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/corba.h:
-        * tao/CORBA_Cls.{h,i,cpp}: Rename CORBA.{h,i,cpp} to
-          CORBA_Cls.{h,i,cpp} because NT doesn't like the coexistance of
-          corba.h and CORBA.h.
-
-Sun Mar 22 02:39:54 1998  Sergio Flores  <sergio@lambada.cs.wustl.edu>
-
-        * tao/CORBA.cpp (ORB_init): made change to check for the return
-        value when initializing the ORB Core instance.  Also, changed the
-        TAO_Marshal::initialize() to be called before the initialization
-        of standard exceptions, where we need the marshal factory for CDR
-        streams.
-        * tao/ORB_Core.cpp (TAO_ORB_Core::init): made change to check for
-        the return value when initializing service configurator.
-        * tao/ORB_Core.cpp (TAO_Resource_Factory::parse_args): changes to
-        correctly parse the options for "-ORBresources" and "-ORBpoa"
-
-Sun Mar 22 01:52:01 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/CORBA.cpp: Moved TAO_Exceptions::init_standard_exceptions()
-          to the beginning of ORB_init() so that we can use exceptions
-          later within that function.  Thanks to Sergio for reporting
-          this.
-
-Sat Mar 21 11:00:40 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao: Renamed a bunch of files so that the names and
-          capitalization matches precisely.
-
-        * tao/Request.i: Created this file and moved a bunch of inline
-          methods into here.
-
-        * tao: Renamed the corbacom.* files (since we don't support COM
-          anyhow) into CORBA.h and the new CORBA.i and CORBA.cpp files.
-
-        * tao/corbacom.h: Moved the CORBA_SEQUENCE stuff back into the
-          header file since it wasn't linking correctly...
-
-        * tao/TAO_IDL: Changed all uses of do_call() to do_static_call().
-
-        * tao: Made lots of minor enhancements to formatting and style.
-
-        * tao: Removed the invoke.cpp file and moved its functionality
-          back into iiopobj.cpp, where it belongs.
-
-        * tao/sequence_T.i (replace): Added a cast to (T *) so compilers
-          wouldn't complain!  Thanks to Sergio for pointing this out.
-
-        * tao: Renamed IIOP_Object::do_call() to
-          IIOP_Object::do_static_call() to be symmetrical with
-          do_dynamic_call()...
-
-        * tao/typecode.cpp: Due to the new reorganization of the code in
-          interp.cpp we're now able to put all the CORBA_TypeCode methods
-          back into typecode.cpp, where they belong...
-
-        * tao: Added a new interp.h file and moved the TypeCode table
-          intialization function into that file.
-
-        * tao/orbobj.cpp: Removed the friggin' global functions
-
-          extern void __TC_init_table (void);
-          extern void __TC_init_standard_exceptions (CORBA::Environment &env);
-
-          and put them inside of classes, where they belong...
-
-        * tao/corbacom.cpp: Moved CORBA::ORB_init() from orbobj.cpp
-          (what was it doing there) to corbacom.cpp, which is where it
-          belongs!
-
-        * tao/giop.cpp: Moved the TAO_GIOP_MsgType enum into the TAO_GIOP
-          class namespace and renamed all the enums accordingly.
-
-        * tao/except.cpp: Added except.i file to split off inlines into
-          their own file.
-
-        * tao/sequence_T.i (replace): Fixed some typos in the template
-          code.  Thanks to Ben Eng <ben@jetpen.com> for reporting these.
-
-Sat Mar 21 20:34:39 1998  Sergio Flores  <sergio@lambada.cs.wustl.edu>
-
-        * tao/connect.cpp (open): fixed a bug due to wrong parens
-        location.
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: added option to
-        disable use of the name service.  hacked the code for platforms
-        that don't support floating point math.  Added Quantify start/stop
-        primitives around CORBA calls.
-
-Sat Mar 21 17:55:40 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * orbsvcs/test/Simulator/NavWeap.idl: removed typo
-
-        * orbsvcs/test/Simulator/DOVEBrowser: New Demo using Java Beans
-          as visualization components added. This will replace the old
-          demo under orbsvcs/test/Simulator/Sim_Display. See the readme
-          file under orbsvcs/test/Simulator for further details.
-
-Fri Mar 20 23:25:28 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * orbsvcs/tests/Trading_Service/Makefile:
-        * orbsvcs/tests/Trading_Service/export_tests.cpp:
-        * orbsvcs/tests/Trading_Service/import_tests.cpp:
-        * orbsvcs/tests/Trading_Service/Offer_Exporter.{h,cpp}:
-        * orbsvcs/tests/Trading_Service/Offer_Importer.{h,cpp}:
-        * orbsvcs/tests/Trading_Service/Service_Type_Exporter.{h,cpp}:
-        * orbsvcs/tests/Trading_Service/TT_Info.{h,cpp}:
-        * orbsvcs/tests/Trading_Service/TTest.idl:
-        I've added the rough draft of tests that pound the Trading Service
-        with a variety of method invocations.
-
-        * orbsvcs/Trading_Service/trader.cpp:
-        * orbsvcs/Trading_Service/Makefile:
-        The trader now responds to resolve_intial_references multicast
-        requests with the IOR of its Lookup interface, as per the
-        specification.
-
-Fri Mar 20 21:48:47 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.9, released Fri Mar 20 21:48:47 1998.
-
-Fri Mar 20 19:46:43 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/sequence_T: Added the full complement of get_buffer(),
-          replace(), and release() calls to TAO's sequences.
-
-        * docs/releasenotes/index.html (href): Reformatted the DOVE
-          demo section of the release notes a bit.
-
-Thu Mar 20 17:05:42 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * $TAO_ROOT/docs/releasenotes/index.html:
-          Documentation about the DOVE demo
-
-Fri Mar 20 16:21:28 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/Generic_Servant/MyFooServant.h: No need to include
-          generic_servant_export.h.
-
-        * tests/POA/Generic_Servant/Makefile: Added flags to the idl
-          compiler so that the server library can be made as a dynamic
-          library.
-
-Thu Mar 20 16:12:42 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/Event_Supplier:
-          New Project and Workspace files for NT
-
-Fri Mar 20 11:53:15 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/NestedUpcall/client.cpp: Use EventHandler_vare.in() to
-          pass in a pointer.  Added explicit template instantiation
-          codes.
-
-Fri Mar 20 09:46:50 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/Memory_Pools.h:
-        * orbsvcs/orbsvcs/Event/Memory_Pools.cpp:
-          Locks are needed for the memory pool singletons; thanks to
-          Thomas Venturella <tventurell@mdc.com> for detecting this.
-
-Fri Mar 20 09:26:28 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/POA/Generic_Servant/MyFooServant.h: added
-          #include "generic_servant_export.h".
-
-        * tao/corbacom.{h,cpp},tao/encode.cpp,tao/poa.cpp,
-          TAO_IDL/ast/ast_generator.cpp,TAO_IDL/be/be_generator.cpp:
-          changed CORBA::WChar from platform-dependent type to ACE_UINT16.
-          This may require casts in application code, if they use
-          a native wchar_t, from wchar_t to CORBA::WChar.
-
-Fri Mar 20 02:47:22 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/default_server.cpp
-          (create_servant_lock,create_poa_lock,create_poa_mgr_lock):
-          Don't return 0 but an ACE_Null_Mutex as default.
-
-Fri Mar 20 00:36:16 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa.cpp (dispatch_servant_i): The POA Current was not being
-          setup correctly.  It was used before it was created. Fix was to
-          change the order of things in dispatch_servant_i() and restored
-          pre_invoke() to its original state.
-
-        * tests/POA/Generic_Servant/client.cpp (main): Make sure the
-          client does not crash if the user does not provide an IOR.
-
-        * tests/POA/Generic_Servant/MyFooServant.h (MyFooServant): Added
-          export macro so that the class gets properly included in the
-          DLL.
-
-        * TAO_IDL/GenExportH.BAT: Changed %1% to %1.
-
-        * tests/POA/Generic_Servant/generic_servant_export.h: The server
-          lib will now be created as a DLL instead of as a static library.
-          New file was added to get the exports right.
-
-Thu Mar 19 18:42:20 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_attribute.cpp (visit_attribute): Undefined
-          variable bt to removed a compilation warning.
-
-        * tao/server_factory.cpp (create_servant_lock):
-        * tao/default_server.{h,cpp} (create_servant_lock): Added new
-          method which creates a servant lock according to various
-          strategies used.
-
-Thu Mar 19 18:45:13 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/client.h:
-        * orbsvcs/tests/AVStreams/client.cpp:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-        * orbsvcs/orbsvcs/AVStreams.idl (interface MMDevice):
-        PropertyService's PropertySet methods have been tested in the
-        AVStreams' test application. Tested using the MMDevice interface
-        of the AVStreams.
-
-Thu Mar 19 18:20:42 1998  Michael Kircher  <mk1@cs.wustl.edu>
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/README: New notes about this release
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/NavWeap.idl: New, simpler Weapons struct
-          because of a Visibroker for Java 3.2 bug.
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/Event_Supplier: Using the new
-          Weapons struct.
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/Sim_Display/NS_Resolve.java: Complying
-          with the new Name Service lookup protocol (4 bytes instead of 2)
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/Sim_Display/Display_Weapons.java:
-          Using the new Weapons struct.
-
-        * $TAO_ROOT/orbsvcs/tests/Simulator/Sim_Display/Display_Push_Consumer.java:
-          Complying with the naming conventions for the skeleton code of VB 3.2.
-
-Thu Mar 19 10:51:22 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated entry for the property service.
-
-Thu Mar 19 09:55:41 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/CDR/README:
-        * tests/CDR/basic_types.cpp:
-        * tests/CDR/tc.cpp:
-          Added basic documentation on the purpose of the tests.
-
-Thu Mar 19 09:26:25 1998  Torben Worm  <tworm@cumbia.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Added an entry for the Concurrency
-          Control Service
-
-Thu Mar 19 08:41:27 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp (new_context): replaced
-          ???! with ???? in comment to avoid g++ "warning: 1 trigraph(s)
-          encountered".
-
-        * orbsvcs/orbsvcs/Sched/Scheduler.cpp: removed two ACE_Lock_Adapter
-          template instantiations because they're in tao/poa.cpp.
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: wrapped a few return
-          statements that follow ACE_THROW's with ACE_NOTREACHED.
-
-        * orbsvcs/orbsvcs/Config_Scheduler.cpp: wrapped a couple of break
-          statements that follow returns with ACE_NOTREACHED.
-
-Thu Mar 19 05:26:10 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/typecode.cpp: In private_member_name, the return value of
-        "skip_typecode ()" was incorrectly compared with TRAVERSE_CONTINUE
-        rather than with a boolean value. This is now fixed.
-
-Wed Mar 18 21:43:46 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/typecode.cpp: private_equal method had a big error. I had
-        forgotten break statements after every case in the switch
-        statement. So no matter what, the last result which returned
-        "TRUE" used to be returned. This is now fixed.
-
-Wed Mar 18 21:32:24 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.8, released Wed Mar 18 21:32:24 1998.
-
-Wed Mar 18 21:26:29 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Ior_Multicast.cpp (IOR_Multicast):
-          reordered initializers to match declaration order.
-
-Wed Mar 18 20:36:46 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/CDR/basic_types.cpp: Rearranged this test file a bit to
-          make it more structured.
-
-Wed Mar 18 18:52:12 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/object.{h, cpp}: Changed the name of the method "key ()" to
-        "_key ()" since this was clashing with names used by users in
-        their IDl files. As such "key" is not a standard method defined by
-        OMG on the class Object. Hence we must use a _ before it.
-
-        * tao/{poa, servant_base}.cpp: Used _key instead of key as
-        explained above.
-
-Wed Mar 18 18:41:34 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/tests/CosPropertyService/main.cpp (main): Added testcode
-        for NamesIterator.
-
-Wed Mar 18 18:33:08 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/any.cpp: There was a bug in the assignment operator whereby
-        a Release was causing the Any object itself getting deleted.
-
-        * tao/poa.cpp: Changed occurrences of "buffer ()" used on the
-        object key (which is a sequence) to use "get_buffer" according to
-        the latest C++ mapping.
-
-Wed Mar 18 18:32:04 1998  Sergio Flores  <sergio@mambo.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp:
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.h: Fixed some allocation
-        errors and added synchronization mechanism for static internal
-        data structures.  Also fixed an undefined symbol due to templates
-        not being instantiated.
-
-Wed Mar 18 17:22:40 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/sequence_T.h: Renamed buffer() to get_buffer() to confrom to
-          orbos/98-01-11.
-
-        * tao/sequence[_T].*: Added the get_buffer(), release(), and
-          replace() methods defined by the proposed orbos/98-01-11
-          specification.
-
-Wed Mar 18 16:54:33 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp (next_n): Changed ACE_NEW
-          to ACE_NEW_RETURN.
-
-Wed Mar 18 16:39:40 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * tao/orbobj.{h,cpp}: * tao/params.{h,cpp}: * tao/orbcore.cpp:
-          Expanded the resolve initial references protocol to include
-          bootstrappable services other than the Naming Service. Now, the
-          multicast message includes a field identifying the target
-          service. The values for this field are defined in orbobj.h --
-          currently there are only TAO_SERVICEID_NAMESERVICE, and
-          TAO_SERVICEID_TRADINGSERVICE. For completeness I've added for
-          the -ORBtradingserviceior and -ORBtradingserviceport command
-          line parameters.
-
-        * orbsvcs/Naming/Naming_Utils.cpp:
-        * orbsvcs/Naming/Ior_Multicast.cpp:
-          Now, on the receiving end, the bootstrappable service compares
-          the service_id it receives in the multicast message with its own
-          before responding to it.
-
-Wed Mar 18 16:04:38 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosPropertyService.idl (CosPropertyService):
-          Uncommented sequence of typecodes. It passed the tao_idl
-          compiler.
-
-Wed Mar 18 07:18:08 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * release.pl: uncommented unlink of .del files.
-
-        * tao/encode.cpp (TAO_Marshal_String::encode): #if 0'd unused
-          local "continue_encoding".
-
-        * tao/sequence{,_T}.cpp: removed some more "meaningless" const
-          modifiers from casts.
-
-        * tao/typecode.cpp (private_equal): wrapped a break with
-          ACE_NOTREACHED.
-
-        * tao/corbacom.h: changed CORBA_Boolean to u_char.  Thanks
-          to Seth and Carlos for pointing out that this will conform
-          to the standard.
-
-        * tao/cdr.i: removed operator <</>> for CORBA::Boolean _with_
-          ACE_HAS_BOOL.  No ACE platform currently #defines ACE_HAS_BOOL,
-          and this will prevent divergence of TAO code if any do in the
-          future.
-
-Wed Mar 18 02:08:55 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Param_Test/client.cpp (~Param_Test_Client): Removed
-          releasing of the Param_Test pointer.  It is owned by the Driver
-          class.
-
-Tue Mar 17 23:28:59 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa.h (POA): Changed the LOCATION_RESULT enum from protected
-          to private.
-
-Tue Mar 17 13:20:05 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit (print_stats): with
-          ACE_LACKS_FLOATING_POINT, multiply calls/usec by 10^6 to get
-          calls/sec.  And, use call_count_ instead of hard-coded 1000.
-
-        * tao/orbconf.h,interp.cpp: renamed TAO_ALIGNMENT_MAGIC_NUMBER to
-          TAO_MAXIMUM_NATIVE_TYPE_SIZE.
-
-        * tao/sequence.i,sequence_T.{i,cpp}: removed "const" from some
-          ACE_reinterpret_casts, because ghs warned that it's "meaningless".
-
-        * tao/cdr.*,decode.cpp (get_encapsulation): changed type of second
-          arg from size_t to CORBA::ULong for platform independence.
-
-Tue Mar 17 11:26:28 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-          Fixed return value for operator[] in sequences of basic types,
-          the _out and _var classes generated non-nested types. Thanks to
-          Frak. J. Hodum <fhdum@std.saic.com> for reporting this problem.
-
-Tue Mar 17 10:25:46 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_state_argument.cpp:
-        * TAO_IDL/be/be_state_attribute.cpp:
-        * TAO_IDL/be/be_state_union.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_exception.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_union_branch.cpp:
-          Some export macros were missing; also fixed minor formatting
-          problems.
-
-Mon Mar 16 18:26:51 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/Default_Servant/File_i.cpp (open): Fixed string being
-          passed to create_reference_with_id(). The test now works.
-
-        * tao/poa.cpp (find_servant): Added new method to the POA. It
-          finds and returns the servant related to the key passed by the
-          user.
-
-Mon Mar 16 15:27:21 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          The _narrow() method is more careful about collocation: the
-          servant could return 0 on the call to _downcast (for instance if
-          the servant is using DSI or is implementing the default servant
-          posicies), in such a case a remote object is created.
-          Generate the _interface_repository_id() method in all classes.
-
-        * TAO_IDL/be/be_visitor_module.cpp:
-          In some cases the export macros were not generated.
-
-        * tao/object.h:
-        * tao/object.cpp:
-          Added a new method to get the interface repository id (only
-          locally).
-
-        * tao/servant_base.cpp:
-          Removed some dead code.
-
-Mon Mar 16 14:28:34 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orbconf.h: cleaned up #define of TAO_ALIGNMENT_MAGIC_NUMBER,
-          to allow it to be overridden.
-
-Mon Mar 16 10:47:08 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/cdr.h:
-        * tao/cdr.i:
-        * tao/cdr.cpp:
-          The CDR stream class exposed its implementation completely, this
-          change is the first attempt to close that interface and make it
-          safer.  The internal representation was changed to a
-          Message_Block, so CDR could eventually create chains of
-          Message_Blocks (minimizing buffer copies and using writev() for
-          output).
-          The next step is to split the class in an input and output
-          interface, following the Java IDL model.
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_enum.cpp:
-        * TAO_IDL/be/be_visitor_exception.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_structure.cpp:
-        * TAO_IDL/be/be_visitor_typedef.cpp:
-        * TAO_IDL/be/be_visitor_union.cpp:
-        * tao/any.cpp:
-        * tao/connect.cpp:
-        * tao/decode.cpp:
-        * tao/except.cpp:
-        * tao/giop.h:
-        * tao/giop.cpp:
-        * tao/iioporb.cpp:
-        * tao/interp.cpp:
-        * tao/objkeyC.cpp:
-        * tao/poaC.cpp:
-        * tao/tc_const.cpp:
-        * tao/typecode.h:
-        * tao/typecode.cpp:
-          This files were modified to use (or generate, in the case of the
-          IDL compiler) the new CDR stream class interface.
-
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be/be_type.cpp:
-          It used a static buffer to evaluate be_type::nested_type_name(),
-          it was changed for a per-class buffer, but the real solution is
-          to allocate a buffer on the fly and return it to the user, maybe
-          using UTL_String will solve the problem.
-
-        * tests/Makefile:
-        * tests/CDR/Makefile:
-        * tests/CDR/basic_types.cpp:
-        * tests/CDR/tc.cpp:
-          Added some simple tests to verify that CDR streams work
-          correctly.
-
-        * taoconfig.mk:
-          The clean target is defined in ACE config files.
-
-        * docs/orbsvcs.html:
-          Included documentation on the collocation services.
-
-        * docs/releasenotes/ec.html:
-          Moved some of the changes from "new in this release" to "changes
-          in previous releases".
-
-Sun Mar 15 22:36:08 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Admin.*
-        * orbsvcs/orbsvcs/Trader/Lookup.*
-        * orbsvcs/orbsvcs/Trader/Policies.*
-        * orbsvcs/orbsvcs/Trader/Policy_Manager.*
-        * orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.*
-        Added the logic to perform federated queries. At this point I'm
-        halting further coding of the Trading Service to concentrate on
-        testing and debugging. The only portion of the specfication left
-        unimplemented is the Proxy interface, which isn't of immediate
-        practical use anyway.
-
-Sun Mar 15 07:56:02 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_field.cpp
-          (be_visitor_field_cs::visit_sequence): made int return type
-          explicit.
-
-Sun Mar 15 06:18:58 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_include/{be_codegen, be_visitor_args}.h: Added a new
-        state called "POST_MARSHAL_SS" i.e., to do post processing after
-        the marshaling of return, inout, and out parameters is done in a
-        server skeleton. Added new visitor class to the argument visitors.
-
-        * TAO_IDL/be/{be_visitor_args, be_visitor_operation,
-        be_interpretive}.cpp: Code for post processing after marshaling in
-        the server skeletons. This was required to support object
-        references.
-
-Sat Mar 14 19:28:50 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_field.cpp: Added a case for handling
-        anonymous sequences in the client stub visitor. The header file
-        was also changed.
-
-Sat Mar 14 19:29:00 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/client.cpp (print_stats): added
-          support for ACE_LACKS_FLOATING_POINT.
-
-Sat Mar 14 16:40:05 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation.cpp: We were not generating the
-        "_get_" and "_set_" prefixes for operations corresponding to
-        attributes. This is now fixed.
-
-        * TAO_IDL/be/be_visitor_enum.cpp: Typecode implementation of enum
-        class was not getting generated due to an incorrect "if"
-        condition. Thanks to Seth Widoff for noticing this.
-
-        * TAO_IDL/be/be_visitor_union_branch.cpp: We had forgotten to
-        generate the "set" and "get" operation implementation for union
-        members that are sequences. Thanks to Seth Widoff for noticing
-        this.
-
-Sat Mar 14 02:48:55 1998  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile (IDL_FILES): Added the SFP IDL files
-        and the AV/sfp.cpp to the rules.
-
-Sat Mar 14 02:17:34 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/*.*:
-        I've hammered out a number of errors from the initial port:
-        the Trading Service compiles on Solaris.
-
-        * orbsvcs/orbsvcs/Makefile:
-        I've added all the necessary additions to the Makefile for the
-        Trading Service. The makefile will perform the compilation when
-        the 'trader' flag is set to 1 on the command line.
-
-        * orbsvcs/Trading_Service/Makefile:
-        * orbsvcs/Trading_Service/trader.cpp:
-        trader.cpp instantiates a Trader object and registers its Lookup
-        interface with the bootstrapped Naming Service. All the Trader
-        interfaces are implicitly activated in the Trader class. In the
-        future we'll want to have the Trading Service bootstrappable
-        through the resolve_initial_references method.
-
-Sat Mar 14 00:36:30 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp (define_property):
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h (PropertyNamesIterator):
-
-        * orbsvcs/orbsvcs/Property/CosProperty_Hash.cpp (CosProperty_Hash_Value):
-
-        * orbsvcs/orbsvcs/Property/CosProperty_Hash.h:
-        The tao_idl compiler has been made to generate Any at some places
-        where it was generating Any_var. Hence, I had to modify this
-        implementaion to accomadate this change.
-
-Fri Mar 13 10:34:15 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation.cpp: For return types that are
-        object references, we were using the actual return type and
-        passing its address to the marshaling routine. However, the
-        marshaling routine needs the address of the base class i.e.,
-        CORBA::Object. Due to "public virtual" inheritance all kinds of
-        crazy things happen. So now we had to resort to declaring the
-        return value of type "CORBA::Object_ptr" and things worked fine.
-
-Fri Mar 13 09:57:51 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbacom.h: use types of known sizes, such as ACE_UINT32
-          and ACE_INT16, instead of native types for Boolean, Short,
-          UShort, Float, and Double.
-
-Thu Mar 12 21:23:10 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/debug.cpp (_dmsg_x): Changed ex->id () to ex->_id ().
-
-Thu Mar 12 20:40:09 1998  Sergio Flores  <sergio@lambada.cs.wustl.edu>
-
-        * tests/Thruput/TAO/client.cpp:
-        * tests/Thruput/TAO/run_client:
-        * tests/Thruput/TAO/run_server:
-        * tests/Thruput/TAO/run_test: Minor fixes in the scripts and usage
-        message.
-
-Thu Mar 12 18:02:06 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * tao/request.cpp:
-        * tao/typecode.cpp:
-        The is_nil methods of typecode and CORBA had this:
-        (CORBA::Boolean) ptr == 0 to test for the nil condition, when we
-        really want this: (CORBA::Boolean) (ptr == 0). This way we cast
-        the result of the expression, and not the pointer, to
-        CORBA::Boolean.
-
-Thu Mar 12 17:49:45 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_visitor_typedef.cpp: For typedefs of pseudo object
-        types, we had forgottten to generate a typedef to the _ptr type.
-
-Thu Mar 12 17:21:32 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/sequence_T.cpp: Fixed a couple of weird bugs were freebuf
-          (MAX) was being called instead of freebuf (tmp).  Thanks to
-          Keith Nicewarner <knicewar@sanders.com> for reporting this.
-
-Thu Mar 12 15:53:44 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/except.h: Changed the member functions "type ()" and "id ()"
-        on the CORBA::Exception class to "_type ()" and "_id ()". This
-        affected the following files:
-        tao/{except, object, poaC, svrrqst}.cpp
-
-        * TAO_IDL/be/be_visitor_exception.cpp: Made changes to use the
-        _type and _id methods. Thanks to Seth Widoff for noticing this in
-        his Trader application where a user defined exception had a member
-        called "type" which clashed with the base class operation "type".
-
-Thu Mar 12 15:00:47 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_exception.cpp: In those cases where object
-        references or strings were assigned, the g++ compiler failed to do
-        implicit conversion to assign a _var to a _ptr type. This is now
-        fixed by using the _var.in () method.
-
-        * TAO_IDL/be/be_visitor_typedef.cpp: Fixed a bug that was
-        generating typecode information for data types that were imported
-        resulting in a multiply defined symbol error at link time.
-
-Thu Mar 12 09:01:43 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: added -Wno-unused to g++ CCFLAGS to
-          suppress warnings about unused parameters and variables.
-
-        * TAO_IDL/be/be_visitor_interface.cpp
-          (be_visitor_interface_sh::visit_interface,
-           be_visitor_interface_collocated_ss::visit_interface):
-          changed type of loop index "i" to signed, to avoid
-          signed/unsigned comparison.
-
-        * TAO_IDL/be/be_visitor_sequence.cpp
-          (be_visitor_sequence_ci::visit_sequence): made int return
-          type explicit.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (~Cubit_Server): changed
-          root_poa_ to poa_.
-
-Thu Mar 12 01:03:17 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/NewPOA/NewPOA.cpp (main): Updated the following files
-          to correctly use CORBA::Policies that are used to create new
-          POAs.  Things that needed fixing included proper exception
-          handling and making sure to destroy the policies once we were
-          through using them.
-
-          - TAO/tao/tao_util.cpp
-          - TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
-          - TAO/tests/POA/Default_Servant/server.cpp
-          - TAO/tests/POA/Explicit_Activation/server.cpp
-          - TAO/tests/POA/NewPOA/NewPOA.cpp
-          - TAO/tests/POA/On_Demand_Activation/server.cpp
-
-Wed Mar 11 21:02:13 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/svrrqst.cpp (marshal): instead of declaring a new loop
-          index "i", use the one at outer scope because it was shadowed.
-
-Wed Mar 11 18:10:47 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO_IDL/tao_idl.dsp: Added new visitor files into the project.
-
-Wed Mar 11 17:23:49 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/tao_util: Changed the name of root_poa_ to poa_ since it
-          doesn't have to be a root POA.
-
-Wed Mar 11 14:37:08 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/Makefile: Included be_visitor_exception.cpp and ran make
-        depend
-
-        * TAO_IDL/be/be_interpretive.cpp: The factory is now able to
-        produce concrete visitors for exceptions.
-
-        * TAO_IDL/be/be_visitor_args.cpp
-          TAO_IDL/be_include/be_visitor_args.h: Added a method
-          "void_return_type" that determines if the operation return type
-          was "void" or not. This was necessary since we were incorrectly
-          generating ACE_NEW_RETURN statements in stubs for cases that had
-          void return types
-
-        * TAO_IDL/be/be_visitor_context.cpp
-          TAO_IDL/be_include/be_visitor_context.h: Added a boolean data
-          member that indicates whether we are generating the special
-          constructor in the exceptions.
-
-        * TAO_IDL/be/be_visitor_exception.cpp
-          TAO_IDL/be/be_visitor_exception.h: Added  various visitors for
-          exception handling.
-
-        * TAO_IDL/be/be_visitor_{struct, union, module, interface,
-        sequence}.cpp: Made sure that code is not generated for imported
-        types.
-
-        * TAO_IDL/be/be_visitor_typedef.cpp: Eliminated the multiple
-        declaration of typedefed variables and their typecodes.
-
-        * TAO_IDL/be/be_visitor_interface.cpp: The "_is_a_skel" now uses
-        the same table driven approach as the other skeletons do.
-
-Wed Mar 11 12:54:59 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/Explicit_Activation/server.cpp (main): The server was
-          changed to test how the POA handles a user given ID which does
-          not contain printable characters.
-
-        * tao/poa (Policies and Currents): Since Policies and Currents do
-          not have locality constraints, they now inherit from regular
-          servants rather than local servants.  This change causes them to
-          register with POAs when their _this() method is invoked.
-          Therefore, the destroy() methods on the Policies was changed to
-          make sure that the Policies are deactivated from the POA they
-          were registered with.
-
-        * tao/sequence_T.cpp (operator=): The semantics of the elements of
-          a sequence are the same as that of a var variable.  Therefore we
-          will not duplicate the user provided pointer before assigning it
-          to the internal variable.  However, we will release it.
-
-Tue Mar 10 16:09:56 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/cdr.{h,cpp}: Added a get_string and put_string method for
-        retrieving and encoding a string. This uses "memcpy" rather than
-        having to go through a get_char/put_char for every byte of the
-        string.
-
-        * tao/connect.cpp: In "handle_request", the marshaling of inout,
-        out, and return value parameters was done inside this method after
-        the operation skeleton had returned. This required unnecessary
-        heap allocation of these parameters. Allocating these parameters
-        on the skeleton call stack was not possible since the marshaling
-        took place after the skeleton had returned. To eliminate these
-        unnecessary waste, 2 new methods on the ServerRequest class are
-        added that perform the demarshaling and marshaling while the
-        skeleton call stack is active. More explanation on these is given
-        below.
-
-        * tao/{encode, decode}.cpp: Used the get_string and put_string
-        methods on the CDR class.
-
-        * tao/giop.*: Added a method called "stream" that returns a
-        reference to the underlying CDR stream. This is helpful when you
-        need access to the stream so that data types can be marshaled into
-        the stream using a compiled form of marshaling. This form of
-        marshaling will soon be added to TAO IDL compiler.
-
-        * tao/object.{h, cpp}: Added a method called "stubobj" which
-        returns a pointer to the underlying Stub_Object. This method
-        eliminates the need to call QueryInterface inside every stub. This
-        way some code size is reduced.
-
-        Also, removed the "get_most_derived" method as well as the "void
-        *sub_" data member which was useless.
-
-        * tao/svrrqst.{h, i, cpp}: Added a new file svrrqst.i. Added two
-        new methods on class IIOP_ServerRequest. These methods enable
-        demarshaling and marshaling of parameters while the operation
-        skeleton's call stack is active. The interface to these methods is
-        exactly like the one used by do_call i.e., a table driven
-        approach. Two new data structures - TAO_Param_data_Skel and
-        TAO_Call_Data_Skel are added. These two tables behave in exactly
-        the same way as the TAO_Param_Data and TAO_Call_Data tables. See
-        the generated code to see how these are used by the demarshal and
-        marshal methods.
-
-        Two more methods and data members are added to this class -
-        "incoming" and "outgoing". These are the CDR streams that indicate
-        the incoming and the outgoing CDR streams.
-
-        An additional "init_reply" method is added that is useful for the
-        compiled marshaling. This is still experimental.
-
-        * TAO_IDL: This is the first release of the new TAO_IDL compiler
-        based on the Visitor pattern. All the old files and code is still
-        included in this release until the transition is complete.
-
-        Although the Visitor pattern is used, we still maintain all the
-        code generation states we had in the previous version of the
-        compiler. The reason is that we maintain a Factory of Visitors
-        indexed on these enumerated states. The downside is the necessity
-        to have states and a larger code size. The larger code size is due
-        to the fact that everytime a Visitor is required, we must first
-        set the appropriate state and then ask the factory to produce it
-        for us. The positive side of this design is that almost all the
-        Visitor files are independent of each other. They only deal with
-        an abstract base level Visitors. The Factory will produce the
-        appropriate specialized Visitor which is a subclass of the base
-        "visitor" class. An additional benefit is that we can switch from
-        having to generate code that uses Interpretive marshaling to
-        compiled marshaling. Visitors for compiled marshaling will be
-        added later. Here are the files that are added:
-
-        be_include/
-                be_visitor.h
-                be_visitor_args.h
-                be_visitor_attribute.h
-                be_visitor_constant.h
-                be_visitor_context.h
-                be_visitor_decl.h
-                be_visitor_enum.h
-                be_visitor_field.h
-                be_visitor_interface.h
-                be_visitor_interface_fwd.h
-                be_visitor_module.h
-                be_visitor_operation.h
-                be_visitor_root.h
-                be_visitor_scope.h
-                be_visitor_sequence.h
-                be_visitor_structure.h
-                be_visitor_typedef.h
-                be_visitor_union.h
-                be_visitor_union_branch.h
-        be/
-                be_visitor.cpp
-                be_visitor_args.cpp
-                be_visitor_attribute.cpp
-                be_visitor_constant.cpp
-                be_visitor_context.cpp
-                be_visitor_decl.cpp
-                be_visitor_enum.cpp
-                be_visitor_exception.cpp
-                be_visitor_field.cpp
-                be_visitor_interface.cpp
-                be_visitor_interface_fwd.cpp
-                be_visitor_module.cpp
-                be_visitor_operation.cpp
-                be_visitor_root.cpp
-                be_visitor_scope.cpp
-                be_visitor_sequence.cpp
-                be_visitor_structure.cpp
-                be_visitor_typedef.cpp
-                be_visitor_union.cpp
-                be_visitor_union_branch.cpp
-
-        NOTE: Code generation for attributes is achieved by using a crude
-        form of the Adapter pattern. We convert the Attribute node into
-        one or possibly two operation nodes and add scope elements that
-        are arguments. The code gene ration is then handed over to the
-        Operation Visitors.
-
-        * be/be_interpretive.cpp: This file defined the implementation of
-        the Factory of Visitors for intepretive marshaling.
-
-        * be_include/be_codegen.h: Added a few more states. Some others
-        are now useless. They will be removed eventually. Also added the
-        Abstract Factory for Visitors.
-
-        * Makefile: Modofoed to include all the visitor files and ran
-        "make depend" on it.
-
-Tue Mar 10 13:22:20 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Event_Latency/Makefile,
-          orbsvcs/tests/EC_Multiple/Makefile,
-          orbsvcs/tests/Simulator/Event_Supplier/Makefile: removed -pedantic
-          from g++ CCFLAGS because prevented use of native long long
-          (Linux/i386).
-
-        * orbsvcs/orbsvcs/RtecScheduler.idl: addressed RT_Info open issues,
-          and updated to match TAO paper.  The updates consisted of
-          changing the names of the Importance enum values so that we
-          don't have collisions when criticality is added, and comment
-          updates.
-
-        * orbsvcs/Event/Dispatching_Modules.cpp,ReactorTask.cpp,
-          orbsvcs/Sched/Config_Scheduler.cpp,
-          orbsvcs/tests/EC_Multiple/EC_Multiple.cpp,
-          orbsvcs/tests/Event_Latency/Event_Latency.cpp,
-          orbsvcs/tests/Simulator/Event_Supplier/Event_{Con,Sup}.cpp:
-          added _IMPORTANCE to Importance enum values.
-
-Mon Mar 09 22:27:53 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA/Generic_Servant/client.cpp: Added code to time calls
-          and produce stats.
-
-        * tao/svrrqst: Removed the lock in CORBA_ServerRequest which was
-          used to protect the refcount. This protection was excessive.
-
-        * tao/optable.cpp: Changed the table so that it does not use a RW
-          Lock. Since the optable is read only, a null lock will suffice.
-
-        * tao/objtable.cpp: Changed the implementation of
-          TAO_Dynamic_Hash_ObjTable so that it does not use a RW Lock. The
-          POA takes care of all necessary locking, and therefore, a null
-          lock will suffice.
-
-        * tao/poa: The following optimizations were made to decrease the
-          time a POA takes to find a servant:
-
-          - Added new classes TAO_Creation_Time and
-            TAO_Temporary_Creation_Time.  These classes are used to record
-            and compare the creation time of POAs. The old method was
-            inefficient as unsigned long were used.  These long required
-            conversions to strings.  The new scheme uses a fixed size
-            buffer. The TAO_Temporary_Creation_Time is a special class
-            that tracks the creation time only during the lifetime of the
-            upcall.
-
-          - parse_key_permanent_id() and parse_key_temporary_id() were
-            added so that the parse_key() routine can distinguish when to
-            create a new id and when to create a special id which is only
-            used during the lifetime of the upcall.
-
-          - rfind() was added so that the TAO_POA::String::rfind() does
-            not have to be used.
-
-          - Changed the object_key_type from String to char.
-
-          - In post_invoke(), only create the POA_var if necessary.
-
-          - Changed create_object_key() and parse_key() so that the old
-            format of:
-
-            Transient/Seconds/MicroSecond/POAName/ObjectId
-
-            to:
-
-            T/TimeStampPOAName/ObjectId
-
-          - Removed excessive memcpy() and strcpy() calls in parse_key().
-
-          - Changed create_object_id() to not include the POA name.
-
-          - Changed is_poa_generated_id() to take the changes to
-            create_object_id() into account.
-
-          - Changed string_to_ObjectId() and ObjectId_to_string() to not
-            use encode and decode routines.
-
-Mon Mar  9 15:23:19 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp (open):
-        Temporarily disabled use of threads, and reverted back to the
-        forking model. The threaded model needs more work before it can
-        safely support multiple clients.
-
-Mon Mar  9 14:57:13 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence.h:
-        * tao/sequence.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.cpp:
-          Removed the _narrow_fixup() method, it was causing problem with
-          sequences of TypeCodes and it is not really needed: the
-          functionality can be implemented in the stubs (skeletons) and/or
-          the >>= methods.
-
-Mon Mar 09 09:59:01 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: removed
-          VxWorks-specific code, because it was no longer used, and
-          relied on a header that was not distributed with TAO.
-
-Sat Mar 07 12:14:58 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.1.7, released Sat Mar 07 12:14:58 1998.
-
-Sat Mar  7 11:59:27 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/orb_core.cpp (get_root_poa): Changed this from being a
-        macro-implemented method to a hand-implemented method.  This is
-        necessary b/c the location of its resource is keyed not off
-        resource_source_ but rathe off poa_source_, and there's no macro
-        avaialble for that.  Thanks to John Geiss <jtgb@eci-esyst.com> for
-        reporting the bug that led to this fix!
-
-Sat Mar 07 08:29:51 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core.cpp (TAO_Default_Reactor ctor and dtor): removed
-          inline qualifiers.
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile: changed -lm to $(MATHLIB).
-          It looks like Sun C++ and g++ link with -lm by default, so
-          there shouldn't be any affect on those platforms.  Others may
-          have to define MATHLIB in their platform_macros.GNU.
-
-        * tests/Cubit/TAO/MT_Cubit/client.cpp (do_priority_inversion_test):
-          changed variables low_client and high_client to low_priority_client
-          and high_priority_client.  Replaced use of cerr with ACE_DEBUG.
-
-Fri Mar  6 17:56:25 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * Aloha: I bid fond farewall to Team TAO for now.  Thanks for the
-        fun times!
-
-        * tests/NestedUpcall/server.cpp: Integrated new stuff.
-
-        * tests/NestedUpcall/client.cpp: Called new 'stop' method.
-
-        * tests/NestedUpcall/{Reactor.idl,reactor_i.*}: Added 'stop' to Reactor
-        interface to shutdown the server.
-
-        * tao/tao_util.cpp: Added code to explicitly destroy policies
-        after creating a child POA.
-
-        * tao/poaS.h: Added a little comment to bring this up in C++ mode
-        in emacs.
-
-        * tao/poa.cpp: Performed explicit deletes on buffers.
-
-        * tao/object.{cpp,i}: Moved DTOR into .cpp and stuck in comment
-        explaining refcount semantics on CORBA_Object.
-
-        * tao/iiopobj.i: Changed initial refcount value to zero; the ORB
-        Core must perform an explicit AddRef() if it intends to hold on to
-        this object.
-
-        * tao/iiopobj.cpp: Changed Release() so that it will call 'delete
-        this' whenever the refcount is below zero.
-
-Fri Mar 06 11:38:38 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html: Shrinked the table widths to 80% so we can
-          see everything without scrolling.  Thanks to Darrell for the
-          HTML tip.
-
-Fri Mar 06 09:36:47 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/object.i (CORBA_Object): reordered initializers to match
-          declaration order.  Also, move _set_parent () before the
-          constructor so that it is defined before being used.
-
-        * tao/cdr.{i,cpp}: modified to base in/out operations
-          on ULongLong instead of LongLong, because we have
-          better support for ULongLong with ACE_LACKS_LONGLONG_T.
-
-        * tao/cdr.{h,cpp} (get_ulonglong): removed const argument qualifier.
-
-Fri Mar 06 00:18:38 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poaS and poaC: Removed about a 1000 lines of stubs and
-          skeletons code from poaC.cpp and poaS.cpp.  This code was not
-          necessary because of the locality constraints on certain POA
-          objects. This should help reduce the footprint of TAO.
-
-Thu Mar  5 19:54:27 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp: bind_context, rebind,
-        and bind were fixed to handle errors more carefully.  Thanks to
-        Mark Boriack for pointing this out.
-
-Thu Mar  5 18:15:32 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/giop.cpp: Removed crufty unused code.
-
-        * tao/iioporb.cpp:
-        * tao/iiopobj.*:
-        * tao/decode.cpp:
-        * tao/object.{h,i}:
-        * tao/orbobj.cpp:
-        * tao/poaC.cpp:
-        * tao/request.cpp:
-        * tao/servant_base.{h,cpp}:
-        Broke the old, incestous, bizarre "contained" relationship between
-        IIOP_Object and CORBA_Object.  Now, multiple CORBA_Objects can
-        reference the same IIOP_Object, and each is reference-counted
-        separately.  Moreover, an IIOP_Object has no back-pointer to a
-        CORBA_Object.  All of this should help alleviate many memory
-        leaks.
-
-        * TAO_IDL/be/be_interface.cpp: Changed emitted code for _narrow
-        and _bind to deal with new relationship btw. CORBA_Object and
-        IIOP_Object.
-
-Thu Mar  5 17:45:28 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/cdr.i:
-          If CORBA::WChar is an alias for CORBA::Short we cannot overload
-          operator<< on it.
-
-        * tao/corbacom.h:
-        * tao/typecode.h:
-          MSVC++ does not like a class forward declared as a structure.
-
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-          -lm is required in IRIX.
-
-Thu Mar 05 16:18:53 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa.cpp (ObjectId_to_wstring and ObjectId_to_const_wstring):
-          Changed the odd looking access to a sequence's buffer to use the
-          new buffer() accessor.
-
-Thu Mar  5 13:15:37 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/cdr.h:
-        * tao/cdr.i:
-          Added a error flag to the class and some << and >> operators to
-          start a more useable interface for the CDR streams.
-
-        * tao/any.h:
-        * tao/any.cpp:
-        * tao/except.h:
-        * tao/except.cpp:
-        * tao/nvlist.h:
-        * tao/nvlist.cpp:
-        * tao/principa.h:
-        * tao/principa.cpp:
-        * tao/request.h:
-        * tao/request.cpp:
-        * tao/typecode.h:
-        * tao/typecode.i:
-        * tao/typecode.cpp:
-          They don't inherit from IUnknown any more. Removed the
-          QueryInterface method, but kept AddRef and Release to keep the
-          change propagation to a minimum.
-          In accordance to the new memory managment scheme the locks were
-          also removed, the agument is:
-          + In the common case the locks are *not* needed.
-          + When needed a lock at that level does *not* work.
-          + The application can add its own locking for the objects that
-          are effectively shared among threads.
-
-        * tao/sequence.h:
-        * tao/sequence.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.cpp:
-          Sequences of objects require some post processing *after*
-          demarshalling: the object references must be narrowed to the
-          right type; a new virtual method was added for that purpose.
-
-Thu Mar 05 09:08:09 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * .../Makefile:  added $(POSTLINK) to link commands.
-          Please, if you don't use rules.bin.GNU, be sure to
-          follow it as closely as possible.
-
-Wed Mar 04 19:49:31 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core (preconnect): changed type of loop index to
-          size_t to avoid signed/unsigned comparison.  Added some
-          template instantiations.
-
-Wed Mar  4 16:35:37 1998  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * tao/orbobj.*: Added an extension to the CORBA_ORB interface
-        that allows an application to preconnect to multiple servers by
-        specifying a string of host:port pairs.
-
-        * tao/orb_core.*: Broke the preconnection logic out of init()
-        and made it its own method, preconnect().  This also uses
-        Connector<>::connect_n() rather than implementing its own loop.
-        It really didn't make things much easier, but we can take
-        advantage of future improvements to that implementation
-        transparently, now.
-
-        * docs/Options.html: Added more details on various options.
-
-Tue Mar 03 21:11:22 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/RtecScheduler.idl: updated a comment: the units
-          of Period are 100 ns.
-
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp (initialize_queues),
-          Task_Manager.cpp (initialize): maintain period in units of 100 ns
-          when converting period from a 64 bit to a 32 bit int.
-
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp (open_queue),
-          ReactorTask.cpp (open_reactor): assign name to thread using units
-          of us.
-
-Mon Mar  2 19:01:44 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/tests/CosPropertyService/main.cpp (class
-        TAO_PropertySet_Tester): Added this wrapper class to organise my
-        test code, testing the methods in the PropertyService interfaces.
-
-Mon Mar  2 16:48:59 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-          More changes attempting to remove the \ problem for NT.
-
-        * tao/orbobj.h:
-          Added a missing TAO_Export macro.
-
-        * tao/typecode.h:
-        * tao/typecode.i:
-          Added the _var and _out classes for CORBA_TypeCode.
-
-        * tao/corbacom.h:
-          Added the TypeCode_var and TypeCode_out classes to the CORBA
-          class.
-
-Mon Mar  2 15:39:57 1998  Douglas C. Schmidt  <schmidt@waltz.cs.wustl.edu>
-
-        * tao/sequence_T.h: Added a ptr() accessor to both the
-          TAO_Bounded_Sequence and TAO_Unbounded_Sequence classes.  Thanks
-          to Carol Sanders <csanders@mdc.com> for suggesting this.
-
-        * tao/sequence[_T].{i,cpp}: Cleaned up a bunch of
-          ACE_reinterpret_cast() operations.  Thanks to Russ Noseworthy
-          <rnosewor@objectsciences.com> for reporting this.
-
-Mon Mar  2 13:13:19 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-          Fixed pathname canonization for NT, we convert a double
-          backslash into a single slash.
-
-Mon Mar 02 08:00:41 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core.cpp: only instantiate ACE_Convert with g++.
-          Even that shouldn't need it, because it's always inline.
-          But, g++ typically creates out-of-line instantiations of
-          inline template member functions.
-
-        * tao/sequence.{h,cpp} (TAO_{B,Unb}ounded_Base_Sequence):
-          added (virtual) destructors.  Without them, GreenHills on
-          Chorus was duplicating their vtables when instantiating
-          templates based on those classes.
-
-        * orbsvcs/orbsvcs/Makefile,tmplinst-orbsvcs.cpp:
-          renamed tmplinst.cpp to tmplinst-orbsvcs.cpp to avoid mangled name
-          collisions with tmplinst.cpp in test directories, when using
-          GreenHills/Chorus.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (main): added explicit
-          int return type.
-
-Sun Mar  1 13:42:56 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * release.pl: This script will now move the 'Current' tag to
-          point to the latest beta release.
-
-Sun Mar  1 10:40:31 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/{poa, objtable}.cpp: Removed the "Anachronism" warning
-        associated with the _out parameters passed to the find () method.
-
-Sat Feb 28 18:37:54 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosProperty_Hash.cpp:
-        * orbsvcs/orbsvcs/Property/CosProperty_Hash.h:
-        * orbsvcs/tests/CosPropertyService/main.cpp:
-        Added some more code to test the functions defined in CosPropertyService_i.cpp.
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/CosPropertyService.idl:
-        * orbsvcs/tests/Makefile (DIRS): Added the directory
-        CosPropertyService under DIRS  here. It is compiled when av=1.
-
-Fri Feb 27 19:55:09 1998  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Test.cpp (main): Added this
-        file which spawns the server and client and terminates them after
-        some time.
-
-Fri Feb 27 17:57:55 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/NestedUpcall/server.cpp: Started integrating the
-        TAO_ORB_Manager, but it's untested thus far so it's
-        conditionally-compiled out.
-
-        * tao/{any,connect,default_server,except,
-        orb_core,orbobj,principa,request}.cpp: Whacked out a bunch of @@
-        comments.
-
-Fri Feb 27 16:11:53 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.h:
-        * tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.h: Changes to make it compile on
-        sigle-threaded platforms.
-
-        * docs/releasenotes/index.html: update to naming service
-        entry.
-
-Fri Feb 27 15:03:58 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/Options.html (TAO_Default_Server_Strategy_Factory): Added
-        documentation for POA-related lock strategies.
-
-        * tao/connect.cpp (handle_input): Added call to
-        Reactor::suspend_handler() in here so that, in the bizarre corner
-        case where sub-event loop "A" eventually leads to sub-sub-event
-        loop "B" being called, but input becomes available for "A"'s
-        descriptor prior to "B"'s descriptor, B's loop won't spin wildly,
-        gobbling up CPU.
-
-Fri Feb 27 15:00:42 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i (hrtime_to_TimeT): with
-          ACE_LACKS_LONGLONG_T, set the high word directly.  The
-          ACE_U_LongLong operator >> returns an ACE_U_LongLong,
-          so the assignment won't work otherwise.
-
-        * tao/orb_core.cpp: added ACE_Convert (const char *, u_int &)
-          instantiation.
-
-Fri Feb 27 12:08:19 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/orb_core.h (TAO_Resource_Factory): Changed to use
-          TAO_Default_Reactor class in TAO_Resource_Factory.
-
-Fri Feb 27 11:10:24 1998  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * test/NestedUpcall/{eh_i,reactor_i}.cpp: Changed debug statements
-        to utilize the new ACE_Log_Msg conversions to indent scopes, etc.
-
-Fri Feb 27 00:40:36 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.6, released Fri Feb 27 00:40:36 1998.
-
-Thu Feb 26 19:29:33 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * orbscvs/orbsvcs/Trader/Admin.cpp:
-        * orbsvcs/orbsvcs/Trader/Admin.h:
-        * orbsvcs/orbsvcs/Trader/Attributes.cpp:
-        * orbsvcs/orbsvcs/Trader/Attributes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Tokens.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Validator.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitor.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-        * orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp:
-        * orbsvcs/orbsvcs/Trader/Dynamic_Property.h:
-        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Link.cpp:
-        * orbsvcs/orbsvcs/Trader/Link.h:
-        * orbsvcs/orbsvcs/Trader/Lookup.cpp:
-        * orbsvcs/orbsvcs/Trader/Lookup.h:
-        * orbsvcs/orbsvcs/Trader/Monitor.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Filter.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Filter.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterator.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Iterator.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Modifier.cpp:
-        * orbsvcs/orbsvcs/Trader/Offer_Modifier.h:
-        * orbsvcs/orbsvcs/Trader/Policies.cpp:
-        * orbsvcs/orbsvcs/Trader/Policies.h:
-        * orbsvcs/orbsvcs/Trader/Policy_Manager.cpp:
-        * orbsvcs/orbsvcs/Trader/Policy_Manager.h:
-        * orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Preference_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp:
-        * orbsvcs/orbsvcs/Trader/Property_Evaluator.h:
-        * orbsvcs/orbsvcs/Trader/Property_Filter.cpp:
-        * orbsvcs/orbsvcs/Trader/Property_Filter.h:
-        * orbsvcs/orbsvcs/Trader/Proxy.cpp:
-        * orbsvcs/orbsvcs/Trader/Proxy.h:
-        * orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.cpp:
-        * orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h:
-        * orbsvcs/orbsvcs/Trader/README:
-        * orbsvcs/orbsvcs/Trader/Register.cpp:
-        * orbsvcs/orbsvcs/Trader/Register.h:
-        * orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp:
-        * orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h:
-        * orbsvcs/orbsvcs/Trader/Sequences.idl:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Map.cpp:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Map.h:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
-        * orbsvcs/orbsvcs/Trader/Trader.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Base.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Base.h:
-        * orbsvcs/orbsvcs/Trader/constraint.l:
-        * orbsvcs/orbsvcs/Trader/constraint.y:
-        * orbsvcs/orbsvcs/CosTrading.idl:
-        * orbsvcs/Trading_Service/Makefile:
-        * orbsvcs/Trading_Service/trader.cpp:
-
-        The Trading Service has a new home and a new orb. I've migrated
-        the VisiBroker implementation of the Trading Service to TAO by
-        having the interfaces inherit from the POA_CosTrading skeletons,
-        replacing the the C++ exception handling with the TAO_* macro
-        exception handling and CORBA::Environment passing, and prefixing
-        all top level classes with 'TAO_'. Because the tao_idl generated
-        code from CosTrading.idl was having some trouble, nothing here has
-        been compiled since the port. The README file contains additions
-        to the Makefile necessary to accommodate the Trading Service's
-        reliance on STL.
-
-        The orbsvcs/Trading_Service/trader.cpp is a server that activates
-        the supported interfaces of our Trading Service. At this point our
-        Trader adheres to the Stand Alone Trader designation of
-        conformance as described in the specification.
-
-Thu Feb 26 18:38:56 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Server):
-          Fixed a syntax error.
-
-Thu Feb 26 18:07:16 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Added an entry for the Property Service.
-
-Thu Feb 26 17:36:21 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/orb_core.{h,cpp} (TAO_Default_Reactor): I added the new class
-          tring to strategize the type of reactor used.  It is not used at
-          the moment.
-
-Thu Feb 26 16:18:47 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp (gen_client_stubs): Split out some
-          code to use a couple temporary variables to work around what
-          might be a Heisenbug with GCC.  Thanks to Carlos O'Ryan and
-          Keith Nicewarner <knicewar@sanders.com> for reporting this.
-
-Thu Feb 26 14:52:20 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/NestedUpcall/{eh_i,reactor_i}.{h,cpp}: Added
-        implementation for the new decrement operation.
-
-        * tests/NestedUpcall/client.cpp: Added calls to invoke the new
-        decrement operation.
-
-        * tests/NestedUpcall/Reactor.idl: Added a new operation,
-        decrement, to test multi-nested upcalls.
-
-        * tao/connect.cpp (send_request): Fixed to return appropriate
-        return values, especially in case of errors.
-
-Thu Feb 26 14:02:36 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/tao_util.cpp (activate_under_child_poa): Instead of
-          returning a String_var, return String_var._retn ().
-          (activate_under_child_poa): Actually, it seems better just
-          use String than String_var.
-
-Thu Feb 26 13:31:06 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: added "all" target for CROSS-COMPILE platforms.
-
-Thu Feb 26 05:39:43 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/NestedUpcall/client.cpp: Cast (char *) to 0 which is used
-          to initialize remote_reactor_key.
-          (main): Added ACE_const_cast in string_to_object call.
-
-        * tests/NestedUpcall/NestedUpcall.dsw:
-        * tests/NestedUpcall/client.dsp:
-        * tests/Nestedupcall/server.dsp: New project files for NT.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (init_naming_service,main):
-          Appended a return at the end.
-
-        * tests/Cubit/TAO/IDL_Cubit/client.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/server.dsp: Updated project file
-          lists.
-
-        * tao/TAO.dsp: Added tao_util.cpp into this project.
-
-        * tao/tao_util.h (TAO_ORB_Manager): Added TAO_Export flag.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Added Ior_Multicast.cpp and
-          Naming_Utils.cpp into this project.
-
-        * orbsvcs/orbsvcs/Naming/Ior_Multicast.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h: Added
-          TAO_ORBSVCS_Export flag.
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp: Added a return
-          statement to muffle MSVC.
-
-Wed Feb 25 22:53:56 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/orbobj: Changed the signature of the run(ACE_Time_Value &)
-          method to run(const ACE_Time_Value &) so we can pass the const
-          ACE_Time_Value::zero to it.  Thanks to Chris Cleeland for
-          suggesting this.
-
-        * orbsvcs/orbsvcs/Event/RT_Task.h: Changed the use of ACE_MT_SYNCH
-          to ACE_SYNCH so that we can at least build the Event Channel on
-          a single-threaded platform.
-
-        * orbsvcs/orbsvcs/Event_Service_Constants.h: Changed the use of
-          ACE_Thread_Mutex and ACE_RT_Thread_Mutex to ACE_THREAD_MUTEX and
-          ACE_RW_THREAD_MUTEX, respectively, so that TAO will build on
-          non-threaded platforms.
-
-        * tao/poa.cpp,
-          tao/default_server.cpp: Fixed TAO by conditionally
-          compiling the code that relies on the recursive mutexes
-          and mutexes.  Thanks to Jim Penny <jpenny@universal-fasteners.com>
-          for reporting this.
-
-Wed Feb 25 22:47:48 1998  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/README::
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/cubit.idl:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.h: Made changes to have the
-        option to specify oneway calls instead of the usual two-way
-        cube_X() call.  Now, you can specify the "-o" argument on the
-        client side.
-
-Wed Feb 25 22:47:16 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/client.cpp (parse_args): Similar to
-        server.cpp changed the meaning of -s option to not to use the
-        naming service and naming service is used by default.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (parse_args): Changed the
-        meaning of the -s option to "don't use the naming service" and made
-        using the naming service the default.
-
-Wed Feb 25 22:47:16 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp (parse_args): Changed the
-        meaning of the -s flag to "don't use the naming service" and made
-        using the naming service the default.
-
-Wed Feb 25 18:03:35 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/tests/AVStreams/Makefile:
-        * tests/Cubit/TAO/IDL_Cubit/Makefile:
-          Updated dependencies.
-
-Wed Feb 25 17:13:05 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (Naming_Service):
-        Changed the main to just create an instance of Naming_Service and
-        call init and run on it.
-
-        * orbsvcs/Naming_Service/Naming_Service.h: Added this file which
-        defines a Naming_Service class to simplify the Naming_Service.cpp
-        file.
-
-Wed Feb 25 16:52:13 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/servant_base.cpp: Updated to reflect change of poa_current_
-        from structure to pointer.
-
-        * tao/poa.*: Changed signature of pre_invoke() and post_invoke()
-        to deal with poa current storage coming from the stack.
-
-        * tao/poa.cpp (dispatch_servant_i): Changed to create POA Current
-        information record on the stack during the upcall, thus clearing
-        the way for proper operation in the face of nested upcalls.
-
-        * tao/orbobj.cpp: Updated to reflect change of poa_current_ from
-        structure to pointer.
-
-        * tao/orb_core.*: Changed poa_current_ to a pointer rather than
-        ownership.  This allows the structure holding the POA Current
-        information to be created in the activation record for the upcall,
-        thus opening the door for proper operation in the face of nested
-        upcalls.
-
-        * tao/giop.h: Removed cruft/unused code.
-
-        * tao/giop.cpp: Addressed some '@@' comments.
-
-        * tao/connect.*: Fixed a problem where nested upcalls would only
-        work every other time.  This was caused by the fact that the
-        servant-turned-client cached the connection to the
-        client-turned-servant.  However, when the client-turned-servant
-        terminated, the servant-turned-client was ignoring input events on
-        this cached connection handle.  Then, when the next instance of
-        the client-turned-servant came along and tried to connect, when
-        the servant-turned-client made the invocation back to the
-        client-turned-servant, the cached handle was returned.  However,
-        when its input was read, rather than getting the expected
-        response, an EOF was received and the servant-turned-client
-        aborted the entire original invocation.
-
-        This was fixed by having the TAO_Client_Connection_Handler always
-        registered to receive input events and to maintain record of its
-        state so that it can tell whether or not it's expecting input.  If
-        it receives an unexpected input event, then it will simply close
-        down the connection, possibly logging a warning message as well.
-
-Wed Feb 25 16:06:59 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/{client,server}.{h,cpp}: Added callback
-        support
-
-Wed Feb 25 16:04:49 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp,h: Added support for making
-        upcalls into the application when connection is established,
-        requested etc..
-
-Wed Feb 25 12:58:04 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tao/tao_util.cpp: Added the implementation for the 2 new methods
-        to use a child_poa.
-
-        * tao/tao_util.h (class TAO_ORB_Manager): Added 2 new methods
-        init_child_poa and activate_under_child_poa to create a child_poa
-        with policies PERSISTENT and USER_ID.
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.cpp (bind): Added checks for
-        null pointers in ACE_DEBUG.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp: Moved this file from
-        orbsvcs/Naming_Service/ to this dir.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h: Moved this file from
-        orbsvcs/Naming_Service/ to this directory.
-
-Wed Feb 25 12:20:04 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/any.cpp (operator<<=): removed declaration of local "tc",
-          which shadowed the declaration in the outer scope.
-
-        * tao/giop.cpp (start): added a debug message for connection
-          failures.  This is where problems often occur for new users/
-          environments, and it'll help diagnose configuration problems.
-          And Linux getsockname () bugs.
-
-Tue Feb 24 21:05:08 1998  Nagarajan Surendran  <naga@mambo.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Main.cpp: This now contains the main
-        which was previously in Naming_Service.cpp to facilitate
-        integrating the IOR_Multicast class defined in Naming_Service.cpp
-        into the orbsvcs library.
-
-        * orbsvcs/Naming_Service/Naming_Utils.h: Defines a new
-        TAO_Naming_Server wrapper class which can be used as a
-        Naming_Server component if one wants a separate Naming_Server.
-
-        * orbsvcs/Naming_Service/Naming_Utils.cpp: Added this new file
-        which implements the TAO_Naming_Server class.
-
-        * tests/Cubit/TAO/IDL_Cubit/client.cpp (read_ior): Added 2 new
-        methods read_ior and init_naming_service.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.cpp: Now contains the
-        implementation of Cubit_Server class with a really simple main.
-
-        * tests/Cubit/TAO/IDL_Cubit/server.h (class Cubit_Server): Defined
-        a new Cubit_Server class akin to Cubit_Client.
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp: Moved the main () to
-        a separate file Main.cpp
-
-Tue Feb 24 17:45:20 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/orbobj.h: Removed the unnecessary = 0 on the new run method.
-
-        * tao/orbobj.cpp (run): Added a new run() method that takes an
-        ACE_Time_Value & rather than an ACE_Time_Value * so that we don't
-        need to pass the address!
-
-Tue Feb 24 14:31:37 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/NestedUpcall/client.cpp (main): Replaced orb->open() with
-        orb->run(&ACE_Time_Value::zero), which though still non-standard,
-        is less non-standard than open().
-
-        * tests/NestedUpcall/README: Added one for the good of all
-        mankind.
-
-Tue Feb 24 13:23:48 1998 Michael Kircher   <mk1@cec.wustl.edu>
-
-        * orbsvcs/tests/Simulator/NavWeap.idl: Added new fields
-
-        * orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.cpp:
-        adopted to new IDL file
-
-        * orbsvcs/tests/Simulator/Sim_Display/Display_Push_Consumer.java:
-        adopted to new IDL file
-
-
-Tue Feb 24 00:41:48 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Added TITLE,
-          DESCRIPTION for all the classes
-
-Mon Feb 23 22:40:22 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/cdr.h: removed old, commented out configuration code.
-
-        * TAO_IDL/be/be_decl.cpp (tc_name2long): changed type of "buf" array
-          from char to long so that it gets properly aligned.  This solves
-          the core dump problem with tao_idl on egcs/Solaris.  Thanks to
-          Håkan Källberg <hk@simulina.se> for reporting this.
-
-        * TAO/tests/Thruput/TAO/utils.cpp (prep_timer): cast LONG_MAX
-          to ACE_INT32 to avoid overflow problems if the result is an
-          int type, and long is bigger than int.
-
-        * orbsvcs/orbsvcs/Event/Event_Channel.i: specify constant
-          2147483648u as unsigned, to avoid compiler warning.
-
-        * TAO_IDL/Makefile: removed -fPIC for g++ because it's not needed
-          without shared libraries.
-
-        * TAO_IDL/Makefile: added Cleanup section, which cleans out builds
-          that were created with the nested version of the Makefile.
-
-Mon Feb 23 22:13:14 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.1.5, released Mon Feb 23 22:13:14 1998.
-
-Mon Feb 23 21:30:04 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: added the g++ options that were picked up
-          from be/Makefile.
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (start_servants):
-          declare local "i" outside of for loop because it is reused
-          in a few loops.
-
-Mon Feb 23 20:45:03 1998  Michael Kircher  <mk1@cec.wustl.edu>
-
-        * orbsvcs/tests/Simulator/Sim_Display: Fixed some small
-        bugs concerning the representation
-
-        * orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.cpp:
-        Changed the rate on which events are supplied
-
-
-Mon Feb 23 18:51:03 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (main): Set the handle
-        limit to the maximum.
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (initialize_orb): Fixed a
-        warning from compiler.
-
-Mon Feb 23 17:33:52 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-          We don't generate the compiler as a single executable, without
-          multiple shared libraries.
-
-Mon Feb 23 16:55:08 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event_Service_Constants.h: changed types of
-          ACE_ES_* constants from u_long to long to match
-          RtecEventComm::EventType.
-
-        * orbsvcs/orbsvcs/Event/Memory_Pools.cpp: updated template
-          instantiations to use ACE_Singleton instead of ACE_TSS.
-
-Mon Feb 23 12:25:21 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/Memory_Pools.h:
-        * orbsvcs/orbsvcs/Event/Memory_Pools.i:
-        * orbsvcs/orbsvcs/Event/Memory_Pools.cpp:
-          We cannot use TSS memory pools: in some cases the memory is
-          allocated in one thread and disposed in another. Until we can
-          clean out that behavior I'm using a singleton.
-
-Mon Feb 23 11:57:16 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/ : Changed the names EXT_ID and INT_ID
-        that I used for Hash_Table operations to less generic
-        CosProperty_Hash_Key and CosProperty_Hash_Value respectively.
-
-Mon Feb 23 11:40:37 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbacom.h (CORBA::LongLong): use ACE_BIG_ENDIAN
-          instead of TAO_WORDS_BIGENDIAN.
-
-        * tao/orbconf.h (TAO_ENCAP_BYTE_ORDER): use ACE_LITTLE_ENDIAN
-          instead of trying to figure it out from cpp #defines, which
-          failed for LynxOS.  Also, removed TAO_WORDS_BIGENDIAN.
-
-        * tao/interp.cpp (declare_entry,setup_entry): use the align_struct_
-          with padding by default, unless TAO_HAS_FIXED_BYTE_ALIGNMENT is
-          #defined.
-
-        * tao/corba.h: added ACE_UNUSED_ARG (VAR); to TAO_CATCH macro
-          for platforms without ACE_HAS_EXCEPTIONS, to avoid compiler
-          warning about unused variable if VAR isn't used anywhere.
-
-        * TAO_IDL/Makefile: added clean and realclean targets for
-          CROSS-COMPILE platforms.
-
-        * TAO_IDL/be/be_interface.cpp (be_interface::relative_name):
-          commented out unused local variable "def_scope".
-
-        * TAO_IDL/be/be_sequence.cpp: commented out some unused variables
-          to avoid compiler warnings.  The comments correspond to commented-out
-          sections of code.
-
-        * TAO_IDL/be/be_visitor_interface.cpp
-          (be_visitor_collocated_ss::visit_operation): removed unused
-          local "nl".
-
-        * TAO_IDL/be/be_visitor_root.cpp (be_visitor_root_ch::visit_sequence):
-          added ACE_UNUSED_ARG (node).
-
-        * TAO_IDL/be/be_visitor_sequence.cpp
-          (be_visitor_sequence_ch::visit_sequence): commented out unused
-          local "cg".
-
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp
-          (Latency_Supplier::push): added ACE_UNUSED_ARG (_env).
-
-Mon Feb 23 10:58:42 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/Fast_Reactor.h:
-        * orbsvcs/orbsvcs/Event/GPlot_File.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Property/CosProperty_Hash.h:
-        * orbsvcs/orbsvcs/Sched/DynSched.h:
-        * orbsvcs/orbsvcs/Sched/SchedEntry.h:
-        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h:
-        * Added more TAO_ORBSVCS_Export macros, this time in files that
-          are not compiled all the time.
-
-Sun Feb 22 22:14:08 1998  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * tao/giop.cpp (invoke): Created my own temporary variable in
-        order to de-warn on g++ and Sun CC.
-
-Sun Feb 22 20:12:24 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs/orbsvcs.dsp: Adapted chages to the directory
-          rearrangement.
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
-        * orbsvcs/orbsvcs/Scheduler_Utilities.h:
-        * orbsvcs/orbsvcs/Event/BCU.h:
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/Memory_Pools.h:
-        * orbsvcs/orbsvcs/Event/RT_Task.h:
-        * orbsvcs/orbsvcs/Event/ReactorTask.h:
-        * orbsvcs/orbsvcs/Event/Task_Manager.h:
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.h:
-        * orbsvcs/orbsvcs/Naming/Entries.h:
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
-        * orbsvcs/orbsvcs/Sched/Scheduler.h:
-        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h: Added
-          TAO_ORBSVCS_Export flags.
-
-Sat Feb 21 08:08:55 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * rules.tao.GNU: added -Wno-used to CCFLAGS, with g++ only.
-
-        * tao/align.h,corbacom.h,orbconf.h,orbobj.cpp:
-          use ACE Basic_Types instead of local SIZEOF_* macros.
-
-        * tao/debug.cpp: null f{,un}lockfile with ACE_HAS_DCE_DRAFT4_THREADS
-          (LynxOS).
-
-        * tao/any.cpp (operator<<=): initialized local "tc" to avoid compiler
-          warnings.
-
-        * tests/POA/On_Demand_Activation/Servant_Activator.cpp (etherealize),
-          Servant_Locator.cpp (preinvoke,postinvoke):
-          added some ACE_UNUSED_ARG's.
-
-        * TAO_IDL/Makefile,tao/Makefile: use CROSS-COMPILE flag instead of
-          CHORUS, LYNXOS, and VXWORKS.  This allows us to add new cross-
-          compile platforms without having to modify the TAO Makefiles.
-          The new platform need only set the CROSS-COMPILE flag.
-
-Sat Feb 21 00:31:20 1998  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * tao/connect.* (send_request): Modified to take an extra arg
-        which specifies whether or not the request is a twoway, i.e.,
-        whether or not it should enter a sub-event loop looking for a
-        reply.
-
-        * tao/giop.cpp (invoke): Changed to match signature of
-        send_request.
-
-        * tests/NestedUpcall/Reactor.idl: Added a oneway method to test
-        nested upcalls with oneways.
-
-        * tests/NestedUpcall/reactor_i.*: Added the oneway implementation.
-
-        * tests/NestedUpcall/client.cpp: Made oneway invocation to test a
-        problem that the nested upcall allowing ORB exhibited.  Thanks to
-        Carlos for reporting this!
-
-Fri Feb 20 14:40:28 1998  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * tao/connect.*: Extended TAO_Client_Connection_Handler to be run
-        a sub-event loop while sending a request in order to handle nested
-        upcalls.  A really cool side-effect of this is that if your
-        application start out being a client but has servants too, it's
-        really easy to get that up and running.  An example of this is
-        shown in the new test, NestedUpcall.
-
-        * tao/giop.cpp (invoke): Changed to call send_request on the
-        client connection handler rather than TAO_GIOP.  This new
-        send_request will handle nested upcalls (see above).
-
-        * tao/giop.* (send_request): Changed signature so that the
-        TAO_SVC_HANDLER* wasn't passed by reference.  This was totally
-        unnecessary.
-
-        * tao/{iioporb,orbobj}.* (string_to_object): Removed unnecessary
-        'const' preceding CORBA::String.
-
-Fri Feb 20 08:29:35 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (svc): added .in ()
-          dereference to several objref uses.
-
-        * orbsvcs/orbsvcs/Event/Memory_Pools.cpp: updated the
-          ACE_TSS <ACE_Malloc<...> > template instantiation to use the
-          ACE_LOCAL_MEMORY_POOL macro.
-
-        * orbsvcs/orbsvcs/Event/Event_Channel.{h,cpp}
-          (ACE_ES_{Con,Dis}junction_Group): added virtual destructors.
-
-Thu Feb 19 12:54:50 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
-        (create_initial_propertysetdef):  Assigned dummy return values in
-        order to avoid Warnings.
-
-        * orbsvcs/orbsvcs/Property/CosProeprtyService.idl file removed
-        from here. It is supposed to be there in ./..
-
-Thu Feb 19 12:49:49 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile: build orbsvcs before tests.
-
-        * tao/Makefile: set fakesvcconf on LynxOS.
-
-        * TAO_IDL/Makefile: don't build the IDL compiler for
-          Chorus, LynxOS, or VxWorks.
-
-        * tao/orbobj.cpp: enhanced some printouts.
-
-        * tao/tao_util.cpp (orb): added .in () dereference to orb_ argument.
-
-Thu Feb 19 10:15:00 1998  Michael Kircher <mk1@cs.wustl.edu>
-        * orbsvcs/test/Simulator: Set the file permissions right.
-
-Thu Feb 19 10:15:00 1998  Michael Kircher <mk1@cs.wustl.edu>
-        * orbsvcs/test/Simulator:
-          Intruduced new demo, using the Event Service as transport
-          media for monitoring events.
-          See orbsvcs/test/Simulator/README for more information
-
-          in orbsvcs/tests/Simulator:
-             NavWeap.idl - IDL definition of the Navigation and Weapons struct
-             ss - restart services script
-
-          in orbsvcs/tests/Simulator/Event_Supplier:
-             Event_Sup.cpp - Event Supplier
-             Event_Sup.h   - Event Supplier class definition
-             Makefile      - Event Supplier Makefile
-             (Event_Con.cpp, Event_Con.h - Event Consumer for testing)
-             svc.conf - helper file
-
-          in orbsvcs/tests/Simulator/Sim_Display:
-            Display.java  - Simulation
-            Display_Client.java - Main Entry point of the Simulation
-            Display_Consumer.java - Event Consumer
-            Display_Object.java - Interface for an Display_Object
-            Display_Weapons.java - Implementation of an Display_Object
-            Display_Art_Horizon.java - Implementation of an Display_Object
-            Display_Object_Factory.java - Factory Object for Display_Objects
-            Graph.java - Simulation
-            Graph_Panel.java - Simulation
-            NS_Resolve.java - Resolving the inital reference to the Naming Service
-            Queue.java - Simulation
-            Sim_Panel.java - Simulation
-            Border_Panel.java - Simulation
-
-
-Wed Feb 18 22:15:06 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tao/tao_util.cpp,h: Updated class to include a constructor so
-        user can supply his own orb, poa or manager.
-
-Wed Feb 18 21:40:24 1998    <coryan@MILONGA>
-
-        * docs/orbsvcs.html:
-          Updated the description of orbsvcs directory hierarchy.
-
-Wed Feb 18 19:45:57 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * Added the idl file for the CosPropertyService , i.e.
-        orbsvcs/orbsvcs/Property/CosPropertyService.idl
-
-Wed Feb 18 17:56:54 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs:
-          Moved all the implementations to the orbsvcs libraries, this is
-          the first step to give the user control over object
-          collocation.
-          Please note that this version is only known to compile on
-          Solaris/CC, it will *not* compile on NT (some "export" macros
-          are missing); since this change is very disruptive (because it
-          moves files around) it was thought that holding it for a long
-          time will result in more harm than good.
-          A top-level make on $TAO_ROOT/orbsvcs works OK.
-
-Wed Feb 18 17:10:23 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tao/tao_util.cpp (init): The ORB_Manager class does not create
-        it's own POA, but uses the default root POA instead.
-
-Wed Feb 18 16:02:34 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * Commented and indented the follwing files in orbsvcs/orbsvcs/
-          CosPropertyService.idl
-          CosPropertyService_i.h
-          CosPropertyService_i.cpp
-
-Wed Feb 18 12:28:58 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Thruput/TAO/tmplinst.cpp:
-          The templates should be instantiated over the CORBA:: typedefs,
-          otherwise they fail in weird platforms.
-
-Wed Feb 18 11:57:24 1998  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile (LDLIBS): Removed -lposix4
-        from the LDLIBS.  Thanks to Bob Olson <olson@mcs.anl.gov> for
-        reporting this.
-
-Wed Feb 18 02:58:40 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (IOR_Multicast): Make
-          sure that response_addr_ is properly initialized before it is
-          used to initialize response_, which is an ACE_SOCK_Dgram.
-
-Tue Feb 17 20:20:35 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/giop.cpp: Removed an extra explicit template instantiation
-          of TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>.  Thanks to
-          Ben Eng <ben@jetpen.com> for reporting this!
-
-        * tests/Thruput/TAO/Makefile: Removed the "clean" macro since it
-          was conflicting with the TAO default.
-
-Tue Feb 17 21:47:41 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (shutdown): Renamed please_exit
-        method to shutdown.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit.idl: Renamed please_exit operation to
-        shutdown.
-
-Tue Feb 17 17:22:47 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.1.4, released Tue Feb 17 17:22:47 1998.
-
-Tue Feb 17 16:50:20 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.cpp (open): Modified so that if it's been called
-        multiple times it returns '1' rather than '-1', thus not appearing
-        to calling code as an error.
-
-Tue Feb 17 16:05:55 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Chris G. updated the file list of
-          this project.
-
-        * orbsvcs/orbsvcs/Time_Utilities.h:
-        * orbsvcs/orbsvcs/Event_Utilities.h: Added MS keayword,
-          TAO_ORBSVCS_Export.
-
-        * tests/Cubit/TAO/IDL_Cubit/client.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/server.dsp: Updated project setting to
-          take the advantage of TAO naming service.
-
-        * orbsvcs/tests/Event_Latency/Event_Latency.dsp: Updated project
-          setting to use DLL version of orbsvcs.
-
-Tue Feb 17 15:39:49 1998  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.h::
-        * tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/cubit.idl:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.h:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.h: Made a bunch of changes to
-        correctly support the POA.  In addition, MT_Cubit now uses the
-        Name Service to bind the Cubit objects.  In case the Name Service
-        doesn't exist, there is still the "cut&paste" ior method that uses
-        a cubit factory to give the client a reference to the cubit
-        objects.
-
-Tue Feb 17 13:25:52 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO-INSTALL.html: Added instructions on using the CPP_LOCATION
-          environment variable in NT's section.  You can also use it on
-          UNIX but NT is the only platform which depends on it.
-
-Tue Feb 17 11:30:53 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orbconf.h: set TAO_ALIGNMENT_MAGIC_NUMBER to 128 if
-          ACE_SIZEOF_LONG > 4, e.g., on 64-bit CPUs.
-
-        * tao/except.cpp (make_standard_typecode): replaced unsigned long/
-          long with CORBA::ULong/CORBA::Long.
-
-        * TAO_IDL/ast/ast_array.cpp,ast_operation.cpp,ast_sequence.cpp,
-          ast_string.cpp,
-          TAO_IDL/util/utl_decllist.cpp,utl_exceptlist.cpp,utl_exprlist.cpp,
-          utl_idlist.cpp,utl_labellist.cpp,utl_namelist.cpp,utl_strlist.cpp:
-          moved base class initialization to beginning of initializer list.
-
-Tue Feb 17 10:43:45 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosTimeBase.idl:
-        * orbsvcs/orbsvcs/Time_Utilities.cpp:
-        * orbsvcs/orbsvcs/Time_Utilities.h:
-        * orbsvcs/orbsvcs/Time_Utilities.i:
-          Added the standard CORBA types for time, also added some helper
-          routines to convert between BasicTime::TimeT and the common
-          representations of time in ACE (ACE_Time_Value and ACE_hrtime_t)
-
-        * orbsvcs/orbsvcs/RtecEventComm.idl:
-        * orbsvcs/orbsvcs/RtecScheduler.idl:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/Event_Service/ReactorTask.cpp:
-        * orbsvcs/Event_Service/Task_Manager.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.h:
-        * orbsvcs/Scheduling_Service/Scheduler.cpp:
-        * orbsvcs/orbsvcs/Channel_Clients_T.i:
-        * orbsvcs/orbsvcs/Event_Service_Constants.h:
-        * orbsvcs/orbsvcs/Event_Utilities.i:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
-        * orbsvcs/Event_Service/Dispatching_Modules.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-          Adapted all the code to use the new time structures.
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/tests/EC_Multiple/Makefile:
-        * orbsvcs/tests/Event_Latency/Makefile:
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Simple_Naming/Makefile:
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/Naming_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Makefile:
-        * orbsvcs/Dump_Schedule/Makefile:
-          Updated dependencies.
-
-        * docs/releasenotes/ec.html:
-          Updated documentation for this release.
-
-Tue Feb 17 07:40:49 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/any.cpp: Added a "return *this" to operator= to stop certain
-          compilers from complaining.  Thanks to Andy for fixing this.
-
-Tue Feb 17 04:08:11 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init): Setting the
-          CPP_PATH has been causing a lot of nasty trouble on NT.  I
-          changed this function to allow overwriting the internal c++
-          compiler location at run time using $CPP_LOCATION.  If someone
-          forgets to set the CPP_PATH when compiling tao_idl, one can
-          make tao_idl work by defining this environment variable to
-          something like:
-
-             set CPP_LOCATION="C:/Program Files/DevStudio/VC/BIN/CL.exe"
-
-          Notice that CPP_LOCATION _must_ be a full pathname of the c++
-          compiler.
-
-Tue Feb 17 00:56:08 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/tests/CosPropertyService/main.cpp (main): Added some
-        more testing for Any in and out of Hash Table.
-
-Mon Feb 16 18:01:23 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.1.3, released Mon Feb 16 18:01:23 1998.
-
-Mon Feb 16 18:00:15 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * release.pl: Changed C++ comment leaders to Perl comment leaders.
-
-Mon Feb 16 17:51:15 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp : Added -s option to use the
-        NamingService. Default doesn't use NamingService.
-
-Mon Feb 16 17:38:15 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/iioporb.cpp: Made sure to count separators when allocating
-        space for the IOR.  This corrected ABW errors in purify.
-
-        * tao/connect.cpp: Explicitly set the buffer when being purified
-        to avoid complaints.
-
-Mon Feb 16 17:22:15 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile: Changed LDFLAGS to link orbsvcs
-        library.Now uses the Naming service.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp: Added code to register
-        IDL_Cubit/cubit_factory name with the naming service.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Added a -s flag to use the
-        NamingService to resolve the cubit_factory flag. It still has the
-        commandline IOR and -f ior_file options.
-
-Mon Feb 16 13:29:31 1998  Brian Mendel <brian.r.mendel@boeing.com>
-
-        * tao/poa.cpp: Added SCE_HAS_TEMPLATE_TYPEDEFS_CHAR guards
-           around ACE_OS:strlen calls for WChar(s).
-        * tao/default.bld, tao.bld: Update VxWorks GHS Build files.
-
-Mon Feb 16 12:24:04 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h (needed.): Added missing member
-        variable.  Things now compile.
-
-Mon Feb 16 10:18:25 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/poa.cpp (decode_string_to_sequence): moved declaration of
-          local "i" outside of loop because it is used after the loop.
-
-        * orbsvcs/Event_Service/RT_Task.cpp (synch_threads): try two
-          fallback strategies if the task activiation fails:
-          ACE_SCHED_OTHER scheduling class with requested priority, then
-          ACE_SCHED_OTHER scheduling class with minimum thread priority.
-          Thanks to Bob Olson <olson@mcs.anl.gov> for reporting the
-          problem in Irix, which doesn't have a thread priority of 0
-          with ACE_SCHED_OTHER.
-
-        * tao/corbacom.h (CORBA_SEQUENCE): replaced CORBA::B_FALSE with 0
-          because some compilers, such as egcs, can't handle its use before
-          definition below in class CORBA.  Thanks to Todd Pack
-          <todd@rwii.com> for reporting this.
-
-        * tao/giop.cpp (TAO_GIOP_message_name): cast quotient of sizeof's
-          to int to avoid signed/unsigned comparison.
-
-        * tao/interp.cpp (calc_nested_size_and_alignment,private_size,
-          private_alignment): qualified TC_KIND_COUNT with CORBA::,
-          so that the file-scope TC_KIND_COUNT isn't used in the
-          comparison.
-
-Mon Feb 16 10:14:34 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_array.cpp:
-          The _free method was emitted in the .i file, but it was not
-          declared inline. Thanks to Michael Kircher (mk1@cs.wustl.edu)
-          for reporting this one.
-
-Mon Feb 16 02:34:24 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosPropertyService_i.cpp: Defined some of the
-        functions for the TAO_PropertySet class.
-
-        * orbsvcs/orbsvcs/CosPropertyService_i.h: Defined the  classes for
-        implementing the CosPropertyService for TAO.
-
-        * orbsvcs/tests/CosPropertyService/Makefile:  Added this
-        Makefile ( Makefile for making test program for the
-        PropertyService )
-
-        * orbsvcs/orbsvcs/CosProperty_Hash.cpp:  Added this file.
-
-        * orbsvcs/orbsvcs/CosProperty_Hash.h (Table): Added this
-        file. This contains  the classes for maintaining Hash Table for
-        storing the PropertySets.
-
-        * orbsvcs/tests/CosPropertyService/main.cpp (main): Added this
-        test file for CosPropertyService
-
-
-Sun Feb 15 20:12:00 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poa.{h,cpp}: Heavily modified several routines to correct
-        problems with the notion of what, exactly, an object key really
-        is.  Some were treating it as simply an octet sequence, others as
-        a zero-terminated string (C-style), while others as a sequence of
-        octets which must be terminated by a zero.
-
-        Object keys and IDs are now stored canonically as opaque octet
-        sequences, and two new conversion routines
-        (encode_sequence_to_string and decode_string_to_sequence) have
-        been created to convert between these octet sequences and C-style
-        strings.
-
-        * tao/iioporb.cpp (object_to_string): Modified to utilize the new
-        encoding routines to convert from octet sequences to printable
-        strings.
-
-        * tao/{tao_internals,orbobj}.cpp: Added explicit inclusion of
-        Object_Manager.h.
-
-Sun Feb 15 16:15:49 1998  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/Param_Test/options.cpp (parse_args): Changed the -f option
-        to read the servant-IOR from a file.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Changed the -f
-        <cubit_factory_key> to -f <cubit_factory_ior_file>. Reads the ior
-        from that file.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp : Added -o <ior_output_file>
-        option to output the cubit factory ior to a file.
-
-Sat Feb 14 22:39:46 1998  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/clnt.cpp (init): Added negative test case
-        of name not found when calling the naming service' resolve()
-        method.
-
-Fri Feb 13 19:37:01 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Changed char buf[BUFSIZ]
-          to char buf[ACE_MAX_DGRAM_SIZE] to make sure we don't overflow
-          the buffer!
-
-Fri Feb 13 18:18:54 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/Makefile:
-        * tests/Thruput/TAO/client.cpp:
-        * tests/Thruput/TAO/Makefile:
-        * tests/Thruput/TAO/server.cpp:
-        * tests/Thruput/TAO/ttcp_i.cpp:
-        * tests/Thruput/TAO/ttcp_i.h:
-        * tests/Thruput/TAO/utils.cpp: Made changes to use the new POA.
-
-Fri Feb 13 12:56:01 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * release.pl: fixed typo, missing comma between chmod args.
-
-Fri Feb 13 12:46:26 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.1.2, released Fri Feb 13 12:46:26 1998.
-
-Thu Feb 12 21:09:22 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AVStreams_i.{h,cpp}: Updated MMDevice and StreamCtrl
-
-Thu Feb 12 20:55:48 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tests/AVStreams/client,server: Updated to use the new StreamCtrl, MMDevice etc..
-
-Thu Feb 12 11:06:48 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poaC.i (PortableServer): Moved POA::_nil() definition above
-          many uses.
-
-Thu Feb 12 10:21:47 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/TAO/Cubit/TAO/MT_Cubit/Task_Client.cpp (svc): added .in ()
-          to objref and cb so that it will compile with g++.
-
-        * tao/Makefile,xdr.{h,cpp},t-xdr.cpp,corba.h: removed xdr files
-          because they're no longer used.
-
-        * tao/encode.cpp,poa.{h,cpp},poaC.{h,cpp}: replaced wchar_t
-          with CORBA::WChar.
-
-        * TAO_IDL/ast/ast_generator.cpp,TAO_IDL/be/be_generator.cpp
-          (create_wstring): use short instead of wchar_t if
-          ACE_HAS_WCHAR_TYPEDEFS_CHAR.
-
-        * TAO_IDL/be/be_array.cpp (tao_name): changed type of loop index
-          "i" to unsigned int to avoid signed/unsigned comparison.
-
-        * TAO_IDL/be/be_state_exception.cpp,be_state_structure.cpp (gen_code):
-          added default case to switch statement, which sets "os" to 0, to
-          avoid compiler warning about possible unitialized use.
-
-        * tests/POA/Default_Servant/File_i.cpp (lseek): changed type
-          of "result" to CORBA::Long to avoid signed/unsigned comparison
-          with -1.  Cast it to CORBA::ULong on return.  Also, added a
-          couple of ACE_UNUSED_ARG (env)'s.
-
-        * tests/Param_Test/server.cpp (main): initialize local
-          "param_test" to 0 to avoid warning about unitialized use.
-
-        * orbsvcs/Scheduling_Service (compute_scheduling): added cast
-          of impl->tasks () to RtecScheduler::handle_t to avoid signed/
-          unsigned comparison.  Also, added a bunch of ACE_UNUSED_ARG (env)'s.
-
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp (EC_Proxy::push,
-          Test_ECP::push): changed type of loop index "i" to u_int to
-          avoid signed/unsigned comparison.  Also, added an
-          ACE_UNUSED_ARG (env).
-
-Wed Feb 11 11:20:34 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/iiopobj.h,stub.h (operator =): added return type to avoid
-          compiler warning, and wrapped in ACE_UNIMPLEMENTED_FUNC.
-
-        * tao/corbacom.h: rearranged LongLong typedefs so that they work
-          with ACE_LACKS_LONGLONG_T.
-
-        * tao/Timeprobe.cpp (print_times): divide by 1000u instead of 1000
-          to allow overload resolution of ACE_U_LongLong::operator /.
-
-        * tao/orb_core.cpp: removed break's after return's to avoid compiler
-          warnings.
-
-        * tao/typecode.cpp: wrapped some break and return statements with
-          ACE_NOTREACHED to avoid compiler warnings.
-
-        * tao/debug.cpp (use_debug_stream_to_get_rid_of_warning): changed
-          to return debug_stream instead of (not) using it.  ghs warned that
-          "controlling expression is constant" the way things were.
-
-        * TAO_IDL/Makefile: added default_vxworks target to prevent make
-          warning.
-
-Tue Feb 10 17:39:13 1998  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/SchedEntry.cpp
-          orbsvcs/Scheduling_Service/DynSched.{cpp,h}
-          orbsvcs/Scheduling_Service/Strategy_Scheduler.{cpp,h} :
-
-          fixes to priority assignment, timeline generation methods
-          (fourth cut - timelines being generated)
-
-Tue Feb 10 11:19:20 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-          Fixed several problems detected by SGI/C++ compiler.
-
-Mon Feb  9 20:00:55 1998  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/SchedEntry.{cpp,h,i}
-          orbsvcs/Scheduling_Service/DynSched.{cpp,h,i}
-          orbsvcs/Scheduling_Service/Strategy_Scheduler.{cpp,h} :
-
-          finished timeline coding, got a clean source compile
-          (third cut - still a work in progress)
-
-
-Mon Feb  9 12:59:29 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/RtecEventComm.idl:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/Event_Channel.i:
-        * orbsvcs/orbsvcs/Event_Utilities.cpp:
-        * orbsvcs/orbsvcs/Event_Utilities.i:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Added comments to the EventComm module and a new field (ttl_:
-          Time-to-Live) to the event data structure.
-
-        * orbsvcs/orbsvcs/Channel_Clients_T.cpp:
-        * orbsvcs/orbsvcs/Channel_Clients_T.h:
-        * orbsvcs/orbsvcs/Channel_Clients_T.i:
-          I finally needed the TIE classes for PushConsumers and
-          PushSupplier, they work OK now.
-
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.h:
-        * orbsvcs/tests/EC_Multiple/README:
-        * orbsvcs/tests/EC_Multiple/Makefile:
-        * orbsvcs/tests/Makefile:
-          Added a simple example on how to connect multiple event
-          channels.
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-          Added and/or fixed some debug messages.
-
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-          Reduce default output level.
-
-        * tao/corba.h:
-          Fixed TAO_RETHROW_RETURN macro.
-
-        * docs/releasenotes/ec.html:
-        * docs/releasenotes/index.html:
-          Split the Event Channel release notes to a separate file, the
-          index.html was growing without control.
-
-Mon Feb  9 09:15:08 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/orbcore.html:
-          Fixed reference to TAO-Install.html, thanks to Sreedharani
-          <dharani@sutmyn.com> for reporting this one.
-
-Sun Feb 08 21:41:24 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao_util.cpp (run): added return 0 statement at end.
-
-Sun Feb  8 19:48:33 1998  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/SchedEntry.{cpp,h,i} : Moved the
-          Classes for the various scheduling entries out of the
-          ACE_Scheduler class and into a separate set of files
-          (first cut - still a work in progress)
-
-        * orbsvcs/Scheduling_Service/DynSched.{cpp,h,i} : Completed
-          merges of dispatches, and a thorough review of priority
-          assignment (second cut - still a work in progress)
-
-        * orbsvcs/Scheduling_Service/Strategy_Scheduler.{cpp,h} :
-          Completed merges of dispatches, and a thorough review of the
-          modified strategies (second cut - still a work in progress)
-
-Fri Feb  6 15:31:17 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_array.cpp:
-          Fixed several problems with the array code generation,
-          including:
-          + The name for the array TypeCode and its alias TypeCode were
-            clashing.
-          + Several inconsistencies in the declaration and definition of
-            operations for _var, _out and _forany parameters.
-          Thanks to James Mason <jmason2@mdc.com> for reporting this.
-
-        * TAO_IDL/be/be_type.cpp:
-          Increased the buffer size for some names to the "standard"
-          NAMEBUFSIZE.
-
-        * docs/releasenotes/orbcore.html:
-          The "Last Updated" field is set by CVS now.
-
-        * tao/interp.cpp:
-        * tao/encode.cpp:
-          Removed obsolete comments.
-
-Wed Feb  4 12:30:43 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/objkeyC.h: Modified so that the namespace mapping for the
-        TAO module uses the alternative "underbar" mapping, i.e., rather
-        than TAO::ObjectKey, it's now TAO_ObjectKey.  The scoping
-        operation is now performed in tao.h.
-
-        * tao/tao.h: This now contains a class (used as a namespace) in
-        which components which *should* be in the TAO:: namespace are
-        typedef'd.
-
-        * tao/tao_util.*: Moved TAO_ORB_Manager into here.
-
-        * tao/stub.h:
-        * tao/servant_base.cpp:
-        * tao/poa.h:
-        * tao/poa.cpp:
-        * tao/orbobj.h:
-        * tao/orbobj.cpp:
-        * tao/orb_core.h:
-        * tao/orb_core.cpp:
-        * tao/object.h:
-        * tao/object.cpp:
-        * tao/iiopobj.h:
-        * tao/iiopobj.cpp:
-        * tao/corba.h:
-        Changed references of TAO::ObjectKey to TAO_ObjectKey.
-
-        * tao/Makefile: Adjusted build tao_util.so rather than tao.so.
-
-Mon Feb  2 22:51:03 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * rules.tao.GNU (TAO_IDLFLAGS):
-        * orbsvcs/orbsvcs/Makefile (TAO_IDLFLAGS): Changed IDLFLAGS to
-          TAO_IDLFLAGS to avoid naming conflict with IDLFLAGS for other
-          IDL compilers.
-
-Mon Feb  2 21:41:32 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: Added Win32 IDL flags for portability.
-
-Mon Feb 02 18:50:19 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Scheduler_Factory.h: Added the
-          TAO_ORBSVCS_Export directive to class Scheduler_Factory.
-
-        * TAO_IDL/GenExportH.BAT: New Windows batch file which generate
-          an header file with approriate exporting flags defined.  See
-          this file for details.
-
-        * orbsvcs/orbsvcs_export.h:  New file that defines the Export
-          directives for Win32.  Generated by GenExportH.BAT in TAO_IDL/.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsw: Added new project file for DLL
-          version of orbsvcs library.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: New project file for DLL version of
-          orbsvcs library.
-
-        * orbsvcs/orbsvcs/orbsvcs_lib.dsp:  Changed the tao_idl custom
-          build commands so it builds files for both LIB and DLL
-          libraries.
-
-        * orbsvcs/orbsvcs.dsw:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsp:
-        * orbsvcs/Event_Service/Event_Service.dsp:
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsp: Changed to
-          use DLL version of orbsvcs library.
-
-Mon Feb  2 18:08:21 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence_T.cpp:
-          Fixed problems in memory reallocation for
-          TAO_Unbounded_Sequence<T>::operator=().
-
-Mon Feb  2 13:47:23 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tao/Makefile: Renamed tao_util to tao. Ditto for the .h and .cpp
-        files. Also renamed the TAO_Util::ORB_Manager class to TAO_ORB_Manager.
-
-Mon Feb  2 13:47:01 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_args.cpp:
-          Fixed the mapping for strings as INOUT parameters.
-
-Mon Feb 02 08:59:57 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/tao_util.cpp (init): added .in () to poa_object in call to
-          _narrow, so that it will compile with g++.
-
-        * orbsvcs/tests/Logger/Makefile,
-          orbsvcs/orbsvcs/Makefile,
-          tests/POA/FindPOA/Makefile,
-          tests/POA/{Default,Generic}_Servant/Makefile,
-          tests/POA/NewPOA/Makefile,
-          tests/Cubit/TAO/{IDL,MT}_Cubit/Makefile,
-          tests/Param_Test/Makefile,
-          tests/Thruput/TAO/Makefile:
-          inserted (or moved) TAO_ROOT definition to top of file.
-
-Sat Jan 31 01:08:19 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-          The IDL compiler has support for NT DLLs already, I moved the
-          tiem from the "issues" to the "new features" list.
-
-        * docs/index.html:
-        * docs/compiler.html:
-          Added documentation for TAO IDL compiler behavior and options.
-
-        * TAO_IDL/be/be_init.cpp:
-          Print a reasonable version for the compiler back-end, it is no
-          longer the Sun example BE and the version is (around 0.1.0).
-
-Fri Jan 30 16:27:47 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.1.1, released Fri Jan 30 16:27:47 1998.
-
-Fri Jan 30 15:35:06 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_args.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-          Added support for export macros and a user defined include file,
-          this was needed to support DLL's in NT.
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile:
-          Removed a broken test target; thanks to Michael Kircher
-          <mk1@cec.wustl.edu>
-
-Fri Jan 30 15:30:30 1998  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/DynSched.{cpp,h,i} : The Dynamic
-          Scheduler Implementation (first cut - still a work in progress)
-
-        * orbsvcs/Scheduling_Service/Strategy_Scheduler.{cpp,h,i} : The
-          strategized scheduler subclass and the corresponding strategies
-          (first cut - still a work in progress)
-
-Fri Jan 30 15:10:01 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * README: Updated the documentation to reflect the latest changes
-          to TAO.  Thanks to Hans Rohnert for noticing this.
-
-Fri Jan 30 14:38:30 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/util.cpp : Added TAO_ORB_Manager, a simple
-        helper class that does simple ORB and POA initialization and
-        object activation etc.
-
-        * orbsvcs/orbsvcs/util.h : Added file
-
-Fri Jan 30 13:15:10 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * Makefile (RELEASE_FILES): Added rules.tao.GNU and taoconfig.mk
-        to this...missing in release 0.1.0.  Thanks to Mark Boriack of
-        SAIC for reporting this.
-
-Fri Jan 30 11:55:38 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs_lib.dsp: Logging service was somehow
-          missing from the library.
-
-        * orbsvcs/tests/Logger/Logger.dsw:
-        * orbsvcs/tests/Logger/{server,client}.dsp: Added new project file.
-
-        * orbsvcs/tests/Logger/svr.cpp:
-        * orbsvcs/tests/Logger/clnt.cpp:
-        * orbsvcs/tests/Logger/logger_i.h:
-        * orbsvcs/tests/Logger/logger_i.cpp: Changed <iostream.h> to
-          "ace/streams.h".  We should always use "ace/streams.h".
-
-Fri Jan 30 11:42:10 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * docs/releasenotes/orbcore.html: Updated to reflect
-        characteristics of the latest release as well as what we have to
-        look forwrd to.
-
-        * announcement: Added this boilerplate for release announcement.
-        Actually, it's a sciprt which can be piped to something like
-        'mailx'.
-
-Fri Jan 30 01:55:59 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/Cubit/COOL/IDL_Cubit/README:
-        * tests/Cubit/COOL/IDL_Cubit/Makefile:
-        * tests/Cubit/COOL/IDL_Cubit/client.cpp:
-        * tests/Cubit/COOL/IDL_Cubit/client.h:
-        * tests/Cubit/COOL/IDL_Cubit/cubit.idl:
-        * tests/Cubit/COOL/IDL_Cubit/cubit_i.cpp:
-        * tests/Cubit/COOL/IDL_Cubit/cubit_i.h:
-        * tests/Cubit/COOL/IDL_Cubit/server.cpp:
-        * tests/Cubit/COOL/IDL_Cubit/tmplinst.cpp: Added test code for
-        Chorus COOL ORB, for the IDL Cubit example.
-
-        * tests/Thruput/COOL/README:
-        * tests/Thruput/COOL/Makefile:
-        * tests/Thruput/COOL/client.cpp:
-        * tests/Thruput/COOL/server.cpp:
-        * tests/Thruput/COOL/ttcp.idl:
-        * tests/Thruput/COOL/ttcp_decl.h:
-        * tests/Thruput/COOL/ttcp_i.cpp:
-        * tests/Thruput/COOL/ttcp_i.h:
-        * tests/Thruput/COOL/utils.cpp: Added test code for Chorus COOL
-        ORB, for the Thruput example.
-
-        * tests/Thruput/TAO/ttcp_decl.h: Make declarations of variables
-        consistent with definition.  Changed srcDataSize from CORBA::ULong
-        to unsigned long.
-
-        * tests/Thruput/TAO/Makefile: Updated to use rules.tao.GNU.  and
-        taoconfig.mk.  This was suggested by a change Carlos O'Ryan did to
-        the long lost Thruput_test directory.
-
-Thu Jan 29 23:10:05 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/clnt.cpp (CosNaming_Client):
-          Reordered the constructor initializations to match the class
-          definition.
-
-Thu Jan 29 20:10:33 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.1.0, released Thu Jan 29 20:10:33 1998.
-
-Thu Jan 29 15:58:01 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Param_Test/run_test: Allowed specification of the
-        invocation style (sii vs. dii) using a shaell variable.
-
-        * docs/releasenotes/{index,orbcore}.html: Updated to include some
-        details regarding this release.  These files are behind the
-        release, but I'm opting to get the release out and update these
-        files ex post facto.
-
-        * release.pl: Updated this script so that it can update different
-        levels of the release version number based on the setting of the
-        RELEASE_TYPE environment variable.
-
-        * Makefile: Added release.chk to the list of files going into the
-        release.  This file is our checklist for things that have been
-        tested and work leading up to a release.  Check in here for
-        details on how a test has worked on a platform.
-
-        * tests/POA/FindPOA/FindPOA.cpp (main): Added missing double-quote
-        in ACE_DEBUG().
-
-Thu Jan 29 15:55:25 1998  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/clnt.h:
-        * orbsvcs/tests/Logger/clnt.cpp:
-          We need to keep a reference to the ORB is some place.
-
-Thu Jan 29 14:59:01 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/POA/On_Demand_Activation/server.cpp:
-        * tests/POA/Generic_Servant/MyFooServant.cpp:
-        * tests/POA/Explicit_Activation/server.cpp:
-        * tests/POA/Default_Servant/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        _var's passed as pointers need to use the .in() method.
-
-        * tests/Param_Test/run_test: Added a longer delay, changed port #,
-        and made all output be prefaced by either "SERVER: " or
-        "CLIENT(<type>): ".
-
-        * tao/poa.cpp: Re-ordered member initializers to de-warn g++.
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp: _narrow needs to be
-        passed a .in() from _vars (you get a lollipop if you understand
-        that comment).
-
-        * docs/poa_migration.html: Added this file to start the ball
-        rolling.  Right now it's poorly-formatted and a rehash of some
-        emails, but it will be refined and grow over time.
-
-Thu Jan 29 12:33:30 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/clnt.cpp:
-        * orbsvcs/tests/Simple_Naming/clnt.h:
-          Simple Naming simply tries to locate the Naming Service, it is
-          useful to test the TAO facilities (multicast, environment,
-          command line) for that purpose.
-
-        * orbsvcs/tests/Logger/clnt.cpp:
-        * orbsvcs/tests/Logger/clnt.h:
-          We do not attempt to use nested context unless requested by the
-          user, the reason is that it is failing consistently right now.
-
-Thu Jan 29 10:34:08 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_operation.cpp: Some bug fixes made in the pre-POA
-        TAO version were accidentally overwritten during the POA to main
-        branch merge. This has been fixed.
-
-        * tao/{encode, decode}.cpp: Fixed the terrible alignment problems
-        that we were having on VxWorks for marshaling structures. At this
-        time, the fix has been made only to "structs". These problems were
-        being caused because the C++ compiler on NT/VxWorks was laying out
-        structures on a 4 byte aligned address. If a "double" is the very
-        first field, it will allocate the double at the 4 byte aligned
-        address even if a double is 8 byte aligned. The fix is to make
-        sure that when we align, we must take into account the start
-        address of the structure as well as the address at which the field
-        is laid out.
-
-Thu Jan 29 10:29:14 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Makefile:
-          Compile <tests> before <orbsvcs>, if the first one fails the
-          second will sure fail also.
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-          Updated comments and reformated some unreadable things.
-
-Wed Jan 28 15:35:37 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Makefile:
-        * tests/Cubit/Makefile:
-          Fixed Makefiles so we can invoke the top level Makefile safely.
-
-Wed Jan 28 13:45:16 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/POA/Default_Server/{client,server}.dsp: Updated project
-          files.
-
-        * tests/Cubit/TAO/MT_Cubit/client.dsp: Added CubitS.cpp to
-          client.dsp.
-
-        * tests/POA/Generic_Servant/{client,server}.dsp: Added idl
-          compilation rules.
-
-        * tests/Parem_Test/{client,server}.dsp: Updated idl file
-          compilation rules.  Added Parem_TestS.cpp to client project.
-
-Wed Jan 28 14:25:29 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Param_Test/run_test: Updated to utilized the new '-o'
-        option on the server side and for the clients to get the IOR from
-        that file.
-
-        * tests/Param_Test/server.cpp: Added '-o' option to specify the
-        name of a file in which the server can deposit the IOR which the
-        client should use.
-
-        * tests/Param_Test/options.cpp: Updated the options string (forgot
-        it last time through).
-
-Wed Jan 28 13:56:07 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/POA/Makefile:
-        * tests/POA/Default_Servant/Default_Servant.dsw:
-        * tests/POA/Default_Servant/File.idl:
-        * tests/POA/Default_Servant/File_i.cpp:
-        * tests/POA/Default_Servant/File_i.h:
-        * tests/POA/Default_Servant/Makefile:
-        * tests/POA/Default_Servant/client.cpp:
-        * tests/POA/Default_Servant/client.dsp:
-        * tests/POA/Default_Servant/server.cpp:
-        * tests/POA/Default_Servant/server.dsp:
-        * tests/POA/Default_Servant/svc.conf:
-          Added some missing tests that were in the POA branch.
-
-Wed Jan 28 13:35:11 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Param_Test/server.cpp: Changed so that the IOR is printed
-        ALL the time.
-
-        * tests/Param_Test/options.*: Updated to work with POA.  Got rid
-        of host and port arguments and added an IOR argument.
-
-        * tests/Param_Test/driver.*: Updated to work with POA.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h: Added emacs mode setting at
-        beginning.
-
-        * tao/optable.h: Cleaned up some formatting in header file.
-
-Wed Jan 28 13:19:55 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/README:
-          Update README on how to run the test.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp:
-          Print the IOR always, it is neded to run properly.
-
-
-        * tests/Cubit/TAO/MT_Cubit/tmplinst.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/tmplinst.cpp:
-          Instantiate on CORBA::Long instead of a plain long.
-
-        * orbsvcs/tests/Logger/svr.cpp:
-          Cosmetic changes on debug messages.
-
-Wed Jan 28 11:20:38 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/Logger.idl:
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Logger/logger.idl:
-          Moved a prototype logger.idl to the orbsvcs library, eventually
-          this will become a full blown service in the TAO architecture.
-
-        * orbsvcs/tests/Logger/clnt.cpp:
-        * orbsvcs/tests/Logger/clnt.h:
-        * orbsvcs/tests/Logger/logger_i.cpp:
-        * orbsvcs/tests/Logger/logger_i.h:
-        * orbsvcs/tests/Logger/svr.cpp:
-          Ported the experimental logging server to POA.
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-          Fixed minor problem with call using a _var as input parameter
-
-Wed Jan 28 09:14:30 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/POA/Makefile:
-          Fixed order in the DIRS variable, Generic_Servant goes first
-          since it builds a library needed in some of the other tests.
-
-        * tests/POA/On_Demand_Activation/Makefile:
-        * tests/POA/Explicit_Activation/Makefile:
-          Fixed order for libraries, -lserver uses -lTAO so it must go
-          first.
-
-        * orbsvcs/orbsvcs/Makefile:
-          Another case of misplaced includes.
-
-
-Tue Jan 27 17:29:11 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile:
-          Reorder includes to avoid evil definition for the IDL compiler.
-
-Tue Jan 27 16:16:11 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Param_Test/server.cpp: Added ACE_UNUSED_ARG() inside the
-        TAO_CATCH() macro scope to de-warn on g++.
-
-        * tests/Param_Test/param_test_i.cpp (Param_Test_i::CTOR): Removed
-        argument name to de-warn on g++.
-
-        * tests/Cubit/TAO/IDL_Cubit/{svr,clnt}.cpp: Use in() method on
-        _var class to explicitly get an _ptr.
-
-        * tao/objtable.cpp (find): Changed conditional expression to not
-        rely on implicit conversion from _var to _ptr type.
-
-        * tao/giop.cpp: Updated "illegal message" error message to
-        actually print out the type of the offending message.  This also
-        caused the addition of a helper function--TAO_GIOP_message_name().
-
-Tue Jan 27 15:06:28 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/Makefile:
-        * orbsvcs/Dump_Schedule/Makefile:
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/Naming_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Makefile:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/tests/Event_Latency/Makefile:
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Simple_Naming/Makefile:
-        * tao/Makefile:
-        * tests/Cubit/TAO/IDL_Cubit/Makefile:
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-        * tests/POA/Explicit_Activation/Makefile:
-        * tests/POA/FindPOA/Makefile:
-        * tests/POA/Generic_Servant/Makefile:
-        * tests/POA/NewPOA/Makefile:
-        * tests/POA/On_Demand_Activation/Makefile:
-        * tests/POA/RootPOA/Makefile:
-        * tests/Param_Test/Makefile:
-          Updated dependencies, apparently they were not properly
-          generated last time; they worked for Solaris/CC, but not in many
-          other platforms.
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/tmplinst.cpp:
-        * orbsvcs/orbsvcs/TAO_IDL_templates.cpp:
-          It seems that tmplinst.cpp is becoming our standard for template
-          instantiation files.
-
-        * tao/poa.h:
-          No need to include poa_T.h, it is not used in any place (yet),
-          and it produces many warnings on IRIX machines.
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-          Use a _var for the output sequence of RT_Infos.
-
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Fixed some misuses of _var, thanks to Chris Cleeland for
-          bringing those to my attention.
-
-        * release.pl:
-          Added CVS id.
-
-1998-01-27  Nagarajan Surendran  <naga@tango.cs.wustl.edu>
-
-        * tests/POA/FindPOA:Added comments to all files
-        * tests/POA/On_Demand_Activation: Added comments to all files
-        * tests/POA/Generic_Servant: Added comments to all files
-
-Mon Jan 26 21:29:24 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/compat/objbase.h: don't #define NOERROR on DIGITAL_UNIX,
-          or on any other platform that already has it #defined.
-          Thanks to Oliver Kellogg <Oliver.Kellogg@vs.dasa.de> for
-          reporting this.
-
-        * tao/corbacom.h: use ACE_INT32, etc., for defining Long, etc.
-
-Mon Jan 26 16:15:18 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/giop.cpp (read_buffer): Modified this to detect ECONNRESET
-        and report is as a normal EOF occurrence.  This will hopefully
-        eliminate a disturbing (but innocuous) message on NT.  Thanks to
-        Frank H. at SAIC for reporting this.
-
-        * tests/Param_Test/run_test: Added this script to run the server
-        and client with all arguments.
-
-Mon Jan 26 16:02:51 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-        * tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/MT_Cubit/cubit_i.h:
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server.h:
-          It compiles now, but it won't run.
-
-Mon Jan 26 15:29:37 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/ (main):
-        Added simple client/server to test AVStreams
-
-Mon Jan 26 15:23:54 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AVStreams_i.cpp:
-        Added dummy implementation for VDev, MMDevice, and StreamEndPoint
-        classes
-
-Mon Jan 26 15:01:49 1998  Alexander Babu Arulanthu  <alex@merengue.cs.wustl.edu>
-
-        * tests/POA/RootPOA.cpp: Added Comments
-
-Mon Jan 26 14:31:46 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tests/POA/FindPOA.cpp: Added CVS ID
-
-Mon Jan 26 00:57:56 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/connect.cpp (open): Conditionally compile the code for
-          TCP_NODELAY only if this macro is present.  Thanks to Edgar
-          Villanueva <edgarvil@ix.netcom.com> for reporting this.
-
-Sun Jan 25 14:30:04 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/client.dsp: Added a missing source.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (Cubit_Client): Changed to
-          initialize Cubit_Client.cubit_key_ from heap.  It should use
-          memory either from stack or heap, but never both.
-
-Sat Jan 24 21:55:55 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/{AVStreams_i.h, AVStreams_i.cpp}:
-          Made changes for new POA
-
-Sat Jan 24 21:46:23 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AVStreams.idl:
-        Changed type key to be a string, rather than a sequence<octet>, which
-        breaks tao_idl!
-
-Sat Jan 24 21:01:00 1998    <coryan@MILONGA>
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Fixed several minor error and sources of non-complaince.
-
-        * TAO_IDL/tao_idl.dsp:
-        * tao/TAO.dsp:
-          CVS does not merge binary files properly.
-
-Sat Jan 24 15:51:41 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/objtable.cpp:
-          Another merge problem.
-
-Sat Jan 24 11:20:42 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Added latest changes by Irfan.
-
-        Sat Jan 24 03:04:51 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa.cpp (id_to_reference): Reimplemented this method so that
-          it does not use id_to_servant and servant_to_reference combo.
-          This is necessary since id_to_reference may be used in a
-          MULTI_ID mode.
-
-        * tao/poaS: Added explicit copy and destroy to all collocated
-          policies.  This will help avoid the inheritance via dominance
-          warnings.
-
-Sat Jan 24 11:08:28 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_visitor.h:
-          The forward declaration of TAO_OutStream was missing; I guess it
-          was some slopiness in the merge.
-
-Sat Jan 24 10:30:40 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * The POA branch is merged back into the main trunk. For the
-          record we reproduce the ChangeLog in the branch.
-
-        * ============
-        * ============ Start of POA branch changes.
-        * ============
-
-        Fri Jan 23 17:13:14 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Merged changes from main_to_poa_merge_11 up to
-          main_to_poa_merge_12
-
-        Fri Jan 23 17:08:45 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Event_Channel.h:
-        * orbsvcs/Event_Service/Event_Channel.i:
-          Fixed problem with Event Channel, it was using _this
-          unproperly.
-
-        Fri Jan 23 16:49:19 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Param_Test/{server.cpp,param_test_i.h,param_test_i.cpp}:
-        Updated to compile with new POA.
-
-        * tests/Param_Test/Makefile: Moved LDFLAGS up, included the
-        rules.tao.GNU, and removed the dependencies which were causing me
-        no end of grief.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): Changed the check on
-        return value from resolve_initial_references() to use the
-        CORBA::is_nil() check.
-
-        Fri Jan 23 16:43:12 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/Event_Channel.i:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.h:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.h:
-          "Ported" the orbsvcs and the Event_Latency test to POA, with
-          little success though, things will compile and it seems that the
-          Naming_Service and Scheduling_Services run properly, but
-          Event_Service does not.
-          We use a nested POA with "PERSISTENT" lifespan policy because it
-          is easier to set an enviroment variable or command line to the
-          NameService IOR.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp:
-          Removed some extra (and unwanted) code.
-
-        Fri Jan 23 14:47:18 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/POA/{FindPOA,RootPOA,NewPOA}/Makefile: Added
-        -L$(TAO_ROOT)/tao to LDFLAGS.
-
-        * tests/POA/NewPOA/NewPOA.cpp:
-        * tests/POA/RootPOA/RootPOA.cpp:
-        * tests/POA/FindPOA/FindPOA.cpp:
-        Used the ::in() method as first argument to _narrow() calls.
-
-        * tests/{Makefile,README}: Updated for new tests.
-
-        * tao/poa.cpp: Added explicit template instantiations.
-
-        Fri Jan 23 14:30:19 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/poa.h:
-        * tao/poa.cpp:
-        * tao/servant_base.cpp:
-          _this() was using the object id for the current servant in *all*
-          objects, now it only does so for the servant invoked.
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h:
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.h:
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp:
-          Ported the Cubit test to POA, including some funky persistent
-          policies to simplify its use.
-
-        Sat Jan 24 01:24:24 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa.cpp (destroy_i): Changed etherealize objects to correct
-          report remaining_activations.
-
-        Fri Jan 23 10:55:40 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/objtable.cpp:
-          Linear object tables were not using the initial size to
-          pre-allocate a buffer.
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_state_argument.cpp:
-          Fixed the mapping for native as OUT or INOUT parameters, also
-          fixed the name for the _dispatch() method.
-
-        Fri Jan 23 01:12:28 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poaS.cpp: Added ACE_NESTED_CLASS macro to constructors.
-
-        Thu Jan 22 23:57:31 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poa.cpp (wstring_to_ObjectId): Stuck the CORBA::WChar type
-        in parens for sizeof...g++ likes it better that way.
-
-        Fri Jan 23 00:14:03 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/poa:
-
-          - Added support for transient and persistent POAs by changing
-            the ObjectKey.  From now on, each key will contain an
-            identifier that will indicate whether the key came from a
-            persistent or transient POA.  That way the dispatch method can
-            decide the value of the activate_it flag while finding the
-            POA.  If the key is from a persistent POA, the activate_it
-            flag will be true, else the flag will be set to false.
-
-          - All operations on the parent POA will check for a valid parent
-            before executing the call.  Remember that the RootPOA does not
-            have a parent POA.
-
-          - Temporarily added export macros to the POA implementation
-            classes, so that the implementations can directly be debugged
-            (rather than going through the stubs/skeletons).  These should
-            be removed once the debugging process is over.
-
-          - Moved the registeration of the POA with its manager from the
-            create_POA method to the POA constructor.  This is to insure
-            that the registration of the RootPOA is not "missed" since the
-            RootPOA is not created via the create_POA call.  Similarly,
-            moved the removal of the POA from its manager from the destroy
-            method to the POA destructor.
-
-          - TAO_POA::delete_child and TAO_POA_Manager::remove_poa were
-            changed such that when the object is closing down, we are
-            currently iterating over our poa collection and there is not
-            need to remove the item from our collection.
-
-          - Changed use of substr from starting_at/ending_at to
-            starting_at/now_many.
-
-          - Methods that return duplicated values/objects, must first be
-            assigned to a _var variable before being used.  This will
-            avoid memory leaks.
-
-          - For find methods, always use != -1 for success.
-
-          - Added code to create_POA_i and find_POA_i_optimized to check
-            when topmost_poa_name == this->name_.
-
-          - Added the concept of creation time to a POA.  This way when a
-            transient POA gets a object key from a previous incarnation,
-            the OBJECT_NOT_EXISTS exception can be thrown.
-
-          - Added a locator cookie field to TAO_POA_Current to keep track
-            of the cookie produced by the servant locator.
-
-          - Made all methods virtual.
-
-          - Renamed active_object_table to active_object_map.
-
-          - Added pre_invoke and post_invoke methods to setup the
-            necessary state before doing the upcall to the servant.
-
-          - Changed locate_servant to return 0 for success and -1 for
-            failure instead of trying to return a servant.  This change is
-            necessary since there may not be a servant available but there
-            may be default servants or servant managers that could fill in
-            for the servant.  Currently the locate_servant method takes an
-            optimistic approach to return TRUE when the servant was not
-            found but a default servant or servant manager was registered
-            with the POA, hoping the default servant or servant manager
-            will be able to fill in when the real request arrives.
-
-          - Add a validity checks for POA policies.
-
-          - Added support for servant managers (both servant locators and
-            servant activators), default servants and DSI.
-
-        * tao/poaC.h: Added DynamicImplementation class to the
-          PortableServer.
-
-        * tao/poaS: Changed dispatch to _dispatch.
-
-        * tao/servant_base:
-
-          - Added TAO_DynamicImplementation class
-            (a.k.a. PortableServer::DynamicImplementation).  Users will
-            inherit from this to implement DSI.
-
-          - Added prefix _ to all methods names in the ServantBase class
-            to avoid potential crashes with user specified method names.
-
-          - Made TAO_POA a friend of ServantBase.
-
-        * tao/connect.cpp (handle_locate): Changed to use latest version
-          of TAO_POA::locate_servant.
-
-        * tao/servant_base.cpp (_default_POA): Changed to use
-          TAO_ORB_Core_instance()->root_poa() instead of
-          TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA").
-
-        * tao/poaC: Added string_to_ObjectId and ObjectId_to_string
-          methods to PortableServer.
-
-        * tao/poa.cpp (TAO_Adapter_Activator::unknown_adapter): Changed
-          the implementation of this object so that it does not depend on
-          being friends with the POA and the POAManager.  Initially, this
-          was done to avoid recursive locks.  However, since user may want
-          to write their own implementations, recursive locks were deemed
-          necessary.
-
-        * tao/default_server.cpp (create_poa_lock): Changed implementation
-          to produce ACE_Recursive_Thread_Mutex instead of
-          ACE_Thread_Mutex.
-
-        * tests/POA/RootPOA/RootPOA.cpp (main) and
-          tests/POA/NewPOA/NewPOA.cpp (main): Added code to destroy the
-          rootPOA.  I am not sure this is the responsibility of the user
-          to destroy the rootPOA since they never really created it.  The
-          responsibility probably lies with the ORB, but since the spec
-          seems neutral about this, it is ok for now.
-
-        * tao/object.i (CORBA_Object::Release): We must delete the object
-          when the parent_ refcount goes to zero.
-
-        Thu Jan 22 16:56:32 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Fixed some relative name problems for the server header file.
-
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_args.cpp:
-          Get rid of some "unused arg" warnings.
-
-        Thu Jan 22 15:26:55 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/object.i: CORBA::Object --> CORBA_Object for internal stuff.
-
-        * tao/object.i (CORBA_Object): Re-ordered member initialization to
-        match declaration order.
-
-        Thu Jan 22 14:40:01 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/corbacom.h:
-          Fixed multiple definitions of ORB_var and ORB_out due to a
-          simplistic merge.
-
-        * TAO_IDL/be/be_interface.cpp:
-          Generate _find() to locate operations; using just find() is not
-          complaint.
-
-        Thu Jan 22 10:40:13 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Merged changes from main_to_poa_merge_10 up to
-          main_to_poa_merge_11
-
-        Wed Jan 21 17:35:20 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Generate CORBA_Object instead of CORBA::Object to keep NT
-          happy.
-
-        * TAO_IDL/be/be_visitor_args.cpp:
-          Fixed mapping for strings as arguments, they should always be
-          char*.
-
-        Mon Jan 19 22:03:38 1998    <coryan@MILONGA>
-
-        * tao/sequence_T.i:
-          Object_Manager constructor was calling _duplicate(). That is not
-          the right semantics, and produces a crash when working on an
-          unitialized buffer.
-
-        * tests/POA/NewPOA/NewPOA.cpp:
-        * tests/POA/NewPOA/NewPOA.dsp:
-          Fixed signed/unsigned warning.
-
-        * tests/POA/NewPOA/NewPOA.dsp:
-          Fixed missing options to find ACE.
-
-        Mon Jan 19 16:36:22 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/iiopobj.h:
-        * tao/iiopobj.cpp:
-          Added a missed in action key() method to IIOP_Object.
-
-        * tao/stub.h:
-        * tao/objkeyC.h:
-        * tao/object.h:
-        * tao/object.cpp:
-          Removed the non-complaint ObjectKey_ptr type.
-
-        Mon Jan 19 16:19:28 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/deep_free.cpp:
-          A reinterpret cast was dropping constness also, thanks to Irfan
-          for pointing this one out.
-
-        Mon Jan 19 15:36:10 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          The last merge was too smart, it kept some changes on this
-          branch that should have gone away.
-
-        Mon Jan 19 13:58:01 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-          Fixed operation table initialization, also called proper
-          constructor for CORBA::Object in collocated classes.
-
-        * tao/corba.h:
-          More include reordering.
-
-        * tao/servant_base.h:
-          The operation table was not properly initialized.
-
-        Mon Jan 19 11:28:47 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Merged changes from main_to_poa_merge_9 up to
-        main_to_poa_merge_10.
-
-        Sun Jan 18 01:04:22 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be_include/be_interface.h:
-        * tao/servant_base.h:
-          Added support for collocation in the _narrow method, this
-          required a complete implementation of _downcast() for each
-          skeleton.
-
-        Sat Jan 17 20:54:26 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-          More bug fixes in code generation for sequences, attributes,
-          etc. Most of them were minor inconsitencies. Also fixed
-          constructors for collocated classes on NT (working around MSVC++
-          bug).
-
-        * tao/servant_base.cpp:
-        * tao/servant_base.h:
-          Added default implementation for _downcast(), it just works if
-          downcasting to "Object".
-
-        * tao/sequence_T.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-          Fixed some problems with managed sequences.
-
-        Sat Jan 17 19:27:12 1998    <coryan@MILONGA>
-
-        * tao/servant_base.h:
-        * tao/servant_base.cpp:
-          Added the new _is_a() method on TAO_ServantBase.
-
-        * TAO_IDL/tao_idl.dsp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_visitor_args.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_visitor_args.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-          Added a new _is_a to the generated servants, also implemented
-          the _is_a method on the collocated classes by invoking that
-          _is_a().
-          Added support for attributes in collocated classes, thanks to
-          Irfan for noticing this.
-
-        Sat Jan 17 15:44:43 1998    <coryan@MILONGA>
-
-        * tao/corba.h:
-        * tao/iiopobj.cpp:
-          Fixed undetected inconsistencies in the last merge.
-
-        * tao/objkeyC.cpp:
-        * tao/objkeyC.h:
-        * tao/objkeyC.i:
-          I regenrated from the IDL file to use the new sequences.
-
-        Sat Jan 17 11:49:15 1998    <coryan@MILONGA>
-
-        * Merged changes from main_to_poa_merge_8 to main_to_poa_merge_9.
-
-        Sat Jan 17 00:45:59 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/POA: Added new tests: Explicit_Activation_POA_Ids and
-          NewPOA.
-
-        * tao/servant_base.h (TAO_ServantBase): Added a _downcast method
-          that gets the servant with the correct vtable.  Also added a new
-          class TAO_Local_ServantBase that overwrites _create_stub.
-          TAO_Local_ServantBase::_create_stub uses a fake key and does not
-          registration with the default POA.
-
-        * tao/poaS.*: Added _downcast to the generated code. Also added
-          attribute accessor methods.  Also updated constructors to
-          explicitly initialize the virtual base class (CORBA::Object).
-
-        * tao/poaC.h: Added TAO_Local_ServantBase to the PortableServer
-          namespace as PortableServer::LocalServantBase.
-
-        * tao/poaC.cpp (_narrow): Changed the implementation of _narrow to
-          produce a collocated class when appropriate.
-
-        * tao/poa.cpp (TAO_POA::create_*_policy): Made sure these methods
-          return collocated classes and not implementation classes.
-
-        * tao/poa.h (class TAO_POA_Policies): Added set methods to
-          TAO_POA_Policies.
-
-        * tao/orbobj.cpp (resolve_poa): Made sure that the RootPOA is
-          created with the PortableServer::IMPLICIT_ACTIVATION policy.
-
-        * tao/object: Added servant pointer and a collocated flag to
-          object class.
-
-        Fri Jan 16 03:27:30 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao:
-
-            BOA begone: CORBA::POA and all BOA related code has been
-            removed from TAO.
-
-            POA: Today the PortableServer and the POA were born in TAO.
-
-        * tao/connect (handle_request): Changed handle_request to accept
-          the TAO_GIOP_RequestHeader parameter by reference rather than by
-          value.
-
-        * tao/corba.h: Rearranged header to accommodate the new POA.
-
-        * tao/corbacom.h (CORBA): Added typedefs for Object_var Object_out
-          in the CORBA class.
-
-        * tao/current: Absorbed all the POACurrent code into the poa.*
-          files.
-
-        * tao/iiopobj.cpp (operator==): Added comparison operator for
-          TAO::ObjectKey.
-
-        * tao/orbobj.cpp (resolve_poa_current and resolve_poa): Made sure
-          that we return the colocated class and not the implementation
-          class.
-
-        * tao/orbobj.h (objref.): POA_init was deprecated.  Please use
-          orb->resolve_initial_references ("RootPOA") instead.
-
-        * tao/objtable.cpp (find): Change the use of auto_ptr(s) to deal
-          correctly with explicit constructors.
-
-        Thu Jan 15 17:27:26 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orb_core.{h,i}: Added the poa_current() method and internal
-        structure so that state is available to the POA and to the upcall.
-
-        * tao/orbobj.{h,cpp}: Added resolve_poa_current() in order to
-        return the POACurrent state context.  Added the "POACurrent" to
-        one of the things for which resolve_initial_references() works.
-        Changed resolve_poa() so that things can compile; the impl isn't
-        correct but when the POA stuff gets committed, this will be
-        changed accordingly.
-
-        Tue Jan 13 12:15:54 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_operation.h:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_state_operation.cpp:
-          The stubs and skeletons for operations that have a "native"
-          argument or return value simply "throw" a CORBA::MARSHAL
-          exception; those methods cannot be called for remote objects.
-          I also had to return something when an exception is raised and
-          the return type is a "native", we choose to return 0 for lack of
-          a better choice.
-
-        Tue Jan 13 10:49:48 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/current.{i,cpp}: Added a first cut at implementations for
-        the POA Current impl.
-
-        Mon Jan 12 19:47:42 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/poa.h:
-        * tao/poa.cpp:
-          Added a _get_stub() method that encapsulates code common to all
-          _this implementations.
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          The _this() method implementation was changed to use the new
-          _get_stub finally adding full support for the standard poa, some
-          changes were required in the _tao_collocated classes and their
-          constructors.
-
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be/be_helper.cpp:
-          Added "manipulators" to increase and decrement indentation
-          level.
-
-        Mon Jan 12 14:55:53 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/current.h (class TAO_POA_Current_Impl): Added this as the
-        beginning of the implementation for the POA Current.  More to
-        come...
-
-        * tao/default_server.*: Added implementations of create_poa_lock()
-        and create_poa_mgr_lock() to obtain their values from -ORBpoalock
-        and -ORBpoamgrlock options, respectively, to the Default Server
-        Strategy Factory specified in svc.conf.  Values for these are
-        either "thread" or "null", which specify an ACE_Thread_Mutex or
-        ACE_NULL_Mutex, respectively.
-
-        * tao/server_factory.*: Added create_poa_lock() and
-        create_poa_mgr_lock() to obtain locks for use in POA and POA
-        Manager instances.
-
-        Mon Jan 12 12:10:58 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/objtable.cpp:
-          Fixed some problems with misused auto_ptr and dynamic cast that
-          was taking away constness at the same time.
-
-        Mon Jan 12 11:55:53 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_poa): Added skeletal code to create root
-        POAs using the resolve_initial_references() interface.  Irfan will
-        fill in the correct code for actually creating the POA.
-
-        Sun Jan 11 14:09:48 1998    <coryan@MILONGA>
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsp:
-        * orbsvcs/Event_Service/CORBA_Utils_T.cpp:
-        * orbsvcs/Event_Service/Dispatching_Modules.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Adapted so they compile with the new POA mapping.
-
-        Sun Jan 11 11:33:36 1998    <coryan@MILONGA>
-
-        * tao/connect.cpp:
-          On this branch the find() method for POA's require a
-          PortableServer::Servant parameter.
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-          Modified to use the new POA mapping for servers.
-
-        * TAO_IDL/tao_idl.dsp:
-          Replaced the old drv_main.cpp with tao_idl.cpp.
-
-        * orbsvcs/orbsvcs/orbsvcs_lib.dsp:
-          The final library is not generated inside Debug and its name is
-          orbsvcs.lib, not orbsvcs_lib.lib
-
-        Sun Jan 11 10:55:04 CST 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Merged changes from tag main_to_poa_merge_5 and
-          main_to_poa_merge_6. This late merge is risky, needs complete
-          validation before public release.
-
-        Sat Jan 10 22:11:47 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Work around bug in MSVC++ 5.0 wrt inheritance from nested
-          classes and the constructor invocation.
-
-        Sat Jan 10 19:21:18 1998    <coryan@MILONGA>
-
-        * TAO_IDL/tao_idl.dsp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be_include/be_interface.h:
-        * tao/orb_core.cpp:
-          Fixed some problems in the latest merges.
-
-        Sat Jan 10 18:06:24 1998    <coryan@MILONGA>
-
-        * Merged changes from tag main_to_poa_merge_7 and
-          main_to_poa_merge_8.
-          Resolved many conflicts in TAO_IDL due to similar changes in
-          both branches.
-
-        Sat Jan 10 16:57:42 1998    <coryan@MILONGA>
-
-        * Merged changes from tag main_to_poa_merge_6 and
-          main_to_poa_merge_7.
-
-        Fri Jan  9 17:58:43 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_enum_val.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_expression.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-          Minor cosmetic changes to make the main trunk changes identic to
-          the ones on this branch.
-
-        Thu Jan  8 15:50:59 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_state_operation.cpp:
-          Added support for native as return type.
-
-        Thu Jan  8 13:20:11 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/ast/Makefile:
-        * TAO_IDL/be/Makefile:
-          Added ast_native and be_native to the list of files.
-
-        * TAO_IDL/be_include/be_native.h:
-        * TAO_IDL/be/be_native.cpp:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be/be_visitor.cpp:
-          Added support for visiting be_native.
-
-        * TAO_IDL/be_include/be_visitor_args.h:
-        * TAO_IDL/be/be_visitor_args.cpp:
-          Added support for native and improved the implementation.
-
-        * TAO_IDL/fe/y.tab.cpp:
-          Removed some includes and pragmas that cause trouble on NT.
-
-        * TAO_IDL/be/be_type.cpp:
-          Print an error if the default implementation for write_as_return
-          is called.
-
-        Thu Jan  8 12:53:28 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/corbacom.i (wstring_dup): Added this, which simply calls
-        wstring_copy().  Of course, I can't find any mention of EITHER of
-        these functions in the 2.0 or 2.1 spec, but what good are wstrings
-        if you can't make copies?  Plus, Irfan really wanted it.
-
-        Wed Jan  7 15:09:47 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/fe/y.tab.cpp:
-          This is the actual file generated from idl.yy, thanks to the
-          "clone" scheme for building ACE it was lost in the previous
-          commits.
-
-        Wed Jan  7 14:17:14 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.{h,cpp} (key_to_object): Changed signature so that
-        it's more in line with what we really need.  This is okay because
-        this method is not in the standard, so we can choose whatever we
-        damn well please!
-
-        Wed Jan  7 14:08:41 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Merged changes from version main_to_poa_merge_4 and
-          main_to_poa_merge_5.
-
-        Tue Jan  6 17:35:44 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Added several fixes for mutiple inheritance, but still needs
-          some work.
-
-        Tue Jan  6 15:20:13 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/object.h:
-        * tao/object.cpp:
-          Removed obsolete methods, they were there to support upcalls on
-          the server side, but now this is done on
-          PortableServer::ServantBase.
-
-        Tue Jan  6 14:46:27 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/poa.h:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Added a _get_servant () method to the collocated classes, to
-          obtain access to the underlying skeleton.
-
-        Tue Jan  6 13:31:20 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/objtable.h:
-        * tao/objtable.cpp:
-          Fixed some problems with the PortableServer::ObjectId and
-          PortableServer::Servant changes.
-
-        * tao/poa.h:
-        * TAO_IDL/be/be_interface.cpp:
-          Added a method to get the interface repository name for a
-          skeleton.
-
-        * tao/encode.cpp:
-          Fixed problem on object reference enconding.
-
-        Mon Jan 05 23:41:59 1998    <coryan@MILONGA>
-
-        * tao/objkeyC.cpp:
-          The code for memory reallocation was missing, I added it back.
-
-        * tao/iiopobj.cpp:
-          Fixed bug in object key generation.
-
-        * tao/poa.cpp:
-          More debug messages when an object is missing.
-
-        Mon Jan 05 17:46:00 1998    <coryan@MILONGA>
-
-        * tao/connect.cpp:
-        * tao/corba.h:
-        * tao/corbacom.h:
-        * tao/default_server.cpp:
-        * tao/default_server.h:
-        * tao/iiopobj.cpp:
-        * tao/iiopobj.i:
-        * tao/iioporb.cpp:
-        * tao/orbobj.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/poa.cpp:
-        * tao/poa.h:
-        * tao/server_factory.cpp:
-        * tao/server_factory.h:
-          The ObjectId changes were "accepted for revision" by the POA
-          committe, hence I'll commit them, they check them and then I'll
-          have to make the changes they require ;-)
-          The current scheme uses TAO::ObjectKey as a representation for
-          sequence<octet>, this class is generated by the IDL compiler.
-          The ORB core uses a typedef (TAO_opaque) for all its internal
-          object keys; the current (and deprecated) POA uses ObjectId
-          (another typedef on the same thing) as object identifiers.
-
-        Mon Jan  5 13:06:19 1998  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * Merged changes from revision main_to_poa_merge_3 up to revision
-          main_to_poa_merge_4.
-
-        Mon Jan 05 00:11:45 1998    <coryan@MILONGA>
-
-        * tao/objtable.h:
-        * tao/objtable.cpp:
-          New Object Table interface, in preparation for the POA needs.
-
-        Sat Jan 03 11:37:21 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_visitor_args.cpp:
-          Typedefs and predefined types where unproperly handled.
-
-        Fri Jan  2 14:09:49 1998  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-          Sequences work on Solaris, even Purify gives its "Houston it's a
-          go", so I'm reinstating them.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp:
-          Minor cosmetic changes.
-
-        Fri Jan 02 08:31:32 1998    <coryan@MILONGA>
-
-        * Merged changes from revision main_to_poa_merge_2 up to revision
-          main_to_poa_merge_3.
-          Had to disable sequence test from IDL_Cubit.
-
-        Thu Jan 01 15:43:43 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-          Generated code for collocations setup the "parent_" field
-          properly.
-
-        * tao/objkeyC.h:
-        * tao/corbacom.h:
-          Added export macros.
-
-        * tao/objtable.cpp:
-        * tao/objtable.h:
-        * tao/poa.cpp:
-        * tao/poa.h:
-          Object table is based on servants now.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/server.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp:
-          Fixed to use the new POA mapping.
-
-        * TAO_IDL/tao_idl.dsp:
-        * tao/TAO.dsp:
-          Added the new files to the MSVC++ project.
-
-        Tue Dec 30 16:38:42 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * More advances in code generation, it compiles and links now, but
-          won't run.
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_args.cpp:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be_include/be_exception.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be_include/be_sequence.h:
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be_include/be_union.h:
-          Added methods to be_type to generate the return types; this
-          time without any switches, just visitors and virtual
-          dispatching.
-
-        * tao/poa.cpp:
-        * tao/poa.h:
-          Added the methods to lookup operations, this are TAO specific
-          and should have complaint names, but currently I just kept the
-          old names to avoid a major breakdown.
-
-        * TAO_IDL/ast/Makefile:
-        * TAO_IDL/be/Makefile:
-        * TAO_IDL/driver/Makefile:
-        * TAO_IDL/fe/Makefile:
-        * TAO_IDL/narrow/Makefile:
-        * TAO_IDL/util/Makefile:
-          Updated dependencies.
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be/be_interface.cpp:
-          Reverted some changes (code moved from be_interface.cpp into
-          visitors) to avoid massive conflicts with Andy's changes.
-
-        Tue Dec 30 11:07:06 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orb_core.h (TAO_Resource_Factory): Corrected my "fat-finger"
-        mistake for the return type of get_allocator ().
-
-        Mon Dec 29 16:26:24 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/orb_core.{h,cpp}: Added methods for the orb core allocator
-        to the resource factory.
-
-        Mon Dec 29 13:18:49 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/Makefile:
-        * TAO_IDL/be/be_visitor.cpp:
-        * TAO_IDL/be/be_visitor_args.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_visitor_args.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-          Started implementation of the collocated class code generation,
-          using the visitor pattern; hence the new be_visitor class and
-          some examples of its use.
-
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-          Added method to obtain the node type for the most "unaliased"
-          type though a typedef chain. This is needed in several points
-          for code generation.
-
-        * TAO_IDL/be/be_interface.cpp:
-          Implemented the collocated class generation using visitors,
-          ditto for (part of) the main class.
-
-        * TAO_IDL/util/utl_identifier.cpp:
-          Fixed memory deallocation problem. The string was copied using
-          ACE_OS::strdup(), but deleted using operator delete[].
-
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_enum_val.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_expression.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_union_label.cpp:
-        * TAO_IDL/be_include/be.h:
-        * TAO_IDL/be_include/be_argument.h:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_attribute.h:
-        * TAO_IDL/be_include/be_constant.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be_include/be_enum_val.h:
-        * TAO_IDL/be_include/be_exception.h:
-        * TAO_IDL/be_include/be_expression.h:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_module.h:
-        * TAO_IDL/be_include/be_operation.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/be_include/be_scope.h:
-        * TAO_IDL/be_include/be_sequence.h:
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_union_branch.h:
-        * TAO_IDL/be_include/be_union_label.h:
-          Added the accept() method for the vistor pattern
-          implementation.
-
-        Mon Dec 29 11:37:47 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/server/Makefile: Updated dependencies.
-
-        Fri Dec 26 12:05:41 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Correctly modified the
-        make_cubit() method to properly access the underlying object key.
-
-        * tao/objkeyC.cpp: Added this crucial file that I somehow missed
-        adding in the last round of changes.
-
-        Wed Dec 24 15:50:38 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed non-standard
-        reliance on underlying object key implementation.  It relied on
-        the buffer being publicly-accessible, which is wrong.  However,
-        I'm not sure that my interim fix is very "right" since it takes
-        the address of operator[](0) to get to the underlying entire
-        buffer.
-
-        * tests/Cubit/TAO/{IDL_Cubit,MT_Cubit/{server,client}}/Makefile:
-        Updated to use rules.tao.GNU.
-
-        * tests/Thruput_test/Makefile: Updated to use rules.tao.GNU.
-
-        * tao/orb.h: Removed unnecessary inclusions of object.h and
-        corbacom.h from this file.
-
-        * tao/objkeyC.{h,cpp}: Moved the inclusion of corba.h from the
-        header to the implementation because of strange requirements of
-        the orb core.  This means that this file CANNOT be used as
-        generated by the IDL compiler.
-
-        * tao/{orbobj,stub,object,iiopobj}.cpp: Updated to use the proper
-        TAO::ObjectKey_ptr type.
-
-        * tao/Makefile: Updated this after the recent merge that
-        accidentally overrote some changes I'd made.
-
-        * taoconfig.mk: Moved the implicit rule into rules.tao.GNU.
-
-        * rules.tao.GNU: Added this file where rules specific to TAO can
-        be collected.  Right now it just contains an implicit rule for
-        executing the IDL compiler on .idl files.
-
-        Tue Dec 23 12:00:38 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * TAO-INSTALL.html:
-        * VERSION:
-        * Benchmark/benchmark/Makefile:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_state.cpp:
-        * TAO_IDL/be/be_state_argument.cpp:
-        * TAO_IDL/be/be_state_exception.cpp:
-        * TAO_IDL/be/be_state_operation.cpp:
-        * TAO_IDL/be/be_state_sequence.cpp:
-        * TAO_IDL/be/be_state_structure.cpp:
-        * TAO_IDL/be/be_state_typedef.cpp:
-        * TAO_IDL/be/be_state_union.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_scope.h:
-        * TAO_IDL/be_include/be_sequence.h:
-        * TAO_IDL/be_include/be_state.h:
-        * TAO_IDL/narrow/narrow.cpp:
-        * docs/Options.html:
-        * docs/components.html:
-        * docs/configurations.html:
-        * docs/index.html:
-        * docs/orbsvcs.html:
-        * docs/releasenotes/index.html:
-        * orbsvcs/README:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-        * orbsvcs/Dump_Schedule/Makefile:
-        * orbsvcs/Event_Service/Dispatching_Modules.cpp:
-        * orbsvcs/Event_Service/Dispatching_Modules.i:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/Event_Channel.i:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/Event_Service/RT_Task.cpp:
-        * orbsvcs/Event_Service/ReactorTask.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-        * orbsvcs/Naming_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.h:
-        * orbsvcs/Scheduling_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/RtecEventChannelAdmin.idl:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
-        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/tests/Event_Latency/Makefile:
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Logger/clnt.cpp:
-        * orbsvcs/tests/Simple_Naming/Makefile:
-        * tao/Makefile:
-        * tao/Timeprobe.cpp:
-        * tao/corba.h:
-        * tao/corbacom.cpp:
-        * tao/deep_free.cpp:
-        * tao/encode.cpp:
-        * tao/except.cpp:
-        * tao/except.h:
-        * tao/giop.cpp:
-        * tao/invoke.cpp:
-        * tao/managed_types.cpp:
-        * tao/managed_types.h:
-        * tao/managed_types.i:
-        * tao/object.i:
-        * tao/orb_core.cpp:
-        * tao/request.cpp:
-        * tao/tao_internals.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h:
-        * tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/client/Task_Client.h:
-        * tests/Cubit/TAO/MT_Cubit/client/client.cpp:
-        * tests/Cubit/TAO/MT_Cubit/client/cubit.idl:
-        * tests/Cubit/TAO/MT_Cubit/server/cubit.h:
-        * tests/Cubit/TAO/MT_Cubit/server/cubit.idl:
-        * tests/Cubit/TAO/MT_Cubit/server/cubit_i.cpp:
-        * tests/Cubit/TAO/MT_Cubit/server/cubit_i.h:
-        * tests/Cubit/TAO/MT_Cubit/server/method_db.i:
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp:
-          Merged in the changes between revisions main_to_poa_merge_1 and
-          main_to_poa_merge_2.
-          The only conflicts were:
-          + ChangeLog:
-          removed all the main truck comments and added the one you are
-          reading just now.
-          + tests/Cubit/TAO/MT_Cubit/client/Makefile:
-          + tests/Cubit/TAO/MT_Cubit/client/Makefile:
-          Left the branch revision, it included the dependencies and had
-          correct syntax.
-          + tao/poa.cpp:
-          CORBA_POA::handle_request was removed on the
-          branch but modified on the main revision; keep it removed.
-
-        Wed Dec 17 02:11:11 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poa.h:
-        * tao/poa.cpp:
-        * tao/orbobj.h:
-        * tao/orbobj.cpp:
-        * tao/objkeyC.i:
-        * tao/objkeyC.h:
-        * tao/object.h:
-        * tao/iiopobj.h:
-        * tao/iiopobj.cpp:
-        * tao/decode.cpp:
-        * tao/corbacom.h:
-        * tao/corba.h:
-        * tao/any.cpp:
-        All affected by changes to support interfaces required by the new
-        POA, specifically CORBA::Object::key() and
-        CORBA::ORB::key_to_object().  It does not compile now, and seems
-        as if it's simply an ordering problem of header files.
-
-        Mon Dec 15 19:39:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO_IDL/be/Makefile:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_state.cpp:
-        * TAO_IDL/be/be_state_attribute.cpp:
-        * TAO_IDL/be/be_state_exception.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be_include/be_state.h:
-        * docs/releasenotes/orbcore.html:
-        * docs/releasenotes/index.html:
-        * orbsvcs/Naming_Service.cpp:
-        * tao/iiopobj.h:
-        * tao/except.h:
-        * tao/except.cpp: Merged in changes from the main trunk.
-
-        * tests/Thruput_test/Makefile: Updated to use taoconfig.mk.
-
-        Sat Dec 13 22:06:25 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poa.* (get_key): Removed this method, since it's
-        unnecessary.
-
-        * tao/objkey.idl: Added this file, which is the idl for an object
-        key.
-
-        * tao/iiopobj.*: Added some '@@' comments for Irfan.
-
-        * tao/Makefile: Reworked this monstrositry a bit.
-
-        Fri Dec 12 12:09:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Changed to use
-        CORBA::Object::key() rather than _get_name().
-
-        * tests/Cubit/TAO/{DII_Cubit,IDL_Cubit,MT_Cubit}/Makefile: Updated
-        to use taoconfig.mk.
-
-        * tao/orb_core.i: Removed stray printf.
-
-        * taoconfig.mk: Added this file which contains common
-        configuration stuff for applications.
-
-        Thu Dec 11 21:28:09 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/poa.{h,cpp}: Moved handle_request to
-        TAO_Server_Connection_Handler and moved create to
-        CORBA::ORB::key_to_object.
-
-        * tao/orbobj.{h,cpp}: Added key_to_object as a method to create an
-        object reference from an object key and type id.  This code
-        actually used to live in POA::create.
-
-        * tao/object.h: Brief documentation twiddling, and renamed
-        get_subclass to get_most_derived, which is hopefully more
-        explicative.
-
-        * tao/{object,iiopobj,stub}.{h,cpp}: Renamed _get_name to 'key'
-        and have it return a TAO_ObjectKey_ptr rather than a const char*.
-
-        * tao/corbacom.h: Added typedef for TAO_ObjectKey, which
-        represents an object key in GIOP.
-
-        * tao/connect.{h,cpp}: Moved handle_request from the POA into
-        here, thereby helping confine IIOP-ness to the ORB Core and
-        keeping the POA pristine.
-
-        Thu Dec 11 22:18:52 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: Moved the code generation for the
-        _var and _out classes before the actual class declaration, but
-        after the forward declaration. This was necessary if any elements
-        in the scope of the interface are defined to be of the same type
-        as that interface. In such a situation those elements are defined
-        to be of the _var type. Hence the declaration for _var and _out
-        must precede the class declaration.
-
-        Thu Dec 11 22:00:52 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (main): Fixed a bug
-        related to returning an empty string as the ior in the reply from
-        the multicast request.
-
-        Thu Dec 11 14:06:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_exception,be_state_exception}.cpp: Support for
-        exceptions added. Added a new file called
-        "be_state_exception.cpp".
-
-        * TAO_IDL/be_include/be_state.h: Added a new singleton for
-        be_state_exception.
-
-        * TAO_IDL/be/be_state.cpp: Template instantiations for
-        be_state_exception.
-
-        * TAO/docs/releasenotes/index.html: Updated to include exception
-        support.
-
-        * TAO/tao/except.{h,cpp}: Moved the TypeCode member from the
-        private section to the protected section so that derived classes
-        can set it. Also, changed the variable from _type to type_ to
-        stick to the ACE design standards.
-
-        * ============
-        * ============ End of POA branch changes.
-        * ============
-
-Fri Jan 23 10:29:17 1998  David L. Levine  <@cs.wustl.edu>
-
-        * tao/deep_free.cpp (TAO_Marshal_Sequence::deep_free): added
-          ACE_UNUSED_ARGs of dest and env.
-
-        * TAO_IDL/fe/{Makefile,y.tab.cpp,y.tab.cpp.diff}: added patch to
-          fix up y.tab.cpp to compile cleanly with g++.
-
-        * TAO_IDL/fe/{Makefile,lex.yy,cpp,lex.yy.cpp.diff}: added patch to
-          fix up lex.yy.cpp to compile cleanly with g++.
-
-Thu Jan 22 18:18:07 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/GPlot_File.{h,cpp}: Shuffled template
-          instantiations and typedef's for ACE_Map_Manager around to
-          eliminate compilation errors from g++.
-
-Thu Jan 22 16:32:56 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/nvlist.cpp (is_nil): Fixed some return lines that were
-        probably returning the wrong value by not enclosing a comparison
-        in parens.  Fortunately we weren't really checking the return
-        value on these, I suspect ;-) Thanks to Frederic Andres
-        <andres@rd.nacsis.ac.jp> for turning this in.
-
-Thu Jan 22 16:16:32 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosPropertyService_i.cpp, CosPropertyService_i.h, AVStreams_i.cpp, AVStreams_i.h:
-        Added empty implementation files for AVStreams and propertyservice implementations
-
-        * orbsvcs/orbsvcs/Makefile:
-        Fixed the Makefile so that it will compile the AV related stuff
-        only when run as `make av=1`.
-
-Thu Jan 22 14:22:46 1998  Nanbor Wang  <nanbor@lindy.cs.wustl.edu>
-
-        * orbsvcs_lib.dsp: Changed to use multithreaded libraries.
-
-Thu Jan 22 14:20:13 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Param_Test/{server,client}.dsp:  The project files
-          somehow got messed up.
-
-        * orbsvcs/orbsvcs_lib.dsp: Changed to use multithreaded
-          libraries.
-
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsp:  Removed
-          unnecessary link-time libraries.
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsp:  Changed to use
-          multithreaded libraries.
-
-Wed Jan 21 20:49:51 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.0.54, released Wed Jan 21 20:49:51 1998.
-
-Wed Jan 21 19:38:02 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/encode.cpp, decode.cpp: Fixed alignment problem. Done only
-        in Marshal_Struct for the time being. Details of this fix will be
-        inserted later.
-
-Wed Jan 21 16:27:58 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * Makefile: Updated this to use the new release.pl file below.
-
-        * release.pl: Added new script to take over some of the release
-        work rather than having it all inline in the Makefile.
-
-        * tests/Cubit/TAO/MT_Cubit/README: Changed docs to reflect the new
-        names and command line requirements.
-
-Wed Jan 21 15:38:52 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Makefile:
-          Removed GPlot_File from the list, it does not compile on
-          Solaris/g++, but it is not needed.
-
-Wed Jan 21 11:48:19 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/encode.cpp: Updated the ObjRef::encode routine to encode NUL
-        object references
-
-        * tests/Param_Test: Further improvements.
-
-        * TAO_IDL/be/{be_state_attribute, be_attribute}.cpp: Solved the
-        problem of return types. The stubs explicitly allocate the top
-        level storage. A similar fix was made for "operations" mentioned
-        in a previous ChangeLof entry.
-
-Wed Jan 21 12:23:29 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-          Fixed typo in object list for server and client.
-
-Wed Jan 21 11:25:36 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/tmplinst.cpp:
-          Removed extra ';' in instantiation pragma.
-
-Wed Jan 21 11:13:56 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/Makefile:
-        * tests/Cubit/TAO/MT_Cubit/tmplinst.cpp:
-        * tao/giop.cpp:
-          Added missing template instantiations.
-
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-          No need to return const reference to pointer, a simple return
-          by value (of the pointer) is OK.
-
-Wed Jan 21 10:38:22 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Added template instantiation
-        for Env_Value<unsigned short>.
-
-        * tests/{Thruput/TAO,Param_Test,Cubit/TAO/IDL_Cubit}/Makefile:
-        Added the appropriate tmplinst.* so that it gets built/linked.
-
-        * tests/{Thruput/TAO,Param_Test,Cubit/TAO/IDL_Cubit}/tmplinst.cpp:
-        Added this file, which contains explicit template instantiations
-        for code generated by the IDL compiler.  Ideally, this file (or
-        something like it) would be generated by the compiler, but we're
-        just not there yet.  So, since it's not TOO much work, we do this.
-
-Wed Jan 21 09:40:27 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence.cpp:
-        * tao/sequence_T.cpp:
-          Fixed allocation problem for operator= in sequences, the new
-          buffer should have size "rhs.maximum_", not "this->maximum_"
-
-Wed Jan 21 04:43:57 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/corbacom.h: Added Object_var and ORB_var to the CORBA class
-        (i.e., to the namespace)
-
-        * tao/sequence.cpp: Operator= for string sequence still had bugs
-        where we were not allocating a larger buffer of the assigned
-        quantity was larger than us. Similar bugs *might* be present in
-        other sequence classes and I have not tested them yet.
-
-Wed Jan 21 01:34:07 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/{server,client}.cpp: Ifdef'ed out
-          ACE_THR_PRIO_FIFO_DEF if it's not defined.
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp: We should use
-          "ace/streams.h" to include iostream definition instead of using
-          <iostream.h> directly.  It is not compatible with the new
-          standard CPP libraries.
-
-        * orbsvcs/Event_Service/Event_Service.dsp:
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsp: It used the
-          wrong libraries.
-
-Tue Jan 20 22:59:42 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/sequence_T.cpp: Fixed more typos where it was referring to
-        the argument as 'seq' rather than the real name 'rhs'.
-
-Tue Jan 20 22:38:10 1998    <coryan@MILONGA>
-
-        * tests/Param_Test/tests.cpp:
-          No need to call CORBA::string_free() on opname_, since it is a
-          String_var
-
-        * tao/sequence_T.cpp:
-          Fixed typo in object sequences.
-
-Tue Jan 20 21:53:52 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/TAO_IDL_templates.cpp:
-          Added missing template instantiations, they go into their own
-          file because I could not think of a "natural" place to put them.
-
-Tue Jan 20 20:25:41 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence.h:
-        * tao/sequence.i:
-        * tao/sequence.cpp:
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          Another round of changes, this time fixing several bugs reported
-          by Andy and Irfan.
-
-Tue Jan 20 20:23:57 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/nvlist.h:
-        * tao/nvlist.i:
-          Fixed warnings for IRIX and follow the spec, use const methods
-          but return non-const types!
-
-Tue Jan 20 17:00:15 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/strategy_T.h: Added this file to contain template strategies
-        such as TAO_Reactive_Strategy<>.
-
-        * tao/default_server.*: Moved TAO_Reactive_Strategy<> into its own
-        set of files.  Thanks to Bryan Mendel <brian.r.mendel@boeing.com>
-        for suggesting this fix!
-
-        * tao/sequence_T.cpp (operator =): Corrected a problem where T**
-        was being assigned to T*.
-
-        * tao/orb_core.cpp (init): Moved setting of stuff in orb_params()
-        to be post-service initialization.  It needs to be this way
-        because the ORB Parameters are now regulated by the resource
-        factory settings, and that gets created during service
-        initialization.
-
-        * tao/giop.cpp: Changed the TAO_GIOP_LocateRequestHeader::init to
-        be more efficient and not generate warnings on Irix.
-
-        * tao/{giop,connect}.cpp: Update code that touches ORB-internal
-        sequences to use the API of TAO_Unbounded_Sequence<> rather than
-        the old crufty code.
-
-        * tao/giop.h: Change ORB-internal sequences (such as the
-        ServiceContextList) to use the new TAO_Unbounded_Sequence<>
-        template rather than the deprecated CORBA_SEQUENCE<> hack.
-
-Tue Jan 20 09:18:31 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/interp.cpp: Used TAO_opaque to set the size of any
-        generic sequence.
-
-        * TAO_IDL/be/{be_operation,be_state_operation}.cpp: For return
-        value of sequences, the stub now allocates the top level storage
-        for the sequence class.
-
-Tue Jan 20 05:34:16 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/sequence.cpp: In the assignment operator for Unbounded
-        string sequences, we had forgotten to update the max and length
-        fields to that of the assigned sequence in the event of it being
-        larger than ourselves. We had also forgottent o set our release
-        flag to true as well as free the old buffer (if already our
-        release flag was true). I have not checked if there are similar
-        bugs in other "=" operators or not. But these will be evident as
-        more tests are added to the Param_Test example.
-
-Mon Jan 19 23:35:45 1998    <coryan@MILONGA>
-
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          Finished suit of parametric classes for sequences, including
-          bounded sequences of objects and strings.
-          Fixed some more bugs in the Manager classes for sequences of
-          objects.
-
-Mon Jan 19 17:33:45 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/clnt.cpp (init): Changed the marker
-        name for the naming service to "NameService" and fixed a bunch of
-        places in init() where "1" was being returned instead of "-1".
-
-        * tests/Cubit/TAO/IDL_Cubit/README: Fixed portion that talks about
-        the IOR to use the correct default IOR.  Thanks to J Russell
-        Noseworthy <j.russell.noseworthy@objectsciences.com> for catching
-        this and submitting fixes!
-
-Mon Jan 19 15:41:53 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp (create_servants): Added a
-          final return statement to avoid warnings.
-          (ACE_THR_PRI_FIFO_DEF): This macro is not defined on NT.  I
-          ifdef'ed the priority setting statement out temporarily until we
-          figure out a way to map NT's thread priority values to pthread's
-          priority values.
-
-        * tests/Cubit/TAO/MT_Cubit/server.dsp: Updated project file.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (Cubit_Client): Changed the
-          data type of <defport> to CORBA::UShort.
-
-        * tests/Param_Test/options.{h,cpp} (portnum): Changed it to type
-          CORBA::UShort.
-
-        * tests/Param_Test/helper.cpp (gen_fixed_struct): Added
-          parenthesis to avoid warnings.
-
-        * tao/sequence.h (TAO_Unbounded_String_Sequence): Added TAO_Export
-          to class TAO_Unbounded_String_Sequence.
-
-Mon Jan 19 11:24:43 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/sequence_T.i:
-          g++ does not like nested types in templates.
-
-        * docs/releasenotes/index.html:
-          Updated docs on services.
-
-Sun Jan 18 21:33:21 1998    <coryan@MILONGA>
-
-        * tao/sequence.h:
-        * tao/sequence.i:
-        * tao/sequence.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          Added new class for sequences of strings, the approach based on
-          templates was not worth it.
-          Also fixed a number of bugs in the unbounded object sequences.
-          The following items are in the TODO list:
-          + Bounded sequences of objects
-          + Bounded sequences of strings.
-
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be/be_helper.cpp:
-          Addded small manipulators to indent and unindent an output
-          stream.
-
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-          Synch up with new classes for string and objects.
-
-        * tests/Param_Test/tests.cpp:
-          Fixed some problems with the test for sequences of variable
-          sized structures.
-
-        * orbsvcs/Event_Service/CORBA_Utils_T.cpp:
-          Fixed unsigned/signed comparison.
-
-Sun Jan 18 18:30:16 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO/tests/Cubit/TAO/MT_Cubit/*.{dsp.MAK}:
-        * TAO/tests/Param_Test/*.{dsp,MAK}:  Played with exported
-          makefiles some more.  It's ultimately funny that when a project
-          file has some customed build commands in it, the exported
-          makefile sometime won't work correctly.
-
-Sat Jan 17 23:41:33 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * Added more MSVC makefiles in some test directories.
-
-        * tests/Param_Test/{client,server}.dsp: Correct idl generated
-          files' dependency.
-
-Sat Jan 17 22:40:29 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/orbobj.{h,i}: Added _var and _out for CORBA_ORB
-
-Sat Jan 17 21:28:05 1998    <coryan@MILONGA>
-
-        * tao/corba.h:
-        * tao/corbacom.h:
-          Moved the definition of TAO_opaque from corbacom.h to corba.h so
-          it appears after the "sequence.h" file.
-
-        * tao/sequence.h:
-        * tao/sequence.cpp:
-          Reorder includes to avoid "inline called before declared so"
-          warning in g++.
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp:
-          The OA uses TAO_opaque instead of CORBA::OctetSeq.
-
-Sat Jan 17 16:07:51 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_args.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be_include/be_visitor_args.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-          New visitors to generate collocated classes (only used on the
-          POA branch) and the arguments declaration.
-
-Fri Jan 16 23:38:38 1998    <coryan@MILONGA>
-
-        * tao/decode.cpp:
-        * tao/deep_free.cpp:
-        * tao/giop.h:
-        * tao/iiopobj.cpp:
-        * tao/sequence.h:
-        * tao/sequence_T.h:
-        * tao/sequence_T.cpp:
-          Fixed some memory *deallocation* problems with sequences, they
-          needed a _deallocate_buffer() method, not to implement the base
-          class destructor, but to implement deep_free.
-
-Fri Jan 16 18:01:03 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * The Event Service works on Solaris/SunCC again.
-
-        * tao/poa.h:
-        * tao/poa.cpp:
-        * tao/objtable.h:
-        * tao/objtable.cpp:
-        * tao/connect.cpp:
-          The object table, and POA use a real TAO_Unbounded_Sequence,
-          removing some nasty casts.
-
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          Fixed some memory allocation problems in operator=
-
-        * TAO_IDL/be/be_interface.cpp:
-          No need to cast the object key when calling POA::bind(), it
-          takes a TAO_opaque now.
-
-Thu Jan 15 17:15:29 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO/TAO_IDL/be/be_interface.cpp:
-        * TAO/tao/connect.cpp:
-        * TAO/tao/corba.h:
-        * TAO/tao/corbacom.cpp:
-        * TAO/tao/corbacom.h:
-        * TAO/tao/decode.cpp:
-        * TAO/tao/encode.cpp:
-        * TAO/tao/iiopobj.cpp:
-        * TAO/tao/iiopobj.i:
-        * TAO/tao/iioporb.cpp:
-        * TAO/tao/poa.cpp:
-          Now TAO_opaque is implemented using the new TAO_*_Sequence
-          classes, this is needed because the demarshaller expects that
-          class.   There are some other sequences in the ORB core that
-          need the same change, but currently that is not so urgent.
-          The object table expects a CORBA_SEQUENCE so some casting is
-          still done among those classes and the new templates.  The POS
-          branch already solved this, so I will wait until the merge to
-          fix it.
-
-        * TAO/tao/sequence_T.h:
-        * TAO/tao/sequence_T.i:
-        * TAO/tao/sequence_T.cpp:
-          Now we include sequence_T.i in sequence_T.h, this is needed for
-          template instantiation.
-          The ACE_ASSERT for indices was comparing to the value of
-          length_, it must compare with maximum_, it is possible that the
-          user creates the sequence with enough space (thus maximum_ is
-          properly set, but length_ is 0), then inserts some data and
-          finally sets the length, with the previous asserts that would
-          fail.
-
-        * TAO/tao/Makefile:
-        * TAO/TAO_IDL/*/Makefile:
-        * TAO/orbsvcs/*/Makefile:
-        * TAO/tests/Cubit/TAO/*/Makefile:
-          Dependencies regenerated.
-
-Wed Jan 14 23:10:13 1998    <coryan@MILONGA>
-
-        * sequence.h:
-        * sequence.i:
-        * sequence.cpp:
-        * sequence_T.h:
-        * sequence_T.i:
-          More generated and parametric code reduced, also fixed some
-          problems  detected by MSVC++.
-
-        * tao/TAO.dsp:
-        * TAO_DL/tao_idl.dsp:
-          Updated projects to include new files.
-
-Wed Jan 14 21:03:18 1998  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * sequence.h:
-        * sequence.i:
-        * sequence.cpp:
-          Removed unused TAO_Unbounded_String class, it has been
-          superseeded by
-          TAO_Unbounded_Managed_String<char,TAO_String_Manager>.
-
-        * sequence_T.h:
-        * sequence_T.i:
-          Managed sequences only need the const version of operator[],
-          because they return a Manager by value.
-
-Wed Jan 14 20:32:47 1998    <coryan@MILONGA>
-
-        * tao/sequence_T.h:
-          Fixed typo in base class for ACE_Bounded_Managed_Sequence.
-
-Wed Jan 14 17:54:31 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_visitor_sequence.h:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_interpretive.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-          The compiler generates code using the new managed sequence
-          parametric classes.
-          Also handled typedefs correctly while generating sequence code
-          specially template arguments and return types for operator[] in
-          _var and _out classes.
-          Simplified code generation for sequences of sequences: the
-          generated typedefs can be used to instantiate the templates.
-          Finally made some of the visitors more generic, so less
-          knowledge on the stream files gets distributed.
-
-        * tao/sequence.h:
-        * tao/sequence.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-        * tao/sequence_T.cpp:
-          Re-implemented the Managed_Sequence classes using the "Manager"
-          as a parameter instead of a nested type.
-          Still requires some work because the sequences need privileged
-          access (friend) to the Managers.
-
-Tue Jan 13 15:55:32 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * Makefile (INSTALL): Added a rule to build the INSTALL file from
-        TAO-INSTALL.html.  Also added both TAO-INSTALL.html and INSTALL to
-        the list of files included in the release.  TAO-INSTALL.html had
-        not been included at all.
-
-        * TAO-INSTALL.html: Updated some of the text in the Unix portion
-        to be explicit regarding the need for GNU Make.
-
-        * INSTALL: Added this file, which is the output of 'lynx -dump
-        TAO-INSTALL.html'.
-
-Mon Jan 12 20:04:32 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/server.cpp: Added comments
-
-Mon Jan 12 17:29:44 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp: Added initialization for an abstract
-        visitor factory in the constructor and deletion in the
-        destructor.
-
-        Added code for the "make_visitor" factory method.
-
-        * TAO_IDL/be/be_factory.cpp: Added destructor and constructor for
-        abstract factory (*note* it is not pure abstract).
-
-        * TAO_IDL/be/be_produce.cpp: We use the different visitors for the
-        root to start code generation. At this time, we instantiate the
-        visitor factory with the concrete factory of visitors which will
-        generate stubs/skeletons  using TAO's interpretive marshaling
-        engine.
-
-        * TAO_IDL/be_be_sequence.cpp: Commented out a large part of code
-        to enable visitors for sequences to take over code generation.
-
-        * TAO_IDL/be/be_visitor.cpp: Abstract factory of visitors.
-
-        * TAO_IDL/be/{be_visitor_root, be_visitor_sequence}.cpp: visitors
-        for Root and Sequences respectively. be_visitor_sequence.cpp is a
-        new file.
-
-        * TAO_IDL/be_include/{be_codegen, be_visitor, be_visitor_root,
-        be_visitor_sequence, be_factory, be_sequence}.h: Files affected
-        due to introduction of visitors and visitor factory. Added a
-        boolean "unbounded ()" method on sequences.
-
-        * TAO/tao/{decode, encode}.cpp: Uses TAO_Base_Sequence instead of
-        the hack of using CORBA_SEQUENCE<Octet>.
-
-        * TAO/tao/{sequence, sequence_T}.{h,i,cpp}: Added large amount of
-        code for bounded and unbounded sequences as well as the special
-        cases for sequences of object references and strings, along with
-        their managed types.
-
-        * TAO/tests/Param_Test: Added tests for object references and
-        sequence of variable structs. There are some problems with the
-        generated code.
-
-Sun Jan 11 11:15:35 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/sequence.i (TAO_Base_Sequence): reordered initializers to match
-          declaration order.
-
-        * tao/nvlist.h: changed AddRef and Release declarations to return
-          CORBA::ULong instead of ULONG, to match their definitions.
-
-Sat Jan 10 14:08:09 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-          We no longer generate names with CORBA_1 or CORBA_3 macros, but
-          sometimes we cannot use the typedefs in CORBA:: because some
-          weird MSVC++ features (bugs?).
-
-Fri Jan 09 21:37:39 1998    <coryan@MILONGA>
-
-        * TAO_IDL/be/be_typedef.cpp:
-          Added missing accept() method for visitors.
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-          Fixed signed/unsigned warning.
-
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-          Yet another fix for the namespace warnings.
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsp:
-        * orbsvcs/Event_Service/Event_Service.dsp:
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.dsp:
-          Executables are not generated into the Debug subdirectory.
-
-Fri Jan  9 20:49:41 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/CosNaming_i.cpp: Fixed some code dealing
-        with Warning (Anachronism) messages.
-
-Fri Jan  9 19:04:10 1998  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * tao/orbobj.cpp: Moved template instantiation codes around to
-          eliminate compilation errors.
-
-Fri Jan  9 17:49:55 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/corba.h:
-        * tao/corbacom.h:
-        * tao/sequence.cpp:
-        * tao/sequence.h:
-        * tao/sequence.i:
-        * tao/sequence_T.cpp:
-        * tao/sequence_T.h:
-        * tao/sequence_T.i:
-          Added the new TAO_Base_Sequence class and its parametric
-          children (TAO_Bounded_Sequence and TAO_Unbounded_Sequence). This
-          classes will be used in the implementation of all the IDL
-          sequences, thus providing the interpreter with a base class to
-          manipulate them.
-
-        * orbsvcs/Scheduling_Service/Scheduler.cpp:
-          Fixed some instantiation problems.
-
-        * TAO_IDL/be/Makefile:
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_enum_val.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_expression.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_native.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_union_label.cpp:
-        * TAO_IDL/be/be_visitor.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be_include/be.h:
-        * TAO_IDL/be_include/be_argument.h:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_attribute.h:
-        * TAO_IDL/be_include/be_constant.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be_include/be_enum_val.h:
-        * TAO_IDL/be_include/be_exception.h:
-        * TAO_IDL/be_include/be_expression.h:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_module.h:
-        * TAO_IDL/be_include/be_native.h:
-        * TAO_IDL/be_include/be_operation.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/be_include/be_scope.h:
-        * TAO_IDL/be_include/be_sequence.h:
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_union_branch.h:
-        * TAO_IDL/be_include/be_union_label.h:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_visitor_root.h:
-          Added visitors from the poa branch into the main trunk.
-
-Fri Jan  9 16:17:37 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orb_core.*: Changed ORB parameters, OA parameters, and the
-        endpoint address to be switchable btw. global and tss resources.
-        I also cleaned up the redundant accessor methods by using macros
-        to define them.  Thanks to Keith Nicewarner <knicewar@sanders.com>
-        for his bug reports which led to this solution.
-
-        * tao/orbobj.cpp (run,perform_work): Added code to set the
-        Reactor's owner to the current thread prior to calling
-        handle_events().  Thanks to Keith Nicewarner
-        <knicewar@sanders.com> for his bug reports which led to this
-        solution.
-
-Fri Jan  9 16:00:21 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: Removed a Release statement that
-        was getting generated in the _narrow method
-
-        * TAO_IDL/be/{be_state_argument, be_state_operation}.cpp: All
-        typedefed strings are handled as if they are strings.
-
-Fri Jan 09 12:29:55 1998    <coryan@CHA-CHA>
-
-        * tao/default_server.cpp:
-          Fixed missing initialization for object_lookup_strategy_
-
-Fri Jan  9 12:17:02 1998  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Dispatching_Modules.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/GPlot_File.cpp:
-        * orbsvcs/Event_Service/Memory_Pools.cpp:
-        * orbsvcs/Event_Service/Task_Manager.cpp:
-        * orbsvcs/Scheduling_Service/Scheduler.cpp:
-        * orbsvcs/Scheduling_Service/Scheduler_Generic.cpp:
-          Added missing instantiation for platforms with
-          ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA (IRIX)
-
-        * orbsvcs/Event_Service/CORBA_Utils_T.h:
-          Added missing member to ACE_ES_Array_Iterator.
-
-        * orbsvcs/Scheduling_Service/Scheduler.h:
-          Use ACE_SYNCH_MUTEX instead of ACE_HAS_THREADS and
-          ACE_Null_Mutex vs ACE_Thread_Mutex.
-
-        * orbsvcs/orbsvcs/Makefile:
-          The IDL generated files are .PRECIOUS
-
-Thu Jan  8 21:58:18 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: be_interface::relative_skel_name ()
-        was producing incorrect results because we were overwriting an
-        internal string with '\0'
-
-        * TAO/tao/deep_free.cpp: Marshal_Struct::deep_free. Commented out
-        the call to String::deep_free if a member is a string because that
-        free should happen automatically as the member is a String_var
-        type. In addition, String::deep_free was setting the pointer to 0.
-
-        * TAO/tao/marshal.i: In string::deep_free, commente dout the line
-        that sets the pointer to 0.
-
-        * TAO/tests/Param_Test: Added a string member field to the
-        var_struct. Also some modifications. Needs more improvement.
-
-Thu Jan 08 17:48:49 1998    <coryan@CHA-CHA>
-
-        * Naming_Service/NS_CosNaming.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp:
-          ACE_NESTED is only needed in the generated code.
-
-        * Scheduling_Service/Scheduling_Service.cpp:
-          MSVC++ 5.0 seems to have a bug: if the implementation for the
-          scheduling service is stored into a RtecScheduler::Scheduler_ptr
-          then the server crashes; this is OK in other platforms and looks
-          OK since the pointers are in fact compatible.
-
-        * tests/Event_Latency/Event_Latency.cpp:
-          Removed some warnings by using "CORBA::ULong" instead of "int"
-          in comparisons against sequence<>::length.
-
-        * Dump_Schedule/Dump_Schedule.dsp:
-        * orbsvcs/orbsvcs_lib.dsp:
-          Fixed some names and missing options.
-
-Thu Jan 08 15:55:21 1998  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * tao/objtable.cpp:
-        * tao/optable.cpp:
-        * tao/orbobj.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp: Added missing template
-          instantiation codes.
-
-Thu Jan  8 12:53:28 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/corbacom.i (wstring_dup): Added this, which simply calls
-        wstring_copy().  Of course, I can't find any mention of EITHER of
-        these functions in the 2.0 or 2.1 spec, but what good are wstrings
-        if you can't make copies?  Plus, Irfan really wanted it.
-
-Thu Jan  8 11:36:38 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_interface.h, TAO_IDL/be/be_interface.cpp:
-        Added a method called "relative_skel_name" to be used for
-        generating names of inherited interfaces in the keleton class
-        name.
-
-        * TAO_IDL/be/be_state_argument.cpp: Generation of space was
-        missing after the "native" type in a parameter list declaration.
-
-        * TAO_IDL/fe/{y.tab.*, lex.yy.cpp}: Due to changes in the idl.ll
-        and idl.yy files, these had to be regenerated.
-
-Thu Jan 08 00:14:56 1998    <coryan@MILONGA>
-
-        * orbsvcs/orbsvcs.dsw:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsp:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.dsw:
-        * orbsvcs/Event_Service/Event_Service.dsp:
-        * orbsvcs/Event_Service/Event_Service.dsw:
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/Naming_Service/Naming_Service.dsw:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsp:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.dsw:
-        * orbsvcs/tests/Event_Latency/Event_Latency.dsp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.dsw:
-          Added preliminar (untested) versions of the project files for
-          MSVC++ 5.0.
-
-Wed Jan  7 22:41:41 1998  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * tao/corba.h:
-          Removed varout.h from the list of included files; it is no used
-          and would abort compilation on IRIX.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tao/orbobj.cpp:
-          Added missing template instantiations.
-
-        * tao/varout.h:
-          Some fixes, but actually the changes were aborted, Andy informed
-          me that the file wasn't really used.
-
-Wed Jan 07 21:52:20 1998    <coryan@MILONGA>
-
-        * TAO_IDL/tao_idl.dsp:
-          Added the new native_* functions to the project file.
-          Also use the new tao_idl.cpp file in the top level directory.
-
-Wed Jan  7 20:20:56 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/NS_CosNaming.cpp:
-        * orbsvcs/Naming_Service/CosNaming_i.cpp: Use the correct
-        _duplicate function.  Also changed the code to use exceptions
-        already supported by TAO.
-
-Wed Jan  7 18:00:08 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/driver/Makefile:
-        * TAO_IDL/driver/drv_main.cpp:
-          Moved the main() routine to the topmost directory, this is
-          needed for platforms like SGI that will not link a group of
-          shared libraries without any object files. It also seems more
-          reasonable (IMHO).
-
-Wed Jan  7 13:55:26 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Changed the assignment of
-        default port number to fetch the value from the environment
-        similar to what is done in orb_core.cpp.
-
-        * tao/poa.{h,cpp} (handle_request): Moved functionality to
-        TAO_Server_Connection_Handler in connect.*.
-
-        * tao/orb_core.cpp: Added the ability to specify the default
-        server port via an environment variable using the ACE_Env_Value
-        template.  The name of the environment variable is the same as the
-        preprocessor #define: TAO_DEFAULT_SERVER_PORT.
-
-        * tao/giop.* (TAO_GIOP_LocateRequest): Added a CTOR and init
-        method similar to TAO_GIOP_Request.
-
-        * tao/connect.{h,cpp} (handle_locate): Added to handle the
-        LocateRequest CORBA request.  Also moved handle_request() method
-        from the poa to here.
-
-        * tao/Makefile: Added "fakesvcconf" variable check so that if
-        somebody wants to build with faked svc config entries on a
-        platform, they can simply do "make fakesvcconf=1".  The CHORUS and
-        VXWORKS sections now override the value of this variable to be 1.
-
-Wed Jan  7 12:00:14 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/corbacom.h: Added forward declarations for
-        CORBA_Object_var and CORBA_Object_out
-
-        * TAO/tao/varout.h: some improvements. However, this file is not
-        used currently.
-
-        * TAO_IDL/include/ast_native.h: New file that defines the "native"
-        type defined by the POA spec.
-
-        * TAO_IDL/include/{ast, ast_interface, ast_module, ast_decl,
-        idl_fwd, idl_global, utl_scope}:
-        Added the create_native and fe_add_native methods for the newly
-        added "native" type. Added a enum value for native in
-        AST_Decl.h. Added an enum value for the current parse state in
-        idl_global.h. Added forward declarations in idl_fwd.h. Added the
-        "add_native" method in utl_scope.h
-
-        * TAO_IDL/ast/{ast_generator, ast_interface, ast_module}.cpp:
-        Added the create_native and fe_add_native methods for the newly
-        added "native" type.
-
-        * TAO_IDL/ast/ast_native.cpp: New file for native type
-
-        * TAO_IDL/fe/idl.ll: Added a rule to recognize the "native"
-        keyword.
-
-        * TAO_IDL/fe/idl.yy: Added a grammar rule for the "native" type.
-
-        * TAO_IDL/util/utl_scope.cpp: Added add_native and fe_add_native
-        methods.
-
-        * TAO_IDL/be_include/be_native.h: New file for the backend for
-        "native" type.
-
-        * TAO_IDL/be/be_native.cpp: New file for backend implementation of
-        "native".
-
-        * TAO_IDL/be/be_attribute.cpp: For the "set" method, we were
-        setting the paramdata structure of the get method. This has been
-        fixed.
-
-        * TAO_IDL/be/be_generator.cpp: Added create_native method.
-
-        * TAO_IDL/be/be_interface.cpp:
-        For a special case of a deeply nested inheritance graph and one
-        specific way of inheritance in which a node that was already
-        visited, but is not present in the queue, gets inserted at the
-        tail. This sitation arises when a node multiply inherits from two
-        or more interfaces in which the first parent is higher up in the
-        tree than the second parent. In addition, if the second parent
-        turns out to be a child of the first. Thanks to Carlos O'Ryan for
-        reporting the error.
-
-        In addition, we use the nested_type_name for the inherited classes
-        in the class definition.
-
-        * TAO_IDL/be/be_type.cpp: We generate relative paths instead of
-        the ACE_NESTED_CLASS macro. However, I am going to make this an
-        IDL option at a later point.
-
-        * TAO_IDL: Did "make depend" on all the Makefiles.
-
-        * TAO/tests/Param_Test: Added tests for testing object
-        references. This is still incomplete.
-
-Tue Jan  6 19:48:45 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * TAO/tests/Cubit/TAO/MT_Cubit/README: Updated README to explain
-        the latest generalization of the MT_Cubit tests.
-
-Tue Jan  6 17:25:57 1998  Nanbor Wang  <nw1@lindy.cs.wustl.edu>
-
-        * MT_Cubit.dsw,client.dsp,server.dsp: Update workspace and
-        project files to reflect the change in directory structure.
-
-Mon Jan 05 23:54:13 1998    <coryan@MILONGA>
-
-        * Added project files for a static orbsvcs library.
-
-Mon Jan  5 16:37:14 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * Makefile: Merged client and server rules
-
-        * server.dsp, svc.conf, svr.cpp, client.dsp, cubit.idl,
-        cubit_i.cpp, cubit_i.h, Task_Client.cpp, Task_Client.h,
-        Util_Thread.cpp, Util_Thread.h, client.cpp, Makefile:
-        Merged client/server code into one directory.
-
-Mon Jan  5 11:50:00 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_attribute.cpp: Code generated for setting the
-        attribute value (in the server skeleton) had some undefined symbol
-        errors as well as the create_list parameter was wrong.
-
-        * TAO/tao/object.{h.i}: Added code for Object_var and Object_out
-
-Mon Jan 05 09:53:51 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbacom.{h,cpp},encode.cpp: replaced defined (VXWORKS) &&
-          defined (ghs) with defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR).
-
-        * tao/Makefile: add -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP to
-          CPPFLAGS on VxWorks.
-
-        * tests/Cubit/TAO/MT_Cubit/Util_Thread.{h,cpp} (Util_Thread ctor):
-          rearranged initializers to match declaration order.
-
-Sun Jan 04 17:19:34 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.53, released Sun Jan 04 17:19:34 1998.
-
-Sun Jan  4 13:49:21 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/nvlist.cpp: NamedValue::Release was calling delete, but
-        this was not correct since NamedValues are allocated using
-        calloc. So now we exclusively call the destructor and free the
-        memory using "free".
-
-        * TAO/tests/Param_Test/{client.cpp, tests.cpp}: Since we do not
-        pass the OUT_LIST_MEMORY flag to create_request, we cannot own the
-        return, inout, and out parameters and hence cannot free them.
-
-Sun Jan  4 13:41:41 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp: Fixed prev_priority to
-        previous_priority
-
-Sun Jan 04 07:47:52 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.52, released Sun Jan 04 07:47:52 1998.
-
-Sun Jan 04 07:37:31 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core.i: Changed ! ACE_LACKS_TEMPLATE_SPECIALIZATION
-          to ACE_HAS_TEMPLATE_SPECIALIZATION, to be consistent with
-          ACE config files.
-
-Sun Jan  4 06:06:28 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/typecode.*: Some modifications in the destruction
-        strategy to eliminate fatal errors such as FNH (freeing non-heap
-        memory) or FMW (freed memory write). Most of these errors were
-        occuring because we were trying to delete our private typecode
-        stuff that was not allocated from heap. For example, in case of
-        sequences of strings the private member tc_content_type used to
-        point to a statically preallocated "tc_string" typecode.
-
-        Also, preliminary support for checking for typecode equality and
-        the "member_name" method added.
-
-        Looking at the current private_* methods, it looks like a lot of
-        stuff can be abstracted into a few methods. So the next attempt
-        will be to eliminate as many of the private_* methods (that do
-        repititive work) and replace them with a couple of helper
-        methods. In addition, we may not need all those tc_*_known_
-        boolean variables. Only one may suffice. All this will be done in
-        the next pass.
-
-        * TAO/tao/{except.h, except.cpp, giop.cpp, object.cpp}: Removed
-        the TAO_CONST CORBA::String insanity and replaced by const
-        char*. This is also in accordance with the mapping as well as
-        eliminates strange compiler warnings about assigning const char*
-        to char*.
-
-        * TAO_IDL/be/be_sequence.cpp: We now generate #if defined (..)
-        macros for sequences and their managed types to avoid multiple
-        declaration/definition errors.
-
-Sat Jan  3 14:58:21 1998  Sumedh Mungee  <sumedh@cs.wustl.edu>
-
-        * Task_Client.h, Util_Thread.cpp, Util_Thread.h, client.cpp,
-        Task_Client.cpp, Makefile:
-        The Util_Thread class basically computes CPU usage. Integrated
-        this class with the MT_Cubit test, so that the Util_Thread
-        performs computation in the background while the test is
-        running. Also extended the test to use `n' clients talking to `n'
-        servants.
-
-
-Sat Jan 03 09:04:28 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/invoke.cpp (ACE_Synchronous_Cancellation_Required):
-          disabled on VxWorks to avoid runtime warnings with
-          ACE_NOTSUP_VERBOSE, because thr_setcanceltype isn't
-          supported there.
-
-        * tao/corba.h: g++/VxWorks doesn't like backslashes at the
-          end of comment lines, so replaced a commenting of a #define
-          with #if 0.
-
-Fri Jan 02 18:42:31 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.51, released Fri Jan 02 18:42:31 1998.
-
-Fri Jan  2 16:29:20 1998  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/GPlot_File.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Scheduling_Service/Scheduler.cpp:
-        * tao/connect.cpp:  Added missing explicit template
-          instantiations.
-
-Fri Jan 02 10:24:21 1998  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * tests/Param_Test/driver.cpp (main): Added a trailing return in
-          main() to prevent MSVC from complaining.
-
-        * tests/Param_Test/helper.cpp (gen_fixed_struct): Changed to use
-          ACE_OS::rand () * 1.0 instead of drand48 ().
-
-        * tao/connect.cpp:
-        * orbsvcs/Scheduling_Service/Scheduler.cpp:
-        * orbsvcs/Event_service/Gplot_File.cpp:
-        * orbsvcs/Event_Service/Event_Channel.cpp: Added explicit template
-          instantiation for ACE_Map_Iterator_Base.
-
-Fri Jan  2 10:39:02 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_type.cpp: Completely reimplemented the way
-        ACE_NESTED_CLASS macro gets generated.
-
-        * TAO_IDL/be/be_state_sequence.cpp: Fixed an error where the
-        reference operator "&" was getting generated at the wrong place.
-
-Wed Dec 31 23:29:59 1997  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * tao/nvlist.cpp (add_value_consume): Added a space between * and
-          /* to avoid warning messages on NT.
-
-Thu Jan 01 14:22:34 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.50, released Thu Jan 01 14:22:34 1998.
-
-Thu Jan  1 13:31:55 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_sequence, be_state_sequence}.cpp: An unwanted
-        reference operator "&" was getting generated for sequences whose
-        element types were not special managed types. This was because the
-        case for handling the managed types somehow got mixed with the
-        normal ccase. Thanks to Nanbor Wang (nw1@cs.wustl.edu) for
-        pointing this out.
-
-Wed Dec 31 18:29:57 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_sequence, be_state_sequence}.cpp: Changed the way
-        we use managed types. Instead of allocating an array, we now
-        instantiate the
-        managed type on the fly i.e., when the operator [] is invoked. The
-        reasons for doing this are: (1) no need for dynamic memory
-        allocation for maintaining the array of managers (2) It was
-        causing all kinds of problems while decoding because the sizeof
-        such sequence classes was bigger than those without managed
-        types. However, due to this scheme, we can no longer define the []
-        operator to return a reference because that would mean that a
-        reference to a local variable/temporary will be returned. Hence
-        changes were necessary in files.
-
-        TypeCode generation was also erroneous. This is fixed. We were
-        generating wrong encapsulation length.
-
-        * TAO_IDL/be/be_string.cpp: Indentation in typecode generation.
-
-        * TAO_IDL/be/be_type.cpp: nested_type_name - improved to
-        eliminate one more strange error message getting generated by the
-        MSVC++ compiler. Still needs testing.
-
-        * TAO/tao/{invoke, decode}.cpp: Reversed the changes which were
-        made to account for sequencese with managed types. We no longer
-        need these changes because sequences with managed types no longer
-        keep an extra data member. Thus the size of all sequences (top
-        level) is the same (so is the layout).
-
-        * TAO/tao/nvlist.cpp: commneted out unused variables, parameters.
-
-        * TAO/tests/Param_Test: Included tests for string sequences,
-        variable sized structs as well as nested structs.
-
-Tue Dec 30 13:46:44 1997  Nanbor Wang  <nw1@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h (portnum_): Changed its data
-          type from CORBA::ULong to CORBA::UShort to kill warning
-          messages.
-
-        * tao/orbobj.cpp (create_list): Changed data type of the loop
-          counter to CORBA::Long.  This caused a warning message on VC.
-
-        * doc/releasenotes/index.html: Added documentation for adding IDL
-          files into Visual C++'s projects.
-
-        * tests/Param_Test/Param_Test.dsw:
-        * tests/Param_Test/client.dsp:
-        * tests/Param_Test/server.dsp: New workspace and projects were added.
-
-Tue Dec 30 10:15:11 1997  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Fast_Reactor.h (ACE_ES_Fast_Reactor):
-          Added the other version of handle_events to stop the compiler
-          from being cranky.
-
-Tue Dec 30 10:06:45 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_state_argument, be_state_operation,
-        be_state_attribute}.cpp - Unnecessary call on "init_mgr" for
-        sequences that do not have any managed types was getting
-        generated. This is fixed. In addition, MSVC++ compiler was
-        producing an error saying "ambiguous assignment" when an "_out"
-        variable was assigned to a pointer type. Solaris platform (CC and
-        g++) did not give any such errors since they were (most probably)
-        using the operator *() on the _out class, but MSVC++ did not.
-
-        * TAO/tests/Cubit/IDL_Cubit/clnt.cpp: The same "ambiguous
-        assignment" error described above has been fixed here too.
-
-        * TAO/tests/Param_Test: Added a method called "reset_parameters"
-        so that we do not change the "in" parameter for every
-        iteration. Previuosly we were settingthe in parameter differently
-        for every new iteration. However, for performance comparison
-        purposes, this was not correct (e.g., in the case of string
-        sequences or unbounded strings where everytime we were sending a
-        different lenght string and hence the performance numbers were
-        different for each run and couldn't be compared.)
-
-Mon Dec 29 21:51:38 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_sequence.cpp: get_name was returning a local
-        variable. In addition, added generationof a method called
-        "init_mgr" that must be used to initialize the sequence's
-        underlying mgr_ vector.
-
-        There was some problem with bounded/unbounded sequence code
-        generation (an error  in an if stmt).
-
-        * TAO_IDL/be/{be_state_argument, be_state_attribute,
-        be_state_operation}.cpp - added code to generate the call to
-        init_mgr for sequences after the do_call is made.
-
-        * TAO_IDL/be_include/be_sequence.h : gen_name returns char* rather
-        than const char* because we now allocate a new string and return
-        it.
-
-        * TAO/tao/Makefile: applied make depend to incorporate nvlist.i
-
-        * TAO/tao/corbacom.h: Added a "boolean release" field to
-        CORBA_SEQUNECE so that its layout is similar to the generated code
-        for sequences.
-
-        * TAO/tao/decode.cpp: In sequence decode, we also set the release
-        flag to 1. In addition, for sequences of strings and objrefs, we
-        zero out additional 4 bytes that are used to store a pointer to
-        the manager array.
-
-        * TAO/tao/deep_free.cpp: some indentation. Also passed the correct
-        parameter to string/wstring::decode
-
-        * TAO/tao/invoke.cpp: In do_dynamic_call, for sequences of strings
-        (inclusing typedefed sequences of strings that themselves can be
-        typedefed), we must allocate size+4 bytes for demarshaling the
-        sequences. The extra 4 bytes are for the manager array pointer.
-
-        * TAO/tao/nvlist.cpp: I the method item, the loop should have run
-        from o to max_ rather than upto len_.
-
-        * TAO/tao/orbobj.cpp: Used placement new of NamedValue in the
-        create_list method.
-
-        * TAO/tests/Param_Test: Added new tests for Fixed_Struct and
-        string sequence. Added a README file.
-
-        * TAO/doc/releasenotes/index.html: updated with latest success stories.
-
-Thu Dec 25 20:36:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.49, released Thu Dec 25 20:36:58 1997.
-
-Thu Dec 25 18:43:03 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_state_attribute, be_state_argument}.cpp: Handled
-        teh remaining cases (except Arrays) that use the newly added
-        methiods to class NVList. The Param_Test test suite is being
-        developed to track any memory leaks.
-
-        * TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp:  Used sequence_var in
-        the cube_sequence function to avoid memory leaks. However, there
-        still are leaks.
-
-Wed Dec 24 18:44:47 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.48, released Wed Dec 24 18:44:47 1997.
-
-Wed Dec 24 18:44:02 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao: Added the nvlist.i file to the tao/ directory.
-
-Wed Dec 24 18:11:08 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_operation, be_state_argument}.cpp: Added
-        "argument_count" method to be_operation which is helpful in
-        creating an NVList of the appropriate size. Previously we were
-        creating an empty list and adding parameters one by one. This was
-        causing a lot of reallocations which were wasteful.
-
-        At this time, we have code base that can successfully send/receive
-        primitive data types as well as strings.
-
-        * TAO_IDL/be_include/be_operation.h : Added a new method called
-        "argument_count" to give us the total number of parameters we
-        have.
-
-        * TAO/tao/{any.cpp, connect.cpp, corbacom.i, decode.cpp,
-        iioporb.cpp, marshal.i, objtable.cpp, optable.cpp, request.cpp}:
-        In all these files, after a call to CORBA::string_free, we made
-        the pointer point to 0. Otherwise, purify was giving us "Free
-        Memory read" errors. Also, this was (by fluke) causing some
-        applications to run successfully.
-
-        * TAO/tao/{nvlist.h, nvlist.cpp, nvlist.i, corba.h}: Added
-        unimplemented methods to NamedValue and NVList. Created a nvlist.i
-        file and updated corba.h
-
-        * TAO/tao/corbacom.cpp: In an assignment operator for Sting_out,
-        we were not checking if the assignment was from ourselves. Also a
-        array was incorrectly being deleted as "delete ..." rather than
-        "delete [] ...".
-
-        * TAO/tao/invoke.cpp: Inside do_call, we were not deleting memory
-        for the "in" part of the inout parameters. Right now we have fixed
-        this problem only for strings. Others will be added as new tests
-        are built. Do_dynamic_call also needs such a fix. NOT DONE in this release.
-
-        * TAO/tao/orb_core.h, orb_core.cpp: ORB_init takes "const char*"
-        orb name as the argument instead of just char*.
-
-        * TAO/tests/Param_Test: Successful in testing
-        "test_unbounded_string". removed a few memory leaks where we were
-        not deleting the client objects.
-
-Tue Dec 23 19:34:40 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.47, released Tue Dec 23 19:34:40 1997.
-
-Tue Dec 23 13:36:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_state_sequence.cpp: ACE_NESTED_CLASS must be
-        generated for seq elements that are scoped. We were generating
-        this macor only when seq elements were typedefs. However, seq
-        elements can also be structs or any other types that have an
-        enclosing scope. Thanks to Chris Gill <cdgill@cs.wustl.edu> for
-        the bug report.
-
-        * TAO_IDL/be/be_state_operation.cpp: Similar problem as above for
-        return types of operations.  Bug reported by Chris Gill.
-
-        * TAO_IDL/be/be_exception.cpp: Whenever a _narrow fails, we were
-        trying to do a ACE_dynamic_cast to a 0. Instead, we now return a
-        0. Again thanks to Chris Gill <cdgill@cs.wustl.edu> for
-        the bug report.
-
-        * TAO_IDL/be/be_state_argument.cpp: We were ot generating a char
-        *& for inout string parameters. Instead only a char * was getting
-        generated. Fixed.
-
-Tue Dec 23 11:45:03 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-          There is no need to set config=1 when compiling
-          $TAO_ROOT/orbsvcs.
-
-Mon Dec 22 22:02:49 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.46, released Mon Dec 22 22:02:49 1997.
-
-Mon Dec 22 19:08:55 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/corba.h:
-        * tao/except.cpp:
-        * tao/except.h:
-          The TAO_TRY macros use the _narrow methods for exceptions;
-          making the TAO_CATCH() macro fully functional.
-
-        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
-        * orbsvcs/Event_Service/Dispatching_Modules.cpp:
-        * orbsvcs/Event_Service/Dispatching_Modules.i:
-        * orbsvcs/Event_Service/Event_Channel.cpp:
-        * orbsvcs/Event_Service/Event_Channel.i:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Event_Service/RT_Task.cpp:
-        * orbsvcs/Event_Service/ReactorTask.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-        * orbsvcs/Scheduling_Service/Config_Scheduler.h:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.h:
-        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Changed the ACE_TRY (and friends) macros to TAO_TRY.
-
-        * orbsvcs/orbsvcs/RtecEventChannelAdmin.idl:
-          Cleaned up some exceptions definitions.
-
-        * orbsvcs/tests/Event_Latency/Makefile:
-          Since the schedule is not distributed (yet) by default we
-          compile the config run, hopefully this will cause less
-          confusion.
-
-Sun Dec 21 23:41:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.45, released Sun Dec 21 23:41:05 1997.
-
-Sun Dec 21 20:29:33 1997    <nw1@JIG>
-
-        * tests/Cubit/TAO/MT_Cubit/client/client.dsp: *
-          tests/Cubit/TAO/MT_Cubit/server/server.dsp: Corrected erroneous
-          library pathes in Release version of project files.
-
-Sun Dec 21 18:30:41 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp: The macro used in the #if !defined
-        (..) clause in the header files was incorrectly generated when IDL
-        file names had characters other than letters in it. Fixed.
-
-        * TAO/tests/Param_Test: A new test suite to test all the parameter
-        passing modes - return, in, inout, and out for a large number of
-        IDL data types. The purpose of this test suite is to verify the
-        correctness of the stubs/skeletons generated by TAO IDL compiler,
-        eliminate any existing errors in the marshaling engine, track down
-        any memory leaks, and finally to measure the performance and fine
-        tune the code if required. In the first version of the test, we
-        only test "shorts". We will be adding other tests as soon as we
-        can.
-
-Sat Dec 20 00:34:45 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tests/Cubit/CORBAplus/MT_Cubit/client/client.cpp (main):
-        * tests/Cubit/CORBAplus/MT_Cubit/client/Makefile:
-        * tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.cpp:
-        * tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h:
-        * tests/Cubit/CORBAplus/MT_Cubit/client/client.cpp:
-        * tests/Cubit/CORBAplus/MT_Cubit/client/cubit.idl:
-        * tests/Cubit/CORBAplus/MT_Cubit/server/Makefile:
-        * tests/Cubit/CORBAplus/MT_Cubit/server/cubit.idl:
-        * tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.cpp:
-        * tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h:
-        * tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp:
-        Ported the MT_Cubit example to CORBAplus.
-
-Fri Dec 19 11:33:51 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-
-        * tests/Thruput/CORBAplus/Makefile:
-        * tests/Thruput/CORBAplus/README:
-        * tests/Thruput/CORBAplus/client.cpp:
-        * tests/Thruput/CORBAplus/extract:
-        * tests/Thruput/CORBAplus/run:
-        * tests/Thruput/CORBAplus/run_client:
-        * tests/Thruput/CORBAplus/run_server:
-        * tests/Thruput/CORBAplus/run_test:
-        * tests/Thruput/CORBAplus/run_tests:
-        * tests/Thruput/CORBAplus/server.cpp:
-        * tests/Thruput/CORBAplus/ttcp.idl:
-        * tests/Thruput/CORBAplus/ttcp_decl.h:
-        * tests/Thruput/CORBAplus/ttcp_i.cpp:
-        * tests/Thruput/CORBAplus/ttcp_i.h:
-        * tests/Thruput/CORBAplus/utils.cpp: Ported the Thruput example to
-        CORBAplus for C++ by Expersoft.  Try running the "run_tests"
-        script for the client side.
-
-        * tests/Thruput/Orbix/Client.cpp:
-        * tests/Thruput/Orbix/Makefile:
-        * tests/Thruput/Orbix/README:
-        * tests/Thruput/Orbix/Srv_Main.cpp:
-        * tests/Thruput/Orbix/extract:
-        * tests/Thruput/Orbix/loop64:
-        * tests/Thruput/Orbix/orbixsol2s4.mk:
-        * tests/Thruput/Orbix/run:
-        * tests/Thruput/Orbix/run_client:
-        * tests/Thruput/Orbix/run_server:
-        * tests/Thruput/Orbix/run_test:
-        * tests/Thruput/Orbix/run_tests:
-        * tests/Thruput/Orbix/ttcp.idl:
-        * tests/Thruput/Orbix/ttcp_decl.h:
-        * tests/Thruput/Orbix/ttcp_i.cpp:
-        * tests/Thruput/Orbix/ttcp_i.h:
-        * tests/Thruput/Orbix/utils.cpp: Included the Thruput example for
-        IONAs Orbix ORB in the tests directory.
-
-        * tests/Thruput/TAO/Makefile:
-        * tests/Thruput/TAO/README:
-        * tests/Thruput/TAO/client.cpp:
-        * tests/Thruput/TAO/run:
-        * tests/Thruput/TAO/run_client:
-        * tests/Thruput/TAO/run_server:
-        * tests/Thruput/TAO/run_test:
-        * tests/Thruput/TAO/server.cpp:
-        * tests/Thruput/TAO/svc.conf:
-        * tests/Thruput/TAO/ttcp.idl:
-        * tests/Thruput/TAO/ttcp_decl.h:
-        * tests/Thruput/TAO/ttcp_i.cpp:
-        * tests/Thruput/TAO/ttcp_i.h:
-        * tests/Thruput/TAO/utils.cpp: Moved the TAO version of the
-        Thruput example to a "TAO" directory in the Thruput directory.
-
-        * tests/Thruput_test: Renamed this directory to Thruput.
-
-Fri Dec 19 00:28:24 1997    <nw1@JIG>
-
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp (main): Removed some
-          random codes.
-
-        * tao/tao_internals.cpp (close_services): Disabled closing down
-          the ACE_Service_Config when reference count drops to 0.
-
-Thu Dec 18 20:36:28 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.44, released Thu Dec 18 20:36:28 1997.
-
-Thu Dec 18 19:35:28 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/clnt.cpp (init):
-        * orbsvcs/Naming_Service/CosNaming_i.cpp (bind_new_context): Fixed
-        a bug in the Naming Service and the Logger test program
-        implementation.  Thanks to Marina Spivak <marina@cs.wustl.edu> for
-        debugging this.
-
-Thu Dec 18 16:18:01 1997    <nw1@JIG>
-
-        * TAO_IDL/be/be_sequence.cpp (gen_name): Removed a local variable
-          <seq>.  It is no longer used.
-
-        * TAO_IDL/be/be_union.cpp (gen_client_stubs): Removed local
-          variables <bt> and <s>.  They are not longer used.
-
-Thu Dec 18 15:50:01 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-          realclean was not removing all the IDL compiler generated
-          files.
-
-Thu Dec 18 15:06:23 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-        Thanks to Keith Nicewarner <knicewar@sanders.com>, Tom Richards
-        <tomr@mcmenterprise.com>, and Carlos O'Ryan <coryan@cs.wustl.edu>
-        for reporting bugs which led to  some of the changes below.
-
-        * TAO_IDL/be/be_array.cpp: Preliminary support for arrays. Not
-        complete.
-
-        * TAO_IDL/be/{be_operation, be_attribute}.cpp: The ParamData
-        structure *must* hold the "size" of the outermost level of the
-        return values and out parameters because the ORB has to allocate
-        memory for it and hence needs to know the size. We had a 0 in it
-        which crashed any return types that were variable in size.
-
-        * TAO_IDL/be/be_codegen.cpp: Added a new state for
-        unions. Corresponding change to the *.h file.
-
-        * TAO_IDL/be/be_decl.cpp: Added a method called "scope" that
-        returns the corresponding scope defined by this node (if one
-        exists). Added method to the *.h file also.
-
-        * TAO_IDL/be/be_scope.cpp: Added a method called "decl" that
-        returns the be_decl method corresponding to this scope. The header
-        file was also updated.
-
-        * TAO_IDL/be/{be_exception, be_state_exception}.cpp: I was making
-        the most stupid mistake of generating constructors per member
-        rather than one constructor that takes all the members as a
-        parameter.
-
-        * TAO_IDL/be/{be_sequence, be_state_sequence}.cpp: Changed the
-        naming scheme for anonymous sequences to avoid code bloat.
-
-        * TAO_IDL/be/be_state.cpp: Added template instantiation for
-        additional state to deal with code generation of members of
-        unions.
-
-        * TAO_IDL/be/be_state_structure.cpp: Made some changes so that
-        spurious code for array members doesn't get generated.
-
-        * TAO_IDL/be/{be_union, be_state_union}.cpp: Added a new state
-        because we were not generating code for union members that were
-        sequences or structs.
-
-        * TAO_IDL/be/be_type.cpp: Modified netsed_type_name to use the new
-        methods on class be_decl/be_scope.
-
-        * TAO_IDL/be/be_union_branch.cpp: gen_client_stubs uses the same
-        strategy as the other gen_client methods.
-
-        * TAO/tao/deep_free.cpp: In deep_free of structures, instead of
-        passing the address of a string member to be freed, we were simply
-        passing the string that led to a segmentation fault. A careful
-        code review is necessary.
-
-        * TAO/tao/orb_core.cpp: Made "use_ior" as default as ooposed to
-        using the URL based scheme for IORs. This was necessary to have
-        interoperability with other ORBs.
-
-        * TAO/tao/poa.cpp: The server request was being released
-        immediately after returning from the dispatch method. This should
-        be done after all return/inout/out parameters are marshaled.
-
-Tue Dec 17 12:53:01 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/encode.cpp: Additional changes for wchar's
-
-Tue Dec 17 10:37:45 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/TAO.dsp: Removed obsolete files from the VC++ project.
-          Changed name of folder from Include Files to Inline Files.
-          Inserted new header files for classview.
-
-        * TAO_IDL/tao_idl.dsp: Added missing be_state_exception.cpp to the
-          the project to eliminate link error.
-
-        * tao/corbacom.cpp: Inserted wslen and wscpy back to handle wchar
-          problems with VxWOrks and GHS.
-
-        * tao/encode.cpp: Inserted wslen and wscpy back to handle wchar
-          problems with VxWOrks and GHS.
-
-Tue Dec 16 18:29:42 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/README:
-        * docs/orbsvcs.html:
-          Started up the documentation for TAO services, at this point
-          only the directory hierarchy is explained.
-
-Tue Dec 16 08:49:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_codegen.h: Added three more states for
-        return types to be generated for operator [] of sequences of
-        strings and object references.
-
-        * TAO_IDL/be_include/be_sequence.h: Added enum constants to
-        indicate what kind of managed type is handled by the sequence. For
-        sequences other than that of strings and objrefs, this enum const
-        is MNG_NONE. Added a new method that returns the managed type.
-
-        * TAO_IDL/be/{be_sequence, be_state_sequence.cpp}: Added code to
-        generate sequences of strings and objrefs. This requires
-        generating special "managed" objects. In addition, for
-        be_state_sequence.cpp, we were not handling the case where base
-        types of sequences were not having any scope which resulted in
-        segmentation faults.
-
-        * TAO_IDL/be/{be_state_argument, be_state_operation}.cpp: Some
-        small bugs fixed. These included lack of a whitespace in the
-        generated code as well as spurious extra level of indirection
-        getting generated.
-
-        * TAO_IDL/be/be_type.cpp: "nested_type_name" now checks if the
-        scope with which are comparing is NUL or not before proceeding
-        further. Such a situation may arise for sequences whose base types
-        are anonymous (e.g., strings) and have no enclosing scope.
-
-        * TAO/tao/managed_types.{h,cpp,i}: Removed. No more needed as teh
-        code is generated by the IDL compiler. Accordingly modified
-        corb.h and did a "make depend" on the Makefile.
-
-        * TAO/docs/releasenotes/index.html: Updated to reflect new changes
-        as well as TO-DO stuff such as adding support for TIEs.
-
-Mon Dec 15 22:31:50 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.43, released Mon Dec 15 22:31:50 1997.
-
-Mon Dec 15 19:13:51 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/Timeprobe.cpp:
-          Removed Solaris specific code, somehow it survived from some
-          debugging session. Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for pointing out this bug.
-
-Mon Dec 15 16:52:58 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * TAO-INSTALL.html: Added some explanations for setting CPP_PATH
-          on NT.
-
-Mon Dec 15 16:49:58 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (cube_sequence): declare
-          local variables "l" and "j" as u_int instead of int, to avoid
-          signed/unsigned comparison.
-
-Thu Dec 11 16:44:26 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-          Fixed typo missed on the previous release.
-
-Thu Dec 11 22:18:52 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: Moved the code generation for the
-        _var and _out classes before the actual class declaration, but
-        after the forward declaration. This was necessary if any elements
-        in the scope of the interface are defined to be of the same type
-        as that interface. In such a situation those elements are defined
-        to be of the _var type. Hence the declaration for _var and _out
-        must precede the class declaration.
-
-Thu Dec 11 22:00:52 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/Naming_Service/Naming_Service.cpp (main): Fixed a bug
-        related to returning an empty string as the ior in the reply from
-        the multicast request.
-
-Thu Dec 11 14:06:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_exception,be_state_exception}.cpp: Support for
-        exceptions added. Added a new file called
-        "be_state_exception.cpp".
-
-        * TAO_IDL/be_include/be_state.h: Added a new singleton for
-        be_state_exception.
-
-        * TAO_IDL/be/be_state.cpp: Template instantiations for
-        be_state_exception.
-
-        * TAO/docs/releasenotes/index.html: Updated to include exception
-        support.
-
-        * TAO/tao/except.{h,cpp}: Moved the TypeCode member from the
-        private section to the protected section so that derived classes
-        can set it. Also, changed the variable from _type to type_ to
-        stick to the ACE design standards.
-
-Thu Dec 11 00:01:41 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.0.42, released Thu Dec 11 00:01:41 1997.
-
-Wed Dec 10 23:04:04 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/Scheduling_Service/Config_Scheduler.cpp:
-          Still struggling with g++, it seems to use the wrong cast for
-          IDL generated T_out classes.
-
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Logger/clnt.cpp:
-        * orbsvcs/tests/Logger/clnt.h:
-        * orbsvcs/tests/Logger/svr.cpp:
-          These files were missed in the orbsvcs hierarchy
-          reorganization.
-
-Wed Dec 10 22:38:08 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tests/Cubit/TAO/DII_Cubit: Fixed the  hand-crafted code to
-        make use of the many changes that were made to the dispatching
-        scheme as well as changes made to the signature of the skeletons
-        for operations of interfaces.
-
-Wed Dec 10 21:41:48 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated the release notes on the
-        Naming Service.
-
-Wed Dec 10 20:13:57 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * Makefile:
-          Added orbsvcs to the hierarchy.
-
-        * The orbsvcs directory was completely reorganized, in preparation
-          for its official release. The new hierarchy is:
-          - orbsvcs/orbsvcs: Contains a library with:
-            + The client stubs for the services.
-            + Common utility classes to access the services.
-            + The server skeletons, but not their implementation.
-          - orbsvcs/Naming_Service: the COSS Naming Service.
-          - orbsvcs/Scheduling_Service: TAO Real-Time Scheduling Service.
-          - orbsvcs/Event_Service: TAO Real-Time Event Service.
-          - orbsvcs/tests: test programs and examples.
-
-        * docs/releasenotes/index.html:
-          Updated documentation on the Event Service and its friends.
-
-Wed Dec 10 19:57:07 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (Cubit_i::cube_sequence):
-        Changed to explicitly use the vector_out::ptr() method to get a
-        ptr.  It seems that g++ wanted to interpret this expression
-        (output == 0) differently from Sun's C++, and this made both
-        interpret it in the desired way.
-
-Wed Dec 10 14:23:24 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/be_state_structure.cpp:
-          Fixed a bug when handling typedefs.
-          It was generating code for imported types, we protected the
-          generation with a !imported(), thank to Andy Gokhale
-          <gokhale@cs.wustl.edu> for helping me on this.
-
-        * tao/connect.cpp:
-          Set the TCP_NODELAY option by default, otherwise oneway calls
-          are considerably slower.  It should have no effect for twoway
-          calls.  Anyway an option should be added to control this
-          behavior.
-
-Wed Dec 10 13:15:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_include/{be_array, be_decl, be_field, be_module,
-        be_operation, be_predefined_type, be_structure, be_typedef}.h:
-        Added a protected function called "compute_size_type" which is
-        invoked if the size type of a data structure is not known in
-        advance. This happens for structs, unions, arrays, and typedefs
-        whose size type depends on their base types.
-
-        * TAO_IDL/be/{be_array, be_decl, be_field, be_module,
-        be_operation, be_predefined_type, be_structure, be_typedef}.cpp:
-        Implementation of the "compute_size_type".
-
-        * TAO_IDL/be/be_decl.cpp: Changed code that sets "size_type" so
-        that we first see if we are unknown in which case we set our size
-        type. However, once we are VARIABLE, no body can reset us to
-        fixed. Similarly, the overloaded size_type method that return the
-        size type first checks if our size is still unknown in which case
-        it calls for "compute_size_type". This is very essential for data
-        types defined in an imported (included) *.idl file. Thanks to Tom
-        Richards (tomr@mcmenterprise.com) for reporting the bug with
-        included file which resulted in this change.
-
-        * TAO_IDL/be/be_state_attribute.cpp: Included a case for
-        IN_PARAM_TYPE_CH for strings (had previously forgotten to do so).
-
-        * TAO_IDL/be/{be_state_structure, be_structure, be_field}.cpp:
-        Revamped so that we use the same switch based technique in
-        be_state_structure.cpp to generate code. For fields that are
-        sequences or structures or unions, we also generate their code.
-
-        * TAO_IDL/be/be_state_argument.cpp: Thanks to Tom Richards and
-        Carlos O'Ryan for noticing a bug when we use out sequences. There
-        used to be a seg fault in deep_free.cpp because a NUL pointer was
-        being owned by an Any and getting freed. In the server skeleton,
-        for out params we now generate code after the upcall is made so
-        that for out parameter value is inserted in the NVList that is
-        marshaled by the server.
-
-        * TAO_IDL/be/be_interface.cpp: In the generated call to _is_a, we
-        were calling CORBA::Object::_is_a if a remote call is
-        necessary. However, MSVC++ cannot handle a call of the form
-        CORBA::Object::_is_a. So we have to generate code that uses
-        ACE_CORBA_3 so as to be portable. Thanks to Nanbor Wang
-        (nw1@cs.wustl.edu).
-
-        * TAO/test/Cubit/TAO/IDL_Cubit/clnt.cpp: Changed the type of the
-        variable that was passed as the out parameter to cube_sequence.
-
-Wed Dec 10 01:02:36 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/iiopobj.cpp (set): Added a special case to IIOP Profile::set
-        so that if the address is INADDR_ANY, it uses the host name, but
-        otherwise uses the IP address.  This eliminates the cryptic
-        appearance of the address "0.0.0.0" in a server's IOR.
-
-Tue Dec  9 21:48:52 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-          The sequence test is not running right now, I'm commenting it
-          out until we can make it work properly.
-
-Tue Dec  9 18:02:43 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orb_core.cpp: The moral of this changelog entry is to be
-        VERY careful when cutting and pasting code...the
-        resource_factory() accessor should not be setting the
-        client_factory_ member at all!
-
-Tue Dec  9 11:55:50 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/compat/objbase.h: Added NOERROR as #define if we're not on
-        WIN32 so that IDL-generated code would continue to work.
-
-        * tao/tao_internals.cpp: Changed faked Resource Factory resource
-        source specifier to "tss" rather than "global".
-
-        * tao/orb_core.*: Added resource_factory() accessor to
-        TAO_ORB_Core.  This will create a default instance if it can't
-        locate one in the Service Repository, which will allow
-        applications to not encounter a hard failure when a svc.conf file
-        is missing.  A warning message is emitted stating that a default
-        is being used.  Applications should not rely on the default
-        settings, as it is very likely that the applicat might require
-        alternate settings for proper desired operation.
-
-        * tao/default_server.*: Added TAO_Reactive_Strategy template
-        class to use in place of the ACE_Reactive_Strategy.  It's only
-        difference from ACE_Reactive_Strategy is that instead of using the
-        reactor provided in the open method, it always uses that found
-        through the TAO_ORB_Core_instance().  This fix was motivated by a
-        general problem which was only observable on VxWorks with a
-        special pseudo-network transport.
-
-        * tao/connect.cpp: Added code to fail gracefully if socket buffer
-        size changes are not supported.
-
-Mon Dec  8 13:11:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-          Added more information on how the Event Channel and friends are
-          going.
-
-        * orbsvcs/bin/Naming_Service/svc.conf:
-          Removed some foreign ^M from the file.
-
-        * tao/Makefile:
-        * tao/connect.cpp:
-        * tao/giop.cpp:
-        * tao/orbobj.cpp:
-        * tao/Timeprobe.i:
-        * tao/Timeprobe.h:
-        * tao/Timeprobe.cpp:
-          Added a instrumentation class to measure time interval, also
-          instrumented some code, as part of the ongoing effort to
-          optimize the EC, unfortunately the problems are not in TAO ;-)
-          The code is only instrumented if compiled using probe=1, no
-          overhead is introduced in normal compiles.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit.idl:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h:
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.h:
-          Addded code to test sequences (as input and output parameters)
-          they don't work (yet).
-
-        * orbsvcs/lib/Makefile:
-        * orbsvcs/lib/Timeprobe.h:
-        * orbsvcs/lib/Timeprobe.i:
-        * orbsvcs/lib/Timeprobe.cpp:
-          The file was moved to $TAO_ROOT/tao.
-
-        * orbsvcs/lib/Scheduler_Factory.cpp:
-          Fixed default dump file, it was using stdout!
-
-Sat Dec 06 15:42:25 1997    <nw1@DINGO>
-
-        * tests/Cubit/TAO/IDL_Cubit/{server,client}.dsp: Updated link time
-          library names.
-
-        * tao/any.cpp:
-        * tao/any.h:
-        * tao/corba.h:
-        * tao/corbacom.h:
-        * tao/decode.cpp:
-        * tao/encode.cpp:
-        * tao/except.cpp:
-        * tao/except.h:
-        * tao/giop.cpp:
-        * tao/iiopobj.cpp:
-        * tao/iiopobj.h:
-        * tao/iioporb.cpp:
-        * tao/iioporb.h:
-        * tao/nvlist.cpp:
-        * tao/nvlist.h:
-        * tao/object.cpp:
-        * tao/object.h:
-        * tao/object.i:
-        * tao/orbobj.cpp:
-        * tao/orbobj.h:
-        * tao/orbobj.i:
-        * tao/poa.cpp:
-        * tao/poa.h:
-        * tao/principa.cpp:
-        * tao/principa.h:
-        * tao/request.cpp:
-        * tao/request.h:
-        * tao/stub.h:
-        * tao/svrrqst.cpp:
-        * tao/svrrqst.h:
-        * tao/typecode.cpp:
-        * tao/typecode.h:
-        * tao/compat/initguid.h:
-        * tao/compat/objbase.h: Removed dependencies on Microsoft's DCOM
-          files.  Below is a list of names that got changed.
-
-            HRESULT -> TAO_HRESULT
-            IID -> TAO_IID
-            IUnknown -> TAO_IUnknown
-            IID_IUnknown -> IID_TAO_IUnknown
-            SCODE -> TAO_SCODE
-            NOERROR -> TAO_NOERROR
-            E_NOINTERFACE -> TAO_E_NOINTERFACE
-            VARTYPE -> TAO_VARTYPE
-            VARENUM -> TAO_VARENUM
-            CY -> TAO_CY
-            VARIANT -> TAO_VARIANT
-            DATE -> TAO_DATE
-
-Fri Dec  5 11:42:25 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/iiopobj.cpp (set): Changed the IIOP::Profile::set() methods
-        which take an ACE_INET_Addr to retrieve the host IP address rather
-        than host name for storage in the profile.  This is motivated by
-        the following situation: machine has 3 interfaces (not including
-        loopback), and it is desired that clients and servers communicate
-        across only one interface.
-
-        When our IDL_Cubit example's factory created new Cubit instances,
-        the set() method would set the host name for that IIOP::Profile to
-        whatever ACE_INET_Addr::get_host_name() returned.  In this case,
-        the IP addr for interface 3 (which is not the primary interface)
-        would return a *LIST* of names in which the first name was that of
-        the primary interface.  Thus, the IP address used by the client
-        would be wrong.
-
-        * tao/object.h: Minor corrections to header comments.
-
-        * tao/{orb_core,orbobj}.{h,cpp}: Moved server_factory and
-        client_factory ptr storage from CORBA_ORB to TAO_ORB_Core.  It
-        really didn't belong there in the first place.
-
-        * tao/poa.cpp: CTOR now fetches server factory ptr from the
-        TAO_ORB_Core rather than from the ORB.
-
-Thu Dec  4 18:20:55 1997  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * TAO_IDL/tao_idl.dsp: Changed hard coded path for cl.exe to CPP_PATH
-          environment variable
-
-Thu Dec  4 11:23:55 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/include/{idl,ast,utl_idlist, utl_identifier}.h: removed
-        #include "ace/stdcpp.h" since this file was removed from
-        ACE. Instead we now include "ace/streams.h" in idl.h
-
-        Also made make depend on all the Makefiles.
-
-Wed Dec  3 16:08:34 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/lib/Event_Utilities.cpp:
-        * orbsvcs/lib/Event_Utilities.i:
-        * orbsvcs/lib/RtecEventComm.idl:
-          Added some more time-stamps to the events to track and measure
-          the delays as they move on the EC.
-
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-        * orbsvcs/lib/RtecEventChannelAdminC.i:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.h:
-        * orbsvcs/lib/RtecEventChannelAdminS.i:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommC.i:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecEventCommS.h:
-        * orbsvcs/lib/RtecEventCommS.i:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerC.h:
-        * orbsvcs/lib/RtecSchedulerC.i:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-        * orbsvcs/lib/RtecSchedulerS.h:
-        * orbsvcs/lib/RtecSchedulerS.i:
-          Thanks to Andy Gokhale efforst the IDL compiler is able to emit
-          proper code for the EC&friends, hence I'm removing the
-          hand-crafted files.
-
-Wed Dec  3 11:12:48 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: Had forgotten to emit code that
-        adds one more cast to the base POA_* class in the generated *S.i
-        file.
-
-Wed Dec 03 09:40:36 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile: added TAO_PLATFORM_SVC_CONF_FILE_NOTSUP to
-          CPPFLAGS on CHORUS.  Thanks to Wei Chiang for this change.
-
-Tue Dec  2 15:47:09 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.h: Added some helper methods to generate
-        additional code in the form of larger operation tables, and
-        skeletons. This situation arises when we have single/multiple
-        inheritance of interfaces.
-
-        * TAO_IDL/be_include/be.h: Included ace/Containers.h for the
-        ACE_Unbounded_Queue that uses the breadth-first strategy used in
-        be_interface.cpp
-
-        * TAO_IDL/be/{be_interface,be_operation,be_attribute}.cpp: Added code
-        to generate a new "virtual void dispatch" method on the skeleton
-        classes. The dispatch method enables us to access the most derived
-        type when invoking the skeleton for a method. The skeletons
-        instead of taking a CORBA::Object_ptr, now take void*. The
-        skeletons themselves cast this void* to the appropriate POA_*
-        type.
-
-        In addition to the above, for the case of inheritance of
-        interfaces, it is not appropriate to pass a pointer to the most
-        derived class as a void* to the skeleton of a base class and cast
-        that to the POA_* of the base class. So we generate inlined code
-        for skeletons of methods in the most derived class even if those
-        methods were defined in the base classes. These inlined skeletons
-        simply cast the object pointer to the right type and invoke the
-        corresponding skeleton of the base class method.
-
-        be_interface.cpp defines a template method to traverse the entire
-        inheritance graph. This traversal is done using a breadth-first
-        traversal. This traverse method takes a pointer to one of the
-        static helper methods defined on class be_interface. Each helper
-        achieves a different purpose such as generation of extended
-        operation tables, providing comparisons of repositoryIDs of base
-        classes in the _is_a methods of derived classes.
-
-        The client-side class now defines a virtual CORBA::Boolean _is_a
-        method. This uses local knowledge of repository ids thereby
-        preventing the expensive remote call in most cases. All changes
-        made in be_interface.cpp
-
-        * TAO/tao/corbacom.h: Changed the signature of TAO_Skeleton so that
-        it uses void*obj and a void *context.
-
-        * TAO/tao/object.h: Added a virtual dispatch method as explained
-        above.
-
-        * TAO/tao/orb.h: Redefinition of TAO_Skeleton removed.
-
-        * TAO/tao/poa.cpp: Changed the demultiplexing code to reflect the
-        change made with the dispatch method. The poa on finding the right
-        object corresponding to the key, now invokes the dispatch method
-        on that object which by dynamic binding invokes the dispatch
-        method of the POA_* class.
-
-Tue Dec 02 15:29:41 1997    <nw1@CHA-CHA>
-
-        * tao/{connect,orb_core}.h: Moved Win32 specific template
-          specialization declaration from connect.h to orb_core.h because
-          the definition had moved to orb_core.i.
-
-        * tao/object.cpp: Removed conditional directives around
-          DEFINE_GUID for IID_IUnknown.  This is now defined for Win32
-          also.
-
-        * tao/TAO.dsp: Removed macro definition __IIOP_BUILD.  It was not
-          used anywhere.
-
-Tue Dec  2 10:25:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/corba.h:
-          Fixed some problems with the ACE_RETHROW macros.
-
-        * orbsvcs/lib/Makefile:
-        * orbsvcs/lib/Timeprobe.h:
-        * orbsvcs/lib/Timeprobe.i:
-        * orbsvcs/lib/Timeprobe.cpp:
-          Added a high resolution timer facility, to measure the delays in
-          the Event Channel and in its client.
-
-        * orbsvcs/lib/RtecEventComm.idl:
-          Changed the time_ field of Event to a double. It should be an
-          structure or a long long, but double is big enough to store
-
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerC.h:
-        * orbsvcs/lib/RtecSchedulerC.i:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-        * orbsvcs/lib/RtecSchedulerS.h:
-          Regenerated the files using the newest IDL compiler; still some
-          hand crafting due to inherited classes.
-
-Tue Dec  2 03:12:50 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Check for errors when
-        resolving using the "NameService" environment variable.
-
-        * orbsvcs/bin/Naming_Service/CosNaming_i.cpp (NS_NamingContext):
-        * orbsvcs/bin/Naming_Service/CosNaming_i.h (NS_NamingContext):
-        - Added constructor that takes a key to initialize the object,
-        instead of using the default name generation.
-        - Enabled some exceptions that are already supported.
-
-        * orbsvcs/bin/Naming_Service/svr.cpp (main): Create first naming
-        context with key "NamingContext".  And minor changes.
-
-        * tests/Cubit/CORBAplus/IDL_Cubit/Makefile:
-        * tests/Cubit/CORBAplus/IDL_Cubit/README:
-        * tests/Cubit/CORBAplus/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/CORBAplus/IDL_Cubit/clnt.h:
-        * tests/Cubit/CORBAplus/IDL_Cubit/cubit.idl:
-        * tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.cpp:
-        * tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h:
-        * tests/Cubit/CORBAplus/IDL_Cubit/svr.cpp: Ported the IDL cubit
-        example to CORBAplus.  Currently, the calls using DII are not
-        ported, so only the "cube average" and the "cube_union_stub" stats
-        are printed.
-
-Mon Dec  1 16:51:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/except.{h,cpp}: Changed semantics of CORBA::Exception so
-        that the mere creation of them does not take a reference.
-        Instead, the user of the exception is expected to call AddRef().
-        CORBA::Environment has been modified (and even documented!) to
-        reflect that as well.
-
-Sun Nov 30 17:08:56 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-          Added missed parameter in do_call() for
-          RtecScheduler::Scheduler::set().
-
-Sat Nov 29 13:34:58 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/stub.i (STUB_Object):
-          No need to release type_id, since it is a String_var now. Thanks
-          to Wei Chiang <chiang@tele.nokia.fi> for pointing this out.
-
-        * giop.cpp:
-          If things go wrong TAO_GIOP::send_request will close the
-          handler and set it to zero, but only a temporary was
-          affected, I decided to set the original value to zero also;
-          based on the return value.
-
-Wed Nov 26 23:24:57 1997    <cleeland@cs.wustl.edu>
-
-        * TAO version 0.0.41, released Wed Nov 26 23:24:57 1997.
-
-Wed Nov 26 16:40:29 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Changed release calls to use
-        the CORBA standard version rather than the non-standard TAO
-        Release() method.  Also moved the client's parse_args() AFTER the
-        ORB_init() so that -ORB parameters were parsed correctly.
-
-        * tao/params.*: Added storage for send and receive socket buffer
-        size to be used for all newly created sockets.  These sizes are
-        initialized to ACE_DEFAULT_MAX_SOCKET_BUFSIZ, and can be changed
-        by the user by using -ORBsndsock and -ORBrcvsock.
-
-        * tao/orbobj.h: Added documentation.
-
-        * tao/orb_core.i: Changed system-specific conditional compilation
-        to use the more general ACE_LACKS_TEMPLATE_SPECIALIZATION.
-
-        * tao/orb_core.cpp: Added code to make -ORBsndsock and -ORBrcvsock
-        options actually work.  Added -ORBpreconnect option to implement
-        pre-cached connections.
-
-        * tao/giop.cpp: Removed the old static inline version of
-        start_message().  Also changed to use send_n() to guarantee
-        correct blocking nature on Win32 with the WFMO Reactor.
-
-        * tao/connect.cpp: Changed set_option() calls to use the socket
-        buffer sizes stored in the TAO_ORB_Parameters instance.  Also
-        added a correct environment-clearing call before initializing a
-        request.
-
-        * tao/client_factory.h: Removed extraneous code.
-
-        * tao/{connect,any,giop,iiopobj,marshal,nvlist,objtable,optable,
-               orb_core,poa,principa,stub,svrrqst,typecode}.h:
-        Addressed or assigned some '@@' comments.
-
-        * docs/releasenotes/orbcore.html: Added information regarding new
-        options, known bugs, etc.
-
-        * docs/Options.html: Added documentation for new -ORBpreconnect
-        option.
-
-        * TAO_IDL/be/Makefile: Added an explicit PIC=-fPIC for when g++ is
-        being used as the compiler.  This fixes the linker complaints.
-
-Sat Dec 20 14:57:30 1997    <nw1@CHA-CHA>
-
-        * All MSVC 5.0 project files: Removed unnecessary library
-          inclusions.  Most of them are not necessary.
-
-Tue Nov 25 20:49:24 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/orbobj.h:
-        * tao/orbobj.cpp:
-        * tao/orb_core.cpp:
-        * tao/params.h:
-        * tao/params.cpp:
-          Removed the parameters to specify the event service and schedule
-          service IOR, the naming service is working now so it can be
-          used. And the support in "resolve_initial_references".
-
-        * tao/corbacom.i:
-        * tao/decode.cpp:
-          Reverted the previous change, but this time added proper
-          comments: the spec says that a Naming_var taking a <char*> is
-          *not* supposed to copy it. Hence the ObjRef decoder cannot
-          release the string it just read.
-
-Mon Nov 24 20:40:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/corbacom.i:
-          Fixed string allocation problem for String_var(char*): if it
-          does not copy the string we run into problems with the
-          demarshalling code.
-
-        * orbsvcs/lib/Event_Utilities.cpp:
-        * orbsvcs/lib/Event_Utilities.h:
-        * orbsvcs/lib/Event_Utilities.i:
-        * orbsvcs/lib/RtecEventChannelAdmin.idl:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-          Removed the unused forward_event parameter in the ConsumerQoS.
-
-        * orbsvcs/lib/RtecSchedulerC.h:
-        * orbsvcs/lib/RtecSchedulerC.i:
-          Hand crafted the T_out constructors to take a "const T_out&"
-          instead of just "T_out&".
-
-Sat Nov 22 18:21:10 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_codegen.h, be/be_codegen.cpp: Added a
-        number of states to handle attributes
-
-        * TAO_IDL/be/{be_attribute,be_state_attribute}.cpp: Code added to
-        handle attributes. This code is a mix of code that is used to
-        handle operations as well as arguments because for attributes we
-        have 2 methods, one to set the value and one which returns the
-        value. For a readonly attribute, there is only the get method.
-
-        A special note: Due to the large switch statement, I had to use
-        -fPIC for g++. We are working on abstracting all the commin
-        functionality once we have the basic IDL compiler working.
-
-        * TAO_IDL/be/be_interface.cpp: Operation table now also includes
-        methods to set and get the attributes if they are present. In
-        addition, the variable name for the operation tables is now the
-        full flattened name to avoid conflicts.
-
-        * TAO_IDL/be/be_sequence.cpp: In the length method, the index of
-        lookp variable "i" is changed from "int" to CORBA::ULong as g++
-        was issuing a warning.
-
-        * TAO_IDL/be/be_string.cpp, be_state_argument,cpp: Proper handling
-        of in, inout, and out strings that are either anonymous or are
-        typedefed.
-
-Fri Nov 21 13:22:39 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.40, released Fri Nov 21 13:22:39 1997.
-
-Thu Nov 20 10:31:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbconf.h (SIZEOF_LONG_DOUBLE): Made sure this is defined
-        properly for Chorus.  Thanks to Wei Chiang <chiang@tele.nokia.fi>
-        for submitting these!
-
-        * tao/orb_core.cpp (init): Added some changes for Chorus.  Thanks
-        to Wei Chiang <chiang@tele.nokia.fi> for submitting these!
-
-        * tao/object.cpp (_is_a): Explicitly specify which conversion
-        operator to use when comparing type_id to 0.
-
-Thu Nov 20 00:10:52 1997  Sergio Flores  <sergio@cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/clnt.h :
-        * orbsvcs/tests/Logger/clnt.cpp (Logger_Client): Fixed a bug
-        dealing with using "_bind" when the naming service is not
-        available.
-
-Thu Nov 20 00:06:03 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.39, released Thu Nov 20 00:06:03 1997.
-
-Thu Nov 20 00:01:06 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * tao/Makefile: Reordered the files so they are built in
-        alphabetic order (within each grouping of targets).  This makes it
-        easier to see how the compilation process is doing ;-).
-
-Wed Nov 19 22:59:18 1997  Sergio Flores  <sergio@cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Minor change to output
-        debug statement.
-
-Wed Nov 19 23:01:46 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_state_operation.cpp: Fixed the problem with
-        strings as return values.  Thanks to Mark L Boriack
-        <mark@vtcibm4a> for reporting this.
-
-Wed Nov 19 20:48:01 1997  James C Hu  <jxh@cs.wustl.edu>
-
-        * tests/Thruput_test/server.cpp: Commented out some unreachable
-          code at the bottom of main.
-
-Wed Nov 19 19:04:53 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tao/decode.cpp (decode): Added a cast so that compiler would
-        know which operator to call.
-
-        * orbsvcs/bin/Naming_Service/svr.cpp (handle_input): Change port
-        number received to host byte order.  Minor changes.
-
-        * tao/orbobj.cpp (resolve_name_service): Send port number in
-        network byte order.
-
-Wed Nov 19 17:45:52 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Put in proper release of
-        resources after _narrow operation.
-
-        * tao/stub.h: Used CORBA::String_var as the underlying type for
-        'type_id' in STUB_Object.  In the long run this may be a bad idea
-        for performance considerations, but we may be able to improve that
-        by improving the implementation of String_var.
-
-        * tao/orbobj.cpp: Removed unreachable ACE_NOTSUP_RETURN.
-
-        * tao/decode.cpp: Made allocation and free semantics of
-        'type_hint' consistent with its type of CORBA::String.
-
-Wed Nov 19 17:33:42 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * Task_Client.cpp: Fixed error_count.. Thanks to James Hu.
-
-Wed Nov 19 17:20:45 1997  James C Hu  <jxh@cs.wustl.edu>
-
-        * TAO_IDL/be/be_operation.cpp: Removed an unreachable return
-          statement.  There was already a return above it.
-
-        * TAO_IDL/ast/ast_expression.cpp: Added casts to comparisons of
-          char variables to 0, since chars are unsigned by default in
-          SGI.
-
-        * tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp: Removed a
-          couple of unreachable return statements.  There are still
-          unreachable statements remaining.  Need help with them.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-          Meaningless type qualifier (const ...) removed.
-
-          Some functions were returning `retval' before it was set.  I had
-          these functions return a passed in paramenter instead.
-
-Wed Nov 19 13:50:36 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.38, released Wed Nov 19 13:50:36 1997.
-
-Wed Nov 19 13:11:53 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/lib/Scheduler_Factory.cpp (dump_schedule): changed loop
-          index from int to u_int to avoid signed/unsigned comparison.
-          (use_runtime): return 0.
-
-        * orbsvcs/lib/Event_Utilities.cpp (debug): changed loop
-          index from int to u_int to avoid signed/unsigned comparison.
-
-Wed Nov 19 12:22:50 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Reverted some of the
-        minor changes below, specifically the use of ACE_ERROR_RETURN
-        rather than ACE_ERROR/return.  ACE_ERROR_RETURN cannot be used
-        as-is because the 2nd parameter is used as an 'int' to specify the
-        operational status, and the return value of this function is NOT
-        an int.  Also had to add a missing semi-colon which caused none of
-        the code to compile.
-
-Wed Nov 19 12:07:42 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.37, released Wed Nov 19 12:07:42 1997.
-
-Wed Nov 19 10:37:19 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/lib/Scheduler_Factory.cpp:
-          The type declared for the rt_info array was wrong.
-
-Wed Nov 19 09:18:30 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.36, released Wed Nov 19 09:18:30 1997.
-
-Wed Nov 19 09:15:15 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Made a bunch of minor
-          Changes for resolving the Naming service.
-
-Wed Nov 19 08:44:12 1997  Brian Mendel <brian.r.mendel@boeing.com>
-
-        * tests/Cubit/TAO/DII_Cubit/default.bld:
-        * tests/Cubit/TAO/DII_Cubit/clnt.bld:
-        * tests/Cubit/TAO/DII_Cubit/svr.bld:
-        * tests/Cubit/TAO/IDL_Cubit/default.bld:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.bld:
-        * tests/Cubit/TAO/IDL_Cubit/svr.bld:
-        * tests/Cubit/TAO/MT_Cubit/default.bld:
-        * tests/Cubit/TAO/MT_Cubit/clnt.bld:
-        * tests/Cubit/TAO/MT_Cubit/svr.bld:  Added build files in the new
-          test structure for VxWorks using the GHS compiler.
-
-        * tests/Cubit/Build: Removed the obsolete build directory for vxWorks.
-
-Wed Nov 19 07:47:13 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.35, released Wed Nov 19 07:47:13 1997.
-
-Wed Nov 19 05:53:42 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/DII_Cubit/clnt.h:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h: Changed code to add loop
-        around all cube calls, and make output more consistent.
-
-        * orbsvcs/tests/Logger/Makefile:
-        * orbsvcs/tests/Logger/ior_multicast.cpp:
-        * orbsvcs/tests/Logger/ior_multicast.h: Removed unneeded
-        ior_multicast.* source files from the logger example.  It now uses
-        the resolve_initial_references() to use the naming service for its
-        advertisement.
-
-        * orbsvcs/lib/Makefile (realclean): Updated with realclean & clean
-        rules to delete CosNamingS.* and CosNamingC.*
-
-        * docs/releasenotes/index.html: Updated status of the naming
-        service to working implementation.
-
-        * orbsvcs/lib/CosNamingS.cpp:
-        * orbsvcs/lib/CosNamingS.i:
-        * orbsvcs/lib/CosNamingS.h:
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/CosNamingC.i:
-        * orbsvcs/lib/CosNamingC.h: Removed these files from the
-        repository, since the IDL compiler generates these correctly.
-
-        * orbsvcs/bin/Naming_Service/CosNaming_i.cpp (list): Remove
-        warning for unused variable.
-
-        * orbsvcs/bin/Naming_Service/svr.h: Constructor of event handler
-        for multicast doesn't need reply port anymore.
-
-        * orbsvcs/bin/Naming_Service/svr.cpp (handle_input): Now receives
-        the port number in the multicast request.  Suggested by Doug
-        Schmidt.
-
-        * tao/orbobj.cpp (resolve_name_service): changed return value
-        variable to be signed.  Added code to send the port number in the
-        multicast resolution mechanism as a CORBA::Short.
-
-        * orbsvcs/bin/Naming_Service/NS_CosNaming.cpp (NS_ExtId):
-        Reordered initializers in the constructor.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.h:
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (run): Added a loop around
-        all cube calls and added calls/sec stats for them.
-
-        * tao/corba.h: Changed order of inclusion of marshal.i, due to
-        warnings of the declaration of the inline function
-        make_marshal_object().
-
-        * tao/orbobj.i: reorder the declaration of inline
-        CORBA_OBJ::Add_Ref(), to remove a warning.
-
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp (main):
-        removed return statement that was causing a warning.
-
-Wed Nov 19 04:22:48 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.34, released Wed Nov 19 04:22:48 1997.
-
-Tue Nov 18 01:29:00 1997    <nw1@COYOTE>
-
-        * tao/TAO.dsp:  Added Arg_Shifter.cpp into project file.
-
-Tue Nov 18 18:53:57 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * TAO_IDL/be/be_state_typedef.cpp (gen_code):
-        * TAO_IDL/be/be_state_structure.cpp (gen_code):
-        * TAO_IDL/be/be_state_sequence.cpp (gen_code):
-        * TAO_IDL/be/be_state_operation.cpp (gen_code):
-        * TAO_IDL/be/be_state_array.cpp (gen_code): Comment out
-        unreachable break statements.
-
-        * TAO_IDL/ast/ast_array.cpp (n_dims):
-        * TAO_IDL/include/ast_array.h (AST_Array::n_dims):
-        * TAO_IDL/ast/ast_attribute.cpp (readonly):
-        * TAO_IDL/include/ast_attribute.h (AST_Attribute::readonly):
-        * TAO_IDL/ast/ast_argument.cpp (direction):
-        * TAO_IDL/include/ast_argument.h (AST_Argument::direction):
-        * tao/nvlist.h (CORBA_NamedValue::name):
-        * TAO_IDL/include/utl_scope.h (UTL_Scope::scope_node_type):
-        * TAO_IDL/ast/ast_predefined_type.cpp (pt):
-        * TAO_IDL/include/ast_predefined_type.h (AST_PredefinedType::pt):
-        removed const from declarations that it didn't have a meaning for.
-        Also from return statements.  These changes were suggested by
-        James Hu and the SGI compiler.
-
-Tue Nov 18 18:34:16 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * tests/Cubit/COOL/client.cpp: ORB_init is now called in
-        Task_Client.cpp instead of the main program, to insure that its
-        called in the right thread.
-
-        * tests/Cubit/COOL/Task_Client.{h,cpp}: Used the COOL_Activity to
-        create threads instead of ACE_Task.
-
-        * tests/Cubit/COOL/server.cpp: Used the createActivity stuff to
-        create threads.  The server now creates two servants, one for high
-        and the other for low priority clients.
-
-Tue Nov 18 17:44:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/corbacom.h: Added special case for CORBA::WChar to be a
-        short on VxWorks/GreenHills.
-
-        * TAO_IDL/be/be_state.cpp: Added template instantiations for SGI.
-
-        * tao/deep_free.cpp (deep_free): Removed unused 'alignment'
-        variable.
-
-        * tao/deep_copy.cpp (deep_copy): Removed unused 'alignment'
-        variable.
-
-        * tao/encode.cpp (encode): Removed unused 'continue_encoding'
-        variable.
-
-        * tao/orbobj.cpp (POA_init): Removed options which were no longer
-        supported/necessary, as well as their corresponding variables.
-
-Tue Nov 18 17:33:20 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/lib/RtecEventChannelAdmin.idl:
-        * orbsvcs/lib/RtecEventComm.idl:
-          Changed several operations to "oneway" to avoid dead-locks in
-          the Event Channel tests.
-
-        * orbsvcs/lib/Runtime_Scheduler.h:
-        * orbsvcs/lib/Runtime_Scheduler.cpp:
-          This class is a servant, event though it is only used
-          collocated, so it must inherit from the POA class.
-
-        * orbsvcs/lib/Scheduler_Factory.cpp:
-          Care must be exercised to create the Runtime_Scheduler instance
-          only once the ORB is up and running.
-
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/CosNamingC.h:
-        * orbsvcs/lib/CosNamingS.cpp:
-        * orbsvcs/lib/CosNamingS.h:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.h:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecEventCommS.h:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerC.h:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-        * orbsvcs/lib/RtecSchedulerS.h:
-          Regenerated all the stubs and skeletons using the latest IDL
-          compiler, but still some hand crafting is required, namely for
-          operations in base classes.
-
-Tue Nov 18 14:27:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/cdr.cpp (CDR): Changed TAO_PURIFY to ACE_PURIFY.
-
-        * tests/Cubit/TAO/MT_Cubit/serdatever/svr.cpp: Added code to put use a
-        kinder, gentler high priority value on VxWorks.  This makes it
-        easier for the machine to remain running. :-\
-
-        * tao/corbacom.h: Added CVS id keyword.
-
-        * tao/{corba.h,tao_internals.h,tao_internals.cpp}: Backed out
-        tao_internals.h, which is not intended to be publicly visible.
-        corba.h should contain only headers/inlines for things which
-        should be externally visible.
-
-Tue Nov 18 04:00:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/poa.cpp:
-          An operation lookup on the dispatching code will cause an error
-          message and the CORBA::BAD_OPERATION exception to be raised.
-
-        * tao/orb_core.cpp:
-          Somehow the options for setting the Event Service and the
-          Scheduling Service IOR were lost. Eventually they must be
-          removed, but we are still testing the Naming Service.
-
-Tue Nov 18 02:17:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.33, released Tue Nov 18 02:17:24 1997.
-
-Tue Nov 18 02:03:22 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/svr.cpp:
-        * orbsvcs/tests/Logger/clnt.cpp: This test example now uses the
-        naming service in the server and client.  Also changed the code to
-        have a default use in case the naming service is not available.
-
-        * tao/orbobj.cpp (resolve_name_service): Fixed a bug, dealing with
-        closing the endpoint of communication for the response of the
-        multicast mechanism.
-
-Tue Nov 18 01:37:42 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_operation.cpp,be_state_operation}.cpp: We now
-        properly handle the declaration and assigning to the return value.
-
-        * TAO_IDL/be/be_state_argument.cpp: Removed a spurious ()
-        appearing after a function call.
-
-        * TAO_IDL/be/{be_structure,be_union}.cpp: Carlos had removed the
-        if !imported check in the member counting function, but it had
-        crept in again, maybe due to me. So this is fixed again.
-
-        * test/Cubit/TAO/IDL/svr.cpp: Removed the hack which was
-        separating command line arguments starting with O. We leave this
-        task to the newly added Arg_Shifter.
-
-        * tao.orbobj.cpp: In ORB_init, the call to
-        TAO_ORb_Core_instance->init needed a char ** argv and we were
-        passing a char * const* argv. So we cast this. g++ was giving this
-        error.
-
-        * TAO_IDL/be_include/be_codegen.h, TAO_IDL/be/be_codegen.cpp:
-        Added 5 new states for code generation. All of these for
-        operations and arguments.
-
-        * TAO_IDL/be/be_argument.cpp: Made all methods uniform so that the
-        state will be set by the corresponding be_operation method. Thus
-        the be_operation method will vary the state but still invoke the
-        same be_argument method.
-
-        * TAO_IDL/be/be_enum.cpp, be_structure.cpp, be_union.cpp, be_field.cpp,
-        be_sequence.cpp: Some reformatting, removed unused variables.
-
-        * TAO_IDL/be/be_scope.cpp: Changes include adding ACE_ERROR_RETURN
-        with file name, line number capability. In addition, we were not
-        testing for return status of the various gen methods called.
-
-        * Most important changes in these files:
-
-        TAO_IDL/be/{be_operation,be_state_argument,be_state_operation}.cpp:
-
-        Large scale changes that include a uniform way to invoke methods
-        of the be_argument class from the be_operation methods. Added the
-        5 new states. Added proper handling of _out parameters in stubs
-        and skeletons.
-
-Mon Nov 17 20:05:40 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Cleaned up lots of places
-        where the allocated stuff wasn't being deallocated.
-
-        * tao/request.cpp: Insured that the CTOR adds a reference for the
-        dynamically-allocated NamedValue.
-
-        * tao/orb_core.cpp: Freed the faked service configurator argv.
-
-        * tao/iiopobj.h: Removed anachronistic comments.
-
-        * tao/iiopobj.{i,cpp}: Changed allocation of IIOP::Profile.host to use
-        new/delete rather than strdup/free b/c the decoder, which is
-        generic, must use new to allocate the space.  Thus, the strdup had
-        to go.  Purify now happier.
-
-        * tao/cdr.cpp: Added call to memset bracketed by #if
-        defined(TAO_PURIFY) in order to appease the purify gods.
-
-Mon Nov 17 20:05:16 1997  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-        * arg_shifter.cpp:
-        fixed a bug where in new, gcc used the address of an integer
-        reference rather than its value. weird.
-
-        * tao/orb_core.cpp:
-          Modified the init routine to "consume" command line arguments it
-          recognizes by placing them in the rear of argv, and adjusting
-          argc. It uses the Arg_Shifter class to accomplish this.
-
-        * tao/arg_shifter.h:
-        * tao/arg_shifter.cpp:
-          The Arg_Shifter class is an iterator that, as it iterates over
-          argv, places consumed arguments at the end of the vector,
-          ignored ones in their original order at the beginning of the
-          vector, and adjusts argc to hide the consumed arguments.
-
-Mon Nov 17 18:40:49 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/orb_core.i:
-          Some data was not initialized when used from a thread different
-          than the one doing ORB_init (even though we choose a global ORB
-          in the svc.conf file). Chris found a fix for this. The affected
-          methods are reactor(), thr_mgr(), connector() and acceptor().
-
-        * TAO_IDL/be/be_sequence.cpp:
-          length was not working if the value was <= than the maximum.
-
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-          Fixed the length() problem by hand, even though the new IDL
-          compiler should do it right.
-
-Mon Nov 17 11:52:54 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp (server_header),
-          TAO_IDL/util/utl_global.cpp (be_change_idl_file_extension):
-          Updated several methods to ensure const correctness for the
-          updated ACE_OS::str*() methods.  Thanks to David Levine for
-          reporting this.
-
-Mon Nov 17 02:40:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.32, released Mon Nov 17 02:40:14 1997.
-
-Mon Nov 17 01:48:17 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/be_scope.cpp:
-          TypeCode generation was failing for imported members.
-
-        * TAO_IDL/be/be_structure.cpp:
-          Member count must include all members, imported or not.
-
-        * TAO_IDL/be/be_typedef.cpp:
-          Added missing decr_indent() in the typecode generation which was
-          making the generated code completely unreadable.
-
-        * orbsvcs/lib/RtecEventChannelAdmin.idl:
-        * orbsvcs/lib/RtecEventComm.idl:
-          Removed the PullConsumer and PullSupplier classes, they are not
-          supported.
-
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/CosNamingS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-        * orbsvcs/lib/RtecEventChannelAdminC.i:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.h:
-        * orbsvcs/lib/RtecEventChannelAdminS.i:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommC.i:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecEventCommS.h:
-        * orbsvcs/lib/RtecEventCommS.i:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-          New version of the generated files, this last version is almost
-          making in it, but still needs hand crafting.
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-          Fixed buggy TypeCode lenght computation, it was only taking into
-          account the tc_encap_len() for the base type but it should use
-          the full tc_size().
-
-        * tao/encode.cpp:
-          Object references *must* be passed a pointer to Object_ptr in
-          the marshalling code.
-
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_state_operation.cpp:
-          Fixed generated code for Object references as return values. It
-          allocates the Object_ptr in the heap, stores the result there
-          and creates an Any for it.
-
-Sun Nov 16 23:30:26 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/svr.cpp (main):
-        Changed the code to use the resolve_initial_references ()
-        interface to get the object refrence to the naming service.
-
-        * orbsvcs/tests/Logger/clnt.cpp (main): Now uses the
-        resolve_initial_references() to get the naming service object
-        reference, to get the logger factory object reference.
-
-        * orbsvcs/bin/Naming_Service/svr.cpp (main):
-        * orbsvcs/bin/Naming_Service/svr.h:
-        Added code to respond to multicast requests for the IOR.
-
-        Added code to respond to multicast requests for the IOR.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Fixed some formatting
-        problems dealing with the precision of the output.
-
-Sun Nov 16 14:48:00 1997    <nw1@COYOTE>
-
-        * test/Cubit/TAO/IDL_Cubit/{server,client}.dsp: Updated library
-          path for release version.
-
-        * TAO_IDL/TAO_IDL.mak:
-        * TAO_IDL/tao_idl.dsp: Added new files (be_state_*.cpp) into
-          project file.
-
-Sun Nov 16 12:56:24 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: The _is_a_skel method's signature
-        had an Object_ptr obj parameter which was unused. Instead of
-        generating the ACE_UNUSED_ARG (obj) line of code, we use /* obj */
-        in the signature.
-
-Sun Nov 16 05:51:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.31, released Sun Nov 16 05:51:38 1997.
-
-Sun Nov 16 00:22:04 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-          Fixed output for structs and union test.
-
-        * tao/iiopobj.cpp:
-          If the user provides no key for an object we generate one, based
-          on the object address.
-
-        * TAO_IDL/be/be_sequence.cpp:
-          The length() method should get the maximum if reallocation
-          occurs.
-
-        * tao/orb_core.cpp:
-        * tao/orbobj.cpp:
-        * tao/orbobj.h:
-        * tao/params.cpp:
-        * tao/params.h:
-          Added new options to the ORB (-ORBeventserviceior,
-          -ORBscheduleserviceior), this should go away once the Naming
-          Service works properly, but are needed now to locate this
-          services.
-
-        * orbsvcs/lib/Makefile:
-          Added several small classes that help when using the Scheduling
-          and/or the Event Service.
-
-        * orbsvcs/lib/Scheduler_Factory.cpp:
-        * orbsvcs/lib/Scheduler_Factory.h:
-        * orbsvcs/lib/Scheduler_Factory.i:
-          Encapsulate the construction and configuration of the Scheduling
-          Service.
-
-        * orbsvcs/lib/Runtime_Scheduler.cpp:
-        * orbsvcs/lib/Runtime_Scheduler.h:
-        * orbsvcs/lib/Runtime_Scheduler.i:
-          Implement a simple, but fast, Scheduling Service based on a
-          precomputed scheduling.
-
-        * orbsvcs/lib/Event_Utilities.cpp:
-        * orbsvcs/lib/Event_Utilities.h:
-        * orbsvcs/lib/Event_Utilities.i:
-          Simplify the creation of QoS structures for the Event Service.
-
-        * orbsvcs/lib/Scheduler_Utilities.cpp:
-        * orbsvcs/lib/Scheduler_Utilities.h:
-        * orbsvcs/lib/Scheduler_Utilities.i:
-          Simplify manipulation of the RT_Infos for the Scheduling
-          Service.
-
-        * orbsvcs/lib/Channel_Clients.cpp:
-        * orbsvcs/lib/Channel_Clients.h:
-        * orbsvcs/lib/Channel_Clients_T.cpp:
-        * orbsvcs/lib/Channel_Clients_T.h:
-          Helpers to adapt PushSuppliers and PushConsumers.
-
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/CosNamingC.h:
-        * orbsvcs/lib/CosNamingC.i:
-        * orbsvcs/lib/CosNamingS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-        * orbsvcs/lib/RtecEventChannelAdminC.i:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.h:
-        * orbsvcs/lib/RtecEventComm.idl:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommC.i:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecSchedulerC.cpp:
-        * orbsvcs/lib/RtecSchedulerC.h:
-        * orbsvcs/lib/RtecSchedulerC.i:
-        * orbsvcs/lib/RtecSchedulerS.cpp:
-          This files were generated by the IDL compiler and don't need any
-          hand crafting (so far). I still maintain them in CVS because the
-          compiler is not stable enough.
-
-        * orbsvcs/bin/Naming_Service/Makefile:
-          Removed spurious call to rm.
-
-        * orbsvcs/lib/RtecEventComm.idl:
-          Removed the (already commented out) include of "orb.idl".
-
-Sat Nov 15 21:38:48 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/be_sequence.cpp:
-          The generated length() method will reallocate the sequences
-          now.
-
-        * TAO_IDL/be/be_constant.cpp:
-          It was initializing nested constants in the client header file,
-          Andy told me how to fix it.
-
-        * TAO_IDL/be/be_operation.cpp:
-          Fixed typo in generated code:
-          s/_tao_enviroment/_tao_environment/
-
-        * TAO_IDL/be/be_field.cpp:
-          Only generate the inline members of the field type if the type
-          is not imported.
-
-        * TAO_IDL/driver/drv_fork.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-          Removed old code to support plain fork (without ACE).
-          Also removed temporary files *unless* we are on Win32, were
-          removing the file and keeping it open fails.
-
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-          Added routines to obtain the generated names of any IDL file,
-          not only the one we are processing.
-
-        * TAO_IDL/be/be_codegen.cpp:
-          The compiler now generate all the required include directives
-          when the IDL file contains some.
-
-        * tao/params.cpp:
-          Initialize name_service_port_ to zero in the constructor.
-
-Sat Nov 15 21:20:01 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_string.cpp: The typecode info was getting
-        generated in a wrong file because of setting the worng file to
-        generate it in.
-
-        * TAO_IDL/be/be_typedef.cpp: Some extra indentation was getting
-        generated for typecodes. This is fixed.
-
-        * TAO_IDL/be/be_state_argument.cpp: For parameters of type
-        ObjRefs, we were not passing the address of the object_ptr to the
-        Any constructor. This would have caused seg faults when
-        decoding. This is now fixed.
-
-        * TAO_IDL/be: Split be_state.cpp into a number of files based on
-        the IDL types, e.g., be_state_struct.cpp, be_state_union.cpp, ...
-
-        * TAO_IDL/be/be_sequence.cpp: Name creation now uses a uniform
-        strategy rather than typedefed sequences assuming the name of the
-        typedef and anonymous sequences getting a generated name. This was
-        required to eliminate a number of multiple declarations errors.
-
-        * TAO_IDL/be/be_state_union.cpp: Since C++ does not allow
-        instances of classes to appear inside a union declaration, the
-        private data members for data members of type objref, strings,
-        sequences, and anys must be pointers. This changes code in the
-        accessor methods defined in the generated *.i files for the union.
-
-        * TAO_IDL/be/be_operation.cpp: There were some instances of the
-        incorrectly spelled _tao_enviroment remaining which have been
-        corrected.
-
-        * TAO/tao/managed_types.{h,i,cpp}: Added these 3 files that define
-        the self managed data type similar to a String_var. These self
-        managed data types are required for struct/union members that are
-        strings or obj references, as well as for element types of
-        sequences.
-
-        * TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode
-        structure for typedefs. These use the tk_alias kind field.
-
-        * TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with
-        string members. However, this is still incomplete and will be
-        done by the next couple of commits.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG
-        stmt for printing object keys.
-
-Sat Nov 15 18:03:39 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (make_cubit): We don't
-          need to free up the object key since it's no longer allocated
-          dynamically.
-
-        * tao/object: Changed the _get_name() method to return const char
-          * to be consistent with the iiopobj change below.
-
-        * tao/iiopobj: Fixed _get_name() so that it doesn't allocate
-          memory by having it return const char * and just return the
-          pointer.  This should fix some subtle problems.
-
-Sat Nov 15 12:19:55 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp: Changed two loop counters from type
-          int to type size_t.
-
-Sat Nov 15 01:33:08 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.30, released Sat Nov 15 01:33:08 1997.
-
-Fri Nov 14 19:45:01 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp :
-        * tests/Cubit/TAO/DII_Cubit/clnt.h :
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp :
-        - Fixed the difference in latency problem from DII and IDL.
-        - Changed the DII_Cubit client interface to be similar to IDL, now
-        you can specify hostname and port number, instead of the IOR.
-
-Fri Nov 14 17:48:14 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/bin/Naming_Service/CosNaming_i.cpp:
-          Fixed problem with the new Environment parameter for _narrow ().
-
-        * orbsvcs/bin/Naming_Service/Makefile:
-          No need to include rules.bin.GNU.
-
-Fri Nov 14 17:08:20 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/iiopobj.cpp: Make sure that host is set to 0 in all the
-          constructors.
-
-        * tao/iiopobj.cpp (Profile): Modified the code to consistently
-          store a NUL at the end of each object key string.
-
-Fri Nov 14 17:10:20 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * cubit_i.cpp: Changed &d to %d in ACE_ERROR
-
-Fri Nov 14 16:42:21 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tao/tao_internals.cpp (fake_service_entries_i): Made sure that
-        the resource factory faked entry had the proper number of
-        arguments specified.
-
-Fri Nov 14 14:11:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * orbsvcs/lib/Makefile:
-          Added new library that contains the stubs and skeletons for the
-          TAO services.
-
-        * orbsvcs/Makefile:
-        * orbsvcs/bin/Makefile:
-        * orbsvcs/tests/Makefile:
-          Added top level Makefiles.
-
-        * orbsvcs/bin/Naming_Service/Makefile:
-        * orbsvcs/bin/Naming_Service/svr.cpp:
-        * orbsvcs/bin/Naming_Service/svc.conf:
-        * orbsvcs/bin/Naming_Service/NS_CosNaming.h:
-        * orbsvcs/bin/Naming_Service/NS_CosNaming.cpp:
-        * orbsvcs/bin/Naming_Service/CosNaming_i.h:
-        * orbsvcs/bin/Naming_Service/CosNaming_i.cpp:
-          Moved the naming service implementation from the TAO
-          subdirectory to this place.
-
-        * orbsvcs/tests/Simple_Naming/Makefile:
-        * orbsvcs/tests/Simple_Naming/svc.conf:
-        * orbsvcs/tests/Simple_Naming/clnt.h:
-        * orbsvcs/tests/Simple_Naming/clnt.cpp:
-          A simple test program for the naming service, it simply tries to
-          locate it and connect to it.
-
-        * orbsvcs/bin/Naming_Service/Orbix/Client.cpp:
-        * orbsvcs/bin/Naming_Service/Orbix/CosNaming.idl:
-        * orbsvcs/bin/Naming_Service/Orbix/Makefile:
-        * orbsvcs/bin/Naming_Service/Orbix/NS_CosNaming.cpp:
-        * orbsvcs/bin/Naming_Service/Orbix/NS_CosNaming.h:
-        * orbsvcs/bin/Naming_Service/Orbix/logger-main.cpp:
-        * orbsvcs/bin/Naming_Service/Orbix/logger.idl:
-        * orbsvcs/bin/Naming_Service/Orbix/logger_tie.cpp:
-        * orbsvcs/bin/Naming_Service/Orbix/logger_tie.h:
-        * orbsvcs/bin/Naming_Service/Orbix/server-main.cpp:
-        * orbsvcs/bin/Naming_Service/TAO/CosNaming.idl:
-        * orbsvcs/bin/Naming_Service/TAO/CosNaming_i.cpp:
-        * orbsvcs/bin/Naming_Service/TAO/CosNaming_i.h:
-        * orbsvcs/bin/Naming_Service/TAO/Makefile:
-        * orbsvcs/bin/Naming_Service/TAO/NS_CosNaming.cpp:
-        * orbsvcs/bin/Naming_Service/TAO/NS_CosNaming.h:
-        * orbsvcs/bin/Naming_Service/TAO/clnt.cpp:
-        * orbsvcs/bin/Naming_Service/TAO/clnt.h:
-        * orbsvcs/bin/Naming_Service/TAO/svc.conf:
-        * orbsvcs/bin/Naming_Service/TAO/svr.cpp:
-          We will only maintain the TAO version for the naming service, no
-          need to keep this subdirectories.
-
-        * orbsvcs/lib/RtecScheduler.idl:
-          The Real Time Scheduling Service. This module declares the QoS
-          structures (RT_Info) and the interface for the global scheduler.
-
-        * orbsvcs/lib/RtecEventComm.idl:
-          Part of the Real Time Event Services interface, this file
-          contains the Event type, the basic interfaces for consumers and
-          suppliers and some exceptions.
-
-        * orbsvcs/lib/RtecEventChannelAdmin.idl:
-          Part of the Real Time Event Services interface, in particular
-          this module defines the event channel, the proxy interfaces and
-          the QoS aware subscription and registration interfaces.
-
-        * orbsvcs/lib/Event_Service_Constants.h:
-          The Event Service implementation and the Scheduling Service
-          implementation require this file, which defines some constants
-          and static limits. For lack of a better place I putted it here.
-
-        * orbsvcs/lib/CosNaming.idl:
-          Moved the IDL file to the library, otherwise it cannot be used
-          by clients.
-
-        * tao/corba.h:
-          Added some macros that support portable exception handling,
-          either through C++ exceptions or the CORBA::Enviroment
-          parameter.
-
-        * orbsvcs/lib/RtecEventCommC.h:
-        * orbsvcs/lib/RtecEventCommC.i:
-        * orbsvcs/lib/RtecEventCommC.cpp:
-        * orbsvcs/lib/RtecEventCommS.h:
-        * orbsvcs/lib/RtecEventCommS.i:
-        * orbsvcs/lib/RtecEventCommS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminS.h:
-        * orbsvcs/lib/RtecEventChannelAdminS.i:
-        * orbsvcs/lib/RtecEventChannelAdminS.cpp:
-        * orbsvcs/lib/RtecEventChannelAdminC.h:
-        * orbsvcs/lib/RtecEventChannelAdminC.i:
-        * orbsvcs/lib/RtecEventChannelAdminC.cpp:
-        * orbsvcs/lib/CosNamingC.h:
-        * orbsvcs/lib/CosNamingC.i:
-        * orbsvcs/lib/CosNamingC.cpp:
-        * orbsvcs/lib/CosNamingS.h:
-        * orbsvcs/lib/CosNamingS.i:
-        * orbsvcs/lib/CosNamingS.cpp:
-          I had to modify the IDL compiler generated files, I will keep
-          the files in CVS until we no longer need to modify it.
-
-Fri Nov 14 13:02:52 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/decode.cpp: TAO_Marshal_Objref::decode line 615 which tried
-        to set the underlying object_addr was invoking an incorrect inline
-        function because of lack of passing an argument to the object_addr
-        () method. Specifically, due to the lask of argment, the
-        "retrieve" method was getting called whereas we wanted the "set"
-        method. All we do is pass a 0 (NUL) argument. This suffices
-        because we have already decoded the host and port number. So all
-        information is with us to set the server address.
-
-Fri Nov 14 00:29:09 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp: set RCS -ko option so that the Id keyword
-          won't get expanded on checkout.  That was causing CVS to think
-          that a merge was needed.
-
-Thu Nov 13 19:11:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/giop.cpp (start): Updated the code to use the new
-          object_addr() style.
-
-        * tao/iiopobj: Added many fixes to the Profile code to fix nasty
-          bugs.  Also, renamed {get|set}_object_addr() to simply
-          object_addr(), which is the correct style.
-
-        * tao/iiopobj.h: Replaced the use of "localhost" with
-           ACE_DEFAULT_SERVER_HOST.  This is necessary to support broken
-           platforms like MVS that don't support "localhost"...
-
-        * TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp (parse_args): Assume for
-          the moment that any arguments starting with `-O' are `-ORB' or
-          `-OA'.  This should be fixed by having the ORB_init() and
-          POA_init() methods consume their argv/argc's.
-
-Thu Nov 13 16:18:32 1997    <nw1@CHA-CHA>
-
-        * tao/orb_core.h:
-        * tao/default_client.h:
-        * tao/default_server.h:  Changed ACE_SVC_FACTORY_DECLARE to
-          ACE_FACTORY_DECLARE.
-
-        * tao/orb_core.cpp:
-        * tao/default_client.cpp:
-        * tao/default_server.cpp:  Changed ACE_SVC_FACTORY_DEFINE to
-          ACE_FACTORY_DEFINE.
-
-        * tao/corba.h: Added include "tao/tao_internals.h".
-
-        * tao/tao_internals.h: Disable header file inclusions.  I've put
-          this file into corba.h.
-
-        * tao/tao_internals.cpp: Changed to use "tao/corba.h".
-
-        * tao/TAO.mak:
-        * tao/TAO.dsp:  Replaced ACE_BUILD_SVC_DLL with TAO_BUILD_DLL.
-
-        * tao/corba.h: Added TAO_Export definition.
-
-        * tao/*.h:  Replaced ACE_Svc_Export with TAO_Export.  Added
-          default definition to build TAO DLL on Win32.
-
-Thu Nov 13 01:47:02 1997  Chris Cleeland  <cleeland@macarena.cs.wustl.edu>
-
-        * tao/iiopobj.cpp (IIOP_Object): Removed the duplicate CTORs that
-        I'd accidentally included here during the prior merge/commit
-        phase.
-
-Wed Nov 12 23:59:29 1997    <nw1@COYOTE>
-
-        * TAO/TAO_IDL/tao_idl.dsp: Changed to generate multithreaded codes
-          on NT.
-
-        * TAO/TAO_IDL/be/be_scope.cpp:
-        * TAO/TAO_IDL/fe/idl.ll:
-        * TAO/TAO_IDL/fe/lex.yy.cpp:
-        * TAO/TAO_IDL/fe/y.tab.cpp:
-        * TAO/TAO_IDL/include/ast_decl.h:
-        * TAO/TAO_IDL/include/idl.h:
-        * TAO/TAO_IDL/include/utl_identifier.h:
-        * TAO/TAO_IDL/include/utl_idlist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h:
-        * TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h:  Changed to use
-          "ace/stdcpp.h" and removed inclusion of header files that
-          conflict with standard C++ library.
-
-Wed Nov 12 18:59:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/iioporb.cpp: Added call to set object address in Profile.
-
-        * tao/iiopobj.cpp: Corrected code in the copy CTOR where the host
-        was being copied over the old host.  This could prove bad if the
-        amount of space allocated previously was too small for the
-        hostname we're copying in.  Ideally we'd use something smarter
-        than this, but hopefully (if you read the comment below) this will
-        go away soon.
-
-        * tao/iiopobj.*: Added an ACE_INET_Addr to IIOP::Profile so that
-        we only need to do a gethostbyname() once.  After that we can used
-        the cached information.  I'd really like to remove the host/port
-        as explicit public data members, but for now we take one step at a
-        time.
-
-        * tao/giop.cpp: Use the IIOP::Profile object address when making a
-        connection.
-
-        * tao/decode.cpp: Added code to set the object address in the
-        Profile when an object ref is decoded.
-
-        * tao/debug.h: Removed old questions in comments.
-
-        * tao/connect.h: Added some documentation.
-
-Wed Nov 12 17:41:02 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/iiopobj.cpp: I had forgotten to update the return type of
-        _get_name in iiopobj.cpp to "char *" instead of "const char *".
-
-Wed Nov 12 14:28:48 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/ast/ast_union.cpp: Fixed a problem where the front end
-        would not give any error if there were duplicate case labels. This
-        was happening since an overloaded == operator taking an
-        AST_Expression* was not getting called. Instead a simple
-        comparison of addresses was taking place. We now use the "compare"
-        method defined on the AST_Expression class to fix this problem.
-
-        * TAO_IDL/be/be_interface.cpp: Removed some code under #if 0. The
-        noteworthy change, however, has to do with code that gets
-        generated for the "_is_a_skel". Some compilers were issuing a
-        warning saying "unused argument obj". Since we cannot change the
-        signature of the generated "_is_a_skel", we use the trick of
-        generatung ACE_UNUSED_ARG (obj); in the code. Some other
-        formatting changes made.
-
-        * TAO_IDL/be/be_operation.cpp: Some very minor changes so that the
-        generated code is properly indented.
-
-        * tao/{iiopobj,object,stub}.h, iiopobj.cpp: Changed the return
-        type of _get_name to return a heap-allocated "char *". In the
-        earlier case we were erroneously returning a pointer to local
-        array. This was a change I made a couple of days back to deal with
-        the fact that object keys are octet arrays and are not null
-        terminated. Now we take the object key and make a NULL terminated
-        copy in a heap allocated string. It is the caller's responsibility
-        to free this.
-
-        * tao/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Used string_free to
-        free the string returned by _get_name.
-
-        * tao/tests/Thruput/client.cpp: _narrow now uses the additional
-        env parameter.
-
-Wed Nov 12 09:22:47 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/tao_internals.cpp (open_services): added ACE_UNUSED_ARGs
-          for argc and argv if TAO_PLATFORM_SVC_CONF_FILE_NOTSUP.
-
-        * TAO_IDL/Makefile: disabled clean and realclean targets on VxWorks,
-          so that they don't remove tao_idl from the host build tree.
-
-Tue Nov 11 23:50:06 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.29, released Tue Nov 11 23:50:06 1997.
-
-Tue Nov 11 20:45:26 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): Replaced NULL with 0.
-
-        * tao/corbacom.h: Fixed the macro for TAO_SYSTEM_EXCEPTION so
-          compilers don't whine about extra semi-colons.
-
-        * tao/iioporb.cpp (iiop_string_to_object): Added a cast of (char
-          *) 0 to disambiguate one of the methods.
-
-        * tao/iiopobj.cpp: Moved the constructors and destructors of
-          IIOP_Object from the *.i file to the *.cpp file and made them
-          non-inline.
-
-Tue Nov 11 18:19:16 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/iiopobj.{h,cpp}: Added two new constructors one of which is
-        useful for the _bind call generated by the IDL compiler. This
-        constructor takes the host name, port number, and key value
-        thereby avoiding the costly string2object call inside the _bind
-        method. The second constructor is used to reduce the amount of
-        code that gets generated to set a IIOP_Object in the constructor
-        of the skeleton class.
-
-        Additionally, these constructors use the REENTRANT get_host_name
-        method of the INET_Addr class to retrieve the host name.
-
-        * tao/iiopobj.h,stub.h: Modified the signature of _get_name to
-        return a const char*. So users will have to copy this value.
-
-        * tao/iiopobj.cpp: The method _get_name uses an internal character
-        array in which the object key is copied. This is necessary so that
-        we can NULL terminate the opaque key and return it to the user.
-
-        * tao/orbconf.h,cdr.h: Commented (and will eventually remove) the
-        defintion of MY_BYTE_SEX from cdr.h. Instead, we now use the macro
-        TAO_ENCAP_BYTE_ORDER which gets defined in orbconf.h. The files
-        affected due to this renaming are:
-
-        tao/{iioporb.cpp, giop.cpp, except.cpp, cdr.cpp, encode.cpp,
-        interp.cpp, tc_const.cpp}
-
-        The following files in the IDL compiler source were affected since
-        they had to generate TAO_ENCAP_BYTE_ORDER instead of MY_BYTE_SEX.
-        TAO_IDL/be/{be_array,be_enum,be_interface,be_sequence,be_structure,
-                be_union}.cpp
-
-        * tao/{typecode,decode}.cpp: some reformatting, indentation.
-
-        * TAO_IDL/be/be_interface.cpp: code generated for _bind uses the
-        newly added constructor to class IIOP_Object.
-
-        * TAO_IDL/be/{be_interface.be_state}.cpp: Code generated for
-        _narrow now takes an additional CORBA::Environment parameter.
-
-        * tests/Cubit/TAO/IDL_Cubit: cubit_i.cpp - in the method
-        make_cubit, we make a copy of the string returned by _get_name and
-        then free that memory.
-
-        clnt.cpp: The tests for unions have been uncommented. The reason
-        they were not working and resulting in seg fault was that methods
-        of the cubit interface were being invoked on the factory object.
-
-Tue Nov 11 10:07:04 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/Makefile: added missing $ before (VAR)
-          in VBIN definition.
-
-        * tao/orbconf.h: added __i386 to TAO_WORDS_BIGENDIAN check,
-          because that's what g++/VxWorks uses.  Also added __alpha
-          to little endian CPUs.
-
-        * tao/orb_core.i: fixed preprocessor test for using the
-          ACE_Hash_Addr<ACE_INET_Addr>::hash_i specialization.
-
-Tue Nov 11 04:22:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.28, released Tue Nov 11 04:22:44 1997.
-
-Tue Nov 11 01:16:07 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): Reformatted the
-          multicast Name Service locator just a bit.
-
-        * tao/orbconf.h: Started putting a more sane way of automatically
-          determining the size of various datatypes into TAO.
-
-Tue Nov 11 00:36:39 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * orbsvcs/bin/Logger/ior_multicast.h:
-        * orbsvcs/bin/Logger/ior_multicast.cpp:
-        * orbsvcs/bin/Logger/clnt.cpp:
-        * orbsvcs/bin/Logger/clnt.cpp:
-        * orbsvcs/bin/Logger/svr.cpp:
-        * orbsvcs/bin/Logger/Makefile:
-        Added multicast resolution of the logger service example.
-
-Tue Nov 11 00:36:39 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tao/orbobj.cpp (resolve_name_service): changed macro for default
-        multicast port.
-        - Added support for multicast mechanism to resolve the name
-        service.
-
-        * tao/orbconf.h: Added some definitions for TAO's default
-        multicast and reply port, and the default timeout value.
-
-Tue Nov 11 00:00:25 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile: removed MUNCHED because
-          it's no longer needed for g++/VxWorks.
-
-Mon Nov 10 22:02:42 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/interp.cpp (declare_entry): Moved TAO_ALIGNMENT_MAGIC_NUMBER
-          to orbconf.h instead of burying it in interp.cpp.
-
-        * tao/corbacom.h: Rather than trying to guess what the size of
-          wchar_t, let's just use what's in ACE.
-
-Mon Nov 10 19:26:03 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * tao/orbconf.h (SIZEOF_INT): FreeBSD and NetBSD have 4 byte
-          ints. Thanks to Nanbor for pointing this out.
-
-        * tao/orbobj.cpp: Added template instantiation for ACE_Atomic_Op.
-
-        * tao/orbconf.h: NetBSD has a long double of size 12, as does
-          FreeBSD. Fixed SIZEOF_LONG_DOUBLE to fix this.
-
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp (main): Removed cerr's
-          and replaced them with ACE_ERROR_RETURN's and the like.
-
-Mon Nov 10 01:25:19 1997    <nw1@COYOTE>
-
-        * tao/giop.h: Added ACE_Svc_Export to classes
-          (TAO_GIOP_Request_Header, TAO_GIOP_Invocation, TAO_GIOP.)  Some
-          of them may not be necessary.
-
-Mon Nov 10 00:09:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.27, released Mon Nov 10 00:09:24 1997.
-
-Sun Nov 09 23:43:04 1997    <irfan@TWOSTEP>
-
-        * tao/corba.h: Reordered the inclusion of poa.i, giop.i,
-          iioporb.i, and iiopobj.i
-
-        * tao/tao_internals.cpp (close_services): Fixed typo.
-
-Sun Nov 09 23:32:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.26, released Sun Nov 09 23:32:58 1997.
-
-Sun Nov 09 22:04:12 1997    <irfan@TWOSTEP>
-
-        * tao/orbobj.cpp (ORB_init):
-        * tao/tao_internals.cpp (close_services):
-
-          Changed ACE_Recursive_Thread_Mutex to ACE_SYNCH_RECURSIVE_MUTEX.
-
-Sun Nov  9 16:05:56 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp: *
-        tests/Cubit/TAO/DII_Cubit/clnt.h: Added clnt.h and restructured
-        the code so it is similar to the IDL_Cubit example.  It doesn't,
-        however, have the same options because the DII example uses an ior
-        as input.
-
-        * tao/debug.cpp: Added dummy function to get rid of
-        "'debug_stream' defined but not used" warning.
-
-Sun Nov  9 13:03:37 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao: Removed the svc.conf.eg file since it was out of date.
-
-        * tao/svrrqst: Removed the #include for svrrqst.i since we don't
-          need any inline functions now.
-
-        * tao/tao_internals: Removed the #include for tao_internals.i
-          since we don't need any inline functions now.
-
-        * tao/varout.h: Cleaned up the programming style.
-
-        * tao: Continued to replace all fields with names _foo to foo_.
-
-        * tao/iioporb.cpp: Move the hex routines into ACE since they are
-          more general.
-
-        * tao/iioporb.cpp: Removed the inclusion of iioporb.i since it is
-          already included in corba.h.
-
-        * tao: Replaced all uses of ACE_Thread_Mutex with ACE_SYNCH_MUTEX
-          since this is portable...
-
-        * tao/iiopobj.cpp: Removed the inclusion of iiopobj.i since it is
-          already included in corba.h.
-
-        * tao/giop.cpp: Moved several large inlined methods into the *.cpp
-          file.
-
-        * tao/giop: Removed the enormous (and unused) incoming_message()
-          method.
-
-        * tao/giop.cpp: Removed the inclusion of giop.i since that is
-          handled in corba.h.
-
-        * tao: Removed the factories.i and factories.cpp files since they
-          don't seem to be used by anything.
-
-        * tao/{corbacom,except}.*: Changed SYSEX to the more politically
-          correct TAO_SYSTEM_EXCEPTION.
-
-        * tao: Replaced all uses of wslen() and wscpy() with the
-          corresponding ACE_OS wide string functions.
-
-        * tao/orbconf.h: Removed all the HAVE_WIDEC_H stuff.  This should
-          be handed by ACE.
-
-        * tao/connect.i: Removed the template instantiations since they
-          were commented out and didn't appear to be used.
-
-        * tao/connect.cpp: connect.i was already being included in corba.h,
-          so don't include it again.
-
-        * tao/client_factory.cpp: Moved inlined constructor/destructor
-          from the *.i file into the *.cpp file.
-
-        * tao/cdr.cpp (CDR): Moved a bunch of absurdly long inlined methods
-          from the *.i file into the *.cpp file.
-
-        * tao/any.cpp (CORBA_Any): refcount_ has previously been
-          uninitialized.  I gave it a value of 1.
-
-        * tao/any.cpp (CORBA_Any): Moved the initialization into the
-          base/member section, where it belongs.
-
-        * tao/any.h: Corrected a spelling mistake in an enumeral and
-          upper-cased the minor codes for exceptional returns.  Are these
-          actually used anywhere?
-
-        * tao: Removed all the unnecessary #if 0 ... #endif header files.
-          I don't know why there were still there.
-
-        * tao/except.h: Moved the #ifdef for minor and major into
-          orbconf.h, where they belong.
-
-        * tao/orbconf.h: Removed all the DECLARED_* macros since they
-          no longer made sense once we've got ACE.
-
-        * tao/orbconf.h: Moved the TAO_DEFAULT* macros from ace/OS.h
-          here, which is more where they belong.
-
-        * tao/default_server.cpp (TAO_Default_Server_Strategy_Factory):
-
-        * tao/{debug.h,orbconf.h}: Removed the DECLARED_STRERROR macro
-          since ACE handles this.
-
-Sun Nov 09 10:18:06 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/connect.cpp: fixed RCS keyword (Id instead of id).
-
-Sat Nov 08 23:23:41 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.25, released Sat Nov 08 23:23:41 1997.
-
-Sat Nov  8 21:27:34 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/orb_core.cpp (init): Removed the code that always binded us
-          to our hostname.  This is unnecessary and makes it hard to use
-          other interfaces on the same host (such as localhost or some ATM
-          interface, etc.).  With this change (and the corresponding
-          changes to ACE_INET_Addr::get_host_name()), we can now bind to
-          INADDR_ANY.
-
-        * docs/releasenotes: Added Marina's documentation for the Trader
-          and cleaned up all the other entries to make them consistent.
-
-        * tao: Changed ProfileBody to Profile, TaggedProfile to
-          Tagged_Profile, ProfileSeq to Profile_Sequence, and ProfileId to
-          Profile_ID.
-
-        * tao/iiopobj.cpp (ProfileBody): For some god knows why reason,
-          the CORBA::String and CORBA::UShort parameters to ProfileBody
-          where being passed as references.  This is silly, so I changed
-          them to non-references.
-
-        * tao/connect.cpp (open),
-          tao/poa.cpp (create): Replaced a use of
-          ACE_INET_Addr::get_host_name(void) with
-          ACE_INET_Addr::get_host_name (char *, size_t), which is
-          reentrant.
-
-        * tao/Makefile: Removed the DCFLAGS, OCFLAGS, and the TAO_ORB_CORE
-          target macros from the Makefile since they were unnecessary.
-          Thanks to Arturo for reporting this.
-
-        * tao/except.cpp (print_exception): Fixed a strange format code in
-          print_exception that was causing a seg fault.  What the heck
-          does %#lx mean?  Thanks to Mark L Boriack <mark@vtcibm4a> for
-          reporting this.
-
-Fri Nov 07 21:23:35 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * tao/orb_core.h:
-        * tao/marshal.h:
-        * tao/corbacom.h:
-          Added ACE_Svc_Export to some classes.
-
-        * tao/any.cpp:
-          Removed delete after DEEP_FREE call, it crashes on NT and it
-          should be unneeded.
-
-        * TAO_IDL/be/be_state.cpp (gen_code):
-          When generating arguments for the server header don't use nested
-          types. The fully qualified type name is needed, even on NT.
-
-        * TAO_IDL/be/be_exception.cpp:
-          Added code to generate a default constructor.
-
-Fri Nov 07 17:26:49 1997    <nw1@CHA-CHA>
-
-        * tao/TAO.dsp:
-        * tests/Cubit/TAO/DII_Cubit/{client,server}.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/{client,server}.dsp:
-        * tests/Cubit/TAO/MT_Cubit/client/client.dsp:  Removed
-          ACE_HAS_TSS_ORB_CORE flag.
-
-        * tests/Cubit/TAO/MT_Cubit/client/client.cpp (main): Added a
-          return statement to satisfy MSVC.
-
-Fri Nov  7 18:20:46 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/{client,server}/svc.conf: Updated to
-        reflect the proper combination of options to achieve the
-        thread-per-ORB-per-rate concurrency model.
-
-        * docs/components.html: Updated to refer to seminal documentation
-        referred to below.
-
-        * docs/configurations.html: Started some new documentation.  It's
-        got a ways to go right now. :-)
-
-Fri Nov 07 15:42:45 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): check for 0 argv[curarg]
-          before calling strcmp on it.
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile: added MUNCHED for
-          VxWorks/g++.
-
-Fri Nov  7 10:30:59 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/tao_internals.cpp (fake_service_entries_i): Updated faked
-        service entries to include new Resource Factory.  This is the
-        fallback for VxWorks.
-
-        * tao/orb_core.h (TAO_Resource_Factory): Added much comments.
-
-Fri Nov 07 02:45:56 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.24, released Fri Nov 07 02:45:56 1997.
-
-Fri Nov  7 01:58:30 1997  Nanbor Wang  <nw1@coyote.wolfpack.cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/driver/drv_fork.cpp: Added the (__FreeBSD__) flag to
-          correctly include wait.h file.
-
-        * tao/orb_core.cpp: Replaced ACE_NETBSD with ACE_HAS_THREADS in
-          template instantiation segment.
-
-        * tao/orbconf.h: Added the (__FreeBSD__) flag to exclude inclusion of
-          widec.h.
-
-        * tao/orbobj.cpp (Release): Wrapped ACE_GUARD with ACE_MT macro.
-
-Fri Nov 07 01:46:04 1997    <irfan@TWOSTEP>
-
-        * tests/Cubit/TAO/DII_Cubit/(cubitC.cpp, cubit.cpp): Byte order
-          changed from 1 to MY_BYTE_SEX.
-
-Thu Nov  6 23:59:45 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/params.cpp: Moved all the inlined methods out of the header
-          file and put them in the *.cpp file.  I hope this doesn't cause
-          problems for GCC on VxWorks.
-
-        * tests/Thruput_test/client.cpp: Fixed a mistake with how
-          the long string constant was defined.  The scheme being
-          used wasn't portable.
-
-Thu Nov 06 20:58:52 1997    <irfan@TWOSTEP>
-
-        * tao/connect.cpp: Made sure that TAO_Server_Connection_Handler
-          and TAO_Client_Connection_Handler have a zero Reactor pointer.
-          If this is not the case, they will try to deregister from a
-          sometimes non-existent Reactor.
-
-Thu Nov  6 19:06:59 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated status of Naming Service
-        port to TAO.
-
-        * TAO_IDL/be/be_exception.cpp (gen_client_header):
-        removed warning for unused variable.
-
-Thu Nov  6 17:07:58 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/tao_internals.i: Added missing #include file.
-
-        * tao/tao_internals.i: Change lock used as monitor for service
-        count to use ACE_Static_Object_Lock::instance().  This pleases
-        VxWorks (but makes me nauseous).
-
-        * tao/tao_internals.h: Removed static instances of locks to please
-        VxWorks.
-
-        * tao/orbobj.cpp (ORB_init): Changed lock used for the monitor
-        here to be ACE_Static_Object_Lock::instance().  This pleases
-        VxWorks (but makes me nauseous).
-
-        * tao/orb_core.cpp (init): Merged in changes for new Naming
-        Service-related options that got accidentally overwritten last
-        night.
-
-        * docs/Options.html: Added documentation for new Naming
-        Service-related options in.
-
-        * tao/orbobj.h: Added documentation for a few static methods.
-
-        * tao/params.h: Changed LOCAL_INLINE macro to TAO_LOCAL_INLINE to
-        avoid possible collisions with application macros.
-
-Thu Nov  6 14:51:22 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * TAO_IDL/Makefile: Renamed libutil to libtao_idl_util. libutil is
-        a system library on NetBSD. Updated TAO_IDL/util/Makefile to be
-        compatible with this.
-
-        * TAO_IDL/be/be_codegen.cpp (server_header): Changed ::toupper to
-        be toupper, since toupper is a macro on some platforms (like
-        netbsd).
-
-        * TAO_IDL/driver/{drv_preproc.cpp, drv_fork.cpp}: NetBSD has
-        sys/wait.h, instead of wait.h. Added #define to fix it.
-
-Thu Nov  6 01:40:29 1997  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-        * tao/tao_internals.h: #defined ACE_Thread_Mutex to be
-        ACE_Null_Mutex for NetBSD.
-
-        * tao/orbconf.h: Added NetBSD to the #define around HAVE_WIDEC_H.
-
-        * tao/orb_core.cpp: #defined around some thread-specific template
-        instantiations which are not needed on NetBSD.
-
-        * tao/except.h: Undefined "minor" and "major, since these are
-        defined in NetBSD.
-
-Thu Nov 06 14:47:15 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/params.[hi]: inlined some functions in the class declaration
-          because g++ for VxWorks couldn't deal with them in the .i file.
-
-        * tao/tao_internals.*,orbobj.cpp: fixed replacement of orbinit_lock_
-          and service_lock_ with ACE_Static_Object_Lock::instance ().
-
-Thu Nov 06 02:17:02 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.23, released Thu Nov 06 02:17:02 1997.
-
-Wed Nov  5 23:44:42 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/{orbobj,iioporb}.h: Made the first parameter to
-          string_to_object() a const CORBA::String rather than just a
-          CORBA::String.
-
-        * tao/params (addr): Fixed a bug where we should have been using
-          const ACE_INET_Addr & rather than just ACE_INET_Addr &.
-
-        * tao/orbobj: Began adding the hooks for a multicast-based
-          implementation of resolve_initial_references().
-
-        * tao/params: Added a new set/get interface to optionally set/get
-          the IOR of the configured Naming Service.
-
-        * tao/orb_core.cpp (init): Added a -ORBnameservice command-line
-          option.  If this option is given, it indicates the IOR where the
-          Naming Service resides.
-
-        * tao/params: Changed the signature of TAO_ORB_Parameters::addr()
-          to return a const ACE_INET_Addr & rather than an ACE_INET_Addr.
-
-        * tao/params: Added new get/set name_service_port() methods to
-          get/set the name service multicast port.
-
-Wed Nov  5 22:38:08 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Thruput_test/client.cpp (main):
-        * tests/Thruput_test/server.cpp (main): Fixed missing declarations
-        and unused variables and labels.  Fixed uninitialized and unused
-        variables.
-
-        * tests/Thruput_test/ttcp_i.cpp (ttcp_sequence_i):
-        * tests/Thruput_test/ttcp_i.h (class ttcp_sequence_i): Change to
-        use POA.
-
-        * tests/Cubit/TAO/DII_Cubit/README (server): Changed comment on
-        how to start the server to indicate the use of "-d" to see the
-        IOR.
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (Cubit_Client): Reordered
-        member initializers to match declaration order
-
-        * tests/Cubit/TAO/DII_Cubit/svr.cpp (main): Fixed comparison of
-        ">=" on an unsigned variable to compare only ">".
-
-Wed Nov 05 20:35:52 1997    <irfan@TWOSTEP>
-
-        * tao/orb_core.cpp (fini): Close down the connector. Other
-        ORB_Core specific objects also need to be cleaned up (and
-        deleted).
-
-        * tests: Made sure that the orb pointer returned by ORB::init() is
-        correctly freed up.  Following files were updated:
-
-          TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
-          TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
-          TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
-          TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
-          TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
-          TAO/tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp
-          TAO/tests/Cubit/TAO/MT_Cubit/server/svr.cpp
-          TAO/tests/Cubit/VisiBroker/base_server/server.cpp
-
-Wed Nov  5 19:37:25 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL compiler:
-
-        files be_array.cpp, be_interface.cpp, be_sequence.cpp,
-        be_structure.cpp, be_union.cpp, be_enum.cpp - Added MY_BYTE_SEX to
-        the typecode generation methods.
-
-        be_operation.cpp, be_argument.cpp, be_state.cpp, be_codegen.* -
-        Modified to deal with _out parameters that are passed to the
-        actual upcalls in the server-side skeleton.
-
-        Some minor changes involving removing commented-out code in the
-        constructors of some classes.
-
-        * tests/Thruput_test: Some modifications. Still needs more work
-        get it to run.
-
-Wed Nov 05 19:26:44 1997    <nw1@COYOTE>
-
-        * tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsp:
-        * tests/Cubit/TAO/MT_Cubit/client/client.dsp:
-        * tests/Cubit/TAO/MT_Cubit/server/server.dsp:
-        * tao/TAO.dsp: Renamed debeg version of TAO library to TAO.dll for
-          NT.
-
-Wed Nov 05 13:39:19 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: more hacks to not build the IDL compiler
-          on VxWorks.
-
-Wed Nov 05 12:53:53 1997    <irfan@TWOSTEP>
-
-        * tao/interp.cpp:
-
-          - Win32 does not use "fixed" byte alignment.  Fixed the
-            setup_entry macro to take this into account.
-
-          - (declare_entry) Seperated the declaration of the structs from
-            their use.  This is necessary for the VC++4.2 compiler.
-
-        * tests/Cubit/TAO/DII_Cubit/svr.cpp (main): Commented out debug
-          message, since obj is not declared.
-
-Wed Nov 05 01:41:34 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.22, released Wed Nov 05 01:41:34 1997.
-
-Wed Nov  5 00:48:58 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Thruput_test/utils.cpp: Delete static definitions of
-        functions.
-
-        * tests/Thruput_test/ttcpS.cpp:
-        * tests/Thruput_test/ttcpC.cpp (_duplicate):
-        * tests/Thruput_test/client.cpp (main):
-        * tests/Thruput_test/ttcp_i.cpp (sendStructSeq):
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-        * tests/Cubit/TAO/DII_Cubit/svr.cpp: Removed a couple of warnings
-        of unused and uninitialized variables.  Included "ace/ACE.h" to
-        be able to have the _REENTRANT flag.
-
-Wed Nov  5 00:18:17 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/be_sequence.cpp: Added code to generate the missing
-        operator [] for sequences.
-
-Tue Nov  4 23:38:54 1997  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/MT_Cubit/{server,client}/Makefile: Removed the
-        (evil) TAO_HAS_TSS_ORB_CORE flag. Now this functionality is
-        provided by svc.conf.
-
-        * tests/Cubit/TAO/MT_Cubit/: Fixed the server code to use the new
-        IDL compiler generated code.
-
-        * TAO/tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp: Changed the
-        order of the initializers to remove g++ warnings, and added some
-        ACE_UNUSED_ARGs. Also removed the hand-crafted stubs, to make way
-        for the idl-compiler generated files.
-
-Tue Nov  4 23:21:29 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp (main):
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (run): Changed the format of the
-        output to be more readable.  Also, fixed resolution of the time for
-        the cube_struct_dii() call.
-
-Tue Nov  4 21:12:48 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * tao/except.h: Removed print_exception().  It seems unnecessary
-        and pollutes the global namespace.
-
-Tue Nov  4 16:58:12 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * {tests/Cubit/TAO/DII_Cubit,tests/Cubit/TAO/IDL_Cubit,
-        tests/Cubit/TAO/MT_Cubit,tests/Demux_Test,
-        tests/Thruput_test}/Makefile: Added an explicit definition for
-        VBIN so that VxWorks can build properly.
-
-        * tao/orb_core.*: Modified TAO_Resource_Factory so that it divides
-        the information that it tracks between pre-allocated resources and
-        resources which are allocated by the application.  Specifically,
-        the orb and root poa pointers are in here (though it's possible
-        that when we move to a full POA implementation that the root poa
-        can be pre-allocated as well).  These pointers are initialized to
-        zero and are given values by the TAO_ORB_Core instance writing
-        through back to the TAO_Resource_Factory instance.
-
-        Also, this implementation reduced the number of singletons/TSS
-        singletons utilized by the resource factory.  The initial
-        "get-it-working" cut used a singleton/tss singleton pair for every
-        resource, which was quite wasteful in environments such as NT that
-        don't have many TSS slots available.  Perhaps if we get even more
-        clever this can be reduced even further.
-
-        * tao/except.*: Added print_exception() function for backwards
-        compatibility.  It simply calls
-        CORBA::Environment::print_exception().
-
-Tue Nov 04 10:45:07 1997    <nw1@CHA-CHA>
-
-        * TAO_IDL/fe/y.tab.cpp: Enclosed a #pragma ident with #if !defined
-          ACE_WIN32.  Compilers other than SunCC might also need this.
-
-Tue Nov  4 13:47:26 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tests/Cubit/TAO/MT_Cubit: Modified the Makefiles in the
-        client and server directory so that they use the TAO IDL
-        compiler. Also added the clean and realclean targets. Updated the
-        server side cubit.idl because it was different from what the
-        client was using.
-
-        * TAO_IDL compiler: Fixed the following problems
-
-        (1) Removed the extra call to Release in the generated _narrow
-        method  in be_interface.cpp
-
-        (2) Used ACE_CORBA_1 (Object) instead of CORBA::Object in the
-        class declaration for interfaces - in be_interface.cpp
-
-        (3) be_interface_fwd.cpp - var_impl had to be updated to generate
-        code that uses the ptr () method in the calls to _duplicate
-
-        * TAO/tests/Cubit/TAO/IDL_Cubit: Fixed some outstanding issues and
-        made sure that it works. Updated the README file.
-
-Tue Nov 04 09:48:51 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core.i: disabled the ACE_Hash_Addr<ACE_INET_Addr>::hash_i ()
-          template specialization on g++/VxWorks because g++
-          cygnus-2.7.2-960126 can't handle it.
-
-        * tao/except.h (line 118): removed backslash at end of comment line.
-          Some compilers complain about that.
-
-        * tao/except.cpp (CORBA_SystemException): reordered initializers to
-          match declaration order.
-
-        * TAO_IDL/Makefile: don't build the IDL compiler on VxWorks.
-
-Tue Nov 04 06:26:14 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/be/be_state.cpp:
-          It still generated fully qualified names for some sequences,
-          that will not work on NT.
-
-Tue Nov 04 05:32:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.21, released Tue Nov 04 05:32:44 1997.
-
-Tue Nov  4 04:42:17 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Thruput_test/server.cpp:
-        * tests/Thruput_test/client.cpp:
-        * tests/Thruput_test/ttcpS.cpp:
-        Fixed "print_exception" errors and errors due to some changes in
-        the orb compiler.
-
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp (svc): Use unsigned
-        int for variable that is used for positive comparisons only.
-
-Tue Nov 04 01:00:51 1997    <nw1@COYOTE>
-
-        * tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw: Renamed former test.dsw
-          to IDL_Cubit.dsw.
-
-        * tests/Cubit/TAO/IDL_Cubit/{client,server}.dsp: Renamed
-          executables for debug version to client.exe and server.exe on
-          NT.
-
-        * tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw: Renamed former test.dsw
-          to DII_Cubit.dsw.
-
-        * tests/Cubit/TAO/DII_Cubit/{client,server}.dsp: Renamed
-          executables for debug version to client.exe and server.exe on
-          NT.
-
-        * tests/Cubit/TAO/IDL_Cubit/Cubit.mak: Added cubit.idl into
-          makefile and its custom build settings.
-
-        * tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw: Renamed former
-          MTCubit.dsw to MT_Cubit.dsw.
-
-Mon Nov 03 23:16:06 1997    <nw1@COYOTE>
-
-        * TAO_IDL/ast/ast_expression.cpp (coerce_value): Added an explicit
-          cast (float) to avoid NT warnging messages.
-
-        * tests/Cubit/TAO/MT_Cubit/server/svr.cpp (svc): Removed
-          declaration of function print_exception.  It's now a member
-          function of CORBA_Environment.
-
-        * TAO_IDL/fe/y.tab.cpp: Commented out include <values.h>.  This
-          was causing compilation errors on NT.
-
-        * tests/Cubit/TAO/DII_Cubit/svr.cpp:
-        * tests/Cubit/TAO/DII_Cubit/clnt.cpp: Changed to use the new
-          CORBA_Environment::print_exception.
-
-        * tao/except.h (CORBA_Environment):  Added ACE_Svc_Export to this
-          class.
-
-        * tests/Cubit/TAO/MT_Cubit/MTCubit.dsw:
-        * tests/Cubit/TAO/MT_Cubit/client/client.dsp:
-        * tests/Cubit/TAO/MT_Cubit/server/server.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/client.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/server.dsp:
-        * tests/Cubit/TAO/IDL_Cubit/test.dsw:  Added new workspace and
-          project files.
-
-        * TAO_IDL/tao_idl.dsp:  Moved the output executables to the usual
-          place.
-
-        * TAO_IDL/be/be.h: Added #ifdef'ed pragma to diable warning 4250
-          on NT.  This is only temporary and should be fixed later.
-
-        * TAO_IDL/be/be_union.cpp (gen_var_defn):
-        * TAO_IDL/be/be_structure.cpp (gen_var_defn):
-        * TAO_IDL/be/be_array.cpp (gen_var_defn): Removed unused local
-          variables declaration (s).
-
-Mon Nov  3 23:25:30 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL Compiler: Files be_sequence.cpp, be_typedef.cpp,
-        be_state.cpp: Lots of improvements to get sequences to
-        work. Support for sequences of strings or obj references is
-        limited. But for all other cases, this seems to be working fine.
-
-        There were some unnecessary lines of code in be_state.cpp that
-        were giving rise to multiple declarations errors. These are
-        removed.
-
-Mon Nov  3 18:30:09 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/clnt.cpp (main): compare with
-        "!= 0" rather than "== -1" for errors.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit.idl (enum discrim): Deleted
-        enumerations not used.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (please_exit): Fixed
-        unused variable.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.h (Cubit_Factory_i):
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.h (objrefs): Fixed invalid
-        comparison between a signed and unsigned variable.
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): Fixed comparison of
-        ">=" on an unsigned variable to compare only ">".
-
-        * TAO_IDL/be/be_typedef.cpp (gen_client_stubs): Removed unused
-        variable warning.
-
-        * TAO_IDL/fe/y.tab.cpp (yytoks): Added brackets to the array
-         of structures being initialized.
-
-Mon Nov 03 18:43:37 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/be/be_operation.cpp:
-          "Fixed" skeleton generation code. Sometimes the formal parameter
-          names for the skeleton can clash with the user defined names for
-          the (IDL) method parameter names.
-          To minimize the chances of such a problem I choose very long
-          parameter names for the skeleton (things like <_tao_enviroment>
-          instead of just <env>), but the right solution is to ignore the
-          user defined parameter names and generate them using some
-          numbering scheme.
-
-        * TAO_IDL/be/be_predefined_type.cpp:
-          Generate CORBA::_tc_Object as the TypeCode for all pseudo
-          object, this is a hack but works for the files we are using
-          right now (maybe it will fail for complex things, like the
-          interface repository).
-
-        * TAO_IDL/be/be_sequence.cpp:
-          Fixed a number of minor problems:
-          Missing _ptr type for sequences.
-          The return type for T_var::operator-> was different in the
-          .h and .i file.
-
-        * TAO_IDL/be/be_type.cpp:
-          tc_name_ and type_name_ were not initialized, producing some
-          segfaults under NT.
-
-Mon Nov  3 13:45:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * {tao,TAO_IDL/util,TAO_IDL/narrow,TAO_IDL/fe,TAO_IDL/driver,
-        TAO_IDL/be,TAO_IDL/ast,Benchmark/benchmark}/Makefile (SHLIB):
-        Fixed definition so that the extension was $(SOEXT) rather than
-        hard-coded to "so".  This makes things compile on VxWorks better.
-        Thanks to David Levine for pointing this out.
-
-Sun Nov 02 19:42:08 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.20, released Sun Nov 02 19:42:08 1997.
-
-Sun Nov  2 19:20:57 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tao/except.*: Made the "print_exception" utility function
-        as a method of class Environment.
-
-        * TAO/tao/giop.cpp: In the TAO_GIOP_Invocation::start method, we
-        were previously not returning even if the connection establishment
-        phase was failing. A return statement is inserted. However, there
-        still are problems when the GIOP_Invocation variable called "call"
-        goes out of scope.
-
-        * TAO_IDL Compiler: be_interface.cpp - The _bind call now
-        generates a "char IOR" instead of "static char IOR" since the
-        latter will be problematic with multiple threads. Thanks to
-        Arturo Montes <mitosys@colomsat.net.co> for pointing that out.
-
-        * TAO/test/Cubit/TAO/IDL_Cubit : Improved the code so that it uses
-        the "print_exception" which is now defined on class
-        CORBA::Environment. The clnt still needs improvement in terms of
-        handling invalid parameters and gracefully exiting.
-
-        * IDL_Compiler: The bug resulting out of encoding object
-        references has been fixed atleast on Solaris using g++ as well as
-        SunCC. Changes made to be_operation.cpp and be_state.cpp such that
-        the return value for object references is always of type
-        CORBA::Object_ptr rather than the real interface type. In
-        addition, keeping in perspective the change that Irfan made and
-        described below (in encode.cpp), the Any that holds the result
-        *does not* own the value. In contrast, for the rest of the cases
-        the result (of type Any) owns the result.
-
-        * be_sequence.cpp: Additional work in progress. Full changelog
-        entry will be available in the next commit.
-
-Fri Oct 31 22:20:06 1997    <irfan@TWOSTEP>
-
-        * tao/encode.cpp (encode): Changed cast of data from
-          *(CORBA::Object_ptr *) to (CORBA::Object_ptr).
-
-        * tao/default_server.cpp (parse_args): Manipulation of curarg was
-          all messed up.  Fixed it such that it was not incremented
-          unnecessarily.
-
-Fri Oct 31 13:46:04 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/Options.html: Updated to specify new TAO_Resource_Factory
-        service and its options.
-
-        * docs/releasenotes/orbcore.html: Updated to reflect recent work.
-
-        * tao/orb_core.*: Added the acceptor and related members and
-        methods from CORBA_ORB.  Made TAO_Resource_Factory a Service
-        Object so that it can be loaded via the Service Configurator.  The
-        option to change its resources between global and thread-specific
-        is "-ORBresources global" and "-ORBresources tss", respectively.
-
-        * tao/orbobj.*: Moved the acceptor and related members and methods
-        to TAO_ORB_Core.
-
-        * tests/.../svc.conf: Added Resource Factory as a service.
-
-        * tests/Cubit/TAO/{DII_Cubit,MT_Cubit}/cubitS.cpp,
-        tests/Thruput_test/ttcpS.cpp, tao/poa.cpp: Changed acceses that
-        used to go to CORBA_ORB::params() to go to TAO_ORB_Core::params().
-
-Fri Oct 31 08:39:54 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL Compiler - Intermediate commit of all improved features.
-
-        * be/be_type.* : Improved the nested_type_name method such that it
-        now takes an additional parameter called suffix that has a default
-        value of NULL. Carlos, Sergio, and myself independently found an
-        extremely bad piece of code that was getting generated that looked
-        like the following:
-                ACE_NESTED_CLASS (XXXX, YYYY)_ptr
-
-        The new convention is to pass the suffix such as "_ptr", or "_var"
-        or "_out" to this method so that it can generate valid code of the
-        form:
-                ACE_NESTED_CLASS (XXXX, YYYY_ptr)
-
-        * be/be_decl.cpp : All the methods such as repoID (), flatname
-        (), etc now check if the corresponding data member was created or
-        not. If they are not, the corresponding private method e.g.,
-        compute_repoID (), are invoked. This way we do not have to call
-        all these private methods in the constructors of all the derived
-        be classes. The one compelling reason to do it this way is because
-        the "names" for certain types are not available at construction
-        time, e.g., sequences. A name to a sequence is assigned from the
-        context it is in i.e., whether it was a named sequence in the form
-        of a "typedef" statement or it was an anonymous sequence.
-
-        As of this commit, all calls to such compute_*  methods in the
-        constructors of all the derived be classes are commented out and
-        will eventually disappear in the next commit.
-
-        * be/be_decl.cpp : One more change in be_decl.cpp is to add the
-        case for "interface_fwd" in the generation of the _var and _out
-        definitions and implementations.
-
-        * be/be_helper.* : Added two new methods called "gen_ifdef_macro"
-        and "gen_endif". These are required to generate the #if !defined
-        (...) <code> #endif macros. These are very essential if the IDL
-        has forward declarations of interfaces. Forward declarations of
-        interfaces must generate a forward class declaration. In addition,
-        it has to typedef the "_ptr" type and define the "_var" and "_out"
-        types. However, the real "be_interface" class does this too which
-        can result in "multiple declarations" errors from the C++
-        compiler. Hence we use this scheme. As in the case of the
-        nested_type_name method mentioned above, this method also takes a
-        default "suffix" parameter (= 0). This is required for the "_var",
-        "_ptr", and "_out" suffixes.
-
-        * be/be_interface.cpp
-          be/be_interface_fwd.cpp:
-
-        Used the TAO_OutStream::gen_ifdef_macro () and gen_endif methods
-        for the definitions of the _ptr, _var, and _out classes and their
-        implementations.
-
-        *be/be_sequence.* : Lot of modifications and change in the design
-        in terms of handling the base types that themselves could be
-        sequences. Although the AST_Sequence i.e., OMG IDL does not define
-        a "sequence" to be a scope producing construct like structs or
-        unions, we choose to make "be_sequence" to be a scope producing
-        construct. This is no way alters the OMG IDL language because the
-        front-end is still the same. "be_sequence" was made to inherit
-        from scope because the sequence mapping gives rise to a C++ class
-        which is a scoping construct. This way, base types that turn out
-        to be anonymous sequences can be assigned a parent scope and their
-        name generation will fall in line with other classes.
-
-        There are certain features missing with sequences at this commit
-        time, but this should reduce tweaking the generated code to a
-        large extent.
-
-        * be/be_state.cpp: Update the code for handling sequences and
-        typedefs. Typedefs should be handled properly now.
-
-        * All other *.cpp files: Either commented out the compute_* calls
-        in the constructors or removed them.
-
-Fri Oct 31 03:00:09 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orb_core.cpp: Moved call to connector's open() into init(),
-        thus insuring that it gets called only AFTER all the resources are
-        available from the Resource Factory.
-
-        * tao/orb_core.*: Changed data members to be associations rather
-        than containment.  This allows decoupling of the
-        "thread-specificness" of these resources from the
-        thread-specificness of the general TAO_ORB_Core container.  Also
-        added set accessors for those resources.
-
-        Added TAO_Resource_Factory class from which the TAO_ORB_Core
-        container initializes itself.  For now this remains a singleton
-        which is, at compile-time, determined to be either TSS or not.
-        But, soon, it will be loaded via the Service Configurator and its
-        TSS nature determined at runtime.
-
-        * tao/giop.h: Updated to use the new ACE macro
-        ACE_CLASS_IS_NAMESPACE.
-
-        * tao/default_server.*: Implemented the new open() method so that
-        it initializes the Reactive and Threaded strategies from the
-        information in TAO_ORB_Core.
-
-        * tao/server_factory.*: Added open() method to be called after all
-        ORB resources are loaded up.  This method can then be used by a
-        strategy factory to further initialize its contained strategies if
-        they require handles to resources to which the ORB might legislate
-        access.  The default implementation does nothing.
-
-Fri Oct 31 01:03:05 1997    <irfan@TWOSTEP>
-
-        * tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): obj was not declared.
-          Commented out use of obj in dmsg1.
-
-        * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (Cubit_Factory_i):
-          numobjs_ was used before it was assigned.
-
-        * TAO/TAO_IDL/TAO_IDL.{mak,mdp}: Added VC++4.2 make files.
-
-        * TAO_IDL/ast/ast_expression.cpp (dump): Streaming the enum was
-          ambiguous.  Therefore the enum was cast to an int.
-
-Thu Oct 30 22:50:44 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * tao/corba.h:
-          Added a definition for ACE_NESTED_CLASS, maybe it is defined in
-          some place else, but I couldn't find it.
-
-        * TAO_IDL/be/be_interface.cpp:
-          Fixed the definition for skeleton destructors.
-
-        * TAO_IDL/be/be_helper.cpp:
-          Added a lot of redundant ACE_OS::fflush() calls. Apparently we
-          have two FILE* or file descriptors over the same file, bt the
-          fflush hides the problem.
-
-        * TAO_IDL/be/be_decl.cpp:
-          Fixed inconsistency between operator-> declaration and
-          definition for _out classes.
-
-Thu Oct 30 14:06:54 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * TAO_IDL/fe/Makefile:
-        Added an expression to the sed command in the rule to construct
-        lex.yy.cpp, that replaces ECHO with TAO_ECHO, because a
-        different ECHO macro is already defined in
-        /usr/include/sys/termios.h
-
-        * TAO_IDL/fe/idl.ll:
-        Fixed some warnings about nested comments.
-        Changed the declaration of variable i to outside of
-        the 'for' initialization to avoid obsolete binding warnings.
-
-        * TAO_IDL/be/be_interface_fwd.cpp (gen_client_header):
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-        for variable i.
-
-        * TAO_IDL/be/be_constant.cpp (exprtype_to_string):
-        * TAO_IDL/util/utl_error.cpp (exprtype_to_string):
-        Added case statements to handle the rest of un-handled
-        enumerations from AST_Expression::ExprType.  These will
-        handle a default value (i.e. NULL).  Enumerations added are:
-        AST_Expression::EV_wstring
-        AST_Expression::EV_wchar
-        AST_Expression::EV_longdouble
-        AST_Expression::EV_ulonglong
-        AST_Expression::EV_longlong
-
-Thu Oct 30 09:56:41 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/giop.h: Added comments to TAO_GIOP class explicitly pointing
-        out its use as a namespace.  Concurrently, I also scoped the CTOR,
-        Copy CTOR, and DTOR as 'private' so nobody can mistakenly
-        instantiate one of these puppies.
-
-Thu Oct 30 03:40:26 1997    <nw1@COYOTE>
-
-        * tests/Cubit/TAO/DII_Cubit/client.dsp:
-        * tests/Cubit/TAO/DII_Cubit/server.dsp:  Updated include files
-          path and libarary path.
-
-        * tao/giop.cpp (close_connection): Use ACE_HANDLE instead of int.
-
-Thu Oct 30 02:53:20 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.19, released Thu Oct 30 02:53:20 1997.
-
-Thu Oct 30 02:20:21 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/IDL_Cubit:
-        Added more comments and changed the header to be ACE'ified.
-        Make output more consistent.
-
-Thu Oct 30 02:12:27 1997 Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-        * tests/{TAO, Cubit}: Changed the directory heirarchy to the
-        following: tests/Cubit/TAO/ now contains all the Cubit examples,
-        i.e. IDL_Cubit, MT_Cubit and DII_Cubit, instead of tests/. Updated
-        the README and Makefiles to reflect this. DII_Cubit is the
-        handcrafted "original" Cubit example.
-
-        * tests/Cubit/COOL: Added the COOL version of the Cubit test. The
-        COOL version is written for Chorus COOL version 4.1.
-
-Wed Oct 29 22:26:10 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tests/IDL_Cubit/clnt.cpp (init): Fixed the error handling so we
-        exit correctly when things go wrong.
-
-        * tao/connect.cpp (open): Revised the code to use the new
-        ACE_LACKS_SOCKET_BUFSIZ to detect when this feature isn't
-        supported.
-
-        * tao/{giop,connect}: Added a nifty typedef called TAO_SVC_HANDLER
-        to remove the drudgery of expanding the template each time.
-
-        * tao: Changed the name of TAO_OA_Connection_Handler to
-        TAO_Server_Connection_Handler to be compliant with the
-        TAO_Client_Connection_Handler.
-
-Wed Oct 29 20:47:47 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/IDL_Cubit/clnt.cpp:
-        * tests/IDL_Cubit/clnt.h:
-        Cleaned up the code.  Added ACE_Profile_Timer to time the calls.
-        Changed copyright header.  Added more comments.
-
-Wed Oct 29 18:55:57 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/giop: Added "_"'s to the data members in
-        TAO_GIOP_Invocation.
-
-        * tao/giop (send_request): Swaped the order of the parameters for
-        send_request() so that it would be consistent with recv_request.
-
-        * tao/{connect,giop}: Changed read_message() to recv_request(),
-        and send_message() to send_request() since these things really
-        work on GIOP requests.
-
-        * tao/{connect,giop}: Changed read_message() to recv_message(),
-        which is more like other parts of ACE.
-
-        * tao/connect.cpp: Fixed the calls to read_message() and
-        send_message() so that they don't try to modify "this."
-
-        * tao/giop: Changed the send_message() and read_message() in the
-        TAO_GIOP class to take ACE_Svc_Handler<ACE_SOCK_STREAM,
-        ACE_NULL_SYNCH> rather than TAO_Client_Connection_Handler.
-
-Wed Oct 29 17:53:12 1997    <irfan@CHA-CHA>
-
-        * tao: Added TAO_HAS_TSS_ORB_CORE to tao and Cubit NT makefiles.
-          This probably needs to be added to the other NT makefiles.
-
-        * tests/Cubit/TAO/svc.conf: Updated files to pass the correct
-          options to the factory.
-
-Wed Oct 29 16:07:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/giop.*: Changed most methods that took ACE_SOCK_Stream&
-        parameters to take TAO_Client_Connection_Handler*& parameters.
-        This makes it easier to clean up properly after errors.  Also
-        #ifdef'd out seemingly unused code (TAO_GIOP::incoming_message).
-        Fixed call to ACE_Svc_Handler::idle() to not contain an argument.
-
-        * docs/Options.html: Updated the documentation to reflect recent
-        changes.
-
-Wed Oct 29 15:59:30 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * tests/IDL_Cubit/clnt.cpp: OO'ified the code. Added class
-        Cubit_Client.
-        * tests/IDL_Cubit/clnt.h: added this file to contain  the class
-        definition.
-
-Wed Oct 29 11:01:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL compiler: be_type.cpp::nested_type_name: A quick commit
-        made that includes an improvement over the previous scheme of
-        generating ACE_NESTED_CLASS macros. We handle the problem of
-        generating fully scoped names for types that were defined in some
-        ancestor of the scope in which that type is being used.
-
-        * Makefiles under TAO_IDL: Fixed a bug in the Makefiles under all
-        the subdirectories. This bug was reported by "ARTURO MONTES"
-        <mitosys@colomsat.net.co>. The bug was causing circular
-        dependencies on the libraru that was getting compiled.
-
-Wed Oct 29 06:17:36 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): Must increase the loop
-          counter.
-
-Wed Oct 29 02:11:43 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.18, released Wed Oct 29 02:11:43 1997.
-
-Wed Oct 29 00:56:26 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/svc.conf: Updated documentation comments to
-        reflect factory option changes.
-
-        * tao/orbobj.*: Wiped argvec_shift and all its bugs off the face
-        of the earth.  Manojkumar Acharya <cvsf325.gpt.co.uk> should prove
-        to be very happy about this turn of events. :-)
-
-        * tao/orbobj.cpp: Weeded out old, dead code here and there and
-        migrated much of what had been in ORB_init() into
-        TAO_ORB_Core::init().
-
-        * tao/orb_core.*: Added methods init() and fini() which perform
-        ORB Core-related initializations and cleanups, respectively.  This
-        is all in anticipation of having a Unified Factory which provides
-        ORB Core as well as other information.  Also began stubbing out
-        and migrating various data members and associated accessors so
-        that they are pointers rather than actual members.  The next step
-        is to actually make them pointers and have everything get
-        initialized properly and deterministically and keep everything
-        working.
-
-        * tao/{giop,orb_core}.cpp: Revised code due to recent changes in
-        ACE related to the Caching connector.
-
-        * tao/default_server.{h,cpp} (parse_args): This method now uses
-        options of the style -ORBfoo rather than the previously-cryptic
-        single-letter options.  This should allow us to eventually allow
-        this same routine to parse args from the command line as well as
-        inside the svc.conf file.  The price we pay for consistency,
-        however, is verbosity to the point of insanity (e.g.,
-        -ORBconcurrency...blech!)  These options are briefly documented in
-        the method header as well as in subsequent svc.conf files.
-
-        * tao/decode.cpp: Added some comments for arguments.
-
-        * tao/connect.{h,cpp}: Moved Connector-related typedefs and
-        corresponding template instantiations into the proper
-        file--orb_core.*.
-
-        * tao/orb_core.cpp (init): Moved much of what used to be
-        ORB_init() into here.  Changed the manner in which objref style
-        was determined--it's no longer via a special ORB name but rather
-        by the -ORBobjrefstyle option which can have either the value
-        "IOR" or "URL" (default is URL).
-
-Tue Oct 28 21:15:36 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * build/SunOS5.5/TAO/tests/IDL_Cubit/clnt.cpp (main): Fixed the
-        code so that if you give incorrect parameters the program exits
-        cleanly, rather than segfaulting.
-
-Tue Oct 28 20:49:28 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tao/giop.cpp (start): NT Access Violation error, AGAIN! Added
-          codes to reset this->handler_ so that
-          ACE_Cached_Connect_Strategy won't complain.
-
-Tue Oct 28 19:19:05 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be/{be_state.cpp, be_union.cpp, be_struct.cpp}: Added code
-        that will generate the ACE_NESTED_CLASS macro
-
-        *TAO_IDL/be/be_type.cpp: Implemented be_type::nexted_type_name
-        that will generate the ACE_NESTED_CLASS macro. However, this may
-        not be completely correct at this point because we want to see if
-        teh compiler fails for types defined in some ancestor and whose
-        fully scoped names are generated .
-
-        * TAO_IDL/be/be_interface.cpp: Added code that will generate the
-        _bind call on the interface class.
-
-        * TAO/tests/IDL_Cubit: Added the _bind call in clnt.cpp. Improved
-        the README file.
-
-        *MAXNAMELEN : There was a clash with TAO_CodeGen::MAXNAMELEN. So
-        it has been substituted by NAMEBUFSIZE as a macro in be_codegen.h
-
-Mon Oct 27 22:22:22 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/be_decl.cpp: Added a ptr () function to the _var classes
-        hat returns the underlying ptr_ data member. This ptr () member
-        function is now used to pass a pointer type to constructor and
-        assignment operator from a T_var class.
-
-        * TAO_IDL/be_state.cpp: Important changes related to generation of
-        return values of operations in the stubs. In addition, an & was
-        missing for passing string types. Some additional bugs arising out
-        of operations with void return type have been fixed.
-
-        * ./tests/IDL_Cubit: This test has been modified to include a
-        factory interface that reads a key for the cubit object and
-        produces an obj reference for Cubit. In addition, a preliminary
-        version of the _bind call has been tested with IDL_Cubit.
-
-        *MAXNAMELEN : Carlos informed me that MAXNAMELEN was a small
-        constant on some platforms. This has been changed to
-        TAO_CodeGen::MAXNAMELEN with a value of 100.
-
-Mon Oct 27 22:07:58 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-          Set this->cli_stub_gen_ to I_TRUE once the code has been
-          emitted.
-
-Mon Oct 27 19:34:08 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-          Set this->cli_stub_gen_ to I_TRUE at the end.
-
-        * TAO_IDL/be/be_typedef.cpp:
-          Set the state to TAO_CodeGen::TAO_TYPEDEF_CH instead of just
-          struct.
-
-Mon Oct 27 15:22:24 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-        * TAO_IDL/be/be_state.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_factory.h:
-        * TAO_IDL/be_include/be_state.h:
-        * tao/iioporb.cpp:
-        * tao/marshal.cpp:
-        * tao/optable.cpp:
-        * tao/optable.h:
-        * tao/singletons.h:
-        The ACE_Singleton lock type needs to be changed from
-        ACE_SYNCH_MUTEX (or ACE_SYNCH_RW_MUTEX) ACE_SYNCH_RECURSIVE_MUTEX.
-        ACE handles those more efficiently for its singletons.  Change
-        suggested by David Levine.
-
-Mon Oct 27 11:59:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbconf.h: Made it so _FAR is defined all the time.  Thanks
-        to Manojkumar Acharya <cvsf325.gpt.co.uk> for reporting this.
-
-Sun Oct 26 22:18:01 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.17, released Sun Oct 26 22:18:01 1997.
-
-Sun Oct 26 17:53:25 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * {tao,tests}/Makefile: Commented out the TAO_HAS_TSS_ORBCORE in
-        these Makefiles since it is going away anyhow and is confusing...
-
-        * tests/IDL_Cubit/svc.conf,
-          tests/Cubit/TAO/svc.conf:
-        Changed the default concurrency policy to be reactive so that
-        things work correctly if TAO_HAS_TSS_ORBCORE.  Thanks to Sumedh
-        for pointing this out.
-
-        * tao/orbobj.cpp (ORB_init): Put the TAO_DEFAULT_SERVER_PORT into
-        ACE's OS.h file and used it in TAO.
-
-Sun Oct 26 15:07:18 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/params.h: Eliminated forward decls of the now-defunct ROA
-        class.
-
-        * tao/orb_core.h (TAO_DEFAULT_PORT): Added manifest constant for
-        default port.
-
-        * tao/orbobj.cpp (ORB_init): Eliminated ugly anonymous constant
-        use for hbuf's size.  Utilized manifest constant for default port.
-
-        * tao/giop.cpp: Changed calls to
-        TAO_Client_Connection_Handler::in_use() to call the underlying
-        Svc_Handler::idle().
-
-        * tao/connect.{h,i}: Eliminated in_use() flags because they're no
-        longer needed with the new Strategy Connector.
-
-        * tao/iioporb.cpp (string_to_object): Removed setting of the orb
-        in the underlying CORBA::Object because it's no longer there.
-
-        * tao/object.{h,i} (CORBA_Object): Eliminated the pointer to an orb
-        within this object.  This should help solve some problems in
-        passing object references across the wire.
-
-        * tao/connect.cpp: Added template instantiations for
-        ACE_Hash_Map_Iterator to reflect Irfan's recent changes.
-
-        * tests/IDL_Cubit/README: Updated documentation on the server to
-        reflect current reality.
-
-Sun Oct 26 01:01:32 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * tao/orbobj.cpp: Redid the template specialization of Hash_Addr
-        to account for the new changes.
-
-Sun Oct 26 01:05:36 1997    <nw1@COYOTE>
-
-        * tao/corba.h: Changed from using Strategies_T.h to Strategies.h.
-
-        * tao/connect.h: Removed a template argument form ACE_Hash_Addr.
-          Removed explicit instantiation of compare_i.
-
-        * tao/connect.cpp:  Removed a template argument from explicit
-          instantiation of ACE_Hash_Addr.
-
-        * tests/Cubit/TAO/clnt.cpp (main): Added a simple class
-          ACE_Winsock_proper_shutdown here to shutdown winsock properly.
-          This class should be removed later once we figure out how to
-          close down winsock properly from ACE.
-
-        * tests/Cubit/TAO/svc.conf: Changed the name of shared object from
-          libTAO to TAO.  Added configuration lines for using debug
-          version of TAO library on NT.
-
-Sun Oct 26 01:47:04 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp (upcase):
-        * TAO_IDL/util/utl_string.cpp (canonicalize):
-        * TAO_IDL/be/be_decl.cpp (tc_name2long):
-        Added "unsigned" to index variable "i" used in for() loop,
-        to avoid warning "comparison between unsigned and signed"
-
-        * TAO_IDL/be/be_decl.cpp (compute_flatname):
-        * TAO_IDL/be/be_decl.cpp (compute_repoID):
-        * TAO_IDL/be/be_interface.cpp (compute_fullskelname):
-        Fixed error "second - I_FALSE;", should be "second = I_FALSE;"
-
-        * TAO_IDL/be/be_operation.cpp (gen_server_skeletons):
-        * TAO_IDL/be/be_state.cpp (gen_code):
-        Initialized pointers to 0
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc):
-        * TAO_IDL/be/be_operation.cpp (gen_server_header):
-        * TAO_IDL/be/be_operation.cpp (gen_client_header):
-        * TAO_IDL/be/be_decl.cpp (gen_out_defn):
-        * TAO_IDL/be/be_decl.cpp (gen_var_defn):
-        * TAO_IDL/be/be_scope.cpp (gen_client_header):
-        * TAO_IDL/be/be_state.cpp (gen_code):
-        * TAO_IDL/be/be_helper.cpp (operator<<):
-        * TAO_IDL/be/be_union.cpp (tc_encap_len):
-        * TAO_IDL/be/be_typedef.cpp (gen_client_stubs):
-        * TAO_IDL/be/be_string.cpp (gen_client_header):
-        * TAO_IDL/be/be_root.cpp (gen_idl2cplusplus_mapping):
-        * TAO_IDL/be/be_predefined_type.cpp (gen_typecode):
-        * TAO_IDL/be/be_interface.cpp (gen_client_stubs):
-        * TAO_IDL/be/be_interface.cpp (gen_server_skeletons):
-        * TAO_IDL/be/be_interface.cpp (gen_operation_table):
-        * TAO_IDL/be/be_interface.cpp (gen_server_inline):
-        * TAO_IDL/be/be_interface.cpp (tc_encap_len):
-        * TAO_IDL/be/be_field.cpp (gen_encapsulation):
-        * TAO_IDL/be/be_field.cpp (tc_encap_len):
-        * TAO_IDL/be/be_enum_val.cpp (gen_encapsulation):
-        * TAO_IDL/be/be_enum.cpp (tc_encap_len):
-        * TAO_IDL/be/be_constant.cpp (gen_client_header):
-        * TAO_IDL/be/be_constant.cpp (gen_client_stubs):
-        * TAO_IDL/be/be_argument.cpp (gen_client_header):
-        * TAO_IDL/be/be_argument.cpp (gen_client_stubs):
-        * TAO_IDL/be/be_argument.cpp (gen_server_header):
-        * TAO_IDL/be/be_argument.cpp (gen_server_skeletons):
-        * TAO_IDL/be/be_array.cpp (be_array):
-        * TAO_IDL/be/be_array.cpp (gen_client_header):
-        * TAO_IDL/be/be_array.cpp (gen_client_inline):
-        * TAO_IDL/be/be_array.cpp (gen_forany_defn):
-        * TAO_IDL/be/be_array.cpp (gen_forany_impl):
-        * TAO_IDL/util/utl_stack.cpp (push):
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-        for variable slen.
-
-        * TAO_IDL/be_include/be_helper.h (class TAO_OutStream):
-        Made destructor virtual; we have virtual member functions.
-
-        * TAO_IDL/be/be_codegen.cpp (TAO_CodeGen):
-        * TAO_IDL/be/be_decl.cpp (be_decl):
-        * TAO_IDL/util/utl_stack.cpp (UTL_ScopeStack):
-        * TAO_IDL/util/utl_scope.cpp (UTL_ScopeActiveIterator):
-        Reordered member initializers to match declaration order to
-        satisfy the compiler.
-
-        * TAO_IDL/util/utl_scope.cpp (lookup_primitive_type):
-        Added "default" case to switch to return NULL.
-
-        * TAO_IDL/util/utl_scope.cpp (add_attribute):
-        * TAO_IDL/util/utl_scope.cpp (add_operation):
-        * TAO_IDL/util/utl_scope.cpp (add_argument):
-        * TAO_IDL/util/utl_scope.cpp (add_union_branch):
-        * TAO_IDL/util/utl_scope.cpp (add_field):
-        * TAO_IDL/util/utl_scope.cpp (add_typedef):
-        * TAO_IDL/util/utl_scope.cpp (add_sequence):
-        * TAO_IDL/util/utl_scope.cpp (add_array):
-        Use 0 instead of NULL to initialize pointers in the
-        member initialization list, again to avoid ANSI C++ forbids
-        implicit (void *) conversions warnings.
-
-Sun Oct 26 01:01:32 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.16, released Sun Oct 26 01:01:32 1997.
-
-Sun Oct 26 00:32:29 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * TAO/TAO_IDL/fe/idl.ll: Reverted a change that Carlos had
-        overwritten.  I guess he's not getting enough sleep these
-        days... ;-)
-
-Sun Oct 26 00:31:38 1997    <irfan@TWOSTEP>
-
-        * tao/orb_core.i (hash_i): Redid the specialization in view of the
-          new changes.
-
-Sat Oct 25 18:14:14 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp (be_interface): Worked around a
-        nasty MSVC++ compiler bug that doesn't like CORBA::Object
-        (object_ptr).  So we use an existing ACE macro for this.
-
-        * TAO_IDL/be/be_interface.cpp (be_interface): Fixed yet another
-        round of uninitialized data members.  It is clear that the
-        original authors of this code wouldn't pass my ugrad programming
-        course...
-
-        * TAO_IDL/fe/idl.ll (idl_parse_line_and_file): Had to make a minor
-        change to skip over the #line directive from Microsoft.  In
-        addition, had to add some code to put Microsoft-style pathnames
-        into a canonical form (i.e., replacing = '\\' with '\').  Thanks
-        to Darrell for helping with this.
-
-        * TAO_IDL/fe/idl.ll: Added a new rule to handle the fact
-        that the Microsoft C++ preprocessor generates tags of the
-        form
-
-        #line 1 "bar.idl"
-
-        rather than
-
-        #1 "bar.idl"
-
-        which is what UNIX C++ compilers seem to do.
-
-        * TAO_IDL/be/be_decl.cpp (compute_fullname, compute_flatname):
-        Fixed a nasty bug where the original author thought new always
-        returned 0'd memory...  Sheesh!
-
-        * TAO_IDL/driver/drv_preproc.cpp: Changed fd < 0 to fd ==
-        ACE_INVALID_HANDLE to be more portable.
-
-        * TAO_IDL/be/be_decl.cpp (be_decl): There were two fields,
-        flatname_ and repoID_, that weren't given initial values of 0.
-        Thanks to Purify for finding this!
-
-        * TAO_IDL/fe/idl.{yy,ll}: Replaced all uses of type names <name>
-        (e.g., FLOAT) with IDL_<name> (e.g., IDL_FLOAT) so that the code
-        won't bomb on lame systems like NT that typedef basic types to all
-        capitals (e.g., typedef float FLOAT).
-
-Sat Oct 25 22:28:42 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/fe/idl.ll: Since yytext may be an "unsigned char*" under
-          HP-UX they define an "alias" __yytext. This hack fails miserably
-          when using flex, since then the yytext thing can change on the
-          fly. I use an inline function instead.  Added support for #line
-          preprocessor directives.
-
-        * TAO_IDL/driver/drv_preproc.cpp: Documented some of my changes
-          for NT, namely the fact that unlinking the output file while
-          still open causes the parsing to fail on NT.
-
-        * TAO_IDL/tao_idl.dsp: Added new folders for source files, header
-          files, template files, etc. I modelled this based on the ACE
-          project files.
-
-Sat Oct 25 22:05:43 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * TAO_IDL/ast/ast_constant.cpp (exprtype_to_string):
-        Added case statements to handle the rest of un-handled
-        enumerations from AST_Expression::ExprType.  These will
-        handle a default value (i.e. the same case as
-        AST_Expression::EV_none).
-
-        * TAO_IDL/ast/ast_expression.cpp (operator==):
-        * TAO_IDL/ast/ast_expression.cpp (compare):
-        Make the default return value I_FALSE instead of NULL which
-        was  giving "lacks a cast" warning.
-
-        * TAO_IDL/ast/ast_expression.cpp (fill_definition_details):
-        Use 0 instead of NULL to initialize pointers in the
-        member initialization list, again to avoid ANSI C++ forbids
-        implicit (void *) conversions warnings.
-
-        * TAO_IDL/ast/ast_expression.cpp (eval_symbol):
-        Initialized pointers to 0.
-
-Sat Oct 25 17:45:17 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp: Fixed the same bug that Sumedh
-        fixed. In addition, ACEified the calls to strcat and strcmp in
-        that file.
-
-        * TAO_IDL/fe/idl.ll: Used %array in the defintion section so that
-        flex uses yytext as an array of characters rather than pointer to
-        char. The pointer case was resulting in a segmentation fault due
-        to lack of memory allocation for the yytext variable. However, we
-        choose to use the array approach to be compatile with "lex"
-        behavior.
-
-Sat Oct 25 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp: Fixed proper tmp filename
-        creation.
-
-Sat Oct 25 14:14:53 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-        * TAO_IDL/tao_idl.dsw:
-        * TAO_IDL/tao_idl.dsp:
-          Added a MSVC++ project file for the IDL compiler, needs several
-          revisions byt the NT experts before shipping, but it has served
-          me well.
-
-        * TAO_IDL/driver/drv_fork.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-          We use ACE components to fork&exec subprocesses, get the default
-          TMP directory and generate protable pathnames.
-          In one case the mapping to NT is not clear: the use case is fork
-          to get a "fresh" copy of the process and provide a unit of
-          protection for the parent; this feature is only used if more
-          than one IDL file is compiled at the same time.
-
-        * TAO_IDL/be/be_decl.cpp:
-          Fixed minor bug, it said "second - I_FALSE;", it should be
-          "second = I_FALSE
-
-        * TAO_IDL/ast/ast_argument.cpp:
-        * TAO_IDL/ast/ast_array.cpp:
-        * TAO_IDL/ast/ast_attribute.cpp:
-        * TAO_IDL/ast/ast_check.cpp:
-        * TAO_IDL/ast/ast_concrete_type.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/ast/ast_enum.cpp:
-        * TAO_IDL/ast/ast_enum_val.cpp:
-        * TAO_IDL/ast/ast_exception.cpp:
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/ast/ast_field.cpp:
-        * TAO_IDL/ast/ast_generator.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/ast/ast_operation.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/ast/ast_recursive.cpp:
-        * TAO_IDL/ast/ast_redef.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/ast/ast_string.cpp:
-        * TAO_IDL/ast/ast_structure.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-        * TAO_IDL/ast/ast_union.cpp:
-        * TAO_IDL/ast/ast_union_branch.cpp:
-        * TAO_IDL/ast/ast_union_label.cpp:
-        * TAO_IDL/be/be_args.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_generator.cpp:
-        * TAO_IDL/be/be_init.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be_include/be.h:
-        * TAO_IDL/be_include/be_generator.h:
-        * TAO_IDL/driver/drv_args.cpp:
-        * TAO_IDL/driver/drv_fork.cpp:
-        * TAO_IDL/driver/drv_init.cpp:
-        * TAO_IDL/driver/drv_main.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/driver/drv_private.cpp:
-        * TAO_IDL/fe/fe_declarator.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/fe/fe_private.cpp:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/include/ast.h:
-        * TAO_IDL/include/ast_argument.h:
-        * TAO_IDL/include/ast_array.h:
-        * TAO_IDL/include/ast_attribute.h:
-        * TAO_IDL/include/ast_concrete_type.h:
-        * TAO_IDL/include/ast_constant.h:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_enum.h:
-        * TAO_IDL/include/ast_enum_val.h:
-        * TAO_IDL/include/ast_exception.h:
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/include/ast_extern.h:
-        * TAO_IDL/include/ast_field.h:
-        * TAO_IDL/include/ast_generator.h:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/include/ast_interface_fwd.h:
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/ast_operation.h:
-        * TAO_IDL/include/ast_predefined_type.h:
-        * TAO_IDL/include/ast_root.h:
-        * TAO_IDL/include/ast_sequence.h:
-        * TAO_IDL/include/ast_string.h:
-        * TAO_IDL/include/ast_structure.h:
-        * TAO_IDL/include/ast_type.h:
-        * TAO_IDL/include/ast_typedef.h:
-        * TAO_IDL/include/ast_union.h:
-        * TAO_IDL/include/ast_union_branch.h:
-        * TAO_IDL/include/ast_union_label.h:
-        * TAO_IDL/include/be_extern.h:
-        * TAO_IDL/include/drv_extern.h:
-        * TAO_IDL/include/drv_private.h:
-        * TAO_IDL/include/fe_declarator.h:
-        * TAO_IDL/include/fe_extern.h:
-        * TAO_IDL/include/fe_interface_header.h:
-        * TAO_IDL/include/fe_private.h:
-        * TAO_IDL/include/global_extern.h:
-        * TAO_IDL/include/idl.h:
-        * TAO_IDL/include/idl_bool.h:
-        * TAO_IDL/include/idl_defines.h:
-        * TAO_IDL/include/idl_extern.h:
-        * TAO_IDL/include/idl_fwd.h:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/include/idl_narrow.h:
-        * TAO_IDL/include/intlmacros.h:
-        * TAO_IDL/include/nr_extern.h:
-        * TAO_IDL/include/util.h:
-        * TAO_IDL/include/utl_decllist.h:
-        * TAO_IDL/include/utl_error.h:
-        * TAO_IDL/include/utl_exceptlist.h:
-        * TAO_IDL/include/utl_exprlist.h:
-        * TAO_IDL/include/utl_identifier.h:
-        * TAO_IDL/include/utl_idlist.h:
-        * TAO_IDL/include/utl_indenter.h:
-        * TAO_IDL/include/utl_labellist.h:
-        * TAO_IDL/include/utl_list.h:
-        * TAO_IDL/include/utl_namelist.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/include/utl_scoped_name.h:
-        * TAO_IDL/include/utl_stack.h:
-        * TAO_IDL/include/utl_string.h:
-        * TAO_IDL/include/utl_strlist.h:
-        * TAO_IDL/include/utl_tmpl/utl_decllist.h:
-        * TAO_IDL/include/utl_tmpl/utl_exceptlist.h:
-        * TAO_IDL/include/utl_tmpl/utl_exprlist.h:
-        * TAO_IDL/include/utl_tmpl/utl_idlist.h:
-        * TAO_IDL/include/utl_tmpl/utl_labellist.h:
-        * TAO_IDL/include/utl_tmpl/utl_list.h:
-        * TAO_IDL/include/utl_tmpl/utl_namelist.h:
-        * TAO_IDL/include/utl_tmpl/utl_strlist.h:
-        * TAO_IDL/narrow/narrow.cpp:
-        * TAO_IDL/util/utl_decllist.cpp:
-        * TAO_IDL/util/utl_error.cpp:
-        * TAO_IDL/util/utl_exceptlist.cpp:
-        * TAO_IDL/util/utl_exprlist.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/util/utl_identifier.cpp:
-        * TAO_IDL/util/utl_idlist.cpp:
-        * TAO_IDL/util/utl_indenter.cpp:
-        * TAO_IDL/util/utl_labellist.cpp:
-        * TAO_IDL/util/utl_list.cpp:
-        * TAO_IDL/util/utl_namelist.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-        * TAO_IDL/util/utl_stack.cpp:
-        * TAO_IDL/util/utl_string.cpp:
-        * TAO_IDL/util/utl_strlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_decllist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_exprlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_idlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_labellist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_list.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_namelist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_strlist.cpp:
-          Removed a *big* number of warnings, in an attempt to surface
-          real problems. The main one was "#pragma ident" and some unused
-          variables.
-
-Sat Oct 25 06:22:03 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.yy: I got errors parsing the idl.yy thru
-        bison. There were errors indicating "type clash on default action".
-
-        This had to do with the fact that the non-terminal "type_dcl" did not
-        have any type defined for it, but it had "struct_type", "union_type"
-        and others on the right-hand side of the rules. The default action of
-        YACC is supposed to assign $1 to $$. So the type for "struct_type"
-        that happened to be a AST_Decl node was getting assigned to the
-        non-terminal "type_dcl" who had no type.
-
-        I am very surprised that the "yacc" on our Sparcs never ever gave this
-        error, but bison did.
-
-        Hence I have modified idl.yy slightly so that I have {$$ = 0;} as the
-        default action. In addition, the non-terminal "type_dcl" is now
-        defined to be of type "ival" which is defined as long inside the
-        %union clause.
-
-        Above all, the bison generated files required some prototypes. So I
-        had to add the following to idl.yy in the declarations section.
-
-        int yylex (void);
-        void yyerror (char *);
-        extern "C" yywrap (void);
-
-        Somehow, this yywrap had to be under extern "C". I don't know why the
-        others need not be under extern "C".
-
-
-Sat Oct 25 00:05:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.15, released Sat Oct 25 00:05:05 1997.
-
-Sat Oct 25 02:46:05 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-        * TAO_IDL/fe/Makefile:
-        Changed the YACC variable to use the bison compiler.
-        Added "-y" to YFLAGS to make bison generate output files like yacc.
-        Changed the LEX variable to use the flex parser instead of lex.
-        These programs generate code that has less warnings and is better
-        code in general.
-        Added "-D_REENTRANT" to CPPFLAGS, to be able to eliminate the warnings
-        in lex.yy.cpp.  This could also be fixed if we include "ace/ACE.h" at
-        the beginning of lex.yy.cpp, but this file is generated with flex.
-
-        * TAO_IDL/fe/idl.yy:
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-        for variable "AST_Decl *v".
-
-        * TAO_IDL/fe/idl.ll (idl_atof):
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-        for variable f and h.
-
-        * TAO_IDL/include/idl.h:
-        Added include file "ace/ACE.h".  This was necessary to eliminate
-        warnings of implicit declarations, which were because the _REENTRANT
-        flag was not defined.
-
-        * TAO_IDL/ast/ast_operation.cpp (AST_Operation):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-
-        * TAO_IDL/ast/ast_operation.cpp (fe_add_exceptions):
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-        for variable fs.
-
-        * TAO_IDL/ast/ast_interface.cpp (AST_Interface):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-
-        * TAO_IDL/ast/ast_expression.cpp (operator==):
-        * TAO_IDL/ast/ast_expression.cpp (coerce):
-        * TAO_IDL/ast/ast_expression.cpp (coerce_value):
-        * TAO_IDL/ast/ast_expression.cpp (compare):
-        * TAO_IDL/ast/ast_expression.cpp (dump_expr_val):
-        Added case statements to handle the rest of un-handled
-        enumerations from AST_Expression::ExprType.  These will
-        handle a default value (i.e. the same case as
-        AST_Expression::EV_none).  Enumerations added are:
-        AST_Expression::EV_wstring
-        AST_Expression::EV_wchar
-        AST_Expression::EV_longdouble
-        AST_Expression::EV_ulonglong
-        AST_Expression::EV_longlong
-
-        * TAO_IDL/ast/ast_expression.cpp (AST_Expression):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-
-        * TAO_IDL/ast/ast_decl.cpp (AST_Decl):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-        Also, use 0 instead of NULL to initialize pointers in the
-        member initialization list, again to avoid ANSI C++ forbids
-        implicit (void *) conversions warnings.
-
-        * TAO_IDL/ast/ast_array.cpp (dump):
-        Added "unsigned" to index variable "i" used in for() loop,
-        to avoid warning "comparison between unsigned and signed"
-
-        * TAO_IDL/ast/ast_array.cpp (compute_dims):
-        Added "unsigned" to index variable "i" used in for() loop,
-        to avoid warning "comparison between unsigned and signed"
-
-        * TAO_IDL/ast/ast_array.cpp (AST_Array):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-
-        * TAO_IDL/fe/fe_declarator.cpp (FE_Declarator):
-        Reordered member initializers to match declaration order to
-        eliminate warnings from the compiler.
-
-        * TAO_IDL/driver/drv_main.cpp (DRV_drive):
-        Added ACE_UNUSED_ARG macro to avoid unused variable warning.
-
-        * TAO_IDL/ast/ast_recursive.cpp (AST_illegal_recursive_type):
-        Initialized pointer variables to avoid warnings.
-
-Fri Oct 24 19:18:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao: Changed remaining uses of BOA to POA.
-
-        * cubit_i.cpp (please_exit): Replaced the call to
-        please_shutdown() on the POA (which no longer exists) with the
-        shutdown() call on the ORB.
-
-        * tests/IDL_Cubit/svr.cpp: Removed
-
-        oa_ptr->clean_shutdown (env);
-
-        since this is no longer supported in TAO's POA.
-
-        * tao/poa.h: Changed the get_boa() method to get_poa().  Even this
-        will probably go away soon.
-
-Fri Oct 24 18:25:00 1997  Aniruddha Gokhale  <gokhale@flamenco.cs.wustl.edu>
-
-        * TAO/tao/svrrqst.cpp: Method params was allocating memory even
-        when the Any's already had memory allocated for the IN and INOUT
-        parameters. Due to this the params would retrieve results in the
-        allocated storage whereas the stubs/skeletons would continue to
-        use variables that they had defined to hold the values.
-
-Fri Oct 24 17:33:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/poa.*: #ifdef'd out the IIOP 1.4 references to shutdown.
-        I'm leaving them in there right now because they might be useful
-        as private member later when we need to figure out how to get OAs
-        to cooperate and shut themselves down in the face of an ORB
-        shutdown.
-
-        * tao/orbobj.h (shutdown): Fixed up documentation.
-
-        * tao/orbobj.i (shutdown): Provided appropriate arg default.
-
-        * tests/Cubit/TAO/svr.cpp: Eliminated unnecessary Object Adapter
-        name from POA_init() invocation.
-
-        * tests/Cubit/TAO/cubit_i.cpp (Cubit_please_exit): Revised to use
-        the new ORB::shutdown() method.
-
-        * tests/Cubit/TAO/clnt.cpp: Got rid of IIOP 1.4-style debug
-        message calls.
-
-        * tao/orbobj.cpp (CORBA_ORB::ORB_init): Corrected a heinous
-        problem in the option parsing loop where argvec_shift() would be
-        asked to shift two argv elements when there was only one.  This
-        could cause problems if an option that required an argument didn't
-        include the argument.  Thanks to Manojkumar Acharya
-        <cvsf325.gpt.co.uk> for sending in a bug report that lead to my
-        finding this!
-
-Fri Oct 24 14:08:12  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * Improved the compiler to make Unions work. The most subtle error
-        was the way the private section of the class for unions was being
-        generated. TAO's Typecode library expected the union members to be
-        inside of a C++  union declaration inside the private
-        section. Whereas the compiler was generating each member
-        separately.
-
-        Another source of error was bad typecode tables getting
-        generated. This is now fixed.
-
-        * TAO/tests/IDL_Cubit: The cubit_i.cpp for cube_union was doing
-        wrong calculations for structs. This was due to my copy-paste
-        tendency and not verifying if it was correct or not. This has been
-        fixed. The README file is updated to reflect the fact that this
-        directory contains code that uses the IDL compiler.
-
-Fri Oct 24 01:54:00 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.14, released Fri Oct 24 01:54:00 1997.
-
-Fri Oct 24 01:02:01 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * clnt.cpp: Removed mysterious obsolete definitions of
-        cube_union_stub() and cube_union_dii().
-
-        * be_state.h: Added definitions for the methods in class
-        be_state_attribute.  For some reason, they were missing.
-
-        * TAO_IDL/be/be_state.cpp: Added the necessary template
-        specializations so that the TAO IDL compiler will work with GCC.
-
-Thu Oct 23 22:46:10 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO IDL Compiler: More progress in terms of getting the Cubit
-        example to work with the IDL generated code. However, we are still
-        finding some problems with using the client-side cubit_union_dii
-        to work properly.
-
-        Much of the improvements were to the server-side skeletons for
-        operations. In addition, code for union constructors, assignment
-        operator, and accessor for discriminant added.
-
-        Some bugs in typecode generation are fixed. This had to do with
-        the encapsulation length for predefined types. It was returning -1
-        as opposed to 0.
-
-        * TAO/tests/IDL_Cubit: Added this directory with the cubit
-        example. Use this to test the IDL compiler. The makefile will
-        invoke the IDL compiler to create the required files.
-
-Thu Oct 23 18:34:02 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/*/Makefile: Fixed the Makefiles so that it has the correct
-        files and dependencies.  Thanks to Steven Wohlever
-        <wohlever@mitre.org> for reporting this.
-
-Wed Oct 22 20:02:39 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * README.sun: Added an explicit reminder at the top that the
-        information in this file is historical in nature and does not
-        necessarily apply to current reality.
-
-        * tao/orbobj.* (shutdown): Added code to the run() event loop so
-        that it will terminate when it finds a flag set.  This involved
-        adding the flag to the ORB's state and minimally implementing the
-        shutdown() method.  The shutdown method still does not honor the
-        "wait for completion" flag which can be passed to it, though.
-
-        * README: Updated the season from "summer" to "Fall" ;-) Also
-        added a note that warned people not to try to link TAO with a
-        version of ACE that's linked with another ORB library, e.g.,
-        liborbix.so.  Thanks to Steven Wohlever <wohlever@mitre.org> for
-        bringing this instructional omission to our attention.
-
-        * tao/tao_internals.cpp (fake_service_entries_i): Made the body of
-        this function conditional on the TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-        preprocessor definition since it doesn't need to exist in
-        platforms that grok the Service Configurator.  This will also
-        reduce the memory footprint :-).  Thanks to David Miron
-        <dxm@crapper.dsto.defence.gov.au> for pointing this out!
-
-        * tao/orb_core.cpp (TAO_ORB_Core): Removed explicit CTOR
-        initialization of reactor_ member.
-
-Wed Oct 22 19:37:22 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO IDL Compiler: Improvements made so that the server-side
-        skeletons for operations now generate valid code. The code
-        generated for the Cubit.idl was compiling cleanly. It is under
-        test currently to see if it runs.
-
-        * Some progress in handling forward declarations of interfaces.
-
-Wed Oct 22 12:55:19 1997    <nw1@CHA-CHA>
-
-        * tao/poa.h:  Added ACE_Svc_Export to class CORBA_POA.
-
-        * tao/TAO.{mdp,mak}:  Updated files in project file.
-
-        * tao/TAO.dsp: Removed boa, Orb_Core and added poa, orb_core to
-          the project file.
-
-Tue Oct 21 17:21:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/releasenotes/orbcore.html: Updated to reflect daily
-        progress.
-
-        * tests/Cubit/TAO/Makefile: Updated dependencies.
-
-        * tests/Cubit/TAO/svc.conf: Updated to eliminate empty quotes at
-        the end that tickled a deficiency in the Service Configurator's
-        grammar.
-
-        * tests/multiCubit/svr.cpp: Updated to reflect POA_init change.
-
-        * tests/Thruput_test/Makefile: Modified to reflect filename
-        changes.
-
-        * tests/Thruput_test/server.cpp: Changed type of argv so that it
-        matched properly.
-
-        * tao/boa.*: Renamed to tao/poa.*.
-
-        * tao/Orb_Core.*: Renamed to tao/orb_core.*.
-
-        * tao/{Makefile,corba.h,default_client.cpp,default_server.cpp,orb.h,orbobj.cpp,params.h}:
-        Modified to reflect filename changes.
-
-Tue Oct 21 13:23:48 1997 Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/connect.i: Moved hash_i and compare_i template
-          specialization to Orb_Core.i.  Original code was left comment
-          out until this mod is checked on all platforms.
-
-        * tao/Orb_Core.i: Added hash_i and compare_i code from connect.i.
-
-Tue Oct 21 03:23:29 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tao/Orb_Core.cpp: Removed conditional inclusion of Orb_Core.i
-          since, according to corba.h, it is always included as an inline
-          function file.
-
-Tue Oct 21 02:24:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.13, released Tue Oct 21 02:24:14 1997.
-
-Mon Oct 20 23:42:48 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * TAO/boa: Changed BOA_init() to POA_init() to be
-          more consistent...
-
-        * TAO_IDL/be/be_interface.cpp,
-          tests/TAO/Thruput_test/server.cpp,
-          tests/TAO/Thruput_test/ttcpS.cpp,
-          tests/TAO/RT_test/Task_Client.cpp,
-          tests/TAO/RT_test/cubit_impl.cpp,
-          tests/TAO/multiCubit/cubitS.cpp,
-          tests/TAO/multiCubit/svr.cpp,
-          tests/TAO/Demux_Test/server.cpp,
-          tests/TAO/Demux_Test/CodeGen/skel.cpp,
-          tests/TAO/MT-Cubit/client/Task_Client.cpp,
-          tests/TAO/MT-Cubit/server/cubitS.cpp,
-          tests/TAO/MT-Cubit/server/svr.cpp,
-          tests/TAO/cubitS.cpp,
-          tests/TAO/svr.cpp,
-          tests/TAO/test1_svr.cpp: Changed BOA to POA to reflect the
-          new naming conventions.
-
-        * tao/stub.i (STUB_Object): Removed a stray default value from the
-        STUB_Object constructor...  Thanks to Carlos for noticing this.
-
-MOn Oct 20 10:14:09 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * Improved version of the TAO IDL compiler. The executable has
-        been renamed to tao_idl. There are a number of improvements as
-        well as shortcomings. These are explained in the
-        docs/releasenotes/index.html page, which can be viewed online at
-        http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/.
-
-Mon Oct 20 16:30:29 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/tao_internals.cpp (fake_service_entries_i): Based the
-        arguments to the faked server service entry for VxWorks on the
-        TAO_HAS_TSS_ORBCORE compilation flag.  This should hopefully
-        eliminate the problems Boeing was seeing in the early rounds of
-        testing the most recent release of TAO.
-
-        * tao/{iiopobj.*,giop.h}: Moved a lock that had been in
-        TAO_GIOP_Invocation (why?  I don't know) into IIOP_Object.  It
-        protects the fwd_profile_ pointer, which has now become private.
-        Also added accessors for the data member as well as the lock.
-        Accessors come in two flavors--thead-safe (fwd_profile()) and
-        non-thread-safe (fwd_profile_i()).  The non-thread-safe variety
-        expect that the lock will be taken and held for the duration of
-        their usage, but no checking is performed in this respect.
-
-        * tao/giop.cpp: Changed references to the IIOP_Object::fwd_profile
-        data member to go through the new accessors (see above).
-
-        * tao/stub.i: Created new file with inline methods for
-        STUB_Object.
-
-        * tao/stub.h: Moved inline method definitions into a new
-        file--stub.i.
-
-        * tao/orbobj.cpp (BOA_init): Eliminated dead code and unused
-        variable.
-
-        * tao/except.cpp (print_exception): Eliminated unused argument
-        warning detected by gcc.
-
-        * tao/corba.h: Re-ordered inclusion of Orb_Core.i to eliminate
-        'function used before declared inline' errors detected by gcc.
-
-        * tao/{Orb_Core,boa,corbacom,orb,orbobj,svrrqst}.*: Renamed BOA to
-        POA.
-
-        * docs/releasenotes*: Moved releasenotes.html into a directory
-        named "releasenotes" so that the various status pages can live
-        independently.  Currently only the ORB Core's status page is
-        broken out, but the documentation should eventually turn into two
-        frames with the one at the top acting as the guide and the lower
-        frame being the actual status document.
-
-Fri Oct 17 17:42:27 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/releasenotes.html: Updated to reflect current status.
-
-        * tao/orbobj.*: Added some documentation for open() method.
-
-        * tao/roa.*: Gone.  Bye-bye.  Removed.
-
-Fri Oct 17 15:43:04 1997    <nw1@CHA-CHA>
-
-        * tao/connect.h: Added template instantiation supression directive
-          for Win32.  VC was complaining about duplicate symbols definition.
-
-Fri Oct 17 06:25:23 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/{boa,roa}.*: Merged class ROA into class
-        CORBA_BOA. Hopefully everything still works ;-)
-
-        * docs/releasenotes.html: Quick update for new TODO list.  Will be
-        updated within the next day or so with dates, too.
-
-        * tao/{server_factory,orbobj,Orb_Core}.cpp: Corrected incorrect
-        explicit template instantiations and added missing ones.
-
-Thu Oct 16 23:48:04 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.12, released Thu Oct 16 23:48:04 1997.
-
-Thu Oct 16 11:15:00 1997  Brian R. Mendel <brian.r.mendel@boeing.com>
-
-        * tao/server_factory.cpp: Added instantiation pragma for VxWorks for
-          ACE_Acceptor.  Added the template to the specialization section, also.
-
-        * tao/orbobj.cpp: Added instantiation pragma for VxWorks for
-          ACE_Cached_Connect_Strategy and ACE_Hash_Map_Manager for
-          ACE_Null_Mutex instantiations.  Also, added these to the template
-          specialization sections.
-
-        * tests/Cubit/Build/default.bld: Added TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-          to defines section of GHS build file.
-
-Tue Oct 14 21:11:20 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/xdr.h: Changed int _fd to ACE_HANDLE _fd to work on NT.
-          Thanks to Satheesh Kumar <satheesh@aspectdv.com> for reporting
-          this.
-
-Tue Oct 14 02:48:21 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.11, released Tue Oct 14 02:48:21 1997.
-
-Mon Oct 13 23:30:16 1997    <irfan@TWOSTEP>
-
-        * tao/connect.h: If we are using TSS, there is no reason to use
-          locking in the connector. Therefore, I added a new typedef that
-          defines the type of lock that should be used for the
-          cached_connect_strategy.  It is ACE_SYNCH_RW_MUTEX in the
-          non-TSS case, and ACE_SYNCH_NULL_MUTEX in the TSS case.
-
-Mon Oct 13 21:34:00 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/svrrqst.cpp (oa): Cleaned up the coding style a bit.
-
-Sun Oct 12 15:38:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/client_factory: Gutted the client factory code related to
-          the Strategy_Connector so that it's either in the TAO_Orb_Core.
-
-        * tao/default_client.h: Removed the connector() from the
-          Default_Client_Factory entirely since it's all been put into the
-          TAO_ORB_Core now.
-
-        * tao/giop.cpp (start): Hacked up the code so that we extract our
-          connector from thread-specific storage if we're using the
-          thread-per-rate concurrency model.  This needs to be integrated
-          more cleverly in the ORB.
-
-        * tao/orbobj.h: Put an instance of the TAO_CONNECTOR into each
-          TAO_ORB_Core object so that we don't have to share these things
-          among all of the threads in a process, but instead can have them
-          be located in thread-specific storage.
-
-        * tao/orbobj.cpp (perform_work): Updated the run() and
-          perform_work() methods to take optional ACE_Time_Value *'s (so
-          they can return from timeouts) and to return error flags if
-          things go wrong.
-
-        * tao/orbobj.h (CORBA_ORB): Changed the set_up_for_listening()
-          call to open(), which is more consistent with other usage in
-          ACE/TAO.
-
-        * tao/orbobj: Changed the name client_acceptor_ to peer_acceptor_
-          to reflect the fact that the connection model is more generic
-          than the notion of client/server interactions (which really take
-          place as the result of particular communication roles).
-
-        * tao/corba.h: Moved the order of #includes around so that
-          "connect.h" is included before "client_factory.h"
-
-        * tao/connect.h: Moved the typedef of the ACE_Strategy_Connector<>
-          from the TAO_Client_Strategy_Factory into the global space and
-          renamed it TAO_CONNECTOR file so that it will be equivalent with
-          the TAO_ACCEPTOR.
-
-Thu Oct  9 23:17:37 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * tao/giop.cpp (invoke): If an error occurs, make sure to mark the
-          handler_ as no longer being in use before we set it to 0.
-
-        * tao/giop.cpp (TAO_GIOP_Invocation): We need to make sure that
-          handler_ isn't 0 before we mark it as no longer being in use.
-
-Thu Oct  9 11:33:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * tao/giop.cpp:
-          There was a minor sintax error.
-
-Tue Oct 07 09:34:35 1997    <brian.r.mendel@boeing.com>
-
-        * tao/Orb_Core.h{cpp}: Added ACE_Svc_Export label to global
-        TAO_ORB_Core_instance() method.  Needed for DLL support on NT.i
-
-        * default.bld, tao.bld: Modified VxWorks build files to add new files.
-
-Tue Oct 07 07:05:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.10, released Tue Oct 07 07:05:38 1997.
-
-Mon Oct 06 22:11:40 1997    <nw1@CHA-CHA>
-
-        * tests/Cubit/TAO/cubit_i.cpp (Cubit_please_exit):
-        * tests/Cubit/TAO/cubitS.cpp (_skel_Cubit): Changed to use the new
-          TAO_ORB_CORE_instance () global function.
-
-Mon Oct  6 20:06:05 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/{boa.h,connect.cpp,giop.cpp,giop.h,roa.cpp,roa.h}:
-        Eliminated unused methods and code.
-
-        * tao/Orb_Core.*: Created new global function called
-        TAO_ORB_Core_instance() which will return the correct instance of
-        the ORB Core state.  This had previously been accessed using
-        TAO_ORB_CORE::instance(), but Win32s linking procedures made the
-        template for TAO_ORB_CORE expand in both the application and the
-        library/DLL, thus creating two singletons.  Bad scene.  The
-        function should force the expansion of the template to only be in
-        the DLL.
-
-        * tao/{connect,default_client,default_server,orbobj,roa}.cpp:
-        Changed references to TAO_ORB_CORE::instance() to
-        TAO_ORB_Core_instance().
-
-        * tao/singletons.h: Removed definition of TAO_ORB_CORE.
-
-Sat Oct  4 20:08:57 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tao/TAO.{dsp,dsw}: Added tao_internals.cpp into project file
-          list.
-
-        * tao/tao_internals.h (TAO_Internal): Added ACE_Svc_Export and
-          $ I d $.
-
-        * tao/tao_internals.i (open_services): Added default return value
-          0.
-
-        * tao/tao_internals.cpp: Added #include "tao/tao_internals.h" and
-          the CVS $ I d $ field.  Also, we should include inline (.i) file
-          for inline code.
-
-Fri Oct  3 09:29:05 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * tests/multiCubit/svr.cpp: Changed the key naming scheme back to
-        not be unique throughout the process.  Process-unique code is
-        still there, but conditionally compiled mutually-exclusive to the
-        other scheme.
-
-        * tao/server_factory.*: The object_lookup_strategy method is gone
-        and is replaced by the create_object_table factor method.  See
-        more information below.
-
-        * tao/default_server.*: The server factory no longer holds on to a
-        single pointer for the object lookup strategy.  In previous
-        incarnations of TAO, this didn't cause problems, but the advent of
-        ORB-per-thread highlighted the inherent badness in this
-        implementation choice.  Gone is the object_lookup_strategy method,
-        and in comes the create_object_table factory method, which creates
-        and returns (and doesn't hold onto) an object table in accordance
-        with parameters such as size and search algorithm.
-
-        * tao/roa.cpp: Changed to use the create_object_table method.
-
-Thu Oct  2 13:48:31 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * tests/multiCubit/svr.cpp: Modified the key generation scheme to
-        include thread ID.  This works around a current shortcoming in the
-        ORB Core in which the object table is shared throughout all object
-        adapters (yes, this is being fixed).
-
-        * tao/tao_internals.*: Added new class to scope static operations
-        and data completely internal to the ORB.
-
-        * tao/orbobj.{i,cpp}: Moved CORBA_ORB DTOR into cpp file.  Finally
-        got rid of icky static mutex in ORB_init().  Moved service config
-        initialization into TAO_Internal method.
-
-        * tao/Orb_Core.h: Added comments.
-
-Wed Oct  1 12:51:48 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tao/corbacom.h: Removed CORBA:: name resolution from the class
-          String_out which is itself defined in class CORBA.  MSVC doesn't
-          like that.
-
-Wed Oct  1 10:44:55 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tao/varout.h: Fixed some template errors in class
-        TAO_Object_out. This was pointed to me by Carlos as he was
-        compiling TAO in SGI.
-
-Wed Oct  1 09:10:38 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-        * docs/releasenotes.html:
-          Updated information on the Event Channel, the use of the Naming
-          Service is no longer a plan, it is done already.
-
-Tue Sep 30 20:14:29 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.9, released Tue Sep 30 20:14:29 1997.
-
-Tue Sep 30 19:42:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * Makefile: Removed "docs" from DIRS so we don't try to run
-        make in this directory.
-
-Tue Sep 30 17:27:00 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * <RELEASE>: Tagged a release for limited consumption until the
-        Service Configurator bug is fixed.
-
-        * tests/multiCubit/svr.cpp: Added code to properly release CORBA
-        objects.  Delays between task activations simply aid in debugging
-        and are not necessary.
-
-        * tao/singletons.h: Made TAO_ORB_Core's singleton type
-        compile-time selectable via the TAO_HAS_TSS_ORBCORE compiler flag.
-
-        * tao/orbobj.cpp: Corrected an incorrect shift count, and the ORB
-        Core now defaults to using the host name of the local host.
-
-        * tao/Orb_Core.[hi]: Added explicit CTOR.
-
-        * tao/Orb_Core.cpp: Insured that the correct template type was
-        instantiated.
-
-        * tao/Makefile: Added -DTAO_HAS_TSS_ORBCORE to CPPFLAGS.
-
-Tue Sep 30 16:43:12 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/releasenotes.html: Added some notes on the ORB Core.
-
-Mon Sep 29 14:39:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/{index,components,releasenotes}.html: Added additional
-        documentation.
-
-Mon Sep 29 13:50:34 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO ORB changes:
-
-        any.*: Added _var and _out classes.
-
-        corbacom.{h,i} : Added _out types for primitive types, added _out and
-        updated _var classes for String. Added corbacom.i for implementing
-        the String's _var and _out classes
-
-        sequence.{h,i}: Added a number of templates for _var and _out
-        classes. However, these are yet to be used and tested.
-
-        * Alpha release of TAO IDL compiler added to this release. This is
-        an alpha release and we are currently putting it to rigorous
-        test. A large amount of code for the back end is added under the
-        TAO/TAO_IDL/be_include and TAO/TAO_IDL/be/ directories.
-
-        In addition, some amount of ACEification done to methods belonging
-        to the TAO/TAO_IDL/utils/ classes.
-
-        A few errors in the IDL grammar have been fixed in
-        fe/idl.yy. These had to do with the valid types for parameters and
-        operation return types. There are still some errors recognizing
-        unions which will be fixed later. The scanner (fe/idl.l) was
-        modified to recognize the OMG IDL data type "any".
-
-        * The ChangeLog file under TAO/TAO_IDL is removed and its contents
-        are inserted appropriately in this ChangeLog file
-
-Sun Sep 28 17:01:27 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/multiCubit: Added a multi-threaded version of Cubit.
-
-        * tao/orbobj.cpp: At long last, Andy has his wish for not having
-        to provide a "-ORBhost <me>" argument to a server.  It now uses
-        ACE_OS::hostname() to determine the canonical hostname, and
-        listens on that address.
-
-        * tao/singletons.h: Changed the ORB Core singleton to be a TSS
-        singleton; this will eventually be conditionally compiled in
-        (before release).  Also added comments and "safety defines".
-
-        * tao/except.cpp: Changed some usage of fputs() in
-        print_exception() to use ACE_DEBUG.
-
-Sun Sep 28 03:18:24 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-        * tests/Cubit/TAO/cubitC.h (Object): Changed references of base
-          class from "CORBA::Object" to "CORBA_Object."  MSVC doesn't
-          allow this.
-
-        * tao/Orb_Core.h: Added ACE_Svc_Export to TAO_Orb_Core class.
-
-        * tao/corbacom.h: Added ACE_Svc_Export to all IID constants.
-          Notice that we must put ACE_Svc_Export _after_ extern "C".
-
-Sat Sep 27 09:31:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/Orb_Core.h: Fixed the friend declaration for
-        CORBA::ORB_init().
-
-        * tests/Cubit/TAO/svr.cpp: Modified to use ORB::run() for event
-        loop and eliminated code cruft.
-
-        * tao/orbobj.*: Added stubs for 4 methods on the ORB from the
-        POA spec: work_pending, perform_work, run, and shutdown.  Of all
-        of these, only run is reasonably implemented, and there not even
-        according to the spec (because the way the spec works isn't really
-        good for our purposes...need to work on that).  See the docs for
-        information.
-
-        Moved the initialization of the Acceptor into its own method,
-        set_up_for_listening (which is a one-shot style method), and
-        placed a call to this within the aforementioned run method.
-
-        * tao/default_client.h: Miscellaneous comments added.
-
-        * tao/connect.cpp: Corrected an errant ACE_DEBUG () call.
-
-        * tao/Orb_Core.*: Added private methods to allow setting of the
-        orb and extended the laurel of friendship to CORBA::ORB_init().
-
-Fri Sep 26 10:20:06 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.*: Added acceptor initialization code to CORBA_ORB
-        CTOR.  (We still need to find a way to NOT do this on the client
-        side.)  Moved CORBA_ORB CTOR into .cpp to avoid nasty
-        interdependencies caused when it was in the .i file.  Moved the
-        specification of host and port to be ORB parameters rather than OA
-        parameters, i.e., -OAhost is now -ORBhost and -OAport is now
-        -ORBport.
-
-        * tao/roa.*: Removed server-side connection endpoint
-        initialization (Acceptor stuff) and put it into the ORB.
-
-        * tao/connect.h: Renamed ROA_Acceptor to TAO_Acceptor (since it's
-        not related to the OA any longer), and restored explicit inclusion
-        of ace headers to avoid having to include "corba.h".
-
-        * tao/boa.h: Removed unneeded get_addr() method.
-
-        * tests/Cubit/TAO/cubitS.cpp: Updates to support changes in ORB
-        Core.
-
-Thu Sep 25 12:28:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/params.*: Added explicit CTOR & DTOR for
-        TAO_{OA,ORB}_Parameters classes that somehow got removed in the
-        previous round of attacks.  Also specified all methods which go
-        into the .i file as "LOCAL_INLINE" within the header.  This avoids
-        having to unravel ugly, complex order interdependencies.
-
-Thu Sep 25 03:48:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/Options.html: Terse documentation on options available for
-        the abstract factories.
-
-        * tao/Orb_Core.*: Added this class (TAO_ORB_Core) to hold the
-        "state" of an ORB.  The intent is that as we move towards
-        different concurrency models, this can be thrown into
-        thread-specific storage and remain a singleton, essentially
-        allowing the running of an ORB-per-thread.
-
-        * tao/singletons.h: Added this file to contain type definitions
-        for *ALL* ACE_Singleton<> types used within TAO.  This was
-        motivated by a desire to eliminate the multitude of warnings
-        generated by g++ regarding methods being called before declared
-        inline, and the only way to eliminate this was to insure that all
-        inlined methods were seen by the compiler before the
-        ACE_Singleton<> definition.  Thus, corba.h includes singleton.h as
-        the very last thing that it does.
-
-        * tao/params.*: TAO_OA_Parameters is no longer a singleton, and
-        because of new recognition of associations in the object model for
-        an ORB, lots of data members and their methods have been shuffled
-        to other places or eliminated.  addr() now belongs in
-        TAO_ORB_Parameters, and root_poa_ is in TAO_ORB_Core.  The
-        using_threads_, thread_flags_, upcall_, and forwarder_ members
-        have been eliminated and their roles taken over by the Concurrency
-        Strategies and the new Dispatch call chain implemented in my last
-        round of changes.
-
-        * tao/orbobj.cpp: Changed references to the ORB singleton to go
-        through TAO_ORB_CORE::instance().  Also eliminated an unnecessary
-        global function (_orb()).
-
-        * tao/marshal.h: Moved all ACE_Singleton<> typedefs into
-        singleton.h.  See comment on tao/corba.h for more information.
-
-        * tao/iioporb.h: Removed unnecessary TAO_ORB singleton.  This is
-        now assumed by TAO_ORB_Core instances.
-
-        * tao/corbacom.h: Added CORBA::POA_ptr for upward compatibility.
-
-        * tao/corba.h: Added Orb_Core.[hi] to the appropriate places.
-        Moved iiop{orb,obj}.i inclusions around and moved typedef'ing of
-        all ACE_Singletons into singletons.h, which must be #included
-        AFTER all the inline files.  This eliminated all of the
-        used-before-declared-inline warnings.
-
-        * tao/{connect,default_client,default_server,roa}.*: Updated
-        singleton usages to go through the TAO_ORB_CORE singleton.
-
-        * tests/Cubit/TAO/{cubitS,cubit_i}.cpp: Updated singleton usages
-        to go through the TAO_ORB_CORE singleton.
-
-Wed Sep 17 12:26:56 1997  Nanbor Wang  <nw1@CHA-CHA>
-
-        * tao/TAO.dsp: Updated source file list.
-
-Mon Sep 15 16:52:28 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * tests/Cubit/TAO/{cubitS,cubit_i}.cpp: Updated references to oa()
-        to root_pos().
-
-        * tao/orbobj.cpp: Corrected some adjustments made for Service
-        Configurator rework.
-
-        * tao/giop.h: Moved the def for TAO_GIOP_EndOfFile out of the
-        range of valid GIOP messages.
-
-        * tao/connect.cpp: Added special case for TAO_GIOP_Reply to break
-        out, and distinguished TAO_GIOP_EndOfFile from other errors by
-        setting errno.
-
-        * tao/boa.cpp: The complete reply header is now stuck into the
-        response stream...what a novel concept!
-
-Fri Sep 12 05:40:50 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * params.h: Renamed oa() method to be root_poa() in preparation
-        for the future.
-
-        * orbobj.cpp: Adjusted the FAKE_SVC_ENTRY macro to catch up to
-        recent changes in ACE.
-
-        * giop.*: Major surgery including elimination of GIOP as a giant
-        namespace (now only static methods are in it).  Changed names of
-        things to TAO_*.
-
-        * {encode,decode,iiopobj,invoke,roa}.*: Name changes resulting
-        from giop.cpp surgery.
-
-        * corbacom.h: Moved TAO_opaque decl into here.
-
-        * corba.h: Re-ordered the inline #includes so that the stuff that
-        is ALWAYS inlined is included prior to the stuff that's only
-        inlined when __ACE_INLINE__ is turned on.
-
-        * connect.*: Modified handle_input() substantially.  Added 3
-        template methods: read_message, handle_message, and send_response.
-
-        * {cdr,marshal,object,typecode}.h: Removed the old "always include
-        inlines" hackery.
-
-        * boa.*: Added handle_request() method.
-
-Wed Sep 03 06:15:00 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/default_client.cpp:  Added conditional sections around the code for setting the
-        socket options for VxWorks.  VxWorks does not support a 64K buffer size.
-
-Tue Sep 02 18:32:12 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/orbobj.cpp:  Added include for Service_Repository.h to orbobj.h
-
-        * tao/debug.cpp: Removed the TAO_NEEDS_UNUSED_VARIABLES #defines
-        around the debug_stream declaration.  debug_stream is used by
-        dmsg_filter in debug.cpp.  Changed SYSTEM_EXCEPTION to
-        CORBA::SYSTEM_EXCEPTION.
-
-        * tao/default_client.cpp: Removed extra parameter from
-        ACE_Hash_Map_Entry #pragma instantiate statement.
-
-        * tao/objtable.cpp: Deleted pragmas for instantiating ACE_Guard,
-        ACE_Read_Guard, and ACE_Write_Guard to eliminate duplicate
-        instantiations.  Also, removed the instantiations from
-        ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for the same reason.
-
-        * tao/orbobj.cpp: Added a typecast to void * in argvec_shift
-        method.
-
-        * tao/default.bld - Modified VxWorks Build File to change template
-        instantiation modes.
-
-        * tao/tao.bld - Added default_client.cpp, default_server.cpp,
-        client_factory.cpp, and server_factory.cpp to the VxWorks build
-        file.
-
-        * tao/tao.dsp - Added default_client.cpp, default_server.cpp,
-        client_factory.cpp, and server_factory.cpp to the Win NT project
-        file.
-
-Tue Sep  2 07:31:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.cpp (ORB_init): VxWorks doesn't use
-        ACE_Service_Config for now; the default factories are used.  The
-        Service Repository is still used, but the appropriate values are
-        "stuffed" in manually.
-
-Sat Aug 30 17:07:18 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * tests/Thruput: First attempt at ACEifying it and removing the
-        tremendous amount of unnecessary stuff that was in there. This
-        modified version still needs testing on other platforms.
-
-Fri Aug 29 10:59:34 1997  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-        * tao/Makefile (TAO_ROOT): FINALLY corrected the default
-        definition of TAO_ROOT.
-
-Thu Aug 28 14:04:44 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.i (CORBA_ORB): Removed assertion that was incorrect
-        b/c our ORB object is a singleton and not dynamically allocated,
-        thus the refcount can only reach zero at the end of its life.
-
-        * tao/typecode.cpp (TC_Private_State): Relocated the delete of
-        tc_discriminator_type_ to be after the deletion of the label list.
-        This is because the discriminator will be inside each of the
-        CORBA::Any instances within the label list, and deleting it before
-        deleting the label list results in extreme badness.
-
-        * tao/typecode.* (operator delete): Added CORBA_TypeCode::operator
-        delete() to simplify deletion of both automatically and
-        dynamically allocated instances of CORBA_TypeCode.  This fixes the
-        problem of freeing non-heap memory.
-
-        * tao/nvlist.h (CORBA_NamedValue): Initialized refcount_ in the
-        CTOR.
-
-Mon Aug 18 16:39:40 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-        * Makefile for TAO compiler:
-          $(SOEXT) must be used instead of just .so, the former does not
-          work on all platforms, notably HP-UX.
-
-Mon Aug 18 16:39:29 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-        * tao/Makefile:
-        * tests/Demux_Test/CodeGen/Makefile:
-          $(SOEXT) must be used instead of just .so, the former does not
-          work on all platforms, notably HP-UX.
-
-Sun Aug 17 16:53:42 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-        * IIOP/test/Orbeline/client/Profile_Timer.h:
-        * IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp:
-        * IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h:
-        * IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp:
-        * IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h:
-        * tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp:
-        * tests/Cubit/VisiBroker/base_server/Profile_Timer.h:
-        * tests/Cubit/VisiBroker/client/Profile_Timer.cpp:
-        * tests/Cubit/VisiBroker/client/Profile_Timer.h:
-        We no longer use timestruct_t in ACE, it is a SYSVism; we use
-        timespec_t instead.
-
-Sat Aug 16 01:11:56 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/svc.conf: Added this as an example of an
-        application's service config configuration file.  It also serves
-        as the documentation for various strategy factory options at the
-        moment.
-
-        * tao/orbobj.cpp: Options parsed by the ORB are now
-        -ORBsvcconf <filename>    specifies the service configurator
-                                  file to be used
-        -ORBdaemon                turn this into a daemon
-        -ORBdebug                 turns debugging on in the service
-                                  configurator
-
-        BOA_init() now sets the itself in the TAO_OA_Parameters singleton.
-
-        * tao/orbobj.*: Changed client_factory(), server_factory(), and
-        params() to return pointers rather than references.
-
-        * tao/{roa,giop}.cpp: Updated code that uses the
-        CORBA::ORB::client_factory() to deal with the fact that it now
-        returns a pointer rather than a reference.
-
-        * tao/default_server.cpp (init): This method now properly
-        initializes the contained reactive and threaded strategies so that
-        they're actually usable!
-
-        * tao/connect.cpp: Added #endif comments.
-
-Wed Aug 13 17:42:39 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/*: Converted to the CORBA:: namespace.
-
-        * tao/default_server.h: Eliminated a few strategy accessors since
-        they aren't provided by this implementation.
-
-        * tao/default_server.cpp: Made this compile.
-
-        * tao/corbacom.h: Slight reformatting of code.  More importantly,
-        added 'static' to the decl of ORB_init().
-
-        * tao/corba.h: Added fake comment to trigger C++ mode.
-
-        * tao/any.h: Added #endif comments.
-
-Tue Aug 12 22:37:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/{any,typecode,cdr}.h: Finished appeasing the compiler gods
-        so that we can remove the ACE_INLINE hack.  Things now seem to be
-        in order.
-
-        * tao/corba.h: Got all the frigging header *.i files #included in
-        the right order so that the GCC compiler stops complaining.
-
-        * tao/giop.cpp: We had method definitions that were defined inline
-        within the giop.h file.  This was causing problems for GCC, which
-        kept warning that methods in the cdi.i file were being used before
-        being inlined.  I've fixed this by creating a giop.i file.
-
-        * tao/corba.h: Add #include files should be prefixed by "tao/".
-        I've fixed this in the release.
-
-Tue Aug 12 16:23:17 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/any.i: Added a missing replace() method used by overloaded
-        operators.
-
-        * tao/{any,cdr}.h: Added conditional ACE_INLINE before the decl
-        for a few methods whose usage in other inlined methods appears
-        prior to their definition.
-
-        * tao/default_client.cpp: Eliminated names of unused arguments to
-        stop the compiler from complaining.
-
-        * tao/server_factory.cpp: Properly scoped return type names for
-        several methods.
-
-        * tao/{typecode,decode,deep_copy,debug}.cpp: Bracketed unused
-        variables with #if defined(TAO_NEEDS_UNUSED_VARIABLES)/#endif;
-        this leaves them around for right now in case they're important.
-
-        * tao/client_factory.i (connector): Properly scoped return type's
-        name.
-
-        * tao/{client_factory,default_client}.cpp: Added necessary
-        template instantiations.
-
-        * tao/{typecode,cdr}.h: Added conditional ACE_INLINE in front of
-        inlined methods to appease the compiler gods.
-
-        * tao/boa.cpp (dispatch): Declared argument unused to get rid of
-        warnings.
-
-        * tao/corbacom.h: Moved #include of sequence.h before the decl for
-        class CORBA.
-
-Sun Aug 10 10:58:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/client_factory: Moved the template specializations from the
-        *.cpp file into the *.i file in order to get this stuff to link
-        without multiply defined symbols.  Thanks to Brian Mendel for
-        giving me the idea to do this.
-
-        * tao/client_factory.cpp: Added a template specialization for
-        ACE_Hash_Addr.
-
-Sun Aug 10 08:56:20 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * CORBA_ to CORBA:: transformation complete. All the files in the
-        TAO/tao distribution have been affected. The most notable changes
-        are:
-        (1) A file called "tao/corba.h" is now the master file. All *.cpp
-        files include *just* this file and nothing else.
-
-        (2) "tao/corbacom.h" is the file that defines the CORBA namespace
-        i.e., class CORBA. Individual CORBA classes such as TypeCode, BOA,
-        etc are now defined inside the CORBA namespace. This will allow
-        users and developers to use CORBA::TypeCode as opposed to the
-        previous CORBA_TypeCode. Instead of nesting the classes, however,
-        we use typedefs to define individual CORBA classes inside class
-        CORBA e.g., typedef CORBA_TypeCode TypeCode;
-
-        (3) All *.i files are included at the end of "tao/corba.h" and
-        nowhere else. However, if __ACE_INLINE__ isnot defined, then each
-        individual *.i file is not yet included in their corresponding
-        .cpp file. This will be done next.
-
-        * TAO/tests/Demux_Test: Included code that tests various
-        demultiplexing strategies in TAO. At this point, however, the code
-        will not work because of changes in TAO. This will be done
-        next. A README file provides additional details.
-
-        * TAO/Benchmark: A suite of benchmarking tests have been
-        included. This is still in the preliminary stages of
-        development. The idea is to compare various aspects of CORBA such
-        as marshaling overhead, demux costs, throughput, latency, and
-        others for a range of ORBs including TAO. Since there are
-        differences in programming different ORBs, this suite tries to
-        abstract out all the common features or atleast provide a uniform
-        interface so that minimal efforts are required to port an
-        application from one ORB to another.
-
-        Benchmark/benchmark: This directory contains thecommon features
-        Benchmark/Marshal_Test: Tests marshaling overhead in 3 ORBs -
-        Orbix, VisiBroker, and TAO. More will be added. There are a few
-        problems getting DSI to work. The tech support at IONA and
-        VisiBroker have been contacted.
-
-Sat Aug  9 14:05:08 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-        * tao: Continued to clean up all the code so that it is more
-          consistent with ACE programming style.
-
-        * tao/orbconf.h: Cleaned up a lot of the unnecessary #defines.
-
-        * tao/default_server.h: Make sure we inherit from
-          TAO_Server_Strategy_Factory, not TAO_Server_Factory.
-
-        * tao/server_factory.cpp: Moved all the inline methods to be
-          non-inline since this code will always be dynamically bound.
-
-        * tao/client_factory.cpp: Cleaned things up a bit.
-
-Sat Aug  9 12:37:05 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/corba.h:  Deleted include for xdr.h from corba.h.  xdr.h
-        is obsolete.
-
-        * tao/objtable.cpp:  Deleted pragmas for instantiating ACE_Guard,
-        ACE_Read_Guard, and ACE_Write_Guard to eliminate duplicate
-        instantiations.  The templates are instantiated by ACE.  Can these
-        templates also be removed from the
-        ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION section as well?
-
-        * tao/default.bld: Added build file for VxWorks.
-
-        * tao/tao.bld: Added build file for VxWorks.
-
-Fri Aug  8 14:25:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/orbobj.*: Updated various methods to use the new
-        dynamically-linked strategy factories discussed below.
-
-        * tao/default_client.*: This file now contains the default client
-        strategy factory which is (a) dynamically linkable by the service
-        configurator and (b) can be configured by flags passed in via
-        service configurator.
-
-        * tao/client_factory.*: This file now contains the abstract base
-        class for the client strategy factory.
-
-        * tao/default_server.*: This file now contains the default server
-        strategy factory which is (a) dynamically linkable by the service
-        configurator and (b) can be configured by flags passed in via
-        service configurator.
-
-        * tao/server_factory.*: This file now contains the abstract base
-        class for the server strategy factory.
-
-        * tao/params.*: Renamed DEMUX_STRATEGY enum to TAO_Demux_Strategy
-        and put it at global scope instead of within TAO_OA_Parameters.
-
-        * tao/svc.conf.eg: Created this file to serve as an example of
-        various lines one might find in an application's svc.conf.
-
-Thu Aug  7 09:51:31 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * factories.cpp: Incorrect use of ACE_ASSERT in
-        TAO_Server_Factory::object_lookup_strategy removed.
-
-        * objtable.cpp: The octet sequence object key was being cast into
-        a char* resulting in undefined behavior at times due to the lack
-        of a NULL character to terminate it. Changes were made in the bind
-        and find methods of TAO_Active_Demux_Table.
-
-Thu Aug 07 03:52:31 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.8, released Thu Aug 07 03:52:31 1997.
-
-Thu Aug  7 00:43:14 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/typecode.cpp: A couple of errors involving TAO_CONST crept
-        in when Brian checked in his code.  I fixed these.
-
-Wed Aug  6 18:28:41 1997  Chris Cleeland  <cleeland@swarm.cs.wustl.edu>
-
-        * tests/Cubit/TAO/clnt.cpp (main): Corrected the format
-        specifications when timing was printing out from %ld to %d.  For
-        some reason this never caused a problem on other platforms.
-
-Wed Aug  6 17:27:44 1997  Brian R. Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/typecode.h: Removed qualified name in typecode.h to eliminate
-          compiler warnings by the GHS compiler.  Line 297.
-
-        * tao/decode.cpp: Changed wchar_t* to CORBA_WChar* to eliminate
-          compiler errors on GHS compiler.  Lines 142, 216, 729, 1371, and 1475.
-
-        * tao/typecode.cpp: Deleted unreachable break statements at lines
-          429, and 477, 904, and 947.
-
-Wed Aug  6 16:31:29 1997  Chris Cleeland  <cleeland@swarm.cs.wustl.edu>
-
-        * tao/*: Changed 'const' to 'TAO_CONST' in contexts where the
-        const didn't make sense.  For example, this occurred in situations
-        where methods declared their return type as 'const CORBA_String',
-        which does not translate to 'const char*' but rather 'char*
-        const'.
-
-        * tao/corbacom.h: Added #define for TAO_CONST.  See above for
-        explanation.
-
-        * tao/{connect,factories,giop,iiopobj,marshal,objtable,
-        optable,orbobj,roa}.cpp: Removed errant trailing semi-colon on all
-        the #pragma instantiate directives.
-
-Wed Aug  6 13:56:40 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/{connect,factories,giop,iiopobj,marshal,objtable,
-        optable,orbobj,roa}.cpp: Changed explicit template instantiations
-        to use the new ACE enabling macro as well as adding the #pragma
-        instantiate to placate Edison Design Group compilers.
-
-        * tao/cdr.h: Changed default for CDR CTOR marshal factory to
-        reflect the new name of the default marshal factory variable.
-
-        * tao/orbobj.cpp (CORBA_ORB_init): Inserted call to
-        TAO_Marshal::initialize().
-
-        * tao/marshal.*: Added TAO_Marshal class to scope static
-        initialization methods for the marshalling engine.
-        TAO_DEFAULT_MARSHAL_FACTORY has moved inside of this.
-
-Sun Aug  3 13:12:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO: Continued to improve the formatting of these
-        tests.
-
-Sat Aug  2 13:55:40 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO: Cleaned up some of the formatting so that
-        it is easier to read.
-
-Thu Jul 31 16:19:43 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/corba.h: Removed incorrect #include "tao/corba.h" in this
-        file.  Bad form.
-
-Thu Jul 31 15:19:43 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/*.{h,i,cpp}: Changed all #include of specific
-        header files to include the application-level "tao/corba.h".
-
-        * tests/Cubit/TAO/Makefile (BIN): Removed test1_svr and test1_clnt
-        for now until we can get them working again.  They stopped working
-        after the BOA API changed and the non-standard get_request()
-        method removed.
-
-        * tao/any.h: Inserted #includes which insure that this header file
-        is not position-dependent on other header files.
-
-        * tao/corba.h: Created this catch-all header file for APPLICATIONS
-        to use as a single entry point.  Currently it just includes all
-        TAO header files, but will eventually be pared down to only those
-        headers which warrant public exposure.
-
-Wed Jul 30 16:55:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/typecode.i (CORBA_TypeCode): Re-ordered member
-        initialization to correspond to declaration order.
-
-        * tao/{typecode,orbobj,optable,decode,cdr}.cpp: Added explicit
-        typecast to CORBA_ULong/unsigned long to eliminate warnings about
-        comparisons btw. signed and unsigned entities.
-
-        * tao/optable.cpp (bind): Put in explicit return type for
-        TAO_Active_Demux_OpTable::bind().
-
-Wed Jul 30 14:18:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/Makefile: Corrected automatic definition of TAO_ROOT and
-        fixed all dependencies on tao header/inline files.
-
-        * tao/{typecode,object}.i: Moved a few methods to the beginning of the file
-        so that the compiler KNOWS that they are inlined when it hits the
-        first reference to them later in the file.
-
-        * tao/object.cpp: Added an end-of-line to silence a very picky SGI
-        compiler.
-
-Wed Jul 30 10:05:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/connect.cpp: Removed a number of explicit template
-        instantiations that are already included in ACE.
-
-Wed Jul 30 14:20:18 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/boa.{i,h,cpp}: Removed the #include of "tao/objtable.h" and
-        instead moved the methods that needed it from boa.i to boa.cpp
-
-Wed Jul 30 13:58:02 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/boa.h: Added #include of "tao/objtable.h" since it is needed
-        in boa.i (which is included here when inlining is turned on)
-
-Wed Jul 30 10:05:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/boa.h: Removed the #include of "tao/objtable.h" which seems
-        to be unnecessary and may cause problems for template
-        specialization.
-
-        * tao/iiopobj.i (IIOP_Object): Changed the second parameter to the
-        IIOP_Object constructor so that we can is a const
-        IIOP::ProfileBody &.  This prevents a compiler warning.
-
-        * tao/typecode.cpp (private_id): Removed unused variable status.
-
-        * tao/objtable.cpp (bind): Removed the temp variable, which
-        was unused.
-
-Tue Jul 29 19:31:11 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/boa.cpp (get_boa): Added casts of ACE_UINT32 so that we
-        don't have ambiguous calls to the constructor of ACE_INET_Addr.
-
-        * tao/deep_copy.cpp (deep_copy): Removed an unreachable return
-        value.
-
-Mon Jul 21 15:08:36 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * TAO version 0.0.7, released Mon Jul 21 15:08:36 1997.
-
-Mon Jul 21 12:06:16 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/object.cpp: removed the #include of object.i since it will
-        always be #included in object.h
-
-Thu Jul 17 16:54:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.6, released Thu Jul 17 16:54:38 1997.
-
-Thu Jul 17 16:43:23 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/{optable,objtable}.cpp: Updated the explicit template
-        instantiations at the end of these files to reflect the changes
-        that Andy made.
-
-Thu Jul 17 10:08:45 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-        * tao/align.h: A very subtle error in "align_binary" was corrected. I
-        was assuming that align_binary is always called by
-        "ptr_align_binary". In the original inline function versions of
-        align_binary and ptr_align_binary, the function align_binary would
-        subtract 1 from the specified alignment that ptr_align_binary
-        provided. Since I assumed that "align_binary" would always be
-        called by "ptr_align_binary", I subtracted the 1 in
-        ptr_align_binary and passed the result to "align_binary". This
-        caused all sorts of problems for application code that directly
-        called "align_binary". This error has been fixed. The macros for
-        align_binary and ptr_align_binary are now exactly as the original
-        inline functions.
-
-        * tao/any.{h,cpp}: Added comments. In addition, in the code for
-        Any::replace, we check if "_value" exists before trying to
-        DEEP_FREE it. Otherwise this was resulting in a segmentation fault
-        violation.
-
-        * tao/boa.{h,i}: Added comments and changed "release" to CORBA_release
-
-        * tao/cdr.{h,cpp}: Added some comments and removed some stuff that was
-        under #if 0 .. #endif
-
-        * tao/corbacom.h: Added lots of comments for the CORBA_String_var class
-
-        * tao/decode.cpp: Made TAO_Marshal_Union::decode to work, added comments.
-
-        * tao/encode.cpp: Made TAO_Marshal_Union::encode to work, added comments.
-
-        * tao/factories.{h,cpp}: Added lots of comments. Removed "void
-        object_lookup_strategy" method since we do this in the parameters
-        class. Added code that will use a user defined lookup strategy if
-        the corresponding flag is set. This needs to be tested.
-
-        * tao/iiopobj.{i,cpp}: In the allocation and deallocation of the buffer
-        for object key, we now use "new/delete" instead of "malloc/free".
-
-        * tao/interp.cpp: commented out a line that decremented 4 from the
-        offset provided for indirected typecodes. I guess this was plain
-        hack to get some broken things to work.
-
-        * tao/objtable.{h,cpp}: Added lots of comments. Added code that will use
-        template specialization for the dynamic hashing case. In addition,
-        improved the destructors of the classes since previously, these
-        were not releasing occupied memory.
-
-        * tao/optable.{h,cpp}: Added lots of comments. Added template
-        specialization for dynamic hashing scheme. Made dynamic hashing
-        scheme the default. Added a new definition for "struct
-        TAO_operation_db_entry". The idea is that an IDL compiler will
-        generate a database of operations and their corresponding
-        skel_ptrs. Such a database is now passed to teh constructors of
-        the operation lookup tables. This way, only one instance of such
-        lookup tables can be shared by any number of objects implementing
-        the same interface.
-
-        * tao/params.{h,i,cpp}: Made dynamic hashing the default. Added a hook
-        by which users can supply their lookup strategies. *Needs testing*.
-
-        * tao/typecode.{h,i,cpp}: Added comments and many changes. The private
-        state's constructor now takes an argument that is a TCKind
-        representing the TypeCode kind of the object of which we are the
-        private state. Removed "child_free". Instead, we introduced a
-        destructor for the private state that frees all the
-        children. Another important change is to the constructor of the
-        TypeCode class. We pass a "parent" pointer, if any, to the
-        constructor. All children typecodes will share the octet buffer of
-        the parent. Only freestanding typecodes will allocate octet
-        buffers. We have a new data member called "non_aligned_buffer_"
-        because the buffer we allocate may not be aligned on a 4 byte
-        boundary. As a result, we may start using the buffer at a shifted
-        position to the right. However, we do not want to lose a handle to
-        the original buffer that was allocated because at the time of
-        freeing, this pointer needs to be freed.
-
-        * tests/Cubit/TAO: Modified a few files (method_db.i, cubitS.cpp)
-        so that they use the modified optable and objtable classes. Added
-        a README file to indicate how to run the example.
-
-        * tests/Thruput_test: Modified virtually all the files to make it
-        work with the latest TAO release and its include files. Also,
-        changes similar to Cubit were necessary due to changes in the
-        objtable and optable classes.
-
-Wed Jul 16 14:17:01 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * tao/params.*: Eliminated unnecessary
-        ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES checks from
-        TAO_OA_Parameters (unnecessary b/c it's not a template).  Also
-        corrected the type of TAO_OA_Parameters::ace_singleton_lock_.
-
-Wed Jul 16 11:34:36 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tao/boa.cpp: Removed some unused code.
-
-        * tao/compat/objbase.h: Added explicit check for prior inclusion
-        of ace/OS.h, with an error being produced if it's not included.
-        This will help keep me honest and remember to always include OS.h
-        beforehand, since I do most of my development on non-WIN32
-        platforms.
-
-        * tao/*.{h,cpp}: Added #include "ace/OS.h" before every inclusion
-        of <objbase.h>.  This is required on WIN32 platforms because
-        objbase.h eventually ends up including <winsock.h>, which is the
-        wrong version of winsock from what ACE requires.  Thus, by
-        including OS.h prior to objbase.h, objbase.h ends up not trying to
-        include a winsock header.
-
-        * tao/orbobj.cpp: Added missing #include for tao/debug.h.
-
-Wed Jul 16 10:55:55 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/PC_Install.bat: removed it since it isn't needed anymore
-
-        * tao/TAO.dsp: Changed include path and removed calling of
-          PC_Install.bat
-
-        * tests/Cubit/TAO/{client,server}.dsp: Changed include path
-
-Tue Jul 15 16:13:53 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tests/Cubit/TAO/cubitC.cpp: Added missing calls to Release()
-        after QueryInterface() calls.  The tip-off that this wasn't
-        happening was the fact that, upon client exit, there were upwards
-        of 15 references to the object references.  Now it's only 5-7
-        (more work to go).
-
-        * tests/Cubit/TAO/*: Changed all #include paths to be "tao/...".
-        Also, changes to orb.h (see below) obviated additional header
-        inclusion in certain files.
-
-        * tao/compat/*.h: Changed the guts of these files so that they
-        work more like their "real" counterparts in the VC++ 5.0.  This
-        should encourage compatibility.  Note that, unlike the previous
-        files, objbase.h MUST be included before initguid.h; this is
-        consistent with the model on WIN32.
-
-        * tao/*.{h,cpp}: Changed all #include paths to be "tao/...".
-        Also, changes to orb.h (see below) obviated additional header
-        inclusion in certain files.
-
-        * tao/giop.cpp: Removed get_request() crufty old code.
-
-        * tao/iiopobj.cpp: Backed out many prior special-code additions
-        for defining IIDs.  Hopefully the need for these is negated by
-        changes elsewhere in the "compat" files.
-
-        * tao/object.cpp: Corrected the conditional compilation switch
-        used to determine if we define IID_IUnknown.  This now happens
-        whenever WIN32 isn't defined, instead of before when it was only
-        on unix or vxworks platforms.
-
-        * tao/Makefile: Eliminated the need to copy files into a "proto/"
-        directory; now, everything is built into and used from the "tao"
-        directory.
-
-        There is also a new, optional, environment
-        variable--TAO_ROOT--which should be set to the ".../TAO"
-        directory.  If it's not set, the Makefile will set it to
-        $WRAPPER_ROOT/TAO.
-
-        Lastly, libcorba.* has changed to libTAO.*.
-
-        * tao/orb.h: Eliminated many header files which had been
-        explicitly included here and were causing all manner of problems
-        with circular includes.  Library components must now be careful to
-        include appropriate headers for all components they use, and we
-        will likely have to create a corba.h file for clients to use.
-
-Fri Jul 11 12:12:40 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/TAO.dsp: changed to use ace-r.dll in the release
-          version
-
-        * tests/Cubit/TAO/{client,server}.dsp: changed to use ace-r.dll
-          and tao-r.dll for the release versions.
-
-Thu Jul 10 15:47:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * docs/: Removed the following obsolete files: README.apm,
-        BUILDING, and TESTS.
-
-        * tao/params.*: Moved the instance() methods into the .cpp from
-        the .i, as well as the declaration for the singleton locks.
-        Having the singleton locks declared in the .i file caused much
-        consternation when ACE inlining was turned on.
-
-        * tao/iiopobj.cpp: #ifdef'd the IID_STUB_Object declaration added
-        a few days ago so that it happens one way on NT, and another in
-        the rest of the Universe.  I would have preferred to find a more
-        general solution, but didn't find one quickly enough to satisfy my
-        current requirements.
-
-        * tao/roa.*: Removed get_request() method.  This should improve
-        our McCabe scores ;-)
-
-        * tao/boa.h: Removed get_request() method.
-
-Wed Jul  9 14:44:31 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * TAO-Install: Added installation instructions for NT
-
-Tue Jul  8 20:52:06 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/PC_Install.bat: Made it very quiet.
-
-        * tao/params.{cpp,h,i}: Changed TAO_OA_PARAMS from a
-          ACE_Singleton to a plain singleton by just integrating the
-          ACE_Singleton code into the class.
-
-Tue Jul  8 14:27:47 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/except.h: added ACE_Svc_Export to SYSEX macro
-
-        * tao/iiopobj.cpp: changed declaration of IID_STUB_Object
-          to include ACE_Svc_Export
-
-        * tao/stub.h: added ACE_Svc_Export to IID_STUB_Object
-
-Tue Jul  8 12:44:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/orbobj.cpp: Put the "*" in before the comment since it is
-          supposed to be there.  Put a space between it and the comment
-          to get rid of the warning which VC was giving originally.
-
-Tue Jul  8 10:21:27 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/typecode.cpp: Changed a few loop counters from int to
-          CORBA_ULong to get rid of unsigned/signed comparison warnings
-
-        * tao/orbobj.cpp: Got rid of a "*" before a comment.  Looked like
-          a typo
-
-        * tao/PC_Install.bat: Replaced "#...." with "rem ...."
-
-Mon Jul  7 20:59:05 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Cubit/TAO/test1_{svr,clnt}.cpp (main): Added template
-          specialization code and updated the formatting.  Thanks to Arturo
-          Montes <mitosys@colomsat.net.co> for reporting this.
-
-        * tests/Cubit/TAO/test1_svr.cpp (main): Added the -i options to
-          getopt().  Thanks to Arturo Montes <mitosys@colomsat.net.co> for
-          reporting this.
-
-        * TAO/tao/orbconf.h (SIZEOF_LONG_DOUBLE): Added a
-          #define for M_UNIX.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-Sun Jul 06 02:37:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.5, released Sun Jul 06 02:37:24 1997.
-
-Sun Jul  6 00:10:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao: Fixed all the code so that we put ACE_MT around all the
-          ACE_GUARD_RETURN macros.
-
-        * tao: Updated all of TAO to make sure we use [] when deleting
-          arrays in order to avoid memory leaks.  This looks like lots of
-          sloppiness left over from the original SunSoft IIOP code.
-
-Sat Jul  5 16:12:31 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * tao/{any,iiopobj,nvlist,principa,request,roa,svrrqst,typecode}.cpp:
-          Fixed a double-deletion of a lock.
-
-        * tao/typecode.i: Cleaned up lots of minor warnings with the code
-          that are only revealed when running GCC.  The code should now
-          compile almost completely cleanly with -wall.
-
-        * tao/typecode.{i,h}: Changed the name of TC_PRV_State to
-          TC_Private_State.
-
-        * tao: Replaced ACE_Thread_Mutex with ACE_SYNCH_MUTEX so that the
-          code will compile on non-threaded and threaded platforms alike.
-
-        * tao/marshal.cpp: Added template specializations for the Marshal
-        primitives.  Thanks to Arturo Montes <mitosys@colomsat.net.co> for
-        reporting this.
-
-        * tao/Makefile (LDLIBS): Replaced -lcorba with -lACE so that we no
-        longer have problems with circular link dependencies.  Thanks to
-        Arturo Montes <mitosys@colomsat.net.co> for reporting this.
-
-Sat Jul 05 13:25:23 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.0.4, released Sat Jul 05 13:25:23 1997.
-
-Sat Jul  5 12:39:57 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao: All throughout TAO I removed the direct use of system
-        include files in lieu of using ace/OS.h.
-
-        * tao/{orbobj,typecode}.cpp: orb.h must be included before others
-        include files. Previous includes prevent correct use of ACE config
-        flags, therefore, I removed them.  Thanks to Arturo Montes
-        <mitosys@colomsat.net.co> for reporting this.
-
-        * tao/{debug,roa}.cpp: changed _POSIX_THREADS to ACE_HAS_PTHREADS.
-        Thanks to Arturo Montes <mitosys@colomsat.net.co> for reporting
-        this.
-
-        * tao/decode.cpp (decode): The casting (CORBA_ULong) kind is
-        unnessary and wrong so I removed it.  Thanks to Arturo Montes
-        <mitosys@colomsat.net.co> for reporting this.
-
-        * tao/debug.cpp (emit_prefix): Changed line 99 from
-
-        #define emit_prefix (stream) ...
-
-        to
-
-        #define emit_prefix(stream) ...
-
-        The blank character prevent after macro name (emit_prefix) prevent
-        correct definition.  Thanks to Arturo Montes
-        <mitosys@colomsat.net.co> for reporting this.
-
-Sat Jul  5 01:04:24 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO/tao/xdr.cpp: Removed unistd.h and string.h from the xdr.cpp
-          file since those aren't necessary.  Thanks to Arturo Montes
-          <mitosys@colomsat.net.co> for reporting this.
-
-Fri Jul  4 00:18:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/roa.h: Removed derogatory COMments ;-).  Thanks to Anton van
-          Straaten <anton@appsolutions.com> for reporting this.
-
-Thu Jul  3 16:16:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * Added ACE_Svc_Export to a couple of declarations to make NT
-          happier
-
-Thu Jul  3 13:43:20 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * Added Visual C++ 5.0 project and workspace files for the TAO
-          library and Cubit test
-
-Wed Jul  2 12:44:42 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * TAO/tests: Moved tests from TAO/IIOP/tests to TAO/tests
-
-Wed Jul 02 00:20:28 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * Compiled the first alpha release of TAO on Solaris just
-          to make sure it still works.  So far, so good... hence,
-          the first alpha release is out the door!
-
-Tue Jul  1 23:35:53 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * VERSION: Added a VERSION file, starting at version 0.0.0...
-
-Tue Jul  1 23:00:15 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * Added a new tests directory with the Cubit and TTCP
-        examples. The older test directory will be deleted soon.
-
-        In addition, the tc_constants in the tc_constants.cpp  file are
-        declared with an ACE_Svc_Export to make the Win NT compiler
-        happy. Extern declarations in typecode.h had the same changes.
-
-        * Updated the PC_install.bat file. In addition, there was one more
-        warning in typecode.cpp (Win NT compiler) that was fixed. Finally,
-        in the the tc_const.cpp file, the ACE_Svc_Export was used
-        accidently. This has been fixed.
-
-        * A number of files were updated with ACE_Svc_Export so that
-        variables and classes do not remain unresolved for Win32
-        platform. Similarly, Irfan had sent me a list of warnings that the
-        Win NT compiler was giving. These are fixed.
-
-        * marshal.*: Changed the way make_marshal_object works. Instead of
-        having a switch statement, we index into a private table of
-        marshal objects using the TypeCode _kind field. MarshalFactory now
-        maintains this private table.
-
-Mon Jun 30 17:39:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * Added a new README file and a COPYING file that explains the
-        contents of TAO and clarifies its copyright status.
-
-Sun Jun 29 10:06:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * marshal.*: Added CORBA_Environment as a parameter to
-        make_marshal_object factory method. The reason for doing this was
-        to enable inlining of the CDR::encode and CDR::decode methods.
-
-        * typecode.*: Changed the way typecodes get deleted. Constant
-        typecodes are now owned by the ORB and their private state freed
-        when the ORB dies. IDL generated typecodes are not owned by the
-        ORB and are the only ones whose refcount matters. Typecodes
-        belonging to the IDL generated typecodes are also not owned by the
-        ORB and there is no effect on their refcount. They get freed only
-        if the parent is destroying itself.
-
-        In typecode.i, methods such as length and content_type were not
-        getting inlined due to presence of switch statements. Converted to
-        if/else.
-
-        * interp.cpp: Bug fix: Had previously forgotten to update the
-        size/alignment of the private state of the typecode.
-
-Fri Jun 27 14:27:49 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * any.cpp: The deep_copy and deep_free optimizations applied. In
-        the previous release, I had forgotten to add these to the Any
-        constructor (that calls deep_copy) and Any destructor/replace
-        (that call deep_free).
-
-        * connect.cp, factories.cpp: Added code that hardcodes the socket
-        buffer sizes to 64K. This is a hack for the time being.
-
-Thu Jun 26 10:02:47 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-        * Some more progress on IDL compiler. Generates the client and
-        server side files without much contents in it.
-
-Thu Jun 26 09:49:38 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-        * Added a full range of optimizations to the TAO IIOP interpretive
-        marshaling engine. The static methods encoder and decoder have
-        been removed from the CDR class. Instead, separate classes for
-        marshaling have been created for each individual data type. The
-        CDR stream maintains a factory that returns an appropriate
-        marshaling object depending on the data type to be
-        marshaled. Files added include marshal.h, marshal.i, encode.cpp,
-        decode.cpp, deep_free.cpp, and deep_copy.cpp. The marshal.h file
-        defines classes for an abstract MarshalObject. The factory is
-        responsible to return a concrete specialized instance of the
-        MarshalObject.
-
-        * Updated the CORBA_TypeCode class so that it now provides all the
-        CORBA_2.0 compliant operations. These include length(),
-        content_type(), member_type(), member_label(),
-        discriminant_type(), id(), default_index(). The equal() operations
-        is still not implemented. In addition, precomputation
-        optimizations are applied to the TypeCode class. This includes
-        precomputing various parameters (if any) of a TypeCode. For
-        example, a struct TypeCode keeps track of the member count and
-        member types. As a result, it is not necessary to interpret the
-        CDR encapsulated stream to retrieve these parameters.
-
-        * At this time, there are some problems getting the Unions to work.
-
-Thu Jun 12 15:45:49 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/objtable.cpp: Added explicit template instantiations
-        for ACE_Hash_Map_Manager<>.
-
-        * IIOP/lib/giop.*: Finally got rid of all those methods that took
-        ACE_HANDLE as the argument.  Now, all those operate on
-        ACE_SOCK_Streams.
-
-Thu Jun  5 10:15:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/giop.cpp: Corrected output format in error message.
-
-Thu Jun  5 10:09:01 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * IIOP/test/svr.cpp: Added a new class to catch SIGINT and
-        terminate.  This was necessary to Quantify the server process.
-
-        * IIOP/lib/orbobj.h: Added ACE_INLINE to forward decls of
-        CORBA_release() and CORBA_is_nil().
-
-Wed May 23 14:39:01 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/lib/objtable.{h,cpp}:  Added template specialization of
-        ACE_Hash_Map_Manager for char*'s.
-
-        * IIOP/test/cubitS.cpp:  Fixed type_id to be of type CORBA_String_var.
-        Also, added a debug msg to print the object address to show the
-        object for which the request is made.
-
-        * IIOP/test/svr.cpp:  Added capability to create multiple Cubit
-        objects via command line options.  Added -n for number of objects and
-        -k for specifying a base name.  For instance, -k Beevis -n 2 creates
-        Beevis1 and Beevis2 objects.  The clnt can then specify a specific
-        object for the request as usual.
-
-Wed May 22 12:28:45 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/test/clnt.cpp:  Deleted VxWorks specific sections.  Command
-        line is now working for VxWorks.
-        * IIOP/test/svr.cpp:  Deleted VxWOrks specific sections.  Command line
-        is now working for VxWorks.
-
-Wed May 22 11:31:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/test/svr.cpp: Added better error checking and messages, and
-        performed general re-formatting.
-
-        * IIOP/test/method_db.i (initialize_method_db): Changed arg type
-        to use a pointer to the abstract class TAO_Operation_Table.
-
-        * IIOP/test/cubitS.cpp (_skel_Cubit::_skel_Cubit): Added better
-        error checking and messages.  Also defaulted to use the linear
-        object table implementation rather than the hashed to simplify
-        debugging.
-
-        * IIOP/test/clnt.cpp: Moved some code around so that more of the
-        code is common is less is specific to VxWorks and other platforms.
-        Also did general re-formatting.
-
-        * IIOP/lib/optable.cpp (TAO_Linear_OpTable::find): Initialization
-        of the loop variable makes the loop work properly.
-
-        * IIOP/lib/objtable.cpp (TAO_Dynamic_Hash_ObjTable::find):
-        Explicitly specified length of object key in CTOR for ACE_CString
-        because object keys are not zero-terminated.
-
-        * IIOP/lib/giop.cpp: Added newlines to the end of all ACE_DEBUG()
-        messages.
-
-        * IIOP/lib/factories.cpp: Added template specializations for
-        ACE_Hash_Addr<ACE_INET_Addr, TAO_Client_Connection_Handler>.
-
-Tue May 22 09:32:41 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/lib/cdr.h: Deleted #define old_value ACE_INLINE and
-        #define ACE_INLINE old_value lines. Added #undefs for ACE_INLINE
-        prior to redefines.  Changes required to compile on Windows NT.
-
-Tue May 20 14:47:46 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/test/cubitS.h: Removed forward decl of
-        TAO_Active_Operation_Table.
-
-        * IIOP/test/{cubitC,cubitS}.*: Changed include quoting characters
-        from [<>] to double-quotes.
-
-        * IIOP/test/Makefile: Removed cubit.o from clnt and svr target
-        (this has been subsumed by cubit[CS]).
-
-        * IIOP/lib/optable.h: Changed ACE_RW_Mutex to ACE_SYNCH_RW_MUTEX.
-
-        * IIOP/lib/optable.cpp: Inserted explicit template instantiations.
-
-        * IIOP/lib/Makefile: Added optable to the Makefile.
-
-        * IIOP/lib/optable.cpp: Moved ~TAO_Operation_Table() into here.
-
-        * IIOP/lib/object.i: Moved find() and bind() into the cpp file.
-        Moved ~TAO_Operation_Table() into optable.cpp.
-
-Tue May 20 14:39:00 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/test/*: Commited changes to Cubit Example as a current snapshot
-          of required changes.
-
-        * IIOP/lib/*: Changes required for header file includes.  Added
-          conditionals around _IIOP_BUILD_
-
-Tue May 20 13:55:58 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * IIOP/test/*: Commited this stuff in-process so that Brian
-        M. doesn't have to duplicate effort.
-
-Tue May 20 13:04:00 1997  Brian Mendel <bmendel@mdc.com>
-
-        * IIOP/lib/debug.cpp: Deleted spaces between flockfile (f) and
-        funlockfile (f).  Changed instances of debug_filter to
-        TAO_debug_filter.  Deleted space between emit_prefix (stream).
-
-        * IIOP/lib/cdr.cpp Added undef(s) for ACE_INLINE and
-          do_undef_on_ACE_INLINE to eliminate redefinition problems.
-
-
-Tue May 20 10:55:09 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/cdr.h: Fixed the automatic inclusion of cdr.i into
-        cdr.h by checking to see if __ACE_INLINE__ is not defined and, if
-        so, defining ACE_INLINE to be "inline" (we tidy up the namespace
-        immediately after the inclusion of cdr.i, too).  See source for
-        comments regarding why this is done.
-
-        * IIOP/lib/optable.cpp (TAO_Linear_OpTable_Entry): Removed setting
-        of opname and skel_ptr to zero in CTOR since the CTOR for those
-        already insures this.  Moreover, NT's compiler was complaining
-        about ambiguous resolutions.
-
-        * IIOP/lib/{orbobj,giop,debug,boa}.cpp: Fixed reference to
-        debug_level so it's TAO_debug_level.
-
-        * IIOP/lib/object.h: Replaced inclusion of optable.h with forward
-        decl of TAO_Operation_Table.
-
-        * IIOP/lib/optable.cpp: Fixed names of methods that were changed
-        in the header but never changed in the source.  Amazing that
-        neither g++ nor Sun C++ caught these gaffs!  (Finally, the NT
-        compiler wins).
-
-        * IIOP/lib/{orbobj,object}.h: Changed the forward decls of
-        CORBA_release() and CORBA_is_nil() so that they are only in effect
-        when inlining is NOT being used.
-
-        * IIOP/lib/giop.cpp: Fixed incorrect passing of an object to
-        ACE_DEBUG() where an int is expected.
-
-Mon May 19 17:16:34 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-        * IIOP/lib/roa.cpp: Explicit cast rids us of a warning.
-
-        * IIOP/lib/params.h: Fixed CTOR name.  Once again I'm surprised
-        G++ didn't catch this.
-
-        * IIOP/lib/optable.h: Corrected erroneous method signature on
-        bind().
-
-        * IIOP/lib/objtable.cpp: Corrected erroneous method signature on
-        TAO_Linear_ObjTable::bind().
-
-        * IIOP/lib/{object,orbobj}.h: Forward declaration of
-        CORBA_release(CORBA_Object_ptr) and CORBA_is_nil(CORBA_Object_ptr)
-        were commented out.  I think this will cause a problem when we
-        DON'T inline, but I'll cross that bridge later.
-
-        * IIOP/lib/{orb,factories}.h: Made inclusion of some headers
-        conditional on the compilation phase (building the library or an
-        application).
-
-        * IIOP/lib/cdr.i: Removed incorrect default arguments (g++ didn't
-        catch them).
-
-        * IIOP/lib/Makefile: Removed thread from the header list.
-
-Mon May 19 10:07:00 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/optable.cpp: Changed implementation of the operation
-        table and the parameters repository so that they use the right
-        class names.
-
-Sat May 17 17:18:38 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * First pass at providing a backend to the SunSoft's CORBA IDL
-        compiler front end.
-
-Fri May 16 17:30:31 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/svrrqst.*: Corrected some comments, adjusted some
-        argument type names to reflect their new, namespace-sanitized
-        names, and moved short methods into a new inline file.
-
-        * IIOP/lib/stub.h: Corrected some comments and adjusted some
-        argument type names to reflect their new, namespace-sanitized
-        names.
-
-        * IIOP/lib/roa.cpp: Corrected syntax error and fixed up typedef.
-
-        * IIOP/lib/params.*: Removed extraneous comments and fixed
-        argument type on demux_strategy().
-
-        * IIOP/lib/orbobj.*: Added comments, removed static pointer to
-        the ORB.
-
-        * IIOP/lib/optable.h: Removed extraneous comments and fixed
-        typedefs.
-
-        * IIOP/lib/objtable.cpp: Fixed some syntax errors introduced by
-        reformating.
-
-        * IIOP/lib/object.cpp: Adjusted some argument type names to
-        reflect their new, namespace-sanitized names.
-
-        * IIOP/lib/invoke.cpp: Removed crufty #includes and adjusted some
-        argument type names to reflect their new, namespace-sanitized
-        names.
-
-        * IIOP/lib/iioporb.*: Moved short methods into inline file, added
-        IIOP_ORB_ptr typedef, and changed data member to conform to ace
-        standards.
-
-        * IIOP/lib/iiopobj.*: Added the second CTOR that I forgot last
-        time and adjusted some argument type names to reflect their new,
-        namespace-sanitized names.
-
-        * IIOP/lib/giop.h: Added comments for various enums and
-        structures.
-
-        * IIOP/lib/giop.cpp: Switched various GIOP::Invocation methods to
-        use handler_->peer() for socket communication rather than going
-        through a file descriptor.  Also began the arduous (no other word
-        could explain it!) process of converting the homegrown debugging
-        message macro uses into ACE_DEBUG() uses.
-
-        * IIOP/lib/factories.*: Added explicit DTOR for TAO_Client_Factory
-        and completed all the darn explicit template instantiations.
-        Changed 'Svc_Handler' to 'TAO_Client_Connection_Handler', and
-        added the forgotton TAO_Client_Factory::connector() method.
-
-        * IIOP/lib/debug.*: Added 'TAO_' prefix to global debug state
-        variables and removed crufty #includes.
-
-        * IIOP/lib/connect.cpp: Change ROA_Handler to
-        TOA_OA_Connection_Handler (missed these the last time through).
-
-        * IIOP/lib/cdr.cpp: Added responsive commentary.
-
-        * IIOP/lib/boa.cpp: Added comments to the dispatching code.
-
-        * IIOP/lib/{any,boa,request,typecode}.cpp: Removed references to
-        thread.h/connmgr.*.
-
-Thu May 15 19:08:16 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * Finished updating all the reformatting.
-
-Thu May 15 15:54:49 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/principa.h: Corrected syntax error which eliminated the
-        _refcount data member.
-
-        * IIOP/lib/{params,roa}.*: Updated class names to reflect ROA -->
-        TOA_OA pseudo-namespace change.
-
-        * IIOP/lib/orbobj.*: Updated CORBA_ORB_init() to return pointer to
-        new ORB singleton.
-
-        * IIOP/lib/orb.h: Commented out some include files to eliminate
-        wierd circular dependencies.
-
-        * IIOP/lib/optable.h: Moved TAP_Operation_Table into here.  Put
-        OpTable* classes into the TAO_Operation_Table* pseudo-namespace.
-
-        * IIOP/lib/objtable.*: Moved TAO_Object_Table into here.  Moved
-        the Entry classes out of the scope of their respective concrete
-        operation tables, so they're now named <concrete_table>_Entry.
-
-        * IIOP/lib/object.*: Moved TAO_Operation_Table into optable.*, and
-        added a data member which carries a pointer to the ORB with which
-        the object is associated.
-
-        * IIOP/lib/iioporb.*: Added a singleton typedef for the ORB which
-        is what CORBA_ORB_init() will now return.  Modified
-        string_to_object() so that it sets the ORB on the CORBA_Object
-        that it returns.
-
-        * IIOP/lib/{iiopobj,nvlist}.h: Added some responsive commentary.
-
-        * IIOP/lib/giop.cpp: Modified connection establishment code in
-        GIOP::Invocation::start() to utilize the client connection manager
-        in the ORB.
-
-        * IIOP/lib/giop.h: Put a TAO_Client_Connection_Handler* into
-        GIOP::Invocation in place of the client_endpoint.
-
-        * IIOP/lib/factories.*: Updated explicit template instantiations,
-        added TAO_Client_Connection_Handler.
-
-        * IIOP/lib/connect.*: Renamed things--ROA_Parameters -->
-        TOA_OA_Parameters, ROA_Handler --> TOA_OA_Connection_Handler.
-
-        * IIOP/lib/boa.h: Moved TAO_Object_Table into objtable.*, added
-        comments where appropriate.
-
-        * IIOP/lib/{any,cdr,iioporb,invoke}.*: Re-formatting and creation
-        of inline method file.
-
-Tue May 13 21:51:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Continued to update the format of the TAO source code so that it
-          will be consistent with the style used in ACE.
-
-Mon May 12 17:02:29 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/roa.*: Moved short method into an inline file.
-        Miscellaneous reformatting.  Adjustment to new type names
-        (prefaced by TAO_ for namespace protection).
-
-        * IIOP/lib/object.*: Moved short methods into an inline file.
-        Changed lookup()/register_op() to find()/bind() for consistency
-        with established ACE APIs.  Miscellaneous reformatting.
-
-        * IIOP/lib/iiopobj.*: Moved short methods into an inline file.
-        Added CTOR for IIOP::Version and IIOP::ProfileBody.  Added
-        convenience CTOR for IIOP_Object where the profile can be
-        supplied.  Miscellaneous reformatting.
-
-        * IIOP/lib/boa.*: Moved short methods into an inline file.  Changed
-        lookup()/register_obj() to find()/bind() for consistency with
-        established ACE APIs.
-
-        * headers: Added comments to force C++ mode in emacs for header
-        files, and changed SCCS version tag info to RCS version tag info.
-
-Wed May  7 14:49:46 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/corbacom.cpp: Some bugs from the CORBA_String_var class
-        have been fixed. Thanks to Brian Mendel for noticing these.
-
-        * IIOP/lib/boa.cpp: In CORBA_BOA::dispatch, the opname local
-        variable of type CORBA_String_var is changed to be of type
-        CORBA_String. This was because the String_var class would assume
-        ownership of the quantity assigned and delete it. Thanks again to
-        Brian Mendel for noticing this.
-
-Tue May  6 14:06:49 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/boa.hh: the register_obj's 2nd argument is changed from
-        CORBA_Object_ptr& to CORBA_Object_ptr
-
-        * IIOP/lib/object.hh: the return type for register_op method on
-        CORBA_Object is changed from void to int to be consistent.
-
-        Added a new method "get_subclass" to CORBA_Object that returns a
-        pointer to the subclass. Typeically, this would be pointer to an
-        object that implements an interface.
-
-        * IIOP/lib/objtable.{hh,cpp}: @nd argument of register_obj changed
-        from CORBA_Object_ptr& to CORBA_Object_ptr.
-
-        * IIOP/lib/orb.hh: the type signature of "skeleton" is changed to
-        take CORBA_Object_ptr rather than CORBA_Object_ptr& as its 2nd argument.
-
-Mon May  5 20:28:54 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/boa.cpp: commented out code that uses the "void
-        *context" field. It doesn't make any sense to have it.
-
-        * IIOP/lib/boa.hh: Added 2 pure virtual methods (shutting_down and
-        clean_shutdown).
-
-        In addition, the "register_obj" method was added. It was missing before.
-
-        * IIOP/lib/corbacom.cpp: String_var's constructor bug is fixed. It
-        was trying to free storage that was never allocated.
-
-        * IIOP/lib/iiopobj.{hh,cpp}: Added a method - "get_name" that
-        retrieves the object name.
-
-        * IIOP/lib/object.{hh,cpp}: Added a method - "get_name" that
-        retrieves the object's name or key. This is for debugging purposes.
-
-        * IIOP/lib/orbobj.cpp: There was an infinite loop in parsing the
-        options to BOA_init. Fixed.
-
-        * IIOP/lib/stub.hh: Added the "get_name" virtual method.
-
-Sat May  3 22:45:23 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/boa.cpp: Added code temporarily that invokes the
-        skeleton that is looked up. We still need to add code that will
-        handle the case when no match is found on the operation names.
-
-        * IIOP/lib/boa.hh: The register_obj method on TAO_Object_Table
-        now returns an integer indicating status of registering (-1 =>
-        failure, 0 for success).
-
-        * IIOP/lib/object.hh: The register_op method on
-        TAO_Operation_Table now returns an integer code (O for success, -1
-        for failure).
-
-        * IIOP/lib/objtable.{hh,cpp}: The register_obj method returns an
-        integer code representing either success or failure.
-
-        * IIOP/lib/optable.{hh,cpp}: Added new files that implement
-        concrete strategies for operation name lookup.
-
-Fri May  2 08:48:29 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/object.hh: Modified the signature of register_op on
-        TAO_Operation_Table to take a second argument to be a pointer to
-        the actual skeleton.
-
-        Thanks to Brian Mendel for reporting this.
-
-Thu May  1 16:46:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/object.{hh,cpp}: Added a method that can set the parent
-        pointer.
-
-        * IIOP/lib/params.cpp: A hook has been provided in ROA_Factory to
-        enable the user to use a user-defined demux strategy.
-
-Wed Apr 30 22:00:51 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/objtable.{hh,cpp}: Added two new files that define
-        different object demultiplexing strategies.
-
-        * IIOP/lib/Makefile: Added objtable as additional source file to compile.
-
-        * IIOP/lib/boa.cpp: Provided the default destructor for the
-        TAO_Object_Table.
-
-        * IIOP/lib/boa.cpp: Provided the default destructor for the
-        TAO_Operation_Table.
-
-        * IIOP/lib/orbobj.cpp: Added support for the -OAtablesize option
-        in the call to CORBA_ORB::BOA_init method.
-
-        * IIOP/lib/params.{hh,i,cpp}: Added support to ROA_Factory to return
-        a specific object lookup strategy.
-
-        *IIOP/lib/roa.cpp: The ROA constructor initializes its "objtable_"
-        private data member with the object lookup strategy returned by
-        ROA factory.
-
-Tue Apr 29 11:52:48 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-        * IIOP/lib/any.hh: Moved CORBA_Any_ptr declaration to orb.hh.
-
-        * IIOP/lib/boa.{hh,cpp}: Renamed BOA to CORBA_BOA. The CORBA_BOA class
-        maintains a pointer to an abstract TAO_ObjectTable class. Concrete
-        classes inheriting from TAO_ObjectTable will provide strategies
-        for lookup.
-
-        Added virtual functions to do dispatch based on object key. In
-        addition, added a lookup method based on object key that delegates
-        the task of looking the object to the object table it maintains.
-
-        Changed the signature of typedef CORBA_BOA::dsi_handler to be pointer to
-        member function of class CORBA_BOA. Eventually, this will point to
-        the dispatch method of class CORBA_BOA.
-
-        Moved "struct Dispatch_Context" from roa.hh to boa.hh since we
-        want BOA to be a full fledged OA eventually and not remain an
-        abstract class as it is now. All other OA's such as ROA inherit
-        from BOA and only add extra functionality.
-
-        * IIOP/lib/connect.cpp: There was a syntax error (missing comma)
-        in one of the ACE_DEBUG statements which has been fixed.
-
-        * IIOP/lib/corbacom.{hh,cpp}: Added class CORBA_String_var as well
-        as the CORBA compliant CORBA_string_dup.
-
-        * IIOP/lib/except.hh: Moved CORBA_Exception_ptr declaration to orb.hh.
-
-        * IIOP/lib/object.hh: Added an abstract class
-        TAO_Operation_Table. CORBA_Object maintains a pointer to this
-        abstract class. The IDL compiler will eventually generate concrete
-        classes that employ different lookup strategies for operation name
-        lookup.
-
-        * IIOP/lib/orb.hh: Added forward declarations to all CORBA_*
-        classes. In addition, moved all the CORBA_*_ptr declarations here.
-
-        * IIOP/lib/orbobj.{hh,cpp}: Added the CORBA compliant BOA_init
-        method to class CORBA_ORB. Users can now pass arguments to
-        BOA_init. Eventually, we want to make this method return any of
-        the specialized OA's depending on the arguments. Right now, we get
-        a pointer to the ROA.
-
-        * IIOP/lib/params.{hh,i}: Added some more methods and enum
-        declarations to the ROA_PARAMS singleton.
-
-        * IIOP/lib/principa.hh: Moved the CORBA_Principal_ptr declaration
-        to orb.hh.
-
-        * IIOP/lib/roa.{hh,cpp}: Moved some functionality to boa.hh. ROA
-        is now only a specialized form of BOA.
-
-        * IIOP/lib/stub.hh: Moved the typedef for "skeleton" to orb.hh.
-
-        * IIOP/lib/svrrqst.{hh,cpp}: Had to rename BOA to CORBA_BOA.
-
-        * IIOP/lib/typecode.hh: Moved the CORBA_TypeCode_ptr declaration
-        to orb.hh.
-
-Tue Apr 22 23:30:19 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/connect.cpp (open): Added log message.
-
-        * IIOP/lib/params.cpp (concurrency_strategy): Uses reactive
-        strategy when appropriate.
-
-        * IIOP/lib/params.hh: Reactive strategy added.
-
-Tue Apr 22 21:03:15 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * IIOP/lib/giop.cpp: Changed erroneous ACE_GUARD calls to ACE_GUARD_RETURN
-        calls.
-
-Tue Apr 22 16:15:52 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/lib/roa.cpp: Removed more POSIX thread calls.
-
-        * IIOP/lib/invoke.cpp: Changed ForceSynchronousCancellation to
-        ACE_Synchronous_Cancellation_Required and made it use the ACE_OS
-        calls.
-
-        * IIOP/lib/{typecode,svrrqst,request,principa,orbobj,nvlist,iiopobj,giop,except,any}.*:
-        Removed all vestiges of pthread mutexes...they are now
-        ACE_Thread_Mutexes.  This will likely have to change if we want to
-        compile something completely devoid of threads, but that's another
-        day.  Also, the mutexes have moved from being globals to being
-        members on the respective classes.  No files should be dependent
-        on thread.hh any longer.
-
-        * IIOP/lib/connect.cpp (open): Removed code obsoleted by use of
-        the Strategy_Acceptor.
-
-        * IIOP/lib/{roa.cpp,connect.cpp},IIOP/tests/svr.cpp: Changes to
-        use new singletons described below.
-
-        * IIOP/lib/params.*: Changed ROA_Parameters and ROA_Factory to use
-        ACE_Singleton<>.  The singleton types are now named ROA_PARAMS and
-        ROA_FACTORY.
-
-Mon Apr 21 23:44:34 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * IIOP/lib/roa.cpp (ROA): Changed spelling of clientAcceptor_ to
-        client_acceptor_ to be consistent with ACE style conventions.
-
-Mon Apr 21 10:52:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/test/clnt.cpp: Moved call to CORBA_ORB_init() prior to the
-        parsing of the command line args.  This got switched around during
-        porting to VxWorks.
-
-        * IIOP/lib/roa.cpp: Changed calls using clientAcceptor_to use APIs
-        vended by ACE_Strategy_Acceptor.
-
-        * IIOP/lib/roa.hh: Moved default thread flags into ROA_Factory.
-
-        * IIOP/lib/params.*: Added ROA_Factory, a singleton which is the
-        beginning of an abstract factory dynamically producing runtime
-        strategies based on information found in ROA_Parameters.
-
-        * IIOP/lib/connect.cpp: Added call to ROA_Handler's base class
-        CTOR in initializer list.
-
-        * IIOP/lib/connect.hh: Changed ROA_Handler's CTOR so that it can
-        take an optional ACE_Thread_Manager* arg.  This makes it
-        compatible with the CTORs for the base class.  Also changed base
-        class for ROA_Acceptor to ACE_Strategy_Acceptor.
-
-        * IIOP/lib/svrrqst.*: Changed references to BOA_ptr from TOA_ptr.
-
-        * IIOP/lib/connect.*: ROA_Handler/ROA_Acceptor moved from roa.*
-        into here.
-
-        * IIOP/lib/params.*: ROA_Parameters moved from roa.* into here.
-
-        * IIOP/lib/boa.*: What used to be TOA is now BOA, and lives in
-        here.
-
-        * IIOP/lib/roa.*: Major restructuring required removal of all
-        classes (see other log entries) from here.  This file now houses
-        only the ROA class.
-
-        * IIOP/lib/{tcpoa.*,toa.*}: Removed because of name changes from
-        TCP_OA->ROA and TOA->BOA.
-
-Fri Apr 18 08:09:19 1997  Brian Mendel   <bmendel@mdc.com>
-
-        * cdr.hh,corbacom.{hh,cpp},giop.cpp,marshall.cpp,typecode.cpp:
-        Changes required for WChar missed in earlier committed code.
-
-        * connmgr.cpp: Changes required for select statement.
-
-        * nvlist.cpp: Conditional include for memory.h added.  VxWorks
-        does not have memory.h.
-
-        * object.cpp: Added conditional for VXWORKS to define
-        IID_IUnknown.
-
-        * orbconf.hh: Minor tuning of the configuration file.
-
-        * tcpoa.{hh,cpp}: Added VXWORKS conditional includes.
-
-        * toa.cpp: Added VXWORKS conditional includes.
-
-
-Mon Apr 15 17:01:00 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * roa.cpp: Added return statement to ROA_Handler::open(void*)
-        method.
-
-        * giop.cpp: Modified giop::read_buffer to replace undefined fc
-        with peer.get_handle().  Modified giop::incoming_message method
-        parameter list to match function prototype exactly.
-
-        * tcpoa.cpp: Replaced fd instances in debug messages with
-        peer.get_handle() calls.
-
-Mon Apr 14 13:45:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * roa.{hh,i,cpp},tcpoa.cpp,svr.cpp: Replaced ACE_ROA with
-        ROA_Parameters, which is a GoF-style singleton.
-
-Sun Apr 13 00:01:56 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * roa.cpp: Fix continuation condition in ROA_Handler::svc()'s loop
-        so that it doesn't stop after one iteration.  Also added some
-        debug messages.
-
-        * giop.cpp: Fixed some returns being called with no value.  This
-        should have been caught in the previous round of changes.
-
-Sat Apr 12 23:10:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * tcpoa.{hh,cpp}: TCP_OA::handle_message() now returns a value
-        indicating how a message was handled.
-
-        * roa.cpp: ROA_Handler::handle_input() now returns a meaningful
-        value based on what TCP_OA::handle_message() returns.
-
-        * giop.{hh,cpp}: Added end-of-file detection on socket
-        connections, and that is now propagated all the way back up
-        through GIOP::incoming_message().  I don't know if I violated
-        something in the spec by doing this, but it was necessary.  I'll
-        look into it later.
-
-Thu Apr 10 11:49:44 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * giop.{hh,cpp}: Overloaded all methods dealing with connections
-        so that there are two, one taking a file descriptor as argument,
-        the other taking an ACE_SOCK_Stream.  Right now, the *_Stream
-        version simply forwards to the fd-based one.  I would have
-        preferred to get rid of the fd-based methods altogether, but we've
-        only converted the server runtime; the client is still using the
-        original sun code, which is effectively fd-based.  In the course
-        of doing this, I also simplified the decls for incoming_message by
-        creating typedefs for some of the function pointers passed as
-        args.
-
-        * orbconf.hh: Fixed the stupid auto-endian-ness detector
-        AGAIN...had my logic reversed!
-
-        * roa.cpp: Adjusted code in accordance with changes to tcpoa.hh.
-
-        * tcpoa.hh: Moved and renamed TCP_OA::dispatch_context to be
-        ::Dispatch_Context, and changed its endpoint member to be an
-        ACE_SOCK_Stream.
-
-        * roa.hh: Fixed handle_input() to use the underlying peer() data
-        member for reading data, rather than using its argument.  This is
-        so that when a different thread handles each connection,
-        handle_input() can simply be called repeatedly by svc().
-
-Wed Apr  9 16:19:21 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-        * tcpoa.cpp: Fixed a problem that G++ didn't notice regarding
-        changing the notion of endpoints in servers from server_endpoint
-        to an ACE_HANDLE.
-
-Wed Apr  9 15:43:37 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * svr.cpp: The -p option is gone, and -e takes its place and is
-        required.  This requires the user to specify not only the port
-        number, but also the IP address of on which the server should
-        listen for requests.  See ACE_INET_Addr documentation for valid
-        string formats for addresses.  Also, the -t option sets the "use
-        threads" global.
-
-        * orbconf.hh: Hopefully resolved the tension between MS and Unix
-        platforms in inferring endian-ness of the target platform based on
-        preprocessor defines.  We now check for i386, _M_X86, and vax
-        (yeah, like we really worry about that, but it's easy to do).
-
-        * roa.{hh,i,cpp}: Added support for spawning threads to handle
-        incoming requests.  This involves a state flag for whether or not
-        to use threads, calling activate() in ROA_Handler::open() if that
-        flag is set, and creating ROA_Handler::svc() that simply loops
-        calling handle_input().
-
-Tue Apr  8 11:14:57 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/test/svr.cpp: Moved setting of upcall(), forwarder(),
-        context(), etc. into here rather than in TCP_OA::TCP_OA(), which
-        is where I mistakenly stuck them a few days ago (duh!).
-
-        * IIOP/lib/tcpoa.cpp: Removed setting of ACE_ROA::upcall(), which belongs
-        in the server code.  I got confused because the function names
-        were so similar: tcpoa.cpp contains ::tcp_oa_dispatcher(), and
-        svr.cpp contains ::tcpoa_dispatch().
-
-        * IIOP/lib/roa.{hh,i,cpp}: Added forwarding function to ACE_ROA global namespace
-        hack.
-
-        * IIOP/lib/orbconf.hh: Fixed preprocessor checks that auto-detect
-        endian-ness of this processor.
-
-Mon Apr  7 21:08:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/test/test1_{clnt,svr}.cpp: THESE HAVE NOT BEEN CONVERTED TO
-        USE ACE EVENT HANDLING!!  This round of changes explicitly
-        instantiates templates where required.
-
-        * IIOP/test/svr.cpp: Global function ::OA_listen() no longer
-        exists; its functionality is now fully contained within ::main().
-        If USE_ACE_EVENT_HANDLING is defined, a Reactor-based event loop
-        is used.  The original intent was to allow conditional compilation
-        to select btw. the original method and a Reactor-based method.
-        However, weaving that into the library proved far more difficult
-        than anticipated, so more than likely not defining
-        USE_ACE_EVENT_HANDLING will cause massive grief.
-
-        * IIOP/lib/toa.cpp: Changed call to TCP_OA::init() to reflect new
-        ACE_INET_Addr argument type.
-
-        * IIOP/lib/tcpoa.cpp (TCP_OA): All initialization methods were
-        changed, specifically the CTOR and TCP_OA::init, to reflect the
-        introduction of ACE_INET_Addr.  Two side-effects of using
-        ACE_INET_Addr are that (1) a server can specify the address on
-        which it wants to listen and (2) best that I can tell, the server
-        MUST specify the address on which it wants to listen because
-        otherwise it won't be able to publish a rational IOR.  The event
-        loop is now changed to simply loop on Reactor::handle_events().
-
-        * IIOP/lib/tcpoa.hh (TCP_OA): Removed vestiges of this component's
-        use of the original connection management scheme.  Where
-        appropriate, hostnames and ports were replaces by ACE_INET_Addr,
-        endpoints by ACE_HANDLEs, etc.  One particularly nasty thing done
-        was to declare ROA_Handler as a friend so that handle_message()
-        can be called from ROA_Handler::handle_input(), which to me
-        exposes a hole in the original architecture wherein input is
-        "pulled" rather than waited-for.  We might need to re-think how
-        this is handled within TAO.
-
-        * IIOP/lib/roa.{hh,i,cpp}: These files contain the required
-        components to support the new server-side ACE-based
-        connection/event substrate.  The client side remains, as always,
-        using the connection mgmt scheme used by the original Sun IIOP
-        code.
-
-        * IIOP/lib/giop.cpp: Added explicit template instantiation for
-        when this is needed.
-
-        * IIOP/lib/corbacom.hh: Now protects itself from multiple
-        inclusion.
-
-        * IIOP/lib/Makefile: Added roa.* where appropriate.
-
-Wed Mar 19 10:25:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * IIOP/docs/us/codecount/*.count: Added to repository.
-
-        * Makefile: Added to repository.
-
-        * IIOP/objbase.h: Moved to IIOP/compat.
-
-        * IIOP/initguid.h: Moved to IIOP/compat.
-
-Thu Mar 13 14:06:28 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-        * ChangeLog: Added the ChangeLog.
diff --git a/TAO/IIOP/Build/default.bld b/TAO/IIOP/Build/default.bld
deleted file mode 100755
index 7b67d4a13c9..00000000000
--- a/TAO/IIOP/Build/default.bld
+++ /dev/null
@@ -1,16 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-tao.bld
-	library
-	:cx_e_option=nomsgnumbers
-	:dependency=nodepend
-	:cx_silent=1
-	:cx_silent=21
-	:cx_silent=191
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../lib
-	:sourcedirs=..
-	:libraries=/home/ace/ACE_wrappers.vxworks/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
diff --git a/TAO/IIOP/Build/tao.bld b/TAO/IIOP/Build/tao.bld
deleted file mode 100755
index 21007d8ab61..00000000000
--- a/TAO/IIOP/Build/tao.bld
+++ /dev/null
@@ -1,53 +0,0 @@
-#!build
-default:
-	library
-	:defines=__IIOP_BUILD
-	:defines=DEBUG
-../lib/any.cpp
-	C++
-../lib/cdr.cpp
-	C++
-../lib/connmgr.cpp
-	C++
-../lib/corbacom.cpp
-	C++
-../lib/debug.cpp
-	C++
-../lib/except.cpp
-	C++
-../lib/giop.cpp
-	C++
-../lib/iiopobj.cpp
-	C++
-../lib/iioporb.cpp
-	C++
-../lib/interp.cpp
-	C++
-../lib/invoke.cpp
-	C++
-../lib/marshal.cpp
-	C++
-../lib/nvlist.cpp
-	C++
-../lib/object.cpp
-	C++
-../lib/orbobj.cpp
-	C++
-../lib/principa.cpp
-	C++
-../lib/request.cpp
-	C++
-../lib/svrrqst.cpp
-	C++
-../lib/t-sizes.cpp
-	C++
-../lib/tc_const.cpp
-	C++
-../lib/tcpoa.cpp
-	C++
-../lib/toa.cpp
-	C++
-../lib/typecode.cpp
-	C++
-../lib/roa.cpp
-	C++
diff --git a/TAO/IIOP/Makefile b/TAO/IIOP/Makefile
deleted file mode 100644
index f6dba1717ab..00000000000
--- a/TAO/IIOP/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO	= 
-
-DIRS	= lib #test
-
-CLONE	= 
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/docs/us/codecounts/align.hh.cccc b/TAO/IIOP/docs/us/codecounts/align.hh.cccc
deleted file mode 100644
index 13cb1ddca0e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/align.hh.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/align.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned int ptr_arith_t;    1    21      14     2     0   0.1   0.0
-typedef unsigned long ptr_arith_t;   24   24       0     0     0            
-typedef unsigned long long ptr_arit  27   27       0     0     0            
-static inline ptr_arith_t align_bin  35   46       5     5     1   1.0   0.2
-static inline unsigned char*ptr_ali  49   61       8     4     1   0.5   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                27    16     2   0.6   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc b/TAO/IIOP/docs/us/codecounts/any.cpp.cccc
deleted file mode 100644
index 44e6cce66e5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/any.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t any_lock=PTH  1    48      34     1     0   0.0   0.0
-CORBA_TypeCode_ptr CORBA_Any::type(  53   57       0     4     1 ! *** ! ***
-void*CORBA_Any::value()const{return  59   63       0     4     1 ! *** ! ***
-CORBA_Any::CORBA_Any(){}             65   78       7     6     0   0.9   0.0
-CORBA_Any::CORBA_Any(){}             81   97       5    11     0   2.2   0.0
-static CORBA_TypeCode::traverse_sta  100  305     44 ? 131 !  30   3.0   0.7
-CORBA_Any::CORBA_Any(){}             308  329      4    13     1   3.3   0.3
-static CORBA_TypeCode::traverse_sta  332  457     46    60 !  21   1.3   0.5
-CORBA_Any::~CORBA_Any(){}            460  481     10     9     2   0.9   0.2
-void CORBA_Any::replace(){}          484  509      3    19     2   6.3   0.7
-DEFINE_GUID(IID_CORBA_Any,0xa201e4c  511  517      4     2     0   0.5   0.0
-ULONG __stdcall CORBA_Any::AddRef()  520  529      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Any::Release(  531  548      0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Any::QueryI  550  567      0    14     5 ! *** ! ***
-CORBA_Any::CORBA_Any(){}             570  583      4     8     0   2.0   0.0
-CORBA_Any&CORBA_Any::operator=(){}   585  660     16    45 ?  15   2.8   0.9
-CORBA_Any::operator VARIANT(){VARIA  662  670      1     5     1   5.0   1.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               178   365    83   2.1   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/any.hh.cccc b/TAO/IIOP/docs/us/codecounts/any.hh.cccc
deleted file mode 100644
index 6cfac7fd831..00000000000
--- a/TAO/IIOP/docs/us/codecounts/any.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/any.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_Any*CORBA_Any_ptr;     1    10       9     0     0   0.0   0.0
-extern const IID IID_CORBA_Any;      12   12       0     0     0            
-class CORBA_Any{};                   14   87      16    46     2   2.9   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                25    49     2   2.0   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc
deleted file mode 100644
index aa92c9f81bd..00000000000
--- a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/cdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Boolean CDR::put_byte(){}      1    60      37    11     4   0.3   0.1
-CORBA_Boolean CDR::put_short(){}     63   90       7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_long(){}      92   120      7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_longlong(){}  122  149      7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_longdouble()  151  178      7    18     4   2.6   0.6
-CORBA_Boolean CDR::get_byte(){}      181  196      3    11     3   3.7   1.0
-CORBA_Boolean CDR::get_short(){}     199  230      6    22     4   3.7   0.7
-CORBA_Boolean CDR::get_long(){}      232  269     10    24     4   2.4   0.4
-CORBA_Boolean CDR::get_longlong(){}  271  312     10    28     4   2.8   0.4
-CORBA_Boolean CDR::get_longdouble()  315  363      9    36     4   4.0   0.4
-CORBA_Boolean CDR::skip_string(){CO  366  377      2     8     4   4.0   2.0
-CORBA_Boolean CDR::grow(){}          380  460     37    34 ?   9   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               142   258    52   1.8   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc
deleted file mode 100644
index 627ff33a9d9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/cdr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-struct _EXPCLASS CDR{enum{SHORT_SIZ  1    362    155 ? 142 !  25   0.9   0.2
-;                                    362  362      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               155   143    25   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc
deleted file mode 100644
index e934a7ebd12..00000000000
--- a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc
+++ /dev/null
@@ -1,38 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/connmgr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static client_endpoint*client_list;  1    77      40     2     0   0.1   0.0
-static server_endpoint*server_list;  78   78       0     0     0            
-static pthread_mutex_t client_lock=  82   88       6     0     0   0.0   0.0
-static pthread_mutex_t server_lock=  89   89       0     0     0            
-static ACE_HANDLE signal_fd;         91   97       6     0     0   0.0   0.0
-static ACE_HANDLE signal_in_fd;      99   103      4     0     0   0.0   0.0
-void client_endpoint::release(){}    108  120      3     6     0   2.0   0.0
-client_endpoint*client_endpoint::lo  123  290     75    69 ?  18   0.9   0.2
-void client_endpoint::dump(){}       295  318      6    12     1   2.0   0.2
-void server_endpoint::release(){}    324  354     17     7     0   0.4   0.0
-server_endpoint*server_endpoint::in  357  507     50    72 ?  16   1.4   0.3
-server_endpoint*server_endpoint::bl  510  742     89 ? 105 !  27   1.2   0.3
-void server_endpoint::shutdown_conn  744  765      0    16     2 ! *** ! ***
-void server_endpoint::dump(){}       770  790      3    12     2   4.0   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               299   315    66   1.1   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc
deleted file mode 100644
index e688b27d271..00000000000
--- a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/connmgr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-template<>class autorelease{};       1    47      14    16     6   1.1   0.4
-struct client_endpoint{};            50   85      11    15     0   1.4   0.0
-class server_endpoint{};             88   141     15    27     0   1.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                40    61     6   1.5   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc
deleted file mode 100644
index b7859bad94a..00000000000
--- a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc
+++ /dev/null
@@ -1,32 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/corbacom.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_String CORBA_string_alloc(){}  1    26      10     5     1   0.5   0.1
-CORBA_String CORBA_string_copy(){}   28   37       0     7     3 ! *** ! ***
-void CORBA_string_free(){}           39   43       0     4     0 ! ***      
-extern"unsigned wslen(const wchar_t  47   60       4     8     2   2.0   0.5
-extern"wchar_t*wscpy(wchar_t*dest,c  62   70       0     7     2 ! *** ! ***
-CORBA_WString CORBA_wstring_alloc()  74   82       4     4     1   1.0   0.3
-CORBA_WString CORBA_wstring_copy(){  84   92       0     7     3 ! *** ! ***
-void CORBA_wstring_free(){}          94   98       0     4     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                18    54    12   3.0   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc
deleted file mode 100644
index 256095a8f3e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc
+++ /dev/null
@@ -1,59 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/corbacom.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef bool CORBA_Boolean;          1    13       6     1     0   0.2   0.0
-typedef int CORBA_Boolean;           18   18       0     0     0            
-enum{CORBA_B_FALSE=0,CORBA_B_TRUE=1  19   19       0     0     0            
-;                                    19   19       0     0     0            
-typedef unsigned char CORBA_Octet;   22   22       0     0     0            
-typedef short CORBA_Short;           24   24       0     0     0            
-typedef unsigned short CORBA_UShort  25   25       0     0     0            
-typedef long CORBA_Long;             27   32       4     0     0   0.0   0.0
-typedef unsigned long CORBA_ULong;   33   33       0     0     0            
-typedef int CORBA_Long;              35   36       1     0     0   0.0   0.0
-typedef unsigned CORBA_ULong;        37   37       0     0     0            
-typedef long long CORBA_LongLong;    40   47       6     0     0   0.0   0.0
-typedef unsigned long long CORBA_UL  48   48       0     0     0            
-typedef long CORBA_LongLong;         50   50       0     0     0            
-typedef unsigned long CORBA_ULongLo  51   51       0     0     0            
-typedef __int64 CORBA_LongLong;      53   53       0     0     0            
-typedef unsigned __int64 CORBA_ULon  54   54       0     0     0            
-struct CORBA_LongLong{};             56   64       6     0     0   0.0   0.0
-struct CORBA_ULongLong{};            65   65       0     0     0            
-struct CORBA_LongLong{};             67   67       0     0     0            
-struct CORBA_ULongLong{};            68   68       0     0     0            
-typedef float CORBA_Float;           72   72       0     0     0            
-typedef double CORBA_Double;         73   73       0     0     0            
-typedef long double CORBA_LongDoubl  75   83       7     0     0   0.0   0.0
-struct CORBA_LongDouble{};           86   88       0     2     0 ! ***      
-typedef char CORBA_Char;             91   91       0     0     0            
-typedef CORBA_Char*CORBA_String;     92   92       0     0     0            
-CORBA_String CORBA_string_alloc();   94   94       0     0     0            
-CORBA_String CORBA_string_copy();    95   95       0     0     0            
-void CORBA_string_free();            96   96       0     0     0            
-typedef wchar_t CORBA_WChar;         98   104      6     0     0   0.0   0.0
-typedef CORBA_WChar*CORBA_WString;   105  105      0     0     0            
-CORBA_WString CORBA_wstring_alloc()  107  107      0     0     0            
-CORBA_WString CORBA_wstring_copy();  108  108      0     0     0            
-void CORBA_wstring_free();           109  109      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                36    37     0   1.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc b/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc
deleted file mode 100644
index 486b8373461..00000000000
--- a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc
+++ /dev/null
@@ -1,39 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/debug.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-unsigned debug_level=0;              1    43      13     1     0   0.1   0.0
-char*debug_filter=";                 44   44       0     0     0            
-static FILE*debug_stream=stderr;     45   45       0     0     0            
-static pid_t my_pid;                 48   63      13     1     0   0.1   0.0
-static pthread_once_t debug_init=PT  68   71       3     0     0   0.0   0.0
-static void setup_once(){}           75   79       0     4     0 ! ***      
-static void emit_prefix(){}          81   87       0     5     0 ! ***      
-static void setup(){}                91   102      5     6     1   1.2   0.2
-static void setup(){}                109  120      5     6     1   1.2   0.2
-void _EXPFUNC dmsg_filter(const cha  130  170      3    28 ?  12 ? 9.3   4.0
-void _EXPFUNC dmsg_filter(unsigned   172  193      1    15     3 ?15.0   3.0
-void _EXPFUNC dmsg_v(const char*_FA  195  213      1    13     1 ?13.0   1.0
-void _EXPFUNC _dmsg_x(CORBA_Environ  215  239      1    18     1 ?18.0   1.0
-void _EXPFUNC dmsg_opaque(char*_FAR  241  286      1    38 ?  10 !38.0 ?10.0
-void _EXPFUNC dmsg_opaque_full(char  288  335      1    39 ?  11 !39.0 ?11.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                47   189    40   4.0   0.9
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc b/TAO/IIOP/docs/us/codecounts/debug.hh.cccc
deleted file mode 100644
index 932d9fb5a19..00000000000
--- a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/debug.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern"char*strerror(int);           1    12       6     1     0   0.2   0.0
-extern unsigned debug_level;         15   22       7     0     0   0.0   0.0
-extern char*debug_filter;            22   23       1     0     0   0.0   0.0
-_dmsg_x(env,s);                      23   43       8     3     0   0.4   0.0
-line 43: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                42    21     0   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc b/TAO/IIOP/docs/us/codecounts/except.cpp.cccc
deleted file mode 100644
index 8b1b2294821..00000000000
--- a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc
+++ /dev/null
@@ -1,53 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/except.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t except_lock=  1    31      12     1     0   0.1   0.0
-DEFINE_GUID(IID_CORBA_Exception,0x7  35   45       2     2     0   1.0   0.0
-DEFINE_GUID(IID_CORBA_UserException  47   49       1     1     0   1.0   0.0
-DEFINE_GUID(IID_CORBA_SystemExcepti  51   53       1     1     0   1.0   0.0
-CORBA_Exception::CORBA_Exception(){  56   66       0    10     1 ! *** ! ***
-CORBA_Exception::CORBA_Exception(){  68   78       0    10     1 ! *** ! ***
-CORBA_Exception::~CORBA_Exception()  80   91       5     5     0   1.0   0.0
-CORBA_Exception&CORBA_Exception::op  93   107      0    13     3 ! *** ! ***
-const CORBA_String CORBA_Exception:  109  119      0     9     3 ! *** ! ***
-const CORBA_TypeCode_ptr CORBA_Exce  121  126      0     5     1 ! *** ! ***
-ULONG __stdcall CORBA_Exception::Ad  128  141      3     7     1   2.3   0.3
-ULONG __stdcall CORBA_Exception::Re  143  167      2    12     3   6.0   1.5
-HRESULT __stdcall CORBA_Exception::  169  192      4    15     5   3.8   1.3
-CORBA_UserException::CORBA_UserExce  195  203      3     5     0   1.7   0.0
-CORBA_UserException::~CORBA_UserExc  205  207      0     2     0 ! ***      
-CORBA_SystemException::CORBA_System  209  218      0     9     0 ! ***      
-CORBA_SystemException::~CORBA_Syste  220  222      0     2     0 ! ***      
-static CORBA_TypeCode_ptr sys_excep  228  228      0     0     0            
-CORBA_ExceptionList __system_except  229  229      0     0     0            
-static void make_standard_typecode(  231  318     29    49 ?  10   1.7   0.3
-SYSEX(UNKNOWN)SYSEX(BAD_PARAM)SYSEX  321  396     24    36     1   1.5   0.0
-static CORBA_Octet tc_buf_Bounds[]=  400  418      7    11     0   1.6   0.0
-static CORBA_TypeCode tc_std_Bounds  419  420      0     1     0 ! ***      
-CORBA_TypeCode_ptr _tc_CORBA_Bounds  421  421      0     0     0            
-static CORBA_Octet tc_buf_BadKind[]  423  437      3    11     0   3.7   0.0
-static CORBA_TypeCode tc_std_BadKin  438  439      0     1     0 ! ***      
-CORBA_TypeCode_ptr _tc_CORBA_BadKin  440  440      0     0     0            
-CORBA_ExceptionType CORBA_Environme  444  469      8    13     6   1.6   0.8
-void _EXPFUNC print_exception(const  472  535     24    35     7   1.5   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               128   295    42   2.3   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/except.hh.cccc b/TAO/IIOP/docs/us/codecounts/except.hh.cccc
deleted file mode 100644
index 430ef037b0d..00000000000
--- a/TAO/IIOP/docs/us/codecounts/except.hh.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/except.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern const IID IID_CORBA_Exceptio  1    15      13     1     0   0.1   0.0
-extern const IID IID_CORBA_UserExce  16   16       0     0     0            
-extern const IID IID_CORBA_SystemEx  17   17       0     0     0            
-class _EXPCLASS CORBA_Exception:pub  19   52       3    25     2 ? 8.3   0.7
-;                                    52   52       0     0     0            
-typedef CORBA_Exception*CORBA_Excep  53   53       0     0     0            
-class _EXPCLASS CORBA_UserException  55   65       5     5     0   1.0   0.0
-;                                    65   65       0     0     0            
-enum CORBA_CompletionStatus{};       67   75       7     1     0   0.1   0.0
-class _EXPCLASS CORBA_SystemExcepti  77   99       2    16     2 ? 8.0   1.0
-;                                    99   99       0     0     0            
-extern CORBA_TypeCode_ptr _tc_CORBA  102  117      6     4     0   0.7   0.0
-line 117: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                44   112     6   2.5   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/generate b/TAO/IIOP/docs/us/codecounts/generate
deleted file mode 100755
index c04f8b92e19..00000000000
--- a/TAO/IIOP/docs/us/codecounts/generate
+++ /dev/null
@@ -1,24 +0,0 @@
-#/bin/sh
-
-error()
-{
-  ret=$1; shift
-  echo "ERROR: " $@
-  return $ret
-}
-
-test -x ${CCCC:=/usr/local/bin/cccc} \
-	|| error 1 "Value of \$CCCC ($CCCC) not found."
-
-test -d ${TOPDIR:=../../../lib} \
-	|| error 1 "Unable to locate \$TOPDIR ($TOPDIR)."
-
-find $TOPDIR \( -name '*.h' -o -name '*.i' -o -name '*.hh' -o -name '*.cpp' \) -print |
-while read file
-do
-  outname=`basename $file`.cccc
-  $CCCC $file > $outname 2>&1
-  echo -n "."
-done
-
-echo
diff --git a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc b/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc
deleted file mode 100644
index d4aa24bb14b..00000000000
--- a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc
+++ /dev/null
@@ -1,50 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/giop.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t fwd_info_loc  1    79      45     2     0   0.0   0.0
-static inline CORBA_Boolean start_m  83   112      6    19     3   3.2   0.5
-static const char digits[]=";        115  115      0     0     0            
-static const char*names[]={};        116  120      0     4     0 ! ***      
-static void dump_msg(){}             122  136      0    13     4 ! *** ! ***
-CORBA_Boolean GIOP::send_message(){  142  226     30    43 ?  12   1.4   0.4
-static const char close_message[]={  229  250     16     5     0   0.3   0.0
-void GIOP::close_connection(ACE_HAN  253  272      8    11     0   1.4   0.0
-static const char error_message[]={  274  286      7     5     0   0.7   0.0
-static inline void send_error(ACE_H  288  297      0     9     0 ! ***      
-static int read_buffer(){}           300  331      6    18     4   3.0   0.7
-GIOP::MsgType GIOP::read_message(){  334  481     75    56 ?  18   0.7   0.2
-GIOP::Invocation::Invocation(IIOP_O  484  524     22    14     0   0.6   0.0
-GIOP::Invocation::~Invocation(){}    526  528      0     2     0 ! ***      
-static const CORBA_Long _oc_opaque[  530  543     13     0     0   0.0   0.0
-CORBA_TypeCode TC_opaque();          544  546      0     2     0 ! ***      
-static const CORBA_Long _oc_svc_ctx  549  610     50     9     0   0.2   0.0
-static CORBA_TypeCode TC_ServiceCon  611  613      0     2     0 ! ***      
-void GIOP::Invocation::start(CORBA_  616  729     58    45 ?  15   0.8   0.3
-extern CORBA_ExceptionList __system  731  731      0     0     0            
-GIOP::ReplyStatusType GIOP::Invocat  733  1086   175 ? 144 !  38   0.8   0.2
-void GIOP::incoming_message(){}      1089 1353    79 ? 151 !  24   1.9   0.3
-template class autorelease<client_e  1356 1356     0     0     0            
-template class CORBA_SEQUENCE<GIOP:  1357 1357     0     0     0            
-template class CORBA_SEQUENCE<CORBA  1358 1358     0     0     0            
-template class CORBA_SEQUENCE<CORBA  1359 1359     0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               590   580   118   1.0   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc b/TAO/IIOP/docs/us/codecounts/giop.hh.cccc
deleted file mode 100644
index d533e8f911a..00000000000
--- a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/giop.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    37      19     1     0   0.1   0.0
-class IOP{};                         39   109     45    21     0   0.5   0.0
-class GIOP{};                        112  321     65 ? 120     0   1.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               129   145     0   1.1   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc
deleted file mode 100644
index b440bf69b76..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc
+++ /dev/null
@@ -1,34 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iiopobj.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t iiopobj_lock  1    30      13     1     0   0.1   0.0
-IIOP::ProfileBody::ProfileBody(cons  35   50       0    13     0 ! ***      
-CORBA_ULong IIOP_Object::hash(){}    53   81      10    15     2   1.5   0.2
-CORBA_Boolean IIOP_Object::is_equiv  84   124     10    25 ?   9   2.5   0.9
-DEFINE_GUID(IID_IIOP_Object,0xa201e  127  133      4     2     0   0.5   0.0
-DEFINE_GUID(IID_STUB_Object,0xa201e  135  141      4     2     0   0.5   0.0
-DEFINE_GUID(IID_CORBA_Object,0xa201  143  145      1     1     0   1.0   0.0
-ULONG __stdcall IIOP_Object::AddRef  147  160      3     7     1   2.3   0.3
-ULONG __stdcall IIOP_Object::Releas  162  179      0    10     3 ! *** ! ***
-HRESULT __stdcall IIOP_Object::Quer  182  214     11    18     7   1.6   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                56   104    22   1.9   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc
deleted file mode 100644
index 866ab27c769..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iiopobj.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    15      10     1     0   0.1   0.0
-class _EXPCLASS IIOP{public:struct   17   48       8    17     0   2.1   0.0
-;                                    48   48       0     0     0            
-extern"const IID IID_IIOP_Object;    51   59       8     0     0   0.0   0.0
-class _EXPCLASS IIOP_Object:public   61   152     33    47     0   1.4   0.0
-;                                    152  152      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                59    69     0   1.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc
deleted file mode 100644
index 6d1e462cf27..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iioporb.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static const char ior_prefix[]=";    1    27       9     1     0   0.1   0.0
-static const char iiop_prefix[]=";   28   28       0     0     0            
-static const char xchars[]=";        29   29       0     0     0            
-static inline char nibble2hex(unsig  32   39       3     4     1   1.3   0.3
-static inline unsigned char hex2byt  41   51       0    10     5 ! *** ! ***
-CORBA_String IIOP_ORB::object_to_st  54   174     42    64 ?  17   1.5   0.4
-static CORBA_Object_ptr ior_string_  177  231     14    33 ?  10   2.4   0.7
-static CORBA_Object_ptr iiop_string  234  349     34    68 !  22   2.0   0.6
-CORBA_Object_ptr IIOP_ORB::string_t  352  374      6    13     5   2.2   0.8
-DEFINE_GUID(IID_IIOP_ORB,0xa201e4c4  376  382      4     2     0   0.5   0.0
-HRESULT __stdcall IIOP_ORB::QueryIn  385  408      3    16     6   5.3   2.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               115   222    66   1.9   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc
deleted file mode 100644
index e016469fd1e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc
+++ /dev/null
@@ -1,28 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iioporb.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class IIOP_ORB*IIOP_ORB_ptr  1    13       9     1     0   0.1   0.0
-extern const IID IID_IIOP_ORB;       15   15       0     0     0            
-class _EXPCLASS IIOP_ORB:public COR  17   47       4    22     0   5.5   0.0
-;                                    47   47       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                13    26     0   2.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc b/TAO/IIOP/docs/us/codecounts/initguid.h.cccc
deleted file mode 100644
index b106c9a8731..00000000000
--- a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc
+++ /dev/null
@@ -1,25 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/initguid.h
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-const IID name={0}                   1    6        2     1     0   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 2     2     0   1.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc b/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc
deleted file mode 100644
index 690563b2274..00000000000
--- a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc
+++ /dev/null
@@ -1,40 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/interp.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef size_t attribute_calculator  1    86      69     6     0   0.1   0.0
-static attribute_calculator calc_st  88   88       0     0     0            
-static attribute_calculator calc_ex  89   89       0     0     0            
-static attribute_calculator calc_un  90   90       0     0     0            
-static attribute_calculator calc_al  91   91       0     0     0            
-static attribute_calculator calc_ar  92   92       0     0     0            
-typedef CORBA_Boolean param_skip_rt  95   99       4     0     0   0.0   0.0
-static CORBA_Boolean skip_encapsula  101  105      0     4     1 ! *** ! ***
-static CORBA_Boolean skip_long(){}   107  113      0     5     1 ! *** ! ***
-struct table_element{};              116  139     18     5     0   0.3   0.0
-static table_element table[]={};     141  188     37    10     0   0.3   0.0
-{struct align_struct_ x one;char du  191  221     23     4     0   0.2   0.0
-;                                    221  221      0     0     0            
-align_struct_ table[t].size=sizeof(  223  224      0     0     0            
-table[t].alignment=(char*)&align.tw  225  226      0     1     0 ! ***      
-line 227: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               603   709   174   1.2   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc b/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc
deleted file mode 100644
index a6b006f91e5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/invoke.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-void IIOP_Object::do_call(CORBA_Env  1    193     87    77 !  24   0.9   0.3
-void IIOP_Object::do_dynamic_call(c  196  346     44    85 !  26   1.9   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               131   164    50   1.3   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc b/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc
deleted file mode 100644
index 90175d333fb..00000000000
--- a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/marshal.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern"{unsigned wslen(const wchar_  1    58      39     4     0   0.1   0.0
-extern CORBA_TypeCode TC_opaque;     61   61       0     0     0            
-CORBA_TypeCode::traverse_status CDR  64   494    146 ? 230 !  71   1.6   0.5
-const CORBA_TypeCode_ptr __tc_const  497  548     23    24     0   1.0   0.0
-;                                    548  548      0     0     0            
-CORBA_TypeCode::traverse_status CDR  551  1107   163 ? 323 !  88   2.0   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               371   586   159   1.6   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc
deleted file mode 100644
index d07414860b1..00000000000
--- a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc
+++ /dev/null
@@ -1,40 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/nvlist.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t nvlist_lock=  1    21       9     1     0   0.1   0.0
-DEFINE_GUID(IID_CORBA_NamedValue,0x  26   32       4     2     0   0.5   0.0
-ULONG __stdcall CORBA_NamedValue::A  35   44       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_NamedValue::R  46   61       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_NamedValue:  63   80       0    14     5 ! *** ! ***
-void CORBA_release(){}               82   90       3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       92   96       0     4     1 ! *** ! ***
-CORBA_NamedValue::~CORBA_NamedValue  98   102      0     4     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_NVList,0x7742  105  111      4     2     0   0.5   0.0
-ULONG __stdcall CORBA_NVList::AddRe  114  123      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_NVList::Relea  125  140      0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_NVList::Que  142  159      0    14     5 ! *** ! ***
-void CORBA_release(){}               161  169      3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       171  175      0     4     1 ! *** ! ***
-CORBA_NVList::~CORBA_NVList(){}      177  188      0     9     2 ! *** ! ***
-CORBA_NamedValue_ptr CORBA_NVList::  190  262     32    35     6   1.1   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55   147    31   2.7   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc
deleted file mode 100644
index b680140d4b9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/nvlist.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class _EXPCLASS CORBA_NamedValue;    1    13      12     0     0   0.0   0.0
-void CORBA_release();                15   15       0     0     0            
-CORBA_Boolean CORBA_is_nil();        16   16       0     0     0            
-enum{CORBA_ARG_IN=0x01,CORBA_ARG_OU  18   25       1     6     0   6.0   0.0
-;                                    25   25       0     0     0            
-class _EXPCLASS CORBA_NamedValue{pu  27   57       3    21     3   7.0   1.0
-;                                    57   57       0     0     0            
-class _EXPCLASS CORBA_NVList;        60   71      11     0     0   0.0   0.0
-void CORBA_release();                73   73       0     0     0            
-CORBA_Boolean CORBA_is_nil();        74   74       0     0     0            
-extern"const IID IID_CORBA_NVList;   76   76       0     0     0            
-class _EXPCLASS CORBA_NVList{public  78   119      3    31     2 ?10.3   0.7
-;                                    119  119      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                30    68     5   2.3   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc b/TAO/IIOP/docs/us/codecounts/objbase.h.cccc
deleted file mode 100644
index 02225ed7d9f..00000000000
--- a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/objbase.h
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned long ULONG;         1    23      18     1     0   0.1   0.0
-typedef unsigned long HRESULT;       24   24       0     0     0            
-typedef char IID[16];                26   36       8     1     0   0.1   0.0
-typedef const IID&REFIID;            36   37       1     0     0   0.0   0.0
-DEFINE_GUID(IID_IUnknown,b,c,d,e,f,  41   55       4     9     0   2.3   0.0
-;                                    55   55       0     0     0            
-typedef unsigned long SCODE;         59   61       1     1     0   1.0   0.0
-inline HRESULT ResultFromScode(SCOD  63   63       0     0     1       ! ***
-typedef unsigned short VARTYPE;      69   79      10     0     0   0.0   0.0
-enum VARENUM{};                      80   98      18     0     0   0.0   0.0
-struct CY{};                         100  111      3     5     0   1.7   0.0
-typedef double DATE;                 113  117      4     0     0   0.0   0.0
-struct VARIANT{};                    119  160     35     6     0   0.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               102    34     1   0.3   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc b/TAO/IIOP/docs/us/codecounts/object.cpp.cccc
deleted file mode 100644
index 82d8215949f..00000000000
--- a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc
+++ /dev/null
@@ -1,55 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/object.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Object::CORBA_Object(){}       1    25       9     5     0   0.6   0.0
-CORBA_Object::~CORBA_Object(){}      27   29       0     2     0 ! ***      
-void CORBA_release(){}               31   41       3     7     1   2.3   0.3
-CORBA_Object_ptr CORBA_Object::_dup  43   49       0     6     2 ! *** ! ***
-CORBA_Object_ptr CORBA_Object::_nil  51   58       3     4     1   1.3   0.3
-CORBA_Boolean CORBA_is_nil(){}       60   64       0     4     1 ! *** ! ***
-void __stdcall CORBA_Object::_creat  67   86       6    13     0   2.2   0.0
-CORBA_Request_ptr __stdcall CORBA_O  89   98       0     9     1 ! *** ! ***
-static const paramdata Object_get_i  101  108      5     2     0   0.4   0.0
-static const calldata Object_get_in  109  113      0     4     0 ! ***      
-;                                    113  113      0     0     0            
-CORBA_InterfaceDef_ptr __stdcall CO  116  150     16    15     3   0.9   0.2
-static const paramdata Object_is_a_  153  160      4     3     0   0.8   0.0
-static const calldata Object_is_a_c  161  165      0     4     0 ! ***      
-;                                    165  165      0     0     0            
-CORBA_Boolean __stdcall CORBA_Objec  168  218     27    19     6   0.7   0.2
-static const paramdata Object_get_i  221  228      5     2     0   0.4   0.0
-static const calldata Object_get_im  229  233      0     4     0 ! ***      
-;                                    233  233      0     0     0            
-CORBA_ImplementationDef_ptr __stdca  236  253      0    15     3 ! *** ! ***
-static const paramdata Object_non_e  256  263      5     2     0   0.4   0.0
-static const calldata Object_non_ex  264  268      0     4     0 ! ***      
-;                                    268  268      0     0     0            
-CORBA_Boolean __stdcall CORBA_Objec  271  306      3    28 ?   8 ? 9.3   2.7
-CORBA_ULong __stdcall CORBA_Object:  309  329      4    14     3   3.5   0.8
-CORBA_Boolean __stdcall CORBA_Objec  332  360      7    18     5   2.6   0.7
-DEFINE_GUID(IID_IUnknown,0x77420089  363  374      7     3     0   0.4   0.0
-DEFINE_GUID(IID_CORBA_Object,0xa201  378  380      1     1     0   1.0   0.0
-ULONG __stdcall CORBA_Object::AddRe  384  389      0     5     1 ! *** ! ***
-ULONG __stdcall CORBA_Object::Relea  391  396      0     5     1 ! *** ! ***
-HRESULT __stdcall CORBA_Object::Que  398  406      0     8     1 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               105   233    37   2.2   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/object.hh.cccc b/TAO/IIOP/docs/us/codecounts/object.hh.cccc
deleted file mode 100644
index b8f3b41f6c5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/object.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/object.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_Object*CORBA_Ob  1    11      10     0     0   0.0   0.0
-void CORBA_release();                12   12       0     0     0            
-CORBA_Boolean CORBA_is_nil();        13   13       0     0     0            
-extern const IID IID_CORBA_Object;   15   15       0     0     0            
-class _EXPCLASS CORBA_Object:public  17   109     28    58     0   2.1   0.0
-;                                    109  109      0     0     0            
-line 112: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                39    63     0   1.6   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc b/TAO/IIOP/docs/us/codecounts/orb.hh.cccc
deleted file mode 100644
index c5687f297f9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orb.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_TypeCode*CORBA_  1    112     90     5     0   0.1   0.0
-typedef class CORBA_Any*CORBA_Any_p  113  113      0     0     0            
-typedef class CORBA_ImplementationD  115  115      0     0     0            
-typedef class CORBA_InterfaceDef*CO  117  117      0     0     0            
-typedef class CORBA_Request*CORBA_R  119  119      0     0     0            
-typedef class CORBA_NamedValue*CORB  121  121      0     0     0            
-typedef class CORBA_NVList*CORBA_NV  123  123      0     0     0            
-typedef unsigned CORBA_Flags;        125  125      0     0     0            
-line 160: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               101    17     0   0.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc
deleted file mode 100644
index 12c296cc020..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbconf.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned long pid_t;         1    148     56    24     0   0.4   0.0
-line 183: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                67    27     0   0.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc
deleted file mode 100644
index 927fc2f58fb..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbobj.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern void __TC_init_table();       1    28      10     1     0   0.1   0.0
-extern void __TC_init_standard_exce  29   29       0     0     0            
-static pthread_mutex_t refcnt_lock=  32   32       0     0     0            
-CORBA_ORB::CORBA_ORB(){}             41   47       3     3     0   1.0   0.0
-CORBA_ORB::~CORBA_ORB(){}            49   52       0     3     0 ! ***      
-void CORBA_release(){}               54   64       3     7     1   2.3   0.3
-CORBA_ORB_ptr CORBA_ORB::_duplicate  66   72       0     6     2 ! *** ! ***
-CORBA_ORB_ptr CORBA_ORB::_nil(){}    74   81       3     4     1   1.3   0.3
-CORBA_Boolean CORBA_is_nil(){}       83   87       0     4     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_ORB,0xa201e4c  90   96       4     2     0   0.5   0.0
-DEFINE_GUID(IID_STUB_Object,0xa201e  99   101      1     1     0   1.0   0.0
-ULONG __stdcall CORBA_ORB::AddRef()  105  114      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_ORB::Release(  116  135      0    11     3 ! *** ! ***
-static CORBA_ORB_ptr the_orb;        138  145      7     0     0   0.0   0.0
-CORBA_ORB_ptr CORBA_ORB_init(int&,c  147  290     59    60 !  23   1.0   0.4
-void CORBA_ORB::create_list(){}      292  308      0    14     1 ! *** ! ***
-CORBA_ORB_ptr _orb(){}               311  322      7     4     1   0.6   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                97   143    34   1.5   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc
deleted file mode 100644
index ccc192d6a06..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbobj.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_ORB*CORBA_ORB_p  1    8        7     0     0   0.0   0.0
-void CORBA_release();                9    9        0     0     0            
-CORBA_Boolean CORBA_is_nil();        10   10       0     0     0            
-extern const IID IID_CORBA_ORB;      12   12       0     0     0            
-CORBA_ORB_ptr CORBA_ORB_init();      14   23       3     6     0   2.0   0.0
-class _EXPCLASS CORBA_ORB:public IU  25   71      13    26     0   2.0   0.0
-;                                    71   71       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                23    38     0   1.7   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc
deleted file mode 100644
index 6486125713e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/principa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t principal_lo  1    22       9     1     0   0.1   0.0
-void CORBA_release(){}               26   31       0     5     1 ! *** ! ***
-CORBA_Boolean CORBA_is_nil(){}       33   37       0     4     1 ! *** ! ***
-CORBA_Principal::CORBA_Principal(){  39   41       0     2     0 ! ***      
-CORBA_Principal::~CORBA_Principal()  43   49       0     5     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_Principal,0xa  51   57       4     2     0   0.5   0.0
-ULONG __stdcall CORBA_Principal::Ad  60   69       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Principal::Re  71   88       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Principal::  90   107      0    14     5 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                13    58    12   4.5   0.9
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc b/TAO/IIOP/docs/us/codecounts/principa.hh.cccc
deleted file mode 100644
index eee81276ec6..00000000000
--- a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/principa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_Principal*CORBA  1    8        7     0     0   0.0   0.0
-void CORBA_release();                10   10       0     0     0            
-CORBA_Boolean CORBA_is_nil();        11   11       0     0     0            
-extern const IID IID_CORBA_Principa  13   13       0     0     0            
-class _EXPCLASS CORBA_Principal:pub  15   52      12    17     0   1.4   0.0
-;                                    52   52       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                19    22     0   1.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc b/TAO/IIOP/docs/us/codecounts/request.cpp.cccc
deleted file mode 100644
index 5b717985743..00000000000
--- a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/request.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_CORBA_Request,0x774  1    19       7     2     0   0.3   0.0
-static pthread_mutex_t refcnt_lock=  22   22       0     0     0            
-ULONG __stdcall CORBA_Request::AddR  26   35       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Request::Rele  37   52       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Request::Qu  54   71       0    14     5 ! *** ! ***
-void CORBA_release(){}               73   81       3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       83   87       0     4     1 ! *** ! ***
-CORBA_Request::CORBA_Request(CORBA_  89   106      3    14     0   4.7   0.0
-CORBA_Request::CORBA_Request(){}     109  121      0    11     0 ! ***      
-CORBA_Request::~CORBA_Request(){}    123  131      0     7     0 ! ***      
-void CORBA_Request::invoke(){}       133  154      8    11     2   1.4   0.3
-void CORBA_Request::send_oneway(){}  156  168      0    11     2 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                21   107    15   5.1   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/request.hh.cccc b/TAO/IIOP/docs/us/codecounts/request.hh.cccc
deleted file mode 100644
index 6859f7eaf38..00000000000
--- a/TAO/IIOP/docs/us/codecounts/request.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/request.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-void CORBA_release();                1    8        6     1     0   0.2   0.0
-CORBA_Boolean CORBA_is_nil();        9    9        0     0     0            
-typedef CORBA_SEQUENCE<CORBA_TypeCo  11   11       0     0     0            
-typedef CORBA_ExceptionList*CORBA_E  12   12       0     0     0            
-extern const IID IID_CORBA_Request;  14   14       0     0     0            
-class _EXPCLASS CORBA_Request:publi  16   69       6    39     6   6.5   1.0
-;                                    69   69       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                12    46     6   3.8   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc
deleted file mode 100644
index 4386a9f01da..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc
+++ /dev/null
@@ -1,43 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-int ACE_ROA::end_reactor_event_loop  5    5        0     0     0            
-ACE_Reactor ACE_ROA::theReactor;     6    6        0     0     0            
-int ACE_ROA::usingThreads_=0;        7    7        0     0     0            
-void*ACE_ROA::context_p=0;           8    8        0     0     0            
-ACE_ROA::UpcallFunc ACE_ROA::theUpc  9    9        0     0     0            
-ACE_ROA::ForwardFunc ACE_ROA::theFo  10   10       0     0     0            
-TCP_OA_ptr ACE_ROA::theOA=0;         11   11       0     0     0            
-ROA_Handler::ROA_Handler(){}         13   15       0     2     0 ! ***      
-int ROA_Handler::open(){}            17   35       0    17     4 ! *** ! ***
-int ROA_Handler::handle_close(){}    37   40       0     3     0 ! ***      
-int ROA_Handler::handle_input(){}    42   75      11    16     1   1.5   0.1
-template class ACE_Acceptor<ROA_Han  82   83       1     0     0   0.0   0.0
-template class ACE_Svc_Handler<ACE_  84   84       0     0     0            
-template class ACE_Task<ACE_NULL_SY  85   86       1     0     0   0.0   0.0
-template class ACE_TSS<ACE_Dynamic>  86   87       1     0     0   0.0   0.0
-template class ACE_Message_Queue<AC  87   88       1     0     0   0.0   0.0
-template class ACE_Module<ACE_NULL_  88   89       1     0     0   0.0   0.0
-template class ACE_Thru_Task<ACE_NU  89   90       1     0     0   0.0   0.0
-line 92: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                18    51     5   2.8   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc b/TAO/IIOP/docs/us/codecounts/roa.hh.cccc
deleted file mode 100644
index 32849e09c09..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class TCP_OA;                        1    18       1     1     0   1.0   0.0
-typedef TCP_OA*TCP_OA_ptr;           19   19       0     0     0            
-class ACE_ROA{};                     21   62       9    24     0   2.7   0.0
-class ROA_Handler:public ACE_Svc_Ha  64   72       0     8     0 ! ***      
-;                                    72   72       0     0     0            
-typedef ACE_Acceptor<ROA_Handler,AC  74   74       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                10    38     0   3.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.i.cccc b/TAO/IIOP/docs/us/codecounts/roa.i.cccc
deleted file mode 100644
index 9b2669b8251..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.i.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.i
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-ACE_INLINE ACE_Reactor*ACE_ROA::rea  1    1        0     0     1       ! ***
-ACE_INLINE int ACE_ROA::usingThread  3    3        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::usingThrea  4    4        0     0     0            
-ACE_INLINE void*ACE_ROA::context(){  6    6        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::context(vo  7    7        0     0     0            
-ACE_INLINE ACE_ROA::UpcallFunc ACE_  9    9        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::upcall(ACE  10   10       0     0     0            
-ACE_INLINE ACE_ROA::ForwardFunc ACE  12   12       0     0     1       ! ***
-ACE_INLINE void ACE_ROA::forwarder(  13   13       0     0     0            
-ACE_INLINE TCP_OA_ptr ACE_ROA::oa()  15   15       0     0     1       ! ***
-ACE_INLINE void ACE_ROA::oa(TCP_OA_  16   16       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 0    11     6 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc b/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc
deleted file mode 100644
index 6cb51165aba..00000000000
--- a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/sequence.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-template<>struct CORBA_SEQUENCE{};   1    21       5    10     0   2.0   0.0
-typedef CORBA_SEQUENCE<CORBA_Octet>  23   23       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 5    12     0   2.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc b/TAO/IIOP/docs/us/codecounts/stub.hh.cccc
deleted file mode 100644
index 2dad231e858..00000000000
--- a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc
+++ /dev/null
@@ -1,32 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/stub.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-enum param_type{};                   1    27      20     4     0   0.2   0.0
-struct paramdata{};                  29   49      19     1     0   0.1   0.0
-struct calldata{};                   52   83      28     3     0   0.1   0.0
-typedef void(*skeleton)();           86   98      12     0     0   0.0   0.0
-struct skel_entry{};                 100  103      1     2     0   2.0   0.0
-extern const IID IID_STUB_Object;    107  117     10     0     0   0.0   0.0
-class _EXPCLASS STUB_Object:public   119  224     63    34     0   0.5   0.0
-;                                    224  224      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               153    51     0   0.3   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc
deleted file mode 100644
index b9e9230c2e0..00000000000
--- a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc
+++ /dev/null
@@ -1,39 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/svrrqst.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_IIOP_ServerRequest,  1    20       7     2     0   0.3   0.0
-DEFINE_GUID(IID_CORBA_ServerRequest  22   24       1     1     0   1.0   0.0
-static pthread_mutex_t svrqst_lock=  29   29       0     0     0            
-IIOP_ServerRequest::~IIOP_ServerReq  33   42       0     9     3 ! *** ! ***
-ULONG __stdcall IIOP_ServerRequest:  45   55       0     7     1 ! *** ! ***
-ULONG __stdcall IIOP_ServerRequest:  57   73       0    11     3 ! *** ! ***
-HRESULT __stdcall IIOP_ServerReques  75   95       0    17     6 ! *** ! ***
-void __stdcall IIOP_ServerRequest::  98   173     36    31     3   0.9   0.1
-void __stdcall IIOP_ServerRequest::  176  196      6    12     3   2.0   0.5
-void __stdcall IIOP_ServerRequest::  199  219      4    15     3   3.8   0.8
-CORBA_String __stdcall IIOP_ServerR  222  230      3     5     1   1.7   0.3
-CORBA_Object_ptr __stdcall IIOP_Ser  232  238      1     5     1   5.0   1.0
-CORBA_Principal_ptr __stdcall IIOP_  240  246      1     5     1   5.0   1.0
-CORBA_ORB_ptr __stdcall IIOP_Server  248  253      0     5     1 ! *** ! ***
-TOA_ptr __stdcall IIOP_ServerReques  255  260      0     5     1 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                59   145    27   2.5   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc
deleted file mode 100644
index aa6da40edce..00000000000
--- a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/svrrqst.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_ServerRequest*C  1    16       9     1     0   0.1   0.0
-typedef class CORBA_ORB*CORBA_ORB_p  17   17       0     0     0            
-typedef class TOA*TOA_ptr;           18   18       0     0     0            
-void CORBA_release();                20   20       0     0     0            
-CORBA_Boolean CORBA_is_nil();        21   21       0     0     0            
-extern const IID IID_CORBA_ServerRe  23   23       0     0     0            
-class _EXPCLASS CORBA_ServerRequest  25   78      29    21     0   0.7   0.0
-;                                    78   78       0     0     0            
-extern const IID IID_IIOP_ServerReq  80   80       0     0     0            
-class _EXPCLASS IIOP_ServerRequest:  82   159     17    51     0   3.0   0.0
-;                                    159  159      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55    82     0   1.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc
deleted file mode 100644
index 24592ade908..00000000000
--- a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc
+++ /dev/null
@@ -1,25 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/t-sizes.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-int main(){}                         6    15       0     9     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 0    10     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc
deleted file mode 100644
index b32010c4109..00000000000
--- a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/t-xdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    34      12     2     0   0.2   0.0
-struct interesting{};                36   73      18    12     0   0.7   0.0
-extern CORBA_TypeCode TC_opaque;     75   78       2     1     0   0.5   0.0
-static void do_test(){}              80   225     34    82 !  30   2.4   0.9
-int main(){}                         228  264      3    29     3 ? 9.7   1.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                69   131    33   1.9   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc
deleted file mode 100644
index e606b23721b..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc
+++ /dev/null
@@ -1,68 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tc_const.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static CORBA_TypeCode tc_null();     1    25      18     1     0   0.1   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  26   26       0     0     0            
-CORBA_TypeCode_ptr CORBA_TypeCode::  28   32       0     4     1 ! *** ! ***
-static CORBA_TypeCode tc_void();     34   34       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  35   35       0     0     0            
-static CORBA_TypeCode tc_short();    37   40       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  41   41       0     0     0            
-static CORBA_TypeCode tc_long();     43   43       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  44   44       0     0     0            
-static CORBA_TypeCode tc_longlong()  46   46       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  47   47       0     0     0            
-static CORBA_TypeCode tc_ushort();   49   49       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  50   50       0     0     0            
-static CORBA_TypeCode tc_ulong();    52   52       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  53   53       0     0     0            
-static CORBA_TypeCode tc_ulonglong(  55   55       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  56   56       0     0     0            
-static CORBA_TypeCode tc_float();    58   61       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  62   62       0     0     0            
-static CORBA_TypeCode tc_double();   64   64       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  65   65       0     0     0            
-static CORBA_TypeCode tc_longdouble  67   67       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  68   68       0     0     0            
-static CORBA_TypeCode tc_boolean();  70   73       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  74   74       0     0     0            
-static CORBA_TypeCode tc_octet();    76   76       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  77   77       0     0     0            
-static CORBA_TypeCode tc_char();     79   84       5     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  85   85       0     0     0            
-static CORBA_TypeCode tc_wchar();    87   87       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  88   88       0     0     0            
-static CORBA_TypeCode tc_string();   90   90       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  91   91       0     0     0            
-static CORBA_TypeCode tc_wstring();  93   93       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  94   94       0     0     0            
-static CORBA_TypeCode tc_any();      96   100      4     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  101  101      0     0     0            
-static CORBA_TypeCode tc_typecode()  103  103      0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  104  104      0     0     0            
-static CORBA_TypeCode tc_principal(  106  106      0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  107  107      0     0     0            
-static const unsigned char oc_objre  109  128      8    11     0   1.4   0.0
-static CORBA_TypeCode tc_objref();   129  131      0     2     0 ! ***      
-const CORBA_TypeCode_ptr _tc_CORBA_  132  132      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                44    62     1   1.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc
deleted file mode 100644
index a5e145edfe2..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc
+++ /dev/null
@@ -1,51 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tcpoa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static TCP_OA*the_oa;                1    44      14     1     0   0.1   0.0
-static pthread_key_t request_key;    47   47       0     0     0            
-static pthread_mutex_t tcpoa_mutex=  48   48       0     0     0            
-static pthread_mutex_t tcpoa_lock=P  49   49       0     0     0            
-static pthread_attr_t thread_attr;   50   50       0     0     0            
-static void tcp_oa_dispatcher(){}    53   180     45    59 ?  10   1.3   0.2
-static GIOP::LocateStatusType tcp_o  182  206      4    18     5   4.5   1.3
-TCP_OA::TCP_OA(CORBA_ORB_ptr owning  209  237      5    19     3   3.8   0.6
-TCP_OA::~TCP_OA(){}                  239  241      0     2     0 ! ***      
-TCP_OA_ptr TCP_OA::init(){}          244  288     11    18     3   1.6   0.3
-CORBA_Object_ptr __stdcall TCP_OA::  291  348      9    41 ?   8   4.6   0.9
-CORBA_OctetSeq*__stdcall TCP_OA::ge  351  364      4     9     1   2.3   0.3
-((GIOP::RequestHeader*)pthread_gets  368  382      9     1     0   0.1   0.0
-CORBA_Object_ptr __stdcall _this(){  386  436     23    22     6   1.0   0.3
-CORBA_OctetSeq*__stdcall TCP_OA::ge  439  454      6     8     1   1.3   0.2
-CORBA_Principal_ptr __stdcall TCP_O  457  472      6     8     1   1.3   0.2
-void TCP_OA::handle_message(){}      474  489      3     8     1   2.7   0.3
-void*TCP_OA::worker(){}              493  527     16    15     4   0.9   0.3
-void __stdcall TCP_OA::get_request(  531  779    128    82 ?  14   0.6   0.1
-void __stdcall TCP_OA::please_shutd  782  797      3     9     0   3.0   0.0
-void __stdcall TCP_OA::clean_shutdo  799  824      3    15     2   5.0   0.7
-void __stdcall TCP_OA::register_dir  827  848      3    16     2   5.3   0.7
-void __stdcall TCP_OA::get_request(  850  873      9    13     2   1.4   0.2
-DEFINE_GUID(IID_TCP_OA,0xa201e4c4,0  876  882      4     2     0   0.5   0.0
-ULONG __stdcall TCP_OA::AddRef(){Cr  885  894      0     6     1 ! *** ! ***
-ULONG __stdcall TCP_OA::Release(){C  896  913      0    10     3 ! *** ! ***
-HRESULT __stdcall TCP_OA::QueryInte  915  934      0    16     6 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               305   425    73   1.4   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc
deleted file mode 100644
index 8feca7cce56..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tcpoa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class _EXPCLASS TCP_OA;              1    33      26     1     0   0.0   0.0
-typedef TCP_OA*TCP_OA_ptr;           34   34       0     0     0            
-extern const IID IID_TCP_OA;         38   38       0     0     0            
-class _EXPCLASS TCP_OA:public TOA{p  40   224     93    61     2   0.7   0.0
-;                                    224  224      0     0     0            
-typedef TCP_OA*TCP_OA_ptr;           226  226      0     0     0            
-extern CORBA_Object_ptr __stdcall _  229  245     16     0     0   0.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               135    68     2   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc b/TAO/IIOP/docs/us/codecounts/thread.hh.cccc
deleted file mode 100644
index 4b1e08a0cfd..00000000000
--- a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/thread.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef thread_t pthread_t;          1    67      39     4     0   0.1   0.0
-typedef mutex_t pthread_mutex_t;     68   68       0     0     0            
-typedef cond_t pthread_cond_t;       69   69       0     0     0            
-typedef unsigned long pthread_attr_  70   70       0     0     0            
-typedef thread_key_t pthread_key_t;  71   71       0     0     0            
-struct pthread_once_t{};             81   84       0     3     0 ! ***      
-inline void pthread_once(pthread_on  88   97       0     9     1 ! *** ! ***
-inline void*pthread_getspecific(pth  107  114      0     6     1 ! *** ! ***
-inline int pthread_create(pthread_t  118  127      0     9     1 ! *** ! ***
-class Critical{};                    133  156      6    14     0   2.3   0.0
-class ForceSynchronousCancel{};      159  181     10     8     0   0.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55    64     3   1.2   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc
deleted file mode 100644
index 98d352ea297..00000000000
--- a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/toa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_TOA,0xa201e4c8,0xf2  1    44      14     3     0   0.2   0.0
-TOA_ptr TOA::get_named_toa(){}       47   102     28    22     5   0.8   0.2
-TOA_ptr TOA::get_toa(){}             105  147     15    22     5   1.5   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                57    50    10   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc b/TAO/IIOP/docs/us/codecounts/toa.hh.cccc
deleted file mode 100644
index 3229e548e61..00000000000
--- a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/toa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class TOA*TOA_ptr;           1    18      10     1     0   0.1   0.0
-CORBA_Boolean is_nil();              20   20       0     0     0            
-void release();                      21   21       0     0     0            
-extern const IID IID_TOA;            23   23       0     0     0            
-class TOA:public IUnknown{public:vi  25   187    113    41     0   0.4   0.0
-;                                    187  187      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               123    47     0   0.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc b/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc
deleted file mode 100644
index 11a4a8c0c88..00000000000
--- a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/typecode.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t refcnt_lock=  1    38      20     1     0   0.1   0.0
-void CORBA_release(){}               42   47       0     5     1 ! *** ! ***
-CORBA_Boolean CORBA_is_nil(){}       49   53       0     4     1 ! *** ! ***
-CORBA_TypeCode::CORBA_TypeCode(CORB  55   69       4    10     0   2.5   0.0
-CORBA_TypeCode::CORBA_TypeCode(CORB  72   115     20    21     1   1.0   0.1
-CORBA_TypeCode::~CORBA_TypeCode(){}  118  129      5     6     2   1.2   0.4
-DEFINE_GUID(IID_CORBA_TypeCode,0xa2  132  139      5     2     0   0.4   0.0
-ULONG __stdcall CORBA_TypeCode::Add  142  151      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_TypeCode::Rel  153  168      0    11     4 ! *** ! ***
-HRESULT __stdcall CORBA_TypeCode::Q  170  187      0    14     5 ! *** ! ***
-CORBA_TCKind CORBA_TypeCode::kind(C  190  200      3     7     1   2.3   0.3
-static CORBA_Boolean skip_typecode(  203  252     15    29 ?   9   1.9   0.6
-CORBA_Any_ptr CORBA_TypeCode::membe  255  341     29    44 ?  19   1.5   0.7
-CORBA_ULong CORBA_TypeCode::param_c  344  434     23    53 !  22   2.3   1.0
-CORBA_ULong CORBA_TypeCode::ulong_p  437  507     26    36 ?  16   1.4   0.6
-CORBA_TypeCode_ptr CORBA_TypeCode::  510  672     43    99 !  58   2.3   1.3
-CORBA_String CORBA_TypeCode::id(COR  675  711     15    19     3   1.3   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               208   384   143   1.8   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc b/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc
deleted file mode 100644
index 494931168d4..00000000000
--- a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/typecode.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-enum CORBA_TCKind{};                 1    50      23    26     0   1.1   0.0
-extern CORBA_TypeCode_ptr _tc_CORBA  53   56       3     0     0   0.0   0.0
-class CORBA_Bounds{};                57   62       0     5     0 ! ***      
-extern CORBA_TypeCode_ptr _tc_CORBA  64   64       0     0     0            
-class CORBA_BadKind{};               65   70       0     5     0 ! ***      
-typedef class CORBA_TypeCode*CORBA_  73   82       9     0     0   0.0   0.0
-void CORBA_release();                83   83       0     0     0            
-CORBA_Boolean CORBA_is_nil();        84   84       0     0     0            
-extern const IID IID_CORBA_TypeCode  86   86       0     0     0            
-class _EXPCLASS CORBA_TypeCode:publ  88   266    101    56     2   0.6   0.0
-;                                    266  266      0     0     0            
-extern const CORBA_TypeCode_ptr _tc  268  298      3    21     0   7.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               139   124     2   0.9   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc
deleted file mode 100644
index 90d59d8dd98..00000000000
--- a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/xdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Boolean XDR_stream::put_longl  1    52      31     6     1   0.2   0.0
-CORBA_Boolean XDR_stream::get_longl  54   59       0     5     1 ! *** ! ***
-CORBA_Boolean XDR_stream::put_longd  62   70       3     5     1   1.7   0.3
-CORBA_Boolean XDR_stream::get_longd  72   77       0     5     1 ! *** ! ***
-CORBA_TypeCode::traverse_status XDR  80   406     82 ? 202 !  65   2.5   0.8
-extern CORBA_TypeCode_ptr __tc_cons  410  413      3     0     0   0.0   0.0
-CORBA_TypeCode::traverse_status XDR  416  766     82 ? 220 !  60   2.7   0.7
-CORBA_Boolean XDR_stream::flush_fra  769  801     10    15     3   1.5   0.3
-CORBA_Boolean XDR_stream::read_frag  804  815      5     5     1   1.0   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               216   472   133   2.2   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc
deleted file mode 100644
index 45e2ca773c7..00000000000
--- a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/xdr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class XDR_stream{};                  1    269     78 ? 149 !  32   1.9   0.4
-inline CORBA_Boolean XDR_stream::ou  271  275      0     4     1 ! *** ! ***
-inline CORBA_Boolean XDR_stream::pu  277  287      0    10     4 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                78   166    37   2.1   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/plan.html b/TAO/IIOP/docs/us/plan.html
deleted file mode 100644
index 5650257a330..00000000000
--- a/TAO/IIOP/docs/us/plan.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>IIOP Notes</title>
-  </head>
-
-  <body>
-      <h1>IIOP Notes</h1>
-
-      <p>
-	The current plan for transforming the Sun IIOP Reference
-	implementation into the basis of the TAO is:
-
-      <ol>
-	<li>Replace selected portions of code with ACE components while maintaining the current architecture and design.
-	<li>Distill the design patterns and begin re-architecting.
-      </ol>
-
-      <p>
-	Please feel free to email additions to this list!
-
-      <hr>
-      <address><a href="mailto:cleeland@cs.wustl.edu">Chris Cleeland</a></address>
-<!-- Created: Fri Feb 14 15:22:32 CST 1997 -->
-<!-- hhmts start -->
-Last modified: Fri Feb 14 15:46:52 CST 
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/TAO/IIOP/docs/us/server b/TAO/IIOP/docs/us/server
deleted file mode 100644
index afad69638a8..00000000000
--- a/TAO/IIOP/docs/us/server
+++ /dev/null
@@ -1,5 +0,0 @@
-This note describes architectural differences between the Sun IIOP
-Reference implementation (SIR) and a new architecture based on ACE.
-After narrating the SIR architecture, shortcomings of that design are
-highlighted, and a solution known as The ACE ORB (TAO) presented.
-
diff --git a/TAO/IIOP/test/Build/clnt.bld b/TAO/IIOP/test/Build/clnt.bld
deleted file mode 100755
index 76e60ef8967..00000000000
--- a/TAO/IIOP/test/Build/clnt.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../cubit.cpp
-	C++
-../clnt.cpp
-	C++
diff --git a/TAO/IIOP/test/Build/default.bld b/TAO/IIOP/test/Build/default.bld
deleted file mode 100755
index cdf3e2e8210..00000000000
--- a/TAO/IIOP/test/Build/default.bld
+++ /dev/null
@@ -1,19 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-	:target=vxwppc
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../proto/include
-	:sourcedirs=../..
-	:libraries=../../proto/lib/tao.a
-	:libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
-	:defines=DEBUG
-clnt.bld
-	program
-	:debuglevel=multi
-svr.bld
-	program
-	:debuglevel=multi
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/IIOP/test/Build/svr.bld b/TAO/IIOP/test/Build/svr.bld
deleted file mode 100755
index 7c8725356b2..00000000000
--- a/TAO/IIOP/test/Build/svr.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../svr.cpp
-	C++
-../cubit.cpp
-	C++
diff --git a/TAO/IIOP/test/Makefile b/TAO/IIOP/test/Makefile
deleted file mode 100644
index 370b9e427fa..00000000000
--- a/TAO/IIOP/test/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lcorba
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt test1_svr test1_clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-LDFLAGS    += -L../proto/lib
-CPPFLAGS   += -I../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS) $(POSTLINK)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS) $(POSTLINK)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS) $(POSTLINK)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS) $(POSTLINK)
-endif
-
-clean:
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-install:
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/Makefile b/TAO/IIOP/test/Orbeline/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit.idl b/TAO/IIOP/test/Orbeline/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/IIOP/test/Orbeline/base_server/server.cpp b/TAO/IIOP/test/Orbeline/base_server/server.cpp
deleted file mode 100644
index a4a1c85ed47..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbeline/base_server/stdmk b/TAO/IIOP/test/Orbeline/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/test/Orbeline/client/Makefile b/TAO/IIOP/test/Orbeline/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/test/Orbeline/client/client.cpp b/TAO/IIOP/test/Orbeline/client/client.cpp
deleted file mode 100644
index c2b1d4070ae..00000000000
--- a/TAO/IIOP/test/Orbeline/client/client.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  Profile_Timer pt;
-
-  pt.start();
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       try {
-         ret_struct = cb->cube_struct (arg_struct);
-
-       } catch (const CORBA::Exception &sysEx) {
-	 cerr << "Call failed: " << endl;
-	 cerr << sysEx;
-	 error_count++;
-       } catch (...) {
-	 cerr << "Unexpected exception" << endl;
-	 error_count++;
-       }       
-
-
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  pt.stop();
-
-  Elapsed_Time et;
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbeline/client/cubit.idl b/TAO/IIOP/test/Orbeline/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/test/Orbeline/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbeline/client/stdmk b/TAO/IIOP/test/Orbeline/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/test/Orbeline/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/test/Orbix/Makefile b/TAO/IIOP/test/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/IIOP/test/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/test/Orbix/base_server/Makefile b/TAO/IIOP/test/Orbix/base_server/Makefile
deleted file mode 100644
index 3bf0684dfd5..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.h b/TAO/IIOP/test/Orbix/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.idl b/TAO/IIOP/test/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp b/TAO/IIOP/test/Orbix/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.h b/TAO/IIOP/test/Orbix/base_server/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp b/TAO/IIOP/test/Orbix/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.h b/TAO/IIOP/test/Orbix/base_server/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h b/TAO/IIOP/test/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/base_server/server.cpp b/TAO/IIOP/test/Orbix/base_server/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.cpp b/TAO/IIOP/test/Orbix/base_server/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.h b/TAO/IIOP/test/Orbix/base_server/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/Orbix/client/Makefile b/TAO/IIOP/test/Orbix/client/Makefile
deleted file mode 100644
index 73f775bee2f..00000000000
--- a/TAO/IIOP/test/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/client/client.cpp b/TAO/IIOP/test/Orbix/client/client.cpp
deleted file mode 100644
index fcf45bdf706..00000000000
--- a/TAO/IIOP/test/Orbix/client/client.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbix/client/cubit.h b/TAO/IIOP/test/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/client/cubit.idl b/TAO/IIOP/test/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/client/cubitC.cpp b/TAO/IIOP/test/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/Makefile b/TAO/IIOP/test/Orbix/factory_client/Makefile
deleted file mode 100644
index 63cc8a65e02..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/factory_client/client.cpp b/TAO/IIOP/test/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.h b/TAO/IIOP/test/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.hh b/TAO/IIOP/test/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.idl b/TAO/IIOP/test/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/orb.mk b/TAO/IIOP/test/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/IIOP/test/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/IIOP/test/Orbix/tpool/Makefile b/TAO/IIOP/test/Orbix/tpool/Makefile
deleted file mode 100644
index 0e425af78b1..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.h b/TAO/IIOP/test/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.idl b/TAO/IIOP/test/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp b/TAO/IIOP/test/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp b/TAO/IIOP/test/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h b/TAO/IIOP/test/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpool/server.cpp b/TAO/IIOP/test/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.cpp b/TAO/IIOP/test/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.h b/TAO/IIOP/test/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/IIOP/test/Orbix/tpr/Makefile b/TAO/IIOP/test/Orbix/tpr/Makefile
deleted file mode 100644
index 650d6aaf259..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.h b/TAO/IIOP/test/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.idl b/TAO/IIOP/test/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp b/TAO/IIOP/test/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.h b/TAO/IIOP/test/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp b/TAO/IIOP/test/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.h b/TAO/IIOP/test/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h b/TAO/IIOP/test/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpr/server.cpp b/TAO/IIOP/test/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.cpp b/TAO/IIOP/test/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.h b/TAO/IIOP/test/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/Orbix/tps/Makefile b/TAO/IIOP/test/Orbix/tps/Makefile
deleted file mode 100644
index 69701ba3b63..00000000000
--- a/TAO/IIOP/test/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tps/cubit.h b/TAO/IIOP/test/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tps/cubit.idl b/TAO/IIOP/test/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubitC.cpp b/TAO/IIOP/test/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubitS.cpp b/TAO/IIOP/test/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.h b/TAO/IIOP/test/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tps/server.cpp b/TAO/IIOP/test/Orbix/tps/server.cpp
deleted file mode 100644
index 4e6baf18886..00000000000
--- a/TAO/IIOP/test/Orbix/tps/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_Factory_var cf = new Cubit_Factory_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Factory_var cf = new TIE_Cubit_Factory (Cubit_Factory) (new Cubit_Factory);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit_Factory", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tps/tps.cpp b/TAO/IIOP/test/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/IIOP/test/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/IIOP/test/Orbix/tps/tps.h b/TAO/IIOP/test/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/IIOP/test/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/clnt.cpp b/TAO/IIOP/test/clnt.cpp
deleted file mode 100644
index f0249489889..00000000000
--- a/TAO/IIOP/test/clnt.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-// @(#)clnt.cpp	1.2 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	Simple "cube" client, calling hand-crafted stubs.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include <ace/Get_Opt.h>
-//#include <crtdbg.h>
-
-#if	unix
-#	include	<unistd.h>
-#	include	<sys/time.h>
-
-#elif defined (VXWORKS)
-#	include	<unistd.h>
-#	include	<time.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include	"cubitC.h"
-
-#include	<corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-inline int func (unsigned i) { return i - 117; }
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// forward declarations
-//
-static void cube_union_stub(unsigned, unsigned&, unsigned&,
-                            CORBA_Object_ptr, CORBA_Environment &);
-
-static void cube_union_dii(unsigned &, unsigned &,
-                           CORBA_Object_ptr, CORBA_Environment &);
-
-// Global variables
-const char* TAO_arg_ior = 0;
-unsigned           loop_count = 1;
-int                exit_later = 0;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dn:O:x");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'n':			// loop count
-         loop_count = (unsigned) ACE_OS::atoi (opts.optarg);
-         continue;
-   
-      case 'O':			// stringified objref
-         {
-           TAO_arg_ior = ACE_OS::strdup(opts.optarg);
-         }
-         continue;
-   
-      case 'x':
-         exit_later++;
-         continue;
-   
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-n loopcount]"
-            " [-O objref]"
-            " [-x]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_Object_ptr objref = CORBA_Object::_nil();
-  CORBA_Environment env;
-
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception() != 0)
-    {
-      print_exception(env.exception(), "ORB initialization");
-      return 1;
-    }
-
-  //
-  // Parse command line and verify parameters.
-  //
-  parse_args(argc, argv);
-
-  if (TAO_arg_ior == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1);
-
-  objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env);
-
-  ACE_OS::free((void*)TAO_arg_ior);
-  TAO_arg_ior = 0;
-
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "string2object");
-      return 1;
-    }
-
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE)
-    ACE_ERROR_RETURN((LM_ERROR, "%s:  must identify non-null target objref\n", argv [0]), 1);
-
-  // Narrow the CORBA_Object reference to the stub object, checking
-  // the type along the way using _is_a
-  Cubit_ptr aCubit = Cubit::_narrow(objref);
-  if (aCubit == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1);
-
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      //
-      // Cube an octet.
-      //
-      CORBA_Octet	arg_octet, ret_octet;
-       
-      call_count++;
-      ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_octet");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-          arg_octet = arg_octet * arg_octet * arg_octet;
-          if (arg_octet != ret_octet) {
-            ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n",
-                            (CORBA_Octet) func (i), ret_octet);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a short.
-      //
-      CORBA_Short	arg_short, ret_short;
-       
-      call_count++;
-      ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_short");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube short:  %d --> %d\n", arg_short, ret_short);
-          arg_short = arg_short * arg_short * arg_short;
-          if (arg_short != ret_short)
-            {
-              ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n",
-                              (CORBA_Short) func (i), ret_short);
-              error_count++;
-            }
-        }
-
-      //
-      // Cube a long.
-      //
-      CORBA_Long	arg_long, ret_long;
-       
-      call_count++;
-      ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_long");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-          arg_long = arg_long * arg_long * arg_long;
-          if (arg_long != ret_long) {
-            ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n",
-                            (CORBA_Long) func (i), ret_long);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit_Many	arg_struct, *ret_struct;
-       
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      ret_struct = aCubit->Cubit_cube_struct (arg_struct, env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_struct");
-          error_count++;
-        }
-      else
-        {
-          dmsg ("cube struct ...");
-          arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-          arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-          arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-          
-          if (arg_struct.l != ret_struct->l
-              || arg_struct.s != ret_struct->s
-              || arg_struct.o != ret_struct->o)
-            {
-              ACE_OS::printf ("** cube_struct ERROR\n");
-              error_count++;
-            }
-          delete ret_struct;
-        }
-       
-    }
-    
-  after = ACE_OS::gettimeofday();
-    
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Simple test for DII:  call "cube_struct".  (It's not timed
-  // since the copious mallocation of DII would bias numbers against
-  // typical stub-based calls.)
-  //
-  do {
-    //
-    // Create the request ...
-    //
-    CORBA_Request_ptr	req;
-       
-    req = objref->_request ((const CORBA_String) "cube_struct", env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request create");
-      break;
-    }
-
-    //
-    // ... initialise the argument list and result ...
-    //
-    Cubit_Many	arg, *result;
-       
-    arg.o = 3; arg.l = 5; arg.s = -7;
-       
-    CORBA_Any	tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE);
-       
-    req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request arg add");
-      CORBA_release (req);
-      break;
-    }
-       
-    req->result ()->value ()
-      ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request result type");
-      CORBA_release (req);
-      break;
-    }
-
-    //
-    // Make the invocation, verify the result
-    //
-    req->invoke ();
-    if (req->env ()->exception () != 0) {
-      print_exception (req->env ()->exception (), "DII invoke");
-      CORBA_release (req);
-      break;
-    }
-       
-    result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-    if (result->o != 27 || result->l != 125 || result->s != -343)
-      ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n");
-    else
-      dmsg ("DII cube_struct ... success!!");
-       
-    CORBA_release (req);
-       
-  } while (0);
-
-  //
-  // Two more tests, using the "cube_union" function
-  //
-  cube_union_dii(call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  cube_union_stub(i, call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  if (exit_later) {
-    aCubit->Cubit_please_exit (env);
-    dexc (env, "server, please ACE_OS::exit");
-  }
-    
-  CORBA_release (objref);
-    
-  return (error_count == 0) ? 0 : 1;
-}
-
-
-static void
-cube_union_stub(unsigned          i,
-                unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   Cubit_ptr aCubit = Cubit::_narrow(objref);
-   //
-   // Cube a "union" ...
-   //
-   Cubit_oneof    u, *r;
-   
-   call_count++;
-   
-   u._disc = e_2nd;
-   u.l = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.l = u.l  * u.l * u.l ;
-      
-      if (u.l != r->l) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-   
-   //
-   // Cube another "union" which uses the default arm ...
-   //
-   call_count++;
-   
-   u._disc = e_5th;
-   u.cm.l = func (i);
-   u.cm.s = func (i);
-   u.cm.o = func (i);
-   
-   u.cm.l = 7;
-   u.cm.s = 5;
-   u.cm.o = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-         || u.cm.s != r->cm.s
-         || u.cm.o != r->cm.o) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-}
-
-
-static void
-cube_union_dii (unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   //
-   // Create the request ...
-   //
-   CORBA_Request_ptr	req;
-   
-   call_count++;
-
-   req = objref->_request ((const CORBA_String) "cube_union", env);
-   if (env.exception () != 0) {
-      error_count++;
-      
-      print_exception (env.exception (), "cube_union_dii request create");
-      return;
-   }
-
-   //
-   // ... initialise the argument list and result ...
-   //
-   Cubit_oneof	u, *r;
-   
-   u._disc = e_3rd;
-   u.cm.l = 5;
-   u.cm.s = -7;
-   u.cm.o = 3;
-
-   CORBA_Any	tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE);
-   
-   req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii request arg add");
-      CORBA_release (req);
-      return;
-   }
-	
-   req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii result type");
-      CORBA_release (req);
-      return;
-   }
-
-   //
-   // Make the invocation, verify the result
-   //
-   req->invoke ();
-   if (req->env ()->exception () != 0) {
-      error_count++;
-      print_exception (req->env ()->exception (),"cube_union_dii invoke");
-      CORBA_release (req);
-      return;
-   }
-
-   r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-   if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) {
-      error_count++;
-      ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n");
-   }
-   else
-      dmsg ("cube_union_dii ... success!!");
-   
-   CORBA_release (req);
-}
diff --git a/TAO/IIOP/test/cubit.cpp b/TAO/IIOP/test/cubit.cpp
deleted file mode 100644
index d232de8eee8..00000000000
--- a/TAO/IIOP/test/cubit.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-//
-
-#include	"cubit.h"		// for stubs ...
-#include	<corba/boa.h>		// ... and skeletons
-
-#include	<corba/debug.h>		// ... and debugging
-
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = {
-    { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-    { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = {
-    "cube_octet", CORBA_B_TRUE,
-    2, &Cubit_cube_octet_params [0],
-    0, 0
-};
-
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet		o,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Octet		retval = 0;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_octet_calldata,
-	    &retval, &o);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_octet_skel (CORBA_ServerRequest &req,    
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Octet);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA_Octet* value = new CORBA_Octet;
-
-  *value = *(CORBA_Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-  *value = (CORBA_Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = {
-    { _tc_CORBA_Short, PARAM_RETURN, 0 },
-    { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = {
-    "cube_short", CORBA_B_TRUE,
-    2, &Cubit_cube_short_params [0],
-    0, 0
-};
-
-
-CORBA_Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA_Short s,
-		  CORBA_Environment &env)
-{
-    CORBA_Short		retval;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_short_calldata,
-		&retval, &s);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_short_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Short);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA_Short* value = new CORBA_Short;
-
-  *value = *(CORBA_Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-  *value =(CORBA_Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = {
-    { _tc_CORBA_Long, PARAM_RETURN, 0 },
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = {
-    "cube_long", CORBA_B_TRUE,
-    2, &Cubit_cube_long_params [0],
-    0, 0
-};
-
-
-CORBA_Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA_Long l,
-		 CORBA_Environment &env)
-{
-  CORBA_Long		retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_long_skel (CORBA_ServerRequest &req,
-		 CORBA_Object_ptr obj,
-		 CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Long);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA_Long* value = new CORBA_Long;
-
-  *value = *(CORBA_Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = {
-    1,				// byte order flag (TRICKY!)
-
-    1, 0,			// empty string:  repository/type ID
-    1, 0,			// empty string:  struct name
-
-    3,				// three struct elements
-
-    // First structure element:  name, typecode for Octet
-    1, 0,			// empty string:  name "o"
-    tk_octet,
-
-    // Second structure element:  name, typecode for Long
-    1, 0,			// empty string:  name "l"
-    tk_long,
-
-    // Third structure element:  name, typecode for Short
-    1, 0,			// empty string:  name "s"
-    tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-    sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = {
-    { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-    { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = {
-    "cube_struct", CORBA_B_TRUE,
-    2, &Cubit_cube_struct_params [0],
-    0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA_Environment &env)
-{
-  Cubit_Many		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_struct_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (TC_Cubit_Many);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA_Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA_Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA_Any *any =
-    new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = {
-    1,				// byte order flag (TRICKY)
-    1, 0,			// omitted repository/type ID
-    1, 0,			// omitted struct name, "oneof"
-
-    //
-    // discriminant typecode:
-    //
-    tk_enum,		// tk_enum
-	72,			// encapsulation length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted enum name, "discrim"
-        6,			// 5 elements in the enum
-
-        1, 0,			// omitted member name, "e_0th"
-        1, 0,			// omitted member name, "e_1st"
-        1, 0,			// omitted member name, "e_2nd"
-        1, 0,			// omitted member name, "e_3rd" 
-        1, 0,			// omitted member name, "e_4th" 
-        1, 0,			// omitted member name, "e_5th" 
-
-    4,				// default member index (zero based)
-    5,				// number of union members
-
-    // the 1st union branch arm
-    e_0th,			// member label value
-    1, 0,			// omitted member name, "o"
-    tk_octet,		// member typecode
-
-    // the 2nd union branch arm
-    e_1st,			// member label value
-    1, 0,			// omitted member name, "s"
-    tk_short,		// member typecode
-
-    // the 3rd union branch arm
-    e_2nd,			// member label value
-    1, 0,			// omitted member name, "l"
-    tk_long,		// member typecode
-
-    // the 4th union branch arm
-    e_3rd,			// member label value
-    1, 0,			// omitted member name, "cm"
-
-    // the 4th union member typecode
-    tk_struct,		// tk_struct
-	60,			// encap length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted struct name, "Many"
-        3,			// three struct members
-
-        // First structure element
-        1, 0,			// omitted member name, "o"
-        tk_octet,	// member type, tk_octet
-
-        // Second structure element
-        1, 0,			// omitted member name, "l"
-        tk_long,	// member type, tk_long
-
-        // Third structure element
-        1, 0,			// omitted member name, "s"
-        tk_short,	// member type, tk_short
-
-    // the 5th union branch arm
-    4,				// the 5th member label value
-    1, 0,			// omitted member name, "cm"
-    ~0,				// indirected typecode (~0)
-	-84			// offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-    (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = {
-    { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-    { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = {
-    "cube_union", CORBA_B_TRUE,
-    2, &Cubit_cube_union_params [0],
-    0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA_Environment &env)
-{
-  Cubit_oneof		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_union_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (TC_Cubit_oneof);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) {
-  case e_0th:
-    r->o = (CORBA_Octet) (v->o * v->o * v->o);
-    break;
-
-  case e_1st:
-    r->s = (CORBA_Short) (v->s * v->s * v->s);
-    break;
-
-  case e_2nd:
-    r->l = v->l * v->l * v->l;
-    break;
-
-  case e_3rd:
-  default:
-    r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o);
-    r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s);
-    r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-    break;
-  }
-
-  CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-}
-
-
-const CORBA_Char	*Cubit__id = (CORBA_Char *)
-    "IDL:Eng.SUN.COM/Cubit:1.1";
-
-
-//
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small cache
-// (e.g. like Obj-C?).  for now, just lsearch.
-//
-const TAO_Skel_Entry Cubit_operations [] = {
-    { &Cubit_cube_octet_calldata, _cube_octet_skel },
-    { &Cubit_cube_short_calldata, _cube_short_skel },
-    { &Cubit_cube_long_calldata, _cube_long_skel },
-    { &Cubit_cube_struct_calldata, _cube_struct_skel },
-    { &Cubit_cube_union_calldata, _cube_union_skel },
-    { &Cubit_please_exit_calldata, _please_exit_skel },
-    { 0, 0 }					// last entry
-};
diff --git a/TAO/IIOP/test/cubit.h b/TAO/IIOP/test/cubit.h
deleted file mode 100644
index 92dd6b381bd..00000000000
--- a/TAO/IIOP/test/cubit.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation
-// (all parent interfaces are virtual public parents) makes
-// object references have different "views".  That is, a
-// pointer to a Cubit (i.e. a Cubit_ptr) would not have
-// the same binary value as a pointer to a CORBA_Object
-// (i.e. a CORBA_Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-//
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-//
-// C style binding
-//
-
-typedef CORBA_Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof {
-    Cubit_discrim          _disc;
-
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
-        Cubit_Many      cm;
-    };
-};
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
-);
-
-CORBA_Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
-);
-
-CORBA_Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA_Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-);
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/test/cubit.idl b/TAO/IIOP/test/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/cubitC.cpp b/TAO/IIOP/test/cubitC.cpp
deleted file mode 100644
index 99416520c15..00000000000
--- a/TAO/IIOP/test/cubitC.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// @(#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj)
-{
-   if (obj)
-      obj->AddRef();
-
-   return obj;
-}
-
-Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj)
-{
-   CORBA_Environment env;
-   if (obj->_is_a("IDL:Cubit:1.0", env))
-   {
-      STUB_Object *istub;
-      if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-      {
-         return Cubit::_nil();
-      }
-      Cubit_ptr new_obj = new Cubit(istub);
-      return Cubit::_duplicate(new_obj);
-   }
-   return Cubit::_nil();
-}
-
-Cubit_ptr Cubit::_nil()
-{
-   return (Cubit_ptr)NULL;
-}
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-   { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-   { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-    
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-   "cube_octet", CORBA_B_TRUE,
-      2, &Cubit_cube_octet_params [0],
-      0, 0
-};
-
-
-CORBA_Octet
-Cubit::Cubit_cube_octet (CORBA_Octet       o, 
-                  CORBA_Environment &env)
-{
-   CORBA_Octet		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_octet_calldata,
-                        &retval, &o);
-   istub->Release ();
-
-   return retval;
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-   { _tc_CORBA_Short, PARAM_RETURN, 0 },
-   { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-   "cube_short", CORBA_B_TRUE,
-      2, &Cubit_cube_short_params [0],
-      0, 0
-};
-
-
-CORBA_Short
-Cubit::Cubit_cube_short (CORBA_Short       s,
-                  CORBA_Environment &env)
-{
-   CORBA_Short		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call(env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-   
-   istub->Release ();
-   
-   return retval;
-}
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-   { _tc_CORBA_Long, PARAM_RETURN, 0 },
-   { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-   "cube_long", CORBA_B_TRUE,
-      2, &Cubit_cube_long_params [0],
-      0, 0
-};
-
-
-CORBA_Long
-Cubit::Cubit_cube_long (CORBA_Long        l,
-                 CORBA_Environment &env)
-{
-   CORBA_Long		retval;
-   
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-   
-   istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = 
-{
-   1,          // byte order flag (TRICKY!)
-      
-   1, 0,       // empty string:  repository/type ID
-   1, 0,       // empty string:  struct name
-      
-   3,          // three struct elements
-      
-   // First structure element:  name, typecode for Octet
-   1, 0,       // empty string:  name "o"
-   tk_octet,
-      
-   // Second structure element:  name, typecode for Long
-   1, 0,       // empty string:  name "l"
-   tk_long,
-      
-   // Third structure element:  name, typecode for Short
-   1, 0,       // empty string:  name "s"
-   tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-                                      sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-                                      CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-   { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-   { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-   "cube_struct", CORBA_B_TRUE,
-      2, &Cubit_cube_struct_params [0],
-      0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA_Environment &env)
-{
-   Cubit_Many		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-  
-   istub->do_call (env, &Cubit_cube_struct_calldata,
-                        &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = 
-{
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "oneof"
-   
-   //
-   // discriminant typecode:
-   //
-   tk_enum,    // tk_enum
-   72,         // encapsulation length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted enum name, "discrim"
-   6,          // 5 elements in the enum
-   
-   1, 0,       // omitted member name, "e_0th"
-   1, 0,       // omitted member name, "e_1st"
-   1, 0,       // omitted member name, "e_2nd"
-   1, 0,       // omitted member name, "e_3rd" 
-   1, 0,       // omitted member name, "e_4th" 
-   1, 0,       // omitted member name, "e_5th" 
-   
-   4,       	// default member index (zero based)
-   5,       	// number of union members
-   
-   // the 1st union branch arm
-   e_0th,       // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 2nd union branch arm
-   e_1st,      // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 3rd union branch arm
-   e_2nd,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-   
-   // the 4th union branch arm
-   e_3rd,      // member label value
-   1, 0,       // omitted member name, "cm"
-   
-   // the 4th union member typecode
-   tk_struct,  // tk_struct
-   60,         // encap length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "Many"
-   3,          // three struct members
-   
-   // First structure element
-   1, 0,       // omitted member name, "o"
-   tk_octet,   // member type, tk_octet
-   
-   // Second structure element
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member type, tk_long
-   
-   // Third structure element
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member type, tk_short
-   
-   // the 5th union branch arm
-   4,          // the 5th member label value
-   1, 0,       // omitted member name, "cm"
-   ~0,         // indirected typecode (~0)
-   -84         // offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-                                       (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-                                       CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-   { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-   { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-   "cube_union", CORBA_B_TRUE,
-      2, &Cubit_cube_union_params [0],
-      0, 0
-};
-
-Cubit_oneof*
-Cubit::Cubit_cube_union (Cubit_oneof		&values,
-                  CORBA_Environment	&env)
-{
-   Cubit_oneof		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-   "please_exit", CORBA_B_FALSE,
-      0, 0,
-      0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA_Environment	&env)
-{
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return;
-   }
-
-   istub->do_call (env, &Cubit_please_exit_calldata);
-   istub->Release ();
-}
diff --git a/TAO/IIOP/test/cubitC.h b/TAO/IIOP/test/cubitC.h
deleted file mode 100644
index 8f9dfe53841..00000000000
--- a/TAO/IIOP/test/cubitC.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-
-#include <iostream.h>
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-   CORBA_Octet o;
-   CORBA_Long  l;
-   CORBA_Short s;
-};
-
-enum Cubit_discrim
-  { e_0th = 0, e_1st = 1, e_2nd = 2,
-    e_3rd = 3, e_4th = 4, e_5th = 5 };
-
-struct Cubit_oneof 
-{
-   Cubit_discrim  _disc;
-   
-   union 
-   {    
-      CORBA_Octet o;
-      CORBA_Short s;
-      CORBA_Long  l;
-      Cubit_Many  cm;
-   };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-   static Cubit_ptr _duplicate(Cubit_ptr obj);
-   static Cubit_ptr _narrow(CORBA_Object_ptr obj);
-   static Cubit_ptr _nil();
-
-   virtual 
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual 
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual 
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual 
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env);
-
-protected:
-   Cubit() { }
-   Cubit(STUB_Object *objref)
-      : CORBA_Object(objref) { }
-   virtual ~Cubit() { }
-
-   
-};
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/test/cubitS.cpp b/TAO/IIOP/test/cubitS.cpp
deleted file mode 100644
index b153b71db1b..00000000000
--- a/TAO/IIOP/test/cubitS.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include	"cubitS.h"
-#include	"cubitC.cpp"
-
-#include "connect.h"
-#include "params.h"
-
-#include "corba/debug.h"    // ... and debugging
-#include "corba/optable.h"  // TAO Dynamic Operation Table
-#include "method_db.i"
-#include "iiopobj.h"
-
-#if defined(CUBIT_USE_DYNAMIC_HASH)
-TAO_Dynamic_Hash_OpTable tao_cubit_optable(7);  // Dynamic Operation Table
-#else
-TAO_Linear_OpTable tao_cubit_optable(7);
-#endif
-
-_skel_Cubit::_skel_Cubit(const char* obj_name)
-{
-  const char* mn = "_skel_Cubit::_skel_Cubit()";
-  
-   //  Initialize Method Database
-   initialize_method_db (&tao_cubit_optable);
-
-   char *type_id = "IDL:Cubit:1.0";
-   // CORBA_String type_id = "IDL:Cubit:1.0";
-   IIOP_Object *data;
-
-   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa();
-   if (oa == 0)
-     {
-       // We just have to assume that oa will be good, or we have to
-       // throw an exception.  For now we "assume", but we'll
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn));
-       return;
-     }
-   
-   this->optable_ = &tao_cubit_optable;
-   data = new IIOP_Object(type_id);
-
-   data->profile.iiop_version.major = IIOP::MY_MAJOR;
-   data->profile.iiop_version.minor = IIOP::MY_MINOR;
-   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-   data->profile.port = oa->get_addr().get_port_number();
-   data->profile.object_key.length =  ACE_OS::strlen(obj_name);
-   data->profile.object_key.maximum = data->profile.object_key.length;
-   data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-   
-   ACE_OS::memcpy (data->profile.object_key.buffer,
-                   obj_name,
-                   data->profile.object_key.length+1);
-
-   this->set_parent(data);
-   this->sub_ = this;
-
-   if (oa->bind(data->profile.object_key, this) == -1)
-     {
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer));
-       return;
-     }
-}
-
-void
-_skel_Cubit::_cube_octet_skel(CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Octet);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_octet, add value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_octet, get params");
-   
-   // Call Implementation
-   CORBA_Octet		*value = new CORBA_Octet;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-
-   *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env);
-
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA_ServerRequest &req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Short);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_short, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_short, get params");
-   
-   // Call Implementation
-   CORBA_Short *value = new CORBA_Short;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env);
-   
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Long);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_long, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_long, get params");
-   
-   // Call Implementation
-   CORBA_Long		*value = new CORBA_Long;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env);
-   
-   CORBA_Any  		*any =
-      new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_Many);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_struct, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_struct, get params");
-   
-   // Call Implementation
-   Cubit_Many  *value;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env);
-   
-   Cubit_Many  *retval = new Cubit_Many;
-   retval->o = (CORBA_Octet)value->o;
-   retval->s = (CORBA_Short)value->s;
-   retval->l = value->l;
-   
-   // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-   // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-   // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA_ServerRequest	&req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_oneof);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_union_3rd, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_union_3rd, get params");
-   
-   // Call Implementation
-   Cubit_oneof    *v;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env);
-
-   Cubit_oneof    *r = new Cubit_oneof;
-   r->_disc = v->_disc;
-   r->o =    (CORBA_Octet) (v->o);
-   r->s =    (CORBA_Short) (v->s);
-   r->l =     v->l;
-   r->cm.o = (CORBA_Octet) (v->cm.o);
-   r->cm.s = (CORBA_Short) (v->cm.s);
-   r->cm.l =  v->cm.l;
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   the_cubit->Cubit_please_exit(env);
-}
diff --git a/TAO/IIOP/test/cubitS.h b/TAO/IIOP/test/cubitS.h
deleted file mode 100644
index 84c07b741b0..00000000000
--- a/TAO/IIOP/test/cubitS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env) = 0;
-   static 
-   void _cube_octet_skel(CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env) = 0;
-  
-   static
-   void _cube_short_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_long_skel (CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_struct_skel (CORBA_ServerRequest &req,
-                           CORBA_Object_ptr    obj,
-                           CORBA_Environment   &env);
-
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_union_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env) = 0;
-
-   static 
-   void _please_exit_skel (CORBA_ServerRequest  &req,
-                           CORBA_Object_ptr     obj,
-                           CORBA_Environment    &env);
-protected:
-   _skel_Cubit(const char* obj_name = 0);
-   virtual ~_skel_Cubit() { }
-
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/test/cubit_i.cpp b/TAO/IIOP/test/cubit_i.cpp
deleted file mode 100644
index ae22b7cd12c..00000000000
--- a/TAO/IIOP/test/cubit_i.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubit_i.h"
-
-#include	<corba/boa.h>    // ... and skeletons
-#include	<corba/debug.h>  // ... and debugging
-
-#include "connect.h"
-#include "params.h"
-
-Cubit_i::Cubit_i(const char* obj_name)
-: _skel_Cubit(obj_name)
-{
-}
-
-Cubit_i::~Cubit_i()
-{
-}
-
-CORBA_Octet
-Cubit_i::Cubit_cube_octet (CORBA_Octet       o,
-                           CORBA_Environment &env)
-{
-
-   return (CORBA_Octet) (o * o * o);
-}
-
-CORBA_Short
-Cubit_i::Cubit_cube_short (CORBA_Short       s, 
-                           CORBA_Environment &env)
-{
-   return (CORBA_Short) (s * s * s);
-}
-
-
-CORBA_Long
-Cubit_i::Cubit_cube_long (CORBA_Long        l,
-                          CORBA_Environment &env)
-{
-   return (CORBA_Long) (l * l * l);
-}
-
-Cubit_Many*
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA_Environment &env)
-{
-   values.o = values.o * values.o * values.o;
-   values.s = values.s * values.s * values.s;
-   values.l = values.l * values.l * values.l;
-   
-   return &values;
-}
-
-Cubit_oneof*
-Cubit_i::Cubit_cube_union (Cubit_oneof       &values,
-                           CORBA_Environment &env)
-{
-   switch (values._disc) {
-   case e_0th:
-      values.o = (CORBA_Octet) (values.o * values.o * values.o);
-      break;
-   case e_1st:
-      values.s = (CORBA_Short) (values.s * values.s * values.s);
-      break;
-   case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-   case e_3rd:
-   default:
-      values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-   }
-   return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA_Environment &env)
-{
-   TAO_OA_Parameters* params = TAO_OA_PARAMS::instance();
-   
-   dmsg ("I've been asked to shut down...");
-   params->oa()->please_shutdown(env);
-   dexc (env, "please_exit, please_shutdown");
-}
diff --git a/TAO/IIOP/test/cubit_i.h b/TAO/IIOP/test/cubit_i.h
deleted file mode 100644
index 6f4bee0d486..00000000000
--- a/TAO/IIOP/test/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-   Cubit_i(const char* obj_name = 0);
-   ~Cubit_i();
-   
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   void Cubit_please_exit (CORBA_Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/IIOP/test/method_db.i b/TAO/IIOP/test/method_db.i
deleted file mode 100644
index 6b77cdf040a..00000000000
--- a/TAO/IIOP/test/method_db.i
+++ /dev/null
@@ -1,67 +0,0 @@
-// @(#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA_ServerRequest &req,
-           CORBA_Object_ptr    obj,
-           CORBA_Environment   &env)
-{
-    CORBA_NVList_ptr		nvlist;
-    CORBA_NamedValue_ptr	nv;
-    CORBA_Any			temp_value (_tc_CORBA_String);
-
-    req.orb()->create_list (0, nvlist);
-    nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-    req.params (nvlist, env);
-    if (env.exception () != 0) 
-    {
-      dexc (env, "is_a_skel, get params");
-	   return;
-    }
-
-    CORBA_Boolean *retval;
-    CORBA_String value = *(CORBA_String *) nv->value()->value();
-
-    if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0
-    || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0)
-	   retval = new CORBA_Boolean (CORBA_B_TRUE);
-    else
-	   retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-    CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-    req.result (any, env);
-    dexc (env, "_is_a, result");
-}
-
-
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db cubit_operations[] = {
-   { "_is_a", &is_a_skel },
-   { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-   { "cube_short", &_skel_Cubit::_cube_short_skel },
-   { "cube_long", &_skel_Cubit::_cube_long_skel },
-   { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-   { "cube_union", &_skel_Cubit::_cube_union_skel },
-   { "please_exit", &_skel_Cubit::_please_exit_skel },
-   { 0, 0 }
-};
-   
-
-void initialize_method_db (TAO_Operation_Table *the_optable)
-{
-   for (int ndx = 0; ndx < 7; ndx++)
-      the_optable->bind(cubit_operations[ndx].opname, 
-                        cubit_operations[ndx].skel_ptr);
-   
-}
diff --git a/TAO/IIOP/test/results/Orbix b/TAO/IIOP/test/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/IIOP/test/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/IIOP/test/results/TAO b/TAO/IIOP/test/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/IIOP/test/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/IIOP/test/results/Visibroker b/TAO/IIOP/test/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/IIOP/test/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/IIOP/test/results/orbs.xls b/TAO/IIOP/test/results/orbs.xls
deleted file mode 100644
index 149078dd383..00000000000
--- a/TAO/IIOP/test/results/orbs.xls
+++ /dev/null
diff --git a/TAO/IIOP/test/svr.cpp b/TAO/IIOP/test/svr.cpp
deleted file mode 100644
index 53fac60bf6d..00000000000
--- a/TAO/IIOP/test/svr.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode, 
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "corba/orb.h"
-#include "corba/debug.h"
-#include "connect.h"
-
-#include "cubit_i.h"
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// Global Variables
-CORBA_String key = (CORBA_String)"key0";
-int num_of_objs = 1;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dk:n:");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'k':			// key (str)
-         key = (CORBA_String) opts.optarg;
-         continue;
-   
-      case 'n':			// idle seconds b4 exit
-         num_of_objs = ACE_OS::atoi(opts.optarg);
-         continue;
-
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-k {object_key}]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_Object_ptr obj = 0;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr   oa_ptr;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  // Initialize the Basic Object Adapter
-  oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA");
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1);
-  
-
-  //
-  // Parse remaining command line and verify parameters.
-  //
-  parse_args(argc, argv);
-  
-  // Create implementation object with user specified key
-  Cubit_i_ptr  *my_cubit = new Cubit_i_ptr[num_of_objs];
-  for (int ndx = 0; ndx < num_of_objs; ndx++)
-  {
-     CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2);
-     sprintf(obj_str, "%s%d", (char*)key, ndx);
-     my_cubit[ndx] = new Cubit_i(obj_str);
-     if (my_cubit[ndx] == 0)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2);
-
-     if (TAO_debug_level >= 1)
-     {
-         // Why are we getting the BOA_ptr from here when we've already
-         // got it above?
-         CORBA_OctetSeq	obj_key;
-         obj_key.buffer = (CORBA_Octet *) obj_str;
-         obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-         if (oa_ptr->find(obj_key, obj) == -1)
-           ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-         //
-         // Stringify the objref we'll be implementing, and
-         // print it to stdout.  Someone will take that string
-         // and give it to some client.  Then release the object.
-         //
-         CORBA_String	str;
-         
-         str = orb_ptr->object_to_string (obj, env);
-         if (env.exception () != 0) {
-            print_exception (env.exception (), "object2string");
-            return 1;
-         }
-         ACE_OS::puts ((char *)str);
-         ACE_OS::fflush (stdout);
-         dmsg1 ("Object Created at: '%ul'", obj);
-         dmsg1 ("listening as object '%s'", str);
-         
-     }
-     CORBA_string_free(obj_str);  
-  }
-//  Cubit_i_ptr  my_cubit = new Cubit_i(key);
-//  if (my_cubit1 == 0)
-//    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2);
-
-/*  if (TAO_debug_level >= 1)
-    {
-      // Why are we getting the BOA_ptr from here when we've already
-      // got it above?
-      CORBA_OctetSeq	obj_key;
-      obj_key.buffer = (CORBA_Octet *) key;
-      obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key);
-     
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-      //
-      // Stringify the objref we'll be implementing, and
-      // print it to stdout.  Someone will take that string
-      // and give it to some client.  Then release the object.
-      //
-      CORBA_String	str;
-     
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-
-      obj_key.buffer = (CORBA_Octet *)"key1";
-      obj_key.length = obj_key.maximum = 4;
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-    }
-*/
-  // Handle requests for this object until we're killed, or one of
-  // the methods asks us to exit.
-  //
-  int terminationStatus = 0;
-
-
-#if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Reactor::run_event_loop();
-#else
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return 0;
-}
diff --git a/TAO/IIOP/test/test.mak b/TAO/IIOP/test/test.mak
deleted file mode 100644
index a27147d5f32..00000000000
--- a/TAO/IIOP/test/test.mak
+++ /dev/null
@@ -1,463 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-DEP_CPP_CLNT_=\

-	"..\..\..\ace\config-win32.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CLNT_=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	

-NODEP_CPP_CUBIT=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	

-NODEP_CPP_CUBITS=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\optable.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\iiopobj.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	

-NODEP_CPP_CUBIT_=\

-	".\connect.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	"..\..\..\ace\config-win32.h"\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_SVR_C=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/IIOP/test/test.mdp b/TAO/IIOP/test/test.mdp
deleted file mode 100644
index dc1aea7d5be..00000000000
--- a/TAO/IIOP/test/test.mdp
+++ /dev/null
diff --git a/TAO/IIOP/test/test1.cpp b/TAO/IIOP/test/test1.cpp
deleted file mode 100644
index a27c29ee378..00000000000
--- a/TAO/IIOP/test/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA_B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA_ ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA_ ## truetype in_a1, \
-		CORBA_ ## truetype &out_a2, \
-		CORBA_ ## truetype &inout_a3, \
-		CORBA_Environment &env) { \
-	CORBA_ ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { _tc_CORBA_Float , PARAM_RETURN , 0 },
-    { _tc_CORBA_Float , PARAM_IN , 0 },
-    { _tc_CORBA_Float , PARAM_OUT , 0 },
-    { _tc_CORBA_Float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA_B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA_Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA_Float	in_a1,
-    CORBA_Float	&out_a2,
-    CORBA_Float	&inout_a3,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA_Float	_in_a1 = in_a1;
-    CORBA_Float	_out_a2 = out_a2;
-    CORBA_Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA_Any *
-test1_test_any (test1_ptr target,
-	const CORBA_Any &in_a1,
-	CORBA_Any *&out_a2,
-	CORBA_Any &inout_a3,
-	CORBA_Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA_B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/IIOP/test/test1.h b/TAO/IIOP/test/test1.h
deleted file mode 100644
index 7d3bd0e08a5..00000000000
--- a/TAO/IIOP/test/test1.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
-
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
-
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA_Environment &env);
-void test1_test_void (test1_ptr target, CORBA_Environment &env);
-
-DECL_TEST (short, CORBA_Short);
-DECL_TEST (long, CORBA_Long);
-DECL_TEST (ushort, CORBA_UShort);
-DECL_TEST (ulong, CORBA_ULong);
-DECL_TEST (float, CORBA_Float);
-DECL_TEST (double, CORBA_Double);
-DECL_TEST (boolean, CORBA_Boolean);
-DECL_TEST (char, CORBA_Char);
-DECL_TEST (octet, CORBA_Octet);
-
-CORBA_Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
-DECL_TEST (Principal, CORBA_Principal_ptr);
-DECL_TEST (Object, CORBA_Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA_String);
-
-DECL_TEST (longlong, CORBA_LongLong);
-DECL_TEST (ulonglong, CORBA_ULongLong);
-DECL_TEST (wchar, CORBA_WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA_WString);
-
-DECL_TEST (longdouble, CORBA_LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA_UserException {
-  public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA_UserException {
-  public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
-
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA_release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/IIOP/test/test1.idl b/TAO/IIOP/test/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/IIOP/test/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/IIOP/test/test1_clnt.cpp b/TAO/IIOP/test/test1_clnt.cpp
deleted file mode 100644
index 831a0189371..00000000000
--- a/TAO/IIOP/test/test1_clnt.cpp
+++ /dev/null
@@ -1,636 +0,0 @@
-// @(#)test1_clnt.cpp	1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		client driver for "test1"
-//
-
-#ifdef	USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include "test1.h"
-#include <corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first) parameter,
-// and the "inout" (third) parameter is the same function the its
-// initial value.   Caller is expected to specify two different "in"
-// values.   This helps make the marshaled bits vary, and turn up a class
-// of potential problems that'd be hidden if parameter order had no
-// effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases where
-// the ORB or operation failed.  The COMPARE symbol can be redefined
-// to achieve different functions -- e.g. cubing numbers, identity,
-// negation, etc.  It should return true iff the correct result was
-// returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating client
-// side memory leaks in the test.
-//
-#define	RELEASE(X)		// NOP by default
-#define	PERFORM_TEST(name,type,value1,value2) \
-    { \
-	CORBA_ ## type	v1, v2, v3; \
- 	\
-	v1 = (CORBA_ ## type)(value1); \
-	v2 = 0; \
-	v3 = (CORBA_ ## type)(value2); \
- 	\
-	test_count++; \
-	v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-	if (env.exception () != 0) { \
-	    print_exception (env.exception (), "perform test_" #name); \
-	    error_count++; \
-	} else if (!COMPARE (CORBA_ ## type, v1, value1) \
-		|| !COMPARE (CORBA_ ## type, v2, value1) \
-		|| !COMPARE (CORBA_ ## type, v3, value2) ) { \
-	    ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-	    BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-	    error_count++; \
-	} \
-	RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef	USE_IOSTREAM
-#	define	DO_IO(x) x
-#else
-#	define	DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-	    DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-	    cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-	    cerr << " v3=" << v3; \
-	    cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-
-//
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-//
-static CORBA_Boolean
-compare_objrefs (
-    CORBA_Object_ptr	v1,
-    CORBA_Object_ptr	v2
-)
-{
-    CORBA_Boolean	temp;
-    CORBA_Environment	env;
-
-    if (v1 == v2)
-	return CORBA_B_TRUE;
-
-    if (CORBA_is_nil (v1))
-	return CORBA_is_nil (v2);
-
-    temp = v1->_is_equivalent (v2, env);
-    if (env.exception () != 0) {
-	print_exception (env.exception (), "compare objref");
-	return CORBA_B_FALSE;
-    }
-    return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-
-static int	skip_longdouble = 0;
-
-//
-// This just performs the tests ...
-//
-void
-do_tests (
-    test1_ptr	target,
-    unsigned	loop_count,
-    unsigned	&test_count,
-    unsigned	&error_count
-)
-{
-    int		count;
-
-    for (count = 0; count < loop_count; count++) {
-	CORBA_Environment	env;
-	CORBA_Environment	env2;	// XXX
-
-	//
-	// test_void
-	//
-	test_count++;
-	test1_test_void (target, env);
-	if (env.exception () != 0) { 
-	    print_exception (env.exception (), "perform test_void");
-	    error_count++;
-	}
-
-	//
-	// Numeric tests ... try some variety in computation, no real
-	// rationale in the choice of initial parameter values except
-	// not to use the same values all the time.
-	//
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-	((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-	PERFORM_TEST (short, Short, count - 23, count + 19);
-	PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-    	PERFORM_TEST (long, Long, count - 17, count + 20);
-    	PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-	PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-	PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif	// !NONNATIVE_LONGLONG
-
-#if	!defined (i386)
-	//
-	// XXX not sure what's wrong with the COMPARE macro with respect to
-	// floating point on x86, since fprintf shows the values basically
-	// look correct ... but these float/double tests fail.
-	//
-	PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-	PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif	// !defined (i386)
-
-
-#ifndef	NONNATIVE_LONGDOUBLE
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	//
-	// don't try this between two platforms that don't provide
-	// arithmetic support for LongDouble values ...
-	//
-	if (!skip_longdouble) {
-	    PERFORM_TEST (longdouble, LongDouble,
-		    count - 2.33, count * 3.14159);
-	}
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	COMPARE
-#undef	EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		(count & 0x01) != 0, (count & 0x01) == 0);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Char, WChar -- identity
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-	PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Object_ptr -- identity (special comparision)
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	    (compare_objrefs (retval, original_value) == CORBA_B_TRUE)
-#undef	RELEASE
-#define	RELEASE(obj) \
-	    { CORBA_release (obj); }
-
-	PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ());
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// TypeCode_ptr -- identity (special comparision), and verifies
-	// that most of the built-in typecode constants exist.
-	//
-	// XXX should try this on all standard and system exceptions!
-	//
-	// XXX  this currently tests only marshaling/unmarshaling of
-	// "no parameter" TypeCodes ... complex ones (objref, struct,
-	// union, enum, sequence, array, alias, exception) are _NOT_
-	// currently attempted.
-	//
-	// XXX  for the simple typecodes (string, wstring), the single
-	// "bound" parameter isn't exercised/verified as it should be.
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define	COMPARE(type,retval,original) \
-	    (((retval) == (original)) || \
-		((retval)->_kind == (original)->_kind))
-
-#undef	RELEASE
-#define	RELEASE(tc) \
-	    { CORBA_release (tc); }
-
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	{
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Null, _tc_CORBA_Void);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Short, _tc_CORBA_UShort);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Long, _tc_CORBA_ULong);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongLong, _tc_CORBA_ULongLong);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Float, _tc_CORBA_Double);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Boolean, _tc_CORBA_Octet);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Any, _tc_CORBA_TypeCode);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongDouble, _tc_CORBA_Principal);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Char, _tc_CORBA_String);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_WChar, _tc_CORBA_WString);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongDouble, _tc_CORBA_Octet);
-
-	    //
-	    // Try all of the standard exception typecodes.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	    //
-	    // All the built-in "user defined" system exceptions.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_BadKind, _tc_CORBA_Bounds);
-	}
-#undef	COMPARE
-#undef	RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	    (strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef	RELEASE
-#define	RELEASE(obj) CORBA_string_free(obj)
-	static const CORBA_Char str1 [] = "small";
-	static const CORBA_Char str2 [] =
-			"relatively long string, constructed"
-			" with the aid of C++ implicit string"
-			" catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef	COMPARE
-#undef	RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	    CORBA_Exception	*xp;
-
-	    //
-	    // Case one:  with parameter <= zero, must throw
-	    // an "x1" exception whose "case_num" is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, -5, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x1	*xp2 = (test1_x1 *) xp;
-
-		    if (xp2->case_num != -5) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 1, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-			"no exception thrown !!\n");
-	    }
-
-
-	    //
-	    // Case two:  with positive odd parameter, must throw
-	    // an "x2" exception whose obj is null, and whose case_num
-	    // is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 101, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 2, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 101) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    if (!CORBA_is_nil (xp2->obj)) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"non-null objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 2, "
-			"no exception thrown !!\n");
-	    }
-
-
-#if	0
-// 18-sept-95:  commented this out.  Work remains to be done in
-// this area:  (a) ServerRequest::target operation unimplemented,
-// so for the servers of current interest this test is no help;
-// (b) probable pointer leak in exceptions holding data.
-
-	    //
-	    // Case three:  with positive even parameter, must throw
-	    // an "x2" exception whose obj is the target, and whose
-	    // case_num is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 42, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 42) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    CORBA_Boolean	status;
-
-		    status = target->_is_equivalent (xp2->obj, env);
-
-		    if (env.exception () != 0) {
-			error_count++;
-			print_exception (env.exception (),
-				"test_throw/3 call to is_equivalent");
-		    } else if (status != CORBA_B_TRUE) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"non-equivalent objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 3, "
-			"no exception thrown !!\n");
-	    }
-
-	    env.clear ();
-#endif	// 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-		|| ACE_OS::strcmp ((char *) env.exception()->id(),
-			(char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) { 
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	}
-    }
-}
-
-
-int
-main (int    argc, char   *argv[])
-{
-    CORBA_ORB_ptr	orb_ptr;
-    CORBA_Environment	env;
-    CORBA_Object_ptr	objref = CORBA_Object::_nil();
-    unsigned		loop_count = 1;
-    unsigned		tests = 0, errors = 0;
-    int			exit_later = 0;
-
-    orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-    if (env.exception () != 0) {
-	dexc (env, "ORB initialisation");
-	return 1;
-    }
-
-    //
-    // Parse and verify parameters.
-    //
-    ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-    int			c;
-
-    while ((c = get_opt ()) != -1)
-	switch (c) {
-	  case 'd':			// debug flag
-	    TAO_debug_level++;
-	    continue;
-
-	  case 'l':			// skip "long double" test
-	    skip_longdouble++;
-	    continue;
-
-	  case 'n':			// loop count
-	    loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	    continue;
-
-	  case 'O':			// stringified objref
-	    {
-		objref = orb_ptr->string_to_object (
-			(CORBA_String)get_opt.optarg, env);
-		if (env.exception () != 0) {
-		    dexc (env, "string2object");
-		    return 1;
-		}
-	    }
-	    continue;
-
-	  case 'x':
-	    exit_later++;
-	    continue;
-
-	  case '?':
-	  default:
-	    ACE_OS::fprintf (stderr, "usage:  %s"
-			    " [-d]"
-			    " [-l]"
-			    " [-n loopcount]"
-			    " [-O objref]"
-			    " [-x]"
-			    "\n", argv [0]
-			    );
-	    return 1;
-        }
-    
-    if (CORBA_is_nil (objref) == CORBA_B_TRUE) {
-	ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		argv [0]);
-	return 1;
-    }
-
-
-    do_tests (objref, loop_count, tests, errors);
-
-    char		*progname = ACE_OS::strrchr (argv [0], '/');
-
-    if (progname != 0)
-	progname += 1;
-    else
-	progname = argv [0];
-
-    ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-	progname, loop_count, tests, errors);
-
-    if (exit_later) {
-	test1_please_exit (objref, env);
-	if (env.exception () != 0)
-	    print_exception (env.exception (), "test1_please_exit");
-    }
-
-    CORBA_release (objref);
-
-    return errors != 0;
-}
diff --git a/TAO/IIOP/test/test1_svr.cpp b/TAO/IIOP/test/test1_svr.cpp
deleted file mode 100644
index c4a51a036c7..00000000000
--- a/TAO/IIOP/test/test1_svr.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include	<stdio.h>
-#include	<string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include	"test1.h"
-#include	<corba/boa.h>
-#include <roa.h>
-
-#include	<corba/debug.h>
-
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method code,
-// in lieu of having an IDL compmiler generate static skeletons.  Static
-// skeletons would be more efficient; most mallocation could go away.
-//
-// Use by:  defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE:  "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList should
-// also get a public constructor, and a way to provide the buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA_ServerRequest	&req, \
-        CORBA_Object_ptr        obj, \
-	CORBA_Environment	&env \
-    ) \
-    { \
-	CORBA_NVList_ptr	nvlist; \
-	CORBA_ ## truetype	scratch = 0; \
-	CORBA_Any		temp_value (_tc_CORBA_ ## truetypename, \
-				    &scratch, CORBA_B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA_ ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA_ ## truetype; \
-	*v2 = (CORBA_ ## truetype) OPERATION (*v1); \
-	retval = new CORBA_ ## truetype; \
-	*retval = (CORBA_ ## truetype) OPERATION (*v1); \
- 	\
-	CORBA_Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA_ ## truetype v1copy = *v1; \
-	*v1 = (CORBA_ ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \
-		retval, CORBA_B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (_tc_CORBA_Long);
-  CORBA_Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA_Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA_Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA_Object::_nil (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // BOA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (
-    CORBA_OctetSeq		&key,
-    CORBA_ServerRequest		&req,
-    void			*context,
-    CORBA_Environment		&env
-)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA_OctetSeq		*obj_key;
-
-  obj_key = (CORBA_OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA_String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA_Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-    return;
-  }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA_ORB_ptr orb_ptr,
-	   CORBA_BOA_ptr oa_ptr,
-	   CORBA_String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA_OctetSeq	obj_key;
-  CORBA_Object_ptr	obj;
-  CORBA_Environment	env;
-
-  obj_key.buffer = (CORBA_Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA_String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "BOA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA_String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA_release (obj);
-  CORBA_string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what BOA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA_B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA_B_FALSE, &tv, env);
-      }
-
-    CORBA_Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA_Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "BOA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  BOA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr		oa_ptr;
-  CORBA_String	key = (CORBA_String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA_String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The BOA may or may not actually be named ...
-  //
-  oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init");
-    return 1;
-  }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
diff --git a/TAO/IIOP/test/tnf/Orbix.svr.summary b/TAO/IIOP/test/tnf/Orbix.svr.summary
deleted file mode 100644
index 1c01995f7d5..00000000000
--- a/TAO/IIOP/test/tnf/Orbix.svr.summary
+++ /dev/null
@@ -1,32 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.04        8.505   3386    0.003    0.349    0.002   0.000
-mutex_unlock         0.04        8.205   3386    0.002    0.127    0.002   0.000
-
-
-                                     Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.01        8.875   3386    0.003    0.373    0.002   0.000
-mutex_unlock         0.01        8.353   3386    0.002    0.093    0.002   0.000
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.02        8.979   3386    0.003    0.386    0.002   0.000
-mutex_unlock         0.02        8.465   3386    0.002    0.030    0.002   0.000
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.01        8.849   3388    0.003    0.355    0.002   0.000
-mutex_unlock         0.01        7.937   3388    0.002    0.029    0.002   0.000
diff --git a/TAO/IIOP/test/tnf/clnt.summary b/TAO/IIOP/test/tnf/clnt.summary
deleted file mode 100644
index bed4a22d35e..00000000000
--- a/TAO/IIOP/test/tnf/clnt.summary
+++ /dev/null
@@ -1,43 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.28       53.642  10006    0.005    0.192    0.004   0.000
-rw_unlock            0.28       52.672  10009    0.005    0.037    0.005   0.000
-mutex_lock           0.06       11.366   2765    0.004    0.161    0.002   0.000
-mutex_unlock         0.04        6.996   2771    0.003    0.028    0.002   0.000
-rw_wrlock            0.00        0.047      3    0.016    0.034    0.006   0.007
-
-                                    Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.41      241.807  30006    0.008    1.181    0.005   0.000
-rw_unlock            0.24      141.506  30009    0.005    0.503    0.004   0.000
-mutex_lock           0.07       38.545   7765    0.005    0.171    0.002   0.000
-mutex_unlock         0.03       19.591   7771    0.003    0.078    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.033    0.005   0.007
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.39      307.763  40006    0.008    2.031    0.005   0.000
-rw_unlock            0.23      184.537  40009    0.005    0.138    0.004   0.000
-mutex_lock           0.05       38.808  10265    0.004    0.173    0.002   0.000
-mutex_unlock         0.03       25.931  10271    0.003    0.078    0.002   0.000
-rw_wrlock            0.00        0.043      3    0.014    0.033    0.004   0.008
diff --git a/TAO/IIOP/test/tnf/svr.summary b/TAO/IIOP/test/tnf/svr.summary
deleted file mode 100644
index 6e1c024aacd..00000000000
--- a/TAO/IIOP/test/tnf/svr.summary
+++ /dev/null
@@ -1,49 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.18      191.077  54588    0.004    1.158    0.003   0.000
-mutex_lock           1.18      190.652  54587    0.003    0.198    0.003   0.000
-rw_rdlock            0.29       46.844   6823    0.007    0.173    0.004   0.000
-rw_unlock            0.18       28.419   6823    0.004    0.064    0.004   0.000
-
-                                     Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.19      150.344  54654    0.003    0.621    0.002   0.000
-mutex_unlock         1.15      144.776  54655    0.003    0.071    0.002   0.000
-rw_rdlock            0.27       33.772   6832    0.005    0.078    0.004   0.000
-rw_unlock            0.19       23.613   6832    0.003    0.105    0.003   0.000
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.48      209.259  54770    0.004   18.223    0.002   0.000
-mutex_lock           1.46      206.619  54769    0.004   10.473    0.002   0.000
-rw_rdlock            0.78      110.047   6846    0.016   38.115    0.003   0.006
-rw_unlock            0.17       23.844   6846    0.003    0.112    0.003   0.000
-
-                                     Profile for 50000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.19      150.149  54477    0.003    0.152    0.002   0.000
-mutex_lock           1.18      149.113  54477    0.003    1.376    0.002   0.000
-rw_rdlock            0.34       43.048   6809    0.006   10.113    0.003   0.001
-rw_unlock            0.19       23.796   6810    0.003    0.326    0.003   0.000
diff --git a/TAO/IIOP/tests/Cubit/Build/clnt.bld b/TAO/IIOP/tests/Cubit/Build/clnt.bld
deleted file mode 100755
index 76e60ef8967..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/clnt.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../cubit.cpp
-	C++
-../clnt.cpp
-	C++
diff --git a/TAO/IIOP/tests/Cubit/Build/default.bld b/TAO/IIOP/tests/Cubit/Build/default.bld
deleted file mode 100755
index cdf3e2e8210..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/default.bld
+++ /dev/null
@@ -1,19 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-	:target=vxwppc
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../proto/include
-	:sourcedirs=../..
-	:libraries=../../proto/lib/tao.a
-	:libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
-	:defines=DEBUG
-clnt.bld
-	program
-	:debuglevel=multi
-svr.bld
-	program
-	:debuglevel=multi
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/IIOP/tests/Cubit/Build/svr.bld b/TAO/IIOP/tests/Cubit/Build/svr.bld
deleted file mode 100755
index 7c8725356b2..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/svr.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../svr.cpp
-	C++
-../cubit.cpp
-	C++
diff --git a/TAO/IIOP/tests/Cubit/Orbix/Makefile b/TAO/IIOP/tests/Cubit/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile b/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile
deleted file mode 100644
index 3bf0684dfd5..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/client/Makefile
deleted file mode 100644
index 73f775bee2f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp
deleted file mode 100644
index fcf45bdf706..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile
deleted file mode 100644
index 63cc8a65e02..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/orb.mk b/TAO/IIOP/tests/Cubit/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile
deleted file mode 100644
index 0e425af78b1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile
deleted file mode 100644
index 650d6aaf259..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile
deleted file mode 100644
index 69701ba3b63..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/README b/TAO/IIOP/tests/Cubit/README
deleted file mode 100644
index 5eaf42ec2e3..00000000000
--- a/TAO/IIOP/tests/Cubit/README
+++ /dev/null
@@ -1,7 +0,0 @@
-		Cubit 
-
-This is the example from the SunSoft's IIOP 1.4 distribution modified
-to work with TAO. There is a Cubit example for Orbix and
-VisiBroker.
-
-Benchmarking results are under results and tnf directories.
diff --git a/TAO/IIOP/tests/Cubit/TAO/Makefile b/TAO/IIOP/tests/Cubit/TAO/Makefile
deleted file mode 100644
index 8883d4b52a8..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lcorba
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt test1_svr test1_clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-LDFLAGS    += -L../../../proto/lib
-CPPFLAGS   += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS) $(POSTLINK)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS) $(POSTLINK)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS) $(POSTLINK)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS) $(POSTLINK)
-endif
-
-clean:
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-install:
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/clnt.cpp
deleted file mode 100644
index f0249489889..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-// @(#)clnt.cpp	1.2 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	Simple "cube" client, calling hand-crafted stubs.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include <ace/Get_Opt.h>
-//#include <crtdbg.h>
-
-#if	unix
-#	include	<unistd.h>
-#	include	<sys/time.h>
-
-#elif defined (VXWORKS)
-#	include	<unistd.h>
-#	include	<time.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include	"cubitC.h"
-
-#include	<corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-inline int func (unsigned i) { return i - 117; }
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// forward declarations
-//
-static void cube_union_stub(unsigned, unsigned&, unsigned&,
-                            CORBA_Object_ptr, CORBA_Environment &);
-
-static void cube_union_dii(unsigned &, unsigned &,
-                           CORBA_Object_ptr, CORBA_Environment &);
-
-// Global variables
-const char* TAO_arg_ior = 0;
-unsigned           loop_count = 1;
-int                exit_later = 0;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dn:O:x");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'n':			// loop count
-         loop_count = (unsigned) ACE_OS::atoi (opts.optarg);
-         continue;
-   
-      case 'O':			// stringified objref
-         {
-           TAO_arg_ior = ACE_OS::strdup(opts.optarg);
-         }
-         continue;
-   
-      case 'x':
-         exit_later++;
-         continue;
-   
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-n loopcount]"
-            " [-O objref]"
-            " [-x]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_Object_ptr objref = CORBA_Object::_nil();
-  CORBA_Environment env;
-
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception() != 0)
-    {
-      print_exception(env.exception(), "ORB initialization");
-      return 1;
-    }
-
-  //
-  // Parse command line and verify parameters.
-  //
-  parse_args(argc, argv);
-
-  if (TAO_arg_ior == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1);
-
-  objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env);
-
-  ACE_OS::free((void*)TAO_arg_ior);
-  TAO_arg_ior = 0;
-
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "string2object");
-      return 1;
-    }
-
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE)
-    ACE_ERROR_RETURN((LM_ERROR, "%s:  must identify non-null target objref\n", argv [0]), 1);
-
-  // Narrow the CORBA_Object reference to the stub object, checking
-  // the type along the way using _is_a
-  Cubit_ptr aCubit = Cubit::_narrow(objref);
-  if (aCubit == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1);
-
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      //
-      // Cube an octet.
-      //
-      CORBA_Octet	arg_octet, ret_octet;
-       
-      call_count++;
-      ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_octet");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-          arg_octet = arg_octet * arg_octet * arg_octet;
-          if (arg_octet != ret_octet) {
-            ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n",
-                            (CORBA_Octet) func (i), ret_octet);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a short.
-      //
-      CORBA_Short	arg_short, ret_short;
-       
-      call_count++;
-      ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_short");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube short:  %d --> %d\n", arg_short, ret_short);
-          arg_short = arg_short * arg_short * arg_short;
-          if (arg_short != ret_short)
-            {
-              ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n",
-                              (CORBA_Short) func (i), ret_short);
-              error_count++;
-            }
-        }
-
-      //
-      // Cube a long.
-      //
-      CORBA_Long	arg_long, ret_long;
-       
-      call_count++;
-      ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_long");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-          arg_long = arg_long * arg_long * arg_long;
-          if (arg_long != ret_long) {
-            ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n",
-                            (CORBA_Long) func (i), ret_long);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit_Many	arg_struct, *ret_struct;
-       
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      ret_struct = aCubit->Cubit_cube_struct (arg_struct, env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_struct");
-          error_count++;
-        }
-      else
-        {
-          dmsg ("cube struct ...");
-          arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-          arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-          arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-          
-          if (arg_struct.l != ret_struct->l
-              || arg_struct.s != ret_struct->s
-              || arg_struct.o != ret_struct->o)
-            {
-              ACE_OS::printf ("** cube_struct ERROR\n");
-              error_count++;
-            }
-          delete ret_struct;
-        }
-       
-    }
-    
-  after = ACE_OS::gettimeofday();
-    
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Simple test for DII:  call "cube_struct".  (It's not timed
-  // since the copious mallocation of DII would bias numbers against
-  // typical stub-based calls.)
-  //
-  do {
-    //
-    // Create the request ...
-    //
-    CORBA_Request_ptr	req;
-       
-    req = objref->_request ((const CORBA_String) "cube_struct", env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request create");
-      break;
-    }
-
-    //
-    // ... initialise the argument list and result ...
-    //
-    Cubit_Many	arg, *result;
-       
-    arg.o = 3; arg.l = 5; arg.s = -7;
-       
-    CORBA_Any	tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE);
-       
-    req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request arg add");
-      CORBA_release (req);
-      break;
-    }
-       
-    req->result ()->value ()
-      ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request result type");
-      CORBA_release (req);
-      break;
-    }
-
-    //
-    // Make the invocation, verify the result
-    //
-    req->invoke ();
-    if (req->env ()->exception () != 0) {
-      print_exception (req->env ()->exception (), "DII invoke");
-      CORBA_release (req);
-      break;
-    }
-       
-    result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-    if (result->o != 27 || result->l != 125 || result->s != -343)
-      ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n");
-    else
-      dmsg ("DII cube_struct ... success!!");
-       
-    CORBA_release (req);
-       
-  } while (0);
-
-  //
-  // Two more tests, using the "cube_union" function
-  //
-  cube_union_dii(call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  cube_union_stub(i, call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  if (exit_later) {
-    aCubit->Cubit_please_exit (env);
-    dexc (env, "server, please ACE_OS::exit");
-  }
-    
-  CORBA_release (objref);
-    
-  return (error_count == 0) ? 0 : 1;
-}
-
-
-static void
-cube_union_stub(unsigned          i,
-                unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   Cubit_ptr aCubit = Cubit::_narrow(objref);
-   //
-   // Cube a "union" ...
-   //
-   Cubit_oneof    u, *r;
-   
-   call_count++;
-   
-   u._disc = e_2nd;
-   u.l = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.l = u.l  * u.l * u.l ;
-      
-      if (u.l != r->l) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-   
-   //
-   // Cube another "union" which uses the default arm ...
-   //
-   call_count++;
-   
-   u._disc = e_5th;
-   u.cm.l = func (i);
-   u.cm.s = func (i);
-   u.cm.o = func (i);
-   
-   u.cm.l = 7;
-   u.cm.s = 5;
-   u.cm.o = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-         || u.cm.s != r->cm.s
-         || u.cm.o != r->cm.o) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-}
-
-
-static void
-cube_union_dii (unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   //
-   // Create the request ...
-   //
-   CORBA_Request_ptr	req;
-   
-   call_count++;
-
-   req = objref->_request ((const CORBA_String) "cube_union", env);
-   if (env.exception () != 0) {
-      error_count++;
-      
-      print_exception (env.exception (), "cube_union_dii request create");
-      return;
-   }
-
-   //
-   // ... initialise the argument list and result ...
-   //
-   Cubit_oneof	u, *r;
-   
-   u._disc = e_3rd;
-   u.cm.l = 5;
-   u.cm.s = -7;
-   u.cm.o = 3;
-
-   CORBA_Any	tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE);
-   
-   req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii request arg add");
-      CORBA_release (req);
-      return;
-   }
-	
-   req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii result type");
-      CORBA_release (req);
-      return;
-   }
-
-   //
-   // Make the invocation, verify the result
-   //
-   req->invoke ();
-   if (req->env ()->exception () != 0) {
-      error_count++;
-      print_exception (req->env ()->exception (),"cube_union_dii invoke");
-      CORBA_release (req);
-      return;
-   }
-
-   r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-   if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) {
-      error_count++;
-      ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n");
-   }
-   else
-      dmsg ("cube_union_dii ... success!!");
-   
-   CORBA_release (req);
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit.cpp
deleted file mode 100644
index d232de8eee8..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-//
-
-#include	"cubit.h"		// for stubs ...
-#include	<corba/boa.h>		// ... and skeletons
-
-#include	<corba/debug.h>		// ... and debugging
-
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = {
-    { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-    { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = {
-    "cube_octet", CORBA_B_TRUE,
-    2, &Cubit_cube_octet_params [0],
-    0, 0
-};
-
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet		o,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Octet		retval = 0;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_octet_calldata,
-	    &retval, &o);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_octet_skel (CORBA_ServerRequest &req,    
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Octet);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA_Octet* value = new CORBA_Octet;
-
-  *value = *(CORBA_Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-  *value = (CORBA_Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = {
-    { _tc_CORBA_Short, PARAM_RETURN, 0 },
-    { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = {
-    "cube_short", CORBA_B_TRUE,
-    2, &Cubit_cube_short_params [0],
-    0, 0
-};
-
-
-CORBA_Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA_Short s,
-		  CORBA_Environment &env)
-{
-    CORBA_Short		retval;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_short_calldata,
-		&retval, &s);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_short_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Short);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA_Short* value = new CORBA_Short;
-
-  *value = *(CORBA_Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-  *value =(CORBA_Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = {
-    { _tc_CORBA_Long, PARAM_RETURN, 0 },
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = {
-    "cube_long", CORBA_B_TRUE,
-    2, &Cubit_cube_long_params [0],
-    0, 0
-};
-
-
-CORBA_Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA_Long l,
-		 CORBA_Environment &env)
-{
-  CORBA_Long		retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_long_skel (CORBA_ServerRequest &req,
-		 CORBA_Object_ptr obj,
-		 CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Long);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA_Long* value = new CORBA_Long;
-
-  *value = *(CORBA_Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = {
-    1,				// byte order flag (TRICKY!)
-
-    1, 0,			// empty string:  repository/type ID
-    1, 0,			// empty string:  struct name
-
-    3,				// three struct elements
-
-    // First structure element:  name, typecode for Octet
-    1, 0,			// empty string:  name "o"
-    tk_octet,
-
-    // Second structure element:  name, typecode for Long
-    1, 0,			// empty string:  name "l"
-    tk_long,
-
-    // Third structure element:  name, typecode for Short
-    1, 0,			// empty string:  name "s"
-    tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-    sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = {
-    { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-    { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = {
-    "cube_struct", CORBA_B_TRUE,
-    2, &Cubit_cube_struct_params [0],
-    0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA_Environment &env)
-{
-  Cubit_Many		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_struct_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (TC_Cubit_Many);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA_Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA_Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA_Any *any =
-    new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = {
-    1,				// byte order flag (TRICKY)
-    1, 0,			// omitted repository/type ID
-    1, 0,			// omitted struct name, "oneof"
-
-    //
-    // discriminant typecode:
-    //
-    tk_enum,		// tk_enum
-	72,			// encapsulation length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted enum name, "discrim"
-        6,			// 5 elements in the enum
-
-        1, 0,			// omitted member name, "e_0th"
-        1, 0,			// omitted member name, "e_1st"
-        1, 0,			// omitted member name, "e_2nd"
-        1, 0,			// omitted member name, "e_3rd" 
-        1, 0,			// omitted member name, "e_4th" 
-        1, 0,			// omitted member name, "e_5th" 
-
-    4,				// default member index (zero based)
-    5,				// number of union members
-
-    // the 1st union branch arm
-    e_0th,			// member label value
-    1, 0,			// omitted member name, "o"
-    tk_octet,		// member typecode
-
-    // the 2nd union branch arm
-    e_1st,			// member label value
-    1, 0,			// omitted member name, "s"
-    tk_short,		// member typecode
-
-    // the 3rd union branch arm
-    e_2nd,			// member label value
-    1, 0,			// omitted member name, "l"
-    tk_long,		// member typecode
-
-    // the 4th union branch arm
-    e_3rd,			// member label value
-    1, 0,			// omitted member name, "cm"
-
-    // the 4th union member typecode
-    tk_struct,		// tk_struct
-	60,			// encap length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted struct name, "Many"
-        3,			// three struct members
-
-        // First structure element
-        1, 0,			// omitted member name, "o"
-        tk_octet,	// member type, tk_octet
-
-        // Second structure element
-        1, 0,			// omitted member name, "l"
-        tk_long,	// member type, tk_long
-
-        // Third structure element
-        1, 0,			// omitted member name, "s"
-        tk_short,	// member type, tk_short
-
-    // the 5th union branch arm
-    4,				// the 5th member label value
-    1, 0,			// omitted member name, "cm"
-    ~0,				// indirected typecode (~0)
-	-84			// offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-    (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = {
-    { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-    { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = {
-    "cube_union", CORBA_B_TRUE,
-    2, &Cubit_cube_union_params [0],
-    0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA_Environment &env)
-{
-  Cubit_oneof		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_union_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (TC_Cubit_oneof);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) {
-  case e_0th:
-    r->o = (CORBA_Octet) (v->o * v->o * v->o);
-    break;
-
-  case e_1st:
-    r->s = (CORBA_Short) (v->s * v->s * v->s);
-    break;
-
-  case e_2nd:
-    r->l = v->l * v->l * v->l;
-    break;
-
-  case e_3rd:
-  default:
-    r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o);
-    r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s);
-    r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-    break;
-  }
-
-  CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-}
-
-
-const CORBA_Char	*Cubit__id = (CORBA_Char *)
-    "IDL:Eng.SUN.COM/Cubit:1.1";
-
-
-//
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small cache
-// (e.g. like Obj-C?).  for now, just lsearch.
-//
-const TAO_Skel_Entry Cubit_operations [] = {
-    { &Cubit_cube_octet_calldata, _cube_octet_skel },
-    { &Cubit_cube_short_calldata, _cube_short_skel },
-    { &Cubit_cube_long_calldata, _cube_long_skel },
-    { &Cubit_cube_struct_calldata, _cube_struct_skel },
-    { &Cubit_cube_union_calldata, _cube_union_skel },
-    { &Cubit_please_exit_calldata, _please_exit_skel },
-    { 0, 0 }					// last entry
-};
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.h b/TAO/IIOP/tests/Cubit/TAO/cubit.h
deleted file mode 100644
index 92dd6b381bd..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation
-// (all parent interfaces are virtual public parents) makes
-// object references have different "views".  That is, a
-// pointer to a Cubit (i.e. a Cubit_ptr) would not have
-// the same binary value as a pointer to a CORBA_Object
-// (i.e. a CORBA_Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-//
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-//
-// C style binding
-//
-
-typedef CORBA_Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof {
-    Cubit_discrim          _disc;
-
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
-        Cubit_Many      cm;
-    };
-};
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
-);
-
-CORBA_Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
-);
-
-CORBA_Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA_Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-);
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.idl b/TAO/IIOP/tests/Cubit/TAO/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp
deleted file mode 100644
index 99416520c15..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// @(#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj)
-{
-   if (obj)
-      obj->AddRef();
-
-   return obj;
-}
-
-Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj)
-{
-   CORBA_Environment env;
-   if (obj->_is_a("IDL:Cubit:1.0", env))
-   {
-      STUB_Object *istub;
-      if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-      {
-         return Cubit::_nil();
-      }
-      Cubit_ptr new_obj = new Cubit(istub);
-      return Cubit::_duplicate(new_obj);
-   }
-   return Cubit::_nil();
-}
-
-Cubit_ptr Cubit::_nil()
-{
-   return (Cubit_ptr)NULL;
-}
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-   { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-   { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-    
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-   "cube_octet", CORBA_B_TRUE,
-      2, &Cubit_cube_octet_params [0],
-      0, 0
-};
-
-
-CORBA_Octet
-Cubit::Cubit_cube_octet (CORBA_Octet       o, 
-                  CORBA_Environment &env)
-{
-   CORBA_Octet		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_octet_calldata,
-                        &retval, &o);
-   istub->Release ();
-
-   return retval;
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-   { _tc_CORBA_Short, PARAM_RETURN, 0 },
-   { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-   "cube_short", CORBA_B_TRUE,
-      2, &Cubit_cube_short_params [0],
-      0, 0
-};
-
-
-CORBA_Short
-Cubit::Cubit_cube_short (CORBA_Short       s,
-                  CORBA_Environment &env)
-{
-   CORBA_Short		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call(env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-   
-   istub->Release ();
-   
-   return retval;
-}
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-   { _tc_CORBA_Long, PARAM_RETURN, 0 },
-   { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-   "cube_long", CORBA_B_TRUE,
-      2, &Cubit_cube_long_params [0],
-      0, 0
-};
-
-
-CORBA_Long
-Cubit::Cubit_cube_long (CORBA_Long        l,
-                 CORBA_Environment &env)
-{
-   CORBA_Long		retval;
-   
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-   
-   istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = 
-{
-   1,          // byte order flag (TRICKY!)
-      
-   1, 0,       // empty string:  repository/type ID
-   1, 0,       // empty string:  struct name
-      
-   3,          // three struct elements
-      
-   // First structure element:  name, typecode for Octet
-   1, 0,       // empty string:  name "o"
-   tk_octet,
-      
-   // Second structure element:  name, typecode for Long
-   1, 0,       // empty string:  name "l"
-   tk_long,
-      
-   // Third structure element:  name, typecode for Short
-   1, 0,       // empty string:  name "s"
-   tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-                                      sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-                                      CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-   { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-   { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-   "cube_struct", CORBA_B_TRUE,
-      2, &Cubit_cube_struct_params [0],
-      0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA_Environment &env)
-{
-   Cubit_Many		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-  
-   istub->do_call (env, &Cubit_cube_struct_calldata,
-                        &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = 
-{
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "oneof"
-   
-   //
-   // discriminant typecode:
-   //
-   tk_enum,    // tk_enum
-   72,         // encapsulation length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted enum name, "discrim"
-   6,          // 5 elements in the enum
-   
-   1, 0,       // omitted member name, "e_0th"
-   1, 0,       // omitted member name, "e_1st"
-   1, 0,       // omitted member name, "e_2nd"
-   1, 0,       // omitted member name, "e_3rd" 
-   1, 0,       // omitted member name, "e_4th" 
-   1, 0,       // omitted member name, "e_5th" 
-   
-   4,       	// default member index (zero based)
-   5,       	// number of union members
-   
-   // the 1st union branch arm
-   e_0th,       // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 2nd union branch arm
-   e_1st,      // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 3rd union branch arm
-   e_2nd,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-   
-   // the 4th union branch arm
-   e_3rd,      // member label value
-   1, 0,       // omitted member name, "cm"
-   
-   // the 4th union member typecode
-   tk_struct,  // tk_struct
-   60,         // encap length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "Many"
-   3,          // three struct members
-   
-   // First structure element
-   1, 0,       // omitted member name, "o"
-   tk_octet,   // member type, tk_octet
-   
-   // Second structure element
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member type, tk_long
-   
-   // Third structure element
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member type, tk_short
-   
-   // the 5th union branch arm
-   4,          // the 5th member label value
-   1, 0,       // omitted member name, "cm"
-   ~0,         // indirected typecode (~0)
-   -84         // offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-                                       (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-                                       CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-   { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-   { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-   "cube_union", CORBA_B_TRUE,
-      2, &Cubit_cube_union_params [0],
-      0, 0
-};
-
-Cubit_oneof*
-Cubit::Cubit_cube_union (Cubit_oneof		&values,
-                  CORBA_Environment	&env)
-{
-   Cubit_oneof		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-   "please_exit", CORBA_B_FALSE,
-      0, 0,
-      0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA_Environment	&env)
-{
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return;
-   }
-
-   istub->do_call (env, &Cubit_please_exit_calldata);
-   istub->Release ();
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.h b/TAO/IIOP/tests/Cubit/TAO/cubitC.h
deleted file mode 100644
index 8f9dfe53841..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitC.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-
-#include <iostream.h>
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-   CORBA_Octet o;
-   CORBA_Long  l;
-   CORBA_Short s;
-};
-
-enum Cubit_discrim
-  { e_0th = 0, e_1st = 1, e_2nd = 2,
-    e_3rd = 3, e_4th = 4, e_5th = 5 };
-
-struct Cubit_oneof 
-{
-   Cubit_discrim  _disc;
-   
-   union 
-   {    
-      CORBA_Octet o;
-      CORBA_Short s;
-      CORBA_Long  l;
-      Cubit_Many  cm;
-   };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-   static Cubit_ptr _duplicate(Cubit_ptr obj);
-   static Cubit_ptr _narrow(CORBA_Object_ptr obj);
-   static Cubit_ptr _nil();
-
-   virtual 
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual 
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual 
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual 
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env);
-
-protected:
-   Cubit() { }
-   Cubit(STUB_Object *objref)
-      : CORBA_Object(objref) { }
-   virtual ~Cubit() { }
-
-   
-};
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp
deleted file mode 100644
index b153b71db1b..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include	"cubitS.h"
-#include	"cubitC.cpp"
-
-#include "connect.h"
-#include "params.h"
-
-#include "corba/debug.h"    // ... and debugging
-#include "corba/optable.h"  // TAO Dynamic Operation Table
-#include "method_db.i"
-#include "iiopobj.h"
-
-#if defined(CUBIT_USE_DYNAMIC_HASH)
-TAO_Dynamic_Hash_OpTable tao_cubit_optable(7);  // Dynamic Operation Table
-#else
-TAO_Linear_OpTable tao_cubit_optable(7);
-#endif
-
-_skel_Cubit::_skel_Cubit(const char* obj_name)
-{
-  const char* mn = "_skel_Cubit::_skel_Cubit()";
-  
-   //  Initialize Method Database
-   initialize_method_db (&tao_cubit_optable);
-
-   char *type_id = "IDL:Cubit:1.0";
-   // CORBA_String type_id = "IDL:Cubit:1.0";
-   IIOP_Object *data;
-
-   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa();
-   if (oa == 0)
-     {
-       // We just have to assume that oa will be good, or we have to
-       // throw an exception.  For now we "assume", but we'll
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn));
-       return;
-     }
-   
-   this->optable_ = &tao_cubit_optable;
-   data = new IIOP_Object(type_id);
-
-   data->profile.iiop_version.major = IIOP::MY_MAJOR;
-   data->profile.iiop_version.minor = IIOP::MY_MINOR;
-   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-   data->profile.port = oa->get_addr().get_port_number();
-   data->profile.object_key.length =  ACE_OS::strlen(obj_name);
-   data->profile.object_key.maximum = data->profile.object_key.length;
-   data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-   
-   ACE_OS::memcpy (data->profile.object_key.buffer,
-                   obj_name,
-                   data->profile.object_key.length+1);
-
-   this->set_parent(data);
-   this->sub_ = this;
-
-   if (oa->bind(data->profile.object_key, this) == -1)
-     {
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer));
-       return;
-     }
-}
-
-void
-_skel_Cubit::_cube_octet_skel(CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Octet);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_octet, add value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_octet, get params");
-   
-   // Call Implementation
-   CORBA_Octet		*value = new CORBA_Octet;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-
-   *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env);
-
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA_ServerRequest &req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Short);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_short, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_short, get params");
-   
-   // Call Implementation
-   CORBA_Short *value = new CORBA_Short;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env);
-   
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Long);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_long, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_long, get params");
-   
-   // Call Implementation
-   CORBA_Long		*value = new CORBA_Long;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env);
-   
-   CORBA_Any  		*any =
-      new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_Many);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_struct, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_struct, get params");
-   
-   // Call Implementation
-   Cubit_Many  *value;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env);
-   
-   Cubit_Many  *retval = new Cubit_Many;
-   retval->o = (CORBA_Octet)value->o;
-   retval->s = (CORBA_Short)value->s;
-   retval->l = value->l;
-   
-   // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-   // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-   // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA_ServerRequest	&req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_oneof);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_union_3rd, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_union_3rd, get params");
-   
-   // Call Implementation
-   Cubit_oneof    *v;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env);
-
-   Cubit_oneof    *r = new Cubit_oneof;
-   r->_disc = v->_disc;
-   r->o =    (CORBA_Octet) (v->o);
-   r->s =    (CORBA_Short) (v->s);
-   r->l =     v->l;
-   r->cm.o = (CORBA_Octet) (v->cm.o);
-   r->cm.s = (CORBA_Short) (v->cm.s);
-   r->cm.l =  v->cm.l;
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   the_cubit->Cubit_please_exit(env);
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.h b/TAO/IIOP/tests/Cubit/TAO/cubitS.h
deleted file mode 100644
index 84c07b741b0..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env) = 0;
-   static 
-   void _cube_octet_skel(CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env) = 0;
-  
-   static
-   void _cube_short_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_long_skel (CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_struct_skel (CORBA_ServerRequest &req,
-                           CORBA_Object_ptr    obj,
-                           CORBA_Environment   &env);
-
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_union_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env) = 0;
-
-   static 
-   void _please_exit_skel (CORBA_ServerRequest  &req,
-                           CORBA_Object_ptr     obj,
-                           CORBA_Environment    &env);
-protected:
-   _skel_Cubit(const char* obj_name = 0);
-   virtual ~_skel_Cubit() { }
-
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp
deleted file mode 100644
index ae22b7cd12c..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubit_i.h"
-
-#include	<corba/boa.h>    // ... and skeletons
-#include	<corba/debug.h>  // ... and debugging
-
-#include "connect.h"
-#include "params.h"
-
-Cubit_i::Cubit_i(const char* obj_name)
-: _skel_Cubit(obj_name)
-{
-}
-
-Cubit_i::~Cubit_i()
-{
-}
-
-CORBA_Octet
-Cubit_i::Cubit_cube_octet (CORBA_Octet       o,
-                           CORBA_Environment &env)
-{
-
-   return (CORBA_Octet) (o * o * o);
-}
-
-CORBA_Short
-Cubit_i::Cubit_cube_short (CORBA_Short       s, 
-                           CORBA_Environment &env)
-{
-   return (CORBA_Short) (s * s * s);
-}
-
-
-CORBA_Long
-Cubit_i::Cubit_cube_long (CORBA_Long        l,
-                          CORBA_Environment &env)
-{
-   return (CORBA_Long) (l * l * l);
-}
-
-Cubit_Many*
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA_Environment &env)
-{
-   values.o = values.o * values.o * values.o;
-   values.s = values.s * values.s * values.s;
-   values.l = values.l * values.l * values.l;
-   
-   return &values;
-}
-
-Cubit_oneof*
-Cubit_i::Cubit_cube_union (Cubit_oneof       &values,
-                           CORBA_Environment &env)
-{
-   switch (values._disc) {
-   case e_0th:
-      values.o = (CORBA_Octet) (values.o * values.o * values.o);
-      break;
-   case e_1st:
-      values.s = (CORBA_Short) (values.s * values.s * values.s);
-      break;
-   case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-   case e_3rd:
-   default:
-      values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-   }
-   return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA_Environment &env)
-{
-   TAO_OA_Parameters* params = TAO_OA_PARAMS::instance();
-   
-   dmsg ("I've been asked to shut down...");
-   params->oa()->please_shutdown(env);
-   dexc (env, "please_exit, please_shutdown");
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
deleted file mode 100644
index 6f4bee0d486..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-   Cubit_i(const char* obj_name = 0);
-   ~Cubit_i();
-   
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   void Cubit_please_exit (CORBA_Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/method_db.i b/TAO/IIOP/tests/Cubit/TAO/method_db.i
deleted file mode 100644
index 6b77cdf040a..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/method_db.i
+++ /dev/null
@@ -1,67 +0,0 @@
-// @(#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA_ServerRequest &req,
-           CORBA_Object_ptr    obj,
-           CORBA_Environment   &env)
-{
-    CORBA_NVList_ptr		nvlist;
-    CORBA_NamedValue_ptr	nv;
-    CORBA_Any			temp_value (_tc_CORBA_String);
-
-    req.orb()->create_list (0, nvlist);
-    nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-    req.params (nvlist, env);
-    if (env.exception () != 0) 
-    {
-      dexc (env, "is_a_skel, get params");
-	   return;
-    }
-
-    CORBA_Boolean *retval;
-    CORBA_String value = *(CORBA_String *) nv->value()->value();
-
-    if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0
-    || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0)
-	   retval = new CORBA_Boolean (CORBA_B_TRUE);
-    else
-	   retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-    CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-    req.result (any, env);
-    dexc (env, "_is_a, result");
-}
-
-
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db cubit_operations[] = {
-   { "_is_a", &is_a_skel },
-   { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-   { "cube_short", &_skel_Cubit::_cube_short_skel },
-   { "cube_long", &_skel_Cubit::_cube_long_skel },
-   { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-   { "cube_union", &_skel_Cubit::_cube_union_skel },
-   { "please_exit", &_skel_Cubit::_please_exit_skel },
-   { 0, 0 }
-};
-   
-
-void initialize_method_db (TAO_Operation_Table *the_optable)
-{
-   for (int ndx = 0; ndx < 7; ndx++)
-      the_optable->bind(cubit_operations[ndx].opname, 
-                        cubit_operations[ndx].skel_ptr);
-   
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/svr.cpp b/TAO/IIOP/tests/Cubit/TAO/svr.cpp
deleted file mode 100644
index 53fac60bf6d..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/svr.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode, 
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "corba/orb.h"
-#include "corba/debug.h"
-#include "connect.h"
-
-#include "cubit_i.h"
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// Global Variables
-CORBA_String key = (CORBA_String)"key0";
-int num_of_objs = 1;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dk:n:");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'k':			// key (str)
-         key = (CORBA_String) opts.optarg;
-         continue;
-   
-      case 'n':			// idle seconds b4 exit
-         num_of_objs = ACE_OS::atoi(opts.optarg);
-         continue;
-
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-k {object_key}]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_Object_ptr obj = 0;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr   oa_ptr;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  // Initialize the Basic Object Adapter
-  oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA");
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1);
-  
-
-  //
-  // Parse remaining command line and verify parameters.
-  //
-  parse_args(argc, argv);
-  
-  // Create implementation object with user specified key
-  Cubit_i_ptr  *my_cubit = new Cubit_i_ptr[num_of_objs];
-  for (int ndx = 0; ndx < num_of_objs; ndx++)
-  {
-     CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2);
-     sprintf(obj_str, "%s%d", (char*)key, ndx);
-     my_cubit[ndx] = new Cubit_i(obj_str);
-     if (my_cubit[ndx] == 0)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2);
-
-     if (TAO_debug_level >= 1)
-     {
-         // Why are we getting the BOA_ptr from here when we've already
-         // got it above?
-         CORBA_OctetSeq	obj_key;
-         obj_key.buffer = (CORBA_Octet *) obj_str;
-         obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-         if (oa_ptr->find(obj_key, obj) == -1)
-           ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-         //
-         // Stringify the objref we'll be implementing, and
-         // print it to stdout.  Someone will take that string
-         // and give it to some client.  Then release the object.
-         //
-         CORBA_String	str;
-         
-         str = orb_ptr->object_to_string (obj, env);
-         if (env.exception () != 0) {
-            print_exception (env.exception (), "object2string");
-            return 1;
-         }
-         ACE_OS::puts ((char *)str);
-         ACE_OS::fflush (stdout);
-         dmsg1 ("Object Created at: '%ul'", obj);
-         dmsg1 ("listening as object '%s'", str);
-         
-     }
-     CORBA_string_free(obj_str);  
-  }
-//  Cubit_i_ptr  my_cubit = new Cubit_i(key);
-//  if (my_cubit1 == 0)
-//    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2);
-
-/*  if (TAO_debug_level >= 1)
-    {
-      // Why are we getting the BOA_ptr from here when we've already
-      // got it above?
-      CORBA_OctetSeq	obj_key;
-      obj_key.buffer = (CORBA_Octet *) key;
-      obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key);
-     
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-      //
-      // Stringify the objref we'll be implementing, and
-      // print it to stdout.  Someone will take that string
-      // and give it to some client.  Then release the object.
-      //
-      CORBA_String	str;
-     
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-
-      obj_key.buffer = (CORBA_Octet *)"key1";
-      obj_key.length = obj_key.maximum = 4;
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-    }
-*/
-  // Handle requests for this object until we're killed, or one of
-  // the methods asks us to exit.
-  //
-  int terminationStatus = 0;
-
-
-#if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Reactor::run_event_loop();
-#else
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mak b/TAO/IIOP/tests/Cubit/TAO/test.mak
deleted file mode 100644
index 58b77c28283..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test.mak
+++ /dev/null
@@ -1,463 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-DEP_CPP_CLNT_=\

-	"..\..\..\..\..\ace\config-win32.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CLNT_=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	

-NODEP_CPP_CUBIT=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	

-NODEP_CPP_CUBITS=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\optable.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\iiopobj.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	

-NODEP_CPP_CUBIT_=\

-	".\connect.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	"..\..\..\..\..\ace\config-win32.h"\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_SVR_C=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mdp b/TAO/IIOP/tests/Cubit/TAO/test.mdp
deleted file mode 100644
index eccc5e94b69..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test.mdp
+++ /dev/null
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.cpp b/TAO/IIOP/tests/Cubit/TAO/test1.cpp
deleted file mode 100644
index a27c29ee378..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA_B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA_ ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA_ ## truetype in_a1, \
-		CORBA_ ## truetype &out_a2, \
-		CORBA_ ## truetype &inout_a3, \
-		CORBA_Environment &env) { \
-	CORBA_ ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { _tc_CORBA_Float , PARAM_RETURN , 0 },
-    { _tc_CORBA_Float , PARAM_IN , 0 },
-    { _tc_CORBA_Float , PARAM_OUT , 0 },
-    { _tc_CORBA_Float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA_B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA_Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA_Float	in_a1,
-    CORBA_Float	&out_a2,
-    CORBA_Float	&inout_a3,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA_Float	_in_a1 = in_a1;
-    CORBA_Float	_out_a2 = out_a2;
-    CORBA_Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA_Any *
-test1_test_any (test1_ptr target,
-	const CORBA_Any &in_a1,
-	CORBA_Any *&out_a2,
-	CORBA_Any &inout_a3,
-	CORBA_Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA_B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.h b/TAO/IIOP/tests/Cubit/TAO/test1.h
deleted file mode 100644
index 7d3bd0e08a5..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
-
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
-
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA_Environment &env);
-void test1_test_void (test1_ptr target, CORBA_Environment &env);
-
-DECL_TEST (short, CORBA_Short);
-DECL_TEST (long, CORBA_Long);
-DECL_TEST (ushort, CORBA_UShort);
-DECL_TEST (ulong, CORBA_ULong);
-DECL_TEST (float, CORBA_Float);
-DECL_TEST (double, CORBA_Double);
-DECL_TEST (boolean, CORBA_Boolean);
-DECL_TEST (char, CORBA_Char);
-DECL_TEST (octet, CORBA_Octet);
-
-CORBA_Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
-DECL_TEST (Principal, CORBA_Principal_ptr);
-DECL_TEST (Object, CORBA_Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA_String);
-
-DECL_TEST (longlong, CORBA_LongLong);
-DECL_TEST (ulonglong, CORBA_ULongLong);
-DECL_TEST (wchar, CORBA_WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA_WString);
-
-DECL_TEST (longdouble, CORBA_LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA_UserException {
-  public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA_UserException {
-  public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
-
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA_release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.idl b/TAO/IIOP/tests/Cubit/TAO/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp
deleted file mode 100644
index 52169789ded..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp
+++ /dev/null
@@ -1,678 +0,0 @@
-// @(#)test1_clnt.cpp   1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST         client driver for "test1"
-//
-
-#ifdef  USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if     unix
-#       include <unistd.h>
-
-#else   // windows
-
-#endif  // unix
-
-#include "test1.h"
-#include <corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char     *optarg;        // missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first)
-// parameter, and the "inout" (third) parameter is the same function
-// the its initial value.  Caller is expected to specify two different
-// "in" values.  This helps make the marshaled bits vary, and turn up
-// a class of potential problems that'd be hidden if parameter order
-// had no effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases
-// where the ORB or operation failed.  The COMPARE symbol can be
-// redefined to achieve different functions -- e.g. cubing numbers,
-// identity, negation, etc.  It should return true iff the correct
-// result was returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating
-// client side memory leaks in the test.
-//
-#define RELEASE(X)              // NOP by default
-#define PERFORM_TEST(name,type,value1,value2) \
-    { \
-        CORBA_ ## type  v1, v2, v3; \
-        \
-        v1 = (CORBA_ ## type)(value1); \
-        v2 = 0; \
-        v3 = (CORBA_ ## type)(value2); \
-        \
-        test_count++; \
-        v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-        if (env.exception () != 0) { \
-            print_exception (env.exception (), "perform test_" #name); \
-            error_count++; \
-        } else if (!COMPARE (CORBA_ ## type, v1, value1) \
-                || !COMPARE (CORBA_ ## type, v2, value1) \
-                || !COMPARE (CORBA_ ## type, v3, value2) ) { \
-            ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-            BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-            error_count++; \
-        } \
-        RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef  USE_IOSTREAM
-#       define  DO_IO(x) x
-#else
-#       define  DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-            DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-            cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-            cerr << " v3=" << v3; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-
-static CORBA_Boolean
-compare_objrefs (CORBA_Object_ptr v1,
-		 CORBA_Object_ptr v2)
-{
-  CORBA_Boolean       temp;
-  CORBA_Environment   env;
-
-  if (v1 == v2)
-    return CORBA_B_TRUE;
-
-  if (CORBA_is_nil (v1))
-    return CORBA_is_nil (v2);
-
-  temp = v1->_is_equivalent (v2, env);
-
-  if (env.exception () != 0) 
-    {
-      print_exception (env.exception (), "compare objref");
-      return CORBA_B_FALSE;
-    }
-  return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-  Type temp = arg;
-
-  temp = temp * arg;
-  temp = temp * arg;
-  return temp;
-}
-
-static int      skip_longdouble = 0;
-
-// This just performs the tests ...
-
-void
-do_tests (test1_ptr   target,
-	  unsigned    loop_count,
-	  unsigned    &test_count,
-	  unsigned    &error_count)
-{
-  int         count;
-
-  for (count = 0; count < loop_count; count++) 
-    {
-      CORBA_Environment       env;
-      CORBA_Environment       env2;   // XXX
-
-      //
-      // test_void
-      //
-      test_count++;
-      test1_test_void (target, env);
-      if (env.exception () != 0) 
-	{
-	  print_exception (env.exception (), "perform test_void");
-	  error_count++;
-	}
-
-      //
-      // Numeric tests ... try some variety in computation, no real
-      // rationale in the choice of initial parameter values except
-      // not to use the same values all the time.
-      //
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-      ((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-      PERFORM_TEST (short, Short, count - 23, count + 19);
-      PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-      PERFORM_TEST (long, Long, count - 17, count + 20);
-      PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if     !defined (NONNATIVE_LONGLONG)
-      // don't try this on platforms that don't support
-      // math on longlongs ...
-      PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-      PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif  // !NONNATIVE_LONGLONG
-
-#if     !defined (i386)
-      //
-      // XXX not sure what's wrong with the COMPARE macro with respect to
-      // floating point on x86, since fprintf shows the values basically
-      // look correct ... but these float/double tests fail.
-      //
-      PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-      PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif  // !defined (i386)
-
-
-#ifndef NONNATIVE_LONGDOUBLE
-#undef  BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-      //
-      // don't try this between two platforms that don't provide
-      // arithmetic support for LongDouble values ...
-      //
-      if (!skip_longdouble) 
-	PERFORM_TEST (longdouble, LongDouble,
-		      count - 2.33, count * 3.14159);
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-      BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif  // !NONNATIVE_LONGDOUBLE
-
-#undef  COMPARE
-#undef  EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		      (count & 0x01) != 0, (count & 0x01) == 0);
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // Char, WChar -- identity
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-      (((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-      PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // Object_ptr -- identity (special comparision)
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-      (compare_objrefs (retval, original_value) == CORBA_B_TRUE)
-#undef  RELEASE
-#define RELEASE(obj) \
-	{ CORBA_release (obj); }
-
-      PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ());
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // TypeCode_ptr -- identity (special comparision), and verifies
-      // that most of the built-in typecode constants exist.
-      //
-      // XXX should try this on all standard and system exceptions!
-      //
-      // XXX  this currently tests only marshaling/unmarshaling of
-      // "no parameter" TypeCodes ... complex ones (objref, struct,
-      // union, enum, sequence, array, alias, exception) are _NOT_
-      // currently attempted.
-      //
-      // XXX  for the simple typecodes (string, wstring), the single
-      // "bound" parameter isn't exercised/verified as it should be.
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original) \
-      (((retval) == (original)) || \
-       ((retval)->_kind == (original)->_kind))
-
-#undef  RELEASE
-#define RELEASE(tc) \
-	{ CORBA_release (tc); }
-
-#undef  BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-      {
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Null, _tc_CORBA_Void);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Short, _tc_CORBA_UShort);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Long, _tc_CORBA_ULong);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongLong, _tc_CORBA_ULongLong);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Float, _tc_CORBA_Double);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Boolean, _tc_CORBA_Octet);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Any, _tc_CORBA_TypeCode);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongDouble, _tc_CORBA_Principal);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Char, _tc_CORBA_String);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_WChar, _tc_CORBA_WString);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongDouble, _tc_CORBA_Octet);
-
-	//
-	// Try all of the standard exception typecodes.
-	//
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	//
-	// All the built-in "user defined" system exceptions.
-	//
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_BadKind, _tc_CORBA_Bounds);
-      }
-#undef  COMPARE
-#undef  RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	(strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef  RELEASE
-#define RELEASE(obj) CORBA_string_free(obj)
-	  static const CORBA_Char str1 [] = "small";
-	static const CORBA_Char str2 [] =
-	  "relatively long string, constructed"
-	  " with the aid of C++ implicit string"
-	  " catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef  COMPARE
-#undef  RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	  CORBA_Exception     *xp;
-
-	  //
-	  // Case one:  with parameter <= zero, must throw
-	  // an "x1" exception whose "case_num" is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, -5, env);
-	  if (env.exception () != 0) {
-	    xp = env.exception ();
-
-	    if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) 
-	      {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-				 "wrong exception thrown (id = '%s')\n",
-				 xp->id ());
-	      } 
-	    else 
-	      {
-		test1_x1    *xp2 = (test1_x1 *) xp;
-
-		if (xp2->case_num != -5) 
-		  {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-				     "wrong value (case_num = '%ld')\n",
-				     xp2->case_num);
-		  }
-                    
-		// else, right exception was thrown
-	      }
-	    } 
-	  else
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 1, "
-			       "no exception thrown !!\n");
-	    }
-
-
-	  //
-	  // Case two:  with positive odd parameter, must throw
-	  // an "x2" exception whose obj is null, and whose case_num
-	  // is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, 101, env);
-	  if (env.exception () != 0) 
-	    {
-	      xp = env.exception ();
-
-	      if (strcmp ((char *)xp->id (),
-			  (char *) _tc_test1_x2->id (env2)) != 0) 
-		{
-		  error_count++;
-		  ACE_OS::fprintf (stderr, "test_throw case 2, "
-				   "wrong exception thrown (id = '%s')\n",
-				   xp->id ());
-		} 
-	      else
-		{
-		  test1_x2    *xp2 = (test1_x2 *) xp;
-
-		  if (xp2->case_num != 101) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 2, "
-				       "wrong value (case_num = '%ld')\n",
-				       xp2->case_num);
-		    }
-
-		  if (!CORBA_is_nil (xp2->obj)) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 2, "
-				       "non-null objref thrown\n");
-		    }
-                    
-		  // else, right exception was thrown
-		}
-	    } 
-	  else 
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 2, "
-			       "no exception thrown !!\n");
-	    }
-
-
-#if     0
-	  // 18-sept-95:  commented this out.  Work remains to be done in
-	  // this area:  (a) ServerRequest::target operation unimplemented,
-	  // so for the servers of current interest this test is no help;
-	  // (b) probable pointer leak in exceptions holding data.
-
-	  //
-	  // Case three:  with positive even parameter, must throw
-	  // an "x2" exception whose obj is the target, and whose
-	  // case_num is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, 42, env);
-	  if (env.exception () != 0) 
-	    {
-	      xp = env.exception ();
-
-	      if (strcmp ((char *)xp->id (),
-			  (char *) _tc_test1_x2->id (env2)) != 0) 
-		{
-		  error_count++;
-		  ACE_OS::fprintf (stderr, "test_throw case 3, "
-				   "wrong exception thrown (id = '%s')\n",
-				   xp->id ());
-		} 
-	      else
-		{
-		  test1_x2    *xp2 = (test1_x2 *) xp;
-
-		  if (xp2->case_num != 42) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-				     "wrong value (case_num = '%ld')\n",
-				     xp2->case_num);
-		  }
-
-		  CORBA_Boolean       status;
-
-		  status = target->_is_equivalent (xp2->obj, env);
-
-		  if (env.exception () != 0) 
-		    {
-		      error_count++;
-		      print_exception (env.exception (),
-				       "test_throw/3 call to is_equivalent");
-		    } 
-		  else if (status != CORBA_B_TRUE) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 3, "
-				       "non-equivalent objref thrown\n");
-		    }
-                    
-		  // else, right exception was thrown
-		}
-	    } 
-	  else
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 3, "
-			       "no exception thrown !!\n");
-	    }
-
-	  env.clear ();
-#endif  // 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-	    || ACE_OS::strcmp ((char *) env.exception()->id(),
-			       (char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) 
-	  {
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	  }
-    }
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr       orb_ptr;
-  CORBA_Environment   env;
-  CORBA_Object_ptr    objref = CORBA_Object::_nil();
-  unsigned            loop_count = 1;
-  unsigned            tests = 0, errors = 0;
-  int                 exit_later = 0;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-
-  if (env.exception () != 0) 
-    {
-      dexc (env, "ORB initialisation");
-      return 1;
-    }
-
-  //
-  // Parse and verify parameters.
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int                 c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c) 
-      {
-      case 'd':                     // debug flag
-	TAO_debug_level++;
-	continue;
-
-      case 'l':                     // skip "long double" test
-	skip_longdouble++;
-	continue;
-
-      case 'n':                     // loop count
-	loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'O':                     // stringified objref
-	{
-	  objref = orb_ptr->string_to_object (
-					      (CORBA_String)get_opt.optarg, env);
-	  if (env.exception () != 0) 
-	    {
-	      dexc (env, "string2object");
-	      return 1;
-	    }
-	}
-      continue;
-
-      case 'x':
-	exit_later++;
-	continue;
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-l]"
-			 " [-n loopcount]"
-			 " [-O objref]"
-			 " [-x]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-    
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE) {
-    ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		     argv [0]);
-    return 1;
-  }
-
-
-  do_tests (objref, loop_count, tests, errors);
-
-  char                *progname = ACE_OS::strrchr (argv [0], '/');
-
-  if (progname != 0)
-    progname += 1;
-  else
-    progname = argv [0];
-
-  ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-		   progname, loop_count, tests, errors);
-
-  if (exit_later) 
-    {
-      test1_please_exit (objref, env);
-      if (env.exception () != 0)
-	print_exception (env.exception (), "test1_please_exit");
-    }
-
-  CORBA_release (objref);
-
-  return errors != 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template CORBA_Octet cube(CORBA_Octet);
-template CORBA_Short cube(CORBA_Short);
-template CORBA_UShort cube(CORBA_UShort);
-template CORBA_Long cube(CORBA_Long);
-template CORBA_ULong cube(CORBA_ULong);
-#if     !defined (NONNATIVE_LONGLONG)
-        // don't try this on platforms that don't support
-        // math on longlongs ...
-template CORBA_LongLong cube(CORBA_LongLong);
-template CORBA_ULongLong cube(CORBA_ULongLong);
-#endif  // !NONNATIVE_LONGLONG
-template CORBA_Float cube(CORBA_Float);
-template CORBA_Double cube(CORBA_Double);
-#if     !defined (NONNATIVE_LONGDOUBLE)
-        // don't try this on platforms that don't support
-        // math on long doubles ...
-template CORBA_LongDouble cube(CORBA_LongDouble);
-#endif  // !NONNATIVE_LONGDOUBLE
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp
deleted file mode 100644
index 083b119fcaa..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp
+++ /dev/null
@@ -1,691 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include	<stdio.h>
-#include	<string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include	"test1.h"
-#include	<corba/boa.h>
-#include <roa.h>
-
-#include	<corba/debug.h>
-
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method
-// code, in lieu of having an IDL compmiler generate static skeletons.
-// Static skeletons would be more efficient; most mallocation could go
-// away.
-//
-// Use by: defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE: "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList
-// should also get a public constructor, and a way to provide the
-// buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA_ServerRequest	&req, \
-        CORBA_Object_ptr        obj, \
-	CORBA_Environment	&env \
-    ) \
-    { \
-	CORBA_NVList_ptr	nvlist; \
-	CORBA_ ## truetype	scratch = 0; \
-	CORBA_Any		temp_value (_tc_CORBA_ ## truetypename, \
-				    &scratch, CORBA_B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA_ ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA_ ## truetype; \
-	*v2 = (CORBA_ ## truetype) OPERATION (*v1); \
-	retval = new CORBA_ ## truetype; \
-	*retval = (CORBA_ ## truetype) OPERATION (*v1); \
- 	\
-	CORBA_Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA_ ## truetype v1copy = *v1; \
-	*v1 = (CORBA_ ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \
-		retval, CORBA_B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-  Type temp = arg;
-
-  temp = temp * arg;
-  temp = temp * arg;
-  return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (_tc_CORBA_Long);
-  CORBA_Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA_Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA_Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA_Object::_nil (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // BOA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (CORBA_OctetSeq &key,
-		 CORBA_ServerRequest &req,
-		 void *context,
-		 CORBA_Environment &env)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA_OctetSeq		*obj_key;
-
-  obj_key = (CORBA_OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA_String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA_Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-      dmsg ("I've been asked to shut down...");
-      req.oa ()->please_shutdown (env);
-      dexc (env, "please_exit, please_shutdown");
-      return;
-    }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA_ORB_ptr orb_ptr,
-	   CORBA_BOA_ptr oa_ptr,
-	   CORBA_String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA_OctetSeq	obj_key;
-  CORBA_Object_ptr	obj;
-  CORBA_Environment	env;
-
-  obj_key.buffer = (CORBA_Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA_String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "BOA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA_String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA_release (obj);
-  CORBA_string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what BOA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA_B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA_B_FALSE, &tv, env);
-      }
-
-    CORBA_Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA_Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "BOA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  BOA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr		oa_ptr;
-  CORBA_String	key = (CORBA_String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "di:ln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA_String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The BOA may or may not actually be named ...
-  //
-  oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) 
-    {
-      print_exception (env.exception (), "OA init");
-      return 1;
-    }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template CORBA_Octet cube(CORBA_Octet);
-template CORBA_Short cube(CORBA_Short);
-template CORBA_UShort cube(CORBA_UShort);
-template CORBA_Long cube(CORBA_Long);
-template CORBA_ULong cube(CORBA_ULong);
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-template CORBA_LongLong cube(CORBA_LongLong);
-template CORBA_ULongLong cube(CORBA_ULongLong);
-#endif	// !NONNATIVE_LONGLONG
-template CORBA_Float cube(CORBA_Float);
-template CORBA_Double cube(CORBA_Double);
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-template CORBA_LongDouble cube(CORBA_LongDouble);
-#endif	// !NONNATIVE_LONGDOUBLE
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp
deleted file mode 100644
index a4a1c85ed47..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp
deleted file mode 100644
index c2b1d4070ae..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  Profile_Timer pt;
-
-  pt.start();
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       try {
-         ret_struct = cb->cube_struct (arg_struct);
-
-       } catch (const CORBA::Exception &sysEx) {
-	 cerr << "Call failed: " << endl;
-	 cerr << sysEx;
-	 error_count++;
-       } catch (...) {
-	 cerr << "Unexpected exception" << endl;
-	 error_count++;
-       }       
-
-
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  pt.stop();
-
-  Elapsed_Time et;
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/Orbix b/TAO/IIOP/tests/Cubit/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/IIOP/tests/Cubit/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/TAO b/TAO/IIOP/tests/Cubit/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/IIOP/tests/Cubit/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/IIOP/tests/Cubit/results/Visibroker b/TAO/IIOP/tests/Cubit/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/IIOP/tests/Cubit/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/orbs.xls b/TAO/IIOP/tests/Cubit/results/orbs.xls
deleted file mode 100644
index 149078dd383..00000000000
--- a/TAO/IIOP/tests/Cubit/results/orbs.xls
+++ /dev/null
diff --git a/TAO/IIOP/tests/Thruput_test/Makefile b/TAO/IIOP/tests/Thruput_test/Makefile
deleted file mode 100644
index f6b0e338f8b..00000000000
--- a/TAO/IIOP/tests/Thruput_test/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO_TTCP benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lcorba
-
-PROG_SRCS 	= client.cpp ttcpC.cpp ttcpS.cpp ttcp_i.cpp server.cpp utils.cpp
-
-LSRC = $(PROG_SRCS)
-
-TTCP_CLIENT_OBJS = client.o ttcpC.o utils.o
-
-TTCP_SERVER_OBJS = server.o ttcpC.o ttcpS.o ttcp_i.o utils.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-LDFLAGS    += -L../../proto/lib
-CPPFLAGS   += -I../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG #-DONEWAY
-
-server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/README b/TAO/IIOP/tests/Thruput_test/README
deleted file mode 100644
index 628ef0c50a4..00000000000
--- a/TAO/IIOP/tests/Thruput_test/README
+++ /dev/null
@@ -1,50 +0,0 @@
-		TAO_TTCP Benchmark README file
-
-This directory contains a modified version of the TTCP benchmark that
-uses the TAO ORB. TAO_TTCP is used to measure the throughput of TAO
-for sending different data types. This code tests sequences of short,
-long, octet, char, double, and richly-typed data such as a struct.
-This benchmark uses an interpretive form of marshaling the data by
-using the dynamic invocation interfaces provided by the TAO ORB.
-
-Organization
-------------
-
-client.cpp		Client main program
-server.cpp		Server main program
-ttcpC.cpp		Client side stubs
-ttcpS.cpp		Server side skeletons
-ttcpC.h			Header file for stubs
-ttcpS.h			Header file for the skeletons
-ttcp_i.cpp		Implementaion of the interface
-ttcp_i.h		Header for the implementation
-utils.cpp		Utilities to calculate throughput
-ttcp_decls.h		Common declarations
-
-Results
--------
-Throughput results are stored under the results directory. If testing
-for REMOTE transfers, use the ./results/REMOTE directory.
-
-Running the tests
------------------
-Three scripts are provided
-
-(1) run_server : runs the server. Be sure to change the host name
-(2) run_client : runs tests for various data types
-(3) run_test : called by run_client
-
-Compiling
----------
-
-Type make
-
-To provide for 2way tests (no data is sent in the reverse
-direction. Sender blocks for a minimal ACK), comment out the -DONEWAY
-flag from the CPPFLAGS
-
-TO-DO
------
-
-
--Aniruddha Gokhale
\ No newline at end of file
diff --git a/TAO/IIOP/tests/Thruput_test/client.cpp b/TAO/IIOP/tests/Thruput_test/client.cpp
deleted file mode 100644
index 51b0096d9f0..00000000000
--- a/TAO/IIOP/tests/Thruput_test/client.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-#include "ttcp_decl.h"
-#include "debug.h"
-
-#include <iostream.h>
-#include <fstream.h>
-
-void print_exception (const CORBA_Exception     *x,
-                      const char                  *info,
-                      FILE                        *stream
-                      );
-
-char Usage[] = "\
-Usage: client [-options] [ORBeline options] host \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--A      align the start of buffers to this modulus (default 16384)\n\
--o      start buffers at this offset from the modulus (default 0)\n\
--v      verbose: print more statistics\n\
--d      set SO_DEBUG socket option\n\
--b ##   set socket buffer size (if supported)\n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--n ##    number of source bufs written to network (default 2048)\n\
--x	Use new lines after each entry in output file\n\
--h ##	Remote host to send data to\n\
--D      don't buffer TCP writes (sets TCP_NODELAY socket option)\n\
--L ##	Output file name for the data type used\n\
--S      <Total Data Size>\n\
--q      <type> Send Sequence: Enumeration for various data types:\n\
-s = short, l = long,  d = double, c = char\n\
-o = octet, S = struct, C = composite\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans =1;			/* 0=receive, !0=transmit mode */
-int sinkmode = 1;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-* resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-*  m = megabits, M = megabytes, 
-*  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-int
-main (int argc, char *argv[])
-{
-    
-  unsigned long addr_tmp;
-  unsigned short done = 0;
-  int c;
-    
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_Environment	env;
-  CORBA_Object_ptr	objref = CORBA_Object::_nil();
-  ttcp_sequence_ptr ttcp_seq;
-  unsigned		loop_count = 1;
-  int			exit_later = 0;
-  CORBA_String str;
-  fstream iorfile;
-
-  if (argc < 2)
-    goto usage;
-    
-  TAO_debug_level = 0;
-  while (!done && ((c = getopt (argc, argv, "d:vDb:h:f:l:n:A:o:L:xS:q:")) != -1))
-    {
-      switch (c)
-	{
-	case 'h':
-	  host = optarg;
-	  break;
-	case 'x':
-	  new_line = 1;
-	  break;
-	case 'L':
-	  title = optarg;
-	  break;
-	case 'd':
-	  TAO_debug_level = atoi(optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'D':
-#ifdef TCP_NODELAY
-	  nodelay = 1;
-#else
-	  fprintf (stderr,
-		   "ttcp: -D option ignored: TCP_NODELAY socket option not supported\n");
-#endif
-	  break;
-	case 'n':
-	  nbuf = atoi (optarg);
-	  break;
-	case 'l':
-	  buflen = atoi (optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'A':
-	  bufalign = atoi (optarg);
-	  break;
-	case 'o':
-	  bufoffset = atoi (optarg);
-	  break;
-	case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-	  sockbufsize = atoi (optarg);
-#else
-	  fprintf (stderr,
-		   "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-	  break;
-	case 'f':
-	  fmt = *optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  /* modify nbuf accordingly */
-	  srcDataSize = atoi(optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
-	case '?':
-	  done = 1;
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-
-  //
-  // Transmitter
-  //
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB initialization", stdout);
-    return 1;
-  }
-
-  str = CORBA_string_alloc(500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("ior.txt", ios::in);
-  iorfile >> ((char *)str);
-  iorfile.close();
-
-  cout << "Read IOR string as: " << ((char *)str) << endl;
-
-  objref = orb_ptr->string_to_object(str, env);
-  if (env.exception() != 0){
-    print_exception(env.exception(), "string2object", stdout);
-    return 1;
-  }
-  CORBA_string_free(str);
-
-
-  if (!CORBA_is_nil(objref)){
-    ttcp_seq = ttcp_sequence::_narrow(objref);
-
-    if (!CORBA_is_nil(ttcp_seq)){
-
-      /* modify nbuf according to Total data size */
-      nbuf = srcDataSize/buflen;
-      fprintf(stderr, "data size = %d, buflen = %d, nbuf = %d\n",srcDataSize, buflen, nbuf);
-
-      // 
-      // Prepare the Message to be sent
-      //
-		
-      errno = 0;
-      if ((buf = (char *) malloc (buflen + bufalign)) == (char *) NULL)
-	err ("malloc");
-      if (bufalign != 0)
-	buf += (bufalign - ((int) buf % bufalign) + bufoffset) % bufalign;
-		
-
-      cout << "Sizeof PerfStruct = " << sizeof(PerfStruct) << endl;
-      // fill the appropriate buffers
-      FillPattern (buf, buflen, dt);
-      //
-      // Start the timers on the client and server sides
-      //
-		
-      prep_timer ();
-      ttcp_seq->start_timer (env);
-      if (env.exception () != 0) {
-	print_exception (env.exception (), "start_timer operation", stdout);
-	return 1;
-      }
-#if defined (USE_QUANTIFY)
-      /* start recording quantify data from here */
-      quantify_clear_data();
-      quantify_start_recording_data();
-#endif
-      while (nbuf--)
-	{
-	  switch(dt){
-	  case SEND_SHORT:
-	    ttcp_seq->sendShortSeq(*sseq, env);
-	    nbytes += sseq->length()*sizeof(CORBA_Short);
-	    break;
-	  case SEND_LONG:
-	    ttcp_seq->sendLongSeq(*lseq, env);
-	    nbytes += lseq->length()*sizeof(CORBA_Long);
-	    break;
-	  case SEND_OCTET:
-	    ttcp_seq->sendOctetSeq(*oseq, env);
-	    nbytes += oseq->length()*sizeof(CORBA_Octet);
-	    break;
-	  case SEND_DOUBLE:
-	    ttcp_seq->sendDoubleSeq(*dseq, env);
-	    nbytes += dseq->length()*sizeof(CORBA_Double);
-	    break;
-	  case SEND_CHAR:
-	    ttcp_seq->sendCharSeq(*cseq, env);
-	    nbytes += cseq->length()*sizeof(CORBA_Char);
-	    break;
-	  case SEND_STRUCT:
-	    ttcp_seq->sendStructSeq(*Sseq, env);
-	    nbytes += Sseq->length()*sizeof(PerfStruct);
-	    break;
-	  }
-	  numCalls++;
-	  if (env.exception () != 0) {
-	    print_exception (env.exception (), "send operation", stdout);
-	    return 1;
-	  }
-	}
-#if defined(USE_QUANTIFY)
-      quantify_stop_recording_data();
-#endif
-      //
-      // Stop the timer
-      //
-      ttcp_seq->stop_timer(env);
-      if (env.exception () != 0) {
-	print_exception (env.exception (), "stop_timer operation", stdout);
-	return 1;
-      }
-      (void) read_timer (stats, sizeof (stats));
-		
-      // print results
-      PrintStats(); 
-
-    }
-  }
-
-  CORBA_release(ttcp_seq);
-  return(0);
-usage:
-  fprintf (stderr, Usage);
-  return 1;
-}
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/run b/TAO/IIOP/tests/Thruput_test/run
deleted file mode 100755
index b746a09536d..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run
+++ /dev/null
@@ -1 +0,0 @@
-client -S 67108864 -f m -D -l $1 -L temp -q $2 -b 65536 -d $3
diff --git a/TAO/IIOP/tests/Thruput_test/run_client b/TAO/IIOP/tests/Thruput_test/run_client
deleted file mode 100755
index 41f9fd5bc51..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_client
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/csh -f
-# All ATM tests: 64k socket Queue Size
-#
-# shorts
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 s 
-sleep 5
-# longs
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 l 
-sleep 5
-# octets
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 o
-sleep 5
-# doubles
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 d 
-sleep 5
-# chars
-#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 c 
-#sleep 5
-# structures
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 S 
-sleep 5
-# Composite Structs
-#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 C 
-#sleep 5
-#
diff --git a/TAO/IIOP/tests/Thruput_test/run_server b/TAO/IIOP/tests/Thruput_test/run_server
deleted file mode 100755
index 9ce44a510b1..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/csh
-#
-# Usage: server <switches>
-# -u : use IOR 
-# -f m : output results in Mbps
-# -b <sock Q size> ** not implemented **
-# -OAhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
-#
-server -u -f m -b 65536 -OAhost mambo-cip #-OAthread
diff --git a/TAO/IIOP/tests/Thruput_test/run_test b/TAO/IIOP/tests/Thruput_test/run_test
deleted file mode 100755
index e36938f42b6..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_test
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/csh -f
-if ($#argv < 3) then
-	echo "Usage: sclt <Total Data Size> <Max msg size> <destination> <TitleOfThisTest> <seq type>"
-	exit 1
-endif
-#
-@ msize=1024
-@ limit= ($argv[2] * 1024)
-#echo $limit
-#echo $msize 
-echo "Iteration#" 1 ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-set flag=0
-while ($msize <= $limit)
-  if ($flag == 0) goto label
-	echo "Iteration#" 1 ": client -S" $1 "-D -f m -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
- label:
-  set flag=1
-  sleep 5
-  foreach i (2)
-	echo "Iteration#" $i ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L " $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-  end
-	echo "---------------------------"
-	@ msize = ($msize * 2)
-	sleep 5
-end 
-
-echo " "
-echo "Done at:" 
-date
diff --git a/TAO/IIOP/tests/Thruput_test/server.cpp b/TAO/IIOP/tests/Thruput_test/server.cpp
deleted file mode 100644
index 6f1cf2c4895..00000000000
--- a/TAO/IIOP/tests/Thruput_test/server.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-#include "ttcp_i.h"
-
-#include <iostream.h>
-#include <fstream.h>
-
-void print_exception (const CORBA_Exception     *x,
-		      const char                  *info,
-		      FILE                        *stream
-		      );
-
-char Usage[] = "\
-Usage: server [options] \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--A      align the start of buffers to this modulus (default 16384)\n\
--O      start buffers at this offset from the modulus (default 0)\n\
--v      verbose: print more statistics\n\
--d      set SO_DEBUG socket option\n\
--b ##   set socket buffer size (if supported)\n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--L ##	Output file name for the data type used\n\
-Options specific to -r:\n\
--B      for -s, only output full blocks as specified by -l (for TAR)\n\
--T      \"touch\": access each byte as it's read\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans;			/* 0=receive, !0=transmit mode */
-int sinkmode = 0;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-
-unsigned short isDone = 0;
-ttcp_sequence_i *my_ttcp;
-
-//
-// forwarding support
-//
-static CORBA_Object_ptr       fwd_ref;
-
-int
-main (int argc, char *const *argv)
-{
-    
-  unsigned long addr_tmp;
-  int c;
-  unsigned short done = 0;
-  CORBA_Environment env;
-  CORBA_ORB_ptr     orb_ptr;
-  CORBA_BOA_ptr          oa_ptr;
-  CORBA_Boolean     do_fork = CORBA_B_FALSE;
-  CORBA_Boolean     do_threads = CORBA_B_FALSE;
-  CORBA_String      key = (CORBA_String) "key0";
-  char                *oa_name = "ROA";
-  char                *orb_name = "internet";
-  int                 idle = -1;
-  int use_ior = 0;
-  fstream iorfile;
-  CORBA_String str;
-
-    
-  if (argc < 2)
-    goto usage;
-    
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init", stdout);
-    return 1;
-  }
-
-  oa_ptr = orb_ptr->BOA_init(argc, argv, oa_name);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init", stdout);
-    return 1;
-  }
-
-  TAO_debug_level = 0;
-  // Now process the options other than Orbix specific options
-  while (!done && ((c = getopt (argc, argv, "ui:d:vb:f:l:L:")) != -1))
-    {
-      switch (c)
-	{
-	case 'u':
-	  use_ior = 1;
-	  orb_name = "";
-	  break;
-	case 'L':
-	  title = optarg;
-	  break;
-	case 'd':
-	  TAO_debug_level = atoi(optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = atoi (optarg);
-	  break;
-	case 'i':
-	  idle = atoi (optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-	  sockbufsize = atoi (optarg);
-#else
-	  fprintf (stderr,
-		   "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-	  break;
-	case 'f':
-	  fmt = *optarg;
-	  break;
-	case 'O':
-	case '?':
-	  done = 1;
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-    
-  //
-  // Receiver
-  //
-
-  iorfile.open("ior.txt", ios::out);
-  my_ttcp = new ttcp_sequence_i("TTCP_IIOP_test");
-  str = orb_ptr->object_to_string(my_ttcp, env);
-  if (env.exception() != 0)
-    {
-      print_exception (env.exception(), "object_to_string", stdout);
-      return 1;
-    }
-  iorfile << ((char *)str) << endl;
-
-#if defined (USE_QUANTIFY)
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  ACE_Reactor::run_event_loop();
-
-#if 0
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-  return 0;
-usage:
-  fprintf (stderr, Usage);
-  return(1);
-}
-
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp.idl b/TAO/IIOP/tests/Thruput_test/ttcp.idl
deleted file mode 100644
index eab3b148658..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-struct PerfStruct{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  octet pad[8];  // to make it 32 bytes
-};
-
-// Richly typed data
-interface ttcp_sequence 
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<PerfStruct> StructSeq;
-
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp b/TAO/IIOP/tests/Thruput_test/ttcpC.cpp
deleted file mode 100644
index c301ec498b5..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp
+++ /dev/null
@@ -1,1005 +0,0 @@
-#include <stdio.h>
-#include "ttcpC.h"
-
-// constructor
-ttcp_sequence::ttcp_sequence(STUB_Object *refdata)
-  : CORBA_Object(refdata)
-{
-}
-
-// static duplicate method
-ttcp_sequence_ptr ttcp_sequence::_duplicate(ttcp_sequence_ptr obj)
-{
-  void *dupl;
-
-  if (obj)
-    {
-      obj->AddRef();
-    }
-  return obj;
-}
-
-// static _narrow method
-ttcp_sequence_ptr ttcp_sequence::_narrow(CORBA_Object_ptr obj)
-{
-  CORBA_Environment env;
-  if (obj->_is_a("IDL:ttcp_sequence:1.0", env)){
-    STUB_Object *istub;
-    if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){
-      return ttcp_sequence::_nil();
-    }
-    ttcp_sequence_ptr new_obj = new ttcp_sequence(istub);
-    return ttcp_sequence::_duplicate(new_obj);
-  }
-  return ttcp_sequence::_nil();
-}
-
-ttcp_sequence_ptr ttcp_sequence::_nil()
-{
-  return (ttcp_sequence_ptr)NULL;
-}
-
-ttcp_sequence::ShortSeq::ShortSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Short[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Short *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::ShortSeq::~ShortSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::ShortSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Short *temp = new CORBA_Short[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Short)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Short));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::ShortSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// LongSeq
-ttcp_sequence::LongSeq::LongSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Long[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Long *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::LongSeq::~LongSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::LongSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Long *temp = new CORBA_Long[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Long)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Long));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::LongSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// DoubleSeq
-ttcp_sequence::DoubleSeq::DoubleSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Double[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Double *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::DoubleSeq::~DoubleSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::DoubleSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Double *temp = new CORBA_Double[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Double)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Double));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::DoubleSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// Char seq
-ttcp_sequence::CharSeq::CharSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Char[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Char *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::CharSeq::~CharSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::CharSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Char *temp = new CORBA_Char[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Char)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Char));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::CharSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-//Octet Seq
-ttcp_sequence::OctetSeq::OctetSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Octet[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Octet *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::OctetSeq::~OctetSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::OctetSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Octet *temp = new CORBA_Octet[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Octet)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Octet));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::OctetSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-//struct seq
-ttcp_sequence::StructSeq::StructSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new PerfStruct[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max, CORBA_ULong length,
-				  PerfStruct *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::StructSeq::~StructSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::StructSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    PerfStruct *temp = new PerfStruct[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(PerfStruct)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(PerfStruct));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::StructSeq::length() const
-{
-  return this->_length;
-}
-
-PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-/***************** TypeCodes **************/
-
-// encapsulated parameters for struct PerfStruct typecode
-static const CORBA_Long _oc_PerfStruct [] = {
-  // strings are encoded as length followed by the string. A length of 1 stands
-  // for the NULL character
-  MY_BYTE_SEX,   // byte order
-  1, 0,  // empty string, repoID
-  1, 0,  // empty string, struct name
-  6,     // 6 struct elements
-
-  // short
-  1, 0,  // empty string
-  tk_short,
-
-  // char
-  1, 0,
-  tk_char,
-
-  // long
-  1, 0,
-  tk_long,
-
-  // octet
-  1, 0,
-  tk_octet,
-
-  // double
-  1, 0,
-  tk_double,
-
-  // padding
-  1, 0,
-  tk_array,
-  12, // encapsulation length
-    MY_BYTE_SEX,
-    tk_octet,
-    8
-};
-
-
-static CORBA_TypeCode _tc__tc_PerfStruct(tk_struct, 
-					  sizeof _oc_PerfStruct, 
-					  (unsigned char *) &_oc_PerfStruct,
-					  CORBA_B_FALSE);
-CORBA_TypeCode_ptr _tc_PerfStruct = &_tc__tc_PerfStruct;
-
-// Typecodes for all the sequences
-
-// StructSeq
-static const CORBA_Long _oc_ttcp_sequence_StructSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_struct,  // sequence of struct
-  112,  // encapsulaton length
-    MY_BYTE_SEX,   // byte order
-    1, 0,  // empty string, repoID
-    1, 0,  // empty string, struct name
-    6,     // 6 struct elements
-
-    // short
-    1, 0,  // empty string
-    tk_short,
-
-    // char
-    1, 0,
-    tk_char,
-
-    // long
-    1, 0,
-    tk_long,
-
-    // octet
-    1, 0,
-    tk_octet,
-
-    // double
-    1, 0,
-    tk_double,
-
-    // padding
-    1, 0,
-    tk_array, // array
-    12, //encapsulation length
-      MY_BYTE_SEX,
-      tk_octet,
-      8,
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_StructSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_StructSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_StructSeq,
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_StructSeq = &_tc__tc_ttcp_sequence_StructSeq; 
-
-// ShortSeq
-static const CORBA_Long _oc_ttcp_sequence_ShortSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_short,  // sequence of short
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_ShortSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_ShortSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_ShortSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_ShortSeq = &_tc__tc_ttcp_sequence_ShortSeq; 
-
-// LongSeq
-static const CORBA_Long _oc_ttcp_sequence_LongSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_long,  // sequence of long
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_LongSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_LongSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_LongSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_LongSeq = &_tc__tc_ttcp_sequence_LongSeq; 
-
-// DoubleSeq
-static const CORBA_Long _oc_ttcp_sequence_DoubleSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_double,  // sequence of doubles
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_DoubleSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_DoubleSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_DoubleSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_DoubleSeq = &_tc__tc_ttcp_sequence_DoubleSeq;
-
-// CharSeq
-static const CORBA_Long _oc_ttcp_sequence_CharSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_char,  // sequence of chars
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_CharSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_CharSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_CharSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_CharSeq = &_tc__tc_ttcp_sequence_CharSeq;
-
-//OctetSeq
-static const CORBA_Long _oc_ttcp_sequence_OctetSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_octet,  // sequence of octets
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_OctetSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_OctetSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_OctetSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_OctetSeq = &_tc__tc_ttcp_sequence_OctetSeq;
-
-
-
-/***************** All the methods ********************/
-
-//sendShortSeq
-static const TAO_Param_Data ttcp_sequence_sendShortSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_ShortSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendShortSeq_TAO_Call_Data = {
-  "sendShortSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendShortSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendShortSeq(const ttcp_sequence::ShortSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendLongSeq
-static const TAO_Param_Data ttcp_sequence_sendLongSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_LongSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendLongSeq_TAO_Call_Data = {
-  "sendLongSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendLongSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendLongSeq(const ttcp_sequence::LongSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendDoubleSeq
-static const TAO_Param_Data ttcp_sequence_sendDoubleSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_DoubleSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendDoubleSeq_TAO_Call_Data = {
-  "sendDoubleSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendDoubleSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendDoubleSeq(const ttcp_sequence::DoubleSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendCharSeq
-static const TAO_Param_Data ttcp_sequence_sendCharSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_CharSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendCharSeq_TAO_Call_Data = {
-  "sendCharSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendCharSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendCharSeq(const ttcp_sequence::CharSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendOctetSeq
-static const TAO_Param_Data ttcp_sequence_sendOctetSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_OctetSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendOctetSeq_TAO_Call_Data = {
-  "sendOctetSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendOctetSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendOctetSeq(const ttcp_sequence::OctetSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendStructSeq
-static const TAO_Param_Data ttcp_sequence_sendStructSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_StructSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendStructSeq_TAO_Call_Data = {
-  "sendStructSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendStructSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendStructSeq(const ttcp_sequence::StructSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-// start timer
-#ifndef ONEWAY
-static const TAO_Param_Data ttcp_sequence_start_timer_params [] = {
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  }
-};
-#endif
-
-static const TAO_Call_Data ttcp_sequence_start_timer_TAO_Call_Data = {
-  "start_timer", 
-#ifndef ONEWAY
-  CORBA_B_TRUE,  // twoway
-  1,
-  &ttcp_sequence_start_timer_params [0],
-#else
-  CORBA_B_FALSE,  // oneway
-  0,
-  0,
-#endif
-  0, 0
-};
-
-//stub
-void ttcp_sequence::start_timer(CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data);
-#else
-  istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data);
-#endif
-}
-
-// stop timer
-#ifndef ONEWAY
-static const TAO_Param_Data ttcp_sequence_stop_timer_params [] = {
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  }
-};
-#endif
-
-static const TAO_Call_Data ttcp_sequence_stop_timer_TAO_Call_Data = {
-  "stop_timer", 
-#ifndef ONEWAY
-  CORBA_B_TRUE,
-  1,
-  &ttcp_sequence_stop_timer_params[0],
-#else
-  CORBA_B_FALSE,  // oneway
-  0,
-  0,
-#endif
-  0, 0
-};
-
-//stub
-void ttcp_sequence::stop_timer(CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data);
-#else
-  istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data);
-#endif
-}
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.h b/TAO/IIOP/tests/Thruput_test/ttcpC.h
deleted file mode 100644
index e163dc7ff75..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpC.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef TTCP_SEQUENCE_C_H
-#define TTCP_SEQUENCE_C_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-#include "debug.h"
-
-// mapping for PerfStruct
-struct PerfStruct{
-  CORBA_Short s;
-  CORBA_Char  c;
-  CORBA_Long  l;
-  CORBA_Octet o;
-  CORBA_Double d;
-  CORBA_Octet pad[8];
-
-
-  typedef CORBA_Octet pad_slice;
-  typedef pad_slice *pad_slice_ptr;
-
-  static inline pad_slice *pad_alloc() {
-    return new CORBA_Octet[8];
-  }
-
-  static inline void pad_free(pad_slice *data) {
-    if (data) delete[] data;
-  }
-
-};
-extern CORBA_TypeCode_ptr _tc_PerfStruct;
-
-class ttcp_sequence;
-typedef ttcp_sequence *ttcp_sequence_ptr;
-typedef ttcp_sequence_ptr ttcp_sequenceRef;
-
-class ttcp_sequence: public virtual CORBA_Object
-{
-public:
-  static ttcp_sequence_ptr _duplicate(ttcp_sequence_ptr obj);
-  static ttcp_sequence_ptr _narrow(CORBA_Object_ptr obj);
-  static ttcp_sequence_ptr _nil();
-
-
-  class ShortSeq
-  {
-  public:
-    ShortSeq();
-    ShortSeq(CORBA_ULong max);
-    ShortSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Short *value,
-	     CORBA_Boolean release = CORBA_B_FALSE
-	     );
-    //    ShortSeq(const ShortSeq&);
-    ~ShortSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Short &operator[](CORBA_ULong index);
-    const CORBA_Short &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Short *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_ShortSeq;
-
-  class LongSeq
-  {
-  public:
-    LongSeq();
-    LongSeq(CORBA_ULong max);
-    LongSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Long *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    LongSeq(const LongSeq&);
-    ~LongSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Long &operator[](CORBA_ULong index);
-    const CORBA_Long &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Long *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_LongSeq;
-
-  class DoubleSeq
-  {
-  public:
-    DoubleSeq();
-    DoubleSeq(CORBA_ULong max);
-    DoubleSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      CORBA_Double *value,
-	      CORBA_Boolean release = CORBA_B_FALSE
-	      );
-    //    DoubleSeq(const DoubleSeq&);
-    ~DoubleSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Double &operator[](CORBA_ULong index);
-    const CORBA_Double &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Double *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_DoubleSeq;
-
-  class CharSeq
-  {
-  public:
-    CharSeq();
-    CharSeq(CORBA_ULong max);
-    CharSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Char *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    CharSeq(const CharSeq&);
-    ~CharSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Char &operator[](CORBA_ULong index);
-    const CORBA_Char &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Char *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_CharSeq;
-
-  class OctetSeq
-  {
-  public:
-    OctetSeq();
-    OctetSeq(CORBA_ULong max);
-    OctetSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Octet *value,
-	     CORBA_Boolean release = CORBA_B_FALSE
-	     );
-    //    OctetSeq(const OctetSeq&);
-    ~OctetSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Octet &operator[](CORBA_ULong index);
-    const CORBA_Octet &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Octet *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_OctetSeq;
-
-  class StructSeq
-  {
-  public:
-    StructSeq();
-    StructSeq(CORBA_ULong max);
-    StructSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      PerfStruct *value,
-	      CORBA_Boolean release = CORBA_B_FALSE
-	      );
-    //    StructSeq(const StructSeq&);
-    ~StructSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    PerfStruct &operator[](CORBA_ULong index);
-    const PerfStruct &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    PerfStruct *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_StructSeq;
-
-
-  // now the methods
-  virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &);
-
-  virtual void start_timer(CORBA_Environment &);
-  virtual void stop_timer(CORBA_Environment &);
-
-protected:
-  ttcp_sequence() {}
-  ttcp_sequence(STUB_Object *refdata);
-  virtual ~ttcp_sequence() {}
-
-private:
-  ttcp_sequence(const ttcp_sequence &) {}
-  void operator=(const ttcp_sequence &) {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp b/TAO/IIOP/tests/Thruput_test/ttcpS.cpp
deleted file mode 100644
index c124dd60138..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-#include <iostream.h>
-#include "ttcpS.h"
-#include "corba/orb.h"
-#include "params.h"
-#include "iiopobj.h"
-#include "corba/optable.h"  // for registering our methods
-#include "corba/corbacom.h"
-
-TAO_Dynamic_Hash_OpTable tao_ttcp_sequence_optable(9); // 8 + 1 operations on our
-						       // interface 
-// operation database
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db ttcp_sequence_operations[] = {
-  {"_is_a", &_skel_ttcp_sequence::_ttcp_sequence_is_a_skel},
-   { "sendShortSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel},
-   { "sendLongSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel},
-   { "sendDoubleSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel},
-   { "sendOctetSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel},
-   { "sendCharSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel},
-   { "sendStructSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel},
-   { "start_timer", &_skel_ttcp_sequence::_ttcp_sequence_start_timer_skel},
-   { "stop_timer", &_skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel},
-   { 0, 0 }
-};
-
-// constructor
-_skel_ttcp_sequence::_skel_ttcp_sequence(const char *obj_name)
-{
-  CORBA_String_var  type_id = "IDL:ttcp_sequence:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_ttcp_sequence_optable;     // operation database
-  CORBA_Long i;
-
-  // insert operation names into the operation table
-  for (i=0; i < 9; i++)
-    {
-      this->optable_->bind(ttcp_sequence_operations[i].opname,
-			   ttcp_sequence_operations[i].skel_ptr);
-    }
-
-  // setup an IIOP object
-  data = new IIOP_Object(type_id);
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-  data->profile.port = oa->get_addr().get_port_number();
-  data->profile.object_key.length = ACE_OS::strlen(obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy(data->profile.object_key.buffer, obj_name,
-		 data->profile.object_key.length); // set the object key
-  this->set_parent(data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind(data->profile.object_key, this);// register ourselves
-}
-
-// skeleton sendShortSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_ShortSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::ShortSeq *value = (ttcp_sequence::ShortSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendShortSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendLongSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_LongSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::LongSeq *value = (ttcp_sequence::LongSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendLongSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendDoubleSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_DoubleSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::DoubleSeq *value = (ttcp_sequence::DoubleSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendDoubleSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendOctetSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_OctetSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::OctetSeq *value = (ttcp_sequence::OctetSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendOctetSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendCharSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_CharSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::CharSeq *value = (ttcp_sequence::CharSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendCharSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendStructSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_StructSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::StructSeq *value = (ttcp_sequence::StructSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendStructSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton start_timer
-void _skel_ttcp_sequence::_ttcp_sequence_start_timer_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->start_timer(env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton stop_timer
-void _skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->stop_timer(env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void _skel_ttcp_sequence::_ttcp_sequence_is_a_skel (
-						    CORBA_ServerRequest	&req,
-						    CORBA_Object_ptr    obj,
-						    CORBA_Environment		&env
-						    )
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:ttcp_sequence:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.h b/TAO/IIOP/tests/Thruput_test/ttcpS.h
deleted file mode 100644
index 0ee9412d275..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpS.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef TTCP_SEQUENCE_S_H
-#define TTCP_SEQUENCE_S_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "ttcpC.h"
-
-
-class _skel_ttcp_sequence;
-typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ptr;
-typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ref;
-
-class _skel_ttcp_sequence: public ttcp_sequence
-{
-public:
-  // pure virtual functions implemented by the implementation class
-  virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void start_timer(CORBA_Environment &) = 0;
-  virtual void stop_timer(CORBA_Environment &) = 0;
-
-  // skeletons that do the upcall
-  static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, 
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _ttcp_sequence_sendShortSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendLongSeq_skel  (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendDoubleSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
-  static void _ttcp_sequence_sendOctetSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendCharSeq_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
-  static void _ttcp_sequence_sendStructSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
-  static void _ttcp_sequence_start_timer_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
-  static void _ttcp_sequence_stop_timer_skel (CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
-					      CORBA_Environment &env);
-protected:
-  _skel_ttcp_sequence(const char *obj_name = 0);
-  virtual ~_skel_ttcp_sequence() {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h b/TAO/IIOP/tests/Thruput_test/ttcp_decl.h
deleted file mode 100644
index e478a6f88c2..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ttcpC.h"
-
-/* #define BSD43 */
-/* #define BSD42 */
-/* #define BSD41a */
-
-
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/time.h>		/* struct itimerval */
-#include <limits.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <iostream.h>
-#include <sys/resource.h>
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-#if defined(SYSV)
-#define bcopy(b1,b2,n)  memcpy(b2,b1,n)
-#define bzero(b1,n)             memset(b1,0,n)
-#include <sys/times.h>
-#include <sys/param.h>
-#endif
-
-#if defined(SUNOS54)
-struct rusage
-  {
-    struct timeval ru_utime, ru_stime;
-  };
-#define RUSAGE_SELF 0
-#else
-#include <sys/resource.h>
-#endif
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-#define SEND_COMPOSITE ((unsigned long)(7))
- 
-/**************
-// Prototypes
-***************/
-void err (char *s);
-void mes (char *s);
-char *outfmt (double b);
-//static void getrusage (int ignored, register struct rusage *ru);
-static void gettimeofday (struct timeval *tp, struct timezone *zp);
-void prep_timer (void);
-double read_timer (char *str, int len);
-static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
-static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-static void psecs (long l, register char *cp);
-void delay (int us);
-int mread (int fd, register char *bufp, unsigned n);
-int Nread (int fd, void *buf, int count);
-int Nwrite (int fd, void *buf, int count);
-void FillPattern(register char *cp, register int bufLen, unsigned long dt);
-void PrintStats();
-int SetSocketBufferSize(int size, unsigned short isTrans);
-int SetNoDelay();
-void ProcessArguments(int argc, char **argv, unsigned short isTrans);
-
-/* Global variables defined here as extern */
-extern int fromlen;
-extern int domain;           	/* Default is to use Internet domain sockets. */
-extern char *domainname;	/* Rendezvous address for UNIX domain sockets. */
-extern int fd;			/* fd of network socket */
-
-extern int buflen;		/* length of buffer */
-extern char *buf;		/* ptr to dynamic buffer */
-extern int nbuf;		/* number of buffers to send in sinkmode */
-
-extern int bufoffset;		/* align buffer to this */
-extern int bufalign;		/* modulo this */
-
-extern int udp;			/* 0 = tcp, !0 = udp */
-extern int options;		/* socket options */
-extern int one;			/* for 4.3 BSD style setsockopt() */
-extern short port;		/* TCP port number */
-extern char *host;              /* ptr to name of host */
-extern int trans;		/* 0=receive, !0=transmit mode */
-extern int sinkmode;		/* 0=normal I/O, !0=sink/source mode */
-extern int verbose;			/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-extern int nodelay;		/* set TCP_NODELAY socket option */
-extern int b_flag;		/* use mread() */
-extern int sockbufsize;		/* socket buffer size to use */
-extern int new_line;            /* This is a special flag */
-extern int write_to_file;       /* indecates writing to file (default)*/
-extern char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern int touchdata;		/* access data after reading */
-
-extern struct hostent *addr;
-extern int errno;
-extern int optind;
-extern char *optarg;
-extern char *title;
-
-extern char stats[128];
-extern unsigned long srcDataSize;	/* Total amount of source data */
-extern unsigned long nbytes;		/* bytes on net */
-extern unsigned long numCalls;		/* # of I/O system calls */
-extern double cput, realt;		/* user, real time (seconds) */
-extern unsigned long	dt;
-
-extern unsigned short isDone;
-
-/* declare struct variables for various message types */
-extern ttcp_sequence::ShortSeq		*sseq;	
-extern ttcp_sequence::LongSeq		*lseq;	
-extern ttcp_sequence::OctetSeq		*oseq;	
-extern ttcp_sequence::DoubleSeq	        *dseq;	
-extern ttcp_sequence::CharSeq		*cseq;	
-extern ttcp_sequence::StructSeq	        *Sseq;
-
-#endif
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp b/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
deleted file mode 100644
index daba9fe6139..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "ttcp_i.h"
-#include <iostream.h>
-
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i(const char *obj_name)
-  :_skel_ttcp_sequence(obj_name)
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-}
-
-
-void
-ttcp_sequence_i::start_timer (CORBA_Environment &IT_env)
-{
-    this->nbytes_ = 0;
-    ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (CORBA_Environment &IT_env)
-{
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    ACE_Reactor::end_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(PerfStruct) ;
-#ifdef DEBUG
-    //    cout << "Bytes received so far = " << this->nbytes_ << endl;
-#endif
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.h b/TAO/IIOP/tests/Thruput_test/ttcp_i.h
deleted file mode 100644
index dcac4813cdf..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- C++ -*- */
-
-// ttcp_i.h
-// 
-// This header file provides facility to use it either as a BOA approach or as
-// a TIE approach.
-//
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include "ttcp_decl.h"
-#include "ttcpS.h"
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-
-
-class ttcp_sequence_i: public _skel_ttcp_sequence 
-{
-public:
-  ttcp_sequence_i(const char *obj_name = 0);
-
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (CORBA_Environment &IT_env);
-  virtual void stop_timer (CORBA_Environment &IT_env);
-
-private:
-  unsigned long nbytes_;
-};
-
-#endif // defined (TTCP_I_H)
-
diff --git a/TAO/IIOP/tests/Thruput_test/utils.cpp b/TAO/IIOP/tests/Thruput_test/utils.cpp
deleted file mode 100644
index d3ba1e195df..00000000000
--- a/TAO/IIOP/tests/Thruput_test/utils.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-#include "ttcp_decl.h"
-
-int SetSocketBufferSize(int size, unsigned short isTrans)
-{
-   // go thru open file descriptors and check if its is a socket and
-   // if so, set its socket size to "size"
-   struct rlimit rlm;
-   memset(&rlm, 0, sizeof(struct rlimit));
-   (void) getrlimit(RLIMIT_NOFILE, &rlm);
-   cout << "Total file descriptors = " << rlm.rlim_max << endl;
-   for (int i=3; i < rlm.rlim_max; i++){
-      if (isTrans)
-      	(void) setsockopt(i, SOL_SOCKET, SO_SNDBUF,
-		(char *) &size, sizeof(size));
-      else
-      	(void) setsockopt(i, SOL_SOCKET, SO_RCVBUF,
-		(char *) &size, sizeof(size));
-   }
-   return 1;
-}
-
-void
-err (char *s)
-{
-  fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  perror (s);
-  fprintf (stderr, "errno=%d\n", errno);
-  exit (1);
-}
-
-void
-mes (char *s)
-{
-  fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-char *
-outfmt (double b)
-{
-  static char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-static struct itimerval itime0;	/* Time at which timing started */
-static struct rusage ru0;	/* Resource utilization at the start */
-
-#if defined(SYSV)
-/*ARGSUSED */
-static void
-getrusage (int ignored, register struct rusage *ru)
-{
-  struct tms buf;
-
-  times (&buf);
-
-  /* Assumption: HZ <= 2147 (LONG_MAX/1000000) */
-  ru->ru_stime.tv_sec = buf.tms_stime / HZ;
-  ru->ru_stime.tv_usec = ((buf.tms_stime % HZ) * 1000000) / HZ;
-  ru->ru_utime.tv_sec = buf.tms_utime / HZ;
-  ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ;
-}
-
-/*ARGSUSED */
-static void
-gettimeofday (struct timeval *tp, struct timezone *zp)
-{
-  tp->tv_sec = time (0);
-  tp->tv_usec = 0;
-}
-#endif /* SYSV */
-/*
- *                    P R E P _ T I M E R
- */
-void
-prep_timer ()
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- * 
- */
-double
-read_timer (char *str, int len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-static void
-prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-	*outp++ = *cp;
-      else if (cp[1])
-	switch (*++cp)
-	  {
-
-	  case 'U':
-	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'S':
-	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'E':
-	    psecs (ms / 100, outp);
-	    END (outp);
-	    break;
-
-	  case 'P':
-	    sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
-	    break;
-
-#if !defined(SYSV)
-	  case 'W':
-	    i = r1->ru_nswap - r0->ru_nswap;
-	    sprintf (outp, "%d", i);
-	    END (outp);
-	    break;
-
-	  case 'X':
-	    sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-	    END (outp);
-	    break;
-
-	  case 'D':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'K':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-		      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'M':
-	    sprintf (outp, "%d", r1->ru_maxrss / 2);
-	    END (outp);
-	    break;
-
-	  case 'F':
-	    sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-	    END (outp);
-	    break;
-
-	  case 'R':
-	    sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-	    END (outp);
-	    break;
-
-	  case 'I':
-	    sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-	    END (outp);
-	    break;
-
-	  case 'O':
-	    sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-	    END (outp);
-	    break;
-	  case 'C':
-	    sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-		     r1->ru_nivcsw - r0->ru_nivcsw);
-	    END (outp);
-	    break;
-#endif /* !SYSV */
-	  }
-    }
-  *outp = '\0';
-}
-
-static void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-static void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-static void
-psecs (long l, register char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-/*
- *                    N R E A D
- */
-int
-Nread (int fd, void *buf, int count)
-{
-  struct sockaddr_in from;
-  int len = sizeof (from);
-  register int cnt;
-  if (udp)
-    {
-      cnt = recvfrom (fd, (char *) buf, count, 0, (struct sockaddr *) &from, &len);
-      numCalls++;
-    }
-  else
-    {
-      if (b_flag)
-	cnt = mread (fd, (char *) buf, count);	/* fill buf */
-      else
-	{
-	  cnt = read (fd, buf, count);
-	  numCalls++;
-	}
-      if (touchdata && cnt > 0)
-	{
-	  register int c = cnt, sum;
-	  register char *b = (char *) buf;
-	  while (c--)
-	    sum += *b++;
-	}
-    }
-  return (cnt);
-}
-
-
-/*
- *                    N W R I T E
- */
-int
-Nwrite (int fd, void *buf, int count)
-{
-  return 0;
-}
-
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-/*
- *                    M R E A D
- *
- * This function performs the function of a read(II) but will
- * call read(II) multiple times in order to get the requested
- * number of characters.  This can be necessary because
- * network connections don't deliver data with the same
- * grouping as it is written with.  Written by Robert S. Miles, BRL.
- */
-int
-mread (int fd, register char *bufp, unsigned n)
-{
-  register unsigned count = 0;
-  register int nread;
-
-  do
-    {
-      nread = read (fd, bufp, n - count);
-      numCalls++;
-      if (nread < 0)
-	{
-	  perror ("ttcp_mread");
-	  return (-1);
-	}
-      if (nread == 0)
-	return ((int) count);
-      count += (unsigned) nread;
-      bufp += nread;
-    }
-  while (count < n);
-
-  return ((int) count);
-}
-
-void
-FillPattern (register char *cp, register int bufLen, unsigned long dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = (short)lrand48(); 
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    } 
-    break;
-  case SEND_LONG:
-    {
-       register long *SeqPtr = (long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = lrand48(); 
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = drand48(); 
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA_Char *SeqPtr = (CORBA_Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_STRUCT:
-    {
-       register PerfStruct *SeqPtr = (PerfStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(PerfStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
- 
-    } 
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA_Octet *SeqPtr = (CORBA_Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA_Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-void PrintStats()
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-//#if defined (LM_RESULTS)
-  if (trans && (title != 0))
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
- 
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      if (new_line)
-        fprintf (outFile, "\n  -l %ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-//#endif
-
-  fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
diff --git a/TAO/LICENSE.sun b/TAO/LICENSE.sun
deleted file mode 100644
index 8bb53b36807..00000000000
--- a/TAO/LICENSE.sun
+++ /dev/null
@@ -1,64 +0,0 @@
-This notice applies to all files in this software distribution that
-were originally derived from SunSoft IIOP code (these files contain
-Sun Microsystems copyright notices).
-
-COPYRIGHT AND LICENSING
------------------------
-
-Copyright 1995 Sun Microsystems, Inc.
-Printed in the United States of America.
-All Rights Reserved.
-
-This software product (LICENSED PRODUCT), implementing the Object Management
-Group's "Internet Inter-ORB Protocol", is protected by copyright and is
-distributed under the following license restricting its use.  Portions of
-LICENSED PRODUCT may be protected by one or more U.S. or foreign patents, or
-pending applications.
-
-LICENSED PRODUCT is made available for your use provided that you include
-this license and copyright notice on all media and documentation and the
-software program in which this product is incorporated in whole or part.
-
-You may copy, modify, distribute, or sublicense the LICENCED PRODUCT without
-charge as part of a product or software program developed by you, so long as
-you preserve the functionality of interoperating with the Object Management
-Group's "Internet Inter-ORB Protocol" version one.  However, any uses other
-than the foregoing uses shall require the express written consent of Sun
-Microsystems, Inc.
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of the LICENSED PRODUCT as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply with
-this license.  Upon termination, you shall destroy or return all code and
-documentation for the LICENSED PRODUCT.
-
-LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
-THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR
-TRADE PRACTICE.
-
-LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON
-THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS
-USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-LICENSED PRODUCT OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to restrictions
-as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and
-Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19.
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
diff --git a/TAO/Makefile b/TAO/Makefile
deleted file mode 100644
index b47ce4e2973..00000000000
--- a/TAO/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO
-#----------------------------------------------------------------------------
-
-#### The "release" targets can be used to create the ACE+TAO kit.  By
-#### default, it creates a new beta release.  To create a new minor or
-#### major release, add "REL=minor" or "REL=major", respectively, to
-#### the make invocation.
-####
-#### To see what make release would do without actually doing it, add
-#### "CHECK=-n" to the invocation.
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO	= README \
-	  VERSION
-
-DIRS	= tao \
-	  TAO_IDL \
-	  orbsvcs \
-	  tests \
-
-CLONE	= Makefile \
-	  tao \
-	  TAO_IDL \
-	  orbsvcs \
-	  tests \
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
-# For the following to work you need to compile the
-# $(ACE_ROOT)/bin/clone.cpp file and install it in your ~/bin
-# directory (or some place similar).
-
-clone:
-	@for dir in $(CLONE) ;\
-	do \
-		(clone -s $(ACE_ROOT)/$$dir $$dir) \
-	done
-
-CONTROLLED_FILES = ChangeLog \
-		   TAO-INSTALL.html \
-		   COPYING \
-		   COPYING.sun \
-		   release.chk \
-		   rules.tao.GNU \
-		   taoconfig.mk \
-		   docs \
-		   LICENSE.sun \
-		   Makefile \
-		   README \
-		   README.sun \
-		   tao \
-		   TAO_IDL \
-		   orbsvcs \
-		   tests \
-		   VERSION
-
-RELEASE_FILES = $(addprefix TAO/,$(CONTROLLED_FILES)) \
-                TAO/INSTALL
-
-INSTALL: TAO-INSTALL.html
-	lynx -dump $^ > $@
-
-#### If creating the "official" TAO release:
-#### 1) Check that the workspace is up-to-date, and bail out if not.
-#### 2) Update the timestamp in the VERSION file.
-#### 3) Add a ChangeLog entry to the ChangeLog plain file.
-#### Detect if we are creating the "official" release by looking at the PWD.
-#### To disable this feature, add "TIMESTAMP=" to the make command line.
-#### NOTE: if the version number in the VERSION file contains three components,
-####       e.g., 4.1.5, then the third one will be incremented.  This assumes
-####       that alpha/beta releases are numbered with three components, and
-####       that final releases are not.  So, if the version number is, e.g.,
-####       4.2, it will not be modified because it is assumed to be for a
-####       final release.
-#ifeq ($(shell pwd),/project/adaptive/ACE_wrappers/TAO)
-  TIMESTAMP = (CHANGELOG='ChangeLog'; export CHANGELOG; \
-              if [ -z "$$CHANGELOG" ]; then echo unable to find latest ChangeLog file; exit 1; fi; \
-              cd ..; UPTODATE=`cvs -nq update $(RELEASE_FILES) | egrep -v '/tests/log/' | perl -pi -e 's%/TAO%%g; s/$$/\\\n  /g'`; cd TAO; \
-              if [ "$$UPTODATE" ]; then /pkg/gnu/bin/echo -e ERROR: workspace must be updated, and/or non-controlled files must be removed or added/committed: $$UPTODATE; exit 1; fi; \
-	      perl release.pl) &&
-#else
-#  TIMESTAMP =
-#endif
-
-#### The following tar creation commands assume that cpio supports -H tar.
-#### Old versions of cpio might not, but the version that's shipped with
-#### Solaris 2.5.1, and gnu cpio 2.3, do support that option.
-
-FILTER = -name CVS -prune -o ! -name '.\#*' ! -name '\#*' ! -name '*~' -print
-
-cleanrelease-old:	INSTALL
-	@$(TIMESTAMP) (make realclean; cd ..; \
-	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
-	 chmod a+r TAO.tar.gz; )
-
-release-old:	INSTALL
-	@$(TIMESTAMP) (cd ..; \
-	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
-	 chmod a+r TAO.tar.gz; )
-
-releaseall-old: INSTALL
-	@$(TIMESTAMP) true
-
-REL = beta
-CHECK =
-
-#### The call to make_release below doesn't actually create the kit.
-#### If creating a release in /project/adaptive/ACE_wrappers/TAO, it
-#### just updates the VERSION and ChangeLog files, and tags the release.
-#### Then, make releasetao is invoked to actually create the kit.
-release: INSTALL
-	@$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -t $(REL) \
-	   -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)"  &&  \
-	 cd ..  &&  make releasetao
diff --git a/TAO/README b/TAO/README
deleted file mode 100644
index 822803d1567..00000000000
--- a/TAO/README
+++ /dev/null
@@ -1,77 +0,0 @@
-Welcome to the latest release of The ACE ORB (TAO).  TAO is an
-implementation of a CORBA 2.x-compliant ORB that supports real-time
-extensions.  Please see http://www.cs.wustl.edu/~schmidt/TAO.html for
-more information on TAO.
-
-Some detailed information on this version of TAO is available in the
-'docs' subdirectory in HTML format.
-
-The current alpha release of TAO contains the following:
-
-     * An ORB Core based on ACE C++ components. This ORB Core provides 3
-       concurrency models: (1) Reactive, (2) Thread-per-Connection,
-       and (3) Thread-per-Rate (which is optimized for certain types
-       of deterministic real-time systems).
-
-     * An optimized version of the SunSoft IIOP protocol
-       interpreter;
-
-     * An implementation of the Portable Object Adapter (POA)
-       specification. 
-
-     * A prototype IDL compiler, based on the SunSoft IDL
-       compiler.  This IDL compiler generates stubs and skeletons that
-       utilize the SunSoft IIOP protocol engine.
-
-     * A Real-time Scheduling Service that determines the priority at
-       which Client requests are dispatched by the ORB.
-
-     * A Real-time Event Service that dispatches CORBA events in
-       real-time.
-
-     * Implementations of the CORBA COS Naming service and Trader
-       service, as well as a logging service.
-       
-     * Various tests illustrating how to use TAO.
-       
-The current version of TAO contains source code and tests that are
-around 1.5 Megabytes when compressed using GNU gzip.
-
-We've gotten TAO to interoperate with other ORBs (e.g., Orbix,
-VisiBroker, miniCOOL, and CORBAplus), so we're confident that its
-implementation of IIOP is robust.  We're currently working on the
-following features for TAO:
-   
-     * An IDL compiler that generates optimized compiled stubs and
-       skeletons. For this, we're planning to use the Flick IDL
-       compiler from University of Utah.
-
-     * A highly extensible, highly optimized set of request
-       demultiplexing strategies that provide constant time lookup of
-       servants based on object keys and operation names contained in
-       CORBA requests.
-
-     * An implementation of the new OMG Audio/Video Streaming
-       service, as well as the Property service.
- 
-We plan to release these features throughout the spring of 1998.  You
-can keep track of our progress online at URL
-
-http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/
-
-A quick build note for users who have used ACE with other ORBs:
-linking TAO with a version of ACE that must also be linked against
-another ORB vendor's library, e.g., liborbix.so, will produce
-undefined and most likely unpredictable and erroneous results.
-
-We welcome suggestions for improvement, bug fixes, portability
-enhancements, etc. and will strive to integrate correct bug fixes
-quickly!  If you have any questions or problems with TAO, please post
-them to the ACE mailing list (ace-users@cs.wustl.edu) or send email to
-Douglas C. Schmidt (schmidt@cs.wustl.edu) and Chris Cleeland
-(cleeland@cs.wustl.edu).
-
-Thanks,
-
-	Douglas C. Schmidt
-	schmidt@cs.wustl.edu
diff --git a/TAO/README.sun b/TAO/README.sun
deleted file mode 100644
index 5fbfaeacbdc..00000000000
--- a/TAO/README.sun
+++ /dev/null
@@ -1,256 +0,0 @@
-========================================
-
-This file contains the original README that came with the SunSoft IIOP
-release.  This information in this file is historical in nature and
-the much of the specific information probably is inaccurate with
-respect to the current state of TAO.  Please see the ./README file
-that comes with TAO for up-to-date information.
-
-Specifically, some of the files referred to below have been renamed in
-TAO.
-
-========================================
-
-@(#)README	1.2 97/02/03
-
-Inter-ORB Engine
-================
-
-02-Feb, 1997
-Version 1.4
-
-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-
-
-    As of today, this is the most current version of the "IIOP Engine".
-    It's doubtful that a later one will be released by Sun Microsystems.
-
-    This still supports only IIOP v1.0 (no fragmentation or security
-    extensions) and contains a few bugs (GIOP service context typecode
-    is wrong).  This version was completed before the COM/CORBA
-    "Part A" RFP cycle, as well as the "Secure IOP" work.
-
-    It's different from other versions in that it has (a) the benefit
-    of much performance work, including support for multithreading,
-    (b) the source code is reorganized to display more of the internal
-    structure, and (c) it incorporates a simple COM glue layer (which
-    is not the same as the one later standardized by the OMG).  There
-    is surely more; for example, experimental XDR marshaling support.
-
-    Documentation hasn't particularly been updated.  It'll need more work
-    to run "out of the box" since it doesn't use autoconf just now.
-
-    Please drop me a line (brownell@ix.netcom.com) if you're using this.
-
-	    - Dave
-
-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-
-
-
-INTRODUCTION
-------------
-Welcome to the Inter-ORB Engine!  This is the source code version of
-SunSoft's portable implementation of the CORBA 2.0 mandatory "IIOP"
-interoperability protocol for networked ORBs.
-
-This is a preliminary version.  This software is made available AS IS and
-WITH NO GUARANTEES.  Please make sure you read and understand the copyright
-and license notice under which this software is distributed.  This notice
-may be found in the "LICENSE" file that is part of this distribution, and
-also in the corba/orb.hh header file used by every source file.  Note that
-both commercial and noncommercial usage is allowed.
-
-The rest of this document includes these sections:
-
-    - ENGINE OVERVIEW
-    - TARGET AUDIENCE
-    - HOW TO OBTAIN THIS SOFTWARE
-    - CONTACT POINT AND WORKING ALIAS
-    - ABOUT THIS IIOP SOFTWARE DISTRIBUTION
-    - WHAT ARE:  IOP, IIOP, GIOP, ESIOP, AND DCE-CIOP?
-
-For instructions on how to build and test this software, see the file
-named "BUILDING" in the "docs" directory. [Note, this is renamed to
-TAO-Install.html for TAO].
-
-ENGINE OVERVIEW
----------------
-The Inter-ORB Engine implementation is composed of four parts.  Each of
-these is found in a top level directory with the name used here:
-
- *  "runtime" ... this defines the public binary interface to the engine, as
-	used by application (and test) programs.  It has three main parts:
-
-	- A CDR (Common Data Representation) marshaling engine, which encodes
-	  simple OMG-IDL data types directly and uses a TypeCode interpreter
-	  to marshal complex ones;
-
-	- The TypeCode interpreter is used to manipulate all legal OMG-IDL
-	  data types using just standard OMG-IDL TypeCodes;
-
-	- The runtime framework itself includes a partial ORB implementation.
-	  Its programming interfaces are specified in CORBA and it provides
-	  the OMG-IDL C++ mapping of those abstractions in most cases;
-
- *  "bridge" ... this is an IIOP-specific module which talks to the runtime
-	and to TCP-based sockets to send, receive, and dispatch IIOP messages.
-
- *  "test" ... code for a few basic functional tests is included.
-
- *  "docs" ... text files, such as this one, describe the way the
-	implementation works.  This is oriented toward people who are
-	maintaining, porting, or otherwise enhancing this code.
-
-The package is not a full ORB.  It doesn't support the full set of CORBA
-APIs, an IDL compiler, an Interface Repository, a standard object adapter,
-and more.  You could use this software to help build an ORB, but you
-would need to enhance it.
-
-If you have an interest in using an IDL compiler to generate TypeCodes,
-stubs, and/or skeletons, you may be interested in the portable front end
-for an OMG-IDL compiler which is available through the OMG FTP server.
-Further information may be found in this file:
-
-    ftp.omg.org:/pub/OMG_IDL/ANNOUNCEMENT
-
-
-TARGET AUDIENCE
----------------
-Who should use this release?
-
-- Organizations which are providing their own implementations of the IIOP
-  should use this software to perform protocol testing, helping to ensure
-  that they can in fact interoperate with each other.
-
-- Bridge builders, including ORB implementors who have their own ORB
-  protocols, can use this software to bootstrap bridge construction work.
-  This includes bridge builders working to bridge COM and CORBA.
-  
-- ORB implementors can use this to acquire a TypeCode interpreter.  (ORBs
-  compliant with CORBA 2.0 CORE need one to support the dynamic runtime
-  typing APIs, such as Any, DII, and DSI.)
-
-- ORB implementors without their own protocols can use this software to add
-  networked object capabilities to their systems, using the Internet IOP.
-
-- Implementors of systems which are intended to talk with ORBs may wish to
-  use this software when bridging to ORBs from non-CORBA systems.  A few
-  examples:  (a) specialized applications that don't need a full ORB as
-  infrastructure; (b) "legacy" code which needs either to use an ORB or to
-  be used by one; (c) users or providers other object systems, such as
-  programming environments, which want ORB connectivity.
-
-- And of course, this is the core of a portable ORB, and may be used as
-  one by providing the rest of the CORBA 2.0 programming interfaces and
-  development tools such as one or more IDL compilers.
-
-
-HOW TO OBTAIN THIS SOFTWARE
----------------------------
-There are several distribution sites for this software, and it may also be
-restributed through other ones.  Not all sites will necessarily have the
-most recent version.
-
-OMG MAIL SERVER -- You can use a mail server program to retrieve this
-software. Send email with a body line 'help' to iiop-bridging@omg.org, and
-the mail server will respond with a copy of this README file.  Send email
-with a body line "iiop" and it will return a SHAR file of this software.
-
-OMG FTP SERVER -- You may also use anonymous FTP to the "ftp.omg.org" server.
-To do this the classic (pre-Web) Internet way, use FTP to sign on with the
-username "ftp" and your Internet email address as your password.  Then change
-directory to "/pub/interop" and retrieve:
-
-    - "iiop.sh.Z" ... compressed SHAR format, for UNIX systems
-    - "iiop.tar.Z" ... compressed TAR format, also for UNIX systems
-    - "iiop.zip" ... ZIP format, for MS-Windows systems
-
-In Web-speak, those files are named by these URLs:
-
-    ftp://ftp.omg.org/pub/interop/iiop.sh.Z	... compressed SHAR format
-    ftp://ftp.omg.org/pub/interop/iiop.tar.Z	... compressed TAR format
-    ftp://ftp.omg.org/pub/interop/iiop.zip	... PC ZIP format
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to the comp.object newsgroup announcing availability.
-
-
-CONTACT POINT AND WORKING ALIAS
--------------------------------
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     omg-iiop-bridge@sun.com
-
-This address can also be used to report problems, bugs (or better yet, fixes!),
-suggestions and send general comments.  It is not a general mailing list for
-discussion about IIOP implementations. 
-
-There is at least one general access alias intended for discussion about
-IIOP implementations.  You can subscribe by sending email with a subject
-line of "subscribe" to:
-
-    iiop-impl-request@jsoft.com
-
-
-ABOUT THIS IIOP SOFTWARE DISTRIBUTION
--------------------------------------
-On some platforms POSIX threads (P1003.1c; draft 10 became the standard)
-will be available to users of this distribution.  There are still legal
-client side message sequences which will not be emitted by this distribution
-(namely, requests being sent on a connection while a response is pending),
-though by definition the server side must (and will!) accept them when they
-are produced by other implementations of the IIOP.
-
-Also, note that although this is written in C++, ANSI C++ exceptions are not
-required.  This derives from a goal to have this software be highly portable.
-(Few C++ compilers fully comply with the C++ exception specifications.)
-
-Developers should not be surprised to find implementation or specification
-problems at this point in time.  When they do, they are encouraged to
-communicate such problems through the contact point (for problems with this
-implementation of IIOP; see above) or the OMG interoperability revision
-task force (for specification problems; see the REFERENCES file) so that
-they can be resolved.  If you need complete and final ORB software, you
-should use a commercially available ORB product.
-
-There are areas where the software is known to be incomplete; for example,
-it does not provide Interface Repository APIs.  It is expected that bridge
-and ORB implementors will add the missing pieces as appropriate for their
-environments.  In some cases these may be added in future distributions
-of this software.
-
-See the "DIFFERENCES" file for information about where this software differs
-from current OMG specifications.  As a rule, these differences are to
-establish compatibility with CORBA 2.0 specifications which are being
-prepared but which are not (as of this writing) available.  In some cases,
-they address recently recognized problems that are yet to be resolved.
-
-For a brief description of the implementation, including goals, notes, and
-an overview of the source file organization, see the "IMPLEMENTATION" file.
-
-For a brief overview of the functional tests, see the "TESTS" file.
-
-
-WHAT ARE:  IOP, IIOP, GIOP, ESIOP, AND DCE-CIOP?
-------------------------------------------------
-Inter-ORB Protocols (IOPs) support communication between or within ORBs.
-
-The "Internet IOP" (IIOP) is the protocol adopted by OMG that is required
-to be supported by CORBA 2.0 compliant Networked ORBs, either as a native
-protocol or through half bridges.  It is a mapping of the "General IOP"
-(GIOP) onto the Internet's TCP transport layer.  Mappings onto other
-transport layers may be defined in the future.
-
-ORBs are free to support optional Environment Specific IOPs (ESIOPs) as
-their preferred ORB protocols.  The "DCE-Common IOP" (DCE-CIOP) is the the
-first such protocol that has been publicly specified.  It uses a subset of
-DCE-RPC facilities, and reuses parts of the GIOP.  ORB implementors building
-on top of DCE are likely to comply with DCE-CIOP, and bridge to the IIOP
-for communication with ORBs not using the DCE-CIOP.
-
-Of course, other ESIOPs exist and will continue to exist, both in ORBs built
-on top of other distributed computing environments such as ONC+ and ones
-independent of such environments.  Due to the prevalence of such ESIOPs,
-most ORBs are expected to interoperate through bridging to the IIOP.
-
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
deleted file mode 100644
index 5e36446fe3c..00000000000
--- a/TAO/TAO-INSTALL.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Building and Installing TAO</TITLE>
-</HEAD>
-<BODY text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
-
-<HR>
-<h3>Building and Installing TAO</h3>
-
-TAO has been ported and tested Windows NT, Solaris, VxWorks, and
-Linux.  I expect that major portions of the release will port easily
-to other platforms that ACE has been ported to.  If you can help port
-TAO to other platforms we'd appreciate it. <P>
-
-TAO can be obtained <A
-HREF="http://www.cs.wustl.edu/~schmidt/TAO-obtain.html">electronically</A>
-via the WWW and ftp.  Bundled with the TAO release is
-HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>.  You will
-need the most recent version of ACE because TAO tends to track changes
-to ACE rather closely. <P>
-
-A quick build note for users who have used ACE with other ORBs:
-linking TAO with a version of ACE that is also linked against another
-ORB vendor's library, <EM>e.g.</EM>, liborbix.so, will produce
-undefined and most likely unpredictable and erroneous results. <P>
-
-<HR><P>
-<h3>On UNIX platforms</h3>
-
-    <ol>
-      <li>Set <code>ACE_ROOT</code> environment variable as outlined
-      in the <a
-href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">ACE
-installation
-      notes</a>.</li> <P>
-
-      <li>Build and install ACE under <CODE>$ACE_ROOT</CODE>.</li> <P>
-
-      <UL>
-      <li>Change directory to <code>$ACE_ROOT/ace</code> and execute
-      <code><a href="#makenotes">make</a></code>.</li> <P>
-      </UL>
-
-      <li>Set <code>TAO_ROOT</code> environment variable to
-           <CODE>$ACE_ROOT/TAO</CODE>. <P>
-
-      <li>Build and install the TAO release under <CODE>$TAO_ROOT</CODE>.</li> <P>
-
-      <UL>
-      <li>Change directory to <code>$TAO_ROOT/tao</code> and
-      execute <code><a href="#makenotes">make</a></code>.</li> <P>
-      </UL>
-
-      <li>Change directory to <code>$TAO_ROOT/tests</code> and
-      execute <code><a href="#makenotes">make</a></code>.</li> <P>
-
-      <li>Follow instructions on executing the various examples under
-      <code>$TAO_ROOT/tests</code>.<P>
-
-    </ol>
-
-    <h4><strong><a name="makenotes">A Note On Make</a></strong></h4>
-    <p>
-      Since TAO is built atop ACE, TAO re-uses ACE's Makefile
-      structure as well.  Thus, just like ACE requires GNU Make, so
-      too does TAO.  More exactly, versions of <code>make</code> which
-      are known to <em>not</em> work include those from Solaris 4.x
-      and 5.x, HP-UX, the latest BSD, etc.
-    <p>
-      GNU Make can be obtained from various places in source form.
-	      
-
-<HR><P>
-<H3>On Windows NT</H3>
-
-Before compiling <CODE>TAO_IDL</CODE> on NT, you may need to set the
-environment variable <CODE>CPP_PATH</CODE> to where CL.exe is
-installed on your machine.  By default, we set this variable to
-"C:/Program Files/DevStudio/VC/bin".  Your location may vary, however.
-Notice that if you forget to set this variable before compiling
-<CODE>TAO_IDL</CODE>, you can use <CODE>CPP_LOCATION</CODE> to specify
-the absolute pathname to CL.exe. We set if to "C:/Program
-Files/DevStudio/VC/bin/CL.exe" when we do use it.<P>
-
-<H4>Visual C++ 5.0</H4>
-
-<P>It works best if TAO is placed in ACE_wrappers so TAO ends up in
-<CODE>ACE_wrappers\TAO</CODE> because the Visual C++ 5.0 Project files
-are set up to work in this configuration. If you move it, then make
-sure you change the project file to look for the include and library
-files in the correct place.</P>
-
-<OL>
-  <LI> Make sure ACE is built (For Visual C++ 5.0, use ace.dsw or ace-vc50.dsw,
-       whichever is in your copy of ACE). <BR><BR>
-
-  <LI> Load the workspace <CODE>tao\TAO.dsw</CODE> and build the TAO library. <BR><BR>
-
-  <LI> To build the Cubit test, load the workspace <CODE>tests\Cubit\TAO\test.dsw</CODE>
-       and build both client and server. <BR><BR>
-</OL>
-
-<H4>Visual C++ 4.x</H4>
-
-<OL>
-  <LI> In Tools|Options, go to the Directories page and make sure that include
-       files paths includes ACE_wrappers\ and the root directory of TAO (which
-       can be <CODE>ACE_wrappers\TAO</CODE> if installed there).  The
-library files paths
-       should include <CODE>ACE_wrappers\ace</CODE>. <P>
-
-  <LI> Load the project file <CODE>tao\TAO.mdp</CODE> and build the
-TAO library. <P>
-
-  <LI> To build the Cubit test, load the project file <CODE>tests\Cubit\TAO\test.mdp</CODE>
-       and build both client and server. <P>
-</OL>
-
-<P><HR><P>
-Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY>
-</HTML>
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
deleted file mode 100644
index 979417360d2..00000000000
--- a/TAO/TAOACE.dsw
+++ /dev/null
@@ -1,80 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "ACE dynamic library"=..\ace\ace_dll.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TAO"=.\tao\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE dynamic library

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "orbsvcs"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ACE dynamic library

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name tao_idl

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "tao_idl"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ACE dynamic library

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/TAO_IDL/ANNOUNCEMENT b/TAO/TAO_IDL/ANNOUNCEMENT
deleted file mode 100644
index 870db6f6006..00000000000
--- a/TAO/TAO_IDL/ANNOUNCEMENT
+++ /dev/null
@@ -1,131 +0,0 @@
-WHAT:
-
-SunSoft, Inc., Mountain View, California, has placed the source code to
-Project DOE's Interface Definition Language (IDL) compiler front end
-(CFE) on OMG's file server, making the implementation publicly
-available. This release is identified by the version number 1.3.
-
-Project DOE is SunSoft's corporate-wide development effort to integrate
-distributed object technology into the Solaris O/S.  OMG (Object Management
-Group) is the industry wide body formed to create specifications for
-distributed object technology. It currently has more than 370 members. OMG
-IDL is part of OMG's CORBA 1.1 specification and provides a standardized
-way for defining object interfaces. OMG IDL forms the basis for distributed
-object interactionin Project DOE.
-
-The SunSoft OMG IDL CFE provides a complete framework for building
-CORBA 1.1-compliant preprocessors for OMG IDL.  By using this standard
-implementation, developers of OMG IDL compilers will save many months
-of work and enhance the portability and interoperability of OMG
-IDL-interfaced objects.
-
-The SunSoft OMG IDL CFE allows convenient and fast integration of new back
-ends to the compiler.  The release consists of a front end which converts
-OMG IDL to an intermediate format, a compiler framework driver, an example
-implementation of a compiler back end, and a set of protocols for
-interaction between the front and back ends.  The SunSoft OMG IDL CFE
-parser uses components generated by yacc and lex.
-
-The SunSoft OMG IDL CFE is designed to allow easy extension of OMG IDL
-without impacting existing back-end implementations.  As the CORBA
-specification evolves, any new updates to the IDE CFE will be placed
-by SunSoft on the OMG server.
-
-This release provides a directory with many examples of OMG IDL
-specifications to allow users to become familiar with the process of
-writing OMG IDL code.
-
-For more information send email to idl-cfe@sun.com.
-
-HOW:
-
-The SunSoft OMG IDL CFE is available at no charge through anonymous FTP
-in source form on the OMG file server, omg.org. Please retrieve the
-file OMG_IDL_CFE_1.3.tar.Z from the directory pub/OMG_IDL_CFE_1.3. Please
-let us know who you are if you retrieve the compiler front end using this
-method, by sending email to idl-cfe@sun.com.
-
-You can also retrieve the software by using the OMG mail server program.
-Send email with the subject 'help' to omg_idl@omg.org, and the mail server
-will respond with instructions on how to retrieve the software.
-
-WHEN:
-
-The SunSoft OMG IDL CFE is available now.
-
-CONTACT:
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send email to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-We ask that if you make extensions or modifications to this source release,
-please make these extensions available to others using the OMG IDL compiler
-front end, by sending the modified sources to the above email address. This
-will help us evaluate your extensions for inclusion in a future version. It
-also ensures your investment in these extensions when new versions of the
-CFE are released.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/CHANGES b/TAO/TAO_IDL/CHANGES
deleted file mode 100644
index ae6fca7bcea..00000000000
--- a/TAO/TAO_IDL/CHANGES
+++ /dev/null
@@ -1,122 +0,0 @@
-CHANGES WHICH AFFECT BE WRITERS
--=============================-
-
-INTRODUCTION
-
-This file describes changes that affect BE writers. It contains IMPORTANT
-INFORMATION for BE writers who wish to migrate a BE written to operate with
-release 1.2 to operate with release 1.3. It is likely that not following
-these instructions will result in a compilable but malfunctioning compiler.
-
-AST INHERITANCE CHANGES
-
-The AST has been reorganized so that AST_Union and AST_Exception now
-inherit from AST_Structure. This means that constructors of BE classes
-which inherit from AST_Union or AST_Exception now need to explicitly call
-an initializer for AST_Structure in their init section.
-
-We repeat below the information given in the file WRITING_A_BE, in the
-section entitled "WRITING A BE".
-
-AST_EXCEPTION
-
-The signature for constructors of classes inheriting from AST_Exception
-should now be:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-
-AST_UNION
-
-The signature for constructors of classes inheriting from AST_Union should
-now be:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-
-IDL_BOOL TYPE
-
-To increase portability and reduce dependency of the sources on POSIX
-compliance in targets of ports, IDL now provides its own boolean type which
-is named idl_bool. It provides two truth values, I_TRUE and I_FALSE.
-
-UTL_SCOPEDNAME TYPE
-
-The UTL_ScopedName type is now a list of Identifier nodes; in previous
-releases it used to be a list of String nodes. If your BE constructs scoped
-names this change will prevent recompilation until you modify your
-constructor calls to invoke constructors for Identifier instead of for
-String. The signature of the constructor is:
-
-	Identifier::Identifier(char *, long x=1, long y=0, long z=I_FALSE)
-
-The additional arguments which can be defaulted to the values indicated are
-included for future use.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/GenExportH.BAT b/TAO/TAO_IDL/GenExportH.BAT
deleted file mode 100755
index 2c56945b0ac..00000000000
--- a/TAO/TAO_IDL/GenExportH.BAT
+++ /dev/null
@@ -1,48 +0,0 @@
-@Echo off
-REM 
-REM $Id$
-REM
-REM Usage:
-REM	GenExportH.BAT <EXPORT_TAG>   >   <export_file.h>
-REM
-REM Author: Nanbor Wang <nanbor@cs.wustl.edu>
-REM
-
-if "%1" == "" goto emptyexport
-Echo // Definition for Win32 Export directives.
-Echo // This file is generated automatically by
-Echo // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
-Echo // ------------------------------
-Echo #if !defined (%1_EXPORT_H)
-Echo #define %1_EXPORT_H
-Echo.
-Echo #include "ace/OS.h"
-Echo.
-Echo #if defined (%1_HAS_DLL) 
-Echo #  if (%1_HAS_DLL == 1)
-Echo #    if defined (%1_BUILD_DLL)
-Echo #      define %1_Export ACE_Proper_Export_Flag
-Echo #      define %1_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-Echo #    else
-Echo #      define %1_Export ACE_Proper_Import_Flag
-Echo #      define %1_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1_SINGLETON_INSTANTIATION(T)
-Echo #    endif /* %1_BUILD_DLL */
-Echo #  else 
-Echo #    define %1_Export
-Echo #    define %1_SINGLETON_DECLARATION(T)
-Echo #    define %1_SINGLETON_INSTANTIATION(T)
-Echo #  endif   /* ! %1_HAS_DLL == 1 */
-Echo #else
-Echo #  define %1_Export
-Echo #  define %1_SINGLETON_DECLARATION(T)
-Echo #  define %1_SINGLETON_INSTANTIATION(T)
-Echo #endif     /* %1_HAS_DLL */
-Echo.
-Echo #endif     /* %1_EXPORT_H */
-Echo            // End of auto generated file.
-goto endrun
-:emptyexport
-Echo #error usage: GenExportH.BAT EXPORT_TAG (Remember to redirect the output to a file.)
-:endrun
\ No newline at end of file
diff --git a/TAO/TAO_IDL/INSTALL b/TAO/TAO_IDL/INSTALL
deleted file mode 100644
index 6fcaa710042..00000000000
--- a/TAO/TAO_IDL/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-INTERFACE DEFINITION LANGUAGE INSTALLATION GUIDE
--==============================================-
-
-INTRODUCTION
-
-This file describes the installation process for OMG_IDL_CFE version 1.3.
-This file explains how to:
-
-- install the source code
-- modify the sources to customize them for different configurations
-- modify the sources to implement your own back end
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is believed to operate correctly on:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-This is the first release of OMG IDL CFE which is preconfigured to compile
-correctly for Solaris 2.x and with SunPro SparcWorks compilers.
-
-CUSTOMIZATION
-
-The release contains a file idl_make_vars in the current directory, which
-is included in each Makefile. This file defines all the customizable
-variables for the CFE.
-
-OSV should be set to a string denoting the operating system upon which you
-wish to build the CFE. The CFE as shipped is preconfigured to compile
-correctly on Solaris 2.x (OSV=SOLARIS2), and has also been tested on SunOS
-4.1.x (OSV=SUNOS4). It contains code donated by HP which enables it to be
-compiled on Apollo Domain systems (OSV=apollo) and HPUX systems (OSV=hpux),
-but these two configurations have not been tested.
-
-C++ and CCC should be set to identify the C++ compiler you will use to
-compile this release. Their values should be identical. Both are set to
-address differences between various make programs - some predefine CCC,
-others use C++ to denote the C++ compiler. The possible values are CC
-(which uses the Sparcworks compilers on SunOS 4.1 and Solaris 2.3) and g++,
-which uses the installed version of GNU C++.
-
-CCFLAGS should be set to a list of flags to pass to the C++ compiler. As
-shipped, this list is -g. NOTE: We have not extensively tested the release
-with optimization turned on.
-
-CPP_FLAGS should be set to a list of flags to pass to the C++ preprocessor.
-Use this variable to enable or disable specific customizations you make to
-the BE or CFE sources.
-
-YFLAGS should be set to a list of flags to pass to the Yacc program. As
-shipped, the list is -d -t, which causes Yacc to generate y.tab.h and
-y.tab.c files.
-
-LEXFLAGS should be set to a list of flags to pass to the Lex program. As
-shipped, the list -t.
-
-RANLIB should be set to the location of the ranlib program on your system.
-As shipped this is ranlib. If your system has no ranlib you can set this
-variable to ':' or /bin/true. As shipped the variable is preset to
-/bin/true since Solaris 2.x does not use ranlib.
-
-AR should be set to the location of the ar program on your system. As
-shipped this is ar. If your system has a different mechanism for creating
-libraries, you should modify the value of this variable accordingly.
-
-ARFLAGS should be set to the flags to be passed to the ar program. As
-shipped this is 'crv'.
-
-INSTALLATION
-
-a. Disk space requirements
-
-This distribution requires approximately 350 KBytes when compressed. When
-uncompressed, untarred and compiled, approximately 10 MBytes of disk space
-are consumed on a Sun 4.
-
-b. Getting the software
-
-Use anonymous FTP to omg.org and supply your e-mail address as password.
-Change directories to pub/OMG_IDL_CFE_1.3, set bin and get the compressed
-tar file OMG_IDL_CFE_1.3.tar.Z.
-
-The distribution may, in the future, be made available from other archives
-on the Internet. However, omg.org will always have the most up-to-date
-version of this software.
-
-After transferring this file, uncompress it and untar it in a directory of
-your choice.
-
-c. Compiling it
-
-If you are using a Sparcstation running Solaris 2.x and have the SunPro
-Sparcworks compilers installed, you may directly install the software. If
-your hardware or operating system configurations are different, read and
-follow the instructions in the previous section first.
-
-At the root directory of the release, issue
-
-   % make
-
-or
-
-   % make all
-
-This will compile the provided sources and the sources found in the be
-directory. Executing this make target causes 'make all' to be invoked in
-each subdirectory, resulting in building the libraries for each component
-and finally a link step producing an executable IDL compiler.
-
-In order to make only the compiler front end components, without compiling
-the sources found in the be directory and without building an executable,
-issue
-
-  % make libs
-
-This will build the libraries in the ast, fe, util, driver and narrow
-directories. To build only the be, issue
-
-  % make be
-
-To build all libraries without creating an executable, issue
-
-  % make all_libs
-
-To remove all files created by the build process, issue
-
-  % make clean
-
-This will not remove any files created by Yacc and Lex, because you may be
-using the ones provided in the distribution (see below).
-
-d. Yacc and Lex
-
-Some installations may not have a C++ aware Yacc and Lex processor. For
-these installations, we have included the output of yacc and lex in the
-release. If you need to use these files to build the release because you
-don't have access to a C++ capable Yacc or Lex, go to the "fe" directory,
-issue the command:
-
-   % touch lex.yy.cc y.tab.cc y.tab.hh
-
-This will ensure that the processed files appear to be newer than the
-source files they were produced from and will cause "make" to skip their
-production.
-
-NOTE: The files provided in the distribution have been produced on Solaris
-2.3 and may contain OS-specific #include directives. If you intend to use
-these files, you may have to edit them to make them work in your
-environment. The provided files are known to compile cleanly without
-modification with both SunPro Sparcworks compilers and GNU C++ on both
-SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and lexer input
-files with bison or flex.
-
-IMPLEMENTING A BACK END
-
-To implement your own back end, you can start with the provided sources in
-the be directory and modify them. The Makefile understands the 'make all'
-target and will generate libbe.a in the demo_be directory. As set up, the
-variable CPP_FLAGS allows you to place include files either in the current
-directory or in the include directory. Alternatively, you can place your
-include files in a new directory and modify CPP_FLAGS to cause the C++
-preprocessor to search this new directory for referenced include files, by
-adding a new -I directive.
-
-Additional detail on the structure and function of back ends, and on the
-protocol which a back end must implement, are found in the document
-entitled WRITING_A_BE.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
deleted file mode 100644
index 12f40f29f50..00000000000
--- a/TAO/TAO_IDL/Makefile
+++ /dev/null
@@ -1,6883 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO IDL compiler
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN   	= tao_idl
-LDLIBS = -lACE
-BUILD 	= $(BIN)
-
-VPATH=.:driver:fe:ast:util:narrow:be
-
-FILES = tao_idl \
-	driver/drv_init \
-	driver/drv_private \
-	driver/drv_args \
-	driver/drv_fork \
-	driver/drv_link \
-	driver/drv_preproc \
-	fe/fe_declarator \
-	fe/fe_private \
-	fe/fe_init \
-	fe/fe_extern \
-	fe/fe_interface_header \
-	fe/y.tab \
-	fe/lex.yy \
-	ast/ast_array \
-	ast/ast_argument \
-	ast/ast_attribute \
-	ast/ast_check \
-	ast/ast_concrete_type \
-	ast/ast_constant \
-	ast/ast_decl \
-	ast/ast_enum \
-	ast/ast_enum_val \
-	ast/ast_exception \
-	ast/ast_expression \
-	ast/ast_field \
-	ast/ast_interface \
-	ast/ast_interface_fwd \
-	ast/ast_module \
-	ast/ast_native \
-	ast/ast_operation \
-	ast/ast_predefined_type \
-	ast/ast_root \
-	ast/ast_sequence \
-	ast/ast_string \
-	ast/ast_structure \
-	ast/ast_type \
-	ast/ast_typedef \
-	ast/ast_union \
-	ast/ast_union_branch \
-	ast/ast_union_label \
-	ast/ast_generator \
-	ast/ast_redef \
-	ast/ast_recursive \
-	util/utl_scope \
-	util/utl_stack \
-	util/utl_string \
-	util/utl_decllist \
-	util/utl_labellist \
-	util/utl_namelist \
-	util/utl_exceptlist \
-	util/utl_strlist \
-	util/utl_list \
-	util/utl_exprlist \
-	util/utl_error \
-	util/utl_indenter \
-	util/utl_identifier \
-	util/utl_idlist \
-	util/utl_global \
-	narrow/narrow \
-	be/be_array \
-	be/be_argument \
-	be/be_attribute \
-	be/be_constant \
-	be/be_enum \
-	be/be_enum_val \
-	be/be_exception \
-	be/be_expression \
-	be/be_field \
-	be/be_interface \
-	be/be_interface_fwd \
-	be/be_module \
-	be/be_native \
-	be/be_operation \
-	be/be_predefined_type \
-	be/be_root \
-	be/be_sequence \
-	be/be_string \
-	be/be_structure \
-	be/be_type \
-	be/be_typedef \
-	be/be_union \
-	be/be_union_branch \
-	be/be_union_label \
-	be/be_generator \
-	be/be_init \
-	be/be_produce \
-	be/be_args  \
-	be/be_helper \
-	be/be_codegen \
-	be/be_factory \
-	be/be_sunsoft \
-	be/be_decl \
-	be/be_scope \
-	be/be_state \
-	be/be_state_array \
-	be/be_state_argument \
-	be/be_state_attribute \
-	be/be_state_exception \
-	be/be_state_operation \
-	be/be_state_sequence \
-	be/be_state_structure \
-	be/be_state_typedef \
-	be/be_state_union \
-	be/be_visitor \
-	be/be_visitor_args \
-	be/be_visitor_attribute \
-	be/be_visitor_constant \
-	be/be_visitor_context \
-	be/be_visitor_decl \
-	be/be_visitor_enum \
-	be/be_visitor_exception \
-	be/be_visitor_field \
-	be/be_visitor_interface \
-	be/be_visitor_interface_fwd \
-	be/be_visitor_module \
-	be/be_visitor_operation \
-	be/be_visitor_root \
-	be/be_visitor_scope \
-	be/be_visitor_sequence \
-	be/be_visitor_structure \
-	be/be_visitor_typedef \
-	be/be_visitor_union \
-	be/be_visitor_union_branch \
-	be/be_interpretive
-
-SRC   	= $(addsuffix .cpp,$(FILES))
-#VOBJS = $(LSRC:%.cpp=$(VDIR)%.$(OBJEXT))
-#$(BIN): $(VOBJS)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(CROSS-COMPILE),)
-  include $(ACE_ROOT)/include/makeinclude/macros.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-endif # ! CROSS-COMPILE
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-ifneq ($(CROSS-COMPILE),)
-  all default_embedded:
-	@echo The IDL compiler won\'t run or build on CROSS-COMPILE platforms.
-
-  clean realclean:
-	@echo Nothing to clean in TAO_IDL on CROSS-COMPILE platforms.
-else  # ! CROSS-COMPILE
-  IDL_CFE_VERSION	= \"1.3.0\"
-
-  ifeq ($(findstring g++,$(CXX)),g++)
-    CCFLAGS += -Wno-switch -Wno-unused
-  endif # g++
-
-  CPPFLAGS += -Iinclude -Ibe_include -Ife -DCPP_LOCATION=\"$(CXX)\" \
-              -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-  clean: realclean.old
-	rm -f tao_idl
-
-  realclean: realclean.old
-	rm -f tao_idl TAGS
-endif # ! CROSS-COMPILE
-
-tags:
-	rm -f TAGS
-	etags -C include/*.h be_include/*.h
-	etags -a ast/*.cpp util/*.cpp narrow/*.cpp \
-		driver/*.cpp fe/*.cpp be/*.cpp
-
-
-#----------------------------------------------------------------------------
-#	Cleanup
-#----------------------------------------------------------------------------
-# This section can be removed eventually.  It's purpose is to clean out
-# builds that were created with nested version of this TAO_IDL Makefile.
-
-realclean.old:
-	@for dir in driver fe ast util narrow be;\
-	do \
-		(echo " ========> Making $(@:.nested=): `pwd`"; \
-		 $(MAKE) -C $$dir realclean; \
-		 echo "<========     End $(@:.nested=): `pwd`") ; \
-	done
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/tao_idl.o .obj/tao_idl.so .shobj/tao_idl.o .shobj/tao_idl.so: tao_idl.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h
-.obj/drv_init.o .obj/drv_init.so .shobj/drv_init.o .shobj/drv_init.so: driver/drv_init.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h
-.obj/drv_private.o .obj/drv_private.so .shobj/drv_private.o .shobj/drv_private.so: driver/drv_private.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h
-.obj/drv_args.o .obj/drv_args.so .shobj/drv_args.o .shobj/drv_args.so: driver/drv_args.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h
-.obj/drv_fork.o .obj/drv_fork.so .shobj/drv_fork.o .shobj/drv_fork.so: driver/drv_fork.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h \
- $(ACE_ROOT)/ace/Process_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Process_Manager.i
-.obj/drv_link.o .obj/drv_link.so .shobj/drv_link.o .shobj/drv_link.so: driver/drv_link.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h
-.obj/drv_preproc.o .obj/drv_preproc.so .shobj/drv_preproc.o .shobj/drv_preproc.so: driver/drv_preproc.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h \
- $(ACE_ROOT)/ace/Process_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Process_Manager.i \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i
-.obj/fe_declarator.o .obj/fe_declarator.so .shobj/fe_declarator.o .shobj/fe_declarator.so: fe/fe_declarator.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/fe_private.o .obj/fe_private.so .shobj/fe_private.o .shobj/fe_private.so: fe/fe_private.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/fe_init.o .obj/fe_init.so .shobj/fe_init.o .shobj/fe_init.so: fe/fe_init.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/fe_extern.o .obj/fe_extern.so .shobj/fe_extern.o .shobj/fe_extern.so: fe/fe_extern.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/fe_interface_header.o .obj/fe_interface_header.so .shobj/fe_interface_header.o .shobj/fe_interface_header.so: fe/fe_interface_header.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/y.tab.o .obj/y.tab.so .shobj/y.tab.o .shobj/y.tab.so: fe/y.tab.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h
-.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i include/idl.h \
- include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
- include/idl_fwd.h include/idl_bool.h include/utl_string.h \
- include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.h include/utl_scope.h \
- include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/fe_private.h include/fe_interface_header.h \
- include/fe_declarator.h fe/y.tab.h
-.obj/ast_array.o .obj/ast_array.so .shobj/ast_array.o .shobj/ast_array.so: ast/ast_array.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_argument.o .obj/ast_argument.so .shobj/ast_argument.o .shobj/ast_argument.so: ast/ast_argument.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_attribute.o .obj/ast_attribute.so .shobj/ast_attribute.o .shobj/ast_attribute.so: ast/ast_attribute.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_check.o .obj/ast_check.so .shobj/ast_check.o .shobj/ast_check.so: ast/ast_check.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_concrete_type.o .obj/ast_concrete_type.so .shobj/ast_concrete_type.o .shobj/ast_concrete_type.so: ast/ast_concrete_type.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_constant.o .obj/ast_constant.so .shobj/ast_constant.o .shobj/ast_constant.so: ast/ast_constant.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_decl.o .obj/ast_decl.so .shobj/ast_decl.o .shobj/ast_decl.so: ast/ast_decl.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_enum.o .obj/ast_enum.so .shobj/ast_enum.o .shobj/ast_enum.so: ast/ast_enum.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_enum_val.o .obj/ast_enum_val.so .shobj/ast_enum_val.o .shobj/ast_enum_val.so: ast/ast_enum_val.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_exception.o .obj/ast_exception.so .shobj/ast_exception.o .shobj/ast_exception.so: ast/ast_exception.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_expression.o .obj/ast_expression.so .shobj/ast_expression.o .shobj/ast_expression.so: ast/ast_expression.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_field.o .obj/ast_field.so .shobj/ast_field.o .shobj/ast_field.so: ast/ast_field.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_interface.o .obj/ast_interface.so .shobj/ast_interface.o .shobj/ast_interface.so: ast/ast_interface.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_interface_fwd.o .obj/ast_interface_fwd.so .shobj/ast_interface_fwd.o .shobj/ast_interface_fwd.so: ast/ast_interface_fwd.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_module.o .obj/ast_module.so .shobj/ast_module.o .shobj/ast_module.so: ast/ast_module.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_native.o .obj/ast_native.so .shobj/ast_native.o .shobj/ast_native.so: ast/ast_native.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_operation.o .obj/ast_operation.so .shobj/ast_operation.o .shobj/ast_operation.so: ast/ast_operation.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_predefined_type.o .obj/ast_predefined_type.so .shobj/ast_predefined_type.o .shobj/ast_predefined_type.so: ast/ast_predefined_type.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_root.o .obj/ast_root.so .shobj/ast_root.o .shobj/ast_root.so: ast/ast_root.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_sequence.o .obj/ast_sequence.so .shobj/ast_sequence.o .shobj/ast_sequence.so: ast/ast_sequence.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_string.o .obj/ast_string.so .shobj/ast_string.o .shobj/ast_string.so: ast/ast_string.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_structure.o .obj/ast_structure.so .shobj/ast_structure.o .shobj/ast_structure.so: ast/ast_structure.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_type.o .obj/ast_type.so .shobj/ast_type.o .shobj/ast_type.so: ast/ast_type.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_typedef.o .obj/ast_typedef.so .shobj/ast_typedef.o .shobj/ast_typedef.so: ast/ast_typedef.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_union.o .obj/ast_union.so .shobj/ast_union.o .shobj/ast_union.so: ast/ast_union.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_union_branch.o .obj/ast_union_branch.so .shobj/ast_union_branch.o .shobj/ast_union_branch.so: ast/ast_union_branch.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_union_label.o .obj/ast_union_label.so .shobj/ast_union_label.o .shobj/ast_union_label.so: ast/ast_union_label.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_generator.o .obj/ast_generator.so .shobj/ast_generator.o .shobj/ast_generator.so: ast/ast_generator.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_redef.o .obj/ast_redef.so .shobj/ast_redef.o .shobj/ast_redef.so: ast/ast_redef.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/ast_recursive.o .obj/ast_recursive.so .shobj/ast_recursive.o .shobj/ast_recursive.so: ast/ast_recursive.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_scope.o .obj/utl_scope.so .shobj/utl_scope.o .shobj/utl_scope.so: util/utl_scope.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_stack.o .obj/utl_stack.so .shobj/utl_stack.o .shobj/utl_stack.so: util/utl_stack.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_string.o .obj/utl_string.so .shobj/utl_string.o .shobj/utl_string.so: util/utl_string.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_decllist.o .obj/utl_decllist.so .shobj/utl_decllist.o .shobj/utl_decllist.so: util/utl_decllist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_labellist.o .obj/utl_labellist.so .shobj/utl_labellist.o .shobj/utl_labellist.so: util/utl_labellist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_namelist.o .obj/utl_namelist.so .shobj/utl_namelist.o .shobj/utl_namelist.so: util/utl_namelist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_exceptlist.o .obj/utl_exceptlist.so .shobj/utl_exceptlist.o .shobj/utl_exceptlist.so: util/utl_exceptlist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_strlist.o .obj/utl_strlist.so .shobj/utl_strlist.o .shobj/utl_strlist.so: util/utl_strlist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_list.o .obj/utl_list.so .shobj/utl_list.o .shobj/utl_list.so: util/utl_list.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_exprlist.o .obj/utl_exprlist.so .shobj/utl_exprlist.o .shobj/utl_exprlist.so: util/utl_exprlist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_error.o .obj/utl_error.so .shobj/utl_error.o .shobj/utl_error.so: util/utl_error.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_indenter.o .obj/utl_indenter.so .shobj/utl_indenter.o .shobj/utl_indenter.so: util/utl_indenter.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_identifier.o .obj/utl_identifier.so .shobj/utl_identifier.o .shobj/utl_identifier.so: util/utl_identifier.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_idlist.o .obj/utl_idlist.so .shobj/utl_idlist.o .shobj/utl_idlist.so: util/utl_idlist.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/utl_global.o .obj/utl_global.so .shobj/utl_global.o .shobj/utl_global.so: util/utl_global.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/narrow.o .obj/narrow.so .shobj/narrow.o .shobj/narrow.so: narrow/narrow.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h
-.obj/be_array.o .obj/be_array.so .shobj/be_array.o .shobj/be_array.so: be/be_array.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_argument.o .obj/be_argument.so .shobj/be_argument.o .shobj/be_argument.so: be/be_argument.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_attribute.o .obj/be_attribute.so .shobj/be_attribute.o .shobj/be_attribute.so: be/be_attribute.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_constant.o .obj/be_constant.so .shobj/be_constant.o .shobj/be_constant.so: be/be_constant.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_enum.o .obj/be_enum.so .shobj/be_enum.o .shobj/be_enum.so: be/be_enum.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_enum_val.o .obj/be_enum_val.so .shobj/be_enum_val.o .shobj/be_enum_val.so: be/be_enum_val.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_exception.o .obj/be_exception.so .shobj/be_exception.o .shobj/be_exception.so: be/be_exception.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_expression.o .obj/be_expression.so .shobj/be_expression.o .shobj/be_expression.so: be/be_expression.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_field.o .obj/be_field.so .shobj/be_field.o .shobj/be_field.so: be/be_field.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_interface.o .obj/be_interface.so .shobj/be_interface.o .shobj/be_interface.so: be/be_interface.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be_visitor_interface.h be_include/be_visitor_scope.h \
- be_include/be_visitor.h be_include/be_visitor_decl.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor_context.h
-.obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be/be_interface_fwd.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_module.o .obj/be_module.so .shobj/be_module.o .shobj/be_module.so: be/be_module.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_native.o .obj/be_native.so .shobj/be_native.o .shobj/be_native.so: be/be_native.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_operation.o .obj/be_operation.so .shobj/be_operation.o .shobj/be_operation.so: be/be_operation.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_predefined_type.o .obj/be_predefined_type.so .shobj/be_predefined_type.o .shobj/be_predefined_type.so: be/be_predefined_type.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_root.o .obj/be_root.so .shobj/be_root.o .shobj/be_root.so: be/be_root.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_sequence.o .obj/be_sequence.so .shobj/be_sequence.o .shobj/be_sequence.so: be/be_sequence.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_sequence.h \
- be_include/be_visitor_decl.h
-.obj/be_string.o .obj/be_string.so .shobj/be_string.o .shobj/be_string.so: be/be_string.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_structure.o .obj/be_structure.so .shobj/be_structure.o .shobj/be_structure.so: be/be_structure.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_type.o .obj/be_type.so .shobj/be_type.o .shobj/be_type.so: be/be_type.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_typedef.o .obj/be_typedef.so .shobj/be_typedef.o .shobj/be_typedef.so: be/be_typedef.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_union.o .obj/be_union.so .shobj/be_union.o .shobj/be_union.so: be/be_union.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_union_branch.o .obj/be_union_branch.so .shobj/be_union_branch.o .shobj/be_union_branch.so: be/be_union_branch.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_union_label.o .obj/be_union_label.so .shobj/be_union_label.o .shobj/be_union_label.so: be/be_union_label.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_generator.o .obj/be_generator.so .shobj/be_generator.o .shobj/be_generator.so: be/be_generator.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_init.o .obj/be_init.so .shobj/be_init.o .shobj/be_init.so: be/be_init.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_produce.o .obj/be_produce.so .shobj/be_produce.o .shobj/be_produce.so: be/be_produce.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_interpretive.h
-.obj/be_args.o .obj/be_args.so .shobj/be_args.o .shobj/be_args.so: be/be_args.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_helper.o .obj/be_helper.so .shobj/be_helper.o .shobj/be_helper.so: be/be_helper.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_codegen.o .obj/be_codegen.so .shobj/be_codegen.o .shobj/be_codegen.so: be/be_codegen.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_factory.o .obj/be_factory.so .shobj/be_factory.o .shobj/be_factory.so: be/be_factory.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_sunsoft.h
-.obj/be_sunsoft.o .obj/be_sunsoft.so .shobj/be_sunsoft.o .shobj/be_sunsoft.so: be/be_sunsoft.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_sunsoft.h
-.obj/be_decl.o .obj/be_decl.so .shobj/be_decl.o .shobj/be_decl.so: be/be_decl.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_scope.o .obj/be_scope.so .shobj/be_scope.o .shobj/be_scope.so: be/be_scope.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state.o .obj/be_state.so .shobj/be_state.o .shobj/be_state.so: be/be_state.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_array.o .obj/be_state_array.so .shobj/be_state_array.o .shobj/be_state_array.so: be/be_state_array.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_argument.o .obj/be_state_argument.so .shobj/be_state_argument.o .shobj/be_state_argument.so: be/be_state_argument.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_attribute.o .obj/be_state_attribute.so .shobj/be_state_attribute.o .shobj/be_state_attribute.so: be/be_state_attribute.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_exception.o .obj/be_state_exception.so .shobj/be_state_exception.o .shobj/be_state_exception.so: be/be_state_exception.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_operation.o .obj/be_state_operation.so .shobj/be_state_operation.o .shobj/be_state_operation.so: be/be_state_operation.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_sequence.o .obj/be_state_sequence.so .shobj/be_state_sequence.o .shobj/be_state_sequence.so: be/be_state_sequence.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_structure.o .obj/be_state_structure.so .shobj/be_state_structure.o .shobj/be_state_structure.so: be/be_state_structure.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_typedef.o .obj/be_state_typedef.so .shobj/be_state_typedef.o .shobj/be_state_typedef.so: be/be_state_typedef.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_state_union.o .obj/be_state_union.so .shobj/be_state_union.o .shobj/be_state_union.so: be/be_state_union.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_visitor.o .obj/be_visitor.so .shobj/be_visitor.o .shobj/be_visitor.so: be/be_visitor.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_visitor_args.o .obj/be_visitor_args.so .shobj/be_visitor_args.o .shobj/be_visitor_args.so: be/be_visitor_args.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_args.h \
- be_include/be_visitor_decl.h
-.obj/be_visitor_attribute.o .obj/be_visitor_attribute.so .shobj/be_visitor_attribute.o .shobj/be_visitor_attribute.so: be/be_visitor_attribute.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_attribute.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_constant.o .obj/be_visitor_constant.so .shobj/be_visitor_constant.o .shobj/be_visitor_constant.so: be/be_visitor_constant.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_constant.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_context.o .obj/be_visitor_context.so .shobj/be_visitor_context.o .shobj/be_visitor_context.so: be/be_visitor_context.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h
-.obj/be_visitor_decl.o .obj/be_visitor_decl.so .shobj/be_visitor_decl.o .shobj/be_visitor_decl.so: be/be_visitor_decl.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_decl.h
-.obj/be_visitor_enum.o .obj/be_visitor_enum.so .shobj/be_visitor_enum.o .shobj/be_visitor_enum.so: be/be_visitor_enum.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_enum.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_exception.o .obj/be_visitor_exception.so .shobj/be_visitor_exception.o .shobj/be_visitor_exception.so: be/be_visitor_exception.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_exception.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_field.o .obj/be_visitor_field.so .shobj/be_visitor_field.o .shobj/be_visitor_field.so: be/be_visitor_field.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_field.h \
- be_include/be_visitor_decl.h
-.obj/be_visitor_interface.o .obj/be_visitor_interface.so .shobj/be_visitor_interface.o .shobj/be_visitor_interface.so: be/be_visitor_interface.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_interface.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \
- include/idl.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_interface_fwd.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_module.o .obj/be_visitor_module.so .shobj/be_visitor_module.o .shobj/be_visitor_module.so: be/be_visitor_module.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_module.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_operation.o .obj/be_visitor_operation.so .shobj/be_visitor_operation.o .shobj/be_visitor_operation.so: be/be_visitor_operation.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_operation.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be/be_visitor_root.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_root.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_scope.o .obj/be_visitor_scope.so .shobj/be_visitor_scope.o .shobj/be_visitor_scope.so: be/be_visitor_scope.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_scope.h \
- be_include/be_visitor_decl.h
-.obj/be_visitor_sequence.o .obj/be_visitor_sequence.so .shobj/be_visitor_sequence.o .shobj/be_visitor_sequence.so: be/be_visitor_sequence.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_sequence.h \
- be_include/be_visitor_decl.h
-.obj/be_visitor_structure.o .obj/be_visitor_structure.so .shobj/be_visitor_structure.o .shobj/be_visitor_structure.so: be/be_visitor_structure.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_structure.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_typedef.o .obj/be_visitor_typedef.so .shobj/be_visitor_typedef.o .shobj/be_visitor_typedef.so: be/be_visitor_typedef.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_typedef.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_union.o .obj/be_visitor_union.so .shobj/be_visitor_union.o .shobj/be_visitor_union.so: be/be_visitor_union.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_union.h \
- be_include/be_visitor_scope.h be_include/be_visitor_decl.h
-.obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be/be_visitor_union_branch.cpp \
- include/idl.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_visitor_union_branch.h \
- be_include/be_visitor_decl.h
-.obj/be_interpretive.o .obj/be_interpretive.so .shobj/be_interpretive.o .shobj/be_interpretive.so: be/be_interpretive.cpp include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i include/intlmacros.h \
- include/idl_narrow.h include/idl_defines.h include/idl_fwd.h \
- include/idl_bool.h include/utl_string.h include/utl_identifier.h \
- include/ast.h include/utl_scoped_name.h include/ast_decl.h \
- include/ast_expression.h include/utl_scope.h include/ast_type.h \
- include/ast_concrete_type.h include/ast_predefined_type.h \
- include/ast_module.h include/ast_root.h include/ast_interface.h \
- include/ast_interface_fwd.h include/ast_structure.h \
- include/ast_exception.h include/ast_enum.h include/ast_operation.h \
- include/utl_list.h include/ast_field.h include/ast_argument.h \
- include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_state.h be_include/be_codegen.h \
- be_include/be_factory.h be_include/be_visitor.h \
- be_include/be_visitor_context.h be_include/be_interpretive.h \
- be_include/be_visitor_args.h be_include/be_visitor_decl.h \
- be_include/be_visitor_attribute.h be_include/be_visitor_scope.h \
- be_include/be_visitor_constant.h be_include/be_visitor_enum.h \
- be_include/be_visitor_exception.h be_include/be_visitor_field.h \
- be_include/be_visitor_interface.h \
- be_include/be_visitor_interface_fwd.h be_include/be_visitor_module.h \
- be_include/be_visitor_operation.h be_include/be_visitor_root.h \
- be_include/be_visitor_sequence.h be_include/be_visitor_structure.h \
- be_include/be_visitor_typedef.h be_include/be_visitor_union.h \
- be_include/be_visitor_union_branch.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/README b/TAO/TAO_IDL/README
deleted file mode 100644
index 6d73554acce..00000000000
--- a/TAO/TAO_IDL/README
+++ /dev/null
@@ -1,233 +0,0 @@
-INTERFACE DEFINITION LANGUAGE COMPILER FRONT END
--==============================================-
-
-INTRODUCTION
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language! This is Release 1.3 of the CFE.
-
-The Interface Definition Language (IDL) implementation is divided into
-three parts:
-
-- A main program for driving the compilation process
-- A parser and attendant utilities
-- One or more back ends (BEs) for taking the processed input and producing
-  output in a target language and target format
-
-WARNINGS
-
-This is a preliminary version. This software is made available AS IS and
-WITH NO GUARANTEES. Please read  the copyright notice attached at the
-bottom of this file.
-
-IMPORTANT NOTICE FOR USERS OF OMG IDL CFE VERSION 1.2.
-
-Please carefully read the file CHANGES to obtain IMPORTANT INFORMATION on
-changes in that may affect the manner in which a BE is constructed. You
-must follow instructions contained in the file CHANGES to obtain a
-functional BE if you are migrating an existing BE from OMG IDL CFE v. 1.2.
-
-TARGET AUDIENCE
-
-Who should use this release?
-
-- You can use this source release to create a stand alone parser for OMG
-  Interface Definition Language. This may be useful to verify the legality
-  of IDL input.
-- Developers of OMG Interface Definition Language compilers should use this
-  release as a basis for writing their back ends, to obtain a common
-  framework for their compiler and to provide portable and uniform
-  parsing of IDL input.
-
-HOW TO OBTAIN THIS SOFTWARE
-
-Please use anonymous FTP to omg.org and supply your e-mail address as the
-password. Then change directories to pub/OMG_IDL_CFE_1.3, set binary transfer
-and get the file OMG_IDL_CFE_1.3.TAR.Z. This file includes copies of all
-individual documentation files in the directory.
-
-Precompiled binaries constructed from the sources in this release will be
-made available shortly, in the directory pub/OMG_IDL_CFE_1.3/bin. These
-binaries are useful for parsing IDL source and for learning about the
-language. Precompiled binaries for Solaris 2.x and for SunOS 4.x will be
-provided.
-
-You can also use the mail server program to retrieve this software. Send
-email with the subject 'help' to omg_idl@omg.org, and the mail server will
-respond with instructions on how to retrieve the software.
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to this newsgroup announcing its availability.
-
-Finally, the SunSoft OMG IDL CFE is also available on magnetic tape for a
-nominal media charge directly from SunSoft. Please refer to part number
-DIDL-100-STP when ordering.
-
-CONTACT POINT
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-WHAT IS PROVIDED IN THE RELEASE
-
-Provided in this release are:
-
-- A main program for driving an Interface Definition Language compiler
-- A parser for the Interface Definition Language grammar which builds an
-  internal representation of the input parsed. This internal
-  representation, named an Abstract Syntax Tree (AST), is used as input to
-  a back end
-- Some utility functions used by the parser
-- A demonstration back end (BE) which exercises the front end but produces
-  no translated output
-- Documentation of the public interfaces and of the contract between
-  the compiler front end and a back end
-
-OPERATION
-
-A complete compiler operates in two passes:
-
-- The first pass, provided in this release, parses the IDL input and
-  produces an internal representation, called an Abstract Syntax Tree (AST).
-  This pass also does a complete syntax and semantics check of the input
-  provided to ensure that exactly legal IDL input is accepted. If a syntax
-  or semantic error is discovered, the second pass is not invoked.
-- The second pass, provided by compiler developers, takes the AST and
-  produces output in the language and format of choice. A demonstration
-  back end is provided in the release.
-
-HOW TO USE THIS SOFTWARE
-
-To create a complete compiler from OMG Interface Definition Language to a
-target language, compiler developers will:
-
-- Write a back end (BE) to take the internal representation of the input
-  parsed and translate it to the target language and format. You will
-  probably want to replace the BE directory in this source tree with your
-  own BE directory
-- Link the BE with the sources provided here to produce a complete
-  compiler.
-
-DOCUMENTATION
-
-The OMG Interface Definition Language is fully described in the CORBA
-documentation, Chapter 4. This document may be obtained from OMG.
-
-This release also provides the following documents:
-
-- This README file, describing the release
-- INSTALL, describing installation of the software
-- WRITING_A_BE contains all the information needed to start writing a back
-  end for this distribution
-- CHANGES_IN_AST describes changes that affect migration of BEs written
-  against version 1.2 to version 1.3.
-- CLI, describing the command line interface to the CFE
-- ROADMAP, describing the directory structure for the source code. This
-  file will assist a developer in understanding the structure of the code
-  and navigating it
-- PROBLEMS, describing a list of issues that may be addressed in future
-  releases
-- BUG_REPORT, containing a form for use in reporting bugs and problems
-  with the IDL CFE
-
-ENVIRONMENT
-
-The INSTALL file explains how to customize the software for specific
-platforms. The source distribution expects the following environment:
-
-- Sparcstation 1, 2, or 10 hardware
-- SunPro SparcWorks 3.x or 4.0
-
-As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to
-compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use
-is made of Sun Make-specific features, and the Makefiles should be usable
-with other make programs.
-
-This release has been tested and is believed to operate correctly with:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-INSTALLATION
-
-This release is targetted for Sun workstations running Solaris 2.x. The
-process of installing this software is described in detail in the file
-INSTALL in this directory. The INSTALL file also describes how to customize
-the release for your own environment if it is different.
-
-KNOWN PROBLEMS
-
-A list of known deficiencies is provided in the file PROBLEMS in this
-directory. If you find a problem which is not mentioned in it, please
-report it as described below. Please read this file now to be apprised of
-the problems found so far with this release.
-
-COPYRIGHT
-
-This copyright notice appears on all files. Please read it!
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/TAO_IDL4.mak b/TAO/TAO_IDL/TAO_IDL4.mak
deleted file mode 100644
index 3eae728d494..00000000000
--- a/TAO/TAO_IDL/TAO_IDL4.mak
+++ /dev/null
@@ -1,14255 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=TAO_IDL - Win32 Release

-!MESSAGE No configuration specified.  Defaulting to TAO_IDL - Win32 Release.

-!ENDIF 

-

-!IF "$(CFG)" != "TAO_IDL - Win32 Release" && "$(CFG)" !=\

- "TAO_IDL - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO_IDL4.mak" CFG="TAO_IDL - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO_IDL - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "TAO_IDL - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "TAO_IDL - Win32 Release"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\TAO_IDL4.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\ast_argument.obj"

-	-@erase "$(INTDIR)\ast_array.obj"

-	-@erase "$(INTDIR)\ast_attribute.obj"

-	-@erase "$(INTDIR)\ast_check.obj"

-	-@erase "$(INTDIR)\ast_concrete_type.obj"

-	-@erase "$(INTDIR)\ast_constant.obj"

-	-@erase "$(INTDIR)\ast_decl.obj"

-	-@erase "$(INTDIR)\ast_enum.obj"

-	-@erase "$(INTDIR)\ast_enum_val.obj"

-	-@erase "$(INTDIR)\ast_exception.obj"

-	-@erase "$(INTDIR)\ast_expression.obj"

-	-@erase "$(INTDIR)\ast_field.obj"

-	-@erase "$(INTDIR)\ast_generator.obj"

-	-@erase "$(INTDIR)\ast_interface.obj"

-	-@erase "$(INTDIR)\ast_interface_fwd.obj"

-	-@erase "$(INTDIR)\ast_module.obj"

-	-@erase "$(INTDIR)\ast_operation.obj"

-	-@erase "$(INTDIR)\ast_predefined_type.obj"

-	-@erase "$(INTDIR)\ast_recursive.obj"

-	-@erase "$(INTDIR)\ast_redef.obj"

-	-@erase "$(INTDIR)\ast_root.obj"

-	-@erase "$(INTDIR)\ast_sequence.obj"

-	-@erase "$(INTDIR)\ast_string.obj"

-	-@erase "$(INTDIR)\ast_structure.obj"

-	-@erase "$(INTDIR)\ast_type.obj"

-	-@erase "$(INTDIR)\ast_typedef.obj"

-	-@erase "$(INTDIR)\ast_union.obj"

-	-@erase "$(INTDIR)\ast_union_branch.obj"

-	-@erase "$(INTDIR)\ast_union_label.obj"

-	-@erase "$(INTDIR)\be_args.obj"

-	-@erase "$(INTDIR)\be_argument.obj"

-	-@erase "$(INTDIR)\be_array.obj"

-	-@erase "$(INTDIR)\be_attribute.obj"

-	-@erase "$(INTDIR)\be_codegen.obj"

-	-@erase "$(INTDIR)\be_constant.obj"

-	-@erase "$(INTDIR)\be_decl.obj"

-	-@erase "$(INTDIR)\be_enum.obj"

-	-@erase "$(INTDIR)\be_enum_val.obj"

-	-@erase "$(INTDIR)\be_exception.obj"

-	-@erase "$(INTDIR)\be_expression.obj"

-	-@erase "$(INTDIR)\be_factory.obj"

-	-@erase "$(INTDIR)\be_field.obj"

-	-@erase "$(INTDIR)\be_generator.obj"

-	-@erase "$(INTDIR)\be_helper.obj"

-	-@erase "$(INTDIR)\be_init.obj"

-	-@erase "$(INTDIR)\be_interface.obj"

-	-@erase "$(INTDIR)\be_interface_fwd.obj"

-	-@erase "$(INTDIR)\be_module.obj"

-	-@erase "$(INTDIR)\be_operation.obj"

-	-@erase "$(INTDIR)\be_predefined_type.obj"

-	-@erase "$(INTDIR)\be_produce.obj"

-	-@erase "$(INTDIR)\be_root.obj"

-	-@erase "$(INTDIR)\be_scope.obj"

-	-@erase "$(INTDIR)\be_sequence.obj"

-	-@erase "$(INTDIR)\be_state.obj"

-	-@erase "$(INTDIR)\be_state_argument.obj"

-	-@erase "$(INTDIR)\be_state_array.obj"

-	-@erase "$(INTDIR)\be_state_attribute.obj"

-	-@erase "$(INTDIR)\be_state_operation.obj"

-	-@erase "$(INTDIR)\be_state_sequence.obj"

-	-@erase "$(INTDIR)\be_state_structure.obj"

-	-@erase "$(INTDIR)\be_state_typedef.obj"

-	-@erase "$(INTDIR)\be_state_union.obj"

-	-@erase "$(INTDIR)\be_string.obj"

-	-@erase "$(INTDIR)\be_structure.obj"

-	-@erase "$(INTDIR)\be_sunsoft.obj"

-	-@erase "$(INTDIR)\be_type.obj"

-	-@erase "$(INTDIR)\be_typedef.obj"

-	-@erase "$(INTDIR)\be_union.obj"

-	-@erase "$(INTDIR)\be_union_branch.obj"

-	-@erase "$(INTDIR)\be_union_label.obj"

-	-@erase "$(INTDIR)\drv_args.obj"

-	-@erase "$(INTDIR)\drv_fork.obj"

-	-@erase "$(INTDIR)\drv_init.obj"

-	-@erase "$(INTDIR)\drv_link.obj"

-	-@erase "$(INTDIR)\drv_main.obj"

-	-@erase "$(INTDIR)\drv_preproc.obj"

-	-@erase "$(INTDIR)\drv_private.obj"

-	-@erase "$(INTDIR)\fe_declarator.obj"

-	-@erase "$(INTDIR)\fe_extern.obj"

-	-@erase "$(INTDIR)\fe_init.obj"

-	-@erase "$(INTDIR)\fe_interface_header.obj"

-	-@erase "$(INTDIR)\fe_private.obj"

-	-@erase "$(INTDIR)\lex.yy.obj"

-	-@erase "$(INTDIR)\narrow.obj"

-	-@erase "$(INTDIR)\utl_decllist.obj"

-	-@erase "$(INTDIR)\utl_error.obj"

-	-@erase "$(INTDIR)\utl_exceptlist.obj"

-	-@erase "$(INTDIR)\utl_exprlist.obj"

-	-@erase "$(INTDIR)\utl_global.obj"

-	-@erase "$(INTDIR)\utl_identifier.obj"

-	-@erase "$(INTDIR)\utl_idlist.obj"

-	-@erase "$(INTDIR)\utl_indenter.obj"

-	-@erase "$(INTDIR)\utl_labellist.obj"

-	-@erase "$(INTDIR)\utl_list.obj"

-	-@erase "$(INTDIR)\utl_namelist.obj"

-	-@erase "$(INTDIR)\utl_scope.obj"

-	-@erase "$(INTDIR)\utl_stack.obj"

-	-@erase "$(INTDIR)\utl_string.obj"

-	-@erase "$(INTDIR)\utl_strlist.obj"

-	-@erase "$(INTDIR)\y.tab.obj"

-	-@erase "$(OUTDIR)\TAO_IDL4.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D CPP_LOCATION=\"cl\" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D\

- "NDEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D\

- CPP_LOCATION=\"cl\" /Fp"$(INTDIR)/TAO_IDL4.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO_IDL4.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/TAO_IDL4.pdb" /machine:I386 /out:"$(OUTDIR)/TAO_IDL4.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\ast_argument.obj" \

-	"$(INTDIR)\ast_array.obj" \

-	"$(INTDIR)\ast_attribute.obj" \

-	"$(INTDIR)\ast_check.obj" \

-	"$(INTDIR)\ast_concrete_type.obj" \

-	"$(INTDIR)\ast_constant.obj" \

-	"$(INTDIR)\ast_decl.obj" \

-	"$(INTDIR)\ast_enum.obj" \

-	"$(INTDIR)\ast_enum_val.obj" \

-	"$(INTDIR)\ast_exception.obj" \

-	"$(INTDIR)\ast_expression.obj" \

-	"$(INTDIR)\ast_field.obj" \

-	"$(INTDIR)\ast_generator.obj" \

-	"$(INTDIR)\ast_interface.obj" \

-	"$(INTDIR)\ast_interface_fwd.obj" \

-	"$(INTDIR)\ast_module.obj" \

-	"$(INTDIR)\ast_operation.obj" \

-	"$(INTDIR)\ast_predefined_type.obj" \

-	"$(INTDIR)\ast_recursive.obj" \

-	"$(INTDIR)\ast_redef.obj" \

-	"$(INTDIR)\ast_root.obj" \

-	"$(INTDIR)\ast_sequence.obj" \

-	"$(INTDIR)\ast_string.obj" \

-	"$(INTDIR)\ast_structure.obj" \

-	"$(INTDIR)\ast_type.obj" \

-	"$(INTDIR)\ast_typedef.obj" \

-	"$(INTDIR)\ast_union.obj" \

-	"$(INTDIR)\ast_union_branch.obj" \

-	"$(INTDIR)\ast_union_label.obj" \

-	"$(INTDIR)\be_args.obj" \

-	"$(INTDIR)\be_argument.obj" \

-	"$(INTDIR)\be_array.obj" \

-	"$(INTDIR)\be_attribute.obj" \

-	"$(INTDIR)\be_codegen.obj" \

-	"$(INTDIR)\be_constant.obj" \

-	"$(INTDIR)\be_decl.obj" \

-	"$(INTDIR)\be_enum.obj" \

-	"$(INTDIR)\be_enum_val.obj" \

-	"$(INTDIR)\be_exception.obj" \

-	"$(INTDIR)\be_expression.obj" \

-	"$(INTDIR)\be_factory.obj" \

-	"$(INTDIR)\be_field.obj" \

-	"$(INTDIR)\be_generator.obj" \

-	"$(INTDIR)\be_helper.obj" \

-	"$(INTDIR)\be_init.obj" \

-	"$(INTDIR)\be_interface.obj" \

-	"$(INTDIR)\be_interface_fwd.obj" \

-	"$(INTDIR)\be_module.obj" \

-	"$(INTDIR)\be_operation.obj" \

-	"$(INTDIR)\be_predefined_type.obj" \

-	"$(INTDIR)\be_produce.obj" \

-	"$(INTDIR)\be_root.obj" \

-	"$(INTDIR)\be_scope.obj" \

-	"$(INTDIR)\be_sequence.obj" \

-	"$(INTDIR)\be_state.obj" \

-	"$(INTDIR)\be_state_argument.obj" \

-	"$(INTDIR)\be_state_array.obj" \

-	"$(INTDIR)\be_state_attribute.obj" \

-	"$(INTDIR)\be_state_operation.obj" \

-	"$(INTDIR)\be_state_sequence.obj" \

-	"$(INTDIR)\be_state_structure.obj" \

-	"$(INTDIR)\be_state_typedef.obj" \

-	"$(INTDIR)\be_state_union.obj" \

-	"$(INTDIR)\be_string.obj" \

-	"$(INTDIR)\be_structure.obj" \

-	"$(INTDIR)\be_sunsoft.obj" \

-	"$(INTDIR)\be_type.obj" \

-	"$(INTDIR)\be_typedef.obj" \

-	"$(INTDIR)\be_union.obj" \

-	"$(INTDIR)\be_union_branch.obj" \

-	"$(INTDIR)\be_union_label.obj" \

-	"$(INTDIR)\drv_args.obj" \

-	"$(INTDIR)\drv_fork.obj" \

-	"$(INTDIR)\drv_init.obj" \

-	"$(INTDIR)\drv_link.obj" \

-	"$(INTDIR)\drv_main.obj" \

-	"$(INTDIR)\drv_preproc.obj" \

-	"$(INTDIR)\drv_private.obj" \

-	"$(INTDIR)\fe_declarator.obj" \

-	"$(INTDIR)\fe_extern.obj" \

-	"$(INTDIR)\fe_init.obj" \

-	"$(INTDIR)\fe_interface_header.obj" \

-	"$(INTDIR)\fe_private.obj" \

-	"$(INTDIR)\lex.yy.obj" \

-	"$(INTDIR)\narrow.obj" \

-	"$(INTDIR)\utl_decllist.obj" \

-	"$(INTDIR)\utl_error.obj" \

-	"$(INTDIR)\utl_exceptlist.obj" \

-	"$(INTDIR)\utl_exprlist.obj" \

-	"$(INTDIR)\utl_global.obj" \

-	"$(INTDIR)\utl_identifier.obj" \

-	"$(INTDIR)\utl_idlist.obj" \

-	"$(INTDIR)\utl_indenter.obj" \

-	"$(INTDIR)\utl_labellist.obj" \

-	"$(INTDIR)\utl_list.obj" \

-	"$(INTDIR)\utl_namelist.obj" \

-	"$(INTDIR)\utl_scope.obj" \

-	"$(INTDIR)\utl_stack.obj" \

-	"$(INTDIR)\utl_string.obj" \

-	"$(INTDIR)\utl_strlist.obj" \

-	"$(INTDIR)\y.tab.obj"

-

-"$(OUTDIR)\TAO_IDL4.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\TAO_IDL4.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\ast_argument.obj"

-	-@erase "$(INTDIR)\ast_array.obj"

-	-@erase "$(INTDIR)\ast_attribute.obj"

-	-@erase "$(INTDIR)\ast_check.obj"

-	-@erase "$(INTDIR)\ast_concrete_type.obj"

-	-@erase "$(INTDIR)\ast_constant.obj"

-	-@erase "$(INTDIR)\ast_decl.obj"

-	-@erase "$(INTDIR)\ast_enum.obj"

-	-@erase "$(INTDIR)\ast_enum_val.obj"

-	-@erase "$(INTDIR)\ast_exception.obj"

-	-@erase "$(INTDIR)\ast_expression.obj"

-	-@erase "$(INTDIR)\ast_field.obj"

-	-@erase "$(INTDIR)\ast_generator.obj"

-	-@erase "$(INTDIR)\ast_interface.obj"

-	-@erase "$(INTDIR)\ast_interface_fwd.obj"

-	-@erase "$(INTDIR)\ast_module.obj"

-	-@erase "$(INTDIR)\ast_operation.obj"

-	-@erase "$(INTDIR)\ast_predefined_type.obj"

-	-@erase "$(INTDIR)\ast_recursive.obj"

-	-@erase "$(INTDIR)\ast_redef.obj"

-	-@erase "$(INTDIR)\ast_root.obj"

-	-@erase "$(INTDIR)\ast_sequence.obj"

-	-@erase "$(INTDIR)\ast_string.obj"

-	-@erase "$(INTDIR)\ast_structure.obj"

-	-@erase "$(INTDIR)\ast_type.obj"

-	-@erase "$(INTDIR)\ast_typedef.obj"

-	-@erase "$(INTDIR)\ast_union.obj"

-	-@erase "$(INTDIR)\ast_union_branch.obj"

-	-@erase "$(INTDIR)\ast_union_label.obj"

-	-@erase "$(INTDIR)\be_args.obj"

-	-@erase "$(INTDIR)\be_argument.obj"

-	-@erase "$(INTDIR)\be_array.obj"

-	-@erase "$(INTDIR)\be_attribute.obj"

-	-@erase "$(INTDIR)\be_codegen.obj"

-	-@erase "$(INTDIR)\be_constant.obj"

-	-@erase "$(INTDIR)\be_decl.obj"

-	-@erase "$(INTDIR)\be_enum.obj"

-	-@erase "$(INTDIR)\be_enum_val.obj"

-	-@erase "$(INTDIR)\be_exception.obj"

-	-@erase "$(INTDIR)\be_expression.obj"

-	-@erase "$(INTDIR)\be_factory.obj"

-	-@erase "$(INTDIR)\be_field.obj"

-	-@erase "$(INTDIR)\be_generator.obj"

-	-@erase "$(INTDIR)\be_helper.obj"

-	-@erase "$(INTDIR)\be_init.obj"

-	-@erase "$(INTDIR)\be_interface.obj"

-	-@erase "$(INTDIR)\be_interface_fwd.obj"

-	-@erase "$(INTDIR)\be_module.obj"

-	-@erase "$(INTDIR)\be_operation.obj"

-	-@erase "$(INTDIR)\be_predefined_type.obj"

-	-@erase "$(INTDIR)\be_produce.obj"

-	-@erase "$(INTDIR)\be_root.obj"

-	-@erase "$(INTDIR)\be_scope.obj"

-	-@erase "$(INTDIR)\be_sequence.obj"

-	-@erase "$(INTDIR)\be_state.obj"

-	-@erase "$(INTDIR)\be_state_argument.obj"

-	-@erase "$(INTDIR)\be_state_array.obj"

-	-@erase "$(INTDIR)\be_state_attribute.obj"

-	-@erase "$(INTDIR)\be_state_operation.obj"

-	-@erase "$(INTDIR)\be_state_sequence.obj"

-	-@erase "$(INTDIR)\be_state_structure.obj"

-	-@erase "$(INTDIR)\be_state_typedef.obj"

-	-@erase "$(INTDIR)\be_state_union.obj"

-	-@erase "$(INTDIR)\be_string.obj"

-	-@erase "$(INTDIR)\be_structure.obj"

-	-@erase "$(INTDIR)\be_sunsoft.obj"

-	-@erase "$(INTDIR)\be_type.obj"

-	-@erase "$(INTDIR)\be_typedef.obj"

-	-@erase "$(INTDIR)\be_union.obj"

-	-@erase "$(INTDIR)\be_union_branch.obj"

-	-@erase "$(INTDIR)\be_union_label.obj"

-	-@erase "$(INTDIR)\drv_args.obj"

-	-@erase "$(INTDIR)\drv_fork.obj"

-	-@erase "$(INTDIR)\drv_init.obj"

-	-@erase "$(INTDIR)\drv_link.obj"

-	-@erase "$(INTDIR)\drv_main.obj"

-	-@erase "$(INTDIR)\drv_preproc.obj"

-	-@erase "$(INTDIR)\drv_private.obj"

-	-@erase "$(INTDIR)\fe_declarator.obj"

-	-@erase "$(INTDIR)\fe_extern.obj"

-	-@erase "$(INTDIR)\fe_init.obj"

-	-@erase "$(INTDIR)\fe_interface_header.obj"

-	-@erase "$(INTDIR)\fe_private.obj"

-	-@erase "$(INTDIR)\lex.yy.obj"

-	-@erase "$(INTDIR)\narrow.obj"

-	-@erase "$(INTDIR)\utl_decllist.obj"

-	-@erase "$(INTDIR)\utl_error.obj"

-	-@erase "$(INTDIR)\utl_exceptlist.obj"

-	-@erase "$(INTDIR)\utl_exprlist.obj"

-	-@erase "$(INTDIR)\utl_global.obj"

-	-@erase "$(INTDIR)\utl_identifier.obj"

-	-@erase "$(INTDIR)\utl_idlist.obj"

-	-@erase "$(INTDIR)\utl_indenter.obj"

-	-@erase "$(INTDIR)\utl_labellist.obj"

-	-@erase "$(INTDIR)\utl_list.obj"

-	-@erase "$(INTDIR)\utl_namelist.obj"

-	-@erase "$(INTDIR)\utl_scope.obj"

-	-@erase "$(INTDIR)\utl_stack.obj"

-	-@erase "$(INTDIR)\utl_string.obj"

-	-@erase "$(INTDIR)\utl_strlist.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(INTDIR)\y.tab.obj"

-	-@erase "$(OUTDIR)\TAO_IDL4.exe"

-	-@erase "$(OUTDIR)\TAO_IDL4.ilk"

-	-@erase "$(OUTDIR)\TAO_IDL4.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D CPP_LOCATION=\"cl\" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I\

- "..\.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D\

- CPP_LOCATION=\"cl\" /Fp"$(INTDIR)/TAO_IDL4.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO_IDL4.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/TAO_IDL4.pdb" /debug /machine:I386\

- /out:"$(OUTDIR)/TAO_IDL4.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\ast_argument.obj" \

-	"$(INTDIR)\ast_array.obj" \

-	"$(INTDIR)\ast_attribute.obj" \

-	"$(INTDIR)\ast_check.obj" \

-	"$(INTDIR)\ast_concrete_type.obj" \

-	"$(INTDIR)\ast_constant.obj" \

-	"$(INTDIR)\ast_decl.obj" \

-	"$(INTDIR)\ast_enum.obj" \

-	"$(INTDIR)\ast_enum_val.obj" \

-	"$(INTDIR)\ast_exception.obj" \

-	"$(INTDIR)\ast_expression.obj" \

-	"$(INTDIR)\ast_field.obj" \

-	"$(INTDIR)\ast_generator.obj" \

-	"$(INTDIR)\ast_interface.obj" \

-	"$(INTDIR)\ast_interface_fwd.obj" \

-	"$(INTDIR)\ast_module.obj" \

-	"$(INTDIR)\ast_operation.obj" \

-	"$(INTDIR)\ast_predefined_type.obj" \

-	"$(INTDIR)\ast_recursive.obj" \

-	"$(INTDIR)\ast_redef.obj" \

-	"$(INTDIR)\ast_root.obj" \

-	"$(INTDIR)\ast_sequence.obj" \

-	"$(INTDIR)\ast_string.obj" \

-	"$(INTDIR)\ast_structure.obj" \

-	"$(INTDIR)\ast_type.obj" \

-	"$(INTDIR)\ast_typedef.obj" \

-	"$(INTDIR)\ast_union.obj" \

-	"$(INTDIR)\ast_union_branch.obj" \

-	"$(INTDIR)\ast_union_label.obj" \

-	"$(INTDIR)\be_args.obj" \

-	"$(INTDIR)\be_argument.obj" \

-	"$(INTDIR)\be_array.obj" \

-	"$(INTDIR)\be_attribute.obj" \

-	"$(INTDIR)\be_codegen.obj" \

-	"$(INTDIR)\be_constant.obj" \

-	"$(INTDIR)\be_decl.obj" \

-	"$(INTDIR)\be_enum.obj" \

-	"$(INTDIR)\be_enum_val.obj" \

-	"$(INTDIR)\be_exception.obj" \

-	"$(INTDIR)\be_expression.obj" \

-	"$(INTDIR)\be_factory.obj" \

-	"$(INTDIR)\be_field.obj" \

-	"$(INTDIR)\be_generator.obj" \

-	"$(INTDIR)\be_helper.obj" \

-	"$(INTDIR)\be_init.obj" \

-	"$(INTDIR)\be_interface.obj" \

-	"$(INTDIR)\be_interface_fwd.obj" \

-	"$(INTDIR)\be_module.obj" \

-	"$(INTDIR)\be_operation.obj" \

-	"$(INTDIR)\be_predefined_type.obj" \

-	"$(INTDIR)\be_produce.obj" \

-	"$(INTDIR)\be_root.obj" \

-	"$(INTDIR)\be_scope.obj" \

-	"$(INTDIR)\be_sequence.obj" \

-	"$(INTDIR)\be_state.obj" \

-	"$(INTDIR)\be_state_argument.obj" \

-	"$(INTDIR)\be_state_array.obj" \

-	"$(INTDIR)\be_state_attribute.obj" \

-	"$(INTDIR)\be_state_operation.obj" \

-	"$(INTDIR)\be_state_sequence.obj" \

-	"$(INTDIR)\be_state_structure.obj" \

-	"$(INTDIR)\be_state_typedef.obj" \

-	"$(INTDIR)\be_state_union.obj" \

-	"$(INTDIR)\be_string.obj" \

-	"$(INTDIR)\be_structure.obj" \

-	"$(INTDIR)\be_sunsoft.obj" \

-	"$(INTDIR)\be_type.obj" \

-	"$(INTDIR)\be_typedef.obj" \

-	"$(INTDIR)\be_union.obj" \

-	"$(INTDIR)\be_union_branch.obj" \

-	"$(INTDIR)\be_union_label.obj" \

-	"$(INTDIR)\drv_args.obj" \

-	"$(INTDIR)\drv_fork.obj" \

-	"$(INTDIR)\drv_init.obj" \

-	"$(INTDIR)\drv_link.obj" \

-	"$(INTDIR)\drv_main.obj" \

-	"$(INTDIR)\drv_preproc.obj" \

-	"$(INTDIR)\drv_private.obj" \

-	"$(INTDIR)\fe_declarator.obj" \

-	"$(INTDIR)\fe_extern.obj" \

-	"$(INTDIR)\fe_init.obj" \

-	"$(INTDIR)\fe_interface_header.obj" \

-	"$(INTDIR)\fe_private.obj" \

-	"$(INTDIR)\lex.yy.obj" \

-	"$(INTDIR)\narrow.obj" \

-	"$(INTDIR)\utl_decllist.obj" \

-	"$(INTDIR)\utl_error.obj" \

-	"$(INTDIR)\utl_exceptlist.obj" \

-	"$(INTDIR)\utl_exprlist.obj" \

-	"$(INTDIR)\utl_global.obj" \

-	"$(INTDIR)\utl_identifier.obj" \

-	"$(INTDIR)\utl_idlist.obj" \

-	"$(INTDIR)\utl_indenter.obj" \

-	"$(INTDIR)\utl_labellist.obj" \

-	"$(INTDIR)\utl_list.obj" \

-	"$(INTDIR)\utl_namelist.obj" \

-	"$(INTDIR)\utl_scope.obj" \

-	"$(INTDIR)\utl_stack.obj" \

-	"$(INTDIR)\utl_string.obj" \

-	"$(INTDIR)\utl_strlist.obj" \

-	"$(INTDIR)\y.tab.obj"

-

-"$(OUTDIR)\TAO_IDL4.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "TAO_IDL - Win32 Release"

-# Name "TAO_IDL - Win32 Debug"

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_decllist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_D=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_decllist.obj" : $(SOURCE) $(DEP_CPP_UTL_D) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_D=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_decllist.obj" : $(SOURCE) $(DEP_CPP_UTL_D) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_error.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_E=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_error.obj" : $(SOURCE) $(DEP_CPP_UTL_E) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_E=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_error.obj" : $(SOURCE) $(DEP_CPP_UTL_E) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_exceptlist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exceptlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exceptlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_exprlist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exprlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exprlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_global.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_G=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_global.obj" : $(SOURCE) $(DEP_CPP_UTL_G) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_G=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_global.obj" : $(SOURCE) $(DEP_CPP_UTL_G) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_identifier.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_identifier.obj" : $(SOURCE) $(DEP_CPP_UTL_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_identifier.obj" : $(SOURCE) $(DEP_CPP_UTL_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_idlist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_ID=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_idlist.obj" : $(SOURCE) $(DEP_CPP_UTL_ID) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_ID=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_idlist.obj" : $(SOURCE) $(DEP_CPP_UTL_ID) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_indenter.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_indenter.obj" : $(SOURCE) $(DEP_CPP_UTL_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_indenter.obj" : $(SOURCE) $(DEP_CPP_UTL_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_labellist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_L=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_labellist.obj" : $(SOURCE) $(DEP_CPP_UTL_L) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_L=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_labellist.obj" : $(SOURCE) $(DEP_CPP_UTL_L) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_list.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_LI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_list.obj" : $(SOURCE) $(DEP_CPP_UTL_LI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_LI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_list.obj" : $(SOURCE) $(DEP_CPP_UTL_LI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_namelist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_N=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_namelist.obj" : $(SOURCE) $(DEP_CPP_UTL_N) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_N=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_namelist.obj" : $(SOURCE) $(DEP_CPP_UTL_N) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_scope.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_scope.obj" : $(SOURCE) $(DEP_CPP_UTL_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_scope.obj" : $(SOURCE) $(DEP_CPP_UTL_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_stack.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_stack.obj" : $(SOURCE) $(DEP_CPP_UTL_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_stack.obj" : $(SOURCE) $(DEP_CPP_UTL_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_string.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_string.obj" : $(SOURCE) $(DEP_CPP_UTL_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_string.obj" : $(SOURCE) $(DEP_CPP_UTL_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_strlist.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_UTL_STRL=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_strlist.obj" : $(SOURCE) $(DEP_CPP_UTL_STRL) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_UTL_STRL=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_strlist.obj" : $(SOURCE) $(DEP_CPP_UTL_STRL) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\narrow\narrow.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_NARRO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\narrow.obj" : $(SOURCE) $(DEP_CPP_NARRO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_NARRO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\narrow.obj" : $(SOURCE) $(DEP_CPP_NARRO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_declarator.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_FE_DE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_declarator.obj" : $(SOURCE) $(DEP_CPP_FE_DE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_FE_DE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_declarator.obj" : $(SOURCE) $(DEP_CPP_FE_DE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_extern.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_FE_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_extern.obj" : $(SOURCE) $(DEP_CPP_FE_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_FE_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_extern.obj" : $(SOURCE) $(DEP_CPP_FE_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_init.cpp

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-DEP_CPP_FE_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_init.obj" : $(SOURCE) $(DEP_CPP_FE_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-DEP_CPP_FE_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/Basic_Types.h"\

-	"..\..\ace/Basic_Types.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/inc_user_config.h"\

-	"..\..\ace/iosfwd.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/streams.h"\

-	"..\..\ace/sys_conf.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_native.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_init.obj" : $(SOURCE) $(DEP_CPP_FE_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_interface_header.cpp

-DEP_CPP_FE_INT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_interface_header.obj" : $(SOURCE) $(DEP_CPP_FE_INT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_private.cpp

-DEP_CPP_FE_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_private.obj" : $(SOURCE) $(DEP_CPP_FE_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\lex.yy.cpp

-DEP_CPP_LEX_Y=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\fe\y.tab.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\lex.yy.obj" : $(SOURCE) $(DEP_CPP_LEX_Y) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\y.tab.cpp

-DEP_CPP_Y_TAB=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_extern.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\y.tab.obj" : $(SOURCE) $(DEP_CPP_Y_TAB) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_args.cpp

-DEP_CPP_DRV_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_args.obj" : $(SOURCE) $(DEP_CPP_DRV_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_fork.cpp

-DEP_CPP_DRV_F=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Process.h"\

-	"..\..\ace/Process.i"\

-	"..\..\ace/Process_Manager.h"\

-	"..\..\ace/Process_Manager.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_fork.obj" : $(SOURCE) $(DEP_CPP_DRV_F) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_init.cpp

-DEP_CPP_DRV_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_init.obj" : $(SOURCE) $(DEP_CPP_DRV_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_link.cpp

-DEP_CPP_DRV_L=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_link.obj" : $(SOURCE) $(DEP_CPP_DRV_L) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_main.cpp

-DEP_CPP_DRV_M=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_main.obj" : $(SOURCE) $(DEP_CPP_DRV_M) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_preproc.cpp

-DEP_CPP_DRV_P=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Process.h"\

-	"..\..\ace/Process.i"\

-	"..\..\ace/Process_Manager.h"\

-	"..\..\ace/Process_Manager.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_preproc.obj" : $(SOURCE) $(DEP_CPP_DRV_P) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_private.cpp

-DEP_CPP_DRV_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\drv_private.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_private.obj" : $(SOURCE) $(DEP_CPP_DRV_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_args.cpp

-DEP_CPP_BE_AR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_args.obj" : $(SOURCE) $(DEP_CPP_BE_AR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_argument.cpp

-DEP_CPP_BE_ARG=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_argument.obj" : $(SOURCE) $(DEP_CPP_BE_ARG) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_array.cpp

-DEP_CPP_BE_ARR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_array.obj" : $(SOURCE) $(DEP_CPP_BE_ARR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_attribute.cpp

-DEP_CPP_BE_AT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_AT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_codegen.cpp

-DEP_CPP_BE_CO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_codegen.obj" : $(SOURCE) $(DEP_CPP_BE_CO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_constant.cpp

-DEP_CPP_BE_CON=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_constant.obj" : $(SOURCE) $(DEP_CPP_BE_CON) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_decl.cpp

-DEP_CPP_BE_DE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_decl.obj" : $(SOURCE) $(DEP_CPP_BE_DE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_enum.cpp

-DEP_CPP_BE_EN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_enum.obj" : $(SOURCE) $(DEP_CPP_BE_EN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_enum_val.cpp

-DEP_CPP_BE_ENU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_enum_val.obj" : $(SOURCE) $(DEP_CPP_BE_ENU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_exception.cpp

-DEP_CPP_BE_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_exception.obj" : $(SOURCE) $(DEP_CPP_BE_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_expression.cpp

-DEP_CPP_BE_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_expression.obj" : $(SOURCE) $(DEP_CPP_BE_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_factory.cpp

-DEP_CPP_BE_FA=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_sunsoft.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_factory.obj" : $(SOURCE) $(DEP_CPP_BE_FA) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_field.cpp

-DEP_CPP_BE_FI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_field.obj" : $(SOURCE) $(DEP_CPP_BE_FI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_generator.cpp

-DEP_CPP_BE_GE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_generator.obj" : $(SOURCE) $(DEP_CPP_BE_GE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_helper.cpp

-DEP_CPP_BE_HE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_helper.obj" : $(SOURCE) $(DEP_CPP_BE_HE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_init.cpp

-DEP_CPP_BE_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_init.obj" : $(SOURCE) $(DEP_CPP_BE_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_interface.cpp

-DEP_CPP_BE_INT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_interface.obj" : $(SOURCE) $(DEP_CPP_BE_INT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_interface_fwd.cpp

-DEP_CPP_BE_INTE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_BE_INTE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_module.cpp

-DEP_CPP_BE_MO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_module.obj" : $(SOURCE) $(DEP_CPP_BE_MO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_operation.cpp

-DEP_CPP_BE_OP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_operation.obj" : $(SOURCE) $(DEP_CPP_BE_OP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_predefined_type.cpp

-DEP_CPP_BE_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_predefined_type.obj" : $(SOURCE) $(DEP_CPP_BE_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_produce.cpp

-DEP_CPP_BE_PRO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_produce.obj" : $(SOURCE) $(DEP_CPP_BE_PRO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_root.cpp

-DEP_CPP_BE_RO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_root.obj" : $(SOURCE) $(DEP_CPP_BE_RO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_scope.cpp

-DEP_CPP_BE_SC=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_scope.obj" : $(SOURCE) $(DEP_CPP_BE_SC) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_sequence.cpp

-DEP_CPP_BE_SE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_SE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state.cpp

-DEP_CPP_BE_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state.obj" : $(SOURCE) $(DEP_CPP_BE_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_string.cpp

-DEP_CPP_BE_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_string.obj" : $(SOURCE) $(DEP_CPP_BE_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_structure.cpp

-DEP_CPP_BE_STRU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STRU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_sunsoft.cpp

-DEP_CPP_BE_SU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_sunsoft.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_sunsoft.obj" : $(SOURCE) $(DEP_CPP_BE_SU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_type.cpp

-DEP_CPP_BE_TY=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_type.obj" : $(SOURCE) $(DEP_CPP_BE_TY) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_typedef.cpp

-DEP_CPP_BE_TYP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_TYP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union.cpp

-DEP_CPP_BE_UN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union.obj" : $(SOURCE) $(DEP_CPP_BE_UN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union_branch.cpp

-DEP_CPP_BE_UNI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union_branch.obj" : $(SOURCE) $(DEP_CPP_BE_UNI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union_label.cpp

-DEP_CPP_BE_UNIO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union_label.obj" : $(SOURCE) $(DEP_CPP_BE_UNIO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_argument.cpp

-DEP_CPP_AST_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_argument.obj" : $(SOURCE) $(DEP_CPP_AST_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_array.cpp

-DEP_CPP_AST_AR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_array.obj" : $(SOURCE) $(DEP_CPP_AST_AR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_attribute.cpp

-DEP_CPP_AST_AT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_attribute.obj" : $(SOURCE) $(DEP_CPP_AST_AT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_check.cpp

-DEP_CPP_AST_C=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_check.obj" : $(SOURCE) $(DEP_CPP_AST_C) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_concrete_type.cpp

-DEP_CPP_AST_CO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_concrete_type.obj" : $(SOURCE) $(DEP_CPP_AST_CO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_constant.cpp

-DEP_CPP_AST_CON=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_constant.obj" : $(SOURCE) $(DEP_CPP_AST_CON) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_decl.cpp

-DEP_CPP_AST_D=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_decl.obj" : $(SOURCE) $(DEP_CPP_AST_D) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_enum.cpp

-DEP_CPP_AST_E=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_enum.obj" : $(SOURCE) $(DEP_CPP_AST_E) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_enum_val.cpp

-DEP_CPP_AST_EN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_enum_val.obj" : $(SOURCE) $(DEP_CPP_AST_EN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_exception.cpp

-DEP_CPP_AST_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_exception.obj" : $(SOURCE) $(DEP_CPP_AST_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_expression.cpp

-DEP_CPP_AST_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_expression.obj" : $(SOURCE) $(DEP_CPP_AST_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_field.cpp

-DEP_CPP_AST_F=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_field.obj" : $(SOURCE) $(DEP_CPP_AST_F) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_generator.cpp

-DEP_CPP_AST_G=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_generator.obj" : $(SOURCE) $(DEP_CPP_AST_G) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_interface.cpp

-DEP_CPP_AST_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_interface.obj" : $(SOURCE) $(DEP_CPP_AST_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_interface_fwd.cpp

-DEP_CPP_AST_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_AST_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_module.cpp

-DEP_CPP_AST_M=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_module.obj" : $(SOURCE) $(DEP_CPP_AST_M) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_operation.cpp

-DEP_CPP_AST_O=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_operation.obj" : $(SOURCE) $(DEP_CPP_AST_O) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_predefined_type.cpp

-DEP_CPP_AST_P=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_predefined_type.obj" : $(SOURCE) $(DEP_CPP_AST_P) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_recursive.cpp

-DEP_CPP_AST_R=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_recursive.obj" : $(SOURCE) $(DEP_CPP_AST_R) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_redef.cpp

-DEP_CPP_AST_RE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_redef.obj" : $(SOURCE) $(DEP_CPP_AST_RE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_root.cpp

-DEP_CPP_AST_RO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_root.obj" : $(SOURCE) $(DEP_CPP_AST_RO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_sequence.cpp

-DEP_CPP_AST_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_sequence.obj" : $(SOURCE) $(DEP_CPP_AST_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_string.cpp

-DEP_CPP_AST_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_string.obj" : $(SOURCE) $(DEP_CPP_AST_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_structure.cpp

-DEP_CPP_AST_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_structure.obj" : $(SOURCE) $(DEP_CPP_AST_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_type.cpp

-DEP_CPP_AST_T=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_type.obj" : $(SOURCE) $(DEP_CPP_AST_T) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_typedef.cpp

-DEP_CPP_AST_TY=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_typedef.obj" : $(SOURCE) $(DEP_CPP_AST_TY) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union.cpp

-DEP_CPP_AST_U=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union.obj" : $(SOURCE) $(DEP_CPP_AST_U) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union_branch.cpp

-DEP_CPP_AST_UN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union_branch.obj" : $(SOURCE) $(DEP_CPP_AST_UN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union_label.cpp

-DEP_CPP_AST_UNI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union_label.obj" : $(SOURCE) $(DEP_CPP_AST_UNI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_union.cpp

-DEP_CPP_BE_STA=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_union.obj" : $(SOURCE) $(DEP_CPP_BE_STA) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_array.cpp

-DEP_CPP_BE_STAT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_array.obj" : $(SOURCE) $(DEP_CPP_BE_STAT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_attribute.cpp

-DEP_CPP_BE_STATE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_STATE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_operation.cpp

-DEP_CPP_BE_STATE_=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_operation.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_sequence.cpp

-DEP_CPP_BE_STATE_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_structure.cpp

-DEP_CPP_BE_STATE_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_ST)\

- "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_typedef.cpp

-DEP_CPP_BE_STATE_T=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_T) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_argument.cpp

-DEP_CPP_BE_STATE_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_argument.h"\

-	".\be_include\be_array.h"\

-	".\be_include\be_attribute.h"\

-	".\be_include\be_codegen.h"\

-	".\be_include\be_constant.h"\

-	".\be_include\be_decl.h"\

-	".\be_include\be_enum.h"\

-	".\be_include\be_enum_val.h"\

-	".\be_include\be_exception.h"\

-	".\be_include\be_expression.h"\

-	".\be_include\be_factory.h"\

-	".\be_include\be_field.h"\

-	".\be_include\be_generator.h"\

-	".\be_include\be_helper.h"\

-	".\be_include\be_interface.h"\

-	".\be_include\be_interface_fwd.h"\

-	".\be_include\be_module.h"\

-	".\be_include\be_operation.h"\

-	".\be_include\be_predefined_type.h"\

-	".\be_include\be_root.h"\

-	".\be_include\be_scope.h"\

-	".\be_include\be_sequence.h"\

-	".\be_include\be_state.h"\

-	".\be_include\be_string.h"\

-	".\be_include\be_structure.h"\

-	".\be_include\be_type.h"\

-	".\be_include\be_typedef.h"\

-	".\be_include\be_union.h"\

-	".\be_include\be_union_branch.h"\

-	".\be_include\be_union_label.h"\

-	".\include\ast.h"\

-	".\include\ast_argument.h"\

-	".\include\ast_array.h"\

-	".\include\ast_attribute.h"\

-	".\include\ast_concrete_type.h"\

-	".\include\ast_constant.h"\

-	".\include\ast_decl.h"\

-	".\include\ast_enum.h"\

-	".\include\ast_enum_val.h"\

-	".\include\ast_exception.h"\

-	".\include\ast_expression.h"\

-	".\include\ast_extern.h"\

-	".\include\ast_field.h"\

-	".\include\ast_generator.h"\

-	".\include\ast_interface.h"\

-	".\include\ast_interface_fwd.h"\

-	".\include\ast_module.h"\

-	".\include\ast_operation.h"\

-	".\include\ast_predefined_type.h"\

-	".\include\ast_root.h"\

-	".\include\ast_sequence.h"\

-	".\include\ast_string.h"\

-	".\include\ast_structure.h"\

-	".\include\ast_type.h"\

-	".\include\ast_typedef.h"\

-	".\include\ast_union.h"\

-	".\include\ast_union_branch.h"\

-	".\include\ast_union_label.h"\

-	".\include\be_extern.h"\

-	".\include\drv_extern.h"\

-	".\include\fe_extern.h"\

-	".\include\global_extern.h"\

-	".\include\idl.h"\

-	".\include\idl_bool.h"\

-	".\include\idl_defines.h"\

-	".\include\idl_extern.h"\

-	".\include\idl_fwd.h"\

-	".\include\idl_global.h"\

-	".\include\idl_narrow.h"\

-	".\include\intlmacros.h"\

-	".\include\nr_extern.h"\

-	".\include\util.h"\

-	".\include\utl_decllist.h"\

-	".\include\utl_error.h"\

-	".\include\utl_exceptlist.h"\

-	".\include\utl_exprlist.h"\

-	".\include\utl_identifier.h"\

-	".\include\utl_idlist.h"\

-	".\include\utl_indenter.h"\

-	".\include\utl_labellist.h"\

-	".\include\utl_list.h"\

-	".\include\utl_namelist.h"\

-	".\include\utl_scope.h"\

-	".\include\utl_scoped_name.h"\

-	".\include\utl_stack.h"\

-	".\include\utl_string.h"\

-	".\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_argument.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/TAO_IDL/TAO_IDL4.mdp b/TAO/TAO_IDL/TAO_IDL4.mdp
deleted file mode 100644
index 30167b40695..00000000000
--- a/TAO/TAO_IDL/TAO_IDL4.mdp
+++ /dev/null
diff --git a/TAO/TAO_IDL/ast/Makefile b/TAO/TAO_IDL/ast/Makefile
deleted file mode 100644
index 9cc6c17fb69..00000000000
--- a/TAO/TAO_IDL/ast/Makefile
+++ /dev/null
@@ -1,1376 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libast
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libast
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-AST_FILES	= \
-		ast_array \
-		ast_argument \
-		ast_attribute \
-		ast_check \
-		ast_concrete_type \
-		ast_constant \
-		ast_decl \
-		ast_enum \
-		ast_enum_val \
-		ast_exception \
-		ast_expression \
-		ast_field \
-		ast_interface \
-		ast_interface_fwd \
-		ast_module \
-		ast_native \
-		ast_operation \
-		ast_predefined_type \
-		ast_root \
-		ast_sequence \
-		ast_string \
-		ast_structure \
-		ast_type \
-		ast_typedef \
-		ast_union \
-		ast_union_branch \
-		ast_union_label \
-		ast_generator \
-		ast_redef \
-		ast_recursive
-
-FILES	 = $(AST_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/ast_array.o .obj/ast_array.so .shobj/ast_array.o .shobj/ast_array.so: ast_array.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_argument.o .obj/ast_argument.so .shobj/ast_argument.o .shobj/ast_argument.so: ast_argument.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_attribute.o .obj/ast_attribute.so .shobj/ast_attribute.o .shobj/ast_attribute.so: ast_attribute.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_check.o .obj/ast_check.so .shobj/ast_check.o .shobj/ast_check.so: ast_check.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_concrete_type.o .obj/ast_concrete_type.so .shobj/ast_concrete_type.o .shobj/ast_concrete_type.so: ast_concrete_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_constant.o .obj/ast_constant.so .shobj/ast_constant.o .shobj/ast_constant.so: ast_constant.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_decl.o .obj/ast_decl.so .shobj/ast_decl.o .shobj/ast_decl.so: ast_decl.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_enum.o .obj/ast_enum.so .shobj/ast_enum.o .shobj/ast_enum.so: ast_enum.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_enum_val.o .obj/ast_enum_val.so .shobj/ast_enum_val.o .shobj/ast_enum_val.so: ast_enum_val.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_exception.o .obj/ast_exception.so .shobj/ast_exception.o .shobj/ast_exception.so: ast_exception.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_expression.o .obj/ast_expression.so .shobj/ast_expression.o .shobj/ast_expression.so: ast_expression.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_field.o .obj/ast_field.so .shobj/ast_field.o .shobj/ast_field.so: ast_field.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_interface.o .obj/ast_interface.so .shobj/ast_interface.o .shobj/ast_interface.so: ast_interface.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_interface_fwd.o .obj/ast_interface_fwd.so .shobj/ast_interface_fwd.o .shobj/ast_interface_fwd.so: ast_interface_fwd.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_module.o .obj/ast_module.so .shobj/ast_module.o .shobj/ast_module.so: ast_module.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_native.o .obj/ast_native.so .shobj/ast_native.o .shobj/ast_native.so: ast_native.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_operation.o .obj/ast_operation.so .shobj/ast_operation.o .shobj/ast_operation.so: ast_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_predefined_type.o .obj/ast_predefined_type.so .shobj/ast_predefined_type.o .shobj/ast_predefined_type.so: ast_predefined_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_root.o .obj/ast_root.so .shobj/ast_root.o .shobj/ast_root.so: ast_root.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_sequence.o .obj/ast_sequence.so .shobj/ast_sequence.o .shobj/ast_sequence.so: ast_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_string.o .obj/ast_string.so .shobj/ast_string.o .shobj/ast_string.so: ast_string.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_structure.o .obj/ast_structure.so .shobj/ast_structure.o .shobj/ast_structure.so: ast_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_type.o .obj/ast_type.so .shobj/ast_type.o .shobj/ast_type.so: ast_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_typedef.o .obj/ast_typedef.so .shobj/ast_typedef.o .shobj/ast_typedef.so: ast_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_union.o .obj/ast_union.so .shobj/ast_union.o .shobj/ast_union.so: ast_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_union_branch.o .obj/ast_union_branch.so .shobj/ast_union_branch.o .shobj/ast_union_branch.so: ast_union_branch.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_union_label.o .obj/ast_union_label.so .shobj/ast_union_label.o .shobj/ast_union_label.so: ast_union_label.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_generator.o .obj/ast_generator.so .shobj/ast_generator.o .shobj/ast_generator.so: ast_generator.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_redef.o .obj/ast_redef.so .shobj/ast_redef.o .shobj/ast_redef.so: ast_redef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/ast_recursive.o .obj/ast_recursive.so .shobj/ast_recursive.o .shobj/ast_recursive.so: ast_recursive.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
deleted file mode 100644
index 3e1b2e34cd0..00000000000
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_argument.cc - Implementation of class AST_Argument.cc
- *
- * AST_Argument nodes denote arguments to an operation. They
- * are AST_Fields with directions. Thus, they have a name
- * (an UTL_ScopedName) and a type (a subclass of AST_Type).
- * Additionally they have a direction field which takes values
- * from the enum AST_Argument::Direction.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static functions
- */
-
-/*
- * Convert an enum Direction value to a char *
- */
-static char *
-direction_to_string(AST_Argument::Direction d)
-{
-  switch (d) {
-  case AST_Argument::dir_IN:
-    return "in";
-  case AST_Argument::dir_OUT:
-    return "out";
-  case AST_Argument::dir_INOUT:
-    return "inout";
-  }
-  return NULL;
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-AST_Argument::AST_Argument()
-	    : pd_direction(dir_IN)
-{
-}
-
-AST_Argument::AST_Argument(Direction d, AST_Type *ft, UTL_ScopedName *n,
-			   UTL_StrList *p)
-	   : AST_Field(AST_Decl::NT_argument, ft, n, p),
-	     AST_Decl(AST_Decl::NT_argument, n, p),
-	     pd_direction(d)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Argument node to the ostream o
- */
-void
-AST_Argument::dump(ostream &o)
-{
-  o << direction_to_string(pd_direction) << " ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Argument::Direction
-AST_Argument::direction()
-{
-  return pd_direction;
-}
-
-/*
- * Narrowing operations
- */
-IMPL_NARROW_METHODS1(AST_Argument, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_Argument)
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
deleted file mode 100644
index 6a273498668..00000000000
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_array.cc - Implementation of class AST_Array
- *
- * AST_Array nodes denote array type and field modifiers.
- * AST_Array nodes have a list of dimensions (a UTL_ExprList)
- * a count of the number of dimensions and a base type (a
- * subtype of AST_ConcreteType. This means that we cannot have
- * arrays of AST_Interfaces???
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Array::AST_Array()
-	 : pd_n_dims(0),
-	   pd_dims(NULL),
-	   pd_base_type(NULL)
-{
-}
-
-AST_Array::AST_Array(UTL_ScopedName *n, unsigned long nd, UTL_ExprList *ds)
-	 : AST_Decl(AST_Decl::NT_array, n, NULL),
-	   pd_n_dims(nd), pd_base_type(NULL)
-{
-  pd_dims = compute_dims(ds, nd);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Compute how many dimensions there are and collect their expressions
- * into an array
- */
-AST_Expression **
-AST_Array::compute_dims(UTL_ExprList *ds, unsigned long nds)
-{
-  AST_Expression	**result;
-  UTL_ExprlistActiveIterator *l;
-  unsigned long		i;
-
-  if (ds == NULL)
-    return NULL;
-
-  result = new AST_Expression *[nds];
-  l      = new UTL_ExprlistActiveIterator(ds);
-
-  for (i = 0; !(l->is_done()) && i < nds; l->next(), i++)
-    result[i] = l->item();
-  delete l;
-  return result;
-}
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Array node to the ostream o
- */
-void
-AST_Array::dump(ostream &o)
-{
-  unsigned long	i;
-
-  pd_base_type->dump(o);
-  o << " ";
-  local_name()->dump(o);
-  for (i = 0; i < pd_n_dims; i++) {
-    o << "[";
-    pd_dims[i]->dump(o);
-    o << "]";
-  }
-}
-
-/*
- * Data accessors
- */
-unsigned long
-AST_Array::n_dims()
-{
-  return pd_n_dims;
-}
-
-AST_Expression **
-AST_Array::dims()
-{
-  return pd_dims;
-}
-
-AST_Type *
-AST_Array::base_type()
-{
-  return pd_base_type;
-}
-
-void
-AST_Array::set_base_type(AST_Type *nbt)
-{
-  pd_base_type = nbt;
-}
-
-void
-AST_Array::set_dims(AST_Expression **ds, unsigned long nds)
-{
-    pd_dims = ds;
-    pd_n_dims = nds;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Array, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_Array)
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
deleted file mode 100644
index 57019823810..00000000000
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_attribute.cc - Implementation of class AST_Attribute.cc
- *
- * AST_Attribute nodes denote IDL attribute declarations.
- * AST_Attribute nodes are AST_Fields with a readonly indication.
- * Hence they have a name (an UTL_ScopedName), a type (a subtype
- * of AST_Type) and a boolean indicating whether the attribute is
- * readonly.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Attribute::AST_Attribute()
-	     : pd_readonly(I_TRUE)
-{
-}
-
-AST_Attribute::AST_Attribute(idl_bool ro,
-			     AST_Type *ft,
-			     UTL_ScopedName *n,
-			     UTL_StrList *p)
-	     : AST_Field(AST_Decl::NT_attr, ft, n, p),
-	       AST_Decl(AST_Decl::NT_attr, n, p),
-	       pd_readonly(ro)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Attribute to the ostream o
- */
-void
-AST_Attribute::dump(ostream &o)
-{
-  o << (pd_readonly == I_TRUE ? "readonly" : "") << " attribute ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-idl_bool
-AST_Attribute::readonly()
-{
-  return pd_readonly;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Attribute, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_Attribute)
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
deleted file mode 100644
index a8e3677cceb..00000000000
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_check.cc - Check AST nodes representing fwd declared interfaces
- *		  after parse of AST is completed.
- *
- * The check ensures that for every forward declared interface we also
- * saw a full definition of that interface.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static storage for remembering nodes
- */
-static AST_InterfaceFwd	**ast_fwds = NULL;
-static long		ast_n_fwds_used = 0;
-static long		ast_n_fwds_alloc = 0;
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Store a node representing a forward declared interface
- */
-void
-AST_record_fwd_interface(AST_InterfaceFwd *n)
-{
-  AST_InterfaceFwd	**o_ast_fwds;
-  long			o_ast_n_fwds_alloc;
-  long			i;
-
-  /*
-   * Make sure there's space to store one more
-   */
-  if (ast_n_fwds_used == ast_n_fwds_alloc) {
-    if (ast_n_fwds_alloc == 0) {
-      ast_n_fwds_alloc = INCREMENT;
-      ast_fwds = new AST_InterfaceFwd *[ast_n_fwds_alloc];
-    } else {
-      o_ast_fwds = ast_fwds;
-      o_ast_n_fwds_alloc = ast_n_fwds_alloc;
-
-      ast_n_fwds_alloc += INCREMENT;
-      ast_fwds = new AST_InterfaceFwd *[ast_n_fwds_alloc];
-
-      for (i = 0; i < o_ast_n_fwds_alloc; i++)
-        ast_fwds[i] = o_ast_fwds[i];
-
-      delete o_ast_fwds;
-    }
-  }
-  /*
-   * Insert new node
-   */
-  ast_fwds[ast_n_fwds_used++] = n;
-}
-
-/*
- * Check that all forward declared interfaces were also defined
- */
-void
-AST_check_fwd_interface()
-{
-  long			i;
-  AST_InterfaceFwd	*d;
-  AST_Interface		*itf;
-
-  for (i = 0; i < ast_n_fwds_used; i++) {
-    d = ast_fwds[i];
-    itf = d->full_definition();
-    if (!(itf->is_defined()))
-      idl_global->err()->fwd_decl_not_defined(itf);
-  }
-}
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
deleted file mode 100644
index 44f010e19df..00000000000
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_concrete_type.cc - Implementation of class AST_ConcreteType
- *
- * AST_ConcreteType nodes denote all non-interface types of IDL.
- * They are AST_Type nodes.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_ConcreteType::AST_ConcreteType()
-{
-}
-
-AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n,
-				     UTL_StrList *p)
-		 : AST_Decl(nt, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_ConcreteType, AST_Type)
-IMPL_NARROW_FROM_DECL(AST_ConcreteType)
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
deleted file mode 100644
index d17bd242159..00000000000
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_constant.cc - Implementation of class AST_Constant
- *
- * AST_Constant nodes denote IDL constant declarations.
- * AST_Constants have a value (an AST_Expression) and a value type
- * (a value from the enum AST_Expression::ExprType).
- * AST_Constant has two constructors, one for use in creating constants
- * and the other for use in creating enumerators (see the class
- * AST_EnumVal)
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static functions
- */
-
-/*
- * Convert a value from the enum AST_Expression::ExprType to a char *
- */
-static char *
-exprtype_to_string(AST_Expression::ExprType et)
-{
-  switch (et) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longlong:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * Default constructor
- */
-AST_Constant::AST_Constant()
-	    : pd_constant_value(NULL), pd_et(AST_Expression::EV_none)
-{
-}
-
-/*
- * Used in constructing AST_EnumVal nodes
- */
-AST_Constant::AST_Constant(AST_Expression::ExprType t,
-			   AST_Decl::NodeType nt,
-			   AST_Expression *v,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-	    : AST_Decl(nt, n, p),
-	      pd_constant_value(idl_global->gen()->create_expr(v, t)),
-	      pd_et(t)
-{
-}
-
-/*
- * Used when constructing AST_Constant nodes
- */
-AST_Constant::AST_Constant(AST_Expression::ExprType t,
-			   AST_Expression *v,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-	    : AST_Decl(AST_Decl::NT_const, n, p),
-	      pd_constant_value(idl_global->gen()->create_expr(v, t)),
-	      pd_et(t)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Constant node to the ostream o
- */
-void
-AST_Constant::dump(ostream &o)
-{
-  o << "const " << exprtype_to_string(pd_et) << " ";
-  local_name()->dump(o);
-  o << " = ";
-  pd_constant_value->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_Constant::constant_value()
-{
-  return pd_constant_value;
-}
-
-AST_Expression::ExprType
-AST_Constant::et()
-{
-  return pd_et;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Constant, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Constant)
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
deleted file mode 100644
index b7d376a3576..00000000000
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_decl.cc - Implementation of class AST_Decl
- *
- * AST_Decl is the base class for all AST nodes except AST_Expression.
- * AST_Decls have a node type (a value from the enum AST_Decl::NodeType)
- * a name (a UTL_ScopedName) and a list of pragmas (a UTL_StrList).
- * Additionally AST_Decl nodes record the scope of definition, the
- * file name in which they were defined, the line on which they were
- * defined in that file, and a boolean denoting whether this is the
- * main file or an #include'd file.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-AST_Decl::AST_Decl()
-  : pd_imported(I_FALSE),
-    pd_in_main_file(I_FALSE),
-    pd_defined_in(NULL),
-    pd_node_type(NT_module),
-    pd_line(-1),
-    pd_file_name(NULL),
-    pd_name(NULL),
-    pd_local_name(NULL),
-    pd_pragmas(NULL),
-    pd_added(I_FALSE)
-{
-}
-
-AST_Decl::AST_Decl(NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-  : pd_imported(idl_global->imported()),
-    pd_in_main_file(idl_global->in_main_file()),
-    pd_defined_in(idl_global->scopes()->depth() > 0
-		  ? idl_global->scopes()->top()
-		  : 0),
-    pd_node_type(nt),
-    pd_line(idl_global->lineno()),
-    pd_file_name(idl_global->filename()),
-    pd_local_name(n == NULL ? 0 : n->last_component()),
-    pd_pragmas(p),
-    pd_added(I_FALSE)
-{
-  compute_full_name (n);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Compute the full scoped name of an AST node
- */
-void
-AST_Decl::compute_full_name(UTL_ScopedName *n)
-{
-  UTL_ScopedName	*cn = NULL;
-  AST_Decl		*d  = NULL;
-
-  /*
-   * Initialize this name to NULL
-   */
-  pd_name = NULL;
-  /*
-   * Global scope?
-   */
-  if (defined_in() == NULL) {
-    pd_name = n;
-    return;
-  }
-  /*
-   * OK, not global. So copy name of containing scope, then
-   * smash last cdr of copy with new component
-   */
-  d = ScopeAsDecl(defined_in());
-  if (d != NULL)
-    cn = d->name();
-  if (cn != NULL)
-    pd_name = (UTL_ScopedName *) cn->copy();
-  if (pd_name == NULL)
-    pd_name = new UTL_ScopedName(local_name(), NULL);
-  else
-    pd_name->nconc(new UTL_ScopedName(local_name(), NULL));
-}
-
-/*
- * Public operations
- */
-
-/*
- * Return TRUE if one of my ancestor scopes is "s"
- * and FALSE otherwise
- */
-idl_bool
-AST_Decl::has_ancestor(AST_Decl *s)
-{
-  if (this == s)
-    return I_TRUE;
-  if (pd_defined_in == NULL)
-    return I_FALSE;
-  return ScopeAsDecl(pd_defined_in)->has_ancestor(s);
-}    
-
-/*
- * Dump this AST_Decl to the ostream o
- */
-void
-AST_Decl::dump(ostream &o)
-{
-  pd_local_name->dump(o);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-idl_bool
-AST_Decl::imported()
-{
-  return pd_imported;
-}
-
-void
-AST_Decl::set_imported(idl_bool is_it)
-{
-  pd_imported = is_it;
-}
-
-idl_bool
-AST_Decl::in_main_file()
-{
-  return pd_in_main_file;
-}
-
-void
-AST_Decl::set_in_main_file(idl_bool is_it)
-{
-  pd_in_main_file = is_it;
-}
-
-idl_bool
-AST_Decl::added()
-{
-  return pd_added;
-}
-
-void
-AST_Decl::set_added(idl_bool is_it)
-{
-  pd_added = is_it;
-}
-
-UTL_Scope *
-AST_Decl::defined_in()
-{
-  return pd_defined_in;
-}
-
-void
-AST_Decl::set_defined_in(UTL_Scope *s)
-{
-  pd_defined_in = s;
-}
-
-AST_Decl::NodeType 
-AST_Decl::node_type()
-{
-  return pd_node_type;
-}
-
-long
-AST_Decl::line()
-{
-  return pd_line;
-}
-
-void
-AST_Decl::set_line(long l)
-{
-  pd_line = l;
-}
-
-String *
-AST_Decl::file_name()
-{
-  return pd_file_name;
-}
-
-void
-AST_Decl::set_file_name(String *s)
-{
-  pd_file_name = s;
-}
-
-UTL_ScopedName *
-AST_Decl::name()
-{
-  return pd_name;
-}
-
-void
-AST_Decl::set_name(UTL_ScopedName *n)
-{
-  pd_name = n;
-  if (n != NULL)
-    pd_local_name = n->last_component();
-}
-
-Identifier *
-AST_Decl::local_name()
-{
-  return pd_local_name;
-}
-
-void
-AST_Decl::add_pragmas(UTL_StrList *p)
-{
-  if (p != NULL) {
-    if (pd_pragmas != NULL)
-      pd_pragmas->nconc(p);
-    else
-      pd_pragmas = p;
-  }
-}
-
-UTL_StrList *
-AST_Decl::pragmas()
-{
-  return pd_pragmas;
-}
-
-/*
- * Narrowing methods for AST_Decl
- */
-IMPL_NARROW_METHODS0(AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Decl)
-
-/*
-** Narrowing methods for COMMON_Base
-*/
-IMPL_NARROW_METHODS0(COMMON_Base)
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
deleted file mode 100644
index e77fdece3cd..00000000000
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_enum.cc - Implementation of class AST_Enum
- *
- * AST_Enum nodes denote IDL enum declarations.
- * AST_Enums are a subclass of AST_ConcreteType and UTL_Scope.
- * They have a counter denoting the next value to be assigned to
- * an enumerator, and a name (a UTL_ScopedName).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Enum::AST_Enum()
-	: pd_enum_counter(0)
-{
-}
-
-AST_Enum::AST_Enum(UTL_ScopedName *n, UTL_StrList *p)
-       : AST_Decl(AST_Decl::NT_enum, n, p),
-	 UTL_Scope(AST_Decl::NT_enum),
-	 pd_enum_counter(0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Look up an enumerator by the value of the supplied expression
- */
-AST_EnumVal *
-AST_Enum::lookup_by_value(const AST_Expression *v)
-{
-  UTL_ScopeActiveIterator *iter;
-  AST_EnumVal		    *item;
-  AST_Decl		  *i;
-
-  iter = new UTL_ScopeActiveIterator(this, IK_decls);
-
-  while (!iter->is_done()) {
-    i = iter->item();
-    item = AST_EnumVal::narrow_from_decl(i);
-    if (item->constant_value() == v) {
-      delete iter;
-      return item;
-    }
-    iter->next();
-  }
-  delete iter;
-  return NULL;
-}
-
-/*
- * Compute the value to be assigned to the next enumerator. Bump the
- * counter
- */
-unsigned long
-AST_Enum::next_enum_val()
-{
-  unsigned long i = pd_enum_counter++;
-
-  return i;
-}
-
-/*
- * Static helper functions
- */
-
-/*
- * Modify scoped name of an enumval so that it is scoped inside the scope
- * in which the enum is defined and not inside the enum itself
- */
-static UTL_ScopedName *
-munge_name_for_enumval(UTL_ScopedName *n, Identifier *last_component)
-{
-  long		  l	= n->length();
-  UTL_ScopedName *hold	= n;
-
-  /*
-   * last three components are:
-   * - scope in which enum is defined
-   * - scope for enum
-   * - name of enumval
-   *
-   * We want to stop cdr'ing down the list when the head of the
-   * list is at the name for the scope in which the enum is defined
-   */
-  while (l > 3) {
-    l--;
-    n = (UTL_ScopedName *) n->tail();
-  }
-
-  n->set_tail(new UTL_IdList(last_component, NULL));
-
-  return hold;
-}
-  
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add an AST_EnumVal node to this scope
- */
-AST_EnumVal *AST_Enum::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-  AST_EnumVal *t1 = NULL;
-
-  if (t != NULL) {
-    t1 = idl_global->gen()->create_enum_val
-      (t->constant_value()->coerce(AST_Expression::EV_ulong)->u.ulval, 
-       t->name(), t->pragmas());
-    t->set_name(munge_name_for_enumval(t->name(), t->local_name()));
-    t1->set_name(munge_name_for_enumval(t1->name(), t1->local_name()));
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-  /*
-   * Add it to enclosing scope
-   */
-  idl_global->scopes()->next_to_top()->fe_add_enum_val(t1);
-
-  return t;
-}
-
-/*
- * Dump this AST_Enum to the ostream o
- */
-void
-AST_Enum::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_decls);
-  AST_Decl		    *d;
-
-  o << "enum ";
-  local_name()->dump(o);
-  o << " {\n";
-
-  while (!(i->is_done())) {
-    d = i->item();
-    d->local_name()->dump(o);
-    i->next();
-    if (!(i->is_done()))
-      o << ", ";
-  }
-  delete i;
-
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Enum, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Enum)
-IMPL_NARROW_FROM_SCOPE(AST_Enum)
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
deleted file mode 100644
index e8b263d1b2b..00000000000
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_enum_val.cc - Implementation of class AST_EnumVal
- *
- * AST_EnumVals denote IDL enumerator declarations
- * AST_EnumVals are a subclass of AST_Constant
- * AST_EnumVals have no additional fields
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_EnumVal::AST_EnumVal()
-{
-}
-
-AST_EnumVal::AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p)
-	    : AST_Constant(AST_Expression::EV_ulong,
-			   AST_Decl::NT_enum_val,
-			   new AST_Expression(v), n, p),
-	      AST_Decl(AST_Decl::NT_enum_val, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_EnumVal to the ostream o
- */
-void
-AST_EnumVal::dump(ostream &o)
-{
-  AST_Constant::dump(o);
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_EnumVal, AST_Constant)
-IMPL_NARROW_FROM_DECL(AST_EnumVal)
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
deleted file mode 100644
index a465674521d..00000000000
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_exception.cc - Implementation of class AST_Exception
- *
- * AST_Exceptions denote IDL exception declarations
- * AST_Exceptions are a subclass of AST_Decl (they are not types!)
- * and of UTL_Scope
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Exception::AST_Exception()
-{
-}
-
-AST_Exception::AST_Exception(UTL_ScopedName *n, UTL_StrList *p)
-	     : AST_Structure(AST_Decl::NT_except, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_Field node to the current scope
- */
-AST_Field *AST_Exception::fe_add_field(AST_Field *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union (manifest type declaration) to the current scope
- */
-AST_Union *AST_Exception::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure (manifest type declaration) to the current
- * scope
- */
-AST_Structure *AST_Exception::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error2(UTL_Error::EIDL_REDEF, t, this);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum (manifest type declaration) to the current scope
- */
-AST_Enum *AST_Exception::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal (enumerator declaration) to the current scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Exception::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Exception node to the ostream o
- */
-void
-AST_Exception::dump(ostream &o)
-{
-  o << "exception ";
-  local_name()->dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Exception, AST_Structure)
-IMPL_NARROW_FROM_DECL(AST_Exception)
-IMPL_NARROW_FROM_SCOPE(AST_Exception)
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
deleted file mode 100644
index fd9d03fabbd..00000000000
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ /dev/null
@@ -1,1597 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/* * ast_expression.cc - Implementation of class AST_Expression
- *
- * AST_Expression nodes denote IDL expressions used in the IDL input.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	<limits.h>
-#include	<float.h>
-
-#undef	MAXCHAR
-#define MAXCHAR	128
-
-// Helper function to fill out the details of where this expression
-// is defined
-void
-AST_Expression::fill_definition_details()
-{
-  pd_defined_in = idl_global->scopes()->depth() > 0 
-    ? idl_global->scopes()->top()
-    : 0 ;
-  pd_line       = idl_global->lineno();
-  pd_file_name	= idl_global->filename();
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * An AST_Expression denoting a symbolic name
- */
-AST_Expression::AST_Expression(UTL_ScopedName *nm)
-	      : pd_ec(EC_symbol),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(nm)
-{
-  fill_definition_details();
-}
-
-/*
- * An AST_Expression denoting a type coercion from another AST_Expression
- */
-AST_Expression::AST_Expression(AST_Expression *v, ExprType t)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = v->coerce(t);
-  if (pd_ev == NULL)
-    idl_global->err()->coercion_error(v, t);
-}
-
-/*
- * An AST_Expression denoting a binary expression combination from
- * two other AST_Expressions
- */
-AST_Expression::AST_Expression(ExprComb c, AST_Expression *ev1,
-			       AST_Expression *ev2)
-	      : pd_ec(c),
-		pd_ev(NULL),
-		pd_v1(ev1),
-		pd_v2(ev2),
-		pd_n(NULL)
-{
-  fill_definition_details();
-}
-
-/*
- * An AST_Expression denoting a short integer
- */
-AST_Expression::AST_Expression(short sv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_short;
-  pd_ev->u.sval = sv;
-}
-
-/*
- * An AST_Expression denoting an unsigned short integer
- */
-AST_Expression::AST_Expression(unsigned short usv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_ushort;
-  pd_ev->u.usval = usv;
-}
-
-/*
- * An AST_Expression denoting a long integer
- */
-AST_Expression::AST_Expression(long lv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_long;
-  pd_ev->u.lval = lv;
-}
-
-/*
- * An AST_Expression denoting a long integer being used as a boolean
- */
-AST_Expression::AST_Expression(long lv, ExprType t)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = t;
-  pd_ev->u.lval = lv;
-}
-
-/*
- * An AST_Expression denoting an unsigned long integer
- */
-AST_Expression::AST_Expression(unsigned long ulv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_ulong;
-  pd_ev->u.ulval = ulv;
-}
-
-/* 
- * An AST_Expression denoting a 32-bit floating point number
- */
-AST_Expression::AST_Expression(float fv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_float;
-  pd_ev->u.fval = fv;
-}
-
-/*
- * An AST_Expression denoting a 64-bit floating point number
- */
-AST_Expression::AST_Expression(double dv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_double;
-  pd_ev->u.dval = dv;
-}
-
-/*
- * An AST_Expression denoting a character
- */
-AST_Expression::AST_Expression(char cv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_char;
-  pd_ev->u.cval = cv;
-}
-
-/*
- * An AST_Expression denoting an octet (unsigned char)
- */
-AST_Expression::AST_Expression(unsigned char ov)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_octet;
-  pd_ev->u.oval = ov;
-}
-
-/*
- * An AST_Expression denotign a string (char * encapsulated as a String)
- */
-AST_Expression::AST_Expression(String *sv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_string;
-  pd_ev->u.strval = sv;
-}
-
-/*
- * Static operations
- */
-
-/*
- * Perform the coercion from the given AST_ExprValue to the requested
- * ExprType. Return an AST_ExprValue if successful, NULL if failed.
- */
-static AST_Expression::AST_ExprValue *
-coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
-{
-  if (ev == NULL)
-    return NULL;
-
-  switch (t) {
-  case AST_Expression::EV_short:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) SHRT_MAX)
-	return NULL;
-      ev->u.sval = (short) ev->u.usval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) SHRT_MAX || ev->u.lval < (long) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.lval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) SHRT_MAX)
-	return NULL;
-      ev->u.sval = (short) ev->u.ulval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.sval = (short) ev->u.bval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) SHRT_MAX || ev->u.fval < (float) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.fval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) SHRT_MAX || ev->u.dval < (double) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.dval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.sval = (short) ev->u.cval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.sval = (short) ev->u.oval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_ushort:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.sval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_ushort:
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) (SHRT_MAX << 1) || ev->u.lval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.lval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.ulval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.usval = (unsigned short) ev->u.bval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.fval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.dval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.cval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.usval = (unsigned short) ev->u.oval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_long:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.lval = (long) ev->u.sval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.lval = (long) ev->u.usval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_long:
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) LONG_MAX)
-	return NULL;
-      ev->u.lval = (long) ev->u.ulval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.lval = (long) ev->u.bval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) LONG_MAX || ev->u.fval < (float) -(LONG_MAX))
-	return NULL;
-      ev->u.lval = (long) ev->u.fval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) LONG_MAX || ev->u.dval < (double) -(LONG_MAX))
-	return NULL;
-      ev->u.lval = (long) ev->u.dval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.lval = (long) ev->u.cval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.lval = (long) ev->u.oval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_ulong:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.sval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.ulval = (unsigned long) ev->u.usval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.lval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_ulong:
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.ulval = (unsigned long) ev->u.bval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) LONG_MAX)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.fval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) LONG_MAX)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.dval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.cval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.ulval = (unsigned long) ev->u.oval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_bool:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.bval = (ev->u.sval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.bval = (ev->u.usval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.bval = (ev->u.lval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_bool:
-      return ev;
-    case AST_Expression::EV_float:
-      ev->u.bval = (ev->u.fval == 0.0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_double:
-      ev->u.bval = (ev->u.dval == 0.0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_float:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.fval = (float) ev->u.sval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.fval = (float) ev->u.usval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.fval = (float) ev->u.lval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.fval = (float) ev->u.ulval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0);
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_float:
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > FLT_MAX || ev->u.dval < -FLT_MAX)
-	return NULL;
-      ev->u.fval = (float) ev->u.dval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.fval = (float) ev->u.cval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.fval = (float) ev->u.oval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_double:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.dval = (double) ev->u.sval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.dval = (double) ev->u.usval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.dval = (double) ev->u.lval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.dval = (double) ev->u.ulval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_float:
-      ev->u.dval = (double) ev->u.fval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_double:
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.dval = (double) ev->u.cval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.dval = (double) ev->u.oval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_char:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval > (short) MAXCHAR || ev->u.sval < (short) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.sval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.usval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) MAXCHAR || ev->u.lval < (long) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.lval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.ulval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.cval = (char) ev->u.bval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) MAXCHAR || ev->u.fval < (float) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.fval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) MAXCHAR || ev->u.dval < (double) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.dval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_char:
-      return ev;
-    case AST_Expression::EV_octet:
-      if (ev->u.oval > (unsigned char) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.oval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_octet:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0 || ev->u.sval > (short) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.sval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.usval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0 || ev->u.lval > (long) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.lval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.ulval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.oval = (ev->u.bval == I_FALSE) ? 1 : 0;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.fval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.dval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.cval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_octet:
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_any:
-    switch (ev->et) {
-    case AST_Expression::EV_any:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_void:
-    switch (ev->et) {
-    case AST_Expression::EV_void:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_none:
-    return NULL;
-  case AST_Expression::EV_string:
-    switch (ev->et) {
-    case AST_Expression::EV_string:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Evaluate the expression wrt the evaluation kind requested. Supported
- * evaluation kinds are
- * - EK_const:		The expression must evaluate to a constant
- * - EK_positive_int:	The expression must further evaluate to a
- *			positive integer
- */
-static AST_Expression::AST_ExprValue *
-eval_kind(AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
-{
-  if (ek == AST_Expression::EK_const)
-    return ev;
-  if (ek == AST_Expression::EK_positive_int)
-    return coerce_value(ev, AST_Expression::EV_ulong);
-
-  return NULL;
-}
-
-/*
- * Private operations
- */
-
-/*
- * Apply binary operators to an AST_Expression after evaluating
- * its sub-expressions.
- * Operations supported:
- *
- * '+', '-', '*', '/'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_bin_op(AST_Expression::EvalKind ek)
-{
-  AST_ExprValue	*retval = NULL;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL || pd_v2 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_double));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->eval_internal(ek));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->coerce(EV_double));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_double;
-
-  switch (pd_ec) {
-  case EC_mod:
-    if (pd_v2->ev()->u.lval == 0)
-      return NULL;
-    retval->u.lval = pd_v1->ev()->u.lval % pd_v2->ev()->u.lval;
-    break;
-  case EC_add:
-    retval->u.dval = pd_v1->ev()->u.dval + pd_v2->ev()->u.dval;
-    break;
-  case EC_minus:
-    retval->u.dval = pd_v1->ev()->u.dval - pd_v2->ev()->u.dval;
-    break;
-  case EC_mul:
-    retval->u.dval = pd_v1->ev()->u.dval * pd_v2->ev()->u.dval;
-    break;
-  case EC_div:
-    if (pd_v2->ev()->u.dval == 0.0)
-      return NULL;
-    retval->u.dval = pd_v1->ev()->u.dval / pd_v2->ev()->u.dval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Apply bitwise operations to an AST_Expression after evaluating
- * its sub-expressions.
- * Operations supported:
- *
- * '%', '|', '&', '^', '<<', '>>'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_bit_op(AST_Expression::EvalKind ek)
-{
-  AST_Expression::AST_ExprValue	*retval=NULL;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL || pd_v2 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_long));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->eval_internal(ek));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->coerce(EV_long));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_long;
-
-  switch (pd_ec) {
-  case EC_or:
-    retval->u.lval = pd_v1->ev()->u.lval | pd_v2->ev()->u.lval;
-    break;
-  case EC_xor:
-    retval->u.lval = pd_v1->ev()->u.lval ^ pd_v2->ev()->u.lval;
-    break;
-  case EC_and:
-    retval->u.lval = pd_v1->ev()->u.lval & pd_v2->ev()->u.lval;
-    break;
-  case EC_left:
-    retval->u.lval = pd_v1->ev()->u.lval << pd_v2->ev()->u.lval;
-    break;
-  case EC_right:
-    retval->u.lval = pd_v1->ev()->u.lval >> pd_v2->ev()->u.lval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Apply unary operators to an AST_Expression after evaluating its
- * sub-expression.
- * Operations supported:
- *
- * '-', '+', '~'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_un_op(AST_Expression::EvalKind ek)
-{
-  AST_ExprValue	*retval = NULL;
-
-  if (pd_ev != NULL)
-    return pd_ev;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_double));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_double;
-
-  switch (pd_ec) {
-  case EC_u_plus:
-    retval->u.lval = pd_v1->ev()->u.lval;
-    break;
-  case EC_u_minus:
-    retval->u.lval = -(pd_v1->ev()->u.lval);
-    break;
-  case EC_bit_neg:
-    pd_v1->set_ev(pd_v1->coerce(EV_long));
-    if (pd_v1->ev() == NULL)
-      return NULL;
-    retval->u.lval = ~pd_v1->ev()->u.lval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Evaluate a symbolic AST_Expression by looking up the named
- * symbol.
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_symbol(AST_Expression::EvalKind ek)
-{
-  UTL_Scope		*s = 0;
-  AST_Decl		*d = 0;
-  AST_Constant		*c = 0;
-
-  /*
-   * Is there a symbol stored?
-   */
-  if (pd_n == NULL) {
-    idl_global->err()->eval_error(this);
-    return NULL;
-  }
-  /*
-   * Get current scope for lookup
-   */
-  if (idl_global->scopes()->depth() > 0)
-     s = idl_global->scopes()->top_non_null();
-  if (s == NULL) {
-    idl_global->err()->lookup_error(pd_n);
-    return NULL;
-  }
-  /*
-   * Do lookup
-   */
-  d = s->lookup_by_name(pd_n, I_TRUE);
-  if (d == NULL) {
-    idl_global->err()->lookup_error(pd_n);
-    return NULL;
-  }
-  /*
-   * Is it a constant?
-   */
-  if (d->node_type() != AST_Decl::NT_const &&
-      d->node_type() != AST_Decl::NT_enum_val) {
-    idl_global->err()->constant_expected(pd_n, d);
-    return NULL;
-  }
-  /*
-   * OK, now evaluate the constant we just got, to produce its value
-   */
-  c = AST_Constant::narrow_from_decl(d);
-  if (c == NULL) return NULL;
-  return c->constant_value()->eval_internal(ek);
-}
-
-/*
- * Coerce "this" to the ExprType required. Returns a copy of the
- * original ExprValue with the coercion applied, if successful, or
- * NULL if failed.
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::coerce(AST_Expression::ExprType t)
-{
-  AST_ExprValue *copy;
-
-  /*
-   * Is it already of the right type?
-   */
-  if (pd_ev != NULL && pd_ev->et == t)
-    return pd_ev;
-  /*
-   * OK, must coerce
-   *
-   * First, evaluate it, then try to coerce result type
-   * If already evaluated, return the result
-   */
-  pd_ev = eval_internal(EK_const);
-  if (pd_ev == NULL)
-    return NULL;
-
-  /*
-   * Create a copy to contain coercion result
-   */
-  copy = new AST_ExprValue;
-
-  copy->et = pd_ev->et;
-  switch (pd_ev->et) {
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_void:
-  case EV_none:
-  case EV_any:
-    return NULL;
-  case EV_short:
-    copy->u.sval = pd_ev->u.sval;
-    break;
-  case EV_ushort:
-    copy->u.usval = pd_ev->u.usval;
-    break;
-  case EV_long:
-    copy->u.lval = pd_ev->u.lval;
-    break;
-  case EV_ulong:
-    copy->u.ulval = pd_ev->u.ulval;
-    break;
-  case EV_bool:
-    copy->u.bval = pd_ev->u.bval;
-    break;
-  case EV_float:
-    copy->u.fval = pd_ev->u.fval;
-    break;
-  case EV_double:
-    copy->u.dval = pd_ev->u.dval;
-    break;
-  case EV_char:
-    copy->u.cval = pd_ev->u.cval;
-    break;
-  case EV_octet:
-    copy->u.oval = pd_ev->u.oval;
-    break;
-  case EV_string:
-    copy->u.strval = pd_ev->u.strval;
-    break;
-  }
-
-  return coerce_value(copy, t);
-}
-
-/*
- * Eval used internally
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_internal(AST_Expression::EvalKind ek)
-{
-  /*
-   * Already evaluated?
-   */
-  if (pd_ev != NULL)
-    return eval_kind(pd_ev, ek);
-  /*
-   * OK, must evaluate operator
-   */
-  switch (pd_ec) {
-  case EC_add:
-  case EC_minus:
-  case EC_mul:
-  case EC_div:
-  case EC_mod:
-    pd_ev = eval_bin_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_or:
-  case EC_xor:
-  case EC_and:
-  case EC_left:
-  case EC_right:
-    pd_ev = eval_bit_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_u_plus:
-  case EC_u_minus:
-  case EC_bit_neg:
-    pd_ev = eval_un_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_symbol:
-    pd_ev = eval_symbol(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_none:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Evaluate an AST_Expression, producing an AST_ExprValue or NULL
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval(AST_Expression::EvalKind ek)
-{
-  AST_Expression::AST_ExprValue *v = NULL;
-
-  /*
-   * Call internal evaluator which does not coerce value to
-   * EvalKind-expected format
-   */
-  v = eval_internal(ek);
-  /*
-   * Then coerce according to EvalKind-expected format
-   */
-  return eval_kind(v, ek);
-}
-
-/*
- * Evaluate "this", assigning the value to the pd_ev field.
- */
-void
-AST_Expression::evaluate(EvalKind ek)
-{
-  pd_ev = eval_internal(ek);
-  pd_ev = eval_kind(pd_ev, ek);
-}
-
-/*
- * Expression equality comparison operator
- */
-long
-AST_Expression::operator==(AST_Expression *vc)
-{
-  if (pd_ec != vc->ec())
-    return I_FALSE;
-  evaluate(EK_const);
-  vc->evaluate(EK_const);
-  if (pd_ev == NULL || vc->ev() == NULL)
-    return I_FALSE;
-  if (pd_ev->et != vc->ev()->et)
-    return I_FALSE;
-  switch (pd_ev->et) {
-  case EV_short:
-    return (pd_ev->u.sval == vc->ev()->u.sval) ? I_TRUE : I_FALSE;
-  case EV_ushort:
-    return (pd_ev->u.usval == vc->ev()->u.usval) ? I_TRUE : I_FALSE;
-  case EV_long:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_ulong:
-    return (pd_ev->u.ulval == vc->ev()->u.ulval) ? I_TRUE : I_FALSE;
-  case EV_float:
-    return (pd_ev->u.fval == vc->ev()->u.fval) ? I_TRUE : I_FALSE;
-  case EV_double:
-    return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
-  case EV_char:
-    return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_octet:
-    return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
-  case EV_bool:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_string:
-    if (pd_ev->u.strval == NULL) {
-      if (vc->ev()->u.strval == NULL)
-	return I_TRUE;
-      else
-	return I_FALSE;
-    } else if (vc->ev()->u.strval == NULL)
-      return I_FALSE;
-    else
-      return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_any:
-  case EV_void:
-  case EV_none:
-    return I_FALSE;
-  }
-  return I_FALSE;
-}
-
-long
-AST_Expression::compare(AST_Expression *vc)
-{
-  if (pd_ec != vc->ec())
-    return I_FALSE;
-  evaluate(EK_const);
-  vc->evaluate(EK_const);
-  if (pd_ev == NULL || vc->ev() == NULL)
-    return I_FALSE;
-  if (pd_ev->et != vc->ev()->et)
-    return I_FALSE;
-  switch (pd_ev->et) {
-  case EV_short:
-    return (pd_ev->u.sval == vc->ev()->u.sval) ? I_TRUE : I_FALSE;
- case EV_ushort:
-    return (pd_ev->u.usval == vc->ev()->u.usval) ? I_TRUE : I_FALSE;
-  case EV_long:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_ulong:
-    return (pd_ev->u.ulval == vc->ev()->u.ulval) ? I_TRUE : I_FALSE;
-  case EV_float:
-    return (pd_ev->u.fval == vc->ev()->u.fval) ? I_TRUE : I_FALSE;
-  case EV_double:
-    return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
-  case EV_char:
-    return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_octet:
-    return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
-  case EV_bool:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_string:
-    if (pd_ev->u.strval == NULL) {
-      if (vc->ev()->u.strval == NULL)
-	return I_TRUE;
-      else
-	return I_FALSE;
-    } else if (vc->ev()->u.strval == NULL)
-      return I_FALSE;
-    else
-      return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_any:
-  case EV_void:
-  case EV_none:
-    return I_FALSE;
-  }
-  return I_FALSE;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Helper functions for expression dumpers
- */
-
-/*
- * Dump this binary AST_Expression node to the ostream o
- */
-static void
-dump_binary_expr(ostream &o, char *s, AST_Expression *n1, AST_Expression *n2)
-{
-  if (n1 != NULL) n1->dump(o);
-  o << " " << s << " ";
-  if (n2 != NULL) n2->dump(o);
-}
-
-/*
- * Dump this unary AST_Expression node to the ostream o
- */
-static void
-dump_unary_expr(ostream &o, char *s, AST_Expression *e)
-{
-  o << s;
-  e->dump(o);
-}
-
-/*
- * Dump the supplied AST_ExprValue to the ostream o
- */
-static void
-dump_expr_val(ostream &o, AST_Expression::AST_ExprValue *ev)
-{
-  switch (ev->et) {
-  case AST_Expression::EV_short:
-    o << ev->u.sval;
-    break;
-  case AST_Expression::EV_ushort:
-    o << ev->u.usval;
-    break;
-  case AST_Expression::EV_long:
-    o << ev->u.lval;
-    break;
-  case AST_Expression::EV_ulong:
-    o << ev->u.ulval;
-    break;
-  case AST_Expression::EV_float:
-    o << ev->u.fval;
-    break;
-  case AST_Expression::EV_double:
-    o << ev->u.dval;
-    break;
-  case AST_Expression::EV_char:
-    o << ev->u.cval;
-    break;
-  case AST_Expression::EV_octet:
-    o << ev->u.oval;
-    break;
-  case AST_Expression::EV_bool:
-    o << (ev->u.bval == I_TRUE) ? "TRUE" : "FALSE";
-    break;
-  case AST_Expression::EV_string:
-    if (ev->u.strval != NULL)
-      ev->u.strval->dump(o);
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_any:
-  case AST_Expression::EV_none:
-  case AST_Expression::EV_void:
-    break;
-  }
-}
-
-/*
- * Dump an AST_Expression node to the ostream o
- */
-void
-AST_Expression::dump(ostream &o)
-{
-  /*
-   * See if it was a constant or was evaluated already
-   */
-  if (pd_ev != NULL) {
-    dump_expr_val(o, pd_ev);
-    return;
-  }
-  /*
-   * OK, must print out an expression
-   */
-  switch (pd_ec) {
-    /*
-     * Binary expressions:
-     */
-  case EC_add:
-    dump_binary_expr(o, "+", pd_v1, pd_v2);
-    break;
-  case EC_minus:
-    dump_binary_expr(o, "-", pd_v1, pd_v2);
-    break;
-  case EC_mul:
-    dump_binary_expr(o, "*", pd_v1, pd_v2);
-    break;
-  case EC_div:
-    dump_binary_expr(o, "/", pd_v1, pd_v2);
-    break;
-  case EC_mod:
-    dump_binary_expr(o, "%", pd_v1, pd_v2);
-    break;
-  case EC_or:
-    dump_binary_expr(o, "|", pd_v1, pd_v2);
-    break;
-  case EC_xor:
-    dump_binary_expr(o, "^", pd_v1, pd_v2);
-    break;
-  case EC_and:
-    dump_binary_expr(o, "&", pd_v1, pd_v2);
-    break;
-  case EC_left:
-    dump_binary_expr(o, "<<", pd_v1, pd_v2);
-    break;
-  case EC_right:
-    dump_binary_expr(o, ">>", pd_v1, pd_v2);
-    break;
-    /*
-     * Unary expressions:
-     */
-  case EC_u_plus:
-    dump_unary_expr(o, "+", pd_v1);
-    break;
-  case EC_u_minus:
-    dump_unary_expr(o, "-", pd_v1);
-    break;
-  case EC_bit_neg:
-    dump_unary_expr(o, "~", pd_v1);
-    break;
-    /*
-     * Unevaluated symbol
-     */
-  case EC_symbol:
-    pd_n->dump(o);
-    break;
-  case EC_none:
-    break;
-  default:
-    o << GTDEVEL("unsupported dump mode for expression with ec == ") 
-      << (int) pd_ec ;
-    break;
-  }
-}
-
-/*
- * Data accessors
- */
-
-UTL_Scope *
-AST_Expression::defined_in()
-{
-  return pd_defined_in;
-}
-
-void
-AST_Expression::set_defined_in(UTL_Scope *d)
-{
-  pd_defined_in = d;
-}
-
-long
-AST_Expression::line()
-{
-  return pd_line;
-}
-
-void
-AST_Expression::set_line(long l)
-{
-  pd_line = l;
-}
-
-String *
-AST_Expression::file_name()
-{
-  return pd_file_name;
-}
-
-void
-AST_Expression::set_file_name(String *f)
-{
-  pd_file_name = f;
-}
-
-AST_Expression::ExprComb
-AST_Expression::ec()
-{
-  return pd_ec;
-}
-
-void
-AST_Expression::set_ec(AST_Expression::ExprComb new_ec)
-{
-  pd_ec = new_ec;
-}
-
-AST_Expression::AST_ExprValue	*
-AST_Expression::ev()
-{
-  return pd_ev;
-}
-
-void
-AST_Expression::set_ev(AST_Expression::AST_ExprValue *new_ev)
-{
-  pd_ev = new_ev;
-}
-
-AST_Expression *
-AST_Expression::v1()
-{
-  return pd_v1;
-}
-
-void
-AST_Expression::set_v1(AST_Expression *e)
-{
-
-  pd_v1 = e;
-}
-
-AST_Expression *
-AST_Expression::v2()
-{
-  return pd_v2;
-}
-
-void
-AST_Expression::set_v2(AST_Expression *e)
-{
-  pd_v2 = e;
-}
-
-UTL_ScopedName *
-AST_Expression::n()
-{
-  return pd_n;
-}
-
-void
-AST_Expression::set_n(UTL_ScopedName *new_n)
-{
-  pd_n = new_n;
-}
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
deleted file mode 100644
index 44912c1d03b..00000000000
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_field.cc - Implementation of class AST_Field
- *
- * AST_Fields denote fields in IDL structure, union and exception
- * declarations. AST_Field is also used as a superclass of AST_Argument
- * and AST_UnionBranch.
- * AST_Fields have a field type (a subclass of AST_Type) and a name
- * (a UTL_ScopedName)
- *
- * AST_Field supplies two constructors, one to be used in constructing
- * AST_Field nodes, the other to be used in constructing AST_Argument
- * nodes and AST_UnionBranch nodes.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * Default constructor
- */
-AST_Field::AST_Field()
-	 : pd_field_type(NULL)
-{
-}
-
-/*
- * To be used when constructing an AST_Field node
- */
-AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_field, n, p),
-	   pd_field_type(ft)
-{
-}
-
-/*
- * To be used when constructing a node of a subclass of AST_Field
- */
-AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
-		   UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(nt, n, p),
-	   pd_field_type(ft)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Field node to the ostream o
- */
-void
-AST_Field::dump(ostream &o)
-{
-  pd_field_type->local_name()->dump(o);
-  o << " ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Field::field_type()
-{
-  return pd_field_type;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Field, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Field)
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
deleted file mode 100644
index 65b03aee387..00000000000
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-// $Id$
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_generator.cc - Implements the base AST node generator
- *
- * The generator protocol is explained in detail in the IDL CFE
- * design document.
- * The AST_Generator class provides operations to instantiate any
- * of the AST nodes. It contains an operation for every constructor
- * of every AST class.
- */
-
-#include        "idl.h"
-#include        "idl_extern.h"
-
-#include "ace/inc_user_config.h"
-
-/*
- * Constructors
- */
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Construct an AST_PredefinedType node (a predefined type)
- */
-AST_PredefinedType *
-AST_Generator::create_predefined_type(AST_PredefinedType::PredefinedType t,
-                                    UTL_ScopedName *n,
-                                    UTL_StrList *p)
-{
-  return new AST_PredefinedType(t, n, p);
-}
-
-/*
- * Construct an AST_Module node (a module)
- */
-AST_Module      *
-AST_Generator::create_module(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Module(n, p);
-}
-
-/*
- * Construct an AST_Root node (a node representing the root of an AST)
- */
-AST_Root *
-AST_Generator::create_root(UTL_ScopedName *n,
-                          UTL_StrList *p)
-{
-    return new AST_Root(n, p);
-}
-
-/*
- * Construct an AST_Interface node (an interface)
- */
-AST_Interface   *
-AST_Generator::create_interface(UTL_ScopedName *n,
-                               AST_Interface **ih,
-                               long nih,
-                               UTL_StrList *p)
-{
-  return new AST_Interface(n, ih, nih, p);
-}
-
-/*
- * Construct an AST_InterfaceFwd node (a node representing the forward
- * declaration of an interface)
- */
-AST_InterfaceFwd *
-AST_Generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_InterfaceFwd(n, p);
-}
-
-/*
- * Construct an AST_Exception node (an exception)
- */
-AST_Exception   *
-AST_Generator::create_exception(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Exception(n, p);
-}
-
-/*
- * Construct an AST_Structure node (a struct)
- */
-AST_Structure   *
-AST_Generator::create_structure(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Structure(n, p);
-}
-
-/*
- * Construct an AST_Enum node (an enum)
- */
-AST_Enum        *
-AST_Generator::create_enum(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Enum(n, p);
-}
-
-/*
- * Construct an AST_Operation node (an operation on an interface)
- */
-AST_Operation   *
-AST_Generator::create_operation(AST_Type *rt,
-                               AST_Operation::Flags fl,
-                               UTL_ScopedName *n,
-                               UTL_StrList *p)
-{
-  return new AST_Operation(rt, fl, n, p);
-}
-
-/*
- * Construct an AST_Field node (a field in a struct, union or exception)
- */
-AST_Field       *
-AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Field(ft, n, p);
-}
-
-/*
- * Construct an AST_Argument node (an argument to an operation)
- */
-AST_Argument    *
-AST_Generator::create_argument(AST_Argument::Direction d,
-                              AST_Type *ft,
-                              UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return new AST_Argument(d, ft, n, p);
-}
-
-/*
- * Construct an AST_Attribute node (an attribute)
- */
-AST_Attribute   *
-AST_Generator::create_attribute(idl_bool ro,
-                               AST_Type *ft,
-                               UTL_ScopedName *n,
-                               UTL_StrList *p)
-{
-  return new AST_Attribute(ro, ft, n, p);
-}
-
-/*
- * Construct an AST_Union node (a union)
- */
-AST_Union       *
-AST_Generator::create_union(AST_ConcreteType *dt,
-                           UTL_ScopedName *n,
-                           UTL_StrList *p)
-{
-  return new AST_Union(dt, n, p);
-}
-
-/*
- * Construct an AST_UnionBranch node (a branch in a union)
- */
-AST_UnionBranch *
-AST_Generator::create_union_branch(AST_UnionLabel *lab,
-                                 AST_Type *ft,
-                                 UTL_ScopedName *n,
-                                 UTL_StrList *p)
-{
-  return new AST_UnionBranch(lab, ft, n, p);
-}
-
-/*
- * Construct an AST_UnionLabel node (a label in a union)
- */
-AST_UnionLabel  *
-AST_Generator::create_union_label(AST_UnionLabel::UnionLabel ul,
-                                AST_Expression *v)
-{
-  return new AST_UnionLabel(ul, v);
-}
-
-/*
- * Construct an AST_Constant node (a constant)
- */
-AST_Constant    *
-AST_Generator::create_constant(AST_Expression::ExprType et,
-                              AST_Expression *ev,
-                              UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return new AST_Constant(et, ev, n, p);
-}
-
-/*
- * Construct an AST_Expression node denoting a symbolic name
- */
-AST_Expression  *
-AST_Generator::create_expr(UTL_ScopedName *n)
-{
-  return new AST_Expression(n);
-}
-
-/*
- * Construct an AST_Expression denoting a coercion
- */
-AST_Expression  *
-AST_Generator::create_expr(AST_Expression *v, AST_Expression::ExprType t)
-{
-  return new AST_Expression(v, t);
-}
-
-/*
- * Construct an AST_Expression node denoting a binary combinator
- * of two other AST_Expression nodes
- */
-AST_Expression  *
-AST_Generator::create_expr(AST_Expression::ExprComb c,
-                           AST_Expression *v1,
-                           AST_Expression *v2)
-{
-  return new AST_Expression(c, v1, v2);
-}
-
-/*
- * Construct an AST_Expression node denoting a long integer
- */
-AST_Expression  *
-AST_Generator::create_expr(long v)
-{
-  return new AST_Expression(v);
-}
-
-/*
- * Construct an AST_Expression node denoting a long integer being used
- * as a boolean
- */
-AST_Expression  *
-AST_Generator::create_expr(long v, AST_Expression::ExprType t)
-{
-  return new AST_Expression(v, t);
-}
-
-/*
- * Construct an AST_Expression node denoting an unsigned long integer
- */
-AST_Expression  *
-AST_Generator::create_expr(unsigned long v)
-{
-  return new AST_Expression(v);
-}
-
-/*
- * Construct an AST_Expression node denoting a string (a char *
- * encapsulated as String)
- */
-AST_Expression  *
-AST_Generator::create_expr(String *s)
-{
-  return new AST_Expression(s);
-}
-
-/*
- * Construct an AST_Expression node denoting a character
- */
-AST_Expression  *
-AST_Generator::create_expr(char c)
-{
-  return new AST_Expression(c);
-}
-
-/*
- * Construct an AST_Expression node denoting a 64-bit floating point number
- */
-AST_Expression  *
-AST_Generator::create_expr(double d)
-{
-  return new AST_Expression(d);
-}
-
-/*
- * Construct an AST_EnumVal node (an enumerator)
- */
-AST_EnumVal     *
-AST_Generator::create_enum_val(unsigned long v,
-                             UTL_ScopedName *n,
-                             UTL_StrList *p)
-{
-  return new AST_EnumVal(v, n, p);
-}
-
-/*
- * Construct an AST_Array node (an array type or field modifier)
- */
-AST_Array       *
-AST_Generator::create_array(UTL_ScopedName *n,
-                           unsigned long ndims,
-                           UTL_ExprList *dims)
-{
-  return new AST_Array(n, ndims, dims);
-}
-
-/*
- * Construct an AST_Sequence node (a sequence type definition)
- */
-AST_Sequence    *
-AST_Generator::create_sequence(AST_Expression *ms, AST_Type *bt)
-{
-  return new AST_Sequence(ms, bt);
-}
-
-/*
- * Construct an AST_String node (a string type definition)
- */
-AST_String      *
-AST_Generator::create_string(AST_Expression *ms)
-{
-  return new AST_String(ms);
-}
-
-/*
- * Construct an AST_String node denoting a wide string type definition
- */
-AST_String      *
-AST_Generator::create_wstring(AST_Expression *ms)
-{
-  return new AST_String(ms, sizeof(ACE_OS::WChar));
-}
-
-/*
- * Construct an AST_Typedef node (a typedef)
- */
-AST_Typedef     *
-AST_Generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Typedef(bt, n, p);
-}
-
-/*
- * Construct an AST_Native node
- */
-AST_Native *
-AST_Generator::create_native (UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return new AST_Native (n, p);
-}
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
deleted file mode 100644
index e0d1ecbc3de..00000000000
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_interface.cc - Implementation of class AST_Interface
- *
- * AST_Interfaces denote IDL interface definitions
- * AST_Interfaces are subclasses of AST_Type and UTL_Scope
- * AST_Interfaces have an array of inherited interfaces and
- * a count of the number of inherited interfaces. This count
- * represents the total number of unique (recursively) inherited
- * interfaces.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Interface::AST_Interface()
-  : pd_inherits(NULL),
-    pd_n_inherits(0)
-{
-}
-
-AST_Interface::AST_Interface(UTL_ScopedName *n,
-			     AST_Interface **ih,
-			     long nih,
-			     UTL_StrList *p)
-  : AST_Decl(AST_Decl::NT_interface, n, p),
-    UTL_Scope(AST_Decl::NT_interface),
-    pd_inherits(ih),
-    pd_n_inherits(nih)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add an AST_Constant node (a constant declaration) to this scope
- */
-AST_Constant *AST_Interface::fe_add_constant(AST_Constant *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Exception node (an exception declaration) to this scope
- */
-AST_Exception *AST_Interface::fe_add_exception(AST_Exception *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Attribute node (an attribute declaration) to this scope
- */
-AST_Attribute *AST_Interface::fe_add_attribute(AST_Attribute *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Operation node (an operation declaration) to this scope
- */
-AST_Operation *AST_Interface::fe_add_operation(AST_Operation *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Structure (a struct declaration) to this scope
- */
-AST_Structure *AST_Interface::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Enum node (an enum declaration) to this scope
- */
-AST_Enum *AST_Interface::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Union (a union declaration) to this scope
- */
-AST_Union *AST_Interface::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_EnumVal node (an enumerator) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Interface::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Typedef (a typedef) to the current scope
- */
-AST_Typedef *AST_Interface::fe_add_typedef(AST_Typedef *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Native (a native declaration) to this scope
- */
-AST_Native *AST_Interface::fe_add_native (AST_Native *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Interface node to the ostream o
- */
-void
-AST_Interface::dump(ostream &o)
-{
-  long	i;
-
-  o << "interface ";
-  local_name()->dump(o);
-  o << " ";
-  if (pd_n_inherits > 0) {
-    o << ": ";
-    for (i = 0; i < pd_n_inherits; i++) {
-      pd_inherits[i]->local_name()->dump(o);
-      if (i < pd_n_inherits - 1)
-	o << ", ";
-    }
-  }
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Data accessors
- */
-
-AST_Interface	**
-AST_Interface::inherits()
-{
-  return pd_inherits;
-}
-
-void
-AST_Interface::set_inherits(AST_Interface **i)
-{
-  pd_inherits = i;
-}
-
-long
-AST_Interface::n_inherits()
-{
-  return pd_n_inherits;
-}
-
-void
-AST_Interface::set_n_inherits(long i)
-{
-  pd_n_inherits = i;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Interface)
-IMPL_NARROW_FROM_SCOPE(AST_Interface)
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
deleted file mode 100644
index 1382fb91468..00000000000
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_interface_fwd.cc - Implementation of class AST_InterfaceFwd
- *
- * AST_InterfaceFwd nodes denote forward declarations of IDL interfaces
- * AST_InterfaceFwd nodes have a field containing the full declaration
- * of the interface, which is initialized when that declaration is
- * encountered.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_InterfaceFwd::AST_InterfaceFwd()
-		: pd_full_definition(NULL)
-{
-}
-
-AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
-		 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
-{
-  /*
-   * Create a dummy placeholder for the forward declared interface. This
-   * interface node is not yet defined (n_inherits < 0), so some operations
-   * will fail
-   */
-  pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
-  /*
-   * Record the node in a list to be checked after the entire AST has been
-   * parsed. All nodes in the list must have n_inherits >= 0, else this
-   * indicates that a full definition was not seen for this forward
-   * delcared interface
-   */
-  AST_record_fwd_interface(this);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_InterfaceFwd node to the ostream o
- */
-void
-AST_InterfaceFwd::dump(ostream &o)
-{
-  o << "interface ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Interface	*
-AST_InterfaceFwd::full_definition()
-{
-  return pd_full_definition;
-}
-
-void
-AST_InterfaceFwd::set_full_definition(AST_Interface *nfd)
-{
-  pd_full_definition = nfd;
-}    
-
-/*
- * Narrowing methods 
- */
-IMPL_NARROW_METHODS1 (AST_InterfaceFwd, AST_Type)
-IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
deleted file mode 100644
index 52d1219a315..00000000000
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_module.cc - Implementation of class AST_Module
- *
- * AST_Modules denote IDL module declarations
- * AST_Modules are subclasses of AST_Decl (they are not a type!) and
- * of UTL_Scope.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Module::AST_Module()
-{
-}
-
-AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_module, n, p),
-	   UTL_Scope(AST_Decl::NT_module)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_PredefinedType node (a predefined type declaration) to
- * this scope
- */
-AST_PredefinedType *AST_Module::fe_add_predefined_type(AST_PredefinedType *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Module node (a module declaration) to this scope
- */
-AST_Module *AST_Module::fe_add_module(AST_Module *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Interface node (an interface declaration) to this scope
- */
-AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
-{
-  AST_Decl		*predef;
-  AST_Interface		*fwd;
-
-  /*
-   * Already defined?
-   */
-  if ((predef = lookup_for_add(t, I_FALSE)) != NULL) {
-    /*
-     * Treat fwd declared interfaces specially
-     */
-    if (predef->node_type() == AST_Decl::NT_interface) {
-      fwd = AST_Interface::narrow_from_decl(predef);
-
-      if (fwd == NULL)
-          return NULL;
-
-      if (!fwd->is_defined()) {	/* Forward declared and not defined yet */
-	if (fwd->defined_in() != this) {
-	  idl_global->err()
-	     ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
-	  return NULL;
-        }
-      }
-      /*
-       * OK, not illegal redef of forward declaration. Now check whether
-       * it has been referenced already
-       */
-      else if (referenced(predef)) {
-        idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-	return NULL;
-      }
-    } else if (!can_be_redefined(predef)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, predef);
-      return NULL;
-    } else if (referenced(predef)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-      return NULL;
-    } else if (t->has_ancestor(predef)) {
-      idl_global->err()->redefinition_in_scope(t, predef);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_InterfaceFwd node (a forward declaration of an IDL
- * interface) to this scope
- */
-AST_InterfaceFwd *AST_Module::fe_add_interface_fwd(AST_InterfaceFwd *i)
-{
-  AST_Decl	*d;
-  AST_Interface	*itf;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(i, I_FALSE)) != NULL) {
-    if (d->node_type() == AST_Decl::NT_interface &&
-	d->defined_in() == this) {
-      itf = AST_Interface::narrow_from_decl(d);
-      if (itf == NULL)
-          return NULL;
-
-      i->set_full_definition(itf);
-      return i;
-    }
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, i, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, i, this, d);
-      return NULL;
-    }
-    if (i->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(i, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(i);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(i, I_FALSE);
-
-  return i;
-}
-
-/*
- * Add this AST_Constant node (a constant declaration) to this scope
- */
-AST_Constant *AST_Module::fe_add_constant(AST_Constant *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Exception node (an exception declaration) to this scope
- */
-AST_Exception *AST_Module::fe_add_exception(AST_Exception *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union node (a union declaration) to this scope
- */
-AST_Union *AST_Module::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure node (a struct declaration) to this scope
- */
-AST_Structure *AST_Module::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (an enum declaration) to this scope
- */
-AST_Enum *AST_Module::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (an enumerator declaration) to this scope
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Module::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Typedef node (a typedef) to this scope
- */
-AST_Typedef *AST_Module::fe_add_typedef(AST_Typedef *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Native (a native declaration) to this scope
- */
-AST_Native *AST_Module::fe_add_native (AST_Native *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Module node to the ostream o
- */
-void
-AST_Module::dump(ostream &o)
-{
-  o << "module ";
-  local_name()->dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
deleted file mode 100644
index 22d72392381..00000000000
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// AST_Native: New IDL type added by the POA spec
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-AST_Native::AST_Native (void)
-{
-}
-
-AST_Native::AST_Native(UTL_ScopedName *n,
-                       UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_native, n, p)
-{
-}
-
-/*
- * Dump this AST_Native node to the ostream o
- */
-void
-AST_Native::dump (ostream &o)
-{
-  AST_Decl::dump (o);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Native, AST_Type)
-IMPL_NARROW_FROM_DECL(AST_Native)
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
deleted file mode 100644
index c0371591258..00000000000
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_operation.cc - Implementation of class AST_Operation
- *
- * AST_Operation nodes denote IDL operation declarations
- * AST_Operations are a subclass of AST_Decl (they are not a type!)
- * and of UTL_Scope (the arguments are managed in a scope).
- * AST_Operations have a return type (a subclass of AST_Type),
- * a bitfield for denoting various properties of the operation (the
- * values are ORed together from constants defined in the enum
- * AST_Operation::FLags), a name (a UTL_ScopedName), a context
- * (implemented as a list of Strings, a UTL_StrList), and a raises
- * clause (implemented as an array of AST_Exceptions).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Operation::AST_Operation()
-  : pd_return_type(NULL),
-    pd_flags(OP_noflags),
-    pd_context(NULL),
-    pd_exceptions(NULL)
-{
-}
-
-AST_Operation::AST_Operation(AST_Type *rt, Flags fl, UTL_ScopedName *n,
-			   UTL_StrList *p)
-  : AST_Decl(AST_Decl::NT_op, n, p),
-    UTL_Scope(AST_Decl::NT_op),
-    pd_return_type(rt),
-    pd_flags(fl),
-    pd_context(NULL),
-    pd_exceptions(NULL)
-{
-  AST_PredefinedType *pdt;
-
-  /*
-   * Check that if the operation is oneway, the return type must be void
-   */
-  if (rt != NULL && pd_flags == OP_oneway) {
-    if (rt->node_type() != AST_Decl::NT_pre_defined)
-      idl_global->err()->error1(UTL_Error::EIDL_NONVOID_ONEWAY, this);
-    else {
-      pdt = AST_PredefinedType::narrow_from_decl(rt);
-      if (pdt == NULL || pdt->pt() != AST_PredefinedType::PT_void)
-        idl_global->err()->error1(UTL_Error::EIDL_NONVOID_ONEWAY, this);
-    }
-  }
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this context (a UTL_StrList) to this scope
- */
-UTL_StrList *
-AST_Operation::fe_add_context(UTL_StrList *t)
-{
-  pd_context = t;
-
-  return t;
-}
-
-/*
- * Add these exceptions (identified by name) to this scope.
- * This looks up each name to resolve it to the name of a known
- * exception, and then adds the referenced exception to the list
- * of exceptions that this operation can raise.
- *
- * NOTE: No attempt is made to ensure that exceptions are mentioned
- *       only once..
- */
-UTL_NameList *
-AST_Operation::fe_add_exceptions(UTL_NameList *t)
-{
-  UTL_NamelistActiveIterator *nl_i;
-  UTL_ScopedName	     *nl_n;
-  UTL_Scope		     *fs = idl_global->scopes()->top();
-  AST_Exception		     *fe;
-  AST_Decl		     *d;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (fs);
-
-  pd_exceptions = NULL;
-  nl_i = new UTL_NamelistActiveIterator(t);
-  while (!(nl_i->is_done())) {
-    nl_n = nl_i->item();
-    d = lookup_by_name(nl_n, I_TRUE);
-    if (d == NULL || d->node_type() != AST_Decl::NT_except) {
-      idl_global->err()->lookup_error(nl_n);
-      delete nl_i;
-      return NULL;
-    }
-    fe = AST_Exception::narrow_from_decl(d);
-    if (fe == NULL) {
-      idl_global->err()->error1(UTL_Error::EIDL_ILLEGAL_RAISES, this);
-      return NULL;
-    }
-    if (pd_exceptions == NULL)
-      pd_exceptions = new UTL_ExceptList(fe, NULL);
-    else
-      pd_exceptions->nconc(new UTL_ExceptList(fe, NULL));
-    nl_i->next();
-  }
-  delete nl_i;
-
-  return t;
-}
-
-/*
- * Add this AST_Argument node (an operation argument declaration)
- * to this scope
- */
-AST_Argument *AST_Operation::fe_add_argument(AST_Argument *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_by_name_local(t->local_name(), I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Cannot add OUT or INOUT argument to oneway operation
-   */
-  if ((t->direction() == AST_Argument::dir_OUT ||
-       t->direction() == AST_Argument::dir_INOUT) &&
-      pd_flags == OP_oneway) {
-    idl_global->err()->error2(UTL_Error::EIDL_ONEWAY_CONFLICT, t, this);
-    return NULL;
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Operation node (an operation) to the ostream o
- */
-void
-AST_Operation::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator   *i;
-  UTL_StrlistActiveIterator *si;
-  UTL_ExceptlistActiveIterator *ei;
-  AST_Decl		    *d;
-  AST_Exception		    *e;
-  String		    *s;
-
-  if (pd_flags == OP_oneway)
-    o << "oneway ";
-  else if (pd_flags == OP_idempotent)
-    o << "idempotent ";
-
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-  pd_return_type->name()->dump(o);
-  o << " ";
-  local_name()->dump(o);
-  o << "(";
-  while (!(i->is_done())) {
-    d = i->item();
-    d->dump(o);
-    i->next();
-    if (!(i->is_done()))
-      o << ", ";
-  }
-  delete i;
-  o << ")";
-
-  if (pd_exceptions != NULL) {
-    o << " raises(";
-    ei = new UTL_ExceptlistActiveIterator(pd_exceptions);
-    while (!(ei->is_done())) {
-      e = ei->item();
-      ei->next();
-      e->local_name()->dump(o);
-      if (!(ei->is_done()))
-	o << ", ";
-    }
-    delete ei;
-    o << ")";
-  }
-  if (pd_context != NULL) {
-    o << " context(";
-    si = new UTL_StrlistActiveIterator(pd_context);
-    while (!(si->is_done())) {
-      s = si->item();
-      si->next();
-      o << s->get_string();
-      if (!(si->is_done()))
-	o << ", ";
-    }
-    delete si;
-    o << ")";
-  }
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Operation::return_type()
-{
-  return pd_return_type;
-}
-
-AST_Operation::Flags
-AST_Operation::flags()
-{
-  return pd_flags;
-}
-
-UTL_StrList *
-AST_Operation::context()
-{
-  return pd_context;
-}
-
-UTL_ExceptList *
-AST_Operation::exceptions()
-{
-  return pd_exceptions;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Operation)
-IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
deleted file mode 100644
index 3e0d868bdce..00000000000
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_predefined_type.cc - Implementation of class AST_PredefinedType
- *
- * AST_PredefinedType nodes denote the various predefined types such
- * as long, short, etc. that are available in IDL. Each AST_PredefinedType
- * node has a field (the value of this field is from the enum
- * AST_PredefinedType::PredefinedType) which denotes the specific predefined
- * type that this node represents. There is only one node in the entire
- * AST which represents each predefined type, such as long etc.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-AST_PredefinedType::AST_PredefinedType()
-		  : pd_pt(PT_long)
-{
-}
-
-AST_PredefinedType::AST_PredefinedType(PredefinedType t, UTL_ScopedName *n,
-				       UTL_StrList *p)
-		   : AST_Decl(AST_Decl::NT_pre_defined, n, p),
-		     pd_pt(t)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_PredefinedType node to the ostream o
- */
-void
-AST_PredefinedType::dump(ostream &o)
-{
-  AST_Decl::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_PredefinedType::PredefinedType
-AST_PredefinedType::pt()
-{
-  return pd_pt;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_PredefinedType)
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
deleted file mode 100644
index 6a904999b63..00000000000
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_recursive.cc - Check whether a type is used recursively in a situation
- *		      where this use would be illegal.
- *
- * EXPLANATION: The CORBAS says that the only legal use of recursive types is
- * in a manifest sequence declared inside a struct or union whose base type is
- * the struct or union
- *
- * ALGORITH FOR CHECK:
- * Sequences push a NULL on the scope stack to mark where in the scope nesting
- * they appear.
- *
- * - If the type is not a struct or union, return FALSE (legal use of type)
- * - Otherwise check up the scope stack, looking for this base type. If we
- *   find a NULL return FALSE (legal use of type, since it is inside some
- *   sequence). If we find the type on the stack, return TRUE (illegal use
- *   since it was not bracketed by a sequence). If we don't find the base
- *   type nor a sequence, return FALSE (legal use, since we're not nested).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * FE_illegal_recursive_type() - Implement the algorithm described above
- */
-idl_bool
-AST_illegal_recursive_type(AST_Decl *t)
-{
-  UTL_ScopeStackActiveIterator *i = 0;
-  UTL_Scope		       *s = 0;
-  AST_Structure		       *st1 = 0, *st2 = 0;
-  AST_Union		       *un1 = 0, *un2 = 0;
-  idl_bool		       check_for_struct = I_FALSE,
-			       check_for_union = I_FALSE;
-
-  if (t == NULL) return I_FALSE;
-  
-  /*
-   * We only care about structs and unions
-   */
-  if (t->node_type() != AST_Decl::NT_struct &&
-      t->node_type() != AST_Decl::NT_union)
-    return I_FALSE;	// NOT ILLEGAL
-  /*
-   * Narrow the type appropriately so comparison will work
-   */
-  if (t->node_type() == AST_Decl::NT_struct) {
-    check_for_struct = I_TRUE;
-    st1 = AST_Structure::narrow_from_decl(t);
-    if (st1 == NULL)
-      return I_FALSE;	// NOT ILLEGAL
-  } else if (t->node_type() == AST_Decl::NT_union) {
-    check_for_union = I_TRUE;
-    un1 = AST_Union::narrow_from_decl(t);
-    if (un1 == NULL)
-      return I_FALSE;	// NOT ILLEGAL
-  }
-  /*
-   * OK, iterate up the stack
-   */
-  i = new UTL_ScopeStackActiveIterator(idl_global->scopes());
-  while (!(i->is_done())) {
-    s = i->item();
-    /*
-     * If we hit a NULL we're done since it means that we're nested inside
-     * a sequence, where recursive types may be used
-     */
-    if (s == NULL) {
-      delete i;
-      return I_FALSE;	// NOT ILLEGAL
-    }
-    /*
-     * OK, must check this scope
-     */
-    if (s->scope_node_type() == AST_Decl::NT_struct && check_for_struct) {
-      st2 = AST_Structure::narrow_from_scope(s);
-      if (st2 != NULL && st2 == st1) {
-	delete i;
-        return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE
-      }
-    } else if (s->scope_node_type() == AST_Decl::NT_union &&
-	       check_for_union) {
-      un2 = AST_Union::narrow_from_scope(s);
-      if (un2 != NULL && un2 == un1) {
-        delete i;
-	return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE
-      }
-    }
-    /*
-     * This one is fine, get next item
-     */
-    i->next();
-  }
-  /*
-   * No more scopes to check. This type was used legally
-   */
-  delete i;
-  return I_FALSE;		// NOT ILLEGAL
-}
-
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
deleted file mode 100644
index 6567e90ebbf..00000000000
--- a/TAO/TAO_IDL/ast/ast_redef.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_redef.cc - Implement utility function to decide when redefinition
- * 		  is allowed
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Return TRUE if the node d represents an IDL construct whose name
- * can be redefined.
- */
-idl_bool
-can_be_redefined(AST_Decl *d)
-{
-  switch (d->node_type()) {
-  case AST_Decl::NT_module:
-  case AST_Decl::NT_interface:
-  case AST_Decl::NT_interface_fwd:
-  case AST_Decl::NT_const:
-  case AST_Decl::NT_except:
-  case AST_Decl::NT_argument:
-  case AST_Decl::NT_enum_val:
-  case AST_Decl::NT_string:
-  case AST_Decl::NT_array:
-  case AST_Decl::NT_sequence:
-  case AST_Decl::NT_union:
-  case AST_Decl::NT_struct:
-  case AST_Decl::NT_enum:
-  case AST_Decl::NT_typedef:
-    return I_TRUE;
-
-  case AST_Decl::NT_union_branch:
-  case AST_Decl::NT_field:
-  case AST_Decl::NT_attr:
-  case AST_Decl::NT_op:
-  case AST_Decl::NT_pre_defined:
-  default:
-    return I_FALSE;
-  }
-}
-
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
deleted file mode 100644
index 2af71a474b5..00000000000
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_root.cc - Implementation of class AST_Root
- *
- * AST_Root nodes represent the roots of ASTs.
- * AST_Root is a subclass of AST_Module, and is defined to allow BEs
- * to subclass it to associate their own information with an entire
- * AST.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Root::AST_Root()
-{
-}
-
-AST_Root::AST_Root(UTL_ScopedName *n, UTL_StrList *p)
-	: AST_Decl(AST_Decl::NT_module, n, p),
-	  UTL_Scope(AST_Decl::NT_module)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Add protocol
- */
-
-/*
- * Add this AST_Sequence to the locally defined types in this scope
- */
-AST_Sequence *
-AST_Root::fe_add_sequence(AST_Sequence *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type", 1, 0, I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-  return t;
-}
-
-/*
- * Add this AST_String to the locally defined types in this scope
- */
-AST_String *
-AST_Root::fe_add_string(AST_String *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type", 1, 0, I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-
-  return t;
-}
-
-/*
- * Add this AST_Array to the locally defined types in this scope
- */
-AST_Array *
-AST_Root::fe_add_array(AST_Array *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type",1,0,I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-
-  return t;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Root node to the ostream o
- */
-void
-AST_Root::dump(ostream &o)
-{
-  UTL_Scope::dump(o);
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Root, AST_Module)
-IMPL_NARROW_FROM_DECL(AST_Root)
-IMPL_NARROW_FROM_SCOPE(AST_Root)
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
deleted file mode 100644
index 276cc31a137..00000000000
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_sequence.cc - Implementation of class AST_Sequence
- *
- * AST_Sequence nodes represent IDL sequence declarations.
- * AST_Sequence is a subclass of AST_ConcreteType.
- * AST_Sequence nodes have a maximum size (an AST_Expression which
- * must evaluate to a positive integer) and a base type (a subclass
- * of AST_Type).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Sequence::AST_Sequence()
-	    : pd_max_size(0),
-	      pd_base_type(NULL)
-{
-}
-
-AST_Sequence::AST_Sequence(AST_Expression *ms, AST_Type *bt)
-	    : AST_Decl(AST_Decl::NT_sequence,
-		       new UTL_ScopedName(
-				      new Identifier("sequence",1,0,I_FALSE),
-				      NULL),
-		       NULL),
-	      pd_max_size(ms),
-	      pd_base_type(bt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Sequence node to the ostream o
- */
-void
-AST_Sequence::dump(ostream &o)
-{
-  o << "sequence <";
-  pd_base_type->dump(o);
-  o << ", ";
-  pd_max_size->dump(o);
-  o << ">";
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_Sequence::max_size()
-{
-  return pd_max_size;
-}
-
-AST_Type *
-AST_Sequence::base_type()
-{
-  return pd_base_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Sequence, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_Sequence)
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
deleted file mode 100644
index e6a502d7604..00000000000
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_string.cc - Implementation of class AST_String
- *
- * AST_String nodes represent IDL string declarations.
- * AST_String is a subclass of AST_ConcreteType.
- * AST_String nodes have a maximum size (an AST_Expression which must
- * evaluate to a positive integer).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_String::AST_String()
-	  : pd_max_size(0), pd_width(1)
-{
-}
-
-AST_String::AST_String(AST_Expression *ms)
-	  : AST_Decl(AST_Decl::NT_string,
-		     new UTL_ScopedName(new Identifier("string",1,0,I_FALSE),
-					NULL),
-		     NULL),
-	    pd_max_size(ms),
-            pd_width(sizeof(char))
-{
-}
-
-AST_String::AST_String(AST_Expression *ms, long wide)
-	  : AST_Decl(AST_Decl::NT_string,
-		     new UTL_ScopedName(wide == sizeof(char)
-					? new Identifier("string",1,0,I_FALSE)
-					: new Identifier("wstring_t",
-                                                         1,
-                                                         0,
-                                                         I_FALSE),
-					NULL),
-		     NULL),
-            pd_max_size(ms),
-            pd_width(wide)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_String node to the ostream o
- */
-void
-AST_String::dump(ostream &o)
-{
-  o << "string <";
-  pd_max_size->dump(o);
-  o << ">";
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_String::max_size()
-{
-  return pd_max_size;
-}
-
-long
-AST_String::width()
-{
-  return pd_width;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_String, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_String)
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
deleted file mode 100644
index e821569c05d..00000000000
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_structure.cc - Implementation of class AST_Structure
- *
- * AST_Structure nodes denote IDL struct declarations.
- * AST_Structure is a subclass of AST_ConcreteType and of UTL_Scope (the
- * structure's fields are managed in a scope).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Structure::AST_Structure()
-{
-}
-
-AST_Structure::AST_Structure(UTL_ScopedName *n, UTL_StrList *p)
-	     : AST_Decl(AST_Decl::NT_struct, n, p),
-	       UTL_Scope(AST_Decl::NT_struct)
-{
-}
-
-AST_Structure::AST_Structure(AST_Decl::NodeType nt,
-			     UTL_ScopedName *n,
-			     UTL_StrList *p)
-	     : AST_Decl(nt, n, p),
-	       UTL_Scope(nt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_Field node (a field declaration) to this scope
- */
-AST_Field *AST_Structure::fe_add_field(AST_Field *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Structure node (a manifest struct type) to this scope
- */
-AST_Structure *AST_Structure::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Union node (a manifest union type) to this scope
- */
-AST_Union *AST_Structure::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (a manifest enum declaration) to this scope
- */
-AST_Enum *AST_Structure::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (an enumerator declaration) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Structure::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Structure node to the ostream o
- */
-void
-AST_Structure::dump(ostream &o)
-{
-  o << "struct ";
-  AST_Decl::dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Structure, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Structure)
-IMPL_NARROW_FROM_SCOPE(AST_Structure)
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
deleted file mode 100644
index fb9b83ae219..00000000000
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_type.cc - Implementation of class AST_Type
- *
- * AST_Type is the base class for all AST classes which represent
- * IDL type constructs.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Type::AST_Type()
-{
-}
-
-AST_Type::AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-	: AST_Decl(nt, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Type, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Type)
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
deleted file mode 100644
index ecd4f28de46..00000000000
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_typedef.cc - Implementation of class AST_Typedef
- *
- * AST_Typedef nodes represent an IDL typedef statement.
- * AST_Typedef is a subclass of AST_Decl (it is not a type,
- * but instead is a type renaming).
- * AST_Typedef nodes have a base type (a subclass of AST_Type)
- * and a name (an UTL_ScopedName).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Typedef::AST_Typedef()
-	   : pd_base_type(NULL)
-{
-}
-
-AST_Typedef::AST_Typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-	   : AST_Decl(AST_Decl::NT_typedef, n, p),
-	     pd_base_type(bt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Typedef node to the ostream o
- */
-void
-AST_Typedef::dump(ostream &o)
-{
-  o << "typedef ";
-  pd_base_type->dump(o);
-  o << " ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Typedef::base_type()
-{
-  return pd_base_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Typedef, AST_Type)
-IMPL_NARROW_FROM_DECL(AST_Typedef)
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
deleted file mode 100644
index b5bb4c14f2d..00000000000
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union.cc - Implementation of class AST_Union
- *
- * AST_Union nodes represent IDL union declarations.
- * AST_Union is a subclass of AST_ConcreteType and of UTL_Scope (the
- * union branches are managed in a scope).
- * AST_Union nodes have a discriminator type (a subclass of AST_ConcreteType),
- * a name (an UTL_ScopedName) and a field denoting the discriminator type if
- * it is a primitive type (the value of this field is from the union
- * AST_Expression::ExprType and serves as a cache). This field is used
- * to compute coercions for labels based on the expected discriminator type.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Union::AST_Union()
-{
-}
-
-AST_Union::AST_Union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_union, n, p),
-	   UTL_Scope(AST_Decl::NT_union)
-{
-  AST_PredefinedType *pdt;
-
-  if (dt == NULL) {
-    pd_disc_type = NULL;
-    pd_udisc_type = AST_Expression::EV_none;
-    return;
-  }
-  /*
-   * If the discriminator type is a predefined type
-   * then install the equivalent coercion target type in
-   * the pd_udisc_type field.
-   */
-  if (dt->node_type() == AST_Decl::NT_pre_defined) {
-    pdt = AST_PredefinedType::narrow_from_decl(dt);
-    if (pdt == NULL) {
-        pd_disc_type = NULL;
-        pd_udisc_type = AST_Expression::EV_none;
-        return;
-    }
-    pd_disc_type = dt;
-    switch (pdt->pt()) {
-    case AST_PredefinedType::PT_long:
-      pd_udisc_type = AST_Expression::EV_long;
-      break;
-    case AST_PredefinedType::PT_ulong:
-      pd_udisc_type = AST_Expression::EV_ulong;
-      break;
-    case AST_PredefinedType::PT_short:
-      pd_udisc_type = AST_Expression::EV_short;
-      break;
-    case AST_PredefinedType::PT_ushort:
-      pd_udisc_type = AST_Expression::EV_ushort;
-      break;
-    case AST_PredefinedType::PT_char:
-      pd_udisc_type = AST_Expression::EV_char;
-      break;
-    case AST_PredefinedType::PT_octet:
-      pd_udisc_type = AST_Expression::EV_octet;
-      break;
-    case AST_PredefinedType::PT_boolean:
-      pd_udisc_type = AST_Expression::EV_bool;
-      break;
-    default:
-      pd_udisc_type = AST_Expression::EV_none;
-      pd_disc_type = NULL;
-      break;
-    }
-  } else if (dt->node_type() == AST_Decl::NT_enum) {
-    pd_udisc_type = AST_Expression::EV_any;
-    pd_disc_type = dt;
-  } else {
-    pd_udisc_type = AST_Expression::EV_none;
-    pd_disc_type = NULL;
-  }
-
-  if (pd_disc_type == NULL)
-    idl_global->err()->error2(UTL_Error::EIDL_DISC_TYPE, this, dt);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Look up the default branch in union
- */
-AST_UnionBranch *
-AST_Union::lookup_default()
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_both);
-  AST_UnionBranch	    *b;
-  AST_Decl		    *d;
-
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      b = AST_UnionBranch::narrow_from_decl(d);
-      if (b == NULL) {
-        i->next();
-        continue;
-      }
-      if (b->label() != NULL &&
-	  b->label()->label_kind() == AST_UnionLabel::UL_default) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch by label
- */
-AST_UnionBranch *
-AST_Union::lookup_label(AST_UnionBranch *b)
-{
-  AST_UnionLabel		*l = b->label();
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-  AST_UnionBranch		*fb;
-
-  if (l->label_val() == NULL)
-    return b;
-  l->label_val()->set_ev(l->label_val()->coerce(pd_udisc_type));
-  if (l->label_val()->ev() == NULL) {
-    idl_global->err()->eval_error(l->label_val());
-    return b;
-  }
-
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      fb = AST_UnionBranch::narrow_from_decl(d);
-      if (fb == NULL) {
-        i->next();
-        continue;
-      }
-      if (fb->label() != NULL &&
-	  fb->label()->label_kind() == AST_UnionLabel::UL_label &&
-	  fb->label()->label_val()->compare(l->label_val())) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch in an enum which is the discriminator type for this
- * union, based on the label value which must be an enumerator in that
- * enum.
- */
-AST_UnionBranch *
-AST_Union::lookup_enum(AST_UnionBranch *b)
-{
-  AST_UnionLabel		*l = b->label();
-  AST_Expression		*v;
-  AST_Enum			*e = AST_Enum::narrow_from_decl(pd_disc_type);
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-  AST_UnionBranch		*fb;
-
-  if (e == NULL) return NULL;
-  if (l->label_val() == NULL)
-    return b;
-  v = l->label_val();
-  /*
-   * Expecting a symbol label
-   */
-  if (v->ec() != AST_Expression::EC_symbol) {
-    idl_global->err()->enum_val_expected(this, l);
-    return b;
-  }
-  /*
-   * See if the symbol defines a constant in the discriminator enum
-   */
-  d = e->lookup_by_name(v->n(), I_TRUE);
-  if (d == NULL || d->defined_in() != e) {
-    idl_global->err()->enum_val_lookup_failure(this, e, v->n());
-    return b;
-  }
-  /*
-   * OK, now see if this symbol is already used as the label of
-   * some other branch
-   */
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      fb = AST_UnionBranch::narrow_from_decl(d);
-      if (fb == NULL) {
-          i->next();
-          continue;
-      }
-      if (fb->label() != NULL &&
-	  fb->label()->label_kind() == AST_UnionLabel::UL_label &&
-	  fb->label()->label_val()->compare (l->label_val())) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch by value. This is the top level branch label resolution
- * entry point. It dispatches to the right lookup function depending on the
- * union discriminator type.
- */
-AST_UnionBranch *
-AST_Union::lookup_branch(AST_UnionBranch *branch)
-{
-  AST_UnionLabel	*l = NULL;
-
-  if (branch != NULL)
-    l = branch->label();
-
-  if (l != NULL) {
-    if (l->label_kind() == AST_UnionLabel::UL_default)
-      return lookup_default();
-    if (pd_udisc_type == AST_Expression::EV_any)
-      /* CONVENTION: indicates enum discr */
-      return lookup_enum(branch);
-    return lookup_label(branch);
-  }
-  return NULL;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_UnionBranch node (a node representing one branch in a
- * union declaration) to this scope
- */
-AST_UnionBranch *AST_Union::fe_add_union_branch(AST_UnionBranch *t)
-{
-  AST_Decl *d;
-
-  /*
-   * If this is a malformed branch, don't do anything with it
-   */
-  if (t == NULL || t->label() == NULL)
-    return NULL;
-  /*
-   * If branch with that label already exists, complain
-   */
-  if (lookup_branch(t) != NULL) {
-    idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, t);
-    return NULL;
-  }
-  /*
-   * If branch with same field name exists, complain
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union (manifest union type) to this scope
- */
-AST_Union *AST_Union::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure node (manifest struct type) to this scope
- */
-AST_Structure *AST_Union::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (manifest enum type) to this scope
- */
-AST_Enum *AST_Union::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (enumerator declaration) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Union::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Union node to the ostream o
- */
-void
-AST_Union::dump(ostream &o)
-{
-  o << "union ";
-  local_name()->dump(o);
-  o << " switch (";
-  pd_disc_type->local_name()->dump(o);
-  o << ") {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Data accessors
- */
-
-AST_ConcreteType *
-AST_Union::disc_type()
-{
-  return pd_disc_type;
-}
-
-AST_Expression::ExprType
-AST_Union::udisc_type()
-{
-  return pd_udisc_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Union, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Union)
-IMPL_NARROW_FROM_SCOPE(AST_Union)
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
deleted file mode 100644
index 55220d7c29f..00000000000
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union_branch.cc - Implementation of class AST_UnionBranch
- *
- * AST_UnionBranch nodes represent a single branch of an IDL union
- * declaration.
- * AST_UnionBranch is a subclass of AST_Field, adding a label (which
- * is a subclass of AST_UnionLabel).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_UnionBranch::AST_UnionBranch()
-	       : pd_label(NULL)
-{
-}
-
-AST_UnionBranch::AST_UnionBranch(AST_UnionLabel *fl, AST_Type *ft,
-				   UTL_ScopedName *n, UTL_StrList *p)
-		: AST_Field(AST_Decl::NT_union_branch, ft, n, p),
-		  AST_Decl(AST_Decl::NT_union_branch, n, p),
-		  pd_label(fl)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_UnionBranch node to the ostream o
- */
-void
-AST_UnionBranch::dump(ostream &o)
-{
-  o << "case ";
-  pd_label->dump(o);
-  o << ": ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_UnionLabel *
-AST_UnionBranch::label()
-{
-  return pd_label;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_UnionBranch, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
deleted file mode 100644
index 18b080d323c..00000000000
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union_label.cc - Implementation of class AST_UnionLabel
- *
- * AST_UnionLabel denotes the label of a branch in an IDL union
- * declaration.
- * AST_UnionLabel nodes have a label kind (the values come from the
- * enum AST_UnionLabel::LabelKind) and a label value (which is a
- * subclass of AST_Expression).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-AST_UnionLabel::AST_UnionLabel()
-	      : pd_label_kind(UL_default),
-		pd_label_val(NULL)
-{
-}
-
-AST_UnionLabel::AST_UnionLabel(UnionLabel lk, AST_Expression *lv)
-	       : pd_label_kind(lk),
-		 pd_label_val(lv)
-{
-    if (lv != NULL)
-      lv->evaluate(AST_Expression::EK_const);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-AST_UnionLabel::UnionLabel
-AST_UnionLabel::label_kind()
-{
-  return pd_label_kind;
-}
-
-AST_Expression *
-AST_UnionLabel::label_val()
-{
-  return pd_label_val;
-}
-
-/*
- * Dump this AST_UnionLabel node to the ostream o
- */
-void
-AST_UnionLabel::dump(ostream &o)
-{
-  if (pd_label_kind == UL_default)
-    o << "default";
-  else
-    pd_label_val->dump(o);
-}
diff --git a/TAO/TAO_IDL/be/Makefile b/TAO/TAO_IDL/be/Makefile
deleted file mode 100644
index ae2e334725d..00000000000
--- a/TAO/TAO_IDL/be/Makefile
+++ /dev/null
@@ -1,5005 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libbe
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME	 = libbe
-LIB	 = $(LIBNAME).a
-SHLIB	 = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-BE_FILES	= \
-		be_array \
-		be_argument \
-		be_attribute \
-		be_constant \
-		be_enum \
-		be_enum_val \
-		be_exception \
-		be_expression \
-		be_field \
-		be_interface \
-		be_interface_fwd \
-		be_module \
-		be_native \
-		be_operation \
-		be_predefined_type \
-		be_root \
-		be_sequence \
-		be_string \
-		be_structure \
-		be_type \
-		be_typedef \
-		be_union \
-		be_union_branch \
-		be_union_label \
-		be_generator \
-		be_init \
-		be_produce \
-		be_args  \
-		be_helper \
-		be_state \
-		be_state_array \
-		be_state_argument \
-		be_state_attribute \
-		be_state_exception \
-		be_state_operation \
-		be_state_sequence \
-		be_state_structure \
-		be_state_typedef \
-		be_state_union \
-		be_codegen \
-		be_factory \
-		be_sunsoft \
-		be_decl \
-		be_scope \
-		be_visitor \
-		be_visitor_args \
-		be_visitor_attribute \
-		be_visitor_constant \
-		be_visitor_context \
-		be_visitor_decl \
-		be_visitor_enum \
-		be_visitor_exception \
-		be_visitor_field \
-		be_visitor_interface \
-		be_visitor_interface_fwd \
-		be_visitor_module \
-		be_visitor_operation \
-		be_visitor_root \
-		be_visitor_scope \
-		be_visitor_sequence \
-		be_visitor_structure \
-		be_visitor_typedef \
-		be_visitor_union \
-		be_visitor_union_branch \
-		be_interpretive
-
-FILES	 = $(BE_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS  =  -lACE
-LIBS	= -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(CXX),g++)
-CCFLAGS += -Wno-switch
-PIC = -fPIC
-endif
-
-CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \
-            -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/be_array.o .obj/be_array.so .shobj/be_array.o .shobj/be_array.so: be_array.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_argument.o .obj/be_argument.so .shobj/be_argument.o .shobj/be_argument.so: be_argument.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_attribute.o .obj/be_attribute.so .shobj/be_attribute.o .shobj/be_attribute.so: be_attribute.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_constant.o .obj/be_constant.so .shobj/be_constant.o .shobj/be_constant.so: be_constant.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_enum.o .obj/be_enum.so .shobj/be_enum.o .shobj/be_enum.so: be_enum.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_enum_val.o .obj/be_enum_val.so .shobj/be_enum_val.o .shobj/be_enum_val.so: be_enum_val.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_exception.o .obj/be_exception.so .shobj/be_exception.o .shobj/be_exception.so: be_exception.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_expression.o .obj/be_expression.so .shobj/be_expression.o .shobj/be_expression.so: be_expression.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_field.o .obj/be_field.so .shobj/be_field.o .shobj/be_field.so: be_field.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_interface.o .obj/be_interface.so .shobj/be_interface.o .shobj/be_interface.so: be_interface.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be_visitor_interface.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_decl.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor_context.h
-.obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be_interface_fwd.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_module.o .obj/be_module.so .shobj/be_module.o .shobj/be_module.so: be_module.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_native.o .obj/be_native.so .shobj/be_native.o .shobj/be_native.so: be_native.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_operation.o .obj/be_operation.so .shobj/be_operation.o .shobj/be_operation.so: be_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_predefined_type.o .obj/be_predefined_type.so .shobj/be_predefined_type.o .shobj/be_predefined_type.so: be_predefined_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_root.o .obj/be_root.so .shobj/be_root.o .shobj/be_root.so: be_root.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_sequence.o .obj/be_sequence.so .shobj/be_sequence.o .shobj/be_sequence.so: be_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_sequence.h ../be_include/be_visitor_decl.h
-.obj/be_string.o .obj/be_string.so .shobj/be_string.o .shobj/be_string.so: be_string.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_structure.o .obj/be_structure.so .shobj/be_structure.o .shobj/be_structure.so: be_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_type.o .obj/be_type.so .shobj/be_type.o .shobj/be_type.so: be_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_typedef.o .obj/be_typedef.so .shobj/be_typedef.o .shobj/be_typedef.so: be_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_union.o .obj/be_union.so .shobj/be_union.o .shobj/be_union.so: be_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_union_branch.o .obj/be_union_branch.so .shobj/be_union_branch.o .shobj/be_union_branch.so: be_union_branch.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_union_label.o .obj/be_union_label.so .shobj/be_union_label.o .shobj/be_union_label.so: be_union_label.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_generator.o .obj/be_generator.so .shobj/be_generator.o .shobj/be_generator.so: be_generator.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_init.o .obj/be_init.so .shobj/be_init.o .shobj/be_init.so: be_init.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_produce.o .obj/be_produce.so .shobj/be_produce.o .shobj/be_produce.so: be_produce.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_interpretive.h
-.obj/be_args.o .obj/be_args.so .shobj/be_args.o .shobj/be_args.so: be_args.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_helper.o .obj/be_helper.so .shobj/be_helper.o .shobj/be_helper.so: be_helper.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state.o .obj/be_state.so .shobj/be_state.o .shobj/be_state.so: be_state.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_array.o .obj/be_state_array.so .shobj/be_state_array.o .shobj/be_state_array.so: be_state_array.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_argument.o .obj/be_state_argument.so .shobj/be_state_argument.o .shobj/be_state_argument.so: be_state_argument.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_attribute.o .obj/be_state_attribute.so .shobj/be_state_attribute.o .shobj/be_state_attribute.so: be_state_attribute.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_exception.o .obj/be_state_exception.so .shobj/be_state_exception.o .shobj/be_state_exception.so: be_state_exception.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_operation.o .obj/be_state_operation.so .shobj/be_state_operation.o .shobj/be_state_operation.so: be_state_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_sequence.o .obj/be_state_sequence.so .shobj/be_state_sequence.o .shobj/be_state_sequence.so: be_state_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_structure.o .obj/be_state_structure.so .shobj/be_state_structure.o .shobj/be_state_structure.so: be_state_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_typedef.o .obj/be_state_typedef.so .shobj/be_state_typedef.o .shobj/be_state_typedef.so: be_state_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_state_union.o .obj/be_state_union.so .shobj/be_state_union.o .shobj/be_state_union.so: be_state_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_codegen.o .obj/be_codegen.so .shobj/be_codegen.o .shobj/be_codegen.so: be_codegen.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_factory.o .obj/be_factory.so .shobj/be_factory.o .shobj/be_factory.so: be_factory.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_sunsoft.h
-.obj/be_sunsoft.o .obj/be_sunsoft.so .shobj/be_sunsoft.o .shobj/be_sunsoft.so: be_sunsoft.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_sunsoft.h
-.obj/be_decl.o .obj/be_decl.so .shobj/be_decl.o .shobj/be_decl.so: be_decl.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_scope.o .obj/be_scope.so .shobj/be_scope.o .shobj/be_scope.so: be_scope.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_visitor.o .obj/be_visitor.so .shobj/be_visitor.o .shobj/be_visitor.so: be_visitor.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_visitor_args.o .obj/be_visitor_args.so .shobj/be_visitor_args.o .shobj/be_visitor_args.so: be_visitor_args.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_args.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_constant.o .obj/be_visitor_constant.so .shobj/be_visitor_constant.o .shobj/be_visitor_constant.so: be_visitor_constant.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_constant.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_context.o .obj/be_visitor_context.so .shobj/be_visitor_context.o .shobj/be_visitor_context.so: be_visitor_context.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h
-.obj/be_visitor_decl.o .obj/be_visitor_decl.so .shobj/be_visitor_decl.o .shobj/be_visitor_decl.so: be_visitor_decl.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_enum.o .obj/be_visitor_enum.so .shobj/be_visitor_enum.o .shobj/be_visitor_enum.so: be_visitor_enum.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_enum.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_field.o .obj/be_visitor_field.so .shobj/be_visitor_field.o .shobj/be_visitor_field.so: be_visitor_field.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_field.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_interface.o .obj/be_visitor_interface.so .shobj/be_visitor_interface.o .shobj/be_visitor_interface.so: be_visitor_interface.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_interface.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be_visitor_interface_fwd.cpp \
- ../include/idl.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_interface_fwd.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_module.o .obj/be_visitor_module.so .shobj/be_visitor_module.o .shobj/be_visitor_module.so: be_visitor_module.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_module.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_operation.o .obj/be_visitor_operation.so .shobj/be_visitor_operation.o .shobj/be_visitor_operation.so: be_visitor_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_operation.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be_visitor_root.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_root.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_scope.o .obj/be_visitor_scope.so .shobj/be_visitor_scope.o .shobj/be_visitor_scope.so: be_visitor_scope.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_sequence.o .obj/be_visitor_sequence.so .shobj/be_visitor_sequence.o .shobj/be_visitor_sequence.so: be_visitor_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_sequence.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_structure.o .obj/be_visitor_structure.so .shobj/be_visitor_structure.o .shobj/be_visitor_structure.so: be_visitor_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_structure.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_decl.h
-.obj/be_visitor_typedef.o .obj/be_visitor_typedef.so .shobj/be_visitor_typedef.o .shobj/be_visitor_typedef.so: be_visitor_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_typedef.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_union.o .obj/be_visitor_union.so .shobj/be_visitor_union.o .shobj/be_visitor_union.so: be_visitor_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_visitor_union.h \
- ../be_include/be_visitor_scope.h ../be_include/be_visitor_decl.h
-.obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be_visitor_union_branch.cpp \
- ../include/idl.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h \
- ../be_include/be_visitor_union_branch.h \
- ../be_include/be_visitor_decl.h
-.obj/be_interpretive.o .obj/be_interpretive.so .shobj/be_interpretive.o .shobj/be_interpretive.so: be_interpretive.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_native.h ../be_include/be_helper.h \
- ../be_include/be_state.h ../be_include/be_codegen.h \
- ../be_include/be_factory.h ../be_include/be_visitor.h \
- ../be_include/be_visitor_context.h ../be_include/be_interpretive.h \
- ../be_include/be_visitor_args.h ../be_include/be_visitor_decl.h \
- ../be_include/be_visitor_constant.h ../be_include/be_visitor_scope.h \
- ../be_include/be_visitor_enum.h ../be_include/be_visitor_field.h \
- ../be_include/be_visitor_interface.h \
- ../be_include/be_visitor_interface_fwd.h \
- ../be_include/be_visitor_module.h \
- ../be_include/be_visitor_operation.h ../be_include/be_visitor_root.h \
- ../be_include/be_visitor_sequence.h \
- ../be_include/be_visitor_structure.h \
- ../be_include/be_visitor_typedef.h ../be_include/be_visitor_union.h \
- ../be_include/be_visitor_union_branch.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
deleted file mode 100644
index 6416609a684..00000000000
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// be_args.cc - Collect command line arguments for the BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Prepare an argument for a BE
- *
- * Since this is the dummy BE, it doesn't do anything with the passed string
- */
-void
-BE_prep_arg(char *s, idl_bool)
-{
-  const char arg_macro[]="export_macro=";
-  const char arg_include[]="export_include=";
-
-  char* last = 0;
-  for (char* arg = ACE_OS::strtok_r (s, ",", &last);
-       arg != 0;
-       arg = ACE_OS::strtok_r (0, ",", &last))
-    {
-      if (ACE_OS::strstr (arg, arg_macro) == arg)
-	{
-	  char* val = arg + sizeof (arg_macro) - 1;
-	  idl_global->export_macro (val);
-	}
-      else if (ACE_OS::strstr (arg, arg_include) == arg)
-	{
-	  char* val = arg + sizeof (arg_include) - 1;
-	  idl_global->export_include (val);
-	}
-      else
-	{
-	  cerr << idl_global->prog_name ()
-	       << ": invalid or unknown argument <"
-	       << arg
-	       << "> to back end\n";
-	}
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
deleted file mode 100644
index 6b2fd6c167c..00000000000
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_argument.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Argument that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Argument
- */
-
-be_argument::be_argument (void)
-{
-}
-
-be_argument::be_argument (AST_Argument::Direction d, AST_Type *ft,
-                          UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Argument (d, ft, n, p),
-    AST_Field (AST_Decl::NT_argument, ft, n, p),
-    AST_Decl (AST_Decl::NT_argument, n, p)
-{
-}
-
-
-// All the methods here are very similar. The state is set by the be_operation
-// method which then invokes its scope which inturn calls one of these methods
-// with the state that was set.
-
-
-int
-be_argument::gen_client_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_client_header - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_client_stubs (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_client_stubs - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_server_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_server_header - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_server_skeletons (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_server_skeletons - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_argument::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_argument::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_argument::accept (be_visitor *visitor)
-{
-  return visitor->visit_argument (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_argument, AST_Argument, be_decl)
-IMPL_NARROW_FROM_DECL (be_argument)
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
deleted file mode 100644
index 347e3282b48..00000000000
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ /dev/null
@@ -1,1533 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_array.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-/*
- * BE_Array
- */
-be_array::be_array (void)
-  :  tao_name_ (0)
-{
-}
-
-be_array::be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims)
-  : AST_Array (n, ndims, dims),
-    AST_Decl (AST_Decl::NT_array, n, NULL),
-    tao_name_ (0)
-{
-#if 0
-  // if we are inside of a union, we change our local name to have an
-  // underscore before us
-  AST_Decl *d = ScopeAsDecl (this->defined_in ());
-  if (d && (d->node_type () == AST_Decl::NT_union))
-    {
-      static char namebuf [200];
-      UTL_ScopedName *myname;
-
-      ACE_OS::memset (namebuf, '\0', 200);
-
-      // make a copy of our parent's name
-      myname = (UTL_ScopedName *)d->name ()->copy ();
-      ACE_OS::sprintf (namebuf, "_%s", this->local_name ()->get_string ());
-      myname->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                         (namebuf), 1, 0,
-                                                         I_FALSE), NULL));
-      this->set_name (myname);
-    }
-#endif
-}
-
-be_array::~be_array (void)
-{
-  if (this->tao_name_ == 0)
-    delete[] tao_name_;
-}
-
-// create a name for ourselves
-const char*
-be_array::tao_name (void)
-{
-  if (this->tao_name_ != 0)
-    return this->tao_name_;
-
-  be_type *bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::"
-                         "tao_name - "
-                         "bad base type\n"),
-                        0);
-    }
-
-  const char prefix[] = "_tc_tao_array_";
-
-  int l = (ACE_OS::strlen (bt->local_name ()->get_string ())
-           + ACE_OS::strlen (this->local_name ()->get_string ()) + 1
-           + sizeof (prefix)
-           + 5 * this->n_dims ());
-
-  ACE_NEW_RETURN (this->tao_name_, char[l], 0);
-
-  ACE_OS::sprintf (this->tao_name_, "%s%s_%s",
-                   prefix, this->local_name ()->get_string (),
-                   bt->local_name ()->get_string());
-
-  for (unsigned int i = 0; i < this->n_dims (); ++i)
-    {
-      AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-
-      // dimension value
-      if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "tao_name - "
-                             "bad array dimension\n"),
-                            0);
-        }
-
-      if (expr->ev ()->et != AST_Expression::EV_ulong)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "tao_name - "
-                             "bad dimension value\n"),
-                            0);
-        }
-
-      char buf[16];
-      ACE_OS::sprintf (buf, "_%04.4x", ((int)expr->ev ()->u.ulval));
-      ACE_OS::strcat (this->tao_name_, buf);
-    }
-  return this->tao_name_;
-}
-
-int
-be_array::create_name (void)
-{
-  char namebuf [NAMEBUFSIZE];
-  unsigned long i;
-  UTL_ScopedName *n = NULL;
-  be_decl *scope; // scope in which we are defined
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);  // reset the buffer
-  // retrieve the base type
-  // the name always starts this way
-
-  be_type *bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::"
-                         "create_name - "
-                         "bad base type\n"),
-                        0);
-    }
-
-  ACE_OS::sprintf (namebuf, "_tao_array_%s", bt->local_name ()->get_string ());
-  // now append dimensions
-  for (i = 0; i < this->n_dims (); i++)
-    {
-      AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-
-      // dimension value
-      if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "create_name - "
-                             "bad array dimension\n"),
-                            -1);
-        }
-      if (expr->ev ()->et == AST_Expression::EV_ulong)
-        {
-          ACE_OS::sprintf (namebuf, "%s_%d", namebuf, ((int)expr->ev ()->u.ulval));
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "create_name - "
-                             "bad dimension value\n"),
-                            -1);
-        }
-    }
-
-  // now see if we have a fully scoped name and if so, generate one
-  scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-  if (scope)
-    {
-      // make a copy of the enclosing scope's  name
-      n = (UTL_ScopedName *)scope->name ()->copy () ;
-
-      // add our local name as the last component
-      n->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                    (namebuf), 1,
-                                                    0, I_FALSE),
-                                    NULL));
-      // set the fully scoped name
-      this->set_name (n);
-    }
-  else
-    {
-      // We better be not here because we must be inside some scope,
-      // atleast the ROOT scope.
-      return -1;
-    }
-  return 0;
-}
-
-// Code generation
-
-int
-be_array::gen_dimensions (TAO_OutStream *os, unsigned short slice)
-{
-  unsigned long i;   // loop index
-
-  // print our dimensions
-  for (i = (slice?1:0); i < this->n_dims (); i++)
-    {
-      AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-
-      // dimension value
-      if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_dimensions - "
-                             "bad array dimension\n"),
-                            -1);
-        }
-      if (expr->ev ()->et == AST_Expression::EV_ulong)
-        {
-          *os << "[" << ((int)expr->ev ()->u.ulval) << "]";
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_dimensions - "
-                             "bad dimension value\n"),
-                            -1);
-        }
-    }
-  return 0;
-}
-
-int
-be_array::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // our base type
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ARRAY_DEFN_CH); // set current code gen state
-
-      ch = cg->client_header (); // retrieve client hdr stream
-
-#if 0
-      if (this->create_name () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "name creation failed\n"),
-                            0);
-        }
-#endif
-      s = cg->make_state (); // get the state-based code generation object
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "Bad state\n"),
-                            -1);
-        }
-
-      // retrieve the base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "Bad type\n"),
-                            -1);
-        }
-
-      // generate the ifdefined macro for the array type
-      ch->gen_ifdef_macro (this->flatname ());
-
-      ch->indent (); // start from current indentation
-      // generate code for our base type if required and then print the type
-      // name
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      // print our name
-      *ch << " " <<  this->local_name ();
-      // print our dimensions
-      if (this->gen_dimensions (ch) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "dimension codegen failed\n"),
-                            -1);
-        }
-
-      *ch << ";" << nl;
-
-      // if our base type is VARIABLE length, then we are variable length too
-      this->size_type (bt->size_type ());
-      cg->pop ();
-
-      cg->push (TAO_CodeGen::TAO_ARRAY_OTHER_CH); // rest of the array defn
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "bad state\n"),
-                            -1);
-        }
-
-      // now generate the slice definition
-      *ch << "typedef ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ch << " " <<  this->local_name () << "_slice";
-      // print dimensions except first one
-      if (this->gen_dimensions (ch, 1) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "slice dimensions codegen failed\n"),
-                            -1);
-        }
-      *ch << ";" << nl;
-
-      // memory management functions
-
-      // The T_alloc method
-      // first find if we are inside a scope
-      if (this->is_nested ()) // we were defined inside a scope. Hence the
-                              // memory management functions become static
-                              // members of the enclosing class
-        *ch << "static ";
-
-      // the return type is a pointer to slice
-      *ch <<  this->local_name () << "_slice *"
-          << this->local_name () << "_alloc (void);" << nl;
-      // the T_dup method
-      if (this->is_nested ())
-        *ch << "static ";
-      *ch <<  this->local_name () << "_slice *" << this->local_name () <<
-        "_dup (const " << this->local_name () << "_slice *);" << nl;
-      // the T_free method
-      if (this->is_nested ())
-        *ch << "static ";
-      *ch << "void " << this->local_name () << "_free (" << this->local_name ()
-          << "_slice *);\n\n";
-
-      // Generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr "
-              << this->tao_name () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-              << idl_global->export_macro ()
-              << " CORBA::TypeCode_ptr "
-              << this->tao_name () << ";\n\n";
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-      // generate the _var, _out, and _forany definition
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "error generating _var class\n"),
-                            -1);
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "error generating _out class\n"),
-                            -1);
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro
-      ch->gen_ifdef_macro (this->flatname (), "_forany");
-      if (this->gen_forany_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_header - "
-                             "error generating _forany class\n"),
-                            -1);
-        }
-      ch->gen_endif ();
-
-      this->cli_hdr_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-int
-be_array::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  unsigned long i;
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_"
-          << this->tao_name () << "[] =" << nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_"
-          << this->tao_name ()
-          << " (CORBA::tk_sequence, "
-          << "sizeof (_oc_" <<  this->tao_name ()
-          << "), (char *) &_oc_"
-          << this->tao_name ()
-          << ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr "
-          << this->tao_name () << " = &_tc__tc_"
-          << this->tao_name () << ";\n\n";
-
-      cg->pop ();
-      this->cli_stub_gen_ = I_TRUE;
-
-      // T_dup method
-      *cs << this->name () << "_slice *" << nl;
-      *cs << this->name () << "_dup (const "
-          << this->name () << "_slice * s)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << this->name () << "_slice *temp;" << nl;
-      *cs << "// alloc an array" << nl;
-      *cs << "temp = " << this->name () << "_alloc ();" << nl;
-      *cs << "// copy each individual elements" << nl;
-      // generate nested loops for as many dimensions as there are
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_array::"
-                                 "gen_client_stubs - "
-                                 "bad array dimension\n"),
-                                -1);
-            }
-          if (expr->ev ()->et == AST_Expression::EV_ulong)
-            {
-              // generate a loop for each dimension
-              *cs << "for (CORBA::ULong i" << i << " = 0; i" << i << " < " <<
-                expr->ev ()->u.ulval << "; i" << i << "++)\n";
-              cs->incr_indent ();
-            }
-          else
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_array::"
-                                 "gen_client_stubs - "
-                                 "bad array dimension value\n"),
-                                -1);
-            }
-        }
-
-      // now generate code such that every element of the array gets assigned
-      // inside the innermost level of the  nested loops generated above
-      *cs << "temp"; // generate the lvalue
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          *cs << "[i" << i << "]";
-        }
-      *cs << " = ";
-      *cs << "s";  // generate the rvalue
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          *cs << "[i" << i << "]";
-        }
-      *cs << ";\n";
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          // decrement indentation as many times as the number of dimensions
-          cs->decr_indent (0);
-        }
-      cs->indent ();
-      *cs << "return temp;\n";
-      // one more to get to the outermost level
-      cs->decr_indent ();
-      *cs << "}\n\n";
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_array::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      TAO_OutStream *ci; // output stream
-      TAO_NL  nl;        // end line
-      be_type *bt;       // our base type
-      be_state *s;       // state based code gen obj
-
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ci = cg->client_inline ();
-      cg->push (TAO_CodeGen::TAO_ARRAY_DEFN_CI);
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_inline - "
-                             "bad state\n"),
-                            -1);
-        }
-
-      // retrieve our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_inline - "
-                             "bad base type\n"),
-                            -1);
-        }
-
-      // first define the _alloc, _dup and _free methods
-      // If we are defined inside some scope, these methods become static
-      // members of the enclosing scope
-
-      // alloc method
-      ci->indent (); // start from current indentation
-      *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-      *ci << this->name () << "_alloc (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return new ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_inline - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      if (this->gen_dimensions (ci) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_array::"
-                             "gen_client_inline - "
-                             "dimensions codegen failed\n"),
-                            -1);
-        }
-
-      *ci << ";\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // free method
-      *ci << "ACE_INLINE void" << nl
-          << this->name () << "_free (" << this->name ()
-          << "_slice *s)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete [] s;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // emit implementations of methods of the _var, _out, and _forany classes
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _var impl code gen failed\n"));
-          return -1;
-        }
-      if (this->gen_out_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _out impl code gen failed\n"));
-          return -1;
-        }
-      if (this->gen_forany_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _forany impl code gen failed\n"));
-          return -1;
-        }
-
-      // generate client inline for base type
-      if (bt->gen_client_inline () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: base type inline code gen failed\n"));
-          return -1;
-        }
-
-      cg->pop ();
-      this->cli_inline_gen_ = I_TRUE;
-    }
-
-  return 0;
-}
-
-int
-be_array::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_array::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-int
-be_array::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the var defn
-int
-be_array::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr from pointer to slice
-  *ch << namebuf << " (" << this->local_name () << "_slice *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer to slice
-  *ch << namebuf << " &operator= (" << this->local_name () << "_slice *);" <<
-    nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  // nothing here
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  // overloaded [] operator
-  *ch << this->local_name () << "_slice &operator[] (CORBA::ULong index);" <<
-    nl;
-  *ch << "const " << this->local_name () <<
-    "_slice &operator[] (CORBA::ULong index) const;" << nl;
-
-  // cast operators
-  *ch << "operator " << this->local_name () << "_slice * const &() const;" <<
-    nl;
-  *ch << "operator " << this->local_name () << "_slice *&();" << nl;
-
-  // in, inout, out and _retn
-  *ch << "// in, inout, out, _retn " << nl;
-  *ch << "const " << this->local_name () << "_slice *in (void) const;" << nl;
-  *ch << this->local_name () << "_slice *inout (void);" << nl;
-  *ch << this->local_name () << "_slice *&out (void);" << nl;
-  *ch << this->local_name () << "_slice *_retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << this->local_name () << "_slice *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_slice *ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_array::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ ((" << this->name () << "_slice *)0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _slice *
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_slice *p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor (deep copy)
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "_dup (p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// is what we own the same that is being assigned to us?" <<
-    nl;
-  *ci << "if (this->ptr_ != p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// delete our stuff and assume ownership of p" << nl;
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// not assigning to ourselves" << nl;
-  *ci << this->name () << "_free (this->ptr_); // free old stuff" << nl;
-  *ci << "this->ptr_ = " << this->name () <<
-    "_dup (p.ptr_);// deep copy\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operators ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_slice * const &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_slice *&() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two operator []s instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << "_slice *" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice * &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_array::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer to slice
-  *ch << namebuf << " (" << this->local_name () << "_slice *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment from slice *
-  *ch << namebuf << " &operator= (" << this->local_name () << "_slice *);" <<
-    nl;
-  // cast
-  *ch << "operator " << this->local_name () << "_slice *&();" << nl;
-  // ptr fn
-  *ch << this->local_name () << "_slice *&ptr (void);" << nl;
-  // operator [] instead of ->
-  *ch << this->local_name () << "_slice &operator[] (CORBA::ULong index);" << nl;
-  *ch << "const " << this->local_name () << "_slice &operator[] " <<
-    "(CORBA::ULong index) const;" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_slice *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << this->local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_array::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the out implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer to slice
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () << "_slice *&p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_slice *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator [] instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_array::gen_forany_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_forany", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr from pointer to slice
-  *ch << namebuf << " (" << this->local_name () << "_slice *, " <<
-    "CORBA::Boolean nocopy=0);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer to slice
-  *ch << namebuf << " &operator= (" << this->local_name () << "_slice *);" <<
-    nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  // nothing here
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  // overloaded [] operator
-  *ch << this->local_name () << "_slice &operator[] (CORBA::ULong index);" <<
-    nl;
-  *ch << "const " << this->local_name () <<
-    "_slice &operator[] (CORBA::ULong index) const;" << nl;
-
-  // cast operators
-  *ch << "operator " << this->local_name () << "_slice * const &() const;" <<
-    nl;
-  *ch << "operator " << this->local_name () << "_slice *&();" << nl;
-
-  // in, inout, out and _retn
-  *ch << "// in, inout, out, _retn " << nl;
-  *ch << "const " << this->local_name () << "_slice *in (void) const;" << nl;
-  *ch << this->local_name () << "_slice *inout (void);" << nl;
-  *ch << this->local_name () << "_slice *&out (void);" << nl;
-  *ch << this->local_name () << "_slice *_retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << this->local_name () << "_slice *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << "friend CORBA::Any;" << nl;
-  *ch << this->local_name () << "_slice *ptr_;" << nl;
-  *ch << "CORBA::Boolean nocopy_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_array::gen_forany_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_forany", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_forany", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ ((" << this->name () << "_slice *)0)," << nl;
-  *ci << "    nocopy_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _slice *
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_slice *p, " <<
-    "CORBA::Boolean nocopy)" << nl;
-  *ci << "  : ptr_ (p)," << nl;
-  *ci << "    nocopy_ (nocopy)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor (deep copy)
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "_dup (p.ptr_);" << nl;
-  *ci << "this->nocopy_ = p.nocopy_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// is what we own the same that is being assigned to us?" <<
-    nl;
-  *ci << "if (this->ptr_ != p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// delete our stuff and assume ownership of p" << nl;
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _forany
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// not assigning to ourselves" << nl;
-  *ci << this->name () << "_free (this->ptr_); // free old stuff" << nl;
-  *ci << "this->ptr_ = " << this->name () <<
-    "_dup (p.ptr_);// deep copy" << nl;
-  *ci << "this->nocopy_ = p.nocopy_;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operators ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name ()
-      << "_slice * const &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_slice *&() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two operator []s instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice const &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << "_slice *" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice * &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-int
-be_array::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_array, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_array::gen_encapsulation (void)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt; // base type
-
-  os = cg->client_stubs ();
-  os->indent (); // start from the current indentation level
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-
-  // emit typecode of element type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_sequence::gen_typecode - bad base type\n"));
-      return -1;
-    }
-
-  //  emit the length
-  os->indent ();
-  //  *os << this->max_size () << ",\n";
-  return 0;
-}
-
-// compute typecode size
-long
-be_array::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_array::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-
-      this->encap_len_ = 4;  // holds the byte order flag
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_array::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-      this->encap_len_ += 4; // to hold the array size
-
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_array::compute_size_type (void)
-{
-  be_type *type = be_type::narrow_from_decl (this->base_type ());
-  if (!type)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::compute_size_type - "
-                         "bad base type\n"), -1);
-    }
-
-  // our size type is the same as our type
-  this->size_type (type->size_type ());
-  return 0;
-}
-
-int be_array::write_as_return (TAO_OutStream *stream,
-                               be_type *type)
-{
-  *stream << type->name () << "_slice *";
-  return 0;
-}
-
-int
-be_array::accept (be_visitor *visitor)
-{
-  return visitor->visit_array (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_array, AST_Array, be_type)
-IMPL_NARROW_FROM_DECL (be_array)
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
deleted file mode 100644
index 5f5e6977a1d..00000000000
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ /dev/null
@@ -1,730 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_attribute.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Attribute that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Attribute
- */
-be_attribute::be_attribute (void)
-{
-}
-
-be_attribute::be_attribute (idl_bool ro, AST_Type *ft, UTL_ScopedName *n,
-                            UTL_StrList *p)
-  : AST_Attribute (ro, ft, n, p),
-    AST_Field (AST_Decl::NT_attr, ft, n, p),
-    AST_Decl (AST_Decl::NT_attr, n, p)
-{
-}
-
-// Handling attributes is very similar to operations. Attributes are mapped to
-// two methods - one to set the value and one to get the value. For a readonly
-// attribute we only have the method that retrieves the value. For the "set"
-// method we pass an in parameter which is of the type of the attribute. So the
-// handling here is exactly like the "in" parameters for arguments. The
-// handling of the "get" method is exactly like the return values of
-// operations.
-
-int
-be_attribute::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ch = cg->client_header ();
-
-  ch->indent (); // start with the current indentation level
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_header - "
-                         "bad type\n"),
-                        -1);
-    }
-
-
-  // first the "get" method
-
-  // the retrieve method is defined virtual
-  *ch << "virtual ";
-
-  // first generate the return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH); // we are now generating
-                                                       // an attribute "get"
-                                                       // definition with the
-                                                       // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  // generate the operation name
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support C++ style Exceptions. However, we can have an option to the
-  // "tao" IDL compiler to ask it to generate code for exceptions. This will be
-  // handled in a later release.
-  *ch << " " << this->local_name () << " (CORBA::Environment &env);\n";
-
-  // now the set method. However, this is not defined if we are readonly
-  if (!this->readonly ())
-    {
-      ch->indent ();
-      *ch << "virtual void " << this->local_name () << "(";
-
-      // we pass the type as an "in" parameter
-      cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH);
-
-      s = cg->make_state (); // retrieve state based object
-
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_attribute::gen_client_header - "
-                             "in param type generation failure\n"),
-                            -1);
-        }
-      cg->pop (); // restore previous state
-      *ch << ", CORBA::Environment &env);\n";
-    }
-
-  return 0;
-}
-
-int
-be_attribute::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  // retrieve the type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // first the retrieve method
-  cs->indent (); // start with current indentation level
-
-  // generate the TAO_Param_Data table for the "get" method
-  *cs << "static const TAO_Param_Data _get_" << this->flatname () <<
-    "_paramdata [] = " << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // entry for the return type
-  *cs << "{" << bt->tc_name () << ", PARAM_RETURN, ";
-  // Are we returning a pointer to value? i.e., is the type variable? If it is,
-  // we must tell the stub what is the size of the top level structure
-  be_type *prim;
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-      prim = tdef->primitive_base_type ();
-    }
-  else
-    prim = bt;
-  if (prim->size_type () == be_decl::VARIABLE)
-    {
-      switch (prim->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_string:
-        case AST_Decl::NT_sequence:
-        case AST_Decl::NT_struct:
-        case AST_Decl::NT_union:
-          // no need of size here
-          *cs << "0}";
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            be_predefined_type *bpd = be_predefined_type::narrow_from_decl
-              (bt);
-            if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-              // no need of size here
-              *cs << "0}";
-            else
-              *cs << "sizeof (" << bt->name () << ")}";
-          }
-          break;
-        default:
-          *cs << "sizeof (" << bt->name () << ")}";
-        }
-    }
-  else
-    *cs << "0}";
-  cs->decr_indent ();
-  *cs << "};\n\n";
-
-  // now generate the calldata table
-
-  cs->indent ();
-  *cs << "static const TAO_Call_Data _get_" << this->flatname () << "_calldata = "
-      << nl;
-  *cs << "{";
-  // prepend a "_get_"
-  *cs << "\"_get_" << this->local_name () << "\", ";
-  *cs << "1, "; // always a twoway call
-  *cs << "1, "; // size is 1
-  // insert the address of the paramdata table
-  *cs << "_get_" << this->flatname () << "_paramdata, ";
-  // XXXASG - Exception list goes here (if it exists) - TODO
-  *cs << "0, 0};\n\n";
-
-  // now generate the actual stub
-
-  // first generate the return type
-  cs->indent ();
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS); // declare a return
-                                                        // type of the stub
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate the operation name
-  *cs << " " << this->name () << "(CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // declare a return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "retval declaration failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate code that calls QueryInterface
-  *cs << "STUB_Object *istub;\n\n";
-  cs->indent ();
-  *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-    "(void **)&istub) != TAO_NOERROR)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" <<
-    nl;
-
-  // return the appropriate error value on exception
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "failure returning from exception\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  cs->decr_indent ();
-  *cs << "}" << nl;
-  *cs << "this->Release (); // QueryInterface has bumped up our refcount" << nl;
-
-  // call do_static_call with appropriate number of arguments
-  *cs << "istub->do_static_call (env, &_get_" << this->flatname () <<
-    "_calldata";
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-      prim = tdef->primitive_base_type ();
-    }
-  else
-    prim = bt;
-
-  if (prim->size_type () == be_decl::VARIABLE)
-    {
-      switch (prim->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_string:
-          *cs << ", &retval";
-          break;
-        case AST_Decl::NT_sequence:
-        case AST_Decl::NT_struct:
-        case AST_Decl::NT_union:
-          *cs << ", retval";
-          break;
-        default:
-          *cs << ", &retval";
-        }
-    }
-  else
-    *cs << ", &retval";
-
-  *cs << ");" << nl;
-
-  // return the retval
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs\n"
-                         "return val return generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-
-  if (this->readonly ())
-    return 0;  // we were readonly, nothing else to do.
-
-  // Now generate the stub for the "set" method
-  cs->indent (); // start with current indentation level
-
-  // generate the TAO_Param_Data table for the "set" method
-  *cs << "static const TAO_Param_Data _set_" << this->flatname () <<
-    "_paramdata [] = " << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // entry for the return type
-  *cs << "{CORBA::_tc_void, PARAM_RETURN, 0}," << nl;
-  *cs << "{" << bt->tc_name () << ", PARAM_IN, 0}\n";
-  cs->decr_indent ();
-  *cs << "};\n\n";
-
-  // now generate the calldata table
-
-  cs->indent ();
-  *cs << "static const TAO_Call_Data _set_" << this->flatname () << "_calldata = "
-      << nl;
-  *cs << "{";
-  // prepend a "_set_"
-  *cs << "\"_set_" << this->local_name () << "\", ";
-  *cs << "1, "; // always a twoway call
-  *cs << "2, "; // size is 2
-  // insert the address of the paramdata table
-  *cs << "_set_" << this->flatname () << "_paramdata, ";
-  // XXXASG - Exception list goes here (if it exists) - TODO
-  *cs << "0, 0};\n\n";
-
-  // now generate the actual stub
-
-  cs->indent ();
-  *cs << "void " << this->name () << "(";
-  // generate the in parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // last argument - is always CORBA::Environment
-  *cs << ", CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // generate code that calls QueryInterface
-  *cs << "STUB_Object *istub;\n\n";
-  cs->indent ();
-  *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-    "(void **)&istub) != TAO_NOERROR)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" <<
-    nl;
-  *cs << "return;\n";
-  cs->decr_indent ();
-  *cs << "}" << nl;
-  *cs << "this->Release (); // QueryInterface has bumped up our refcount" << nl;
-
-  // do any pre do_static_call stuff with the lone IN parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS);
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_atribute::gen_client_stubs - "
-                         "failure generating pre docall stuff\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // call do_static_call with appropriate number of arguments
-  *cs << "istub->do_static_call (env, &_set_" << this->flatname () <<
-  "_calldata, 0"; // no return value
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "in param in docall generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-  *cs << ");" << nl;
-
-  // do any post do_static_call processing
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS);
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs\n"
-                         "post docall generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-
-  return 0;
-}
-
-int
-be_attribute::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code generator object
-  TAO_NL nl;         // newline generator
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  sh = cg->server_header ();
-
-  // first retrieve the type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // first the "get" method
-
-  sh->indent (); // start with the current indentation level
-
-  // the retrieve method is defined pure virtual
-  *sh << "virtual ";
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH); // we are now generating
-                                                       // an operation
-                                                       // definition with the
-                                                       // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  *sh << " " << this->local_name () << " (CORBA::Environment &env) = 0;" << nl;
-
-  // generate the static method corresponding to the method
-  *sh << "static void _get_" << this->local_name () <<
-    "_skel (CORBA::ServerRequest &req, void *obj, " <<
-    "void *context, CORBA::Environment &env);\n\n";
-
-
-  // now the set method. However, this is not defined if we are readonly
-  if (this->readonly ())
-    return 0;
-
-  sh->indent ();
-  *sh << "virtual void " << this->local_name () << "(";
-
-  // we pass the type as an "in" parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH);
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "in param type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-  *sh << ", CORBA::Environment &env) = 0;" << nl;
-
-  // generate the static method corresponding to the method
-  *sh << "static void _set_" << this->local_name () <<
-    "_skel (CORBA::ServerRequest &req, void *obj, " <<
-    "void *context, CORBA::Environment &env);\n\n";
-
-
-  return 0;
-}
-
-int
-be_attribute::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-  be_interface *intf; // enclosing interface node
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ss = cg->server_skeletons ();
-
-  ss->indent (); // start with the current indentation level
-
-  // retrieve our type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // retrieve our enclosing interface decl
-  intf = be_interface::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "bad enclosing interface\n"),
-                        -1);
-    }
-
-
-  // code generation - first the "get" method
-  *ss << "void " << intf->full_skel_name () << "::_get_"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-      << "void *_tao_object_reference, void * /*context*/, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  // define a variable that will eventually point to our implementation object
-  *ss << intf->full_skel_name () << "_ptr impl = (" << intf->full_skel_name ()
-      << "_ptr) _tao_object_reference;" << nl;
-  // store the result in this Any
-  *ss << "CORBA::Any *result;" << nl;
-  // emit the return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS); // emit type for return
-                                                        // value
-  // get a state based code gen object
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for return val decl failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  ss->indent ();
-  *ss << "// this method has no incoming parameters. Nothing to parse" << nl;
-
-  // make the upcall
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS);
-  s = cg->make_state ();
-  // emit code to assign to retval
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for return val assign failed\n"),
-                        -1);
-    }
-  *ss << " = impl->" << this->local_name () << "(_tao_environment);" << nl;
-  cg->pop ();
-
-  // insert our return val into the result
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for returning result failed\n"),
-                        -1);
-    }
-  cg->pop ();
-  // insert the result into the server request
-  *ss << "_tao_server_request.result (result, _tao_environment);\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  if (this->readonly ())
-    return 0; // nothing else to do as we are readonly
-
-  // generate skeleton for the "set" method
-
-  ss->indent ();
-  *ss << "void " << intf->full_skel_name () << "::_set_"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-      << "void *_tao_object_reference, void * /*context*/, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  // define an NVList to hold the in argument
-  *ss << "CORBA::NVList_ptr nvlist;" << nl;
-  // define a variable that will eventually point to our implementation object
-  *ss << intf->full_skel_name () << "_ptr    impl = (" << intf->full_skel_name
-    () << "_ptr)_tao_object_reference;" << nl;
-
-  // declare an NVList and create one
-  ss->indent ();
-  *ss << "// create an NV list and populate it with typecodes" << nl;
-  *ss << "_tao_server_request.orb ()->create_list (1, nvlist); // initialize a list" << nl;
-
-  // if we have any arguments, get each one of them and allocate an Any and
-  // NamedValue for each. In addition, define a variable of that type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for returning result failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  *ss << "// parse the arguments" << nl;
-  *ss << "_tao_server_request.params (nvlist, _tao_environment);" << nl;
-  *ss << "if (_tao_environment.exception ()) return;" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "preupcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // make the upcall
-  *ss << "impl->" << this->local_name () << "(";
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "upcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-  *ss << "_tao_environment);" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "post upcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  *ss << "\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_attribute::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_attribute::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_attribute::accept (be_visitor *visitor)
-{
-  return visitor->visit_attribute (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_attribute, AST_Attribute, be_decl)
-IMPL_NARROW_FROM_DECL (be_attribute)
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
deleted file mode 100644
index 2de42eed813..00000000000
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ /dev/null
@@ -1,569 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_codegen.cpp
-//
-// = DESCRIPTION
-//
-//   Code generation
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-TAO_CodeGen *tao_cg = TAO_CODEGEN::instance ();
-
-static const int CHUNK = 100;
-
-/* BE global Data */
-TAO_CodeGen::TAO_CodeGen (void)
-  : client_header_ (0),
-    client_stubs_ (0),
-    client_inline_ (0),
-    server_header_ (0),
-    server_skeletons_ (0),
-    server_inline_ (0),
-    curr_os_ (0),
-    state_ (new TAO_CodeGen::CG_STATE [CHUNK]),
-    top_ (0),
-    size_ (CHUNK),
-    visitor_factory_ (0)
-{
-  // set the current code generation state
-  this->state_ [this->top_++] = TAO_CodeGen::TAO_INITIAL;
-}
-
-// destructor
-TAO_CodeGen::~TAO_CodeGen (void)
-{
-  delete this->client_header_;
-  delete this->server_header_;
-  delete this->client_stubs_;
-  delete this->server_skeletons_;
-  delete this->client_inline_;
-  delete this->server_inline_;
-  this->curr_os_ = 0;
-  delete [] this->state_;
-  delete this->visitor_factory_;
-}
-
-// visitor factory method
-be_visitor *
-TAO_CodeGen::make_visitor (be_visitor_context *ctx)
-{
-  ACE_ASSERT (this->visitor_factory_ != 0);
-  return this->visitor_factory_->make_visitor (ctx);
-}
-
-// factory method
-be_state *
-TAO_CodeGen::make_state (void)
-{
-  switch (this->state ())
-    {
-    case TAO_STRUCT_CH:
-    case TAO_STRUCT_CS:
-    case TAO_STRUCT_CI:
-      return TAO_BE_STATE_STRUCT::instance ();
-    case TAO_UNION_DISCTYPEDEFN_CH:
-      return TAO_BE_STATE_UNION_DISCTYPEDEFN_CH::instance ();
-    case TAO_UNION_DISCTYPEDEFN_CI:
-      return TAO_BE_STATE_UNION_DISCTYPEDEFN_CI::instance ();
-    case TAO_UNION_PUBLIC_CH:
-      return TAO_BE_STATE_UNION_PUBLIC_CH::instance ();
-    case TAO_UNION_PUBLIC_CI:
-      return TAO_BE_STATE_UNION_PUBLIC_CI::instance ();
-    case TAO_UNION_PUBLIC_CS:
-    case TAO_UNION_PUBLIC_ASSIGN_CS:
-      return TAO_BE_STATE_UNION_PUBLIC_CS::instance ();
-    case TAO_UNION_PRIVATE_CH:
-      return TAO_BE_STATE_UNION_PRIVATE_CH::instance ();
-    case TAO_OPERATION_CH:
-    case TAO_OPERATION_RETURN_TYPE_CS:
-    case TAO_OPERATION_RETVAL_DECL_CS:
-    case TAO_OPERATION_RETVAL_EXCEPTION_CS:
-    case TAO_OPERATION_RETVAL_RETURN_CS:
-    case TAO_OPERATION_SH:
-    case TAO_OPERATION_RETVAL_DECL_SS:
-    case TAO_OPERATION_RETVAL_ASSIGN_SS:
-    case TAO_OPERATION_RESULT_SS:
-      return TAO_BE_STATE_OPERATION::instance ();
-    case TAO_ARGUMENT_CH:
-    case TAO_ARGUMENT_CS:
-    case TAO_ARGUMENT_PRE_DOCALL_CS:
-    case TAO_ARGUMENT_DOCALL_CS:
-    case TAO_ARGUMENT_POST_DOCALL_CS:
-    case TAO_ARGUMENT_SH:
-    case TAO_ARGUMENT_SS:
-    case TAO_ARGUMENT_VARDECL_SS:
-    case TAO_ARGUMENT_PRE_UPCALL_SS:
-    case TAO_ARGUMENT_UPCALL_SS:
-    case TAO_ARGUMENT_POST_UPCALL_SS:
-      return TAO_BE_STATE_ARGUMENT::instance ();
-    case TAO_TYPEDEF_CH:
-    case TAO_TYPEDEF_CS:
-    case TAO_TYPEDEF_CI:
-      return TAO_BE_STATE_TYPEDEF::instance ();
-    case TAO_ARRAY_DEFN_CH:
-    case TAO_ARRAY_OTHER_CH:
-    case TAO_ARRAY_DEFN_CI:
-      return TAO_BE_STATE_ARRAY::instance ();
-    case TAO_SEQUENCE_BASE_CH:
-    case TAO_SEQUENCE_BASE_CS:
-    case TAO_SEQUENCE_BASE_CI:
-    case TAO_SEQUENCE_BODY_CH:
-    case TAO_SEQUENCE_BODY_CS:
-    case TAO_SEQUENCE_BODY_CI:
-    case TAO_SEQELEM_RETTYPE_CH:
-    case TAO_SEQELEM_RETTYPE_CI:
-    case TAO_SEQELEM_RETTYPE_CS:
-      return TAO_BE_STATE_SEQUENCE::instance ();
-    case TAO_ATTRIBUTE_RETURN_TYPE_CH:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-    case TAO_ATTRIBUTE_RETURN_TYPE_CS:
-    case TAO_ATTRIBUTE_RETVAL_DECL_CS:
-    case TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-    case TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-    case TAO_ATTRIBUTE_PRE_DOCALL_CS:
-    case TAO_ATTRIBUTE_DOCALL_CS:
-    case TAO_ATTRIBUTE_POST_DOCALL_CS:
-    case TAO_ATTRIBUTE_RETURN_TYPE_SH:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-    case TAO_ATTRIBUTE_RETVAL_DECL_SS:
-    case TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-    case TAO_ATTRIBUTE_RESULT_SS:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-    case TAO_ATTRIBUTE_PRE_UPCALL_SS:
-    case TAO_ATTRIBUTE_UPCALL_SS:
-    case TAO_ATTRIBUTE_POST_UPCALL_SS:
-      return TAO_BE_STATE_ATTRIBUTE::instance ();
-    case TAO_EXCEPTION_CH:
-    case TAO_EXCEPTION_CTOR_CH:
-    case TAO_EXCEPTION_CS:
-    case TAO_EXCEPTION_CTOR_CS:
-    case TAO_EXCEPTION_CTOR_ASSIGN_CS:
-    case TAO_EXCEPTION_CI:
-      return TAO_BE_STATE_EXCEPTION::instance ();
-    default:
-      return 0;
-    }
-}
-
-// change the string to all upcase
-const char *
-TAO_CodeGen::upcase (const char *str)
-{
-  static char upcase_str [NAMEBUFSIZE];
-
-  ACE_OS::memset (upcase_str, '\0', NAMEBUFSIZE);
-  // convert letters in str to upcase
-  for (unsigned int i=0; i < ACE_OS::strlen (str); i++)
-    {
-      if (isalpha (str [i]))
-        {
-          upcase_str[i] = toupper (str [i]);
-        }
-      else
-        {
-          // copy it as it is
-          upcase_str[i] = str[i];
-        }
-    }
-  return upcase_str;
-}
-
-// set the client header stream
-int
-TAO_CodeGen::client_header (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_header_ = factory->make_outstream ();
-  if (!this->client_header_)
-    {
-      return -1;
-    }
-
-  if (this->client_header_->open (fname, TAO_OutStream::TAO_CLI_HDR) == -1)
-    return -1;
-  else
-    {
-      // now generate the #if !defined clause
-      static char macro_name [NAMEBUFSIZE];
-
-      ACE_OS::memset (macro_name, '\0', NAMEBUFSIZE);
-      const char *suffix = ACE_OS::strstr (fname, ".h");
-      if (suffix == 0)
-        return -1; // bad file name
-      else
-        {
-          ACE_OS::sprintf (macro_name, "_TAO_IDL_");
-          // convert letters in fname to upcase
-          for (int i=0; i < (suffix - fname); i++)
-	    {
-	      if (isalpha (fname [i]))
-		macro_name[i+9] = toupper (fname [i]);
-	      else if (isdigit (fname [i]))
-		macro_name[i+9] = fname[i];
-	      else
-		macro_name[i+9] = '_';
-	    }
-
-          ACE_OS::strcat (macro_name, "_H_");
-
-          this->client_header_->print ("#if !defined (%s)\n", macro_name);
-          this->client_header_->print ("#define %s\n\n", macro_name);
-          *this->client_header_ << "#include \"tao/corba.h\"\n";
-
-	  if (idl_global->export_include () != 0)
-	    {
-	      *this->client_header_ << "#include \""
-				    << idl_global->export_include ()
-				    << "\"\n";
-	    }
-
-	  // We must include all the skeleton headers corresponding to
-	  // IDL files included by the current IDL file.
-	  for (size_t j = 0;
-	       j < idl_global->n_include_file_names ();
-	       ++j)
-	    {
-	      String* idl_name =
-		idl_global->include_file_names()[j];
-
-	      const char* client_hdr =
-		IDL_GlobalData::be_get_client_hdr (idl_name);
-
-	      if (client_hdr != 0)
-		{
-		  this->client_header_->print ("#include \"%s\"\n",
-					       client_hdr);
-		}
-	      else
-		{
-		  ACE_ERROR ((LM_WARNING,
-			      "WARNING, invalid file '%s' included\n",
-			      idl_name->get_string ()));
-		}
-	    }
-	  *this->client_header_ << "\n";
-          return 0;
-        }
-    }
-}
-
-// get the client header stream
-TAO_OutStream *
-TAO_CodeGen::client_header (void)
-{
-  return this->client_header_;
-}
-
-// set the client stub stream
-int
-TAO_CodeGen::client_stubs (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_stubs_ = factory->make_outstream ();
-  if (!this->client_stubs_)
-    {
-      return -1;
-    }
-
-  if (this->client_stubs_->open (fname, TAO_OutStream::TAO_CLI_IMPL) == -1)
-    {
-      return -1;
-    }
-  // generate the include statement for the client header
-  *this->client_stubs_ << "#include \"" <<
-    idl_global->be_get_client_hdr_fname () << "\"\n\n";
-
-  *this->client_stubs_ << "#include \"" <<
-    idl_global->be_get_server_hdr_fname () << "\"\n\n";
-
-  // generate the code that includes the inline file if not included in the
-  // header file
-  *this->client_stubs_ << "#if !defined (__ACE_INLINE__)\n";
-  *this->client_stubs_ << "#include \"" <<
-    idl_global->be_get_client_inline_fname () << "\"\n";
-  *this->client_stubs_ << "#endif /* !defined INLINE */\n\n";
-  return 0;
-}
-
-// get the client stubs stream
-TAO_OutStream *
-TAO_CodeGen::client_stubs (void)
-{
-  return this->client_stubs_;
-}
-
-// set the client inline stream
-int
-TAO_CodeGen::client_inline (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_inline_ = factory->make_outstream ();
-  if (!this->client_inline_)
-    {
-      return -1;
-    }
-
-  return this->client_inline_->open (fname, TAO_OutStream::TAO_CLI_INL);
-}
-
-// get the client inline stream
-TAO_OutStream *
-TAO_CodeGen::client_inline (void)
-{
-  return this->client_inline_;
-}
-
-// set the server header stream
-int
-TAO_CodeGen::server_header (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_header_ = factory->make_outstream ();
-  if (!this->server_header_)
-    {
-      return -1;
-    }
-
-  if (this->server_header_->open (fname, TAO_OutStream::TAO_SVR_HDR) == -1)
-    return -1;
-  else
-    {
-      // now generate the #if !defined clause
-      static char macro_name [NAMEBUFSIZE];
-
-      ACE_OS::memset (macro_name, '\0', NAMEBUFSIZE);
-      const char *suffix = ACE_OS::strstr (fname, ".h");
-      if (suffix == 0)
-	return -1; // bad file name
-      else
-	{
-          ACE_OS::sprintf (macro_name, "_TAO_IDL_");
-          // convert letters in fname to upcase
-          for (int i=0; i < (suffix - fname); i++)
-            if (isalpha (fname [i]))
-              macro_name[i+9] = toupper (fname [i]);
-            else
-              macro_name[i+9] = fname[i];
-
-          ACE_OS::strcat (macro_name, "_H_");
-
-          this->server_header_->print ("#if !defined (%s)\n", macro_name);
-          this->server_header_->print ("#define %s\n\n", macro_name);
-
-	  // We must include all the skeleton headers corresponding to
-	  // IDL files included by the current IDL file.
-	  for (size_t j = 0;
-	       j < idl_global->n_include_file_names ();
-	       ++j)
-	    {
-	      String* idl_name =
-		idl_global->include_file_names()[j];
-
-	      const char* server_hdr =
-		IDL_GlobalData::be_get_server_hdr (idl_name);
-
-	      this->server_header_->print ("#include \"%s\"\n",
-					   server_hdr);
-	    }
-          // the server header should include the client header
-          *this->server_header_ << "#include \"" <<
-            idl_global->be_get_client_hdr_fname () << "\"\n\n";
-
-          return 0;
-        }
-    }
-}
-
-// get the server header stream
-TAO_OutStream *
-TAO_CodeGen::server_header (void)
-{
-  return this->server_header_;
-}
-
-// set the server skeletons stream
-int
-TAO_CodeGen::server_skeletons (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_skeletons_ = factory->make_outstream ();
-  if (!this->server_skeletons_)
-    {
-      return -1;
-    }
-
-  if (this->server_skeletons_->open (fname, TAO_OutStream::TAO_SVR_IMPL) == -1)
-    {
-      return -1;
-    }
-
-  // generate the include statement for the server header
-  *this->server_skeletons_ << "#include \"" <<
-    idl_global->be_get_server_hdr_fname () << "\"\n\n";
-
-  // generate the code that includes the inline file if not included in the
-  // header file
-  *this->server_skeletons_ << "#if !defined (__ACE_INLINE__)\n";
-  *this->server_skeletons_ << "#include \"" <<
-    idl_global->be_get_server_inline_fname () << "\"\n";
-  *this->server_skeletons_ << "#endif /* !defined INLINE */\n\n";
-  return 0;
-}
-
-// get the server skeletons stream
-TAO_OutStream *
-TAO_CodeGen::server_skeletons (void)
-{
-  return this->server_skeletons_;
-}
-
-// set the server inline stream
-int
-TAO_CodeGen::server_inline (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_inline_ = factory->make_outstream ();
-  if (!this->server_inline_)
-    {
-      return -1;
-    }
-
-  return this->server_inline_->open (fname, TAO_OutStream::TAO_SVR_INL);
-}
-
-// get the server inline stream
-TAO_OutStream *
-TAO_CodeGen::server_inline (void)
-{
-  return this->server_inline_;
-}
-
-// put the last #endif in the client and server headers
-int
-TAO_CodeGen::end_client_header (void)
-{
-  // insert the code to include the inline file
-  *this->client_header_ << "\n#if defined (__ACE_INLINE__)\n";
-  *this->client_header_ << "#include \"" <<
-    idl_global->be_get_client_inline_fname () << "\"\n";
-  *this->client_header_ << "#endif /* defined INLINE */\n\n";
-
-  // code to put the last #endif
-  *this->client_header_ << "\n#endif /* if !defined */\n";
-  return 0;
-}
-
-int
-TAO_CodeGen::end_server_header (void)
-{
-  // insert the code to include the inline file
-  *this->server_header_ << "\n#if defined (__ACE_INLINE__)\n";
-  *this->server_header_ << "#include \"" <<
-    idl_global->be_get_server_inline_fname () << "\"\n";
-  *this->server_header_ << "#endif /* defined INLINE */\n\n";
-
-  // code to put the last #endif
-  *this->server_header_ << "\n#endif /* if !defined */\n";
-  return 0;
-}
-
-// We use the following helper functions to pass information. This class is the
-// best place to pass such information rather than passing information through
-// global variables spread everywhere. This class is a singleton and is
-// effectively a global.
-
-void
-TAO_CodeGen::outstream (TAO_OutStream *os)
-{
-  this->curr_os_ = os;
-}
-
-TAO_OutStream *
-TAO_CodeGen::outstream (void)
-{
-  return this->curr_os_;
-}
-
-void
-TAO_CodeGen::push (TAO_CodeGen::CG_STATE s)
-{
-  if (this->top_ == this->size_)
-    {
-      TAO_CodeGen::CG_STATE *temp = this->state_;
-      this->size_ += CHUNK;
-      this->state_ = new TAO_CodeGen::CG_STATE [this->size_];
-      for (int i=0; i < this->top_; i++)
-        this->state_ [i] = temp [i];
-      delete []temp;
-    }
-  this->state_[this->top_++] = s;
-}
-
-void
-TAO_CodeGen::pop (void)
-{
-  this->top_--;
-}
-
-TAO_CodeGen::CG_STATE
-TAO_CodeGen::state (void)
-{
-  return this->state_[this->top_ - 1]; // top points to the next free slot
-}
-
-void
-TAO_CodeGen::reset (void)
-{
-  this->top_ = 1; // the 0th posn is always the INITIAL state
-}
-
-void
-TAO_CodeGen::node (be_decl *n)
-{
-  this->node_ = n;
-}
-
-be_decl *
-TAO_CodeGen::node (void)
-{
-  return this->node_;
-}
-
-void
-TAO_CodeGen::visitor_factory (TAO_Visitor_Factory *f)
-{
-  this->visitor_factory_ = f;
-}
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
deleted file mode 100644
index 962436a8de3..00000000000
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_constant.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Constant that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Constant
- */
-be_constant::be_constant (void)
-{
-  this->size_type (be_decl::FIXED);
-}
-
-be_constant::be_constant (AST_Expression::ExprType et,
-			  AST_Expression *v,
-                          UTL_ScopedName *n,
-                          UTL_StrList *p)
-  : AST_Constant (et, v, n, p),
-    AST_Decl (AST_Decl::NT_const, n, p)
-{
-  this->size_type (be_decl::FIXED);
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the constant
-int
-be_constant::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_CONSTANT_CH);
-
-  ch = cg->client_header ();
-
-  // if we are defined in the outermost scope, then the value is assigned
-  // to us here itself, else it will be in the *.cpp file
-
-  ch->indent (); // start from whatever indentation level we were at
-  *ch << "static const " << this->exprtype_to_string () << " " << local_name ();
-  if (!this->is_nested ())
-    {
-      // We were defined at the outermost scope. So we put the value in the
-      // header itself
-      *ch << " = " << this->constant_value ();
-    }
-  *ch << ";\n\n";
-  cg->pop ();
-  return 0;
-}
-
-// Generates the client-side stubs for the constant
-int
-be_constant::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_CONSTANT_CS);
-
-  cs = cg->client_stubs ();
-
-  if (this->is_nested ())
-    {
-      // for those constants not defined in the outer most scope, they get
-      // assigned to their values in the
-      cs->indent (); // start from whatever indentation level we were at
-      *cs << "const " << this->exprtype_to_string () << " " << this->name ();
-      *cs << " = " << this->constant_value ();
-      *cs << ";\n\n";
-    }
-  cg->pop ();
-  return 0;
-}
-
-// Generates the server-side header information for the constant
-int
-be_constant::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the constant
-int
-be_constant::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_constant::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_constant::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-char *
-be_constant::exprtype_to_string (void)
-{
-  switch (this->et ())
-    {
-    case AST_Expression::EV_short:
-      return "CORBA::Short";
-    case AST_Expression::EV_ushort:
-      return "CORBA::UShort";
-    case AST_Expression::EV_long:
-      return "CORBA::Long";
-    case AST_Expression::EV_ulong:
-      return "CORBA::ULong";
-    case AST_Expression::EV_float:
-      return "CORBA::Float";
-    case AST_Expression::EV_double:
-      return "CORBA::Double";
-    case AST_Expression::EV_char:
-      return "CORBA::Char";
-    case AST_Expression::EV_octet:
-      return "CORBA::Octet";
-    case AST_Expression::EV_bool:
-      return "CORBA::Boolean";
-    case AST_Expression::EV_string:
-      return "char *const";
-    case AST_Expression::EV_any:
-      return "CORBA::Any";
-    case AST_Expression::EV_void:
-      return "void";
-    case AST_Expression::EV_none:
-      return "none";
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-      return NULL;
-    }
-  return NULL;
-}
-
-int
-be_constant::accept (be_visitor *visitor)
-{
-  return visitor->visit_constant (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_constant, AST_Constant, be_decl)
-IMPL_NARROW_FROM_DECL (be_constant)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
deleted file mode 100644
index 1d776ed5e07..00000000000
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ /dev/null
@@ -1,570 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_decl.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Decl that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-
-// Default Constructor
-be_decl::be_decl (void)
-  : cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    fullname_ (0),
-    flatname_ (0),
-    repoID_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN),
-    encap_len_ (-1)
-{
-}
-
-// Constructor
-be_decl::be_decl (AST_Decl::NodeType type, UTL_ScopedName *n, UTL_StrList
-                  *pragmas)
-  : AST_Decl (type, n, pragmas),
-    cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    fullname_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN),
-    encap_len_ (-1)
-{
-}
-
-//destructor
-be_decl::~be_decl (void)
-{
-}
-
-int
-be_decl::gen_encapsulation (void)
-{
-  // do nothing
-  return 0;
-}
-
-long
-be_decl::tc_encap_len (void)
-{
-  return -1;
-}
-
-// return our size type
-be_decl::SIZE_TYPE
-be_decl::size_type (void)
-{
-  if (this->size_type_ == be_decl::SIZE_UNKNOWN)
-    (void) this->compute_size_type ();
-  return this->size_type_;
-}
-
-// set our size type and that of all our ancestors
-void
-be_decl::size_type (be_decl::SIZE_TYPE st)
-{
-  // precondition - you cannot set somebody's sizetype to unknown
-  ACE_ASSERT (st != be_decl::SIZE_UNKNOWN);
-
-  // st can be VARIABLE or FIXED
-  if (this->size_type_ == be_decl::SIZE_UNKNOWN) // not set yet
-    this->size_type_ = st; // set it
-  else if ((this->size_type_ == be_decl::FIXED) &&
-           (st == be_decl::VARIABLE))
-    // once we are VARIABLE, we cannot be FIXED. But if we were FIXED and then
-    // get overwritten to VARIABLE, it is fine. Such a situation occurs only
-    // when setting the sizes of structures and unions
-    this->size_type_ = st;
-
-
-#if 0
-  // if we are just a typedef, nothing else to do
-  if (this->node_type () == AST_Decl::NT_typedef)
-    return;
-
-  // update our parent if it is of a specific type
-  if (this->is_nested ())
-    {
-      // get the scope we are defined in
-      be_decl *d = be_decl::narrow_from_decl (ScopeAsDecl (this->defined_in
-                                                           ()));
-      switch (d->node_type ())
-        {
-          // only these define valid scopes whose size needs to be set the same
-          // as ours.
-        case AST_Decl::NT_struct:
-        case AST_Decl::NT_union:
-          d->size_type (st); // call recursively to set the size type of our
-                             // ancestors
-        default:
-          return; // we are done
-        }
-    } // end else
-#endif
-}
-
-// compute stringified fully scoped name
-void
-be_decl::compute_fullname (void)
-{
-  if (fullname_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator *i;
-      long first = I_TRUE;
-      long second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 0;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 2; // for "::"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->fullname_ = new char [namelen+1];
-      this->fullname_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->fullname_, "::");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->fullname_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-const char*
-be_decl::fullname (void)
-{
-  if (!this->fullname_)
-    compute_fullname ();
-
-  return this->fullname_;
-}
-
-// compute stringified flattened fully scoped name
-void
-be_decl::compute_flatname (void)
-{
-  if (flatname_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator *i;
-      long first = I_TRUE;
-      long second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 0;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 1; // for "_"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->flatname_ = new char [namelen+1];
-      this->flatname_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->flatname_, "_");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->flatname_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-const char*
-be_decl::flatname (void)
-{
-  if (!this->flatname_)
-    compute_flatname ();
-
-  return this->flatname_;
-}
-
-// compute stringified repository ID
-void
-be_decl::compute_repoID (void)
-{
-  if (repoID_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator *i;
-      long first = I_TRUE;
-      long second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 8; // for the prefix "IDL:" and suffix ":1.0"
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 1; // for "/"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->repoID_ = new char [namelen+1];
-      this->repoID_[0] = '\0';
-      ACE_OS::sprintf (this->repoID_, "%s", "IDL:");
-      i = new UTL_IdListActiveIterator (this->name ());
-      first = I_TRUE;
-      second = I_FALSE;
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->repoID_, "/");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->repoID_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-      ACE_OS::strcat (this->repoID_, ":1.0");
-    }
-  return;
-}
-
-const char *
-be_decl::repoID (void)
-{
-  if (!this->repoID_)
-    compute_repoID ();
-
-  return this->repoID_;
-}
-
-// converts a string name into an array of 4 byte longs
-int
-be_decl::tc_name2long (const char *name, long *&larr, long &arrlen)
-{
-  static long buf [NAMEBUFSIZE / sizeof (long)];
-  long slen;
-  unsigned int i;
-
-  slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
-
-  // compute the number of bytes necessary to hold the name rounded to the next
-  // multiple of 4 (i.e., size of long)
-  arrlen = slen/4 + (slen%4 ? 1:0);
-
-  ACE_OS::memset (buf, '\0', arrlen*4);
-  larr = buf;
-  ACE_OS::memcpy (buf, name, arrlen*4);
-#if 0
-  for (i=0; i < ACE_OS::strlen (name); i++)
-    {
-      long shift; // num bytes to shift left
-
-      shift = 3 - (i%4);
-      // store the computed shifted quantity in the appropriate byte of the
-      // array to be returned
-      larr [i/4] |= ((name[i] & 0xff) << (shift*8));
-    }
-#endif
-  return 0;
-}
-
-idl_bool
-be_decl::is_nested (void)
-{
-  be_decl *d;
-
-  d = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-  // if we have an outermost scope and if that scope is not that of the Root,
-  // then we are defined at some nesting level
-  if (d && d->node_type () != AST_Decl::NT_root)
-    return I_TRUE;
-
-  return I_FALSE;
-}
-
-// return the length in bytes to hold the repoID inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-long
-be_decl::repoID_encap_len (void)
-{
-  long slen;
-
-  slen = ACE_OS::strlen (this->repoID ()) + 1; // + 1 for NULL terminating char
-  // the number of bytes to hold the string must be a multiple of 4 since this
-  // will be represented as an array of longs
-  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-}
-
-// return the length in bytes to hold the name inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-long
-be_decl::name_encap_len (void)
-{
-  long slen;
-
-  slen = ACE_OS::strlen (this->local_name ()->get_string ()) + 1; // + 1 for
-                                                    // NULL terminating char
-  // the number of bytes to hold the string must be a multiple of 4 since this
-  // will be represented as an array of longs
-  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-}
-
-// compute the size type of the node in question
-int
-be_decl::compute_size_type (void)
-{
-  return 0;
-}
-
-// return the scope created by this node (if one exists, else NULL)
-be_scope *
-be_decl::scope (void)
-{
-  be_decl *d = this;
-
-   switch (this->node_type()) {
-   case AST_Decl::NT_interface_fwd:
-      /*
-       * Resolve forward declared interface by looking at full_definition()
-       * field and iterating
-       */
-      d = be_interface::narrow_from_decl ((be_interface_fwd::narrow_from_decl
-                                           (this))->full_definition ());
-      /*
-       * Fall through
-       */
-   case AST_Decl::NT_interface:
-      return be_interface::narrow_from_decl (d);
-   case AST_Decl::NT_module:
-      return be_module::narrow_from_decl (d);
-   case AST_Decl::NT_root:
-      return be_root::narrow_from_decl (d);
-   case AST_Decl::NT_except:
-      return be_exception::narrow_from_decl (d);
-   case AST_Decl::NT_union:
-      return be_union::narrow_from_decl (d);
-   case AST_Decl::NT_struct:
-      return be_structure::narrow_from_decl (d);
-   case AST_Decl::NT_enum:
-      return be_enum::narrow_from_decl (d);
-   case AST_Decl::NT_op:
-      return be_operation::narrow_from_decl (d);
-   case AST_Decl::NT_sequence:
-      return be_sequence::narrow_from_decl (d);
-   default:
-      return (be_scope *)0;
-   }
-}
-
-// boolean methods to test if code was already generated
-idl_bool
-be_decl::cli_hdr_gen (void)
-{
-  return this->cli_hdr_gen_;
-}
-
-idl_bool
-be_decl::cli_stub_gen (void)
-{
-  return this->cli_stub_gen_;
-}
-
-idl_bool
-be_decl::cli_inline_gen (void)
-{
-  return this->cli_inline_gen_;
-}
-
-idl_bool
-be_decl::srv_hdr_gen (void)
-{
-  return this->srv_hdr_gen_;
-}
-
-idl_bool
-be_decl::srv_skel_gen (void)
-{
-  return this->srv_skel_gen_;
-}
-
-idl_bool
-be_decl::srv_inline_gen (void)
-{
-  return this->srv_inline_gen_;
-}
-
-// set the flag indicating that code generation is done
-void
-be_decl::cli_hdr_gen (idl_bool val)
-{
-  this->cli_hdr_gen_ = val;
-}
-
-void
-be_decl::cli_stub_gen (idl_bool val)
-{
-  this->cli_stub_gen_ = val;
-}
-
-void
-be_decl::cli_inline_gen (idl_bool val)
-{
-  this->cli_inline_gen_ = val;
-}
-
-void
-be_decl::srv_hdr_gen (idl_bool val)
-{
-  this->srv_hdr_gen_ = val;
-}
-
-void
-be_decl::srv_skel_gen (idl_bool val)
-{
-  this->srv_skel_gen_ = val;
-}
-
-void
-be_decl::srv_inline_gen (idl_bool val)
-{
-  this->srv_inline_gen_ = val;
-}
-
-int
-be_decl::accept (be_visitor *visitor)
-{
-  return visitor->visit_decl (this);
-}
-
-idl_bool
-be_decl::is_child (be_decl *node)
-{
-  if (this->defined_in ())
-    {
-      be_decl *bd;
-
-      bd = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-      if (!bd)
-        return 0;
-
-      if (!ACE_OS::strcmp (bd->fullname (), node->fullname ()))
-        return 1; // true
-    }
-  return 0; // not a child
-}
-
-// narrowing methods
-IMPL_NARROW_METHODS1 (be_decl, AST_Decl)
-IMPL_NARROW_FROM_DECL (be_decl)
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
deleted file mode 100644
index bed7a98a493..00000000000
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_enum.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Enum that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Enum
- */
-be_enum::be_enum (void)
-{
-  this->size_type (be_decl::FIXED);
-}
-
-be_enum::be_enum (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Enum (n, p),
-    AST_Decl (AST_Decl::NT_enum, n, p),
-    UTL_Scope (AST_Decl::NT_enum),
-    member_count_ (-1)
-{
-  this->size_type (be_decl::FIXED);
-}
-
-// compute total number of members
-int
-be_enum::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-	{
-	  // get the next AST decl node
-	  d = si->item ();
-	  if (!d->imported ())
-	    {
-              this->member_count_++;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_enum::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the interface
-int
-be_enum::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_hdr_gen_)
-    {
-      UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_decls);
-      // scope iterator
-      AST_Decl		    *d; // AST node
-
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ENUM_CH);
-
-      ch = cg->client_header ();
-
-      ch->indent (); // start from whatever indentation level we were at
-      *ch << "enum " << this->local_name () << nl;
-      *ch << "{\n";
-      ch->incr_indent ();
-      while (!(i->is_done ()))
-        {
-          d = i->item ();
-          *ch << d->local_name ();
-          i->next ();
-          if (!(i->is_done()))
-            *ch << ", " << nl;
-        }
-      delete i;
-      *ch << "\n";
-      ch->decr_indent ();
-      *ch << "};" << nl;
-      // As per the ORBOS spec, we need the following typedef
-      *ch << "typedef " << this->local_name () << " &" << this->local_name () <<
-        "_out;\n";
-      cg->pop ();
-
-      // Generate the typecode decl
-      // All names in the root scope have length 2 (for the root and
-      // ourself). The children have length greater than 2. Thus, if our name
-      // length is 2 or less, we are outermost and our typecode decl must be
-      // extern, else we are defined static inside the enclosing scope.
-      if (this->name ()->length () > 2)
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-	      << idl_global->export_macro ()
-	      << "CORBA::TypeCode_ptr "
-	      << this->tc_name ()->last_component () << ";\n\n";
-        }
-      this->cli_hdr_gen_ =  I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the interface
-int
-be_enum::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ENUM_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << nl;
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_enum:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_enum, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the interface
-int
-be_enum::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the interface
-int
-be_enum::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_enum::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_enum::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate typecode.
-// Typecode for enum comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_enum::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_enum, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-int
-be_enum::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate code for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_enum::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// return encapsulation length
-long
-be_enum::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID storage
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-int be_enum::write_as_return (TAO_OutStream *stream,
-			      be_type *type)
-{
-  *stream << type->name ();
-  return 0;
-}
-
-int
-be_enum::accept (be_visitor *visitor)
-{
-  return visitor->visit_enum (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_enum, AST_Enum, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_enum)
-IMPL_NARROW_FROM_SCOPE (be_enum)
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
deleted file mode 100644
index 0a63a7fb3cd..00000000000
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_enum_val.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_EnumVal that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_enum_val::be_enum_val (void)
-{
-}
-
-be_enum_val::be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Constant (AST_Expression::EV_ulong,
-                  AST_Decl::NT_enum_val,
-                  new AST_Expression(v),
-                  n,
-                  p),
-    AST_Decl (AST_Decl::NT_enum_val, n, p)
-{
-#if 0
-  // computes the repoID
-  compute_repoID ();
-
-  // computes the fully scoped name
-  compute_fullname ();
-
-  // compute the flattened fully scoped name
-  compute_flatname ();
-#endif
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// NOTE: The IDL front end does a strange thing of putting the enum_vals in the
-// Enum decl scope as well as the scope that encloses the ENUM decl. Since we
-// took care of generating the client header declarations for all the
-// enum_vals, we do not do anything in any of the methods below. However, we
-// have to provide them so that whenever be_scope finds an enum_val in a scope
-// that is not an ENUM, it just ignores it.
-
-// Generates the client-side header information for the enum val
-int
-be_enum_val::gen_client_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side stubs for the enum val
-int
-be_enum_val::gen_client_stubs (void)
-{
-  return 0;
-}
-
-// Generates the server-side header information for the enum val
-int
-be_enum_val::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the enum val
-int
-be_enum_val::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_enum_val::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_enum_val::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_enum_val::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-  return 0;
-}
-
-long
-be_enum_val::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = this->name_encap_len (); // for name
-    }
-
-  return this->encap_len_;
-}
-
-int
-be_enum_val::accept (be_visitor *visitor)
-{
-  return visitor->visit_enum_val (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl)
-IMPL_NARROW_FROM_DECL (be_enum_val)
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
deleted file mode 100644
index b8eb55018d1..00000000000
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_exception.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Exception that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Exception
- */
-be_exception::be_exception (void)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_exception::be_exception (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_except, n, p),
-    AST_Structure (AST_Decl::NT_except, n, p),
-    UTL_Scope (AST_Decl::NT_except),
-    member_count_ (-1)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// compute total number of members
-int
-be_exception::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          this->member_count_++;
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_exception::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-// CODE GENERATION
-
-int
-be_exception::gen_client_header (void)
-{
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      TAO_OutStream *ch = cg->client_header (); // output stream
-      TAO_NL  nl;        // end line
-      be_scope *s = be_scope::narrow_from_scope (DeclAsScope (this)); // the
-                                                                      // scope
-                                                                      // defined by us
-
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_exception::"
-                             "gen_client_header - "
-                             "bad scope\n"), -1);
-        }
-
-      cg->push (TAO_CodeGen::TAO_EXCEPTION_CH);
-      ch->indent (); // start from whatever indentation level we were at
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      ch->indent ();
-      *ch << "class " << this->local_name () << ";" << nl;
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *"
-	  << this->local_name () << "_ptr;" << nl;
-      ch->gen_endif ();
-
-      ch->gen_ifdef_macro (this->flatname ());
-
-      ch->indent ();
-      *ch << "class " << idl_global->export_macro ()
-	  << " " << this->local_name ()
-	  << " : public CORBA::UserException" << nl;
-      *ch << "{" << nl
-	  << "public:\n";
-      ch->incr_indent ();
-      // constructors and destructor
-      *ch << this->local_name () << " (void); // default ctor" << nl;
-      *ch << this->local_name () << " (const " << this->local_name () <<
-        " &); // copy ctor" << nl;
-      *ch << "~" << this->local_name () << "(void); // dtor" << nl;
-
-      // generate constructor that takes each member as a parameter. We need a
-      // new state. Such a constructor exists if we have members
-      if (this->member_count () > 0)
-        {
-          cg->push (TAO_CodeGen::TAO_EXCEPTION_CTOR_CH);
-          s->comma (1); // tell the scope to generate a comma after every
-                        // member is generated
-          *ch << this->local_name () << "(";
-          if (be_scope::gen_client_header () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_exception::"
-                                 "gen_client_header - "
-                                 "codegen for scope failed\n"), -1);
-            }
-          *ch << ");" << nl;
-          s->comma (0); // revert comma generation state
-          cg->pop (); // revert to previous state
-        }
-
-      // assignment operator
-      *ch << this->local_name () << " &operator= (const " << this->local_name
-        () << " &);" << nl;
-      // the static _narrow method
-      *ch << "static " << this->local_name () <<
-        " *_narrow (CORBA::Exception *);\n";
-
-      // generate the members
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_exception::"
-                             "gen_client_header - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      ch->decr_indent ();
-      *ch << "};" << nl;
-
-      // generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-	      << idl_global->export_macro ()
-	      << " CORBA::TypeCode_ptr "
-	      << this->tc_name ()->last_component () << ";\n\n";
-        }
-      ch->gen_endif ();
-
-      this->cli_hdr_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-int
-be_exception::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      TAO_NL  nl;        // end line
-
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      TAO_OutStream *ci = cg->client_inline ();
-
-      ci->indent ();
-      *ci << "// *************************************************************"
-          << nl;
-      *ci << "// Inline operations for exception " << this->name () << nl;
-      *ci << "// *************************************************************\n\n";
-
-      // default constructor
-      ci->indent ();
-      *ci << "// default constructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      *ci << "  : CORBA_UserException (CORBA::TypeCode::_duplicate (" <<
-        this->tc_name () << "))\n";
-      *ci << "{" << nl;
-      *ci << "}\n\n";
-
-      // destructor
-      ci->indent ();
-      *ci << "// destructor - all members are of self managing types" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::~" << this->local_name () << " (void)" << nl;
-      *ci << "{" << nl;
-      *ci << "}\n\n";
-
-      cg->push (TAO_CodeGen::TAO_EXCEPTION_CI);
-      // generate inline code  required of any anonymous types of members
-      if (be_scope::gen_client_inline () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_exception::gen_client_inline -"
-                             "codegen for scope failed\n"), -1);
-        }
-
-      cg->pop ();
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_exception::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_scope *s = be_scope::narrow_from_scope (DeclAsScope (this)); // the scope
-                                                                  // defined by
-                                                                  // us
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_exception::"
-                         "gen_client_stubs - "
-                         "bad scope\n"), -1);
-    }
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_EXCEPTION_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      // copy constructor
-      cs->indent ();
-      *cs << "// copy constructor" << nl;
-      *cs << this->name () << "::" << this->local_name () << "(const " <<
-        this->name () << " &_tao_excp)" << nl;
-      *cs << "  :CORBA_UserException (" <<
-        "CORBA::TypeCode::_duplicate (_tao_excp.type ()))" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // assign each individual member
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_exception::gen_client_stubs -"
-                             "codegen for scope failed\n"), -1);
-        }
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // assignment operator
-      cs->indent ();
-      *cs << "// assignment operator" << nl;
-      *cs << this->name () << "&" << nl;
-      *cs << this->name () << "::operator= (const " <<
-        this->name () << " &_tao_excp)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << "this->type_ = " <<
-        "CORBA::TypeCode::_duplicate (_tao_excp.type ());\n";
-      // assign each individual member
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_exception::gen_client_stubs -"
-                             "codegen for scope failed\n"), -1);
-        }
-      cs->indent ();
-      *cs << "return *this;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // constructor taking all members. We need a new state here. Also, such a
-      // constructor exists if we have any members
-      if (this->member_count () > 0)
-        {
-          cg->push (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
-          s->comma (1); // scope should produce comma after every parameter is
-                        // defined
-          cs->indent ();
-          *cs << "// special constructor" << nl;
-          *cs << this->name () << "::" << this->local_name () << "(";
-          if (be_scope::gen_client_stubs () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_exception::gen_client_stubs -"
-                                 "codegen for scope failed\n"), -1);
-            }
-          s->comma (0);
-          cg->pop ();
-          *cs  << ")" << nl;
-
-          *cs << "  : CORBA_UserException " <<
-            "(CORBA::TypeCode::_duplicate (" << this->tc_name () <<
-            "))" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          // assign each individual member. We need yet another state
-          cg->push (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS);
-          if (be_scope::gen_client_stubs () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_exception::gen_client_stubs -"
-                                 "codegen for scope failed\n"), -1);
-            }
-          cg->pop (); // revert to previous state
-          cs->decr_indent ();
-          *cs << "}\n\n";
-        }
-
-      // narrow method
-      cs->indent ();
-      *cs << "// narrow" << nl;
-      *cs << this->name () << "_ptr " << nl;
-      *cs << this->name () << "::_narrow(CORBA::Exception *exc)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << "if (!ACE_OS::strcmp (\"" << this->repoID () <<
-        "\", exc->id ())) // same type" << nl;
-      *cs << "  return ACE_dynamic_cast (" << this->name () << "_ptr, exc);" <<
-        nl;
-      *cs << "else" << nl;
-      *cs << "  return 0;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_stubs -"
-                             "codegen for scope failed\n"), -1);
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_except, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-int
-be_exception::gen_server_header (void)
-{
-  return 0;
-}
-
-
-int
-be_exception::gen_server_inline (void)
-{
-  return 0;
-}
-
-int
-be_exception::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// generate typecode.
-// Typecode for exceptions comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_exception::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_except, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_exception::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *cs << "0, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_exception: cannot generate typecode for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_exception::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute encapsulation length
-long
-be_exception::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-int be_exception::write_as_return (TAO_OutStream *,
-				   be_type *)
-{
-  // exceptions cannot be returned
-  return -1;
-}
-
-int
-be_exception::accept (be_visitor *visitor)
-{
-  return visitor->visit_exception (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_exception, AST_Exception, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_exception)
-IMPL_NARROW_FROM_SCOPE (be_exception)
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
deleted file mode 100644
index bc9773030e6..00000000000
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_expression.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Expression that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Expression
- */
-
-// the constructors
-be_expression::be_expression (UTL_ScopedName *n) 
-  : AST_Expression (n) 
-{
-}
-
-be_expression::be_expression (AST_Expression *b, AST_Expression::ExprType t)
-  : AST_Expression (b, t) 
-{
-}
-
-be_expression::be_expression (AST_Expression::ExprComb c,
-                              AST_Expression *v1,
-                              AST_Expression *v2)
-  : AST_Expression (c, v1, v2)
-{
-}
-
-be_expression::be_expression (long l) 
-  : AST_Expression (l) 
-{
-}
-
-be_expression::be_expression (long l, AST_Expression::ExprType t)
-  : AST_Expression (l, t)
-{
-}
-
-be_expression::be_expression (unsigned long l) 
-  : AST_Expression (l) 
-{
-}
-
-be_expression::be_expression (String *s) 
-  : AST_Expression (s) 
-{
-}
-
-be_expression::be_expression (char c) 
-  : AST_Expression (c) 
-{
-}
-
-be_expression::be_expression (double d) 
-  : AST_Expression (d) 
-{
-}
-
-int
-be_expression::accept (be_visitor *visitor)
-{
-  return visitor->visit_expression (this);
-}
diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp
deleted file mode 100644
index ff3038d9d42..00000000000
--- a/TAO/TAO_IDL/be/be_factory.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include        "be_sunsoft.h"
-
-// destructor
-TAO_Visitor_Factory::~TAO_Visitor_Factory (void)
-{
-}
-
-// constructor
-TAO_OutStream_Factory::TAO_OutStream_Factory (void)
-  : strm_type_ (TAO_OutStream_Factory::TAO_SUNSOFT)
-{
-}
-
-// destructor
-TAO_OutStream_Factory::~TAO_OutStream_Factory (void)
-{
-}
-
-// set the type of specialized o/p stream we want
-int
-TAO_OutStream_Factory::set_stream_type
-(TAO_OutStream_Factory::TAO_OutStream_Type t)
-{
-  this->strm_type_ = t;
-  return 0;
-}
-
-// factory method
-TAO_OutStream *
-TAO_OutStream_Factory::make_outstream (void)
-{
-  switch (this->strm_type_)
-    {
-    case TAO_OutStream_Factory::TAO_SUNSOFT:
-      return new TAO_SunSoft_OutStream ();
-    case TAO_OutStream_Factory::TAO_FLICK:
-      return (TAO_OutStream *)0;  // not implemented as yet
-    default:
-      return (TAO_OutStream *)0;
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
deleted file mode 100644
index 0511fd4c909..00000000000
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_field.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Field that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Field
- */
-be_field::be_field (void)
-{
-}
-be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Field (ft, n, p),
-    AST_Decl (AST_Decl::NT_field, n, p)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the field
-int
-be_field::gen_client_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // code generation state
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // retrieve field type
-  bt = be_type::narrow_from_decl (this->field_type ());
-
-  // make the state based object. The state has been set by the enclosing
-  // parent structure
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_field::gen_client_header -"
-                         "codegen failed\n"), -1);
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the field
-int
-be_field::gen_client_stubs (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // code generation state
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // retrieve field type
-  bt = be_type::narrow_from_decl (this->field_type ());
-
-  // make the state based object. The state has been set by the enclosing
-  // parent structure
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_field::gen_client_stubs -"
-                         "codegen failed\n"), -1);
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_field::gen_client_inline (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // code generation state
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // retrieve field type
-  bt = be_type::narrow_from_decl (this->field_type ());
-
-  // make the state based object. The state has been set by the enclosing
-  // parent structure
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_field::gen_client_inline -"
-                         "codegen failed\n"), -1);
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the field
-int
-be_field::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the field
-int
-be_field::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_field::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_field::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt;  // our type node
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (this->field_type ());
-  return bt->gen_typecode ();
-}
-
-long
-be_field::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)  // not computed yet
-    {
-      be_type *bt;
-
-      // struct member is represented as the "name" followed by the typecode
-
-      this->encap_len_ = this->name_encap_len (); // for name
-
-      // add to this, the size of our typecode
-      bt = be_type::narrow_from_decl (this->field_type ());
-      this->encap_len_ += bt->tc_size (); // note that we must add typecode
-                                          // size of the type
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_field::compute_size_type (void)
-{
-  be_type *type = be_type::narrow_from_decl (this->field_type ());
-  if (!type)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_field::compute_size_type - "
-                         "bad field type\n"), -1);
-    }
-
-  // our size type is the same as our type
-  this->size_type (type->size_type ()); // as a side effect will also update
-                                        // the size type of parent
-  return 0;
-}
-
-int
-be_field::accept (be_visitor *visitor)
-{
-  return visitor->visit_field (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_field, AST_Field, be_decl)
-IMPL_NARROW_FROM_DECL (be_field)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
deleted file mode 100644
index 4279bcdf2de..00000000000
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// be_generator.cc
-//
-// Implementation of BE generator class
-//
-// This implements the same protocol as AST_Generator but creates instances
-// of the BE-subclassed classes instead of of AST classes
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "ace/inc_user_config.h"
-
-/*
- * Constructor
- */
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Inherited operations redefined here
- */
-
-/*
- * Construct a be_root node (a node representing the root of an AST of BE nodes)
- */
-AST_Root *
-be_generator::create_root(UTL_ScopedName *n,
-                          UTL_StrList *p)
-{
-    return new be_root(n, p);
-}
-
-/*
- * Create a BE_PredefinedType node
- */
-AST_PredefinedType *
-be_generator::create_predefined_type(AST_PredefinedType::PredefinedType t,
-                                     UTL_ScopedName *n,
-                                     UTL_StrList *p)
-{
-  return (AST_PredefinedType *) new be_predefined_type(t, n, p);
-}
-
-/*
- * Create a BE_Module node
- */
-AST_Module *
-be_generator::create_module(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Module *) new be_module(n, p);
-}
-
-/*
- * Create a BE_Interface node
- */
-AST_Interface *
-be_generator::create_interface(UTL_ScopedName *n,
-                               AST_Interface **ih,
-                               long nih,
-                               UTL_StrList *p)
-{
-  return (AST_Interface *) new be_interface(n, ih, nih, p);
-}
-
-/*
- * Create a BE_InterfaceFwd node
- */
-AST_InterfaceFwd *
-be_generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_InterfaceFwd *) new be_interface_fwd(n, p);
-}
-
-/*
- * Create a BE_Exception node
- */
-AST_Exception *
-be_generator::create_exception(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Exception *) new be_exception(n, p);
-}
-
-/*
- * Create a BE_Structure node
- */
-AST_Structure *
-be_generator::create_structure(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Structure *) new be_structure(n, p);
-}
-
-/*
- * Create a BE_Enum node
- */
-AST_Enum *
-be_generator::create_enum(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Enum *) new be_enum(n, p);
-}
-
-/*
- * Create a BE_Operation node
- */
-AST_Operation *
-be_generator::create_operation(AST_Type *rt,
-                               AST_Operation::Flags fl,
-                               UTL_ScopedName *n,
-                               UTL_StrList *p)
-{
-  return (AST_Operation *) new be_operation(rt, fl, n, p);
-}
-
-/*
- * Create a BE_Field node
- */
-AST_Field *
-be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Field *) new be_field(ft, n, p);
-}
-
-/*
- * Create a BE_Argument node
- */
-AST_Argument *
-be_generator::create_argument(AST_Argument::Direction d,
-                              AST_Type *ft,
-                              UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return (AST_Argument *) new be_argument(d, ft, n, p);
-}
-
-/*
- * Create a BE_Attribute node
- */
-AST_Attribute *
-be_generator::create_attribute(idl_bool ro,
-                               AST_Type *ft,
-                               UTL_ScopedName *n,
-                               UTL_StrList *p)
-{
-  return (AST_Attribute *) new be_attribute(ro, ft, n, p);
-}
-
-/*
- * Create a BE_Union node
- */
-AST_Union *
-be_generator::create_union(AST_ConcreteType *dt,
-                           UTL_ScopedName *n,
-                           UTL_StrList *p)
-{
-  return (AST_Union *) new be_union(dt, n, p);
-}
-
-/*
- * Create a BE_UnionBranch node
- */
-AST_UnionBranch *
-be_generator::create_union_branch(AST_UnionLabel *lab,
-                                  AST_Type *ft,
-                                  UTL_ScopedName *n,
-                                  UTL_StrList *p)
-{
-  return (AST_UnionBranch *) new be_union_branch(lab, ft, n, p);
-}
-
-/*
- * Create a BE_UnionLabel node
- */
-AST_UnionLabel *
-be_generator::create_union_label(AST_UnionLabel::UnionLabel ul,
-                                 AST_Expression *lv)
-{
-  return (AST_UnionLabel *) new be_union_label(ul, lv);
-}
-
-/*
- * Create a BE_Constant node
- */
-AST_Constant *
-be_generator::create_constant(AST_Expression::ExprType et,
-                              AST_Expression *ev,
-                              UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return (AST_Constant *) new be_constant (et, ev, n, p);
-}
-
-/*
- * Create a symbolic BE_Expression node
- */
-AST_Expression *
-be_generator::create_expr(UTL_ScopedName *n)
-{
-  return (AST_Expression *) new be_expression (n);
-}
-
-/*
- * Create a BE_Expression node denoting a coercion
- */
-AST_Expression *
-be_generator::create_expr(AST_Expression *b, AST_Expression::ExprType t)
-{
-  return (AST_Expression *) new be_expression (b, t);
-}
-
-/*
- * Create a BE_Expression node combining two other AST_Expression nodes
- */
-AST_Expression *
-be_generator::create_expr(AST_Expression::ExprComb c,
-                          AST_Expression *v1,
-                          AST_Expression *v2)
-{
-  return (AST_Expression *) new be_expression (c, v1, v2);
-}
-
-/*
- * Create a BE_Expression node denoting a long integer
- */
-AST_Expression *
-be_generator::create_expr(long l)
-{
-  return (AST_Expression *) new be_expression (l);
-}
-
-/*
- * Create a BE_Expression node denoting a long integer being used as a boolean
- */
-AST_Expression *
-be_generator::create_expr(long l, AST_Expression::ExprType t)
-{
-  return (AST_Expression *) new be_expression (l, t);
-}
-
-/*
- * Create a BE_Expression node denoting an unsigned long integer
- */
-AST_Expression *
-be_generator::create_expr(unsigned long l)
-{
-  return (AST_Expression *) new be_expression(l);
-}
-
-/*
- * Create a BE_Expression node denoting a char * (encapsulated as a String)
- */
-AST_Expression *
-be_generator::create_expr (String *s)
-{
-  return (AST_Expression *) new be_expression (s);
-}
-
-/*
- * Create a BE_Expression node denoting a character
- */
-AST_Expression *
-be_generator::create_expr(char c)
-{
-  return (AST_Expression *) new be_expression (c);
-}
-
-/*
- * Create a BE_Expression node denoting a 64-bit floating point number
- */
-AST_Expression *
-be_generator::create_expr (double d)
-{
-  return (AST_Expression *) new be_expression (d);
-}
-
-/*
- * Create a BE_EnumVal node
- */
-AST_EnumVal *
-be_generator::create_enum_val(unsigned long v,
-                              UTL_ScopedName *n,
-                              UTL_StrList *p)
-{
-  return (AST_EnumVal *) new be_enum_val(v, n, p);
-}
-
-/*
- * Create a BE_Array node
- */
-AST_Array *
-be_generator::create_array(UTL_ScopedName *n,
-                           unsigned long ndims,
-                           UTL_ExprList *dims)
-{
-  return (AST_Array *) new be_array(n, ndims, dims);
-}
-
-/*
- * Create a BE_Sequence node
- */
-AST_Sequence *
-be_generator::create_sequence(AST_Expression *v, AST_Type *bt)
-{
-  return (AST_Sequence *) new be_sequence(v, bt);
-}
-
-/*
- * Create a BE_String node
- */
-AST_String *
-be_generator::create_string(AST_Expression *v)
-{
-  return (AST_String *) new be_string(v);
-}
-
-/*
- * Create a BE_string node for a wide string
- */
-AST_String *
-be_generator::create_wstring(AST_Expression *v)
-{
-  return (AST_String *) new be_string(v, sizeof(ACE_OS::WChar));
-}
-
-/*
- * Create a BE_Typedef node
- */
-AST_Typedef *
-be_generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Typedef *) new be_typedef(bt, n, p);
-}
-
-/*
- * Construct an AST_Native node
- */
-AST_Native *
-be_generator::create_native (UTL_ScopedName *n,
-                             UTL_StrList *p)
-{
-  return (AST_Native *) new be_native (n, p);
-}
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
deleted file mode 100644
index 5ba49d8a5ae..00000000000
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.cpp
-//
-// = DESCRIPTION
-//   Provides helper classes to print generated code to the output
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-//    Improvements by Carlos O'Ryan
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-static const char copyright [] =
-"/* -*- C++ -*- */\n\n\
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******\n\
-// TAO ORB and the TAO IDL Compiler have been developed by Washington \n\
-// University Computer Science's Distributed Object Computing Group.\n\
-//\n\
-// Information on TAO is available at\n\
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html\n";
-
-TAO_NL::TAO_NL (void)
-{
-}
-
-TAO_INDENT::TAO_INDENT (int do_now)
-  :  do_now_ (do_now)
-{
-}
-
-TAO_UNINDENT::TAO_UNINDENT (int do_now)
-  :  do_now_ (do_now)
-{
-}
-
-const TAO_NL be_nl;
-const TAO_INDENT be_idt;
-const TAO_INDENT be_idt_nl (1);
-const TAO_UNINDENT be_uidt;
-const TAO_UNINDENT be_uidt_nl (1);
-
-// methods of the TAO_OutStream class
-
-TAO_OutStream::TAO_OutStream (void)
-  : fp_ (NULL),
-    indent_level_ (0)
-{
-}
-
-TAO_OutStream::~TAO_OutStream (void)
-{
-  // close the underlying I/O handle only if it exists
-  if (fp_)
-    {
-      ACE_OS::fclose (fp_);
-      fp_ = NULL;
-    }
-  indent_level_ = 0;
-}
-
-int
-TAO_OutStream::open (const char *fname, TAO_OutStream::STREAM_TYPE st)
-{
-  if (fname)
-    {
-      // file name exists, open an I/O file handle
-      fp_ = ACE_OS::fopen (fname, "w");
-      if (fp_)
-        {
-          this->st_ = st;
-          // put the copyright notice
-          ACE_OS::fprintf (fp_, "%s\n", copyright);
-	  ACE_OS::fflush (fp_);
-          return 0;
-        }
-      else
-        return -1;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-// set and get the stream type
-void
-TAO_OutStream::stream_type (TAO_OutStream::STREAM_TYPE st)
-{
-  this->st_ = st;
-}
-
-TAO_OutStream::STREAM_TYPE
-TAO_OutStream::stream_type (void)
-{
-  return this->st_;
-}
-
-// indentation
-int
-TAO_OutStream::incr_indent (unsigned short flag)
-{
-  indent_level_++;
-  if (flag)
-    return this->indent ();
-  else
-    return 0; // do not indent output
-}
-
-// indentation
-int
-TAO_OutStream::decr_indent (unsigned short flag)
-{
-  indent_level_--;
-  if (flag)
-    return this->indent ();
-  else
-    return 0; // do not indent output
-}
-
-int
-TAO_OutStream::reset (void)
-{
-  indent_level_ = 0;
-  return 0;
-}
-
-// indented print
-int
-TAO_OutStream::indent (void)
-{
-  int i;
-  // based on the current indentation level, leave appropriate number of blank
-  // spaces in the output
-  if (this->indent_level_ > 0)
-    {
-      for (i=0; i < this->indent_level_; i++)
-        {
-          ACE_OS::fprintf (this->fp_, "  ");
-	  ACE_OS::fflush (this->fp_);
-        }
-    }
-  return 0;
-}
-
-int
-TAO_OutStream::nl (void)
-{
-  ACE_OS::fprintf (this->fp_, "\n");
-  this->indent ();
-  return 0;
-}
-
-// macro generation
-int
-TAO_OutStream::gen_ifdef_macro (const char *flatname, const char *suffix)
-{
-  static char macro [NAMEBUFSIZE];
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (macro, "_%s_", cg->upcase (flatname));
-  if (suffix)
-    {
-      ACE_OS::sprintf (macro, "%s_%s_", macro, cg->upcase (suffix));
-    }
-
-  // append a suffix representing the stream type
-  switch (this->st_)
-    {
-    case TAO_OutStream::TAO_CLI_HDR:
-      ACE_OS::strcat (macro, "CH_");
-      break;
-    case TAO_OutStream::TAO_CLI_INL:
-      ACE_OS::strcat (macro, "CI_");
-      break;
-    case TAO_OutStream::TAO_CLI_IMPL:
-      ACE_OS::strcat (macro, "CS_");
-      break;
-    case TAO_OutStream::TAO_SVR_HDR:
-      ACE_OS::strcat (macro, "SH_");
-      break;
-    case TAO_OutStream::TAO_SVR_INL:
-      ACE_OS::strcat (macro, "SI_");
-      break;
-    case TAO_OutStream::TAO_SVR_IMPL:
-      ACE_OS::strcat (macro, "SS_");
-      break;
-    }
-  *this << "\n#if !defined (" << macro << ")\n";
-  *this << "#define " << macro << "\n\n";
-  return 0;
-}
-
-int
-TAO_OutStream::gen_endif (void)
-{
-  *this << "\n#endif /* end #if !defined */\n\n";
-  return 0;
-}
-
-// printf style variable argument print
-int
-TAO_OutStream::print (const char *format, ...)
-{
-  int result = 0;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vfprintf (this->fp_, format, ap), int, -1, result);
-  ACE_OS::fflush (fp_);
-  va_end (ap);
-  return result;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const char *str)
-{
-  ACE_OS::fprintf (this->fp_, "%s", str);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const long num)
-{
-  ACE_OS::fprintf (this->fp_, "%ld", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const TAO_NL&)
-{
-  ACE_OS::fprintf (this->fp_ , "\n");
-  this->indent ();
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const TAO_INDENT& i)
-{
-  this->incr_indent (0);
-  if (i.do_now_)
-    this->nl ();
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const TAO_UNINDENT& i)
-{
-  this->decr_indent (0);
-  if (i.do_now_)
-    this->nl ();
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (Identifier *id)
-{
-  return this->print (id);
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (UTL_IdList *id)
-{
-  return this->print (id);
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (AST_Expression *expr)
-{
-  return this->print (expr);
-}
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
deleted file mode 100644
index b44336db57f..00000000000
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// BE_init.cc - Initialization for dummy BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Initialize the BE. The protocol requires only that this routine
- * return an instance of AST_Generator (or a subclass thereof).
- *
- * Remember that none of the FE initialization has been done, when you
- * add stuff here.
- */
-AST_Generator *
-BE_init()
-{
-  AST_Generator	*g = new be_generator();
-
-  if (g == NULL) {
-    cerr << GTDEVEL("IDL: BE init failed to create generator, exiting\n");
-    exit(99);
-  }
-  return g;
-}
-
-/*
- * Print out a version string for the BE
- */
-void
-BE_version()
-{
-  cerr << GTDEVEL("TAO C++ BE, version 0.1.0\n");
-}
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
deleted file mode 100644
index 4fccc686756..00000000000
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ /dev/null
@@ -1,2140 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be_visitor_interface.h"
-#include "be.h"
-
-/*
- * BE_Interface
- */
-
-// default constructor
-be_interface::be_interface (void)
-  : full_skel_name_ (0),
-    skel_count_ (0),
-    full_coll_name_ (0),
-    local_coll_name_ (0)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// constructor used to build the AST
-be_interface::be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                            UTL_StrList *p)
-  : AST_Interface (n, ih, nih, p),
-    AST_Decl (AST_Decl::NT_interface, n, p),
-    UTL_Scope (AST_Decl::NT_interface),
-    full_skel_name_ (0),
-    skel_count_ (0),
-    full_coll_name_ (0),
-    local_coll_name_ (0)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_interface::~be_interface (void)
-{
-  if (this->full_skel_name_ != 0)
-    {
-      delete[] this->full_skel_name_;
-      this->full_skel_name_ = 0;
-    }
-  if (this->full_coll_name_ != 0)
-    {
-      delete[] this->full_coll_name_;
-      this->full_coll_name_ = 0;
-    }
-  if (this->local_coll_name_ != 0)
-    {
-      delete[] this->local_coll_name_;
-      this->local_coll_name_ = 0;
-    }
-}
-
-// compute stringified fully qualified collocated class name.
-void
-be_interface::compute_coll_name (void)
-{
-  if (this->full_coll_name_ != 0)
-    return;
-
-  const char collocated[] = "_tao_collocated_";
-  const char poa[] = "POA_";
-  // Reserve enough room for the "POA_" prefix, the "_tao_collocated_"
-  // prefix and the local name and the (optional) "::"
-  int namelen = sizeof (collocated) + sizeof (poa);
-
-  UTL_IdListActiveIterator *i;
-  ACE_NEW (i, UTL_IdListActiveIterator (this->name ()));
-  while (!i->is_done ())
-    {
-      // reserve 2 characters for "::".
-      namelen += ACE_OS::strlen (i->item ()->get_string ()) + 2;
-      i->next ();
-    }
-  delete i;
-
-  ACE_NEW (this->full_coll_name_,
-           char[namelen+1]);
-  this->full_coll_name_[0] = 0; // null terminate the string...
-
-  // Iterate again....
-  ACE_NEW (i, UTL_IdListActiveIterator (this->name ()));
-
-  // Only the first component get the "POA_" preffix.
-  int poa_added = 0;
-  while (!i->is_done ())
-    {
-      const char* item = i->item ()->get_string ();
-
-      // Increase right away, so we can test for the final component
-      // in the loop.
-      i->next ();
-
-      // We add the POA_ preffix only if the first component is not
-      // the global scope...
-      if (ACE_OS::strcmp (item, "") != 0)
-        {
-          if (!i->is_done ())
-            {
-              // We only add the POA_ preffix if there are more than
-              // two components in the name, in other words, if the
-              // class is inside some scope.
-              if (!poa_added)
-                {
-                  ACE_OS::strcat (this->full_coll_name_, poa);
-                  poa_added = 1;
-                }
-              ACE_OS::strcat (this->full_coll_name_, item);
-              ACE_OS::strcat (this->full_coll_name_, "::");
-            }
-          else
-            {
-              ACE_OS::strcat (this->full_coll_name_, collocated);
-              ACE_OS::strcat (this->full_coll_name_, item);
-            }
-        }
-    }
-  delete i;
-
-  // Compute the local name for the collocated class.
-  int localen = sizeof (collocated);
-  localen += ACE_OS::strlen (this->local_name ()->get_string ());
-  ACE_NEW (this->local_coll_name_, char[localen]);
-  ACE_OS::strcpy(this->local_coll_name_, collocated);
-  ACE_OS::strcat(this->local_coll_name_,
-                 this->local_name ()->get_string ());
-}
-
-const char *
-be_interface::full_coll_name (void)
-{
-  if (this->full_coll_name_ == 0)
-    this->compute_coll_name ();
-
-  return this->full_coll_name_;
-}
-
-const char*
-be_interface::local_coll_name (void) const
-{
-  if (this->local_coll_name_ == 0)
-    ACE_const_cast (be_interface*, this)->compute_coll_name ();
-
-  return this->local_coll_name_;
-}
-
-// compute stringified fully scoped skel name
-void
-be_interface::compute_fullskelname (void)
-{
-  if (full_skel_name_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator *i;
-      long first = I_TRUE;
-      long second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 4;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 2; // for "::"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ()); //
-          // additional 4 for the POA_ characters
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->full_skel_name_ = new char [namelen+1];
-      this->full_skel_name_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      ACE_OS::strcat (this->full_skel_name_, "POA_");
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->full_skel_name_, "::");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->full_skel_name_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-// retrieve the fully scoped skeleton name
-const char*
-be_interface::full_skel_name (void)
-{
-  if (!this->full_skel_name_)
-    compute_fullskelname ();
-
-  return this->full_skel_name_;
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int
-be_interface::gen_client_header (void)
-{
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      long i;            // loop index
-      TAO_NL  nl;        // end line
-
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      cg->push (TAO_CodeGen::TAO_INTERFACE_CH); // set the current code
-      // generation  state
-
-      TAO_OutStream *ch = cg->client_header ();
-
-      // == STEP 1:  generate the class name and class names we inherit ==
-      ch->indent (); // start with whatever indentation level we are at
-
-      // generate the ifdefined macro for  the _ptr type
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      // the following two are required to be under the ifdef macro to avoid
-      // multiple declarations
-
-      // forward declaration
-      *ch << "class " << this->local_name () << ";" << nl;
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *" << this->local_name ()
-          << "_ptr;" << nl;
-
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the _var declaration
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface - error generating _var definition\n"));
-          return -1;
-        }
-      ch->gen_endif ();
-
-      // generate the ifdef macro for the _out class
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface - error generating _var definition\n"));
-          return -1;
-        }
-      // generate the endif macro
-      ch->gen_endif ();
-
-      ch->gen_ifdef_macro (this->flatname ());
-
-      // now generate the class definition
-      ch->indent ();
-      *ch << "class " << idl_global->export_macro ()
-          << " " << this->local_name ();
-
-      if (n_inherits () > 0)  // this interface inherits from other interfaces
-        {
-          *ch << ": ";
-          for (i = 0; i < n_inherits (); i++)
-            {
-              be_interface *inherited = be_interface::narrow_from_decl
-                (this->inherits ()[i]);
-              be_decl *scope = 0;
-              if (inherited->is_nested ())
-                {
-                  // inherited node is used in the scope of "this" node
-                  scope = be_scope::narrow_from_scope (this->defined_in
-                                                       ())->decl ();
-                }
-
-              *ch << "public virtual ";
-              *ch << inherited->nested_type_name (scope);  // dump the scoped name
-              if (i < n_inherits () - 1) // this is the case of multiple
-                // inheritance
-                {
-                  *ch << ", ";
-                }
-            }  // end of for loop
-          *ch << nl;
-        }
-      else
-        {
-          // we do not inherit from anybody, hence we do so from the base
-          // CORBA::Object class
-          *ch << " : public virtual CORBA::Object" << nl;
-        }
-
-      // generate the body
-
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent ();
-      // generate the static _duplicate, _narrow, and _nil operations
-      *ch << "// the static operations" << nl;
-      *ch << "static " << this->local_name () << "_ptr " << "_duplicate ("
-          << this->local_name () << "_ptr obj);" << nl;
-      *ch << "static " << this->local_name () << "_ptr " << "_narrow ("
-          << "CORBA::Object_ptr obj, CORBA::Environment &env);" << nl;
-      *ch << "static " << this->local_name () << "_ptr "
-          << "_nil (void);" << nl;
-
-      // generate a TAO-specific _bind method similar to what Orbix and VisiBroker
-      // have
-      *ch << "static " << this->local_name () << "_ptr _bind (const char *host, "
-          << "CORBA::UShort port, const char *key, CORBA::Environment &env);\n\n";
-
-      // the _is_a method
-      ch->indent ();
-      *ch << "virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, "
-          << "CORBA::Environment &env);\n" << be_nl
-          << "// = user methods\n";
-
-      // generate code for the interface definition by traversing thru the
-      // elements of its scope. We depend on the front-end to have made sure
-      // that only legal syntactic elements appear in our scope.
-      if (this->be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_interface::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-          return -1;
-        }
-
-      // generate the "protected" constructor so that users cannot instantiate
-      // us
-      *ch << be_uidt_nl
-          << "protected:" << be_idt_nl
-          << this->local_name () << " (" << be_idt << be_idt_nl
-          << "STUB_Object *objref = 0," << be_nl
-          << "TAO_ServantBase *servant = 0," << be_nl
-          << "CORBA::Boolean collocated = CORBA::B_FALSE" << be_uidt_nl
-          << ");\n" << be_uidt;
-      ch->decr_indent ();
-
-      // dtor is public...
-      *ch << "public:" << be_idt_nl
-          << "virtual ~" << this->local_name () << " (void);" << be_uidt_nl;
-
-      // private copy constructor and assignment operator. These are not
-      // allowed, hence they are private.
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << this->local_name () << " (const " << this->local_name () << "&);" << nl;
-      *ch << "void operator= (const " << this->local_name () << "&);\n";
-      ch->decr_indent ();
-      *ch << "};\n\n";
-      ch->gen_endif ();
-
-
-      // generate the typecode decl. If we are in the outermost scope, our typecode
-      // decl is extern
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-              << idl_global->export_macro ()
-              << " CORBA::TypeCode_ptr "
-              << this->tc_name ()->last_component () << ";\n\n";
-        }
-
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the client-side inline functions
-int
-be_interface::gen_client_inline (void)
-{
-  TAO_NL  nl;        // end line
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  TAO_OutStream *ci = cg->client_inline ();
-  ci->indent (); // start from the current indentation level
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::"
-      << this->local_name () << "(" << be_idt << be_idt_nl
-      << "STUB_Object *objref," << be_nl
-      << "TAO_ServantBase *servant," << be_nl
-      << "CORBA::Boolean collocated" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << " : ACE_CORBA_1 (Object) (objref, servant, collocated)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::~" << this->local_name () <<
-    " (void) // destructor" << nl;
-  *ci << "{}\n\n";
-
-  // _nil method
-  *ci << "ACE_INLINE " << this->name () << "_ptr" << be_nl
-      << this->name () << "::_nil (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return (" << this->name () << "_ptr)0;" << be_uidt_nl
-      << "}\n" << be_nl;
-
-  // generate the ifdefined macro for  the _var type
-  ci->gen_ifdef_macro (this->flatname (), "_var");
-
-  if (this->gen_var_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _var impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  ci->gen_ifdef_macro (this->flatname (), "_out");
-
-  if (this->gen_out_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _out impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  if (this->be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: code gen failed for scope\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-
-// Generate the client-side stubs
-int
-be_interface::gen_client_stubs (void)
-{
-  TAO_NL  nl;        // end line
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_CS); // set the current code generation
-                                            // state
-
-  TAO_OutStream *cs = cg->client_stubs ();
-
-  cs->indent (); // start with whatever indentation level we are at
-
-  // first generate the code for the static methods
-  // The _duplicate method
-  *cs << this->name () << "_ptr " << this->name () << "::_duplicate ("
-      << this->name () << "_ptr obj)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "if (!CORBA::is_nil (obj))\n";
-  cs->incr_indent ();
-  *cs << "obj->AddRef ();\n";
-  cs->decr_indent ();
-  *cs << nl;
-  *cs << "return obj;\n";
-  cs->decr_indent ();
-  *cs << "} // end of _duplicate" << nl << nl;
-
-  // The _narrow method
-  *cs << this->name () << "_ptr " << this->name ()
-      << "::_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &env" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (CORBA::is_nil (obj))" << be_idt_nl
-      << "return " << this->name () << "::_nil ();" << be_uidt_nl
-      << "if (!obj->_is_a (\"" << this->repoID () << "\", env))"
-      << be_idt_nl
-      << "return " << this->name () << "::_nil ();" << be_uidt_nl;
-
-  *cs << "if (!obj->_is_collocated () || !obj->_servant())" << be_nl
-      << "{" << be_idt_nl;
-  *cs << this->name () << "_ptr new_obj = new " << this->name () << "(obj->_get_parent ());" << be_nl
-      << "return new_obj;" << be_uidt_nl
-      << "} // end of if" << be_nl;
-
-  *cs << "STUB_Object *stub = obj->_servant ()->_create_stub (env);" << be_nl
-      << "if (env.exception () != 0)" << be_idt_nl
-      << "return " << this->name () << "::_nil ();" << be_uidt_nl
-      << "void* servant = obj->_servant ()->_downcast (\""
-      << this->repoID () << "\");" << be_nl
-      << "return new ";
-
-  // This may be necessary to work around a GCC compiler bug!
-  const char *coll_name = this->full_coll_name ();
-  const char *skel_name = this->full_skel_name ();
-
-  *cs << coll_name << "(" << be_idt << be_idt_nl
-      << "ACE_reinterpret_cast(" << skel_name
-      << "_ptr, servant)," << be_nl
-      << "stub" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // the _bind method
-  *cs << this->name () << "_ptr " << this->name () << "::_bind (" <<
-    "const char *host, CORBA::UShort port, const char *key, " <<
-    "CORBA::Environment &env)" << nl;
-  *cs << "{" << be_idt_nl
-      << "IIOP_Object *data = new IIOP_Object (host, port, key);" << be_nl
-      << "if (!data) return " << this->name () << "::_nil ();" << be_nl
-      << "// create the CORBA level proxy" << be_nl
-      << "CORBA::Object_ptr objref = new CORBA_Object (data);" << be_nl
-      << "if (objref == 0)" << be_idt_nl << "{" << be_idt_nl
-      << "data->Release ();" << be_nl
-      << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" << be_nl
-      << "return " << this->name () << "::_nil ();" << be_uidt_nl << "}" << be_uidt_nl
-      << "return " << this->name () << "::_narrow (objref, env);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // generate code for the elements of the interface
-  if (this->be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_client_stubs\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // generate the is_a method
-  cs->indent ();
-  *cs << "CORBA::Boolean " << this->name () << "::_is_a (" <<
-    "const CORBA::Char *value, CORBA::Environment &_tao_environment)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "if (\n";
-  cs->incr_indent (0);
-  if (this->traverse_inheritance_graph (be_interface::is_a_helper, cs) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::gen_client_stubs - "
-                         "inheritance graph failed\n"), -1);
-    }
-  cs->indent ();
-  *cs << "(!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))\n";
-  *cs << "  return 1; // success using local knowledge\n";
-  cs->decr_indent ();
-  *cs << "else" << nl;
-  *cs << "  return this->CORBA_Object::_is_a (value, _tao_environment); // remote call\n";
-  cs->decr_indent ();
-  *cs << "}\n\n";
-
-  // generate the typecode information here
-  cs->indent (); // start from current indentation level
-  *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-    nl;
-  *cs << "{\n";
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "Error generating typecode\n\n"));
-      return -1;
-    }
-  cs->decr_indent ();
-  *cs << "};" << nl;
-
-  *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-    " (CORBA::tk_objref, sizeof (_oc_" <<  this->flatname () <<
-    "), (char *) &_oc_" << this->flatname () <<
-    ", CORBA::B_FALSE);" << nl;
-  *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-    this->flatname () << ";\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-// generate server header
-int be_interface::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-  static char namebuf [NAMEBUFSIZE]; // holds the class name
-  AST_Decl *d;       // enclosing scope
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_SH); // set the current code generation
-                                          // state
-
-  sh = cg->server_header ();
-
-  // generate the skeleton class name
-
-  sh->indent (); // start with whatever indentation level we are at
-
-  // we shall have a POA_ prefix only if we are at the topmost level
-  // generate the forward declaration
-  d = ScopeAsDecl (this->defined_in ());
-  if (d->node_type () == AST_Decl::NT_root)
-    {
-      // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", this->local_name ()->get_string ());
-    }
-  else
-    {
-      ACE_OS::sprintf (namebuf, "%s", this->local_name ()->get_string ());
-    }
-
-  *sh << "class " << namebuf << ";" << nl;
-
-  // generate the _ptr declaration
-  *sh << "typedef " << namebuf << " *" << namebuf
-      << "_ptr;" << nl;
-
-  // now generate the class definition
-  *sh << "class " << idl_global->export_macro ()
-      << " " << namebuf << " : ";
-  if (n_inherits () > 0)  // this interface inherits from other interfaces
-    {
-      be_interface *intf;
-
-      *sh << "public virtual ";
-      intf = be_interface::narrow_from_decl (inherits ()[0]);
-      *sh << intf->relative_skel_name (this->full_skel_name ());
-      for (i = 1; i < n_inherits (); i++)
-        {
-          *sh << ", public virtual ";
-          intf = be_interface::narrow_from_decl (inherits ()[i]);
-          *sh << intf->relative_skel_name (this->full_skel_name ());
-        }  // end of for loop
-    }
-  else
-    {
-      // We don't inherit from another user defined object, hence our
-      // base class is the ServantBase class.
-      *sh << " public virtual PortableServer::ServantBase";
-    }
-  *sh << nl;
-  *sh << "{" << nl;
-  *sh << "protected:\n";
-  sh->incr_indent ();
-  *sh << namebuf << " (void);" << nl;
-  sh->decr_indent ();
-  *sh << "public:\n";
-  sh->incr_indent ();
-  *sh << "virtual ~" << namebuf << " (void);\n";
-
-  sh->indent ();
-  *sh << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt
-      << ");\n" << be_uidt;
-
-  sh->indent ();
-  *sh << "virtual void* _downcast (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_uidt_nl
-      << ");\n" << be_uidt;
-
-  // generate code for elements in the scope (e.g., operations)
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // add our _is_a method
-  sh->indent ();
-  *sh << "static void _is_a_skel (CORBA::ServerRequest &req, " <<
-    "void *obj, void *context, CORBA::Environment &_tao_enviroment);\n\n";
-
-  // generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the call
-  if (this->traverse_inheritance_graph (be_interface::gen_skel_helper, sh) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::gen_server_header - "
-                         "inheritance graph traversal failed\n"), -1);
-    }
-
-  // add the dispatch method
-  sh->indent ();
-  *sh << "virtual void _dispatch (CORBA::ServerRequest &req, " <<
-    "void *context, CORBA::Environment &env);\n\n";
-
-  // Print out the _this() method.
-  sh->indent ();
-  *sh << this->name () << " *_this (CORBA::Environment &_tao_environment);\n";
-
-  sh->indent ();
-  *sh << "virtual const char* _interface_repository_id"
-      << " (void) const;\n";
-
-  sh->decr_indent ();
-
-  *sh << "};\n\n";
-
-#if 0
-  be_visitor_collocated_sh visitor;
-  this->accept (&visitor);
-  *sh << "\n";
-#endif
-  cg->pop ();
-  return 0;
-}
-
-int be_interface::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-  AST_Decl *d;        // temporary
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_SS); // set the current code generation
-                                          // state
-
-  ss = cg->server_skeletons ();
-
-  // generate the skeleton class name
-
-  ss->indent (); // start with whatever indentation level we are at
-
-  if (this->gen_operation_table () == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "be_interface::gen_operation_table failure\n"));
-      return -1;
-    }
-
-  *ss << "// skeleton constructor" << nl;
-  // find if we are at the top scope or inside some module
-  d = ScopeAsDecl (this->defined_in ());
-
-  //  if (d && d->node_type () == AST_Decl::NT_root)
-  if (!this->is_nested ())
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *ss << this->full_skel_name () << "::POA_" << this->local_name () <<
-        " (void)" << nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *ss << this->full_skel_name () << "::" << this->local_name () <<
-        " (void)" << nl;
-    }
-
-  *ss << "{" << be_idt_nl
-      << "this->optable_ = &tao_" << this->flatname ()
-      << "_optable;" << be_uidt_nl
-      << "}\n\n";
-
-  // generate code for elements in the scope (e.g., operations)
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_server_skeletons\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // generate code for the _is_a skeleton
-  ss->indent ();
-  *ss << "void " << this->full_skel_name ()
-      << "::_is_a_skel (" << be_idt << be_idt_nl
-      << "CORBA::ServerRequest &req, " << be_nl
-      << "void * _tao_object_reference," << be_nl
-      << "void * /*context*/," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl;
-
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "CORBA::NVList_ptr nvlist;" << nl;
-  *ss << "CORBA::NamedValue_ptr nv;" << nl;
-  *ss << "CORBA::Any temp_value (CORBA::_tc_string);" << nl;
-  *ss << "CORBA::Any *any;" << nl;
-  *ss << "CORBA::Boolean *retval = new CORBA::Boolean;" << nl;
-  *ss << "CORBA::String value;" << nl;
-  *ss << nl;
-  *ss << "req.orb()->create_list (0, nvlist);" << nl;
-  *ss << "nv = nvlist->add_value (0, temp_value, "
-      << "CORBA::ARG_IN, _tao_environment);" << nl;
-  *ss << "req.params (nvlist, _tao_environment); // parse the args" << nl;
-  *ss << "if (_tao_environment.exception () != 0) return;" << nl;
-  *ss << "value = *(CORBA::String *)nv->value ()->value ();" << nl;
-
-  *ss << this->full_skel_name () << "_ptr    impl = ("
-      << this->full_skel_name () << "_ptr) _tao_object_reference;"
-      << nl;
-
-  *ss << "*retval = impl->_is_a (value, _tao_environment);" << be_nl
-      << "if (_tao_environment.exception () != 0) return;" << be_nl;
-  *ss << "any = new CORBA::Any (CORBA::_tc_boolean, "
-      << "retval, CORBA::B_TRUE);" << nl;
-  *ss << "req.result (any, _tao_environment);\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  ss->indent ();
-  *ss << "CORBA::Boolean " << this->full_skel_name ()
-      << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* value," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (\n" << be_idt;
-  if (this->traverse_inheritance_graph (be_interface::is_a_helper, ss) == -1)
-    {
-      return -1;
-    }
-
-  ss->indent ();
-  *ss << "(!ACE_OS::strcmp ((char *)value, "
-      << "CORBA::_tc_Object->id (_tao_environment))))"
-      << be_idt_nl << "return CORBA::B_TRUE;" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "return CORBA::B_FALSE;" << be_uidt << be_uidt << be_uidt_nl
-      << "}\n\n";
-
-  ss->indent ();
-  *ss << "void* " << this->full_skel_name ()
-      << "::_downcast (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (this->traverse_inheritance_graph (be_interface::downcast_helper, ss) == -1)
-    {
-      return -1;
-    }
-
-  *ss << "if (ACE_OS::strcmp (logical_type_id, "
-      << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl
-      << "return ACE_static_cast(PortableServer::Servant, this);"
-      << be_uidt_nl;
-
-  *ss << "return 0;" << be_uidt_nl
-      << "}\n\n";
-
-
-  // now the dispatch method
-  ss->indent ();
-  *ss << "void " << this->full_skel_name () <<
-    "::_dispatch (CORBA::ServerRequest &req, " <<
-    "void *context, CORBA::Environment &env)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "TAO_Skeleton skel; // pointer to skeleton for operation" << nl;
-  *ss << "CORBA::String opname = req.operation (); // retrieve operation name" <<
-                                                 nl;
-  *ss << "// find the skeleton corresponding to this opname" << nl;
-  *ss << "if (this->_find (opname, skel) == -1)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));" <<
-    nl;
-  *ss << "ACE_ERROR ((LM_ERROR, \"Bad operation <%s>\\n\", opname));\n";
-  ss->decr_indent ();
-  *ss << "}\n";
-  *ss << "else" << nl;
-  *ss << "  skel (req, this, context, env);\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  ss->indent ();
-  *ss << "const char* " << this->full_skel_name ()
-      << "::_interface_repository_id (void) const"
-      << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "return \"" << this->repoID () << "\";\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  cg->pop ();
-
-#if 0
-  be_visitor_collocated_ss visitor;
-  this->accept (&visitor);
-  *ss << "\n";
-#endif
-  *ss << this->name () << "*" << be_nl
-      << this->full_skel_name ()
-      << "::_this (CORBA_Environment &_env)" << be_nl
-      << "{" << be_idt_nl
-      << "STUB_Object *stub = this->_create_stub (_env);" << be_nl
-      << "if (_env.exception () != 0)" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-
-#if 0
-      << "TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();" << be_nl
-      << "if (orb_core->get_current ()->in_servant_upcall ())" << be_nl
-      << "{" << be_idt << be_nl
-      << "stub = new IIOP_Object (" << be_idt << be_idt << be_nl
-      << "CORBA::string_copy (this->_interface_repository_id ())," << be_nl
-      << "IIOP::Profile (" << be_idt << be_idt << be_nl
-      << "TAO_ORB_Core_instance ()->orb_params ()->addr ()," << be_nl
-      << "orb_core->get_current ()->object_key ()" << be_uidt << be_nl
-      << ")" << be_uidt << be_uidt << be_nl
-      << ");" << be_uidt << be_uidt << be_nl
-      << "}" << be_nl
-      << "else" << be_nl
-      << "{" << be_idt_nl
-      << "POA* poa = this->default_poa (_env);" << be_nl
-      << "if (_env.exception () != 0)" << be_idt << be_nl
-      << "return 0;" << be_uidt << be_nl
-      << "const TAO::ObjectKey& object_key = " << be_idt << be_nl
-      << "poa->servant_to_id (this, _env);" << be_uidt << be_nl
-      << "if (_env.exception () != 0)" << be_idt << be_nl
-      << "return 0;" << be_uidt << be_nl
-      << "stub = new IIOP_Object (" << be_idt << be_idt << be_nl
-      << "CORBA::string_copy (this->_interface_repository_id ())," << be_nl
-      << "IIOP::Profile (" << be_idt << be_idt << be_nl
-      << "TAO_ORB_Core_instance ()->orb_params ()->addr ()," << be_nl
-      << "object_key" << be_uidt << be_nl
-      << ")" << be_uidt << be_uidt << be_nl
-      << ");" << be_uidt << be_uidt << be_nl
-      << "}\n" << be_nl
-#endif /* 0 */
-
-      << "return new " << this->full_coll_name ()
-      << " (this, stub);" << be_uidt << be_nl;
-
-  *ss << "}\n\n";
-
-   return 0;
-}
-
-// Generates the server-side inline
-int
-be_interface::gen_server_inline (void)
-{
-  // nothing to be done
-  TAO_OutStream *si; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  si = cg->server_inline ();
-
-  // generate the skeleton class name
-
-  si->indent (); // start with whatever indentation level we are at
-
-  *si << "// skeleton destructor" << nl;
-
-  *si << "ACE_INLINE" << nl;
-  if (!this->is_nested ())
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *si << this->full_skel_name () << "::~POA_" << this->local_name () <<
-        " (void)" << nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *si << this->full_skel_name () << "::~" << this->local_name () <<
-        " (void)" << nl;
-    }
-
-  *si << "{\n";
-  *si << "}\n";
-
-
-  // generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the call
-  if (this->traverse_inheritance_graph (be_interface::gen_skel_helper, si) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::gen_server_inline - "
-                         "inheritance graph traversal failed\n"), -1);
-    }
-
-  return 0;
-}
-
-// generate the var definition
-int
-be_interface::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_interface::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_interface::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-  // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_interface::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate typecode.
-// Typecode for interface comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_interface::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_objref, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_interface::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << ",\n";
-
-  return 0;
-}
-
-// compute size of typecode
-long
-be_interface::tc_size (void)
-{
-   return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute the encapsulation length
-long
-be_interface::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      long slen;
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (slen);
-
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-    }
-  return this->encap_len_;
-}
-
-// helper
-int
-be_interface::gen_operation_table (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ss = cg->server_skeletons ();
-
-  ss->indent (); // start from current indentation level
-  *ss << "static const TAO_operation_db_entry " << this->flatname () <<
-    "_operations [] = {\n";
-  ss->incr_indent (0);
-
-  if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, ss) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::gen_operation_table - "
-                         "inheritance graph traversal failed\n"), -1);
-    }
-
-  // generate the skeleton for the is_a method
-  ss->indent ();
-  *ss << "{\"_is_a\", &" << this->full_skel_name () << "::_is_a_skel}\n";
-  this->skel_count_++;
-
-  ss->decr_indent ();
-  *ss << "};" << nl << nl;
-
-  // XXXASG - this code should be based on using different strategies for
-  // demux - for next release
-  *ss << "static const CORBA::Long _tao_" << this->flatname ()
-      << "_optable_size = sizeof (ACE_Hash_Map_Entry<const char *,"
-      << " TAO_Skeleton>) * (" << (3*this->skel_count_)
-      << ");" << be_nl;
-  *ss << "static char _tao_" << this->flatname () << "_optable_pool "
-      << "[_tao_" << this->flatname () << "_optable_size];" << be_nl;
-  *ss << "static ACE_Static_Allocator_Base _tao_" << this->flatname ()
-      << "_allocator (_tao_" << this->flatname () << "_optable_pool, "
-      << "_tao_" << this->flatname () << "_optable_size);" << be_nl;
-  *ss << "TAO_Dynamic_Hash_OpTable tao_" << this->flatname () << "_optable "
-      << "(" << this->flatname () << "_operations, " << this->skel_count_
-      << ", " << 2*this->skel_count_ << ", &_tao_" << this->flatname ()
-      << "_allocator);" << be_nl;
-  return 0;
-}
-
-// we separate the generation of operation table entries from the
-// "gen_operation_table" method. This enables us to invoke generation of
-// entries for interfaces from which we inherit without any additional
-// code. The parameter "derived" is the one for which the entire operation
-// table is being built.
-int
-be_interface::gen_optable_entries (be_interface *derived)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  TAO_OutStream *ss; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ss = cg->server_skeletons ();
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope i.e., any operations and
-      // attributes defined by "this" which happens to be the same as "derived"
-      // or one of its ancestors.
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (d->node_type () == AST_Decl::NT_op)
-            {
-              ss->indent (); // start from current indentation level
-              // we are an operation node
-              *ss << "{\"" << d->local_name () << "\", &" << derived->full_skel_name
-                () << "::" << d->local_name () << "_skel},\n";
-              derived->skel_count_++;
-            }
-          else if (d->node_type () == AST_Decl::NT_attr)
-            {
-              AST_Attribute *attr;
-
-              ss->indent (); // start from current indentation level
-              // generate only the "get" entry if we are readonly
-              *ss << "{\"_get_" << d->local_name () << "\", &" <<
-                derived->full_skel_name () << "::_get_" << d->local_name () <<
-                "_skel},\n";
-              derived->skel_count_++;
-
-              attr = AST_Attribute::narrow_from_decl (d);
-              if (!attr)
-                return -1;
-
-              if (!attr->readonly ())
-                {
-                  // the set method
-                  ss->indent (); // start from current indentation level
-                  *ss << "{\"_set_" << d->local_name () << "\", &" <<
-                    derived->full_skel_name () << "::_set_" << d->local_name
-                    () << "_skel},\n";
-                  derived->skel_count_++;
-                }
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// template method that traverses the inheritance graph in a breadth-first
-// style. The actual work on each element in the inheritance graph is carried
-// out by the function passed as argument
-int be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
-                                              TAO_OutStream *os)
-{
-  long i;            // loop index
-  ACE_Unbounded_Queue <be_interface*> queue; // Queue data structure needed for
-                                            // breadth-first traversal of
-                                            // inheritance tree
-
-  // For a special case of a deeply nested inheritance graph and one specific
-  // way of inheritance in which a node that was already visited, but is not present in
-  // the queue, gets inserted at the tail. This sitation arises when a node
-  // multiply inherits from two or more interfaces in which the first parent is
-  // higher up in the tree than the second parent. In addition, if the second
-  // parent turns out to be a child of the first .
-
-  ACE_Unbounded_Queue <be_interface*> del_queue; // queue of dequeued nodes to
-                                                 // be searched for the above case
-
-  // insert ourselves in the Queue
-  if (queue.enqueue_tail (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::gen_operation_table - "
-                         "error generating entries\n"), -1);
-    }
-
-  // do until queue is empty
-  while (!queue.is_empty ())
-    {
-      be_interface *bi;  // element inside the queue
-
-      // use breadth-first strategy i.e., first generate entries for ourselves,
-      // followed by nodes that we immediately inherit from, and so on. In the
-      // process make sure that we do not generate code for the same node more
-      // than once. Such a case may arise due to multiple inheritance forming a
-      // diamond like inheritance graph.
-
-      // dequeue the element at the head of the queue
-      if (queue.dequeue_head (bi))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_interface::traverse_graph - "
-                             "dequeue_head failed\n"), -1);
-        }
-
-      // insert the dequeued element in the del_queue
-      if (del_queue.enqueue_tail (bi) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::gen_operation_table - "
-                             "error generating entries\n"), -1);
-        }
-
-      // use the helper method to generate code for ourself using the
-      // properties of the element dequeued. For the first iteration, the
-      // element dequeued and "this" will be the same i.e., ourselves
-      if (gen (this, bi, os) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_interface::traverse_graph - "
-                             "helper code gen failed\n"), -1);
-        }
-
-      // now check if the dequeued element has any ancestors. If yes, insert
-      // them inside the queue making sure that there are no duplicates
-      for (i=0; i < bi->n_inherits (); i++)
-        {
-          be_interface *parent;  // parent of the dequeued element
-
-          // initialize an iterator to search the queue for duplicates
-          ACE_Unbounded_Queue_Iterator<be_interface*> q_iter (queue);
-
-          // retrieve the next parent from which the dequeued element inherits
-          parent = be_interface::narrow_from_decl (bi->inherits ()[i]);
-          if (!parent)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_interface::gen_server_skeletons - "
-                                 "bad inherited interface\n"), -1);
-            }
-
-          // now insert this node at the tail of the queue, but make sure that
-          // it doesn't already exist in the queue
-          int found = 0;
-          while (!q_iter.done ())
-            {
-              be_interface **temp;  // queue element
-
-              (void) q_iter.next (temp);
-              if (!ACE_OS::strcmp (parent->fullname (), (*temp)->fullname ()))
-                {
-                  // we exist in this queue and cannot be inserted
-                  found = 1;
-                }
-              if (found)
-                break;
-              (void) q_iter.advance ();
-            } // end of while
-
-          // initialize an iterator to search the del_queue for duplicates
-          ACE_Unbounded_Queue_Iterator<be_interface*> del_q_iter (del_queue);
-
-          while (!found && !del_q_iter.done ())
-            {
-              be_interface **temp;  // queue element
-
-              (void) del_q_iter.next (temp);
-              if (!ACE_OS::strcmp (parent->fullname (), (*temp)->fullname ()))
-                {
-                  // we exist in this del_queue and cannot be inserted
-                  found = 1;
-                }
-              if (found)
-                break;
-              (void) del_q_iter.advance ();
-            } // end of while
-
-          if (!found)
-            {
-              // insert the parent in the queue
-              if (queue.enqueue_tail (parent) == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_interface::gen_server_skeletons - "
-                                 "enqueue op failed\n"), -1);
-                }
-            }
-        } // end of for loop
-    } // end of while queue not empty
-  return 0;
-}
-
-// helpers passed to the template method
-
-int
-be_interface::gen_optable_helper (be_interface *derived,
-                                  be_interface *ancestor,
-                                  TAO_OutStream * /*os*/)
-{
-  // generate entries for the derived class using the properties of its
-  // ancestors
-  if (ancestor->gen_optable_entries (derived) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_interface::gen_operation_table - "
-                         "error generating entries for inherited"
-                         "interfaces\n"), -1);
-    }
-  return 0;
-}
-
-int
-be_interface::is_a_helper (be_interface * /*derived*/,
-                           be_interface *bi,
-                           TAO_OutStream *os)
-{
-  // emit the comparison code
-  os->indent ();
-  *os << "(!ACE_OS::strcmp ((char *)value, \"" << bi->repoID () <<
-    "\")) ||\n";
-
-  return 0;
-}
-
-int
-be_interface::downcast_helper (be_interface * /* derived */,
-                               be_interface *base,
-                               TAO_OutStream *os)
-{
-  *os << "if (ACE_OS::strcmp (logical_type_id, \""
-      << base->repoID () << "\") == 0)" << be_idt_nl
-      << "return ACE_static_cast ("
-      << base->full_skel_name () << "_ptr, this);" << be_uidt_nl;
-  return 0;
-}
-
-int
-be_interface::gen_skel_helper (be_interface *derived,
-                               be_interface *ancestor,
-                               TAO_OutStream *os)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  TAO_NL  nl;        // end line
-
-  // if derived and ancestor are same, skip it
-  if (derived == ancestor)
-    return 0;
-
-  // else generate code that does the cast to the appropriate type
-
-  if (ancestor->nmembers () > 0)
-    {
-      // if there are elements in ancestor scope i.e., any operations and
-      // attributes defined by "ancestor", become methods on the derived class
-      // which call the corresponding method of the base class by doing the
-      // proper casting
-
-      si = new UTL_ScopeActiveIterator (ancestor, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (d->node_type () == AST_Decl::NT_op)
-            {
-              os->indent (); // start from current indentation level
-              if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                {
-                  // generate the static method corresponding to this method
-                  *os << "static void " << d->local_name () <<
-                    "_skel (CORBA::ServerRequest &req, void *obj,"
-                      << " void *context, CORBA::Environment &env);\n\n";
-                }
-              else
-                { // generate code in the inline file
-                  // generate the static method corresponding to this method
-                  *os << "ACE_INLINE void " << derived->full_skel_name () <<
-                    "::" << d->local_name () <<
-                    "_skel (CORBA::ServerRequest &req, " <<
-                    "void *obj, void *context, CORBA::Environment &env)" << nl;
-                  *os << "{\n";
-                  os->incr_indent ();
-                  *os << ancestor->full_skel_name () << "_ptr impl = (" <<
-                    derived->full_skel_name () << "_ptr) obj;" << nl;
-                  *os << ancestor->full_skel_name () << "::" << d->local_name
-                    () << "_skel (req, (" << ancestor->full_skel_name () <<
-                    "_ptr) impl, context, env);\n";
-                  os->decr_indent ();
-                  *os << "}\n";
-                }
-            }
-          else if (d->node_type () == AST_Decl::NT_attr)
-            {
-              AST_Attribute *attr;
-
-              attr = AST_Attribute::narrow_from_decl (d);
-              if (!attr)
-                return -1;
-
-              os->indent (); // start from current indentation level
-              if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                {
-                  // generate the static method corresponding to this method
-                  *os << "static void _get_" << d->local_name () <<
-                    "_skel (CORBA::ServerRequest &req, void *obj,"
-                      << " void *context, CORBA::Environment &env);\n\n";
-                }
-              else
-                { // generate code in the inline file
-                  // generate the static method corresponding to this method
-                  *os << "ACE_INLINE void " << derived->full_skel_name () <<
-                    "::_get_" << d->local_name () <<
-                    "_skel (CORBA::ServerRequest &req, " <<
-                    "void *obj, void *context, CORBA::Environment &env)" << nl;
-                  *os << "{\n";
-                  os->incr_indent ();
-                  *os << ancestor->full_skel_name () << "_ptr impl = (" <<
-                    derived->full_skel_name () << "_ptr) obj;" << nl;
-                  *os << ancestor->full_skel_name () << "::_get_" << d->local_name
-                    () << "_skel (req, (" << ancestor->full_skel_name () <<
-                    "_ptr) impl, context, env);\n";
-                  os->decr_indent ();
-                  *os << "}\n";
-                }
-
-              if (!attr->readonly ())
-                {
-                  // the set method
-                  os->indent (); // start from current indentation level
-                  if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                    {
-                      // generate the static method corresponding to this method
-                      *os << "static void _set_" << d->local_name () <<
-                        "_skel (CORBA::ServerRequest &req, void *obj,"
-                          << " void *context, CORBA::Environment &env);\n\n";
-                    }
-                  else
-                    { // generate code in the inline file
-                      // generate the static method corresponding to this method
-                      *os << "ACE_INLINE void " << derived->full_skel_name ()
-                          << "::_set_" << d->local_name () <<
-                        "_skel (CORBA::ServerRequest &req, " <<
-                        "void *obj, void *context, CORBA::Environment &env)" <<
-                        nl;
-                      *os << "{\n";
-                      os->incr_indent ();
-                      *os << ancestor->full_skel_name () << "_ptr impl = (" <<
-                        derived->full_skel_name () << "_ptr) obj;" << nl;
-                      *os << ancestor->full_skel_name () << "::_get_" <<
-                        d->local_name () << "_skel (req, (" <<
-                        ancestor->full_skel_name () <<
-                        "_ptr) impl, context, env);\n";
-                      os->decr_indent ();
-                      *os << "}\n";
-                    }
-
-                }
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-const char*
-be_interface::relative_coll_name (const char *collname)
-{
-  return be_interface::relative_name (this->full_coll_name (),
-                                      collname);
-}
-
-// return the relative skeleton name (needed due to NT compiler insanity)
-const char *
-be_interface::relative_skel_name (const char *skelname)
-{
-  return be_interface::relative_name (this->full_skel_name (),
-                                      skelname);
-}
-
-const char*
-be_interface::relative_name (const char *localname,
-                             const char *othername)
-{
-  // some compilers do not like generating a fully scoped name for a
-  // type that was defined in the same enclosing scope in which it was
-  // defined.  We have to emit just the partial name, relative to our
-  // "localname"
-
-  // The tricky part here is that it is not enough to check if the
-  // typename we are using was defined in the current scope. But we
-  // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro
-
-  // thus we need some sort of relative name to be generated
-
-  static char macro [NAMEBUFSIZE];
-  // UNUSED: be_decl *def_scope = 0;  // our defining scope
-  char // hold the fully scoped name
-    def_name [NAMEBUFSIZE],
-    use_name [NAMEBUFSIZE];
-  char // these point to the curr and next component in the scope
-    *def_curr = def_name,
-    *def_next,
-    *use_curr = use_name,
-    *use_next;
-
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (def_name, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (use_name, '\0', NAMEBUFSIZE);
-
-  // traverse every component of the def_scope and use_scope beginning at the
-  // root and proceeding towards the leaf trying to see if the components
-  // match. Continue until there is a match and keep accumulating the path
-  // traversed. This forms the first argument to the ACE_NESTED_CLASS
-  // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument
-
-  ACE_OS::strcpy (def_name, localname);
-  ACE_OS::strcpy (use_name, othername);
-
-  while (def_curr && use_curr)
-    {
-      // find the first occurrence of a :: and advance the next pointers accordingly
-      def_next = ACE_OS::strstr (def_curr, "::");
-      use_next = ACE_OS::strstr (use_curr, "::");
-
-      if (def_next)
-        *def_next = 0;
-
-      if (use_next)
-        *use_next = 0;
-
-      if (!ACE_OS::strcmp (def_curr, use_curr))
-        {
-          // they have same prefix, append to arg1
-          def_curr = (def_next ? (def_next+2) : 0); // skip the ::
-          use_curr = (use_next ? (use_next+2) : 0); // skip the ::
-        }
-      else
-        {
-          // we had overwritten a ':' by a '\0' for string comparison. We
-          // revert back because we want the rest of the relative name to be
-          // used
-          if (def_next)
-            *def_next = ':';
-
-          if (use_next)
-            *use_next = ':';
-
-          // no match. This is the end of the first argument. Get out
-          // of the loop as no more comparisons are necessary
-          break;
-        }
-    }
-
-  // start the 2nd argument of the macro
-
-  // copy the remaining def_name (if any left)
-  if (def_curr)
-    ACE_OS::strcat (macro, def_curr);
-
-  return macro;
-}
-
-int
-be_interface::accept (be_visitor *visitor)
-{
-  return visitor->visit_interface (this);
-}
-
-int be_interface::write_as_return (TAO_OutStream *stream,
-                                   be_type *type)
-{
-  *stream << type->name () << "_ptr";
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_interface)
-IMPL_NARROW_FROM_SCOPE (be_interface)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node <be_interface*>;
-template class ACE_Unbounded_Queue <be_interface*>;
-template class ACE_Unbounded_Queue_Iterator <be_interface*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<be_interface*>
-#pragma instantiate ACE_Unbounded_Queue<be_interface*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<be_interface*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
deleted file mode 100644
index 760ca8297f2..00000000000
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface_Fwd that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_InterfaceFwd
- */
-
-be_interface_fwd::be_interface_fwd (void)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_interface_fwd::be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_InterfaceFwd (n, p),
-    AST_Decl (AST_Decl::NT_interface_fwd, n, p)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int be_interface_fwd::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      // get the client header
-      ch = cg->client_header ();
-
-      ch->indent (); // start from the current
-
-      // all we do in this is generate a forward declaration of the class
-      *ch << "class " << this->local_name () << ";" << nl;
-
-      // generate the ifdefined macro for the _ptr type
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *" << this->local_name () <<
-        "_ptr; \n";
-
-      ch->gen_endif ();
-
-      // enclose under an ifdef macro
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the _var declaration
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface_fwd - error generating _var definition\n"));
-          return -1;
-        }
-      // gen an endif
-      ch->gen_endif ();
-
-      // enclose under an ifdef macro
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface_fwd - error generating _var definition\n"));
-          return -1;
-        }
-
-      // generate the endif macro
-      ch->gen_endif ();
-
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_interface_fwd::gen_client_stubs (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the ifdefined macro for  the _var type
-  ci->gen_ifdef_macro (this->flatname (), "_var");
-
-  if (this->gen_var_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface_fwd: _var impl code gen failed\n"));
-      return -1;
-    }
-
-  ci->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  ci->gen_ifdef_macro (this->flatname (), "_out");
-
-  if (this->gen_out_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface_fwd: _out impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_inline (void)
-{
-  return 0;
-}
-
-// generate the var definition
-int
-be_interface_fwd::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_interface_fwd::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_interface_fwd::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-  // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_interface_fwd::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-int
-be_interface_fwd::gen_typecode (void)
-{
-  return 0;
-}
-
-long
-be_interface_fwd::tc_size (void)
-{
-  return 0;
-}
-
-int be_interface_fwd::write_as_return (TAO_OutStream *stream,
-				       be_type *type)
-{
-  *stream << type->name () << "_ptr";
-  return 0;
-}
-
-int
-be_interface_fwd::accept (be_visitor *visitor)
-{
-  return visitor->visit_interface_fwd (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_interface_fwd, AST_InterfaceFwd, be_type)
-IMPL_NARROW_FROM_DECL (be_interface_fwd)
diff --git a/TAO/TAO_IDL/be/be_interpretive.cpp b/TAO/TAO_IDL/be/be_interpretive.cpp
deleted file mode 100644
index 8c40a549d5d..00000000000
--- a/TAO/TAO_IDL/be/be_interpretive.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL Backend
-//
-// = FILENAME
-//    be_interpretive_visitor.cpp
-//
-// = DESCRIPTION
-//    Defines a factory that returns a specialized visitor object based on the
-//    code generation state. The visitors returned by this factory generate
-//    stubs and skeletons that use interpretive form of marshaling
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// individual visitors included only here
-#include "be_interpretive.h"
-
-#include "be_visitor_args.h"
-#include "be_visitor_attribute.h"
-#include "be_visitor_constant.h"
-#include "be_visitor_enum.h"
-#include "be_visitor_exception.h"
-#include "be_visitor_field.h"
-#include "be_visitor_interface.h"
-#include "be_visitor_interface_fwd.h"
-#include "be_visitor_module.h"
-#include "be_visitor_operation.h"
-#include "be_visitor_root.h"
-#include "be_visitor_sequence.h"
-#include "be_visitor_structure.h"
-#include "be_visitor_typedef.h"
-#include "be_visitor_union.h"
-#include "be_visitor_union_branch.h"
-
-TAO_Interpretive_Visitor_Factory::TAO_Interpretive_Visitor_Factory (void)
-{
-}
-
-// destructor
-TAO_Interpretive_Visitor_Factory::~TAO_Interpretive_Visitor_Factory (void)
-{
-}
-
-be_visitor *
-TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
-{
-  TAO_CodeGen::CG_STATE st = ctx->state ();
-  // create a new context so that ownership issues are not confused. This newly
-  // created context is a copy of what was sent by the caller. The newly
-  // created visitor will own this new copy.
-  be_visitor_context *new_ctx = new be_visitor_context (*ctx);
-
-  switch (st)
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      return new be_visitor_root_ch (new_ctx);
-    case TAO_CodeGen::TAO_ROOT_CI:
-      return new be_visitor_root_ci (new_ctx);
-    case TAO_CodeGen::TAO_ROOT_CS:
-      return new be_visitor_root_cs (new_ctx);
-    case TAO_CodeGen::TAO_ROOT_SH:
-      return new be_visitor_root_sh (new_ctx);
-    case TAO_CodeGen::TAO_ROOT_SI:
-      return new be_visitor_root_si (new_ctx);
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return new be_visitor_root_ss (new_ctx);
-
-    case TAO_CodeGen::TAO_MODULE_CH:
-      return new be_visitor_module_ch (new_ctx);
-    case TAO_CodeGen::TAO_MODULE_SH:
-      return new be_visitor_module_sh (new_ctx);
-    case TAO_CodeGen::TAO_MODULE_CI:
-    case TAO_CodeGen::TAO_MODULE_CS:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return new be_visitor_module (new_ctx);
-
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      return new be_visitor_interface_ch (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-      return new be_visitor_interface_ci (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      return new be_visitor_interface_cs (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-      return new be_visitor_interface_sh (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-      return new be_visitor_interface_si (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-      return new be_visitor_interface_ss (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-      return new be_visitor_interface_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return new be_visitor_interface_collocated_ss (new_ctx);
-
-    case TAO_CodeGen::TAO_INTERFACE_FWD_CH:
-      return new be_visitor_interface_fwd_ch (new_ctx);
-    case TAO_CodeGen::TAO_INTERFACE_FWD_CI:
-      return new be_visitor_interface_fwd_ci (new_ctx);
-
-    case TAO_CodeGen::TAO_STRUCT_CH:
-      return new be_visitor_structure_ch (new_ctx);
-    case TAO_CodeGen::TAO_STRUCT_CS:
-      return new be_visitor_structure_cs (new_ctx);
-    case TAO_CodeGen::TAO_STRUCT_CI:
-      return new be_visitor_structure_ci (new_ctx);
-
-    case TAO_CodeGen::TAO_CONSTANT_CH:
-      return new be_visitor_constant_ch (new_ctx);
-    case TAO_CodeGen::TAO_CONSTANT_CS:
-      return new be_visitor_constant_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_ENUM_CH:
-      return new be_visitor_enum_ch (new_ctx);
-    case TAO_CodeGen::TAO_ENUM_CS:
-      return new be_visitor_enum_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_FIELD_CH:
-      return new be_visitor_field_ch (new_ctx);
-    case TAO_CodeGen::TAO_FIELD_CS:
-      return new be_visitor_field_cs (new_ctx);
-    case TAO_CodeGen::TAO_FIELD_CI:
-      return new be_visitor_field_ci (new_ctx);
-
-    case TAO_CodeGen::TAO_UNION_CH:
-      return new be_visitor_union_ch (new_ctx);
-    case TAO_CodeGen::TAO_UNION_CI:
-      return new be_visitor_union_ci (new_ctx);
-    case TAO_CodeGen::TAO_UNION_CS:
-      return new be_visitor_union_cs (new_ctx);
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CH:
-      return new be_visitor_union_branch_public_ch (new_ctx);
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CI:
-      return new be_visitor_union_branch_public_ci (new_ctx);
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CS:
-      return new be_visitor_union_branch_public_cs (new_ctx);
-    case TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS:
-      return new be_visitor_union_branch_public_assign_cs (new_ctx);
-    case TAO_CodeGen::TAO_UNION_PRIVATE_CH:
-      return new be_visitor_union_branch_private_ch (new_ctx);
-    case TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CH:
-
-      return new be_visitor_union_discriminant_ch (new_ctx);
-    case TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CI:
-      return new be_visitor_union_discriminant_ci (new_ctx);
-    case TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CS:
-      return new be_visitor_union_discriminant_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_SEQUENCE_CH:
-      return new be_visitor_sequence_ch (new_ctx);
-    case TAO_CodeGen::TAO_SEQUENCE_CI:
-      return new be_visitor_sequence_ci (new_ctx);
-    case TAO_CodeGen::TAO_SEQUENCE_CS:
-      return new be_visitor_sequence_cs (new_ctx);
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-      return new be_visitor_sequence_base (new_ctx);
-    case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH:
-    case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-      return new be_visitor_sequence_elemtype (new_ctx);
-    case TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH:
-    case TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CI:
-    case TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CS:
-      return new be_visitor_sequence_buffer_type (new_ctx);
-
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      return new be_visitor_typedef_ch (new_ctx);
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      return new be_visitor_typedef_cs (new_ctx);
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      return new be_visitor_typedef_ci (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_CH:
-      return new be_visitor_operation_ch (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_CS:
-      return new be_visitor_operation_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_SH:
-      return new be_visitor_operation_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_SS:
-      return new be_visitor_operation_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH:
-      return new be_visitor_operation_collocated_sh (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS:
-      return new be_visitor_operation_collocated_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETTYPE_CH:
-    case TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS:
-      return new be_visitor_operation_rettype (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-      return new be_visitor_operation_rettype_vardecl_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_DOCALL_CS:
-      return new be_visitor_operation_rettype_pre_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DOCALL_CS:
-      return new be_visitor_operation_rettype_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_DOCALL_CS:
-      return new be_visitor_operation_rettype_post_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-      return new be_visitor_operation_rettype_return_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS:
-      return new be_visitor_operation_exceptlist_cs (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-      return new be_visitor_operation_rettype_vardecl_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DEMARSHAL_SS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS:
-      return new be_visitor_operation_rettype_marshal_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-      return new be_visitor_operation_rettype_assign_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_POST_UPCALL_SS:
-      return new be_visitor_operation_rettype_post_upcall_ss (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
-      return new be_visitor_operation_arglist (new_ctx);
-    case TAO_CodeGen::TAO_OPERATION_ARG_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_DOCALL_CS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_DOCALL_CS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_UPCALL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
-      return new be_visitor_operation_argument (new_ctx);
-
-    case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH:
-    case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS:
-      return new be_visitor_args_arglist (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-      return new be_visitor_args_pre_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-      return new be_visitor_args_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-      return new be_visitor_args_post_docall_cs (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-      return new be_visitor_args_vardecl_ss (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-      return new be_visitor_args_pre_upcall_ss (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-      return new be_visitor_args_upcall_ss (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-      return new be_visitor_args_post_upcall_ss (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_DEMARSHAL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS:
-      return new be_visitor_args_marshal_ss (new_ctx);
-    case TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS:
-      return new be_visitor_args_post_marshal_ss (new_ctx);
-
-    case TAO_CodeGen::TAO_ATTRIBUTE_CH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
-      return new be_visitor_attribute (new_ctx);
-
-    case TAO_CodeGen::TAO_EXCEPTION_CH:
-      return new be_visitor_exception_ch (new_ctx);
-    case TAO_CodeGen::TAO_EXCEPTION_CI:
-      return new be_visitor_exception_ci (new_ctx);
-    case TAO_CodeGen::TAO_EXCEPTION_CS:
-      return new be_visitor_exception_cs (new_ctx);
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH:
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS:
-      return new be_visitor_exception_ctor (new_ctx);
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS:
-      return new be_visitor_exception_ctor_assign (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_CH:
-    case TAO_CodeGen::TAO_ARGUMENT_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_SH:
-    case TAO_CodeGen::TAO_ARGUMENT_SS:
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CH:
-    case TAO_CodeGen::TAO_ARRAY_OTHER_CH:
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CI:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-    default:
-      return new be_visitor_decl (new_ctx);
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp
deleted file mode 100644
index f51a834806b..00000000000
--- a/TAO/TAO_IDL/be/be_module.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_module.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Module that provides additional means for C++
-//    mapping of a module
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Module
- */
-be_module::be_module (void)
-{
-}
-
-be_module::be_module (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_module, n, p),
-    UTL_Scope (AST_Decl::NT_module)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int be_module::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CH); // set the current code generation state
-  ch = cg->client_header (); // get the stream
-
-  // XXXASG - Modules really map to namespace. We need to see if our target
-  // compiler supports namespaces or not. For this release we opt to generate a
-  // class definition for a module
-
-  ch->indent (); // start with whatever indentation level we are at
-
-  // now generate the class definition
-  *ch << "class " << idl_global->export_macro ()
-      << " " << local_name ();
-
-  // generate the body
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent (0);
-
-  // generate code for the module definition by traversing thru the
-  // elements of its scope. We depend on the front-end to have made sure
-  // that only legal syntactic elements appear in our scope.
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_client_stubs (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CS); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_stubs\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  TAO_NL  nl;        // end line
-  AST_Decl *d;
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SH); // set the current code generation state
-
-  sh = cg->server_header ();
-
-  // generate the skeleton class name
-
-  sh->indent (); // start with whatever indentation level we are at
-
-  // now generate the class definition. The prefix POA_ is prepended to our
-  // name only if we are the outermost module
-  d = ScopeAsDecl (this->defined_in ());
-
-  *sh << "class " << idl_global->export_macro ()
-      << " ";
-  if (d->node_type () == AST_Decl::NT_root)
-    // we are outermost module
-    *sh << "POA_" << local_name () << nl;
-  else
-    // we are inside another module
-    *sh << local_name () << nl;
-
-  *sh << "{" << nl;
-  *sh << "public:\n";
-  sh->incr_indent (0);
-
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  sh->decr_indent ();
-  *sh << "};\n\n";
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_server_skeletons (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SS); // set the current code generation state
-
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_skeletons\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-  cg->pop ();
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_module::gen_client_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CI); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_inline\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_module::gen_server_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SI); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_inline\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-// compute the size type of the node in question
-int
-be_module::compute_size_type (void)
-{
-  // our size does not matter
-  return 0;
-}
-
-int
-be_module::accept (be_visitor *visitor)
-{
-  return visitor->visit_module (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_module, AST_Module, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_module)
-IMPL_NARROW_FROM_SCOPE (be_module)
diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp
deleted file mode 100644
index eaaf1f9d325..00000000000
--- a/TAO/TAO_IDL/be/be_native.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// Id
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_native.cpp
-//
-// = DESCRIPTION
-//    The native IDL type
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-
-// be_native: New IDL type added by the POA spec
-/*
- * Constructor(s)
- */
-be_native::be_native (void)
-{
-}
-
-be_native::be_native (UTL_ScopedName *n,
-                      UTL_StrList *p)
-  : AST_Native (n, p),
-    AST_Decl (AST_Decl::NT_native, n, p)
-{
-}
-
-int
-be_native::gen_client_header (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_client_stubs (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_client_inline (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_server_inline (void)
-{
-  return 0;
-}
-
-int
-be_native::gen_typecode (void)
-{
-  return 0;
-}
-
-long
-be_native::tc_size (void)
-{
-  return 0;
-}
-
-int
-be_native::write_as_return (TAO_OutStream *stream,
-			       be_type *type)
-{
-  *stream << type->name ();
-  return 0;
-}
-
-int
-be_native::accept (be_visitor *visitor)
-{
-  return visitor->visit_native (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(be_native, AST_Native, be_type)
-IMPL_NARROW_FROM_DECL(be_native)
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
deleted file mode 100644
index 602ab706e1d..00000000000
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ /dev/null
@@ -1,969 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_operation.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Operation that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Operation
- */
-be_operation::be_operation (void)
-  : argument_count_ (-1),
-    has_native_ (0)
-{
-}
-
-be_operation::be_operation (AST_Type *rt, AST_Operation::Flags fl,
-                            UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Operation (rt, fl, n, p),
-    AST_Decl (AST_Decl::NT_op, n, p),
-    UTL_Scope (AST_Decl::NT_op),
-    argument_count_ (-1),
-    has_native_ (0)
-{
-}
-
-// compute total number of members
-int
-be_operation::compute_argument_attr (void)
-{
-  if (this->argument_count_ != -1)
-    return 0;
-
-  this->argument_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      UTL_ScopeActiveIterator *si =
-	new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-	  AST_Decl *d = si->item ();
-
-          if (!d->imported ()
-	      && d->node_type () == AST_Decl::NT_argument)
-	    {
-	      this->argument_count_++;
-	      be_argument *arg = be_argument::narrow_from_decl (d);
-	      be_type* type =
-		be_type::narrow_from_decl (arg->field_type ());
-
-	      if (type->base_node_type () == AST_Decl::NT_native)
-		this->has_native_ = 1;
-	    }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-
-  be_type* type = be_type::narrow_from_decl (this->return_type ());
-  if (type->base_node_type () == AST_Decl::NT_native)
-    this->has_native_ = 1;
-
-  return 0;
-}
-
-// return the member count
-int
-be_operation::argument_count (void)
-{
-  this->compute_argument_attr ();
-
-  return this->argument_count_;
-}
-
-// return if any argument or the return type is a <native> type.
-int
-be_operation::has_native (void)
-{
-  this->compute_argument_attr ();
-
-  return this->has_native_;
-}
-
-be_argument *
-be_operation::add_argument_to_scope (be_argument *arg)
-{
-  this->add_to_scope (arg);
-  this->add_to_referenced (arg, 0);
-  return arg;
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-int
-be_operation::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ch = cg->client_header ();
-
-  ch->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *ch << "virtual ";
-
-  // first generate the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-  cg->push (TAO_CodeGen::TAO_OPERATION_CH); // we are now generating an
-                                            // operation definition with the
-                                            // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  // generate the operation name
-  *ch << " " << this->local_name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_CH); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_header - "
-                         "failed in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // XXXASG
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support C++ style Exceptions. However, we can have an option to the
-  // "tao" IDL compiler to ask it to generate code for exceptions. This will be
-  // handled in a later release.
-  *ch << "CORBA::Environment &env);\n";
-
-  return 0;
-}
-
-int
-be_operation::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  UTL_ScopeActiveIterator *si; // scope iterator
-  AST_Decl *d;       // temp node
-  be_argument *bd;   // argument node
-  be_predefined_type *bpd=0; // predefined type used for return VOID type
-  be_state *s;       // state based code gen object
-  long paramtblsize = 0;  // size of the paradata table
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  // for each operation, generate the paramdata and calldata tables followed by
-  // the actual stub
-
-  cs->indent (); // start with current indentation level
-
-  // retrieve the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-
-  // bt holds the return type. Declare a variable that will hold the return
-  // type. However, we must be careful if the return type is a void
-  if (bt->node_type () == AST_Decl::NT_pre_defined)
-    {
-      bpd = be_predefined_type::narrow_from_decl (bt);
-    }
-
-  if (!this->has_native ())
-    {
-      // generate the TAO_Param_Data table
-      *cs << "static const TAO_Param_Data " << this->flatname () <<
-	"_paramdata [] = " << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-
-      // entry for the return type
-      *cs << "{" << bt->tc_name () << ", PARAM_RETURN, ";
-
-      // Are we returning a pointer to value? i.e., is the type
-      // variable? If it is, we must tell the stub what is the size of
-      // the top level structure
-      be_type *prim;
-      if (bt->node_type () == AST_Decl::NT_typedef)
-	{
-	  be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-	  prim = tdef->primitive_base_type ();
-	}
-      else
-	prim = bt;
-      if (prim->size_type () == be_decl::VARIABLE)
-        {
-          switch (prim->node_type ())
-            {
-            case AST_Decl::NT_interface:
-            case AST_Decl::NT_interface_fwd:
-            case AST_Decl::NT_string:
-            case AST_Decl::NT_sequence:
-            case AST_Decl::NT_struct:
-            case AST_Decl::NT_union:
-              // no need of size here
-              *cs << "0}";
-              break;
-            case AST_Decl::NT_pre_defined:
-              {
-                be_predefined_type *bpd = be_predefined_type::narrow_from_decl
-                  (bt);
-                if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                  // no need of size here
-                  *cs << "0}";
-                else
-                  *cs << "sizeof (" << bt->name () << ")}";
-              }
-              break;
-            default:
-              *cs << "sizeof (" << bt->name () << ")}";
-            }
-        }
-      else
-        *cs << "0}";
-      paramtblsize++;
-
-      // if we have any arguments, get each one of them
-      if (this->nmembers () > 0)
-	{
-	  // if there are elements in this scope
-
-	  si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-	  // instantiate a scope iterator.
-
-	  while (!(si->is_done ()))
-	    {
-	      // get the next AST decl node
-	      d = si->item ();
-	      // only if this is an argument node
-	      if (d->node_type () == AST_Decl::NT_argument)
-		{
-		  bd = be_argument::narrow_from_decl (d);
-		  bt = be_type::narrow_from_decl (bd->field_type ());
-		  *cs << "," << nl; // put a comma and newline before the
-		  // previous entry
-		  *cs << "{" << bt->tc_name ();
-		  // based on the direction, output the appropriate constant.
-		  switch (bd->direction ())
-		    {
-		    case AST_Argument::dir_IN:
-		      *cs << ", PARAM_IN, 0}";
-		      break;
-		    case AST_Argument::dir_INOUT:
-		      *cs << ", PARAM_INOUT, 0}";
-		      break;
-		    case AST_Argument::dir_OUT:
-		      {
-			*cs << ", PARAM_OUT, 0}";
-#if 0
-			// Are we returning a pointer to value? i.e.,
-			// is the type variable? If it is, we must
-			// tell the stub what is the size of the top
-			// level structure
-			if (bt->size_type () == be_decl::VARIABLE)
-			  {
-			    switch (bt->node_type ())
-			      {
-			      case AST_Decl::NT_interface:
-			      case AST_Decl::NT_interface_fwd:
-				// no need of size here
-				*cs << "0}";
-				break;
-			      case AST_Decl::NT_pre_defined:
-				{
-				  be_predefined_type *bpd =
-				    be_predefined_type::narrow_from_decl (bt);
-				  if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                                // no need of size here
-				    *cs << "0}";
-				  else
-				    *cs << "sizeof (" << bt->name () << ")}";
-				}
-				break;
-			      default:
-				*cs << "sizeof (" << bt->name () << ")}";
-			      }
-			  }
-			else
-			  *cs << "0}";
-#endif
-		      }
-		      break;
-		    } // end switch
-		  paramtblsize++;
-		} // end if argument node
-	      si->next ();
-	    } // end of while
-	  delete si; // free the iterator object
-	} // end of arg list
-      *cs << "\n";
-      cs->decr_indent ();
-      *cs << "};\n\n";
-
-      // now generate the calldata table
-
-      cs->indent ();
-      *cs << "static const TAO_Call_Data " << this->flatname ()
-	  << "_calldata = " << nl
-	  << "{"
-	  << "\"" << this->local_name () << "\", ";
-
-      // are we oneway or two operation?
-      if (this->flags () == AST_Operation::OP_oneway)
-	{
-	  *cs << "0, "; // for false
-	}
-      else
-	{
-	  *cs << "1, "; // for true
-	}
-      // insert the size of the paramdata table
-      *cs << paramtblsize << ", ";
-
-      // insert the address of the paramdata table
-      *cs << this->flatname () << "_paramdata, ";
-
-      // XXXASG - Exception list goes here (if it exists) - TODO
-      *cs << "0, 0};\n\n";
-    }
-
-  // now generate the actual stub
-
-  // retrieve the return type again because we have used bt to also retrieve
-  // the argument types
-  bt = be_type::narrow_from_decl (this->return_type ());
-
-  // bt holds the return type. Declare a variable that will hold the return
-  // type. However, we must be careful if the return type is a void
-  if (bt->node_type () == AST_Decl::NT_pre_defined)
-    {
-      bpd = be_predefined_type::narrow_from_decl (bt);
-    }
-
-  // first generate the return type
-  cs->indent ();
-  cg->push (TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS); // declare a return
-                                                        // type of the stub
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate the operation name
-  *cs << " " << this->name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_CS); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // last argument - is always CORBA::Environment
-  *cs << "CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  if (this->has_native ())
-    {
-      *cs << "env.exception (new CORBA::MARSHAL "
-	  << "(CORBA::COMPLETED_NO));" << nl;
-      // return the appropriate error value on exception
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS);
-      s = cg->make_state ();
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "failure returning from exception\n"),
-			    -1);
-	}
-    }
-  else
-    {
-      // declare a return type
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS);
-      s = cg->make_state ();
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "retval declaration failure\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      // generate code that calls QueryInterface
-      *cs << "STUB_Object *istub;\n\n";
-      cs->indent ();
-      *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-	"(void **)&istub) != TAO_NOERROR)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << "env.exception (new CORBA::DATA_CONVERSION "
-	  << "(CORBA::COMPLETED_NO));" << nl;
-
-      // return the appropriate error value on exception
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS);
-      s = cg->make_state ();
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "failure returning from exception\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      cs->decr_indent ();
-      *cs << "}" << nl;
-      *cs << "this->Release (); "
-	  << "// QueryInterface has bumped up our refcount" << nl;
-
-      // do any pre do_static_call stuff with arguments
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS);
-      if (be_scope::gen_client_stubs () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "failure generating pre docall stuff\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      // call do_static_call with appropriate number of arguments
-      *cs << "istub->do_static_call (env, &" << this->flatname ()
-	  << "_calldata";
-
-      // if our return type is not void, then pass the address of retval
-      if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-        {
-          be_type *prim;
-          if (bt->node_type () == AST_Decl::NT_typedef)
-            {
-              be_typedef *tdef = be_typedef::narrow_from_decl (bt);
-              prim = tdef->primitive_base_type ();
-            }
-          else
-            prim = bt;
-          if (prim->size_type () == be_decl::VARIABLE)
-            {
-              switch (prim->node_type ())
-                {
-                case AST_Decl::NT_interface:
-                case AST_Decl::NT_interface_fwd:
-                case AST_Decl::NT_string:
-                  *cs << ", &retval";
-                  break;
-                case AST_Decl::NT_sequence:
-                case AST_Decl::NT_struct:
-                case AST_Decl::NT_union:
-                  *cs << ", retval";
-                  break;
-                default:
-                  *cs << ", &retval";
-                }
-            }
-          else
-            *cs << ", &retval";
-        }
-      else
-        {
-          // pass a 0
-          *cs << ", 0";
-        }
-
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS);
-      if (be_scope::gen_client_stubs () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "failed to emit code for arguments in docall\n"),
-			    -1);
-	}
-      cg->pop ();
-      *cs << ");" << nl;
-
-      // do any post do_static_call stuff with arguments
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS);
-      if (be_scope::gen_client_stubs () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs - "
-			     "failed to emit code for post "
-			     "docall processing\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      // return the retval
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      s = cg->make_state ();
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "(%N:%l) be_operation::gen_client_stubs\n"
-			     "return val return generation failure\n"),
-			    -1);
-	}
-      cg->pop ();
-    }
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-  return 0;
-}
-
-int
-be_operation::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code generator object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_OPERATION_SH); // we are now generating an
-                                            // operation definition
-
-  sh = cg->server_header ();
-  sh->indent (); // start with the current indentation level
-
-  // every operation is declared virtual
-  *sh << "virtual ";
-
-
-  // first generate the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-  s = cg->make_state (); // retrieve code gen object for this state
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_operation::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "return type generation failure\n"));
-      return -1;
-    }
-  // generate the operation name
-  *sh << " " << this->local_name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_SH); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_operation::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Argument generation failure\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // XXXASG
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support Exceptions. However, we can have an option to the "tao" IDL
-  // compiler to ask it to generate code for exceptions. This will be handled
-  // in a later release.
-  *sh << " CORBA::Environment &env) = 0; // pure virtual\n";
-
-  sh->indent ();
-
-  // generate the static method corresponding to this method
-  *sh << "static void " << this->local_name () <<
-    "_skel (CORBA::ServerRequest &req, void *obj,"
-      << " void *context, CORBA::Environment &env);\n\n";
-  cg->pop (); // restore previous state
-  return 0;
-}
-
-// Generate code for the operation skeleton that makes the upcall.
-// Special Note: We deviate a bit from our policy of handing over code
-// generation for elements in our scope to the be_scope class. For this method,
-// it is best to simulate that behavior here as it involves a lot of
-// complexity.
-int
-be_operation::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_type *rt;       // type node for the return type
-  UTL_ScopeActiveIterator *si; // scope iterator
-  AST_Decl *d;       // temp node
-  be_argument *bd = 0;   // argument node
-  be_state *s;       // state based code gen object
-  be_predefined_type *bpd=0; // predefined return type
-  be_interface *intf; // enclosing interface node
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ss = cg->server_skeletons ();
-
-  ss->indent (); // start with the current indentation level
-
-  // retrieve our enclosing interface decl
-  intf = be_interface::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-
-  *ss << "void " << intf->full_skel_name () << "::"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-    //@@XXASG      << "CORBA::Object_ptr _tao_object_reference, "
-      << "void *_tao_object_reference, "
-      << "void *context, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "ACE_UNUSED_ARG (context);" << nl;
-
-  if (this->has_native ())
-    {
-      // Native types cannot be exported...
-      *ss << "_tao_environment.exception (new CORBA::MARSHAL"
-	  << " (CORBA::COMPLETED_NO));\n";
-    }
-  else
-    {
-      // define an NVList to hold arguments
-      *ss << "CORBA::NVList_ptr  nvlist;" << nl;
-      // define a variable that will eventually point to our
-      // implementation object
-      *ss << intf->full_skel_name () << "_ptr impl = ("
-	  << intf->full_skel_name () << "_ptr) _tao_object_reference;"
-	  << nl;
-
-      // verify if we need to define a variable intended to hold the
-      // operation return type. We do not need one if the return type
-      // is void
-
-      rt = be_type::narrow_from_decl (this->return_type ());
-      if (!rt)
-	{
-	  ACE_ERROR ((LM_ERROR,
-		      "be_operation::gen_server_skeletons - bad "
-		      "return type\n"));
-	  return -1;
-	}
-      if (rt->node_type () == AST_Decl::NT_pre_defined)
-	{
-	  bpd = be_predefined_type::narrow_from_decl (rt);
-	}
-      if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-	{
-	  // not a void type
-	  *ss << "CORBA::Any *result;" << nl;
-
-	  // emit the return type
-
-	  // emit type for return value
-	  cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS);
-
-	  // get a state based code gen object
-	  s = cg->make_state ();
-
-	  if (s->gen_code (rt, this) == -1)
-	    {
-	      ACE_ERROR ((LM_ERROR,
-			  "be_operation::gen_server_skeletons - "
-			  "codegen failed for return type\n"));
-	      return -1;
-	    }
-	  cg->pop ();
-	}
-
-#if 0
-      // if we have any arguments, get each one of them and allocate
-      // an Any and NamedValue for each. In addition, define a
-      // variable of that type
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS);
-      if (be_scope::gen_server_skeletons () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_operation::gen_server_skeletons - "
-			     "argument gen code failed\n"),
-			    -1);
-	}
-      *ss << "\n";
-      cg->pop ();
-#endif
-
-      // declare an NVList and create one
-      ss->indent ();
-      *ss << "// create an NV list and populate it with typecodes" << nl;
-      *ss << "_tao_server_request.orb ()->create_list ("
-	  << this->argument_count ()
-	  << ", nvlist); // initialize a list" << nl;
-
-      // add each argument according to the in, out, inout semantics
-      if (this->nmembers () > 0)
-	{
-	  *ss << "// add each argument according to the "
-	      << "in, out, inout semantics" << nl;
-	  // if we have any arguments, insert its typecode and a
-	  // pointer to storage for the variable
-	  cg->push (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS);
-	  s = cg->make_state ();
-	  if (!s)
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 "(%N:%l) be_operation::"
-				 "gen_server_skeletons - "
-				 "Bad state\n"),
-				-1);
-	    }
-
-	  // if there are elements in this scope
-	  si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-	  // instantiate a scope iterator.
-
-	  while (!(si->is_done ()))
-	    {
-	      // get the next AST decl node
-	      d = si->item ();
-	      if (!d->imported ())
-		{
-		  // only if this is an argument node
-		  if (d->node_type () == AST_Decl::NT_argument)
-		    {
-		      bd = be_argument::narrow_from_decl (d);
-		      if (!bd)
-			{
-			  ACE_ERROR_RETURN ((LM_ERROR,
-					     "(%N:%l) be_operation::"
-					     "gen_server_skeletons - "
-					     "Bad argument\n"),
-					    -1);
-			}
-		      bt = be_type::narrow_from_decl (bd->field_type ());
-		      if (!bt)
-			{
-			  ACE_ERROR_RETURN ((LM_ERROR,
-					     "(%N:%l) be_operation::"
-					     "gen_server_skeletons - "
-					     "Bad type\n"),
-					    -1);
-			}
-		      // emit code that adds this argument to the
-		      // NVList
-#if 0
-		      *ss << "nv_" << bd->local_name ()
-			  << " = nvlist->add_value (\""
-			  << bd->local_name () << "\", "
-			  << "any_" << bd->local_name () << ", ";
-		      switch (bd->direction ())
-			{
-			case AST_Argument::dir_IN:
-			  *ss << "CORBA::ARG_IN, _tao_environment);" << nl;
-			  break;
-			case AST_Argument::dir_INOUT:
-			  *ss << "CORBA::ARG_INOUT, _tao_environment);" << nl;
-			  break;
-			case AST_Argument::dir_OUT:
-			  *ss << "CORBA::ARG_OUT, _tao_environment);" << nl;
-			  break;
-			}
-#endif
-		      if (s->gen_code (bt, bd) == -1)
-			{
-			  ACE_ERROR_RETURN ((LM_ERROR,
-					     "(%N:%l) be_operation::"
-					     "gen_server_skeletons - "
-					     "state based code gen failed\n"),
-					    -1);
-			}
-		    } // end if argument node
-		} // end if ! imported
-	      si->next ();
-	    } // end of while
-	  delete si; // free the iterator object
-	  cg->pop ();
-	} // end of arg list
-
-      // parse the arguments
-      *ss << "// parse the arguments" << nl;
-      *ss << "_tao_server_request.params (nvlist, _tao_environment);" << nl;
-      *ss << "if (_tao_environment.exception ()) return;" << nl;
-
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS);
-      if (be_scope::gen_server_skeletons () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_operation::gen_server_skeletons - "
-			     "argument gen code failed\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      // make the upcall
-      //  *ss << "impl = (" << intf->full_skel_name ()
-      //      << "_ptr) _tao_object_reference->get_subclass ();"
-      //  << nl;
-      if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-	{
-	  cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS);
-	  s = cg->make_state ();
-	  // emit code to assign to retval
-	  if (!s || (s->gen_code (rt, this) == -1))
-	    {
-	      return -1;
-	    }
-	  *ss << " = impl->" << this->local_name () << "(";
-	  cg->pop ();
-	}
-      else
-	{
-	  // void return type
-	  *ss << "impl->" << this->local_name () << "(";
-	}
-
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS);
-      if (be_scope::gen_server_skeletons () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_operation::gen_server_skeletons - "
-			     "argument in upcall\n"),
-			    -1);
-	}
-      cg->pop ();
-      *ss << "_tao_environment);" << nl;
-
-      cg->push (TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS);
-      if (be_scope::gen_server_skeletons () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_operation::gen_server_skeletons - "
-			     "argument gen code failed\n"),
-			    -1);
-	}
-      cg->pop ();
-
-      // if there is any return type, send it via the ServerRequest
-      if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-	{
-	  cg->push (TAO_CodeGen::TAO_OPERATION_RESULT_SS);
-	  s = cg->make_state ();
-	  if (!s || (s->gen_code (rt, this) == -1))
-	    return -1;
-	  cg->pop ();
-	  *ss << "_tao_server_request.result (result, "
-	      << "_tao_environment);" << nl;
-	}
-      *ss << "\n";
-    }
-
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_operation::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_operation::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// compute the size type of the node in question
-int
-be_operation::compute_size_type (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          bd = be_decl::narrow_from_decl (d);
-          if (bd != 0)
-            {
-              // our sizetype depends on the sizetype of our members. Although
-              // previous value of sizetype may get overwritten, we are
-              // guaranteed by the "size_type" call that once the value reached
-              // be_decl::VARIABLE, nothing else can overwrite it.
-              this->size_type (bd->size_type ());
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l) be_operation::compute_size_type - "
-                          "narrow_from_decl returned 0\n"));
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_operation::accept (be_visitor *visitor)
-{
-  return visitor->visit_operation (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_operation, AST_Operation, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_operation)
-IMPL_NARROW_FROM_SCOPE (be_operation)
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
deleted file mode 100644
index 7fa818da279..00000000000
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ /dev/null
@@ -1,521 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_predefined_type.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_PredefinedType that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_PredefinedType
- */
-be_predefined_type::be_predefined_type (void)
-{
-}
-
-be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
-                                        UTL_ScopedName *n, UTL_StrList *p)
-  : AST_PredefinedType (t, n, p),
-    AST_Decl (AST_Decl::NT_pre_defined, n, p)
-{
-  // generate a new Scoped Name for us such that we belong to the CORBA
-  // namespace
-  if (this->pt () != AST_PredefinedType::PT_void)
-    {
-
-      UTL_ScopedName *new_name = new UTL_ScopedName (new Identifier ("CORBA", 1, 0,
-                                                                     I_FALSE),
-                                                     NULL);
-      switch (this->pt ())
-        {
-        case AST_PredefinedType::PT_long:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Long", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_ulong:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("ULong", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_short:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Short", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_ushort:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("UShort", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_float:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Float", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_double:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Double", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_char:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Char", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_octet:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Octet", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_wchar:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("WChar", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_boolean:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Boolean", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_any:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Any", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_pseudo:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier
-                                                 (n->last_component
-                                                  ()->get_string (), 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        default:
-          {
-            new_name->nconc (new UTL_ScopedName (this->local_name (), NULL));
-          }
-        }
-      this->set_name (new_name);
-    }
-
-  // computes the repoID
-  compute_repoID ();
-
-  // computes the fully scoped name
-  compute_fullname ();
-
-  // computes the fully scoped typecode name
-  compute_tc_name ();
-
-  // compute the flattened fully scoped name
-  compute_flatname ();
-}
-
-// overriden method
-void
-be_predefined_type::compute_tc_name (void)
-{
-  // start with the head as the CORBA namespace
-  this->tc_name_ = new UTL_ScopedName (new Identifier ("CORBA", 1, 0, I_FALSE),
-                                       NULL);
-
-  switch (this->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_void", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_long:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_long", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_longlong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_longlong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ulong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ulong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ulonglong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_short:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_short", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ushort:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ushort", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_float:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_float", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_double:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_double", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_longdouble", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_char:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_char", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_wchar:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_wchar", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_octet:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_octet", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_boolean:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_boolean", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_any:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_any", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-    break;
-    case AST_PredefinedType::PT_pseudo:
-      {
-        char tcname [100];
-        ACE_OS::sprintf (tcname, "_tc_%s",
-                         this->name ()->last_component ()->get_string ());
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier
-                                                   (ACE_OS::strdup (tcname),
-                                                    1, 0,
-                                                    I_FALSE), NULL));
-      }
-    break;
-    default:
-      ACE_ERROR ((LM_WARNING, "Unknown or invalid predefined type"));
-      break;
-    }
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the predefined type
-int
-be_predefined_type::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  ch->indent ();
-  *ch << this->name ();
-  return 0;
-}
-
-// Generates the client-side stubs for the predefined type
-int
-be_predefined_type::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  return 0;
-}
-
-// Generates the server-side header information for the predefined type
-int
-be_predefined_type::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  sh = cg->server_header ();
-
-  return 0;
-}
-
-// Generates the server-side skeletons for the predefined type
-int
-be_predefined_type::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ss = cg->server_skeletons ();
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_predefined_type::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_predefined_type::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_predefined_type::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from the current indentation level
-
-  switch (this->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      *cs << "CORBA::tk_void,\n\n";
-      break;
-    case AST_PredefinedType::PT_short:
-      *cs << "CORBA::tk_short,\n\n";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *cs << "CORBA::tk_ushort,\n\n";
-      break;
-    case AST_PredefinedType::PT_long:
-      *cs << "CORBA::tk_long,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *cs << "CORBA::tk_ulong,\n\n";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *cs << "CORBA::tk_longlong,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *cs << "CORBA::tk_ulonglong,\n\n";
-      break;
-    case AST_PredefinedType::PT_float:
-      *cs << "CORBA::tk_float,\n\n";
-      break;
-    case AST_PredefinedType::PT_double:
-      *cs << "CORBA::tk_double,\n\n";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *cs << "CORBA::tk_longdouble,\n\n";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *cs << "CORBA::tk_boolean,\n\n";
-      break;
-    case AST_PredefinedType::PT_char:
-      *cs << "CORBA::tk_char,\n\n";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *cs << "CORBA::tk_octet,\n\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      *cs << "CORBA::tk_any,\n\n";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *cs << "CORBA::tk_wchar,\n\n";
-      break;
-    case AST_PredefinedType::PT_pseudo:
-      {
-        if (!ACE_OS::strcmp (this->local_name ()->get_string (), "TypeCode"))
-          *cs << "CORBA::tk_TypeCode,\n\n";
-        else
-          if (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object"))
-            {
-              *cs << "CORBA::tk_objref,\n";
-              *cs << this->tc_encap_len () << ", // encapsulation length\n";
-              // now emit the encapsulation
-              this->gen_encapsulation ();
-            }
-      }
-      break;
-    }
-  return 0;
-}
-
-long
-be_predefined_type::tc_size (void)
-{
-  if (ACE_OS::strcmp (this->local_name ()->get_string (), "Object")) // not same
-    return 4; // for the enum value
-  else
-    return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_predefined_type::tc_encap_len (void)
-{
-  if ((this->encap_len_ == -1) // not computed yet
-      && (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object")))
-    // is a CORBA::Object
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-    }
-
-  return this->encap_len_;
-}
-
-  int
-    be_predefined_type::gen_encapsulation (void)
-    {
-      if (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object"))
-        {
-          TAO_OutStream *cs; // output stream
-          TAO_NL  nl;        // end line
-          TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-          long i, arrlen;
-          long *arr;  // an array holding string names converted to array of longs
-
-          cs = cg->client_stubs ();
-          cs->indent (); // start from whatever indentation level we were at
-
-          // XXXASG - byte order must be based on what m/c we are generating code -
-          // TODO
-          *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-          // generate repoID
-          *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-          (void)this->tc_name2long (this->repoID (), arr, arrlen);
-          for (i=0; i < arrlen; i++)
-            {
-              cs->print ("0x%x, ", arr[i]);
-            }
-          *cs << " // repository ID = " << this->repoID () << nl;
-          // generate name
-          *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-          (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-          for (i=0; i < arrlen; i++)
-            {
-              cs->print ("0x%x, ", arr[i]);
-            }
-          *cs << " // name = " << this->local_name () << ",\n";
-        }
-      return 0;
-    }
-
-// compute the size type of the node in question
-int
-be_predefined_type::compute_size_type (void)
-{
-  switch (this->pt ())
-    {
-    case AST_PredefinedType::PT_any:
-    case AST_PredefinedType::PT_pseudo:
-      // we are variable length type
-      this->size_type (be_decl::VARIABLE);
-      break;
-    default:
-      this->size_type (be_decl::FIXED);
-    }
-  return 0;
-}
-
-int be_predefined_type::write_as_return (TAO_OutStream *stream,
-					 be_type *type)
-{
-  *stream << type->name ();
-  // check if the type is an any
-  if (this->pt () == AST_PredefinedType::PT_any)
-    {
-      // if it is an any, return a pointer to it
-      *stream << " *";
-    }
-  else if (this->pt () == AST_PredefinedType::PT_pseudo)
-    {
-      // pseudo object, return a pointer
-      *stream << "_ptr";
-    }
-  return 0;
-}
-
-int
-be_predefined_type::accept (be_visitor *visitor)
-{
-  return visitor->visit_predefined_type (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_predefined_type, AST_PredefinedType, be_type)
-IMPL_NARROW_FROM_DECL (be_predefined_type)
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
deleted file mode 100644
index 817fb6af65d..00000000000
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// BE_produce.cc - Produce the work of the BE - does nothing in the
-//		   dummy BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include        "be_interpretive.h"
-
-/*
- * Do the work of this BE. This is the starting point for code generation.
- */
-
-void
-BE_produce()
-{
-  be_root *root;   // root of the AST made up of BE nodes
-  be_visitor *root_visitor; // visitor for root
-  be_visitor_context ctx; // context information for the visitor root
-
-  // XXXASG - Here is where we will have a choice of what to initialize i.e.,
-  // whether we want a visitor generating "interpetive" or "compiled" form of
-  // stubs/skeletons
-  // TODO - to do this elegantly.
-  // right now we just force it to be the interpretive one.
-  tao_cg->visitor_factory (new TAO_Interpretive_Visitor_Factory);
-
-  AST_Decl *d = idl_global->root (); // get the root
-
-  root = be_root::narrow_from_decl (d); // narrow it to the "be_root"
-  if (!root) // no root
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "No Root\n"));
-      BE_abort();
-    }
-
-  // Code generation involves six steps because of the six files that we
-  // generate.
-
-  // (1) generate client header
-  // instantiate a visitor context
-  ctx.state (TAO_CodeGen::TAO_ROOT_CH); // set the codegen state
-  // get a root visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "client header for Root failed\n"));
-      BE_abort();
-    }
-  (void) tao_cg->end_client_header (); // generate the last #endif
-  delete root_visitor; // it is our responsibility to free up the visitor
-
-  // (2) generate client inline
-  // set the context information
-  ctx.state (TAO_CodeGen::TAO_ROOT_CI);
-  // create a visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "client inline for Root failed\n"));
-      BE_abort();
-    }
-  delete root_visitor; // it is our responsibility to free up the visitor
-
-
-  // (3) generate client stubs
-  ctx.state (TAO_CodeGen::TAO_ROOT_CS);
-  // create a visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "client stubs for Root failed\n"));
-      BE_abort();
-    }
-  delete root_visitor; // it is our responsibility to free up the visitor
-
-  // (4) generate server header
-  ctx.state (TAO_CodeGen::TAO_ROOT_SH);
-  // create a visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "server header for Root failed\n"));
-      BE_abort();
-    }
-  (void) tao_cg->end_server_header (); // generate the last #endif
-  delete root_visitor; // it is our responsibility to free up the visitor
-
-  // (5) generate server inline
-  ctx.state (TAO_CodeGen::TAO_ROOT_SI);
-  // create a visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "server inline for Root failed\n"));
-      BE_abort();
-    }
-  delete root_visitor; // it is our responsibility to free up the visitor
-
-  // (6) generate server skeletons
-  ctx.state (TAO_CodeGen::TAO_ROOT_SS);
-  // create a visitor
-  root_visitor = tao_cg->make_visitor (&ctx);
-  if (root->accept (root_visitor) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_produce - "
-                  "server skeletons for Root failed\n"));
-      BE_abort();
-    }
-  delete root_visitor; // it is our responsibility to free up the visitor
-}
-
-/*
- * Abort this run of the BE
- */
-void
-BE_abort()
-{
-  cerr << "Fatal Error" << endl;
-  exit (1);
-}
diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp
deleted file mode 100644
index 96dcb1065d6..00000000000
--- a/TAO/TAO_IDL/be/be_root.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_root.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Root that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// Default Constructor
-be_root::be_root (void)
-{
-}
-
-// Constructor used to build the root of the abstract syntax tree (AST)
-be_root::be_root (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Root (n, p),
-    AST_Decl (AST_Decl::NT_root, n, p),
-    UTL_Scope (AST_Decl::NT_root)
-
-{
-}
-
-// =====================================================
-//           CODE GENERATION METHODS
-// =====================================================
-
-// Starting point for the code generation. Called inside BE_produce ()
-int be_root::gen_idl2cplusplus_mapping (void)
-{
-  // this is the main starting point from which the files are generated. We
-  // delegate the task of code generation to a special Code Generation
-  // object. This allows a number of different front ends to access the services
-  // of a single code generator
-
-  // C++ mapping involves producing 6 files. These include the client and
-  // server side headers, the client and server side inlines, as well as client
-  // stubs and server skeletons.
-  if (this->gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client header file: %s\n",
-		  idl_global->be_get_client_hdr_fname ()));
-      return -1;
-    }
-  if (this->gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client inline file: %s\n",
-		  idl_global->be_get_client_inline_fname ()));
-      return -1;
-    }
-  if (this->gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client stubs file: %s\n",
-		  idl_global->be_get_client_stub_fname ()));
-      return -1;
-    }
-  if (this->gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server header file: %s\n",
-		  idl_global->be_get_server_hdr_fname ()));
-      return -1;
-    }
-  if (this->gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server inline file: %s\n",
-		  idl_global->be_get_server_inline_fname ()));
-      return -1;
-    }
-  if (this->gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server skeleton file: %s\n",
-		  idl_global->be_get_server_skeleton_fname ()));
-      return -1;
-    }
-
-  return 0;
-}
-
-// generate client header
-int be_root::gen_client_header (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CH); // set the code generation state
-
-  // open the client-side header file
-  if (cg->client_header (idl_global->be_get_client_hdr_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client header\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  (void) cg->end_client_header (); // generate the last #endif
-  return 0;
-}
-
-// Generates the client-side stubs for the root
-int be_root::gen_client_stubs (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CS); // set the code generation state
-
-  // open the client-side stub file
-  if (cg->client_stubs (idl_global->be_get_client_stub_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client stubs file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the client-side inlines for the root
-int be_root::gen_client_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CI); // set the code generation state
-
-  // open the client-side inline file
-  if (cg->client_inline (idl_global->be_get_client_inline_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client inline file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the server-side header information for the root
-int be_root::gen_server_header (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SH); // set the code generation state
-
-  // open the server-side header file
-  if (cg->server_header (idl_global->be_get_server_hdr_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server header\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "be_root: server code generation for scope failed\n"));
-      return -1;
-    }
-
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  (void) cg->end_server_header (); // generate the last #endif statement
-  return 0;
-}
-
-// Generates the server-side skeletons for the root
-int be_root::gen_server_skeletons (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SS); // set the code generation state
-
-  // open the server-side skeleton file
-  if (cg->server_skeletons (idl_global->be_get_server_skeleton_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server skeletons file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the server-side inlines for the root
-int be_root::gen_server_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SI); // set the code generation state
-
-  // open the server-side inline file
-  if (cg->server_inline (idl_global->be_get_server_inline_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server inline file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// We had to provide these since the AST_Root::fe_* method was setting the
-// names of these three to "local type"
-
-/*
- * Add this AST_Sequence to the locally defined types in this scope
- */
-AST_Sequence *
-be_root::fe_add_sequence (AST_Sequence *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types(t);
-  return t;
-}
-
-/*
- * Add this AST_String to the locally defined types in this scope
- */
-AST_String *
-be_root::fe_add_string (AST_String *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types (t);
-
-  return t;
-}
-
-/*
- * Add this AST_Array to the locally defined types in this scope
- */
-AST_Array *
-be_root::fe_add_array (AST_Array *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types (t);
-
-  return t;
-}
-
-int
-be_root::accept (be_visitor *visitor)
-{
-  return visitor->visit_root (this);
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS3 (be_root, AST_Root, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_root)
-IMPL_NARROW_FROM_SCOPE (be_root)
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
deleted file mode 100644
index 1842d29143a..00000000000
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-//
-// $Id$
-//
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// Default Constructor
-be_scope::be_scope (void)
-  : comma_ (0)
-{
-}
-
-// Constructor
-be_scope::be_scope (AST_Decl::NodeType type)
-  : UTL_Scope (type),
-    comma_ (0)
-{
-}
-
-be_scope::~be_scope (void)
-{
-}
-
-// Code generation methods
-void
-be_scope::comma (unsigned short comma)
-{
-  this->comma_ = comma;
-}
-
-int
-be_scope::comma (void) const
-{
-  return this->comma_;
-}
-
-int
-be_scope::gen_client_header (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->client_header (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-
-              // NOTE: Our assumption here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              // The FE does some strange things in which items get added to
-              // the enclosing scope as well as the scope that encloses the
-              // enclosing scope. We do not want to generate code for items
-              // that do not belong to the appropriate scope
-
-              bd = be_decl::narrow_from_decl (d);
-              // @@ Despite the comment above the following code will
-              // crash without the if() around it.
-              if (bd != 0)
-                {
-                  if (bd->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_header failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_header - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // no imported
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_client_stubs (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->client_stubs (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              // @@ Despite the comment above the following code will
-              // crash without the if() around it.
-              if (bd != 0)
-                {
-                  if (bd->gen_client_stubs () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_stubs failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_stubs - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_client_inline (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->client_inline (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_client_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_inline failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_inline - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_header (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->server_header (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // we are not imported.
-
-          // NOTE: Our assumptin here is that whatever scope we are in, the
-          // node type that shows up here *MUST* be valid according to the
-          // IDL grammar. We do not check for this since the front end must
-          // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_header failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_server_header - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_skeletons (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->server_skeletons (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_skeletons () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_skeletons failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l): be_scope::gen-server_skeletons - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_inline (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  TAO_OutStream *os = cg->server_inline (); // output stream
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_inline failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l): be_scope::gen_server_inline - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            }
-          si->next ();
-          if (!si->is_done () && this->comma_)
-            {
-              *os << ", "; // generate a comma
-            }
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_encapsulation (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          bd = be_decl::narrow_from_decl (d);
-          if (bd->gen_encapsulation () == -1)
-            {
-              // failure
-              return -1;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-long
-be_scope::tc_encap_len (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  long encap_len = 0;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-
-          // NOTE: Our assumptin here is that whatever scope we are in, the
-          // node type that shows up here *MUST* be valid according to the
-          // IDL grammar. We do not check for this since the front end must
-          // have taken care of weeding out such errors
-
-          bd = be_decl::narrow_from_decl (d);
-          if (bd != 0)
-            {
-              encap_len += bd->tc_encap_len ();
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l): be_scope::tc_encap_len - "
-                          "narrow_from_decl returned 0\n"));
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return encap_len;
-}
-
-// return the scope created by this node (if one exists, else NULL)
-be_decl *
-be_scope::decl (void)
-{
-  switch (this->scope_node_type())
-    {
-    case AST_Decl::NT_interface:
-      return be_interface::narrow_from_scope (this);
-    case AST_Decl::NT_module:
-      return be_module::narrow_from_scope (this);
-    case AST_Decl::NT_root:
-      return be_root::narrow_from_scope (this);
-    case AST_Decl::NT_except:
-      return be_exception::narrow_from_scope (this);
-    case AST_Decl::NT_union:
-      return be_union::narrow_from_scope (this);
-    case AST_Decl::NT_struct:
-      return be_structure::narrow_from_scope (this);
-    case AST_Decl::NT_enum:
-      return be_enum::narrow_from_scope (this);
-    case AST_Decl::NT_op:
-      return be_operation::narrow_from_scope (this);
-    default:
-      return (be_decl *)0;
-    }
-}
-
-int
-be_scope::accept (be_visitor *visitor)
-{
-  return visitor->visit_scope (this);
-}
-
-// narrowing methods
-IMPL_NARROW_METHODS1 (be_scope, UTL_Scope)
-IMPL_NARROW_FROM_SCOPE (be_scope)
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
deleted file mode 100644
index 6ffdfbe8997..00000000000
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ /dev/null
@@ -1,2646 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_sequence.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Sequence that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-#include "be_visitor_sequence.h"
-
-/*
- * BE_Sequence
- */
-be_sequence::be_sequence (void)
-  : mt_ (be_sequence::MNG_UNKNOWN)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_sequence::be_sequence (AST_Expression *v, AST_Type *t)
-  : AST_Sequence (v, t),
-    AST_Decl (AST_Decl::NT_sequence,
-              NULL,
-              NULL),
-    mt_ (be_sequence::MNG_UNKNOWN)
-{
-  // check if we are bounded or unbounded. An expression value of 0 means
-  // unbounded
-  if (v->ev ()->u.ulval == 0)
-    {
-      this->unbounded_ = I_TRUE;
-    }
-  else
-    {
-      this->unbounded_ = I_FALSE;
-    }
-
-  this->size_type (be_decl::VARIABLE); // a sequence data type is always
-                                       // VARIABLE
-}
-
-idl_bool
-be_sequence::unbounded (void) const
-{
-  return this->unbounded_;
-}
-
-// helper to create_name
-char *
-be_sequence::gen_name (void)
-{
-  char namebuf [NAMEBUFSIZE];
-  be_type *bt; // base type;
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);  // reset the buffer
-  // retrieve the base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_name - "
-                         "bad base type\n"),
-                        0);
-    }
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      // our base type is an anonymous sequence
-      be_sequence *seq;
-      seq = be_sequence::narrow_from_decl (bt);
-      if (!seq)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_name - "
-                             "error converting base type to sequence\n"),
-                            0);
-        }
-      seq->set_defined_in (this); // set ourselves as its parent
-      this->fe_add_sequence (seq); // add the child to our scope
-      ACE_OS::sprintf (namebuf, "_tao_seq_%s", seq->gen_name ());
-    }
-  else
-    {
-      ACE_OS::sprintf (namebuf, "_tao_seq_%s", bt->local_name ()->get_string ());
-    }
-  // append the size (if any)
-  if (!this->unbounded_)
-    {
-      ACE_OS::sprintf (namebuf, "%s_%d", namebuf, this->max_size ()->ev
-                       ()->u.ulval);
-    }
-  return ACE_OS::strdup (namebuf);
-}
-
-// create a name for ourselves
-int
-be_sequence::create_name (be_typedef *node)
-{
-  static char namebuf [NAMEBUFSIZE];
-  UTL_ScopedName *n = NULL;
-  be_decl *scope; // scope in which we are defined
-
-  // if there is a typedef node, we use its name as our name
-  if (node)
-    {
-      n = (UTL_ScopedName *)node->name ()->copy ();
-      this->set_name (n); // set our name
-    }
-  else
-    {
-
-      ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);  // reset the buffer
-      ACE_OS::strcpy (namebuf, this->gen_name ()); // generate a local name
-
-      // now see if we have a fully scoped name and if so, generate one
-      scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-      if (scope)
-        {
-          // make a copy of the enclosing scope's  name
-          n = (UTL_ScopedName *)scope->name ()->copy () ;
-
-          // add our local name as the last component
-          n->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                        (namebuf), 1,
-                                                        0, I_FALSE),
-                                        NULL));
-          // set the fully scoped name
-          this->set_name (n);
-        }
-      else
-        {
-          // We better be not here because we must be inside some scope,
-          // atleast the ROOT scope.
-          return -1;
-        }
-    }
-  return 0;
-}
-
-// Does this sequence have a managed type sequence element?
-be_sequence::MANAGED_TYPE
-be_sequence::managed_type (void)
-{
-  if (this->mt_ == be_sequence::MNG_UNKNOWN) // not calculated yet
-    {
-      be_type  *bt, *prim_type; // base types
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-
-      if (bt->node_type () == AST_Decl::NT_typedef)
-        {
-          // get the primitive base type of this typedef node
-          be_typedef *t = be_typedef::narrow_from_decl (bt);
-          prim_type = t->primitive_base_type ();
-        }
-      else
-        prim_type = bt;
-
-      // determine if we need a managed type and which one
-      switch (prim_type->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-          this->mt_ = be_sequence::MNG_OBJREF;
-          break;
-        case AST_Decl::NT_string:
-          this->mt_ = be_sequence::MNG_STRING;
-          break;
-        case AST_Decl::NT_pre_defined:
-          {
-            be_predefined_type *bpd = be_predefined_type::narrow_from_decl
-              (prim_type);
-            if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-              {
-                this->mt_ = be_sequence::MNG_OBJREF;
-              }
-            else
-              {
-                this->mt_ = be_sequence::MNG_NONE;
-              }
-          }
-          break;
-        default:
-          this->mt_ = be_sequence::MNG_NONE;
-        } // end of switch
-    }
-  return this->mt_;
-}
-
-int
-be_sequence::gen_client_header (void)
-{
-#if 0 /* visitor code */
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-#endif /* visitor code */
-
-  if (!this->cli_hdr_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      // first create a name for ourselves. We defer name creation for
-      // ourselves to this point since named sequences should get the name
-      // of the typedef node, else some other technique of name generation
-      // should be used.
-      if (this->create_name () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_sequence::gen_client_header - name creation failed\n"),
-                            -1);
-        }
-
-      be_visitor *visitor_seq_ch = cg->make_visitor (0);
-        //        (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-
-      if (this->accept (visitor_seq_ch) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence - "
-                             "gen_client_header"
-                             "\n"),
-                            -1);
-        }
-
-#if 0 /* visitor code */
-      ch = cg->client_header ();
-
-      // generate the ifdefined macro for the sequence type
-      ch->gen_ifdef_macro (this->flatname ());
-
-      ch->indent (); // start with the current indentation level
-
-      *ch << "// *************************************************************"
-          << nl;
-      *ch << "// class " << this->local_name () << nl;
-      *ch << "// *************************************************************"
-              << nl << nl;
-
-      *ch << "class " << idl_global->export_macro ()
-      << " " << this->local_name () << nl;
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent (0);
-
-      // retrieve the base type since we may need to do some code
-      // generation for the base type.
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence.cpp - "
-                             "Bad base type\n"),
-                            -1);
-        }
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CH); // set current code gen
-      // state
-      s = cg->make_state ();
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence.cpp - "
-                             "base type codegen failed\n"),
-                            -1);
-        }
-      cg->pop ();
-
-      // now generate the sequence body
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "bad state\n"),
-                            -1);
-        }
-
-      // generate constructors
-      ch->indent ();
-      *ch << this->local_name () << " (void); // default constructor" << nl;
-      // check whether we are bounded or not. Depending on that the mapping is
-      // slightly different as shown below
-      if (this->unbounded_)
-        {
-          *ch << local_name () << " (CORBA::ULong max);" << nl;
-          *ch << local_name () << " (CORBA::ULong max, CORBA::ULong length, " << nl;
-        }
-      else
-        {
-          // bounded seq does not take the "max" argument
-          *ch << local_name () << " (CORBA::ULong length, " << nl;
-        }
-
-      *ch << "  ";
-      // generate the type info for the element type
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ch << " *value, CORBA::Boolean release=CORBA::B_FALSE);" << nl;
-      *ch << local_name () << "(const " << local_name () <<
-        " &); // copy constructor" << nl;
-      *ch << "~" << this->local_name () << " (void);" << nl;
-      *ch << this->local_name () << " &operator= (const " <<
-        this->local_name () << " &);" << nl;
-      *ch << "CORBA::ULong maximum (void) const;" << nl;
-      *ch << "void length (CORBA::ULong);" << nl;
-      *ch << "CORBA::ULong length (void) const;" << nl;
-
-      // we need a new state here because the [] operator for strings and obj
-      // references returns a managed type as opposed to the normal type
-      cg->push (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH);
-      s = cg->make_state ();
-      if (!s || s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << "operator[] (CORBA::ULong index);" << nl;
-      *ch << "const ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << "operator[] (CORBA::ULong index) const;" << nl;
-      cg->pop (); // back to the previous state
-
-      s = cg->make_state ();
-      // generate the static allocbuf and freebuf methods
-      *ch << "static ";
-      if (!s || s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << " *allocbuf (CORBA::ULong nelems);" << nl;
-      *ch << "static void freebuf (";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << " *);\n" ;
-
-      // the spec says that for managed sequence types, the freebuf method
-      // should individually free up the elements before deleting the
-      // buffer. However, freebuf does not have a parameter that indicates the
-      // total number of elements that are in the buffer. Hence we provide a
-      // helper method to freebuf
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-        case be_sequence::MNG_STRING:
-          ch->indent ();
-          *ch << "static void freebuf (" << nl;
-          if (s->gen_code (bt, this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_sequence::"
-                                 "gen_client_header - "
-                                 "state based codegen failed\n"),
-                                -1);
-            }
-          *ch << " *, CORBA::ULong);\n" ;
-          break;
-        default:
-          break;
-        }
-      ch->decr_indent ();
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << "CORBA::ULong maximum_;" << nl;
-      *ch << "CORBA::ULong length_;" << nl;
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_header - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ch << " *buffer_;" << nl;
-      *ch << "CORBA::Boolean release_;\n";
-      ch->decr_indent ();
-      *ch << "};\n";
-      ch->indent ();
-      *ch << "typedef " << this->local_name () << "* "
-          << this->local_name () << "_ptr;\n";
-      // Generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-              << idl_global->export_macro ()
-              << " CORBA::TypeCode_ptr "
-              << this->tc_name ()->last_component () << ";\n\n";
-        }
-
-      ch->gen_endif (); // endif macro
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the var and out types
-      if (this->gen_var_defn () == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_sequence::"
-                           "gen_client_header - "
-                           "codegen for _var failed\n"),
-                          -1);
-      }
-
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      if (this->gen_out_defn () == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_sequence::"
-                           "gen_client_header - "
-                           "codegen for _out failed\n"),
-                          -1);
-      }
-      ch->gen_endif ();
-
-      cg->pop ();
-#endif /* visitor code */
-
-      this->cli_hdr_gen_ = I_TRUE;
-    } // if (cli_hdr_gen_)
-  return 0;
-}
-
-int
-be_sequence::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-#if 0 /* visitor code */
-  be_type *bt; // base type
-  be_state *s; //state object
-#endif /* visitor code */
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      cs = cg->client_stubs (); // retrieve the client stubs stream
-      // generate the ifdefined macro for the sequence type
-      cs->gen_ifdef_macro (this->flatname ());
-
-#if 0 /* visitor code */
-      // retrieve base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "bad type\n"),
-                            -1);
-        }
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
-      s = cg->make_state ();
-
-      // generate stubs for our base type if it itself is a sequence  or we
-      // need to generate code for our managed types
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      cg->pop ();
-
-      // generate the methods of the sequence C++ mapping
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CS);
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "bad state\n"),
-                            -1);
-        }
-
-
-      *cs << "// *************************************************************"
-          << nl;
-      *cs << "// class " << this->name () << nl;
-      *cs << "// *************************************************************\n\n";
-
-      // copy constructor
-      cs->indent ();
-      *cs << "// copy constructor" << nl;
-      *cs << this->name () << "::" << this->local_name () <<
-        " (const " << this->name () << " &seq)" << nl;
-      *cs << "  : maximum_ (seq.maximum_)," << nl;
-      *cs << "    length_ (seq.length_)," << nl;
-      *cs << "    buffer_ (" << this->name () << "::allocbuf (seq.maximum_)),"
-          << nl;
-      *cs << "    release_ (1) // we always own it" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // copy each element
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-          {
-            *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-            *cs << "{" << nl;
-            *cs << "  this->buffer_[i] = " << bt->name () << "::_duplicate ("
-                << "seq.buffer_[i]);" << nl;
-            *cs << "}\n";
-          }
-          break;
-        case be_sequence::MNG_STRING:
-          {
-            *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-            *cs << "{" << nl;
-            *cs << "  this->buffer_[i] = CORBA::string_dup (" <<
-              "seq.buffer_[i]);" << nl;
-            *cs << "}\n";
-          }
-          break;
-        default: // all other types are self managed, just assign them.
-          *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-          *cs << "  this->buffer_[i] = seq.buffer_[i];\n";
-        }
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // constructor only for unbounded seq. This takes in "max length"
-      if (this->unbounded_)
-        {
-          cs->indent ();
-          *cs << "// constructor for unbounded seq" << nl;
-          *cs << this->name () << "::" << this->local_name () <<
-            "(CORBA::ULong max )" << nl;
-          *cs << "  : maximum_ (max)," << nl;
-          *cs << "    length_ (0)," << nl;
-          *cs << "    buffer_ (" << this->name () << "::allocbuf (max))," << nl;
-          *cs << "    release_ (1) // owns" << nl;
-          *cs << "{\n";
-          *cs << "}\n\n";
-        }
-
-      // constructor that takes in the data buffer
-      cs->indent ();
-      *cs << "// constructor from data buffer" << nl;
-      *cs << this->name () << "::" << this->local_name ();
-      // depending on whether we are bounded or not, the constructor has
-      // different sets of parameters
-      if (this->unbounded_)
-        {
-          *cs << " (CORBA::ULong max, CORBA::ULong length, " << nl;
-        }
-      else
-        {
-          // bounded seq does not take the "max" argument
-          *cs << " (CORBA::ULong length, " << nl;
-        }
-      *cs << "  ";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *cs << " *value, CORBA::Boolean release)" << nl;
-      // for unbounded we have the additional max parameter
-      if (this->unbounded_)
-        {
-          *cs << "  : maximum_ (max)," << nl;
-        }
-      else
-        {
-          *cs << "  : maximum_ (" << this->max_size () << ")," << nl;
-        }
-      *cs << "    length_ (length)," << nl;
-      *cs << "    buffer_ (value)," << nl;
-      *cs << "    release_ (release) // ownership depends on release" << nl;
-      *cs << "{\n";
-      *cs << "}\n\n";
-
-      // destructor
-      cs->indent ();
-      *cs << "// destructor" << nl;
-      *cs << this->name () << "::~" << this->local_name () << " (void)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << "if (this->release_) // we own the buffer" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-
-      // only for obj references and strings, we need to free each individual
-      // element
-      // call the appropriate freebuf on the buffer
-      if (this->managed_type () != be_sequence::MNG_NONE)
-        {
-          *cs << this->name () << "::freebuf (this->buffer_, " <<
-            "this->maximum_);\n";
-        }
-      else
-        *cs << this->name () << "::freebuf (this->buffer_);\n";
-
-      cs->decr_indent ();
-      *cs << "}\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // assignment operator
-      cs->indent ();
-      *cs << "// assignment operator" << nl;
-      *cs << this->name () << "& " << nl;
-      *cs << this->name () << "::operator=" <<
-        " (const " << this->name () << " &seq)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // check for equality
-      *cs << "if (this == &seq) return *this;" << nl;
-      // otherwise, if release flag, free the buffer
-      *cs << "if (this->release_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // only for obj references and strings, we need to free each individual
-      // element
-      // call the appropriate freebuf on the buffer
-      if (this->managed_type () != be_sequence::MNG_NONE)
-        {
-          *cs << this->name () << "::freebuf (this->buffer_, " <<
-            "this->maximum_);\n";
-        }
-      else
-        *cs << this->name () << "::freebuf (this->buffer_);\n";
-
-      cs->decr_indent ();
-      *cs << "}" << nl;
-
-      *cs << "this->length_ = seq.length_;" << nl;
-      *cs << "this->maximum_ = seq.maximum_;" << nl;
-      *cs << "this->buffer_ = " << this->name () << "::allocbuf (seq.maximum_),"
-          << nl;
-      *cs << "this->release_ = 1; // we always own it" << nl;
-      // copy each element
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-          {
-            *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-            *cs << "{" << nl;
-            *cs << "  this->buffer_[i] = " << bt->name () << "::_duplicate ("
-                << "seq.buffer_[i]);" << nl;
-            *cs << "}" << nl;
-          }
-          break;
-        case be_sequence::MNG_STRING:
-          {
-            *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-            *cs << "{" << nl;
-            *cs << "  this->buffer_[i] = CORBA::string_dup (" <<
-              "seq.buffer_[i]);" << nl;
-            *cs << "}" << nl;
-          }
-          break;
-        default: // all other types are self managed, just assign them.
-          *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-          *cs << "  this->buffer_[i] = seq.buffer_[i];" << nl;
-        }
-      *cs << "return *this;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // the length method
-      cs->indent ();
-      *cs << "void" << nl;
-      *cs << this->name () << "::length (CORBA::ULong length)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      if (!this->unbounded_) // bounded sequence - we cannot increase length
-                             // more than its max => no reallocation necessary
-        {
-          // The sequence has a maximum length, check that the new
-          // length is valid before changing anything.
-          *cs << "if (length > this->maximum_)" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          *cs << "// @@ throw something?" << nl;
-          *cs << "return;\n";
-          cs->decr_indent ();
-          *cs << "}" << nl;
-          *cs << "this->length_ = length;\n";
-        }
-      else // unbounded buffer - may need reallocation
-        {
-          // Reallocate the buffer.
-          *cs << "if (length > this->maximum_) // need realloc" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          if (s->gen_code (bt, this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_sequence::"
-                                 "gen_client_stubs - "
-                                 "bad state\n"),
-                                -1);
-            }
-
-          *cs << " *tmp = " << this->name ()
-              << "::allocbuf (length);" << nl;
-          *cs << "if (!tmp)" << nl;
-          *cs << "  return;" << nl;
-
-          // copy each element. Allocate a new manager and initialize it.
-          switch (this->managed_type ())
-            {
-            case be_sequence::MNG_OBJREF:
-              {
-                *cs << "CORBA::ULong i;" << nl;
-                *cs << "// copy old buffer" << nl;
-                *cs << "for (i=0; i < this->length_; i++)" << nl;
-                *cs << "{" << nl;
-                *cs << "  tmp[i] = " << bt->name () << "::_duplicate ("
-                    << "this->buffer_[i]);" << nl;
-                *cs << "}" << nl;
-              }
-              break;
-            case be_sequence::MNG_STRING:
-              {
-                *cs << "CORBA::ULong i;" << nl;
-                *cs << "// copy old buffer" << nl;
-                *cs << "for (i=0; i < this->length_; i++)" << nl;
-                *cs << "{" << nl;
-                *cs << "  tmp[i] = CORBA::string_dup (" <<
-                  "this->buffer_[i]);" << nl;
-                *cs << "}" << nl;
-              }
-              break;
-            default: // all other types are self managed, just assign them.
-              {
-                *cs << "CORBA::ULong i;" << nl;
-                *cs << "// copy old buffer" << nl;
-                *cs << "for (i=0; i < this->length_; i++)" << nl;
-                *cs << "{" << nl;
-                *cs << "  tmp[i] = this->buffer_[i];" << nl;
-                *cs << "}" << nl;
-              }
-            }
-          // if release is set, we must free the previous buffer
-          *cs << "if (this->release_) // free old one if we own it" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          // only for obj references and strings, we need to free each individual
-          // element. Others are self managed.
-          // call the appropriate freebuf on the buffer
-          if (this->managed_type () != be_sequence::MNG_NONE)
-            {
-              *cs << this->name () << "::freebuf (this->buffer_, " <<
-                "this->maximum_);\n";
-            }
-          else
-            *cs << this->name () << "::freebuf (this->buffer_);\n";
-
-          cs->decr_indent ();
-          *cs << "}" << nl;
-
-          *cs << "//assign the newly reallocated buffer" << nl;
-          *cs << "this->buffer_ = tmp;" << nl;
-          *cs << "this->release_ = 1; //after reallocation, we own it" << nl;
-          *cs << "this->maximum_ = length;\n";
-          cs->decr_indent ();
-          *cs << "}" << nl;;
-          *cs << "this->length_ = length;\n";
-        }
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // the allocbuf method
-      cs->indent ();
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *cs << " *" << nl;
-      *cs << this->name () << "::allocbuf (CORBA::ULong nelems)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *cs << " *buf = new ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *cs << "[nelems]; // allocate from heap" << nl;
-      // the managed types must be initilaized
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-          {
-            *cs << "for (CORBA::ULong i=0; i < nelems; i++)" << nl;
-            *cs << "  buf[i] = " << bt->name () << "::_nil ();" << nl;
-          }
-          break;
-        case be_sequence::MNG_STRING:
-          {
-            *cs << "for (CORBA::ULong i=0; i < nelems; i++)" << nl;
-            *cs << "  buf[i] = (char *)0;" << nl;
-          }
-          break;
-        }
-      *cs << "return buf;\n";
-
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // extra freebuf method for managed types
-      if (this->managed_type () != MNG_NONE)
-        {
-          cs->indent ();
-          *cs << "void" << nl;
-          *cs << this->name () << "::freebuf (";
-          if (s->gen_code (bt, this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_sequence::"
-                                 "gen_client_inline - "
-                                 "state based codegen failed\n"),
-                                -1);
-            }
-
-          *cs << " *seq, CORBA::ULong nelems)" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          *cs << "if (!seq) return; // null sequence" << nl;
-          // the managed types must be individually freed. The others will have
-          // their destructors called.
-          switch (this->managed_type ())
-            {
-            case be_sequence::MNG_OBJREF:
-              {
-                *cs << "for (CORBA::ULong i=0; i < nelems; i++)" << nl;
-                *cs << "  CORBA::release (seq[i]);" << nl;
-              }
-              break;
-            case be_sequence::MNG_STRING:
-              {
-                *cs << "for (CORBA::ULong i=0; i < nelems; i++)" << nl;
-                *cs << "  CORBA::string_free (seq[i]);" << nl;
-              }
-              break;
-            }
-          *cs << this->name () << "::freebuf (seq);\n";
-          cs->decr_indent ();
-          *cs << "}\n\n";
-        }
-#endif /* visitor code */
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_stubs - "
-                             "codegen for encapsulation failed\n"),
-                            -1);
-        }
-
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_sequence, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-
-#if 0
-      cg->pop ();
-#endif
-      this->cli_stub_gen_ = I_TRUE;
-
-      cs->gen_endif ();
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_sequence::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-#if 0 /* visitor code */
-  TAO_NL  nl;        // end line
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-#endif /* visitor code */
-
-  if (!this->cli_inline_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ci = cg->client_inline ();
-#if 0
-      // retrieve base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "bad type\n"),
-                            -1);
-        }
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
-      s = cg->make_state ();
-
-      // generate inline methods for our base type if it itself is a sequence
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      cg->pop ();
-
-      // generate the methods of the sequence C++ mapping
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "bad state\n"),
-                            -1);
-        }
-
-      // generate the ifdefined macro for type
-      ci->gen_ifdef_macro (this->flatname ());
-
-      *ci << "// *************************************************************"
-          << nl;
-      *ci << "// class " << this->name () << nl;
-      *ci << "// *************************************************************\n\n";
-
-      // freebuf method
-      ci->indent ();
-      *ci << "ACE_INLINE void" << nl;
-      *ci << this->name () << "::freebuf (";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ci << " *seq)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete []seq;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // default constructor
-      ci->indent ();
-      *ci << "//default constructor" << nl;
-      *ci << "ACE_INLINE " << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      // for bounded and unbounded, initialize the data members differently
-      if (this->unbounded_)
-        {
-          *ci << "  : maximum_ (0)," << nl;
-          *ci << "    length_ (0)," << nl;
-          *ci << "    buffer_ (0)," << nl;
-          *ci << "    release_ (0) // does not own" << nl;
-        }
-      else
-        {
-          *ci << "  : maximum_ (" << this->max_size () << ")," << nl;
-          *ci << "    length_ (0)," << nl;
-          *ci << "    buffer_ (" << this->name () << "::allocbuf (" <<
-            this->max_size () << "))," << nl;
-          *ci << "    release_ (1) // owns" << nl;
-        }
-      *ci << "{}\n\n";
-
-      // the maximum method
-      ci->indent ();
-      *ci << "ACE_INLINE CORBA::ULong" << nl;
-      *ci << this->name () << "::maximum (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->maximum_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // the length method
-      ci->indent ();
-      *ci << "ACE_INLINE CORBA::ULong" << nl;
-      *ci << this->name () << "::length  (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->length_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      cg->pop ();
-
-      // subscript operators (1) read-only, (2) read/write
-      cg->push (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI);
-      s = cg->make_state ();
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "bad state\n"),
-                            -1);
-        }
-
-      ci->indent ();
-      *ci << "ACE_INLINE ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ci << nl;
-      *ci << this->name () << "::operator[] (CORBA::ULong index) // read/write"
-         << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-          *ci << "return " << this->name () << "::TAO_ObjRefMngType (" <<
-            "&this->buffer_[index], this->release_);\n";
-          break;
-        case be_sequence::MNG_STRING:
-          *ci << "return " << this->name () << "::TAO_StrMngType (" <<
-            "&this->buffer_[index], this->release_);\n";
-          break;
-        default:
-          *ci << "return this->buffer_[index];\n";
-        }
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE const ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-
-      *ci << nl;
-      *ci << this->name () << "::operator[] (CORBA::ULong index) const // read"
-         << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      switch (this->managed_type ())
-        {
-        case be_sequence::MNG_OBJREF:
-          *ci << "return " << this->name () << "::TAO_ObjRefMngType (" <<
-            "&this->buffer_[index], this->release_);\n";
-          break;
-        case be_sequence::MNG_STRING:
-          *ci << "return " << this->name () << "::TAO_StrMngType (" <<
-            "&this->buffer_[index], this->release_);\n";
-          break;
-        default:
-          *ci << "return this->buffer_[index];\n";
-        }
-      ci->decr_indent ();
-      *ci << "}\n\n";
-      cg->pop ();
-      ci->gen_endif (); // endif macro
-#endif
-      // generate the ifdefined macro for the var type
-      ci->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the implementations for the _var and _impl classes
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "var implementation failed\n"),
-                            -1);
-        }
-      ci->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      ci->gen_ifdef_macro (this->flatname (), "_out");
-
-      if (this->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_client_inline - "
-                             "out impl failed\n"),
-                            -1);
-        }
-      ci->gen_endif (); // endif macro
-
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_sequence::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_sequence::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_sequence::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_sequence::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-  be_decl *scope; // our enclosing scope
-
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  *ch << "// *************************************************************"
-      << nl;
-  *ch << "// class " << this->name () << "_var" << nl;
-  *ch << "// *************************************************************\n\n";
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "state based codegen failed\n"),
-                        -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  if (this->defined_in ())
-    scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-  else
-    scope = 0;
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << this->local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << this->local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << this->local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << this->local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-
-  // cast operator
-  *ch << "operator const " << this->local_name () << " &() const;" << nl;
-  *ch << "operator " << this->local_name () << " &();" << nl;
-  *ch << "operator " << this->local_name () << " &() const;" << nl;
-
-  // overloaded [] operator. The const version is not required for sequences
-
-#if 0
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_STRING:
-      if (scope)
-        {
-          *ch << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-            this->local_name () << "::TAO_StrMngType) ";
-        }
-      else
-        {
-          *ch << this->local_name () << "::TAO_StrMngType ";
-        }
-      break;
-    case be_sequence::MNG_OBJREF:
-      if (scope)
-        {
-          *ch << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-            this->local_name () << "::TAO_ObjRefMngType) ";
-        }
-      else
-        {
-          *ch << this->local_name () << "::TAO_ObjRefMngType ";
-        }
-      break;
-    default:
-      // gen code for base return type
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_var_defn - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << " &";
-    }
-
-  be_visitor_sequence_elemtype elemtype (ch, this, bt);
-  if (bt->accept (&elemtype) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-#endif
-
-  *ch << "operator[] (CORBA::ULong index);" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << "const " << this->local_name () << " &in (void) const;" << nl;
-  *ch << this->local_name () << " &inout (void);" << nl;
-  *ch << this->local_name () << " *&out (void);" << nl;
-  *ch << this->local_name () << " *_retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << this->local_name () << " *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << " *ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  cg->pop ();
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_sequence::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_impl - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the var implementation in the inline file
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "  this->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "  this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p) // deep copy" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator []
-  ci->indent ();
-  *ci << "ACE_INLINE ";
-
-#if 0
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_STRING:
-      *ci << this->name () << "::TAO_StrMngType ";
-      break;
-    case be_sequence::MNG_OBJREF:
-      *ci << this->name () << "::TAO_ObjRefMngType ";
-      break;
-    default:
-      // gen code for base return type
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_var_impl - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ci << " &";
-    }
-
-  be_visitor_sequence_elemtype elemtype (ci, 0, bt);
-  if (bt->accept (&elemtype) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-#endif
-
-
-  *ci << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_->operator[] (index);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "// mapping for variable size " << nl;
-  *ci << "ACE_INLINE " << name () << " *&" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " *" << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << " *tmp = this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return tmp;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  cg->pop ();
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_sequence::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-  be_decl *scope; // our enclosing scope
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_out_defn - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  if (this->defined_in ())
-    scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
-  else
-    scope = 0;
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << this->local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << this->local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << this->local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << this->local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << this->local_name () << " *operator-> (void);" << nl;
-
-  // overloaded [] operator only for sequence. The const version is not
-  // required
-
-#if 0
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_STRING:
-      if (scope)
-        {
-          *ch << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-            this->local_name () << "::TAO_StrMngType) ";
-        }
-      else
-        {
-          *ch << this->local_name () << "::TAO_StrMngType ";
-        }
-      break;
-    case be_sequence::MNG_OBJREF:
-      if (scope)
-        {
-          *ch << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-            this->local_name () << "::TAO_ObjRefMngType) ";
-        }
-      else
-        {
-          *ch << this->local_name () << "::TAO_ObjRefMngType ";
-        }
-      break;
-    default:
-      // gen code for base return type
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_out_defn - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ch << " &";
-    }
-
-  be_visitor_sequence_elemtype elemtype(ch, this, bt);
-  if (bt->accept (&elemtype) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-#endif
-
-  *ch << "operator[] (CORBA::ULong index);" << nl;
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-
-  *ch << this->local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << this->local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-int
-be_sequence::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_out_impl - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the out implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // sequence has an additional method
-  ci->indent ();
-  *ci << "ACE_INLINE ";
-#if 0
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_STRING:
-      *ci << this->name () << "::TAO_StrMngType ";
-      break;
-    case be_sequence::MNG_OBJREF:
-      *ci << this->name () << "::TAO_ObjRefMngType ";
-      break;
-    default:
-      // gen code for base return type
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_out_impl - "
-                             "state based codegen failed\n"),
-                            -1);
-        }
-      *ci << " &";
-    }
-
-  be_visitor_sequence_elemtype elemtype (ci, 0, bt);
-  if (bt->accept (&elemtype) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-#endif
-
-
-  *ci << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_->operator[] (index);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-// generate the managed type
-int
-be_sequence::gen_managed_type_ch (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-  char typebuf [NAMEBUFSIZE];  // generated type
-  be_type *bt;  // base type
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_gen_managed_type_ch - "
-                         "state based codegen failed\n"),
-                        -1);
-    }
-
-  // set the name of the generated class
-  // the name depends on whether we are interface  type or a string type
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (typebuf, '\0', NAMEBUFSIZE);
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      {
-        ACE_OS::sprintf (namebuf, "%s", "TAO_ObjRefMngType");
-        ACE_OS::sprintf (typebuf, "%s", bt->nested_type_name (this, "_ptr"));
-      }
-      break;
-    case be_sequence::MNG_STRING:
-      {
-        ACE_OS::sprintf (namebuf, "%s", "TAO_StrMngType");
-        ACE_OS::sprintf (typebuf, "%s", "char *");
-      }
-      break;
-    default:
-      // cannot be here
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_sequence::"
-                           "gen_gen_managed_type_ch - "
-                           "bad managed type\n"),
-                          -1);
-      }
-    }
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // generate the friend instruction
-  *ch << "friend " << this->local_name () << ";" << nl;
-  // default constr is protected as this managed type is not available
-  // outside. Only this sequence can play with it.
-  //*ch << namebuf << " (void); // default constructor" << nl;
-  // copy constructor
-  *ch << namebuf << "(const " << namebuf << " &); // copy ctor " << nl;
-  // the constructor that will be used
-  if (this->managed_type () == be_sequence::MNG_STRING)
-    {
-      *ch << namebuf << "(char **buffer, CORBA::Boolean release);" << nl;
-    }
-  else
-    {
-      *ch << namebuf << "(" << bt->nested_type_name (this, "_ptr*") <<
-        ", CORBA::Boolean release);" << nl;
-    }
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from another managed type
-  *ch << namebuf << " &operator= (const " << namebuf << "&);" << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << typebuf << ");" << nl;
-
-  // others
-  if (this->managed_type () == be_sequence::MNG_STRING)
-    {
-      // assignment operator from a pointer to const
-      *ch << namebuf << " &operator= (const " << typebuf << ");" << nl;
-      // cast op
-      *ch << "operator const char*() const;" << nl;
-      *ch << "operator char *();" << nl;
-      // overloaded [] operator - only for strings
-      *ch << "char &operator[] (CORBA::ULong index);" << nl;
-      *ch << "const char &operator[] (CORBA::ULong index) const;" << nl;
-      *ch << "// in, inout, out, _retn " << nl;
-      // the return types of in, out, inout, and _retn are based on the parameter
-      // passing rules and the base type
-      *ch << "const char *in (void) const;" << nl;
-      *ch << "char *&inout (void);" << nl;
-      *ch << "char *&out (void);" << nl;
-      *ch << "char *_retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "operator const " << bt->nested_type_name (this, "_ptr") <<
-        " &() const;" << nl;
-      *ch << "operator " << bt->nested_type_name (this, "_ptr") <<
-        " &();" << nl;
-      *ch << "// in, inout, out, _retn " << nl;
-      // the return types of in, out, inout, and _retn are based on the parameter
-      // passing rules and the base type
-      *ch << "const " << bt->nested_type_name (this, "_ptr") <<
-        " in (void) const;" << nl;
-      *ch << bt->nested_type_name (this, "_ptr") << " &inout (void);" << nl;
-      *ch << bt->nested_type_name (this, "_ptr") << " &out (void);" << nl;
-      *ch << bt->nested_type_name (this, "_ptr") << " _retn (void);" << nl;
-    }
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  //  *ch << namebuf << "(const " << namebuf << " &); // copy ctor " << nl;
-  *ch << typebuf << " *ptr_;" << nl;
-  *ch << "CORBA::Boolean release_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the managed type class. All of these get generated in the
-// inline file
-int
-be_sequence::gen_managed_type_ci (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;  // base type
-  char fnamebuf [NAMEBUFSIZE];  // full name
-  char lnamebuf [NAMEBUFSIZE];  // local name
-  char typebuf [NAMEBUFSIZE];  // type name
-  char macro [NAMEBUFSIZE]; // for ifdef macro
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // get the inline stream
-  ci = cg->client_inline ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence.cpp::"
-                         "gen_managed_types_ci - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // set the names (this is for easier code generation)
-  ACE_OS::memset (fnamebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (lnamebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (typebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      {
-        ACE_OS::sprintf (fnamebuf, "%s::%s", this->fullname (), "TAO_ObjRefMngType");
-        ACE_OS::sprintf (lnamebuf, "%s", "TAO_ObjRefMngType");
-        ACE_OS::sprintf (typebuf, "%s_ptr", bt->fullname ());
-        ACE_OS::sprintf (macro, "%s_%s", this->flatname (), "TAO_ObjRefMngType");
-      }
-      break;
-    case be_sequence::MNG_STRING:
-      {
-        ACE_OS::sprintf (fnamebuf, "%s::%s", this->fullname (), "TAO_StrMngType");
-        ACE_OS::sprintf (lnamebuf, "%s", "TAO_StrMngType");
-        ACE_OS::sprintf (typebuf, "%s", "char *");
-        ACE_OS::sprintf (macro, "%s_%s", this->flatname (), "TAO_StrMngType");
-      }
-      break;
-    default:
-      // cannot be here
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_sequence::"
-                           "gen_managed_types_ci - "
-                           "Bad managed type\n"),
-                          -1);
-      }
-    }
-
-  // generate the ifdefined macro for the managed
-  ci->gen_ifdef_macro (macro);
-
-  // generate the managed type implementation in the inline file
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fnamebuf << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fnamebuf << "::~" << lnamebuf << " (void) // destructor" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor not allowed
-
-  // operators
-  if (this->managed_type () == be_sequence::MNG_STRING)
-    {
-      // constructor that will be used
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::" << lnamebuf <<
-        "(char **buffer, CORBA::Boolean release)" << nl;
-      *ci << "  : ptr_ (buffer)," << nl;
-      *ci << "    release_ (release)" << nl;
-      *ci << "{}\n\n";
-
-      // other extra methods - cast operator ()
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::operator const " << typebuf <<
-        " () const // cast" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::operator " << typebuf << " () // cast " << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // operator []
-      ci->indent ();
-      *ci << "ACE_INLINE char&" << nl;
-      *ci << fnamebuf << "::operator[] (CORBA::ULong index)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_[index];\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // operator []
-      ci->indent ();
-      *ci << "ACE_INLINE const char&" << nl;
-      *ci << fnamebuf << "::operator[] (CORBA::ULong index) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_[index];\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else if (this->managed_type () == be_sequence::MNG_OBJREF)
-    {
-      // constructor that will be used
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::" << lnamebuf << "(" << bt->name () <<
-        "_ptr* buffer, CORBA::Boolean release)" << nl;
-      *ci << "  : ptr_ (buffer)," << nl;
-      *ci << "    release_ (release)" << nl;
-      *ci << "{}\n\n";
-
-      // other extra methods - cast operator ()
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::operator const " << typebuf <<
-        " &() const // cast" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << nl;
-      *ci << fnamebuf << "::operator " << typebuf << " &() // cast " << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_managed_types_ci - "
-                         "Bad managed type\n"),
-                        -1);
-    }
-
-  // in, inout
-  ci->indent ();
-  *ci << "ACE_INLINE const " << typebuf << nl;
-  *ci << fnamebuf << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << typebuf << "&" << nl;
-  *ci << fnamebuf << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->gen_endif ();
-  return 0;
-}
-
-// implementation of the managed types
-int
-be_sequence::gen_managed_type_cs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;  // base type
-  char fnamebuf [NAMEBUFSIZE];  // full name
-  char lnamebuf [NAMEBUFSIZE];  // local name
-  char typebuf [NAMEBUFSIZE];  // type name
-  char macro [NAMEBUFSIZE]; // for ifdef macro
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // get the stubs stream
-  cs = cg->client_stubs ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence.cpp::"
-                         "gen_managed_types_cs - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // set the names (this is for easier code generation)
-  ACE_OS::memset (fnamebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (lnamebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (typebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      {
-        ACE_OS::sprintf (fnamebuf, "%s::%s", this->fullname (), "TAO_ObjRefMngType");
-        ACE_OS::sprintf (lnamebuf, "%s", "TAO_ObjRefMngType");
-        ACE_OS::sprintf (typebuf, "%s_ptr", bt->fullname ());
-        ACE_OS::sprintf (macro, "%s_%s", this->flatname (), "TAO_ObjRefMngType");
-      }
-      break;
-    case be_sequence::MNG_STRING:
-      {
-        ACE_OS::sprintf (fnamebuf, "%s::%s", this->fullname (), "TAO_StrMngType");
-        ACE_OS::sprintf (lnamebuf, "%s", "TAO_StrMngType");
-        ACE_OS::sprintf (typebuf, "%s", "char *");
-        ACE_OS::sprintf (macro, "%s_%s", this->flatname (), "TAO_StrMngType");
-      }
-      break;
-    default:
-      // cannot be here
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_sequence.cpp::"
-                           "gen_managed_types_cs - "
-                           "Bad managed type\n"),
-                          -1);
-      }
-    }
-
-  // generate the ifdefined macro for the sequence type
-  cs->gen_ifdef_macro (macro);
-
-  switch (this->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      {
-        // copy ctro
-        cs->indent ();
-        *cs << fnamebuf << "::" << lnamebuf << "(const " << fnamebuf <<
-          " &_tao_mng_type)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "*this->ptr_ = " << bt->name () <<
-          "::_duplicate (*_tao_mng_type.ptr_);" << nl;
-        *cs << "this->release_ = _tao_mng_type.release_;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // assignment operator
-        cs->indent ();
-        *cs << fnamebuf << "&" << nl;
-        *cs << fnamebuf << "::operator= (const " << fnamebuf <<
-          " &_tao_mng_type)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this == &_tao_mng_type) return *this;" << nl;
-        *cs << "if (this->release_) // need to free old one" << nl;
-        *cs << "  CORBA::release (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = " << bt->name () <<
-          "::_duplicate (*_tao_mng_type.ptr_);" << nl;
-        *cs << "return *this;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // assignment operator from a pointer
-        cs->indent ();
-        *cs << fnamebuf << " &" << nl;
-        *cs << fnamebuf << "::operator= (" << typebuf << " p)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this->release_) // need to free old one" << nl;
-        *cs << "  CORBA::release (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = p; // no copy" << nl;
-        *cs << "return *this;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // out method and _retn
-        cs->indent ();
-        *cs << "// mapping for variable size " << nl;
-        *cs << bt->name () << "_ptr &" << nl;
-        *cs << fnamebuf << "::out (void)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this->release_)" << nl;
-        *cs << "  CORBA::release (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = " << bt->name () << "::_nil ();" << nl;
-        *cs << "return *this->ptr_;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        cs->indent ();
-        *cs << bt->name () << "_ptr" << nl;
-        *cs << fnamebuf << "::_retn (void)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << bt->name () << "_ptr tmp = *this->ptr_;" << nl;
-        *cs << "*this->ptr_ = " << bt->name () << "::_nil ();" << nl;
-        *cs << "return tmp;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-      }
-      break;
-    case be_sequence::MNG_STRING:
-      {
-        // copy constructor
-        cs->indent ();
-        *cs << fnamebuf << "::" << lnamebuf << "(const " << fnamebuf <<
-          " &_tao_mng_type)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "*this->ptr_ = CORBA::string_dup (*_tao_mng_type.ptr_);" << nl;
-        *cs << "this->release_ = _tao_mng_type.release_;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // assignment operator (does not change the release flag)
-        cs->indent ();
-        *cs << fnamebuf << "&" << nl;
-        *cs << fnamebuf << "::operator= (const " << fnamebuf <<
-          " &_tao_mng_type)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this == &_tao_mng_type) return *this;" << nl;
-        *cs << "if (this->release_) // need to free old one" << nl;
-        *cs << "  CORBA::string_free (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = CORBA::string_dup (*_tao_mng_type.ptr_);" << nl;
-        *cs << "return *this;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // assignment operator from a pointer
-        cs->indent ();
-        *cs << fnamebuf << " &" << nl;
-        *cs << fnamebuf << "::operator= (" << typebuf << " p)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this->release_) // need to free old one" << nl;
-        *cs << "  CORBA::string_free (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = p; // no copy" << nl;
-        *cs << "return *this;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // assignment operator from a pointer to const
-        cs->indent ();
-        *cs << fnamebuf << " &" << nl;
-        *cs << fnamebuf << "::operator= (const " << typebuf << " p)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this->release_) // need to free old one" << nl;
-        *cs << "{" << nl;
-        *cs << "  CORBA::string_free (*this->ptr_);" << nl;
-        *cs << "  *this->ptr_ = CORBA::string_dup (p);// make copy" << nl;
-        *cs << "}" << nl;
-        *cs << "else // make no copy as we don't own it" << nl;
-        *cs << "  *this->ptr_ = (char *)p; // no copy" << nl;
-        *cs << "return *this;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        // out method and _retn
-        cs->indent ();
-        *cs << "// mapping for variable size " << nl;
-        *cs << "char *&" << nl;
-        *cs << fnamebuf << "::out (void)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "if (this->release_)" << nl;
-        *cs << "  CORBA::string_free (*this->ptr_);" << nl;
-        *cs << "*this->ptr_ = 0;" << nl;
-        *cs << "return *this->ptr_;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-
-        cs->indent ();
-        *cs << "char *" << nl;
-        *cs << fnamebuf << "::_retn (void)" << nl;
-        *cs << "{\n";
-        cs->incr_indent ();
-        *cs << "char *tmp = *this->ptr_;" << nl;
-        *cs << "*this->ptr_ = 0;" << nl;
-        *cs << "return tmp;\n";
-        cs->decr_indent ();
-        *cs << "}\n\n";
-      }
-      break;
-    }
-
-  cs->gen_endif ();
-  return 0;
-}
-
-// generate typecode.
-// Typecode for sequences comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_sequence::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_sequence, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_sequence::gen_encapsulation (void)
-{
-  TAO_OutStream *os; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt; // base type
-
-  os = cg->client_stubs ();
-  os->incr_indent ();
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
-
-  // emit typecode of element type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_sequence::gen_typecode - bad base type\n"));
-      return -1;
-    }
-
-  //  emit the length
-  os->decr_indent ();
-  *os << this->max_size () << ",\n";
-  return 0;
-}
-
-// compute typecode size
-long
-be_sequence::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_sequence::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-
-      this->encap_len_ = 4;  // holds the byte order flag
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_sequence::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-      this->encap_len_ += 4; // to hold the max size
-
-    }
-  return this->encap_len_;
-}
-
-/*
- * Add this be_sequence to the locally defined types in this scope
- */
-be_sequence *
-be_sequence::fe_add_sequence (be_sequence *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  this->add_to_local_types(t);
-  return t;
-}
-
-// overridden method
-be_decl *
-be_sequence::decl (void)
-{
-  return this;
-}
-
-int be_sequence::write_as_return (TAO_OutStream *stream,
-                                  be_type *type)
-{
-  *stream << type->name () << " *";
-  return 0;
-}
-
-int
-be_sequence::accept (be_visitor *visitor)
-{
-  return visitor->visit_sequence (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_sequence, AST_Sequence, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_sequence)
diff --git a/TAO/TAO_IDL/be/be_state.cpp b/TAO/TAO_IDL/be/be_state.cpp
deleted file mode 100644
index 59312eaeaa5..00000000000
--- a/TAO/TAO_IDL/be/be_state.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state.cpp
-//
-// = DESCRIPTION
-//    state based code generation.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// constructor
-be_state::be_state (void)
-{
-}
-
-// destructor
-be_state::~be_state (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<be_state_struct, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_public_cs, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<be_state_struct, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_public_cs, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/TAO_IDL/be/be_state_argument.cpp b/TAO/TAO_IDL/be/be_state_argument.cpp
deleted file mode 100644
index a5198b16d3e..00000000000
--- a/TAO/TAO_IDL/be/be_state_argument.cpp
+++ /dev/null
@@ -1,2307 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_argument.cpp
-//
-// = DESCRIPTION
-//    state based code generation for arguments.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for argument
-be_state_argument::be_state_argument (void)
-{
-}
-
-// generate code for the mapping of the argument.
-// The different cases below have the following meaning:
-// TAO_ARGUMENT_CH
-// TAO_ARGUMENT_CS
-// TAO_ARGUMENT_SH -- all three generate the arguments in the signature of the
-//                    method . The CH case uses the ACE_NESTED_CLASS macro to
-//                    keep the MSVC++ compiler happy
-// The rest of the enumerated constants are self-explanatory
-//
-// There are 3 levels of nested switch statements
-// Level (1): The "type" of each argument, e.g., predefined, structure, ...
-// Level (2): The direction - in, inout, out
-// Level (3): The current state we are in
-
-int
-be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_argument *arg;  // argument node
-  be_interface *bif; // interface inside which the operation that uses this
-                     // argument was defined
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ARGUMENT_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  // retrieve the argument node
-  arg = be_argument::narrow_from_decl (d);
-  if (!arg)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument.cpp - "
-                         "Bad argument\n"),
-                        -1);
-    }
-
-  // get the scope of the arg which is the operation. Its scope is the
-  // interface node. We need this interface node for generating the
-  // ACE_NESTED_CLASS macro
-  bif = be_interface::narrow_from_scope (ScopeAsDecl (arg->defined_in
-                                                      ())->defined_in ());
-  if (!bif)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument.cpp - "
-                         "Bad interface\n"),
-                        -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // find the direction of the argument. Depending on the direction and the
-  // type, generate the mapping
-  switch (type->node_type ())  // LEVEL (1) switch on node type of the "type"
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (arg->direction ())
-          {
-          case AST_Argument::dir_IN:
-            // what state are we in
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << " = " << arg->local_name () << "; // cast it" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // pass the cast value
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing for in parameters
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << arg->local_name () << ";" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << ";" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &_tao_base_" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", &_tao_base_" << arg->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // convert from the CORBA::Object_ptr to the interface type
-                  // using a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", " <<
-                    "_tao_environment);" << nl;
-                  *os << "if (_tao_environment.exception ()) return;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // we must release the in parameter
-                  *os << "CORBA::release (" << arg->local_name () << ");" << nl;
-                  *os << "CORBA::release (_tao_base_" << arg->local_name () <<
-                    ");" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_ptr " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // switch state
-            break;
-          case AST_Argument::dir_INOUT: // inout
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << " = " << arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // reassign to the inout parameter doing a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", env);"
-                      << nl;
-                  *os << "CORBA::release (_tao_base_" << arg->local_name () <<
-                    ");" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << arg->local_name () << ";" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr *_tao_base_" << arg->local_name ()
-                      << " = new CORBA::Object_ptr;" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_INOUT, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", _tao_base_" << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // convert from the CORBA::Object_ptr to the interface type
-                  // using a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (*_tao_base_" << arg->local_name () << ", " <<
-                    "_tao_environment);" << nl;
-                  *os << "if (_tao_environment.exception ()) return;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // assign modified interface obj ref to object_ptr
-                  *os << "CORBA::release (*_tao_base_" << arg->local_name () <<
-                    "); // first release old obj" << nl;
-                  *os << "*_tao_base_" << arg->local_name () << " = " <<
-                    arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_ptr") << " &" <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_ptr &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_OUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // reassign to the inout parameter doing a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", env);"
-                      << nl;
-                  *os << "// free the Object_ptr" << nl;
-                  *os << "CORBA::release (_tao_base_" << arg->local_name () <<
-                    ");" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr " << arg->local_name () << ";" <<
-                    nl;
-                  *os << bt->name () << "_out " << arg->local_name () <<
-                    "_out (" << arg->local_name () << ");" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr *_tao_base_" << arg->local_name ()
-                      << " = new CORBA::Object_ptr;" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-#endif
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    " = nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_OUT, _tao_environment);" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // out parameter is cast to Object_ptr
-                  *os << "*_tao_base_" << arg->local_name () << " = " <<
-                    arg->local_name () << "_out.ptr ();" << nl;
-                  *os << "nv_" << arg->local_name () << "->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", _tao_base_" << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << "_out, ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          } // end switch direction
-      } // end of case interface/interface_fwd
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        // check if the type is an any
-        if (bpd->pt () == AST_PredefinedType::PT_any)
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                      *os << bt->name () << " ";
-                    // declare a variable
-                      *os << arg->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", &" << arg->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing since the Any will call  its destructor
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      // keep MSVC++ happy
-                      *os << "const " << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << "const " << bt->name () << " &" << arg->local_name
-                        () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *";
-                      *os << arg->local_name () << " = new " << bt->name () <<
-                        ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                        "\", CORBA::ARG_INOUT, _tao_environment)->value ()->" <<
-                        "replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << "const " << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " &" << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = 0;" << nl;
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        "_out (" << arg->local_name () << ");" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-#endif
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name ()
-                          << " = nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_OUT, _tao_environment);" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-#if 0 // causing ambiguity on NT compiler
-                      *os << arg->local_name () << " = " << arg->local_name ()
-                          << "_out;" << nl;
-#endif
-                      *os << "nv_" << arg->local_name () << "->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              } // end switch direction
-          } // end of if
-        else if (bpd->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr " << arg->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_IN, _tao_environment)->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", &" << arg->local_name () << ", 0, " <<
-                        "_tao_environment); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // no casting necessary as we already are object_ptr
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing to be done as we are Object_ptr
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      //release the in parameter
-                      *os << "CORBA::release (" << arg->local_name () << ");"
-                          << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_ptr " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end of switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr *" << arg->local_name () <<
-                        " = new " << bt->name () << "_ptr;" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_INOUT, _tao_environment)->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_ptr") << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_ptr &" << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr *" << arg->local_name () <<
-                        " = new " << bt->name ()  << "_ptr;" << nl;
-                      *os << bt->name () << "_out ";
-                      *os << arg->local_name () << "_out (*" << arg->local_name
-                        () << ");" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 0); // ORB doesn't own" << nl;
-#endif
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name ()
-                          << " = nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_OUT, _tao_environment);" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // declare a variable
-                      *os << bt->name () << "_ptr _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &_tao_base_" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // this was causing an ambiguity on NT compiler
-                      // assign to the _out parameter
-                      *os << arg->local_name () << " = _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << "_out, ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-#if 0 // causing ambiguity on NT compiler
-                      *os << "*" << arg->local_name () << " = " <<
-                        arg->local_name () << "_out;" << nl;
-#endif
-                      *os << "nv_" << arg->local_name () << "->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              } // end switch direction
-          } // end else if
-        else // simple predefined types
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " " << arg->local_name () << ";" <<
-                        nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_IN, _tao_environment)->value ()"
-                          << "->replace (" << bt->tc_name ()
-                          << ", &" << arg->local_name () << ", 0, " <<
-                        "_tao_environment); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif) << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " " << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        "); // ORB owns " << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_INOUT, _tao_environment)->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " &" << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_OUT, _tao_environment)->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end of switch
-                break;
-              } // end switch direction
-          } // end of else
-      } // end of case predefined
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (arg->direction ())
-          {
-          case AST_Argument::dir_IN:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-#if 0
-                  // XXXASG- check for memory leak here - TODO
-                    // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-#endif
-                  *os << "char *" << arg->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_IN, _tao_environment)->value ()->replace ("
-                      << bt->tc_name () << ", &" << arg->local_name () <<
-                    ", 0, _tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // we need to free the "in" string that got decoded
-                  *os << "CORBA::string_free (" << arg->local_name () << ");"
-                      << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-#if 0
-                  *os << "const ";
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif);
-                  else
-                    *os << "char *";
-#endif
-                  *os << "const char *" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-                {
-#if 0
-                  *os << "const ";
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-#endif
-                  *os << "const char *" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_INOUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-#if 0
-                    // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    {
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-                    }
-                  else
-                    {
-                      *os << "char **" << arg->local_name () <<
-                        " = new char *;" << nl;
-                    }
-#endif
-                  *os << "char **" << arg->local_name () << " = new char *;" <<
-                    nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_INOUT, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", " << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << "*" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-#if 0
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif, " &");
-                  else
-                    *os << "char *&";
-#endif
-                  *os << "char *&" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-                {
-#if 0
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *&";
-#endif
-                  *os << "char *&" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_OUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-#if 0
-                    // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    {
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-                    }
-                  else
-                    {
-                      *os << "char **" << arg->local_name () <<
-                        " = new char *;" << nl;
-                    }
-                  // now declare a _out variable to be passed as a parameter
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name () << "_out";
-                  else
-                    *os << "CORBA::String_out";
-#endif
-                  *os << "char **" << arg->local_name () <<
-                    " = new char *;" << nl;
-                  *os << "CORBA::String_out " << arg->local_name () <<
-                    "_out (*" << arg->local_name () << ");" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_OUT, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", " << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-#if 0
-                  // declare a string variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-#endif
-                  *os << "char *_tao_base_" << arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // assign the _tao_base_<string> variable to the out
-                  // parameter
-                  *os << arg->local_name () << " = _tao_base_" <<
-                    arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << "_out, ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-#if 0 // causing ambiguity on NT compiler
-                  // out parameter is cast back to the real parameter
-                  *os << "*" << arg->local_name () << " = " <<
-                    arg->local_name () << "_out;" << nl;
-#endif
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-#if 0
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif, "_out");
-                  else
-                    *os << "CORBA::String_out";
-#endif
-                  *os << "CORBA::String_out " << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-#if 0
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name () << "_out";
-                  else
-                    *os << "CORBA::String_out";
-#endif
-                  *os << "CORBA::String_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          } // end switch direction
-      } // end case string
-      break;
-    case AST_Decl::NT_array: // type is an array
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " " << arg->local_name ()
-                      << ";" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_INOUT, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", &" << arg->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << "const " << bt->nested_type_name (bif) << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << "const " << bt->name () << " " << arg->local_name ()
-                      << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name ();
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << "_slice *";
-                    }
-                  *os << " " << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << bt->nested_type_name (bif, "_slice") << " *" <<
-                        arg->local_name () << ", ";
-                    }
-                  else
-                    {
-                      *os << bt->nested_type_name (bif) << " " <<
-                        arg->local_name () << ", ";
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name ();
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << "_slice *";
-                    }
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << "_slice *" << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          }
-          break;
-        } // end of switch direction
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " " << arg->local_name () <<
-                    ";" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", &" << arg->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing - the destructor will ensure proper memory release
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << "const " << bt->name () << " &" << arg->local_name ()
-                      << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          }
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " *" << arg->local_name () <<
-                    " = new " << bt->name () << ";" << nl;
-#if 0
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                    "\", CORBA::ARG_INOUT, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", " << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-#if 0
-                  // if we are sequence, call init manager
-                  if (type->node_type () == AST_Decl::NT_sequence)
-                    {
-                      be_sequence *seq = be_sequence::narrow_from_decl (type);
-                      // init_mgr method for managed types
-                      switch (seq->managed_type ())
-                        {
-                        case be_sequence::MNG_OBJREF:
-                        case be_sequence::MNG_STRING:
-                          *os << arg->local_name () << ".init_mgr ();" << nl;
-                          break;
-                        default:
-                          break;
-                        }
-                    }
-#endif
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << "*" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " &" << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // for a variable sized type, the caller allocates a pointer
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = 0;" << nl;
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        "_out (" << arg->local_name () << ");" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 0); // ORB does not own" << nl;
-#endif
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name ()
-                          << " = nvlist->add_item (\"" << arg->local_name
-                        () << "\", CORBA::ARG_OUT, _tao_environment);" << nl;
-                    }
-                  else
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 0); // ORB does not own" << nl;
-#endif
-                      // insert into the Any
-                      *os << "(void) nvlist->add_item (\"" << arg->local_name () <<
-                        "\", CORBA::ARG_OUT, _tao_environment)->value ()->" <<
-                        "replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    } // end else
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // declare a variable. We need this only if we are variable
-                  // sized. If we are fixed sized, we already know our size and
-                  // hence we have already been allocated
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << bt->name () << " *_tao_base_" << arg->local_name
-                        () << " = new " << bt->name () << ";" << nl;
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << ", _tao_base_" << arg->local_name ();
-                    }
-                  else
-                    {
-                      // simply pass our address
-                      *os << ", &" << arg->local_name ();
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-#if 0
-                  // if we are sequence, call init manager
-                  if (type->node_type () == AST_Decl::NT_sequence)
-                    {
-                      be_sequence *seq = be_sequence::narrow_from_decl (type);
-                      // init_mgr method for managed types
-                      switch (seq->managed_type ())
-                        {
-                        case be_sequence::MNG_OBJREF:
-                        case be_sequence::MNG_STRING:
-                          *os << "_tao_base_" << arg->local_name () <<
-                            "->init_mgr ();" << nl;
-                          break;
-                        default:
-                          break;
-                        }
-                    }
-#endif
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << arg->local_name () << " = _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    *os << arg->local_name () << "_out, ";
-                  else
-                    *os << "*" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-#if 0 // causing ambiguity on NT compiler
-                      *os << arg->local_name () << " = " << arg->local_name ()
-                          << "_out;" << nl;
-#endif
-                      *os << "nv_" << arg->local_name () << "->" <<
-                        "value ()->replace (" << bt->tc_name ()
-                          << ", " << arg->local_name () << ", 1, " <<
-                        "_tao_environment); // ORB owns" << nl;
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                  break;
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        } // end switch direction
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << arg->local_name () << ";" <<
-                    nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name
-                    () << "\", CORBA::ARG_IN, _tao_environment)->value ()"
-                      << "->replace (" << bt->tc_name ()
-                      << ", &" << arg->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " " << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end of switch state
-          } // end case
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name
-                    () << "\", CORBA::ARG_INOUT, _tao_environment)->" <<
-                    "value ()->replace (" << bt->tc_name ()
-                      << ", " << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << "*" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " &" << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " *" << arg->local_name () <<
-                    " = new " << bt->name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << arg->local_name
-                    () << "\", CORBA::ARG_OUT, _tao_environment)->" <<
-                    "value ()->replace (" << bt->tc_name ()
-                      << ", " << arg->local_name () << ", 1, " <<
-                    "_tao_environment); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << "*" << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        } // end switch direction
-      break;
-    case AST_Decl::NT_native:
-      { 
-	switch (arg->direction ())
-	  {
-	  case AST_Argument::dir_IN:
-	    {
-	      switch (cg->state ())
-		{
-		case TAO_CodeGen::TAO_ARGUMENT_CH:
-		  // to keep the MSVC++ compiler happy
-		  *os << bt->nested_type_name (bif) << " "
-		      << arg->local_name () << ", ";
-		  break;
-		case TAO_CodeGen::TAO_ARGUMENT_CS:
-		case TAO_CodeGen::TAO_ARGUMENT_SH:
-		  *os << bt->name () << " " << arg->local_name () << ", ";
-		  break;
-		case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-		case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-		  *os << "env.exception (new CORBA::MARSHAL " <<
-		    "(CORBA::COMPLETED_NO));" << nl;
-		  break;
-		default:
-		  break;
-		}
-	    case AST_Argument::dir_INOUT:
-	    case AST_Argument::dir_OUT:
-	      {
-		switch (cg->state ())
-		  {
-		  case TAO_CodeGen::TAO_ARGUMENT_CH:
-		    // to keep the MSVC++ compiler happy
-		    *os << bt->nested_type_name (bif) << " &"
-			<< arg->local_name () << ", ";
-		    break;
-		  case TAO_CodeGen::TAO_ARGUMENT_CS:
-		  case TAO_CodeGen::TAO_ARGUMENT_SH:
-		    *os << bt->name () << " &"
-			<< arg->local_name () << ", ";
-		    break;
-		  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-		  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-		    *os << "env.exception (new CORBA::MARSHAL " <<
-		      "(CORBA::COMPLETED_NO));" << nl;
-		    break;
-		  default:
-		    break;
-		  }
-	      }
-	    }
-	  }
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of case
-      break;
-    } //end switch node type
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_array.cpp b/TAO/TAO_IDL/be/be_state_array.cpp
deleted file mode 100644
index 618c891bc7b..00000000000
--- a/TAO/TAO_IDL/be/be_state_array.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_array.cpp
-//
-// = DESCRIPTION
-//    state based code generation for arrays.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for array
-be_state_array::be_state_array (void)
-{
-}
-
-// generate code for array type
-int
-be_state_array::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  // get the appropriate stream
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CH:
-    case TAO_CodeGen::TAO_ARRAY_OTHER_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CI:
-      os = cg->client_inline ();
-      break;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        *os << bt->name () << "_var ";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        *os << bt->name ();
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        *os << "CORBA::String_var ";
-      }
-      break;
-    case AST_Decl::NT_array:
-      // type is an array. This is possible only if we
-      // are here thru the typedef node
-      {
-        *os << bt->name () << "_slice *";
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_enum:     // type is an enum
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct:   // type is a struct
-    case AST_Decl::NT_union:    // type is a union
-      {
-        // based on what state we are in, we may have to generate the definition
-        // of the type first
-        if (cg->state () == TAO_CodeGen::TAO_ARRAY_DEFN_CH)
-          if (bt->gen_client_header () == -1)  // generate the defn
-            return -1;
-
-        *os << bt->name ();
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of switch
-      //break; unreachable statement!
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_attribute.cpp b/TAO/TAO_IDL/be/be_state_attribute.cpp
deleted file mode 100644
index 4b505514e3f..00000000000
--- a/TAO/TAO_IDL/be/be_state_attribute.cpp
+++ /dev/null
@@ -1,1164 +0,0 @@
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_attribute.cpp
-//
-// = DESCRIPTION
-//    state based code generation for attributes.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// constructor
-be_state_attribute::be_state_attribute (void)
-{
-}
-
-int
-be_state_attribute::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_attribute *attr; // attribute node
-  be_interface *bif;  // enclosing scope which is an interface
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  // retrieve the ATTRIBUTE node
-  attr = be_attribute::narrow_from_decl (d);
-  if (!attr)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_attribute.cpp - "
-                         "Bad attribute node\n"),
-                        -1);
-    }
-
-  // get the enclosing interface scope to be used in the NESTED_CLASS macro
-  bif = be_interface::narrow_from_decl (ScopeAsDecl (attr->defined_in ()));
-  if (!bif)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_attribute.cpp - "
-                         "Bad interface\n"),
-                        -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // Two level switching
-  // (1) switch on node type
-  // (2) switch on current code generation state
-
-  switch (type->node_type ())  // LEVEL (1) switch based on node type
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        // what state are we in
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_ptr") << " ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << bt->name () << "_ptr " << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << "CORBA::Object_ptr retval = CORBA::Object::_nil ();" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return " << bt->name () << "::_nil ();\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return " << bt->name () << "::_narrow (retval, env);" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << "CORBA::Object_ptr *retval ="
-                " new CORBA::Object_ptr;" << nl;
-              *os << "*retval = CORBA::Object::_nil ();" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval"; // assign to retval
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // assign to a CORBA::Object_ptr
-              *os << "CORBA::Object_ptr _tao_base_" << attr->local_name ()
-                  << " = " << attr->local_name () << "; // cast it" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // pass the cast value
-              *os << ", &_tao_base_" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing for in parameters
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << "_ptr ";
-              *os << attr->local_name () << ";" << nl;
-              // we also declare a corresponding CORBA::Object_ptr to be
-              // passed to the decoder
-              *os << "CORBA::Object_ptr _tao_base_" << attr->local_name ()
-                  << ";" << nl;
-#if 0
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &_tao_base_" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-#endif
-              // insert into the Any
-              *os << "(void) nvlist->add_item (\"" << attr->local_name () <<
-                "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                "replace (" << bt->tc_name ()
-                  << ", &_tao_base_" << attr->local_name () << ", 0, " <<
-                "_tao_environment); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // convert from the CORBA::Object_ptr to the interface type
-              // using a _narrow
-              *os << attr->local_name () << " = " << bt->name () <<
-                "::_narrow (_tao_base_" << attr->local_name () << ", " <<
-                "_tao_environment);" << nl;
-              *os << "if (_tao_environment.exception ()) return;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // we must release the in parameter
-              *os << "CORBA::release (" << attr->local_name () << ");" << nl;
-              *os << "CORBA::release (_tao_base_" << attr->local_name () <<
-                ");" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // switch state
-      } // end of case interface/interface_fwd
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        // check if the type is an any
-        if (bpd->pt () == AST_PredefinedType::PT_any)
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "return 0;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                  *os << bt->name () << " ";
-                    // declare a variable
-                  *os << attr->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << attr->local_name () <<
-                    "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                    "replace (" << bt->tc_name ()
-                      << ", &" << attr->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name () << "* ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end of if
-        else if (bpd->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "return 0;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr *retval = new " << bt->name () <<
-                    "_ptr;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "*retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << "_ptr " << attr->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << attr->local_name
-                    () << "\", CORBA::ARG_IN, _tao_environment)->" <<
-                    "value ()->replace (" << bt->tc_name ()
-                      << ", &" << attr->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // no casting necessary as we already are object_ptr
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  *os << ", &" << attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // nothing to be done as we are Object_ptr
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  //release the in parameter
-                  *os << "CORBA::release (" << attr->local_name () << ");"
-                      << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end of switch state
-          } // end else if
-        else // simple predefined types
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  *os << "return retval;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  *os << " *retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << attr->local_name () << ";" <<
-                    nl;
-#if 0
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-#endif
-                  // insert into the Any
-                  *os << "(void) nvlist->add_item (\"" << attr->local_name
-                    () << "\", CORBA::ARG_IN, _tao_environment)->value ()"
-                      << "->replace (" << bt->tc_name ()
-                      << ", &" << attr->local_name () << ", 0, " <<
-                    "_tao_environment); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  *os << ", &" << attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end of else
-      } // end of case predefined
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " retval = 0;" << nl;
-                }
-              else
-                {
-                  *os << "char *retval = 0;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << "*;" << nl;
-                }
-              else
-                {
-                  *os << "char **retval = new char*;" << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              *os << ", &" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // we need to free the "in" string that got decoded
-              *os << "CORBA::string_free (" << attr->local_name () << ");"
-                  << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  // to keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name ();
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-                    // declare a variable
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                *os << bt->name ();
-              else
-                *os << "char *";
-              *os << " " << attr->local_name () << ";" << nl;
-#if 0
-                    // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-                    // declare an Any
-              *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-#endif
-              // insert into the Any
-              *os << "(void) nvlist->add_item (\"" << attr->local_name () <<
-                "\", CORBA::ARG_IN, _tao_environment)->value ()->replace ("
-                  << bt->tc_name () << ", &" << attr->local_name () <<
-                ", 0, _tao_environment); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              *os << "const char *" << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case string
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << " " << attr->local_name ()
-                  << ";" << nl;
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", " << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_slice") << " *";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name () << "_slice *";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << "const " << bt->nested_type_name (bif) << " " <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << "const " << bt->name () << " " << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end of case array
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << " " << attr->local_name () <<
-                ";" << nl;
-#if 0
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-#endif
-              // insert into the Any
-              *os << "(void) nvlist->add_item (\"" << attr->local_name () <<
-                "\", CORBA::ARG_IN, _tao_environment)->value ()->" <<
-                "replace (" << bt->tc_name ()
-                  << ", &" << attr->local_name () << ", 0, " <<
-                "_tao_environment); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              *os << ", &" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-           break;
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-#if 0
-              if (type->node_type () == AST_Decl::NT_sequence)
-                {
-                  be_sequence *seq = be_sequence::narrow_from_decl (type);
-                  // init_mgr method for managed types
-                  switch (seq->managed_type ())
-                    {
-                    case be_sequence::MNG_OBJREF:
-                    case be_sequence::MNG_STRING:
-                      *os << "retval->init_mgr ();" << nl;
-                      break;
-                    default:
-                      break;
-                    }
-                }
-#endif
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                // to keep MSVC++ happy
-                *os << bt->nested_type_name (bif) << " *";
-              else
-                *os << bt->nested_type_name (bif);
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                *os << bt->name () << " *";
-              else
-                *os << bt->name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << "const " << bt->nested_type_name (bif) << " &" <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << "const " << bt->name () << " &" << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return retval;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-                    // declare a variable
-              *os << bt->name () << " " << attr->local_name () << ";" <<
-                nl;
-#if 0
-                    // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-                    // declare an Any
-              *os << "CORBA::Any    any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-#endif
-              // insert into the Any
-              *os << "(void) nvlist->add_item (\"" << attr->local_name
-                () << "\", CORBA::ARG_IN, _tao_environment)->value ()"
-                  << "->replace (" << bt->tc_name ()
-                  << ", &" << attr->local_name () << ", 0, " <<
-                "_tao_environment); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << bt->nested_type_name (bif) << " " << attr->local_name
-                ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << bt->name () << " " << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } //   end case
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of case
-      break;
-    } //end switch node type
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_exception.cpp b/TAO/TAO_IDL/be/be_state_exception.cpp
deleted file mode 100644
index 769104ffe65..00000000000
--- a/TAO/TAO_IDL/be/be_state_exception.cpp
+++ /dev/null
@@ -1,409 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_exception.cpp
-//
-// = DESCRIPTION
-//    state based code generation for exceptions.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-be_state_exception::be_state_exception (void)
-{
-}
-
-// generate code for exception member
-int
-be_state_exception ::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_field *f;       // field node
-  be_exception *bexcp;  // enclosing exception node
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_EXCEPTION_CH: // used for defining members
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH: // used for defining the
-                                             // parameters to the special
-                                             // constructor
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_EXCEPTION_CI: // for generating inline functions for
-                                        // specific anonymous types
-      os = cg->client_inline ();
-      break;
-    case TAO_CodeGen::TAO_EXCEPTION_CS: // for copy ctor and assignment op
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS: // for the parameters of the
-                                             // special constructor
-    case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS: // for assigning to members
-                                                    // inside the special ctor
-      os = cg->client_stubs ();
-      break;
-    default:
-      os = 0;  // Force a seg fault.  At least os will have a known value.
-    }
-
-  f = be_field::narrow_from_decl (d); // downcast to field node
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_exception.cpp - "
-                         "Bad field\n"),
-                        -1);
-    }
-
-  // retrieve the exception node
-  bexcp = be_exception::narrow_from_scope (f->defined_in ());
-  if (!bexcp)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_exception.cpp - "
-                         "Bad exception\n"),
-                        -1);
-    }
-
-  // pass the field node just incase it is needed to generate definition for
-  // sequence
-  cg->node (f);
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_EXCEPTION_CH:
-            {
-              os->indent (); // start from current indentation
-              *os << bt->nested_type_name (bexcp, "_var") << " " << f->local_name
-                () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_excp." <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH:
-            {
-              *os << "const " << bt->nested_type_name (bexcp, "_ptr") << "&";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS:
-            {
-              *os << "const " << bt->name () << "_ptr &_tao_" << f->local_name
-                ();
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_" <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CI:
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_exception - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case interface
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-        if (!bpd)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_state_exception - "
-                               "bad predefined type\n"), -1);
-          }
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_EXCEPTION_CH:
-            {
-              switch (bpd->pt ())
-                {
-                case AST_PredefinedType::PT_pseudo:
-                  {
-                    os->indent (); // start from current indentation
-                    *os << bt->nested_type_name (bexcp, "_var") << " " <<
-                      f->local_name () << ";\n";
-                  }
-                  break;
-                default:
-                  {
-                    os->indent (); // start from current indentation
-                    *os << bt->nested_type_name (bexcp) << " " << f->local_name
-                      () << ";\n";
-                  }
-                } // end of switch state
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_excp." <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH:
-            {
-              switch (bpd->pt ())
-                {
-                case AST_PredefinedType::PT_pseudo:
-                  {
-                    *os << "const " << bt->nested_type_name (bexcp, "_ptr") <<
-                      "&";
-                  }
-                  break;
-                default:
-                  {
-                    *os << "const " << bt->nested_type_name (bexcp);
-                  }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS:
-            {
-              switch (bpd->pt ())
-                {
-                case AST_PredefinedType::PT_pseudo:
-                  {
-                    *os << "const " << bt->name () << "_ptr &_tao_" <<
-                      f->local_name ();
-                  }
-                  break;
-                default:
-                  {
-                    *os << "const " << bt->name () << " _tao_" <<
-                      f->local_name ();
-                  }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_" <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CI:
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_exception - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_EXCEPTION_CH:
-            {
-              os->indent (); // start from current indentation
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->nested_type_name (bexcp, "_var") << " " <<
-                    f->local_name () << ";\n";
-                }
-              else
-                {
-                  *os << "CORBA::String_var " << f->local_name () << ";\n";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_excp." <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << "const " << bt->nested_type_name (bexcp);
-                }
-              else
-                {
-                  *os << "const char*";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << "const " << bt->name () << " _tao_" << f->local_name
-                    ();
-                }
-              else
-                {
-                  *os << "const char* _tao_" << f->local_name ();
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_" <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CI:
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_exception - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_EXCEPTION_CH:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_header () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_exception - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-              os->indent ();
-              *os << bt->nested_type_name (bexcp) << " " << f->local_name () <<
-                ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CI:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_inline () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_exception - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CS:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_stubs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_exception - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_excp." <<
-                f->local_name () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CH:
-            {
-              *os << "const " << bt->nested_type_name (bexcp) << "&";
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_CS:
-            {
-              *os << "const " << bt->name () << "&_tao_" << f->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS:
-            {
-              // assign
-              os->indent (); // start with current indentation
-              *os << "this->" << f->local_name () << " = _tao_" <<
-                f->local_name () << ";\n";
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_exception - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, f, temp);
-      } // end of switch
-      //break;  unreachable statement!
-    }
-  // the enclosing exception will be variable length if the field's type is
-  // variable length
-  bexcp->size_type (type->size_type ());
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_operation.cpp b/TAO/TAO_IDL/be/be_state_operation.cpp
deleted file mode 100644
index 8e0a255232e..00000000000
--- a/TAO/TAO_IDL/be/be_state_operation.cpp
+++ /dev/null
@@ -1,737 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_operation.cpp
-//
-// = DESCRIPTION
-//    state based code generation for operations.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for operation
-be_state_operation::be_state_operation (void)
-{
-}
-
-// generate code for return type of operation
-int
-be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_operation *bop;
-  be_interface *bif; // interface in which the operation was defined
-
-  bop = be_operation::narrow_from_decl (d);
-  if (!bop)
-    return -1;
-
-  bif = be_interface::narrow_from_scope (bop->defined_in ());
-  if (!bif)
-    return -1;
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-    case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << "CORBA::Object_ptr retval = CORBA::Object::_nil ();" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return " << bt->name () << "::_nil ();\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return " << bt->name () << "::_narrow (retval, env);" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << "CORBA::Object_ptr *retval ="
-                " new CORBA::Object_ptr;" << nl;
-              *os << "*retval = CORBA::Object::_nil ();" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval"; // assign to retval
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_ptr") << " ";
-            }
-            break;
-          default:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-          }
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr ";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "void ";
-                }
-              else
-                {
-                  *os << bt->name () << " ";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  // no return variable
-                }
-              else
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "return 0;\n";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "return 0;\n";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "return;\n";
-                }
-              else
-                {
-                  *os << "return retval;\n";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "return; // no value" << nl;
-                }
-              else
-                {
-                  *os << "return retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr *retval = new " << bt->name () <<
-                      "_ptr;" << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "retval";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "*retval";
-                }
-              else
-                {
-                  *os << " *retval";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-              else
-                {
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->nested_type_name (bif, "*") << " ";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->nested_type_name (bif, "_ptr") << " ";
-                }
-              else
-                {
-                  *os << bt->nested_type_name (bif) << " ";
-                }
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << " *";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "_ptr";
-                }
-            }
-          } // end switch (cg->state())
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-#if 0
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name ();
-                }
-              else
-                {
-                  *os << "char *";
-                }
-#endif
-              *os << "char *";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-#if 0
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " retval = 0;" << nl;
-                }
-              else
-                {
-                  *os << "char *retval = 0;" << nl;
-                }
-#endif
-              *os << "char *retval = 0;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-#if 0
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";" << nl;
-                }
-              else
-                {
-                  *os << "char **retval = new char*;" << nl;
-                }
-#endif
-              *os << "char **retval = new char*;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-#if 0
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  // to keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-              else
-                {
-                  *os << "char *";
-                }
-#endif
-              *os << "char *";
-            }
-            break;
-          default:
-            {
-              *os << "char *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << "_slice *";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_slice") << " *";
-            }
-            break;
-          default:
-            {
-              // return a pointer to slice
-              *os << bt->name () << "_slice *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-      // return type is a pointer to sequence
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " *";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-#if 0
-              be_sequence *seq = be_sequence::narrow_from_decl (type);
-              // init_mgr method for managed types
-              switch (seq->managed_type ())
-                {
-                case be_sequence::MNG_OBJREF:
-                case be_sequence::MNG_STRING:
-                  *os << "retval->init_mgr ();" << nl;
-                  break;
-                default:
-                  break;
-                }
-#endif
-              // if we are sequence, call init manager
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif) << " *";
-            }
-            break;
-          default:
-            {
-              *os << bt->name () << " *";
-            }
-          } // end of swithc cg->state
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " ";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return retval;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " ";
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "*";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "return 0;\n";
-                }
-              else
-                {
-                  *os << "return retval;\n";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              if (type->size_type () == be_decl::VARIABLE)
-                {
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              if (type->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "retval";
-                }
-              else
-                {
-                  *os << "*retval";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-              // check if we are fixed size or variable sized. Depending on that we
-              // return a pointer or the aggregate itself
-              if (type->size_type () == be_decl::VARIABLE)
-                *os << " *";
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-              // check if we are fixed size or variable sized. Depending on that we
-              // return a pointer or the aggregate itself
-              if (type->size_type () == be_decl::VARIABLE)
-                *os << " *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_native:
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name ();
-            }
-	    break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-	    *os << "return 0;\n";
-	    break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif) << " ";
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-            }
-	    break;
-          }
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of switch
-      //break; unreachable statement!
-    } // switch of main switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_sequence.cpp b/TAO/TAO_IDL/be/be_state_sequence.cpp
deleted file mode 100644
index ca1b9e11a2a..00000000000
--- a/TAO/TAO_IDL/be/be_state_sequence.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_sequence.cpp
-//
-// = DESCRIPTION
-//    state based code generation for sequences.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for sequence
-be_state_sequence::be_state_sequence (void)
-{
-}
-
-// generate code for sequence type
-int
-be_state_sequence::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_sequence *seq;
-
-  seq = be_sequence::narrow_from_decl (d);
-  if (!seq)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_sequence.cpp - "
-                         "Bad sequence type\n"),
-                        -1);
-    }
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-    case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH:
-      os = cg->client_header (); // get client header stream
-      break;
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-    case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-      os = cg->client_stubs (); // get client stubs stream
-      break;
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-    case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-      os = cg->client_inline (); // get client inline stream
-      break;
-    default:
-      return -1;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // enclosing scope in which the sequence element type occurs
-  be_decl *scope;
-  if (!bt->defined_in ()) // no outer scope for us
-    scope = 0;
-  else
-    {
-      scope =  be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-      if (!scope)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_state_sequence.cpp - "
-                             "bad scope for seq elem type\n"),
-                            -1);
-        }
-    }
-
-  // for sequences, all we do is generate the type
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-            // if it is the case of sequence base, we generate the code for
-            // managed types
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-            if (seq->gen_managed_type_ch () == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_state_sequence.cpp - "
-                                   "codegen for managed type\n"),
-                                  -1);
-              }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-            if (seq->gen_managed_type_cs () == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_state_sequence.cpp - "
-                                   "codegen for managed type\n"),
-                                  -1);
-              }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            if (seq->gen_managed_type_ci () == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%N:%l) be_state_sequence.cpp - "
-                                   "codegen for managed type\n"),
-                                  -1);
-              }
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH: // managed type returned by
-                                                    // operator []
-            {
-              if ((type->node_type () == AST_Decl::NT_interface)
-                  || (type->node_type () == AST_Decl::NT_interface_fwd))
-                {
-                  if (scope)
-                    {
-                      *os << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-                        seq->local_name () << "::TAO_ObjRefMngType) ";
-                    }
-                  else
-                    {
-                      *os << seq->local_name () << "::TAO_ObjRefMngType ";
-                    }
-                }
-              else // must be a string
-                {
-                  if (scope)
-                    {
-                      *os << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-                        seq->local_name () << "::TAO_StrMngType) ";
-                    }
-                  else
-                    {
-                      *os << seq->local_name () << "::TAO_StrMngType ";
-                    }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-            {
-              if ((type->node_type () == AST_Decl::NT_interface)
-                  || (type->node_type () == AST_Decl::NT_interface_fwd))
-                {
-                  *os << seq->name () << "::TAO_ObjRefMngType ";
-                }
-              else // must be a string
-                {
-                  *os << seq->name () << "::TAO_StrMngType ";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            {
-              if ((type->node_type () == AST_Decl::NT_interface)
-                  || (type->node_type () == AST_Decl::NT_interface_fwd))
-                {
-                  *os << bt->nested_type_name (scope, "_ptr");
-                }
-              else // must be a string
-                {
-                  *os << "char *";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-            {
-              if ((type->node_type () == AST_Decl::NT_interface)
-                  || (type->node_type () == AST_Decl::NT_interface_fwd))
-                {
-                  *os << bt->name () << "_ptr";
-                }
-              else // must be a string
-                {
-                  *os << "char *";
-                }
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_sequence.cpp - "
-                                 "bad state\n"),
-                                -1);
-            }
-          }
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        if (!bpd)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_state_sequence.cpp - "
-                               "bad type\n"),
-                              -1);
-          }
-        if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-          {
-            // managed types for pseudo objs
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-                if (seq->gen_managed_type_ch () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_sequence.cpp - "
-                                       "codegen for managed type\n"),
-                                      -1);
-                  }
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-                if (seq->gen_managed_type_cs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_sequence.cpp - "
-                                       "codegen for managed type\n"),
-                                      -1);
-                  }
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-                if (seq->gen_managed_type_ci () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_sequence.cpp - "
-                                       "codegen for managed type\n"),
-                                      -1);
-                  }
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-                *os << bt->nested_type_name (scope, "_ptr");
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-                *os << bt->name () << "_ptr";
-                break;
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH: // managed type returned by
-                // operator []
-                {
-                  if (scope)
-                    {
-                      *os << "ACE_NESTED_CLASS (" << scope->name () << "," <<
-                        seq->local_name () << "::TAO_ObjRefMngType ) ";
-                    }
-                  else
-                    {
-                      *os << seq->local_name () << "::TAO_ObjRefMngType ";
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-                {
-                  *os << seq->name () << "::TAO_ObjRefMngType ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_sequence.cpp - "
-                                     "bad state\n"),
-                                    -1);
-                }
-              } // end switch state
-          } // if pseudo
-        else
-          {
-            // rest of the predefined types
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-              case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-                // nothing to be done
-                break;
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH:
-                *os << bt->nested_type_name (scope, " &");
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-                *os << bt->nested_type_name (scope, " ");
-                break;
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-              case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-                *os << bt->name () << " &";
-                break;
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-              case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-                *os << bt->name () << " ";
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_sequence.cpp - "
-                                     "bad state\n"),
-                                    -1);
-                }
-              } // end of switch
-          } // end else
-      } // end case predefined type
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            // nothing to do because we cannot have anonymous data types here
-            // that are enums or structures or unions.
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            *os << bt->nested_type_name (scope, " ");
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH:
-            *os << bt->nested_type_name (scope, " &");
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-            *os << bt->name () << " &";
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-            *os << bt->name () << " ";
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_sequence.cpp - "
-                                 "bad state\n"),
-                                -1);
-            }
-          }
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_header () == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_sequence.cpp - "
-                                     "Bad sequence type\n"),
-                                    -1);
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_stubs () == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_sequence.cpp - "
-                                     "Bad sequence type\n"),
-                                    -1);
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_inline () == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_sequence.cpp - "
-                                     "Bad sequence type\n"),
-                                    -1);
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            *os << bt->nested_type_name (scope, " ");
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH:
-            *os << bt->nested_type_name (scope, " &");
-            break;
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CS:
-          case TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI:
-            *os << bt->name () << " &";
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-            *os << bt->name () << " ";
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_sequence.cpp - "
-                                 "bad state\n"),
-                                -1);
-            }
-          }
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      }
-      //break;  unreachable statement!
-    } // end of switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_structure.cpp b/TAO/TAO_IDL/be/be_state_structure.cpp
deleted file mode 100644
index 86ab10cac5a..00000000000
--- a/TAO/TAO_IDL/be/be_state_structure.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_struct.cpp
-//
-// = DESCRIPTION
-//    state based code generation for structs.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-be_state_struct::be_state_struct (void)
-{
-}
-
-// generate code for structure member
-int
-be_state_struct ::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_field *f;       // field node
-  be_structure *bs;  // enclosing structure node
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_STRUCT_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_STRUCT_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_STRUCT_CI:
-      os = cg->client_inline ();
-      break;
-    default:
-      os = 0;  // Force a seg fault.  At least os will have a known value.
-    }
-
-  f = be_field::narrow_from_decl (d); // downcast to field node
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_structure.cpp - "
-                         "Bad field\n"),
-                        -1);
-    }
-
-  // retrieve the enclosing "struct" node
-  bs = be_structure::narrow_from_scope (f->defined_in ());
-  if (!bs)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_struct.cpp - "
-                         "Bad structure\n"),
-                        -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_STRUCT_CH:
-            {
-              os->indent (); // start from current indentation
-              *os << bt->nested_type_name (bs, "_var") << " " << f->local_name
-                () << ";\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CI:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CS:
-            {
-              // nothing
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_struct - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case interface
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_STRUCT_CH:
-            {
-              be_predefined_type *bpd = be_predefined_type::narrow_from_decl
-                (type);
-              if (!bpd)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_struct - "
-                                     "bad predefined type\n"), -1);
-                }
-              os->indent (); // start from current indentation
-              switch (bpd->pt ())
-                {
-                case AST_PredefinedType::PT_any:
-                case AST_PredefinedType::PT_pseudo:
-                  *os << bt->nested_type_name (bs) << "_var " << f->local_name
-                    () << ";\n";
-                  break;
-                default:
-                  *os << bt->nested_type_name (bs) << " " << f->local_name ()
-                      << ";\n";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CI:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CS:
-            {
-              // nothing
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_struct - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_STRUCT_CH:
-            {
-              os->indent (); // start from current indentation
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->nested_type_name (bs, "_var") << " " <<
-                    f->local_name () << ";\n";
-                }
-              else
-                {
-                  *os << "CORBA::String_var " << f->local_name () << ";\n";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CI:
-            {
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CS:
-            {
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_struct - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_STRUCT_CH:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_header () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_struct - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-              // this is not to be generated for arrays
-              if (bt->node_type () != AST_Decl::NT_array)
-                {
-                  os->indent ();
-                  *os << bt->nested_type_name (bs) << " " << f->local_name () <<
-                    ";\n";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CI:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_inline () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_struct - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-            }
-            break;
-          case TAO_CodeGen::TAO_STRUCT_CS:
-            {
-              // We first need to generate code for this aggregate type. Check
-              // if we are not called recursively thru a typedef
-              if (bt->node_type () != AST_Decl::NT_typedef
-                  && !bt->imported ())
-                if (bt->gen_client_stubs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_struct - "
-                                       "error generating code for type\n"),
-                                      -1);
-                  }
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_struct - unknown state\n"), -1);
-            }
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, f, temp);
-      } // end of switch
-      //break;  unreachable statement!
-    }
-  // the enclosing structure will be variable length if the field's type is
-  // variable length
-  bs->size_type (type->size_type ());
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_typedef.cpp b/TAO/TAO_IDL/be/be_state_typedef.cpp
deleted file mode 100644
index 7c83bfa758c..00000000000
--- a/TAO/TAO_IDL/be/be_state_typedef.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_typedef.cpp
-//
-// = DESCRIPTION
-//    state based code generation for typedefs.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for typedef
-be_state_typedef::be_state_typedef (void)
-{
-}
-
-// generate code for structure member
-int
-be_state_typedef::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_typedef *tdef;  // typedef node
-  be_decl *scope; // enclosing scope in which the typedef occurs
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      os = cg->client_header (); // set the stream to be the client header
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      os = cg->client_inline ();
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      os = cg->client_stubs ();
-      break;
-    default:
-      return -1;
-    } // end of outermost switch
-
-
-  tdef = be_typedef::narrow_from_decl (d); // downcast to typedef node
-  if (!tdef)
-    return -1;
-
-  scope = be_scope::narrow_from_scope (tdef->defined_in ())->decl ();
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most
-       // primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // the typedef node has the same size type as its base type
-  tdef->size_type (bt->size_type ());
-
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-
-              // typedef of an interface results in 3 typedefs as shown below
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_ptr") << " " <<
-                d->local_name () << "_ptr;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_var") << " " <<
-                d->local_name () << "_var;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " " <<
-                d->local_name () << "_out;\n\n";
-            }
-            break;
-          default:  // nothing to do for other cases
-            break;
-          } // end of switch state
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              be_predefined_type *pd = be_predefined_type::narrow_from_decl (type);
-
-              if (!pd)
-                return -1;
-              os->indent (); // start from current indentation
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";";
-              // if the predefined type is an ANY, we also define a typedef to _var
-              if (pd->pt () == AST_PredefinedType::PT_any)
-                {
-                  *os << nl;
-                  *os << "typedef " << bt->name () << "_var " << d->local_name
-                    () << "_var;";
-                }
-              else if (pd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object
-                  *os << "typedef " << bt->nested_type_name (scope, "_ptr") <<
-                    " " << d->local_name () << "_ptr;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_var") <<
-                    " " << d->local_name () << "_var;" << nl;
-                }
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            } // end of case
-            break;
-          default: // nothing to do for other cases
-            break;
-          } // end switch
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                    d->local_name () << ";" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_var") <<
-                    " " << d->local_name () << "_var;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_out") <<
-                    " " << d->local_name () << "_out;\n\n";
-                }
-              else
-                {
-                  *os << "typedef CORBA::String " << d->local_name () << ";" <<
-                    nl;
-                  *os << "typedef CORBA::String_var " << d->local_name
-                    () << "_var;" << nl;
-                  *os << "typedef CORBA::String_out " << d->local_name
-                    () << "_out;\n\n";
-                }
-            }
-            break;
-          default: // nothing to do for the rest of the cases
-            break;
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_state_typedef - enum gen failed\n"), -1);
-                    }
-                }
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            }
-            break;
-          default:
-            break;
-          } // end of switch
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first i.e., this typedef had its immediate base
-              // class that was an array declaration. The code for arrays will
-              // handle all the code generation. We just prepend the word
-              // "typedef".
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  os->indent ();
-                  *os << "typedef ";
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                           "be_state_typedef - array gen failed\n"), -1);
-                    }
-                }
-              else
-                {
-                  // we are a typedef node whose immediate base class is also a
-                  // typedefed node to some array node. We simply output a
-                  // number of typedef statements
-                  os->indent ();
-                  *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                    d->local_name () << ";" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_slice") <<
-                    " " << d->local_name () << "_slice;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_var") << " "
-                      << d->local_name () << "_var;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                      << d->local_name () << "_out;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_forany") << " "
-                      << d->local_name () << "_forany;" << nl;
-
-                  // typedefs for the auxiliary methods. If we are nested inside
-                  // some scope, these methods become static to the enclosing scope
-                  if (d->is_nested ())
-                    *os << "static ";
-                  *os << bt->nested_type_name (scope) << "_slice* " << d->local_name () <<
-                    "_alloc (void);" << nl;
-                  if (d->is_nested ())
-                    *os << "static ";
-                  *os << bt->nested_type_name (scope, "_slice") << " *" <<
-                    d->local_name () << "_dup ("
-                      << bt->nested_type_name (scope) << "_slice* " << ");" << nl;
-                  if (d->is_nested ())
-                    *os << "static ";
-                  *os << "void " << bt->nested_type_name (scope) << "_free (" <<
-                    d->name () << "_slice *);\n\n";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CI:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CS:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_stubs () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          default:
-            break;
-          } // end of switch
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct:   // type is a struct
-    case AST_Decl::NT_union:    // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-              os->indent (); // start from current indentation
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_var") << " "
-                  << d->local_name () << "_var;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CI:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CS:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_stubs () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          default:
-            break;
-          } // end of switch state
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, tdef, temp);
-      } // end of case
-      //break;  unreachable statement!
-    } // end of switch
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_union.cpp b/TAO/TAO_IDL/be/be_state_union.cpp
deleted file mode 100644
index 9a0b5b6c07e..00000000000
--- a/TAO/TAO_IDL/be/be_state_union.cpp
+++ /dev/null
@@ -1,1144 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_union.cpp
-//
-// = DESCRIPTION
-//    state based code generation for unions.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_state_union_disctypedefn_ch::be_state_union_disctypedefn_ch (void)
-{
-}
-
-// generate code for union discriminant type in client header
-int
-be_state_union_disctypedefn_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union *bu;
-
-  bu = be_union::narrow_from_decl (d); // downcast to union type
-  if (!bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_disctypedefn_ch::"
-                         "gen_code - "
-                         "bad union node\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  os = cg->client_header (); // get client header stream
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-    case AST_Decl::NT_except: // type is an exception
-      // all these cases are syntax errors which the front-end should have
-      // flagged as error cases
-      return -1;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        // if the discriminant is an enum, first generate the enum
-        // definition. However, check that we are not inside a recursive call
-        if (bt->node_type () == AST_Decl::NT_enum)
-          if (bt->gen_client_header () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_disctypedefn_ch::"
-                                 "gen_code - "
-                                 "codegen for discrim failed\n"), -1);
-            }
-
-        os->indent ();
-        // the set method
-        *os << "void _d (" << bt->nested_type_name (bu) << ");" << nl;
-        // the get method
-        *os << bt->nested_type_name (bu) << " _d (void) const;\n\n";
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        // a scoped name must result in one of the allowed types. Hopefully the
-        // front-end has done a good job of ensuring this.
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-        if (!t)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_state_union_disctypedefn_ch::"
-                               "gen_code - "
-                               "bad typedef node\n"), -1);
-          }
-
-        temp = t->primitive_base_type ();
-        return this->gen_code (t, d, temp);
-      }
-    } // end of switch
-  return 0;
-}
-
-be_state_union_disctypedefn_ci::be_state_union_disctypedefn_ci (void)
-{
-}
-
-// generate code for union discriminant type in client inline
-int
-be_state_union_disctypedefn_ci::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union *bu;
-
-  bu = be_union::narrow_from_decl (d); // downcast to union type
-  if (!bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_disctypedefn_ci::"
-                         "gen_code - "
-                         "bad union node\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  os = cg->client_inline (); // get client inline stream
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-    case AST_Decl::NT_except: // type is an exception
-      // all these cases are syntax errors which the front-end should have
-      // flagged as error
-      return -1;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        os->indent ();
-        // the set method
-        *os << "// accessor to set the discriminant" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::_d (" << bt->name () <<
-          " discval)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "this->disc_ = discval;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-        // the get method
-        *os << "// accessor to get the discriminant" << nl;
-        *os << "ACE_INLINE " << bt->name () << nl;
-        *os << bu->name () << "::_d (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->disc_;\n";
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    } // end of switch
-  return 0;
-}
-
-be_state_union_public_ch::be_state_union_public_ch (void)
-{
-}
-
-// generate code for union branch members in client header.  This involves
-// generating the set/get methods corresponding to the members
-int
-be_state_union_public_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;      // enclosing union
-
-  os = cg->client_header (); // get client header stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_ch::"
-                         "gen_code - "
-                         "bad union member\n"), -1);
-    }
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (bu == NULL)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_ch::"
-                         "gen_code - "
-                         "bad union node\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // codegen based on node type and the state we are in
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        os->indent (); // start from current indentation
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-          (bu, "_ptr") << ");// set" << nl;
-        *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () <<
-          " (void) const; // get method\n\n";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-        if (!bpd)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_state_union_public_ch::"
-                               "gen_code - "
-                               "bad predefined type\n"), -1);
-          }
-
-        if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-          {
-            os->indent (); // start from current indentation
-            *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-              (bu) << "_ptr);// set" << nl;
-            *os << bt->nested_type_name (bu) << "_ptr " << ub->local_name () <<
-              " (void) const; // get method\n\n";
-          }
-        else
-          {
-            os->indent (); // start from current indentation
-            *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-              (bu) << ");// set" << nl;
-            *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-              " (void) const; // get method\n\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        // XXXASG - TODO - what if we have a pseudo obj?
-        // if the type is an enum, we generate its defn first
-        if (bt->node_type () == AST_Decl::NT_enum)
-          if (bt->gen_client_header () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ch::"
-                                 "gen_code - "
-                                 "bad union member\n"), -1);
-            }
-
-        os->indent (); // start from current indentation
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name (bu)
-          << ");// set" << nl;
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-          " (void) const; // get method\n\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        os->indent (); // start from current indentation
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            // three methods to set the string value
-            *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-              (bu) << "); // set" << nl;
-            *os << "void " << ub->local_name () << " (const " <<
-              bt->nested_type_name (bu) << "); // set"
-                << nl;
-            *os << "void " << ub->local_name () <<
-              " (const " << bt->nested_type_name (bu, "_var") << " &); // set"  <<
-              nl;
-            *os << "const " << bt->nested_type_name (bu) << " " <<
-              ub->local_name () << " (void) const; // get method\n\n";
-          }
-        else
-          {
-            // three methods to set the string value
-            *os << "void " << ub->local_name () << " (char *); // set" << nl;
-            *os << "void " << ub->local_name () << " (const char *); // set"
-                << nl;
-            *os << "void " << ub->local_name () <<
-              " (const CORBA::String_var&); // set"  << nl;
-            *os << "const char *" << ub->local_name () <<
-              " (void) const; // get method\n\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        // generate code for the array. So let the array handle code
-        // generation. Check if this is not a recursive call
-        if (bt->node_type () != AST_Decl::NT_typedef)
-          if (bt->gen_client_header () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ch::"
-                                 "gen_code - "
-                                 "codegen for array failed\n"), -1);
-            }
-
-        os->indent ();
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-          (bu) << ");// set" << nl;
-        *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name () <<
-          " (void) const; // get method\n\n";
-
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        // generate defn for this aggregate unless we are recursively called
-        if (bt->node_type () != AST_Decl::NT_typedef)
-          if (bt->gen_client_header () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ch::"
-                                 "gen_code - "
-                                 "codegen for type failed\n"), -1);
-            }
-
-        os->indent ();
-        *os << "void " << ub->local_name () << " (const " <<
-          bt->nested_type_name (bu) << " &);// set" << nl;
-        *os << "const " << bt->nested_type_name (bu) << " &" << ub->local_name
-          () << " (void) const; // get method (read only)" << nl;
-        *os << bt->nested_type_name (bu) << " &" << ub->local_name () <<
-          " (void); // get method (read/write only)\n\n";
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-    } // end of switch
-
-  // enclosing union is variable if the member is variable
-  bu->size_type (type->size_type ());
-
-  return 0;
-}
-
-be_state_union_public_ci::be_state_union_public_ci (void)
-{
-}
-
-// generate code for union branch members in client inline.  This involves
-// generating the set/get methods corresponding to the members
-int
-be_state_union_public_ci::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os;   // output stream
-  TAO_NL  nl;          // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;        // enclosing union
-
-  os = cg->client_inline (); // get client inline stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_ci::"
-                         "gen_code - "
-                         "bad union member\n"), -1);
-    }
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (bu == NULL)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_ci::"
-                         "gen_code - "
-                         "bad union node\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        // for array, generate inline methods  if any
-        // We first need to generate code for this aggregate type. Check
-        // if we are not called recursively thru a typedef
-        if (bt->node_type () == AST_Decl::NT_array
-            && !bt->imported ())
-          if (bt->gen_client_inline () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ci::"
-                                 "gen_code - "
-                                 "codegen for array failed\n"), -1);
-            }
-
-        // set method
-        os->indent (); // start from current indentation
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (" << bt->name ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            // if it is an interface node, we use _ptr as a suffix for the type
-            *os << "_ptr";
-          }
-        *os << " val)// set" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            if (type->node_type () == AST_Decl::NT_interface)
-              {
-                // the private data member is a pointer type
-                *os << "*this->" << ub->local_name () << "_ = val;\n";
-              }
-            else
-              {
-                *os << "this->" << ub->local_name () << "_ = val;\n";
-              }
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // get method
-        *os << "// retrieve the member" << nl;
-        *os << "ACE_INLINE " << bt->name ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            // for interface type, return a _ptr type
-            *os << "_ptr";
-          }
-        else if (type->node_type () == AST_Decl::NT_array)
-          {
-            // for an array, return a _slice* type
-            *os << "_slice *";
-          }
-        *os << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            *os << "return *this->" << ub->local_name () << "_;\n";
-          }
-        else
-          {
-            *os << "return this->" << ub->local_name () << "_;\n";
-          }
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        // three methods to set the string value
-
-        // (1) set method from char*
-        os->indent (); // start from current indentation
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (" << bt->name
-              () << " val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (char *val)"
-                << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "  this->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "  *this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // (2) set method from const char *
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (const " <<
-              bt->name () << " val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () <<
-              " (const char *val)" << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "  this->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "  *this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // (3) set from const String_var&
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (const " <<
-              bt->name () << "_var &val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () <<
-              " (const CORBA::String_var &val)" << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "  this->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "  *this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << "ACE_INLINE const " << bt->name () << nl;
-          }
-        else
-          {
-            *os << "ACE_INLINE const char *" << nl;
-          }
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (void) const // get method" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_union: // type is a union
-      {
-        // We first need to generate code for this aggregate type. Check
-        // if we are not called recursively thru a typedef
-        if (bt->node_type () != AST_Decl::NT_typedef
-            && !bt->imported ())
-          if (bt->gen_client_inline () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ci::"
-                                 "gen_code - "
-                                 "codegen for type failed\n"), -1);
-            }
-
-        os->indent ();
-        // This case has to be handled differently from structs because the data
-        // member is a pointer
-
-        // (1) set from a const
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (const " << bt->name () << " &val)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "*this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // readonly get method
-        *os << "// readonly get method " << nl;
-        *os << "ACE_INLINE const " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // read/write get method
-        *os << "// read/write get method " << nl;
-        *os << "ACE_INLINE " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-      {
-        // We first need to generate code for this aggregate type. Check
-        // if we are not called recursively thru a typedef
-        if (bt->node_type () != AST_Decl::NT_typedef
-            && !bt->imported ())
-          if (bt->gen_client_inline () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_union_public_ci::"
-                                 "gen_code - "
-                                 "codegen for struct failed\n"), -1);
-            }
-
-        os->indent ();
-
-        // (1) set from a const
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (const " << bt->name () << " &val)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // readonly get method
-        *os << "// readonly get method " << nl;
-        *os << "ACE_INLINE const " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // read/write get method
-        *os << "// read/write get method " << nl;
-        *os << "ACE_INLINE " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-    } // end of switch
-
-  return 0;
-}
-
-be_state_union_public_cs::be_state_union_public_cs (void)
-{
-}
-
-// generate code for union branch members in client header.  This involves
-// generating the set/get methods corresponding to the members
-int
-be_state_union_public_cs::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;      // enclosing union
-
-  os = cg->client_stubs (); // get client stubs stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_cs::"
-                         "gen_code - "
-                         "bad union member\n"), -1);
-    }
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (!bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_public_cs::"
-                         "gen_code - "
-                         "bad union member\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CS:
-      {
-        switch (type->node_type ())
-          {
-          case AST_Decl::NT_interface: // type is an obj reference
-          case AST_Decl::NT_pre_defined: // type is predefined type
-          case AST_Decl::NT_string: // type is a string
-            {
-              // nothing
-            }
-            break;
-          case AST_Decl::NT_enum: // type is an enum
-            {
-              if (bt->node_type () == AST_Decl::NT_enum)
-                if (bt->gen_client_stubs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_union_public_cs::"
-                                       "gen_code - "
-                                       "codegen for type failed\n"), -1);
-                  }
-            }
-            break;
-          case AST_Decl::NT_array: // type is an array
-            {
-              // generate code for the array. So let the array handle code
-              // generation. Check if this is not a recursive call
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                if (bt->gen_client_stubs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_union_public_cs::"
-                                       "gen_code - "
-                                       "codegen for type failed\n"), -1);
-                  }
-
-            }
-            break;
-          case AST_Decl::NT_sequence: // type is a sequence
-          case AST_Decl::NT_struct: // type is a struct
-          case AST_Decl::NT_union: // type is a union
-            {
-              // generate defn for this aggregate unless we are recursively called
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                if (bt->gen_client_stubs () == -1)
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "(%N:%l) be_state_union_public_cs::"
-                                       "gen_code - "
-                                       "codegen for type failed\n"), -1);
-                  }
-            }
-            break;
-          case AST_Decl::NT_except: // type is an exception
-            {
-              // XXXASG: Is this case valid ???
-            }
-            break;
-          case AST_Decl::NT_typedef: // type is a typedef
-            {
-              be_type *temp; // most primitive base type
-              be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-              if (!t)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_union_private_cs::"
-                                     "gen_code - "
-                                     "bad typedef\n"), -1);
-                }
-
-              temp = t->primitive_base_type ();
-              // make a recursive call
-              return this->gen_code (t, ub, temp);
-            }
-          } // end of switch node type
-      }
-      break;
-    case TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS:
-      {
-        // This state is used when we are generating the copy ctor and
-        // assignment operator for the union.
-        // Individual assignment of the members takes place inside a case
-        // statement because the type of member assigned is based on the value
-        // of the discriminant
-        os->indent ();
-        if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-          {
-            *os << "case " << ub->label ()->label_val ()->n ()  << ":\n";
-          }
-        else
-          {
-            *os << "case " << ub->label ()->label_val () << ":\n";
-          }
-        os->incr_indent ();
-        *os << "this->" << ub->local_name () << "_ = u." << ub->local_name ()
-            << "_;" << nl;
-        *os << "break;\n";
-        os->decr_indent (0);
-      }
-      break;
-    }
-
-  return 0;
-}
-
-be_state_union_private_ch::be_state_union_private_ch (void)
-{
-}
-
-int
-be_state_union_private_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;      // enclosing union
-
-  os = cg->client_header (); // get client header stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_private_ch::"
-                         "gen_code - "
-                         "bad union member\n"), -1);
-    }
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (!bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_union_private_ch::"
-                         "gen_code - "
-                         "bad union\n"), -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        os->indent (); // start from current indentation
-        // C++ does not allow an object declaration inside a union. Hence we
-        // must have a pointer. This changes some of the methods
-        *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-        if (!bpd)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_state_union_private_ch::"
-                               "gen_code - "
-                               "bad predefined type\n"), -1);
-          }
-
-        if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-          {
-            os->indent (); // start from current indentation
-            *os << bt->nested_type_name (bu) << "_var " << ub->local_name () <<
-              "_;\n";
-          }
-        else
-          {
-            os->indent (); // start from current indentation
-            *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-              "_;\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        os->indent (); // start from current indentation
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        os->indent (); // start from current indentation
-        // C++ does not allow an object declaration inside a union. Hence we
-        // must have a pointer. This changes some of the methods
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-              "_;\n";
-          }
-        else
-          {
-            *os << "CORBA::String_var *" << ub->local_name () << "_;\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        os->indent ();
-        *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_union: // type is a union
-      {
-        os->indent ();
-        // C++ doesn't allow object instances inside unions, so we need a
-        // pointer
-        *os << bt->nested_type_name (bu) << " *" << ub->local_name () << "_;\n";
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-      {
-        os->indent ();
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () << "_;\n";
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-    } // end of switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
deleted file mode 100644
index c883c6e80eb..00000000000
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_string.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_String
- */
-be_string::be_string (void)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_string::be_string (AST_Expression *v)
-  : AST_String (v),
-    AST_Decl (AST_Decl::NT_string,
-             new UTL_ScopedName(new Identifier("string", 1, 0, I_FALSE),
-                                NULL),
-             NULL)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_string::be_string (AST_Expression *v, long wide)
-  : AST_String (v, wide),
-    AST_Decl (AST_Decl::NT_string,
-              wide == 1
-              ? new UTL_ScopedName(new Identifier("string",1,0,I_FALSE),
-                                   NULL)
-              : new UTL_ScopedName(new Identifier("wstring_t",
-                                                  1,
-                                                  0,
-                                                  I_FALSE),
-                                   NULL),
-              NULL)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// overriden method
-void
-be_string::compute_tc_name (void)
-{
-  // start with the head as the CORBA namespace
-  this->tc_name_ = new UTL_ScopedName (new Identifier ("CORBA", 1, 0, I_FALSE),
-                                       NULL);
-
-  this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_string", 1, 0,
-                                                             I_FALSE), NULL));
-}
-
-// Code generation
-
-int
-be_string::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-  ch->indent ();
-  *ch << "char *";
-
-  return 0;
-}
-
-int
-be_string::gen_client_stubs (void)
-{
-  return 0;
-}
-
-int
-be_string::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_string::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_string::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_string::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_string::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from the current indentation level
-  // emit the enumeration
-  *cs << "CORBA::tk_string, " << nl;
-  *cs << this->max_size () << ", // string length\n";
-  return 0;
-}
-
-// compute typecode size
-long
-be_string::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing string length
-  return 4 + 4;
-}
-
-int
-be_string::gen_encapsulation (void)
-{
-  return 0;
-}
-
-long
-be_string::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)
-    {
-      this->encap_len_ = 0; // no encapsulation
-    }
-  return this->encap_len_;
-}
-
-int be_string::write_as_return (TAO_OutStream *stream,
-				be_type * /* type */)
-{
-  *stream << "char* ";
-  return 0;
-}
-
-int
-be_string::accept (be_visitor *visitor)
-{
-  return visitor->visit_string (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_string, AST_String, be_type)
-IMPL_NARROW_FROM_DECL (be_string)
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
deleted file mode 100644
index 0f9778ba764..00000000000
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ /dev/null
@@ -1,911 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_structure.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Structure that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Structure
- */
-be_structure::be_structure (void)
-{
-}
-
-be_structure::be_structure (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_struct, n, p),
-    UTL_Scope (AST_Decl::NT_struct),
-    member_count_ (-1)
-{
-}
-
-// compute total number of members
-int
-be_structure::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          this->member_count_++;
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_structure::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the structure
-int
-be_structure::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CH); // set current code gen state
-
-      ch = cg->client_header ();
-
-      ch->indent (); // start from whatever indentation level we were at
-      *ch << "struct " << local_name () << nl;
-      *ch << "{\n";
-      ch->incr_indent (0);
-
-      // generate code for field members
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_header -"
-                             "codegen for scope failed\n"), -1);
-        }
-
-      ch->decr_indent ();
-      *ch << "};\n\n";
-
-      // generate var defn
-      this->gen_var_defn ();
-
-      // a class is generated for an out defn only for a variable length struct
-      if (this->size_type () == be_decl::VARIABLE)
-        {
-          this->gen_out_defn ();
-        }
-      else
-        {
-          ch->indent ();
-          *ch << "typedef " << this->local_name () << " &" << this->local_name
-            () << "_out;\n\n";
-        }
-
-      // generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-	      << idl_global->export_macro ()
-	      << " CORBA::TypeCode_ptr "
-	      << this->tc_name ()->last_component () << ";\n\n";
-        }
-      this->cli_hdr_gen_ = I_TRUE;
-      cg->pop (); // pop up the current state
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the structure
-int
-be_structure::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-      // pass info
-      cg->node (this);
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_stubs -"
-                             "codegen for scope failed\n"), -1);
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_struct, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-
-}
-
-// Generates the client-side inline information
-int
-be_structure::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CI); // set current code gen state
-
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_inline -"
-                             "_var codegen failed\n"), -1);
-        }
-      if (this->size_type () == be_decl::VARIABLE && this->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_inline -"
-                             "_out codegen failed\n"), -1);
-        }
-      if (be_scope::gen_client_inline () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_inline -"
-                             "codegen for scope failed\n"), -1);
-        }
-      this->cli_inline_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the structure
-int
-be_structure::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the structure
-int
-be_structure::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_structure::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_structure::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << " &() const;" << nl;
-  *ch << "operator " << local_name () << " &();" << nl;
-  *ch << "operator " << local_name () << " &() const;" << nl;
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " &out (void);" << nl;
-      *ch << local_name () << " _retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << " *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_structure::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "  this->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "  this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the out is handled differently based on our size type
-  ci->indent ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << name () << " *&" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return tmp;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else
-    {
-      *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << name () << " &" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_structure::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << " *operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_structure::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-
-  return 0;
-}
-
-// generate typecode.
-// Typecode for structures comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_structure::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_struct, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      return -1;
-    }
-  cs->decr_indent ();
-  return 0;
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_structure::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_structure::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute encapsulation length
-long
-be_structure::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_structure::compute_size_type (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          bd = be_decl::narrow_from_decl (d);
-          if (bd != 0)
-            {
-              // our sizetype depends on the sizetype of our members. Although
-              // previous value of sizetype may get overwritten, we are
-              // guaranteed by the "size_type" call that once the value reached
-              // be_decl::VARIABLE, nothing else can overwrite it.
-              this->size_type (bd->size_type ());
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l) be_structure::compute_size_type - "
-                          "narrow_from_decl returned 0\n"));
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int be_structure::write_as_return (TAO_OutStream *stream,
-				   be_type *type)
-{
-  *stream << type->name ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *stream << " *";
-    }
-  return 0;
-}
-
-int
-be_structure::accept (be_visitor *visitor)
-{
-  return visitor->visit_structure (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_structure, AST_Structure, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_structure)
-IMPL_NARROW_FROM_SCOPE (be_structure)
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
deleted file mode 100644
index f6bbac39a76..00000000000
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-#include        "be_sunsoft.h"
-
-TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
-  : TAO_OutStream ()
-{
-}
-
-TAO_SunSoft_OutStream::~TAO_SunSoft_OutStream (void)
-{
-}
-
-TAO_OutStream & 
-TAO_SunSoft_OutStream::print (Identifier *id)
-{
-  ACE_OS::fprintf (this->fp_, id->get_string ());
-  return *this;
-}
-
-TAO_OutStream & 
-TAO_SunSoft_OutStream::print (UTL_IdList *idl)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator (idl);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done ())) 
-    {
-      if (!first)
-        *this << "::";
-      else if (second)
-        first = second = I_FALSE;
-      // print the identifier
-      *this << i->item ();
-      if (first) 
-        {
-          if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-            // does not start with a ""
-            first = I_FALSE;
-          else
-            second = I_TRUE;
-        }
-      i->next ();
-  }
-  return *this;
-}
-
-TAO_OutStream&
-TAO_SunSoft_OutStream::print (AST_Expression *expr)
-{
-  AST_Expression::AST_ExprValue *ev = expr->ev ();
-
-  if (ev)
-    {
-      switch (ev->et)
-        {
-        case AST_Expression::EV_short:
-          this->TAO_OutStream::print ("%hd", ev->u.sval);
-          break;
-        case AST_Expression::EV_ushort:
-          this->TAO_OutStream::print ("%hu", ev->u.usval);
-          break;
-        case AST_Expression::EV_long:
-          this->TAO_OutStream::print ("%ld", ev->u.lval);
-          break;
-        case AST_Expression::EV_ulong:
-          this->TAO_OutStream::print ("%ld", ev->u.ulval);
-          break;
-        case AST_Expression::EV_longlong:
-          break;
-        case AST_Expression::EV_ulonglong:
-          break;
-        case AST_Expression::EV_float:
-          this->TAO_OutStream::print ("%f", ev->u.fval);
-          break;
-        case AST_Expression::EV_double:
-          this->TAO_OutStream::print ("%f", ev->u.dval);
-          break;
-        case AST_Expression::EV_longdouble:
-          break;
-        case AST_Expression::EV_char:
-          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-          break;
-        case AST_Expression::EV_wchar:
-          break;
-        case AST_Expression::EV_octet:
-          this->TAO_OutStream::print ("%c", ev->u.oval);
-          break;
-        case AST_Expression::EV_bool:
-          this->TAO_OutStream::print ("%ld", ev->u.bval);
-          break;
-        case AST_Expression::EV_string:
-          this->TAO_OutStream::print ("\"%s\"", ev->u.strval->get_string ());
-          break;
-        case AST_Expression::EV_wstring:
-          break;
-        default:
-          break;
-        }
-    }
-  else // 
-    {
-      // XXXASG: need to add code here
-    }
-  return *this;
-}
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
deleted file mode 100644
index 79484c523eb..00000000000
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_type.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Type that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Type
- */
-
-be_type::be_type (void)
-  : tc_name_ (0),
-    type_name_ (0),
-    nested_type_name_ (0)
-{
-}
-
-be_type::be_type (AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (nt, n, p),
-    tc_name_ (0),
-    type_name_ (0),
-    nested_type_name_ (0)
-{
-}
-
-be_type::~be_type (void)
-{
-  if (this->nested_type_name_ != 0)
-    {
-      delete[] this->nested_type_name_;
-      this->nested_type_name_ = 0;
-    }
-}
-
-// compute the typecode name. The idea is to use the fully scoped name,
-// however, prepend a _tc_ to the last component. A slightly different approach
-// is required of the predefined types. Hence this method is overridden for
-// predefined types.
-
-void
-be_type::compute_tc_name (void)
-{
-  static char namebuf [NAMEBUFSIZE];
-  UTL_ScopedName *n;
-
-  this->tc_name_ = NULL;
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  n = this->name ();
-  while (n->tail () != NULL)
-    {
-      if (!this->tc_name_)
-        {
-          // does not exist
-          this->tc_name_ = new UTL_ScopedName (n->head (), NULL);
-        }
-      else
-        {
-          this->tc_name_->nconc (new UTL_ScopedName (n->head (), NULL));
-        }
-      n = (UTL_ScopedName *)n->tail ();
-    }
-  ACE_OS::sprintf (namebuf, "_tc_%s", n->last_component ()->get_string ());
-  if (!this->tc_name_)
-    {
-      // does not exist
-      this->tc_name_ = new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                           (namebuf), 1, 0, I_FALSE), NULL);
-    }
-  else
-    {
-      this->tc_name_->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                                 (namebuf), 1,
-                                                                 0, I_FALSE), NULL));
-    }
-  return;
-}
-
-// retrieve typecode name
-UTL_ScopedName *
-be_type::tc_name (void)
-{
-  if (!this->tc_name_)
-    compute_tc_name ();
-
-  return this->tc_name_;
-}
-
-// XXXASG - This code works. However, whether we should generate the
-// ACE_NESTED_CLASS macro or not should be based on an option to the
-// compiler. In this version, we choose to generate a relative path.
-
-// return the type name using the ACE_NESTED_CLASS macro
-const char *
-be_type::nested_type_name (be_decl *use_scope, const char *suffix)
-{
-  // some compilers do not like generating a fully scoped name for a type that
-  // was defined in the same enclosing scope in which it was defined. For such,
-  // we emit a macro defined in the ACE library.
-  //
-
-  // The tricky part here is that it is not enough to check if the
-  // typename we are using was defined in the current scope. But we
-  // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro
-
-  // thus we need some sort of relative name to be generated
-
-  if (this->nested_type_name_ == 0)
-    ACE_NEW_RETURN (this->nested_type_name_, char[NAMEBUFSIZE], 0);
-
-  be_decl *def_scope = 0;  // our defining scope
-  char // hold the fully scoped name
-    def_name [NAMEBUFSIZE],
-    use_name [NAMEBUFSIZE];
-  char // these point to the curr and next component in the scope
-    *def_curr = def_name,
-    *def_next,
-    *use_curr = use_name,
-    *use_next;
-
-  ACE_OS::memset (this->nested_type_name_, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (def_name, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (use_name, '\0', NAMEBUFSIZE);
-
-  // traverse every component of the def_scope and use_scope beginning at the
-  // root and proceeding towards the leaf trying to see if the components
-  // match. Continue until there is a match and keep accumulating the path
-  // traversed. This forms the first argument to the ACE_NESTED_CLASS
-  // macro. Whenever there is no match, the remaining components of the
-  // def_scope form the second argument
-
-  def_scope = ((this->defined_in ())?
-               (be_scope::narrow_from_scope (this->defined_in ())->decl ()):
-               0);
-
-  if (def_scope && def_scope->node_type () != AST_Decl::NT_root && use_scope)
-    // if both scopes exist and that we are not in the root scope
-    {
-      ACE_OS::strcpy (def_name, def_scope->fullname ());
-      ACE_OS::strcpy (use_name, use_scope->fullname ());
-
-      // find the first occurrence of a :: and advance the next pointers accordingly
-      def_next = ACE_OS::strstr (def_curr, "::");
-      use_next = ACE_OS::strstr (use_curr, "::");
-
-      if (def_next)
-        *def_next = 0;
-
-      if (use_next)
-        *use_next = 0;
-
-      if (!ACE_OS::strcmp (def_curr, use_curr))
-        {
-          // initial prefix matches i.e., they have a common root
-          // start by initializing the macro
-
-          //@@          ACE_OS::sprintf (this->nested_type_name_, "ACE_NESTED_CLASS (");
-          //@@          ACE_OS::strcat (this->nested_type_name_, def_curr); // initialize the first argument
-
-          def_curr = (def_next ? (def_next+2) : 0); // skip the ::
-          use_curr = (use_next ? (use_next+2) : 0); // skip the ::
-
-          while (def_curr && use_curr)
-            {
-              // find the first occurrence of a :: and advance the next pointers accordingly
-              def_next = ACE_OS::strstr (def_curr, "::");
-              use_next = ACE_OS::strstr (use_curr, "::");
-
-              if (def_next)
-                *def_next = 0;
-
-              if (use_next)
-                *use_next = 0;
-
-              if (!ACE_OS::strcmp (def_curr, use_curr))
-                {
-                  // they have same prefix, append to arg1
-                  //@@    ACE_OS::strcat (this->nested_type_name_, "::");
-                  //@@ ACE_OS::strcat (this->nested_type_name_, def_curr);
-                  def_curr = (def_next ? (def_next+2) : 0); // skip the ::
-                  use_curr = (use_next ? (use_next+2) : 0); // skip the ::
-                }
-              else
-                {
-                  // no match. This is the end of the first argument. Get out
-                  // of the loop as no more comparisons are necessary
-                  break;
-                }
-            }
-
-          // start the 2nd argument of the macro
-          //@@          ACE_OS::strcat (this->nested_type_name_, ", ");
-
-          // copy the remaining def_name (if any left)
-          if (def_curr)
-            ACE_OS::strcat (this->nested_type_name_, def_curr);
-
-          // append our local name
-          ACE_OS::strcat (this->nested_type_name_, this->local_name ()->get_string ());
-          if (suffix)
-            ACE_OS::strcat (this->nested_type_name_, suffix);
-          //@@          ACE_OS::strcat (this->nested_type_name_, ")");
-          return this->nested_type_name_;
-        } // end of if the root prefixes match
-    }
-
-  // otherwise just emit our fullname
-  ACE_OS::sprintf (this->nested_type_name_, this->fullname ());
-  if (suffix)
-    ACE_OS::strcat (this->nested_type_name_, suffix);
-
-  return this->nested_type_name_;
-}
-
-// *****************************
-// CODE GENERATION
-// *****************************
-
-// generate the _var definition for ourself
-int
-be_type::gen_var_defn (void)
-{
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_type::gen_var_impl (void)
-{
-  return 0;
-}
-
-// generate the _out definition
-int
-be_type::gen_out_defn (void)
-{
-  return 0;
-}
-
-int
-be_type::gen_out_impl (void)
-{
-  return 0;
-}
-
-AST_Decl::NodeType be_type::base_node_type (void) const
-{
-  return ACE_const_cast(be_type*, this)->node_type ();
-}
-
-int be_type::write_as_return (TAO_OutStream *, be_type *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-		     "be_type::write_as_return - internal error,"
-		     " method shouldn't be invoked\n"), -1);
-}
-
-int
-be_type::accept (be_visitor *visitor)
-{
-  return visitor->visit_type (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_type, AST_Type, be_decl)
-IMPL_NARROW_FROM_DECL (be_type)
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
deleted file mode 100644
index 2d7885d18db..00000000000
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_typedef.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Typedef that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_typedef::be_typedef (void)
-{
-}
-
-be_typedef::be_typedef (AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Typedef (bt, n, p),
-    AST_Decl (AST_Decl::NT_typedef, n, p)
-{
-}
-
-// given a typedef node, traverse the chain of base types until they are no
-// more typedefs, and return that most primitive base type
-be_type *
-be_typedef::primitive_base_type (void)
-{
-  be_type *d;
-
-  d = this;
-  while (d && d->node_type () == AST_Decl::NT_typedef)
-    {
-      be_typedef *temp; // temporary
-
-      temp = be_typedef::narrow_from_decl (d);
-      d = be_type::narrow_from_decl (temp->base_type ());
-    }
-  return d;
-}
-
-int
-be_typedef::gen_client_header (void)
-{
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-  TAO_OutStream *ch; // client header
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      ch = cg->client_header ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CH);
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type. As a side effect, also
-      // generate the mapping for the typedef
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      // generate the typecode decl for this typedef node
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-	      << idl_global->export_macro ()
-	      << " CORBA::TypeCode_ptr "
-	      << this->tc_name ()->last_component () << ";\n\n";
-        }
-
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_typedef::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type. As a side effect, also
-      // generate the mapping for the typedef
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error generating typecode\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_alias, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-
-
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_typedef::gen_client_inline (void)
-{
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_inline_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CI);
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      cg->pop ();
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_typedef::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_typedef::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_typedef::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_typedef::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_alias, // typecode kind for typedefs" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      return -1;
-    }
-
-  cs->decr_indent (0);
-  return 0;
-}
-
-// generate encapsulation. A typedef is an alias to its base type
-int
-be_typedef::gen_encapsulation  (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-  be_type *bt; // base type
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // generate typecode for the base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-       "be_typedef::gen_encapsulation failed for base type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-long
-be_typedef::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_typedef::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-              "be_typedef::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_typedef::compute_size_type (void)
-{
-  be_type *type = be_type::narrow_from_decl (this->base_type ());
-  if (!type)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_typedef::compute_size_type - "
-                         "bad base type\n"), -1);
-    }
-
-  // our size type is the same as our type
-  this->size_type (type->size_type ());
-  return 0;
-}
-
-AST_Decl::NodeType be_typedef::base_node_type (void) const
-{
-  be_type *base = be_type::narrow_from_decl (ACE_const_cast(be_typedef*, this)->base_type ());
-  return base->base_node_type ();
-}
-
-int be_typedef::write_as_return (TAO_OutStream *stream,
-				 be_type *type)
-{
-  be_type *base = be_type::narrow_from_decl (this->base_type ());
-  return base->write_as_return (stream, type);
-}
-
-int
-be_typedef::accept (be_visitor *visitor)
-{
-  return visitor->visit_typedef (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_typedef, AST_Typedef, be_type)
-IMPL_NARROW_FROM_DECL (be_typedef)
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
deleted file mode 100644
index 46ea8ec2931..00000000000
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ /dev/null
@@ -1,1190 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Union that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Union
- */
-
-be_union::be_union (void)
-{
-}
-
-be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Union (dt, n, p),
-    AST_Structure (AST_Decl::NT_union, n, p),
-    AST_Decl (AST_Decl::NT_union, n, p),
-    UTL_Scope (AST_Decl::NT_union),
-    member_count_ (-1),
-    default_index_ (-2)
-{
-}
-
-// compute total number of members
-int
-be_union::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          this->member_count_++;
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// compute total number of members
-int
-be_union::compute_default_index (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-  be_union_branch *bub; // union branch node
-  int i = 0; // counter
-
-  this->default_index_ = -1;  // if not used at all, this is the value it will
-                              // take
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              bub = be_union_branch::narrow_from_decl (d);
-              if (bub->label ()->label_kind () == AST_UnionLabel::UL_default)
-                this->default_index_ = i; // zero based indexing
-              i++;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_union::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-// return the default_index
-int
-be_union::default_index (void)
-{
-  if (this->default_index_ == -2)
-    this->compute_default_index ();
-
-  return this->default_index_;
-}
-
-
-// ****************************
-// code generation
-// ****************************
-
-int
-be_union::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // code generation state
-
-  if (!this->cli_hdr_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ch = cg->client_header ();
-
-      // generate the ifdefined macro for the array type
-      ch->gen_ifdef_macro (this->flatname ());
-      ch->indent (); // start with the current indentation level
-      *ch << "class " << idl_global->export_macro ()
-      << " " << local_name () << nl;
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent ();
-
-      // generate default and copy constructors
-      *ch << local_name () << " (void); // default constructor" << nl;
-      *ch << local_name () << " (const " << local_name () <<
-        " &); // copy constructor" << nl;
-      // generate destructor
-      *ch << "~" << local_name () << " (void); // destructor" << nl;
-      // generate assignment operator
-      *ch << local_name () << " &operator= (const " << local_name () <<
-        " &); // copy constructor\n\n";
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      cg->push (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CH); // set current code gen state
-      bt = be_type::narrow_from_decl (this->disc_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "bad disciminant type\n"), -1);
-        }
-
-      s  = cg->make_state (); // get the code gen object for the current state
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "bad state\n"), -1);
-        }
-
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "codegen for discriminant failed\n"), -1);
-        }
-      cg->pop (); // revert to previous state
-
-      // now generate the public defn for the union branch members
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CH); // set current code gen state
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "codegen for public defn of union members\n"),
-                            -1);
-        }
-
-      cg->pop ();
-
-      // now generate the private data members of the union
-      cg->push (TAO_CodeGen::TAO_UNION_PRIVATE_CH); // set current code gen state
-      ch->decr_indent ();
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << bt->nested_type_name (this) << " disc_;" << nl; // emit the
-                                                 // ACE_NESTED_CLASS macro
-
-      // the members are inside of a union
-      *ch << "union" << nl;
-      *ch << "{\n";
-      ch->incr_indent (0);
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "codegen for private members of union\n"), -1);
-        }
-
-      ch->decr_indent ();
-      *ch << "}; // end of union\n";
-
-      ch->decr_indent ();
-      *ch << "};\n\n";
-
-      // Generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern "
-	      << idl_global->export_macro ()
-	      << " CORBA::TypeCode_ptr "
-	      << this->tc_name ()->last_component () << ";\n\n";
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the array type
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-      // generate var defn
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_header - "
-                             "codegen for _var\n"), -1);
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the array type
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-      // a class is generated for an out defn only for a variable length struct
-      if (this->size_type () == be_decl::VARIABLE)
-        {
-          if (this->gen_out_defn () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_union::"
-                                 "gen_client_header - "
-                                 "codegen for _out\n"), -1);
-            }
-        }
-      else
-        {
-          ch->indent ();
-          *ch << "typedef " << this->local_name () << " &" << this->local_name
-            () << "_out;\n\n";
-        }
-      ch->gen_endif ();
-
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_union::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cs = cg->client_stubs ();
-
-      // first generate code for any of the members (if required, e.g.,
-      // anonymous sequences, structs, unions, arrays)
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CS); // set current code gen state
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_stubs - "
-                             "codegen for scope failed\n"), -1);
-        }
-      cg->pop ();
-
-      // now generate the operations on the union such as the copy constructor
-      // and the assignment operator
-
-      *cs << "// *************************************************************"
-          << nl;
-      *cs << "// Operations for union " << this->name () << nl;
-      *cs << "// *************************************************************\n\n";
-
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
-
-      // generate the copy constructor and the assignment operator here
-      cs->indent ();
-      *cs << "// copy constructor" << nl;
-      *cs << this->name () << "::" << this->local_name () << " (const " <<
-        this->name () << " &u)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // first set the discriminant
-      *cs << "this->disc_ = u.disc_;" << nl;
-      // now switch based on the disc value
-      *cs << "switch (this->disc_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_stubs - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      cs->decr_indent ();
-      *cs << "}\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // assignment operator
-      cs->indent ();
-      *cs << "// assignment operator" << nl;
-      *cs << this->name () << " &" << nl; // return type
-      *cs << this->name () << "::operator= (const " <<
-        this->name () << " &u)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // first set the discriminant
-      *cs << "this->disc_ = u.disc_;" << nl;
-      // now switch based on the disc value
-      *cs << "switch (this->disc_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_stubs - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      cs->decr_indent ();
-      *cs << "}" << nl;
-      *cs << "return *this;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_stubs - "
-                             "codegen for encapsulation failed\n"), -1);
-        }
-
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_union, sizeof (_oc_" <<  this->flatname () <<
-        "), (char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_union::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // code generation state
-
-
-  if (!this->cli_inline_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      ci = cg->client_inline ();
-
-      *ci << "// *************************************************************"
-          << nl;
-      *ci << "// Inline operations for union " << this->name () << nl;
-      *ci << "// *************************************************************\n\n";
-
-      // generate the default constructor and the destructor here
-      ci->indent ();
-      *ci << "// default constructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      *ci << "{" << nl;
-      *ci << "}" << nl << nl;
-
-      *ci << "// destructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::~" << this->local_name () << " (void)" << nl;
-      *ci << "{" << nl;
-      *ci << "}\n\n";
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      cg->push (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CI); // set current code gen state
-      bt = be_type::narrow_from_decl (this->disc_type ());
-
-      s  = cg->make_state (); // get the code gen object for the current state
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "Discriminant type generation failure\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      // now generate the implementation of the access methods
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CI); // set current code gen state
-      if (be_scope::gen_client_inline () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_inline - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      cg->pop ();
-
-      // generate the ifdefined macro for the array type
-      ci->gen_ifdef_macro (this->flatname (), "_var");
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_inline - "
-                             "codegen for _var failed\n"), -1);
-        }
-      ci->gen_endif ();
-
-      // generate the ifdefined macro for the array type
-      ci->gen_ifdef_macro (this->flatname (), "_out");
-      if (this->size_type () == be_decl::VARIABLE && this->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_union::"
-                             "gen_client_inline - "
-                             "codegen for _out failed\n"), -1);
-        }
-      ci->gen_endif ();
-
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_union::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_union::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_union::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate typecode.
-// Typecode for union comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-// generate the _var definition for ourself
-int
-be_union::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << " &() const;" << nl;
-  *ch << "operator " << local_name () << " &();" << nl;
-  *ch << "operator " << local_name () << " &() const;" << nl;
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " &out (void);" << nl;
-      *ch << local_name () << " _retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << " *ptr(void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_union::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "  this->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "  this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the out is handled differently based on our size type
-  ci->indent ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << name () << " *&" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return tmp;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else
-    {
-      *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << name () << " &" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // the additional ptr () member function
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::ptr (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_union::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << " *operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_union::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-
-  return 0;
-}
-
-int
-be_union::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_union, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation.
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_union::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-  be_type *discrim;
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << ",\n";
-
-  // generate typecode for discriminant
-  discrim = be_type::narrow_from_decl (this->disc_type ());
-  if (discrim->gen_typecode () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate typecode for discriminant\n"));
-      return -1;
-    }
-
-  // generate the default used flag
-  cs->indent ();
-  *cs << this->default_index () << ", // default used index" << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_union::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_union::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      long slen;
-      be_type *discrim;
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (slen);
-
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len (); // for name
-
-      // add encapsulation size of discriminant typecode
-      discrim = be_type::narrow_from_decl (this->disc_type ());
-      this->encap_len_ += discrim->tc_size ();
-
-      this->encap_len_ += 4; // to hold the "default used" flag
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_union::compute_size_type (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          bd = be_decl::narrow_from_decl (d);
-          if (bd != 0)
-            {
-              // our sizetype depends on the sizetype of our members. Although
-              // previous value of sizetype may get overwritten, we are
-              // guaranteed by the "size_type" call that once the value reached
-              // be_decl::VARIABLE, nothing else can overwrite it.
-              this->size_type (bd->size_type ());
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l) be_structure::compute_size_type - "
-                          "narrow_from_decl returned 0\n"));
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int be_union::write_as_return (TAO_OutStream *stream,
-			       be_type *type)
-{
-  *stream << type->name ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *stream << " *";
-    }
-  return 0;
-}
-
-int
-be_union::accept (be_visitor *visitor)
-{
-  return visitor->visit_union (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_union, AST_Union, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_union)
-IMPL_NARROW_FROM_SCOPE (be_union)
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
deleted file mode 100644
index 78defae5d7b..00000000000
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union_branch.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_UnionBranch that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_UnionBranch
- */
-be_union_branch::be_union_branch (void)
-{
-}
-
-be_union_branch::be_union_branch (AST_UnionLabel *lab, AST_Type *ft,
-                                  UTL_ScopedName *n, UTL_StrList *p)
-  : AST_UnionBranch (lab, ft, n, p),
-    AST_Field (AST_Decl::NT_union_branch, ft, n, p),
-    AST_Decl (AST_Decl::NT_union_branch, n, p)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the union_branch
-int
-be_union_branch::gen_client_header (void)
-{
-  be_type *bt;  // the union_branch type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) ==  -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_union_branch::"
-                         "gen_client_header - "
-                         "state based code gen failed\n"), -1);
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the union_branch
-int
-be_union_branch::gen_client_stubs (void)
-{
-  be_type *bt;  // the union_branch type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) ==  -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_union_branch::"
-                         "gen_client_stubs - "
-                         "state based code gen failed\n"), -1);
-    }
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_union_branch::gen_client_inline (void)
-{
-  be_type *bt;  // the union_branch type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) ==  -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_union_branch::"
-                         "gen_client_inline - "
-                         "state based code gen failed\n"), -1);
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the union_branch
-int
-be_union_branch::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the union_branch
-int
-be_union_branch::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_union_branch::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_union_branch::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt;  // our type node
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // emit the case label value
-  *cs << this->label ()->label_val ();
-  *cs << ", // union case label (evaluated)" << nl;
-  // emit name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    return -1;
-  return bt->gen_typecode ();
-}
-
-long
-be_union_branch::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)
-    {
-      be_type *bt;
-
-      this->encap_len_ = 4; // case label;
-      this->encap_len_ += this->name_encap_len (); // for name
-      bt = be_type::narrow_from_decl (this->field_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union_branch: bad field type\n"));
-          return -1;
-        }
-      this->encap_len_ += bt->tc_size (); // note that we add the typecode size
-                                          // of the type
-    }
-  return this->encap_len_;
-}
-
-// compute the size type of the node in question
-int
-be_union_branch::compute_size_type (void)
-{
-  be_type *type = be_type::narrow_from_decl (this->field_type ());
-  if (!type)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_field::compute_size_type - "
-                         "bad field type\n"), -1);
-    }
-
-  // our size type is the same as our type
-  this->size_type (type->size_type ()); // as a side effect will also update
-                                        // the size type of parent
-  return 0;
-}
-
-int
-be_union_branch::accept (be_visitor *visitor)
-{
-  return visitor->visit_union_branch (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_union_branch, AST_UnionBranch, be_decl)
-IMPL_NARROW_FROM_DECL (be_union_branch)
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
deleted file mode 100644
index 64d1f74893e..00000000000
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// $Id$
-//
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_UnionLabel
- */
-be_union_label::be_union_label()
-{
-}
-be_union_label::be_union_label(AST_UnionLabel::UnionLabel ul,
-			       AST_Expression *v)
-	      : AST_UnionLabel(ul, v)
-{
-}
-
-int
-be_union_label::accept (be_visitor *visitor)
-{
-  return visitor->visit_union_label (this);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
deleted file mode 100644
index 38e10c4eb16..00000000000
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor.h
-//
-// = DESCRIPTION
-//    Abstract class for back end visitors.
-//
-// = NOTES
-//    This is not a pure abstract class
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#include "idl.h"
-#include "be.h"
-#include "be_visitor.h"
-
-be_visitor::be_visitor (void)
-{
-}
-
-be_visitor::~be_visitor (void)
-{
-}
-
-// all the visit methods. Concrete visitors will selectively override each one
-int be_visitor::visit_decl (be_decl *)
-{
-  return 0;
-}
-
-int be_visitor::visit_scope (be_scope *node)
-{
-  return 0;
-}
-
-int be_visitor::visit_type (be_type *)
-{
-  return 0;
-}
-
-int be_visitor::visit_predefined_type (be_predefined_type *)
-{
-  return 0;
-}
-
-int be_visitor::visit_module (be_module *)
-{
-  return 0;
-}
-
-int be_visitor::visit_interface (be_interface *)
-{
-  return 0;
-}
-
-int be_visitor::visit_interface_fwd (be_interface_fwd *)
-{
-  return 0;
-}
-
-int be_visitor::visit_structure (be_structure *)
-{
-  return 0;
-}
-
-int be_visitor::visit_exception (be_exception *)
-{
-  return 0;
-}
-
-int be_visitor::visit_expression (be_expression *)
-{
-  return 0;
-}
-
-int be_visitor::visit_enum (be_enum *)
-{
-  return 0;
-}
-
-int be_visitor::visit_operation (be_operation *)
-{
-  return 0;
-}
-
-int be_visitor::visit_field (be_field *)
-{
-  return 0;
-}
-
-int be_visitor::visit_argument (be_argument *)
-{
-  return 0;
-}
-
-int be_visitor::visit_attribute (be_attribute *)
-{
-  return 0;
-}
-
-int be_visitor::visit_union (be_union *)
-{
-  return 0;
-}
-
-int be_visitor::visit_union_branch (be_union_branch *)
-{
-  return 0;
-}
-
-int be_visitor::visit_union_label (be_union_label *)
-{
-  return 0;
-}
-
-int be_visitor::visit_constant (be_constant *)
-{
-  return 0;
-}
-
-int be_visitor::visit_enum_val (be_enum_val *)
-{
-  return 0;
-}
-
-int be_visitor::visit_array (be_array *)
-{
-  return 0;
-}
-
-int be_visitor::visit_sequence (be_sequence *)
-{
-  return 0;
-}
-
-int be_visitor::visit_string (be_string *)
-{
-  return 0;
-}
-
-int be_visitor::visit_typedef (be_typedef *)
-{
-  return 0;
-}
-
-int be_visitor::visit_root (be_root *)
-{
-  return 0;
-}
-
-int be_visitor::visit_native (be_native *)
-{
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_args.cpp b/TAO/TAO_IDL/be/be_visitor_args.cpp
deleted file mode 100644
index f22f295f927..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_args.cpp
+++ /dev/null
@@ -1,2531 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_args.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Argument
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "be.h"
-#include "be_visitor_args.h"
-
-be_visitor_args::be_visitor_args (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_args::~be_visitor_args (void)
-{
-}
-
-int be_visitor_args::visit_argument (be_argument *node)
-{
-  return -1;
-}
-
-// helper that returns the type name either as a nested type name (for header
-// files) or as a fully scoped name. In addition, we make sure that if the type
-// is an alias, we use that name
-const char *
-be_visitor_args::type_name (be_type *node, const char *suffix)
-{
-  static char namebuf [NAMEBUFSIZE];
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-
-  be_type *bt; // type to use
-
-  // use the typedefed name if that is the one used in the IDL defn
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // generate the NESTED_CLASS macro i.e., a relative path name to satisfy the
-  // MSVC++ compiler
-  switch (this->ctx_->stream ()->stream_type ())
-    {
-    case TAO_OutStream::TAO_CLI_HDR:
-      ACE_OS::sprintf (namebuf, "%s", bt->nested_type_name
-                       (this->ctx_->scope (), suffix));
-      break;
-    default: // fullname for all other cases
-      ACE_OS::sprintf (namebuf, "%s", bt->fullname ());
-      if (suffix)
-        ACE_OS::strcat (namebuf, suffix);
-    }
-
-  return namebuf;
-}
-
-// helper that returns the direction type of the argument
-AST_Argument::Direction
-be_visitor_args::direction (void)
-{
-  // grab the argument node. We know that our context has stored the right
-  // argument node
-  be_argument *arg = this->ctx_->be_node_as_argument ();
-
-  ACE_ASSERT (arg != 0);
-  return arg->direction ();
-}
-
-// ************************************************************
-// be_visitor_args_arglist for parameter list in method declarations and
-// definitions
-// ************************************************************
-
-be_visitor_args_arglist::be_visitor_args_arglist (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_arglist::~be_visitor_args_arglist (void)
-{
-}
-
-int be_visitor_args_arglist::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_arglist::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  os->indent (); // start with current indentation level
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_arglist::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  *os << " " << node->local_name () << ",\n";
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node);
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node);
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << this->type_name (node);
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
-      break;
-    case AST_Argument::dir_INOUT: // inout
-      *os << this->type_name (node, "_ptr") << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << this->type_name (node, "_ptr");
-      break;
-    case AST_Argument::dir_INOUT: // inout
-      *os << this->type_name (node, "_ptr") << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_native (be_native *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << this->type_name (node);
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node) << " &";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << "const " << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << this->type_name (node, "_ptr");
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node, "_ptr") << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << this->type_name (node);
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const char *";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << "char *&";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << "CORBA::String_out";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " &";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_arglist::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// *************************************************************************
-// visitor for argument to do any pre docall processing. Not all types need
-// this. Only those that have an _out type need this.  In addition, interfaces
-// need it because we ned to convert from the interface type to the base Object
-// type and vice versa.
-// *************************************************************************
-
-be_visitor_args_pre_docall_cs::be_visitor_args_pre_docall_cs
-(be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_pre_docall_cs::~be_visitor_args_pre_docall_cs (void)
-{
-}
-
-int
-be_visitor_args_pre_docall_cs::void_return_type (void)
-{
-  // is the operation return type void?
-  be_argument *arg = this->ctx_->be_node_as_argument ();
-  ACE_ASSERT (arg != 0);
-  be_operation *op = be_operation::narrow_from_scope (arg->defined_in ());
-  ACE_ASSERT (arg != 0);
-
-  be_type *bt = be_type::narrow_from_decl (op->return_type ());
-  if (bt->node_type () == AST_Decl::NT_pre_defined
-      && (be_predefined_type::narrow_from_decl (bt)->pt ()
-          == AST_PredefinedType::PT_void))
-    return 1;
-  else
-    return 0;
-}
-
-int be_visitor_args_pre_docall_cs::visit_argument (be_argument *node)
-{
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type of the argument
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_docall_cs::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_docall_cs::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << bt->name () << "_slice *&_tao_base_" << arg->local_name ()
-          << " = " << arg->local_name () << ".ptr ();\n";
-      if (!this->void_return_type ())
-        {
-          *os << "ACE_NEW_RETURN (_tao_base_" << arg->local_name ()
-              << ", " << bt->name () << "_slice, _tao_retval);\n";
-        }
-      else
-        {
-          *os << "ACE_NEW (_tao_base_" << arg->local_name ()
-              << ", " << bt->name () << "_slice);\n";
-        }
-      break;
-    default:
-      break;
-    }
-  return 0;
-
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-          << " = " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-          << " = " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // pre do_static_call processing is valid only for pseudo objects and for Any
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << "_ptr &_tao_base_" << arg->local_name ()
-              << " = " << arg->local_name () << ".ptr ();\n";
-          break;
-        default:
-          break;
-        }
-      }
-      break;
-    case AST_PredefinedType::PT_any:
-      {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << " *&_tao_base_" << arg->local_name ()
-              << " = " << arg->local_name () << ".ptr ();" << be_nl;
-          if (!this->void_return_type ())
-            {
-              *os << "ACE_NEW_RETURN (_tao_base_" << arg->local_name ()
-                  << ", CORBA::Any, _tao_retval);\n";
-            }
-          else
-            {
-              *os << "ACE_NEW (_tao_base_" << arg->local_name ()
-                  << ", CORBA::Any);\n";
-            }
-          break;
-        default:
-          break;
-        }
-      }
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_OUT:
-      // caller must have allocated the pointer
-      os->indent ();
-      *os << bt->name () << " *&_tao_base_" << arg->local_name ()
-          << " = " << arg->local_name () << ".ptr ();" << be_nl;
-      if (!this->void_return_type ())
-        {
-          *os << "ACE_NEW_RETURN (_tao_base_" << arg->local_name ()
-              << ", " << bt->name () << ", _tao_retval);\n";
-        }
-      else
-        {
-          *os << "ACE_NEW (_tao_base_" << arg->local_name ()
-              << ", " << bt->name () << ");\n";
-        }
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_OUT:
-      // caller should have allocated the pointer
-      os->indent ();
-      *os << "char *&_tao_base_" << arg->local_name ()
-          << " = " << arg->local_name () << ".ptr ();\n";
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (node->size_type () == be_type::VARIABLE)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_OUT:
-          // caller must have allocated the pointer
-          os->indent ();
-          *os << bt->name () << " *&_tao_base_" << arg->local_name ()
-              << " = " << arg->local_name () << ".ptr ();" << be_nl;
-          if (!this->void_return_type ())
-            {
-              *os << "ACE_NEW_RETURN (_tao_base_" << arg->local_name ()
-                  << ", " << bt->name () << ", _tao_retval);\n";
-            }
-          else
-            {
-              *os << "ACE_NEW (_tao_base_" << arg->local_name ()
-                  << ", " << bt->name () << ");\n";
-            }
-          break;
-        default:
-          break;
-        }
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (node->size_type () == be_type::VARIABLE)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << " *&_tao_base_" << arg->local_name ()
-              << " = " << arg->local_name () << ".ptr ();" << be_nl;
-          if (!this->void_return_type ())
-            {
-              *os << "ACE_NEW_RETURN (_tao_base_" << arg->local_name ()
-                  << ", " << bt->name () << ", _tao_retval);\n";
-            }
-          else
-            {
-              *os << "ACE_NEW (_tao_base_" << arg->local_name ()
-                  << ", " << bt->name () << ");\n";
-            }
-          break;
-        default:
-          break;
-        }
-    }
-  return 0;
-}
-
-int
-be_visitor_args_pre_docall_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_docall_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ****************************************************************************
-// visitor for argument passing to do_static_call. The do_static_call method takes a variable
-// number of parameters. The total number of parameters is determined by the
-// "calldata" parameter that must be passed before the variable list
-// starts. Each argument to the do_static_call is considered to be of type "void *".
-// Hence we pass the address of each argument. The case for _out is a bit
-// tricky where we must first retrieve the pointer, allocate memory and pass it
-// to do_static_call. This is done in the "pre_do_static_call" processing.
-// ****************************************************************************
-
-be_visitor_args_docall_cs::be_visitor_args_docall_cs (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_docall_cs::~be_visitor_args_docall_cs (void)
-{
-}
-
-int be_visitor_args_docall_cs::visit_argument (be_argument *node)
-{
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type of the argument
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_docall_cs::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_docall_cs::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      *os << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      // pass reference to the pointer to slice
-      *os << "_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      // pass the address. Storage is already allocated
-      *os << "&" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      *os << "&_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      *os << "&_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get argument node
-
-  os->indent ();
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	  *os << "&" << arg->local_name ();
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << "_tao_base_" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end of if any
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g.,
-                                                         // CORBA::Object,
-                                                         // CORBA::TypeCode
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-          *os << "&" << arg->local_name ();
-          break;
-	case AST_Argument::dir_OUT:
-          *os << "&_tao_base_" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end else if pseudo
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	case AST_Argument::dir_OUT:
-	  *os << "&" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      *os << "_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      *os << "&_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      {
-        // check if the size type is VARIABLE
-        if (node->size_type () == be_type::VARIABLE)
-          *os << "_tao_base_" << arg->local_name ();
-        else
-          *os << "&" << arg->local_name ();
-      }
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      {
-        // check if the size type is VARIABLE
-        if (node->size_type () == be_type::VARIABLE)
-          *os << "_tao_base_" << arg->local_name ();
-        else
-          *os << "&" << arg->local_name ();
-      }
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_docall_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_docall_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// *************************************************************************
-// visitor for argument to do any pre docall processing. Not all types need
-// this. Only those that have an _out type need this.  In addition, interfaces
-// need it because we ned to convert from the interface type to the base Object
-// type and vice versa.
-// *************************************************************************
-
-be_visitor_args_post_docall_cs::be_visitor_args_post_docall_cs
-(be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_post_docall_cs::~be_visitor_args_post_docall_cs (void)
-{
-}
-
-int
-be_visitor_args_post_docall_cs::visit_argument (be_argument *node)
-{
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type of the argument
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_docall_cs::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_docall_cs::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_args_post_docall_cs::visit_interface (be_interface *node)
-{
-  // we must narrow the out object reference to the appropriate type
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      {
-        os->indent ();
-        // assign the narrowed obj reference
-        *os << arg->local_name () << " = " << node->name ()
-            << "::_narrow (_tao_base_" << arg->local_name ()
-            << ", _tao_environment);" << be_nl;
-        *os << "CORBA::release (_tao_base_" << arg->local_name ()
-            << ");\n";
-      }
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_post_docall_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  // we must narrow the out object reference to the appropriate type
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      {
-        os->indent ();
-        // assign the narrowed obj reference
-        *os << arg->local_name () << " = " << node->name ()
-            << "::_narrow (_tao_base_" << arg->local_name ()
-            << ", _tao_environment);" << be_nl;
-        *os << "CORBA::release (_tao_base_" << arg->local_name ()
-            << ");\n";
-      }
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_post_docall_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_docall_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-// Visitor to generate code for argument variable declaration
-// ************************************************************************
-
-be_visitor_args_vardecl_ss::be_visitor_args_vardecl_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_vardecl_ss::~be_visitor_args_vardecl_ss (void)
-{
-}
-
-int be_visitor_args_vardecl_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_vardecl_ss::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_vardecl_ss::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      if (node->size_type () == be_type::VARIABLE)
-        {
-          *os << bt->name () << "_slice *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-          *os << bt->name () << "_out " << arg->local_name ()
-              << " (_tao_ptr_" << arg->local_name () << ");\n";
-        }
-      else
-        *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << "_ptr " << arg->local_name () << ";" << be_nl;
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      *os << bt->name () << "_ptr _tao_ptr_" << arg->local_name () << ";" << be_nl;
-      *os << bt->name () << "_out " << arg->local_name ()
-          << " (_tao_ptr_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << "_ptr " << arg->local_name () << ";" << be_nl;
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::Object_ptr _tao_base_" << arg->local_name () << ";\n";
-      *os << bt->name () << "_ptr _tao_ptr_" << arg->local_name () << ";" << be_nl;
-      *os << bt->name () << "_out " << arg->local_name ()
-          << " (_tao_ptr_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-          os->indent ();
-          *os << bt->name () << " " << arg->local_name () << ";\n";
-	  break;
-	case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << " *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-          *os << bt->name () << "_out " << arg->local_name ()
-              << " (_tao_ptr_" << arg->local_name () << ");\n";
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          os->indent ();
-          *os << bt->name () << "_ptr " << arg->local_name () << ";\n";
-          break;
-        case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << "_ptr _tao_ptr_" << arg->local_name () << ";" << be_nl;
-          *os << bt->name () << "_out " << arg->local_name ()
-              << " (_tao_ptr_" << arg->local_name () << ");\n";
-          break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << bt->name () << " " << arg->local_name () << ";\n";
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << bt->name () << " *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-      *os << bt->name () << "_out " << arg->local_name ()
-          << " (_tao_ptr_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "char *" << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "char *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-      *os << "CORBA::String_out " << arg->local_name ()
-          << " (_tao_ptr_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      // check if it is variable sized
-      if (node->size_type () == be_type::VARIABLE)
-        {
-          *os << bt->name () << " *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-          *os << bt->name () << "_out " << arg->local_name ()
-              << " (_tao_ptr_" << arg->local_name () << ");\n";
-        }
-      else
-        *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      // check if it is variable sized
-      if (node->size_type () == be_type::VARIABLE)
-        {
-          *os << bt->name () << " *_tao_ptr_" << arg->local_name () << ";" << be_nl;
-          *os << bt->name () << "_out " << arg->local_name ()
-              << " (_tao_ptr_" << arg->local_name () << ");\n";
-        }
-      else
-        *os << bt->name () << " " << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_vardecl_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_vardecl_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-// Visitor to generate code for passing argument to the marshal/demarshal
-// routines
-// ************************************************************************
-
-be_visitor_args_marshal_ss::be_visitor_args_marshal_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_marshal_ss::~be_visitor_args_marshal_ss (void)
-{
-}
-
-int be_visitor_args_marshal_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_marshal_ss::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_marshal_ss::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "_tao_ptr_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "&" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "&_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "&_tao_base_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-          os->indent ();
-          *os << "&" << arg->local_name ();
-	  break;
-	case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << "_tao_ptr_" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-          os->indent ();
-          *os << "&" << arg->local_name ();
-	  break;
-	case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << "&_tao_ptr_" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	case AST_Argument::dir_OUT:
-          os->indent ();
-          *os << "&" << arg->local_name ();
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "_tao_ptr_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "&_tao_ptr_" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      if (node->size_type () == be_type::VARIABLE)
-        *os << "_tao_ptr_" << arg->local_name ();
-      else
-        *os << "&" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << "&" << arg->local_name ();
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      if (node->size_type () == be_type::VARIABLE)
-        *os << "_tao_ptr_" << arg->local_name ();
-      else
-        *os << "&" << arg->local_name ();
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_marshal_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_marshal_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-// visitor for passing arguments to the upcall
-// ************************************************************************
-
-be_visitor_args_pre_upcall_ss::be_visitor_args_pre_upcall_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_pre_upcall_ss::~be_visitor_args_pre_upcall_ss (void)
-{
-}
-
-int be_visitor_args_pre_upcall_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_upcall_ss::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_upcall_ss::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT: // inout
-      os->indent ();
-      *os << arg->local_name () << " = " << node->name ()
-          << "::_narrow (_tao_base_" << arg->local_name ()
-          << ", _tao_environment);\n";
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT: // inout
-      os->indent ();
-      *os << arg->local_name () << " = " << node->name ()
-          << "::_narrow (_tao_base_" << arg->local_name ()
-          << "_tao_environment);\n";
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_pre_upcall_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_pre_upcall_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-// visitor for passing arguments to the upcall
-// ************************************************************************
-
-be_visitor_args_upcall_ss::be_visitor_args_upcall_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_upcall_ss::~be_visitor_args_upcall_ss (void)
-{
-}
-
-int be_visitor_args_upcall_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  switch (node->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << node->local_name ();
-      break;
-    }
-  return 0;
-
-}
-
-// ************************************************************************
-//  visitor for doing any post-processing after the upcall is made
-// ************************************************************************
-
-be_visitor_args_post_upcall_ss::be_visitor_args_post_upcall_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_post_upcall_ss::~be_visitor_args_post_upcall_ss (void)
-{
-}
-
-int be_visitor_args_post_upcall_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_upcall_ss::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_upcall_ss::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT: // inout
-      os->indent ();
-      *os << "CORBA::release (_tao_base_" << arg->local_name () << ");"
-          << be_nl;
-      *os << "_tao_base_" << arg->local_name () << " = " << arg->local_name ()
-          << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "_tao_base_" << arg->local_name () << " = _tao_ptr_"
-          << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT: // inout
-      os->indent ();
-      *os << "CORBA::release (_tao_base_" << arg->local_name () << ");"
-          << be_nl;
-      *os << "_tao_base_" << arg->local_name () << " = " << arg->local_name ()
-          << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "_tao_base_" << arg->local_name () << " = _tao_ptr_"
-          << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_upcall_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_upcall_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-//  visitor for doing any post-processing after the marshaling is done
-// ************************************************************************
-
-be_visitor_args_post_marshal_ss::be_visitor_args_post_marshal_ss (be_visitor_context *ctx)
-  : be_visitor_args (ctx)
-{
-}
-
-be_visitor_args_post_marshal_ss::~be_visitor_args_post_marshal_ss (void)
-{
-}
-
-int be_visitor_args_post_marshal_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_marshal_ss::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_marshal_ss::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT: // inout
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::release (_tao_base_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT: // inout
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << "CORBA::release (_tao_base_" << arg->local_name () << ");\n";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end else if
-  else // simple predefined types
-    {
-      switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  break;
-	case AST_Argument::dir_INOUT:
-	  break;
-	case AST_Argument::dir_OUT:
-	  break;
-	} // end switch direction
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_post_marshal_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_post_marshal_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute.cpp
deleted file mode 100644
index e03095678c7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_attribute.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_attribute.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Attribute
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_attribute.h"
-
-// Attribute gets mapped to one or possibly two operations based on whether
-// it is readonly or not. The two operations "get" and "set" the value of the
-// attribute.
-//
-// code generation for attributes is achieved by mapping an attribute node to
-// a corresponding operation node. The reason is that we do not want to
-// duplicate the code. However, an attribute node and an operation node have
-// different interfaces. Hence we need some form of an adapter that can take us
-// from an attribute node to an operation node. The following paragraph
-// describes how this is accomplished.
-//
-// For a "get" operation on the attribute, we create an operation node with the
-// same name as the attribute and a return type which is the same as the type
-// of the attribute. This operation has no arguments.
-//
-// For a "set" operation on the attribute (if it is not readonly), we create an
-// operation node with a "void" return type and an "in" parameter of the same
-// type as the attribute.
-
-// In both cases the context will hold sufficient information to indicate that
-// the operation node is really an attribute node.
-
-// *************************************************************************
-// primary visitor for "attribute". The context state decides the next state
-// *************************************************************************
-
-be_visitor_attribute::be_visitor_attribute (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_attribute::~be_visitor_attribute (void)
-{
-}
-
-int
-be_visitor_attribute::visit_attribute (be_attribute *node)
-{
-  TAO_OutStream *os; // output stream
-  //  be_type *bt;       // type node
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node
-  this->ctx_->attribute (node); // save this attribute node
-
-  be_operation *op;
-
-  // first the "get" operation
-  op = new be_operation (node->field_type (), AST_Operation::OP_noflags,
-                         node->name (), 0);
-  op->set_name (node->name ());
-  be_visitor_context ctx (*this->ctx_);
-
-  // this switch statement eliminates the need for different classes that have
-  // exactly the same code except different states.
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ATTRIBUTE_CH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_CS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || !op || (op->accept (visitor) == -1))
-    {
-      delete visitor;
-      delete op;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "codegen for get_attribute failed\n"),
-                        -1);
-    }
-  delete op;
-  delete visitor;
-  if (node->readonly ())
-    return 0;  // nothing else to do
-
-  // the set method.
-  // the return type  is "void"
-  be_predefined_type *rt = new be_predefined_type (AST_PredefinedType::PT_void,
-                                                   new UTL_ScopedName
-                                                   (new Identifier
-                                                    ("void", 1, 0, I_FALSE), 0),
-                                                   0);
-  // argument type is the same as the attribute type
-  be_argument *arg = new be_argument (AST_Argument::dir_IN,
-                                      node->field_type (),
-                                      node->name (),
-                                      0);
-  arg->set_name (node->name ());
-  // create the operation
-  op = new be_operation (rt, AST_Operation::OP_noflags,
-                         node->name (), 0);
-  op->set_name (node->name ());
-  op->add_argument_to_scope (arg);
-
-  ctx = *this->ctx_;
-  // this switch statement eliminates the need for different classes that have
-  // exactly the same code except different states.
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ATTRIBUTE_CH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_CS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SS);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
-      break;
-    }
-
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || !op || (op->accept (visitor) == -1))
-    {
-      delete visitor;
-      delete op;
-      delete arg;
-      delete rt;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "codegen for set_attribute failed\n"),
-                        -1);
-    }
-  delete op;
-  delete visitor;
-  delete rt;
-  delete arg;
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_constant.cpp b/TAO/TAO_IDL/be/be_visitor_constant.cpp
deleted file mode 100644
index f2b2d722164..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_constant.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_constant.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Constant
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_constant.h"
-
-// ********************************************************************
-// Visitor implementation for the Constant type
-// This one for the client header file
-// ********************************************************************
-
-be_visitor_constant_ch::be_visitor_constant_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_constant_ch::~be_visitor_constant_ch (void)
-{
-}
-
-// visit the Constant_Ch node and its scope
-int
-be_visitor_constant_ch::visit_constant (be_constant *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_hdr_gen ())
-    {
-      // if we are defined in the outermost scope, then the value is assigned
-      // to us here itself, else it will be in the *.cpp file
-
-      os->indent (); // start from whatever indentation level we were at
-      *os << "static const " << node->exprtype_to_string ()
-          << " " << node->local_name ();
-      if (!node->is_nested ())
-        {
-          // We were defined at the outermost scope. So we put the value in the
-          // header itself
-          *os << " = " << node->constant_value ();
-        }
-      *os << ";\n\n";
-      node->cli_hdr_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ********************************************************************
-// Visitor implementation for the Constant type
-// This one for the client stubs file
-// ********************************************************************
-
-be_visitor_constant_cs::be_visitor_constant_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_constant_cs::~be_visitor_constant_cs (void)
-{
-}
-
-// visit the Constant_cs node and its scope
-int
-be_visitor_constant_cs::visit_constant (be_constant *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_hdr_gen ())
-    {
-      if (node->is_nested ())
-        {
-          // for those constants not defined in the outer most scope, they get
-          // assigned to their values in the impl file
-          os->indent (); // start from whatever indentation level we were at
-          *os << "const " << node->exprtype_to_string () << " " << node->name ()
-              << " = " << node->constant_value () << ";\n\n";
-        }
-      node->cli_stub_gen (I_TRUE);
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
deleted file mode 100644
index 11ecf88da38..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_context.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_context.cpp
-//
-// = DESCRIPTION
-//     Maintains the context information for visitors
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// constructor
-be_visitor_context::be_visitor_context (void)
-  : state_ (TAO_CodeGen::TAO_UNKNOWN),
-    os_ (0),
-    scope_ (0),
-    node_ (0),
-    alias_ (0),
-    tdef_ (0),
-    attr_ (0),
-    exception_ (0),
-    comma_ (0)
-{
-}
-
-be_visitor_context::be_visitor_context (const be_visitor_context &ctx)
-  : state_ (ctx.state_),
-    os_ (ctx.os_),
-    scope_ (ctx.scope_),
-    node_ (ctx.node_),
-    alias_ (ctx.alias_),
-    tdef_ (ctx.tdef_),
-    attr_ (ctx.attr_),
-    exception_ (ctx.exception_),
-    comma_ (ctx.comma_)
-{
-}
-
-be_visitor_context &
-be_visitor_context::operator= (const be_visitor_context &ctx)
-{
-  this->state_ = ctx.state_;
-  this->os_ = ctx.os_;
-  this->scope_ = ctx.scope_;
-  this->node_ = ctx.node_;
-  this->alias_ = ctx.alias_;
-  this->tdef_ = ctx.tdef_;
-  this->attr_ = ctx.attr_;
-  this->exception_ = ctx.exception_;
-  this->comma_ = ctx.comma_;
-
-  return *this;
-}
-
-be_visitor_context::~be_visitor_context (void)
-{
-  // we do not own anything
-}
-
-//= helpers
-
-void
-be_visitor_context::stream (TAO_OutStream *os)
-{
-  this->os_ = os;
-}
-
-TAO_OutStream *
-be_visitor_context::stream (void)
-{
-  return this->os_;
-}
-
-void
-be_visitor_context::scope (be_decl *s)
-{
-  this->scope_ = s;
-}
-
-be_decl *
-be_visitor_context::scope (void)
-{
-  return this->scope_;
-}
-
-void
-be_visitor_context::node (be_decl *n)
-{
-  this->node_ = n;
-}
-
-be_decl *
-be_visitor_context::node (void)
-{
-  return this->node_;
-}
-
-void
-be_visitor_context::state (TAO_CodeGen::CG_STATE st)
-{
-  this->state_ = st;
-}
-
-TAO_CodeGen::CG_STATE
-be_visitor_context::state (void)
-{
-  return this->state_;
-}
-
-void
-be_visitor_context::tdef (be_typedef *node)
-{
-  this->tdef_ = node;
-}
-
-be_typedef *
-be_visitor_context::tdef (void)
-{
-  return this->tdef_;
-}
-
-void
-be_visitor_context::alias (be_typedef *node)
-{
-  this->alias_ = node;
-}
-
-be_typedef *
-be_visitor_context::alias (void)
-{
-  return this->alias_;
-}
-
-void
-be_visitor_context::attribute (be_attribute *node)
-{
-  this->attr_ = node;
-}
-
-be_attribute *
-be_visitor_context::attribute (void)
-{
-  return this->attr_;
-}
-
-void
-be_visitor_context::exception (idl_bool ib)
-{
-  this->exception_ = ib;
-}
-
-idl_bool
-be_visitor_context::exception (void)
-{
-  return this->exception_;
-}
-
-void
-be_visitor_context::comma (idl_bool ib)
-{
-  this->comma_ = ib;
-}
-
-idl_bool
-be_visitor_context::comma (void)
-{
-  return this->comma_;
-}
-
-// return the node as argument if possible
-be_argument *
-be_visitor_context::be_node_as_argument (void)
-{
-  if (this->node_)
-    return be_argument::narrow_from_decl (this->node_);
-  else
-    return (be_argument *)0;
-}
-
-// return the node as array if possible
-be_array *
-be_visitor_context::be_node_as_array (void)
-{
-  if (this->node_)
-    return be_array::narrow_from_decl (this->node_);
-  else
-    return (be_array *)0;
-}
-
-// return the node as attribute if possible
-be_attribute *
-be_visitor_context::be_node_as_attribute (void)
-{
-  if (this->node_)
-    return be_attribute::narrow_from_decl (this->node_);
-  else
-    return (be_attribute *)0;
-}
-
-// return the node as constant if possible
-be_constant *
-be_visitor_context::be_node_as_constant (void)
-{
-  if (this->node_)
-    return be_constant::narrow_from_decl (this->node_);
-  else
-    return (be_constant *)0;
-}
-
-// return the node as enum if possible
-be_enum *
-be_visitor_context::be_node_as_enum (void)
-{
-  if (this->node_)
-    return be_enum::narrow_from_decl (this->node_);
-  else
-    return (be_enum *)0;
-}
-
-// return the node as enum_val if possible
-be_enum_val *
-be_visitor_context::be_node_as_enum_val (void)
-{
-  if (this->node_)
-    return be_enum_val::narrow_from_decl (this->node_);
-  else
-    return (be_enum_val *)0;
-}
-
-// return the node as exception if possible
-be_exception *
-be_visitor_context::be_node_as_exception (void)
-{
-  if (this->node_)
-    return be_exception::narrow_from_decl (this->node_);
-  else
-    return (be_exception *)0;
-}
-
-// return the node as field if possible
-be_field *
-be_visitor_context::be_node_as_field (void)
-{
-  if (this->node_)
-    return be_field::narrow_from_decl (this->node_);
-  else
-    return (be_field *)0;
-}
-
-// return the node as interface if possible
-be_interface *
-be_visitor_context::be_node_as_interface (void)
-{
-  if (this->node_)
-    return be_interface::narrow_from_decl (this->node_);
-  else
-    return (be_interface *)0;
-}
-
-// return the node as interface_fwd if possible
-be_interface_fwd *
-be_visitor_context::be_node_as_interface_fwd (void)
-{
-  if (this->node_)
-    return be_interface_fwd::narrow_from_decl (this->node_);
-  else
-    return (be_interface_fwd *)0;
-}
-
-// return the node as module if possible
-be_module *
-be_visitor_context::be_node_as_module (void)
-{
-  if (this->node_)
-    return be_module::narrow_from_decl (this->node_);
-  else
-    return (be_module *)0;
-}
-
-// return the node as operation if possible
-be_operation *
-be_visitor_context::be_node_as_operation (void)
-{
-  if (this->node_)
-    return be_operation::narrow_from_decl (this->node_);
-  else
-    return (be_operation *)0;
-}
-
-// return the node as predefined_type if possible
-be_predefined_type *
-be_visitor_context::be_node_as_predefined_type (void)
-{
-  if (this->node_)
-    return be_predefined_type::narrow_from_decl (this->node_);
-  else
-    return (be_predefined_type *)0;
-}
-
-// return the node as root if possible
-be_root *
-be_visitor_context::be_node_as_root (void)
-{
-  if (this->node_)
-    return be_root::narrow_from_decl (this->node_);
-  else
-    return (be_root *)0;
-}
-
-// return the node as sequence if possible
-be_sequence *
-be_visitor_context::be_node_as_sequence (void)
-{
-  if (this->node_)
-    return be_sequence::narrow_from_decl (this->node_);
-  else
-    return (be_sequence *)0;
-}
-
-// return the node as string if possible
-be_string *
-be_visitor_context::be_node_as_string (void)
-{
-  if (this->node_)
-    return be_string::narrow_from_decl (this->node_);
-  else
-    return (be_string *)0;
-}
-
-// return the node as structure if possible
-be_structure *
-be_visitor_context::be_node_as_structure (void)
-{
-  if (this->node_)
-    return be_structure::narrow_from_decl (this->node_);
-  else
-    return (be_structure *)0;
-}
-
-// return the node as typedef if possible
-be_typedef *
-be_visitor_context::be_node_as_typedef (void)
-{
-  if (this->node_)
-    return be_typedef::narrow_from_decl (this->node_);
-  else
-    return (be_typedef *)0;
-}
-
-// return the node as union if possible
-be_union *
-be_visitor_context::be_node_as_union (void)
-{
-  if (this->node_)
-    return be_union::narrow_from_decl (this->node_);
-  else
-    return (be_union *)0;
-}
-
-// return the node as union_branch if possible
-be_union_branch *
-be_visitor_context::be_node_as_union_branch (void)
-{
-  if (this->node_)
-    return be_union_branch::narrow_from_decl (this->node_);
-  else
-    return (be_union_branch *)0;
-}
-
-// for scope
-
-// return the scope as enum if possible
-be_enum *
-be_visitor_context::be_scope_as_enum (void)
-{
-  if (this->scope_)
-    return be_enum::narrow_from_decl (this->scope_);
-  else
-    return (be_enum *)0;
-}
-
-// return the scope as exception if possible
-be_exception *
-be_visitor_context::be_scope_as_exception (void)
-{
-  if (this->scope_)
-    return be_exception::narrow_from_decl (this->scope_);
-  else
-    return (be_exception *)0;
-}
-
-// return the scope as interface if possible
-be_interface *
-be_visitor_context::be_scope_as_interface (void)
-{
-  if (this->scope_)
-    return be_interface::narrow_from_decl (this->scope_);
-  else
-    return (be_interface *)0;
-}
-
-// return the scope as module if possible
-be_module *
-be_visitor_context::be_scope_as_module (void)
-{
-  if (this->scope_)
-    return be_module::narrow_from_decl (this->scope_);
-  else
-    return (be_module *)0;
-}
-
-// return the scope as operation if possible
-be_operation *
-be_visitor_context::be_scope_as_operation (void)
-{
-  if (this->scope_)
-    return be_operation::narrow_from_decl (this->scope_);
-  else
-    return (be_operation *)0;
-}
-
-// return the scope as root if possible
-be_root *
-be_visitor_context::be_scope_as_root (void)
-{
-  if (this->scope_)
-    return be_root::narrow_from_decl (this->scope_);
-  else
-    return (be_root *)0;
-}
-
-// return the scope as structure if possible
-be_structure *
-be_visitor_context::be_scope_as_structure (void)
-{
-  if (this->scope_)
-    return be_structure::narrow_from_decl (this->scope_);
-  else
-    return (be_structure *)0;
-}
-
-// return the scope as union if possible
-be_union *
-be_visitor_context::be_scope_as_union (void)
-{
-  if (this->scope_)
-    return be_union::narrow_from_decl (this->scope_);
-  else
-    return (be_union *)0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp
deleted file mode 100644
index 86b6a179068..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_decl.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_decl.cpp
-//
-// = DESCRIPTION
-//    Visitor for the base be_decl node. This serves to maintain the current
-//    state (context) of code generation for the derived visitor.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_decl.h"
-
-// Root visitor for client header
-be_visitor_decl::be_visitor_decl (be_visitor_context *ctx)
-  : ctx_ (ctx)
-{
-}
-
-be_visitor_decl::~be_visitor_decl (void)
-{
-  delete this->ctx_;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_enum.cpp b/TAO/TAO_IDL/be/be_visitor_enum.cpp
deleted file mode 100644
index 08692251985..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_enum.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_enum.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Enum
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_enum.h"
-
-// ********************************************************************
-// Visitor implementation for the Enum type
-// This one for the client header file
-// ********************************************************************
-
-be_visitor_enum_ch::be_visitor_enum_ch (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_enum_ch::~be_visitor_enum_ch (void)
-{
-}
-
-// visit the Enum_Ch node and its scope
-int
-be_visitor_enum_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  this->ctx_->comma (1); // comma to be generated by the scope visitor
-
-  if (!node->cli_hdr_gen () && !node->imported ())
-    {
-      os->indent (); // start from whatever indentation level we were at
-      *os << "enum " << node->local_name () << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      if (this->visit_scope (node) == 1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_enum_ch::"
-                             "visit_enum - "
-                             "scope generation failed\n"
-                             ), -1);
-        }
-      *os << "\n";
-      os->decr_indent ();
-      *os << "};" << be_nl;
-      // As per the ORBOS spec, we need the following typedef
-      *os << "typedef " << node->local_name () << " &" << node->local_name ()
-          << "_out;\n";
-
-      // Generate the typecode decl
-      if (node->is_nested ())
-        {
-          // we have a scoped name
-          os->indent ();
-          *os << "static CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          os->indent ();
-          *os << "extern CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      node->cli_hdr_gen (I_TRUE);
-    }
-  return 0;
-}
-
-int
-be_visitor_enum_ch::post_process (void)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << "," << be_nl;
-  return 0;
-}
-
-int
-be_visitor_enum_ch::visit_enum_val (be_enum_val *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->indent ();
-  *os << node->local_name ();
-
-  return 0;
-}
-
-
-// ********************************************************************
-// Visitor implementation for the Enum type
-// This one for the client stubs file
-// ********************************************************************
-
-be_visitor_enum_cs::be_visitor_enum_cs (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_enum_cs::~be_visitor_enum_cs (void)
-{
-}
-
-// visit the Enum_cs node and its scope
-int
-be_visitor_enum_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_stub_gen () && !node->imported ())
-    {
-      // generate the typecode information here
-      os->indent (); // start from current indentation level
-      *os << be_nl
-          << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
-          << be_nl
-          << "{" << be_idt_nl;
-      if (node->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_enum_cs::"
-                             "visit_enum - "
-                             "scope generation failed\n"
-                             ), -1);
-        }
-      os->decr_indent ();
-      *os << "};" << be_nl;
-
-      *os << "static CORBA::TypeCode _tc__tc_" << node->flatname ()
-          << " (CORBA::tk_enum, sizeof (_oc_" <<  node->flatname ()
-          << "), (char *) &_oc_" << node->flatname ()
-          << ", CORBA::B_FALSE);" << be_nl;
-      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_"
-          <<  node->flatname () << ";\n\n";
-      node->cli_stub_gen (I_TRUE);
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception.cpp
deleted file mode 100644
index b57d4527a87..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_exception.cpp
+++ /dev/null
@@ -1,982 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_exception.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Exception
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_exception.h"
-
-// generic struct visitor
-be_visitor_exception::be_visitor_exception (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_exception::~be_visitor_exception (void)
-{
-}
-
-// visit the Exception node and its scope
-int
-be_visitor_exception::visit_exception (be_exception *node)
-{
-  return -1; // must be overriden
-}
-
-int
-be_visitor_exception::visit_field (be_field *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_EXCEPTION_CH:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CH);
-      break;
-    case TAO_CodeGen::TAO_EXCEPTION_CI:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CI);
-      break;
-    case TAO_CodeGen::TAO_EXCEPTION_CS:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_exception::"
-                           "visit_field - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_exception::"
-                         "visit_field - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_exception::"
-                         "visit_field - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// for client header
-// ******************************************************
-
-be_visitor_exception_ch::be_visitor_exception_ch (be_visitor_context *ctx)
-  : be_visitor_exception (ctx)
-{
-}
-
-be_visitor_exception_ch::~be_visitor_exception_ch (void)
-{
-}
-
-// visit the Exception node and its scope
-int be_visitor_exception_ch::visit_exception (be_exception *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
-                                                   // not imported
-    {
-      os = this->ctx_->stream ();
-
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
-
-      os->indent ();
-      *os << "class " << node->local_name () << ";" << be_nl;
-      // generate the _ptr declaration
-      *os << "typedef " << node->local_name () << " *"
-	  << node->local_name () << "_ptr;" << be_nl;
-      os->gen_endif ();
-
-      os->gen_ifdef_macro (node->flatname ());
-
-      os->indent ();
-      *os << "class " << idl_global->export_macro ()
-	  << " " << node->local_name ()
-	  << " : public CORBA::UserException" << be_nl;
-      *os << "{" << be_nl
-	  << "public:\n";
-      os->incr_indent ();
-      // constructors and destructor
-      *os << node->local_name () << " (void); // default ctor" << be_nl;
-      *os << node->local_name () << " (const " << node->local_name ()
-          << " &); // copy ctor" << be_nl;
-      *os << "~" << node->local_name () << " (void); // dtor" << be_nl;
-
-      // generate constructor that takes each member as a parameter. We need a
-      // new state. Such a constructor exists if we have members
-      if (node->member_count () > 0)
-        {
-          be_visitor_context ctx (*this->ctx_);
-          ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CH);
-          be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_exception::"
-                                 "visit_exception - "
-                                 "codegen for ctor failed\n"), -1);
-            }
-          delete visitor;
-        }
-
-      os->indent ();
-      // assignment operator
-      *os << node->local_name () << " &operator= (const "
-          << node->local_name () << " &);" << be_nl;
-      // the static _narrow method
-      *os << "static " << node->local_name ()
-          << " *_narrow (CORBA::Exception *);\n";
-
-      // generate code for field members
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_ch::"
-                             "visit_exception - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "};" << be_nl;
-
-      // generate the typecode decl
-      if (node->is_nested ())
-        {
-          // we have a scoped name
-          *os << "static CORBA::TypeCode_ptr "
-              << node->tc_name ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          *os << "extern "
-	      << idl_global->export_macro ()
-	      << " CORBA::TypeCode_ptr "
-	      << node->tc_name ()->last_component () << ";\n\n";
-        }
-      os->gen_endif ();
-
-      node->cli_hdr_gen (1);
-
-    }
-  return 0;
-}
-
-// ******************************************************
-// for client inline
-// ******************************************************
-
-be_visitor_exception_ci::be_visitor_exception_ci (be_visitor_context *ctx)
-  : be_visitor_exception (ctx)
-{
-}
-
-be_visitor_exception_ci::~be_visitor_exception_ci (void)
-{
-}
-
-// visit the Exception node and its scope
-int be_visitor_exception_ci::visit_exception (be_exception *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  if (!node->cli_inline_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-      os->indent ();
-      *os << "// *************************************************************"
-          << be_nl;
-      *os << "// Inline operations for exception " << node->name () << be_nl;
-      *os << "// *************************************************************\n\n";
-
-      // generate inline code  required of any anonymous types of members
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception::"
-                             "visit_exception -"
-                             "code for inline failed\n"), -1);
-        }
-
-      node->cli_inline_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ***************************************************************************
-// for client stubs
-// ***************************************************************************
-be_visitor_exception_cs::be_visitor_exception_cs (be_visitor_context *ctx)
-  : be_visitor_exception (ctx)
-{
-}
-
-be_visitor_exception_cs::~be_visitor_exception_cs (void)
-{
-}
-
-// visit the Exception_Cs node and its scope
-int be_visitor_exception_cs::visit_exception (be_exception *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_stub_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-
-      // default constructor
-      os->indent ();
-      *os << "// default constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
-      *os << "  : CORBA_UserException (CORBA::TypeCode::_duplicate ("
-          << node->tc_name () << "))\n";
-      *os << "{" << be_nl;
-      *os << "}\n\n";
-
-      // destructor
-      os->indent ();
-      *os << "// destructor - all members are of self managing types" << be_nl;
-      *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl;
-      *os << "{" << be_nl;
-      *os << "}\n\n";
-
-      // copy constructor
-      os->indent ();
-      *os << "// copy constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (const " <<
-        node->name () << " &_tao_excp)" << be_nl;
-      *os << "  :CORBA_UserException (" <<
-        "CORBA::TypeCode::_duplicate (_tao_excp._type ()))" << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      // assign each individual member
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cs::"
-                             "visit_exception -"
-                             "codegen for scope failed\n"), -1);
-        }
-      delete visitor;
-      os->decr_indent ();
-      *os << "}\n\n";
-
-      // assignment operator
-      os->indent ();
-      *os << "// assignment operator" << be_nl;
-      *os << node->name () << "&" << be_nl;
-      *os << node->name () << "::operator= (const " <<
-        node->name () << " &_tao_excp)" << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      *os << "this->type_ = " <<
-        "CORBA::TypeCode::_duplicate (_tao_excp._type ());\n";
-      // assign each individual member
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cs::"
-                             "visit_exception -"
-                             "codegen for scope failed\n"), -1);
-        }
-      delete visitor;
-      os->indent ();
-      *os << "return *this;\n";
-      os->decr_indent ();
-      *os << "}\n\n";
-
-      // constructor taking all members. It exists only if there are any
-      // members
-      if (node->member_count () > 0)
-        {
-          // generate the signature
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
-          visitor = tao_cg->make_visitor (&ctx);
-
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_exception::"
-                                 "visit_exception - "
-                                 "codegen for ctor failed\n"), -1);
-            }
-          delete visitor;
-
-          *os << "  : CORBA_UserException "
-              << " (CORBA::TypeCode::_duplicate (" << node->tc_name ()
-              << "))" << be_nl;
-          *os << "{\n";
-          os->incr_indent ();
-          // assign each individual member. We need yet another state
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS);
-          ctx.exception (1); // indicate that the special ctor is being
-                             // generated
-          visitor = tao_cg->make_visitor (&ctx);
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              delete visitor;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_exception_cs::"
-                                 "visit_exception -"
-                                 "codegen for scope failed\n"), -1);
-            }
-          delete visitor;
-          os->decr_indent ();
-          *os << "}\n\n";
-        }
-
-      // narrow method
-      os->indent ();
-      *os << "// narrow" << be_nl;
-      *os << node->name () << "_ptr " << be_nl;
-      *os << node->name () << "::_narrow (CORBA::Exception *exc)" << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      *os << "if (!ACE_OS::strcmp (\"" << node->repoID () <<
-        "\", exc->_id ())) // same type" << be_nl;
-      *os << "  return ACE_dynamic_cast (" << node->name () << "_ptr, exc);" <<
-        be_nl;
-      *os << "else" << be_nl;
-      *os << "  return 0;\n";
-      os->decr_indent ();
-      *os << "}\n\n";
-
-      // generate the typecode information here
-      os->indent (); // start from current indentation level
-      *os << "static const CORBA::Long _oc_" << node->flatname () << "[] =" <<
-        be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (node->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_structure::gen_client_stubs -"
-                             "codegen for scope failed\n"), -1);
-        }
-      os->decr_indent ();
-      *os << "};" << be_nl;
-
-      *os << "static CORBA::TypeCode _tc__tc_" << node->flatname () <<
-        " (CORBA::tk_except, sizeof (_oc_" <<  node->flatname () <<
-        "), (char *) &_oc_" << node->flatname () <<
-        ", CORBA::B_FALSE);" << be_nl;
-      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_" <<
-        node->flatname () << ";\n\n";
-
-      node->cli_stub_gen (I_TRUE);
-    }
-
-  return 0;
-}
-
-// ************************************************************************
-//  code to generate the special ctor
-// ************************************************************************
-
-be_visitor_exception_ctor::be_visitor_exception_ctor
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_exception_ctor::~be_visitor_exception_ctor (void)
-{
-}
-
-int
-be_visitor_exception_ctor::post_process (void)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  *os << ",\n";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_exception (be_exception *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << node->local_name ();
-  else
-    *os << node->name () << "::" << node->local_name ();
-  *os << "(" << be_idt << "\n";
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor_assign::"
-                         "visit_exception - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << be_uidt << ");\n\n";
-  else
-    *os << be_uidt << ")\n\n";
-
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_field (be_field *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor::"
-                         "visit_exception - "
-                         "Bad field type\n"),
-                        -1);
-    }
-
-  os->indent ();
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor::"
-                         "visit_field - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  *os << " _tao_" << node->local_name ();
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  *os << "_ptr ";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  *os << "_ptr ";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-        *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-      else
-        *os << "const " << bt->name ();
-      *os << " &";
-      return 0;
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-        *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-      else
-        *os << "const " << bt->name ();
-      *os << "_ptr ";
-    } // end else if
-  else // simple predefined types
-    {
-      if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-        *os << bt->nested_type_name (this->ctx_->scope ());
-      else
-        *os << bt->name ();
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  *os << " &";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  *os << "const char *";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  *os << " &";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  // set the right type;
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
-    *os << "const " << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << "const " << bt->name ();
-  *os << " &";
-  return 0;
-}
-
-int be_visitor_exception_ctor::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ************************************************************************
-// used for the body of the assignment operator and the copy constructor
-// ************************************************************************
-
-be_visitor_exception_ctor_assign::be_visitor_exception_ctor_assign (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_exception_ctor_assign::~be_visitor_exception_ctor_assign (void)
-{
-}
-
-int be_visitor_exception_ctor_assign::visit_exception (be_exception *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor_assign::"
-                         "visit_exception - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_field (be_field *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor_assign::"
-                         "visit_field - "
-                         "Bad field type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor_assign::"
-                         "visit_field - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
-          << ";\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
-          << ";\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
-          << ";\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
-          << ";\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_" << bd->local_name () << ");\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_excp." << bd->local_name () << ".in ());\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_" << bd->local_name () << ");\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_excp." << bd->local_name () << ".in ());\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  return 0;
-  // check if the type is an any
-  if (node->pt () == AST_PredefinedType::PT_any)
-    {
-      if (this->ctx_->exception ()) // special ctor
-        {
-          *os << "this->" << bd->local_name () << " = _tao_"
-              << bd->local_name () << ";\n";
-        }
-      else
-        {
-          *os << "this->" << bd->local_name () << " = _tao_excp."
-              << bd->local_name () << ";\n";
-        }
-    } // end of if
-  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-    {
-      if (this->ctx_->exception ()) // special ctor
-        {
-          *os << "this->" << bd->local_name () << " = "
-              << node->name () << "::_duplicate (_tao_"
-              << bd->local_name () << ");\n";
-        }
-      else
-        {
-          *os << "this->" << bd->local_name () << " = "
-              << node->name () << "::_duplicate (_tao_excp."
-              << bd->local_name () << ".in ());\n";
-        }
-    } // end else if
-  else // simple predefined types
-    {
-      if (this->ctx_->exception ()) // special ctor
-        {
-          *os << "this->" << bd->local_name () << " = _tao_"
-              << bd->local_name () << ";\n";
-        }
-      else
-        {
-          *os << "this->" << bd->local_name () << " = _tao_excp."
-              << bd->local_name () << ";\n";
-        }
-    } // end of else
-
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
-          << ";\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
-          << ";\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = CORBA::string_dup (_tao_"
-          << bd->local_name () << ");\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name ()
-          << " = CORBA::string_dup (_tao_excp." << bd->local_name ()
-          << ".in ());\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_structure (be_structure *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
-          << ";\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
-          << ";\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_union (be_union *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_decl *bd = this->ctx_->node ();
-
-  os->indent ();
-  if (this->ctx_->exception ()) // special ctor
-    {
-      *os << "this->" << bd->local_name () << " = _tao_" << bd->local_name ()
-          << ";\n";
-    }
-  else
-    {
-      *os << "this->" << bd->local_name () << " = _tao_excp." << bd->local_name ()
-          << ";\n";
-    }
-  return 0;
-}
-
-int be_visitor_exception_ctor_assign::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_exception_ctor_assign::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_field.cpp b/TAO/TAO_IDL/be/be_visitor_field.cpp
deleted file mode 100644
index 1eaa5ee04d7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_field.cpp
+++ /dev/null
@@ -1,784 +0,0 @@
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_field.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Field" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-
-#include "be_visitor_field.h"
-
-// **********************************************
-//  visitor for field in the client header file
-// **********************************************
-
-// constructor
-be_visitor_field_ch::be_visitor_field_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_field_ch::~be_visitor_field_ch (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_field_ch::visit_field (be_field *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt; // field's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  // now output the field name
-  *os << " " << node->local_name () << ";\n";
-  return 0;
-}
-
-// =visit operations on all possible data types  that a field can be
-
-// visit array type
-int
-be_visitor_field_ch::visit_array (be_array *node)
-{
-  // TO-DO
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_field_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // now use this enum as a "type" for the subsequent declarator
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope ());
-
-  return 0;
-}
-
-// visit interface type
-int
-be_visitor_field_ch::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope (), "_var");
-  return 0;
-}
-
-// visit interface forward type
-int
-be_visitor_field_ch::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope (), "_var");
-  return 0;
-}
-
-// visit predefined type
-int
-be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  os->indent (); // start from current indentation level
-  if (node->pt () == AST_PredefinedType::PT_pseudo) // is a psuedo obj
-    *os << bt->nested_type_name (this->ctx_->scope (), "_var");
-  else
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  return 0;
-}
-
-// visit sequence type
-int
-be_visitor_field_ch::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope ());
-  return 0;
-}
-
-// visit string type
-int
-be_visitor_field_ch::visit_string (be_string *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent (); // start from current indentation level
-  // set the right type;
-  if (this->ctx_->alias ())
-    {
-      *os << this->ctx_->alias ()->nested_type_name (this->ctx_->scope ())
-          << "_var";
-    }
-  else
-    *os << "CORBA::String_var";
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_field_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the struct declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_struct - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope ());
-  return 0;
-}
-
-// visit typedefed type
-int
-be_visitor_field_ch::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);     // save the node for use in code generation and
-                               // indicate that the field of the field node
-                               // is a typedefed quantity
-
-  // make a decision based on the primitive base type
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_spec_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_field_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  os->indent (); // start from current indentation level
-  *os << bt->nested_type_name (this->ctx_->scope ());
-  return 0;
-}
-
-// **********************************************
-//  visitor for field in the client inline file.
-//
-//  Generate inline code for types that are defined
-//  inside the structure
-// **********************************************
-
-// constructor
-be_visitor_field_ci::be_visitor_field_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_field_ci::~be_visitor_field_ci (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_field_ci::visit_field (be_field *node)
-{
-  TAO_OutStream *os;
-  be_type *bt; // field's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ci::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ci::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types  that a field can be
-
-// visit array
-int
-be_visitor_field_ci::visit_array (be_array *node)
-{
-  return 0;
-}
-
-// visit sequence
-int
-be_visitor_field_ci::visit_sequence (be_sequence *node)
-{
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_field_ci::visit_structure (be_structure *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-                                                // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // generate the inline code for structs
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ci::"
-                             "visit_struct - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ci::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit typedef type
-int
-be_visitor_field_ci::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_field_ci::visit_union (be_union *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-                                                // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // generate the inline code for union
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ci::"
-                             "visit_struct - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_ci::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// **********************************************
-//  visitor for field in the client stubs file
-// **********************************************
-
-// constructor
-be_visitor_field_cs::be_visitor_field_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_field_cs::~be_visitor_field_cs (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_field_cs::visit_field (be_field *node)
-{
-  TAO_OutStream *os; // output stream
-
-  be_type *bt; // field's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cs::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cs::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit array
-int
-be_visitor_field_cs::visit_array (be_array *node)
-{
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_field_cs::visit_enum (be_enum *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // generate the typcode for enums
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-int
-be_visitor_field_cs::visit_sequence (be_sequence *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope is
-      // still the same
-
-      // generate the inline code for structs
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_field_cs::visit_structure (be_structure *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope is
-      // still the same
-
-      // generate the inline code for structs
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_struct - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit typedef type
-int
-be_visitor_field_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_field_cs::visit_union (be_union *node)
-{
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope is
-      // still the same
-
-      // generate the inline code for union
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_field_cs::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
deleted file mode 100644
index 6dea0191d48..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ /dev/null
@@ -1,1935 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_interface.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Interface
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-
-#include "be_visitor_interface.h"
-
-// ******************************************************
-// Generic Interface visitor
-// ******************************************************
-
-be_visitor_interface::be_visitor_interface (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_interface::~be_visitor_interface (void)
-{
-}
-
-// this method must be overridden by the derived interface visitors
-int
-be_visitor_interface::visit_interface (be_interface *node)
-{
-  return -1;
-}
-
-// =all common visit methods for interface visitor
-
-// visit an attribute
-int
-be_visitor_interface::visit_attribute (be_attribute *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_SH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_SS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_COLLOCATED_SS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_attribute - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_attribute - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_attribute - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a constant
-int
-be_visitor_interface::visit_constant (be_constant *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_constant - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_constant - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_constant - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-//visit an enum
-int
-be_visitor_interface::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_enum - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_enum - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_enum - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an exception
-int
-be_visitor_interface::visit_exception (be_exception *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CI);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_exception - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_exception - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_exception - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an operation
-int
-be_visitor_interface::visit_operation (be_operation *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CH);
-      //      return node->gen_client_header ();
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_CS);
-      //      return node->gen_client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SH);
-      //      return node->gen_server_header ();
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_SS);
-      //      return node->gen_server_skeletons ();
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_operation - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  // grab the appropriate visitor
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_operation - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // visit the node using this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_operation - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an structure
-int
-be_visitor_interface::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_structure - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_structure - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_structure - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a union
-int
-be_visitor_interface::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_union - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_union - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_union - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a typedef
-int
-be_visitor_interface::visit_typedef (be_typedef *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_INTERFACE_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CH);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CI:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CI);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CS);
-      break;
-    case TAO_CodeGen::TAO_INTERFACE_SH:
-    case TAO_CodeGen::TAO_INTERFACE_SI:
-    case TAO_CodeGen::TAO_INTERFACE_SS:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_interface::"
-                           "visit_typedef - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_typedef - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface::"
-                         "visit_typedef - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// Interface visitor for client header
-// ******************************************************
-
-be_visitor_interface_ch::be_visitor_interface_ch (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_ch::~be_visitor_interface_ch (void)
-{
-}
-
-int
-be_visitor_interface_ch::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  long i;            // loop index
-
-  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
-                                                   // not imported
-    {
-
-      os = this->ctx_->stream ();
-
-      // == STEP 1:  generate the class name and class names we inherit ==
-
-      // generate the ifdefined macro for  the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
-
-      // the following two are required to be under the ifdef macro to avoid
-      // multiple declarations
-
-      os->indent (); // start with whatever indentation level we are at
-      // forward declaration
-      *os << "class " << node->local_name () << ";" << be_nl;
-      // generate the _ptr declaration
-      *os << "typedef " << node->local_name () << " *" << node->local_name ()
-          << "_ptr;" << be_nl;
-
-      os->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      // generate the _var declaration
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_ch::"
-                             "visit_interface - "
-                             "codegen for _var failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      // generate the ifdef macro for the _out class
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_ch::"
-                             "visit_interface - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-
-      // now the interface definition itself
-      os->gen_ifdef_macro (node->flatname ());
-
-      // now generate the class definition
-      os->indent ();
-      *os << "class " << idl_global->export_macro ()
-	  << " " << node->local_name ();
-
-      if (node->n_inherits () > 0)  // node interface inherits from other
-                                    // interfaces
-        {
-          *os << ": ";
-          for (i = 0; i < node->n_inherits (); i++)
-            {
-              be_interface *inherited =
-                be_interface::narrow_from_decl (node->inherits ()[i]);
-              be_decl *scope = 0;
-              if (inherited->is_nested ())
-                {
-                  // inherited node is used in the scope of "node" node
-                  scope = be_scope::narrow_from_scope (node->defined_in ())
-                    ->decl ();
-                }
-
-              *os << "public virtual ";
-              *os << inherited->nested_type_name (scope);  // dump the scoped name
-              if (i < node->n_inherits () - 1) // node is the case of multiple
-                                               // inheritance, so put a comma
-                {
-                  *os << ", ";
-                }
-            }  // end of for loop
-          *os << be_nl;
-        }
-      else
-        {
-          // we do not inherit from anybody, hence we do so from the base
-          // CORBA::Object class
-          *os << " : public virtual CORBA::Object" << be_nl;
-        }
-
-      // generate the body
-
-      *os << "{" << be_nl
-          << "public:" << be_idt_nl
-        // generate the static _duplicate, _narrow, and _nil operations
-          << "// the static operations" << be_nl
-          << "static " << node->local_name () << "_ptr " << "_duplicate ("
-          << node->local_name () << "_ptr obj);" << be_nl
-          << "static " << node->local_name () << "_ptr " << "_narrow ("
-          << "CORBA::Object_ptr obj, CORBA::Environment &env);" << be_nl
-          << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n";
-
-      // generate code for the interface definition by traversing thru the
-      // elements of its scope. We depend on the front-end to have made sure
-      // that only legal syntactic elements appear in our scope.
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_ch::"
-                             "visit_interface - "
-                             "codegen for scope failed\n"), -1);
-        }
-      // the _is_a method
-      os->indent ();
-      *os << "virtual CORBA::Boolean _is_a ("
-	  << "const CORBA::Char *type_id, " << be_idt << be_idt_nl
-          << "CORBA::Environment &env" << be_uidt_nl
-	  << ");" << be_uidt_nl
-	  << "virtual const char* "
-	  << "_interface_repository_id (void) const;" << be_uidt_nl;
-
-      // generate the "protected" constructor so that users cannot instantiate
-      // us
-      *os << "protected:" << be_idt_nl
-	  << node->local_name () << " (void); // default constructor" << be_nl
-          << node->local_name ()
-	  << " (STUB_Object *objref, " << be_idt << be_idt_nl
-          << "TAO_ServantBase *_tao_servant = 0, " << be_nl
-          << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl
-	  << ");" << be_uidt_nl
-          << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
-
-      // private copy constructor and assignment operator. These are not
-      // allowed, hence they are private.
-      *os << "private:\n";
-      os->incr_indent ();
-      *os << node->local_name () << " (const " << node->local_name () << " &);"
-          << be_nl
-          << "void operator= (const " << node->local_name () << " &);\n";
-      os->decr_indent ();
-      *os << "};\n\n";
-      os->gen_endif ();
-
-
-      // generate the typecode decl. If we are in the outermost scope, our typecode
-      // decl is extern
-      if (node->is_nested ())
-        {
-          // we have a scoped name
-          os->indent ();
-          *os << "static CORBA::TypeCode_ptr "
-	      << node->tc_name ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          os->indent ();
-          *os << "extern CORBA::TypeCode_ptr "
-	      << node->tc_name ()->last_component () << ";\n\n";
-        }
-
-      node->cli_hdr_gen (I_TRUE);
-    } // if !cli_hdr_gen
-  return 0;
-}
-
-// **************************************************
-// Interface visitor for client inline
-// **************************************************
-be_visitor_interface_ci::be_visitor_interface_ci (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_ci::~be_visitor_interface_ci (void)
-{
-}
-
-int
-be_visitor_interface_ci::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->cli_inline_gen () || node->imported ())
-    return 0;
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from the current indentation level
-
-  // generate the constructors and destructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () <<
-    " (void) // default constructor" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () <<
-    " (STUB_Object *objref, TAO_ServantBase *_tao_servant, "
-      << "CORBA::Boolean _tao_collocated) // constructor" << be_nl;
-  *os << "  : CORBA_Object (objref, _tao_servant, _tao_collocated)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::~" << node->local_name () <<
-    " (void) // destructor" << be_nl;
-  *os << "{}\n\n";
-
-  // generate the ifdefined macro for  the _var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate inline methods for elements of our scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-  return 0;
-}
-
-// ************************************************************
-// Interface visitor for client stubs
-// ************************************************************
-
-be_visitor_interface_cs::be_visitor_interface_cs (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_cs::~be_visitor_interface_cs (void)
-{
-}
-
-int
-be_visitor_interface_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->cli_stub_gen () || node->imported ())
-    return 0;
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start with whatever indentation level we are at
-
-  // first generate the code for the static methods
-
-  // The _duplicate method
-  *os << node->name () << "_ptr " << node->name () << "::_duplicate ("
-      << node->name () << "_ptr obj)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "if (!CORBA::is_nil (obj))\n";
-  os->incr_indent ();
-  *os << "obj->AddRef ();\n";
-  os->decr_indent ();
-  *os << be_nl;
-  *os << "return obj;\n";
-  os->decr_indent ();
-  *os << "} // end of _duplicate" << be_nl << be_nl;
-
-  // The _narrow method
-  *os << node->name () << "_ptr " << node->name ()
-      << "::_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &env" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (CORBA::is_nil (obj))" << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl
-      << "if (!obj->_is_a (\"" << node->repoID () << "\", env))"
-      << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl;
-
-  *os << "if (!obj->_is_collocated ()" << be_idt << be_idt << be_idt_nl
-      << " || !obj->_servant()" << be_nl
-      << " || obj->_servant()->_downcast (\""
-      << node->repoID () << "\") == 0" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << "{" << be_idt_nl;
-  *os << node->name () << "_ptr new_obj = new "
-      << node->name () << "(obj->_get_parent ());" << be_nl
-      << "return new_obj;" << be_uidt_nl
-      << "} // end of if" << be_nl;
-
-  *os << "STUB_Object *stub = obj->_servant ()->_create_stub (env);" << be_nl
-      << "if (env.exception () != 0)" << be_idt_nl
-      << "return " << node->name () << "::_nil ();" << be_uidt_nl
-      << "void* servant = obj->_servant ()->_downcast (\""
-      << node->repoID () << "\");" << be_nl
-      << "return new ";
-
-  // This may be necessary to work around a GCC compiler bug!
-  const char *skel_name = node->full_skel_name ();
-  const char *coll_name = node->full_coll_name ();
-  assert (coll_name != 0);
-
-  *os << coll_name << "(" << be_idt << be_idt_nl
-      << "ACE_reinterpret_cast(" << skel_name
-      << "_ptr, servant)," << be_nl
-      << "stub" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // _nil method
-  *os << node->name () << "_ptr " << node->name () << "::_nil (void)" <<
-    be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return (" << node->name () << "_ptr)NULL;\n";
-  os->decr_indent ();
-  *os << "} // end of _nil" << be_nl << be_nl;
-
-  // generate code for the elements of the interface
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_cs::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-  // generate the is_a method
-  os->indent ();
-  *os << "CORBA::Boolean " << node->name () << "::_is_a (" <<
-    "const CORBA::Char *value, CORBA::Environment &env)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "if (\n";
-  os->incr_indent (0);
-  if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_cs::"
-                         "visit_interface - "
-                         "_is_a method codegen failed\n"), -1);
-    }
-
-  os->indent ();
-  *os << "(!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))\n";
-  *os << "  return 1; // success using local knowledge\n";
-  os->decr_indent ();
-  *os << "else" << be_nl;
-  *os << "  return this->CORBA_Object::_is_a (value, env); // remote call\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "const char* " << node->name ()
-      << "::_interface_repository_id (void) const"
-      << be_nl
-      << "{" << be_idt_nl
-      << "return \"" << node->repoID () << "\";" << be_uidt_nl
-      << "}\n\n";
-
-  // generate the typecode information here
-  os->indent (); // start from current indentation level
-  *os << "static const CORBA::Long _oc_" << node->flatname () << "[] =" <<
-    be_nl;
-  *os << "{\n";
-  os->incr_indent (0);
-  if (node->gen_encapsulation () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_cs::"
-                         "visit_interface - "
-                         "codegen for typecode failed\n"), -1);
-    }
-
-  os->decr_indent ();
-  *os << "};" << be_nl;
-
-  *os << "static CORBA::TypeCode _tc__tc_" << node->flatname () <<
-    " (CORBA::tk_objref, sizeof (_oc_" <<  node->flatname () <<
-    "), (char *) &_oc_" << node->flatname () <<
-    ", CORBA::B_FALSE);" << be_nl;
-  *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_" <<
-    node->flatname () << ";\n\n";
-
-  return 0;
-}
-
-// ************************************************************
-// Interface visitor for server header
-// ************************************************************
-
-be_visitor_interface_sh::be_visitor_interface_sh (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_sh::~be_visitor_interface_sh (void)
-{
-}
-
-int
-be_visitor_interface_sh::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  long i; // loop index
-  static char namebuf [NAMEBUFSIZE]; // holds the class name
-
-  if (node->srv_hdr_gen () || node->imported ())
-    return 0;
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-
-  os = this->ctx_->stream ();
-
-  // generate the skeleton class name
-
-  os->indent (); // start with whatever indentation level we are at
-
-  // we shall have a POA_ prefix only if we are at the topmost level
-  if (!node->is_nested ())
-    {
-      // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ()->get_string ());
-    }
-  else
-    {
-      ACE_OS::sprintf (namebuf, "%s", node->local_name ()->get_string ());
-    }
-
-  *os << "class " << namebuf << ";" << be_nl;
-
-  // generate the _ptr declaration
-  *os << "typedef " << namebuf << " *" << namebuf
-      << "_ptr;" << be_nl;
-
-  // now generate the class definition
-  *os << "class " << idl_global->export_macro ()
-      << " " << namebuf << " : ";
-  if (node->n_inherits () > 0)  // this interface inherits from other interfaces
-    {
-      be_interface *intf; // inherited interface
-
-      *os << "public virtual ";
-      intf = be_interface::narrow_from_decl (node->inherits ()[0]);
-      *os << intf->relative_skel_name (node->full_skel_name ());
-      for (i = 1; i < node->n_inherits (); i++)
-        {
-          *os << ", public virtual ";
-          intf = be_interface::narrow_from_decl (node->inherits ()[i]);
-          *os << intf->relative_skel_name (node->full_skel_name ());
-        }  // end of for loop
-    }
-  else
-    {
-      // We don't inherit from another user defined object, hence our
-      // base class is the ServantBase class.
-      *os << " public virtual PortableServer::ServantBase";
-    }
-  *os << be_nl
-      << "{" << be_nl
-      << "protected:" << be_idt_nl
-      << namebuf << " (void);" << be_uidt_nl
-      << "public:" << be_idt_nl
-      << "virtual ~" << namebuf << " (void);" << be_nl;
-
-  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt
-      << ");\n" << be_uidt;
-
-  os->indent ();
-  *os << "virtual void* _downcast (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_uidt_nl
-      << ");\n" << be_uidt;
-
-  // generate code for elements in the scope (e.g., operations)
-  if (this->visit_scope (node) ==  -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_sh::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-  // add a skeleton for our _is_a method
-  os->indent ();
-  *os << "static void _is_a_skel (CORBA::ServerRequest &req, " <<
-    "void *obj, void *context, CORBA::Environment &_tao_enviroment);\n\n";
-
-  // generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the call
-  if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_sh::"
-                         "visit_interface - "
-                         "inheritance graph traversal failed\n"),
-                        -1);
-    }
-
-  // add the dispatch method
-  os->indent ();
-  *os << "virtual void _dispatch (CORBA::ServerRequest &_tao_req, "
-      << "void *_tao_context, CORBA::Environment &_tao_env);\n\n";
-
-  // Print out the _this() method.
-  os->indent ();
-  *os << node->name () << " *_this (CORBA::Environment &_tao_environment);\n";
-  // the _interface_repository_id method
-  os->indent ();
-  *os << "virtual const char* _interface_repository_id"
-      << " (void) const;\n";
-
-  os->decr_indent ();
-
-  *os << "};\n\n";
-
-  // generate the collocated class
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_sh::"
-                         "visit_interface - "
-                         "codegen for collocated class failed\n"),
-                        -1);
-    }
-
-  *os << "\n";
-
-  return 0;
-}
-
-// ************************************************************************
-// Interface visitor for server inline
-// ************************************************************************
-
-be_visitor_interface_si::be_visitor_interface_si (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_si::~be_visitor_interface_si (void)
-{
-}
-
-int
-be_visitor_interface_si::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->srv_inline_gen () || node->imported ())
-    return 0;
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start with whatever indentation level we are at
-
-  // Generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the
-  // call. Hence we generate these in the inline file
-  if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os)
-      == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_si::"
-                         "visit_interface - "
-                         "codegen for base class skeletons failed\n"), -1);
-    }
-
-  return 0;
-}
-
-// ************************************************************
-// Interface visitor for server skeletons
-// ************************************************************
-
-be_visitor_interface_ss::be_visitor_interface_ss (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_ss::~be_visitor_interface_ss (void)
-{
-}
-
-int
-be_visitor_interface_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->srv_skel_gen () || node->imported ())
-    return 0;
-
-  os = this->ctx_->stream ();
-
-  // generate the skeleton class name
-
-  os->indent (); // start with whatever indentation level we are at
-
-  if (node->gen_operation_table () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "codegen for operation table failed\n"),
-                        -1);
-    }
-
-  // constructor
-  *os << "// skeleton constructor" << be_nl;
-  // find if we are at the top scope or inside some module
-  if (!node->is_nested ())
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *os << node->full_skel_name () << "::POA_" << node->local_name () <<
-        " (void)" << be_nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *os << node->full_skel_name () << "::" << node->local_name () <<
-        " (void)" << be_nl;
-    }
-
-  *os << "{" << be_idt_nl
-      << "this->optable_ = &tao_" << node->flatname ()
-      << "_optable;" << be_uidt_nl
-      << "}\n\n";
-
-  // destructor
-  os->indent ();
-  *os << "// skeleton destructor" << be_nl;
-
-  if (!node->is_nested ())
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *os << node->full_skel_name () << "::~POA_" << node->local_name () <<
-        " (void)" << be_nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *os << node->full_skel_name () << "::~" << node->local_name () <<
-        " (void)" << be_nl;
-    }
-  *os << "{\n";
-  *os << "}\n";
-
-
-  // generate code for elements in the scope (e.g., operations)
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // generate code for the _is_a skeleton
-  os->indent ();
-  *os << "static const TAO_Param_Data_Skel " << node->flatname ()
-      << "_is_a_paramdata [] = " << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "{CORBA::_tc_boolean, 0, 0}," << be_nl;
-  *os << "{CORBA::_tc_string, CORBA::ARG_IN, 0}" << be_uidt_nl;
-  *os << "};" << be_nl;
-  *os << "static const TAO_Call_Data_Skel " << node->flatname ()
-      << "_is_a_calldata = " << be_nl;
-  *os << "{\"_is_a\", 1, 2, " << node->flatname () << "_is_a_paramdata};" << be_nl;
-  *os << "void " << node->full_skel_name ()
-      << "::_is_a_skel (" << be_idt << be_idt_nl
-      << "CORBA::ServerRequest &_tao_server_request, " << be_nl
-      << "void * _tao_object_reference," << be_nl
-      << "void * /*context*/," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << node->full_skel_name () << "_ptr  _tao_impl = ("
-      << node->full_skel_name () << "_ptr) _tao_object_reference;"
-      << be_nl;
-  *os << "CORBA::Boolean _tao_retval;" << be_nl;
-  *os << "char *_tao_value = 0;" << be_nl;
-  *os << "_tao_server_request.demarshal (" << be_idt_nl
-      << "_tao_environment, " << be_nl
-      << "&" << node->flatname () << "_is_a_calldata, " << be_nl
-      << "&_tao_retval, " << be_nl
-      << "&_tao_value" << be_uidt_nl
-      << ");" << be_nl;
-  *os << "if (_tao_environment.exception () != 0) return;" << be_nl;
-  *os << "_tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);"
-      << be_nl;
-  *os << "_tao_server_request.marshal (" << be_idt_nl
-      << "_tao_environment, " << be_nl
-      << "&" << node->flatname () << "_is_a_calldata, " << be_nl
-      << "&_tao_retval, " << be_nl
-      << "&_tao_value" << be_uidt_nl
-      << ");" << be_nl;
-  *os << "CORBA::string_free (_tao_value);" << be_uidt_nl;
-  *os << "}\n\n";
-
-
-  os->indent ();
-  *os << "CORBA::Boolean " << node->full_skel_name ()
-      << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* value," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (\n" << be_idt;
-  if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "traversal of inhertance graph failed\n"),
-                        -1);
-    }
-
-  os->indent ();
-  *os << "(!ACE_OS::strcmp ((char *)value, "
-      << "CORBA::_tc_Object->id (_tao_environment))))"
-      << be_idt_nl << "return CORBA::B_TRUE;" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "return CORBA::B_FALSE;" << be_uidt << be_uidt << be_uidt_nl
-      << "}\n\n";
-
-  os->indent ();
-  *os << "void* " << node->full_skel_name ()
-      << "::_downcast (" << be_idt << be_idt_nl
-      << "const char* logical_type_id" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (node->traverse_inheritance_graph (be_interface::downcast_helper, os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "traversal of inhertance graph failed\n"),
-                        -1);
-    }
-
-  *os << "if (ACE_OS::strcmp (logical_type_id, "
-      << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl
-      << "return ACE_static_cast(PortableServer::Servant, this);"
-      << be_uidt_nl;
-
-  *os << "return 0;" << be_uidt_nl
-      << "}\n\n";
-
-
-  // now the dispatch method
-  os->indent ();
-  *os << "void " << node->full_skel_name () <<
-    "::_dispatch (CORBA::ServerRequest &req, " <<
-    "void *context, CORBA::Environment &env)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "TAO_Skeleton skel; // pointer to skeleton for operation" << be_nl;
-  *os << "const char *opname = req.operation (); // retrieve operation name"
-      << be_nl;
-  *os << "// find the skeleton corresponding to this opname" << be_nl;
-  *os << "if (this->_find (opname, skel) == -1)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));"
-      << be_nl;
-  *os << "ACE_ERROR ((LM_ERROR, \"Bad operation <%s>\\n\", opname));\n";
-  os->decr_indent ();
-  *os << "}\n";
-  *os << "else" << be_nl;
-  *os << "  skel (req, this, context, env);\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "const char* " << node->full_skel_name ()
-      << "::_interface_repository_id (void) const"
-      << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return \"" << node->repoID () << "\";\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // generate the collocated class impl
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "Bad visitor for collocated class\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_ss::"
-                         "visit_interface - "
-                         "codegen for collocated class failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << "\n";
-
-  // the _this () operation
-  *os << node->name () << "*" << be_nl
-      << node->full_skel_name ()
-      << "::_this (CORBA_Environment &_env)" << be_nl
-      << "{" << be_idt_nl
-      << "STUB_Object *stub = this->_create_stub (_env);" << be_nl
-      << "if (_env.exception () != 0)" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "return new " << node->full_coll_name ()
-      << " (this, stub);" << be_uidt << be_nl;
-
-  *os << "}\n\n";
-
-   return 0;
-}
-
-// ************************************************************
-//  collocated class in header
-// ************************************************************
-
-be_visitor_interface_collocated_sh::be_visitor_interface_collocated_sh
-(be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_collocated_sh::~be_visitor_interface_collocated_sh (void)
-{
-}
-
-int be_visitor_interface_collocated_sh::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->gen_ifdef_macro (node->flatname (), "_collocated");
-
-  // output the class defn
-  os->indent ();
-  *os << "class " << idl_global->export_macro ()
-      << " " << node->local_coll_name ();
-  os->incr_indent ();
-  *os << " : public virtual " << node->name ();
-
-  // generate base classes if any
-  if (node->n_inherits () > 0)
-    {
-      for (int i = 0; i < node->n_inherits (); ++i)
-        {
-          *os << "," << be_nl;
-          be_interface* parent =
-            be_interface::narrow_from_decl (node->inherits()[i]);
-          *os << "  public virtual "
-              << parent->relative_coll_name (node->full_coll_name ());
-        }
-    }
-  *os << "\n";
-  os->decr_indent ();
-  *os << "{" << be_nl;
-  *os << "public:\n";
-  os->incr_indent ();
-
-  *os << node->local_coll_name () << " (\n";
-
-  os->incr_indent (0);
-  os->incr_indent ();
-
-  // XXXASG - can we make this a method to return the right name ??
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-
-  *os << node->local_name () << "_ptr "
-      << " servant," << be_nl;
-
-  *os << "STUB_Object *stub\n";
-  os->decr_indent ();
-  *os << ");\n";
-  os->decr_indent (0);
-
-  os->indent ();
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-  *os << node->local_name ()
-      << "_ptr _get_servant (void) const;" << be_nl;
-
-  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char *logical_type_id," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ");\n" << be_uidt;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_collocated_sh::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-#if 0
-  // XXXASG - don't remove until we are sure that the scope visitor is doing
-  // the task we expect it to do
-  if (node->nmembers () > 0)
-    {
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      while (!si->is_done ())
-        {
-          AST_Decl *d = si->item ();
-          si->next ();
-          be_decl *bd = be_decl::narrow_from_decl (d);
-          if (d->imported () || bd == 0)
-            {
-              continue;
-            }
-          if (bd->accept (this) == -1)
-            {
-              delete si;
-              return -1;
-            }
-        }
-      delete si;
-    }
-#endif
-
-  os->decr_indent ();
-
-  *os << be_nl << "private:\n";
-  os->incr_indent ();
-  if (!node->is_nested ())
-    {
-      // The skeleton name is the outermost, we need to printout the
-      // POA_ prefix that goes with it.
-      *os << "POA_";
-    }
-  *os << node->local_name () << "_ptr servant_;\n";
-  os->decr_indent ();
-  *os << "};\n\n";
-
-  os->gen_endif ();
-
-  return 0;
-}
-
-#if 0
-int be_visitor_interface_collocated_sh::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->indent (); // start with the current indentation level
-
-  // every operation is declared virtual
-  *os << "virtual ";
-
-  // first generate the return type
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-
-  // XXASG - this changes
-  if (bt->write_as_return (os, bt) == -1)
-    {
-      return -1;
-    }
-
-  // generate the operation name
-  *os << " " << node->local_name () << " ";
-
-  // XXXASG - TODO
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_colocated_sh::"
-                         "visit_operation - "
-                         "Bad visitor for arglist\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_colocated_sh::"
-                         "visit_operation - "
-                         "codegen for arglist failed\n"),
-                        -1);
-    }
-  *os << ";\n";
-
-  return 0;
-}
-
-int be_visitor_interface_collocated_sh::visit_attribute (be_attribute *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  os->indent (); // start with the current indentation level
-
-  be_type* bt = be_type::narrow_from_decl (node->field_type ());
-
-  // the retrieve method is defined virtual
-  *os << "virtual ";
-
-  // XXXASG - change this
-  if (bt->write_as_return (os, bt) == -1)
-    {
-      return -1;
-    }
-
-  *os << " " << node->local_name () << " (" << be_idt << be_idt_nl
-      << "CORBA::Environment &env" << be_uidt_nl
-      << ");\n" << be_uidt;
-
-  if (!node->readonly ())
-    {
-      os->indent ();
-      *os << "virtual void " << node->local_name ()
-          << " (" << be_idt << be_idt;
-
-      // XXXASG - TODO
-      be_visitor_args_decl vdecl (os);
-      vdecl.current_type_name (bt->name ());
-      vdecl.argument_direction (AST_Argument::dir_IN);
-      if (bt->accept (&vdecl) == -1)
-        return -1;
-
-      *os << " _tao_value," << be_nl
-          << "CORBA::Environment &_tao_environment" << be_uidt_nl
-          << ");\n" << be_uidt;
-    }
-  return 0;
-}
-#endif
-
-// ************************************************************
-//  be_visitor_interface_collacted_ss
-// ************************************************************
-
-be_visitor_interface_collocated_ss::be_visitor_interface_collocated_ss
-(be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_collocated_ss::~be_visitor_interface_collocated_ss (void)
-{
-}
-
-int be_visitor_interface_collocated_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = tao_cg->server_skeletons ();
-  long i;
-
-  this->ctx_->node (node);
-
-  *os << node->full_coll_name () << "::"
-      << node->local_coll_name () << " (\n";
-
-  os->incr_indent (0);
-  os->incr_indent ();
-  *os << node->full_skel_name () << "_ptr "
-      << " servant," << be_nl;
-
-  *os << "STUB_Object *stub\n";
-  os->decr_indent ();
-  *os << ")\n";
-  os->decr_indent (0);
-
-  os->incr_indent ();
-#if defined (ACE_WIN32)
-  // @@ TODO MSVC++ compiler has some kind of issue (read
-  // *bug*) wrt nested classes in constructors, if the fully
-  // qualified name is used it gets all confused. Quite to my
-  // dismay the work around is to use a non-qualified name for
-  // the base class!
-  // I wish I never have to know why the symbol table for
-  // MSVC++ can get so confused ;-) (coryan)
-  *os << ": " << node->local_name ()
-      << " (stub, servant, CORBA::B_TRUE)," << be_nl;
-#else
-  *os << ": " << node->name ()
-      << " (stub, servant, CORBA::B_TRUE)," << be_nl;
-#endif /* ACE_WIN32 */
-
-  // @@ We should call the constructor for all base classes, since we
-  // are using multiple inheritance.
-
-  if (node->n_inherits () > 0)
-    {
-      for (i = 0; i < node->n_inherits (); ++i)
-        {
-          be_interface* parent =
-            be_interface::narrow_from_decl (node->inherits()[i]);
-#if defined (ACE_WIN32)
-          // @@ TODO MSVC++ compiler has some kind of issue (read
-          // *bug*) wrt nested classes in constructors, if the fully
-          // qualified name is used it gets all confused. Quite to my
-          // dismay the work around is to use a non-qualified name for
-          // the base class!
-          // I wish I never have to know why the symbol table for
-          // MSVC++ can get so confused ;-) (coryan)
-          *os << "  " << parent->local_coll_name () << " (servant, stub),"
-              << be_nl;
-#else
-          *os << "  " << parent->full_coll_name () << " (servant, stub),"
-              << be_nl;
-#endif /* ACE_WIN32 */
-        }
-    }
-
-  *os << "  CORBA_Object (stub, servant, CORBA::B_TRUE)," << be_nl
-      << "  servant_ (servant)";
-
-  *os << "\n";
-  os->decr_indent ();
-  *os << "{\n";
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << node->full_skel_name () << "_ptr "
-      << node->full_coll_name () << "::"
-      << "_get_servant (void) const\n"
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->servant_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "CORBA::Boolean " << node->full_coll_name ()
-      << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id," << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "return this->servant_->_is_a (" << be_idt << be_idt_nl
-      << "logical_type_id," << be_nl
-      << "_tao_environment" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << "}\n\n";
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_collocated_ss::"
-                         "visit_scope - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-#if 0
-  // XXXASG - DO NOT DELETE until the visit_scope has been tested
-  if (node->nmembers () > 0)
-    {
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      while (!si->is_done ())
-        {
-          AST_Decl *d = si->item ();
-          si->next ();
-          be_decl *bd = be_decl::narrow_from_decl (d);
-          // Only printout the operations, nested interfaces and
-          // structures only go in the main declaration.
-          if (d->imported () || bd == 0)
-            {
-              continue;
-            }
-          if (bd->accept (this) == -1)
-            {
-              delete si;
-              return -1;
-            }
-        }
-      delete si;
-    }
-#endif
-
-  return 0;
-}
-
-#if 0
-int be_visitor_interface_collocated_ss::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = tao_cg->server_skeletons ();
-  be_interface *intf = this->ctx_->be_scope_as_interface ();
-
-  // retrieve the return type again because we have used bt to also retrieve
-  // the argument types
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-
-  if (bt->write_as_return (os, bt) == -1)
-    {
-      return -1;
-    }
-
-  *os << " " << intf->full_coll_name () << "::"
-      << node->local_name () << " ";
-
-  be_visitor_args_decl visitor (os);
-  if (node->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) args decl failed\n"), -1);
-    }
-  *os << "\n";
-  os->indent ();
-  *os << "{\n";
-  os->incr_indent ();
-
-  if (bt->node_type () != AST_Decl::NT_pre_defined
-      || be_predefined_type::narrow_from_decl (bt)->pt () != AST_PredefinedType::PT_void)
-    {
-      *os << "return ";
-    }
-
-  *os << "this->servant_->" << node->local_name () << " (\n";
-  os->incr_indent (0);
-  os->incr_indent (0);
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_collocated_ss::"
-                         "visit_operation - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  os->indent ();
-  *os << " _tao_environment\n";
-  os->decr_indent ();
-  *os << ");\n";
-  os->decr_indent (0);
-  os->decr_indent (0);
-  *os << "}\n\n";
-
-  return 0;
-}
-
-int be_visitor_interface_collocated_ss::visit_attribute (be_attribute *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_interface *intf = this->ctx_->be_scope_as_interface ();
-
-  os->indent (); // start with the current indentation level
-
-  be_type* bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (bt->write_as_return (os, bt) == -1)
-    {
-      return -1;
-    }
-
-  *os << be_nl << intf->full_coll_name ()
-      << "::" << node->local_name () << " (" << be_idt << be_idt_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "return this->servant_->"
-      << node->local_name () << "(_tao_environment);" << be_uidt_nl
-      << "}\n";
-
-  if (!node->readonly ())
-    {
-      *os << be_nl
-          << "void "
-          << intf->full_coll_name ()
-          << "::" << node->local_name ()
-          << " (" << be_idt << be_idt_nl;
-      // XXXASG - TODO
-      be_visitor_args_decl vdecl (os);
-      vdecl.current_type_name (bt->name ());
-      vdecl.argument_direction (AST_Argument::dir_IN);
-      if (bt->accept (&vdecl) == -1)
-        return -1;
-
-      *os << " _tao_value," << be_nl
-          << "CORBA::Environment &_tao_environment" << be_uidt_nl
-          << ")" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "this->servant_->" << node->local_name ()
-          << " (" << be_idt << be_idt_nl
-          << "_tao_value," << be_nl
-          << "_tao_environment" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
-          << "}\n\n";
-    }
-  return 0;
-}
-
-int be_visitor_interface_collocated_ss::visit_argument (be_argument *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->indent ();
-  *os << node->local_name () << ",\n";
-  return 0;
-}
-#endif
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
deleted file mode 100644
index 3e9ce97d5cf..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_interface_fwd.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Interface_Fwd
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_interface_fwd.h"
-
-// ********************************************************************
-// Visitor implementation for the Interface_Fwd type
-// This one for the client header file
-// ********************************************************************
-
-be_visitor_interface_fwd_ch::be_visitor_interface_fwd_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_interface_fwd_ch::~be_visitor_interface_fwd_ch (void)
-{
-}
-
-// visit the Interface_Fwd_Ch node and its scope
-int
-be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_hdr_gen () && !node->imported ())
-    {
-      os->indent (); // start from the current
-
-      // all we do in this is generate a forward declaration of the class
-      *os << "class " << node->local_name () << ";" << be_nl;
-
-      // generate the ifdefined macro for the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
-
-      // generate the _ptr declaration
-      *os << "typedef " << node->local_name () << " *" << node->local_name ()
-          << "_ptr;\n";
-
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      // generate the _var declaration
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ch::"
-                             "visit_interface_fwd - "
-                             "codegen for _var failed\n"), -1);
-        }
-      // gen an endif
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ch::"
-                             "visit_interface_fwd - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-      node->cli_hdr_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ********************************************************************
-// Visitor implementation for the Interface_Fwd type
-// This one for the client inline file
-// ********************************************************************
-
-be_visitor_interface_fwd_ci::be_visitor_interface_fwd_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_interface_fwd_ci::~be_visitor_interface_fwd_ci (void)
-{
-}
-
-// visit the Interface_Fwd_ci node and its scope
-int
-be_visitor_interface_fwd_ci::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_inline_gen () && !node->imported ())
-    {
-
-      // generate the ifdefined macro for  the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      if (node->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ci::"
-                             "visit_interface_fwd - "
-                             "codegen for _var failed\n"), -1);
-        }
-
-      os->gen_endif ();
-
-      // generate the ifdefined macro for  the _out type
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      if (node->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ci::"
-                             "visit_interface_fwd - "
-                             "codegen for _out failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      node->cli_stub_gen (I_TRUE);
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_module.cpp b/TAO/TAO_IDL/be/be_visitor_module.cpp
deleted file mode 100644
index 5b7107f9886..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_module.cpp
+++ /dev/null
@@ -1,658 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_module.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Module
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_module.h"
-
-// ******************************************************
-// Generic Module visitor
-// ******************************************************
-
-be_visitor_module::be_visitor_module (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_module::~be_visitor_module (void)
-{
-}
-
-// visit the Module node and its scope
-int be_visitor_module::visit_module (be_module *node)
-{
-  // all we have to do is to visit the scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::visit_module - "
-                         "codegen for scope failed\n"), -1);
-    }
-  return 0;
-}
-
-// =all common visit methods for module visitor
-
-// visit a constant
-int
-be_visitor_module::visit_constant (be_constant *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_constant - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_constant - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_constant - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-//visit an enum
-int
-be_visitor_module::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_enum - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_enum - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_enum - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an exception
-int
-be_visitor_module::visit_exception (be_exception *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_exception - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_exception - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_exception - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an interface
-int
-be_visitor_module::visit_interface (be_interface *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SS:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_interface - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_interface - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_interface - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an interface_fwd
-int
-be_visitor_module::visit_interface_fwd (be_interface_fwd *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_interface_fwd - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_interface_fwd - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_interface_fwd - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an structure
-int
-be_visitor_module::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_structure - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_structure - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_structure - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an union
-int
-be_visitor_module::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_union - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_union - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_union - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a typedef
-int
-be_visitor_module::visit_typedef (be_typedef *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_typedef - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_typedef - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_typedef - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// Module visitor for client header
-// ******************************************************
-
-be_visitor_module_ch::be_visitor_module_ch (be_visitor_context *ctx)
-  : be_visitor_module (ctx)
-{
-}
-
-be_visitor_module_ch::~be_visitor_module_ch (void)
-{
-}
-
-int
-be_visitor_module_ch::visit_module (be_module *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_hdr_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-
-      // XXXASG - Modules really map to namespace. We need to see if our target
-      // compiler supports namespaces or not. This visitor generates a class for a
-      // module. We can have the factory generate another module visitor that can
-      // generate namespaces
-
-      os->indent (); // start from whatever indentation level we were at
-      // now generate the class definition
-      *os << "class " << idl_global->export_macro ()
-	  << " " << node->local_name () << be_nl
-          << "{" << be_nl
-          << "public:\n";
-      os->incr_indent (0);
-
-      // generate code for the module definition by traversing thru the
-      // elements of its scope. We depend on the front-end to have made sure
-      // that only legal syntactic elements appear in our scope.
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_module_ch::"
-                             "visit_module - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      *os << be_uidt_nl
-          << "}; // module " << node->name () << "\n\n";
-
-    }
-  return 0;
-}
-
-// ************************************************************
-// Module visitor for server header
-// ************************************************************
-
-be_visitor_module_sh::be_visitor_module_sh (be_visitor_context *ctx)
-  : be_visitor_module (ctx)
-{
-}
-
-be_visitor_module_sh::~be_visitor_module_sh (void)
-{
-}
-
-int
-be_visitor_module_sh::visit_module (be_module *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->srv_hdr_gen () && !node->imported ()) // not generated and not imported
-    {
-      os = this->ctx_->stream ();
-
-      // generate the skeleton class name
-
-      os->indent (); // start with whatever indentation level we are at
-
-      // now generate the class definition. The prefix POA_ is prepended to our
-      // name only if we are the outermost module
-      if (!node->is_nested ())
-        // we are outermost module
-        *os << "class "  << idl_global->export_macro ()
-	    << " POA_" << node->local_name () << be_nl;
-      else
-        // we are inside another module
-        *os << "class "  << idl_global->export_macro ()
-	    << " " << node->local_name () << be_nl;
-
-      *os << "{" << be_nl
-          << "public:"
-          << be_idt;
-
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_module_sh::"
-                             "visit_module - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "};\n\n";
-    }
-  return 0;
-
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
deleted file mode 100644
index 2035bc114cc..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ /dev/null
@@ -1,3249 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_operation.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Operation
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_operation.h"
-
-// ******************************************************
-// primary visitor for "operation" in client header
-// ******************************************************
-
-be_visitor_operation_ch::be_visitor_operation_ch (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_ch::~be_visitor_operation_ch (void)
-{
-}
-
-int
-be_visitor_operation_ch::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node
-
-  os->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *os << "virtual ";
-
-  // STEP I: generate the return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // grab the right visitor to generate the return type
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 2: generate the operation name
-  *os << " " << node->local_name ();
-
-  // STEP 3: generate the argument list with the appropriate mapping. For these
-  // we grab a visitor that generates the parameter listing
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_CH);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  return 0;
-}
-
-// ************************************************************
-// Operation visitor for client stubs
-// ************************************************************
-
-be_visitor_operation_cs::be_visitor_operation_cs (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_cs::~be_visitor_operation_cs (void)
-{
-}
-
-// processing to be done after every element in the scope is processed
-int
-be_visitor_operation_cs::post_process ()
-{
-  // all we do here is to insert a comma and a newline
-  TAO_OutStream *os = this->ctx_->stream ();
-  *os << ",\n";
-  return 0;
-}
-
-int
-be_visitor_operation_cs::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node for future use
-
-  os->indent (); // start with the current indentation level
-
-  // retrieve the operation return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // STEP 1:
-  // generate the param_data and call_data tables. We generate these if and
-  // only if none of our arguments is of "native" type. Native types cannot be
-  // marshaled. Hence, stubs for such operations will generate MARSHAL
-  // exceptions. As a result it is pointless generating these tables
-  be_visitor_context ctx;
-  be_visitor *visitor;
-  if (!node->has_native ())
-    {
-      // native type does not exist. Generate the static tables
-
-      // STEP 1A: generate the TAO_Param_Data table
-      *os << "static const TAO_Param_Data ";
-      // check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->flatname () <<
-	"_paramdata [] = " << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-
-      // entry for the return type
-      *os << "{" << bt->tc_name () << ", PARAM_RETURN, 0}";
-      if (node->nmembers () > 0)
-        *os << ",\n";
-
-      // generate entries for the param data table for arguments
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "visit scope failed\n"),
-                            -1);
-        }
-      *os << "\n";
-      os->decr_indent ();
-      *os << "}; // " << node->flatname () << "_paramdata\n\n";
-
-      // Check if this operation raises any exceptions. In that case, we must
-      // generate a list of exception typecodes. This is not valid for
-      // attributes
-      if (!this->ctx_->attribute ())
-        {
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS);
-          visitor = tao_cg->make_visitor (&ctx);
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) "
-                                 "be_visitor_operation_cs::visit_operation - "
-                                 "Exceptionlist generation error\n"),
-                                -1);
-            }
-        }
-
-      // STEP 1B: now generate the calldata table
-      os->indent ();
-      *os << "static const TAO_Call_Data ";
-      // check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->flatname ()
-	  << "_calldata = " << be_nl
-	  << "{"
-	  << "\"";
-      // check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->local_name () << "\", ";
-
-      // are we oneway or two operation?
-      if (node->flags () == AST_Operation::OP_oneway)
-	{
-	  *os << "0, "; // for false
-	}
-      else
-	{
-	  *os << "1, "; // for true
-	}
-      // insert the size of the paramdata table i.e., number of arguments + 1
-      // for return type
-      *os << (node->argument_count () + 1) << ", ";
-
-      // insert the address of the paramdata table
-      // first check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->flatname () << "_paramdata, ";
-
-      // insert exception list (if any) - node for attributes
-      if (this->ctx_->attribute ())
-        *os << "0, 0};\n\n";
-      else
-        {
-          if (node->exceptions ())
-            {
-              *os << node->exceptions ()->length ()
-                  << ", _tao_" << node->flatname () << "_exceptlist};\n\n";
-            }
-          else
-            *os << "0, 0};\n\n";
-        }
-    } // end of if !(native)
-
-  // STEP 2: generate the return type mapping (same as in the header file)
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "Bad visitor for return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 3: generate the operation name
-  *os << " " << node->name ();
-
-  // STEP 4: generate the argument list with the appropriate mapping (same as
-  // in the header file)
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 5:
-  // generate the actual code for the stub. However, if any of the argument
-  // types is "native", we flag a MARSHAL exception.
-  // last argument - is always CORBA::Environment
-  *os << "{\n";
-  os->incr_indent (0);
-
-  // STEP 5A: declare a return type
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return var decl failed\n"),
-                        -1);
-    }
-
-  os->indent ();
-  if (node->has_native ()) // native exists => no stub
-    {
-      *os << "_tao_environment.exception (new CORBA::MARSHAL "
-	  << "(CORBA::COMPLETED_NO));" << be_nl;
-      *os << "return _tao_retval;\n";
-    }
-  else
-    {
-      // STEP 5B:
-      // generate code that retrieves the underlying stub object and then
-      // invokes do_static_call on it.
-      *os << "STUB_Object *istub = this->stubobj (_tao_environment);" << be_nl
-          << "if (istub)" << be_nl
-          << "{\n";
-      os->incr_indent (0);
-
-      // STEP 5C:
-      // do any pre do_static_call processing with return type. This includes
-      // allocating memory, initialization.
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for retval pre do_static_call failed\n"),
-                            -1);
-        }
-
-
-      // STEP 5D:
-      // do any pre do_static_call stuff with arguments
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_PRE_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for argument pre do_static_call failed\n"),
-                            -1);
-        }
-
-      // STEP 5E:
-      // call do_static_call with appropriate number of arguments
-      os->indent ();
-      *os << "istub->do_static_call (" << be_idt_nl
-          << "_tao_environment, " << be_nl
-          << "&";
-      // check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->flatname () << "_calldata,\n";
-
-      // pass the appropriate return value to docall
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for return var in do_static_call failed\n"),
-                            -1);
-        }
-      // insert a comma after the return val if there are arguments
-      if (node->argument_count () > 0)
-        {
-          *os << ",\n";
-        }
-
-      // pass each argument to do_static_call
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for return var in do_static_call failed\n"),
-                            -1);
-        }
-
-      // end the do_static_call
-      *os << be_uidt_nl;
-      *os << ");\n";
-
-      // STEP 5F:
-      // do any post processing for the retval
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_POST_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for return type post do_static_call failed\n"),
-                            -1);
-        }
-
-      // STEP 5G: do any post processing for the arguments
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_DOCALL_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for args in post do_static_call failed\n"),
-                            -1);
-        }
-
-    } // end of if (!native)
-
-  os->decr_indent ();
-  *os << "} // end of if (istub)\n";
-  // STEP 5H: return the appropriate return value
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return var failed\n"),
-                        -1);
-    }
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_operation_cs::visit_argument (be_argument *node)
-{
-  // this method is used to generate the ParamData table entry
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt; // argument type
-
-  // retrieve the type for this argument
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  os->indent ();
-  *os << "{" << bt->tc_name () << ", ";
-  switch (node->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "PARAM_IN, ";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << "PARAM_INOUT, ";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << "PARAM_OUT, ";
-      break;
-    }
-  *os << "0}";
-
-  return 0;
-}
-
-// ************************************************************
-// Operation visitor for server header
-// ************************************************************
-
-be_visitor_operation_sh::be_visitor_operation_sh (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_sh::~be_visitor_operation_sh (void)
-{
-}
-
-int
-be_visitor_operation_sh::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node representing the return type
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node
-
-  os->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *os << "virtual ";
-
-  // STEP I: generate the return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // grab the right visitor to generate the return type
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 2: generate the operation name
-  *os << " " << node->local_name ();
-
-  // STEP 3: generate the argument list with the appropriate mapping. For these
-  // we grab a visitor that generates the parameter listing
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_SH);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // generate the corresponding static skeleton method for this operation only
-  // if there was no "native" type
-  if (!node->has_native ())
-    {
-      os->indent ();
-      *os << "static void ";
-      // check if we are an attribute node in disguise
-      if (this->ctx_->attribute ())
-        {
-          // now check if we are a "get" or "set" operation
-          if (node->nmembers () == 1) // set
-            *os << "_set_";
-          else
-            *os << "_get_";
-        }
-      *os << node->local_name () <<
-        "_skel (" << be_idt << be_idt_nl
-          << "CORBA::ServerRequest &_tao_req, " << be_nl
-          << "void *_tao_obj, " << be_nl
-          << "void *_tao_context, " << be_nl
-          << "CORBA::Environment &_tao_env"
-          << be_uidt_nl << be_uidt << ");\n\n";
-    }
-
-  return 0;
-}
-
-// ************************************************************
-// Operation visitor for server skeletons
-// ************************************************************
-
-be_visitor_operation_ss::be_visitor_operation_ss (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_ss::~be_visitor_operation_ss (void)
-{
-}
-
-// processing to be done after every element in the scope is processed
-int
-be_visitor_operation_ss::post_process ()
-{
-  // all we do here is to insert a comma and a newline
-  TAO_OutStream *os = this->ctx_->stream ();
-  *os << ",\n";
-  return 0;
-}
-
-int
-be_visitor_operation_ss::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node for return type
-
-  os = this->ctx_->stream (); // grab the o/p stream
-  this->ctx_->node (node); // save the node for future use
-
-  os->indent (); // start with the current indentation level
-
-  // if there is an argument of type "native", return immediately
-  if (node->has_native ())
-    return 0;
-
-  // retrieve the operation return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // STEP 1:
-  // generate the param_data and call_data tables. We generate these if and
-  // only if none of our arguments is of "native" type. Native types cannot be
-  // marshaled.
-  // native type does not exist. Generate the static tables
-
-  // STEP 1A: generate the TAO_Param_Data_Skel table
-  *os << "static const TAO_Param_Data_Skel ";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->flatname () <<
-    "_paramdata [] = " << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-
-      // entry for the return type
-  *os << "{" << bt->tc_name () << ", 0, 0}";
-  if (node->nmembers () > 0)
-    *os << ",\n";
-
-      // generate entries for the param data table for arguments
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "visit scope failed\n"),
-                        -1);
-    }
-  *os << "\n";
-  os->decr_indent ();
-  *os << "}; // " << node->flatname () << "_paramdata\n\n";
-
-  // STEP 1B: now generate the calldata table
-  os->indent ();
-  *os << "static const TAO_Call_Data_Skel ";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->flatname ()
-      << "_calldata = " << be_nl
-      << "{"
-      << "\"";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->local_name () << "\", ";
-
-      // are we oneway or two operation?
-  if (node->flags () == AST_Operation::OP_oneway)
-    {
-      *os << "0, "; // for false
-    }
-  else
-    {
-      *os << "1, "; // for true
-    }
-  // insert the size of the paramdata table i.e., number of arguments + 1
-  // for return type
-  *os << (node->argument_count () + 1) << ", ";
-
-  // insert the address of the paramdata table
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->flatname () << "_paramdata};\n\n";
-
-  // We need the interface node in which this operation was defined. However,
-  // if this operation node was an attribute node in disguise, we get this
-  // information from the context
-  be_interface *intf;
-  intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (node->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "bad interface scope\n"),
-                        -1);
-    }
-
-  // STEP 2: generate the signature of the static skeleton
-  os->indent ();
-  *os << "void " << intf->full_skel_name () << "::";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->local_name ()
-      << "_skel (" << be_idt << be_idt_nl
-      << "CORBA::ServerRequest &_tao_server_request, " << be_nl
-      << "void *_tao_object_reference, " << be_nl
-      << "void * /* context */, " << be_nl
-      << "CORBA::Environment &_tao_environment" << be_uidt << be_uidt_nl
-      << ")" << be_nl;
-
-  // STEP 3:
-  // generate the actual code for the skeleton. However, if any of the argument
-  // types is "native", we do not generate any skeleton
-  // last argument - is always CORBA::Environment
-  *os << "{" << be_idt_nl;
-
-  // get the right object implementation.
-  *os << intf->full_skel_name () << " *_tao_impl = ("
-      << intf->full_skel_name () << " *)_tao_object_reference;\n";
-
-  // STEP 3A: declare a return type variable
-  be_visitor_context ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return var decl failed\n"),
-                        -1);
-    }
-
-  // STEP 3B: declare variables for arguments
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return var decl failed\n"),
-                        -1);
-    }
-
-
-  // STEP 3C: setup parameters for demarshaling and demarshal them
-  os->indent ();
-  *os << "_tao_server_request.demarshal (" << be_idt_nl
-      << "_tao_environment, " << be_nl
-      << "&";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->flatname () << "_calldata,\n";
-
-  // pass the appropriate return value to the demarshal operation
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DEMARSHAL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for return var in demarshal failed\n"),
-                        -1);
-    }
-  // insert a comma after the return val if there are arguments
-  if (node->argument_count () > 0)
-    *os << ",\n";
-
-  // pass each argument to the demarshal operation
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument in demarshal failed\n"),
-                        -1);
-    }
-
-  // end the demarshal call
-  *os << be_uidt_nl;
-  *os << ");\n";
-
-  // STEP 3D: check for exception
-  os->indent ();
-  *os << "if (_tao_environment.exception ()) return;\n";
-
-  // do pre upcall processing if any
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for making upcall failed\n"),
-                        -1);
-    }
-  // STEP 3E: make the upcall and assign to the return val
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for retval assignment failed\n"),
-                        -1);
-    }
-
-  // make the upcall
-  *os << "_tao_impl->" << node->local_name () << " (" << be_idt << "\n";
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for making upcall failed\n"),
-                        -1);
-    }
-  // last argument is the environment
-  if (node->argument_count () > 0)
-    *os << ",\n";
-  os->indent ();
-  *os << "_tao_environment";
-  // end the upcall
-  *os << be_uidt_nl;
-  *os << ");\n";
-
-  // STEP 3F: do any post processing for the arguments
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_UPCALL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for args in post upcall failed\n"),
-                        -1);
-    }
-
-  // STEP 3G: check if we are oneway in which case, we are done
-  if (node->flags () == AST_Operation::OP_oneway)
-    {
-      // we are done. Nothing else to do, except closing the funciton body.
-      os->decr_indent ();
-      *os << "}\n\n";
-      return 0;
-    }
-
-  // STEP 3H: setup parameters for marshaling and marshal them into the
-  // outgoing stream
-  os->indent ();
-  *os << "_tao_server_request.marshal (" << be_idt_nl
-      << "_tao_environment, " << be_nl
-      << "&";
-  // check if we are an attribute node in disguise
-  if (this->ctx_->attribute ())
-    {
-      // now check if we are a "get" or "set" operation
-      if (node->nmembers () == 1) // set
-        *os << "_set_";
-      else
-        *os << "_get_";
-    }
-  *os << node->flatname () << "_calldata,\n";
-
-  // pass the appropriate return value to the marshal operation
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for return var in marshal failed\n"),
-                        -1);
-    }
-  // insert a comma after the return val if there are arguments
-  if (node->argument_count () > 0)
-    {
-      *os << ",\n";
-    }
-
-  // pass each argument to the marshal operation
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument in marshal failed\n"),
-                        -1);
-    }
-  // end the marshal call
-  *os << be_uidt_nl;
-  *os << ");\n";
-
-  // STEP 3E:
-  // do any post processing for the retval
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_POST_UPCALL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (bt->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for return type post upcall failed\n"),
-                        -1);
-    }
-
-  // STEP 3F: do any post processing for the arguments
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for args in post marshal failed\n"),
-                        -1);
-    }
-
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_operation_ss::visit_argument (be_argument *node)
-{
-  // this method is used to generate the ParamData table entry
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt; // argument type
-
-  // retrieve the type for this argument
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  os->indent ();
-  *os << "{" << bt->tc_name () << ", ";
-  switch (node->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "CORBA::ARG_IN, ";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << "CORBA::ARG_INOUT, ";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << "CORBA::ARG_OUT, ";
-      break;
-    }
-  *os << "0}";
-
-  return 0;
-}
-
-// *************************************************************************
-//  be_visitor_operation_collocated_sh --
-//  This visitor generates code for the collocated operation signature in a
-//  server header file
-// *************************************************************************
-
-be_visitor_operation_collocated_sh::be_visitor_operation_collocated_sh
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_collocated_sh::~be_visitor_operation_collocated_sh (void)
-{
-}
-
-int be_visitor_operation_collocated_sh::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node representing the return type
-
-  os = this->ctx_->stream ();
-  this->ctx_->node (node); // save the node
-
-  os->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *os << "virtual ";
-
-  // STEP I: generate the return type
-  bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // grab the right visitor to generate the return type
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 2: generate the operation name
-  *os << " " << node->local_name ();
-
-  // STEP 3: generate the argument list with the appropriate mapping. For these
-  // we grab a visitor that generates the parameter listing
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_sh::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  return 0;
-}
-
-// *************************************************************************
-//  be_visitor_operation_collocated_ss --
-//  This visitor generates code for the collocated operation signature in a
-//  server skeletons file
-// *************************************************************************
-
-be_visitor_operation_collocated_ss::be_visitor_operation_collocated_ss
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_collocated_ss::~be_visitor_operation_collocated_ss (void)
-{
-}
-
-int be_visitor_operation_collocated_ss::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // We need the interface node in which this operation was defined. However,
-  // if this operation node was an attribute node in disguise, we get this
-  // information from the context
-  be_interface *intf;
-  intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (node->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_collocated_ss::"
-                         "visit_operation - "
-                         "bad interface scope\n"),
-                        -1);
-    }
-
-  // retrieve the operation return type
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_collocated_ss::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // STEP 2: generate the return type mapping (same as in the header file)
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_collocated_ss::"
-                         "visit_operation - "
-                         "Bad visitor for return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_collocated_ss::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << " " << intf->full_coll_name () << "::"
-      << node->local_name () << " ";
-
-  // STEP 4: generate the argument list with the appropriate mapping (same as
-  // in the header file)
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << "{" << be_idt << "\n";
-
-  os->indent ();
-  if (bt->node_type () != AST_Decl::NT_pre_defined
-      || be_predefined_type::narrow_from_decl (bt)->pt () != AST_PredefinedType::PT_void)
-    {
-      *os << "return ";
-    }
-
-  *os << "this->servant_->" << node->local_name () << " (" << be_idt << "\n";
-
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ss::"
-                         "visit_operation - "
-                         "codegen for making upcall failed\n"),
-                        -1);
-    }
-  // last argument is the environment
-  if (node->argument_count () > 0)
-    *os << ",\n";
-  os->indent ();
-  *os << "_tao_environment";
-  // end the upcall
-  *os << be_uidt_nl;
-  *os << ");" << be_uidt_nl;
-  *os << "}\n\n";
-
-  return 0;
-}
-
-// ****************************************************************************
-// Operation visitor for return types. This generates the mapping for a return
-// type in an operation signature
-// ****************************************************************************
-
-be_visitor_operation_rettype::be_visitor_operation_rettype (be_visitor_context
-                                                            *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype::~be_visitor_operation_rettype (void)
-{
-}
-
-int
-be_visitor_operation_rettype::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope (), "_slice") << " *";
-  else
-    *os << bt->name () << "_slice *";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope (), "_ptr");
-  else
-    *os << bt->name () << "_ptr";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope (), "_ptr");
-  else
-    *os << bt->name () << "_ptr";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_native (be_native *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ()) << " *";
-  else
-    *os << bt->name () << " *";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-        *os << bt->nested_type_name (this->ctx_->scope (), "_ptr");
-      else
-        *os << bt->name () << "_ptr";
-      break;
-    case AST_PredefinedType::PT_any:
-      if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-        *os << bt->nested_type_name (this->ctx_->scope ()) << " *";
-      else
-        *os << bt->name () << " *";
-      break;
-    default:
-      if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-        *os << bt->nested_type_name (this->ctx_->scope ());
-      else
-        *os << bt->name ();
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_sequence (be_sequence *node)
-{
-  // we should never directly be here because anonymous sequence return types
-  // are not allowed
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ()) << " *";
-  else
-    *os << bt->name () << " *";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  *os << "char *";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << " *";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << " *";
-  return 0;
-}
-
-// ************************************************************
-//   operation visitor  to generate the argument list.
-//   We have separated code generation for this from the 4 main
-//   visitors to avoid code duplication and tight coupling
-// ************************************************************
-
-be_visitor_operation_arglist::be_visitor_operation_arglist (be_visitor_context
-                                                            *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_arglist::~be_visitor_operation_arglist (void)
-{
-}
-
-int
-be_visitor_operation_arglist::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->incr_indent (0); // these are for pretty printing
-  os->incr_indent (0);
-  *os << " (\n";
-
-  // all we do is hand over code generation to our scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_arglist::"
-                         "visit_operation - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  // last argument - is always CORBA::Environment
-  os->indent ();
-  *os << "CORBA::Environment &_tao_environment\n";
-  os->decr_indent ();
-  *os << " )";
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
-      *os << ";\n";
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-      // each method is pure virtual in the server header
-      *os << " = 0;\n";
-      break;
-    default:
-      *os << "\n";
-    }
-
-  os->decr_indent (0);
-  return 0;
-}
-
-int
-be_visitor_operation_arglist::visit_argument (be_argument *node)
-{
-  // get the visitor that will dump the argument's mapping in the operation
-  // signature.
-  be_visitor_context ctx (*this->ctx_);
-
-  // first grab the interface definition inside which this operation is
-  // defined. We need this since argument types may very well be declared
-  // inside the scope of the interface node. In such cases, we would like to
-  // generate the appropriate relative scoped names.
-  be_operation *op = this->ctx_->be_scope_as_operation ();
-  if (!op)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad operation\n"),
-                        -1);
-    }
-
-  // We need the interface node in which this operation was defined. However,
-  // if this operation node was an attribute node in disguise, we get this
-  // information from the context
-  be_interface *intf;
-  intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (op->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad interface\n"),
-                        -1);
-    }
-  ctx.scope (intf); // set new scope
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_arglist::"
-                           "visit_argument - "
-                           "Bad context\n"),
-                          -1);
-      }
-    }
-
-  // grab a visitor
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad visitor\n"),
-                        -1);
-    }
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-
-                         "visit_argument - "
-                         "codegen for arglist failed\n"),
-                        -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ************************************************************
-//    be_visitor_operation_rettype_vardecl_cs
-//    This visitor generates code for variable declaration and initialization
-//    of the return type.
-// ************************************************************
-
-be_visitor_operation_rettype_vardecl_cs::
-be_visitor_operation_rettype_vardecl_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_vardecl_cs::
-~be_visitor_operation_rettype_vardecl_cs (void)
-{
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "_slice *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << " _tao_retval = (" << bt->name () << ")0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " << bt->name () << "::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      os->indent ();
-      *os << bt->name () << "_ptr _tao_retval = 0;\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      os->indent ();
-      *os << bt->name () << " *_tao_retval = 0;\n";
-      break;
-    case AST_PredefinedType::PT_void:
-      break;
-    default:
-      os->indent ();
-      *os << bt->name () << " _tao_retval = 0;\n";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_sequence (be_sequence *node)
-{
-  // we should never directly be here because anonymous sequence return types
-  // are not allowed
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << " *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "char *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
-  else
-    {
-      *os << bt->name () << " _tao_retval;" << be_nl;
-      *os << "ACE_OS::memset (&_tao_retval, 0, sizeof (" << bt->name () << "));\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_vardecl_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
-  else
-    {
-      *os << bt->name () << " _tao_retval;" << be_nl;
-      *os << "ACE_OS::memset (&_tao_retval, 0, sizeof (" << bt->name () << "));\n";
-    }
-  return 0;
-}
-
-// *****************************************************************************
-//    be_visitor_operation_rettype_pre_docall_cs
-//
-//    This visitor generates code that passes the return type variable to the
-//    do_static_call method
-// *****************************************************************************
-
-be_visitor_operation_rettype_pre_docall_cs::
-be_visitor_operation_rettype_pre_docall_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_pre_docall_cs::
-~be_visitor_operation_rettype_pre_docall_cs (void)
-{
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "CORBA::Object_ptr _tao_base_retval = CORBA::Object::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "CORBA::Object_ptr _tao_base_retval = CORBA::Object::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::
-visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_any:
-      os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);\n";
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "ACE_NEW_RETURN (_tao_retval, " << node->name () << ", _tao_retval);\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  // check if the union is variable
-  if (node->size_type () == be_type::VARIABLE)
-    {
-      os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_retval, " << node->name () << ", _tao_retval);\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_pre_docall_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_pre_docall_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  // check if the union is variable
-  if (node->size_type () == be_type::VARIABLE)
-    {
-      os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_retval, " << node->name () << ", _tao_retval);\n";
-    }
-  return 0;
-}
-
-// *****************************************************************************
-//    be_visitor_operation_rettype_docall_cs
-//
-//    This visitor generates code that passes the return type variable to the
-//    do_static_call method
-// *****************************************************************************
-
-be_visitor_operation_rettype_docall_cs::be_visitor_operation_rettype_docall_cs
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_docall_cs::
-~be_visitor_operation_rettype_docall_cs (void)
-{
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_base_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_base_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      *os << "0";
-      break;
-    case AST_PredefinedType::PT_any:
-      *os << "_tao_retval";
-      break;
-    default:
-      *os << "&_tao_retval";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // check if the struct is variable
-  if (node->size_type () == be_type::VARIABLE)
-    *os << "_tao_retval";
-  else
-    *os << "&_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_docall_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_docall_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // check if the union is variable
-  if (node->size_type () == be_type::VARIABLE)
-    *os << "_tao_retval";
-  else
-    *os << "&_tao_retval";
-  return 0;
-}
-
-// *******************************************************************************
-//    be_visitor_operation_rettype_post_docall_cs
-//
-//    This visitor generates code that passes the return type variable to the
-//    do_static_call method
-// ********************************************************************************
-
-be_visitor_operation_rettype_post_docall_cs::
-be_visitor_operation_rettype_post_docall_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_post_docall_cs::
-~be_visitor_operation_rettype_post_docall_cs (void)
-{
-}
-
-int
-be_visitor_operation_rettype_post_docall_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = " << node->name ()
-      << "::_narrow (_tao_base_retval, _tao_environment);" << be_nl;
-  *os << "CORBA::release (_tao_base_retval);\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_docall_cs::
-visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = " << node->name ()
-      << "::_narrow (_tao_base_retval, _tao_environment);" << be_nl;
-  *os << "CORBA::release (_tao_base_retval);\n";
-  return 0;
-}
-
-// ************************************************************
-//    be_visitor_operation_rettype_return_cs
-//
-//    code to generate the return statement of the stub.
-// ************************************************************
-
-be_visitor_operation_rettype_return_cs::be_visitor_operation_rettype_return_cs
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_return_cs::~be_visitor_operation_rettype_return_cs (void)
-{
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // we must narrow it
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // we must narrow it
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      *os << "return;\n";
-      break;
-    default:
-      *os << "return _tao_retval;\n";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_structure (be_structure *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_return_cs::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_union (be_union *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "return _tao_retval;\n";
-  return 0;
-}
-
-// ********************************************************************************
-//    be_visitor_operation_rettype_vardecl_ss
-//    This visitor generates code for variable declaration and initialization
-//    of the return type.
-// ********************************************************************************
-
-be_visitor_operation_rettype_vardecl_ss::be_visitor_operation_rettype_vardecl_ss
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_vardecl_ss::
-~be_visitor_operation_rettype_vardecl_ss (void)
-{
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "_slice *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << " _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // due to the virtual inheritance and the fact that we will be passing the
-  // address of the objref to the marshaling routine, we use the base
-  // CORBA::Object_ptr as the type for the return value even though the actual
-  // return type may be some derived class
-  *os << "CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::
-visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  // due to the virtual inheritance and the fact that we will be passing the
-  // address of the objref to the marshaling routine, we use the base
-  // CORBA::Object_ptr as the type for the return value even though the actual
-  // return type may be some derived class
-  *os << "CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::
-visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      os->indent ();
-      *os << bt->name () << "_ptr _tao_retval = 0;\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      os->indent ();
-      *os << bt->name () << " *_tao_retval = 0;\n";
-      break;
-    case AST_PredefinedType::PT_void:
-      break;
-    default:
-      os->indent ();
-      *os << bt->name () << " _tao_retval = 0;\n";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_sequence (be_sequence *node)
-{
-  // we should never directly be here because anonymous sequence return types
-  // are not allowed
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << " *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "char *_tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
-  else
-    *os << bt->name () << " _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_vardecl_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  // based on whether we are variable or not, we return a pointer or the
-  // aggregate type
-  if (node->size_type () == be_decl::VARIABLE)
-    *os << bt->name () << " *_tao_retval = 0;\n";
-  else
-    *os << bt->name () << " _tao_retval;\n";
-  return 0;
-}
-
-// ****************************************************************************
-// Visitor that passes the return value to the marshal/demarshal routine
-// ****************************************************************************
-
-be_visitor_operation_rettype_marshal_ss::
-be_visitor_operation_rettype_marshal_ss (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_marshal_ss::
-~be_visitor_operation_rettype_marshal_ss (void)
-{
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::
-visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::
-visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      os->indent ();
-      *os << "0";
-      break;
-    case AST_PredefinedType::PT_pseudo:
-    case AST_PredefinedType::PT_any:
-    default:
-      os->indent ();
-      *os << "&_tao_retval";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "&_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  if (node->size_type () == be_type::VARIABLE)
-    *os << "_tao_retval";
-  else
-    *os << "&_tao_retval";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_marshal_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  if (node->size_type () == be_type::VARIABLE)
-    *os << "_tao_retval";
-  else
-    *os << "&_tao_retval";
-
-  return 0;
-}
-
-// ****************************************************************************
-// visitor for assignment to a return value variable from the upcall
-// ****************************************************************************
-
-be_visitor_operation_rettype_assign_ss::
-be_visitor_operation_rettype_assign_ss (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_assign_ss::
-~be_visitor_operation_rettype_assign_ss (void)
-{
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_enum (be_enum *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_interface (be_interface *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::
-visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::
-visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      break;
-    case AST_PredefinedType::PT_pseudo:
-    case AST_PredefinedType::PT_any:
-    default:
-      *os << "_tao_retval = ";
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_sequence (be_sequence *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_structure (be_structure *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_assign_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::visit_union (be_union *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-// ****************************************************************************
-// visitor to do any post processing for return type after an upcall
-// ****************************************************************************
-
-be_visitor_operation_rettype_post_upcall_ss::be_visitor_operation_rettype_post_upcall_ss (be_visitor_context
-                                                            *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_rettype_post_upcall_ss::~be_visitor_operation_rettype_post_upcall_ss (void)
-{
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_array (be_array *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "delete _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      break;
-    case AST_PredefinedType::PT_any:
-      break;
-    case AST_PredefinedType::PT_void:
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_sequence (be_sequence *node)
-{
-  // we should never directly be here because anonymous sequence return types
-  // are not allowed
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_string (be_string * /* node*/)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_post_upcall_ss::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_post_upcall_ss::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  return 0;
-}
-
-// ************************************************************
-// generic operation visitor to handle the pre/post do_static_call/upcall stuff with
-// arguments
-// ************************************************************
-
-be_visitor_operation_argument::be_visitor_operation_argument (be_visitor_context
-                                                            *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_operation_argument::~be_visitor_operation_argument (void)
-{
-}
-
-int
-be_visitor_operation_argument::post_process (void)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_ARG_DOCALL_CS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
-    case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
-      *os << ",\n";
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_argument::visit_operation (be_operation *node)
-{
-  // all we do is hand over code generation to our scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_argument::"
-                         "visit_operation - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_operation_argument::visit_argument (be_argument *node)
-{
-  // get the visitor that will dump the argument's mapping in the operation
-  // signature.
-  be_visitor_context ctx (*this->ctx_);
-
-  // first grab the interface definition inside which this operation is
-  // defined. We need this since argument types may very well be declared
-  // inside the scope of the interface node. In such cases, we would like to
-  // generate the appropriate relative scoped names.
-  be_operation *op = this->ctx_->be_scope_as_operation ();
-  if (!op)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad operation\n"),
-                        -1);
-    }
-
-  // We need the interface node in which this operation was defined. However,
-  // if this operation node was an attribute node in disguise, we get this
-  // information from the context
-  be_interface *intf;
-  intf = this->ctx_->attribute ()
-    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_interface::narrow_from_scope (op->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad interface\n"),
-                        -1);
-    }
-  ctx.scope (intf); // set new scope
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_ARG_PRE_DOCALL_CS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_DOCALL_CS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_DOCALL_CS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_DEMARSHAL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_PRE_UPCALL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_UPCALL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS);
-      break;
-    case TAO_CodeGen::TAO_OPERATION_ARG_POST_MARSHAL_SS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_argument::"
-                           "visit_argument - "
-                           "Bad context\n"),
-                          -1);
-      }
-    }
-
-  // grab a visitor
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_argument::"
-                         "visit_argument - "
-                         "Bad visitor\n"),
-                        -1);
-    }
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_argument::"
-
-                         "visit_argument - "
-                         "codegen for argument failed\n"),
-                        -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-
-// ****************************************************************************
-// visitor to generate the exception list for operations
-// ****************************************************************************
-
-be_visitor_operation_exceptlist_cs::be_visitor_operation_exceptlist_cs (be_visitor_context
-                                                            *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_operation_exceptlist_cs::~be_visitor_operation_exceptlist_cs (void)
-{
-}
-
-int
-be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  // don't do anything if the exception list is empty
-  if (node->exceptions ())
-    {
-      os->indent ();
-      *os << "CORBA::TypeCode_ptr " << "_tao_" << node->flatname ()
-          << "_exceptlist [] = {" << be_idt_nl;
-      // initialize an iterator to iterate thru the exception list
-      UTL_ExceptlistActiveIterator *ei;
-      ACE_NEW_RETURN (ei,
-                      UTL_ExceptlistActiveIterator (node->exceptions ()),
-                      -1);
-      // continue until each element is visited
-      while (!ei->is_done ())
-        {
-          be_exception *excp = be_exception::narrow_from_decl (ei->item ());
-
-          if (excp == 0)
-            {
-              delete ei;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_operation_exceptlist_cs"
-                                 "visit_operation - "
-                                 "codegen for scope failed\n"), -1);
-
-            }
-          os->indent ();
-          *os << excp->tc_name ();
-
-          ei->next ();
-          if (!ei->is_done ())
-            *os << ",\n";
-          // except the last one is processed?
-
-        } // end of while loop
-      delete ei;
-      *os << be_uidt_nl << "};\n\n";
-    } // end of if
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
deleted file mode 100644
index cd291424a39..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ /dev/null
@@ -1,796 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_root.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Root
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-#include "be_visitor_root.h"
-
-// Generic Root visitor
-be_visitor_root::be_visitor_root (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_root::~be_visitor_root (void)
-{
-}
-
-// this method must be overridden by the derived root visitors
-int
-be_visitor_root::init (void)
-{
-  return -1;
-}
-
-// visit the Root node and its scope
-int be_visitor_root::visit_root (be_root *node)
-{
-  // open the appropriate output file based on what state we are in. The
-  // overridden "init" method of derived classes will do the job.
-  if (this->init () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::init - "
-                         "failed to initialize context\n"), -1);
-    }
-
-  // all we have to do is to visit the scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::visit_root - "
-                         "codegen for scope failed\n"), -1);
-    }
-  return 0;
-}
-
-// =all common visit methods for root visitor
-
-// visit a constant
-int
-be_visitor_root::visit_constant (be_constant *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_constant - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_constant - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_constant - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-//visit an enum
-int
-be_visitor_root::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_enum - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_enum - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_enum - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an exception
-int
-be_visitor_root::visit_exception (be_exception *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_exception - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_exception - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_exception - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an interface
-int
-be_visitor_root::visit_interface (be_interface *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SS:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_SS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_interface - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_interface - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_interface - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an interface_fwd
-int
-be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_interface_fwd - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_interface_fwd - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_interface_fwd - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an module
-int
-be_visitor_root::visit_module (be_module *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_MODULE_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_MODULE_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_MODULE_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-      ctx.state (TAO_CodeGen::TAO_MODULE_SH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SI:
-      ctx.state (TAO_CodeGen::TAO_MODULE_SI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SS:
-      ctx.state (TAO_CodeGen::TAO_MODULE_SS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_module - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_module - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_module - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an structure
-int
-be_visitor_root::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_structure - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_structure - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_structure - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an union
-int
-be_visitor_root::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_union - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_union - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_union - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an typedef
-int
-be_visitor_root::visit_typedef (be_typedef *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_typedef - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_typedef - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_typedef - "
-                         "failed to accept visitor"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ********************************
-// Root visitor for client header
-// ********************************
-
-be_visitor_root_ch::be_visitor_root_ch (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_ch::~be_visitor_root_ch (void)
-{
-}
-
-int
-be_visitor_root_ch::init (void)
-{
-  // first open the client-side header file for writing
-  if (tao_cg->client_header (idl_global->be_get_client_hdr_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_visitor_root_ch::init - "
-                  "Error opening client header file\n"));
-      return -1;
-    }
-
-  this->ctx_->stream (tao_cg->client_header ());
-  return 0;
-}
-
-// *********************************
-// Root visitor for client inline
-// *********************************
-
-be_visitor_root_ci::be_visitor_root_ci (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_ci::~be_visitor_root_ci (void)
-{
-}
-
-int
-be_visitor_root_ci::init (void)
-{
-  // first open the client-side inline file for writing
-  if (tao_cg->client_inline (idl_global->be_get_client_inline_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%N:%l) be_visitor_root_ci - "
-                  "Error opening client inline file\n"));
-      return -1;
-    }
-
-  this->ctx_->stream (tao_cg->client_inline ());
-  return 0;
-}
-
-// ***********************************
-// Root visitor for client stubs
-// ***********************************
-
-be_visitor_root_cs::be_visitor_root_cs (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_cs::~be_visitor_root_cs (void)
-{
-}
-
-int
-be_visitor_root_cs::init (void)
-{
-  // first open the file
-  if (tao_cg->client_stubs (idl_global->be_get_client_stub_fname ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root_cs - "
-                         "Error opening client stub file\n"), -1);
-    }
-
-  this->ctx_->stream (tao_cg->client_stubs ()); // init stream
-  return 0;
-}
-
-// ***********************************
-// Root visitor for server header
-// ***********************************
-
-be_visitor_root_sh::be_visitor_root_sh (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_sh::~be_visitor_root_sh (void)
-{
-}
-
-int
-be_visitor_root_sh::init (void)
-{
-  // open the file
-  if (tao_cg->server_header (idl_global->be_get_server_hdr_fname ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root_sh::init - "
-                         "Error opening server header file\n"), -1);
-    }
-
-  // set the stream and the next state
-  this->ctx_->stream (tao_cg->server_header ());
-  return 0;
-}
-
-// ***********************************************
-// Root visitor for server inline
-// ***********************************************
-
-be_visitor_root_si::be_visitor_root_si (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_si::~be_visitor_root_si (void)
-{
-}
-
-int
-be_visitor_root_si::init (void)
-{
-  // first open the file for writing
-  if (tao_cg->server_inline (idl_global->be_get_server_inline_fname ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root_si::init - "
-                         "server inline open failed\n"), -1);
-    }
-
-  this->ctx_->stream (tao_cg->server_inline ()); // init stream
-  return 0;
-}
-
-// ******************************************************
-// Root visitor for server skeletons
-// ******************************************************
-
-be_visitor_root_ss::be_visitor_root_ss (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_ss::~be_visitor_root_ss (void)
-{
-}
-
-int
-be_visitor_root_ss::init (void)
-{
-  // first open the file for writing
-  if (tao_cg->server_skeletons (idl_global->be_get_server_skeleton_fname ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root_ss::init - "
-                         "Error opening server skeletons file\n"), -1);
-    }
-
-  this->ctx_->stream (tao_cg->server_skeletons ()); // set stream
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
deleted file mode 100644
index 126e18ca3e2..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_scope.cpp
-//
-// = DESCRIPTION
-//    Visitor for the base be_scope node. This serves to maintain the current
-//    state (context) of code generation for the derived visitor.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_scope.h"
-
-// ******************************************************
-//  Generic visitor for a scope.
-//  All elements that give rise to a scope inherit from
-//  this class
-// ******************************************************
-
-be_visitor_scope::be_visitor_scope (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_scope::~be_visitor_scope (void)
-{
-}
-
-// visit the scope and its elements
-int
-be_visitor_scope::visit_scope (be_scope *node)
-{
-  // proceed if the number of members in our scope is greater than 0
-  if (node->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-		      UTL_ScopeActiveIterator (node,
-					       UTL_Scope::IK_decls),
-		      -1);
-      // continue until each element is visited
-      while (!si->is_done ())
-	{
-	  AST_Decl *d = si->item ();
-	  be_decl *bd = be_decl::narrow_from_decl (d);
-          // set the scope node in which the code is being generated
-          this->ctx_->scope (node->decl ());
-          // set the node to be visited
-          this->ctx_->node (bd);
-	  if (bd == 0 || bd->accept (this) == -1)
-	    {
-	      delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "codegen for scope failed\n"), -1);
-
-	    }
-	  si->next ();
-          if (!si->is_done ())
-            this->post_process (); // anything to be done after each element
-                                   // except the last one is processed?
-
-	} // end of while loop
-      delete si;
-    } // end of if
-
-  return 0;
-}
-
-int
-be_visitor_scope::post_process (void)
-{
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
deleted file mode 100644
index 30c69532422..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp
+++ /dev/null
@@ -1,1558 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_sequence.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Sequence
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-#include "be_visitor_sequence.h"
-
-// Root visitor for client header
-be_visitor_sequence_ch::be_visitor_sequence_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_ch::~be_visitor_sequence_ch (void)
-{
-}
-
-int
-be_visitor_sequence_ch::gen_base_sequence_class (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  // retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // generate the appropriate sequence type
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF: // sequence of objrefs
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_Object_Sequence<";
-      else
-        *os << "TAO_Bounded_Object_Sequence<";
-      break;
-    case be_sequence::MNG_STRING: // sequence of strings
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_String_Sequence";
-      else
-        *os << "TAO_Bounded_String_Sequence";
-      break;
-    default: // not a managed type
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_Sequence<";
-      else
-        *os << "TAO_Bounded_Sequence<";
-      break;
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // find out if the sequence is of a managed type and if it is bounded or not
-  if (node->managed_type () == be_sequence::MNG_STRING)
-    {
-      if (!node->unbounded ())
-        {
-          *os << "<" << node->max_size () << ">";
-        }
-    }
-  else
-    {
-      if (node->unbounded ())
-        {
-          *os << ">";
-        }
-      else
-        {
-          *os << ", " << node->max_size () << ">";
-        }
-    }
-  return 0;
-}
-
-int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
-{
-  be_type *bt;       // type node
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->cli_hdr_gen () || node->imported ())
-    return 0;
-
-  // first create a name for ourselves
-  if (node->create_name (this->ctx_->tdef ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "failed creating name\n"), -1);
-    }
-
-  // generate the ifdefined macro for the sequence type
-  os->gen_ifdef_macro (node->flatname ());
-
-  os->indent (); // start with the current indentation level
-
-  // retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  *os << "// *************************************************************"
-      << be_nl
-      << "// " << node->local_name () << be_nl
-      << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // generate a typedef to a parametrized sequence
-  *os << "class " << idl_global->export_macro ()
-      << " " << node->local_name () << " : public ";
-  if (this->gen_base_sequence_class (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "codegen for base sequence class\n"), -1);
-    }
-
-  *os << be_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl
-      << node->local_name () << " (void); // default ctor" << be_nl;
-  // for unbounded sequences, we have a different set of constructors
-  if (node->unbounded ())
-    {
-      *os << node->local_name () << " (CORBA::ULong max); // uses max size"
-          << be_nl;
-    }
-
-  *os << node->local_name () << " (" << be_idt_nl;
-  if (node->unbounded ())
-    {
-      // unbounded seq takes this extra parameter
-      *os << "CORBA::ULong max, " << be_nl;
-    }
-  *os << "CORBA::ULong length, " << be_nl;
-  // generate the base type for the buffer
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-  delete visitor;
-  *os << " *buffer, " << be_nl
-      << "CORBA::Boolean release=0" << be_uidt_nl
-      << ");" << be_nl;
-  *os << node->local_name () << " (const " << node->local_name ()
-      << " &); // copy ctor" << be_nl;
-  *os << "~" << node->local_name () << " (void); // dtor\n";
-  os->decr_indent ();
-  *os << "};" << be_nl;
-
-  // define a _ptr type. This is just an extension for convenience
-  *os << "typedef " << node->local_name () << " *"
-      << node->local_name () << "_ptr;\n";
-
-  // Generate the typecode decl
-  if (node->is_nested ())
-    {
-      // we have a scoped name
-      os->indent ();
-      *os << "static CORBA::TypeCode_ptr "
-          << node->tc_name ()->last_component () << "_seq;\n\n";
-    }
-  else
-    {
-      // we are in the ROOT scope
-      os->indent ();
-      *os << "extern "
-         << idl_global->export_macro ()
-         << " CORBA::TypeCode_ptr "
-         << node->tc_name ()->last_component () << ";\n\n";
-    }
-
-
-  os->gen_endif (); // endif macro
-
-  // generate the ifdefined macro for the var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
-
-  // generate the var and out types
-  if (this->gen_var_defn (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "codegen for _var failed\n"), -1);
-    }
-
-  os->gen_endif ();
-
-  // generate the ifdefined macro for the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
-
-  if (this->gen_out_defn (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
-  os->gen_endif ();
-  node->cli_hdr_gen (1);
-
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_visitor_sequence_ch::gen_var_defn (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  char namebuf [NAMEBUFSIZE];  // names
-  be_type *bt;  // base type
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", node->local_name ()->get_string ());
-
-  os = this->ctx_->stream ();
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// class " << node->name () << "_var" << be_nl;
-  *os << "// *************************************************************\n\n";
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_var_defn - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  os->indent (); // start with whatever was our current indent level
-  *os << "class " << idl_global->export_macro ()
-      << " " << namebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:\n";
-  os->incr_indent ();
-  // default constr
-  *os << namebuf << " (void); // default constructor" << be_nl;
-  // constr
-  *os << namebuf << " (" << node->local_name () << " *);" << be_nl;
-  // copy constructor
-  *os << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << be_nl;
-  // destructor
-  *os << "~" << namebuf << " (void); // destructor" << be_nl;
-  *os << be_nl;
-  // assignment operator from a pointer
-  *os << namebuf << " &operator= (" << node->local_name () << " *);" << be_nl;
-  // assignment from _var
-  *os << namebuf << " &operator= (const " << namebuf <<
-    " &);" << be_nl;
-
-  // arrow operator
-  *os << node->local_name () << " *operator-> (void);" << be_nl;
-  *os << "const " << node->local_name () << " *operator-> (void) const;" << be_nl;
-  *os << be_nl;
-
-  // other extra types (cast operators, [] operator, and others)
-
-  // cast operator
-  *os << "operator const " << node->local_name () << " &() const;" << be_nl;
-  *os << "operator " << node->local_name () << " &();" << be_nl;
-  *os << "operator " << node->local_name () << " &() const;" << be_nl;
-
-  // overloaded [] operator. The const version is not required for sequences
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_var_defn - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << "operator[] (CORBA::ULong index);" << be_nl;
-
-  *os << "// in, inout, out, _retn " << be_nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *os << "const " << node->local_name () << " &in (void) const;" << be_nl;
-  *os << node->local_name () << " &inout (void);" << be_nl;
-  *os << node->local_name () << " *&out (void);" << be_nl;
-  *os << node->local_name () << " *_retn (void);" << be_nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *os << node->local_name () << " *ptr (void) const;\n";
-
-  *os << "\n";
-  os->decr_indent ();
-
-  // generate the private section
-  *os << "private:\n";
-  os->incr_indent ();
-  *os << node->local_name () << " *ptr_;\n";
-
-  os->decr_indent ();
-  *os << "};\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_visitor_sequence_ch::gen_out_defn (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-  be_type *bt;  // base type
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", node->local_name ()->get_string ());
-  os = this->ctx_->stream ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_out_defn - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // generate the out definition (always in the client header)
-  os->indent (); // start with whatever was our current indent level
-
-  *os << "class " << idl_global->export_macro () << " "
-      << namebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:\n";
-  os->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *os << namebuf << " (" << node->local_name () << " *&);" << be_nl;
-  // constructor from a _var &
-  *os << namebuf << " (" << node->local_name () << "_var &);" << be_nl;
-  // constructor from a _out &
-  *os << namebuf << " (" << namebuf << " &);" << be_nl;
-  // assignment operator from a _out &
-  *os << namebuf << " &operator= (" << namebuf << " &);" << be_nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *os << namebuf << " &operator= (" << node->local_name () << " *);" << be_nl;
-  // operator ()
-  *os << "operator " << node->local_name () << " *&();" << be_nl;
-  // ptr fn
-  *os << node->local_name () << " *&ptr (void);" << be_nl;
-  // operator ->
-  *os << node->local_name () << " *operator-> (void);" << be_nl;
-
-  // overloaded [] operator only for sequence. The const version is not
-  // required
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_out_defn - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-  delete visitor;
-  *os << "operator[] (CORBA::ULong index);" << be_nl;
-  *os << "\n";
-  os->decr_indent ();
-  *os << "private:\n";
-  os->incr_indent ();
-
-  *os << node->local_name () << " *&ptr_;" << be_nl;
-  *os << "// assignment from T_var not allowed" << be_nl;
-  *os << "void operator= (const " << node->local_name () << "_var &);\n";
-
-  os->decr_indent ();
-  *os << "};\n\n";
-
-  return 0;
-}
-
-// ***********************************************************
-// sequence visitor for inline generation
-// ***********************************************************
-
-
-be_visitor_sequence_ci::be_visitor_sequence_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_ci::~be_visitor_sequence_ci (void)
-{
-}
-
-int
-be_visitor_sequence_ci::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->cli_inline_gen () || node->imported ())
-    return 0;
-
-  // all we do is generate the _var and _out implementations
-  if (this->gen_var_impl (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "codegen for _var failed\n"), -1);
-    }
-
-  if (this->gen_out_impl (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "codegen for _out failed\n"), -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", node->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", node->local_name ()->get_string ());
-
-  os  = this->ctx_->stream ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // generate the var implementation in the inline file
-  os->indent (); // start with whatever was our current indent level
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************\n\n";
-
-  // default constr
-  *os << "ACE_INLINE" << be_nl
-      << fname << "::" << lname
-      << " (void) // default constructor" << be_nl
-      << "  " << ": ptr_ (0)" << be_nl
-      << "{}\n\n";
-
-  // constr from a _ptr
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () << " *p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{}\n\n";
-
-  // copy constructor
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "if (p.ptr_)" << be_nl;
-  *os << "  this->ptr_ = new " << node->name () << "(*p.ptr_);" << be_nl;
-  *os << "else" << be_nl;
-  *os << "  this->ptr_ = 0;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // destructor
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::~" << lname << " (void) // destructor" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "delete this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // assignment operator from a pointer
-  os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->name () <<
-    " *p)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // assignment operator from _var
-  os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname <<
-    " &p) // deep copy" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "if (this != &p)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = new " << node->name () << " (*p.ptr_);\n";
-  os->decr_indent ();
-  *os << "}" << be_nl;
-  *os << "return *this;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // two arrow operators
-  os->indent ();
-  *os << "ACE_INLINE const " << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void) const" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  os->indent ();
-  *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator const " << node->name () <<
-    " &() const // cast" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return *this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () << " &() // cast " << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return *this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () << " &() const// cast " << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return *this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // operator []
-  os->indent ();
-  *os << "ACE_INLINE ";
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_var_impl - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_var_impl - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_->operator[] (index);\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // in, inout, out, and _retn
-  os->indent ();
-  *os << "ACE_INLINE const " << node->name () << " &" << be_nl;
-  *os << fname << "::in (void) const" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return *this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " &" << be_nl;
-  *os << fname << "::inout (void)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return *this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "// mapping for variable size " << be_nl;
-  *os << "ACE_INLINE " << node->name () << " *&" << be_nl;
-  *os << fname << "::out (void)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;" << be_nl;
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
-  *os << fname << "::_retn (void)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << node->name () << " *tmp = this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;" << be_nl;
-  *os << "return tmp;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // the additional ptr () member function
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
-  *os << fname << "::ptr (void) const" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  return 0;
-}
-
-int
-be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", node->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", node->local_name ()->get_string ());
-
-  os = this->ctx_->stream ();
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_out_impl - "
-                         "Bad element type\n"), -1);
-    }
-
-  // generate the out implementation in the inline file
-
-  os->indent (); // start with whatever was our current indent level
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () << " *&p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "this->ptr_ = 0;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // constructor from _var &
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () <<
-    "_var &p) // constructor from _var" << be_nl;
-  *os << "  : ptr_ (p.out ())" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // copy constructor
-  os->indent ();
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << be_nl;
-  *os << "  : ptr_ (p.ptr_)" << be_nl;
-  *os << "{}\n\n";
-
-  // assignment operator from _out &
-  os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << fname <<
-    " &p)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "this->ptr_ = p.ptr_;" << be_nl;
-  *os << "return *this;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->name () <<
-    " *p)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // other extra methods - cast operator ()
-  os->indent ();
-  *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () <<
-    " *&() // cast" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // ptr function
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *&" << be_nl;
-  *os << fname << "::ptr (void) // ptr" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // operator ->
-  os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  // sequence has an additional method
-  os->indent ();
-  *os << "ACE_INLINE ";
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_out_impl - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_out_impl - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  *os << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{\n";
-  os->incr_indent ();
-  *os << "return this->ptr_->operator[] (index);\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-
-  return 0;
-}
-
-// ************************************************************
-// Root visitor for client stub class
-// ************************************************************
-
-be_visitor_sequence_cs::be_visitor_sequence_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_cs::~be_visitor_sequence_cs (void)
-{
-}
-
-// XXXASG - this method is same as that in the _ch visitor. So we need some
-// abstraction for this
-
-int
-be_visitor_sequence_cs::gen_base_sequence_class (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  // retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "gen_base_sequence_class - "
-                         "Bad element type\n"), -1);
-    }
-
-  // generate the appropriate sequence type
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF: // sequence of objrefs
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_Object_Sequence<";
-      else
-        *os << "TAO_Bounded_Object_Sequence<";
-      break;
-    case be_sequence::MNG_STRING: // sequence of strings
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_String_Sequence";
-      else
-        *os << "TAO_Bounded_String_Sequence";
-      break;
-    default: // not a managed type
-      if (node->unbounded ())
-        *os << "TAO_Unbounded_Sequence<";
-      else
-        *os << "TAO_Bounded_Sequence<";
-      break;
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // find out if the sequence is of a managed type and if it is bounded or not
-  if (node->managed_type () == be_sequence::MNG_STRING)
-    {
-      if (!node->unbounded ())
-        {
-          *os << "<" << node->max_size () << ">";
-        }
-    }
-  else
-    {
-      if (node->unbounded ())
-        {
-          *os << ">";
-        }
-      else
-        {
-          *os << ", " << node->max_size () << ">";
-        }
-    }
-  return 0;
-}
-
-int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
-{
-  // generate the constructors
-  be_type *bt;       // type node
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->cli_stub_gen () || node->imported ())
-    return 0;
-
-  // generate the ifdefined macro for the sequence type
-  os->gen_ifdef_macro (node->flatname ());
-
-  os->indent (); // start with the current indentation level
-
-  // retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  *os << "// *************************************************************"
-      << be_nl
-      << "// " << node->name () << be_nl
-      << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // default constructor
-  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl
-      << "{}" << be_nl;
-
-  // for unbounded sequences, we have a different set of constructors
-  if (node->unbounded ())
-    {
-      *os << node->name () << "::" << node->local_name ()
-          << " (CORBA::ULong max) // uses max size" << be_nl
-          << "  : ";
-      // pass it to the base constructor
-      if (this->gen_base_sequence_class (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cs::"
-                             "visit_sequence - "
-                             "codegen for base sequence class\n"), -1);
-        }
-      *os << " (max)" << be_nl
-          << "{}" << be_nl;
-    }
-
-  // constructor with the buffer
-  *os << node->name () << "::" << node->local_name () << " (";
-  if (node->unbounded ())
-    {
-      *os << "CORBA::ULong max, ";  // unbounded seq takes this extra parameter
-    }
-  *os << "CORBA::ULong length, ";
-  // generate the base type for the buffer
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad visitor\n"), -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-  delete visitor;
-  *os << " *buffer, CORBA::Boolean release)" << be_nl
-      << "  : ";
-  // pass it to the base constructor
-  if (this->gen_base_sequence_class (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "codegen for base sequence class\n"), -1);
-    }
-  *os << " (";
-  if (node->unbounded ())
-    {
-      *os << "max, ";
-    }
-  *os << "length, buffer, release)" << be_nl
-      << "{}" << be_nl;
-
-  // copy constructor
-  *os << node->name () << "::" << node->local_name ()
-      << " (const " << node->local_name ()
-      << " &seq) // copy ctor" << be_nl
-      << "  : ";
-  // pass it to the base constructor
-  if (this->gen_base_sequence_class (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "codegen for base sequence class\n"), -1);
-    }
-  *os << " (seq)" << be_nl
-      << "{}" << be_nl;
-
-  // destructor
-  *os << node->name () << "::~" << node->local_name ()
-      << " (void) // dtor" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  // generate the typecode information here
-  os->indent (); // start from current indentation level
-  *os << "static const CORBA::Long _oc_" << node->flatname () << "_seq[] ="
-      << be_nl;
-  *os << "{\n";
-  os->incr_indent (0);
-  if (node->gen_encapsulation () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_client_stubs - "
-                         "codegen for encapsulation failed\n"),
-                        -1);
-    }
-
-  os->decr_indent ();
-  *os << "};" << be_nl;
-
-  *os << "static CORBA::TypeCode _tc__tc_" << node->flatname ()
-      << "_seq (CORBA::tk_sequence, sizeof (_oc_" <<  node->flatname ()
-      << "_seq), (char *) &_oc_" << node->flatname ()
-      << "_seq, CORBA::B_FALSE);" << be_nl;
-  *os << "CORBA::TypeCode_ptr " << node->tc_name () << "_seq = &_tc__tc_"
-      << node->flatname () << "_seq;\n\n";
-  os->gen_endif ();
-
-  return 0;
-}
-
-// ****************************************************************
-// We have to generate the parameters for the template that implements
-// each sequence type.
-// ****************************************************************
-
-be_visitor_sequence_base::
-be_visitor_sequence_base (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_base::~be_visitor_sequence_base (void)
-{
-}
-
-int
-be_visitor_sequence_base::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  *os << node->name ();
-  return 0;
-}
-
-// helper
-int
-be_visitor_sequence_base::visit_node (be_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BASE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-  return 0;
-}
-
-int
-be_visitor_sequence_base::visit_sequence (be_sequence *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_interface (be_interface *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_interface_fwd (be_interface_fwd *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_string (be_string *)
-{
-  // NO-OP, we have ad-hoc classes from strings.
-  return 0;
-}
-
-int
-be_visitor_sequence_base::visit_structure (be_structure *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_union (be_union *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_enum (be_enum *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_exception (be_exception *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_array (be_array *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_base::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_sequence_base::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ****************************************************************
-// We have to generate the buffer type in the constructor
-// ****************************************************************
-
-be_visitor_sequence_buffer_type::
-be_visitor_sequence_buffer_type (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_buffer_type::~be_visitor_sequence_buffer_type (void)
-{
-}
-
-// helper
-int
-be_visitor_sequence_buffer_type::visit_node (be_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ());
-  else
-    *os << bt->name ();
-  return 0;
-}
-
-int
-be_visitor_sequence_buffer_type::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    *os << node->name () << "_ptr";
-  else
-    *os << node->name ();
-  return 0;
-}
-
-int
-be_visitor_sequence_buffer_type::visit_sequence (be_sequence *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
-    *os << node->nested_type_name (this->ctx_->scope (), "_ptr");
-  else
-    *os << node->name () << "_ptr";
-  return 0;
-}
-
-int
-be_visitor_sequence_buffer_type::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
-    *os << node->nested_type_name (this->ctx_->scope (), "_ptr");
-  else
-    *os << node->name () << "_ptr";
-  return 0;
-}
-
-int
-be_visitor_sequence_buffer_type::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  *os << "char *";
-  return 0;
-}
-
-int
-be_visitor_sequence_buffer_type::visit_structure (be_structure *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_union (be_union *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_enum (be_enum *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_exception (be_exception *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_array (be_array *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_buffer_type::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_sequence_buffer_type::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// ***********************************************************
-// sequence element type visitor for return types of [] methods
-// ***********************************************************
-
-
-be_visitor_sequence_elemtype::
-be_visitor_sequence_elemtype (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_sequence_elemtype::~be_visitor_sequence_elemtype (void)
-{
-}
-
-// helper
-int
-be_visitor_sequence_elemtype::visit_node (be_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope ()) << " &";
-  else
-    *os << bt->name () << " &";
-  return 0;
-}
-
-int
-be_visitor_sequence_elemtype::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
-        {
-          *os << "TAO_Object_Manager<" << bt->nested_type_name
-            (this->ctx_->scope ()) << "> ";
-        }
-      else
-        *os << "TAO_Object_Manager<" << bt->name () << "> ";
-      break;
-    default:
-      if (this->ctx_->state () == TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH)
-	*os << bt->nested_type_name (this->ctx_->scope ()) << " &";
-      else
-	*os << bt->name () << " &";
-    }
-  return 0;
-}
-
-int
-be_visitor_sequence_elemtype::visit_sequence (be_sequence *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-
-  *os << "TAO_Object_Manager <"
-      << bt->nested_type_name (this->ctx_->scope ())
-      << " > ";
-
-  return 0;
-}
-
-int
-be_visitor_sequence_elemtype::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-
-  *os << "TAO_Object_Manager <"
-      << bt->nested_type_name (this->ctx_->scope ())
-      << " > ";
-
-  return 0;
-}
-
-int
-be_visitor_sequence_elemtype::visit_string (be_string *)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << "TAO_String_Manager ";
-  return 0;
-}
-
-int
-be_visitor_sequence_elemtype::visit_structure (be_structure *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_union (be_union *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_enum (be_enum *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_exception (be_exception *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_array (be_array *node)
-{
-  return this->visit_node (node);
-}
-
-int
-be_visitor_sequence_elemtype::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_sequence_elemtype::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure.cpp
deleted file mode 100644
index d0fd88b13e1..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_structure.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_structure.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Structure
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_structure.h"
-
-// generic struct visitor
-be_visitor_structure::be_visitor_structure (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_structure::~be_visitor_structure (void)
-{
-}
-
-// visit the Structure node and its scope
-int
-be_visitor_structure::visit_structure (be_structure *node)
-{
-  return -1; // must be overriden
-}
-
-int
-be_visitor_structure::visit_field (be_field *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_STRUCT_CH:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CH);
-      break;
-    case TAO_CodeGen::TAO_STRUCT_CI:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CI);
-      break;
-    case TAO_CodeGen::TAO_STRUCT_CS:
-      ctx.state (TAO_CodeGen::TAO_FIELD_CS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_structure::"
-                           "visit_field - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure::"
-                         "visit_field - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure::"
-                         "visit_field - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// for client header
-// ******************************************************
-
-be_visitor_structure_ch::be_visitor_structure_ch (be_visitor_context *ctx)
-  : be_visitor_structure (ctx)
-{
-}
-
-be_visitor_structure_ch::~be_visitor_structure_ch (void)
-{
-}
-
-// visit the Structure node and its scope
-int be_visitor_structure_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
-                                                   // not imported
-    {
-      os = this->ctx_->stream ();
-
-      os->indent (); // start from whatever indentation level we were at
-      *os << "struct " << node->local_name () << be_nl
-          << "{" << be_idt << "\n";
-
-      // generate code for field members
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ch::"
-                             "visit_structure - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "};\n\n";
-
-      // generate var defn
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ch::"
-                             "visit_structure - "
-                             "codegen for _var failed\n"), -1);
-        }
-
-      // a class is generated for an out defn only for a variable length struct
-      if (node->size_type () == be_decl::VARIABLE)
-        {
-          if (node->gen_out_defn () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_structure_ch::"
-                                 "visit_structure - "
-                                 "codegen for _out failed\n"), -1);
-            }
-        }
-      else
-        {
-          os->indent ();
-          *os << "typedef " << node->local_name () << " &" << node->local_name
-            () << "_out;\n\n";
-        }
-
-      // generate the typecode decl
-      if (node->is_nested ())
-        {
-          // we have a scoped name
-          os->indent ();
-
-          *os << "static CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          os->indent ();
-          *os << "extern CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      node->cli_hdr_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ******************************************************
-// for client inline
-// ******************************************************
-
-be_visitor_structure_ci::be_visitor_structure_ci (be_visitor_context *ctx)
-  : be_visitor_structure (ctx)
-{
-}
-
-be_visitor_structure_ci::~be_visitor_structure_ci (void)
-{
-}
-
-// visit the Structure node and its scope
-int be_visitor_structure_ci::visit_structure (be_structure *node)
-{
-  if (!node->cli_inline_gen () && !node->imported ())
-    {
-      if (node->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ci::"
-                             "visit_structure - "
-                             "codegen for _var failed\n"), -1);
-        }
-      if (node->size_type () == be_decl::VARIABLE &&
-          node->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ci::"
-                             "visit_structure - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // all we have to do is to visit the scope
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ci::"
-                             "visit_structure - "
-                             "codegen for scope failed\n"), -1);
-        }
-      node->cli_inline_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ***************************************************************************
-// for client stubs
-// ***************************************************************************
-be_visitor_structure_cs::be_visitor_structure_cs (be_visitor_context *ctx)
-  : be_visitor_structure (ctx)
-{
-}
-
-be_visitor_structure_cs::~be_visitor_structure_cs (void)
-{
-}
-
-// visit the Structure_Cs node and its scope
-int be_visitor_structure_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_stub_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-
-      // generate the typecode information here
-      os->indent (); // start from current indentation level
-      *os << "static const CORBA::Long _oc_" << node->flatname () << "[] =" <<
-        be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (node->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_cs::"
-                             "visit_structure - "
-                             "codegen for typecode failed\n"), -1);
-        }
-      os->decr_indent ();
-      *os << "};" << be_nl;
-
-      *os << "static CORBA::TypeCode _tc__tc_" << node->flatname () <<
-        " (CORBA::tk_struct, sizeof (_oc_" <<  node->flatname () <<
-        "), (char *) &_oc_" << node->flatname () <<
-        ", CORBA::B_FALSE);" << be_nl;
-      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_" <<
-        node->flatname () << ";\n\n";
-
-      // do any code generation required for the scope members
-      // all we have to do is to visit the scope
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_cs::"
-                             "visit_structure - "
-                             "codegen for scope failed\n"), -1);
-        }
-      node->cli_stub_gen (I_TRUE);
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
deleted file mode 100644
index fcf0477b7da..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp
+++ /dev/null
@@ -1,1161 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_typedef.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Typedef
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_typedef.h"
-
-// ******************************************************
-// Generic Typedef visitor
-// ******************************************************
-
-be_visitor_typedef::be_visitor_typedef (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_typedef::~be_visitor_typedef (void)
-{
-}
-
-// visit the Typedef node and its scope
-int be_visitor_typedef::visit_typedef (be_typedef *node)
-{
-  return -1; // must be overridden
-}
-
-// =all common visit methods for typedef visitor
-
-// visit a array
-int
-be_visitor_typedef::visit_array (be_array *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CI);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_array - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_array - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_array - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-//visit an enum
-int
-be_visitor_typedef::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_enum - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_enum - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_enum - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an predefined type
-int
-be_visitor_typedef::visit_predefined_type (be_predefined_type *node)
-{
-  return 0;
-}
-
-// visit an sequence
-int
-be_visitor_typedef::visit_sequence (be_sequence *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CI);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_sequence - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_sequence - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_sequence - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an structure
-int
-be_visitor_typedef::visit_string (be_string *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_string - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_string - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_string - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an structure
-int
-be_visitor_typedef::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_structure - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_structure - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_structure - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an union
-int
-be_visitor_typedef::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_SH:
-    case TAO_CodeGen::TAO_TYPEDEF_SI:
-    case TAO_CodeGen::TAO_TYPEDEF_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_typedef::"
-                           "visit_union - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_union - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef::"
-                         "visit_union - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// Typedef visitor for client header
-// ******************************************************
-
-be_visitor_typedef_ch::be_visitor_typedef_ch (be_visitor_context *ctx)
-  : be_visitor_typedef (ctx)
-{
-}
-
-be_visitor_typedef_ch::~be_visitor_typedef_ch (void)
-{
-}
-
-int
-be_visitor_typedef_ch::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-
-  // In general, we may have a chain of typedefs. i.e.,
-  // typedef sequence<long> X;
-  // typedef X Y;
-  // typedef Y Z; and so on
-  // The first time we will be in will be for node Z for which the code
-  // generation has to take place. However, it is not enough to just generate
-  // code that looks like -
-  // typedef Y Z;
-  // For different types (in this case we have a sequence), we will need
-  // typedefs for the _var and _out types for Z. If it had been an array, we
-  // will additionally have the _forany type as well as inlined *_alloc, _dup,
-  // and _free methods.
-  //
-  // Finally, we need to differentiate between the case where we were
-  // generating code for
-  // typedef sequence<long> X; and
-  // typedef Y Z; where Y was somehow aliased to the sequence. In the former
-  // case, we will need to generate all the code for sequence<long> or whatever
-  // the type maybe. In the latter, we just need typedefs for the type and all
-  // associated _var, _out, and other types.
-
-  be_type *bt; // base type
-
-  if (this->ctx_->tdef ())
-    {
-      // the fact that we are here indicates that we were generating code for a
-      // typedef node whose base type also happens to be another typedef-ed
-      // (i.e. an alias) node for another (possibly alias) node
-
-      this->ctx_->alias (node); // save this alias
-
-      // grab the most primitive base type in the chain to avoid recusrsively
-      // going thru this visit method
-      bt = node->primitive_base_type ();
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad primitive base type\n"
-                             ),  -1);
-        }
-
-      // accept on this base type, but generate code for the typedef node
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-      this->ctx_->alias (0); // reset
-    }
-  else
-    {
-      // the context has not stored any "tdef" node. So we must be in here for
-      // the first time
-      this->ctx_->tdef (node); // save the typedef node
-
-      // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad base type\n"
-                             ),  -1);
-        }
-
-      // accept on this base type, but generate code for the typedef node
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-
-      // generate the typecode decl for this typedef node
-      if (!node->imported ())
-        {
-          if (node->is_nested ())
-            {
-              // we have a scoped name
-              *os << "static CORBA::TypeCode_ptr "
-                  << node->tc_name ()->last_component () << ";\n\n";
-            }
-          else
-            {
-              // we are in the ROOT scope
-              *os << "extern CORBA::TypeCode_ptr "
-                  << node->tc_name ()->last_component () << ";\n\n";
-            }
-        }
-      this->ctx_->tdef (0); // reset
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!bt->imported () &&
-      bt->node_type () == AST_Decl::NT_array) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_array (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_array - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type and the _slice type
-  *os << "typedef " << bt->nested_type_name (scope)
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  *os << "typedef " << bt->nested_type_name (scope, "_slice")
-      << " " << tdef->nested_type_name (scope, "_slice") << ";" << be_nl;
-  // typedef the _var, _out, and _forany types
-  *os << "typedef " << bt->nested_type_name (scope, "_var")
-      << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
-  *os << "typedef " << bt->nested_type_name (scope, "_out")
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  *os << "typedef " << bt->nested_type_name (scope, "_forany")
-      << " " << tdef->nested_type_name (scope, "_forany") << ";" << be_nl;
-  // the _alloc, _dup, and free methods
-  *os << tdef->nested_type_name (scope, "_slice") << " *"
-      << tdef->nested_type_name (scope, "_alloc") << " (void);" << be_nl;
-  *os << tdef->nested_type_name (scope, "_slice") << " *"
-      << tdef->nested_type_name (scope, "_dup") << " ("
-      << tdef->nested_type_name (scope, "_slice") << " *slice);" << be_nl;
-  *os << tdef->nested_type_name (scope, "_slice") << " *"
-      << tdef->nested_type_name (scope, "_free") << " ("
-      << tdef->nested_type_name (scope, "_slice") << " *slice);" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_enum) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_enum (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_enum - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type and the _slice type
-  *os << "typedef " << bt->nested_type_name (scope)
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  // typedef the _out
-  *os << "typedef " << bt->nested_type_name (scope, "_out")
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type
-  *os << "typedef " << bt->nested_type_name (scope)
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    {
-      // typedef the _ptr
-      *os << "typedef " << bt->nested_type_name (scope, "_ptr")
-          << " " << tdef->nested_type_name (scope, "_ptr") << ";" << be_nl;
-    }
-  // typedef the _out
-  *os << "typedef " << bt->nested_type_name (scope, "_out")
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_string (be_string *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type and the _slice type
-  *os << "typedef char *"
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  // typedef the _var, _out, and _forany types
-  *os << "typedef CORBA::String_var"
-      << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
-  *os << "typedef CORBA::String_out"
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_sequence) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_sequence (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_sequence - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-  else
-    {
-      // now generate the typedefs
-      os->indent ();
-      // typedef the type
-      *os << "typedef " << bt->nested_type_name (scope)
-          << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-      // typedef the _var, _out types
-      *os << "typedef " << bt->nested_type_name (scope, "_var")
-          << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
-      *os << "typedef " << bt->nested_type_name (scope, "_out")
-          << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-    }
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_struct) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_structure (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_structure - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type
-  *os << "typedef " << bt->nested_type_name (scope)
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  // typedef the _var, _out types
-  *os << "typedef " << bt->nested_type_name (scope, "_var")
-      << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
-  *os << "typedef " << bt->nested_type_name (scope, "_out")
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  return 0;
-}
-
-int
-be_visitor_typedef_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_union) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_union (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_union - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-
-  // now generate the typedefs
-  os->indent ();
-  // typedef the type and the _slice type
-  *os << "typedef " << bt->nested_type_name (scope)
-      << " " << tdef->nested_type_name (scope) << ";" << be_nl;
-  // typedef the _var, _out types
-  *os << "typedef " << bt->nested_type_name (scope, "_var")
-      << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl;
-  *os << "typedef " << bt->nested_type_name (scope, "_out")
-      << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
-  return 0;
-}
-
-// ******************************************************
-// Typedef visitor for client inline
-// ******************************************************
-
-be_visitor_typedef_ci::be_visitor_typedef_ci (be_visitor_context *ctx)
-  : be_visitor_typedef (ctx)
-{
-}
-
-be_visitor_typedef_ci::~be_visitor_typedef_ci (void)
-{
-}
-
-int
-be_visitor_typedef_ci::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-
-  // In general, we may have a chain of typedefs. i.e.,
-  // typedef sequence<long> X;
-  // typedef X Y;
-  // typedef Y Z; and so on
-  // The first time we will be in will be for node Z for which the code
-  // generation has to take place. However, it is not enough to just generate
-  // code that looks like -
-  // typedef Y Z;
-  // For different types (in this case we have a sequence), we will need
-  // typedefs for the _var and _out types for Z. If it had been an array, we
-  // will additionally have the _forany type as well as inlined *_alloc
-  // methods.
-  //
-  // Finally, we need to differentiate between the case where we were
-  // generating code for
-  // typedef sequence<long> X; and
-  // typedef Y Z; where Y was somehow aliased to the sequence. In the former
-  // case, we will need to generate all the code for sequence<long> or whatever
-  // the type maybe. In the latter, we just need typedefs for the type and all
-  // associated _var, _out, and other types.
-
-  be_type *bt; // base type
-
-  if (this->ctx_->tdef ())
-    {
-      // the fact that we are here indicates that we were generating code for a
-      // typedef node whose base type also happens to be another typedef-ed
-      // (i.e. an alias) node for another (possibly alias) node
-
-      this->ctx_->alias (node); // save this alias
-
-      // grab the most primitive base type in the chain to avoid recusrsively
-      // going thru this visit method
-      bt = node->primitive_base_type ();
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad primitive base type\n"
-                             ),  -1);
-        }
-      // accept on this base type
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-
-      this->ctx_->alias (0);
-    }
-  else
-    {
-      // the context has not stored any "tdef" node. So we must be in here for
-      // the first time
-      this->ctx_->tdef (node); // save the typedef node
-
-      // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad base type\n"
-                             ),  -1);
-        }
-      // accept on this base type
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-
-      this->ctx_->tdef (0);
-    }
-  return 0;
-}
-
-int
-be_visitor_typedef_ci::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_array) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_array (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ci::"
-                             "visit_array - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-  return 0;
-}
-
-int
-be_visitor_typedef_ci::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_sequence) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_sequence (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ci::"
-                             "visit_sequence - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-  return 0;
-}
-
-int
-be_visitor_typedef_ci::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_struct) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_structure (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ci::"
-                             "visit_structure - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-  return 0;
-}
-
-int
-be_visitor_typedef_ci::visit_union (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_typedef *tdef = this->ctx_->tdef (); // typedef node
-  be_decl *scope = this->ctx_->scope (); // scope in which it is used
-  be_type *bt;
-
-  if (this->ctx_->alias ()) // typedef of a typedef
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (bt->node_type () == AST_Decl::NT_union) // direct typedef of a base node
-                                              // type
-    {
-      // let the base class visitor handle this case
-      if (this->be_visitor_typedef::visit_union (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ci::"
-                             "visit_union - "
-                             "base class visitor failed \n"
-                             ),  -1);
-        }
-    }
-  return 0;
-}
-
-// ******************************************************
-// Typedef visitor for client stubs
-// ******************************************************
-
-be_visitor_typedef_cs::be_visitor_typedef_cs (be_visitor_context *ctx)
-  : be_visitor_typedef (ctx)
-{
-}
-
-be_visitor_typedef_cs::~be_visitor_typedef_cs (void)
-{
-}
-
-int
-be_visitor_typedef_cs::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-
-  // In general, we may have a chain of typedefs. i.e.,
-  // typedef sequence<long> X;
-  // typedef X Y;
-  // typedef Y Z; and so on
-  // The first time we will be in will be for node Z for which the code
-  // generation has to take place. However, it is not enough to just generate
-  // code that looks like -
-  // typedef Y Z;
-  // For different types (in this case we have a sequence), we will need
-  // typedefs for the _var and _out types for Z. If it had been an array, we
-  // will additionally have the _forany type as well as inlined *_alloc
-  // methods.
-  //
-  // Finally, we need to differentiate between the case where we were
-  // generating code for
-  // typedef sequence<long> X; and
-  // typedef Y Z; where Y was somehow aliased to the sequence. In the former
-  // case, we will need to generate all the code for sequence<long> or whatever
-  // the type maybe. In the latter, we just need typedefs for the type and all
-  // associated _var, _out, and other types.
-
-  be_type *bt; // base type
-
-  if (this->ctx_->tdef ())
-    {
-      // the fact that we are here indicates that we were generating code for a
-      // typedef node whose base type also happens to be another typedef-ed
-      // (i.e. an alias) node for another (possibly alias) node
-
-      this->ctx_->alias (node); // save this alias
-
-      // grab the most primitive base type in the chain to avoid recusrsively
-      // going thru this visit method
-      bt = node->primitive_base_type ();
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad primitive base type\n"
-                             ),  -1);
-        }
-      // accept on this base type
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-      this->ctx_->alias (0);
-    }
-  else
-    {
-      // the context has not stored any "tdef" node. So we must be in here for
-      // the first time
-      this->ctx_->tdef (node); // save the typedef node
-
-      // grab the immediate base type node
-      bt = be_type::narrow_from_decl (node->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "bad base type\n"
-                             ),  -1);
-        }
-      // accept on this base type
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typedef_ch::"
-                             "visit_typedef - "
-                             "failed to accept visitor\n"
-                             ),  -1);
-        }
-
-      if (!node->imported ())
-        {
-          // generate the typecode information here
-          os->indent (); // start from current indentation level
-          *os << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
-              << be_nl;
-          *os << "{\n";
-          os->incr_indent (0);
-          if (node->gen_encapsulation () == -1)
-            {
-              ACE_ERROR ((LM_ERROR, "Error generating typecode\n\n"));
-              return -1;
-            }
-          os->decr_indent ();
-          *os << "};" << be_nl;
-
-          *os << "static CORBA::TypeCode _tc__tc_" << node->flatname ()
-              << " (CORBA::tk_alias, sizeof (_oc_" << node->flatname ()
-              << "), (char *) &_oc_" << node->flatname ()
-              << ", CORBA::B_FALSE);" << be_nl;
-          *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_"
-              << node->flatname () << ";\n\n";
-
-        }
-      this->ctx_->tdef (0);
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_union.cpp b/TAO/TAO_IDL/be/be_visitor_union.cpp
deleted file mode 100644
index 7e3bd0f46e7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_union.cpp
+++ /dev/null
@@ -1,852 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_union.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Union
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_union.h"
-
-// generic struct visitor
-be_visitor_union::be_visitor_union (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_union::~be_visitor_union (void)
-{
-}
-
-// visit the Union node and its scope
-int
-be_visitor_union::visit_union (be_union *node)
-{
-  return -1; // must be overriden
-}
-
-int
-be_visitor_union::visit_union_branch (be_union_branch *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CH);
-      break;
-    case TAO_CodeGen::TAO_UNION_PRIVATE_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_PRIVATE_CH);
-      break;
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CI);
-      break;
-    case TAO_CodeGen::TAO_UNION_PUBLIC_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CS);
-      break;
-    case TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_union::"
-                           "visit_union_branch - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-      break;
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union::"
-                         "visit_union_branch - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union::"
-                         "visit_union_branch - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// ******************************************************
-// for client header
-// ******************************************************
-
-be_visitor_union_ch::be_visitor_union_ch (be_visitor_context *ctx)
-  : be_visitor_union (ctx)
-{
-}
-
-be_visitor_union_ch::~be_visitor_union_ch (void)
-{
-}
-
-// visit the Union node and its scope
-int be_visitor_union_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-
-  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
-                                                   // not imported
-    {
-      os = this->ctx_->stream ();
-
-      // generate the ifdefined macro for the union type
-      os->gen_ifdef_macro (node->flatname ());
-      os->indent (); // start with the current indentation level
-      *os << "class " << node->local_name () << be_nl
-          << "{" << be_nl
-          << "public:" << be_idt_nl
-
-        // generate default and copy constructors
-          << node->local_name () << " (void); // default constructor" << be_nl
-          << node->local_name () << " (const " << node->local_name ()
-          << " &); // copy constructor" << be_nl
-        // generate destructor
-          << "~" << node->local_name () << " (void); // destructor" << be_nl
-        // generate assignment operator
-          << node->local_name () << " &operator= (const "
-          << node->local_name () << " &); // copy constructor\n\n";
-
-      // retrieve the disriminant type
-      bt = be_type::narrow_from_decl (node->disc_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "bad disciminant type\n"), -1);
-        }
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CH); // set current code
-                                                          // gen state
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "bad visitor\n"), -1);
-        }
-
-      if (bt->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             " visit_union - "
-                             "codegen for discriminant failed\n"), -1);
-        }
-      delete visitor;
-
-      // now generate the public defn for the union branch members. For this,
-      // set our state to reflect what we are aiming to do
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_CH); // set current code
-                                                            // gen state
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "codegen for public defn of union members\n"),
-                            -1);
-        }
-
-      // now generate the private data members of the union
-      os->decr_indent ();
-      *os << "private:\n";
-      os->incr_indent ();
-      *os << bt->nested_type_name (node) << " disc_;" << be_nl; // emit the
-                                                 // ACE_NESTED_CLASS macro
-
-      // the members are inside of a union
-      *os << "union" << be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PRIVATE_CH); // set current
-                                                             // code gen state
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "codegen for private members of union\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "}; // end of union \n";
-
-      os->decr_indent ();
-      *os << "}; // " << node->name () << "\n\n";
-
-      // Generate the typecode decl
-      if (node->is_nested ())
-        {
-          // we have a scoped name
-          os->indent ();
-          *os << "static CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          os->indent ();
-          *os << "extern CORBA::TypeCode_ptr " << node->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      os->gen_endif ();
-
-      // generate the ifdefined macro for the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-      // generate var defn
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "codegen for _var\n"), -1);
-        }
-      os->gen_endif ();
-
-      // generate the ifdefined macro for the array type
-      os->gen_ifdef_macro (node->flatname (), "_out");
-      // a class is generated for an out defn only for a variable length struct
-      if (node->size_type () == be_decl::VARIABLE)
-        {
-          if (node->gen_out_defn () == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_union_ch::"
-                                 "visit_union - "
-                                 "codegen for _out\n"), -1);
-            }
-        }
-      else
-        {
-          os->indent ();
-          *os << "typedef " << node->local_name () << " &" << node->local_name
-            () << "_out;\n\n";
-        }
-      os->gen_endif ();
-
-      node->cli_hdr_gen (I_TRUE);
-    }
-
-  return 0;
-}
-
-// ******************************************************
-// for client inline
-// ******************************************************
-
-be_visitor_union_ci::be_visitor_union_ci (be_visitor_context *ctx)
-  : be_visitor_union (ctx)
-{
-}
-
-be_visitor_union_ci::~be_visitor_union_ci (void)
-{
-}
-
-// visit the Union node and its scope
-int be_visitor_union_ci::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-
-  if (!node->cli_inline_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-
-      *os << "// *************************************************************"
-          << be_nl;
-      *os << "// Inline operations for union " << node->name () << be_nl;
-      *os << "// *************************************************************\n\n";
-
-      // generate the default constructor and the destructor here
-      os->indent ();
-      *os << "// default constructor" << be_nl
-          << "ACE_INLINE" << be_nl
-          << node->name () << "::" << node->local_name () << " (void)" << be_nl
-          << "{" << be_nl
-          << "}" << be_nl << be_nl;
-
-      *os << "// destructor" << be_nl
-          << "ACE_INLINE" << be_nl
-          << node->name () << "::~" << node->local_name () << " (void)" << be_nl
-          << "{" << be_nl
-          << "}\n\n";
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      bt = be_type::narrow_from_decl (node->disc_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit_union - "
-                             "bad discriminant type\n"), -1);
-        }
-
-      ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CI); // set current code
-                                                          // gen state
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit_union - "
-                             "bad visitor\n"), -1);
-        }
-      // generate code for the discriminant
-      if (bt->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit union - "
-                             "codegen for discrminant failed\n"), -1);
-        }
-
-      // now generate the implementation of the access methods for the
-      // union. For this set our state
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_CI);
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit_union - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      // generate the ifdefined macro for the array type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-      if (node->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit_union - "
-                             "codegen for _var failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      // generate the ifdefined macro for the array type then generate the _out
-      // impl
-      os->gen_ifdef_macro (node->flatname (), "_out");
-      if (node->size_type () == be_decl::VARIABLE
-          && node->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ci::"
-                             "visit_union - "
-                             "codegen for _out failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      node->cli_inline_gen (I_TRUE);
-    }
-  return 0;
-}
-
-// ******************************************************
-// for client stubs
-// ******************************************************
-
-be_visitor_union_cs::be_visitor_union_cs (be_visitor_context *ctx)
-  : be_visitor_union (ctx)
-{
-}
-
-be_visitor_union_cs::~be_visitor_union_cs (void)
-{
-}
-
-// visit the Union_cs node and its scope
-int be_visitor_union_cs::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt; // for discriminant type
-
-  if (!node->cli_stub_gen () && !node->imported ())
-    {
-      os = this->ctx_->stream ();
-
-      be_visitor_context ctx (*this->ctx_);
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement. We need to generate its
-      // typecode
-
-      bt = be_type::narrow_from_decl (node->disc_type ());
-      if (!bt)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs::"
-                             "visit_union - "
-                             "bad discriminant type\n"), -1);
-        }
-
-      ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CS); // set current code
-                                                          // gen state
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs::"
-                             "visit_union - "
-                             "bad visitor\n"), -1);
-        }
-      // generate code for the discriminant
-      if (bt->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs::"
-                             "visit union - "
-                             "codegen for discrminant failed\n"), -1);
-        }
-
-      // first generate code for any of the members (if required, e.g.,
-      // anonymous sequences, structs, unions, arrays)
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_CS); // set current code
-                                                            // gen state
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs"
-                             "visit_union - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      // now generate the operations on the union such as the copy constructor
-      // and the assignment operator
-
-      *os << "// *************************************************************"
-          << be_nl;
-      *os << "// Operations for union " << node->name () << be_nl;
-      *os << "// *************************************************************\n\n";
-
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
-
-      // generate the copy constructor and the assignment operator here
-      os->indent ();
-      *os << "// copy constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (const " <<
-        node->name () << " &u)" << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      // first set the discriminant
-      *os << "this->disc_ = u.disc_;" << be_nl;
-      // now switch based on the disc value
-      *os << "switch (this->disc_)" << be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs"
-                             "visit_union - "
-                             "codegen for copy ctor failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "}\n";
-      os->decr_indent ();
-      *os << "}\n\n";
-
-      // assignment operator
-      os->indent ();
-      *os << "// assignment operator" << be_nl;
-      *os << node->name () << " &" << be_nl; // return type
-      *os << node->name () << "::operator= (const " <<
-        node->name () << " &u)" << be_nl;
-      *os << "{\n";
-      os->incr_indent ();
-      // first set the discriminant
-      *os << "this->disc_ = u.disc_;" << be_nl;
-      // now switch based on the disc value
-      *os << "switch (this->disc_)" << be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs"
-                             "visit_union - "
-                             "codegen for assign op failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "}" << be_nl;
-      *os << "return *this;\n";
-      os->decr_indent ();
-      *os << "}\n\n";
-
-      // generate the typecode information here
-      os->indent (); // start from current indentation level
-      *os << "static const CORBA::Long _oc_" << node->flatname () << "[] =" <<
-        be_nl;
-      *os << "{\n";
-      os->incr_indent (0);
-      if (node->gen_encapsulation () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_cs"
-                             "visit_union - "
-                             "codegen for encapsulation failed\n"), -1);
-        }
-
-      os->decr_indent ();
-      *os << "};" << be_nl;
-
-      *os << "static CORBA::TypeCode _tc__tc_" << node->flatname () <<
-        " (CORBA::tk_union, sizeof (_oc_" <<  node->flatname () <<
-        "), (char *) &_oc_" << node->flatname () <<
-        ", CORBA::B_FALSE);" << be_nl;
-      *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_" <<
-        node->flatname () << ";\n\n";
-      node->cli_stub_gen (I_TRUE);
-    }
-  return 0;
-}
-
-
-// *************************************************************************
-// be_visitor_discriminant_ch - visitor for discriminant in client header file
-// *************************************************************************
-
-be_visitor_union_discriminant_ch::be_visitor_union_discriminant_ch
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_union_discriminant_ch::~be_visitor_union_discriminant_ch (void)
-{
-}
-
-int
-be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union *bu =
-    this->ctx_->be_node_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_ch::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  os->indent ();
-  // the set method
-  *os << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
-  // the get method
-  *os << bt->nested_type_name (bu) << " _d (void) const;\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
-                                                         *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union *bu =
-    this->ctx_->be_node_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // the set method
-  *os << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
-  // the get method
-  *os << bt->nested_type_name (bu) << " _d (void) const;\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_discriminant_ch::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// *************************************************************************
-// be_visitor_discriminant_ci - visitor for discriminant in client inline file
-// *************************************************************************
-
-be_visitor_union_discriminant_ci::be_visitor_union_discriminant_ci
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_union_discriminant_ci::~be_visitor_union_discriminant_ci (void)
-{
-}
-
-int
-be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union *bu =
-    this->ctx_->be_node_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // the set method
-  *os << "// accessor to set the discriminant" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::_d (" << bt->name ()
-      << " discval)" << be_nl
-      << "{" << be_idt_nl
-      << "this->disc_ = discval;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // the get method
-  *os << "// accessor to get the discriminant" << be_nl
-      << "ACE_INLINE " << bt->name () << be_nl
-      << bu->name () << "::_d (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return this->disc_;" << be_uidt_nl
-      << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_discriminant_ci::visit_predefined_type (be_predefined_type
-                                                         *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union *bu =
-    this->ctx_->be_node_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // the set method
-  *os << "// accessor to set the discriminant" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::_d (" << bt->name ()
-      << " discval)" << be_nl
-      << "{" << be_idt_nl
-      << "this->disc_ = discval;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // the get method
-  *os << "// accessor to get the discriminant" << be_nl
-      << "ACE_INLINE " << bt->name () << be_nl
-      << bu->name () << "::_d (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return this->disc_;" << be_uidt_nl
-      << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_discriminant_ci::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-  this->ctx_->alias (0);
-
-  return 0;
-}
-
-// *************************************************************************
-// be_visitor_discriminant_cs - visitor for discriminant in client stubs
-// *************************************************************************
-
-be_visitor_union_discriminant_cs::be_visitor_union_discriminant_cs
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_union_discriminant_cs::~be_visitor_union_discriminant_cs (void)
-{
-}
-
-int
-be_visitor_union_discriminant_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union *bu =
-    this->ctx_->be_node_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // generate the typecode for the enum
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_cs::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_cs::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
deleted file mode 100644
index 0fb4047c38f..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
+++ /dev/null
@@ -1,2110 +0,0 @@
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_union_branch.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Union_Branch" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-#include "be_visitor_union_branch.h"
-
-// **********************************************
-//  visitor for union_branch in the client header file
-// **********************************************
-
-// constructor
-be_visitor_union_branch_public_ch::be_visitor_union_branch_public_ch
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_union_branch_public_ch::~be_visitor_union_branch_public_ch (void)
-{
-}
-
-// visit the union_branch node
-int
-be_visitor_union_branch_public_ch::visit_union_branch (be_union_branch *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt; // union_branch's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types  that a union_branch can be
-
-// visit array type
-int
-be_visitor_union_branch_public_ch::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
-  be_type *bt;
-
-  // check if we are visiting this via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_array - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_array - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_array - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // now use this enum as a "type" for the subsequent declarator
-  os->indent (); // start from current indentation
-  // the set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu) << ");// set"
-      << be_nl;
-  // the get method
-  *os << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_union_branch_public_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // now use this enum as a "type" for the subsequent declarator
-  os->indent (); // start from current indentation
-  // the set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu) << ");// set"
-      << be_nl;
-  // the get method
-  *os << bt->nested_type_name (bu) << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-
-  return 0;
-}
-
-// visit interface type
-int
-be_visitor_union_branch_public_ch::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "_ptr")
-      << ");// set" << be_nl;
-  // get method
-  *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-  return 0;
-}
-
-// visit interface forward type
-int
-be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_interface_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "_ptr")
-      << ");// set" << be_nl;
-  // get method
-  *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-  return 0;
-}
-
-// visit predefined type
-int
-be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_predefined_type - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    {
-      // set method
-      *os << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu, "_ptr") << ");// set" << be_nl;
-      // get method
-      *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-          << " (void) const; // get method\n\n";
-    }
-  else
-    {
-      // set method
-      *os << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu) << ");// set" << be_nl;
-      // get method
-      *os << bt->nested_type_name (bu) << " " << ub->local_name ()
-          << " (void) const; // get method\n\n";
-    }
-  return 0;
-}
-
-// visit sequence type
-int
-be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_sequence - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &);// set" << be_nl;
-  // read-only
-  *os << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const; // get method (read only)"
-      << be_nl;
-  // read/write
-  *os << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void); // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-// visit string type
-int
-be_visitor_union_branch_public_ch::visit_string (be_string *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_string - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // three methods to set the string value
-  *os << "void " << ub->local_name () << " (char *); // set" << be_nl;
-  *os << "void " << ub->local_name () << " (const char *); // set"
-      << be_nl;
-  *os << "void " << ub->local_name () << " (const CORBA::String_var&); // set"
-      << be_nl;
-  //get method
-  *os << "const char *" << ub->local_name ()
-      << " (void) const; // get method\n\n";
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_union_branch_public_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_structure - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_structure - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_structure - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &);// set" << be_nl
-    // read-only
-      << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const; // get method (read only)"
-      << be_nl
-    // read/write
-      << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void); // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-// visit typedefed type
-int
-be_visitor_union_branch_public_ch::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent (); // start from current indentation level
-  this->ctx_->alias (node);     // save the node for use in code generation and
-                               // indicate that the union_branch of the union_branch node
-                               // is a typedefed quantity
-
-  // make a decision based on the primitive base type
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_spec_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_union_branch_public_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_union - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ch::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &);// set" << be_nl
-    // read-only
-      << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const; // get method (read only)"
-      << be_nl
-    // read/write
-      << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void); // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-// **********************************************
-//  visitor for union_branch in the client header generating the private information
-// **********************************************
-
-// constructor
-be_visitor_union_branch_private_ch::be_visitor_union_branch_private_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_union_branch_private_ch::~be_visitor_union_branch_private_ch (void)
-{
-}
-
-// visit the union_branch node
-int
-be_visitor_union_branch_private_ch::visit_union_branch (be_union_branch *node)
-{
-  TAO_OutStream *os;
-  be_type *bt; // union_branch's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_cs::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_cs::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types  that a union_branch can be
-
-int
-be_visitor_union_branch_private_ch::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_array - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name ()
-      << "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  *os << bt->nested_type_name (bu) << " " << ub->local_name () << "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // C++ does not allow an object declaration inside a union. Hence we
-  // must have a pointer. This changes some of the methods
-  *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-    "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_interface_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // C++ does not allow an object declaration inside a union. Hence we
-  // must have a pointer. This changes some of the methods
-  *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-    "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_predefined_type - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    {
-      // Cannot have an object inside of a union
-      os->indent (); // start from current indentation
-      *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-        "_;\n";
-    }
-  else
-    {
-      os->indent (); // start from current indentation
-      *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-        "_;\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_sequence - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // C++ doesn't allow object instances inside unions, so we need a
-  // pointer
-  *os << bt->nested_type_name (bu) << " *" << ub->local_name () << "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_string (be_string *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_string - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  *os << "CORBA::String_var *" << ub->local_name () << "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_structure - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  *os << bt->nested_type_name (bu) << " " << ub->local_name () << "_;\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_union_branch_private_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_private_ch::"
-                         "visit_union - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // C++ doesn't allow object instances inside unions, so we need a
-  // pointer
-  *os << bt->nested_type_name (bu) << " *" << ub->local_name () << "_;\n";
-  return 0;
-}
-
-// *****************************************************
-//  visitor for union_branch in the client inline file
-// *****************************************************
-
-// constructor
-be_visitor_union_branch_public_ci::be_visitor_union_branch_public_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_union_branch_public_ci::~be_visitor_union_branch_public_ci (void)
-{
-}
-
-// visit the union_branch node
-int
-be_visitor_union_branch_public_ci::visit_union_branch (be_union_branch *node)
-{
-  TAO_OutStream *os;
-  be_type *bt; // union_branch's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_cs::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_cs::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types  that a union_branch can be
-
-int
-be_visitor_union_branch_public_ci::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_array - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_array - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
-      << " val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;\n";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << "ACE_INLINE " << bt->name () << "_slice *" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->" << ub->local_name () << "_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
-      << " val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;\n";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << "ACE_INLINE " << bt->name () << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->" << ub->local_name () << "_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
-      << "_ptr val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;\n";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << "ACE_INLINE " << bt->name () << "_ptr " << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->" << ub->local_name () << "_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_interface_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (" << bt->name ()
-      << "_ptr val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;\n";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << "ACE_INLINE " << bt->name () << "_ptr " << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->" << ub->local_name () << "_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (" << bt->name ();
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    *os << "_ptr";
-  *os << " val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;\n";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << "ACE_INLINE " << bt->name ();
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    *os << "_ptr";
-  *os << be_nl;
-  *os << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->" << ub->local_name () << "_;\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_sequence - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";"
-              << be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "*this->" << ub->local_name () << "_ = val;" << be_uidt_nl;
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << "ACE_INLINE const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << "ACE_INLINE " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_string (be_string *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_string - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // three methods to set the string value
-
-  // (1) set method from char*
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (char *val)"
-      << be_nl
-      << "{" << be_idt_nl;
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "if (!this->" << ub->local_name () << "_) // does not exist"
-          << be_nl
-          << "  this->" << ub->local_name ()
-          << "_ = new CORBA::String_var (val);" << be_nl
-          << "else" << be_nl
-          << "  *this->" << ub->local_name () << "_ = val;";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  *os << be_uidt_nl << "}" << be_nl;
-
-  // (2) set method from const char *
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (const char *val)" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "if (!this->" << ub->local_name () << "_) // does not exist"
-          << be_nl
-          << "  this->" << ub->local_name ()
-          << "_ = new CORBA::String_var (val);" << be_nl
-          << "else" << be_nl
-          << "  *this->" << ub->local_name () << "_ = val;" << be_uidt_nl;
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-
-  *os << "}" << be_nl;
-
-  // (3) set from const String_var&
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (const CORBA::String_var &val)" << be_nl
-      << "{" << be_idt_nl;
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "if (!this->" << ub->local_name () << "_) // does not exist"
-          << be_nl
-          << "  this->" << ub->local_name ()
-          << "_ = new CORBA::String_var (val);" << be_nl
-          << "else" << be_nl
-          << "  *this->" << ub->local_name () << "_ = val;";
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  *os << be_uidt_nl << "}" << be_nl;
-
-  // get method
-  *os << "ACE_INLINE const char *" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (void) const // get method" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_structure - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_structure - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_structure - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-
-  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";"
-              << be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "this->" << ub->local_name () << "_ = val;" << be_uidt_nl;
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << "ACE_INLINE const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << "ACE_INLINE " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_union_branch_public_ci::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_union - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_branch_public_ci::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << "ACE_INLINE void" << be_nl
-      << bu->name () << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-  os->incr_indent ();  // set the discriminant to the appropriate label
-  if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-    {
-      // valid label
-      *os << "// set the discriminant val" << be_nl;
-      // check if the case label is a symbol or a literal
-      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-              << ";" << be_nl;
-        }
-      else
-        {
-          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-            be_nl;
-        }
-      *os << "// set the value" << be_nl
-          << "*this->" << ub->local_name () << "_ = val;" << be_uidt_nl;
-    }
-  else
-    {
-      // default label
-      // XXXASG - TODO
-    }
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << "ACE_INLINE const " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << "ACE_INLINE " << bt->name () << " &" << be_nl
-      << bu->name () << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->" << ub->local_name () << "_;" << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-// **********************************************
-//  visitor for union_branch in the client stubs file
-// **********************************************
-
-// constructor
-be_visitor_union_branch_public_cs::be_visitor_union_branch_public_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_union_branch_public_cs::~be_visitor_union_branch_public_cs (void)
-{
-}
-
-// visit the union_branch node
-int
-be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node)
-{
-  TAO_OutStream *os; // output stream
-
-  be_type *bt; // union_branch's type
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit array type
-int
-be_visitor_union_branch_public_cs::visit_array (be_array *node)
-{
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_union_branch_public_cs::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // generate the typcode for enums
-  ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_enum - "
-                         "Bad visitor\n"
-                         ), -1);
-    }
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_enum - "
-                         "codegen failed\n"
-                         ), -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit sequence type
-int
-be_visitor_union_branch_public_cs::visit_sequence (be_sequence *node)
-{
-  return 0;
-}
-
-// visit string type
-int
-be_visitor_union_branch_public_cs::visit_string (be_string *node)
-{
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_union_branch_public_cs::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // generate the inline code for structs
-  ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_struct - "
-                         "Bad visitor\n"
-                         ), -1);
-    }
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_struct - "
-                         "codegen failed\n"
-                         ), -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_union_branch_public_cs::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // generate the inline code for union
-  ctx.state (TAO_CodeGen::TAO_UNION_CS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_union - "
-                         "Bad visitor\n"
-                         ), -1);
-    }
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_cs::"
-                         "visit_union - "
-                         "codegen failed\n"
-                         ), -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-
-// **********************************************
-//  visitor for union_branch in the client stubs file generating the code for
-//  the copy ctor and assignment operator
-// **********************************************
-
-// constructor
-be_visitor_union_branch_public_assign_cs::be_visitor_union_branch_public_assign_cs
-(be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-}
-
-// destructor
-be_visitor_union_branch_public_assign_cs::~be_visitor_union_branch_public_assign_cs
-(void)
-{
-}
-
-// visit the union_branch node
-int
-be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *node)
-{
-  TAO_OutStream *os; // output stream
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-  be_union *bu =
-    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-
-  os = this->ctx_->stream ();
-
-  // This visitor is used when we are generating the copy ctor and
-  // assignment operator for the union.
-  // Individual assignment of the members takes place inside a case
-  // statement because the type of member assigned is based on the value
-  // of the discriminant
-  os->indent ();
-  if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-    {
-      *os << "case " << ub->label ()->label_val ()->n ()  << ":" << be_idt_nl;
-    }
-  else
-    {
-      *os << "case " << ub->label ()->label_val () << ":" << be_idt_nl;
-    }
-
-  *os << "this->" << ub->local_name () << "_ = u." << ub->local_name ()
-      << "_;" << be_nl
-      << "break;\n";
-  os->decr_indent (0);
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
deleted file mode 100644
index 3dafbfec175..00000000000
--- a/TAO/TAO_IDL/be_include/be.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_BE_HH
-#define _BE_BE_HH
-
-// be.h
-//
-
-#if defined (ACE_WIN32)
-#pragma    warning(disable:4250)
-#endif /* ACE_WIN32 */
-
-// ACE includes
-
-#include        "ace/ACE.h"
-#include        "ace/OS.h"
-#include        "ace/Singleton.h"
-#include        "ace/Synch.h"
-#include        "ace/Log_Msg.h"
-#include        "ace/Containers.h"
-
-/*
- * BE includes
- */
-
-#include        "be_decl.h"             // class BE_Decl
-#include        "be_scope.h"            // class BE_Scope
-#include	"be_generator.h"	// BE generator class
-#include        "be_type.h"
-#include	"be_predefined_type.h"  // class BE_PredefinedType
-#include	"be_module.h"		// class BE_Module
-#include	"be_interface.h"	// class BE_Interface
-#include	"be_interface_fwd.h"	// class BE_InterfaceFwd
-#include	"be_structure.h"	// class BE_Structure
-#include	"be_exception.h"	// class BE_Exception
-#include        "be_expression.h"       // class BE_Expr_val
-#include	"be_enum.h"		// class BE_Enum
-#include	"be_operation.h"	// class BE_Operation
-#include	"be_field.h"		// class BE_Field
-#include	"be_argument.h"	        // class BE_Argument
-#include	"be_attribute.h"	// class BE_Attribute
-#include	"be_union.h"		// class BE_Union
-#include	"be_union_branch.h"	// class BE_UnionBranch
-#include	"be_union_label.h"	// class BE_UnionLabel
-#include	"be_constant.h"	        // class BE_Constant
-#include	"be_enum_val.h"	        // class BE_EnumVal
-#include	"be_array.h"		// class BE_Array
-#include	"be_sequence.h"	        // class BE_Sequence
-#include	"be_string.h"		// class BE_String
-#include	"be_typedef.h"	        // class BE_Typedef
-#include        "be_root.h"             // class BE_Root
-#include        "be_native.h"           // class BE_Native
-
-#include        "be_helper.h"           // helper functions
-#include        "be_state.h"            // code generation states
-#include        "be_codegen.h"          // code generator
-#include        "be_factory.h"          // factory
-
-#include 	"be_visitor.h"          // abstract visitor
-#include        "be_visitor_context.h"  // visitor context
-
-#endif           // _BE_BE_HH
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
deleted file mode 100644
index 5f417e6e9e4..00000000000
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_argument.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Argument that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ARGUMENT_H)
-#define BE_ARGUMENT_H
-
-/*
- * BE_Argument
- */
-class be_argument : public virtual AST_Argument,
-                    public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_argument (void);
-  // default constructor
-
-  be_argument (AST_Argument::Direction d, AST_Type *ft, UTL_ScopedName *n,
-               UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for the argument
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for the argument
-
-  virtual int gen_server_header (void);
-  // generate server header for the argument
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for the argument
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the argument
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the argument
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_argument, AST_Argument, be_decl);
-  DEF_NARROW_FROM_DECL (be_argument);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
deleted file mode 100644
index 55dcabe0e38..00000000000
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_array.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_ARRAY_H)
-#define BE_ARRAY_H
-
-class TAO_OutStream;
-
-/*
- * BE_Array
- */
-class be_array : public virtual AST_Array,
-                 public virtual be_type
-{
-public:
-  // =Operations
-
-  be_array (void);
-  // default constructor
-
-  be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims);
-  // constructor
-
-  ~be_array (void);
-
-  virtual int gen_client_header (void);
-  // generate client header for array
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for array
-
-  virtual int gen_server_header (void);
-  // generate server header for array
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for array
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the array
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the array
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_forany_defn (void);
-  // the forany class
-
-  virtual int gen_forany_impl (void);
-  // the forany impl
-
-  virtual int gen_dimensions (TAO_OutStream *os, unsigned short slice=0);
-  // generate dimensions. If slice == 1, generate dimensions for the slice
-  // definition
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_array, AST_Array, be_type);
-  DEF_NARROW_FROM_DECL (be_array);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-  virtual int create_name (void);
-  // create a name for us
-
-  const char* tao_name (void);
-
-private:
-  char* tao_name_;
-  // We need a name to generate typecodes and other objects, but it
-  // must be different from the typedef name....
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
deleted file mode 100644
index c1ad4b8b362..00000000000
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_attribute.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Attribute that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ATTRIBUTE_H)
-#define BE_ATTRIBUTE_H
-
-/*
- * BE_Attribute
- */
-class be_attribute : public virtual AST_Attribute,
-                     public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_attribute (void);
-  // default constructor
-
-  be_attribute (idl_bool ro, AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for the attribute
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for the attribute
-
-  virtual int gen_server_header (void);
-  // generate server header for the attribute
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for the attribute
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the attribute
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the attribute
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_attribute, AST_Attribute, be_decl);
-  DEF_NARROW_FROM_DECL (be_attribute);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
deleted file mode 100644
index c3516c62bfc..00000000000
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ /dev/null
@@ -1,461 +0,0 @@
-// $Id$
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_codegen.h
-//
-// = DESCRIPTION
-//   The Code generator class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_CODEGEN_H)
-#define TAO_BE_CODEGEN_H
-
-#define NAMEBUFSIZE 1024
-// maximum length of static buffers used to store names
-
-class TAO_Visitor_Factory;
-class be_visitor_context;
-
-class TAO_CodeGen
-{
-  // = TITLE
-  //   TAO_CodeGen
-  //
-  // = DESCRIPTION
-  //   Holds global parameters for the Back End and generates the C++ mapping
-  //
-public:
-
-  // define all the code generation states. The first letter C/S of the suffix stands
-  // for client/server-side and the second letter H/I/S stands for
-  // header/inline/impl file. These are used to denote the state or the context
-  // of code generation we are in and serves to produce the right kind of
-  // visitor for us
-
-  enum CG_STATE
-  {
-    // initial state
-    TAO_INITIAL,
-
-    // rest of the state in alphabetical order of the types
-
-    // emitting code for arguments of an operation. No distinction between
-    // headers, inlines, stubs.
-    TAO_ARGUMENT_CH,                         // in client header
-    TAO_ARGUMENT_CI,                         // in client inline
-    TAO_ARGUMENT_CS,                         // in client stubs
-    TAO_ARGUMENT_SH,                         // in server header
-    TAO_ARGUMENT_SI,                         // in server inline
-    TAO_ARGUMENT_SS,                         // in server skeleton
-    TAO_ARGUMENT_ARGLIST_CH,                 // argument in op signature of
-                                             // ... client header
-    TAO_ARGUMENT_ARGLIST_OTHERS,             // ... in other cases
-    TAO_ARGUMENT_PRE_DOCALL_CS,              // preprocessing of argument
-                                             // variable before passing to
-                                             // do_static_call  (in stub)
-    TAO_ARGUMENT_DOCALL_CS,                  // passing argument variable to do_static_call
-    TAO_ARGUMENT_POST_DOCALL_CS,             // postprocessing of argument
-                                             // variable after do_static_call
-    TAO_ARGUMENT_VARDECL_SS,                 // declaration of argument
-                                             // variable in skeleton (server)
-    TAO_ARGUMENT_MARSHAL_SS,                 // passing argument node to the
-    TAO_ARGUMENT_DEMARSHAL_SS,               // demarshal and marshal
-                                             // operations
-    TAO_ARGUMENT_POST_MARSHAL_SS,
-    TAO_ARGUMENT_PRE_UPCALL_SS,              // preprocessing of argument
-                                             // variable before upcall
-    TAO_ARGUMENT_UPCALL_SS,                  // passing argument variable to upcall
-    TAO_ARGUMENT_POST_UPCALL_SS,             // postprocessing of argument
-                                             // variable after upcall
-
-    // emitting code for attributes.
-    TAO_ATTRIBUTE_CH,                        // in client header
-    TAO_ATTRIBUTE_CS,                        // in client stubs
-    TAO_ATTRIBUTE_SH,                        // in server header
-    TAO_ATTRIBUTE_SS,                        // in server skeletons
-    TAO_ATTRIBUTE_COLLOCATED_SH,             // in server header for collocated
-    TAO_ATTRIBUTE_COLLOCATED_SS,             // in server skeletons for
-                                             // collocated
-
-    TAO_ATTRIBUTE_RETVAL_DECL_SS,
-    TAO_ATTRIBUTE_RETVAL_ASSIGN_SS,
-    TAO_ATTRIBUTE_RETURN_TYPE_CH,
-    TAO_ATTRIBUTE_INPARAM_TYPE_CH,
-    TAO_ATTRIBUTE_RETURN_TYPE_CS,
-    TAO_ATTRIBUTE_RETVAL_DECL_CS,
-    TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS,
-    TAO_ATTRIBUTE_RETVAL_RETURN_CS,
-    TAO_ATTRIBUTE_INPARAM_TYPE_CS,
-    TAO_ATTRIBUTE_PRE_DOCALL_CS,
-    TAO_ATTRIBUTE_DOCALL_CS,
-    TAO_ATTRIBUTE_POST_DOCALL_CS,
-    TAO_ATTRIBUTE_RETURN_TYPE_SH,
-    TAO_ATTRIBUTE_INPARAM_TYPE_SH,
-    TAO_ATTRIBUTE_RESULT_SS,
-    TAO_ATTRIBUTE_INPARAM_TYPE_SS,
-    TAO_ATTRIBUTE_PRE_UPCALL_SS,
-    TAO_ATTRIBUTE_UPCALL_SS,
-    TAO_ATTRIBUTE_POST_UPCALL_SS,
-
-    // emitting code for array defn
-    TAO_ARRAY_CH,
-    TAO_ARRAY_CI,
-    TAO_ARRAY_CS,
-
-    TAO_ARRAY_DEFN_CH,
-    TAO_ARRAY_DEFN_CI,
-    TAO_ARRAY_DEFN_CS,
-    TAO_ARRAY_DEFN_SH,
-    TAO_ARRAY_DEFN_SI,
-    TAO_ARRAY_DEFN_SS,
-
-    // emitting code for rest of the array decl
-    TAO_ARRAY_OTHER_CH,
-    TAO_ARRAY_OTHER_CI,
-    TAO_ARRAY_OTHER_CS,
-    TAO_ARRAY_OTHER_SH,
-    TAO_ARRAY_OTHER_SI,
-    TAO_ARRAY_OTHER_SS,
-
-    // emitting code for the constants
-    TAO_CONSTANT_CH,                         // in client header
-    TAO_CONSTANT_CI,                         // XXXASG rm?
-    TAO_CONSTANT_CS,                         // in client stub
-
-    // emitting code for enums
-    TAO_ENUM_CH,                             // in client header
-    TAO_ENUM_CI,                             // XXXASG rm?
-    TAO_ENUM_CS,                             // in client stubs
-    TAO_ENUM_SH,                             // XXXASG rm? all 3
-    TAO_ENUM_SI,
-    TAO_ENUM_SS,
-
-    // emitting code for exceptions
-    TAO_EXCEPTION_CH,
-    TAO_EXCEPTION_CTOR_CH,
-    TAO_EXCEPTION_CI,
-    TAO_EXCEPTION_CS,
-    TAO_EXCEPTION_CTOR_CS,
-    TAO_EXCEPTION_CTOR_ASSIGN_CS,
-    TAO_EXCEPTION_SH,
-    TAO_EXCEPTION_SI,
-    TAO_EXCEPTION_SS,
-
-    // emitting fields i.e., struct members
-    TAO_FIELD_CH,
-    TAO_FIELD_CI,
-    TAO_FIELD_CS,
-
-    // emitting code for the interface
-    TAO_INTERFACE_CH,
-    TAO_INTERFACE_CI,
-    TAO_INTERFACE_CS,
-    TAO_INTERFACE_SH,
-    TAO_INTERFACE_SI,
-    TAO_INTERFACE_SS,
-    TAO_INTERFACE_COLLOCATED_SH,
-    TAO_INTERFACE_COLLOCATED_SS,
-
-    // emitting code for the interface forward declaration
-    TAO_INTERFACE_FWD_CH,
-    TAO_INTERFACE_FWD_CI,
-
-    // emitting code for the module
-    TAO_MODULE_CH,
-    TAO_MODULE_CI,
-    TAO_MODULE_CS,
-    TAO_MODULE_SH,
-    TAO_MODULE_SI,
-    TAO_MODULE_SS,
-
-    // emitting code for an operation.
-    TAO_OPERATION_CH,                       // in client header
-    TAO_OPERATION_CI,                       // XXXASG rm?
-    TAO_OPERATION_CS,                       // in client stubs
-    TAO_OPERATION_SH,                       // in server header
-    TAO_OPERATION_SI,                       // XXXASG rm?
-    TAO_OPERATION_SS,                       // in server skeletons
-    TAO_OPERATION_COLLOCATED_SH,            // in collocated server header
-    TAO_OPERATION_COLLOCATED_SS,            // in collocated server skel
-    TAO_OPERATION_RETTYPE_CH,                // return type in client header op
-                                             // signature
-    TAO_OPERATION_RETTYPE_OTHERS,            // ... in other cases
-    TAO_OPERATION_RETURN_TYPE_CS,            //
-    TAO_OPERATION_ARGLIST_CH,                // parameter list in op signature
-                                             // ... for client header
-    TAO_OPERATION_ARGLIST_SH,                // ... for server header
-    TAO_OPERATION_ARGLIST_COLLOCATED_SH,     // ... for collocated server
-    TAO_OPERATION_ARGLIST_OTHERS,            // ... for all other cases
-    TAO_OPERATION_RETVAL_DECL_CS,            // return value variable declaration
-    TAO_OPERATION_RETVAL_EXCEPTION_CS,       // return value on exception (error)
-    TAO_OPERATION_RETVAL_PRE_DOCALL_CS,      // preprocessing for return value
-                                             // before sending over the wire
-    TAO_OPERATION_ARG_PRE_DOCALL_CS,         // preprocessing of arguments
-                                             //   before do_static_call
-    TAO_OPERATION_RETVAL_DOCALL_CS,          // passing the return type
-                                             //   variable to do_static_call
-    TAO_OPERATION_ARG_DOCALL_CS,             // passing argument variable to do_static_call
-    TAO_OPERATION_RETVAL_POST_DOCALL_CS,     // processing  of return type
-                                             //   after do_static_call
-    TAO_OPERATION_ARG_POST_DOCALL_CS,        // processing of arg after do_static_call
-    TAO_OPERATION_RETVAL_RETURN_CS,          // returning the return type
-                                             // variable
-    TAO_OPERATION_EXCEPTLIST_CS,             // generating the exception list
-    TAO_OPERATION_RETVAL_DECL_SS,            // return type decl in skeleton
-    TAO_OPERATION_ARG_DECL_SS,               // argument decl in skeleton
-    TAO_OPERATION_RETVAL_DEMARSHAL_SS,       // passing return type variable
-    TAO_OPERATION_ARG_DEMARSHAL_SS,          //   and argument variables to the
-    TAO_OPERATION_RETVAL_MARSHAL_SS,         //   marshal and demarshal operations
-    TAO_OPERATION_ARG_MARSHAL_SS,
-    TAO_OPERATION_ARG_POST_MARSHAL_SS,
-    TAO_OPERATION_RETVAL_ASSIGN_SS,          // assigning to return type
-                                             // variable
-    TAO_OPERATION_ARG_PRE_UPCALL_SS,         // pre upcall processing
-    TAO_OPERATION_RETVAL_UPCALL_SS,          // passing return type var and argument
-    TAO_OPERATION_ARG_UPCALL_SS,             // variables to upcall
-    TAO_OPERATION_RETVAL_POST_UPCALL_SS,     // post upcall processing for
-    TAO_OPERATION_ARG_POST_UPCALL_SS,        //   return and argument variables
-    TAO_OPERATION_RESULT_SS,                 // XXXASG rm?
-
-    // for predefined type
-    TAO_PREDEFINED_TYPE_CH,
-    TAO_PREDEFINED_TYPE_CI,
-    TAO_PREDEFINED_TYPE_CS,
-
-    // emitting code for root
-    TAO_ROOT_CH,
-    TAO_ROOT_CI,
-    TAO_ROOT_CS,
-    TAO_ROOT_SH,
-    TAO_ROOT_SI,
-    TAO_ROOT_SS,
-
-    // emitting sequences
-    TAO_SEQUENCE_CH,
-    TAO_SEQUENCE_CI,
-    TAO_SEQUENCE_CS,
-
-    // emitting code for sequence base type
-    TAO_SEQUENCE_BASE_CH,
-    TAO_SEQUENCE_BASE_CI,
-    TAO_SEQUENCE_BASE_CS,
-    TAO_SEQUENCE_BASE_SH,
-    TAO_SEQUENCE_BASE_SI,
-    TAO_SEQUENCE_BASE_SS,
-
-    // emitting code for sequence body
-    TAO_SEQUENCE_BODY_CH,
-    TAO_SEQUENCE_BODY_CI,
-    TAO_SEQUENCE_BODY_CS,
-    TAO_SEQUENCE_BODY_SH,
-    TAO_SEQUENCE_BODY_SI,
-    TAO_SEQUENCE_BODY_SS,
-
-    // for special sequnce elements
-    TAO_SEQELEM_RETTYPE_CH,
-    TAO_SEQELEM_RETTYPE_CI,
-    TAO_SEQELEM_RETTYPE_CS,
-
-    // for sequence buffer types
-    TAO_SEQUENCE_BUFFER_TYPE_CH,
-    TAO_SEQUENCE_BUFFER_TYPE_CI,
-    TAO_SEQUENCE_BUFFER_TYPE_CS,
-
-    // emitting code for strings
-    TAO_STRING_CH,
-    TAO_STRING_CI,
-    TAO_STRING_CS,
-    TAO_STRING_SH,
-    TAO_STRING_SI,
-    TAO_STRING_SS,
-
-    // emitting code for struct and its members
-    TAO_STRUCT_CH,
-    TAO_STRUCT_CI,
-    TAO_STRUCT_CS,
-
-    // emitting code for typedefs
-    TAO_TYPEDEF_CH,
-    TAO_TYPEDEF_CI,
-    TAO_TYPEDEF_CS,
-    TAO_TYPEDEF_SH,
-    TAO_TYPEDEF_SI,
-    TAO_TYPEDEF_SS,
-
-    // emitting code for unions
-    TAO_UNION_CH,
-    TAO_UNION_CI,
-    TAO_UNION_CS,
-
-    // emitting code for the discriminant
-    TAO_UNION_DISCTYPEDEFN_CH,
-    TAO_UNION_DISCTYPEDEFN_CI,
-    TAO_UNION_DISCTYPEDEFN_CS,
-    TAO_UNION_DISCTYPEDEFN_SH,
-    TAO_UNION_DISCTYPEDEFN_SI,
-    TAO_UNION_DISCTYPEDEFN_SS,
-
-    // emitting code for the public members of the union
-    TAO_UNION_PUBLIC_CH,
-    TAO_UNION_PUBLIC_CI,
-    TAO_UNION_PUBLIC_CS,
-    TAO_UNION_PUBLIC_ASSIGN_CS,
-    TAO_UNION_PUBLIC_SH,
-    TAO_UNION_PUBLIC_SI,
-    TAO_UNION_PUBLIC_SS,
-
-    // emitting code for private members of the union
-    TAO_UNION_PRIVATE_CH,
-    TAO_UNION_PRIVATE_CI,
-    TAO_UNION_PRIVATE_CS,
-    TAO_UNION_PRIVATE_SH,
-    TAO_UNION_PRIVATE_SI,
-    TAO_UNION_PRIVATE_SS,
-
-    // Always must be last
-    TAO_UNKNOWN
-
-  };
-
-  TAO_CodeGen (void);
-  // Constructor
-
-  ~TAO_CodeGen (void);
-  // destructor
-
-  be_visitor *make_visitor (be_visitor_context *);
-  // Factory that makes the right visitor based on the contex. This
-  // delegates the task to its factory data member
-
-  be_state *make_state (void);
-  // factory method returning appropriate subclass of the be_state object
-  // based on the current code generation state
-
-  int gen_cplusplus_mapping (void);
-  // generate the C++ mapping for CORBA IDL
-
-  int client_header (const char *fname);
-  // set the client header stream
-
-  TAO_OutStream *client_header (void);
-  // get the client header stream
-
-  int client_stubs (const char *fname);
-  // set the client stub stream
-
-  TAO_OutStream *client_stubs (void);
-  // get the client stubs stream
-
-  int client_inline (const char *fname);
-  // set the client inline stream
-
-  TAO_OutStream *client_inline (void);
-  // get the client inline stream
-
-  int server_header (const char *fname);
-  // set the server header stream
-
-  TAO_OutStream *server_header (void);
-  // get the server header stream
-
-  int server_skeletons (const char *fname);
-  // set the server skeletons stream
-
-  TAO_OutStream *server_skeletons (void);
-  // get the server skeletons stream
-
-  int server_inline (const char *fname);
-  // set the server inline stream
-
-  TAO_OutStream *server_inline (void);
-  // get the server inline stream
-
-  void outstream (TAO_OutStream *os);
-  // set current out stream
-
-  TAO_OutStream *outstream (void);
-  // retrieve current out stream being used
-
-  void visitor_factory (TAO_Visitor_Factory *);
-  // set the visitor factory  object
-
-  int end_client_header (void);
-  // put a last #endif in the client header
-
-  int end_server_header (void);
-  // put a last #endif in the server header
-
-  void push (CG_STATE s);
-  // set the code generation state
-
-  void pop (void);
-  // out of the current state
-
-  void reset (void);
-  // reset the stack to 1
-
-  CG_STATE state (void);
-  // return the current state
-
-  void node (be_decl *n);
-  // pass info
-
-  be_decl *node (void);
-  // retrieve passed info
-
-  const char *upcase (const char *str);
-  // convert input string to all upcase
-
-private:
-  TAO_OutStream *client_header_;
-  // client header stream
-
-  TAO_OutStream *client_stubs_;
-  // client stub file stream
-
-  TAO_OutStream *client_inline_;
-  // client side inline definitions
-
-  TAO_OutStream *server_header_;
-  // server header stream
-
-  TAO_OutStream *server_skeletons_;
-  // server skeleton stream
-
-  TAO_OutStream *server_inline_;
-  // server side inline file
-
-  TAO_OutStream *curr_os_;
-  // currently used out stream
-
-  CG_STATE *state_;
-  // code generation state stack
-
-  int top_;
-  // top of state stack
-
-  int size_;
-  // size of allocated stack
-
-  be_decl *node_;
-  // save current node in this
-
-  TAO_Visitor_Factory *visitor_factory_;
-  // visitor factory object
-};
-
-typedef ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX> TAO_CODEGEN;
-// Singleton instance of the BE code generator
-
-extern TAO_CodeGen *tao_cg; // code generator instance which is used everywhere
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
deleted file mode 100644
index e11271450b1..00000000000
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_constant.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Constant that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_CONSTANT_H)
-#define BE_CONSTANT_H
-
-/*
- * BE_Constant
- */
-class be_constant : public virtual AST_Constant , public virtual be_decl
-{
-public:
-  // Operations
-
-  be_constant (void);
-  // constructor
-
-  be_constant (AST_Expression::ExprType et,
-               AST_Expression *v,
-               UTL_ScopedName *n,
-               UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the constant
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the constant
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the constant
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the constant
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the constant
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the constant
-
-  // = helper
-  char *exprtype_to_string (void);
-  // returns the appropriate type
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_constant, AST_Constant, be_decl);
-  DEF_NARROW_FROM_DECL (be_constant);
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
deleted file mode 100644
index 2a37587f419..00000000000
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_decl.h
-//
-// = DESCRIPTION
-//    Extension of the AST_Decl class.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_DECL_H)
-#define TAO_BE_DECL_H
-
-class be_scope;
-class be_visitor;
-
-/*
- * BE_Decl
- */
-class be_decl : public virtual AST_Decl
-{
-  // = TITLE
-  //   be_decl
-  // = DESCRIPTION
-  //   The back end extension of the AST_Decl class. Provides an abstract
-  //   interface
-  //
-public:
-  enum SIZE_TYPE
-  {
-    SIZE_UNKNOWN,
-    FIXED,
-    VARIABLE
-  };
-  // indicates if we are fixed size or variable. Most useful for structs,
-  // unions, and arrays.
-
-  // =Operations
-
-  be_decl (void);
-  // Default constructor
-
-  be_decl (AST_Decl::NodeType type, UTL_ScopedName *n, UTL_StrList *pragmas);
-  // constructor that sets the node type
-
-  ~be_decl (void);
-  // destructor
-
-  virtual int gen_client_header (void) = 0;
-  // Generates the client-side header information for the decl
-
-  virtual int gen_client_stubs (void) = 0;
-  // Generates the client-side stubs for the decl
-
-  virtual int gen_server_header (void) = 0;
-  // Generates the server-side header information for the decl
-
-  virtual int gen_server_skeletons (void) = 0;
-  // Generates the server-side skeletons for the decl
-
-  virtual int gen_client_inline (void) = 0;
-  // Generates the client-side inline for the decl
-
-  virtual int gen_server_inline (void) = 0;
-  // Generates the server-side inlines for the decl
-
-  virtual void size_type (SIZE_TYPE);
-  // set the size type
-
-  virtual SIZE_TYPE size_type (void);
-  // return our size type
-
-  const char *repoID (void);
-  // retrieve the repository ID
-
-  const char *fullname (void);
-  // return the stringified full name
-
-  const char *flatname (void);
-  // return the flattened full scoped name
-
-  virtual idl_bool is_nested (void);
-  // determines if we are inside of a nested scope or not
-
-  virtual int gen_encapsulation (void);
-  // encapsulation of parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual be_scope *scope (void);
-  // return the scope created by this node (if one exists)
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // boolean methods to test if code was already generated
-  idl_bool cli_hdr_gen (void);
-  idl_bool cli_stub_gen (void);
-  idl_bool cli_inline_gen (void);
-  idl_bool srv_hdr_gen (void);
-  idl_bool srv_skel_gen (void);
-  idl_bool srv_inline_gen (void);
-
-  // set the flag indicating that code generation is done
-  void cli_hdr_gen (idl_bool);
-  void cli_stub_gen (idl_bool);
-  void cli_inline_gen (idl_bool);
-  void srv_hdr_gen (idl_bool);
-  void srv_skel_gen (idl_bool);
-  void srv_inline_gen (idl_bool);
-
-  idl_bool is_child (be_decl *node);
-  // am I a direct child of node?
-
-  // Narrowing
-  DEF_NARROW_METHODS1 (be_decl, AST_Decl);
-  DEF_NARROW_FROM_DECL (be_decl);
-
-protected:
-  // =helper
-
-  virtual int compute_size_type (void);
-  // determine our size type and set it if it is unknown
-
-  virtual void compute_repoID (void);
-  // computes the repoID
-
-  virtual void compute_fullname (void);
-  // computes the fully scoped name
-
-  virtual void compute_flatname (void);
-  // compute the flattened fully scoped name
-
-  virtual int tc_name2long (const char *name, long *&, long &);
-  // name represented as a padded array of longs
-
-  virtual long repoID_encap_len (void);
-  // return encapsulation length required to hold repository ID
-
-  virtual long name_encap_len (void);
-  // return encapsulation length required to hold IDL name
-
-  // variables that indicate if the code generation for that node is already
-  // been done. This way we avoid regenerating same code.
-  idl_bool cli_hdr_gen_;
-  idl_bool cli_stub_gen_;
-  idl_bool cli_inline_gen_;
-  idl_bool srv_hdr_gen_;
-  idl_bool srv_skel_gen_;
-  idl_bool srv_inline_gen_;
-
-  char *fullname_;
-  // our full scoped name
-
-  char *flatname_;
-  // flattened fully scoped name
-
-  char *repoID_;
-  // repository ID
-
-  SIZE_TYPE size_type_;
-  // whether we are fixed or variable size (by default fixed)
-
-  long encap_len_;
-  // encapsulation length - required for typecodes
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
deleted file mode 100644
index c8f4f80a8e5..00000000000
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_enum.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Enum that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_ENUM_H)
-#define BE_ENUM_H
-
-/*
- * BE_Enum
- */
-class be_enum : public virtual AST_Enum,
-                public virtual be_scope,
-                public virtual be_type
-{
-public:
-  // Operations
-
-  be_enum (void);
-  // default constructor
-
-  be_enum (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the enum
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the enum
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the enum
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the enum
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the enum
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the enum
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_enum, AST_Enum, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_enum);
-  DEF_NARROW_FROM_SCOPE (be_enum);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
deleted file mode 100644
index e8671c23275..00000000000
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_enum_val.h
-//
-// = DESCRIPTION
-//    Extension of class AST_EnumVal that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ENUM_VAL_H)
-#define BE_ENUM_VAL_H
-
-/*
- * BE_EnumVal
- */
-class be_enum_val : public virtual AST_EnumVal,
-                    public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_enum_val (void);
-  // default constructor
-
-  be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the EnumVal 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the EnumVal
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the EnumVal 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the EnumVal
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the EnumVal
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the EnumVal
-
-  virtual int gen_encapsulation (void);
-  // generate the typecode
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl);
-  DEF_NARROW_FROM_DECL (be_enum_val);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
deleted file mode 100644
index 46081d3c90f..00000000000
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#if !defined (BE_EXCEPTION_H)
-#define BE_EXCEPTION_H
-
-/*
- * BE_Exception
- */
-class be_exception : public virtual AST_Exception,
-                     public virtual be_scope,
-                     public virtual be_type
-
-{
-public:
-  // Operations
-  be_exception (void);
-  // default constructor
-
-  be_exception (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  // =code generation
-
-  virtual int gen_client_header (void);
-  // generate client header
-
-  virtual int gen_client_inline (void);
-  // generate client inline
-
-  virtual int gen_client_stubs (void);
-  // generate client stubs
-
-  virtual int gen_server_header (void);
-  // generate server header
-
-  virtual int gen_server_inline (void);
-  // generate server inline
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_exception, AST_Exception, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_exception);
-  DEF_NARROW_FROM_SCOPE (be_exception);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif // end of if !defined (...)
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
deleted file mode 100644
index 7429a299977..00000000000
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_expression.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Expression that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_EXPRESSION_H)
-#define BE_EXPRESSION_H
-
-/*
- * BE_Expression
- */
-class be_expression : public virtual AST_Expression 
-{
-public:
-  // Operations
-  be_expression (UTL_ScopedName *n);
-  be_expression (AST_Expression *b, AST_Expression::ExprType t);
-  be_expression (AST_Expression::ExprComb c,
-                 AST_Expression *v1,
-                 AST_Expression *v2);
-  be_expression (long l);
-  be_expression (long l, AST_Expression::ExprType t);
-  be_expression (unsigned long l);
-  be_expression (String *s);
-  be_expression (char c);
-  be_expression (double d);
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h
deleted file mode 100644
index 9ed9a18f0de..00000000000
--- a/TAO/TAO_IDL/be_include/be_factory.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL Backend
-//
-// = FILENAME
-//    be_factory.h
-//
-// = DESCRIPTION
-//    Defines a factory that returns a specialized output stream object that
-//    understands a specific Front End
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_FACTORY_H)
-#define TAO_BE_FACTORY_H
-
-class TAO_Visitor_Factory
-{
-  // =TITLE
-  //   TAO_Visitor_Factory
-  //
-  // =DESCRIPTION
-  //   Abstract factory that creates visitors
-public:
-  virtual ~TAO_Visitor_Factory (void);
-  // destructor
-
-  virtual be_visitor *make_visitor (be_visitor_context *) = 0;
-  // create the right visitor
-
-};
-
-class TAO_OutStream_Factory
-{
-  // =TITLE
-  //   TAO_OutStream_Factory
-  // =DESCRIPTION
-  //   factory to produce specialized instances of the output stream objects
-public:
-  enum TAO_OutStream_Type
-  {
-    TAO_SUNSOFT,
-    TAO_FLICK
-  };
-
-  TAO_OutStream_Factory (void);
-  // constructor
-
-  ~TAO_OutStream_Factory (void);
-  // destructor
-
-  TAO_OutStream *make_outstream (void);
-  // make the specialized out stream class
-
-  int set_stream_type (TAO_OutStream_Type t);
-  // set the stream type
-
-private:
-  TAO_OutStream_Type  strm_type_;
-};
-
-typedef ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_OUTSTREAM_FACTORY;
-// Singleton instance of the OutStream factory
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
deleted file mode 100644
index 4fcb1535058..00000000000
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_field.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Field that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_FIELD_H)
-#define BE_FIELD_H
-
-/*
- * BE_Field
- */
-class be_field : public virtual AST_Field,
-                 public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_field (void);
-  // default constructor
-
-  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the field
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the field
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the field
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the field
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the field
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the field
-
-  virtual int gen_encapsulation (void);
-  // generate the typecode
-
-  virtual long tc_encap_len (void);
-  // return the total byte length of ourselves represented as an encapsulation
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_field, AST_Field, be_decl);
-  DEF_NARROW_FROM_DECL (be_field);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
deleted file mode 100644
index 3f4f38bca3f..00000000000
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_GENERATOR_BE_GENERATOR_HH
-#define _BE_GENERATOR_BE_GENERATOR_HH
-
-// be_generator.hh
-//
-// Defines BE class for generator
-//
-// This defines the same protocol as the AST_Generator class but actually
-// is implemented to create nodes of AST classes subclassed in this BE
-
-/*
-** DEPENDENCIES: AST_Generator.h
-**
-** USE: Included from be.h
-*/
-
-class	be_generator : public AST_Generator {
-public:
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
-  // Create a node representing a module which is the root of an AST made up of
-  // BE nodes
-
-  // Operations
-  virtual AST_PredefinedType
-    *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
-
-  virtual AST_Module	*create_module(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
-  virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Field	*create_field(AST_Type *ft, UTL_ScopedName *n,
-				      UTL_StrList *p);
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-  virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
-  virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
-
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
-  virtual AST_Sequence	*create_sequence(AST_Expression *v, AST_Type *bt);
-  virtual AST_String	*create_string(AST_Expression *v);
-  virtual AST_String	*create_wstring(AST_Expression *v);
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
-  // Create a node representing a native
-  virtual AST_Native	*create_native (UTL_ScopedName *n,
-                                        UTL_StrList *p);
-
-};
-
-#endif           // _BE_GENERATOR_BE_GENERATOR_HH
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
deleted file mode 100644
index e456e7394b3..00000000000
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.h
-//
-// = DESCRIPTION
-//    Defines the abstract class for outputting the C++ mapping. This is a
-//    helper class to the singleton TAO_CodeGen class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-//    Improvements by Carlos O'Ryan
-//
-// ============================================================================
-
-#if !defined (TAO_BE_OUTSTRM_H)
-#define TAO_BE_OUTSTRM_H
-
-// a dummy structure to inform TAO_OutStream's << operator to  put a newline
-// and use the current indentation for the succeeding line
-struct TAO_NL
-{
-public:
-  TAO_NL (void);
-};
-
-struct TAO_INDENT
-{
-  // = TITLE
-  //   Operates like a manipulator, increasing the indentation level.
-  //
-  // = DESCRIPTION
-  //   Increase the indentation level, if the "do_now" parameter is
-  //   not zero then the <indent> method is called on the stream.
-  //
-  TAO_INDENT (int do_now = 0);
-
-  const int do_now_;
-};
-
-struct TAO_UNINDENT
-{
-  // = TITLE
-  //   Operates like a manipulator, decreasing the indentation level.
-  //
-  // = DESCRIPTION
-  //   Decrease the indentation level, if the "do_now" parameter is
-  //   not zero then the <indent> method is called on the stream.
-  //
-  TAO_UNINDENT (int do_now = 0);
-
-  const int do_now_;
-};
-
-extern const TAO_NL be_nl;
-extern const TAO_INDENT be_idt;
-extern const TAO_INDENT be_idt_nl;
-extern const TAO_UNINDENT be_uidt;
-extern const TAO_UNINDENT be_uidt_nl;
-
-class TAO_OutStream
-{
-  // =TITLE
-  // TAO_OutStream
-  // =DESCRIPTION
-  //  Defines an interface by which the backend code generator can print its
-  //  output to the underlying I/O handle. This is a helper class that will be
-  //  used by the TAO_CodeGen class. However, this is an abstract class and
-  //  classes that understand specific front ends must derive from this
-  //  class.
-public:
-
-  // Enumerated type to indicate the stream type
-  enum STREAM_TYPE
-    {
-      TAO_CLI_HDR,
-      TAO_CLI_INL,
-      TAO_CLI_IMPL,
-      TAO_SVR_HDR,
-      TAO_SVR_INL,
-      TAO_SVR_IMPL
-    };
-
-  TAO_OutStream (void);
-  // constructor.
-
-  virtual ~TAO_OutStream (void);
-  // destructor
-
-  int open (const char *fname, TAO_OutStream::STREAM_TYPE st=TAO_OutStream::TAO_CLI_HDR);
-  // open the underlying low-level handle for output
-
-  void stream_type (TAO_OutStream::STREAM_TYPE);
-  // set the stream type
-
-  TAO_OutStream::STREAM_TYPE stream_type (void);
-  // return the stream type
-
-  int incr_indent (unsigned short flag=1);
-  // increment the indentation level and by default actually indent the output
-  // accordingly
-
-  int decr_indent (unsigned short flag=1);
-  // decrease the indentation level and by default actually indent the output
-  // accordingly
-
-  int reset (void);
-  // reset indentation level to 0
-
-  int indent (void);
-  // indent starting next line
-
-  int nl (void);
-  // put a newline and indent on the next line
-
-  int print (const char *format, ...);
-  // "printf" style variable argument print
-
-  int gen_ifdef_macro (const char *flatname, const char *suffix=0);
-  // generate a #if !defined, #defined macro
-
-  int gen_endif (void);
-  // generate an endif statement
-
-  // =overloaded operators
-
-  TAO_OutStream &operator<< (const char *str);
-  // output the char string and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const long num);
-  // output the integer and return a reference to ourselves
-
-  // = MANIPULATORS
-
-  TAO_OutStream &operator<< (const TAO_NL& nl);
-  TAO_OutStream &operator<< (const TAO_INDENT& i);
-  TAO_OutStream &operator<< (const TAO_UNINDENT& i);
-
-  // The following will be provided by specialized classes
-
-  TAO_OutStream &operator<< (Identifier *id);
-  // output an Identifier node
-
-  TAO_OutStream &operator<< (UTL_IdList *idl);
-  // output a scoped name
-
-  TAO_OutStream &operator<< (AST_Expression *expr);
-  // output an AST_Expression node
-
-  // provided by specialized classes
-  virtual TAO_OutStream &print (Identifier *id) = 0;
-
-  virtual TAO_OutStream &print (UTL_IdList *idl) = 0;
-
-  virtual TAO_OutStream &print (AST_Expression *idl) = 0;
-
-protected:
-  FILE *fp_;
-  // the underlying low-level I/O handle
-
-  TAO_OutStream::STREAM_TYPE st_;
-  // stream type
-
-  int indent_level_;
-  // indentation level
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
deleted file mode 100644
index fc01883e9a5..00000000000
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_INTERFACE_H)
-#define TAO_BE_INTERFACE_H
-
-class TAO_OutStream;
-
-/*
- * BE_Interface
- */
-class be_interface : public virtual AST_Interface,
-                     public virtual be_scope,
-                     public virtual be_type
-{
-  // = TITLE
-  //   The back end extension of the AST_Interface class
-  //
-  // = DESCRIPTION
-  //
-public:
-
-  // used to pass functions to the template method
-  typedef int (*tao_code_emitter) (be_interface *, be_interface *, TAO_OutStream *);
-
-  // Operations
-  be_interface (void);
-  // Default constructor
-
-  be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                UTL_StrList *p);
-  // Constructor that sets its scoped name <n>, a list of inherited interfaces
-  // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>
-
-  ~be_interface (void);
-  // dtor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the interface
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the interface
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the interface
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the interface
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the interface
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the interface
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  const char *full_skel_name (void);
-  // retrieve the fully scoped skel class name
-
-  //
-  // Each interface (to fix names "T") also defines two help classes,
-  // the "collocated" class inherits from T, but delegates on the
-  // skeleton for T (usually POA_T or POA_ModuleName::T), in other
-  // words it is a Bridge from T to its implementation.
-  // The class is nested inside the skeleton class.
-  //
-  // The "stub" is a class defined on the client scope, it actually
-  // defines the stubs (all operations in T are pure virtual).
-  // @@ TODO currently the stub class is not implemented.
-  //
-  const char *full_coll_name (void);
-  // retrieve the fully qualified collocated class name
-
-  const char *local_coll_name (void) const;
-  // retrieve the fully qualified collocated class name
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int traverse_inheritance_graph (tao_code_emitter gen,
-                                          TAO_OutStream *os);
-  // template method using breadth first traversal of inheritance graph
-
-  const char *relative_skel_name (const char *other_class_name);
-  // relative skeleton name
-
-  const char *relative_coll_name (const char *other_class_name);
-  // relative name for collocated class.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_interface);
-  DEF_NARROW_FROM_SCOPE (be_interface);
-
-  static int is_a_helper (be_interface *, be_interface *, TAO_OutStream *os);
-  // helper method passed to the template method
-
-  static int downcast_helper (be_interface *,
-			      be_interface *,
-			      TAO_OutStream *os);
-
-  static int gen_optable_helper (be_interface *,
-                                 be_interface *,
-                                 TAO_OutStream *os);
-  // helper method passed to the template method
-
-  static int gen_skel_helper (be_interface *,
-                              be_interface *,
-                              TAO_OutStream *os);
-  // helper method passed to the template method
-
-  void compute_fullskelname (void);
-  // compute the fully scoped skel class name
-
-  int gen_operation_table (void);
-  // generate the operation table including entries for inherited interfaces
-
-  static const char *relative_name (const char* our_name,
-				    const char *other_class_name);
-  // relative name for collocated class.
-
-  int gen_optable_entries (be_interface *);
-  // generate the operation table entries
-
-  void compute_coll_name (void);
-  // compute the fully qualified collocated class name.
-
-private:
-  char *full_skel_name_;  // fully scoped skeleton name
-
-  int skel_count_; // number of static skeletons in the operation table
-
-  char *full_coll_name_;
-  char *local_coll_name_;
-};
-
-#endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
deleted file mode 100644
index 717e388b46b..00000000000
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface_Fwd that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_INTERFACE_FWD_H)
-#define BE_INTERFACE_FWD_H
-
-/*
- * BE_InterfaceFwd
- */
-class be_interface_fwd : public virtual AST_InterfaceFwd,
-                         public virtual be_type
-{
-  // =TITLE
-  //  be_interface_fwd
-  // =DESCRIPTION
-  //  Extensions to the AST_Interface_Fwd class
-public:
-  // Operations
-
-  be_interface_fwd (void);
-  // default constructor
-
-  be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the interface
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the interface
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the interface
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the interface
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the interface
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the interface
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor* visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_interface_fwd, AST_InterfaceFwd, be_type);
-  DEF_NARROW_FROM_DECL (be_interface_fwd);
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interpretive.h b/TAO/TAO_IDL/be_include/be_interpretive.h
deleted file mode 100644
index e6312b8d2cd..00000000000
--- a/TAO/TAO_IDL/be_include/be_interpretive.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL Backend
-//
-// = FILENAME
-//    be_interpretive_visitor.h
-//
-// = DESCRIPTION
-//    Defines a factory that returns a specialized visitor object based on the
-//    code generation state. The visitors returned by this factory generate
-//    stubs and skeletons that use interpretive form of marshaling
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-class TAO_Interpretive_Visitor_Factory: public TAO_Visitor_Factory
-{
-  // =TITLE
-  //   TAO_Visitor_Factory
-  //
-  // =DESCRIPTION
-  //   Factory that creates visitors that generate stubs/skeletons for
-  //   interpretive form of marshaling
-public:
-  TAO_Interpretive_Visitor_Factory (void);
-  // constructor
-
-  virtual ~TAO_Interpretive_Visitor_Factory (void);
-  // destructor
-
-  virtual be_visitor *make_visitor (be_visitor_context *);
-  // create the right visitor
-
-};
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
deleted file mode 100644
index 519c5be9a43..00000000000
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_module.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Module that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (_BE_MODULE_H)
-#define _BE_MODULE_H
-
-/*
- * BE_Module
- */
-
-class be_module : public virtual AST_Module,
-                  public virtual be_scope,
-                  public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_module (void);
-  // default constructor
-
-  be_module (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the module
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the module
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the module
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the module
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the module
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the module
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_module, AST_Module, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_module);
-  DEF_NARROW_FROM_SCOPE (be_module);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h
deleted file mode 100644
index 8b04f93565c..00000000000
--- a/TAO/TAO_IDL/be_include/be_native.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Id
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_native.h
-//
-// = DESCRIPTION
-//    The native IDL type
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#if !defined (BE_NATIVE_H)
-#define BE_NATIVE_H
-
-// Representation of "native" IDL type added by the POA spec
-
-class be_native : public virtual AST_Native, public virtual be_type
-{
-public:
-  // =Operations
-
-  // Constructor(s)
-  be_native (void);
-  // default constructor
-
-  be_native(UTL_ScopedName *n, UTL_StrList *p);
-  // constructor that initializes its scoped name
-
-  virtual ~be_native (void) {}
-  // destructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the type
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the type
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the type
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the type
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the type
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the type
-
-  virtual int gen_typecode (void);
-  // generate the typecode description
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2(be_native, AST_Native, be_type);
-  DEF_NARROW_FROM_DECL(be_native);
-};
-
-#endif /* BE_NATIVE_H */
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
deleted file mode 100644
index bf22269394e..00000000000
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_operation.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Operation that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_OPERATION_H)
-#define BE_OPERATION_H
-
-class be_argument;
-
-/*
- * BE_Operation
- */
-class be_operation : public virtual AST_Operation,
-                     public virtual be_scope,
-                     public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_operation (void);
-  // default constructor
-
-  be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n,
-                UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs
-
-  virtual int gen_server_header (void);
-  // generate server header
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the operation
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the operation
-
-  virtual int argument_count (void);
-  // return the count of members
-
-  virtual int has_native (void);
-  // Any of the arguments or the return value is a <native> type.
-  // This is important because in that case no code should be
-  // generated for the stubs.
-
-  be_argument *add_argument_to_scope (be_argument *arg);
-  // add an argument to the scope
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_operation, AST_Operation, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_operation);
-  DEF_NARROW_FROM_SCOPE (be_operation);
-
-protected:
-  //=helper
-  int compute_size_type (void);
-  // compute the size type if it is unknown
-
-  int compute_argument_attr (void);
-  // count the number of arguments
-
-  int argument_count_;
-  // number of arguments
-
-  int has_native_;
-  // Is any argument of type native.
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
deleted file mode 100644
index 7b0d6c8406f..00000000000
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_predefined_type.h
-//
-// = DESCRIPTION
-//    Extension of class AST_PredefinedType that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (_BE_PREDEFINED_TYPE_H)
-#define _BE_PREDEFINED_TYPE_H
-
-// be_classes.hh
-//
-// Defines all classes for dummy BE
-
-/*
- * BE_PredefinedType
- */
-class be_predefined_type : public virtual AST_PredefinedType,
-                           public virtual be_type
-{
-public:
-  // =Operations
-
-  be_predefined_type (void);
-  // default constructor
-
-  be_predefined_type (AST_PredefinedType::PredefinedType t, UTL_ScopedName *n,
-                      UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the predefined type
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the predefined type
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the predefined type
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the predefined type
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the predefined type
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the predefined type
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor* visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_predefined_type, AST_PredefinedType, be_type);
-  DEF_NARROW_FROM_DECL (be_predefined_type);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-  virtual void compute_tc_name (void);
-  // overridden method
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
deleted file mode 100644
index 43e979c4722..00000000000
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_root.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Root that provides the backend
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_ROOT_H)
-#define TAO_BE_ROOT_H
-
-class be_root : public virtual AST_Root,
-                public virtual be_scope,
-                public virtual be_decl
-{
-  // = TITLE
-  //   The back end extension of the AST_Root class
-  //
-  // = DESCRIPTION
-  //
-public:
-  // Operations
-  be_root (void);
-  // Default constructor
-
-  be_root (UTL_ScopedName *n, UTL_StrList *p);
-  // Constructor that sets its scoped name <n>, and any pragmas <p>
-
-  int gen_idl2cplusplus_mapping (void);
-  // generates the IDL to C++ mapping
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the root
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the root
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the root
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the root
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the root
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the root
-
-  // =Scope management functions that override the AST scope management methods
-  // since the AST methods set the names of the sequences, strings, and arrays
-  // to a fixed value which interferes with our back-end code generation
-  AST_Sequence *fe_add_sequence (AST_Sequence *);
-  AST_String   *fe_add_string (AST_String *);
-  AST_Array    *fe_add_array (AST_Array *);
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_root, AST_Root, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_root);
-  DEF_NARROW_FROM_SCOPE (be_root);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
deleted file mode 100644
index c5509438613..00000000000
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_scope.h
-//
-// = DESCRIPTION
-//    Extension of the UTL_Scope CFE class
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_SCOPE_H)
-#define TAO_BE_SCOPE_H
-
-class be_decl;
-
-/*
- * BE_Scope
- */
-class be_scope : public virtual UTL_Scope
-{
-  // = TITLE
-  //   be_scope
-  // = DESCRIPTION
-  //   The back end extension of the UTL_Scope class
-  //
-public:
-  // Operations
-
-  be_scope (void);
-  // Default constructor
-
-  be_scope (AST_Decl::NodeType nt);
-  // constructor that sets the node type
-
-  virtual ~be_scope (void);
-  // destructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the scope
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the scope
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the scope
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the scope
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the scope
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the scope
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual void comma (unsigned short set);
-  // set the comma producing state
-
-  int comma (void) const;
-  // get the comma producing state
-
-  virtual be_decl *decl (void);
-  // return the be_decl node corresponding to this scope node
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS1 (be_scope, UTL_Scope);
-  DEF_NARROW_FROM_SCOPE (be_scope);
-
-private:
-  unsigned short comma_;
-  // if set, generate a comma after every element is handled
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
deleted file mode 100644
index ce5cb519f89..00000000000
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_sequence.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Sequence that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_SEQUENCE_H)
-#define BE_SEQUENCE_H
-
-/*
- * BE_Sequence
- */
-
-class be_typedef;
-
-// A sequence in OMG IDL does not define a scoping construct just as a struct
-// or union or an interface do. However, in the C++ mapping, a sequence becomes
-// a class. If the base type of a sequence is another anonymous sequence, then
-// the base type is defined in the scope of this sequence. Hence we define
-// be_sequence to possess the additional characteristics of a scope
-class be_sequence : public virtual AST_Sequence,
-                    public virtual be_scope,
-                    public virtual be_type
-{
-public:
-  enum MANAGED_TYPE
-  {
-    MNG_UNKNOWN ,
-    MNG_NONE,
-    MNG_STRING,
-    MNG_OBJREF
-  };
-
-  // =Operations
-
-  be_sequence (void);
-  // default constructor
-
-  be_sequence (AST_Expression *v, AST_Type *bt);
-  // constructor
-
-  virtual int create_name (be_typedef *node=0);
-  // create a name for ourselves. If we are typedefed, then we get the name of
-  // the typedef node, else we generate a name for ourselves
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the sequence
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the sequence
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the sequence
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the sequence
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the sequence
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the sequence
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_managed_type_ch (void);
-  // generate code for managed types in header
-
-  virtual int gen_managed_type_ci (void);
-  // generate code for managed types in inlined file
-
-  virtual int gen_managed_type_cs (void);
-  // generate code for managed types in impl file
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual MANAGED_TYPE managed_type (void);
-  // return the managed type
-
-  virtual idl_bool unbounded (void) const;
-  // is this sequence bounded or not
-
-  // =Scope management functions
-  be_sequence *fe_add_sequence (be_sequence *);
-
-  virtual be_decl *decl (void);
-  // overridden method on the be_scope class
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_sequence, AST_Sequence, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_sequence);
-
-protected:
-  virtual char *gen_name (void);
-  // helper to create_name
-
-private:
-  idl_bool unbounded_;
-  // whether we are bounded or unbounded
-
-  MANAGED_TYPE mt_;
-  // our managed type
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h
deleted file mode 100644
index 353238bbb09..00000000000
--- a/TAO/TAO_IDL/be_include/be_state.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state.h
-//
-// = DESCRIPTION
-//   The Code generator state class and its subclasses
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_STATE_H)
-#define TAO_BE_STATE_H
-
-class be_state
-{
-  // =TITLE
-  // be_state
-  // =DESCRIPTION
-  // Emits code based on current state. This is an abstract base class. The
-  // task of code generation is handled by subclasses.
-public:
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0) = 0;
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-
-  virtual ~be_state (void);
-  // destructor
-
-protected:
-  be_state (void);
-  // constructor
-};
-
-// ============== subclasses ====================
-
-class be_state_struct : public be_state
-{
-  // =TITLE
-  // be_state_struct
-  // =DESCRIPTION
-  // struct generation
-public:
-
-  be_state_struct (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_BE_STATE_STRUCT;
-
-class be_state_union_disctypedefn_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header
-public:
-
-  be_state_union_disctypedefn_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CH;
-
-class be_state_union_disctypedefn_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-
-  be_state_union_disctypedefn_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CI;
-
-class be_state_union_public_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-
-  be_state_union_public_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CH;
-
-class be_state_union_public_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-
-  be_state_union_public_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CI;
-
-class be_state_union_private_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_private_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-
-  be_state_union_private_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PRIVATE_CH;
-
-class be_state_union_public_cs: public be_state
-{
-  // =TITLE
-  // be_state_union_public_cs
-  // =DESCRIPTION
-  // union discriminant defn generation in client stubs file
-public:
-
-  be_state_union_public_cs (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_cs, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CS;
-
-class be_state_operation: public be_state
-{
-  // =TITLE
-  // be_state_operation
-  // =DESCRIPTION
-  // operation return type
-public:
-
-  be_state_operation (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_OPERATION;
-
-class be_state_argument: public be_state
-{
-  // =TITLE
-  // be_state_argument
-  // =DESCRIPTION
-  // argument return type
-public:
-
-  be_state_argument (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARGUMENT;
-
-class be_state_typedef: public be_state
-{
-  // =TITLE
-  // be_state_typedef
-  // =DESCRIPTION
-  // typedef code generation
-public:
-
-  be_state_typedef (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_TYPEDEF;
-
-class be_state_array: public be_state
-{
-  // =TITLE
-  // be_state_array
-  // =DESCRIPTION
-  // array code generation
-public:
-
-  be_state_array (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARRAY;
-
-class be_state_sequence: public be_state
-{
-  // =TITLE
-  // be_state_sequence
-  // =DESCRIPTION
-  // sequence code generation
-public:
-
-  be_state_sequence (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_SEQUENCE;
-
-class be_state_attribute : public be_state
-{
-  // =TITLE
-  // be_state_attribute
-  // =DESCRIPTION
-  // attribute code generation
-public:
-  be_state_attribute (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third
-  // parameter is used for recursive invocation involving a typedef
-};
-
-typedef ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-	TAO_BE_STATE_ATTRIBUTE;
-
-class be_state_exception : public be_state
-{
-  // =TITLE
-  // be_state_exception
-  // =DESCRIPTION
-  // exception code generation
-public:
-  be_state_exception (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third
-  // parameter is used for recursive invocation involving a typedef
-};
-
-typedef ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX>
-	TAO_BE_STATE_EXCEPTION;
-
-#endif /* end of be_state */
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
deleted file mode 100644
index 0121bcf1216..00000000000
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_string.h
-//
-// = DESCRIPTION
-//    Extension of class AST_String that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_STRING_H)
-#define BE_STRING_H
-
-/*
- * BE_String
- */
-class be_string : public virtual AST_String,
-                  public virtual be_type
-{
-public:
-  // Operations
-
-  be_string (void);
-  //  default constructor
-
-  be_string (AST_Expression *v);
-  // constructor
-
-  be_string (AST_Expression *v, long wide);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for string
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for string
-
-  virtual int gen_server_header (void);
-  // generate server header for string
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for string
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the string
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the string
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_string, AST_String, be_type);
-  DEF_NARROW_FROM_DECL (be_string);
-
-protected:
-  virtual void compute_tc_name (void);
-  // overridden method to compute typecode name
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
deleted file mode 100644
index d1521ea9d25..00000000000
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_structure.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Structure that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_STRUCTURE_H)
-#define BE_STRUCTURE_H
-
-/*
- * BE_Structure
- */
-class be_structure : public virtual AST_Structure,
-                     public virtual be_scope,
-                     public virtual be_type
-{
-public:
-  // =Operations
-
-  be_structure (void);
-  // default constructor
-
-  be_structure (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the struct
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the struct
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the struct
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the struct
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the struct
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the struct
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_structure, AST_Structure, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_structure);
-  DEF_NARROW_FROM_SCOPE (be_structure);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_sunsoft.h b/TAO/TAO_IDL/be_include/be_sunsoft.h
deleted file mode 100644
index 7dc6c512fe3..00000000000
--- a/TAO/TAO_IDL/be_include/be_sunsoft.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_sunsoft.h
-//
-// = DESCRIPTION
-//    SunSoft specific backend output generation
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_HELPER_H)
-#define TAO_BE_HELPER_H
-
-class TAO_SunSoft_OutStream : public TAO_OutStream
-{
-  // =TITLE
-  //  TAO_SunSoft_OutStream
-  // =DESCRIPTION
-  //  Backend specific to SunSoft AST nodes
-public:
-  TAO_SunSoft_OutStream (void);
-  // constructor
-
-  ~TAO_SunSoft_OutStream (void);
-  // destuctor
-
-  virtual TAO_OutStream &print (Identifier *id);
-  // output the SunSoft IDL Identifier Node
-
-  virtual TAO_OutStream &print (UTL_IdList *idl);
-  // output the SunSoft IDL UTL_IdList Node which is usually used to maintain a
-  // scoped name
-
-  virtual TAO_OutStream &print (AST_Expression *expr);
-  // output the contents of the AST_Expression node
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
deleted file mode 100644
index 88632350609..00000000000
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_type.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Type that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_TYPE_H)
-#define BE_TYPE_H
-
-class TAO_OutStream;
-
-/*
- * BE_Type
- */
-class be_type : public virtual AST_Type,
-                public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_type (void);
-  // default constructor
-
-  be_type (AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual ~be_type (void);
-
-  virtual int gen_client_header (void) = 0;
-  // Generates the client-side header information for the type
-
-  virtual int gen_client_stubs (void) = 0;
-  // Generates the client-side stubs for the type
-
-  virtual int gen_server_header (void) = 0;
-  // Generates the server-side header information for the type
-
-  virtual int gen_server_skeletons (void) = 0;
-  // Generates the server-side skeletons for the type
-
-  virtual int gen_client_inline (void)  = 0;
-  // Generates the client-side inline for the type
-
-  virtual int gen_server_inline (void) = 0;
-  // Generates the server-side inlines for the type
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void) = 0;
-  // generate the typecode description
-
-  virtual long tc_size (void) = 0;
-  // return typecode size
-
-  UTL_ScopedName *tc_name (void);
-  // return the typecode name
-
-  virtual const char *nested_type_name (be_decl *d, const char *suffix = 0);
-  // type name of a node used when generating declarations
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // Different types have different mappings as return values, for
-  // instance interfaces are returned by reference (_ptr), but basic
-  // types by value.
-  // Typedefs are tricky, their mapping depend on the real type they
-  // are aliasing, but the name should be the typedef name, hence
-  // typedefs delegate on their base type, but pass their nodes down
-  // so the real name can be generated; hence the <type> parameter.
-  // This method writes the type as a return value on the stream.
-
-  virtual AST_Decl::NodeType base_node_type (void) const;
-  // Typedefs are tricky to handle, in many points their mapping
-  // depend on base type they are aliasing.  Since typedefs can be
-  // recursive simply using "base_type->node_type()" will not work, so
-  // the most "unaliased" type is needed.
-
-  // Visiting
-  virtual int accept (be_visitor* visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_type, AST_Type, be_decl);
-  DEF_NARROW_FROM_DECL (be_type);
-
-protected:
-  virtual void compute_tc_name (void);
-  // computes the fully scoped typecode name
-
-  UTL_ScopedName *tc_name_;
-  // typecode name
-
-  char *type_name_;
-  // type name (this uses the ACE NESTED macro)
-
-  char *nested_type_name_;
-  // for the corresponding method.
-};
-
-#endif // end of if !defined
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
deleted file mode 100644
index 3afda4d7125..00000000000
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_typedef.h
-//
-// = DESCRIPTION
-//    Extension of class AST_typedef that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_TYPEDEF_H)
-#define BE_TYPEDEF_H
-
-/*
- * BE_Typedef
- */
-class be_typedef : public virtual AST_Typedef,
-                   public virtual be_type
-{
-public:
-  // =Operations
-
-  be_typedef (void);
-  // default constructor
-
-  be_typedef (AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  be_type *primitive_base_type (void);
-  // return the most primitive base type by traversing the chain of typedefed
-  // base types
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the typedef
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the typedef
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the typedef
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the typedef
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the typedef
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the typedef
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual AST_Decl::NodeType base_node_type (void) const;
-  // Return the most "unaliased" type node for the base type (see
-  // be_type.h).
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_typedef, AST_Typedef, be_type);
-  DEF_NARROW_FROM_DECL (be_typedef);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
deleted file mode 100644
index 8d9729a74cf..00000000000
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Union that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_UNION_H)
-#define BE_UNION_H
-
-/*
- * BE_Union
- */
-class be_union : public virtual AST_Union,
-                 public virtual be_scope,
-                 public virtual be_type
-{
-public:
-  // =Operations
-
-  be_union (void);
-  // default constructor
-
-  be_union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the union
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the union
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the union
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the union
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the union
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the union
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  virtual int default_index (void);
-  // return the default index used
-
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_union, AST_Union, be_scope, be_type);
-  DEF_NARROW_FROM_DECL(be_union);
-  DEF_NARROW_FROM_SCOPE(be_union);
-
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int compute_default_index (void);
-  // count the default index
-
-  int member_count_;
-  // number of members
-
-  int default_index_;
-  // default label index (zero based indexing)
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
deleted file mode 100644
index 75393231e57..00000000000
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union_branch.h
-//
-// = DESCRIPTION
-//    Extension of class AST_UnionBranch that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_UNION_BRANCH_H)
-#define BE_UNION_BRANCH_H
-
-/*
- * BE_UnionBranch
- */
-class be_union_branch : public virtual AST_UnionBranch,
-                        public virtual be_decl
-{
-public:
-  // Operations
-  be_union_branch (void);
-  // default constructor
-
-  be_union_branch (AST_UnionLabel *lab, AST_Type *ft, UTL_ScopedName *n,
-                   UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the union branch
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the union branch
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the union branch
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the union branch
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the union branch
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the union branch
-
-  virtual int gen_encapsulation (void);
-  // generate the encapsulation
-
-  virtual long tc_encap_len (void);
-  // return the total byte length of ourselves represented as an encapsulation
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_union_branch, AST_UnionBranch, be_decl);
-  DEF_NARROW_FROM_DECL (be_union_branch);
-protected:
-  virtual int compute_size_type (void);
-  // compute the size type if it is unknown
-
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
deleted file mode 100644
index 31b9abbba2a..00000000000
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#if !defined(BE_UNION_LABEL_H)
-#define BE_UNION_LABEL_H
-
-/*
- * BE_UnionLabel
- */
-class	be_union_label : public virtual AST_UnionLabel {
-public:
-  // Operations
-  be_union_label();
-  be_union_label(AST_UnionLabel::UnionLabel ul, AST_Expression *v);
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
deleted file mode 100644
index 9c6c05e1632..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// $Id$
-//
-
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor.h
-//
-// = DESCRIPTION
-//    The abstract visitor class. The concrete classes are responsible for code
-//    generation.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Carlos O'Ryan, Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_H)
-#define TAO_BE_VISITOR_H
-
-class be_decl;
-class be_scope;
-class be_type;
-class be_predefined_type;
-class be_module;
-class be_interface;
-class be_interface_fwd;
-class be_structure;
-class be_exception;
-class be_expression;
-class be_enum;
-class be_operation;
-class be_field;
-class be_argument;
-class be_attribute;
-class be_union;
-class be_union_branch;
-class be_union_label;
-class be_constant;
-class be_enum_val;
-class be_array;
-class be_sequence;
-class be_string;
-class be_typedef;
-class be_root;
-class be_native;
-
-class be_visitor_context;
-class TAO_OutStream;
-
-class be_visitor
-{
-  //
-  // = TITLE
-  //   Base class for visitors.
-  //
-  // = DESCRIPTION
-  //   To implement code generation we use the "Visitor Pattern", this
-  //   is the abstract "Visitor".
-  //   The "visit" methods are not pure virtual to facilitate the
-  //   implementation of simple visitors that only override a few.
-  //
-public:
-  virtual ~be_visitor (void);
-
-  virtual visit_decl (be_decl *d);
-  // visit a decl node
-
-  virtual int visit_scope (be_scope *node);
-  // visit the scope
-
-  virtual int visit_type (be_type *node);
-  // visit the type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit the predefined type
-
-  virtual int visit_module (be_module *node);
-  // visit module
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface_fwd
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception
-
-  virtual int visit_expression (be_expression *node);
-  // visit expression
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_operation (be_operation *node);
-  // visit an operation
-
-  virtual int visit_field (be_field *node);
-  // visit a field
-
-  virtual int visit_argument (be_argument *node);
-  // visit argument
-
-  virtual int visit_attribute (be_attribute *node);
-  // visit an attribute
-
-  virtual int visit_union (be_union *node);
-  // visit union
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit union branch
-
-  virtual int visit_union_label (be_union_label *node);
-  // visit union label
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum_val (be_enum_val *node);
-  // visit enum val
-
-  virtual int visit_array (be_array *node);
-  // visit an array
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit a sequence
-
-  virtual int visit_string (be_string *node);
-  // visit a string
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit a typedef
-
-  virtual int visit_root (be_root *node);
-  // visit a root
-
-  virtual int visit_native (be_native *node);
-  // visit a native
-
-protected:
-  be_visitor (void);
-  // constructor is protected
-
-};
-
-#endif // TAO_BE_VISITOR_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_args.h b/TAO/TAO_IDL/be_include/be_visitor_args.h
deleted file mode 100644
index 78ceb5b70b2..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_args.h
+++ /dev/null
@@ -1,574 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_args.h
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Arguments
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O' Ryan
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_ARGS_H
-#define _BE_VISITOR_ARGS_H
-
-#include "be_visitor_decl.h"
-
-class be_visitor_args : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   Generates the code for arguments output.
-  //
-  // = DESCRIPTION
-  //   At several stages in the code generation a node of type
-  //   "be_operation" is visited, and the code for its arguments must
-  //   be generated.
-  //   Sometimes the argument declarations must be generated (such as
-  //   in the class declaration), other the arguments names (such as
-  //   in method invocations).
-  //   This class implements some common functionality required across all
-  //   argument visitors
-  //
-public:
-  be_visitor_args (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args (void);
-  // destructor
-
-  //= helper
-  virtual const char *type_name (be_type *type, const char *suffix=0);
-  // helper that produces either a nested name for header files or full name
-  // for others
-
-  virtual AST_Argument::Direction direction (void);
-  // return the direction of the argument node
-
-  virtual int visit_argument (be_argument *node);
-  // must be overridden by derived classes
-};
-
-class be_visitor_args_arglist : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   Generates the code for arguments output.
-  //
-  // = DESCRIPTION
-  //   At several stages in the code generation a node of type
-  //   "be_operation" is visited, and the code for its arguments must
-  //   be generated.
-  //   Sometimes the argument declarations must be generated (such as
-  //   in the class declaration), other the arguments names (such as
-  //   in method invocations).
-  //   This class implements the declaration output, in other words,
-  //   it outputs both the arguments and their types.
-  //
-public:
-  be_visitor_args_arglist (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_arglist (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_native (be_native *node);
-  // visit native node
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_pre_docall_cs
-// ************************************************************
-class be_visitor_args_pre_docall_cs : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_docall_cs
-  //
-  // = DESCRIPTION
-  //   Code to be generated when making the do_static_call
-  //
-public:
-  be_visitor_args_pre_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_pre_docall_cs (void);
-  // destructor
-
-  virtual int void_return_type (void);
-  // return true if the operation return type is void
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_docall_cs
-// ************************************************************
-class be_visitor_args_docall_cs : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_docall_cs
-  //
-  // = DESCRIPTION
-  //   Code to be generated when making the do_static_call
-  //
-public:
-  be_visitor_args_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_docall_cs (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_post_docall_cs
-// ************************************************************
-class be_visitor_args_post_docall_cs : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_post_docall_cs
-  //
-  // = DESCRIPTION
-  //   Code to be generated after the do_static_call is done
-  //
-public:
-  be_visitor_args_post_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_post_docall_cs (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-};
-
-// ************************************************************
-// class be_visitor_args_vardecl_ss
-// ************************************************************
-class be_visitor_args_vardecl_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_vardecl_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for variable declaration for argument
-  //
-public:
-  be_visitor_args_vardecl_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_vardecl_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_pre_upcall_ss
-// ************************************************************
-class be_visitor_args_pre_upcall_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_upcall_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for passing argument to the upcall
-  //
-public:
-  be_visitor_args_pre_upcall_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_pre_upcall_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_upcall_ss
-// ************************************************************
-class be_visitor_args_upcall_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_upcall_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for passing argument to the upcall
-  //
-public:
-  be_visitor_args_upcall_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_upcall_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-};
-
-// ************************************************************
-// class be_visitor_args_marshal_ss
-// ************************************************************
-class be_visitor_args_marshal_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_marshal_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for passing argument to the marshaling/demarshaling routine
-  //
-public:
-  be_visitor_args_marshal_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_marshal_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_post_upcall_ss
-// ************************************************************
-class be_visitor_args_post_upcall_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_post_upcall_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for post processing after upcall
-  //
-public:
-  be_visitor_args_post_upcall_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_post_upcall_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-// ************************************************************
-// class be_visitor_args_post_marshal_ss
-// ************************************************************
-class be_visitor_args_post_marshal_ss : public be_visitor_args
-{
-  //
-  // = TITLE
-  //   be_visitor_args_post_marshal_ss
-  //
-  // = DESCRIPTION
-  //   Visitor for post processing after marshal
-  //
-public:
-  be_visitor_args_post_marshal_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_args_post_marshal_ss (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-#endif // _BE_VISITOR_ARGS_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute.h
deleted file mode 100644
index 6db40e2a693..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_attribute.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Attribute class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_ATTRIBUTE_H)
-#define TAO_BE_VISITOR_ATTRIBUTE_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-// ************************************************************
-// Attribute visitor
-// ************************************************************
-
-class be_visitor_attribute : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_attribute
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate code for attributes. We have one
-  //   class for mapping into the client and server.
-  //
-  //
-public:
-  be_visitor_attribute (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_attribute (void);
-  // destructor
-
-  virtual int visit_attribute (be_attribute *node);
-  // visit attribute. We provide code for this method in the derived class
-
-};
-
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant.h b/TAO/TAO_IDL/be_include/be_visitor_constant.h
deleted file mode 100644
index 2f2902f844d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_constant.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_constant.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the constant class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_CONSTANT_H)
-#define TAO_BE_VISITOR_CONSTANT_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_constant_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_constant_ch
-  //
-  // = DESCRIPTION
-  //   This is the visitor for constant for the header file
-  //
-  //
-public:
-  be_visitor_constant_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_constant_ch (void);
-  // destructor
-
-  virtual int visit_constant (be_constant *node);
-  // visit constant.
-
-};
-
-class be_visitor_constant_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_constant_cs
-  //
-  // = DESCRIPTION
-  //   This is the visitor for constant for the impl file
-  //
-  //
-public:
-  be_visitor_constant_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_constant_cs (void);
-  // destructor
-
-  virtual int visit_constant (be_constant *node);
-  // visit constant
-
-};
-
-#endif // TAO_BE_VISITOR_CONSTANT_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
deleted file mode 100644
index 399f59137cf..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// $Id$
-//
-
-/* -*- C++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_context.h
-//
-// = DESCRIPTION
-//    This class serves to provide all the necessary context information to the
-//    visitor as it generates code. This may include the scope inside which the
-//    code is generated, the output file that is being used, and others. This
-//    context information will be passed to the abstract/concrete visitor
-//    factory which in turn will use it to construct the right visitor.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_CONTEXT_H)
-#define TAO_BE_VISITOR_CONTEXT_H
-
-class be_visitor_context
-{
-public:
-  be_visitor_context (void);
-  // default constructor
-
-  be_visitor_context (const be_visitor_context &ctx);
-  // default constructor
-
-  ~be_visitor_context (void);
-  // destructor
-
-  be_visitor_context &operator= (const be_visitor_context &ctx);
-  // assignment operator
-
-  // =helpers
-
-  void stream (TAO_OutStream *os);
-  // set the output stream
-
-  TAO_OutStream *stream (void);
-  // get the stream
-
-  void scope (be_decl *scope);
-  // set the scope
-
-  be_decl *scope (void);
-  // get the scope in which code will be generated
-
-  void node (be_decl *node);
-  // current node being visited
-
-  be_decl *node (void);
-  // node being visited
-
-  void state (TAO_CodeGen::CG_STATE);
-  // code generation state
-
-  TAO_CodeGen::CG_STATE state (void);
-  // return the code generation state
-
-  void alias (be_typedef *node);
-  // set the alias node (if any)
-
-  be_typedef *alias (void);
-  // return the aliased node (if any)
-
-  void tdef (be_typedef *node);
-  // set the typedef node (if any)
-
-  be_typedef *tdef (void);
-  // return the typedef node (if any)
-
-  void attribute (be_attribute *attr);
-  // set the attribute node if any
-
-  be_attribute *attribute (void);
-  // get the attribute node
-
-  void exception (idl_bool);
-  // is it the special ctor for exceptions?
-
-  idl_bool exception (void);
-  // is it the special ctor for exceptions?
-
-  void comma (idl_bool);
-  // scope supoorts generation of comma after each element
-
-  idl_bool comma (void);
-  // are we supposed to generate a comma?
-
-  // = helpers
-
-  // visitors may need the actual type of the node stored in this context. We
-  // could have kept separate nodes but that would have increased the size of
-  // the context class by a large extent. So we will rely on the
-  // "narrow_from_decl" approach
-
-  // two types of helpers are provided here. One of them returns the node as
-  // the desired actual type. The other returns the scope as the desired type.
-
-  be_argument *be_node_as_argument (void);
-  // return the node as argument if possible
-
-  be_array *be_node_as_array (void);
-  // return the node as array if possible
-
-  be_attribute *be_node_as_attribute (void);
-  // return the node as attribute if possible
-
-  be_constant *be_node_as_constant (void);
-  // return the node as constant if possible
-
-  be_enum *be_node_as_enum (void);
-  // return the node as enum if possible
-
-  be_enum_val *be_node_as_enum_val (void);
-  // return the node as enum_val if possible
-
-  be_exception *be_node_as_exception (void);
-  // return the node as exception if possible
-
-  be_field *be_node_as_field (void);
-  // return the node as field if possible
-
-  be_interface *be_node_as_interface (void);
-  // return the node as interface if possible
-
-  be_interface_fwd *be_node_as_interface_fwd (void);
-  // return the node as interface_fwd if possible
-
-  be_module *be_node_as_module (void);
-  // return the node as module if possible
-
-  be_operation *be_node_as_operation (void);
-  // return the node as operation if possible
-
-  be_predefined_type *be_node_as_predefined_type (void);
-  // return the node as predefined_type if possible
-
-  be_root *be_node_as_root (void);
-  // return the node as root if possible
-
-  be_sequence *be_node_as_sequence (void);
-  // return the node as sequence if possible
-
-  be_string *be_node_as_string (void);
-  // return the node as string if possible
-
-  be_structure *be_node_as_structure (void);
-  // return the node as structure if possible
-
-  be_typedef *be_node_as_typedef (void);
-  // return the node as typedef if possible
-
-  be_union *be_node_as_union (void);
-  // return the node as union if possible
-
-  be_union_branch *be_node_as_union_branch (void);
-  // return the node as union_branch if possible
-
-  // for scope
-
-  be_enum *be_scope_as_enum (void);
-  // return the scope as enum if possible
-
-  be_exception *be_scope_as_exception (void);
-  // return the scope as exception if possible
-
-  be_interface *be_scope_as_interface (void);
-  // return the scope as interface if possible
-
-  be_module *be_scope_as_module (void);
-  // return the scope as module if possible
-
-  be_operation *be_scope_as_operation (void);
-  // return the scope as operation if possible
-
-  be_root *be_scope_as_root (void);
-  // return the scope as root if possible
-
-  be_structure *be_scope_as_structure (void);
-  // return the scope as structure if possible
-
-  be_union *be_scope_as_union (void);
-  // return the scope as union if possible
-
-private:
-  TAO_CodeGen::CG_STATE state_;
-  // code generation state
-
-  TAO_OutStream *os_;
-  // current output stream
-
-  be_decl *scope_;
-  // current scope in which code is generated
-
-  be_decl *node_;
-  // current node
-
-  be_typedef *alias_;
-  // aliased node used as a scoped name to define IDL types.
-
-  be_typedef *tdef_;
-  // typedef node
-
-  be_attribute *attr_;
-  // attribute node stored here while generating its code
-
-  idl_bool exception_;
-  // is it the special ctor for exceptions?
-
-  idl_bool comma_;
-  // whether scope should generate a comma after every element
-};
-
-
-#endif /* BE_VISITOR_CONTEXT_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h
deleted file mode 100644
index 4c8f575cacd..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_decl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_decl.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Decl" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_DECL_H)
-#define TAO_BE_VISITOR_DECL_H
-
-#include "be_visitor.h"
-
-class be_visitor_decl : public be_visitor
-{
-  //
-  // = TITLE
-  //    be_visitor_decl
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_decl node. Its only purpose is to
-  //   maintain state information for the derived visitor
-  //
-public:
-  be_visitor_decl (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_decl (void);
-  // destructor
-
-protected:
-  // using a protected mechanism will allow derived visitors to access this
-  // information
-
-  be_visitor_context *ctx_;
-  // any context information required by the visitor
-};
-
-
-#endif // TAO_BE_VISITOR_DECL_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum.h b/TAO/TAO_IDL/be_include/be_visitor_enum.h
deleted file mode 100644
index 59a6aff8ab6..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_enum.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_enum.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the enum class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_ENUM_H)
-#define TAO_BE_VISITOR_ENUM_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_enum_ch : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_enum_ch
-  //
-  // = DESCRIPTION
-  //   This is the base visitor for enum for the header file
-  //
-  //
-public:
-  be_visitor_enum_ch (be_visitor_context *ctx);
-  // conenumor
-
-  ~be_visitor_enum_ch (void);
-  // deenumor
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum.
-
-  // =visit operations on syntactically valid elements in our scope
-
-  virtual int visit_enum_val (be_enum_val *node);
-  // visit enum_val
-
-  // = helper
-
-  virtual int post_process (void);
-  // generate a comma after each element is processed
-};
-
-class be_visitor_enum_cs : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_enum_cs
-  //
-  // = DESCRIPTION
-  //   This is the visitor for enum for the impl file
-  //
-  //
-public:
-  be_visitor_enum_cs (be_visitor_context *ctx);
-  // conenumor
-
-  ~be_visitor_enum_cs (void);
-  // deenumor
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum and generate the typecode
-
-};
-
-#endif // TAO_BE_VISITOR_ENUM_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception.h
deleted file mode 100644
index 627fd708b5f..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_exception.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_exception.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Exception class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_EXCEPTION_H)
-#define TAO_BE_VISITOR_EXCEPTION_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_exception : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_exception
-  //
-  // = DESCRIPTION
-  //   This is the base visitor for exception
-  //
-  //
-public:
-  be_visitor_exception (be_visitor_context *ctx);
-  // ctor
-
-  ~be_visitor_exception (void);
-  // dtor
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception. We provide code for this method in the derived class
-
-  // =visit operations on syntactically valid elements in our scope
-
-  virtual int visit_field (be_field *node);
-  // visit field
-};
-
-class be_visitor_exception_ch : public be_visitor_exception
-{
-  //
-  // = TITLE
-  //   be_visitor_exception_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for exception
-  //
-  //
-public:
-  be_visitor_exception_ch (be_visitor_context *ctx);
-  // constructureor
-
-  ~be_visitor_exception_ch (void);
-  // destructureor
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception. We provide code for this method in the derived class
-
-};
-
-class be_visitor_exception_ci : public be_visitor_exception
-{
-  //
-  // = TITLE
-  //   be_visitor_exception_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for exception
-  //
-  //
-public:
-  be_visitor_exception_ci (be_visitor_context *ctx);
-  // ctor
-
-  ~be_visitor_exception_ci (void);
-  // dtor
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception. We provide code for this method in the derived class
-
-};
-
-class be_visitor_exception_cs : public be_visitor_exception
-{
-  //
-  // = TITLE
-  //   be_visitor_exception_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for exception
-  //
-  //
-public:
-  be_visitor_exception_cs (be_visitor_context *ctx);
-  // ctor
-
-  ~be_visitor_exception_cs (void);
-  // dtor
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception. We provide code for this method in the derived class
-
-};
-
-class be_visitor_exception_ctor : public be_visitor_scope
-{
-  // =TITLE
-  //   be_visitor_exception_ctor
-  //
-  // =DESCRIPTION
-  //   generation of the special constructor
-public:
-  be_visitor_exception_ctor (be_visitor_context *ctx);
-  // ctor
-
-  ~be_visitor_exception_ctor (void);
-  // dtor
-
-  virtual int post_process (void);
-  // post processing after each element
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception. We provide code for this method in the derived class
-
-  virtual int visit_field (be_field *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the field
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-class be_visitor_exception_ctor_assign : public be_visitor_scope
-{
-  // =TITLE
-  //   be_visitor_exception_ctor_assign
-  //
-  // =DESCRIPTION
-  //   generation of the assignment statements in
-public:
-  be_visitor_exception_ctor_assign (be_visitor_context *ctx);
-  // ctor
-
-  ~be_visitor_exception_ctor_assign (void);
-  // dtor
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception.
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit all the nodes that can be the types for the field
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit the enum node
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef type
-
-};
-
-#endif // TAO_BE_VISITOR_EXCEPTION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field.h b/TAO/TAO_IDL/be_include/be_visitor_field.h
deleted file mode 100644
index 9846554bccc..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_field.h
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_field.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Field" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_FIELD_H)
-#define TAO_BE_VISITOR_FIELD_H
-
-#include "be_visitor_decl.h"
-
-class be_visitor_field_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_field_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_field node for the client header.
-  //
-public:
-  be_visitor_field_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_field_ch (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a field can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_field_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_field_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_field node for the client inline
-  //   file
-  //
-public:
-  be_visitor_field_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_field_ci (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a field can be and for
-  // which inline code must be generated
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_field_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_field_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_field node for the client stubs
-  //   file
-  //
-public:
-  be_visitor_field_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_field_cs (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a field can be and impl
-  // code must be generated
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-#endif // TAO_BE_VISITOR_FIELD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
deleted file mode 100644
index c649c3a5fc2..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ /dev/null
@@ -1,257 +0,0 @@
-
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_interface.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface class
-//
-// = AUTHOR
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_INTERFACE_H)
-#define TAO_BE_VISITOR_INTERFACE_H
-
-#include "be_visitor_scope.h"
-
-
-// = DESCRIPTION
-//   Interface code generation is complex, the client stubs require
-//   two different class and the server also require other two.
-//   Only one of them includes whatever nested typedefs, exceptions
-//   and or structures are defined in the interface.
-//   To break this complexity a different visitor is used for each
-//   case.
-//
-// = NOTE
-//   Visitors were added recently into the compiler, so some
-//   code is still generated using the old "state oriented" approach;
-//   notably only the _collocated class is actually generated using
-//   the visitor, in the other cases (the interface class and the
-//   skeleton class) we still call back the old code generation
-//   methods.
-//
-
-class be_visitor_interface : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_interface
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for interface that abstracts all common tasks
-  //
-
-public:
-  be_visitor_interface (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit the interface node
-
-  // =visit methods on all elements syntactically valid in a Interface scope
-
-  virtual int visit_attribute (be_attribute *node);
-  // visit attribute
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_exception (be_exception *node);
-  // visit an exception
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef node
-
-};
-
-// we need derived interface visitors for the client and server header files. For
-// the others, they use the default interface visitor
-
-class be_visitor_interface_ch : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for interface
-  //
-  //
-public:
-  be_visitor_interface_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_ch (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-
-};
-
-class be_visitor_interface_ci : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for interface
-  //
-  //
-public:
-  be_visitor_interface_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_ci (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-
-};
-
-class be_visitor_interface_cs : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for interface
-  //
-  //
-public:
-  be_visitor_interface_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_cs (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-};
-
-class be_visitor_interface_sh : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for interface
-  //
-  //
-public:
-  be_visitor_interface_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_sh (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-};
-
-class be_visitor_interface_si : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_si
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server inline for interface
-  //
-  //
-public:
-  be_visitor_interface_si (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_si (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-};
-
-class be_visitor_interface_ss : public be_visitor_interface
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeletons for interface
-  //
-  //
-public:
-  be_visitor_interface_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_ss (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // set the right context and make a visitor
-};
-
-class be_visitor_interface_collocated_sh : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "collocated" class declaration.
-
-public:
-  be_visitor_interface_collocated_sh (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_collocated_sh (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit an interface
-
-};
-
-class be_visitor_interface_collocated_ss : public be_visitor_interface
-{
-  // = TITLE
-  //   Generate the "collocated" class declaration.
-
-public:
-  be_visitor_interface_collocated_ss (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_interface_collocated_ss (void);
-  // destructor
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface
-
-};
-
-#endif // _BE_VISITOR_INTERFACE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
deleted file mode 100644
index b24a9942e39..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_interface_fwd.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the interface_fwd class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_INTERFACE_FWD_H)
-#define TAO_BE_VISITOR_INTERFACE_FWD_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_interface_fwd_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_fwd_ch
-  //
-  // = DESCRIPTION
-  //   This is the visitor for interface_fwd for the header file
-  //
-  //
-public:
-  be_visitor_interface_fwd_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_fwd_ch (void);
-  // destructor
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface_fwd.
-
-};
-
-class be_visitor_interface_fwd_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_interface_fwd_ci
-  //
-  // = DESCRIPTION
-  //   This is the visitor for interface_fwd for the inline file
-  //
-  //
-public:
-  be_visitor_interface_fwd_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_interface_fwd_ci (void);
-  // destructor
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface_fwd
-
-};
-
-#endif // TAO_BE_VISITOR_INTERFACE_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module.h b/TAO/TAO_IDL/be_include/be_visitor_module.h
deleted file mode 100644
index 0a1f64a4496..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_module.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_module.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Module class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_MODULE_H)
-#define TAO_BE_VISITOR_MODULE_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_module : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_module
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for module that abstracts all common tasks
-  //
-
-public:
-  be_visitor_module (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_module (void);
-  // destructor
-
-  // =visit methods on all elements syntactically valid in a Module scope
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_exception (be_exception *node);
-  // visit an exception
-
-  virtual int visit_interface (be_interface *node);
-  // visit an interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface
-
-  virtual int visit_module (be_module *node);
-  // visit a module
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef node
-
-};
-
-// we need derived module visitors for the client and server header files. For
-// the others, they use the default module visitor
-
-class be_visitor_module_ch : public be_visitor_module
-{
-  //
-  // = TITLE
-  //   be_visitor_module_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for module
-  //
-  //
-public:
-  be_visitor_module_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_module_ch (void);
-  // destructor
-
-  virtual int visit_module (be_module *node);
-  // visit module. We provide code for this method in the derived class
-
-};
-
-class be_visitor_module_sh : public be_visitor_module
-{
-  //
-  // = TITLE
-  //   be_visitor_module_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for module
-  //
-  //
-public:
-  be_visitor_module_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_module_sh (void);
-  // destructor
-
-  virtual int visit_module (be_module *node);
-  // visit module. We provide code for this method in the derived class
-
-};
-
-
-#endif // TAO_BE_VISITOR_MODULE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
deleted file mode 100644
index d6b66b4c71f..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ /dev/null
@@ -1,789 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_operation.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Operation class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_OPERATION_H)
-#define TAO_BE_VISITOR_OPERATION_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-// ************************************************************
-// Operation visitor for client header
-// ************************************************************
-
-class be_visitor_operation_ch : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for operation
-  //
-  //
-public:
-  be_visitor_operation_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_ch (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation. We provide code for this method in the derived class
-
-};
-
-// ************************************************************
-// Operation visitor for client stubs
-// ************************************************************
-
-class be_visitor_operation_cs : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for operation
-  //
-  //
-public:
-  be_visitor_operation_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_cs (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation.
-
-  virtual int visit_argument (be_argument *node);
-  // visit argument to generate ParamData entries
-
-  virtual int post_process (void);
-  // stuff to output after every member of the scope is handled
-};
-
-// ************************************************************
-// Operation visitor for server header
-// ************************************************************
-
-class be_visitor_operation_sh : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for operation
-  //
-  //
-public:
-  be_visitor_operation_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_sh (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation. We provide code for this method in the derived class
-
-};
-
-// ************************************************************
-// Operation visitor for server skeletons
-// ************************************************************
-
-class be_visitor_operation_ss : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeletons for operation
-  //
-  //
-public:
-  be_visitor_operation_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_ss (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation. We provide code for this method in the derived class
-
-  virtual int visit_argument (be_argument *node);
-  // visit argument to generate ParamData entries
-
-  virtual int post_process (void);
-  // stuff to output after every member of the scope is handled
-};
-
-// ************************************************************
-// Operation visitor for server header in the collocated class
-// ************************************************************
-
-class be_visitor_operation_collocated_sh : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_collocated_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for operation
-  //   in the collocated class
-  //
-  //
-public:
-  be_visitor_operation_collocated_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_collocated_sh (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation node.
-
-};
-
-// *****************************************************************
-// Operation visitor for server skeletons for the collocated class
-// *****************************************************************
-
-class be_visitor_operation_collocated_ss : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeletons for
-  //   operation in the collocated class
-  //
-  //
-public:
-  be_visitor_operation_collocated_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_collocated_ss (void);
-  // destructor
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation node.
-
-};
-
-// ***********************************************************************
-// Operation visitor for return types in the signature of the operation
-// ***********************************************************************
-
-class be_visitor_operation_rettype : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ch
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate operation return types
-  //
-  //
-public:
-  be_visitor_operation_rettype (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_native (be_native *node);
-  // visit native type
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ******************************************************************************
-// Operation visitor for argument list - generates parameters in the signature
-// ******************************************************************************
-
-class be_visitor_operation_arglist : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operaion_arglist
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate operation argument list
-  //
-  //
-public:
-  be_visitor_operation_arglist (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_arglist (void);
-  // destructor
-
-  int visit_operation (be_operation *node);
-  // visit the operation
-
-  int visit_argument (be_argument *node);
-  // visit each argument
-
-};
-
-// ************************************************************
-// Operation visitor for return type variable declaration
-// ************************************************************
-
-class be_visitor_operation_rettype_vardecl_cs :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_vardecl_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration ofr an operation
-  //   return type
-  //
-public:
-  be_visitor_operation_rettype_vardecl_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_vardecl_cs (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ************************************************************
-// Operation visitor for preprocessing before do_static_call is invoked
-// ************************************************************
-
-class be_visitor_operation_rettype_pre_docall_cs :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_pre_docall_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate any pre processing before the do_static_call is
-  //   made
-  //
-public:
-  be_visitor_operation_rettype_pre_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_pre_docall_cs (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ************************************************************
-// Operation visitor for passing return variable to do_static_call
-// ************************************************************
-
-class be_visitor_operation_rettype_docall_cs :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_docall_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration ofr an operation
-  //   return type
-  //
-public:
-  be_visitor_operation_rettype_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_docall_cs (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ************************************************************
-// Operation visitor for postprocessing after do_static_call is invoked
-// ************************************************************
-
-class be_visitor_operation_rettype_post_docall_cs :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_psot_docall_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate any post processing after the do_static_call is
-  //   made
-  //
-public:
-  be_visitor_operation_rettype_post_docall_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_post_docall_cs (void);
-  // destructor
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-};
-
-// ************************************************************
-// Operation visitor for returning the return val
-// ************************************************************
-
-class be_visitor_operation_rettype_return_cs :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_return_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration ofr an operation
-  //   return type
-  //
-public:
-  be_visitor_operation_rettype_return_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_return_cs (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ******************************************************************************
-// Visitor for
-// ******************************************************************************
-
-class be_visitor_operation_exceptlist_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operaion_exceptlist_cs
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate operation exception list to be provided to
-  //   the do_static_call
-  //
-  //
-public:
-  be_visitor_operation_exceptlist_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_exceptlist_cs (void);
-  // destructor
-
-  int visit_operation (be_operation *node);
-  // visit the operation
-
-};
-
-// ************************************************************
-// generic operation visitor for docall, upcall, pre/post
-// ************************************************************
-
-class be_visitor_operation_argument : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_argument
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration ofr an operation
-  //   return type
-  //
-public:
-  be_visitor_operation_argument (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_argument (void);
-  // destructor
-
-  int post_process (void);
-  // stuff to o/p after each element of the scope is handled
-
-  int visit_operation (be_operation *node);
-  // visit the operation
-
-  int visit_argument (be_argument *node);
-  // visit argument
-
-};
-
-// ************************************************************
-// Operation visitor for return type variable declaration in the server
-// skeleton
-// ************************************************************
-
-class be_visitor_operation_rettype_vardecl_ss :public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_vardecl_ss
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate a variable declaration ofr an operation
-  //   return type in the server skeleton
-  //
-public:
-  be_visitor_operation_rettype_vardecl_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_vardecl_ss (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ***********************************************************************
-// Operation visitor for passing return type to the marshal/demarshal routine
-// inside the server skeleton
-// ***********************************************************************
-
-class be_visitor_operation_rettype_marshal_ss : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_marshal_ss
-  //
-  // = DESCRIPTION
-  //   This is a visitor to pass return type to the marshal/demarshal routines
-  //
-  //
-public:
-  be_visitor_operation_rettype_marshal_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_marshal_ss (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ***********************************************************************
-// Operation visitor for assignment to return types in an upcall
-// ***********************************************************************
-
-class be_visitor_operation_rettype_assign_ss : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_ch
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate code that assigns to the return type
-  //   variable in the upcall
-  //
-  //
-public:
-  be_visitor_operation_rettype_assign_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_assign_ss (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-// ***********************************************************************
-// Operation visitor for post upcall processing of return types
-// ***********************************************************************
-
-class be_visitor_operation_rettype_post_upcall_ss : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_post_upcall_ss
-  //
-  // = DESCRIPTION
-  //   This is a visitor for post processing after an upcall
-  //
-  //
-public:
-  be_visitor_operation_rettype_post_upcall_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_operation_rettype_post_upcall_ss (void);
-  // destructor
-
-  int visit_array (be_array *node);
-  // visit an array node
-
-  int visit_enum (be_enum *node);
-  // visit an enum node
-
-  int visit_interface (be_interface *node);
-  // visit an interface node
-
-  int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
-
-  int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type node
-
-  int visit_sequence (be_sequence *node);
-  // visit a sequence node
-
-  int visit_string (be_string *node);
-  // visit a sequence node
-
-  int visit_structure (be_structure *node);
-  // visit a structure node
-
-  int visit_typedef (be_typedef *node);
-  // visit a typedef node
-
-  int visit_union (be_union *node);
-  // visit a union node
-
-};
-
-#endif // TAO_BE_VISITOR_OPERATION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h
deleted file mode 100644
index 7d0f4f6a704..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_root.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_root.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Root class
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_ROOT_H)
-#define TAO_BE_VISITOR_ROOT_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_root : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_root
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for root that abstracts all common tasks
-  //
-
-public:
-  be_visitor_root (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root (void);
-  // destructor
-
-  virtual int visit_root (be_root *node);
-  // visit root
-
-  // =visit methods on all elements syntactically valid in a Root scope
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_exception (be_exception *node);
-  // visit an exception
-
-  virtual int visit_interface (be_interface *node);
-  // visit an interface
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface
-
-  virtual int visit_module (be_module *node);
-  // visit a module
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef node
-
-  // =helper. This is used by derived clases to set the right context
-
-  virtual int init (void);
-  // will be overridden by derived classes that set the appropriate context
-};
-
-class be_visitor_root_ch : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for root
-  //
-  //
-public:
-  be_visitor_root_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_ch (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-class be_visitor_root_ci : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for root
-  //
-  //
-public:
-  be_visitor_root_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_ci (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-class be_visitor_root_cs : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for root
-  //
-  //
-public:
-  be_visitor_root_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_cs (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-class be_visitor_root_sh : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for root
-  //
-  //
-public:
-  be_visitor_root_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_sh (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-class be_visitor_root_si : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_si
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server inline for root
-  //
-  //
-public:
-  be_visitor_root_si (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_si (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-class be_visitor_root_ss : public be_visitor_root
-{
-  //
-  // = TITLE
-  //   be_visitor_root_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeletons for root
-  //
-  //
-public:
-  be_visitor_root_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_root_ss (void);
-  // destructor
-
-  virtual int init (void);
-  // set the right context and make a visitor
-};
-
-
-#endif // TAO_BE_VISITOR_ROOT_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h
deleted file mode 100644
index 07796a9b0e2..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_scope.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_scope.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Scope" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_SCOPE_H)
-#define TAO_BE_VISITOR_SCOPE_H
-
-#include "be_visitor.h"
-#include "be_visitor_decl.h"
-
-class be_visitor_scope : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_scope
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_scope node. Its only purpose is to
-  //   iterate over the elements of the scope
-  //
-public:
-  be_visitor_scope (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_scope (void);
-  // destructor
-
-  int visit_scope (be_scope *node);
-  // visit scope
-
-  virtual int post_process (void);
-  // do any processing after every element except the last one of the scope is
-  // processed
-};
-
-
-#endif // TAO_BE_VISITOR_SCOPE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence.h b/TAO/TAO_IDL/be_include/be_visitor_sequence.h
deleted file mode 100644
index 5be601730ac..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-#if !defined (TAO_BE_VISITOR_SEQUENCE_H)
-#define TAO_BE_VISITOR_SEQUENCE_H
-
-#include "be_visitor_decl.h"
-
-class be_visitor_sequence_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for
-  //   sequences
-  //
-public:
-  be_visitor_sequence_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_sequence_ch (void);
-  // destructor
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence node
-
-  virtual int gen_base_sequence_class (be_sequence *node);
-  // generate the base sequence class
-
-  virtual int gen_var_defn (be_sequence *node);
-  // generate the var defn
-
-  virtual int gen_out_defn (be_sequence *node);
-  // generate the out defn
-};
-
-class be_visitor_sequence_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for
-  //   sequences. The only purpose is to generate the implementation for the
-  //   _var and _out classes
-  //
-public:
-  be_visitor_sequence_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_sequence_ci (void);
-  // destructor
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence node
-
-  virtual int gen_var_impl (be_sequence *node);
-  // generate the var impl
-
-  virtual int gen_out_impl (be_sequence *node);
-  // generate the out impl
-};
-
-class be_visitor_sequence_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for
-  //   sequences
-  //
-public:
-  be_visitor_sequence_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_sequence_cs (void);
-  // destructor
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence node
-
-  virtual int gen_base_sequence_class (be_sequence *node);
-  // generate the base sequence class
-
-};
-
-// =helper visitors to generate the base type and element type
-
-class be_visitor_sequence_base : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_base
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the template parameters
-  //   for a TAO_*_Sequence instantiation.
-  //
-  // = BUGS
-  //   The class name is misleading, eventually this class could be
-  //   used to generate code in other files, not only the client
-  //   header.
-  //   The visitor factory should provide a factory method that builds
-  //   this class on the fly.
-  //
-public:
-  be_visitor_sequence_base (be_visitor_context *ctx);
-  // Constructor
-
-  ~be_visitor_sequence_base (void);
-  // destructor
-
-  // = Visitor methods.
-  virtual int visit_predefined_type (be_predefined_type *node);
-  virtual int visit_interface (be_interface *node);
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  virtual int visit_structure (be_structure *node);
-  virtual int visit_enum (be_enum *node);
-  virtual int visit_exception (be_exception *node);
-  virtual int visit_union (be_union *node);
-  virtual int visit_array (be_array *node);
-  virtual int visit_string (be_string *node);
-  virtual int visit_sequence (be_sequence *node);
-  virtual int visit_typedef (be_typedef *node);
-
-protected:
-  int visit_node (be_type *);
-  // helper that does the common job
-
-};
-
-class be_visitor_sequence_buffer_type : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_buffer_type
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the buffer type
-  //   for a TAO_*_Sequence instantiation.
-  //
-public:
-  be_visitor_sequence_buffer_type (be_visitor_context *ctx);
-  // Constructor
-
-  ~be_visitor_sequence_buffer_type (void);
-  // destructor
-
-  // = Visitor methods.
-  virtual int visit_predefined_type (be_predefined_type *node);
-  virtual int visit_interface (be_interface *node);
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  virtual int visit_structure (be_structure *node);
-  virtual int visit_enum (be_enum *node);
-  virtual int visit_exception (be_exception *node);
-  virtual int visit_union (be_union *node);
-  virtual int visit_array (be_array *node);
-  virtual int visit_string (be_string *node);
-  virtual int visit_sequence (be_sequence *node);
-  virtual int visit_typedef (be_typedef *node);
-
-protected:
-  int visit_node (be_type *);
-  // helper that does the common job
-
-};
-
-class be_visitor_sequence_elemtype : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_sequence_elemtype
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the return type for the
-  //   [] operators
-  //
-  // = NOTES
-  //    This class may eventually go away when the _var and _out classes are
-  //    generated using templates
-public:
-  be_visitor_sequence_elemtype (be_visitor_context *ctx);
-  // Constructor
-
-  ~be_visitor_sequence_elemtype (void);
-  // destructor
-
-  // = Visitors
-  virtual int visit_predefined_type (be_predefined_type *node);
-  virtual int visit_interface (be_interface *node);
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  virtual int visit_structure (be_structure *node);
-  virtual int visit_enum (be_enum *node);
-  virtual int visit_exception (be_exception *node);
-  virtual int visit_union (be_union *node);
-  virtual int visit_array (be_array *node);
-  virtual int visit_sequence (be_sequence *node);
-  virtual int visit_typedef (be_typedef *node);
-  virtual int visit_string (be_string *node);
-
-protected:
-  int visit_node (be_type *);
-  // helper that does the common job
-
-};
-
-#endif /* TAO_BE_VISITOR_SEQUENCE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure.h
deleted file mode 100644
index 5c643d48c23..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_structure.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_structure.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Structure class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_STRUCTURE_H)
-#define TAO_BE_VISITOR_STRUCTURE_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_structure : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_structure
-  //
-  // = DESCRIPTION
-  //   This is the base visitor for structure
-  //
-  //
-public:
-  be_visitor_structure (be_visitor_context *ctx);
-  // constructureor
-
-  ~be_visitor_structure (void);
-  // destructureor
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure. We provide code for this method in the derived class
-
-  // =visit operations on syntactically valid elements in our scope
-
-  virtual int visit_field (be_field *node);
-  // visit field
-};
-
-class be_visitor_structure_ch : public be_visitor_structure
-{
-  //
-  // = TITLE
-  //   be_visitor_structure_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for structure
-  //
-  //
-public:
-  be_visitor_structure_ch (be_visitor_context *ctx);
-  // constructureor
-
-  ~be_visitor_structure_ch (void);
-  // destructureor
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure. We provide code for this method in the derived class
-
-};
-
-class be_visitor_structure_ci : public be_visitor_structure
-{
-  //
-  // = TITLE
-  //   be_visitor_structure_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for structure
-  //
-  //
-public:
-  be_visitor_structure_ci (be_visitor_context *ctx);
-  // constructureor
-
-  ~be_visitor_structure_ci (void);
-  // destructureor
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure. We provide code for this method in the derived class
-
-};
-
-class be_visitor_structure_cs : public be_visitor_structure
-{
-  //
-  // = TITLE
-  //   be_visitor_structure_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for structure
-  //
-  //
-public:
-  be_visitor_structure_cs (be_visitor_context *ctx);
-  // constructureor
-
-  ~be_visitor_structure_cs (void);
-  // destructureor
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure. We provide code for this method in the derived class
-
-};
-
-
-#endif // TAO_BE_VISITOR_STRUCTURE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef.h
deleted file mode 100644
index 270f2aae6a0..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_typedef.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Typedef class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_TYPEDEF_H)
-#define TAO_BE_VISITOR_TYPEDEF_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_typedef : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_typedef
-  //
-  // = DESCRIPTION
-  //    This is a concrete visitor for typedef that abstracts all common tasks
-  //
-
-public:
-  be_visitor_typedef (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_typedef (void);
-  // destructor
-
-  virtual int visit_typedef (be_typedef *node);
-  // must be overridden
-
-  // =visit methods on all elements syntactically valid as types that can be
-  // typedefed.
-
-  virtual int visit_array (be_array *node);
-  // visit a array
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type node
-
-  virtual int visit_string (be_string *node);
-  // visit a typedef
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit a sequence
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-};
-
-// we need derived typedef visitors for the client files.
-
-class be_visitor_typedef_ch : public be_visitor_typedef
-{
-  //
-  // = TITLE
-  //   be_visitor_typedef_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for typedef
-  //
-  //
-public:
-  be_visitor_typedef_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_typedef_ch (void);
-  // destructor
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedef. We provide code for this method in the derived class
-
-  // =visit methods on all elements syntactically valid as types that can be
-  // typedefed.
-
-  virtual int visit_array (be_array *node);
-  // visit a array
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type node
-
-  virtual int visit_string (be_string *node);
-  // visit a typedef
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit a sequence
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-};
-
-class be_visitor_typedef_ci : public be_visitor_typedef
-{
-  //
-  // = TITLE
-  //   be_visitor_typedef_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for typedef
-  //
-  //
-public:
-  be_visitor_typedef_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_typedef_ci (void);
-  // destructor
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedef. We provide code for this method in the derived class
-
-  // =visit methods on all elements syntactically valid as types that can be
-  // typedefed.
-
-  virtual int visit_array (be_array *node);
-  // visit a array
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit a sequence
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-};
-
-class be_visitor_typedef_cs : public be_visitor_typedef
-{
-  //
-  // = TITLE
-  //   be_visitor_typedef_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for typedef
-  //
-  //
-public:
-  be_visitor_typedef_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_typedef_cs (void);
-  // destructor
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedef. We provide code for this method in the derived class
-
-};
-
-
-#endif // TAO_BE_VISITOR_TYPEDEF_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union.h b/TAO/TAO_IDL/be_include/be_visitor_union.h
deleted file mode 100644
index 5ed4437fa2c..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_union.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_union.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Union class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_UNION_H)
-#define TAO_BE_VISITOR_UNION_H
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-class be_visitor_union : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_union
-  //
-  // = DESCRIPTION
-  //   This is the base visitor for union
-  //
-  //
-public:
-  be_visitor_union (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union (void);
-  // destructor
-
-  virtual int visit_union (be_union *node);
-  // visit union. We provide code for this method in the derived class
-
-  // =visit operations on syntactically valid elements in our scope
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit union_branch
-};
-
-class be_visitor_union_ch : public be_visitor_union
-{
-  //
-  // = TITLE
-  //   be_visitor_union_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for union
-  //
-  //
-public:
-  be_visitor_union_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_ch (void);
-  // destructor
-
-  virtual int visit_union (be_union *node);
-  // visit union. We provide code for this method in the derived class
-
-};
-
-class be_visitor_union_ci : public be_visitor_union
-{
-  //
-  // = TITLE
-  //   be_visitor_union_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for union
-  //
-  //
-public:
-  be_visitor_union_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_ci (void);
-  // destructor
-
-  virtual int visit_union (be_union *node);
-  // visit union. We provide code for this method in the derived class
-
-};
-
-class be_visitor_union_cs : public be_visitor_union
-{
-  //
-  // = TITLE
-  //   be_visitor_union_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for union
-  //
-  //
-public:
-  be_visitor_union_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_cs (void);
-  // destructor
-
-  virtual int visit_union (be_union *node);
-  // visit union. We provide code for this method in the derived class
-
-};
-
-class be_visitor_union_discriminant_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_union_discriminant_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for union
-  //   discriminant
-  //
-  //
-public:
-  be_visitor_union_discriminant_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_discriminant_ch (void);
-  // destructor
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit a typedef node
-};
-
-class be_visitor_union_discriminant_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_union_discriminant_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for union
-  //   discriminant
-  //
-  //
-public:
-  be_visitor_union_discriminant_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_discriminant_ci (void);
-  // destructor
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit a predefined type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit a typedef node
-};
-
-class be_visitor_union_discriminant_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_union_discriminant_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for union
-  //   discriminant
-  //
-  //
-public:
-  be_visitor_union_discriminant_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_discriminant_cs (void);
-  // destructor
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum. Required to generate the typecode for an enum definition
-  // appearing side the union
-
-};
-
-#endif // TAO_BE_VISITOR_UNION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
deleted file mode 100644
index 780099165eb..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
+++ /dev/null
@@ -1,254 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_union_branch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the base "BE_Union_Branch" node
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_VISITOR_UNION_BRANCH_H)
-#define TAO_BE_VISITOR_UNION_BRANCH_H
-
-#include "be_visitor_decl.h"
-
-class be_visitor_union_branch_public_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_union_branch_public_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_union_branch node for the client
-  //   header. This generates the code for the public section of the "union"
-  //   class
-  //
-public:
-  be_visitor_union_branch_public_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_branch_public_ch (void);
-  // destructor
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union_branch node
-
-  // =visit operations on all possible data types that a union_branch can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_union_branch_private_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_union_branch_private_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_union_branch node for the client
-  //   header. This generates the code for the private section of the "union"
-  //   class
-  //
-public:
-  be_visitor_union_branch_private_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_branch_private_ch (void);
-  // destructor
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union_branch node
-
-  // =visit operations on all possible data types that a union_branch can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_union_branch_public_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_union_branch_public_ci
-  //
-  // = DESCRIPTION
-  //    This visitor is used to generate the accessors for the members of the
-  //    union
-  //
-public:
-  be_visitor_union_branch_public_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_branch_public_ci (void);
-  // destructor
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union_branch node
-
-  // =visit operations on all possible data types that a union_branch can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_union_branch_public_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_union_branch_public_cs
-  //
-  // = DESCRIPTION
-  //    This visitor is used to generate implementation such as typecodes for
-  //    constructed types
-  //
-public:
-  be_visitor_union_branch_public_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_branch_public_cs (void);
-  // destructor
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union_branch node
-
-  // =visit operations on all possible data types that a union_branch can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-};
-
-class be_visitor_union_branch_public_assign_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_union_branch_public_assign_cs
-  //
-  // = DESCRIPTION
-  //    This is used to generate the body of the assignment operator and the
-  //    copy constructor of the union class
-  //
-public:
-  be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_union_branch_public_assign_cs (void);
-  // destructor
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union_branch node
-
-};
-
-#endif // TAO_BE_VISITOR_UNION_BRANCH_H
diff --git a/TAO/TAO_IDL/docs/ANNOUNCEMENT b/TAO/TAO_IDL/docs/ANNOUNCEMENT
deleted file mode 100644
index 870db6f6006..00000000000
--- a/TAO/TAO_IDL/docs/ANNOUNCEMENT
+++ /dev/null
@@ -1,131 +0,0 @@
-WHAT:
-
-SunSoft, Inc., Mountain View, California, has placed the source code to
-Project DOE's Interface Definition Language (IDL) compiler front end
-(CFE) on OMG's file server, making the implementation publicly
-available. This release is identified by the version number 1.3.
-
-Project DOE is SunSoft's corporate-wide development effort to integrate
-distributed object technology into the Solaris O/S.  OMG (Object Management
-Group) is the industry wide body formed to create specifications for
-distributed object technology. It currently has more than 370 members. OMG
-IDL is part of OMG's CORBA 1.1 specification and provides a standardized
-way for defining object interfaces. OMG IDL forms the basis for distributed
-object interactionin Project DOE.
-
-The SunSoft OMG IDL CFE provides a complete framework for building
-CORBA 1.1-compliant preprocessors for OMG IDL.  By using this standard
-implementation, developers of OMG IDL compilers will save many months
-of work and enhance the portability and interoperability of OMG
-IDL-interfaced objects.
-
-The SunSoft OMG IDL CFE allows convenient and fast integration of new back
-ends to the compiler.  The release consists of a front end which converts
-OMG IDL to an intermediate format, a compiler framework driver, an example
-implementation of a compiler back end, and a set of protocols for
-interaction between the front and back ends.  The SunSoft OMG IDL CFE
-parser uses components generated by yacc and lex.
-
-The SunSoft OMG IDL CFE is designed to allow easy extension of OMG IDL
-without impacting existing back-end implementations.  As the CORBA
-specification evolves, any new updates to the IDE CFE will be placed
-by SunSoft on the OMG server.
-
-This release provides a directory with many examples of OMG IDL
-specifications to allow users to become familiar with the process of
-writing OMG IDL code.
-
-For more information send email to idl-cfe@sun.com.
-
-HOW:
-
-The SunSoft OMG IDL CFE is available at no charge through anonymous FTP
-in source form on the OMG file server, omg.org. Please retrieve the
-file OMG_IDL_CFE_1.3.tar.Z from the directory pub/OMG_IDL_CFE_1.3. Please
-let us know who you are if you retrieve the compiler front end using this
-method, by sending email to idl-cfe@sun.com.
-
-You can also retrieve the software by using the OMG mail server program.
-Send email with the subject 'help' to omg_idl@omg.org, and the mail server
-will respond with instructions on how to retrieve the software.
-
-WHEN:
-
-The SunSoft OMG IDL CFE is available now.
-
-CONTACT:
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send email to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-We ask that if you make extensions or modifications to this source release,
-please make these extensions available to others using the OMG IDL compiler
-front end, by sending the modified sources to the above email address. This
-will help us evaluate your extensions for inclusion in a future version. It
-also ensures your investment in these extensions when new versions of the
-CFE are released.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/BUG_REPORT b/TAO/TAO_IDL/docs/BUG_REPORT
deleted file mode 100644
index 28c34ae141d..00000000000
--- a/TAO/TAO_IDL/docs/BUG_REPORT
+++ /dev/null
@@ -1,144 +0,0 @@
-OMG IDL COMPILER FRONT END PROBLEM REPORT FORM
--============================================-
-
-Checklist: Did you:
-- include configuration information?
-- include compiler version number (use -V to obtain)?
-- include script of run?
-- include IDL file causing problem?
-- make any changes to the CFE? If so, did you include a diff against
-  original version?
-
-PLEASE SEND THE COMPLETED BUG REPORT TO: idl-cfe@sun.com.
-
-THANK YOU FOR REPORTING THIS PROBLEM! THROUGH YOUR COLLABORATION, SUNSOFT
-WILL BE ABLE TO IMPROVE THE FUNCTIONALITY OF THIS PRODUCT. RECEIPT OF BUG
-REPORTS WILL BE ACKNOWLEDGED BUT NO OBLIGATION IS UNDERTAKEN BY SUNSOFT TO
-CORRECT THE REPORTED PROBLEM. SEE YOUR COPYRIGHT AND LICENSE INFORMATION.
-
-
-CONFIGURATION INFORMATION (describe your hardware platform, operating
-system and which compilers you used to compile the CFE):
-
-
-
-
-
-
-COMPILER VERSION INFORMATION (include output from idl -V here):
-
-
-
-
-
-
-
-PROBLEM DESCRIPTION (describe problem, include script if available):
-
-
-
-
-
-
-
-
-IDL INPUT CAUSING PROBLEM (include IDL input causing problem):
-
-
-
-
-
-
-
-
-
-DID YOU MAKE ANY CHANGES TO THE CFE? [Y] _ [N] _
-IF YES, INCLUDE A DIF OF YOUR VERSION AGAINST ORIGINAL VERSION:
-
-
-
-
-
-
-
-
-
-PROPOSED FIX (if you believe you know the cause of the problem, please
-include a proposed change to the software to correct it):
-
-
-
-
-
-
-
-
-ANY OTHER RELEVANT INPUT (include here any other information you believe
-may be relevant to the resolution of the problem you described):
-
-
-
-
-
-
-PLEASE SEND THIS PROBLEM REPORT TO idl-cfe@sun.com.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/CHANGES b/TAO/TAO_IDL/docs/CHANGES
deleted file mode 100644
index ae6fca7bcea..00000000000
--- a/TAO/TAO_IDL/docs/CHANGES
+++ /dev/null
@@ -1,122 +0,0 @@
-CHANGES WHICH AFFECT BE WRITERS
--=============================-
-
-INTRODUCTION
-
-This file describes changes that affect BE writers. It contains IMPORTANT
-INFORMATION for BE writers who wish to migrate a BE written to operate with
-release 1.2 to operate with release 1.3. It is likely that not following
-these instructions will result in a compilable but malfunctioning compiler.
-
-AST INHERITANCE CHANGES
-
-The AST has been reorganized so that AST_Union and AST_Exception now
-inherit from AST_Structure. This means that constructors of BE classes
-which inherit from AST_Union or AST_Exception now need to explicitly call
-an initializer for AST_Structure in their init section.
-
-We repeat below the information given in the file WRITING_A_BE, in the
-section entitled "WRITING A BE".
-
-AST_EXCEPTION
-
-The signature for constructors of classes inheriting from AST_Exception
-should now be:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-
-AST_UNION
-
-The signature for constructors of classes inheriting from AST_Union should
-now be:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-
-IDL_BOOL TYPE
-
-To increase portability and reduce dependency of the sources on POSIX
-compliance in targets of ports, IDL now provides its own boolean type which
-is named idl_bool. It provides two truth values, I_TRUE and I_FALSE.
-
-UTL_SCOPEDNAME TYPE
-
-The UTL_ScopedName type is now a list of Identifier nodes; in previous
-releases it used to be a list of String nodes. If your BE constructs scoped
-names this change will prevent recompilation until you modify your
-constructor calls to invoke constructors for Identifier instead of for
-String. The signature of the constructor is:
-
-	Identifier::Identifier(char *, long x=1, long y=0, long z=I_FALSE)
-
-The additional arguments which can be defaulted to the values indicated are
-included for future use.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/CLI b/TAO/TAO_IDL/docs/CLI
deleted file mode 100644
index a61c2bae365..00000000000
--- a/TAO/TAO_IDL/docs/CLI
+++ /dev/null
@@ -1,187 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END: COMMAND LINE INTERFACE
--==========================================================================-
-
-INTRODUCTION
-
-This document describes general OMG Interface Definition Language compiler
-command line options. Options that are specific to a given back end, object
-adapter or language are not described here. These should be described in a
-document detailing the interface implemented by each specific back end.
-
-OMG INTERFACE DEFINITION LANGUAGE COMMAND LINE OPTIONS
-
-OMG Interface Definition Language compiler options are described below.
-Unless otherwise noted, only one occurrence of each option is allowed.
-The following conventions are used
-
-- Text in '[..]' is optional.
-- Text followed by '*' can be repeated zero or more times.
-- Text followed by '+' can be repeated once or more times.
-- '{' and '}' are used to group text to cause '+' or '*' to apply to
-  the entire grouped text.
-- 'aa|bb' means either 'aa' or 'bb'.
-
-COMMAND LINE SUMMARY
-
-	idl [flag | file-name]*
-
-Flags are command line words that start with a '-'. All other command line
-words are assumed to be file names. If no file names are given, input is
-taken from stdin.
-
-COMMAND LINE FLAGS
-
--A[xyz]	A local escape. This can be used to specify additional options that
-	are specific to a given implementation. More than one -A option is
-	allowed
-
--Dname[=value]
-	Defines name and an optional value to be passed to a compliant C++
-	preprocessor, as if by #define. White space between the -D option
-	and the name is optional. More than one -D option is allowed.
-
--d	If no parse errors were found, prints out a representation of the
-	IDL input to stderr.
-
--E	Runs the C++ preprocessor on the OMG Interface Definition Language
-	input and sends the result to the standard output.
-
--Idirectory
-	Causes directory to be added to the search path for include files.
-	More than one -I option is allowed. This option is processed by a
-	compliant C++ preprocessor.
-
--Uname	Undefines name, as if by #undef. White space between the -U option
-	and the name is optional. More than one -U option is allowed.
-
--V	Causes the version information of the CFE to be displayed. No other
-	work is done, regardless of any other options.
-
--W[b|p][,arg]+
-	Hands off the arguments supplied to a specific portion of the OMG
-	Interface Definition Language compiler:
-
-	- -Wb arguments are handed to the loaded back end
-	- -Wp arguments are handed to a compliant C++ preprocessor
-
--Yp,pathname
-	Specifies an alternate path for finding a C++ compliant
-	preprocessor. Specifiers other than 'p' may be defined in future
-	versions of the CFE. More than one -Y option may appear. The last
-	one specifying each component takes effect.
-
-	This option exists but currently does nothing. Instead, we use the
-	preprocessing facilities provided by invoking CC -E always.
-
--bback_end
-	Causes the CFE to use a different compiler back end than the
-	default one (if dynamic loading is supported). Legal values for
-	this option and the default value are implementation specific.
-
--u	Prints a usage message from the CFE. All possible options are
-	shown. No other work is done regardless of any other options.
-
--v	Causes the CFE to produce informational output as the various
-	phases of the compiler execute.
-
--w	Suppresses IDL compiler warning messages.
-
-
-WHITESPACE
-
-All option arguments may be separated from their option letter by
-whitespace. For example, -D FOO is equivalent to -DFOO.
-
-UNKNOWN OPTIONS
-
-If an unknown option is passed to the CFE, the offending option is
-displayed to the user together with a usage message, and no compilation is
-performed.
-
-PASSING OPTIONS TO COMPILER PHASES
-
-The order in which options appear on the command line is preserved when
-they are passed to various compiler phases.
-
-MUTUALLY EXCLUSIVE OPTION COMBINATIONS
-
-Mutually exclusive or ambiguous option combinations are resolved by using
-the option that appears later on the command line. For example,
-
-    -DFOO -UFOO
-
-has no effect and leaves FOO undefined for the preprocessor.
-
-OPTION SCOPE
-
-All options are in effect for the entire IDL compilation run. If multiple
-IDL source file names are given on the command line, all options apply to
-each file. If different IDL source files require different sets of options
-for successfull compilation, they must be compiled separately.
-
-EXIT STATUS
-
-IDL Compilers exit with status equal to zero for successfull compilations.
-If errors were found by the CFE, the exit status is a count of the errors.
-The exit status for unsuccessfull compilations aborted by BEs is defined by
-each BE.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/COPYRIGHT b/TAO/TAO_IDL/docs/COPYRIGHT
deleted file mode 100644
index 461ad949518..00000000000
--- a/TAO/TAO_IDL/docs/COPYRIGHT
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/INSTALL b/TAO/TAO_IDL/docs/INSTALL
deleted file mode 100644
index 6fcaa710042..00000000000
--- a/TAO/TAO_IDL/docs/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-INTERFACE DEFINITION LANGUAGE INSTALLATION GUIDE
--==============================================-
-
-INTRODUCTION
-
-This file describes the installation process for OMG_IDL_CFE version 1.3.
-This file explains how to:
-
-- install the source code
-- modify the sources to customize them for different configurations
-- modify the sources to implement your own back end
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is believed to operate correctly on:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-This is the first release of OMG IDL CFE which is preconfigured to compile
-correctly for Solaris 2.x and with SunPro SparcWorks compilers.
-
-CUSTOMIZATION
-
-The release contains a file idl_make_vars in the current directory, which
-is included in each Makefile. This file defines all the customizable
-variables for the CFE.
-
-OSV should be set to a string denoting the operating system upon which you
-wish to build the CFE. The CFE as shipped is preconfigured to compile
-correctly on Solaris 2.x (OSV=SOLARIS2), and has also been tested on SunOS
-4.1.x (OSV=SUNOS4). It contains code donated by HP which enables it to be
-compiled on Apollo Domain systems (OSV=apollo) and HPUX systems (OSV=hpux),
-but these two configurations have not been tested.
-
-C++ and CCC should be set to identify the C++ compiler you will use to
-compile this release. Their values should be identical. Both are set to
-address differences between various make programs - some predefine CCC,
-others use C++ to denote the C++ compiler. The possible values are CC
-(which uses the Sparcworks compilers on SunOS 4.1 and Solaris 2.3) and g++,
-which uses the installed version of GNU C++.
-
-CCFLAGS should be set to a list of flags to pass to the C++ compiler. As
-shipped, this list is -g. NOTE: We have not extensively tested the release
-with optimization turned on.
-
-CPP_FLAGS should be set to a list of flags to pass to the C++ preprocessor.
-Use this variable to enable or disable specific customizations you make to
-the BE or CFE sources.
-
-YFLAGS should be set to a list of flags to pass to the Yacc program. As
-shipped, the list is -d -t, which causes Yacc to generate y.tab.h and
-y.tab.c files.
-
-LEXFLAGS should be set to a list of flags to pass to the Lex program. As
-shipped, the list -t.
-
-RANLIB should be set to the location of the ranlib program on your system.
-As shipped this is ranlib. If your system has no ranlib you can set this
-variable to ':' or /bin/true. As shipped the variable is preset to
-/bin/true since Solaris 2.x does not use ranlib.
-
-AR should be set to the location of the ar program on your system. As
-shipped this is ar. If your system has a different mechanism for creating
-libraries, you should modify the value of this variable accordingly.
-
-ARFLAGS should be set to the flags to be passed to the ar program. As
-shipped this is 'crv'.
-
-INSTALLATION
-
-a. Disk space requirements
-
-This distribution requires approximately 350 KBytes when compressed. When
-uncompressed, untarred and compiled, approximately 10 MBytes of disk space
-are consumed on a Sun 4.
-
-b. Getting the software
-
-Use anonymous FTP to omg.org and supply your e-mail address as password.
-Change directories to pub/OMG_IDL_CFE_1.3, set bin and get the compressed
-tar file OMG_IDL_CFE_1.3.tar.Z.
-
-The distribution may, in the future, be made available from other archives
-on the Internet. However, omg.org will always have the most up-to-date
-version of this software.
-
-After transferring this file, uncompress it and untar it in a directory of
-your choice.
-
-c. Compiling it
-
-If you are using a Sparcstation running Solaris 2.x and have the SunPro
-Sparcworks compilers installed, you may directly install the software. If
-your hardware or operating system configurations are different, read and
-follow the instructions in the previous section first.
-
-At the root directory of the release, issue
-
-   % make
-
-or
-
-   % make all
-
-This will compile the provided sources and the sources found in the be
-directory. Executing this make target causes 'make all' to be invoked in
-each subdirectory, resulting in building the libraries for each component
-and finally a link step producing an executable IDL compiler.
-
-In order to make only the compiler front end components, without compiling
-the sources found in the be directory and without building an executable,
-issue
-
-  % make libs
-
-This will build the libraries in the ast, fe, util, driver and narrow
-directories. To build only the be, issue
-
-  % make be
-
-To build all libraries without creating an executable, issue
-
-  % make all_libs
-
-To remove all files created by the build process, issue
-
-  % make clean
-
-This will not remove any files created by Yacc and Lex, because you may be
-using the ones provided in the distribution (see below).
-
-d. Yacc and Lex
-
-Some installations may not have a C++ aware Yacc and Lex processor. For
-these installations, we have included the output of yacc and lex in the
-release. If you need to use these files to build the release because you
-don't have access to a C++ capable Yacc or Lex, go to the "fe" directory,
-issue the command:
-
-   % touch lex.yy.cc y.tab.cc y.tab.hh
-
-This will ensure that the processed files appear to be newer than the
-source files they were produced from and will cause "make" to skip their
-production.
-
-NOTE: The files provided in the distribution have been produced on Solaris
-2.3 and may contain OS-specific #include directives. If you intend to use
-these files, you may have to edit them to make them work in your
-environment. The provided files are known to compile cleanly without
-modification with both SunPro Sparcworks compilers and GNU C++ on both
-SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and lexer input
-files with bison or flex.
-
-IMPLEMENTING A BACK END
-
-To implement your own back end, you can start with the provided sources in
-the be directory and modify them. The Makefile understands the 'make all'
-target and will generate libbe.a in the demo_be directory. As set up, the
-variable CPP_FLAGS allows you to place include files either in the current
-directory or in the include directory. Alternatively, you can place your
-include files in a new directory and modify CPP_FLAGS to cause the C++
-preprocessor to search this new directory for referenced include files, by
-adding a new -I directive.
-
-Additional detail on the structure and function of back ends, and on the
-protocol which a back end must implement, are found in the document
-entitled WRITING_A_BE.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/PROBLEMS b/TAO/TAO_IDL/docs/PROBLEMS
deleted file mode 100644
index 65cfb6a1893..00000000000
--- a/TAO/TAO_IDL/docs/PROBLEMS
+++ /dev/null
@@ -1,132 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END: KNOWN PROBLEMS
--==================================================================-
-
-INTRODUCTION
-
-This file describes what configurations are known to work correctly with
-this release, and what are the known problems with this release as shipped.
-Comments about future possible enhancements do not imply a commitment on
-the part of Sun or any of its subsidiaries to produce these enhancements.
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is known to operate correctly on:
-
-- Sparcstation 2 running SunOS 4.1.2, when compiled with SparcWorks 3.0
-- Sparcstation 10 running Solaris 2.3, when compiled with SparcWorks 3.0.1
-- Sparcstation 10 running Solaris 2.3, when compiled with SparcWorks 4.0
-
-We are aware of a bug in GNU C++ (the latest version we tested was 2.5)
-which causes up-casting (changing the type of an instance from a base class
-to a more derived class, also known as "narrowing") to fail or cause a
-program crash.
-
-PROBLEMS:
-
-This is a list of known problems with the current version of the CFE:
-
-- The following syntax, although legal, is not accepted by the CFE:
-
-  .. sequence <string <10>> ..
-
-  This causes a parse error. The cause of this problem is that the '>>' is
-  read as a right shif operater and not as two '>'s. You can avoid this
-  problem by instead writing
-
-  .. sequence <string <10> > ..
-
-- The following syntax, although legal, is not accepted by the CFE:
-
-  const string foo = "abc" " and" " another" " string";
-
-  Instead, write:
-
-  const string foo = "abc and another string";
-
-- The printout produced by the -d option for dumping the AST is not always
-  perfect. Specifically, dumping of sequences and arrays is deficient.
-
-POSSIBLE FUTURE ENHANCEMENTS:
-
-This is a list of areas in which the code of the CFE may change in future
-releases:
-
-- The current release is restricted in its use of C++ because it must
-  be possible to compile it using C++ 2.1. However, we have also provided
-  files that depend on features which are only present in C++ 3.0, such as
-  templates. If your compiler supports templates and you wish to use them,
-  copy the files in include/utl_tmpl to include, and copy the files in
-  util/utl_tmpl to util. You will also need to make compiler dependent
-  modifications to Makefiles throughout the CFE directory hierarchy to
-  enable the use of templates.
-
-  The code using templates was donated by Steve Vinoski of HP.
-
-  In a future release of the CFE only the template code may be included,
-  and hence users will need to use a C++ 3.0 or higher compiler.
-
-- The UTL_list classes defined in the util directory are rudimentary. More
-  features may be added to make the functionality richer.
-
-- The UTL_String class may be rewritten or replaced by a standard ANSI C++
-  String implementation. Applications will be shielded from this change.
-
-COPYRIGHT:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/README b/TAO/TAO_IDL/docs/README
deleted file mode 100644
index 6d73554acce..00000000000
--- a/TAO/TAO_IDL/docs/README
+++ /dev/null
@@ -1,233 +0,0 @@
-INTERFACE DEFINITION LANGUAGE COMPILER FRONT END
--==============================================-
-
-INTRODUCTION
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language! This is Release 1.3 of the CFE.
-
-The Interface Definition Language (IDL) implementation is divided into
-three parts:
-
-- A main program for driving the compilation process
-- A parser and attendant utilities
-- One or more back ends (BEs) for taking the processed input and producing
-  output in a target language and target format
-
-WARNINGS
-
-This is a preliminary version. This software is made available AS IS and
-WITH NO GUARANTEES. Please read  the copyright notice attached at the
-bottom of this file.
-
-IMPORTANT NOTICE FOR USERS OF OMG IDL CFE VERSION 1.2.
-
-Please carefully read the file CHANGES to obtain IMPORTANT INFORMATION on
-changes in that may affect the manner in which a BE is constructed. You
-must follow instructions contained in the file CHANGES to obtain a
-functional BE if you are migrating an existing BE from OMG IDL CFE v. 1.2.
-
-TARGET AUDIENCE
-
-Who should use this release?
-
-- You can use this source release to create a stand alone parser for OMG
-  Interface Definition Language. This may be useful to verify the legality
-  of IDL input.
-- Developers of OMG Interface Definition Language compilers should use this
-  release as a basis for writing their back ends, to obtain a common
-  framework for their compiler and to provide portable and uniform
-  parsing of IDL input.
-
-HOW TO OBTAIN THIS SOFTWARE
-
-Please use anonymous FTP to omg.org and supply your e-mail address as the
-password. Then change directories to pub/OMG_IDL_CFE_1.3, set binary transfer
-and get the file OMG_IDL_CFE_1.3.TAR.Z. This file includes copies of all
-individual documentation files in the directory.
-
-Precompiled binaries constructed from the sources in this release will be
-made available shortly, in the directory pub/OMG_IDL_CFE_1.3/bin. These
-binaries are useful for parsing IDL source and for learning about the
-language. Precompiled binaries for Solaris 2.x and for SunOS 4.x will be
-provided.
-
-You can also use the mail server program to retrieve this software. Send
-email with the subject 'help' to omg_idl@omg.org, and the mail server will
-respond with instructions on how to retrieve the software.
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to this newsgroup announcing its availability.
-
-Finally, the SunSoft OMG IDL CFE is also available on magnetic tape for a
-nominal media charge directly from SunSoft. Please refer to part number
-DIDL-100-STP when ordering.
-
-CONTACT POINT
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-WHAT IS PROVIDED IN THE RELEASE
-
-Provided in this release are:
-
-- A main program for driving an Interface Definition Language compiler
-- A parser for the Interface Definition Language grammar which builds an
-  internal representation of the input parsed. This internal
-  representation, named an Abstract Syntax Tree (AST), is used as input to
-  a back end
-- Some utility functions used by the parser
-- A demonstration back end (BE) which exercises the front end but produces
-  no translated output
-- Documentation of the public interfaces and of the contract between
-  the compiler front end and a back end
-
-OPERATION
-
-A complete compiler operates in two passes:
-
-- The first pass, provided in this release, parses the IDL input and
-  produces an internal representation, called an Abstract Syntax Tree (AST).
-  This pass also does a complete syntax and semantics check of the input
-  provided to ensure that exactly legal IDL input is accepted. If a syntax
-  or semantic error is discovered, the second pass is not invoked.
-- The second pass, provided by compiler developers, takes the AST and
-  produces output in the language and format of choice. A demonstration
-  back end is provided in the release.
-
-HOW TO USE THIS SOFTWARE
-
-To create a complete compiler from OMG Interface Definition Language to a
-target language, compiler developers will:
-
-- Write a back end (BE) to take the internal representation of the input
-  parsed and translate it to the target language and format. You will
-  probably want to replace the BE directory in this source tree with your
-  own BE directory
-- Link the BE with the sources provided here to produce a complete
-  compiler.
-
-DOCUMENTATION
-
-The OMG Interface Definition Language is fully described in the CORBA
-documentation, Chapter 4. This document may be obtained from OMG.
-
-This release also provides the following documents:
-
-- This README file, describing the release
-- INSTALL, describing installation of the software
-- WRITING_A_BE contains all the information needed to start writing a back
-  end for this distribution
-- CHANGES_IN_AST describes changes that affect migration of BEs written
-  against version 1.2 to version 1.3.
-- CLI, describing the command line interface to the CFE
-- ROADMAP, describing the directory structure for the source code. This
-  file will assist a developer in understanding the structure of the code
-  and navigating it
-- PROBLEMS, describing a list of issues that may be addressed in future
-  releases
-- BUG_REPORT, containing a form for use in reporting bugs and problems
-  with the IDL CFE
-
-ENVIRONMENT
-
-The INSTALL file explains how to customize the software for specific
-platforms. The source distribution expects the following environment:
-
-- Sparcstation 1, 2, or 10 hardware
-- SunPro SparcWorks 3.x or 4.0
-
-As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to
-compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use
-is made of Sun Make-specific features, and the Makefiles should be usable
-with other make programs.
-
-This release has been tested and is believed to operate correctly with:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-INSTALLATION
-
-This release is targetted for Sun workstations running Solaris 2.x. The
-process of installing this software is described in detail in the file
-INSTALL in this directory. The INSTALL file also describes how to customize
-the release for your own environment if it is different.
-
-KNOWN PROBLEMS
-
-A list of known deficiencies is provided in the file PROBLEMS in this
-directory. If you find a problem which is not mentioned in it, please
-report it as described below. Please read this file now to be apprised of
-the problems found so far with this release.
-
-COPYRIGHT
-
-This copyright notice appears on all files. Please read it!
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/ROADMAP b/TAO/TAO_IDL/docs/ROADMAP
deleted file mode 100644
index 5da0d83823c..00000000000
--- a/TAO/TAO_IDL/docs/ROADMAP
+++ /dev/null
@@ -1,126 +0,0 @@
-INTERFACE DEFINITION LANGUAGE SOURCE TREE ROADMAP
--===============================================-
-
-INTRODUCTION
-
-This file provides an overview of the directory structure of the sources
-for the compiler front end for OMG Interface Definition Language. This will
-be of use in understanding the source structure and will aid developers of
-BEs.
-
-DIRECTORIES
-
-The following directories are present:
-
-- idl_specs:  Contains many examples of IDL specifications, including the
-	      IDL specifications of several Object Services, and several
-	      files that somewhat exhaustively test features of the IDL
-	      language
-- include:    Contains all include (".hh") files
-- ast:	      Contains implementations for all classes comprising
-	      the AST internal representation of the input parsed
-- fe:	      Contains the Yacc grammar and Lex specification for
-	      the OMG Interface Definition Language, and some utilities
-- driver:     Contains the main program which drives the compilation
-	      process
-- util:	      Contains utility classes used throughout the CFE. These
-	      classes may also be of use in writing a BE
-- narrow:     Contains an implementation of a narrowing mechanism used
-	      in the CFE. Since C++ does not provide compiler support
-	      for narrowing, this is provided as an explicit service
-- demo_be:    Contains a demonstration back end which subclasses all
-	      the AST classes but adds no functionality
-
-NAMING CONVENTIONS
-
-The file names start with two or three characters identifying the component
-to which they belong:
-
-- idl_:	      This is the prefix for all files which contain global
-	      elements of the CFE
-- ast_:	      This is the prefix for all files containing implementations
-	      or definitions of the AST
-- fe_:	      This is the prefix for all files belonging to the parser
-- drv_:	      This is the prefix for all files belonging to the compiler
-	      driver
-- utl_:	      This prefix is used to identify files belonging to the set of
-	      utlities provided with the CFE
-- nr_:	      This prefix identifies files belonging to the narrowing mechanim
-- be_:	      This is the prefix for all files belonging to the back end
-
-All C++ files use the ".cc" extension, and all include files have the ".hh"
-extension. All make files are named Makefile. Each directory contains a
-make file. Lex input files have the ".ll" extension, and Yacc input files
-use the ".yy" extension. All files containing IDL specifications have a
-name ending with the ".idl" suffix.
-
-INCLUDE FILE HIERARCHY
-
-There are two main include files which must be included in all source
-files. These are idl.hh and idl_extern.hh. The idl.hh file includes the
-definitions for all the facilities provided by the CFE. The idl_extern.hh
-file declares globally accessible data and exported application programmer
-interface entry points.
-
-Each component has an include file for its own. Back end writers will want
-to modify be.hh and possibly be_extern.hh.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/WRITING_A_BE b/TAO/TAO_IDL/docs/WRITING_A_BE
deleted file mode 100644
index 5c3c069f7a1..00000000000
--- a/TAO/TAO_IDL/docs/WRITING_A_BE
+++ /dev/null
@@ -1,1350 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END PROTOCOLS
-==============================================================
-
-INTRODUCTION
-------------
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language!
-
-This document explains how to use the release to create a fully functional
-OMG Interface Definition Language to target language compiler for your
-selected target system configuration. The section OVERVIEW explains this
-document's structure.
-
-CONTEXT
--------
-
-The implementation has three parts:
-
-1. A main program driving the compilation process
-2. A parser and attendant utilities for converting the IDL input into
-   an internal form
-3. One or more back ends which take as input the internal form representing
-   the IDL input, and which produce output in a target language and target
-   format
-
-The release contains components 1 and 2, and a demonstration implementation
-of component 3. To use this release, you
-
-- write a back end which takes the internal representation of the parsed input
-  and translates it to the target language and format. You may replace or
-  modify the demonstration back end provided.
-- link the back end with the provided main program and parser sources
-  to produce a complete compiler.
-
-OVERVIEW
---------
-
-This document does not explain IDL nor does it introduce IDL features. 
-For this information, refer to the OMG CORBA specification, available by
-anonymous FTP from omg.org.
-
-This document does not explain C++, except to demonstrate how it is
-used to construct the CFE. The ARM by Stroustrup and Ellis provides a
-thorough explanation of C++.
-
-This document consists of two independent parts. The first part
-s all CFE supported protocols and the required
-application programmer's interface entry points that a conformant 
-BE must provide. The second part steps through the process of
-constructing a working BE.
-
-The first part describes:
-
-- The compilation process
-- The Abstract Syntax Tree (AST) internal representation of parsed IDL
-  input
-- How access to member data fields is managed
-- How the AST is generated from the IDL input (Generator protocol)
-- How definition scopes are nested and how name lookup works
-- The narrowing mechanism
-- How definition scopes are managed and how nodes are added to scopes
-- How BEs get control during the AST construction process (Add protocol)
-- The inheritance scheme used by the AST and how it affects BEs
-- How errors are handled and reported
-- How the CFE is initialized
-- How the command line arguments are parsed
-- What global variables and functions are provided
-- What API is required to be supported by a BE in order to link
-  with the CFE
-- What files must be included in each BE file
-
-The second part describes
-
-- The API to be supplied by each BE
-- How to subclass from the AST to add BE specific functionality
-- How to subclass from the Generator protocol to create BE specific
-  extended AST nodes
-- How to write constructors for the derived BE classes
-- How to use the Add protocol to store BE specific information
-- How to maintain BE specific information which applies to the entire
-  AST generated from the IDL input
-- How to use data members in your BE
-- How to build a complete compiler
-
-PART I. FEATURES OF THE CFE
--=========================-
-
-THE COMPILATION PROCESS
------------------------
-
-The OMG IDL compiler operates as follows:
-
-- Parses command line arguments. If an option is directed at a
-  BE, an appropriate operation provided by the BE is invoked to process
-  the option.
-- Performs global initialization.
-- Forks a copy of the compiler for each file specified as input.
-- An ANSI-compatible preprocessor preprocesses the IDL input.
-- Parses the file using the CFE parser, and constructs an AST describing the
-  IDL input.
-- Prints the AST for verification, if requested.
-- Invokes the BE to process the AST and produce the output
-  characteristic of that BE.
-
-ABSTRACT SYNTAX TREE
---------------------
-
-The AST (Abstract Syntax Tree) is the primary mechanism for communication
-between a BE and the CFE. It consists of a tree of instances of classes
-defined in the CFE or refinements of those classes as defined in a BE.
-The class hierarchy of the AST closely resembles the structure of the IDL
-syntax. Most AST classes have direct equivalents in IDL constructs.
-
-The UTL_Scope class defines common functionality for definition scope
-management and name lookup. This is explained in a following section.
-UTL_Scope is defined in include/utl_scope.hh and implemented in
-util/utl_scope.cc.
-
-The AST provides the following classes:
-
-AST_Decl	    Base of the AST class hierarchy. Each class in the AST
-		    inherits from AST_Decl. Defined in include/ast_decl.hh
-		    and implemented in ast/ast_decl.cc
-
-AST_Type	    Common base class for all classes which represent IDL
-		    type constructs. Defined in include/ast_type.hh and
-		    implemented in ast/ast_type.cc. Inherits from AST_Decl.
-
-AST_ConcreteType    Common base class for all classes which represent IDL
-		    types other than interfaces. Defined in the file
-		    include/ast_concrete_type.hh and implemented in
-		    ast/ast_concrete_type.cc. Inherits from AST_Type.
-
-AST_PredefinedType  Instances of this class represent all predefined types
-		    such as long, char and so forth. Defined in the file
-		    include/ast_predefined_type.hh and implemented in
-		    ast/ast_predefined_type.cc. Inherits from
-		    AST_ConcreteType.
-
-AST_Module	    Represents the IDL module construct. Defined in the
-		    file include/ast_module.hh and implemented in
-		    ast/ast_module.cc. Inherits from AST_Decl and
-		    UTL_Scope.
-
-AST_Root	    Represents the root of the abstract syntax tree being
-		    constructed. Is a subclass of AST_Module. Can be
-		    subclassed in BEs to store information associated with
-		    the entire AST. Defined in the file include/ast_root.hh
-		    and implemented in ast/ast_root.cc. Inherits from
-		    AST_Module.
-
-AST_Interface	    Represents the IDL interface construct. Defined in
-		    include/ast_interface.hh and implemented in the file
-		    ast/ast_interface.cc. Inherits from AST_Type and
-		    UTL_Scope.
-
-AST_InterfaceFwd    Represents a forward declaration of an IDL interface.
-		    Defined in include/ast_interface_fwd.hh and implemented
-		    in ast/ast_interface_fwd.cc. Inherits from AST_Decl.
-
-AST_Attribute	    Represents an IDL attribute construct. Defined in
-		    include/ast_attribute.hh and implemented in the file
-		    ast/ast_attribute.cc. Inherits from AST_Decl.
-
-AST_Exception	    Represents an IDL exception construct. Defined in
-		    include/ast_exception.hh and implemented in the file
-		    ast/ast_exception.cc. Inherits from AST_Decl.
-
-AST_Structure	    Represents an IDL struct construct. Defined in the file
-		    include/ast_structure.hh and implemented in the file
-		    ast/ast_structure.cc. Inherits from AST_ConcreteType
-		    and UTL_Scope.
-
-AST_Field	    Represents a field in an IDL struct or exception
-		    construct. Defined in include/ast_field.hh and
-		    implemented in ast/ast_field.cc. Inherits from
-		    AST_Decl.
-
-AST_Operation	    Represents an IDL operation construct. Defined in the
-		    file include/ast_operation.hh and implemented in
-		    ast/ast_operation.cc. Inherits from AST_Decl and
-		    UTL_Scope.
-
-AST_Argument	    Represents an argument to an IDL operation construct.
-		    Defined in include/ast_argument.hh and implemented in
-		    ast/ast_argument.cc. Inherits from AST_Field.
-
-AST_Union	    Represents an IDL union construct. Defined in
-		    include/ast_union.hh and implemented in
-		    ast/ast_union.cc. Inherits from AST_ConcreteType and
-		    from UTL_Scope.
-
-AST_UnionBranch	    Represents an individual branch in an IDL union
-		    construct. Defined in include/ast_union_branch.hh and
-		    implemented in ast/ast_union_branch.cc. Inherits from
-		    AST_Field.
-
-AST_UnionLabel	    Represents the label of an individual branch in an IDL
-		    union construct. Defined in include/ast_union_label.hh
-		    and implemented in ast/ast_union_label.cc
-
-AST_Constant	    Represents an IDL constant construct. Defined in
-		    include/ast_constant.hh and implemented in the file
-		    ast/ast_constant.cc. Inherits from AST_Decl.
-
-AST_Enum	    Represents an IDL enum construct. Defined in the file
-		    include/ast_enum.hh and implemented in ast/ast_enum.cc.
-		    Inherits from AST_ConcreteType and UTL_Scope.
-
-AST_EnumVal	    Represents an enumerator in an IDL enum construct.
-		    Defined in include/ast_enum_val.hh and implemented in
-		    ast/ast_enum_val.cc. Inherits from AST_Constant.
-
-AST_Sequence	    Represents an IDL sequence construct. Defined in
-		    include/ast_sequence.hh and implemented in
-		    ast/ast_sequence.cc. Inherits from AST_Decl.
-
-AST_String	    Represents an IDL string construct. Defined in the file
-		    include/ast_string.hh and implemented in
-		    ast/ast_string.cc. Inherits from AST_Decl.
-
-AST_Array	    Represents an array modifier to the type of an IDL
-		    field or typedef declaration. Defined in the file
-		    include/ast_array.hh and implemented in
-		    ast/ast_array.cc. Inherits from AST_Decl.
-
-AST_Typedef	    Represents an IDL typedef construct. Defined in the file
-		    include/ast_typedef.hh and implemented in
-		    ast/ast_typedef.cc. Inherits from AST_Decl.
-
-AST_Expression	    Represents an IDL expression. Defined in the file
-		    include/ast_expression.hh and implemented in
-		    ast/ast_expression.cc.
-
-AST_Root	    A subclass of AST_Module, an instance of this class
-		    is used to represent the distinguished root node of
-		    the AST. Defined in include/ast_root.hh and implemented
-		    in ast/ast_root.cc. Inherits from AST_Module.
-
-
-USING INSTANCE DATA
--------------------
-
-The AST classes define member data fields in addition to defining
-operations on instances. These member data fields are all private, to allow
-only the instance in which they are stored direct access. Other objects
-(including other instances of the same class) can obtain access to the
-member data fields of an instance through accessor functions. These
-accessor functions allow retrieval of the data, and in some cases update
-functions are also provided to store new values.
-
-There are several reasons why this approach is taken. First, it hides the
-actual implementation of the member data fields from outside the class. For
-example, a Thermometer class would not expose whether its temperature
-reading is stored in Farenheit or Celsius units, and it could allow access
-through either unit method.
-
-Second, protecting access to member data in this manner restricts the
-ability to update it to the instance itself, save where update functions
-are explicitly provided. This makes for more reliable implementations,
-since the manipulation of the data is isolated in the class implementation
-itself.
-
-Third, wrapping a function call around access to member data allows such
-access and update operations to be protected in a multithreaded
-environment. While the CFE itself is not multithreaded and the access
-operations as currently defined do no special work to protect against
-mutliple conflicting access operations, this may be changed in a future
-version. Moving the CFE to a multithreaded environment without protecting
-access to member data in this manner would be extremely difficult.
-
-The protocol defined in the CFE is that member data fields are all private
-and have names which start with the prefix "pd_" (denoting Private Data).
-The access functions have names which are the same as the name of the field
-sans the prefix. For example, AST_Decl has a field pd_defined_in and an
-access function defined_in().
-
-The update functions have names starting with "set_" followed by the name
-of the corresponding access function. Thus, AST_Decl defines a function
-set_in_main_file(boolean) which sets the pd_in_main_file data member's
-value to the boolean provided.
-
-GENERATION OF THE AST
----------------------
-
-The CFE generates the abstract syntax tree after parsing IDL
-input. The nodes of the AST are defined by classes introduced in the
-previous section, or by subclasses thereof as defined by each BE. In
-writing the CFE, we were faced with the following problem: how to generate
-the AST containing nodes of the derived classes as defined in each BE
-without knowledge of the types and conventions of these BE classes.
-
-One alternative was to define a naming scheme which predetermines the names
-of each subclass a BE can define. The AST would then be generated by
-calling an appropriate constructor on the BE derived class. This scheme
-suffers from some shortcomings:
-
-- It breaks the modularity of the compiler and imports knowledge about
-  types defined in a BE into the CFE, where this information does not belong.
-- It restricts a compiler to having only one BE loaded at a time because the
-  names of these classes can be in use in only one BE at a time.
-- It requires a BE to provide derived classes for all AST classes, even for
-  those classes where the BE adds no functionality.
-
-The mechanism we chose is different. We define the AST_Generator class
-which has an operation for each constructor defined on each AST class. The
-operation takes arguments appropriate to the constructor, invokes it and
-returns the created AST node, using the type known to the CFE. All such
-operations on the generator are declared virtual. The names of all
-operations start with "create_" and contain the name of the construct.
-Thus, an operation which invokes a constructor of an AST_Module is named
-create_module. AST_Generator is defined in include/ast_generator.hh and
-implemented in ast/ast_generator.cc.
-
-If a BE derives from any AST class, it must also derive from the
-AST_Generator class and redefine the relevant operations to invoke
-constructors of the BE provided class instead of the AST provided class.
-For example, if BE_Module is a subclass of AST_Module in a BE, the BE would
-also define BE_Generator and redefine create_module to call the constructor
-of BE_Module instead of that provided by AST_Module.
-
-During initialization, the CFE causes an instance of the BE derived
-generator to be created and saved. This is explained in the section on
-REQUIRED ENTRY POINTS SUPPLIED BY A BE. During parsing, actions in the Yacc
-grammar invoke operations on the saved instance to create new nodes for the
-AST as it is being built. These operations invoke constructors for BE
-derived classes or for AST provided classes if they were not overridden.
-
-DEFINITION SCOPES
------------------
-
-IDL is a nested scoped language. The scoping rules are defined by the CORBA
-spec and closely follow those of C++.
-
-Scope management is implemented in two classes provided in the utilities
-library, UTL_Scope and UTL_Stack. UTL_Scope manages associations between
-names and AST nodes, and UTL_Stack manages scope nesting and entry and exit
-from definition scopes as the parse is proceeding. UTL_Scope is defined in
-include/utl_scope.hh and implemented in util/utl_scope.cc. UTL_Stack is
-defined in include/utl_stack.hh and implemented in util/utl_stack.cc.
-
-During initialization, the CFE creates an instance of UTL_Stack and saves
-it. During parsing, as definition scopes are entered and exited, AST nodes
-are pushed onto, or popped from, the stack represented by the saved
-instances. Nodes on the stack are stored as instances of UTL_Scope. Section
-THE NARROWING MECHANISM explains how to obtain the real type of a node
-retrieved from the stack.
-
-All definition scopes are linked in a tree rooted in the distinguished AST
-root node. This linkage is implemented by UTL_Scope and AST_Decl. The
-linkage is a permanent record of the scope nesting while the stack is a
-dynamic record which at each instant represents the current state of the
-parse.
-
-The nesting information is used to do name lookup. IDL uses scoped names  
-which are concatenations of definition scope names ending with individual
-construct names. For example, in
-
-	  interface a {
-		    struct b {
-			   long c;
-		    };
-		    const long k = 23;
-		    struct s {
-			   long ar[k];
-		    };
-	   };
-
-the name a::b::c represents the long field in the struct b inside the
-interface a.
-
-Lookup is performed by searching down the linkage chain for the first component
-of the name, then, when found, recursively resolving the remaining
-components in the scope defined by the first component. Lookup is relative
-to the scope of use; in the above example, k could also have been referred to
-as a::k within the struct s.
-
-Nodes are stored in a definition scope as instances of AST_Decl. Thus, name
-lookup returns instances of AST_Decl. The next section, THE NARROWING
-MECHANISM, explains how to obtain the real type of a node retrieved from a
-definition scope.
-
-THE NARROWING MECHANISM
------------------------
-
-Here we give only a cursory explanation of how narrowing works. We
-concentrate on defining the problem and showing how to use our narrowing
-mechanism. The narrowing mechanism is defined in include/idl_narrow.hh.
-
-As explained above, nodes are stored on the scope stack as instances of
-UTL_Scope, and inside definition scopes as instances of AST_Decl. Also,
-nodes are linked in a nesting tree as instances of AST_Decl. Given a node
-retrieved from the stack or a definition scope, one is faced with the task
-of obtaining its real class. C++ does not currently provide an implicit
-mechanism for narrowing to a derived class, so the CFE defines its own
-mechanism. This mechanism requires some work on your part as BE implementor
-and requires some explicit code to be written when it is to be used.
-
-The class AST_Decl defines an enum whose members encode specific AST node
-classes. AST_Decl provides an accessor function, node_type(), which
-retrieves a member of the enum representing the AST type of the node. Thus,
-if an instance of AST_Decl really is an instance of AST_Module, the
-node_type() accessor returns AST_Decl::NT_module.
-
-The class UTL_Scope also provides an accessor function, scope_node_type(),
-which returns a member of the enum encoding the actual type of the node.
-Thus, given an UTL_Scope instance which is really an instance of
-AST_Operation, scope_node_type() would return AST_Decl::NT_op.
-
-Perusing the header files for classes provided by the AST, you will note
-the use of some macros defined in include/idl_narrow.hh. These macros
-define the explicit narrowing mechanism:
-
-DEF_NARROW_METHODSx(<class name>,<parent_x>) for x equal to 0,1,2 or 3,
-defines a narrowing method for the specified class which has 0,1,2 or 3
-immediate base classes from which it inherits. For example, ast_module.hh
-which defines AST_Module contains the following line:
-
-      DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-
-This is because AST_Module inherits directly from AST_Decl and UTL_Scope.
-
-DEF_NARROW_FROM_DECL(<class name>) appears in class definitions for classes
-which are derived from AST_Decl and which can be stored in a definition
-scope. This macro declares a static operation narrow_from_decl(AST_Decl *)
-on the class in which it appears. The operation returns the provided
-instance as an instance of <class name> if it can be narrowed, or NULL.
-
-DEF_NARROW_FROM_SCOPE(<class name>) appears in class definitions of classes
-which are derived from UTL_Scope and which can be stored on the scope
-stack. This macro declares a static operation narrow_from_scope(UTL_Scope *) 
-on the class in which it appears. The operation returns the provided
-instance as an instance of <class name> if it can be narrowed, or NULL.
-
-Now look in the files implementing these classes. You will note occurrences
-of the following macros:
-
-IMPL_NARROW_METHODSx(<class name>,<parent_x>) for x equal to 0,1,2 or 3,
-implements a narrowing method for the specified class which has 0,1,2 or 3
-immediate base classes from which it inherits. For example, ast_module.cc
-which implements AST_Module contains the following line:
-
-      IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-
-IMPL_NARROW_FROM_DECL(<class name>) implements a method to narrow from an
-instance of AST_Decl to an instance of <class name> as defined above.
-
-IMPL_NARROW_FROM_SCOPE(<class name>) implements a method to narrow from an
-instance of UTL_Scope to an instance of <class name> as defined above.
-
-To put it all together: In the file ast_module.hh, you will find:
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Module);
-  DEF_NARROW_FROM_SCOPE(AST_Module);
-
-In the file ast_module.cc, you will see:
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
-
-The CFE uses narrowing internally to obtain the correct type of nodes in
-the AST. The CFE contains many code fragments such as the following:
-
-	  AST_Decl *d = get_an_AST_Decl_from_somewhere();
-	  AST_Module *m;
-	  ...
-	  if (d->node_type() == AST_Decl::NT_module) {
-	    m = AST_Module::narrow(d);
-	    if (m == NULL) {	// Narrow failed
-	      ...
-	    } else {		// Success, do normal processing
-	      ...
-	    }
-	  }
-	  ...
-
-Similar code implements narrowing instances of UTL_Scope to their actual
-types.
-
-In your BE classes which derive from UTL_Scope you must include a line
-defining how to narrow from a scope, so:
-
-	 DEF_NARROW_FROM_SCOPE(<your BE class>)
-
-and similarly for your BE classes which derive from AST_Decl.
-
-The narrowing mechanism is defined only for narrowing from AST_Decl and
-UTL_Scope. If your BE class inherits directly from one or more classes
-which themselves are derived from AST_Decl and/or UTL_Scope, you must
-include a line
-
-	DEF_NARROW_METHODSx(<your class name>,<parent 1>,<parent 2>)
-
-To make this concrete, here is what you'd write in a definition of BE_union
-which inherits from AST_Union:
-
-        DEF_NARROW_METHODS1(BE_Union, AST_Union);
-	DEF_NARROW_FROM_DECL(BE_Union);
-	DEF_NARROW_FROM_SCOPE(BE_Union);
-
-and in the implementation file of BE_Union:
-
-/*
- * Narrowing methods:
- */
-IMPL_NARROW_METHODS1(BE_Union, AST_Union)
-IMPL_NARROW_FROM_DECL(BE_Union)
-IMPL_NARROW_FROM_SCOPE(BE_Union)
-
-Then, in BE code which expects to see an instance of your derived BE_Union
-class, you will write:
-
-	  AST_Decl *d = get_an_AST_Decl_from_somewhere();
-	  BE_Union *u;
-	  ...
-	  if (d->node_type() == AST_Decl::NT_union) {
-	    u = BE_Union::narrow_from_decl(d);
-	    if (u == NULL) {	// Narrow failed
-	      ...
-	    } else {		// Success, do normal processing
-	      ...
-	    }
-	  }
-	  ...
-
-
-SCOPE MANAGEMENT
-----------------
-
-Instances of classes which are derived from UTL_Scope implement definition
-scopes. A definition scope can contain any kind of AST node as long as it
-is derived from AST_Decl. However, specific kinds of definition scopes such
-as interfaces and unions can contain only a restricted subset of all AST
-node types.
-
-UTL_Scope provides operations to add instances of each AST provided class
-to a definition scope. The names of these operations are constructed by
-prepending the string "add_" to the name of the IDL construct. So, to add
-an interface to a definition scope, invoke the operation add_interface.
-The operations are all defined virtual and are intended to be overridden in
-classes derived from UTL_Scope.
-
-If the node was successfully added to the definition scope, the node is
-returned as the result. Otherwise the node is not added to the definition
-scope and NULL is returned.
-
-All add operation implementations in UTL_Scope return NULL. Thus,
-only the operations which implement legal additions to a specific kind of
-definition scope must be overridden in the implementation of that
-definition scope. For example, in AST_Module the add_interface operation is
-overridden to add the provided instance of AST_Interface to the scope and
-to return the provided instance if the addition was successful. Operations
-which were not overridden return NULL to indicate that the addition is
-illegal in this context. For example, in AST_Operation the definition of
-add_interface is not overridden since it is illegal to store an interface
-inside an operation definition scope.
-
-The add operations are invoked in the actions in the Yacc grammar. The
-following fragment is a representative example of code using the add
-operations:
-
-	AST_Constant *d = construct_a_new_constant();
-	...
-	if (current_scope->add_constant(d) == NULL) { // Failed
-	   ...
-	} else {				      // Succeeded
-	  ...
-	}
-
-BE INTERACTION DURING THE PARSING PROCESS
------------------------------------------
-
-The add operations can be overridden in BE derived classes to let the BE
-perform additional house-keeping work during the process of constructing
-the AST. For example, a BE could keep separate lists of interfaces as they
-are being added to a module.
-
-If you override an add operation in your BE, you must invoke the overridden
-operation in the superclass of your derived class to allow the CFE to
-perform its own house-keeping tasks. A good rule is to invoke the operation
-on the superclass before you do your own processing; then, if the
-superclass operation returns NULL, this indicates that the addition failed
-and your own code should immediately return NULL. An example explains this:
-
-AST_Interface *
-BE_Module::add_interface(AST_Interface *i)
-{
-  if (AST_Module::add_interface(i) == NULL)	// Failed, bail out!
-    return NULL;
-  ...	   					// Do your own work here
-  return i;					// Return success indication   
-}
-
-We strongly advise you to only define add operations that override add
-operations provided by the AST classes. Add operations which
-do not override equivalent operations in the AST in effect
-extend the semantics of the language accepted by the compiler. For
-example, the CFE does not have an add_interface operation on
-AST_Operation. If you were to define one in your BE_Operation class,
-the resulting compiler would allow an interface to be
-stored in an operation definition scope. The current CORBA specification
-does not allow this.
-
-AST INHERITANCE SCHEME
-----------------------
-
-The AST classes all use public virtual inheritance to construct the
-inheritance tree. This ensures that a class may appear several times in the
-inheritance tree through different paths and the derived class's instances
-will have only one copy of the inherited class's data.
-
-The use of public virtual inheritance has several important effects on how
-a BE is constructed. We explain those effects below.
-
-First, you must define a default constructor for your BE class, since
-your class may be used as a virtual base class of some other class. In this 
-case the compiler may want to call a default constructor for your class. It
-is a good idea to have a default constructor anyway, even if you do not
-plan to subclass your BE class, since for most C++ compilers this causes
-the code to be smaller. Your default constructor should initialize all
-constant data members. Additionally, it may initialize any non-constant
-data member whose value must be set before the first time the instance is
-used.
-
-Second, the constructor of your BE derived class must explicitly call all
-constructors of virtual base classes which perform useful work. For
-example, if a class in the AST from which your BE class inherits has an
-initializer for a data member, you must call that constructor. This rule is
-discussed in detail in the C++ ARM. An example may help here.
-
-Suppose you define a class BE_attribute which inherits from AST_Attribute.
-Its constructor should be as follows:
-
-    BE_Attribute::BE_Attribute(boolean ro,
-			       AST_Type *ft,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		: AST_Attribute(ro, ft, n, p),
-		  AST_Field(ft, n, p),
-		  AST_Decl(AST_Decl::NT_attr, n, p)
-    {
-    }
-
-The calls to the constructors of AST_Attribute, AST_Field and AST_Decl are
-needed because these constructors do useful initializations on their
-classes. 
-
-Note that there is some redundancy in the data passed to these
-constructors. We chose to preserve this redundancy since it should be
-possible to create BEs which subclass only some of the classes supplied by
-the AST. This means that the constructors on each class provided by the AST
-should take arguments which are sufficient to construct the instance if
-the AST class is the most derived one.
-
-The code supplied with this release contains a demonstration BE which
-subclasses all the AST provided classes. The constructors for each class
-provided by the BE are found in the file be/be_classes.cc.
-
-INITIALIZATION
---------------
-
-The following steps take place at initialization:
-
-- The global data instance is created, stored in idl_global and filled with
-  default values (in driver/drv_init.cc).
-- The command line arguments are parsed (in driver/drv_args.cc).
-- For each IDL input file, a copy of the compiler process is forked (in
-  driver/drv_fork.cc).
-- The IDL input is preprocessed (in driver/drv_preproc.cc).
-- FE initialization stage 1 is done: the scopes stack is created and stored
-  in the global data variable idl_global->scopes() field (in fe/fe_init.cc).
-- BE_init is called to create the generator instance and the returned
-  instance is stored in the global data variable idl_global->gen() field.
-- FE initialization stage 2 is done: the global scope is created, pushed on
-  the scopes stack and populated with predefined types (in fe/fe_init.cc).
-
-GLOBAL STATE AND ENTRY POINTS
------------------------------
-
-The CFE has one global variable named idl_global, which stores an instance
-of a class IDL_GlobalData as explained below:
-
-The CFE defines a class IDL_GlobalData which defines the global
-information used in a specific run of the compiler. IDL_GlobalData is
-defined in include/idl_global.hh and implemented in the file
-util/utl_global.cc.
-
-Initialization creates an instance of this class and stores it in the value
-of the global variable idl_global. Thus, the individual pieces of
-information stored in the instance are accessible everywhere.
-
-ERROR HANDLING
---------------
-
-All error handling is defined by a class provided by the CFE, UTL_Error.
-This class is defined in include/utl_error.hh and implemented in the file
-util/utl_error.cc. The class provides several methods for reporting
-specific errors as well as generic error reporting methods taking zero to
-three arguments.
-
-The CFE instantiates the class and stores the instance as part of the
-global state, accessible as idl_global->err(). Thus, to cause an error
-report, you would write code similar to the following:
-
-	if (error condition found)
-	   idl_global->err()->specific_error_message(arg1, ..);
-
-or
-
-	if (error condition found)
-	  idl_global->err()->generic_error_message(flag, arg1, ..);
-
-The flag argument is one of the predefined error conditions found in the
-enum at the head of the UTL_Error class definition. The arguments to the
-specific error message routine are defined by the signature of that
-routine. The arguments to a generic error message routine are always
-instances of AST_Decl.
-
-The running count of errors is accessible as idl_global->err_count(). If
-the value returned by this operation is non-zero after the IDL input has
-been parsed, the BE is not invoked.
-
-HANDLING OF COMMAND LINE ARGUMENTS
-----------------------------------
-
-Defined command line arguments are specified in the document CLI, in this
-directory. The CFE calls the required BE API entry point BE_prep_arg to
-process arguments passed within a -Wb flag.
-
-REQUIRED ENTRY POINTS SUPPLIED BY A BE
---------------------------------------
-
-The following API entry points must be supplied by a BE in order to
-successfully link with the CFE:
-
-extern "C" AST_Generator   *BE_init();
-
-       Creates an instance of the generator object and returns it. Note
-       that the global scope is not yet set up and the scopes stack is
-       empty when this routine is called.
-
-extern "C" void		   BE_produce();
-
-       Called by the compiler main program after the IDL input has been
-       successfully parsed and processed. The job of this routine is to
-       carry out the specific function of the BE. The AST is accessible as
-       the value of idl_global->root().
-
-extern "C" void	    	   BE_prep_arg(char *, idl_bool);
-
-       Called to process an argument passed in with a -Wb flag. The boolean
-       will always be FALSE.
-
-extern "C" void	      	   BE_abort();
-
-       Called when the CFE decides to abort the compilation. Can be used in
-       a BE to clean up after itself, e.g. remove temporary files or
-       directories it created while the parse was in progress.
-
-extern "C" void	      	   BE_version();
-
-       Called when a -V argument is processed. This should produce a
-       message for the user identifying the BE that is loaded and its
-       version information.
-
-PART II. WRITING A BACK END
--=========================-
-
-REQUIRED API THAT EACH BE MUST SUPPORT
---------------------------------------
-
-Below are the API entry points that each BE must supply in order to use the
-CFE framework. This is a repeat of the BE API section:
-
-extern "C" AST_Generator   *BE_init();
-
-       Creates an instance of the generator object and returns it. Note
-       that the scopes stack is still not set up at the time this routine
-       is called.
-
-extern "C" void		   BE_produce();
-
-       Called by the compiler main program after the IDL input has been
-       successfully parsed and processed. The job of this routine is to
-       carry out the specific function of the BE. The AST is accessible as
-       the value of idl_global->root().
-
-extern "C" void	    	   BE_prep_arg(char *, boolean);
-
-       Called to process an argument passed in with a -Wb flag. The boolean
-       will always be FALSE.
-
-extern "C" void	      	   BE_abort();
-
-       Called when the CFE decides to abort the compilation. Can be used in
-       a BE to clean up after itself, e.g. remove temporary files or
-       directories it created while the parse was in progress.
-
-extern "C" void	      	   BE_version();
-
-       Called when a -V argument is processed. This should produce a
-       message for the user identifying the BE that is loaded and its
-       version information.
-
-WHAT FILES TO INCLUDE
----------------------
-
-To use the CFE, each implementation file of your BE must include the
-following two header files:
-
-#include  <idl.hh>
-#include  <idl_extern.hh>
-
-Following this, you can include any header files needed by your BE.
-
-HOW TO SUBCLASS THE AST
------------------------
-
-Your BE may subclass from any of the classes provided by the AST. Your
-class should use public virtual inheritance to ensure that only one copy of
-the class's data members is present in each instance. Read the section on
-HOW TO WRITE CONSTRUCTORS to learn about additional considerations that you
-must take into account when writing constructors for your BE classes.
-
-HOW TO SUBCLASS THE GENERATOR TO CREATE BE ENHANCED AST NODES
--------------------------------------------------------------
-
-Your BE subclasses from classes provided by the AST. To ensure that
-instances of these classes are constructed when the AST is built, you must
-also subclass AST_Generator and return an instance of your subclass from
-the call to BE_init.
-
-The AST_Generator class provides operations to create instances of all
-classes defined in the AST. For example, the operation to create an
-AST_Attribute node is as follows:
-
-	AST_Attribute *
-	AST_Generator::create_attribute(...)
-	{
-	  return new AST_Attribute(...);
-	}
-
-In your BE_Generator subclass of AST_Generator, you will override methods
-for creation of nodes of all AST classes which you have subclassed. Thus,
-if your BE has a class BE_Attribute which is a subclass of AST_Attribute,
-your BE_Generator class definition has to override the create_attribute
-method to ensure that instances of BE_Attribute are created.
-
-The definition of the overriden operations should call the constructor of
-the derived class and return the new node as an instance of the inherited
-class. Thus, the implementation of create_attribute is as follows:
-
-	AST_Attribute *
-	BE_Generator::create_attribute(...)
-	{
-	  return new BE_Attribute(...);
-	}
-
-The Yacc grammar actions call create_xxx operations on the generator
-instance stored in the global variable idl_global->gen() field. By storing
-an instance of your derived generator class BE_Generator you ensure that
-instances of the BE classes you defined will be created.
-
-HOW TO WRITE CONSTRUCTORS FOR BE CLASSES
-----------------------------------------
-
-As mentioned above, the AST uses public virtual inheritance to derive the
-AST class hierarchy. This has two important effects on how you write a BE,
-specifically how you write constructors for derived BE classes.
-
-First, you must define a default constructor for your BE class, since
-your class may be used as a virtual base class of some other class. In that
-case the compiler may want to call a default constructor for your class. It
-is a good idea to have a default constructor anyway, even if you do not
-plan to subclass your BE class, since for most C++ compilers this causes
-the code to be smaller. Your default constructor should initialize all
-constant data members. Additionally, it may initialize any non-constant
-data member whose value must be set before the first time the instance is
-used.
-
-Second, the constructor for your BE class must explicitly call all
-constructors of virtual base classes which do some useful work. For
-example, if a class in the AST from which your BE class inherits, directly
-or indirectly, has an initializer for a data member, your BE class's
-constructor must call the AST class's constructor. This is discussed
-extensively in the C++ ARM.
-
-Below is a list showing how to write constructors for subclasses of each
-class provided by the BE. For each AST class we show a definition of a
-constructor for a derived class which calls all neccessary constructors on
-AST classes:
-
-AST_Argument:
-
-	BE_Argument::BE_Argument(AST_Argument::Direction d,
-				 AST_Type *ft,
-				 UTL_ScopedName *n,
-				 UTL_StrList *p)
-		   : AST_Argument(d, ft, n, p),
-		     AST_Field(AST_Decl::NT_argument, ft, n, p),
-		     AST_Decl(AST_Decl::NT_argument, n, p)
-	{
-	}
-
-AST_Array:
-
-	BE_Array::BE_Array(UTL_ScopedName *n,
-			   unsigned long nd,
-			   UTL_ExprList *ds)
-		: AST_Array(n, nd, ds),
-		  AST_Decl(AST_Decl::NT_array, n, NULL)
-
-	{
-	}
-
-AST_Attribute:
-
-	BE_Attribute::BE_Attribute(boolean ro,
-				   AST_Type *ft,
-				   UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Attribute(ro, ft, n, p),
-		      AST_Field(AST_Decl::NT_attr, ft, n, p),
-		      AST_Decl(AST_Decl::NT_attr, n, p)
-	{
-	}
-
-AST_ConcreteType:
-
-	BE_ConcreteType::BE_ConcreteType(AST_Decl::NodeType nt,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p)
-		       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Constant:
-
-	BE_Constant::BE_Constant(AST_Expression::ExprType t,
-				 AST_Expression *v,
-				 UTL_ScopedName *n,
-				 UTL_StrList *p)
-		   : AST_Constant(t, v, n, p),
-		     AST_Decl(AST_Decl::NT_const, n, p)
-	{
-	}
-
-AST_Decl:
-
-	BE_Decl::BE_Decl(AST_Decl::NodeType nt,
-			 UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Enum:
-
-	BE_Enum::BE_Enum(UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Enum(n, p),
-		 AST_Decl(AST_Decl::NT_enum, n, p),
-		 UTL_Scope(AST_Decl::NT_enum)
-	{
-	}
-
-AST_EnumVal:
-
-	BE_EnumVal::BE_EnumVal(unsigned long v,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		  : AST_EnumVal(v, n, p),
-		    AST_Constant(AST_Expression::EV_ulong,
-		    		 AST_Decl::NT_enum_val,
-				 new AST_Expression(v),
-				 n,
-				 p),
-		    AST_Decl(AST_Decl::NT_enum_val, n, p)
-	{
-	}
-
-AST_Exception:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-	{
-	}
-
-AST_Field:
-
-	BE_Field::BE_Field(AST_Type *ft,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Field(ft, n, p),
-		  AST_Decl(AST_Decl::NT_field, n, p)
-	{
-	}
-
-AST_Interface:
-
-	BE_Interface::BE_Interface(UTL_ScopedName *n,
-				   AST_Interface **ih,
-				   long nih,
-				   UTL_StrList *p)
-		    : AST_Interface(n, ih, nih, p),
-		      AST_Decl(AST_Decl::NT_interface, n, p),
-		      UTL_Scope(AST_Decl::NT_interface)
-	{
-	}
-
-AST_InterfaceFwd:
-
-	BE_InterfaceFwd::BE_InterfaceFwd(UTL_ScopedName *n,
-					 UTL_StrList *p)
-		       : AST_InterfaceFwd(n, p),
-			 AST_Decl(AST_Decl::NT_interface_fwd, n, p)
-	{
-	}
-
-AST_Module:
-
-	BE_Module::BE_Module(UTL_ScopedName *n,
-			     UTL_StrList *p)
-		 : AST_Decl(AST_Decl::NT_module, n, p),
-		   UTL_Scope(AST_Decl::NT_module)
-	{
-	}
-
-AST_Operation:
-
-	BE_Operation::BE_Operation(AST_Type *rt,
-				   AST_Operation::Flags fl,
-				   UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Operation(rt, fl, n, p),
-		      AST_Decl(AST_Decl::NT_op, n, p),
-		      UTL_Scope(AST_Decl::NT_op)
-	{
-	}
-
-AST_PredefinedType:
-
-	BE_PredefinedType::BE_PredefinedType(
-				AST_PredefinedType::PredefinedType *pt,
-				UTL_ScopedName *n,
-				UTL_StrList *p)
-			 : AST_PredefinedType(pt, n, p),
-			   AST_Decl(AST_Decl::NT_pre_defined, n, p)
-	{
-	}
-
-AST_Root:
-
-	BE_Root::BE_Root(UTL_ScopedName *n, UTL_StrList *p)
-	       : AST_Module(n, p),
-	         AST_Decl(AST_Decl::NT_module, n, p),
-		 UTL_Scope(AST_Decl::NT_module)
-	{
-	}
-
-
-AST_Sequence:
-
-	BE_Sequence::BE_Sequence(AST_Expression *ms, AST_Type *bt)
-		   : AST_Sequence(ms, bt),
-		     AST_Decl(AST_Decl::NT_sequence,
-		     	      new UTL_ScopedName(new String("sequence"), NULL),
-			      NULL)
-	{
-	}
-
-AST_String:
-
-	BE_String::BE_String(AST_Expression *ms)
-		 : AST_String(ms),
-		   AST_Decl(AST_Decl::NT_string,
-		   	    new UTL_ScopedName(new String("string"), NULL),
-			    NULL)
-	{
-	}
-
-AST_Structure:
-
-	BE_Structure::BE_Structure(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_struct, n, p),
-		      UTL_Scope(AST_Decl::NT_struct)
-	{
-	}
-
-AST_Type:
-
-	BE_Type::BE_Type(AST_Decl::NodeType nt,
-			 UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Typedef:
-
-	BE_Typedef::BE_Typedef(AST_Type *bt,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		  : AST_Typedef(bt, n, p),
-		    AST_Decl(AST_Decl::NT_typedef, n, p)
-	{
-	}
-
-AST_Union:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-	{
-	}
-
-AST_UnionBranch:
-
-	BE_UnionBranch::BE_UnionBranch(AST_UnionLabel *fl,
-				       AST_Type *ft,
-				       UTL_ScopedName *n,
-				       UTL_StrList *p)
-		      : AST_UnionBranch(fl, ft, n, p),
-		        AST_Field(ft, n, p),
-			AST_Decl(AST_Decl::NT_union_branch, n, p)
-	{
-	}
-
-AST_UnionLabel:
-
-	BE_UnionLabel::BE_UnionLabel(AST_UnionLabel::UnionLabel lk,
-				     AST_Expression *lv)
-		     : AST_UnionLabel(lk, lv)
-	{
-	}
-
-HOW TO USE THE ADD PROTOCOL
----------------------------
-
-As explained the section SCOPE MANAGEMENT, the CFE manages scopes by
-calling type-specific functions to add new nodes to the scope to be
-augmented. These functions can be overridden in your BE classes to do work
-specific to your BE class. For example, in a BE_module class, you might
-override add_interface to do additional work.
-
-The protocol defined by the "add_" functions is that they return NULL to
-indicate failure. They return the node that was added (and which was given
-as an argument) if the operation succeeded. Your functions in your BE class
-should follow the same protocol.
-
-The "add_" functions defined in the BE must call the overridden function in
-the base class defind in the CFE in order for the CFE scope management
-mechanism to work.  Otherwise, the CFE does not get an opportunity to
-augment its scopes with the new node to be added. It is good practice to
-call the overridden "add_" function as the first action in your BE
-function, because the success or failure of the CFE operation indicates
-whether your function should complete its task or abort early.
-
-Here is an example. Suppose you have defined a class BE_module which
-inherits from AST_Module. You may wish to override the add_interface
-function as follows:
-
-	 class BE_Module : public virtual AST_Module
-	 {
-	 	....
-		/*
-		 * ADD protocol
-		 */
-		virtual AST_Interface	*add_interface(AST_Interface *);
-		...
-	};
-
-The implementation of this function would look something like the following:
-
-    AST_Interface *
-    BE_Module::add_interface(AST_Interface *new_in)
-    {
-    	/*
-	 * Check that the CFE operation succeeds. If it returns
-	 * NULL, stop any further work
-	 */
-	if (AST_Module::add_interface(new_in) == NULL)
-	  return NULL;
-	/*
-	 * OK, non-NULL, this means the BE can do its own work here
-	 */
-	...
-	/*
-	 * Finally, don't forget to return the argument to indicate
-	 * success
-	 */
-	return new_in;
-    }	  
-
-HOW TO MAINTAIN BE SPECIFIC INFORMATION
----------------------------------------
-
-The CFE provides a special class AST_Root, a subclass of AST_Module. An
-instance of the AST_Root class is used as the distinguished root of the
-abstract syntax tree built during a parse.
-
-Your BE can subclass BE_Root from AST_Root and override the create_root
-operation in your BE_Generator class derived from AST_Generator. This will
-cause the CFE to create an instance of your BE_Root class as the root of
-the tree being constructed.
-
-You can use the instance of the BE_Root class as a convenient place to
-store information specific to an individual tree. For example, you could
-add operations on the BE_Root class to count how many nodes of each class
-are created.
-
-HOW TO USE MEMBER DATA
-----------------------
-
-As explained above, the AST classes provide access and update functions for
-manipulating data members. Your BE classes must use these functions when
-they require access to data members defined in the AST classes, since the
-data members themselves are private.
-
-It is good practice to follow the same scheme in your BE classes. Make all
-data members private. Prepend the names of all such fields with "pd_".
-Define access functions with names equal to the name of the field without the
-prefix. Define update functions according to need by prepending the name of
-the access function with the prefix "set_".
-
-Using these techniques will allow your BE to enjoy the same benefits that
-are imparted onto the CFE. Your BE will be easier to move to a
-multithreaded environment and its data members will be better protected and
-hidden.
-
-HOW TO BUILD A COMPLETE COMPILER
---------------------------------
-
-We now have all information needed to write a BE and to link it in with the
-CFE, to produce a complete IDL compiler.
-
-The following assumes that your BE will be stored in the "be" directory
-under the "release" directory. See the document ROADMAP for an explanation
-of the directory structure of the source release. If you decide to use a
-different directory to store your BE, you may have to modify the CPP_FLAGS in
-"idl_make_vars" in the top-level directory to allow your BE to find the
-include files it needs. You will also need to modify several targets in
-the Makefile in the top-level directory to correctly compile your BE into a
-library and to correctly link it in with the CFE to produce a complete
-compiler.
-
-You can get started quickly on writing your BE by modifying the sources
-found in the "demo_be" directory. The Makefile supports all the the targets
-that are needed to build a complete system and the maintenance target
-"clean" which assists in keeping the files and directories tidy. The files
-provided in the "demo_be" directory also provide all the API entry points
-that are mandated by this document.
-
-To build a complete compiler, invoke "make" or "make all" in the top-level
-directory. This will compile your BE and all the CFE sources, if this is
-the first invocation. On subsequent invocations this will recompile only
-the modified files. You will rarely if at all modify the CFE sources, so
-the overhead of compiling the CFE is incurred only the first time. To build
-just your BE, you can invoke "make all" or "make" in the "demo_be"
-directory. You can also, from the top-level directory, invoke "make
-demo_be/libbe.a".
-
-HOW TO OBTAIN ASSISTANCE
-------------------------
-
-First, read all the documents provided. If you have unanswered questions,
-mail them to
-
-	idl-cfe@sun.com
-
-Sun does not promise to support the IDL CFE source release in any manner.
-However, we will attempt to answer questions and correct problems as time
-allows.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE
-----------------
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/driver/Makefile b/TAO/TAO_IDL/driver/Makefile
deleted file mode 100644
index f7d541968ad..00000000000
--- a/TAO/TAO_IDL/driver/Makefile
+++ /dev/null
@@ -1,361 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libdrv
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libdrv
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-DRIVER_FILES = \
-		drv_init \
-		drv_private \
-		drv_args \
-		drv_fork \
-		drv_link \
-		drv_preproc
-
-FILES	 = $(DRIVER_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-# Need the following. But we should be able to handle this using ACE's functionality
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-$(LOBJS): $(LHDRS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/drv_init.o .obj/drv_init.so .shobj/drv_init.o .shobj/drv_init.so: drv_init.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h \
- ../include/drv_link.h
-.obj/drv_private.o .obj/drv_private.so .shobj/drv_private.o .shobj/drv_private.so: drv_private.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h
-.obj/drv_args.o .obj/drv_args.so .shobj/drv_args.o .shobj/drv_args.so: drv_args.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h \
- ../include/drv_link.h
-.obj/drv_fork.o .obj/drv_fork.so .shobj/drv_fork.o .shobj/drv_fork.so: drv_fork.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h \
- $(ACE_ROOT)/ace/Process_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Process_Manager.i
-.obj/drv_link.o .obj/drv_link.so .shobj/drv_link.o .shobj/drv_link.so: drv_link.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h \
- ../include/drv_link.h
-.obj/drv_preproc.o .obj/drv_preproc.so .shobj/drv_preproc.o .shobj/drv_preproc.so: drv_preproc.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/drv_private.h \
- ../include/drv_link.h \
- $(ACE_ROOT)/ace/Process_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Process_Manager.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
deleted file mode 100644
index bd26d593f4b..00000000000
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// drv_args.c - Argument parsing for IDL compiler main driver
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-#include	<stdio.h> 
-
-/*
- * Push a file into the list of files to be processed
- */
-static void
-DRV_push_file(char *s)
-{
-  DRV_files[DRV_nfiles++] = s;
-}
-
-/*
- * Prepare a CPP argument
- */
-static void
-DRV_prep_cpp_arg(char *s)
-{
-  char *newarg = new char[512];  
-  char *farg;
-
-  newarg[0] = '\0';
-  for (farg = strtok(s, ","); farg != NULL; farg = strtok(NULL, ","))
-    strcat(newarg,farg);
-  DRV_cpp_putarg(newarg);
-}
-
-/*
- * Print a usage message and exit
- */
-void
-DRV_usage()
-{
-  cerr << idl_global->prog_name()
-       << GTDEVEL(": usage: ")
-       << idl_global->prog_name()
-       << GTDEVEL(" [flag | file]*\n");
-  cerr << GTDEVEL("Legal flags:\n");
-  cerr << GTDEVEL(" -A...\t\t\tlocal implementation-specific escape\n");
-  cerr << GTDEVEL(" -Dname[=value]\t\tdefines name for preprocessor\n");
-  cerr << GTDEVEL(" -E\t\t\truns preprocessor only, prints on stdout\n");
-  cerr << GTDEVEL(" -Idir\t\t\tincludes dir in search path for preprocessor\n");
-  cerr << GTDEVEL(" -Uname\t\t\tundefines name for preprocessor\n");
-  cerr << GTDEVEL(" -V\t\t\tprints version info then exits\n");
-  cerr << GTDEVEL(" -W[p|b],arg1,argn\tpasses args to preprocessor or BE\n");
-  cerr << GTDEVEL(" -Yp,path\t\tdefines location of preprocessor\n");
-  cerr << GTDEVEL(" -bback_end\t\tcauses specified back end to be used\n");
-  cerr << GTDEVEL(" -u\t\t\tprints usage message and exits\n");
-  cerr << GTDEVEL(" -v\t\t\ttraces compilation stages\n");
-  cerr << GTDEVEL(" -w\t\t\tsuppresses IDL compiler warning messages\n");
-}
-
-/*
- * Parse arguments on command line
- */
-void
-DRV_parse_args(long ac, char **av)
-{
-  char	*buffer;
-  char	*s;
-  long	i;
-
-  DRV_cpp_init();
-  idl_global->set_prog_name(av[0]);
-  for (i = 1; i < ac; i++) {
-    if (av[i][0] == '-') {
-      switch (av[i][1]) {
-      case 0:
-	DRV_push_file("standard input");
-	break;
-      case 'A':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else
-	    exit(99);
-	} else
-	  s = av[i] + 2;
-	strcat(idl_global->local_escapes(), s);
-	strcat(idl_global->local_escapes(), " ");
-	break;
-      case 'D':
-      case 'U':
-      case 'I':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    buffer = new char[strlen(av[i]) + strlen(av[i + 1]) + 2];
-	    sprintf(buffer, "%s%s", av[i], av[i+1]);
-	    DRV_cpp_putarg(buffer);
-	    i++;
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i] 
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-	} else
-	  DRV_cpp_putarg(av[i]);
-	break;
-      case 'E':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_PREPROC);
-	break;
-      case 'V':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_VERSION);
-	break;
-      case 'W':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-        } else
-	  s = av[i] + 2;
-	switch (*s) {
-	default:
-	    cerr << GTDEVEL("IDL: -W must be followed by 'p' or 'b'\n");
-	    exit(99);
-	case 'p':
-	  if (*(s + 1) == ',')
-	    DRV_prep_cpp_arg(s + 2);
-	  break;
-	case 'b':
-	  if (*(s + 1) == ',')
-	    (*DRV_BE_prep_arg)(s + 2, I_TRUE);
-	  break;
-	}
-	break;
-      case 'Y':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-        } else
-	  s = av[i] + 2;
-	switch (*s) {
-	case 'p':
-	  if (*(s + 1) == ',') {
-	    idl_global->set_cpp_location(s + 2);
-	    DRV_cpp_new_location(s + 2);
-	  }
-	  break;
-	default:
-	  break;
-	}
-	break;
-      case 'b':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-	} else
-	  s = av[i] + 2;
-	idl_global->set_be(s);
-	break;
-      case 'd':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_DUMP_AST);
-	break;
-      case 'u':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_USAGE);
-	break;
-      case 'v':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_INFORMATIVE);
-	break;
-      case 'w':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_NOWARNINGS);
-	break;
-      default:
-	cerr << GTDEVEL("IDL: Illegal option '") << av[i] << "'\n";
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_USAGE);
-	break;
-      }
-    } else
-      DRV_push_file(av[i]);
-  }
-}
diff --git a/TAO/TAO_IDL/driver/drv_fork.cpp b/TAO/TAO_IDL/driver/drv_fork.cpp
deleted file mode 100644
index 31398991ce8..00000000000
--- a/TAO/TAO_IDL/driver/drv_fork.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * DRV_fork.cc - Fork a process for each file to be processed, wait for
- *		 status from the child process
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-
-#include "ace/Process_Manager.h"
-
-/*
- * Fork off a process, wait for it to die
- */
-void
-DRV_fork()
-{
-  // This will not work on NT, but I can hardly think of some way to
-  // make it work.
-  // The idea is to make it compile, and always use the compiler with
-  // just one file, that works because then there is no fork
-  // involved.
-  for (DRV_file_index = 0;
-       DRV_file_index < DRV_nfiles;
-       ++DRV_file_index)
-    {
-      ACE_Process_Options options;
-      options.creation_flags (ACE_Process_Options::NO_EXEC);
-
-      ACE_Process_Manager manager;
-      pid_t child_pid = manager.spawn (options);
-      if (child_pid == 0)
-	{
-	  /*
-	   * OK, do it to this file (in the child)
-	   */
-	  DRV_drive(DRV_files[DRV_file_index]);
-	  ACE_OS::exit(0);
-	}
-
-      if (child_pid == -1)
-	{
-	  cerr << GTDEVEL("IDL: spawn failed\n");
-	  ACE_OS::exit (99);
-	  /*NOTREACHED*/
-	}
-
-      // child_pid is the process id of something at this point.
-      if (manager.wait () == -1)
-	{
-	  cerr << GTDEVEL("IDL: wait failed\n");
-	  ACE_OS::exit (99);
-	  /*NOTREACHED*/
-	}
-    }
-  /*
-   * Now the parent process can exit
-   */
-  exit(0);
-}
diff --git a/TAO/TAO_IDL/driver/drv_init.cpp b/TAO/TAO_IDL/driver/drv_init.cpp
deleted file mode 100644
index df3504b08d8..00000000000
--- a/TAO/TAO_IDL/driver/drv_init.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// DRV_init.cc - Initialization for IDL compiler driver program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include 	"drv_link.h"
-
-void
-DRV_init()
-{
-  // Initialize global data
-
-  idl_global = new IDL_GlobalData();
-
-  idl_global->set_scopes(NULL);
-  idl_global->set_root(NULL);
-  idl_global->set_gen(NULL);
-  idl_global->set_err((*DRV_FE_new_UTL_Error)());
-  idl_global->set_err_count(0);
-  idl_global->set_indent((*DRV_FE_new_UTL_Indenter)());
-
-  idl_global->set_filename(NULL);
-  idl_global->set_main_filename(NULL);
-  idl_global->set_real_filename(NULL);
-  idl_global->set_stripped_filename(NULL);
-  idl_global->set_import(I_TRUE);
-  idl_global->set_in_main_file(I_FALSE);
-  idl_global->set_lineno(-1);
-
-  idl_global->set_prog_name(NULL);
-
-  idl_global->set_cpp_location(CPP_LOCATION);
-
-  idl_global->set_be("");
-
-  idl_global->set_local_escapes(new char[1024]);
-
-  idl_global->set_pragmas(NULL);
-
-  idl_global->set_compile_flags(0);
-
-  idl_global->set_read_from_stdin(I_FALSE);
-
-  idl_global->set_include_file_names(NULL);
-  idl_global->set_n_include_file_names(0);
-
-  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-
-  // Initialize driver private data
-
-  DRV_nfiles = 0;
-  DRV_file_index = 0;  
-}
-
diff --git a/TAO/TAO_IDL/driver/drv_link.cpp b/TAO/TAO_IDL/driver/drv_link.cpp
deleted file mode 100644
index 5d67b8b67a9..00000000000
--- a/TAO/TAO_IDL/driver/drv_link.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
-** drv_link.cc - routines for programatic linking
-**
-** This file is set up so that you can easily convert the CFE to do
-** dynamic loading of either the front end (parser) or BEs. Since no
-** portable dynamic loading mechanism exists, we have removed the specific
-** one which is in Sunsoft\'s version and which uses Solaris dlopen.
-*/
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-DRV_PF_FE_init_stage1   DRV_FE_init_stage1;
-DRV_PF_FE_init_stage2   DRV_FE_init_stage2;
-DRV_PF_FE_yyparse       DRV_FE_yyparse;
-DRV_PF_FE_set_yyin      DRV_FE_set_yyin;
-DRV_PF_FE_new_UTL_Error DRV_FE_new_UTL_Error;
-DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter;
-DRV_PF_FE_new_UTL_String DRV_FE_new_UTL_String;
-
-DRV_PF_BE_init		DRV_BE_init;
-DRV_PF_BE_produce 	DRV_BE_produce;
-DRV_PF_BE_abort   	DRV_BE_abort;
-DRV_PF_BE_prep_arg	DRV_BE_prep_arg;
-DRV_PF_BE_version	DRV_BE_version;
-
-void
-DRV_FE_open()
-{
-  DRV_FE_init_stage1 = &FE_init_stage1;
-  DRV_FE_init_stage2 = &FE_init_stage2;
-  DRV_FE_yyparse = &FE_yyparse;
-  DRV_FE_set_yyin = &FE_set_yyin;
-  DRV_FE_new_UTL_Error = &FE_new_UTL_Error;
-  DRV_FE_new_UTL_Indenter = &FE_new_UTL_Indenter;
-  DRV_FE_new_UTL_String = &FE_new_UTL_String;
-}
-
-void
-DRV_FE_close()
-{
-  DRV_FE_init_stage1 = 0;
-  DRV_FE_init_stage2 = 0;
-  DRV_FE_yyparse = 0;
-  DRV_FE_set_yyin = 0;
-  DRV_FE_new_UTL_Error = 0;
-  DRV_FE_new_UTL_Indenter = 0;
-  DRV_FE_new_UTL_String = 0;
-}
-
-void
-DRV_BE_open()
-{
-  DRV_BE_init = &BE_init;
-  DRV_BE_produce = &BE_produce;
-  DRV_BE_abort = &BE_abort;
-  DRV_BE_prep_arg = &BE_prep_arg;
-  DRV_BE_version = &BE_version;
-}
-
-void
-DRV_BE_close()
-{
-  DRV_BE_init = 0;
-  DRV_BE_produce = 0;
-  DRV_BE_abort = 0;
-  DRV_BE_prep_arg = 0;
-  DRV_BE_version = 0;
-}
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
deleted file mode 100644
index 32c74256d63..00000000000
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-/*  $Id$  */
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * DRV_pre_proc.cc - pass an IDL file through the C preprocessor
- */
-
-#include "idl.h"
-#include "idl_extern.h"
-
-#include "drv_private.h"
-#include "drv_link.h"
-
-#include "ace/Process_Manager.h"
-#include "ace/Env_Value_T.h"
-
-#undef  MAX_ARGLIST
-#define MAX_ARGLIST     128
-
-static  char    *arglist[MAX_ARGLIST];
-static  long    argcount = 0;
-
-/*
- * Push the new CPP location if we got a -Yp argument
- */
-void
-DRV_cpp_new_location(char *new_loc)
-{
-  arglist[0] = new_loc;
-}
-
-/*
- * Push an argument into the arglist
- */
-void
-DRV_cpp_putarg(char *str)
-{
-  if (argcount >= MAX_ARGLIST) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": More than ")
-         << MAX_ARGLIST
-         << GTDEVEL(" arguments to preprocessor\n");
-    exit (99);
-  }
-  arglist[argcount++] = str;
-}
-
-/*
- * Initialize the cpp argument list
- */
-void
-DRV_cpp_init()
-{
-
-  char *cpp_loc;
-
-  // DRV_cpp_putarg("\\cygnus\\H-i386-cygwin32\\bin\\echo");
-  ACE_Env_Value<char*> cpp_path ("CPP_LOCATION", (char *) 0);
-
-  if (cpp_path != 0)
-      cpp_loc = cpp_path;
-  else
-      cpp_loc = idl_global->cpp_location();
-  DRV_cpp_putarg(cpp_loc);
-  DRV_cpp_putarg("-E");
-  DRV_cpp_putarg("-DIDL");
-  DRV_cpp_putarg("-I.");
-}
-
-/*
- * lines can be 1024 chars long
- */
-#define LINEBUF_SIZE    1024
-static  char    drv_line[LINEBUF_SIZE + 1];
-
-/*
- * Get a line from stdin
- */
-static long
-DRV_get_line(FILE *f)
-{
-    char        *l = fgets(drv_line, LINEBUF_SIZE, f);
-    long        i;
-
-    if (l == NULL)
-        return I_FALSE;
-    if (*l == '\0' && feof(f))
-        return I_FALSE;
-    if (*l == '\0')
-        return I_TRUE;
-    i = strlen(l) - 1;
-    if (l[i] == '\n')
-        l[i] = '\0';
-    return I_TRUE;
-}
-
-/*
- * Copy from stdin to a file
- */
-static void
-DRV_copy_input(FILE *fin, char *fn)
-{
-  FILE  *f = fopen(fn, "w");
-
-  if (f == NULL) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": cannot open temp file ")
-         << fn
-         << GTDEVEL(" for writing\n");
-    exit(99);
-  }
-  if (fin == NULL) {
-      cerr << idl_global->prog_name()
-           << GTDEVEL(": cannot open input file\n");
-      exit(99);
-  }
-  while (DRV_get_line(fin))
-    fprintf(f, "%s\n", drv_line);
-  fclose(f);
-}
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-DRV_stripped_name(char *fn)
-{
-    char        *n = fn;
-    long        l;
-
-    if (n == NULL)
-        return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * File names
- */
-static char     tmp_file[128];
-static char     tmp_ifile[128];
-
-/*
- * Pass input through preprocessor
- */
-void
-DRV_pre_proc(char *myfile)
-{
-  long  readfromstdin = I_FALSE;
-  char  catbuf[512];
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (readfromstdin);
-
-  const char* tmpdir = getenv("TMP");
-  if (tmpdir != 0)
-    {
-      ACE_OS::strcpy (tmp_file, tmpdir);
-      ACE_OS::strcpy (tmp_ifile, tmpdir);
-    }
-  else
-    {
-      ACE_OS::strcpy (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
-      ACE_OS::strcat (tmp_file, "tmp");
-      ACE_OS::strcpy (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
-      ACE_OS::strcat (tmp_ifile, "tmp");
-    }
-
-  ACE_OS::strcat (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
-  ACE_OS::strcat (tmp_file, "idlf_XXXXXX");
-
-  ACE_OS::strcat (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
-  ACE_OS::strcat (tmp_ifile, "idli_XXXXXX");
-
-  (void) ACE_OS::mktemp (tmp_file); ACE_OS::strcat (tmp_file, ".cc");
-  (void) ACE_OS::mktemp (tmp_ifile); ACE_OS::strcat (tmp_ifile, ".cc");
-  if (strcmp(myfile, "standard input") == 0) {
-    idl_global->set_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    idl_global->set_main_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    idl_global->
-        set_stripped_filename(
-            (*DRV_FE_new_UTL_String)(DRV_stripped_name(tmp_ifile))
-        );
-    idl_global->set_real_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    DRV_copy_input(stdin, tmp_ifile);
-    idl_global->set_read_from_stdin(I_TRUE);
-  } else {
-    FILE *fd = fopen(myfile, "r");
-    DRV_copy_input(fd, tmp_ifile);
-    fclose(fd);
-    idl_global->set_read_from_stdin(I_FALSE);
-    idl_global->set_filename((*DRV_FE_new_UTL_String)(myfile));
-    idl_global->set_main_filename((*DRV_FE_new_UTL_String)(myfile));
-    idl_global->
-        set_stripped_filename(
-            (*DRV_FE_new_UTL_String)(DRV_stripped_name(myfile))
-        );
-    idl_global->set_real_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-  }
-
-  // We use ACE instead of the (low level) fork facilities, this also
-  // work on NT.
-  ACE_Process manager;
-  ACE_Process_Options cpp_options;
-  DRV_cpp_putarg (tmp_ifile);
-  DRV_cpp_putarg (0); // Null terminate the arglist.
-  cpp_options.command_line (arglist);
-  ACE_HANDLE fd = ACE_OS::open(tmp_file, O_WRONLY | O_CREAT | O_TRUNC, 0777);
-  if (fd == ACE_INVALID_HANDLE) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": cannot open temp file ")
-         << tmp_file << " for writing\n";
-    return;
-  }
-  cpp_options.set_handles (ACE_INVALID_HANDLE, fd);
-  if (manager.spawn (cpp_options) == -1)
-    {
-      cerr << idl_global->prog_name()
-           << GTDEVEL(": spawn of ")
-           << arglist[0]
-           << GTDEVEL(" failed\n");
-      return;
-    }
-
-  // Close the output file on the parent process.
-  if (ACE_OS::close (fd) == -1)
-    {
-      cerr << idl_global->prog_name ()
-           << GTDEVEL(": cannot close temp file")
-           << tmp_file << " on parent\n";
-      return;
-    }
-
-  // Remove the null termination and the input file from the arglist,
-  // the next file will the previous args.
-  argcount -= 2;
-
-  if (manager.wait () == -1)
-    {
-      cerr << idl_global->prog_name ()
-           << GTDEVEL(": wait for child process failed\n");
-      return;
-    }
-  // TODO: Manage problems in the pre-processor, in the previous
-  // version the current process would exit if the pre-processor
-  // returned with error.
-
-
-  FILE * yyin = fopen(tmp_file, "r");
-  if (yyin == NULL) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": Could not open cpp output file ")
-         << tmp_file
-         << "\n";
-    exit(99);
-  }
-  (*DRV_FE_set_yyin)((File *) yyin);
-
-  // @@ TODO: This is not protable, cat(1) is a UNIX tool.
-  if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC) {
-    sprintf(catbuf, "cat < %s", tmp_file);
-    system(catbuf);
-  }
-
-  if (ACE_OS::unlink(tmp_ifile) == -1) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": Could not remove cpp input file ")
-         << tmp_ifile
-         << "\n";
-    exit(99);
-  }
-#if !defined (ACE_WIN32)
-  // TODO: This unlink fails every time under NT, it seems that you
-  // cannot remove an open file under that OS?
-  if (ACE_OS::unlink(tmp_file) == -1) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": Could not remove cpp output file ")
-         << tmp_file
-         << "\n";
-    exit(99);
-  }
-#endif /* !ACE_WIN32 */
-  if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC)
-    exit(0);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Env_Value<char*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate  ACE_Env_Value<char*>
-#endif
diff --git a/TAO/TAO_IDL/driver/drv_private.cpp b/TAO/TAO_IDL/driver/drv_private.cpp
deleted file mode 100644
index 6160112e818..00000000000
--- a/TAO/TAO_IDL/driver/drv_private.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// drv_global.cc - Global variables for IDL compiler driver program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-
-// Storage for file names
-
-#define		NFILES	1024
-
-char		*DRV_files[NFILES];
-long		DRV_nfiles = 0;
-long		DRV_file_index = -1;
-IDL_GlobalData *idl_global = NULL;
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
deleted file mode 100644
index 31d8eb90e9e..00000000000
--- a/TAO/TAO_IDL/fe/Makefile
+++ /dev/null
@@ -1,397 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libfe
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libfe
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-FE_FILES	= \
-		fe_declarator \
-		fe_private \
-		fe_init \
-		fe_extern \
-		fe_interface_header
-
-OTHER_FILES	= \
-		y.tab \
-		lex.yy
-
-FILES	 = $(FE_FILES) $(OTHER_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LHDR	= $(addsuffix .h,$(HDRS))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -D_REENTRANT -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-YACC   = yacc
-LEX	= flex
-YFLAGS	= -t -d
-LFLAGS	= -t
-
-# Create the parser and lexer
-y.tab.h y.tab.cpp: idl.yy
-	@-$(RM) -f $@
-	$(YACC) $(YFLAGS) idl.yy
-	@mv -f y.tab.c y.tab.cpp
-	@patch < y.tab.cpp.diff
-	@-$(RM) -f y.tab.cpp.orig
-
-lex.yy.cpp: idl.ll y.tab.h
-	$(LEX) $(LFLAGS) idl.ll > /tmp/$@
-	@#### Replace #includes of standard headers with #include of ace/OS.h,
-	@#### so that ace/config.h is #included first.
-	@sed -e 's%#include.*<stdio.h>%#include "ace/OS.h"%g' \
-	     -e '/#include.*stdlib.h/D' \
-	     -e '/#include.*unistd.h/D' \
-	     -e 's/ECHO/TAO_ECHO/g' < /tmp/$@ > $@
-	@patch < lex.yy.cpp.diff
-	@-$(RM) -f /tmp/$@ lex.yy.cpp.orig
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/fe_declarator.o .obj/fe_declarator.so .shobj/fe_declarator.o .shobj/fe_declarator.so: fe_declarator.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/fe_private.o .obj/fe_private.so .shobj/fe_private.o .shobj/fe_private.so: fe_private.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/fe_init.o .obj/fe_init.so .shobj/fe_init.o .shobj/fe_init.so: fe_init.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/fe_extern.o .obj/fe_extern.so .shobj/fe_extern.o .shobj/fe_extern.so: fe_extern.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/fe_interface_header.o .obj/fe_interface_header.so .shobj/fe_interface_header.o .shobj/fe_interface_header.so: fe_interface_header.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/y.tab.o .obj/y.tab.so .shobj/y.tab.o .shobj/y.tab.so: y.tab.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h
-.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: lex.yy.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h ../include/fe_private.h \
- ../include/fe_interface_header.h ../include/fe_declarator.h y.tab.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
deleted file mode 100644
index 1c802e338e9..00000000000
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_declarator.cc - Implementation of FE private declaration
- *		      statement class
- *
- * The FE_Declarator class is used to hold together complex declarations
- * until all the components are parsed and before they are composed into
- * an AST_Type node.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-FE_Declarator::FE_Declarator(UTL_ScopedName *n, DeclaratorType dt,
-			     AST_Decl *cp)
-	     : pd_complex_part(cp),
-	       pd_name(n),
-	       pd_decl_type(dt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Compose the type of the complex declarator (if any) with the base
-// type supplied in ct
-AST_Type *
-FE_Declarator::compose(AST_Decl *d)
-{
-  AST_Array	*arr;
-  AST_Type	*ct;
-
-  ct = AST_Type::narrow_from_decl(d);
-  if (ct == NULL) {
-    idl_global->err()->not_a_type(d);
-    return NULL;
-  }
-  if (ct->node_type() == AST_Decl::NT_except) {
-    idl_global->err()->not_a_type(d);
-    return NULL;
-  }
-  if (pd_decl_type == FD_simple || pd_complex_part == NULL) {
-    return ct;
-  }
-  if (pd_complex_part->node_type() == AST_Decl::NT_array) {
-    arr = AST_Array::narrow_from_decl(pd_complex_part);
-    arr->set_base_type(ct);
-
-    /*
-     * Add the new array to the types defined in the global scope
-     */
-    idl_global->root()->fe_add_array(arr);
-
-    return arr;
-  }
-  return NULL; // return through this statement should not happen
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-AST_Decl *
-FE_Declarator::complex_part()
-{
-  return pd_complex_part;
-}
-
-UTL_ScopedName *
-FE_Declarator::name()
-{
-  return pd_name;
-}
-
-FE_Declarator::DeclaratorType
-FE_Declarator::decl_type()
-{
-  return pd_decl_type;
-}
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
deleted file mode 100644
index 03e52fbdc5f..00000000000
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_extern.cc - export FE interfaces to driver
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-#include 	"utl_error.h"
-#include	"utl_indenter.h"
-#include	"utl_string.h"
-
-/*
- * yacc parser interface
- */
-
-extern int yyparse();
-extern FILE * yyin;
-
-int
-FE_yyparse()
-{
-  int result = yyparse();
-  if (idl_global->err_count() == 0) {
-    idl_global->root()->call_add();
-  }
-  return result;
-}
-
-void
-FE_set_yyin(File * f)
-{
-  yyin = (FILE*)f;
-}
-
-/*
- * constructor interfaces 
- */
-
-UTL_Error *
-FE_new_UTL_Error()
-{
-  return new UTL_Error();
-}
-
-UTL_Indenter *
-FE_new_UTL_Indenter()
-{
-  return new UTL_Indenter();
-}
-
-UTL_String *
-FE_new_UTL_String(char * str)
-{
-  return new UTL_String(str);
-}
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
deleted file mode 100644
index 16f6b4372d8..00000000000
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_init.cc - Initialize the FE
- *
- * The FE initialization is carried out in two stages, with the BE
- * initialization protocol sandwiched between the two stages.
- *
- * The first stage is responsible for creating the scopes stack.
- * The second stage is run after the BE initialization has created
- * and returned an instance of AST_Generator (or a subclass). This
- * instance is used to create the root node for the AST, and to
- * populate it with AST_PredefinedType nodes which represent the
- * predefined IDL types. This AST root is then pushed on the scopes
- * stack as the outermost scope.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Create a scoped name
- */
-static UTL_ScopedName *
-create_scoped_name(char *s)
-{
-  return new UTL_ScopedName(new Identifier(s, 1, 0, I_FALSE), NULL);
-}
-
-/*
- * Populate the global scope with all predefined entities
- */
-void
-fe_populate(AST_Module *m)
-{
-  AST_PredefinedType *pdt;
-
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_long,
-					          create_scoped_name("long"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ulong,
-					   create_scoped_name("unsigned long"),
-					   NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_longlong,
-				 create_scoped_name("long long"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_ulonglong,
-				 create_scoped_name("unsigned long long"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_short,
-						  create_scoped_name("short"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-   idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ushort,
-					  create_scoped_name("unsigned short"),
-					  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_float,
-						  create_scoped_name("float"),
-					       	  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_double,
-					      create_scoped_name("double"),
-					      NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_longdouble,
-				 create_scoped_name("long double"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_char,
-						  create_scoped_name("char"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_wchar,
-				 create_scoped_name("wchar_t"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_octet,
-						  create_scoped_name("octet"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_any,
-						  create_scoped_name("any"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_boolean,
-					      create_scoped_name("boolean"),
-					      NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_void,
-						  create_scoped_name("void"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("Object"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("TypeCode"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-
-  /*
-   * Add these to make all keywords protected even in different spellings
-   */
-
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("attribute"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("case"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("const"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("context"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("default"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("enum"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("exception"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("in"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("out"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("inout"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("interface"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("module"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("oneway"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("raises"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("readonly"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("sequence"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("string"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("wstring_t"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("struct"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("switch"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("typedef"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("union"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("unsigned"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("TRUE"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("FALSE"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-}
-
-/*
- * Initialization stage 1: create global scopes stack
- */
-void
-FE_init_stage1()
-{
-  idl_global->set_scopes(new UTL_ScopeStack());
-  if (idl_global->scopes() == NULL) {
-    cerr << GTDEVEL("IDL: FE init failed to create scope stack, exiting\n");
-    exit(99);
-  }
-}
-
-/*
- * Initialization stage 2: create global scope and populate it
- */
-void
-FE_init_stage2()
-{
-  AST_Root	*r;
-
-  /*
-   * Check that the BE init created a generator object
-   */
-  if (idl_global->gen() == NULL) {
-    cerr << GTDEVEL("IDL: BE did not initialize idl_global->gen(), exiting\n");
-    exit(99);
-  }
-  /*
-   * Create a global root for the AST. Note that the AST root has no
-   * name
-   */
-  r = idl_global->gen()->create_root(create_scoped_name(""), NULL);
-  idl_global->set_root(r);
-  if (r == NULL) {
-    cerr << GTDEVEL("IDL: FE init failed to create AST root, exiting\n");
-    exit(99);
-  }
-  /*
-   * Push it on the stack
-   */
-  idl_global->scopes()->push(idl_global->root());
-  /*
-   * Populate it with nodes for predefined types
-   */
-  fe_populate(idl_global->root());
-  /*
-   * Set flag to indicate we are processing the main file now
-   */
-  idl_global->set_in_main_file(I_TRUE);
-}
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
deleted file mode 100644
index b493bde1969..00000000000
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_interface_header.cc - Implements the FE private class FE_InterfaceHeader
- *
- * FE_InterfaceHeader instances are used to store information about an
- * interface header as the interface is being parsed and before the
- * AST_Interface node used to represent this interface is created.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl)
-		  : pd_interface_name(n)
-{
-  compile_inheritance(nl);
-}
-
-/*
- * Private operations
- */
-
-// Compute flattened, non-repeating list of inherited interfaces
-
-#undef	INCREMENT
-#define	INCREMENT	512
-
-/*
- * Private storage used to store interfaces seen already in the
- * computation of the unique, flattened inheritance list
- */
-static AST_Interface **iseen = NULL;
-static long	    iallocated = 0;
-static long	    iused = 0;
-
-/*
- * Add an interface to an inheritance spec
- */
-static void
-add_inheritance(AST_Interface *i)
-{
-  long			oiallocated;
-  long			k;
-  AST_Interface	      **oiseen;
-
-  /*
-   * Make sure there's space for one more
-   */
-  if (iallocated == iused) {
-    if (iallocated == 0) {
-      iallocated = INCREMENT;
-      iseen = new AST_Interface *[iallocated];
-    } else {
-      oiallocated = iallocated;
-      oiseen = iseen;
-      iallocated += INCREMENT;
-      iseen = new AST_Interface *[iallocated];
-      for (k = 0; k < iused; k++)
-	iseen[k] = oiseen[k];
-      delete oiseen;
-    }
-  }
-  /*
-   * OK, now insert it
-   */
-  iseen[iused] = i;
-  iused++;
-}
-
-/*
- * Have we already seen this interface?
- */
-static long
-already_seen(AST_Interface *ip)
-{
-  long	i;
-
-  for (i = 0; i < iused; i++) {
-    if (iseen[i] == ip)
-      return I_TRUE;
-  }
-  return I_FALSE;
-}
-
-/*
- * Add this interface to the list of inherited if not already there
- */
-void
-FE_InterfaceHeader::compile_one_inheritance(AST_Interface *i)
-{
-  /*
-   * Check for badly formed interface
-   */
-  if (i == NULL)
-    return;
-  /*
-   * If we've seen it already then don't expand again
-   */
-  if (already_seen(i))
-    return;
-  /*
-   * OK, add i to the list of inherited interfaces
-   */
-  add_inheritance(i);
-}
-
-/*
- * Compute the list of top-level interfaces this one inherits from
- */
-void
-FE_InterfaceHeader::compile_inheritance(UTL_NameList *nl)
-{
-  UTL_NamelistActiveIterator *l = new UTL_NamelistActiveIterator(nl);
-  AST_Decl		       *d;
-  AST_Interface		       *i;
-  long			        k;
-
-  iused = 0;
-  /*
-   * Compute expanded flattened non-repeating list of interfaces
-   * which this one inherits from
-   */
-  while (!(l->is_done())) {
-    /*
-     * Check that scope stack is valid
-     */
-    if (idl_global->scopes()->top() == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
-    }
-    /*
-     * Look it up
-     */
-    d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
-    /*
-     * Not found?
-     */
-    if (d == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
-    }
-    /*
-     * Not an interface?
-     */
-    while(d->node_type() == AST_Decl::NT_typedef) 
-      d = AST_Typedef::narrow_from_decl(d)->base_type();
-    if (d->node_type() != AST_Decl::NT_interface) {
-      idl_global->err()->inheritance_error(pd_interface_name, d);
-      return;
-    }
-    /*
-     * OK, cast to an interface
-     */
-    i = AST_Interface::narrow_from_decl(d);
-    if (i == NULL)
-       idl_global->err()->inheritance_error(pd_interface_name, d);
-    /*
-     * Forward declared interface?
-     */
-    if (!i->is_defined()) {
-      idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
-      return;
-    }
-    /*
-     * OK, see if we have to add this to the list of interfaces
-     * inherited from
-     */
-    compile_one_inheritance(i);
-
-    /*
-     * Next element in header list
-     */
-    l->next();
-  }
-  delete l;
-  /*
-   * OK, install in interface header
-   */
-  pd_inherits = new AST_Interface *[iused];
-  for (k = 0; k < iused; k++)
-    pd_inherits[k] = iseen[k];
-  pd_n_inherits = iused;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-UTL_ScopedName *
-FE_InterfaceHeader::interface_name()
-{
-  return pd_interface_name;
-}
-
-AST_Interface **
-FE_InterfaceHeader::inherits()
-{
-  return pd_inherits;
-}
-
-long
-FE_InterfaceHeader::n_inherits()
-{
-  return pd_n_inherits;
-}
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
deleted file mode 100644
index 30fe3c3cfc0..00000000000
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_private.cc - Declare global data which are private to the FE
- *		   part
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * List of pragmas
- */
-UTL_StrList	*DRV_global_pragmas = NULL;
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
deleted file mode 100644
index 17f11b8fb21..00000000000
--- a/TAO/TAO_IDL/fe/idl.ll
+++ /dev/null
@@ -1,528 +0,0 @@
-
-%{
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.ll - Lexical scanner for IDL 1.1
- */
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include "y.tab.h"
-
-static char	idl_escape_reader(char *);
-static double	idl_atof(char *);
-static long	idl_atoi(char *, long);
-static void	idl_parse_line_and_file(char *);
-static void	idl_store_pragma(char *);
-
-#if 0 /* defined (HPUX) */
-// HPUX has yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __yytext = (char*) yytext;
-// NOTE: This will not work under flex(1) were yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__yytext()
-{
-  return (char *) yytext;
-}
-#define ace_yytext __yytext()
-#else
-#define ace_yytext yytext
-#endif /* 0 */
-%}
-
-%array
-
-%%
-
-any             return IDL_ANY;
-module		return IDL_MODULE;
-raises		return IDL_RAISES;
-readonly	return IDL_READONLY;
-attribute	return IDL_ATTRIBUTE;
-exception	return IDL_EXCEPTION;
-context		return IDL_CONTEXT;
-interface	return IDL_INTERFACE;
-const		return IDL_CONST;
-typedef		return IDL_TYPEDEF;
-struct		return IDL_STRUCT;
-enum		return IDL_ENUM;
-string		return IDL_STRING;
-wstring_t	return IDL_WSTRING;
-sequence	return IDL_SEQUENCE;
-union		return IDL_UNION;
-switch		return IDL_SWITCH;
-case		return IDL_CASE;
-default		return IDL_DEFAULT;
-float		return IDL_FLOAT;
-double		return IDL_DOUBLE;
-long		return IDL_LONG;
-short		return IDL_SHORT;
-unsigned	return IDL_UNSIGNED;
-char		return IDL_CHAR;
-wchar_t		return IDL_WCHAR;
-boolean		return IDL_BOOLEAN;
-octet		return IDL_OCTET;
-void		return IDL_VOID;
-native          return IDL_NATIVE;
-
-TRUE		return IDL_TRUETOK;
-FALSE		return IDL_FALSETOK;
-
-inout		return IDL_INOUT;
-in		return IDL_IN;
-out		return IDL_OUT;
-oneway		return IDL_ONEWAY;
-
-\<\<		return IDL_LEFT_SHIFT;
-\>\>		return IDL_RIGHT_SHIFT;
-\:\:		{
-		  yylval.strval = "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
-
-[a-zA-Z][a-zA-Z0-9_]*	{
-    char *z = (char *) malloc(strlen(ace_yytext) + 1);
-    strcpy(z, ace_yytext);
-    yylval.strval = z;
-    return IDENTIFIER;
-}
-
--?[0-9]+"."[0-9]*([eE][+-]?[0-9]+)?[lLfF]?      {
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
--?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-
--?[1-9][0-9]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
--?0[xX][a-fA-F0-9]+ {
-		  yylval.ival = idl_atoi(ace_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
--?0[0-7]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-
-"\""[^\"]*"\""	{
-		  /* Skip the quotes */
-		  char *tmp = ace_yytext;
-		  tmp[strlen(tmp)-1] = '\0';
-		  yylval.sval = new String(tmp + 1);
-		  return IDL_STRING_LITERAL;
-	      	}
-"'"."'"		{
-		  yylval.cval = ace_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-"'"\\([0-7]{1,3})"'"	{
-		  // octal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-"'"\\."'"	{
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-^#[ \t]*pragma[ \t].*\n	{/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_yytext);
-		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#line[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#[ \t]*[0-9]*\n {
-		  idl_parse_line_and_file(ace_yytext);
-	        }
-^#[ \t]*ident.*\n	{
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-\/\/.*\n	{
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-"/*"		{
-		  for(;;) {
-		    char c = yyinput();
-		    if (c == '*') {
-		      char next = yyinput();
-		      if (next == '/')
-			break;
-		      else
-			yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-[ \t]*		;
-\n		{
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-.		return ace_yytext [0];
-
-%%
-	/* subroutines */
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-stripped_name(UTL_String *fn)
-{
-    char	*n = fn->get_string();
-    long	l;
-
-    if (n == NULL)
-	return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * Parse a #line statement generated by the C preprocessor
- */
-static void
-idl_parse_line_and_file(char *buf)
-{
-  char		*r = buf;
-  char 		*h;
-  UTL_String	*nm;
-
-  /* Skip initial '#' */
-  if (*r != '#')
-    return;
-  else
-    r++;
-
-  /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */
-
-  if (ACE_OS::strncmp (r, "line", 4) == 0)
-    r += 5;
-
-  /* Find line number */
-  while (*r == ' ' || *r == '\t')
-    r++;
-  h = r;
-  for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
-    continue;
-  *r++ = 0;
-  idl_global->set_lineno(idl_atoi(h, 10));
-
-  /* Find file name, if present */
-  for (; *r != '"'; r++)
-    if (*r == '\n' || *r == '\0')
-      return;
-
-  h = ++r;
-  for (; *r != '"'; r++)
-    continue;
-  *r = 0;
-  if (*h == '\0')
-    idl_global->set_filename(new String("standard input"));
-  else
-    {
-      long i;
-      long j;
-
-      // Put Microsoft-style pathnames into a canonical form.
-      for (i = 0, j = 0; h[j] != '\0'; i++, j++)
-        {
-          if (h[j] == '\\' && h[j + 1] == '\\')
-	    j++;
-
-	  h[i] = h[j];
-        }
-      h[i] = '\0';
-      idl_global->set_filename(new String(h));
-    }
-  idl_global->set_in_main_file(
-    (idl_global->filename()->compare(idl_global->real_filename())) ?
-    I_TRUE :
-    I_FALSE
-  );
-  /*
-   * If it's an import file store the stripped name for the BE to use
-   */
-  if (!(idl_global->in_main_file()) && idl_global->import()) {
-    nm = new UTL_String(stripped_name(idl_global->filename()));
-    idl_global->store_include_file_name(nm);
-  }
-}
-
-/*
- * Store a #pragma line into the list of pragmas
- */
-static void
-idl_store_pragma(char *buf)
-{
-  char *cp = buf + 1;
-  while(*cp != 'p')
-    cp++;
-  while(*cp != ' ' && *cp != '\t')
-    cp++;
-  while(*cp == ' ' || *cp == '\t')
-    cp++;
-  char pragma[80];
-  char *pp = pragma;
-  while(*cp != '\n') {
-    *pp++ = *cp++;
-  }
-  *pp = 0;
-  if (strcmp(pragma, "import") == 0) {
-    idl_global->set_import(I_TRUE);
-    return;
-  }
-  if (strcmp(pragma, "include") == 0) {
-    idl_global->set_import(I_FALSE);
-    return;
-  }
-  UTL_StrList *p = idl_global->pragmas();
-  if (p == NULL)
-    idl_global->set_pragmas(new UTL_StrList(new String(buf), NULL));
-  else {
-    p->nconc(new UTL_StrList(new String(buf), NULL));
-    idl_global->set_pragmas(p);
-  }
-}
-
-/*
- * idl_atoi - Convert a string of digits into an integer according to base b
- */
-static long
-idl_atoi(char *s, long b)
-{
-	long	r = 0;
-	long	negative = 0;
-
-	if (*s == '-') {
-	  negative = 1;
-	  s++;
-	}
-	if (b == 8 && *s == '0')
-	  s++;
-	else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-	  s += 2;
-
-	for (; *s; s++)
-	  if (*s <= '9' && *s >= '0')
-	    r = (r * b) + (*s - '0');
-	  else if (b > 10 && *s <= 'f' && *s >= 'a')
-	    r = (r * b) + (*s - 'a' + 10);
-	  else if (b > 10 && *s <= 'F' && *s >= 'A')
-	    r = (r * b) + (*s - 'A' + 10);
-	  else
-	    break;
-
-	if (negative)
-	  r *= -1;
-
-	return r;
-}
-
-/*
- * Convert a string to a float; atof doesn't seem to work, always.
- */
-static double
-idl_atof(char *s)
-{
-	char    *h = s;
-	double	d = 0.0;
-	double	f = 0.0;
-	double	e, k;
-	long	neg = 0, negexp = 0;
-
-	ACE_UNUSED_ARG (f);
-	ACE_UNUSED_ARG (h);
-
-	if (*s == '-') {
-	  neg = 1;
-	  s++;
-	}
-	while (*s >= '0' && *s <= '9') {
-		d = (d * 10) + *s - '0';
-		s++;
-	}
-	if (*s == '.') {
-		s++;
-		e = 10;
-		while (*s >= '0' && *s <= '9') {
-			d += (*s - '0') / (e * 1.0);
-			e *= 10;
-			s++;
-		}
-	}
-	if (*s == 'e' || *s == 'E') {
-		s++;
-		if (*s == '-') {
-			negexp = 1;
-			s++;
-		} else if (*s == '+')
-			s++;
-		e = 0;
-		while (*s >= '0' && *s <= '9') {
-			e = (e * 10) + *s - '0';
-			s++;
-		}
-		if (e > 0) {
-			for (k = 1; e > 0; k *= 10, e--);
-			if (negexp)
-				d /= k;
-			else
-				d *= k;
-		}
-	}
-
-	if (neg) d *= -1.0;
-
-	return d;
-}
-
-/*
- * Convert (some) escaped characters into their ascii values
- */
-static char
-idl_escape_reader(
-    char *str
-)
-{
-    if (str[0] != '\\') {
-	return str[0];
-    }
-
-    switch (str[1]) {
-      case 'n':
-	return '\n';
-      case 't':
-	return '\t';
-      case 'v':
-	return '\v';
-      case 'b':
-	return '\b';
-      case 'r':
-	return '\r';
-      case 'f':
-	return '\f';
-      case 'a':
-	return '\a';
-      case '\\':
-	return '\\';
-      case '\?':
-	return '?';
-      case '\'':
-	return '\'';
-      case '"':
-	return '"';
-      case 'x':
-	{
-	    int i;
-	    // hex value
-	    for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[2], 16);
-	    str[i] = save;
-	    return out;
-	}
-	break;
-      default:
-	// check for octal value
-	if (str[1] >= '0' && str[1] <= '7') {
- 	    int i;
-	    for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[1], 8);
-	    str[i] = save;
-	    return out;
-	} else {
-	  return str[1] - 'a';
-	}
-	break;
-    }
-}
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
deleted file mode 100644
index ba695d1b8d8..00000000000
--- a/TAO/TAO_IDL/fe/idl.yy
+++ /dev/null
@@ -1,2297 +0,0 @@
-
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.yy - YACC grammar for IDL 1.1
- */
-
-/* Declarations */
-
-%{
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include <stdio.h>
-
-#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern	"C" int yywrap();
-#endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-
-void yyerror (char *);
-int yylex (void);
-extern "C" int yywrap (void);
-extern char yytext[];
-extern int yyleng;
-#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-// Force the pretty debugging code to compile.
-#define YYDEBUG 1
-%}
-
-/*
- * Declare the type of values in the grammar
- */
-
-%union {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-}
-
-/*
- * Token types: These are returned by the lexer
- */
-
-%token <strval>	IDENTIFIER
-
-%token		IDL_CONST
-%token		IDL_MODULE
-%token		IDL_INTERFACE
-%token		IDL_TYPEDEF
-%token		IDL_LONG
-%token		IDL_SHORT
-%token		IDL_UNSIGNED
-%token		IDL_DOUBLE
-%token		IDL_FLOAT
-%token		IDL_CHAR
-%token		IDL_WCHAR
-%token		IDL_OCTET
-%token		IDL_BOOLEAN
-%token		IDL_ANY
-%token		IDL_STRUCT
-%token		IDL_UNION
-%token		IDL_SWITCH
-%token		IDL_ENUM
-%token		IDL_SEQUENCE
-%token		IDL_STRING
-%token		IDL_WSTRING
-%token		IDL_EXCEPTION
-%token		IDL_CASE
-%token		IDL_DEFAULT
-%token		IDL_READONLY
-%token		IDL_ATTRIBUTE
-%token		IDL_ONEWAY
-%token		IDL_IDEMPOTENT
-%token		IDL_VOID
-%token		IDL_IN
-%token		IDL_OUT
-%token		IDL_INOUT
-%token		IDL_RAISES
-%token		IDL_CONTEXT
-%token          IDL_NATIVE
-
-%token <ival>	IDL_INTEGER_LITERAL
-%token <sval>	IDL_STRING_LITERAL
-%token <cval>	IDL_CHARACTER_LITERAL
-%token <dval>	IDL_FLOATING_PT_LITERAL
-%token		IDL_TRUETOK
-%token		IDL_FALSETOK
-
-%token <strval>	IDL_SCOPE_DELIMITOR
-%token		IDL_LEFT_SHIFT
-%token		IDL_RIGHT_SHIFT
-
-/*
- * These are production names:
- */
-
-%type <dcval>	type_spec simple_type_spec constructed_type_spec
-%type <dcval>	template_type_spec sequence_type_spec string_type_spec
-%type <dcval>	struct_type enum_type switch_type_spec union_type
-%type <dcval>	array_declarator op_type_spec seq_head wstring_type_spec
-%type <dcval>   param_type_spec
-
-%type <idlist>	scoped_name
-%type <slval>	opt_context at_least_one_string_literal
-%type <slval>	string_literals
-
-%type <nlval>	at_least_one_scoped_name scoped_names inheritance_spec
-%type <nlval>	opt_raises
-
-%type <elval>	at_least_one_array_dim array_dims
-
-%type <llval>	at_least_one_case_label case_labels
-
-%type <dlval>	at_least_one_declarator declarators
-%type <dlval>   at_least_one_simple_declarator simple_declarators
-
-%type <ihval>	interface_header
-
-%type <exval>	expression const_expr or_expr xor_expr and_expr shift_expr
-%type <exval>	add_expr mult_expr unary_expr primary_expr literal
-%type <exval>	positive_int_expr array_dim
-
-%type <ulval>	case_label
-
-%type <ffval>	element_spec
-
-%type <etval>	const_type integer_type char_type boolean_type
-%type <etval>	floating_pt_type any_type signed_int
-%type <etval>	unsigned_int base_type_spec octet_type
-
-%type <dival>	direction
-
-%type <ofval>	opt_op_attribute
-
-%type <deval>	declarator simple_declarator complex_declarator
-
-%type <bval>	opt_readonly
-
-%type <idval>	interface_decl id
-
-%type <ival> type_dcl
-%%
-
-/*
- * Production starts here
- */
-start :	definitions ;
-
-definitions
-	: definition definitions
-	| /* empty */
-	;
-
-definition
-	: type_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| const_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| exception
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| interface_def
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| module
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-module	: IDL_MODULE
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-	  }
-	  IDENTIFIER
-	  {
-	    UTL_ScopedName 	*n =
-		new UTL_ScopedName(new Identifier($3, 1, 0, I_FALSE), NULL);
-	    AST_Module		*m = NULL;
-	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();
-
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-	    /*
-	     * Make a new module and add it to the enclosing scope
-	     */
-	    if (s != NULL) {
-	      m = idl_global->gen()->create_module(n, p);
-	      (void) s->fe_add_module(m);
-	    }
-	    /*
-	     * Push it on the stack
-	     */
-	    idl_global->scopes()->push(m);
-	  }
-          '{'
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-	  }
-	  definitions
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-	  }
-	  '}'
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-	    /*
-	     * Finished with this module - pop it from the scope stack
-	     */
-	    idl_global->scopes()->pop();
-	  }
-	  ;
-
-interface_def
-	: interface
-	| forward
-	;
-
-interface :
-	interface_header
-	{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  AST_Decl	*v = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  /*
-	   * Make a new interface node and add it to its enclosing scope
-	   */
-	  if (s != NULL && $1 != NULL) {
-	    i = idl_global->gen()->create_interface($1->interface_name(),
-						    $1->inherits(),
-						    $1->n_inherits(),
-						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits($1->inherits());
-		    fd->set_n_inherits($1->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
-	    /*
-	     * Add the interface to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
-	exports
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-interface_decl:
-	 IDL_INTERFACE
-	 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-	 }
-	 id
-	 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-	   $$ = $3;
-	 }
-	;
-
-interface_header :
-	interface_decl inheritance_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-	  /*
-	   * Create an AST representation of the information in the header
-	   * part of an interface - this representation contains a computed
-	   * list of all interfaces which this interface inherits from,
-	   * recursively
-	   */
-	  $$ = new FE_InterfaceHeader(new UTL_ScopedName($1, NULL), $2);
-	}
-	;
-
-inheritance_spec
-	: ':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        }
-	  at_least_one_scoped_name
-	{
-	  $$ = $3;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-exports
-	: exports export
-	| /* EMPTY */
-	;
-
-export
-	: type_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| const_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| exception
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| attribute
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| operation
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-at_least_one_scoped_name :
-	scoped_name scoped_names
-	{
-	  $$ = new UTL_NameList($1, $2);
-	}
-	;
-
-scoped_names
-	: scoped_names
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        }
-	  scoped_name
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_NameList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_NameList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-scoped_name
-	: id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $$ = new UTL_IdList($1, NULL);
-	}
-	| IDL_SCOPE_DELIMITOR
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-	  id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $$ = new UTL_IdList(new Identifier($1, 1, 0, I_FALSE),
-			      new UTL_IdList($3, NULL));
-	}
-	| scoped_name
-	  IDL_SCOPE_DELIMITOR
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-	  id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $1->nconc(new UTL_IdList($4, NULL));
-	  $$ = $1;
-	}
-	;
-
-id: IDENTIFIER
-        {
-            $$ = new Identifier($1, 1, 0, I_FALSE);
-        }
-        ;
-
-forward :
-	interface_decl
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($1, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * interface. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_interface_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
-	;
-
-const_dcl :
-	IDL_CONST
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
-        }
-	const_type
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        }
-	'='
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        }
-	expression
-	{
-	  UTL_ScopedName	*n = new UTL_ScopedName($5, NULL);
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Constant		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-	  /*
-	   * Create a node representing a constant declaration. Store
-	   * it in the enclosing scope
-	   */
-	  if ($9 != NULL && s != NULL) {
-	    if ($9->coerce($3) == NULL)
-	      idl_global->err()->coercion_error($9, $3);
-	    else {
-	      c =
-		idl_global->gen()->create_constant($3, $9, n, p);
-	      (void) s->fe_add_constant(c);
-	    }
-	  }
-	}
-	;
-
-const_type
-	: integer_type
-	| char_type
-	| octet_type
-	| boolean_type
-	| floating_pt_type
-	| string_type_spec
-	{
-	  $$ = AST_Expression::EV_string;
-	}
-	| wstring_type_spec
-	{
-	  $$ = AST_Expression::EV_wstring;
-        }
-	| scoped_name
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*c = NULL;
-	  AST_Typedef		*t = NULL;
-
-	  /*
-	   * If the constant's type is a scoped name, it must resolve
-	   * to a scalar constant type
-	   */
-	  if (s != NULL && (d = s->lookup_by_name($1, I_TRUE)) != NULL) {
-	    /*
-	     * Look through typedefs
-	     */
-	    while (d->node_type() == AST_Decl::NT_typedef) {
-	      t = AST_Typedef::narrow_from_decl(d);
-	      if (t == NULL)
-	        break;
-	      d = t->base_type();
-	    }
-	    if (d == NULL)
-	      $$ = AST_Expression::EV_any;
-	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
-	      c = AST_PredefinedType::narrow_from_decl(d);
-	      if (c != NULL) {
-	         $$ = idl_global->PredefinedTypeToExprType(c->pt());
-	      } else {
-	         $$ = AST_Expression::EV_any;
-	      }
-	    } else
-	      $$ = AST_Expression::EV_any;
-	  } else
-	    $$ = AST_Expression::EV_any;
-	}
-	;
-
-expression : const_expr	;
-
-const_expr : or_expr ;
-
-or_expr : xor_expr
-	| or_expr '|' xor_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_or, $1, $3);
-	}
-	;
-
-xor_expr
-	: and_expr
-	| xor_expr '^' and_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_xor, $1, $3);
-	}
-	;
-
-and_expr
-	: shift_expr
-	| and_expr '&' shift_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_and, $1, $3);
-	}
-	;
-
-shift_expr
-	: add_expr
-	| shift_expr IDL_LEFT_SHIFT add_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_right,$1,$3);
-	}
-	| shift_expr IDL_RIGHT_SHIFT add_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_left,$1,$3);
-	}
-	;
-
-add_expr
-	: mult_expr
-	| add_expr '+' mult_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_add, $1, $3);
-	}
-	| add_expr '-' mult_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_minus,$1,$3);
-	}
-	;
-
-mult_expr
-	: unary_expr
-	| mult_expr '*' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_mul, $1, $3);
-	}
-	| mult_expr '/' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_div, $1, $3);
-	}
-	| mult_expr '%' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_mod, $1, $3);
-	}
-	;
-
-unary_expr
-	: primary_expr
-	| '+' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-					      $2,
-					      NULL);
-	}
-	| '-' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-					      $2,
-					      NULL);
-	}
-	| '~' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-					      $2,
-					      NULL);
-	}
-	;
-
-primary_expr
-	: scoped_name
-	{
-	  /*
-	   * An expression which is a scoped name is not resolved now,
-	   * but only when it is evaluated (such as when it is assigned
-	   * as a constant value)
-	   */
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| literal
-	| '(' const_expr ')'
-	{
-	  $$ = $2;
-	}
-	;
-
-literal
-	: IDL_INTEGER_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_STRING_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_CHARACTER_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_FLOATING_PT_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_TRUETOK
-	{
-	  $$ = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-					    AST_Expression::EV_bool);
-	}
-	| IDL_FALSETOK
-	{
-	  $$ = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-					    AST_Expression::EV_bool);
-	}
-	;
-
-positive_int_expr :
-	const_expr
-	{
-	    $1->evaluate(AST_Expression::EK_const);
-	    $$ = idl_global->gen()->create_expr($1, AST_Expression::EV_ulong);
-	}
-	;
-
-type_dcl
-	: IDL_TYPEDEF
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-	  }
-	  type_declarator {$$ = 0;}
-	| struct_type { $$ = 0;}
-	| union_type  { $$ = 0;}
-	| enum_type   { $$ = 0;}
-        | IDL_NATIVE simple_declarator
-        {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Native		*node = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
-	  /*
-	   * Create a node representing a Native and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    node = idl_global->gen()->create_native ($2->name (), p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_native (node);
-	  }
-	}
-	;
-
-type_declarator :
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
-        }
-	at_least_one_declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l;
-	  FE_Declarator		*d = NULL;
-	  AST_Typedef		*t = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-	  /*
-	   * Create a list of type renamings. Add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_DecllistActiveIterator($3);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		      continue;
-              AST_Type * tp = d->compose($1);
-              if (tp == NULL)
-		     continue;
-	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
-              // if this is a sequence, it is a named one and hence we
-	      // set its name to the same as the declarator. However
-	      // @@ (ASG) note that if we had a scenario of the kind
-              // typedef sequence<...> X, Y, Z; then we must make a
-	      // new sequence node for each name. Not handled currently.
-              if (tp->node_type () == AST_Decl::NT_sequence)
-               {
-                 tp->set_name (d->name ());
-               }
-	      (void) s->fe_add_typedef(t);
-	    }
-	    delete l;
-	  }
-	}
-	;
-
-type_spec
-	: simple_type_spec
-	| constructed_type_spec
-	;
-
-simple_type_spec
-	: base_type_spec
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| template_type_spec
-	| scoped_name
-	{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name($1, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error($1);
-	  $$ = d;
-	}
-	;
-
-base_type_spec
-	: integer_type
-	| floating_pt_type
-	| char_type
-	| boolean_type
-	| octet_type
-	| any_type
-	;
-
-template_type_spec
-	: sequence_type_spec
-	| string_type_spec
-	| wstring_type_spec
-	;
-
-constructed_type_spec
-	: struct_type
-	| union_type
-	| enum_type
-	;
-
-at_least_one_declarator :
-	declarator declarators
-	{
-	  $$ = new UTL_DeclList($1, $2);
-	}
-	;
-
-declarators
-	: declarators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-	  declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_DeclList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_DeclList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-declarator
-	: simple_declarator
-	| complex_declarator
-	;
-
-at_least_one_simple_declarator :
-	simple_declarator simple_declarators
-	{
-	  $$ = new UTL_DeclList($1, $2);
-	}
-	;
-
-simple_declarators
-	: simple_declarators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-	  simple_declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_DeclList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_DeclList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-simple_declarator :
-	id
-	{
-	  $$ = new FE_Declarator(new UTL_ScopedName($1, NULL),
-				 FE_Declarator::FD_simple, NULL);
-	}
-	;
-
-complex_declarator :
-	array_declarator
-	{
-	  $$ = new FE_Declarator(new UTL_ScopedName($1->local_name(), NULL),
-				 FE_Declarator::FD_complex,
-				 $1);
-	}
-	;
-
-integer_type
-	: signed_int
-	| unsigned_int
-	;
-
-signed_int
-	: IDL_LONG
-	{
-	  $$ = AST_Expression::EV_long;
-	}
-	| IDL_LONG IDL_LONG
-	{
-	  $$ = AST_Expression::EV_longlong;
-        }
-	| IDL_SHORT
-	{
-	  $$ = AST_Expression::EV_short;
-	}
-	;
-
-unsigned_int
-	: IDL_UNSIGNED IDL_LONG
-	{
-	  $$ = AST_Expression::EV_ulong;
-	}
-	| IDL_UNSIGNED IDL_LONG IDL_LONG
-	{
-	  $$ = AST_Expression::EV_ulonglong;
-        }
-	| IDL_UNSIGNED IDL_SHORT
-	{
-	  $$ = AST_Expression::EV_ushort;
-	}
-	;
-
-floating_pt_type
-	: IDL_DOUBLE
-	{
-	  $$ = AST_Expression::EV_double;
-	}
-	| IDL_FLOAT
-	{
-	  $$ = AST_Expression::EV_float;
-	}
-	| IDL_LONG IDL_DOUBLE
-	{
-	  $$ = AST_Expression::EV_longdouble;
-        }
-	;
-
-char_type
-	: IDL_CHAR
-	{
-	  $$ = AST_Expression::EV_char;
-	}
-	| IDL_WCHAR
-	{
-	  $$ = AST_Expression::EV_wchar;
-        }
-	;
-
-octet_type
-	: IDL_OCTET
-	{
-          $$ = AST_Expression::EV_octet;
-	}
-	;
-
-boolean_type
-	: IDL_BOOLEAN
-	{
-	  $$ = AST_Expression::EV_bool;
-        }
-	;
-
-any_type
-	: IDL_ANY
-	{
-	  $$ = AST_Expression::EV_any;
-	}
-	;
-
-struct_type :
-	IDL_STRUCT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
-        }
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Structure		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-	  /*
-	   * Create a node representing a struct declaration. Add it
-	   * to the enclosing scope
-	   */
-	  if (s != NULL) {
-	    d = idl_global->gen()->create_structure(n, p);
-	    (void) s->fe_add_structure(d);
-	  }
-	  /*
-	   * Push the scope of the struct on the scopes stack
-	   */
-	  idl_global->scopes()->push(d);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
-        }
-	at_least_one_member
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-	  /*
-	   * Done with this struct. Pop its scope off the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ =
-	      AST_Structure::narrow_from_scope(
-				   idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-at_least_one_member : member members ;
-
-members
-	: members member
-	| /* EMPTY */
-	;
-
-member	:
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
-        }
-	at_least_one_declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
-        }
-	';'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  FE_Declarator		*d = NULL;
-	  AST_Field		*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if ($1 != NULL && AST_illegal_recursive_type($1))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, $1);
-	  /*
-	   * Create a node representing a struct or exception member
-	   * Add it to the enclosing scope
-	   */
-	  else if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_DecllistActiveIterator($3);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
- 	      AST_Type *tp = d->compose($1);
-	      if (tp == NULL)
-		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
-	      (void) s->fe_add_field(f);
-	    }
-	    delete l;
-	  }
-	}
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-union_type :
-	IDL_UNION
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
-        }
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
-        }
-	IDL_SWITCH
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
-        }
-	'('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
-        }
-	switch_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
-        }
-	')'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Union		*u = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-	  /*
-	   * Create a node representing a union. Add it to its enclosing
-	   * scope
-	   */
-	  if ($9 != NULL && s != NULL) {
- 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl($9);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type($9);
-            } else {
-	      u = idl_global->gen()->create_union(tp, n, p);
-	      (void) s->fe_add_union(u);
- 	    }
-	  }
-	  /*
-	   * Push the scope of the union on the scopes stack
-	   */
-	  idl_global->scopes()->push(u);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
-        }
-	at_least_one_case_branch
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-	  /*
-	   * Done with this union. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ =
-	      AST_Union::narrow_from_scope(
-				idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-switch_type_spec :
-	integer_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| char_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| octet_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| boolean_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| enum_type
-	| scoped_name
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*p = NULL;
-	  AST_Typedef		*t = NULL;
-	  long			found = I_FALSE;
-
-	  /*
-	   * The discriminator is a scoped name. Try to resolve to
-	   * one of the scalar types or to an enum. Thread through
-	   * typedef's to arrive at the base type at the end of the
-	   * chain
-	   */
-	  if (s != NULL && (d = s->lookup_by_name($1, I_TRUE)) != NULL) {
-	    while (!found) {
-	      switch (d->node_type()) {
-	      case AST_Decl::NT_enum:
-		$$ = d;
-		found = I_TRUE;
-		break;
-	      case AST_Decl::NT_pre_defined:
-		p = AST_PredefinedType::narrow_from_decl(d);
-		if (p != NULL) {
-		  switch (p->pt()) {
-		  case AST_PredefinedType::PT_long:
-		  case AST_PredefinedType::PT_ulong:
-		  case AST_PredefinedType::PT_longlong:
-		  case AST_PredefinedType::PT_ulonglong:
-		  case AST_PredefinedType::PT_short:
-		  case AST_PredefinedType::PT_char:
-		  case AST_PredefinedType::PT_wchar:
-		  case AST_PredefinedType::PT_octet:
-		  case AST_PredefinedType::PT_boolean:
-		    $$ = p;
-		    found = I_TRUE;
-		    break;
-		  default:
-		    $$ = NULL;
-		    found = I_TRUE;
-		    break;
-		  }
-		}
-		break;
-	      case AST_Decl::NT_typedef:
-		t = AST_Typedef::narrow_from_decl(d);
-		if (t != NULL) d = t->base_type();
-		break;
-	      default:
-		$$ = NULL;
-		found = I_TRUE;
-		break;
-	      }
-	    }
-	  } else
-	    $$ = NULL;
-
-	  if ($$ == NULL)
-	    idl_global->err()->lookup_error($1);
-	}
-	;
-
-at_least_one_case_branch : case_branch case_branches ;
-
-case_branches
-	: case_branches case_branch
-	| /* empty */
-	;
-
-case_branch :
-	at_least_one_case_label
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
-        }
-	element_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
-        }
-	';'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_LabellistActiveIterator *l = NULL;
-	  AST_UnionLabel	*d = NULL;
-	  AST_UnionBranch	*b = NULL;
-	  AST_Field		*f = $3;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-	  /*
-	   * Create several nodes representing branches of a union.
-	   * Add them to the enclosing scope (the union scope)
-	   */
-	  if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_LabellistActiveIterator($1);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      b = idl_global->gen()->create_union_branch(d,
-						      f->field_type(),
-						      f->name(),
-						      f->pragmas());
-	      (void) s->fe_add_union_branch(b);
-	    }
-	    delete l;
-	  }
-	}
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-at_least_one_case_label :
-	case_label case_labels
-	{
-	  $$ = new UTL_LabelList($1, $2);
-	}
-	;
-
-case_labels
-	: case_labels case_label
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_LabelList($2, NULL);
-	  else {
-	    $1->nconc(new UTL_LabelList($2, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-case_label
-	: IDL_DEFAULT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
-        }
-	  ':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  $$ = idl_global->gen()->
-	            create_union_label(AST_UnionLabel::UL_default,
-				       NULL);
-	}
-	| IDL_CASE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
-        }
-	  const_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
-        }
-	':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  $$ = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-						     $3);
-	}
-	;
-
-element_spec :
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
-        }
-	declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if ($1 != NULL && AST_illegal_recursive_type($1))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, $1);
-	  /*
-	   * Create a field in a union branch
-	   */
-	  else if ($1 == NULL || $3 == NULL)
-	    $$ = NULL;
-	  else {
-	    AST_Type *tp = $3->compose($1);
-	    if (tp == NULL)
-	      $$ = NULL;
- 	    else
-	      $$ = idl_global->gen()->create_field(tp,
-			        		   $3->name(),
-			        		   idl_global->pragmas());
-	  }
-	}
-	;
-
-enum_type :
-	IDL_ENUM
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
-        }
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Enum		*e = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-	  /*
-	   * Create a node representing an enum and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_enum(n, p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_enum(e);
-	  }
-	  /*
-	   * Push the enum scope on the scopes stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
-        }
-	at_least_one_enumerator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-	  /*
-	   * Done with this enum. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-at_least_one_enumerator : enumerator enumerators ;
-
-enumerators
-	: enumerators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
-        }
-	  enumerator
-	| /* EMPTY */
-	;
-
-enumerator :
-	IDENTIFIER
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier($1, 1, 0, I_FALSE), NULL);
-	  AST_EnumVal		*e = NULL;
-	  AST_Enum		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  /*
-	   * Create a node representing one enumerator in an enum
-	   * Add it to the enclosing scope (the enum scope)
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL)
-	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-	    (void) s->fe_add_enum_val(e);
-	  }
-	}
-	;
-
-sequence_type_spec
-        : seq_head
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
-        }
-	positive_int_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
-        }
-	  '>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else if ($1 == NULL) {
-	    $$ = NULL;
-	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl($1);
-	    if (tp == NULL)
-	      $$ = NULL;
-	    else {
-	      $$ = idl_global->gen()->create_sequence($4, tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl($$));
- 	    }
-	  }
-	}
-	| seq_head
-	  '>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if ($1 == NULL)
-	    $$ = NULL;
-	  else {
-	    AST_Type *tp = AST_Type::narrow_from_decl($1);
-	    if (tp == NULL)
-	      $$ = NULL;
-            else {
-	      $$ =
-	        idl_global->gen()->create_sequence(
-		  	     idl_global->gen()->create_expr((unsigned long) 0),
-			     tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl($$));
-	    }
-	  }
-	}
-	;
-
-seq_head:
-	IDL_SEQUENCE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-	  /*
-	   * Push a sequence marker on scopes stack
-	   */
-	  idl_global->scopes()->push(NULL);
-	}
-	'<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
-        }
-	simple_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-	  $$ = $5;
-        }
-	;
-
-string_type_spec
-	: string_head
-	  '<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-	positive_int_expr
-	{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-	'>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else {
-	    $$ = idl_global->gen()->create_string($4);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl($$));
-	  }
-	}
-	| string_head
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  $$ =
-	    idl_global->gen()->create_string(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl($$));
-	}
-	;
-
-string_head:
-	IDL_STRING
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-	;
-
-wstring_type_spec
-	: wstring_head
-	  '<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-	positive_int_expr
-	{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-	'>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else {
-	    $$ = idl_global->gen()->create_wstring($4);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl($$));
-	  }
-	}
-	| wstring_head
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  $$ =
-	    idl_global->gen()->create_wstring(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl($$));
-	}
-	;
-
-wstring_head:
-	IDL_WSTRING
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-	;
-
-array_declarator :
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
-        }
-	at_least_one_array_dim
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-	  /*
-	   * Create a node representing an array
-	   */
-	  if ($3 != NULL) {
-	     $$ = idl_global->gen()->create_array(new UTL_ScopedName($1, NULL),
-						  $3->length(), $3);
-	  }
-	}
-	;
-
-at_least_one_array_dim :
-	array_dim array_dims
-	{
-	  $$ = new UTL_ExprList($1, $2);
-	}
-	;
-
-array_dims
-	: array_dims array_dim
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_ExprList($2, NULL);
-	  else {
-	    $1->nconc(new UTL_ExprList($2, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-array_dim :
-	'['
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
-        }
-	positive_int_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
-        }
-	']'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-	  /*
-	   * Array dimensions are expressions which must be coerced to
-	   * positive integers
-	   */
-	  if ($3 == NULL || $3->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($3, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else
-	    $$ = $3;
-	}
-	;
-
-attribute:
-	opt_readonly
-	IDL_ATTRIBUTE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
-        }
-	param_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
-        }
-	at_least_one_simple_declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  AST_Attribute		*a = NULL;
-	  FE_Declarator		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-	  /*
-	   * Create nodes representing attributes and add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && $4 != NULL && $6 != NULL) {
-	    l = new UTL_DecllistActiveIterator($6);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      AST_Type *tp = d->compose($4);
- 	      if (tp == NULL)
-	 	continue;
-	      a = idl_global->gen()->create_attribute($1, tp, d->name(), p);
-	      /*
-	       * Add one attribute to the enclosing scope
-	       */
-	      (void) s->fe_add_attribute(a);
-	    }
-	    delete l;
-	  }
-	}
-	;
-
-opt_readonly
-	: IDL_READONLY
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-	  $$ = I_TRUE;
-	}
-	| /* EMPTY */
-	{
-	  $$ = I_FALSE;
-	}
-	;
-
-exception :
-	IDL_EXCEPTION
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-	}
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Exception		*e = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-	  /*
-	   * Create a node representing an exception and add it to
-	   * the enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_exception(n, p);
-	    (void) s->fe_add_exception(e);
-	  }
-	  /*
-	   * Push the exception scope on the scope stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        }
-	members
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-	  /*
-	   * Done with this exception. Pop its scope from the scope stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-operation :
-	opt_op_attribute
-	op_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
-        }
-	IDENTIFIER
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier($4, 1, 0, I_FALSE), NULL);
-	  AST_Operation		*o = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-	  /*
-	   * Create a node representing an operation on an interface
-	   * and add it to its enclosing scope
-	   */
-	  if (s != NULL && $2 != NULL) {
-	    AST_Type *tp = AST_Type::narrow_from_decl($2);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type($2);
-            } else if (tp->node_type() == AST_Decl::NT_except) {
-              idl_global->err()->not_a_type($2);
-            } else {
-	      o = idl_global->gen()->create_operation(tp, $1, n, p);
-	      (void) s->fe_add_operation(o);
-	    }
-	  }
-	  /*
-	   * Push the operation scope onto the scopes stack
-	   */
-	  idl_global->scopes()->push(o);
-	}
-	parameter_list
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
-        }
-	opt_raises
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
-        }
-	opt_context
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Operation		*o = NULL;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-	  /*
-	   * Add exceptions and context to the operation
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-	    o = AST_Operation::narrow_from_scope(s);
-
-	    if ($8 != NULL && o != NULL)
-	      (void) o->fe_add_exceptions($8);
-	    if ($10 != NULL)
-	      (void) o->fe_add_context($10);
-	  }
-	  /*
-	   * Done with this operation. Pop its scope from the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-opt_op_attribute
-	: IDL_ONEWAY
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  $$ = AST_Operation::OP_oneway;
-	}
-	| IDL_IDEMPOTENT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  $$ = AST_Operation::OP_idempotent;
-	}
-	| /* EMPTY */
-	{
-	  $$ = AST_Operation::OP_noflags;
-	}
-	;
-
-op_type_spec
-	: param_type_spec
-	| IDL_VOID
-	{
-	  $$ =
-	    idl_global->scopes()->bottom()
-	       ->lookup_primitive_type(AST_Expression::EV_void);
-	}
-	;
-
-parameter_list
-	: '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-	| '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-	  at_least_one_parameter
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-	;
-
-at_least_one_parameter : parameter parameters ;
-
-parameters
-	: parameters
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
-        }
-	  parameter
-	| /* EMPTY */
-	;
-
-parameter :
-	direction
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
-        }
-	param_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
-        }
-	declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Argument		*a = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-	  /*
-	   * Create a node representing an argument to an operation
-	   * Add it to the enclosing scope (the operation scope)
-	   */
-	  if ($3 != NULL && $5 != NULL && s != NULL) {
-	    AST_Type *tp = $5->compose($3);
-	    if (tp != NULL) {
-	      a = idl_global->gen()->create_argument($1, tp, $5->name(), p);
-	      (void) s->fe_add_argument(a);
-	    }
-	  }
-	}
-	;
-
-param_type_spec
-        : base_type_spec
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-        | string_type_spec
-        | scoped_name
-	{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name($1, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error($1);
-	  $$ = d;
-	}
-	;
-
-direction
-	: IDL_IN
-	{
-	  $$ = AST_Argument::dir_IN;
-	}
-	| IDL_OUT
-	{
-	  $$ = AST_Argument::dir_OUT;
-	}
-	| IDL_INOUT
-	{
-	  $$ = AST_Argument::dir_INOUT;
-	}
-	;
-
-opt_raises
-	: IDL_RAISES
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
-        }
-	  '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
-        }
-	  at_least_one_scoped_name
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-	  $$ = $5;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-opt_context
-	: IDL_CONTEXT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
-        }
-	  '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
-        }
-	  at_least_one_string_literal
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-	  $$ = $5;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-at_least_one_string_literal :
-	IDL_STRING_LITERAL string_literals
-	{
-	  $$ = new UTL_StrList($1, $2);
-	}
-	;
-
-string_literals
-	: string_literals
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
-        }
-	  IDL_STRING_LITERAL
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_StrList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_StrList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-%%
-/* programs */
-
-/*
- * ???
- */
-int
-yywrap()
-{
-  return 1;
-}
-
-/*
- * Report an error situation discovered in a production
- *
- * This does not do anything since we report all error situations through
- * idl_global->err() operations
- */
-void
-yyerror(char *)
-{
-}
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
deleted file mode 100644
index 39fc0908496..00000000000
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ /dev/null
@@ -1,2196 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
- */
-
-#define FLEX_SCANNER
-
-#include "ace/OS.h"
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#ifdef __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-
-#ifdef __TURBOC__
-#define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
-#ifndef const
-#define const
-#endif
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.
- */
-#define YY_START ((yy_start - 1) / 2)
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file".  Now included
- * only for backward compatibility with previous versions of flex.
- */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	extern int yywrap YY_PROTO(( void ));
-#ifdef __cplusplus
-	}
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	int yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-#if 0
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-static void yy_push_state YY_PROTO(( int new_state ));
-static void yy_pop_state YY_PROTO(( void ));
-static int yy_top_state YY_PROTO(( void ));
-#endif /* 0 */
-
-static void *yy_flex_alloc YY_PROTO(( unsigned int ));
-static void *yy_flex_realloc YY_PROTO(( void *, unsigned int ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define INITIAL 0
-typedef unsigned char YY_CHAR;
-typedef int yy_state_type;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-extern char yytext[];
-
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, const char *, int ));
-#endif
-
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( const char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = yy_cp - yy_bp; \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	if ( yyleng >= YYLMAX ) \
-		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \
-	yy_c_buf_p = yy_cp;
-
-#define YY_END_OF_BUFFER 62
-static const short int yy_accept[284] =
-    {   0,
-       58,   58,   62,   60,   58,   59,   60,   60,   60,   60,
-       45,   43,   60,   60,   60,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   60,   58,    0,   46,    0,
-        0,   45,   43,   57,    0,   41,   45,    0,    0,    0,
-       43,   39,   37,   38,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   34,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,    0,   54,    0,    0,
-        0,    0,    0,   47,    0,   47,    0,    0,   56,   41,
-
-        0,   41,    0,   42,   44,   40,   40,    1,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   35,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,    0,    0,
-        0,    0,    0,   49,   48,    0,    0,   41,   42,   40,
-       31,   40,   40,   18,   25,   40,   40,   40,   40,   12,
-       40,   40,   40,   40,   22,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   29,
-       40,   40,    0,    0,    0,    0,    0,   48,    0,   32,
-       40,   40,    9,   40,   40,   40,   40,   20,   33,   40,
-
-       40,   40,   28,   40,   40,   40,   40,   23,   40,   40,
-       40,   40,   16,   40,   40,   40,   52,    0,    0,    0,
-        0,   40,   40,   40,   40,   21,   40,   40,    2,   30,
-       36,    3,   40,   40,   13,   11,   17,   40,   40,   40,
-       40,   51,    0,    0,    0,    0,    0,    0,   40,   27,
-        7,   19,   40,   40,   40,   40,   10,   40,   26,   40,
-        0,   55,    0,    0,    0,   40,   40,   40,    4,   15,
-       24,   40,    0,    0,    0,    5,    6,    8,   14,   53,
-        0,   50,    0
-    } ;
-
-static const int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    1,    5,    6,    1,    1,    1,    7,    1,
-        1,    8,    9,    1,   10,   11,   12,   13,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,   16,    1,   17,
-        1,   18,    1,    1,   19,   20,   20,   20,   21,   22,
-       23,   23,   23,   23,   23,   24,   23,   23,   23,   23,
-       23,   25,   26,   27,   28,   23,   23,   29,   23,   23,
-        1,   30,    1,    1,   31,    1,   32,   33,   34,   35,
-
-       36,   37,   38,   39,   40,   23,   23,   41,   42,   43,
-       44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-       54,   23,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static const int yy_meta[55] =
-    {   0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    3,    3,    3,    1,    1,    1,    3,    3,
-        3,    3,    4,    4,    4,    4,    4,    4,    4,    1,
-        4,    3,    3,    3,    3,    3,    3,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4
-    } ;
-
-static const short int yy_base[294] =
-    {   0,
-        0,  444,  449,  451,   53,  451,  443,  417,   45,   53,
-       53,   58,  430,  428,  426,    0,  424,  417,   13,  397,
-       31,   40,   34,  399,  396,  394,  393,  404,   47,   56,
-       44,  381,  391,  389,   51,  105,   96,  427,  451,  424,
-       88,  100,  111,  451,  427,  141,  128,  155,  170,    0,
-      160,  451,  451,  451,    0,  405,  400,  373,  377,  381,
-      376,  391,  379,  384,  370,  369,  384,  373,   42,  373,
-      380,  365,  364,  376,  362,  370,  377,  362,  363,  359,
-      365,  359,   64,  363,  363,  352,  184,  451,  111,  189,
-      365,  359,  351,  451,  390,  389,  120,  392,  451,    0,
-
-      196,  451,  144,  199,    0,  368,  372,    0,  345,  350,
-      354,  342,   82,  356,  354,  344,  349,  352,  333,  346,
-      343,  330,  339,  342,  325,    0,  328,  340,  324,  326,
-       88,  323,  335,  326,  329,  333,  335,  319,  360,  359,
-      327,  319,  329,  451,  451,  187,  202,  213,  451,  339,
-        0,  319,  322,    0,    0,  308,  320,  305,  313,    0,
-      308,  303,  302,  303,    0,  308,  297,  298,  314,  309,
-      300,  307,  293,  298,  306,  305,  303,  294,  298,    0,
-      288,  294,  328,  157,  289,  295,  292,  451,  322,    0,
-      295,  295,    0,  273,  284,  288,  274,    0,    0,  285,
-
-      285,  284,    0,  265,  270,  274,  273,    0,  277,  265,
-      274,  276,    0,  268,  279,  266,  451,  205,  259,  228,
-      265,  256,  262,  255,  254,    0,  262,  269,    0,    0,
-        0,    0,  237,  238,    0,    0,    0,  220,  215,  199,
-      201,  451,  231,  235,  245,  251,  248,  201,  182,    0,
-        0,    0,  181,  188,  153,  159,    0,  155,    0,  158,
-      169,  451,  162,  146,  101,  112,  101,  104,    0,    0,
-        0,   88,  130,  120,  114,    0,    0,    0,    0,  451,
-      107,  451,  451,  266,  270,  272,  276,  280,   75,  284,
-      288,  292,  296
-
-    } ;
-
-static const short int yy_def[294] =
-    {   0,
-      283,    1,  283,  283,  283,  283,  284,  285,  283,  283,
-      283,  283,  283,  283,  283,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  283,  283,  284,  283,  283,
-      287,  283,  283,  283,  288,  283,  283,  283,  283,  289,
-      283,  283,  283,  283,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  283,  283,   36,  283,
-      283,  283,  283,  283,  283,  283,  283,  288,  283,   46,
-
-      283,  283,  283,  283,  289,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  290,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  290,  283,  283,  283,  283,  283,  283,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  283,  283,  283,  283,
-      283,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      286,  283,  283,  291,  283,  283,  283,  283,  286,  286,
-      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-      291,  283,  292,  283,  283,  286,  286,  286,  286,  286,
-      286,  286,  292,  283,  293,  286,  286,  286,  286,  283,
-      293,  283,    0,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283
-
-    } ;
-
-static const short int yy_nxt[506] =
-    {   0,
-        4,    5,    6,    5,    7,    4,    8,    4,    4,    9,
-        4,   10,   11,   12,   12,   13,   14,   15,   16,   16,
-       16,   17,   16,   16,   16,   16,   18,   16,   16,    4,
-        4,   19,   20,   21,   22,   23,   24,   16,   16,   25,
-       26,   27,   28,   29,   16,   16,   30,   31,   32,   33,
-       34,   35,   16,   16,   37,   58,   37,   42,   43,   43,
-       44,   59,   61,   46,   45,   47,   47,   48,   46,   62,
-       51,   51,   51,   49,   63,   64,   66,  105,   49,   78,
-       73,   50,   79,   65,   85,  119,   67,   76,   49,   74,
-      120,   77,   80,   49,   96,   81,   75,   37,   86,   37,
-
-       97,   97,  275,  134,  275,   50,   87,   88,   89,  282,
-       46,  135,   47,   47,   48,  139,  282,   90,   90,   90,
-       49,   46,  280,   51,   51,   51,  145,  174,   50,  156,
-      157,   49,  146,  146,  274,   49,  279,  175,   46,  278,
-       47,   47,   48,  277,   91,   92,   49,  276,   49,   93,
-      263,  283,   50,  100,  100,  100,  104,  104,  104,  217,
-      218,  101,  102,   49,  102,   46,  274,   48,   48,   48,
-       46,  262,   51,   51,   51,   49,  101,  102,  103,  103,
-       49,  102,  104,  104,  104,   87,   88,   89,  272,  271,
-       49,   88,  140,  188,  270,   49,   90,   90,   90,  189,
-
-      189,   90,   90,   90,  147,  147,  269,  242,  148,  148,
-      148,  104,  104,  104,  148,  148,  148,  243,  243,  243,
-      149,  268,  149,   91,  267,  148,  148,  148,   93,  245,
-      266,  246,  265,  242,  102,  149,  102,  262,  260,  149,
-      247,  247,  247,  243,  243,  243,  245,  259,  246,  102,
-      258,  264,  245,  102,  246,  263,  257,  247,  247,  247,
-      247,  247,  247,  247,  247,  247,   38,   38,   38,   38,
-       40,  256,   40,   40,   55,   55,   95,  255,   95,   95,
-       98,   98,   98,   98,  183,  183,  183,  183,  261,  261,
-      261,  261,  273,  273,  273,  273,  281,  281,  281,  281,
-
-      254,  253,  252,  251,  250,  249,  248,  244,  241,  240,
-      239,  238,  237,  236,  235,  234,  233,  232,  231,  230,
-      229,  228,  227,  226,  225,  224,  223,  222,  188,  221,
-      220,  219,  184,  216,  215,  214,  213,  212,  211,  210,
-      209,  208,  207,  206,  205,  204,  203,  202,  201,  200,
-      199,  198,  197,  196,  195,  194,  193,  192,  191,  190,
-      187,  186,  185,  139,  184,  182,  181,  180,  179,  178,
-      177,  176,  173,  172,  171,  170,  169,  168,  167,  166,
-      165,  164,  163,  162,  161,  160,  159,  158,  155,  154,
-      153,  152,  151,  150,   99,  144,  144,  143,  142,  141,
-
-      138,  137,  136,  133,  132,  131,  130,  129,  128,  127,
-      126,  125,  124,  123,  122,  121,  118,  117,  116,  115,
-      114,  113,  112,  111,  110,  109,  108,  107,  106,   99,
-       94,   39,   84,   83,   82,   72,   71,   70,   69,   68,
-       60,   57,   56,   54,   53,   52,   41,   39,  283,   36,
-        3,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-
-      283,  283,  283,  283,  283
-    } ;
-
-static const short int yy_chk[506] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    5,   19,    5,    9,    9,    9,
-       10,   19,   21,   11,   10,   11,   11,   11,   12,   21,
-       12,   12,   12,   11,   21,   22,   23,  289,   12,   31,
-       29,   11,   31,   22,   35,   69,   23,   30,   11,   29,
-       69,   30,   31,   12,   41,   31,   29,   37,   35,   37,
-
-       41,   41,  265,   83,  265,   11,   36,   36,   36,  281,
-       42,   83,   42,   42,   42,   89,  275,   36,   36,   36,
-       42,   43,  274,   43,   43,   43,   97,  131,   42,  113,
-      113,   43,   97,   97,  273,   42,  272,  131,   47,  268,
-       47,   47,   47,  267,   36,   36,   43,  266,   47,   36,
-      264,   89,   42,   46,   46,   46,  103,  103,  103,  184,
-      184,   46,   46,   47,   46,   48,  263,   48,   48,   48,
-       51,  261,   51,   51,   51,   48,   46,   46,   49,   49,
-       51,   46,   49,   49,   49,   87,   87,   87,  260,  258,
-       48,   90,   90,  146,  256,   51,   87,   87,   87,  146,
-
-      146,   90,   90,   90,  101,  101,  255,  218,  101,  101,
-      101,  104,  104,  104,  147,  147,  147,  218,  218,  218,
-      104,  254,  104,   87,  253,  148,  148,  148,   87,  220,
-      249,  220,  248,  243,  148,  104,  148,  244,  241,  104,
-      220,  220,  220,  243,  243,  243,  245,  240,  245,  148,
-      239,  247,  246,  148,  246,  246,  238,  245,  245,  245,
-      247,  247,  247,  246,  246,  246,  284,  284,  284,  284,
-      285,  234,  285,  285,  286,  286,  287,  233,  287,  287,
-      288,  288,  288,  288,  290,  290,  290,  290,  291,  291,
-      291,  291,  292,  292,  292,  292,  293,  293,  293,  293,
-
-      228,  227,  225,  224,  223,  222,  221,  219,  216,  215,
-      214,  212,  211,  210,  209,  207,  206,  205,  204,  202,
-      201,  200,  197,  196,  195,  194,  192,  191,  189,  187,
-      186,  185,  183,  182,  181,  179,  178,  177,  176,  175,
-      174,  173,  172,  171,  170,  169,  168,  167,  166,  164,
-      163,  162,  161,  159,  158,  157,  156,  153,  152,  150,
-      143,  142,  141,  140,  139,  138,  137,  136,  135,  134,
-      133,  132,  130,  129,  128,  127,  125,  124,  123,  122,
-      121,  120,  119,  118,  117,  116,  115,  114,  112,  111,
-      110,  109,  107,  106,   98,   96,   95,   93,   92,   91,
-
-       86,   85,   84,   82,   81,   80,   79,   78,   77,   76,
-       75,   74,   73,   72,   71,   70,   68,   67,   66,   65,
-       64,   63,   62,   61,   60,   59,   58,   57,   56,   45,
-       40,   38,   34,   33,   32,   28,   27,   26,   25,   24,
-       20,   18,   17,   15,   14,   13,    8,    7,    3,    2,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-
-      283,  283,  283,  283,  283
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#ifndef YYLMAX
-#define YYLMAX 8192
-#endif
-
-char yytext[YYLMAX];
-char *yytext_ptr;
-# line 1 "idl.ll"
-# line 3 "idl.ll"
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.ll - Lexical scanner for IDL 1.1
- */
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include "y.tab.h"
-
-static char	idl_escape_reader(char *);
-static double	idl_atof(char *);
-static long	idl_atoi(char *, long);
-static void	idl_parse_line_and_file(char *);
-static void	idl_store_pragma(char *);
-
-#if 0 /* defined (HPUX) */
-// HPUX has yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __yytext = (char*) yytext;
-// NOTE: This will not work under flex(1) were yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__yytext()
-{
-  return (char *) yytext;
-}
-#define ace_yytext __yytext()
-#else
-#define ace_yytext yytext
-#endif /* 0 */
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef TAO_ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define TAO_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = getc( yyin ); \
-		result = c == EOF ? 0 : 1; \
-		buf[0] = (char) c; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-# line 100 "idl.ll"
-
-
-
-	if ( yy_init )
-		{
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( yy_current_buffer )
-			yy_init_buffer( yy_current_buffer, yyin );
-		else
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-
-		yy_init = 0;
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-		if ( yy_bp[-1] == '\n' )
-			++yy_current_state;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 284 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 451 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_USER_ACTION
-# line 102 "idl.ll"
-return IDL_ANY;
-	YY_BREAK
-case 2:
-YY_USER_ACTION
-# line 103 "idl.ll"
-return IDL_MODULE;
-	YY_BREAK
-case 3:
-YY_USER_ACTION
-# line 104 "idl.ll"
-return IDL_RAISES;
-	YY_BREAK
-case 4:
-YY_USER_ACTION
-# line 105 "idl.ll"
-return IDL_READONLY;
-	YY_BREAK
-case 5:
-YY_USER_ACTION
-# line 106 "idl.ll"
-return IDL_ATTRIBUTE;
-	YY_BREAK
-case 6:
-YY_USER_ACTION
-# line 107 "idl.ll"
-return IDL_EXCEPTION;
-	YY_BREAK
-case 7:
-YY_USER_ACTION
-# line 108 "idl.ll"
-return IDL_CONTEXT;
-	YY_BREAK
-case 8:
-YY_USER_ACTION
-# line 109 "idl.ll"
-return IDL_INTERFACE;
-	YY_BREAK
-case 9:
-YY_USER_ACTION
-# line 110 "idl.ll"
-return IDL_CONST;
-	YY_BREAK
-case 10:
-YY_USER_ACTION
-# line 111 "idl.ll"
-return IDL_TYPEDEF;
-	YY_BREAK
-case 11:
-YY_USER_ACTION
-# line 112 "idl.ll"
-return IDL_STRUCT;
-	YY_BREAK
-case 12:
-YY_USER_ACTION
-# line 113 "idl.ll"
-return IDL_ENUM;
-	YY_BREAK
-case 13:
-YY_USER_ACTION
-# line 114 "idl.ll"
-return IDL_STRING;
-	YY_BREAK
-case 14:
-YY_USER_ACTION
-# line 115 "idl.ll"
-return IDL_WSTRING;
-	YY_BREAK
-case 15:
-YY_USER_ACTION
-# line 116 "idl.ll"
-return IDL_SEQUENCE;
-	YY_BREAK
-case 16:
-YY_USER_ACTION
-# line 117 "idl.ll"
-return IDL_UNION;
-	YY_BREAK
-case 17:
-YY_USER_ACTION
-# line 118 "idl.ll"
-return IDL_SWITCH;
-	YY_BREAK
-case 18:
-YY_USER_ACTION
-# line 119 "idl.ll"
-return IDL_CASE;
-	YY_BREAK
-case 19:
-YY_USER_ACTION
-# line 120 "idl.ll"
-return IDL_DEFAULT;
-	YY_BREAK
-case 20:
-YY_USER_ACTION
-# line 121 "idl.ll"
-return IDL_FLOAT;
-	YY_BREAK
-case 21:
-YY_USER_ACTION
-# line 122 "idl.ll"
-return IDL_DOUBLE;
-	YY_BREAK
-case 22:
-YY_USER_ACTION
-# line 123 "idl.ll"
-return IDL_LONG;
-	YY_BREAK
-case 23:
-YY_USER_ACTION
-# line 124 "idl.ll"
-return IDL_SHORT;
-	YY_BREAK
-case 24:
-YY_USER_ACTION
-# line 125 "idl.ll"
-return IDL_UNSIGNED;
-	YY_BREAK
-case 25:
-YY_USER_ACTION
-# line 126 "idl.ll"
-return IDL_CHAR;
-	YY_BREAK
-case 26:
-YY_USER_ACTION
-# line 127 "idl.ll"
-return IDL_WCHAR;
-	YY_BREAK
-case 27:
-YY_USER_ACTION
-# line 128 "idl.ll"
-return IDL_BOOLEAN;
-	YY_BREAK
-case 28:
-YY_USER_ACTION
-# line 129 "idl.ll"
-return IDL_OCTET;
-	YY_BREAK
-case 29:
-YY_USER_ACTION
-# line 130 "idl.ll"
-return IDL_VOID;
-	YY_BREAK
-case 30:
-YY_USER_ACTION
-# line 131 "idl.ll"
-return IDL_NATIVE;
-	YY_BREAK
-case 31:
-YY_USER_ACTION
-# line 133 "idl.ll"
-return IDL_TRUETOK;
-	YY_BREAK
-case 32:
-YY_USER_ACTION
-# line 134 "idl.ll"
-return IDL_FALSETOK;
-	YY_BREAK
-case 33:
-YY_USER_ACTION
-# line 136 "idl.ll"
-return IDL_INOUT;
-	YY_BREAK
-case 34:
-YY_USER_ACTION
-# line 137 "idl.ll"
-return IDL_IN;
-	YY_BREAK
-case 35:
-YY_USER_ACTION
-# line 138 "idl.ll"
-return IDL_OUT;
-	YY_BREAK
-case 36:
-YY_USER_ACTION
-# line 139 "idl.ll"
-return IDL_ONEWAY;
-	YY_BREAK
-case 37:
-YY_USER_ACTION
-# line 141 "idl.ll"
-return IDL_LEFT_SHIFT;
-	YY_BREAK
-case 38:
-YY_USER_ACTION
-# line 142 "idl.ll"
-return IDL_RIGHT_SHIFT;
-	YY_BREAK
-case 39:
-YY_USER_ACTION
-# line 143 "idl.ll"
-{
-		  yylval.strval = "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
-	YY_BREAK
-case 40:
-YY_USER_ACTION
-# line 148 "idl.ll"
-{
-    char *z = (char *) malloc(strlen(ace_yytext) + 1);
-    strcpy(z, ace_yytext);
-    yylval.strval = z;
-    return IDENTIFIER;
-}
-	YY_BREAK
-case 41:
-YY_USER_ACTION
-# line 155 "idl.ll"
-{
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-	YY_BREAK
-case 42:
-YY_USER_ACTION
-# line 159 "idl.ll"
-{
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-	YY_BREAK
-case 43:
-YY_USER_ACTION
-# line 164 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	YY_BREAK
-case 44:
-YY_USER_ACTION
-# line 168 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	YY_BREAK
-case 45:
-YY_USER_ACTION
-# line 172 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-	YY_BREAK
-case 46:
-YY_USER_ACTION
-# line 177 "idl.ll"
-{
-		  /* Skip the quotes */
-		  char *tmp = ace_yytext;
-		  tmp[strlen(tmp)-1] = '\0';
-		  yylval.sval = new String(tmp + 1);
-		  return IDL_STRING_LITERAL;
-	      	}
-	YY_BREAK
-case 47:
-YY_USER_ACTION
-# line 184 "idl.ll"
-{
-		  yylval.cval = ace_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-	YY_BREAK
-case 48:
-YY_USER_ACTION
-# line 188 "idl.ll"
-{
-		  // octal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	YY_BREAK
-case 49:
-YY_USER_ACTION
-# line 193 "idl.ll"
-{
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	YY_BREAK
-case 50:
-YY_USER_ACTION
-# line 197 "idl.ll"
-{/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_yytext);
-		}
-	YY_BREAK
-case 51:
-YY_USER_ACTION
-# line 201 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 52:
-YY_USER_ACTION
-# line 204 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 53:
-YY_USER_ACTION
-# line 207 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 54:
-YY_USER_ACTION
-# line 210 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-	        }
-	YY_BREAK
-case 55:
-YY_USER_ACTION
-# line 213 "idl.ll"
-{
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 56:
-YY_USER_ACTION
-# line 217 "idl.ll"
-{
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 57:
-YY_USER_ACTION
-# line 221 "idl.ll"
-{
-		  for(;;) {
-		    char c = yyinput();
-		    if (c == '*') {
-		      char next = yyinput();
-		      if (next == '/')
-			break;
-		      else
-			yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-	YY_BREAK
-case 58:
-YY_USER_ACTION
-# line 235 "idl.ll"
-;
-	YY_BREAK
-case 59:
-YY_USER_ACTION
-# line 236 "idl.ll"
-{
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 60:
-YY_USER_ACTION
-# line 239 "idl.ll"
-return ace_yytext [0];
-	YY_BREAK
-case 61:
-YY_USER_ACTION
-# line 241 "idl.ll"
-TAO_ECHO;
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = yy_cp - yytext_ptr - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-							yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr - 1; /* copy prev. char, too */
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a singled characater, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = yy_c_buf_p - yytext_ptr;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset = yy_c_buf_p - b->yy_ch_buf;
-
-			b->yy_buf_size *= 2;
-			b->yy_ch_buf = (char *)
-				yy_flex_realloc( (void *) b->yy_ch_buf,
-						 b->yy_buf_size );
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move - YY_MORE_ADJ == 1 )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	/* yytext begins at the second character in yy_ch_buf; the first
-	 * character is the one which preceded it before reading in the latest
-	 * buffer; it needs to be kept around in case it's a newline, so
-	 * yy_get_previous_state() will have with '^' rules active.
-	 */
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[1];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	register char *yy_bp = yytext_ptr;
-
-	yy_current_state = yy_start;
-	if ( yy_bp[-1] == '\n' )
-		++yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 284 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 284 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 283);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += dest - source;
-		yy_bp += dest - source;
-		yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
-		yy_cp[-2] = '\n';
-
-	*--yy_cp = (char) c;
-
-
-	/* Note: the formal parameter *must* be called "yy_bp" for this
-	 * macro to now work correctly.
-	 */
-	YY_DO_BEFORE_ACTION; /* set up yytext again */
-	}
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			yytext_ptr = yy_c_buf_p;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						{
-						yy_c_buf_p =
-						yytext_ptr + YY_MORE_ADJ;
-						return EOF;
-						}
-
-					YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-					break;
-
-				case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
-					YY_FATAL_ERROR(
-					"unexpected last match in yyinput()" );
-#else
-					YY_FATAL_ERROR(
-					"unexpected last match in input()" );
-#endif
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	yy_flex_free( (void *) b->yy_ch_buf );
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-	{
-	b->yy_input_file = file;
-
-	/* We put in the '\n' and start reading from [1] so that an
-	 * initial match-at-newline will be true.
-	 */
-
-	b->yy_ch_buf[0] = '\n';
-	b->yy_n_chars = 1;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[1];
-
-	b->yy_is_interactive = file ? isatty( fileno(file) ) : 0;
-
-	b->yy_fill_buffer = 1;
-
-	b->yy_buffer_status = YY_BUFFER_NEW;
-	}
-
-
-#if 0
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		int new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-
-
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-
-
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif /* 0 */
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( const char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( 1 );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n - YY_MORE_ADJ; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, const char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-const char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( unsigned int size )
-#else
-static void *yy_flex_alloc( size )
-unsigned int size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, unsigned int size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-unsigned int size;
-#endif
-	{
-	return (void *) realloc( ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-# line 241 "idl.ll"
-
-	/* subroutines */
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-stripped_name(UTL_String *fn)
-{
-    char	*n = fn->get_string();
-    long	l;
-
-    if (n == NULL)
-	return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * Parse a #line statement generated by the C preprocessor
- */
-static void
-idl_parse_line_and_file(char *buf)
-{
-  char		*r = buf;
-  char 		*h;
-  UTL_String	*nm;
-
-  /* Skip initial '#' */
-  if (*r != '#')
-    return;
-  else
-    r++;
-
-  /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */
-
-  if (ACE_OS::strncmp (r, "line", 4) == 0)
-    r += 5;
-
-  /* Find line number */
-  while (*r == ' ' || *r == '\t')
-    r++;
-  h = r;
-  for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
-    continue;
-  *r++ = 0;
-  idl_global->set_lineno(idl_atoi(h, 10));
-
-  /* Find file name, if present */
-  for (; *r != '"'; r++)
-    if (*r == '\n' || *r == '\0')
-      return;
-
-  h = ++r;
-  for (; *r != '"'; r++)
-    continue;
-  *r = 0;
-  if (*h == '\0')
-    idl_global->set_filename(new String("standard input"));
-  else
-    {
-      long i;
-      long j;
-
-      // Put Microsoft-style pathnames into a canonical form.
-      for (i = 0, j = 0; h[j] != '\0'; i++, j++)
-        {
-          if (h[j] == '\\' && h[j + 1] == '\\')
-	    j++;
-
-	  h[i] = h[j];
-        }
-      h[i] = '\0';
-      idl_global->set_filename(new String(h));
-    }
-  idl_global->set_in_main_file(
-    (idl_global->filename()->compare(idl_global->real_filename())) ?
-    I_TRUE :
-    I_FALSE
-  );
-  /*
-   * If it's an import file store the stripped name for the BE to use
-   */
-  if (!(idl_global->in_main_file()) && idl_global->import()) {
-    nm = new UTL_String(stripped_name(idl_global->filename()));
-    idl_global->store_include_file_name(nm);
-  }
-}
-
-/*
- * Store a #pragma line into the list of pragmas
- */
-static void
-idl_store_pragma(char *buf)
-{
-  char *cp = buf + 1;
-  while(*cp != 'p')
-    cp++;
-  while(*cp != ' ' && *cp != '\t')
-    cp++;
-  while(*cp == ' ' || *cp == '\t')
-    cp++;
-  char pragma[80];
-  char *pp = pragma;
-  while(*cp != '\n') {
-    *pp++ = *cp++;
-  }
-  *pp = 0;
-  if (strcmp(pragma, "import") == 0) {
-    idl_global->set_import(I_TRUE);
-    return;
-  }
-  if (strcmp(pragma, "include") == 0) {
-    idl_global->set_import(I_FALSE);
-    return;
-  }
-  UTL_StrList *p = idl_global->pragmas();
-  if (p == NULL)
-    idl_global->set_pragmas(new UTL_StrList(new String(buf), NULL));
-  else {
-    p->nconc(new UTL_StrList(new String(buf), NULL));
-    idl_global->set_pragmas(p);
-  }
-}
-
-/*
- * idl_atoi - Convert a string of digits into an integer according to base b
- */
-static long
-idl_atoi(char *s, long b)
-{
-	long	r = 0;
-	long	negative = 0;
-
-	if (*s == '-') {
-	  negative = 1;
-	  s++;
-	}
-	if (b == 8 && *s == '0')
-	  s++;
-	else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-	  s += 2;
-
-	for (; *s; s++)
-	  if (*s <= '9' && *s >= '0')
-	    r = (r * b) + (*s - '0');
-	  else if (b > 10 && *s <= 'f' && *s >= 'a')
-	    r = (r * b) + (*s - 'a' + 10);
-	  else if (b > 10 && *s <= 'F' && *s >= 'A')
-	    r = (r * b) + (*s - 'A' + 10);
-	  else
-	    break;
-
-	if (negative)
-	  r *= -1;
-
-	return r;
-}
-
-/*
- * Convert a string to a float; atof doesn't seem to work, always.
- */
-static double
-idl_atof(char *s)
-{
-	char    *h = s;
-	double	d = 0.0;
-	double	f = 0.0;
-	double	e, k;
-	long	neg = 0, negexp = 0;
-
-	ACE_UNUSED_ARG (f);
-	ACE_UNUSED_ARG (h);
-
-	if (*s == '-') {
-	  neg = 1;
-	  s++;
-	}
-	while (*s >= '0' && *s <= '9') {
-		d = (d * 10) + *s - '0';
-		s++;
-	}
-	if (*s == '.') {
-		s++;
-		e = 10;
-		while (*s >= '0' && *s <= '9') {
-			d += (*s - '0') / (e * 1.0);
-			e *= 10;
-			s++;
-		}
-	}
-	if (*s == 'e' || *s == 'E') {
-		s++;
-		if (*s == '-') {
-			negexp = 1;
-			s++;
-		} else if (*s == '+')
-			s++;
-		e = 0;
-		while (*s >= '0' && *s <= '9') {
-			e = (e * 10) + *s - '0';
-			s++;
-		}
-		if (e > 0) {
-			for (k = 1; e > 0; k *= 10, e--);
-			if (negexp)
-				d /= k;
-			else
-				d *= k;
-		}
-	}
-
-	if (neg) d *= -1.0;
-
-	return d;
-}
-
-/*
- * Convert (some) escaped characters into their ascii values
- */
-static char
-idl_escape_reader(
-    char *str
-)
-{
-    if (str[0] != '\\') {
-	return str[0];
-    }
-
-    switch (str[1]) {
-      case 'n':
-	return '\n';
-      case 't':
-	return '\t';
-      case 'v':
-	return '\v';
-      case 'b':
-	return '\b';
-      case 'r':
-	return '\r';
-      case 'f':
-	return '\f';
-      case 'a':
-	return '\a';
-      case '\\':
-	return '\\';
-      case '\?':
-	return '?';
-      case '\'':
-	return '\'';
-      case '"':
-	return '"';
-      case 'x':
-	{
-	    int i;
-	    // hex value
-	    for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[2], 16);
-	    str[i] = save;
-	    return out;
-	}
-	break;
-      default:
-	// check for octal value
-	if (str[1] >= '0' && str[1] <= '7') {
- 	    int i;
-	    for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[1], 8);
-	    str[i] = save;
-	    return out;
-	} else {
-	  return str[1] - 'a';
-	}
-	break;
-    }
-}
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
deleted file mode 100644
index bd03e464bb7..00000000000
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- lex.yy.cpp.orig	Mon Mar 23 15:30:42 1998
-+++ lex.yy.cpp	Mon Mar 23 15:30:42 1998
-@@ -215,12 +215,14 @@
- void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
- void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
- 
-+#if 0
- static int yy_start_stack_ptr = 0;
- static int yy_start_stack_depth = 0;
- static int *yy_start_stack = 0;
- static void yy_push_state YY_PROTO(( int new_state ));
- static void yy_pop_state YY_PROTO(( void ));
- static int yy_top_state YY_PROTO(( void ));
-+#endif /* 0 */
- 
- static void *yy_flex_alloc YY_PROTO(( unsigned int ));
- static void *yy_flex_realloc YY_PROTO(( void *, unsigned int ));
-@@ -1777,6 +1779,7 @@
- 	}
- 
- 
-+#if 0
- #ifdef YY_USE_PROTOS
- static void yy_push_state( int new_state )
- #else
-@@ -1822,7 +1825,7 @@
- 	{
- 	return yy_start_stack[yy_start_stack_ptr - 1];
- 	}
--
-+#endif /* 0 */
- 
- #ifdef YY_USE_PROTOS
- static void yy_fatal_error( const char msg[] )
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
deleted file mode 100644
index f9e59cce461..00000000000
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ /dev/null
@@ -1,3345 +0,0 @@
-#ifndef lint
-char yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90 \n\
- Modified 5/2/90 by J. Roskind to support graphic debugging modes";
-#endif
-#line 74 "idl.yy"
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include <stdio.h>
-
-#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern	"C" int yywrap();
-#endif	/* (defined(apollo) || defined(hpux)) && defined(__cplusplus)*/
-
-void yyerror (char *);
-int yylex (void);
-extern "C" int yywrap (void);
-extern char yytext[];
-extern int yyleng;
-#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-/* Force the pretty debugging code to compile.*/
-#define YYDEBUG 1
-#line 97 "idl.yy"
-typedef union {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-} YYSTYPE;
-#line 51 "y.tab.c"
-#define IDENTIFIER 257
-#define IDL_CONST 258
-#define IDL_MODULE 259
-#define IDL_INTERFACE 260
-#define IDL_TYPEDEF 261
-#define IDL_LONG 262
-#define IDL_SHORT 263
-#define IDL_UNSIGNED 264
-#define IDL_DOUBLE 265
-#define IDL_FLOAT 266
-#define IDL_CHAR 267
-#define IDL_WCHAR 268
-#define IDL_OCTET 269
-#define IDL_BOOLEAN 270
-#define IDL_ANY 271
-#define IDL_STRUCT 272
-#define IDL_UNION 273
-#define IDL_SWITCH 274
-#define IDL_ENUM 275
-#define IDL_SEQUENCE 276
-#define IDL_STRING 277
-#define IDL_WSTRING 278
-#define IDL_EXCEPTION 279
-#define IDL_CASE 280
-#define IDL_DEFAULT 281
-#define IDL_READONLY 282
-#define IDL_ATTRIBUTE 283
-#define IDL_ONEWAY 284
-#define IDL_IDEMPOTENT 285
-#define IDL_VOID 286
-#define IDL_IN 287
-#define IDL_OUT 288
-#define IDL_INOUT 289
-#define IDL_RAISES 290
-#define IDL_CONTEXT 291
-#define IDL_NATIVE 292
-#define IDL_INTEGER_LITERAL 293
-#define IDL_STRING_LITERAL 294
-#define IDL_CHARACTER_LITERAL 295
-#define IDL_FLOATING_PT_LITERAL 296
-#define IDL_TRUETOK 297
-#define IDL_FALSETOK 298
-#define IDL_SCOPE_DELIMITOR 299
-#define IDL_LEFT_SHIFT 300
-#define IDL_RIGHT_SHIFT 301
-#define YYERRCODE 256
-short yylhs[] = {                                        -1,
-    0,   67,   67,   69,   68,   71,   68,   73,   68,   75,
-   68,   77,   68,   78,   68,   79,   80,   81,   82,   76,
-   74,   74,   85,   87,   88,   83,   89,   64,   32,   90,
-   22,   22,   86,   86,   92,   91,   93,   91,   94,   91,
-   96,   91,   98,   91,   99,   91,   20,  100,   21,   21,
-   16,  101,   16,  102,   16,   65,   84,  103,  104,  105,
-  106,   70,   48,   48,   48,   48,   48,   48,   48,   48,
-   33,   34,   35,   35,   36,   36,   37,   37,   38,   38,
-   38,   39,   39,   39,   40,   40,   40,   40,   41,   41,
-   41,   41,   42,   42,   42,   43,   43,   43,   43,   43,
-   43,   44,  108,   66,   66,   66,   66,   66,  109,  107,
-    1,    1,    2,    2,    2,   56,   56,   56,   56,   56,
-   56,    4,    4,    4,    3,    3,    3,   28,  110,   29,
-   29,   60,   60,   30,  111,   31,   31,   61,   62,   49,
-   49,   54,   54,   54,   55,   55,   55,   52,   52,   52,
-   50,   50,   57,   51,   53,  112,  113,  115,  116,    7,
-  114,  118,  118,  119,  120,  117,  121,  117,  122,  123,
-  124,  125,  126,  127,  129,  130,   10,    9,    9,    9,
-    9,    9,    9,  128,  132,  132,  133,  134,  131,  135,
-  131,   26,   27,   27,  136,   46,  137,  138,   46,  139,
-   47,  140,  141,  143,  144,    8,  142,  147,  146,  146,
-  145,  148,  149,    5,    5,  150,  151,   13,  153,  154,
-    6,    6,  152,  156,  157,   14,   14,  155,  158,   11,
-   24,   25,   25,  159,  160,   45,  161,  162,   95,   63,
-   63,  163,  164,  165,  166,   72,  167,  169,  170,  171,
-   97,   59,   59,   59,   12,   12,  172,  168,  174,  168,
-  173,  177,  176,  176,  178,  179,  175,   15,   15,   15,
-   58,   58,   58,  180,  181,   23,   23,  182,  183,   17,
-   17,   18,  184,   19,   19,
-};
-short yylen[] = {                                         2,
-    1,    2,    0,    0,    3,    0,    3,    0,    3,    0,
-    3,    0,    3,    0,    3,    0,    0,    0,    0,    9,
-    1,    1,    0,    0,    0,    7,    0,    3,    2,    0,
-    3,    0,    2,    0,    0,    3,    0,    3,    0,    3,
-    0,    3,    0,    3,    0,    3,    2,    0,    4,    0,
-    1,    0,    3,    0,    4,    1,    1,    0,    0,    0,
-    0,    9,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    3,    1,    3,    1,    3,    1,    3,
-    3,    1,    3,    3,    1,    3,    3,    3,    1,    2,
-    2,    2,    1,    1,    3,    1,    1,    1,    1,    1,
-    1,    1,    0,    3,    1,    1,    1,    2,    0,    3,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    2,    0,    4,
-    0,    1,    1,    2,    0,    4,    0,    1,    1,    1,
-    1,    1,    2,    1,    2,    3,    2,    1,    1,    2,
-    1,    1,    1,    1,    1,    0,    0,    0,    0,    9,
-    2,    2,    0,    0,    0,    5,    0,    3,    0,    0,
-    0,    0,    0,    0,    0,    0,   17,    1,    1,    1,
-    1,    1,    1,    2,    2,    0,    0,    0,    5,    0,
-    3,    2,    2,    0,    0,    3,    0,    0,    5,    0,
-    3,    0,    0,    0,    0,    9,    2,    0,    4,    0,
-    1,    0,    0,    6,    2,    0,    0,    5,    0,    0,
-    6,    1,    1,    0,    0,    6,    1,    1,    0,    3,
-    2,    2,    0,    0,    0,    5,    0,    0,    6,    1,
-    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,
-   10,    1,    1,    0,    1,    1,    0,    3,    0,    4,
-    2,    0,    4,    0,    0,    0,    5,    1,    1,    1,
-    1,    1,    1,    0,    0,    6,    0,    0,    0,    6,
-    0,    2,    0,    4,    0,
-};
-short yydefred[] = {                                      0,
-   14,   58,   16,   27,  103,  156,  169,  202,  242,    0,
-    0,  105,  107,  106,   23,    0,    4,    1,    0,    6,
-    8,   10,   12,   21,   22,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   56,  108,  138,    0,   30,   29,
-    0,    2,    0,    0,    0,    0,   15,    0,  144,    0,
-  148,  149,  151,  152,  153,  154,  223,  228,   52,   68,
-   69,    0,   59,   63,   64,   66,   67,  140,  141,   65,
-   51,    0,    0,   17,   28,  155,  216,  109,  111,  112,
-  114,  122,  123,  125,  127,  126,    0,  124,    0,  116,
-  118,  119,  117,  121,  113,  120,  104,  157,  170,  203,
-  243,   24,    0,    5,    7,    9,   11,   13,  143,  150,
-    0,  147,    0,   54,    0,  219,  224,    0,    0,    0,
-  212,  215,    0,    0,    0,    0,   34,    0,   31,  146,
-   53,    0,   60,    0,    0,   18,  217,  139,  110,  131,
-  132,  133,    0,    0,  158,  171,  204,  244,    0,    0,
-   55,    0,   96,   97,   98,   99,  100,  101,    0,    0,
-    0,    0,    0,  102,    0,    0,    0,    0,    0,    0,
-   85,   89,   94,  220,  225,    0,    0,    0,    0,  213,
-    0,    0,    0,  163,   45,  240,  252,  253,    0,    0,
-   35,   37,   39,    0,   33,   41,   43,   48,   61,   90,
-   91,   92,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   19,  218,  129,  234,  230,
-  233,    0,  167,  164,  159,  163,  172,  211,  205,  210,
-    0,    0,  256,  269,  247,  255,    0,  268,  237,    0,
-    0,    0,   26,    0,    0,    0,    0,   95,    0,    0,
-    0,    0,    0,    0,    0,   86,   87,   88,  221,  226,
-    0,    0,    0,    0,  214,    0,    0,    0,    0,    0,
-    0,    0,  162,    0,   46,    0,    0,   36,   38,   40,
-   42,   44,    0,   62,   71,   20,  130,  235,  232,  168,
-  165,  160,    0,  182,  173,    0,  178,  179,  181,  180,
-  206,  208,  246,  248,  238,    0,    0,    0,    0,    0,
-    0,  236,  166,  174,  209,    0,  249,  239,  137,    0,
-    0,    0,    0,    0,  175,  258,  271,  272,  273,  265,
-    0,  264,  274,  250,  135,    0,    0,  260,    0,    0,
-    0,    0,  190,  197,  195,  187,  194,  176,  186,  266,
-  262,  275,  278,  251,  136,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  191,  198,  196,  200,
-  188,  193,  177,  185,  267,  263,    0,  279,    0,    0,
-    0,  276,    0,  199,  201,  189,  285,    0,    0,  280,
-  283,    0,  284,
-};
-short yydgoto[] = {                                      11,
-  224,   79,   80,   81,   82,   83,   84,   85,  295,   86,
-  138,  235,   87,   88,  236,  163,  354,  388,  389,  129,
-  150,   40,  334,  220,  264,  346,  360,  139,  178,  318,
-  324,   15,  284,  164,  165,  166,  167,  168,  169,  170,
-  171,  172,  173,  174,  221,  347,  371,   63,   90,   91,
-   92,   93,   94,   68,   69,   95,   96,  330,  189,  140,
-  141,  142,  190,   16,   71,   17,   18,   19,   41,   20,
-   43,   21,   44,   22,   45,   23,   46,   26,   28,  118,
-  176,  261,   24,   25,   38,  149,  127,  194,   29,  103,
-  195,  240,  241,  242,  196,  244,  197,  245,  232,  246,
-  113,  132,   27,  115,  152,  247,   97,   30,  120,  262,
-  342,   31,  123,  225,  181,  268,  273,  231,  267,  307,
-  266,   32,  124,  182,  270,  308,  320,  348,  336,  361,
-  349,  362,  359,  381,  356,  358,  357,  379,  380,   33,
-  125,  229,  183,  271,  230,  272,  309,  144,  222,  119,
-  177,   72,  134,  214,   73,  135,  215,  179,  263,  306,
-  277,  311,   34,  126,  184,  274,  276,  317,  310,  323,
-  341,  321,  331,  322,  332,  339,  364,  337,  363,  340,
-  365,  366,  383,  392,
-};
-short yysindex[] = {                                    333,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, -194,
-    0,    0,    0,    0,    0,   10,    0,    0,  333,    0,
-    0,    0,    0,    0,    0,   25,  254, -177, -194,  162,
- -194, -194, -194, -194,    0,    0,    0,  -34,    0,    0,
-   47,    0,   52,   61,   78,  103,    0,  -54,    0, -187,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, -131,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  126,  150,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   77,    0, -131,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, -183,    0,    0,    0,    0,    0,    0,    0,
-  -90,    0, -194,    0, -194,    0,    0,   72,  152, -194,
-    0,    0,   95,  -53,  119,  122,    0, -131,    0,    0,
-    0, -194,    0,   26,   26,    0,    0,    0,    0,    0,
-    0,    0,    0,   26,    0,    0,    0,    0,  303,  212,
-    0,  209,    0,    0,    0,    0,    0,    0,  -30,  -30,
-  -30,   26, -131,    0,  156,  182,  246, -154,  159,   89,
-    0,    0,    0,    0,    0,  333,  211,  242,  196,    0,
-  137,  248,   32,    0,    0,    0,    0,    0,  228,   13,
-    0,    0,    0,  165,    0,    0,    0,    0,    0,    0,
-    0,    0,  250,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,  230,  235,    0,    0,    0,    0,    0,
-    0,  236,    0,    0,    0,    0,    0,    0,    0,    0,
-  137,  243,    0,    0,    0,    0, -131,    0,    0,  245,
-  247,  249,    0,  251,  253, -183,   26,    0,  182,  246,
- -154,  159,  159,   89,   89,    0,    0,    0,    0,    0,
-  180, -194,   26,  196,    0,  257, -194,  188,  137,  287,
-  192,  263,    0,  193,    0,   71,  271,    0,    0,    0,
-    0,    0, -131,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   67,    0,    0, -131,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  238,  277,  296,   32,  298,
- -194,    0,    0,    0,    0,    0,    0,    0,    0,  219,
-  302,  -63,   55,  300,    0,    0,    0,    0,    0,    0,
-  305,    0,    0,    0,    0,  -74,  271,    0,  304,  307,
-   58, -194,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  293,   26,  297,  162, -102,
-  229,  -74, -194,  -63, -183,  318,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  319,    0,  301, -194,
-  306,    0,   69,    0,    0,    0,    0,  323,  324,    0,
-    0,   79,    0,
-};
-short yyrindex[] = {                                    371,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -27,    0,    0,   17,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  -19,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  115,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   28,   38,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   57,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    4,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   94,    0,    0,    0,    0,    0,  112,    9,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  -29,    0,   99,  129,  155,  107,   50,   -7,
-    0,    0,    0,    0,    0,  259,    0,  326,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  261,    0,    0,    0,    0,    0,  130,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  157,  268,
-  135,   56,   66,   -1,   40,    0,    0,    0,    0,    0,
-    0,    0,    0,  140,    0,    0,    0,    0,  265,    0,
-    0,  266,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  347,    0,    0,  355,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -14,    0,    0,    0,    0,
-    0,    0,  -56,  338,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  375,    0,
-  251,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  187,
-    0,  292,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  377,    0,
-    0,    0,    0,
-};
-short yygindex[] = {                                      0,
-  -24,  244,    0,    0,    0,  -22,   54,    7,    0,   60,
-    0,    0,    0,  393, -207,  -26,    0,    0,    0,   76,
-    0,    0,    0,    0,    0,    0,    0,  175,    0,    0,
-    0,    0,    0, -134,    0,  218,  240,  217,   39,   51,
-   21,   80,    0,  -88,  179,   86,    0,    0,  -16,  -12,
-    8,  420,    0,    0,    0, -148,   12,    0,    0, -209,
-   -8,    0,    0,    0,  -10,  299,    1,    0,    0,  317,
-    0,  320,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  286,  258,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  108,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  163,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  136,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,
-};
-#define YYTABLESIZE 625
-short yytable[] = {                                      37,
-   62,   36,  277,   89,   60,   78,   13,   93,   93,  162,
-   64,   93,   93,   93,   65,   93,    3,   93,   75,   42,
-   98,   99,  100,  101,  142,   13,  257,  203,   93,   93,
-   82,   57,   93,   82,   66,   82,   83,   82,   70,   83,
-  238,   83,  142,   83,   50,  145,  175,   50,  145,   47,
-   82,   82,  287,   12,   82,  180,   83,   83,   49,   14,
-   83,   49,   35,   93,   93,  162,  145,   39,  159,  305,
-  160,  222,   12,   35,  111,  112,  128,   84,   14,   74,
-   84,  227,   84,   47,   84,   82,   82,   79,  102,  222,
-   79,   83,   83,   80,   93,   32,   80,   84,   84,  227,
-  115,   84,  131,   81,  133,  104,   81,   79,   79,  143,
-  105,   79,  285,   80,   80,   59,   82,   80,  115,  106,
-  121,  151,   83,   81,   81,  213,   50,   81,  238,  350,
-  211,   47,   84,   84,  138,  212,  107,  138,  122,   72,
-   49,    3,   79,   79,   77,  207,  208,   77,   80,   80,
-   89,  161,  138,  375,   89,   13,   72,   72,   81,   81,
-   72,  108,  237,   84,   77,   77,  234,  114,   77,   73,
-  385,  130,   78,   79,  288,   78,  216,  344,  345,   80,
-  231,  343,   13,  231,  229,  116,   73,   73,  238,   81,
-   73,   72,   78,   78,  136,   75,   78,   74,  231,   77,
-   77,  209,   12,  210,   89,  344,  345,  109,   14,  117,
-  110,  137,   75,   75,   74,   74,   75,  145,   74,  283,
-  146,   73,  368,  327,  328,  329,   35,   78,   78,   12,
-   77,  256,  257,  258,  277,   14,   25,  142,  200,  201,
-  202,  147,   89,  296,  148,  252,  253,   75,   75,   74,
-  237,  143,   73,  297,  234,  198,  143,  298,   78,  254,
-  255,  145,  153,  154,  155,  156,  157,  158,   59,  199,
-   93,   93,  259,  259,  259,  205,  294,  299,   75,  204,
-   74,  300,   35,  206,  222,  218,  219,  227,  228,  243,
-  248,  259,   82,   82,  227,  239,  260,  265,   83,   83,
-   37,  275,  319,  278,  286,  279,  302,  280,   76,  281,
-  237,  282,  292,  115,  234,  290,  301,  303,  153,  154,
-  155,  156,  157,  158,   59,   76,   76,  304,  109,   76,
-  312,   37,   89,  355,  370,  313,  314,  316,  128,   84,
-   84,  325,  326,  335,  333,  338,  352,  351,  353,   79,
-   79,  367,  143,  373,  369,   80,   80,  378,  384,  382,
-   76,   76,  387,  390,  386,   81,   81,  391,  254,  143,
-    3,   70,  393,  254,  254,  254,  254,  254,  254,  254,
-  254,  254,  254,    3,  128,  245,  270,  142,  254,  161,
-  207,   76,  223,   35,  241,  183,  134,  254,   48,   49,
-   50,   51,   52,   53,   54,   55,   56,   76,    6,    7,
-  254,    8,   77,   57,   58,  261,  184,  282,   35,   61,
-  217,  249,  251,   48,   49,   50,   51,   52,   53,   54,
-   55,   56,   76,    6,    7,   59,    8,   77,   57,   58,
-  377,  291,  289,  192,  250,  372,   67,  191,  192,  192,
-  192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-   59,  192,  192,  192,  192,  192,  226,   35,  193,  374,
-    0,  315,   48,   49,   50,   51,   52,   53,   54,   55,
-   56,   76,    0,  269,   35,  192,   77,   57,   58,   48,
-   49,   50,   51,   52,   53,   54,   55,   56,   76,  376,
-    0,    0,    0,    0,   57,    0,    0,    0,    0,   59,
-   35,    0,    0,  233,    0,   48,   49,   50,   51,   52,
-   53,   54,   55,   56,    0,    0,   59,   35,    0,    0,
-   57,   58,   48,   49,   50,   51,   52,   53,   54,   55,
-   56,   76,    0,   35,    0,    0,    0,   57,  293,   49,
-   50,    0,   59,   53,   54,   55,   56,    0,  185,    0,
-    2,    8,    0,    5,    0,    0,    0,    0,    0,   59,
-    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
-    0,    9,    0,    0,  186,   59,  187,  188,    1,    0,
-    2,    3,    4,    5,   10,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
-    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   10,
-};
-short yycheck[] = {                                      10,
-   27,   10,   59,   30,   27,   30,    0,   37,   38,   40,
-   27,   41,   42,   43,   27,   45,    0,   47,   29,   19,
-   31,   32,   33,   34,   44,   19,   41,  162,   58,   59,
-   38,   59,   62,   41,   27,   43,   38,   45,   27,   41,
-  189,   43,   62,   45,   41,   41,  135,   44,   44,   41,
-   58,   59,  262,    0,   62,  144,   58,   59,   41,    0,
-   62,   44,  257,   93,   94,   40,   62,   58,   43,  277,
-   45,   44,   19,  257,  262,  263,  103,   38,   19,  257,
-   41,   44,   43,   59,   45,   93,   94,   38,  123,   62,
-   41,   93,   94,   38,  124,  123,   41,   58,   59,   62,
-   44,   62,  113,   38,  115,   59,   41,   58,   59,  120,
-   59,   62,  247,   58,   59,  299,  124,   62,   62,   59,
-   44,  132,  124,   58,   59,   37,  123,   62,  277,  337,
-   42,  123,   93,   94,   41,   47,   59,   44,   62,   41,
-  123,  125,   93,   94,   38,  300,  301,   41,   93,   94,
-  177,  126,   59,  363,  181,  149,   58,   59,   93,   94,
-   62,   59,  189,  124,   58,   59,  189,  299,   62,   41,
-  380,  262,   38,  124,  263,   41,  176,  280,  281,  124,
-   41,  256,  176,   44,   91,   60,   58,   59,  337,  124,
-   62,   93,   58,   59,  123,   41,   62,   41,   59,   93,
-   94,   43,  149,   45,  231,  280,  281,  262,  149,   60,
-  265,   60,   58,   59,   58,   59,   62,  123,   62,  246,
-  274,   93,  357,  287,  288,  289,  257,   93,   94,  176,
-  124,  211,  212,  213,  291,  176,  125,  257,  159,  160,
-  161,  123,  269,  270,  123,  207,  208,   93,   94,   93,
-  277,  262,  124,  270,  277,   44,  267,  270,  124,  209,
-  210,  257,  293,  294,  295,  296,  297,  298,  299,   61,
-  300,  301,  287,  288,  289,   94,  270,  270,  124,  124,
-  124,  270,  257,   38,  257,   44,   91,   40,  257,  125,
-   41,   62,  300,  301,  257,  283,   62,   62,  300,  301,
-  311,   59,  311,   59,  125,   59,   44,   59,   41,   59,
-  337,   59,  125,  257,  337,   59,  125,  125,  293,  294,
-  295,  296,  297,  298,  299,   58,   59,  257,  262,   62,
-   93,  342,  359,  342,  359,   59,   41,   40,  365,  300,
-  301,  123,   41,   44,  290,   41,   40,   44,  291,  300,
-  301,   59,  363,  125,   58,  300,  301,   40,   58,   41,
-   93,   94,  294,   41,   59,  300,  301,   44,  257,  380,
-    0,  257,  294,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  125,   59,  125,  257,   41,  277,  125,
-  125,  124,  256,  257,  283,   41,   59,  286,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  299,  275,  276,  277,  278,   41,  125,   41,  257,   27,
-  177,  204,  206,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  299,  275,  276,  277,  278,
-  365,  267,  264,  257,  205,  360,   27,  149,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  299,  275,  276,  277,  278,  149,  181,  257,  149,  362,
-   -1,  309,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,   -1,  226,  257,  299,  276,  277,  278,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  364,
-   -1,   -1,   -1,   -1,  277,   -1,   -1,   -1,   -1,  299,
-  257,   -1,   -1,  286,   -1,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,   -1,   -1,  299,  257,   -1,   -1,
-  277,  278,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,   -1,  257,   -1,   -1,   -1,  277,  262,  263,
-  264,   -1,  299,  267,  268,  269,  270,   -1,  256,   -1,
-  258,  275,   -1,  261,   -1,   -1,   -1,   -1,   -1,  299,
-   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
-   -1,  279,   -1,   -1,  282,  299,  284,  285,  256,   -1,
-  258,  259,  260,  261,  292,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
-   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  292,
-};
-#define YYFINAL 11
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 301
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0,0,0,0,
-0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,"'{'","'|'","'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"IDENTIFIER","IDL_CONST",
-"IDL_MODULE","IDL_INTERFACE","IDL_TYPEDEF","IDL_LONG","IDL_SHORT",
-"IDL_UNSIGNED","IDL_DOUBLE","IDL_FLOAT","IDL_CHAR","IDL_WCHAR","IDL_OCTET",
-"IDL_BOOLEAN","IDL_ANY","IDL_STRUCT","IDL_UNION","IDL_SWITCH","IDL_ENUM",
-"IDL_SEQUENCE","IDL_STRING","IDL_WSTRING","IDL_EXCEPTION","IDL_CASE",
-"IDL_DEFAULT","IDL_READONLY","IDL_ATTRIBUTE","IDL_ONEWAY","IDL_IDEMPOTENT",
-"IDL_VOID","IDL_IN","IDL_OUT","IDL_INOUT","IDL_RAISES","IDL_CONTEXT",
-"IDL_NATIVE","IDL_INTEGER_LITERAL","IDL_STRING_LITERAL","IDL_CHARACTER_LITERAL",
-"IDL_FLOATING_PT_LITERAL","IDL_TRUETOK","IDL_FALSETOK","IDL_SCOPE_DELIMITOR",
-"IDL_LEFT_SHIFT","IDL_RIGHT_SHIFT",
-};
-char *yyrule[] = {
-"$accept : start",
-"start : definitions",
-"definitions : definition definitions",
-"definitions :",
-"$$1 :",
-"definition : type_dcl $$1 ';'",
-"$$2 :",
-"definition : const_dcl $$2 ';'",
-"$$3 :",
-"definition : exception $$3 ';'",
-"$$4 :",
-"definition : interface_def $$4 ';'",
-"$$5 :",
-"definition : module $$5 ';'",
-"$$6 :",
-"definition : error $$6 ';'",
-"$$7 :",
-"$$8 :",
-"$$9 :",
-"$$10 :",
-"module : IDL_MODULE $$7 IDENTIFIER $$8 '{' $$9 definitions $$10 '}'",
-"interface_def : interface",
-"interface_def : forward",
-"$$11 :",
-"$$12 :",
-"$$13 :",
-"interface : interface_header $$11 '{' $$12 exports $$13 '}'",
-"$$14 :",
-"interface_decl : IDL_INTERFACE $$14 id",
-"interface_header : interface_decl inheritance_spec",
-"$$15 :",
-"inheritance_spec : ':' $$15 at_least_one_scoped_name",
-"inheritance_spec :",
-"exports : exports export",
-"exports :",
-"$$16 :",
-"export : type_dcl $$16 ';'",
-"$$17 :",
-"export : const_dcl $$17 ';'",
-"$$18 :",
-"export : exception $$18 ';'",
-"$$19 :",
-"export : attribute $$19 ';'",
-"$$20 :",
-"export : operation $$20 ';'",
-"$$21 :",
-"export : error $$21 ';'",
-"at_least_one_scoped_name : scoped_name scoped_names",
-"$$22 :",
-"scoped_names : scoped_names ',' $$22 scoped_name",
-"scoped_names :",
-"scoped_name : id",
-"$$23 :",
-"scoped_name : IDL_SCOPE_DELIMITOR $$23 id",
-"$$24 :",
-"scoped_name : scoped_name IDL_SCOPE_DELIMITOR $$24 id",
-"id : IDENTIFIER",
-"forward : interface_decl",
-"$$25 :",
-"$$26 :",
-"$$27 :",
-"$$28 :",
-"const_dcl : IDL_CONST $$25 const_type $$26 id $$27 '=' $$28 expression",
-"const_type : integer_type",
-"const_type : char_type",
-"const_type : octet_type",
-"const_type : boolean_type",
-"const_type : floating_pt_type",
-"const_type : string_type_spec",
-"const_type : wstring_type_spec",
-"const_type : scoped_name",
-"expression : const_expr",
-"const_expr : or_expr",
-"or_expr : xor_expr",
-"or_expr : or_expr '|' xor_expr",
-"xor_expr : and_expr",
-"xor_expr : xor_expr '^' and_expr",
-"and_expr : shift_expr",
-"and_expr : and_expr '&' shift_expr",
-"shift_expr : add_expr",
-"shift_expr : shift_expr IDL_LEFT_SHIFT add_expr",
-"shift_expr : shift_expr IDL_RIGHT_SHIFT add_expr",
-"add_expr : mult_expr",
-"add_expr : add_expr '+' mult_expr",
-"add_expr : add_expr '-' mult_expr",
-"mult_expr : unary_expr",
-"mult_expr : mult_expr '*' unary_expr",
-"mult_expr : mult_expr '/' unary_expr",
-"mult_expr : mult_expr '%' unary_expr",
-"unary_expr : primary_expr",
-"unary_expr : '+' primary_expr",
-"unary_expr : '-' primary_expr",
-"unary_expr : '~' primary_expr",
-"primary_expr : scoped_name",
-"primary_expr : literal",
-"primary_expr : '(' const_expr ')'",
-"literal : IDL_INTEGER_LITERAL",
-"literal : IDL_STRING_LITERAL",
-"literal : IDL_CHARACTER_LITERAL",
-"literal : IDL_FLOATING_PT_LITERAL",
-"literal : IDL_TRUETOK",
-"literal : IDL_FALSETOK",
-"positive_int_expr : const_expr",
-"$$29 :",
-"type_dcl : IDL_TYPEDEF $$29 type_declarator",
-"type_dcl : struct_type",
-"type_dcl : union_type",
-"type_dcl : enum_type",
-"type_dcl : IDL_NATIVE simple_declarator",
-"$$30 :",
-"type_declarator : type_spec $$30 at_least_one_declarator",
-"type_spec : simple_type_spec",
-"type_spec : constructed_type_spec",
-"simple_type_spec : base_type_spec",
-"simple_type_spec : template_type_spec",
-"simple_type_spec : scoped_name",
-"base_type_spec : integer_type",
-"base_type_spec : floating_pt_type",
-"base_type_spec : char_type",
-"base_type_spec : boolean_type",
-"base_type_spec : octet_type",
-"base_type_spec : any_type",
-"template_type_spec : sequence_type_spec",
-"template_type_spec : string_type_spec",
-"template_type_spec : wstring_type_spec",
-"constructed_type_spec : struct_type",
-"constructed_type_spec : union_type",
-"constructed_type_spec : enum_type",
-"at_least_one_declarator : declarator declarators",
-"$$31 :",
-"declarators : declarators ',' $$31 declarator",
-"declarators :",
-"declarator : simple_declarator",
-"declarator : complex_declarator",
-"at_least_one_simple_declarator : simple_declarator simple_declarators",
-"$$32 :",
-"simple_declarators : simple_declarators ',' $$32 simple_declarator",
-"simple_declarators :",
-"simple_declarator : id",
-"complex_declarator : array_declarator",
-"integer_type : signed_int",
-"integer_type : unsigned_int",
-"signed_int : IDL_LONG",
-"signed_int : IDL_LONG IDL_LONG",
-"signed_int : IDL_SHORT",
-"unsigned_int : IDL_UNSIGNED IDL_LONG",
-"unsigned_int : IDL_UNSIGNED IDL_LONG IDL_LONG",
-"unsigned_int : IDL_UNSIGNED IDL_SHORT",
-"floating_pt_type : IDL_DOUBLE",
-"floating_pt_type : IDL_FLOAT",
-"floating_pt_type : IDL_LONG IDL_DOUBLE",
-"char_type : IDL_CHAR",
-"char_type : IDL_WCHAR",
-"octet_type : IDL_OCTET",
-"boolean_type : IDL_BOOLEAN",
-"any_type : IDL_ANY",
-"$$33 :",
-"$$34 :",
-"$$35 :",
-"$$36 :",
-"struct_type : IDL_STRUCT $$33 id $$34 '{' $$35 at_least_one_member $$36 '}'",
-"at_least_one_member : member members",
-"members : members member",
-"members :",
-"$$37 :",
-"$$38 :",
-"member : type_spec $$37 at_least_one_declarator $$38 ';'",
-"$$39 :",
-"member : error $$39 ';'",
-"$$40 :",
-"$$41 :",
-"$$42 :",
-"$$43 :",
-"$$44 :",
-"$$45 :",
-"$$46 :",
-"$$47 :",
-"union_type : IDL_UNION $$40 id $$41 IDL_SWITCH $$42 '(' $$43 switch_type_spec $$44 ')' $$45 '{' $$46 at_least_one_case_branch $$47 '}'",
-"switch_type_spec : integer_type",
-"switch_type_spec : char_type",
-"switch_type_spec : octet_type",
-"switch_type_spec : boolean_type",
-"switch_type_spec : enum_type",
-"switch_type_spec : scoped_name",
-"at_least_one_case_branch : case_branch case_branches",
-"case_branches : case_branches case_branch",
-"case_branches :",
-"$$48 :",
-"$$49 :",
-"case_branch : at_least_one_case_label $$48 element_spec $$49 ';'",
-"$$50 :",
-"case_branch : error $$50 ';'",
-"at_least_one_case_label : case_label case_labels",
-"case_labels : case_labels case_label",
-"case_labels :",
-"$$51 :",
-"case_label : IDL_DEFAULT $$51 ':'",
-"$$52 :",
-"$$53 :",
-"case_label : IDL_CASE $$52 const_expr $$53 ':'",
-"$$54 :",
-"element_spec : type_spec $$54 declarator",
-"$$55 :",
-"$$56 :",
-"$$57 :",
-"$$58 :",
-"enum_type : IDL_ENUM $$55 id $$56 '{' $$57 at_least_one_enumerator $$58 '}'",
-"at_least_one_enumerator : enumerator enumerators",
-"$$59 :",
-"enumerators : enumerators ',' $$59 enumerator",
-"enumerators :",
-"enumerator : IDENTIFIER",
-"$$60 :",
-"$$61 :",
-"sequence_type_spec : seq_head ',' $$60 positive_int_expr $$61 '>'",
-"sequence_type_spec : seq_head '>'",
-"$$62 :",
-"$$63 :",
-"seq_head : IDL_SEQUENCE $$62 '<' $$63 simple_type_spec",
-"$$64 :",
-"$$65 :",
-"string_type_spec : string_head '<' $$64 positive_int_expr $$65 '>'",
-"string_type_spec : string_head",
-"string_head : IDL_STRING",
-"$$66 :",
-"$$67 :",
-"wstring_type_spec : wstring_head '<' $$66 positive_int_expr $$67 '>'",
-"wstring_type_spec : wstring_head",
-"wstring_head : IDL_WSTRING",
-"$$68 :",
-"array_declarator : id $$68 at_least_one_array_dim",
-"at_least_one_array_dim : array_dim array_dims",
-"array_dims : array_dims array_dim",
-"array_dims :",
-"$$69 :",
-"$$70 :",
-"array_dim : '[' $$69 positive_int_expr $$70 ']'",
-"$$71 :",
-"$$72 :",
-"attribute : opt_readonly IDL_ATTRIBUTE $$71 param_type_spec $$72 at_least_one_simple_declarator",
-"opt_readonly : IDL_READONLY",
-"opt_readonly :",
-"$$73 :",
-"$$74 :",
-"$$75 :",
-"$$76 :",
-"exception : IDL_EXCEPTION $$73 id $$74 '{' $$75 members $$76 '}'",
-"$$77 :",
-"$$78 :",
-"$$79 :",
-"$$80 :",
-"operation : opt_op_attribute op_type_spec $$77 IDENTIFIER $$78 parameter_list $$79 opt_raises $$80 opt_context",
-"opt_op_attribute : IDL_ONEWAY",
-"opt_op_attribute : IDL_IDEMPOTENT",
-"opt_op_attribute :",
-"op_type_spec : param_type_spec",
-"op_type_spec : IDL_VOID",
-"$$81 :",
-"parameter_list : '(' $$81 ')'",
-"$$82 :",
-"parameter_list : '(' $$82 at_least_one_parameter ')'",
-"at_least_one_parameter : parameter parameters",
-"$$83 :",
-"parameters : parameters ',' $$83 parameter",
-"parameters :",
-"$$84 :",
-"$$85 :",
-"parameter : direction $$84 param_type_spec $$85 declarator",
-"param_type_spec : base_type_spec",
-"param_type_spec : string_type_spec",
-"param_type_spec : scoped_name",
-"direction : IDL_IN",
-"direction : IDL_OUT",
-"direction : IDL_INOUT",
-"$$86 :",
-"$$87 :",
-"opt_raises : IDL_RAISES $$86 '(' $$87 at_least_one_scoped_name ')'",
-"opt_raises :",
-"$$88 :",
-"$$89 :",
-"opt_context : IDL_CONTEXT $$88 '(' $$89 at_least_one_string_literal ')'",
-"opt_context :",
-"at_least_one_string_literal : IDL_STRING_LITERAL string_literals",
-"$$90 :",
-"string_literals : string_literals ',' $$90 IDL_STRING_LITERAL",
-"string_literals :",
-};
-#endif
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#ifndef YYSTACKSIZE
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 300
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-#define yystacksize YYSTACKSIZE
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#line 2277 "idl.yy"
-/* programs */
-
-/*
- * ???
- */
-int
-yywrap()
-{
-  return 1;
-}
-
-/*
- * Report an error situation discovered in a production
- *
- * This does not do anything since we report all error situations through
- * idl_global->err() operations
- */
-void
-yyerror(char *)
-{
-}
-#line 815 "y.tab.c"
-#define YYABORT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-#ifdef YYDEBUG
-#ifndef YYDEBUG_LEXER_TEXT /* pointer to the text isolated by the lexer*/
-#define YYDEBUG_LEXER_TEXT "YYDEBUG_LEXER_TEXT not defined"
-#endif
-#ifndef YYDEBUG_INDENT_STRING
-#define YYDEBUG_INDENT_STRING  "|       "
-#endif
-#ifndef YYDEBUG_REDUCE_STRING
-#define YYDEBUG_REDUCE_STRING  "+-------"
-#endif
-#ifndef YYDEBUG_INDENT
-#ifdef __cplusplus
-void YYDEBUG_INDENT(int yyindent)
-#else
-YYDEBUG_INDENT(yyindent)
-int yyindent;
-#endif
-{
-    while(yyindent-- > 0)
-        printf("%s", YYDEBUG_INDENT_STRING);
-}
-#endif /* YYDEBUG_INDENT */
-#ifndef YYDEBUG_REDUCE
-#ifdef __cplusplus
-void YYDEBUG_REDUCE(int yynew_state, int yyrule_num, char *yyrule_string, int yynew_indent, int yyrhs_count)
-#else
-YYDEBUG_REDUCE(yynew_state, yyrule_num, yyrule_string, yynew_indent, yyrhs_count)
-int yynew_state;
-int yyrule_num;
-char * yyrule_string;
-int yynew_indent;
-int yyrhs_count;
-#endif
-{
-    if (1 < yyrhs_count)
-    {  /* draw the graphics for the reduction */
-        YYDEBUG_INDENT(yynew_indent);
-        while(1 < yyrhs_count--)
-            printf("%s", YYDEBUG_REDUCE_STRING);
-        putchar('+'); /* left rotated L would look nice */
-        putchar('\n');
-        YYDEBUG_INDENT(yynew_indent);
-        putchar('|'); /* down arrow would look nice */
-        putchar('\n');
-    }
-    YYDEBUG_INDENT(yynew_indent);
-    /* Only print the resulting token name */
-    while (*yyrule_string)
-        putchar(*yyrule_string++);
-    putchar('\n');
-}
-#endif /* YYDEBUG_REDUCE */
-#ifndef YYDEBUG_SHIFT_LEXEME
-#ifdef __cplusplus
-void YYDEBUG_SHIFT_LEXEME(int yyold_state, int yynew_state, char *yytoken_string, int yynew_indent)
-#else
-YYDEBUG_SHIFT_LEXEME(yyold_state, yynew_state, yytoken_string, yynew_indent)
-int yyold_state;
-int yynew_state;
-char * yytoken_string;
-int yynew_indent;
-#endif
-{
-    YYDEBUG_INDENT(yynew_indent);
-    printf("%s <-- `%s'\n", yytoken_string, YYDEBUG_LEXER_TEXT);
-}
-#endif /*  YYDEBUG_SHIFT_LEXEME */
-#ifndef YYDEBUG_LOOK_AHEAD
-#ifdef __cplusplus
-void YYDEBUG_LOOK_AHEAD(int yynew_state, int yytoken_num, char *yytoken_string, int yyindent)
-#else
-YYDEBUG_LOOK_AHEAD(yynew_state, yytoken_num, yytoken_string, yyindent)
-int yynew_state;
-int yytoken_num;
-char * yytoken_string;
-int yyindent;
-#endif
-{
-    YYDEBUG_INDENT(yyindent);
-    printf("          .... look ahead at %s   `%s'\n",
-           yytoken_string,
-           (0 == yytoken_num)? "\0": YYDEBUG_LEXER_TEXT);
-}
-#endif /* YYDEBUG_LOOK_AHEAD */
-#ifndef YYDEBUG_DISCARD_STATE
-#ifdef __cplusplus
-void YYDEBUG_DISCARD_STATE(int yynew_state, int yyindent)
-#else
-YYDEBUG_DISCARD_STATE(yynew_state, yyindent)
-int yynew_state;
-int yyindent;
-#endif
-{
-    if (0 < yyindent)
-    {  /* draw the graphics for the reduction */
-        YYDEBUG_INDENT(yyindent-1);
-        printf("%s", YYDEBUG_REDUCE_STRING);
-        putchar('+'); /* left rotated L would look nice */
-        printf("  discarding state\n");
-        YYDEBUG_INDENT(yyindent-1);
-        putchar('|'); /* down arrow would look nice */
-        putchar('\n');
-    }
-    else
-    {
-        if (0 == yyindent)
-            printf("discarding state\n");
-        else
-            printf("no more states to discard: parser will abort\n");
-    }
-}
-#endif /* YYDEBUG_DISCARD_STATE */
-#ifndef YYDEBUG_DISCARD_TOKEN
-#ifdef __cplusplus
-void YYDEBUG_DISCARD_TOKEN(int yynew_state, int yytoken_num, char *yytoken_string, int yyindent)
-#else
-YYDEBUG_DISCARD_TOKEN(yynew_state, yytoken_num, yytoken_string, yyindent)
-int yynew_state;
-int yytoken_num;
-char * yytoken_string;
-int yyindent;
-#endif
-{
-    YYDEBUG_INDENT(yyindent);
-    printf("discarding token %s\n", yytoken_string);
-}
-#endif /* YYDEBUG_DISCARD_TOKEN */
-#ifndef YYDEBUG_SHIFT_ERROR_LEXEME
-#ifdef __cplusplus
-void YYDEBUG_SHIFT_ERROR_LEXEME(int yyold_state, int yynew_state, int yyindent)
-#else
-YYDEBUG_SHIFT_ERROR_LEXEME(yyold_state, yynew_state, yyindent)
-int yyold_state;
-int yynew_state;
-int yyindent;
-#endif
-{
-    YYDEBUG_INDENT(yyindent);
-    printf("error\n");
-}
-#endif /* YYDEBUG_SHIFT_ERROR_LEXEME */
-#endif /* YYDEBUG */
-#ifdef __cplusplus
-extern "C" { extern char *getenv(const char *); }
-#endif
-int
-yyparse()
-{
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register char *yys;
-#ifndef __cplusplus
-    extern char *getenv();
-#endif
-
-    if ((yys = getenv("YYDEBUG")))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate])) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            if (5 < yydebug)
-                printf("yydebug: state %d, reading %d (%s)\n", yystate,
-                        yychar, yys);
-            else
-                YYDEBUG_LOOK_AHEAD(yystate, yychar, yys, yyssp-yyss);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            if (5 < yydebug)
-                printf("yydebug: state %d, shifting to state %d\n",
-                        yystate, yytable[yyn]);
-            else
-                YYDEBUG_SHIFT_LEXEME(yystate, yytable[yyn], yys, yyssp-yyss);
-#endif
-        if (yyssp >= yyss + yystacksize - 1)
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#ifdef lint
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    if (5 < yydebug)
-                        printf("yydebug: state %d, error recovery shifting\
- to state %d\n", *yyssp, yytable[yyn]);
-                    else
-                        YYDEBUG_SHIFT_ERROR_LEXEME(*yyssp, yytable[yyn], yyssp-yyss);
-#endif
-                if (yyssp >= yyss + yystacksize - 1)
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    if (5 < yydebug)
-                        printf("yydebug: error recovery discarding state %d\
-",
-                            *yyssp);
-                    else
-                        YYDEBUG_DISCARD_STATE(*yyssp, yyssp-yyss-1);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            if (5 < yydebug)
-                printf("yydebug: state %d, error recovery discards token %d (%s)\n",
-                    yystate, yychar, yys);
-            else 
-                YYDEBUG_DISCARD_TOKEN(yystate, yychar, yys, yyssp-yyss);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-#if YYDEBUG
-    if (yydebug)
-        if (5 < yydebug)
-            printf("yydebug: state %d, reducing by rule %d (%s)\n",
-                    yystate, yyn, yyrule[yyn]);
-        else
-            YYDEBUG_REDUCE(yystate, yyn, yyrule[yyn], yyssp-yyss-yym, yym);
-#endif
-    switch (yyn)
-    {
-case 4:
-#line 240 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-break;
-case 5:
-#line 244 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 6:
-#line 248 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-break;
-case 7:
-#line 252 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 8:
-#line 256 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-break;
-case 9:
-#line 260 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 10:
-#line 264 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
-        }
-break;
-case 11:
-#line 268 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 12:
-#line 272 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
-        }
-break;
-case 13:
-#line 276 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 14:
-#line 280 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-break;
-case 15:
-#line 284 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-break;
-case 16:
-#line 291 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-	  }
-break;
-case 17:
-#line 295 "idl.yy"
-{
-	    UTL_ScopedName 	*n =
-		new UTL_ScopedName(new Identifier(yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	    AST_Module		*m = NULL;
-	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();
-
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-	    /*
-	     * Make a new module and add it to the enclosing scope
-	     */
-	    if (s != NULL) {
-	      m = idl_global->gen()->create_module(n, p);
-	      (void) s->fe_add_module(m);
-	    }
-	    /*
-	     * Push it on the stack
-	     */
-	    idl_global->scopes()->push(m);
-	  }
-break;
-case 18:
-#line 316 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-	  }
-break;
-case 19:
-#line 320 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-	  }
-break;
-case 20:
-#line 324 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-	    /*
-	     * Finished with this module - pop it from the scope stack
-	     */
-	    idl_global->scopes()->pop();
-	  }
-break;
-case 23:
-#line 340 "idl.yy"
-{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  AST_Decl	*v = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  /*
-	   * Make a new interface node and add it to its enclosing scope
-	   */
-	  if (s != NULL && yyvsp[0].ihval != NULL) {
-	    i = idl_global->gen()->create_interface(yyvsp[0].ihval->interface_name(),
-						    yyvsp[0].ihval->inherits(),
-						    yyvsp[0].ihval->n_inherits(),
-						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits(yyvsp[0].ihval->inherits());
-		    fd->set_n_inherits(yyvsp[0].ihval->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
-	    /*
-	     * Add the interface to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-break;
-case 24:
-#line 424 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
-break;
-case 25:
-#line 428 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
-break;
-case 26:
-#line 432 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-break;
-case 27:
-#line 443 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-	 }
-break;
-case 28:
-#line 447 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-	   yyval.idval = yyvsp[0].idval;
-	 }
-break;
-case 29:
-#line 455 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-	  /*
-	   * Create an AST representation of the information in the header
-	   * part of an interface - this representation contains a computed
-	   * list of all interfaces which this interface inherits from,
-	   * recursively
-	   */
-	  yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(yyvsp[-1].idval, NULL), yyvsp[0].nlval);
-	}
-break;
-case 30:
-#line 469 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        }
-break;
-case 31:
-#line 473 "idl.yy"
-{
-	  yyval.nlval = yyvsp[0].nlval;
-	}
-break;
-case 32:
-#line 477 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	}
-break;
-case 35:
-#line 489 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-break;
-case 36:
-#line 493 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 37:
-#line 497 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-break;
-case 38:
-#line 501 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 39:
-#line 505 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-break;
-case 40:
-#line 509 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 41:
-#line 513 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
-        }
-break;
-case 42:
-#line 517 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 43:
-#line 521 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
-        }
-break;
-case 44:
-#line 525 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 45:
-#line 529 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-break;
-case 46:
-#line 533 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-break;
-case 47:
-#line 541 "idl.yy"
-{
-	  yyval.nlval = new UTL_NameList(yyvsp[-1].idlist, yyvsp[0].nlval);
-	}
-break;
-case 48:
-#line 549 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        }
-break;
-case 49:
-#line 553 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-	  if (yyvsp[-3].nlval == NULL)
-	    yyval.nlval = new UTL_NameList(yyvsp[0].idlist, NULL);
-	  else {
-	    yyvsp[-3].nlval->nconc(new UTL_NameList(yyvsp[0].idlist, NULL));
-	    yyval.nlval = yyvsp[-3].nlval;
-	  }
-	}
-break;
-case 50:
-#line 564 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	}
-break;
-case 51:
-#line 571 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yyval.idlist = new UTL_IdList(yyvsp[0].idval, NULL);
-	}
-break;
-case 52:
-#line 577 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-break;
-case 53:
-#line 581 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yyval.idlist = new UTL_IdList(new Identifier(yyvsp[-2].strval, 1, 0, I_FALSE),
-			      new UTL_IdList(yyvsp[0].idval, NULL));
-	}
-break;
-case 54:
-#line 589 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-break;
-case 55:
-#line 593 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yyvsp[-3].idlist->nconc(new UTL_IdList(yyvsp[0].idval, NULL));
-	  yyval.idlist = yyvsp[-3].idlist;
-	}
-break;
-case 56:
-#line 602 "idl.yy"
-{
-            yyval.idval = new Identifier(yyvsp[0].strval, 1, 0, I_FALSE);
-        }
-break;
-case 57:
-#line 609 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[0].idval, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * interface. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_interface_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
-break;
-case 58:
-#line 629 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
-        }
-break;
-case 59:
-#line 633 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
-break;
-case 60:
-#line 637 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        }
-break;
-case 61:
-#line 641 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        }
-break;
-case 62:
-#line 645 "idl.yy"
-{
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[-4].idval, NULL);
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Constant		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-	  /*
-	   * Create a node representing a constant declaration. Store
-	   * it in the enclosing scope
-	   */
-	  if (yyvsp[0].exval != NULL && s != NULL) {
-	    if (yyvsp[0].exval->coerce(yyvsp[-6].etval) == NULL)
-	      idl_global->err()->coercion_error(yyvsp[0].exval, yyvsp[-6].etval);
-	    else {
-	      c =
-		idl_global->gen()->create_constant(yyvsp[-6].etval, yyvsp[0].exval, n, p);
-	      (void) s->fe_add_constant(c);
-	    }
-	  }
-	}
-break;
-case 68:
-#line 678 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_string;
-	}
-break;
-case 69:
-#line 682 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_wstring;
-        }
-break;
-case 70:
-#line 686 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*c = NULL;
-	  AST_Typedef		*t = NULL;
-
-	  /*
-	   * If the constant's type is a scoped name, it must resolve
-	   * to a scalar constant type
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(yyvsp[0].idlist, I_TRUE)) != NULL) {
-	    /*
-	     * Look through typedefs
-	     */
-	    while (d->node_type() == AST_Decl::NT_typedef) {
-	      t = AST_Typedef::narrow_from_decl(d);
-	      if (t == NULL)
-	        break;
-	      d = t->base_type();
-	    }
-	    if (d == NULL)
-	      yyval.etval = AST_Expression::EV_any;
-	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
-	      c = AST_PredefinedType::narrow_from_decl(d);
-	      if (c != NULL) {
-	         yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
-	      } else {
-	         yyval.etval = AST_Expression::EV_any;
-	      }
-	    } else
-	      yyval.etval = AST_Expression::EV_any;
-	  } else
-	    yyval.etval = AST_Expression::EV_any;
-	}
-break;
-case 74:
-#line 728 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 76:
-#line 736 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 78:
-#line 744 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 80:
-#line 752 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,yyvsp[-2].exval,yyvsp[0].exval);
-	}
-break;
-case 81:
-#line 756 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,yyvsp[-2].exval,yyvsp[0].exval);
-	}
-break;
-case 83:
-#line 764 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 84:
-#line 768 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,yyvsp[-2].exval,yyvsp[0].exval);
-	}
-break;
-case 86:
-#line 776 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 87:
-#line 780 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 88:
-#line 784 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, yyvsp[-2].exval, yyvsp[0].exval);
-	}
-break;
-case 90:
-#line 792 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-					      yyvsp[0].exval,
-					      NULL);
-	}
-break;
-case 91:
-#line 798 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-					      yyvsp[0].exval,
-					      NULL);
-	}
-break;
-case 92:
-#line 804 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-					      yyvsp[0].exval,
-					      NULL);
-	}
-break;
-case 93:
-#line 813 "idl.yy"
-{
-	  /*
-	   * An expression which is a scoped name is not resolved now,
-	   * but only when it is evaluated (such as when it is assigned
-	   * as a constant value)
-	   */
-	  yyval.exval = idl_global->gen()->create_expr(yyvsp[0].idlist);
-	}
-break;
-case 95:
-#line 823 "idl.yy"
-{
-	  yyval.exval = yyvsp[-1].exval;
-	}
-break;
-case 96:
-#line 830 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yyvsp[0].ival);
-	}
-break;
-case 97:
-#line 834 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yyvsp[0].sval);
-	}
-break;
-case 98:
-#line 838 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yyvsp[0].cval);
-	}
-break;
-case 99:
-#line 842 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yyvsp[0].dval);
-	}
-break;
-case 100:
-#line 846 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-					    AST_Expression::EV_bool);
-	}
-break;
-case 101:
-#line 851 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-					    AST_Expression::EV_bool);
-	}
-break;
-case 102:
-#line 859 "idl.yy"
-{
-	    yyvsp[0].exval->evaluate(AST_Expression::EK_const);
-	    yyval.exval = idl_global->gen()->create_expr(yyvsp[0].exval, AST_Expression::EV_ulong);
-	}
-break;
-case 103:
-#line 867 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-	  }
-break;
-case 104:
-#line 870 "idl.yy"
-{yyval.ival = 0;}
-break;
-case 105:
-#line 871 "idl.yy"
-{ yyval.ival = 0;}
-break;
-case 106:
-#line 872 "idl.yy"
-{ yyval.ival = 0;}
-break;
-case 107:
-#line 873 "idl.yy"
-{ yyval.ival = 0;}
-break;
-case 108:
-#line 875 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Native		*node = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
-	  /*
-	   * Create a node representing a Native and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    node = idl_global->gen()->create_native (yyvsp[0].deval->name (), p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_native (node);
-	  }
-	}
-break;
-case 109:
-#line 900 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
-        }
-break;
-case 110:
-#line 904 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l;
-	  FE_Declarator		*d = NULL;
-	  AST_Typedef		*t = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-	  /*
-	   * Create a list of type renamings. Add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && yyvsp[-2].dcval != NULL && yyvsp[0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yyvsp[0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		      continue;
-              AST_Type * tp = d->compose(yyvsp[-2].dcval);
-              if (tp == NULL)
-		     continue;
-	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
-              /* if this is a sequence, it is a named one and hence we*/
-	      /* set its name to the same as the declarator. However*/
-	      /* @@ (ASG) note that if we had a scenario of the kind*/
-              /* typedef sequence<...> X, Y, Z; then we must make a*/
-	      /* new sequence node for each name. Not handled currently.*/
-              if (tp->node_type () == AST_Decl::NT_sequence)
-               {
-                 tp->set_name (d->name ());
-               }
-	      (void) s->fe_add_typedef(t);
-	    }
-	    delete l;
-	  }
-	}
-break;
-case 113:
-#line 952 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 115:
-#line 957 "idl.yy"
-{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name(yyvsp[0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(yyvsp[0].idlist);
-	  yyval.dcval = d;
-	}
-break;
-case 128:
-#line 992 "idl.yy"
-{
-	  yyval.dlval = new UTL_DeclList(yyvsp[-1].deval, yyvsp[0].dlval);
-	}
-break;
-case 129:
-#line 1000 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-break;
-case 130:
-#line 1004 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if (yyvsp[-3].dlval == NULL)
-	    yyval.dlval = new UTL_DeclList(yyvsp[0].deval, NULL);
-	  else {
-	    yyvsp[-3].dlval->nconc(new UTL_DeclList(yyvsp[0].deval, NULL));
-	    yyval.dlval = yyvsp[-3].dlval;
-	  }
-	}
-break;
-case 131:
-#line 1015 "idl.yy"
-{
-	  yyval.dlval = NULL;
-	}
-break;
-case 134:
-#line 1027 "idl.yy"
-{
-	  yyval.dlval = new UTL_DeclList(yyvsp[-1].deval, yyvsp[0].dlval);
-	}
-break;
-case 135:
-#line 1035 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-break;
-case 136:
-#line 1039 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if (yyvsp[-3].dlval == NULL)
-	    yyval.dlval = new UTL_DeclList(yyvsp[0].deval, NULL);
-	  else {
-	    yyvsp[-3].dlval->nconc(new UTL_DeclList(yyvsp[0].deval, NULL));
-	    yyval.dlval = yyvsp[-3].dlval;
-	  }
-	}
-break;
-case 137:
-#line 1050 "idl.yy"
-{
-	  yyval.dlval = NULL;
-	}
-break;
-case 138:
-#line 1057 "idl.yy"
-{
-	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yyvsp[0].idval, NULL),
-				 FE_Declarator::FD_simple, NULL);
-	}
-break;
-case 139:
-#line 1065 "idl.yy"
-{
-	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yyvsp[0].dcval->local_name(), NULL),
-				 FE_Declarator::FD_complex,
-				 yyvsp[0].dcval);
-	}
-break;
-case 142:
-#line 1079 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_long;
-	}
-break;
-case 143:
-#line 1083 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_longlong;
-        }
-break;
-case 144:
-#line 1087 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_short;
-	}
-break;
-case 145:
-#line 1094 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ulong;
-	}
-break;
-case 146:
-#line 1098 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ulonglong;
-        }
-break;
-case 147:
-#line 1102 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ushort;
-	}
-break;
-case 148:
-#line 1109 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_double;
-	}
-break;
-case 149:
-#line 1113 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_float;
-	}
-break;
-case 150:
-#line 1117 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_longdouble;
-        }
-break;
-case 151:
-#line 1124 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_char;
-	}
-break;
-case 152:
-#line 1128 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_wchar;
-        }
-break;
-case 153:
-#line 1135 "idl.yy"
-{
-          yyval.etval = AST_Expression::EV_octet;
-	}
-break;
-case 154:
-#line 1142 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_bool;
-        }
-break;
-case 155:
-#line 1149 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_any;
-	}
-break;
-case 156:
-#line 1156 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
-        }
-break;
-case 157:
-#line 1160 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[0].idval, NULL);
-	  AST_Structure		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-	  /*
-	   * Create a node representing a struct declaration. Add it
-	   * to the enclosing scope
-	   */
-	  if (s != NULL) {
-	    d = idl_global->gen()->create_structure(n, p);
-	    (void) s->fe_add_structure(d);
-	  }
-	  /*
-	   * Push the scope of the struct on the scopes stack
-	   */
-	  idl_global->scopes()->push(d);
-	}
-break;
-case 158:
-#line 1184 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
-        }
-break;
-case 159:
-#line 1188 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
-        }
-break;
-case 160:
-#line 1192 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-	  /*
-	   * Done with this struct. Pop its scope off the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval =
-	      AST_Structure::narrow_from_scope(
-				   idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-break;
-case 164:
-#line 1217 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
-        }
-break;
-case 165:
-#line 1221 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
-        }
-break;
-case 166:
-#line 1225 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  FE_Declarator		*d = NULL;
-	  AST_Field		*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (yyvsp[-4].dcval != NULL && AST_illegal_recursive_type(yyvsp[-4].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, yyvsp[-4].dcval);
-	  /*
-	   * Create a node representing a struct or exception member
-	   * Add it to the enclosing scope
-	   */
-	  else if (s != NULL && yyvsp[-4].dcval != NULL && yyvsp[-2].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yyvsp[-2].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
- 	      AST_Type *tp = d->compose(yyvsp[-4].dcval);
-	      if (tp == NULL)
-		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
-	      (void) s->fe_add_field(f);
-	    }
-	    delete l;
-	  }
-	}
-break;
-case 167:
-#line 1258 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-break;
-case 168:
-#line 1262 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-break;
-case 169:
-#line 1270 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
-        }
-break;
-case 170:
-#line 1274 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
-        }
-break;
-case 171:
-#line 1278 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
-        }
-break;
-case 172:
-#line 1282 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
-        }
-break;
-case 173:
-#line 1286 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
-        }
-break;
-case 174:
-#line 1290 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[-8].idval, NULL);
-	  AST_Union		*u = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-	  /*
-	   * Create a node representing a union. Add it to its enclosing
-	   * scope
-	   */
-	  if (yyvsp[-2].dcval != NULL && s != NULL) {
- 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(yyvsp[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(yyvsp[-2].dcval);
-            } else {
-	      u = idl_global->gen()->create_union(tp, n, p);
-	      (void) s->fe_add_union(u);
- 	    }
-	  }
-	  /*
-	   * Push the scope of the union on the scopes stack
-	   */
-	  idl_global->scopes()->push(u);
-	}
-break;
-case 175:
-#line 1319 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
-        }
-break;
-case 176:
-#line 1323 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
-        }
-break;
-case 177:
-#line 1327 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-	  /*
-	   * Done with this union. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval =
-	      AST_Union::narrow_from_scope(
-				idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-break;
-case 178:
-#line 1345 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 179:
-#line 1349 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 180:
-#line 1353 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 181:
-#line 1357 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 183:
-#line 1362 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*p = NULL;
-	  AST_Typedef		*t = NULL;
-	  long			found = I_FALSE;
-
-	  /*
-	   * The discriminator is a scoped name. Try to resolve to
-	   * one of the scalar types or to an enum. Thread through
-	   * typedef's to arrive at the base type at the end of the
-	   * chain
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(yyvsp[0].idlist, I_TRUE)) != NULL) {
-	    while (!found) {
-	      switch (d->node_type()) {
-	      case AST_Decl::NT_enum:
-		yyval.dcval = d;
-		found = I_TRUE;
-		break;
-	      case AST_Decl::NT_pre_defined:
-		p = AST_PredefinedType::narrow_from_decl(d);
-		if (p != NULL) {
-		  switch (p->pt()) {
-		  case AST_PredefinedType::PT_long:
-		  case AST_PredefinedType::PT_ulong:
-		  case AST_PredefinedType::PT_longlong:
-		  case AST_PredefinedType::PT_ulonglong:
-		  case AST_PredefinedType::PT_short:
-		  case AST_PredefinedType::PT_char:
-		  case AST_PredefinedType::PT_wchar:
-		  case AST_PredefinedType::PT_octet:
-		  case AST_PredefinedType::PT_boolean:
-		    yyval.dcval = p;
-		    found = I_TRUE;
-		    break;
-		  default:
-		    yyval.dcval = NULL;
-		    found = I_TRUE;
-		    break;
-		  }
-		}
-		break;
-	      case AST_Decl::NT_typedef:
-		t = AST_Typedef::narrow_from_decl(d);
-		if (t != NULL) d = t->base_type();
-		break;
-	      default:
-		yyval.dcval = NULL;
-		found = I_TRUE;
-		break;
-	      }
-	    }
-	  } else
-	    yyval.dcval = NULL;
-
-	  if (yyval.dcval == NULL)
-	    idl_global->err()->lookup_error(yyvsp[0].idlist);
-	}
-break;
-case 187:
-#line 1432 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
-        }
-break;
-case 188:
-#line 1436 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
-        }
-break;
-case 189:
-#line 1440 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_LabellistActiveIterator *l = NULL;
-	  AST_UnionLabel	*d = NULL;
-	  AST_UnionBranch	*b = NULL;
-	  AST_Field		*f = yyvsp[-2].ffval;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-	  /*
-	   * Create several nodes representing branches of a union.
-	   * Add them to the enclosing scope (the union scope)
-	   */
-	  if (s != NULL && yyvsp[-4].llval != NULL && yyvsp[-2].ffval != NULL) {
-	    l = new UTL_LabellistActiveIterator(yyvsp[-4].llval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      b = idl_global->gen()->create_union_branch(d,
-						      f->field_type(),
-						      f->name(),
-						      f->pragmas());
-	      (void) s->fe_add_union_branch(b);
-	    }
-	    delete l;
-	  }
-	}
-break;
-case 190:
-#line 1468 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-break;
-case 191:
-#line 1473 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-break;
-case 192:
-#line 1481 "idl.yy"
-{
-	  yyval.llval = new UTL_LabelList(yyvsp[-1].ulval, yyvsp[0].llval);
-	}
-break;
-case 193:
-#line 1488 "idl.yy"
-{
-	  if (yyvsp[-1].llval == NULL)
-	    yyval.llval = new UTL_LabelList(yyvsp[0].ulval, NULL);
-	  else {
-	    yyvsp[-1].llval->nconc(new UTL_LabelList(yyvsp[0].ulval, NULL));
-	    yyval.llval = yyvsp[-1].llval;
-	  }
-	}
-break;
-case 194:
-#line 1497 "idl.yy"
-{
-	  yyval.llval = NULL;
-	}
-break;
-case 195:
-#line 1504 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
-        }
-break;
-case 196:
-#line 1508 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  yyval.ulval = idl_global->gen()->
-	            create_union_label(AST_UnionLabel::UL_default,
-				       NULL);
-	}
-break;
-case 197:
-#line 1516 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
-        }
-break;
-case 198:
-#line 1520 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
-        }
-break;
-case 199:
-#line 1524 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-						     yyvsp[-2].exval);
-	}
-break;
-case 200:
-#line 1534 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
-        }
-break;
-case 201:
-#line 1538 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (yyvsp[-2].dcval != NULL && AST_illegal_recursive_type(yyvsp[-2].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, yyvsp[-2].dcval);
-	  /*
-	   * Create a field in a union branch
-	   */
-	  else if (yyvsp[-2].dcval == NULL || yyvsp[0].deval == NULL)
-	    yyval.ffval = NULL;
-	  else {
-	    AST_Type *tp = yyvsp[0].deval->compose(yyvsp[-2].dcval);
-	    if (tp == NULL)
-	      yyval.ffval = NULL;
- 	    else
-	      yyval.ffval = idl_global->gen()->create_field(tp,
-			        		   yyvsp[0].deval->name(),
-			        		   idl_global->pragmas());
-	  }
-	}
-break;
-case 202:
-#line 1564 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
-        }
-break;
-case 203:
-#line 1568 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[0].idval, NULL);
-	  AST_Enum		*e = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-	  /*
-	   * Create a node representing an enum and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_enum(n, p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_enum(e);
-	  }
-	  /*
-	   * Push the enum scope on the scopes stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-break;
-case 204:
-#line 1595 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
-        }
-break;
-case 205:
-#line 1599 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
-        }
-break;
-case 206:
-#line 1603 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-	  /*
-	   * Done with this enum. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-break;
-case 208:
-#line 1622 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
-        }
-break;
-case 211:
-#line 1631 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	  AST_EnumVal		*e = NULL;
-	  AST_Enum		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  /*
-	   * Create a node representing one enumerator in an enum
-	   * Add it to the enclosing scope (the enum scope)
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL)
-	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-	    (void) s->fe_add_enum_val(e);
-	  }
-	}
-break;
-case 212:
-#line 1655 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
-        }
-break;
-case 213:
-#line 1659 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
-        }
-break;
-case 214:
-#line 1663 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (yyvsp[-2].exval == NULL || yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else if (yyvsp[-5].dcval == NULL) {
-	    yyval.dcval = NULL;
-	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl(yyvsp[-5].dcval);
-	    if (tp == NULL)
-	      yyval.dcval = NULL;
-	    else {
-	      yyval.dcval = idl_global->gen()->create_sequence(yyvsp[-2].exval, tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(yyval.dcval));
- 	    }
-	  }
-	}
-break;
-case 215:
-#line 1694 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (yyvsp[-1].dcval == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    AST_Type *tp = AST_Type::narrow_from_decl(yyvsp[-1].dcval);
-	    if (tp == NULL)
-	      yyval.dcval = NULL;
-            else {
-	      yyval.dcval =
-	        idl_global->gen()->create_sequence(
-		  	     idl_global->gen()->create_expr((unsigned long) 0),
-			     tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(yyval.dcval));
-	    }
-	  }
-	}
-break;
-case 216:
-#line 1727 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-	  /*
-	   * Push a sequence marker on scopes stack
-	   */
-	  idl_global->scopes()->push(NULL);
-	}
-break;
-case 217:
-#line 1735 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
-        }
-break;
-case 218:
-#line 1739 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-	  yyval.dcval = yyvsp[0].dcval;
-        }
-break;
-case 219:
-#line 1748 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-break;
-case 220:
-#line 1752 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-break;
-case 221:
-#line 1756 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (yyvsp[-2].exval == NULL || yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else {
-	    yyval.dcval = idl_global->gen()->create_string(yyvsp[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	  }
-	}
-break;
-case 222:
-#line 1774 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  yyval.dcval =
-	    idl_global->gen()->create_string(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	}
-break;
-case 223:
-#line 1792 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-break;
-case 224:
-#line 1800 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-break;
-case 225:
-#line 1804 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-break;
-case 226:
-#line 1808 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (yyvsp[-2].exval == NULL || yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else {
-	    yyval.dcval = idl_global->gen()->create_wstring(yyvsp[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	  }
-	}
-break;
-case 227:
-#line 1826 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  yyval.dcval =
-	    idl_global->gen()->create_wstring(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	}
-break;
-case 228:
-#line 1844 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-break;
-case 229:
-#line 1851 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
-        }
-break;
-case 230:
-#line 1855 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-	  /*
-	   * Create a node representing an array
-	   */
-	  if (yyvsp[0].elval != NULL) {
-	     yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(yyvsp[-2].idval, NULL),
-						  yyvsp[0].elval->length(), yyvsp[0].elval);
-	  }
-	}
-break;
-case 231:
-#line 1869 "idl.yy"
-{
-	  yyval.elval = new UTL_ExprList(yyvsp[-1].exval, yyvsp[0].elval);
-	}
-break;
-case 232:
-#line 1876 "idl.yy"
-{
-	  if (yyvsp[-1].elval == NULL)
-	    yyval.elval = new UTL_ExprList(yyvsp[0].exval, NULL);
-	  else {
-	    yyvsp[-1].elval->nconc(new UTL_ExprList(yyvsp[0].exval, NULL));
-	    yyval.elval = yyvsp[-1].elval;
-	  }
-	}
-break;
-case 233:
-#line 1885 "idl.yy"
-{
-	  yyval.elval = NULL;
-	}
-break;
-case 234:
-#line 1892 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
-        }
-break;
-case 235:
-#line 1896 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
-        }
-break;
-case 236:
-#line 1900 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-	  /*
-	   * Array dimensions are expressions which must be coerced to
-	   * positive integers
-	   */
-	  if (yyvsp[-2].exval == NULL || yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    yyval.exval = NULL;
-	  } else
-	    yyval.exval = yyvsp[-2].exval;
-	}
-break;
-case 237:
-#line 1917 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
-        }
-break;
-case 238:
-#line 1921 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
-        }
-break;
-case 239:
-#line 1925 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  AST_Attribute		*a = NULL;
-	  FE_Declarator		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-	  /*
-	   * Create nodes representing attributes and add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && yyvsp[-2].dcval != NULL && yyvsp[0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yyvsp[0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      AST_Type *tp = d->compose(yyvsp[-2].dcval);
- 	      if (tp == NULL)
-	 	continue;
-	      a = idl_global->gen()->create_attribute(yyvsp[-5].bval, tp, d->name(), p);
-	      /*
-	       * Add one attribute to the enclosing scope
-	       */
-	      (void) s->fe_add_attribute(a);
-	    }
-	    delete l;
-	  }
-	}
-break;
-case 240:
-#line 1959 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-	  yyval.bval = I_TRUE;
-	}
-break;
-case 241:
-#line 1964 "idl.yy"
-{
-	  yyval.bval = I_FALSE;
-	}
-break;
-case 242:
-#line 1971 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-	}
-break;
-case 243:
-#line 1975 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yyvsp[0].idval, NULL);
-	  AST_Exception		*e = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-	  /*
-	   * Create a node representing an exception and add it to
-	   * the enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_exception(n, p);
-	    (void) s->fe_add_exception(e);
-	  }
-	  /*
-	   * Push the exception scope on the scope stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-break;
-case 244:
-#line 1999 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        }
-break;
-case 245:
-#line 2003 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
-        }
-break;
-case 246:
-#line 2007 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-	  /*
-	   * Done with this exception. Pop its scope from the scope stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-break;
-case 247:
-#line 2019 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
-        }
-break;
-case 248:
-#line 2023 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	  AST_Operation		*o = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-	  /*
-	   * Create a node representing an operation on an interface
-	   * and add it to its enclosing scope
-	   */
-	  if (s != NULL && yyvsp[-2].dcval != NULL) {
-	    AST_Type *tp = AST_Type::narrow_from_decl(yyvsp[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(yyvsp[-2].dcval);
-            } else if (tp->node_type() == AST_Decl::NT_except) {
-              idl_global->err()->not_a_type(yyvsp[-2].dcval);
-            } else {
-	      o = idl_global->gen()->create_operation(tp, yyvsp[-3].ofval, n, p);
-	      (void) s->fe_add_operation(o);
-	    }
-	  }
-	  /*
-	   * Push the operation scope onto the scopes stack
-	   */
-	  idl_global->scopes()->push(o);
-	}
-break;
-case 249:
-#line 2052 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
-        }
-break;
-case 250:
-#line 2056 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
-        }
-break;
-case 251:
-#line 2060 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Operation		*o = NULL;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-	  /*
-	   * Add exceptions and context to the operation
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-	    o = AST_Operation::narrow_from_scope(s);
-
-	    if (yyvsp[-2].nlval != NULL && o != NULL)
-	      (void) o->fe_add_exceptions(yyvsp[-2].nlval);
-	    if (yyvsp[0].slval != NULL)
-	      (void) o->fe_add_context(yyvsp[0].slval);
-	  }
-	  /*
-	   * Done with this operation. Pop its scope from the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-break;
-case 252:
-#line 2085 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  yyval.ofval = AST_Operation::OP_oneway;
-	}
-break;
-case 253:
-#line 2090 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  yyval.ofval = AST_Operation::OP_idempotent;
-	}
-break;
-case 254:
-#line 2095 "idl.yy"
-{
-	  yyval.ofval = AST_Operation::OP_noflags;
-	}
-break;
-case 256:
-#line 2103 "idl.yy"
-{
-	  yyval.dcval =
-	    idl_global->scopes()->bottom()
-	       ->lookup_primitive_type(AST_Expression::EV_void);
-	}
-break;
-case 257:
-#line 2112 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-break;
-case 258:
-#line 2116 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-break;
-case 259:
-#line 2120 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-break;
-case 260:
-#line 2125 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-break;
-case 262:
-#line 2135 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
-        }
-break;
-case 265:
-#line 2144 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
-        }
-break;
-case 266:
-#line 2148 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
-        }
-break;
-case 267:
-#line 2152 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Argument		*a = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-	  /*
-	   * Create a node representing an argument to an operation
-	   * Add it to the enclosing scope (the operation scope)
-	   */
-	  if (yyvsp[-2].dcval != NULL && yyvsp[0].deval != NULL && s != NULL) {
-	    AST_Type *tp = yyvsp[0].deval->compose(yyvsp[-2].dcval);
-	    if (tp != NULL) {
-	      a = idl_global->gen()->create_argument(yyvsp[-4].dival, tp, yyvsp[0].deval->name(), p);
-	      (void) s->fe_add_argument(a);
-	    }
-	  }
-	}
-break;
-case 268:
-#line 2174 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yyvsp[0].etval);
-	}
-break;
-case 270:
-#line 2179 "idl.yy"
-{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name(yyvsp[0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(yyvsp[0].idlist);
-	  yyval.dcval = d;
-	}
-break;
-case 271:
-#line 2193 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_IN;
-	}
-break;
-case 272:
-#line 2197 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_OUT;
-	}
-break;
-case 273:
-#line 2201 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_INOUT;
-	}
-break;
-case 274:
-#line 2208 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
-        }
-break;
-case 275:
-#line 2212 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
-        }
-break;
-case 276:
-#line 2217 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-	  yyval.nlval = yyvsp[-1].nlval;
-	}
-break;
-case 277:
-#line 2222 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	}
-break;
-case 278:
-#line 2229 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
-        }
-break;
-case 279:
-#line 2233 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
-        }
-break;
-case 280:
-#line 2238 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-	  yyval.slval = yyvsp[-1].slval;
-	}
-break;
-case 281:
-#line 2243 "idl.yy"
-{
-	  yyval.slval = NULL;
-	}
-break;
-case 282:
-#line 2250 "idl.yy"
-{
-	  yyval.slval = new UTL_StrList(yyvsp[-1].sval, yyvsp[0].slval);
-	}
-break;
-case 283:
-#line 2258 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
-        }
-break;
-case 284:
-#line 2262 "idl.yy"
-{
-	  if (yyvsp[-3].slval == NULL)
-	    yyval.slval = new UTL_StrList(yyvsp[0].sval, NULL);
-	  else {
-	    yyvsp[-3].slval->nconc(new UTL_StrList(yyvsp[0].sval, NULL));
-	    yyval.slval = yyvsp[-3].slval;
-	  }
-	}
-break;
-case 285:
-#line 2271 "idl.yy"
-{
-	  yyval.slval = NULL;
-	}
-break;
-#line 3286 "y.tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#ifdef YYDEBUG
-        if (5 < yydebug)
-            printf("yydebug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                if (5 < yydebug)
-                    printf("yydebug: state %d, reading %d (%s)\n",
-                        YYFINAL, yychar, yys);
-                else
-                    YYDEBUG_LOOK_AHEAD(YYFINAL, yychar, yys, yyssp-yyss);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#ifdef YYDEBUG
-    if (5 < yydebug)
-        printf("yydebug: after reduction, shifting from state %d \
-to state %d\n", *yyssp, yystate);
-#endif
-    if (yyssp >= yyss + yystacksize - 1)
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff
deleted file mode 100644
index 8f29bff9c8b..00000000000
--- a/TAO/TAO_IDL/fe/y.tab.cpp.diff
+++ /dev/null
@@ -1,127 +0,0 @@
---- y.tab.cpp.orig	Fri Jan 23 11:09:05 1998
-+++ y.tab.cpp	Fri Jan 23 11:08:33 1998
-@@ -97,13 +97,13 @@
-
- #ifdef __STDC__
- #include <stdlib.h>
--#include <string.h>
-+// #include <string.h>
- #else
- #include <malloc.h>
- #include <memory.h>
- #endif
-
--#include <values.h>
-+// #include <values.h>
-
- #ifdef __cplusplus
-
-@@ -494,52 +494,52 @@
-
- yytoktype yytoks[] =
- {
--	"IDENTIFIER",	257,
--	"IDL_CONST",	258,
--	"IDL_MODULE",	259,
--	"IDL_INTERFACE",	260,
--	"IDL_TYPEDEF",	261,
--	"IDL_LONG",	262,
--	"IDL_SHORT",	263,
--	"IDL_UNSIGNED",	264,
--	"IDL_DOUBLE",	265,
--	"IDL_FLOAT",	266,
--	"IDL_CHAR",	267,
--	"IDL_WCHAR",	268,
--	"IDL_OCTET",	269,
--	"IDL_BOOLEAN",	270,
--	"IDL_ANY",	271,
--	"IDL_STRUCT",	272,
--	"IDL_UNION",	273,
--	"IDL_SWITCH",	274,
--	"IDL_ENUM",	275,
--	"IDL_SEQUENCE",	276,
--	"IDL_STRING",	277,
--	"IDL_WSTRING",	278,
--	"IDL_EXCEPTION",	279,
--	"IDL_CASE",	280,
--	"IDL_DEFAULT",	281,
--	"IDL_READONLY",	282,
--	"IDL_ATTRIBUTE",	283,
--	"IDL_ONEWAY",	284,
--	"IDL_IDEMPOTENT",	285,
--	"IDL_VOID",	286,
--	"IDL_IN",	287,
--	"IDL_OUT",	288,
--	"IDL_INOUT",	289,
--	"IDL_RAISES",	290,
--	"IDL_CONTEXT",	291,
--	"IDL_NATIVE",	292,
--	"IDL_INTEGER_LITERAL",	293,
--	"IDL_STRING_LITERAL",	294,
--	"IDL_CHARACTER_LITERAL",	295,
--	"IDL_FLOATING_PT_LITERAL",	296,
--	"IDL_TRUETOK",	297,
--	"IDL_FALSETOK",	298,
--	"IDL_SCOPE_DELIMITOR",	299,
--	"IDL_LEFT_SHIFT",	300,
--	"IDL_RIGHT_SHIFT",	301,
--	"-unknown-",	-1	/* ends search */
-+	{"IDENTIFIER",	257},
-+	{"IDL_CONST",	258},
-+	{"IDL_MODULE",	259},
-+	{"IDL_INTERFACE",	260},
-+	{"IDL_TYPEDEF",	261},
-+	{"IDL_LONG",	262},
-+	{"IDL_SHORT",	263},
-+	{"IDL_UNSIGNED",	264},
-+	{"IDL_DOUBLE",	265},
-+	{"IDL_FLOAT",	266},
-+	{"IDL_CHAR",	267},
-+	{"IDL_WCHAR",	268},
-+	{"IDL_OCTET",	269},
-+	{"IDL_BOOLEAN",	270},
-+	{"IDL_ANY",	271},
-+	{"IDL_STRUCT",	272},
-+	{"IDL_UNION",	273},
-+	{"IDL_SWITCH",	274},
-+	{"IDL_ENUM",	275},
-+	{"IDL_SEQUENCE",	276},
-+	{"IDL_STRING",	277},
-+	{"IDL_WSTRING",	278},
-+	{"IDL_EXCEPTION",	279},
-+	{"IDL_CASE",	280},
-+	{"IDL_DEFAULT",	281},
-+	{"IDL_READONLY",	282},
-+	{"IDL_ATTRIBUTE",	283},
-+	{"IDL_ONEWAY",	284},
-+	{"IDL_IDEMPOTENT",	285},
-+	{"IDL_VOID",	286},
-+	{"IDL_IN",	287},
-+	{"IDL_OUT",	288},
-+	{"IDL_INOUT",	289},
-+	{"IDL_RAISES",	290},
-+	{"IDL_CONTEXT",	291},
-+	{"IDL_NATIVE",	292},
-+	{"IDL_INTEGER_LITERAL",	293},
-+	{"IDL_STRING_LITERAL",	294},
-+	{"IDL_CHARACTER_LITERAL",	295},
-+	{"IDL_FLOATING_PT_LITERAL",	296},
-+	{"IDL_TRUETOK",	297},
-+	{"IDL_FALSETOK",	298},
-+	{"IDL_SCOPE_DELIMITOR",	299},
-+	{"IDL_LEFT_SHIFT",	300},
-+	{"IDL_RIGHT_SHIFT",	301},
-+	{"-unknown-",	-1}	/* ends search */
- };
-
- char * yyreds[] =
-@@ -837,7 +837,9 @@
-  * Copyright (c) 1993 by Sun Microsystems, Inc.
-  */
-
-+#if !defined (ACE_WIN32)
- #pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
-+#endif /* ACE_WIN32 */
-
- /*
- ** Skeleton parser driver for yacc output
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
deleted file mode 100644
index 8c197aab46b..00000000000
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-typedef union
-#ifdef __cplusplus
-	YYSTYPE
-#endif
- {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-} YYSTYPE;
-extern YYSTYPE yylval;
-# define IDENTIFIER 257
-# define IDL_CONST 258
-# define IDL_MODULE 259
-# define IDL_INTERFACE 260
-# define IDL_TYPEDEF 261
-# define IDL_LONG 262
-# define IDL_SHORT 263
-# define IDL_UNSIGNED 264
-# define IDL_DOUBLE 265
-# define IDL_FLOAT 266
-# define IDL_CHAR 267
-# define IDL_WCHAR 268
-# define IDL_OCTET 269
-# define IDL_BOOLEAN 270
-# define IDL_ANY 271
-# define IDL_STRUCT 272
-# define IDL_UNION 273
-# define IDL_SWITCH 274
-# define IDL_ENUM 275
-# define IDL_SEQUENCE 276
-# define IDL_STRING 277
-# define IDL_WSTRING 278
-# define IDL_EXCEPTION 279
-# define IDL_CASE 280
-# define IDL_DEFAULT 281
-# define IDL_READONLY 282
-# define IDL_ATTRIBUTE 283
-# define IDL_ONEWAY 284
-# define IDL_IDEMPOTENT 285
-# define IDL_VOID 286
-# define IDL_IN 287
-# define IDL_OUT 288
-# define IDL_INOUT 289
-# define IDL_RAISES 290
-# define IDL_CONTEXT 291
-# define IDL_NATIVE 292
-# define IDL_INTEGER_LITERAL 293
-# define IDL_STRING_LITERAL 294
-# define IDL_CHARACTER_LITERAL 295
-# define IDL_FLOATING_PT_LITERAL 296
-# define IDL_TRUETOK 297
-# define IDL_FALSETOK 298
-# define IDL_SCOPE_DELIMITOR 299
-# define IDL_LEFT_SHIFT 300
-# define IDL_RIGHT_SHIFT 301
diff --git a/TAO/TAO_IDL/idl_make_vars b/TAO/TAO_IDL/idl_make_vars
deleted file mode 100644
index f061649d004..00000000000
--- a/TAO/TAO_IDL/idl_make_vars
+++ /dev/null
@@ -1,62 +0,0 @@
-# Makefile include file for IDL compiler
-#
-# What OS we're compiling on.
-#
-# As shipped the CFE is preconfigured for SOLARIS 2.x
-# ===================================================
-#
-# Uncomment the next line for SOLARIS 2.x
-OSV		= SOLARIS2
-# Uncomment the next line for SUNOS 4.x
-# OSV		= SUNOS4
-# Uncomment the next line for HPUX
-# OSV		= hpux
-# Uncomment the next line for Apollo Domain
-# OSV		= apollo
-#
-# IDL_CFE_VERSION	Defines what the current IDL CFE version is
-IDL_CFE_VERSION =	\"1.3.0\"
-#
-# Define LEXFLAGS to pass to lex
-LEXFLAGS	= -t
-#
-# Define YFLAGS to pass to yacc
-YFLAGS	 	= -t -d
-#
-# C++			What C++ compiler to use
-#
-# Also define CCC which is used instead of C++ in
-# some versions of make. Make sure they refer to the
-# same executable; if you modify one please also modify
-# the other to be identical.
-#
-# Uncomment these two lines if you're using SunPro Sparcworks C++ compilers
-# (Tested for SunPro Sparcworks 2.x with SunOS 4.x and Solaris 2.x, for
-#  SunPro Sparcworks 3.0 with Solaris 2.x)
-C++		= CC
-CCC		= CC
-# Uncomment these two lines if you're using g++ (tested for SunOS 4.x and
-# Solaris 2.x only, with g++ 2.5.8)
-# C++		= g++
-# CCC		= g++
-#
-# What flags to pass to the C preprocessor
-CPPFLAGS += -I../include -I. -D$(OSV) \
-	    -DCPP_LOCATION=\"$(C++)\" \
-	    -DIDL_CFE_VERSION=$(IDL_CFE_VERSION) \
-#
-# What flags to pass to the CC phase
-CCFLAGS	 += -g
-#
-# What ranlib to use
-#
-# Uncomment the following line for SunOS 4.x and others which have ranlib
-# RANLIB	        = ranlib
-# Uncomment the following line for Solaris 2.x and others which don't have it
-RANLIB		= /bin/true
-#
-# What ar to use
-AR	        = ar
-#
-# What flags to give to ar
-ARFLAGS		= crv
diff --git a/TAO/TAO_IDL/idl_specs/array.idl b/TAO/TAO_IDL/idl_specs/array.idl
deleted file mode 100644
index 2520e9045fd..00000000000
--- a/TAO/TAO_IDL/idl_specs/array.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-typedef sequence<long,10> vec10;
-typedef char str22[22][2];
-typedef boolean boolarray[3][40];
-
-
-struct A {
-    long	a1;
-    char	a2[17];
-    char	a3[10][2];
-//    vec10	a3;
-};
-
-struct B {
-    long	b1;
-    A		b2;
-};
-
-struct C {
-    long	c1;
-    long	c2;
-};
-
-typedef A A_matrix[2][3][4];
-typedef B B_matrix[2][3][4];
-typedef C C_matrix[2][3][4];
-
-typedef A_matrix A_rmatrix[2][3][4][5];
-
-interface A_i {
-    A		op(in A a1, inout A a2, out A a3);
-    str22	op2(in str22 a1, inout str22 a2, out str22 a3);
-    str22       op3(in short a1[3][4], inout short a2[3][4], out short a3[4][4]);
-    A_matrix	op4(in A a1, inout A a2, out A a3);
-    attribute str22 attribute_array;
-    void foo(in any x[3], out any y[4], inout any z[3]);
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/constant.idl b/TAO/TAO_IDL/idl_specs/constant.idl
deleted file mode 100644
index 3570de87ebc..00000000000
--- a/TAO/TAO_IDL/idl_specs/constant.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-const short l = 4;
-
-enum N { zero, un , deux, trois };
-
-exception E {
-	short cause ;
-	};
-
-module M {
-	const short l = 4; 
-
-	enum N { zero, un , deux, trois };
-
-	exception E {
-        short cause ;
-        };
-	
-	interface A {
-	        const short l = 4; 
- 
-	        enum N { zero, un , deux, trois };
- 
-       		 exception E {
-        	short cause ;
-        	};
-	N foo(in N x, out N y, inout N z);
-	};
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/dif2.idl b/TAO/TAO_IDL/idl_specs/dif2.idl
deleted file mode 100644
index c2b23eaf625..00000000000
--- a/TAO/TAO_IDL/idl_specs/dif2.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* A test interface for DIF1 */
-
-interface ex1
-{
-	void op0();
-	float op1(in float f, out double d, inout long l);
-	double op2(in double d, out long l, inout short s);
-	long op3(in long l, out short s, inout unsigned long ul);
-	short op4(in short s, out unsigned long ul, inout unsigned short us);
-	unsigned long op5(inout unsigned long ul, in unsigned short us, out char c, in boolean b);
-	unsigned short op6(out unsigned short us, inout char c);
-};
-
-//interface ex3;
-
-interface ex2 : ex1 
-{
-	// operations continued from ex1
-	char op7(in char c, out boolean b, inout octet o);
-	boolean op8(out boolean b, in octet o);
-	octet op9(inout octet o, out string s, in string <10> ls, inout long l);
-	string op10(in string s, out string <10> ls);
-	string <10> op11(inout string <10> ls, out long l);
-	long op12(in long l);
-//	ex3 op13(Environment *ev);
-};
-
-interface ex3 : ex1
-{
-	// attributes
-	readonly attribute float float_attribute;
-	attribute double double_attribute;
-	readonly attribute long long_attribute;
-	attribute short short_attribute;
-	readonly attribute unsigned long unsigned_long_attribute;
-
-};
-
-interface ex4 : ex2, ex3
-{
-	attribute unsigned short unsigned_short_attribute;
-	readonly attribute char char_attribute;
-	attribute boolean boolean_attribute;
-	readonly attribute octet octet_attribute;
-	attribute string string_attribute;
-	readonly attribute string <10> limited_string_attribute;
-	readonly attribute ex4 an_object_attribute;
-};
diff --git a/TAO/TAO_IDL/idl_specs/inherit.idl b/TAO/TAO_IDL/idl_specs/inherit.idl
deleted file mode 100644
index a96fe169570..00000000000
--- a/TAO/TAO_IDL/idl_specs/inherit.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-interface one {
-    void op_one();
-};
-interface two : one {
-    void op_two();
-};
-interface three : one {
-    void op_three();
-};
-interface four : two, three {
-    void op_four();
-};
-
-interface five : four, three, two {
-    void op_five();
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/module.idl b/TAO/TAO_IDL/idl_specs/module.idl
deleted file mode 100644
index 178ad2fb689..00000000000
--- a/TAO/TAO_IDL/idl_specs/module.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-module mod1
-{
-    module mod2
-    {
-	interface ex1
-	{
-	    attribute long	l1;
-	    readonly attribute long l2;
-
-	    long	m1(in long a);
-	};
-
-	interface ex2 : ex1
-	{
-	    attribute long	l3;
-
-	    long	m2(in long a, out long b);
-	};
-    };
-};
diff --git a/TAO/TAO_IDL/idl_specs/primtypes.idl b/TAO/TAO_IDL/idl_specs/primtypes.idl
deleted file mode 100644
index fa5d154f8f2..00000000000
--- a/TAO/TAO_IDL/idl_specs/primtypes.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-interface ex1
-{
-    attribute  long l1;
-    long	m1(in long a);
-    ex1		mtypes(
-	in long a1, inout long a2, out   long a3,
-	in unsigned long b1, inout unsigned long b2, out unsigned long b3,
-	in short c1,inout short c2, out short c3,
-	in unsigned short d1, inout unsigned short d2, out unsigned short d3,
-	in float e1, inout float e2, out float e3,
-	in double f1, inout double f2, out double f3,
-	in char g1,  inout char g2, out char g3
-    );
-		   
-};
-
-interface ex2 : ex1 
-{
-    readonly attribute long l2;
-
-    long	m2(in long a, out long b);
-    void	mv();
-};
diff --git a/TAO/TAO_IDL/idl_specs/sequence.idl b/TAO/TAO_IDL/idl_specs/sequence.idl
deleted file mode 100644
index 4701c987b15..00000000000
--- a/TAO/TAO_IDL/idl_specs/sequence.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-typedef sequence<long,10> vec10;
-typedef sequence<char,20> c20;
-typedef sequence<c20,23> cc23;
-typedef sequence<char,24> c24;
-typedef sequence< sequence<long,10>, 10> c30;
-struct TProgram {
-    string		path;
-    sequence<string>	argv;
-    sequence<string>	envp;
-};
-
-struct foo {
-    long	f1;
-    char	f2;
-};
-
-typedef foo			foo_ar[20];
-typedef sequence<foo> 		f_unbounded;
-typedef sequence<foo_ar>	f_ar_unbounded;
-
-interface TestSeq {
-    attribute	f_unbounded	fattr;
-    typedef sequence<long,10> also_vec10;
-    vec10 op(in also_vec10 a, out vec10 b, inout sequence <long,10> c);
-};
diff --git a/TAO/TAO_IDL/idl_specs/simple.idl b/TAO/TAO_IDL/idl_specs/simple.idl
deleted file mode 100644
index 6538d9410ba..00000000000
--- a/TAO/TAO_IDL/idl_specs/simple.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-typedef sequence<long,10> vec10;
-
-exception simple_error {
-    long reason;
-};
-
-interface simple {
-	long op(in long a, out simple b, inout long c) raises (simple_error);
-};
-
-interface simple2 : simple {
-    exception simple2_error {
-	long	reason2;
-    };
-    long op2(in long a, in simple b, out simple2 c) raises (simple2_error);
-};
diff --git a/TAO/TAO_IDL/idl_specs/simple2.idl b/TAO/TAO_IDL/idl_specs/simple2.idl
deleted file mode 100644
index b26e7ff3230..00000000000
--- a/TAO/TAO_IDL/idl_specs/simple2.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "simple.idl"
-
-
-interface simple3 : simple2 {
-    exception OVERFLOW {
-	long	a;
-	string	msg;
-    };
-    exception UNDERFLOW {
-	long	b;
-	string	msg;
-    };
-    exception BADNUM {
-	vec10	c;
-    };
-    exception USERERROR { 
-	any reason;
-    };
-    long	op3(in long a, out simple3 b, out simple2 c, out simple d)
-                      raises (OVERFLOW, UNDERFLOW, BADNUM);
-    any		op4(in any x, inout any y, out any z)
-               raises(UNDERFLOW);
-
-    oneway void	op5()
-               raises(USERERROR);
-};
diff --git a/TAO/TAO_IDL/idl_specs/struct.idl b/TAO/TAO_IDL/idl_specs/struct.idl
deleted file mode 100644
index 42f215a1a62..00000000000
--- a/TAO/TAO_IDL/idl_specs/struct.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-struct bar {
-	long	b1;
-	long	b2;
-	string<20> b3;
-};
-
-struct bar2 {
-	long	b3;
-	bar	b4;
-};
-
-struct bar3 {
-    long b1;
-    long b2;
-    long b3;
-};
-
-struct bar4 {
-    long b1;
-    bar2 b2;
-    long b3;
-    bar3 b4;
-    long b5;
-};
-
-
-interface foo {
-	long	op(in bar a, out bar2 b);
-};
-interface foo2 : foo {
-    bar	op2(in bar2 a);
-    long op3(in long a, out char b);
-};
-
-
-typedef		unsigned short	Coord;
-
-struct CellPos {
-    Coord	row;      		
-    Coord	col;
-};
-
-struct CellPos2 {
-	unsigned short	row;
-	unsigned short	col;
-};
-
-struct CellPos3 {
-	Coord	row;
-	Coord	col;
-	unsigned short col2;
-};
diff --git a/TAO/TAO_IDL/idl_specs/union.idl b/TAO/TAO_IDL/idl_specs/union.idl
deleted file mode 100644
index 7b6e32b9957..00000000000
--- a/TAO/TAO_IDL/idl_specs/union.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-struct Bar {
-    long	b1;
-    char	b2;
-};
-
-union Foo switch (long) {
-case 1: long x;
-case 2: Bar y;
-default: char z;
-};
-
-
-union Foo2 switch (char) {
-  case 'a': long x;
-  case 'b': Foo y;
-};
-
-interface a {
-	struct astruct {
-		Foo2	a1;
-		Foo	a2;
-		Bar	a3;
-	};
-	Foo2	opA(in astruct b);
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/union2.idl b/TAO/TAO_IDL/idl_specs/union2.idl
deleted file mode 100644
index 94a355facdf..00000000000
--- a/TAO/TAO_IDL/idl_specs/union2.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-enum FooDisc {
-	FOO1,
-	FOO2
-};
-union Foo switch (FooDisc) {
-case FOO1: long x;
-case FOO2: string y;
-default: char z;
-};
-
-
-struct Bar {
-    enum BarDisc {
-	BAR1,
-	BAR2
-    } kind;
-    union Foo switch (BarDisc) {
-      case BAR1: long x;
-      case BAR2: long y;
-    } addr;
-};
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
deleted file mode 100644
index 5fdeef19e0c..00000000000
--- a/TAO/TAO_IDL/include/ast.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_AST_HH
-#define _AST_AST_HH
-
-// ast.h
-//
-// Defines the classes which constitute the agreement between the CFE
-// and BEs.
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-#include	"utl_scoped_name.h"	// Define UTL_ScopedName
-
-#include	"ast_decl.h"		// class AST_Decl
-
-#include	"ast_expression.h"	// class AST_Expression
-
-#include	"utl_scope.h"		// class UTL_Scope
-
-#include	"ast_type.h"		// class AST_Type
-#include	"ast_concrete_type.h"	// class AST_ConcreteType
-#include	"ast_predefined_type.h"// class AST_PredefinedType
-#include	"ast_module.h"		// class AST_Module
-#include	"ast_root.h"		// class AST_Root
-#include	"ast_interface.h"	// class AST_Interface
-#include	"ast_interface_fwd.h"	// class AST_InterfaceFwd
-#include	"ast_structure.h"	// class AST_Structure
-#include	"ast_exception.h"	// class AST_Exception
-#include	"ast_enum.h"		// class AST_Enum
-#include	"ast_operation.h"	// class AST_Operation
-#include	"ast_field.h"		// class AST_Field
-#include	"ast_argument.h"	// class AST_Argument
-#include	"ast_attribute.h"	// class AST_Attribute
-#include	"ast_union.h"		// class AST_Union
-#include	"ast_union_branch.h"	// class AST_UnionBranch
-#include	"ast_union_label.h"	// class AST_UnionLabel
-#include	"ast_constant.h"	// class AST_Constant
-#include	"ast_enum_val.h"	// class AST_EnumVal
-#include	"ast_array.h"		// class AST_Array
-#include	"ast_sequence.h"	// class AST_Sequence
-#include	"ast_string.h"		// class AST_String
-#include	"ast_typedef.h"	// class AST_Typedef
-#include        "ast_native.h"          // class AST_Native
-
-#include	"utl_list.h"		// class UTL_List
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_exprlist.h"	// class UTL_ExprList
-
-#include	"ast_generator.h"	// class AST_Generator
-
-#endif           // _AST_AST_HH
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
deleted file mode 100644
index c0cbb18cebb..00000000000
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ARGUMENT_AST_ARGUMENT_HH
-#define _AST_ARGUMENT_AST_ARGUMENT_HH
-
-// Representation of argument to operation:
-//
-// An argument is a field with a direction attached
-
-/*
-** DEPENDENCIES: ast_field.hh, utl_scoped_name.hh, ast_type.hh
-**		 utl_strlist.hh, ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_field.h"
-
-
-class AST_Argument : public virtual AST_Field
-{
-public:
-  // Define enum with values denoting argument passing directions
-  enum Direction {dir_IN, dir_OUT, dir_INOUT};
-
-  // Operations
-
-  // Constructor(s)
-  AST_Argument();
-  AST_Argument(Direction direction, AST_Type *ft, UTL_ScopedName *n,
-	       UTL_StrList *p);
-  virtual ~AST_Argument() {}
-
-  // Data Accessors
-  Direction direction();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Argument, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_Argument);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  const Direction	pd_direction;	// Argument direction
-};
-
-#endif           // _AST_ARGUMENT_AST_ARGUMENT_HH
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
deleted file mode 100644
index 0d3fb69b9f1..00000000000
--- a/TAO/TAO_IDL/include/ast_array.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ARRAY_AST_ARRAY_HH
-#define _AST_ARRAY_AST_ARRAY_HH
-
-// Representation of array declaration:
-//
-// An array is a combination of a list of dimensions and a base type
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_exprlist.hh, ast_type.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Array : public virtual AST_ConcreteType {
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Array();
-  AST_Array(UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims);
-  virtual ~AST_Array() {}
-
-  // Data Accessors
-  unsigned long n_dims();
-  AST_Expression **dims();
-  void		   set_dims(AST_Expression **, unsigned long);
-  AST_Type	  *base_type();
-  void		   set_base_type(AST_Type *nbt);
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Array, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_Array);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  unsigned long			pd_n_dims;	// How many dimensions?
-  AST_Expression		**pd_dims;	// Their expressions
-  AST_Type			*pd_base_type;	// Base type of array
-
-  // Operations
-
-  // Compute how many dimensions
-  AST_Expression	       **compute_dims(UTL_ExprList *dims,
-					     unsigned long ndims);
-};
-
-#endif           // _AST_ARRAY_AST_ARRAY_HH
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
deleted file mode 100644
index a18706bd0f7..00000000000
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
-#define _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
-
-// Representation of attribute declaration:
-//
-// An attribute is a field with a readonly property
-
-/*
-** DEPENDENCIES: ast_field.hh, ast_type.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh, ast_decl.hh
-**
-** USE: Included from ast.h
-*/
-
-class	AST_Attribute : public virtual AST_Field
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Attribute();
-  AST_Attribute(idl_bool readonly,
-		AST_Type *ft,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
-  virtual ~AST_Attribute() {}
-
-  // Data Accessors
-  idl_bool readonly();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Attribute, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_Attribute);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  const idl_bool		pd_readonly;	// Is attribute read-only?
-};
-
-#endif           // _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
deleted file mode 100644
index 6c527afaca7..00000000000
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
-#define _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
-
-// Class for all concrete types
-//
-// This is useful to group together IDL types other than objects
-
-/*
-** DEPENDENCIES: ast_type.hh, ast_decl.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_ConcreteType : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_ConcreteType();
-  AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_ConcreteType() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_ConcreteType, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_ConcreteType);
-};
-
-#endif           // _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
deleted file mode 100644
index 90db723d429..00000000000
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_CONSTANT_AST_CONSTANT_HH
-#define _AST_CONSTANT_AST_CONSTANT_HH
-
-// Representation of constant declaration:
-//
-// NOTE: Part of the job of the constructor is to convert
-// the AST_Constant_val it received to the type denoted by
-// the ConstantType it received.
-//
-// NOTE: There are two constructors here, one that gets a NodeType
-// parameter. This constructor is used from AST_EnumVal, which is
-// just a glorified AST_Constant
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_expression.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Constant : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Constant();
-  AST_Constant(AST_Expression::ExprType et, AST_Decl::NodeType nt,
-	       AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p);
-  AST_Constant(AST_Expression::ExprType et, AST_Expression *ev,
-	       UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Constant() {}
-
-  // Data Accessors
-  AST_Expression *constant_value();
-  AST_Expression::ExprType et();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Constant, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Constant);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_constant_value;	// The value
-  AST_Expression::ExprType	pd_et;			// Its expr type
-};
-
-#endif           // _AST_CONSTANT_AST_CONSTANT_HH
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
deleted file mode 100644
index 964cc917f8a..00000000000
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_DECL_AST_DECL_HH
-#define _AST_DECL_AST_DECL_HH
-
-// Rock bottom of AST class hierarchy
-//
-// This class is inherited by all classes which represent named entities
-// in IDL. It implements the line and file recording mechanism and also
-// records the type of the node. This may be useful for BEs to be able
-// to distinguish the real type of a node given only a superclass.
-
-/*
-** DEPENDENCIES: utl_scope.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"idl_bool.h"
-#include	"utl_scoped_name.h"
-#include	"utl_string.h"
-
-// This class is needed (only for g++) to get around a bug in g++ which
-// causes virtual operations to not be looked up correctly if an operation
-// is defined in more than one virtual public base class. This class makes
-// the hierarchy rooted in a single class, thereby eliminating the situation
-// that causes the bug to appear
-
-class	COMMON_Base
-{
-  public:
-        // Narrowing
-    DEF_NARROW_METHODS0(COMMON_Base);
-};
-
-class	AST_Decl : public virtual COMMON_Base
-{
-public:
-  // Enum defining the different kinds of AST nodes
-  enum NodeType {
-        NT_module				// Denotes a module
-      , NT_root					// Denotes the root of AST
-      , NT_interface				// Denotes an interface
-      , NT_interface_fwd			// Fwd declared interface
-      , NT_const				// Denotes a constant
-      , NT_except				// Denotes an exception
-      , NT_attr					// Denotes an attribute
-      , NT_op					// Denotes an operation
-      , NT_argument				// Denotes an op. argument
-      , NT_union				// Denotes a union
-      , NT_union_branch				// Denotes a union branch
-      , NT_struct				// Denotes a structure
-      , NT_field				// Denotes a field in structure
-      , NT_enum					// Denotes an enumeration
-      , NT_enum_val				// Denotes an enum. value
-      , NT_string				// Denotes an IDL string
-      , NT_array				// Denotes an IDL array
-      , NT_sequence				// Denotes an IDL sequence
-      , NT_typedef				// Denotes a typedef
-      , NT_pre_defined				// Denotes a predefined type
-        , NT_native                             // Denotes a native type
-                                                // dependent on the programming
-                                                // language
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Decl();
-  AST_Decl(NodeType type, UTL_ScopedName *n, UTL_StrList *pragmas);
-  virtual ~AST_Decl() {}
-
-  // Data Accessors
-  idl_bool imported();
-  void set_imported(idl_bool is_it);
-  idl_bool in_main_file();
-  void set_in_main_file(idl_bool is_it);
-  UTL_Scope *defined_in();
-  void set_defined_in(UTL_Scope *);
-  NodeType node_type();
-  long line();
-  void set_line(long l);
-  String *file_name();
-  void set_file_name(String *s);
-  UTL_ScopedName *name();
-  void set_name(UTL_ScopedName *n);
-  Identifier *local_name();
-  void add_pragmas(UTL_StrList *p);
-  UTL_StrList *pragmas();
-  idl_bool added();
-  void set_added(idl_bool is_it);
-
-  // Narrowing
-  DEF_NARROW_METHODS0(AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Decl);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other operations
-
-  // Return TRUE if "this" has "s" as an ancestor
-  idl_bool			has_ancestor(AST_Decl *s);
-
-private:
-  // Data
-  idl_bool			pd_imported;    // Imported?
-  idl_bool			pd_in_main_file; // Defined in main file?
-  UTL_Scope			*pd_defined_in;	// Scope
-  NodeType			pd_node_type;	// What kind of node
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
-  UTL_ScopedName		*pd_name;	// As given
-  Identifier			*pd_local_name;	// Name in scope
-  UTL_StrList			*pd_pragmas;	// Pragmas
-  idl_bool			pd_added;	// already added
-
-  // Operations
-
-  // Compute the full name of an AST node
-  void				compute_full_name(UTL_ScopedName *n);
-};
-
-#endif           // _AST_DECL_AST_DECL_HH
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
deleted file mode 100644
index cf6941386c5..00000000000
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ENUM_AST_ENUM_HH
-#define _AST_ENUM_AST_ENUM_HH
-
-// Representation of enum:
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_enum_val.hh,
-**		 utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh,
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Enum();
-  AST_Enum(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Enum() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Enum, AST_ConcreteType, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Enum);
-  DEF_NARROW_FROM_SCOPE(AST_Enum);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-
-  // Other operations
-
-  // Look up an AST_EnumVal by value
-  virtual AST_EnumVal		*lookup_by_value(const AST_Expression *v);
-
-  // Get value to be assigned to next enumerator
-  virtual unsigned long		next_enum_val();
-
-private:
-  // Data
-  unsigned long			pd_enum_counter;	// Value for next
-							// enumerator
-  // Scope management
-  friend int yyparse();
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-
-};
-
-#endif           // _AST_ENUM_AST_ENUM_HH
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
deleted file mode 100644
index 902b5ad04c4..00000000000
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ENUM_VAL_AST_ENUM_VAL_HH
-#define _AST_ENUM_VAL_AST_ENUM_VAL_HH
-
-// Representation of enumerator in enum:
-//
-// An enumerator is a constant of type unsigned long
-
-/*
-** DEPENDENCIES: ast_constant.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_EnumVal : public virtual AST_Constant
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_EnumVal();
-  AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_EnumVal() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_EnumVal, AST_Constant);
-  DEF_NARROW_FROM_DECL(AST_EnumVal);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-};
-
-#endif           // _AST_ENUM_VAL_AST_ENUM_VAL_HH
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
deleted file mode 100644
index a1bf98fd8e9..00000000000
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXCEPTION_AST_EXCEPTION_HH
-#define _AST_EXCEPTION_AST_EXCEPTION_HH
-
-// Representation of exception
-//
-// NOTE: An exception is not a type according to the CORBAS 1.1
-//
-// NOTE: add(AST_ConcreteType *) is defined here because an exception
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Exception.
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_structure.hh, utl_scope.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Exception : public virtual AST_Structure
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Exception();
-  AST_Exception(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Exception() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Exception, AST_Structure);
-  DEF_NARROW_FROM_DECL(AST_Exception);
-  DEF_NARROW_FROM_SCOPE(AST_Exception);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Field		*fe_add_field(AST_Field		*f);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-
-};
-
-#endif           // _AST_EXCEPTION_AST_EXCEPTION_HH
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
deleted file mode 100644
index 6d284bd1a77..00000000000
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXPRESSION_AST_EXPRESSION_HH
-#define _AST_EXPRESSION_AST_EXPRESSION_HH
-
-// Representation of expression values
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from ast.hh
-*/
-
-// An expression (and maybe its value, if computed)
-class	AST_Expression {
-public:
-  // Enum to define all the different operators to combine expressions
-  enum ExprComb {
-      EC_add		// '+'
-    , EC_minus		// '-'
-    , EC_mul		// '*'
-    , EC_div		// '/'
-    , EC_mod		// '%'
-    , EC_or		// '|'
-    , EC_xor		// '^'
-    , EC_and		// '&'
-    , EC_left		// '<<'
-    , EC_right		// '>>'
-    , EC_u_plus		// unary '+'
-    , EC_u_minus	// unary '-'
-    , EC_bit_neg	// '~'
-    , EC_none		// No operator (missing)
-    , EC_symbol		// a symbol (function or constant name)
-  };
-  
-  // Enum to define the different kinds of evaluation possible
-  // Extend this for more kinds of evaluation as required
-  enum EvalKind {
-      EK_const			// Must evaluate to constant
-    , EK_positive_int		// Must evaluate to positive integer
-  };
-
-  // Enum to define expression type
-  enum ExprType {
-      EV_short			// Expression value is short
-    , EV_ushort			// Expression value is unsigned short
-    , EV_long			// Expression value is long
-    , EV_ulong			// Expression value is unsigned long
-    , EV_longlong		// Expression value is long long
-    , EV_ulonglong		// Expression value is unsigned long long
-    , EV_float			// Expression value is 32-bit float
-    , EV_double			// Expression value is 64-bit float
-    , EV_longdouble		// Expression value is 128-bit float
-    , EV_char			// Expression value is char
-    , EV_wchar			// Expression value is wide char	
-    , EV_octet			// Expression value is unsigned char
-    , EV_bool			// Expression value is boolean
-    , EV_string			// Expression value is char *
-    , EV_wstring		// Expression value is wchar_t *
-    , EV_any			// Expression value is any of above
-    , EV_void			// Expression value is void (absent)
-    , EV_none			// Expression value is missing
-  };
-
-  // Structure to descrive value of constant expression and its type
-  struct AST_ExprValue {
-    union {
-      short		sval;	// Contains short expression value
-      unsigned short	usval;	// Contains unsigned short expr value
-      long		lval;	// Contains long expression value
-      unsigned long	ulval;	// Contains unsigned long expr value
-      unsigned long	bval;	// Contains boolean expression value
-      float		fval;	// Contains 32-bit float expr value
-      double		dval;	// Contains 64-bit float expr value
-      char		cval;	// Contains char expression value
-      unsigned char	oval;	// Contains unsigned char expr value
-      String	        *strval; // Contains String * expr value
-      unsigned long	eval;	// Contains enumeration value
-    } u;
-    ExprType et;
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Expression(AST_Expression *v, ExprType t);
-
-  AST_Expression(ExprComb c, AST_Expression *v1, AST_Expression *v2);
-
-  AST_Expression(short		s);
-  AST_Expression(unsigned short	us);
-  AST_Expression(long		l);
-  AST_Expression(long		l, ExprType t);
-  AST_Expression(unsigned long	ul);
-  AST_Expression(float		f);
-  AST_Expression(double		d);
-  AST_Expression(char		c);
-  AST_Expression(unsigned char	uc);
-  AST_Expression(String		*s);
-  AST_Expression(UTL_ScopedName	*n);
-  virtual ~AST_Expression () {}
-
-  // Data Accessors
-  UTL_Scope *defined_in();
-  void set_defined_in(UTL_Scope *d);
-  long line();
-  void set_line(long l);
-  String *file_name();
-  void set_file_name(String *f);
-  ExprComb ec();
-  void set_ec(ExprComb new_ec);
-  AST_ExprValue	*ev();
-  void set_ev(AST_ExprValue *new_ev);
-  AST_Expression *v1();
-  void set_v1(AST_Expression *e);
-  AST_Expression *v2();
-  void set_v2(AST_Expression *e);
-  UTL_ScopedName *n();
-  void set_n(UTL_ScopedName *new_n);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other operations
-
-  // Evaluation and value coercion
-  virtual AST_ExprValue		*eval(EvalKind ek);
-  virtual AST_ExprValue		*coerce(ExprType t);
-
-  // Evaluate then store value inside this AST_Expression
-  virtual void			evaluate(EvalKind ek);
-
-  // Compare to AST_Expressions
-  virtual long			operator==(AST_Expression *vc);
-  virtual long			compare(AST_Expression *vc);
-
-protected:
-  // Evaluate different sets of operators
-  virtual AST_ExprValue	*eval_bin_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_bit_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_un_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_symbol(EvalKind ek);
-
-private:
-  // Data
-  UTL_Scope			*pd_defined_in;	// Scope
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
-
-  ExprComb			pd_ec;		// What combinator
-  AST_ExprValue			*pd_ev;		// computed value
-  AST_Expression		*pd_v1;		// 1st sub-expression
-  AST_Expression		*pd_v2;		// 2nd sub-expression
-  UTL_ScopedName		*pd_n;		// symbolic name (if any)
-
-  // Operations
-
-  // Fill out the lineno, filename and definition scope details
-  void				fill_definition_details();
-
-  // Internal evaluation
-  virtual AST_ExprValue *eval_internal(EvalKind ek);
-};
-
-#endif           // _AST_EXPR_VAL_AST_EXPR_VAL_HH
-
-
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
deleted file mode 100644
index 74ea518bef5..00000000000
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXTERN_AST_EXTERN_HH
-#define _AST_EXTERN_AST_EXTERN_HH
-
-// ast_extern.hh
-//
-// Declares all global functions for the AST
-
-/*
-** DEPENDENCIES: none
-**
-** USE: Included from idl_extern.hh
-*/
-
-// Functions:
-
-// Two functions are provided for storing AST nodes representing fwd
-// declared interfaces, and for checking the stored nodes after parsing
-// the entire AST. The check ensures that for each fwd declared interface
-// the full definition was also seen.
-
-extern void	AST_record_fwd_interface(AST_InterfaceFwd *i);
-extern void	AST_check_fwd_interface();
-
-extern idl_bool	AST_illegal_recursive_type(AST_Decl *t);
-
-#endif           // _AST_EXTERN_AST_EXTERN_HH
-
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
deleted file mode 100644
index 39e80f5c6ec..00000000000
--- a/TAO/TAO_IDL/include/ast_field.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_FIELD_AST_FIELD_HH
-#define _AST_FIELD_AST_FIELD_HH
-
-// Representation of a generic field
-//
-// Used as member in structures, exceptions and unions, and as a base
-// type for attributes and arguments to operations
-//
-// NOTE: There are two constructors here, the first is used when field
-// is used directly inside a structure, the second when it is used as
-// the base type for attributes and operations.
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_type.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-
-
-class	AST_Field : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Field();
-  AST_Field(AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
-  AST_Field(AST_Decl::NodeType nt, AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Field() {}
-
-  // Data Accessors
-  AST_Type *field_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Field, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Field);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Type			*pd_field_type;	// Base type for field
-
-};
-
-#endif           // _AST_FIELD_AST_FIELD_HH
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
deleted file mode 100644
index 887ac7aa156..00000000000
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_GENERATOR_AST_GENERATOR_HH
-#define _AST_GENERATOR_AST_GENERATOR_HH
-
-// ast_generator.h
-//
-// Defines base class for generators
-
-/*
-** DEPENDENCIES: ast_predefined_type.hh utl_scoped_name.hh utl_strlist.hh
-**		 ast_module.hh ast_root.hh ast_interface.hh
-**		 ast_interface_fwd.hh ast_exception.hh ast_structure.hh
-**		 ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh
-**		 ast_argument.hh ast_attribute.hh ast_union.hh
-**		 ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh
-**		 ast_expression.hh ast_enum_val.hh ast_array.hh
-**		 ast_sequence.hh ast_string.hh ast_typedef.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Generator
-{
-public:
-  // Operations
-
-  // Create a node representing a predefined type
-  virtual AST_PredefinedType
-    *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
-
-  // Create a node representing a module
-  virtual AST_Module	*create_module(UTL_ScopedName *n,
-				       UTL_StrList *p);
-
-  // Create a node representing a module which is the root of an AST
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
-
-  // Create a node representing an interface
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
-
-  // Create a node representing a forward declaration of an interface
-  virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
-
-  // Create a node representing an exception
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a structure
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing an enum
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n,
-				     UTL_StrList *p);
-
-  // Create a node representing an operation on an interface
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a field in a structure, exception or
-  // union
-  virtual AST_Field	*create_field(AST_Type *ft,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-
-  // Create a node representing an argument to an operation
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create a node representing an attribute
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a union
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-
-  // Create a node representing one branch in a union
-  virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
-
-  // Create a node representing a label on a union branch
-  virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
-
-  // Create a node representing a constant
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create various kinds of nodes representing expressions
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
-
-  // Create a node representing an enumerator
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create a node representing an array type
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
-
-  // Create a node representing a sequence type
-  virtual AST_Sequence	*create_sequence(AST_Expression *v,
-					 AST_Type *bt);
-
-  // Create a node representing a string type
-  virtual AST_String	*create_string(AST_Expression *v);
-
-  // Create a node representing a wide string type
-  virtual AST_String	*create_wstring(AST_Expression *v);
-
-  // Create a node representing a type renaming (typedef)
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
-
-  // Create a node representing a native
-  virtual AST_Native	*create_native (UTL_ScopedName *n,
-                                        UTL_StrList *p);
-
-};
-
-#endif           // _AST_GENERATOR_AST_GENERATOR_HH
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
deleted file mode 100644
index 06f01ddecb1..00000000000
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_INTERFACE_AST_INTERFACE_HH
-#define _AST_INTERFACE_AST_INTERFACE_HH
-
-// Representation of interface:
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope.
-
-/*
-** DEPENDENCIES: ast_type.hh, utl_scope.hh, ast_decl.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_type.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
-
-
-class	AST_Interface : public virtual AST_Type, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Interface();
-  AST_Interface(UTL_ScopedName *n,
-		AST_Interface **ih,
-		long nih,
-		UTL_StrList *p);
-  virtual ~AST_Interface() {}
-
-  // Data Accessors
-  AST_Interface	**inherits();
-  void set_inherits(AST_Interface **i);
-  long n_inherits();
-  void set_n_inherits(long i);
-
-  // Is this interface defined? This predicate returns FALSE when an
-  // interface was forward declared but not defined yet, and TRUE in
-  // all other cases.
-  idl_bool is_defined()
-  {
-    return (pd_n_inherits < 0) ? I_FALSE : I_TRUE;
-  }
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Interface);
-  DEF_NARROW_FROM_SCOPE(AST_Interface);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Interface			**pd_inherits;	// Inherited interfaces
-						// This is an array of pointers
-						// to the inherited interfaces
-  long				pd_n_inherits;	// How many of them?
-
-  // Scope Management Protocol
-  friend int yyparse();
-
-  virtual AST_Constant		*fe_add_constant(AST_Constant	*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception	*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute	*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation	*o);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef	*t);
-  virtual AST_Native            *fe_add_native (AST_Native      *n);
-
-};
-
-#endif           // _AST_INTERFACE_AST_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
deleted file mode 100644
index 8dddc51d916..00000000000
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
-#define _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
-
-// Representation of a forward interface declaration
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_interface.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_InterfaceFwd : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_InterfaceFwd();
-  AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_InterfaceFwd() {}
-
-  // Data Accessors
-  AST_Interface	*full_definition();
-  void set_full_definition(AST_Interface *nfd);
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_InterfaceFwd, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
-
-  // AST Dumping
-  virtual void		dump(ostream &);
-
-private:
-  // Data
-  AST_Interface		*pd_full_definition;	// The interface this is a
-						// forward declaration of
-};
-
-#endif           // _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
deleted file mode 100644
index 81dbbf0e50d..00000000000
--- a/TAO/TAO_IDL/include/ast_module.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_MODULE_AST_MODULE_HH
-#define _AST_MODULE_AST_MODULE_HH
-
-// Representation of module
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope.
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scope.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Module : public virtual AST_Decl, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Module();
-  AST_Module(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Module() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Module);
-  DEF_NARROW_FROM_SCOPE(AST_Module);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend void fe_populate(AST_Module *m);
-  friend int yyparse();
-
-  // Scope Management Protocol
-
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
-  virtual AST_Native            *fe_add_native (AST_Native      *n);
-
-};
-
-#endif           // _AST_MODULE_AST_MODULE_HH
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
deleted file mode 100644
index 6cc41d146af..00000000000
--- a/TAO/TAO_IDL/include/ast_native.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _AST_NATIVE_H_
-#define _AST_NATIVE_H_
-
-// Representation of "native" IDL type added by the POA spec
-//
-/*
-** DEPENDENCIES: ast_decl.h
-**
-** USE: Included from ast.h
-*/
-
-class AST_Native : public virtual AST_Type
-{
-public:
-  // =Operations
-
-  // Constructor(s)
-  AST_Native (void);
-  // default constructor
-
-  AST_Native(UTL_ScopedName *n, UTL_StrList *p);
-  // constructor that initializes its scoped name
-
-  virtual ~AST_Native (void) {}
-  // destructor
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Native, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_Native);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-};
-
-#endif /* AST_NATIVE_H */
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
deleted file mode 100644
index dc197a7bf17..00000000000
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_OPERATION_AST_OPERATION_HH
-#define _AST_OPERATION_AST_OPERATION_HH
-
-// Representation of operation declaration:
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scope.hh, ast_type.hh, utl_strlist.hh,
-**		 utl_exceptlist.hh, utl_scoped_name.hh
-**
-** USE: included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"utl_list.h"
-#include	"ast_decl.h"
-#include	"utl_scope.h"
-#include	"utl_scoped_name.h"
-
-
-class	AST_Operation : public virtual AST_Decl, public virtual UTL_Scope
-{
-public:
-  // Define enum with flags for operation attributes
-  enum Flags {
-       OP_noflags		// No flags present
-     , OP_oneway		// Operation is oneway
-     , OP_idempotent		// Operation is idempotent
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Operation();
-  AST_Operation(AST_Type *return_type,
-		Flags flags,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
-  virtual ~AST_Operation() {}
-
-  // Data Accessors
-  AST_Type *return_type();
-  Flags flags();
-  UTL_StrList *context();
-  UTL_ExceptList *exceptions();
-  
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Operation);
-  DEF_NARROW_FROM_SCOPE(AST_Operation);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Type			*pd_return_type;	// Return type
-  Flags				pd_flags;		// Operation flags
-  UTL_StrList			*pd_context;		// Context
-  UTL_ExceptList		*pd_exceptions;		// Exceptions raised
-
-  // Scope Management Protocol
-  friend int yyparse();
-
-  virtual AST_Argument		*fe_add_argument(AST_Argument	*a);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList 	*c);	
-							// Add context
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList *e);
-							// exceptions
-
-};
-
-#endif           // _AST_OPERATION_AST_OPERATION_HH
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
deleted file mode 100644
index 1be12f4c4bc..00000000000
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
-#define _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
-
-// Representation of predefined types:
-//
-// Instances of this class are inserted into the global context by
-// the front end before the start of parsing.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_PredefinedType : public virtual AST_ConcreteType
-{
-public:
-  // Enum for all the different predefined types
-  enum PredefinedType {
-        PT_long		// Predefined type "long"
-      , PT_ulong	// Predefined type "unsigned long"
-      , PT_longlong	// Predefined type "long long"
-      , PT_ulonglong	// Predefined type "unsigned long long"
-      , PT_short	// Predefined type "short"
-      , PT_ushort	// Predefined type "unsigned short"
-      , PT_float	// Predefined type "float"
-      , PT_double	// Predefined type "double"
-      , PT_longdouble	// Predefined type "long double"
-      , PT_char		// Predefined type "char"
-      , PT_wchar	// Predefined type "wchar_t"
-      , PT_boolean	// Predefined type "boolean"
-      , PT_octet	// Predefined type "octet"
-      , PT_any		// Predefined type "any"
-      , PT_void		// Predefined type "void"
-      , PT_pseudo	// Predefined type for pseudo objects
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_PredefinedType();
-  AST_PredefinedType(PredefinedType t, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_PredefinedType() {}
-
-  // Data Accessors
-  PredefinedType	pt();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_PredefinedType);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  const PredefinedType	pd_pt;		// The specific predefined type
-};  
-
-#endif           // _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
deleted file mode 100644
index 765043aac97..00000000000
--- a/TAO/TAO_IDL/include/ast_root.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ROOT_AST_ROOT_HH
-#define _AST_ROOT_AST_ROOT_HH
-
-// Representation of root of AST
-
-/*
-** DEPENDENCIES: ast_module.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Root : public virtual AST_Module
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Root();
-  AST_Root(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Root() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Root, AST_Module);
-  DEF_NARROW_FROM_DECL(AST_Root);
-  DEF_NARROW_FROM_SCOPE(AST_Root);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend class FE_Declarator;
-  friend int yyparse();
-  // Add protocol
-
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
-
-};
-
-#endif           // _AST_ROOT_AST_ROOT_HH
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
deleted file mode 100644
index d3864e9f982..00000000000
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_SEQUENCE_AST_SEQUENCE_HH
-#define _AST_SEQUENCE_AST_SEQUENCE_HH
-
-// Representation of sequence declaration:
-//
-// A sequence is a combination of a maximum size and a base type
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, ast_type.hh, ast_decl.hh,
-**		 ast_expression.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Sequence : public virtual AST_ConcreteType
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Sequence();
-  AST_Sequence(AST_Expression *max_size, AST_Type *bt);
-  virtual ~AST_Sequence() {}
-
-  // Data Accessors
-  AST_Expression *max_size();
-  AST_Type *base_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Sequence, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_Sequence);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_max_size;	// Maximum sequence size
-  AST_Type			*pd_base_type;	// Sequence base type
-};
-
-#endif           // _AST_SEQUENCE_AST_SEQUENCE_HH
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
deleted file mode 100644
index 4bdfbb7734e..00000000000
--- a/TAO/TAO_IDL/include/ast_string.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_STRING_AST_STRING_HH
-#define _AST_STRING_AST_STRING_HH
-
-// Representation of string declaration
-//
-// A string type is represented by a maximum size
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, ast_decl.hh, ast_expression.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_String : public virtual AST_ConcreteType
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_String();
-  AST_String(AST_Expression *max_size);
-  AST_String(AST_Expression *max_size, long wide);
-  virtual ~AST_String() {}
-
-  // Data Accessors
-  AST_Expression *max_size();
-  long		 width();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_String, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_String);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_max_size;	// String maximum size
-  long				pd_width;	// Width of string
-};
-
-#endif           // _AST_STRING_AST_STRING_HH
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
deleted file mode 100644
index f20eb0eb3a8..00000000000
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_STRUCTURE_AST_STRUCTURE_HH
-#define _AST_STRUCTURE_AST_STRUCTURE_HH
-
-// Representation of structure:
-//
-// NOTE: add(AST_ConcreteType *) is defined here because a structure
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Structure.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Structure : public virtual AST_ConcreteType,
-			public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Structure();
-  AST_Structure(UTL_ScopedName *n, UTL_StrList *p);
-  AST_Structure(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Structure() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Structure, AST_ConcreteType, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Structure);
-  DEF_NARROW_FROM_SCOPE(AST_Structure);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Union	*fe_add_union(AST_Union		*u);
-  virtual AST_Structure	*fe_add_structure(AST_Structure	*s);
-  virtual AST_Field	*fe_add_field(AST_Field		*f);
-  virtual AST_Enum	*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal	*fe_add_enum_val(AST_EnumVal	*v);
-};
-
-#endif           // _AST_STRUCTURE_AST_STRUCTURE_HH
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
deleted file mode 100644
index ca9a5e0498c..00000000000
--- a/TAO/TAO_IDL/include/ast_type.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_TYPE_AST_TYPE_HH
-#define _AST_TYPE_AST_TYPE_HH
-
-// Class for all IDL types
-//
-// This is useful wherever any IDL type defining construct can appear
-// such as the base type for a typedef or array
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-
-
-class	AST_Type : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Type();
-  AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Type() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Type, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Type);
-};
-
-#endif           // _AST_TYPE_AST_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
deleted file mode 100644
index 1abb09aa935..00000000000
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_TYPEDEF_AST_TYPEDEF_HH
-#define _AST_TYPEDEF_AST_TYPEDEF_HH
-
-// Representation of typedef declaration
-//
-// A typedef declaration is a renaming of a base type
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_type.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Typedef : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Typedef();
-  AST_Typedef(AST_Type *base_type, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Typedef() {}
-
-  // Data Accessors
-  AST_Type *base_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Typedef, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_Typedef);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  AST_Type		*pd_base_type;	// typedef base type
-};
-
-#endif           // _AST_TYPEDEF_AST_TYPEDEF_HH
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
deleted file mode 100644
index eab7ec51985..00000000000
--- a/TAO/TAO_IDL/include/ast_union.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_AST_UNION_HH
-#define _AST_UNION_AST_UNION_HH
-
-// Representation of union declaration:
-//
-// NOTE: add(AST_ConcreteType *) is defined here because a union
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Union.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_union_branch.hh,
-**		 ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Union : public virtual AST_Structure
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Union();
-  AST_Union(AST_ConcreteType *disc_type, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Union() {}
-
-  // Data Accessors
-  AST_ConcreteType *disc_type();
-  AST_Expression::ExprType udisc_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Union, AST_Structure);
-  DEF_NARROW_FROM_DECL(AST_Union);
-  DEF_NARROW_FROM_SCOPE(AST_Union);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-
-private:
-  // Data
-  AST_ConcreteType		*pd_disc_type;	// Discriminator type
-  AST_Expression::ExprType	pd_udisc_type;	// Its expression type
-  /* Convention: udisc_type == EV_any denotes an enum value */
-
-  // Operations
-
-  // Look up a branch by node pointer
-  AST_UnionBranch		*lookup_branch(AST_UnionBranch *branch);
-
-  // Look up the branch with the "default" label
-  AST_UnionBranch		*lookup_default();
-
-  // Look up a branch given a branch with a label. This is used to
-  // check for duplicate labels
-  AST_UnionBranch		*lookup_label(AST_UnionBranch *b);
-
-  // Look up a union branch given an enumerator. This is used to
-  // check for duplicate enum labels
-  AST_UnionBranch		*lookup_enum(AST_UnionBranch *b);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-
-};
-
-#endif           // _AST_UNION_AST_UNION_HH
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
deleted file mode 100644
index e2de5aa8b7e..00000000000
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_BRANCH_AST_UNION_BRAN_HH
-#define _AST_UNION_BRANCH_AST_UNION_BRAN_HH
-
-// Representation of union branch declaration:
-//
-// A branch of a union is a field with a label
-
-/*
-** DEPEndencies: ast_field.hh, ast_union_label.hh, ast_type.hh,
-**		 utl_scoped_name.hh, utl_strlist.h, ast_decl.h
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_UnionBranch : public virtual AST_Field
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_UnionBranch();
-  AST_UnionBranch(AST_UnionLabel *label,
-		  AST_Type *ft,
-		  UTL_ScopedName *n,
-		  UTL_StrList *p);
-  virtual ~AST_UnionBranch() {}
-
-  // Data Accessors
-  AST_UnionLabel *label();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_UnionBranch, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_UnionBranch);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_UnionLabel		*pd_label;	// Label of this branch
-};
-
-#endif           // _AST_UNION_BRANCH_AST_UNION_BRAN_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
deleted file mode 100644
index 587ddb1c911..00000000000
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_LABEL_AST_UNION_LABEL_HH
-#define _AST_UNION_LABEL_AST_UNION_LABEL_HH
-
-// AST_UnionLabel.h
-//
-// Defines labels for unions
-
-/*
-** DEPENDENCIES: ast_expression.hh
-**
-** USE: included from ast.hh
-*/
-
-class	AST_UnionLabel
-{
-public:
-  // Define kind of label
-  enum UnionLabel {
-        UL_default		// Label is "default"
-      , UL_label		// Regular label
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_UnionLabel();
-  AST_UnionLabel(UnionLabel lk, AST_Expression *lv);
-  virtual ~AST_UnionLabel() {}
-
-  // Data Accessors
-  UnionLabel label_kind();
-  AST_Expression *label_val();
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  UnionLabel			pd_label_kind;	// Label kind
-  AST_Expression		*pd_label_val;	// Label expression
-
-};
-
-#endif           // _AST_UNION_LABEL_AST_UNION_LABEL_HH
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
deleted file mode 100644
index c8e5f0530fe..00000000000
--- a/TAO/TAO_IDL/include/be_extern.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_EXTERN_BE_EXTERN_HH
-#define _BE_EXTERN_BE_EXTERN_HH
-
-// be_extern.h - Defines the BE part of the BE<->FE protocol
-
-// Functions:
-
-extern "C" AST_Generator	*BE_init();
-
-extern "C" void			BE_produce();
-extern "C" void			BE_abort();
-extern "C" void			BE_prep_arg(char *, idl_bool);
-
-extern "C" void			BE_version();
-
-#endif           // _BE_EXTERN_BE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
deleted file mode 100644
index 8f5d6651f91..00000000000
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_EXTERN_DRV_EXTERN_HH
-#define _DRV_EXTERN_DRV_EXTERN_HH
-
-// drv_extern.h - External functions for the IDL compiler driver program
-
-// Functions
-
-extern void		DRV_init();
-extern void		DRV_parse_args(long, char **);
-extern void		DRV_usage();
-
-extern void	        DRV_pre_proc(char *myfile);
-
-extern void		DRV_cpp_init();
-extern void		DRV_cpp_putarg(char *str);
-extern void		DRV_cpp_new_location(char *new_loc);
-
-extern void		DRV_fork();
-
-#endif           // _DRV_EXTERN_DRV_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_link.h b/TAO/TAO_IDL/include/drv_link.h
deleted file mode 100644
index daea5b77b88..00000000000
--- a/TAO/TAO_IDL/include/drv_link.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_LINK_DRV_LINK_HH
-#define _DRV_LINK_DRV_LINK_HH
-
-// drv_link.hh - Define data and functions which are used to 
-//		 link in the back end functions
-
-/*
- * Front end interface
- */
-
-class File;
-typedef void (* DRV_PF_FE_init_stage1)();
-typedef void (* DRV_PF_FE_init_stage2)();
-typedef int  (* DRV_PF_FE_yyparse)();
-typedef void (* DRV_PF_FE_set_yyin)(File *);
-
-class UTL_Error;
-class UTL_Indenter;
-class UTL_String;
-typedef UTL_Error * (* DRV_PF_FE_new_UTL_Error)();
-typedef UTL_Indenter * (* DRV_PF_FE_new_UTL_Indenter)();
-typedef UTL_String * (* DRV_PF_FE_new_UTL_String)(char *);
-
-extern DRV_PF_FE_init_stage1	DRV_FE_init_stage1;
-extern DRV_PF_FE_init_stage2	DRV_FE_init_stage2;
-extern DRV_PF_FE_yyparse	DRV_FE_yyparse;
-extern DRV_PF_FE_set_yyin	DRV_FE_set_yyin;
-
-extern DRV_PF_FE_new_UTL_Error	DRV_FE_new_UTL_Error;
-extern DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter;
-extern DRV_PF_FE_new_UTL_String	DRV_FE_new_UTL_String;
-
-/* 
- * Back end interface
- */
-
-class AST_Generator;
-typedef AST_Generator * (* DRV_PF_BE_init)();
-typedef void (* DRV_PF_BE_produce)();
-typedef void (* DRV_PF_BE_abort)();
-typedef void (* DRV_PF_BE_prep_arg)(char *, idl_bool);
-typedef void (* DRV_PF_BE_version)();
-
-extern DRV_PF_BE_init		DRV_BE_init;
-extern DRV_PF_BE_produce 	DRV_BE_produce;
-extern DRV_PF_BE_abort   	DRV_BE_abort;
-extern DRV_PF_BE_prep_arg	DRV_BE_prep_arg;
-extern DRV_PF_BE_version	DRV_BE_version;
-
-// Functions
-
-extern void DRV_FE_open();
-extern void DRV_FE_close();
-
-extern void DRV_BE_open();
-extern void DRV_BE_close();
-
-#endif	// _DRV_LINK_DRV_LINK_HH
diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h
deleted file mode 100644
index caa74747db7..00000000000
--- a/TAO/TAO_IDL/include/drv_private.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_PRIVATE_DRV_PRIVATE_HH
-#define _DRV_PRIVATE_DRV_PRIVATE_HH
-
-// drv_private.hh - Define data and functions which are private to
-//		    the DRV but which must be accessible througout the DRV
-
-// Data
-
-extern char		*DRV_files[];	// All files to be processed
-extern long		DRV_nfiles;	// How many are there?
-extern long		DRV_file_index;	// What's the file I am responsible
-					// for?
-
-// Functions
-extern	void		DRV_drive(char *);// Compiler driver for single file
-
-#endif	// _DRV_PRIVATE_DRV_PRIVATE_HH
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
deleted file mode 100644
index dee81ffe035..00000000000
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_DECLARATOR_FE_DECLARATOR_HH
-#define _FE_DECLARATOR_FE_DECLARATOR_HH
-
-// FE_Declarator.h
-//
-// FE internal class for storing interim declaration statements
-
-/*
-** DEPENDENCIES: utl_scoped_name.hh, ast_decl.hh
-**
-** USE: Included from fe.hh
-*/
-
-class	FE_Declarator
-{
-public:
-  // Enum to denote types of declarators
-  enum DeclaratorType {
-        FD_simple		// Simple declarator
-      , FD_complex		// Complex declarator (complex_part field used)
-  };
-
-  // Operations
-
-  // Constructor(s)
-  FE_Declarator(UTL_ScopedName *n, DeclaratorType dt, AST_Decl *cp);
-  virtual ~FE_Declarator() {}
-
-  // Data Accessors
-  AST_Decl *complex_part();
-  UTL_ScopedName *name();
-  DeclaratorType decl_type();
-
-  // Other Operations
-
-  // Compose an FE_Declarator into an AST_Type once all the needed information
-  // is available
-  AST_Type		*compose(AST_Decl* tc);
-
-private:
-  // Data
-  AST_Decl		*pd_complex_part;	// If a complex declarator
-  UTL_ScopedName	*pd_name;		// The name if complex
-  DeclaratorType	pd_decl_type;		// Whether complex or simple
-};
-
-#endif           // _FE_DECLARATOR_FE_DECLARATOR_HH
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
deleted file mode 100644
index 816081f1323..00000000000
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_EXTERN_FE_EXTERN_HH
-#define _FE_EXTERN_FE_EXTERN_HH
-
-// fe_extern.hh
-//
-// Declares all global functions for the FE
-
-/*
-** DEPENDENCIES: none
-**
-** USE: Included from idl_extern.hh
-*/
-
-// Functions:
-
-// Initialization:
-//
-// FE initialization is done in two stages, with the BE initialization
-// occurring in between. The first stage is responsible for creating
-// the sope stack. The BE initialization creates the generator object
-// which is then used in the second stage to create the global scope
-// and to populate it with nodes for the predefined types
-
-extern "C" void			FE_init_stage1();	// Initialize stage 1
-extern "C" void			FE_init_stage2();	// Initialize stage 2
-
-// Interface to Yacc parser
-
-class File;
-extern "C" int			FE_yyparse();		// Invode yyparse
-extern "C" void			FE_set_yyin(File *);	// Set yyin
-
-// Interface to constructors for objects need by the driver
-
-class UTL_Error;
-class UTL_Indenter;
-class UTL_String;
-
-extern "C" UTL_Error *		FE_new_UTL_Error();
-extern "C" UTL_Indenter *	FE_new_UTL_Indenter();
-extern "C" UTL_String *  	FE_new_UTL_String(char *);
-
-#endif           // _FE_EXTERN_FE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
deleted file mode 100644
index b75164780a8..00000000000
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_INTERFACE_HEADER_FE_INTERFACE_HH
-#define _FE_INTERFACE_HEADER_FE_INTERFACE_HH
-
-// FE_InterfaceHeader
-//
-// Internal class for FE to describe interface headers
-
-/*
-** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh,
-**		 ast_decl.hh
-**
-** USE: Included from fe.hh
-*/
-
-class	FE_InterfaceHeader
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l);
-  virtual ~FE_InterfaceHeader() {}
-
-  // Data Accessors
-  UTL_ScopedName *interface_name();
-  AST_Interface **inherits();
-  long n_inherits();
-
-private:
-  // Data
-  UTL_ScopedName	*pd_interface_name;	// Interface name
-  AST_Interface		**pd_inherits;		// Inherited interfaces
-  long			pd_n_inherits;		// How many
-
-  // Operations
-
-  // Compile the flattened unique list of interfaces which this
-  // interface inherits from
-  void			compile_one_inheritance(AST_Interface *i);
-  void			compile_inheritance(UTL_NameList *l);
-};
-
-#endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
deleted file mode 100644
index d90e19907bd..00000000000
--- a/TAO/TAO_IDL/include/fe_private.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_FE_HH
-#define _FE_FE_HH
-
-// fe_private.hh - Defines data which is private to the FE but
-//		   which must be accessible throughout the FE
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from source files
-*/
-
-/*
- * FE includes
- */
-
-#include	"fe_interface_header.h"// class FE_InterfaceHeader
-#include	"fe_declarator.h"	// class FE_Declarator
-
-/*
- * FE Operations
- */
-
-#endif           // _FE_FE_HH
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
deleted file mode 100644
index 3ff7bf93dfd..00000000000
--- a/TAO/TAO_IDL/include/global_extern.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
-#define _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
-
-// global_extern.hh - Global data for the IDL compiler
-
-extern	IDL_GlobalData	*idl_global;	// Contains all "global" data
-
-// Global functions for the IDL compiler
-
-// Return TRUE when the name of this AST_Decl can be reused in
-// a definition in this scope
-extern	idl_bool	can_be_redefined(AST_Decl *);
-
-#endif           // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
deleted file mode 100644
index 24442901569..00000000000
--- a/TAO/TAO_IDL/include/idl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_IDL_HH
-#define _IDL_IDL_HH
-
-// idl.hh
-//
-// Main include file for IDL compiler. Includes the rest of the
-// files defining the different units of the compiler
-
-#include        "ace/ACE.h"             // Most important ACE include file
-#include    "ace/streams.h"     // iostreams
-#include	"intlmacros.h"		// Define macros for intl'ion
-
-#include	<stdlib.h>		// POSIX standard defns
-#include	<ctype.h>		// External functions
-
-#include	<sys/types.h>		// POSIX standard types
-
-#include	"idl_narrow.h"		// IDL Narrowing mechanism
-
-#include	"idl_defines.h"	// Constants for IDL compiler
-#include	"idl_fwd.h"		// Forward decls of classes
-
-#include	"idl_bool.h"		// Defines boolean for IDL
-
-#include	"utl_string.h"		// Defines utility string class
-#include	"utl_identifier.h"	// Defines utility identifier class
-#include	"ast.h"		// AST classes
-#include	"util.h"		// Utility classes
-
-#endif           // _IDL_IDL_HH
diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h
deleted file mode 100644
index dd53d968732..00000000000
--- a/TAO/TAO_IDL/include/idl_bool.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_BOOL_IDL_BOOL_HH
-#define _IDL_BOOL_IDL_BOOL_HH
-
-/*
- * idl_bool.hh - Boolean definitions for IDL CFE
- *
- * This is interim. When porting to a new platform, this file will be
- * modified to incorporate definitions for the boolean type suitable
- * for the new platform.
- */
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-#ifndef	I_TRUE
-#define I_TRUE	1
-#endif
-
-#ifndef	I_FALSE
-#define I_FALSE	0
-#endif
-
-typedef		long		idl_bool;
-
-#endif           // _IDL_BOOL_IDL_BOOL_HH
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
deleted file mode 100644
index b4a4857d3f2..00000000000
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_DEFINES_IDL_DEFINES_HH
-#define _IDL_DEFINES_IDL_DEFINES_HH
-
-/*
- * idl_defines.hh - Defines global compiler flags
- */
-
-// This cannot be an enum since more than one value may be active at
-// a given time, hence bitflags are #define'd instead
-     
-#define	IDL_CF_VERSION		(1 << 0)
-#define	IDL_CF_DUMP_AST		(1 << 1)
-#define	IDL_CF_ONLY_PREPROC	(1 << 2)
-#define	IDL_CF_ONLY_USAGE	(1 << 3)
-#define	IDL_CF_INFORMATIVE	(1 << 4)
-#define	IDL_CF_NOWARNINGS	(1 << 5)
-
-#endif	// _IDL_DEFINES_IDL_DEFINES_HH
diff --git a/TAO/TAO_IDL/include/idl_extern.h b/TAO/TAO_IDL/include/idl_extern.h
deleted file mode 100644
index efa7f328950..00000000000
--- a/TAO/TAO_IDL/include/idl_extern.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_EXTERN_IDL_EXTERN_HH
-#define _IDL_EXTERN_IDL_EXTERN_HH
-
-// idl_extern.hh
-//
-// Global variables and functions for IDL compiler
-
-#include	"fe_extern.h"		// External API of FE
-#include	"be_extern.h"		// External API of BE
-#include	"drv_extern.h"		// External API of DRV
-#include	"ast_extern.h"		// External API of AST
-#include	"nr_extern.h"		// External API of NR
-#include	"global_extern.h"	// Global data
-
-#endif           // _IDL_EXTERN_IDL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h
deleted file mode 100644
index a5342d73b86..00000000000
--- a/TAO/TAO_IDL/include/idl_fwd.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_FWD_IDL_FWD_HH
-#define _IDL_FWD_IDL_FWD_HH
-
-// idl_fwd.hh
-//
-// Forward declaration of all class names in CFE-BEs contract
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-// Class for global data representation:
-
-class	IDL_GlobalData;			// Global data is stored in an
-					// instance of this
-
-// Classes for utility of the IDL compiler:
-
-class	UTL_ScopeStack;			// Stack of scopes
-class	UTL_Scope;			// A definition scope (mixin)
-
-class	UTL_LongList;			// List of longs
-class	UTL_StrList;			// List of strings
-class	UTL_StrlistActiveIterator;	// Active iterator for list of strings
-class	UTL_IdList;			// List of identifiers
-class	UTL_IdListActiveIterator;	// Active iterator for list of id's
-class	UTL_ExceptList;			// List of exceptions
-class	UTL_NameList;			// List of scoped names
-class	UTL_ExprList;			// List of expressions
-class	UTL_InterfList;			// List of interfaces
-class	UTL_LabelList;			// List of union branch labels
-class	UTL_DeclList;			// List of declarators
-class	UTL_String;			// String class
-class	UTL_Identifier;			// Identifier class
-
-class	UTL_Error;			// Error class
-class	UTL_Indenter;			// Indenter class
-
-// Classes for utility of the FE. These classes are used only
-// by the FE but their forward declaration is needed because lists
-// of them are constructed by classes in UTL
-
-class	FE_InterfaceHeader;		// Interface header
-class	FE_Declarator;			// Declarator
-
-// Generator class for the AST
-
-class	AST_Generator;			// Generate nodes of various types
-
-// Classes for AST:
-
-class	AST_Decl;			// The rock bottom base class
-
-class	AST_PredefinedType;		// A predefined type
-class	AST_Type;			// An IDL type
-class	AST_ConcreteType;		// An IDL concrete type
-class	AST_Module;			// A module
-class	AST_Root;			// The root of an AST (a module)
-class	AST_Interface;			// An interface
-class	AST_InterfaceFwd;		// A forward interface decl
-class	AST_Constant;			// A constant declaration
-class	AST_Expression;			// Value of an expression
-class	AST_Exception;			// An exception declaration
-class	AST_Attribute;			// An attribute declaration
-class	AST_Operation;			// An operation declaration
-class	AST_Argument;			// An argument to an operation
-class	AST_Union;			// A union declaration
-class	AST_UnionBranch;		// A branch in a union
-class	AST_UnionLabel;			// A union branch label
-class	AST_Structure;			// A structure declaration
-class	AST_Field;			// A field in a structure or union
-class	AST_Enum;			// An enum declaration
-class	AST_EnumVal;			// An enumerator in an enum
-class	AST_Sequence;			// A sequence declaration
-class	AST_String;			// A string declaration
-class	AST_Array;			// An array declaration
-class	AST_Typedef;			// A typedef declaration
-class   AST_Native;                     // A native declaration
-
-#endif           // _IDL_FWD_IDL_FWD_HH
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
deleted file mode 100644
index a65fe039c60..00000000000
--- a/TAO/TAO_IDL/include/idl_global.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_IDL_GLOBAL_HH
-#define _IDL_IDL_GLOBAL_HH
-
-// idl_global.hh
-//
-// Defines a class containing all global data for the compiler.
-// Can be subclassed in BEs to store more data
-
-class IDL_GlobalData
-{
-public:
-  // Types
-
-  // The ParseState type encodes the state of the Yacc parser so that
-  // better error messages can be produced, and for use by BEs in situations
-  // where context sensitive behavior is required
-  enum ParseState {
-      PS_NoState		// No state
-    , PS_TypeDeclSeen		// Seen complete typedef declaration
-    , PS_ConstDeclSeen		// Seen complete const declaration
-    , PS_ExceptDeclSeen		// Seen complete exception declaration
-    , PS_InterfaceDeclSeen	// Seen complete interface declaration
-    , PS_ModuleDeclSeen		// Seen complete module declaration
-    , PS_AttrDeclSeen		// Seen complete attribute declaration
-    , PS_OpDeclSeen		// Seen complete operation declaration
-    , PS_ModuleSeen		// Seen a MODULE keyword
-    , PS_ModuleIDSeen		// Seen the module ID
-    , PS_ModuleSqSeen		// '{' seen for module
-    , PS_ModuleQsSeen		// '}' seen for module
-    , PS_ModuleBodySeen		// Seen complete module body
-    , PS_InterfaceSeen		// Seen an INTERFACE keyword
-    , PS_InterfaceIDSeen	// Seen the interface ID
-    , PS_InheritSpecSeen	// Seen a complete inheritance spec
-    , PS_ForwardDeclSeen	// Forward interface decl seen
-    , PS_InterfaceSqSeen	// '{' seen for interface
-    , PS_InterfaceQsSeen	// '}' seen for interface
-    , PS_InterfaceBodySeen	// Seen an interface body
-    , PS_InheritColonSeen	// Seen ':' in inheritance list
-    , PS_SNListCommaSeen	// Seen ',' in list of scoped names
-    , PS_ScopedNameSeen		// Seen a complete scoped name
-    , PS_SN_IDSeen		// Seen an identifier as part of a scoped name
-    , PS_ScopeDelimSeen		// Seen a scope delim as party of a scoped name
-    , PS_ConstSeen		// Seen a CONST keyword
-    , PS_ConstTypeSeen		// Parsed the type of a constant
-    , PS_ConstIDSeen		// Seen the constant ID
-    , PS_ConstAssignSeen	// Seen the '='
-    , PS_ConstExprSeen		// Seen the constant value expression
-    , PS_TypedefSeen		// Seen a TYPEDEF keyword
-    , PS_TypeSpecSeen		// Seen a complete type specification
-    , PS_DeclaratorsSeen	// Seen a complete list of declarators
-    , PS_StructSeen		// Seen a STRUCT keyword
-    , PS_StructIDSeen		// Seen the struct ID
-    , PS_StructSqSeen		// '{' seen for struct
-    , PS_StructQsSeen		// '}' seen for struct
-    , PS_StructBodySeen		// Seen complete body of struct decl
-    , PS_MemberTypeSeen		// Seen type of struct or except member
-    , PS_MemberDeclsSeen	// Seen decls of struct or except members
-    , PS_MemberDeclsCompleted	// Completed one struct or except member to ';'
-    , PS_UnionSeen		// Seen a UNION keyword
-    , PS_UnionIDSeen		// Seen the union ID
-    , PS_SwitchSeen		// Seen the SWITCH keyword
-    , PS_SwitchOpenParSeen	// Seen the switch open par.
-    , PS_SwitchTypeSeen		// Seen the switch type spec
-    , PS_SwitchCloseParSeen	// Seen the switch close par.
-    , PS_UnionSqSeen		// '{' seen for union
-    , PS_UnionQsSeen		// '}' seen for union
-    , PS_DefaultSeen		// Seen DEFAULT keyword
-    , PS_UnionLabelSeen		// Seen label of union element
-    , PS_LabelColonSeen		// Seen ':' of union branch label
-    , PS_LabelExprSeen		// Seen expression of union branch label
-    , PS_UnionElemSeen		// Seen a union element
-    , PS_UnionElemCompleted	// Completed one union member up to ';'
-    , PS_CaseSeen		// Seen a CASE keyword
-    , PS_UnionElemTypeSeen	// Seen type spec for union element
-    , PS_UnionElemDeclSeen	// Seen declarator for union element
-    , PS_UnionBodySeen		// Seen completed union body
-    , PS_EnumSeen		// Seen an ENUM keyword
-    , PS_EnumIDSeen		// Seen the enum ID
-    , PS_EnumSqSeen		// Seen '{' for enum
-    , PS_EnumQsSeen		// Seen '}' for enum
-    , PS_EnumBodySeen		// Seen complete enum body
-    , PS_EnumCommaSeen		// Seen ',' in list of enumerators
-    , PS_SequenceSeen		// Seen a SEQUENCE keyword
-    , PS_SequenceSqSeen		// Seen '<' for sequence
-    , PS_SequenceQsSeen		// Seen '>' for sequence
-    , PS_SequenceTypeSeen	// Seen type decl for sequence
-    , PS_SequenceCommaSeen	// Seen comma for sequence
-    , PS_SequenceExprSeen	// Seen size expression for sequence
-    , PS_StringSeen		// Seen a STRING keyword
-    , PS_StringSqSeen		// Seen '<' for string
-    , PS_StringQsSeen		// Seen '>' for string
-    , PS_StringExprSeen		// Seen size expression for string
-    , PS_StringCompleted	// Seen a string decl without size spec
-    , PS_ArrayIDSeen		// Seen array ID
-    , PS_ArrayCompleted		// Seen completed array declaration
-    , PS_DimSqSeen		// Seen '[' for array dimension
-    , PS_DimQsSeen		// Seen ']' for array dimension
-    , PS_DimExprSeen		// Seen size expression for array dimension
-    , PS_AttrROSeen		// Seen READONLY keyword
-    , PS_AttrSeen		// Seen ATTRIBUTE keyword
-    , PS_AttrTypeSeen		// Seen type decl for attribute
-    , PS_AttrDeclsSeen		// Seen declarators for attribute
-    , PS_AttrCompleted		// Seen complete attribute declaration
-    , PS_ExceptSeen		// Seen EXCEPTION keyword
-    , PS_ExceptIDSeen		// Seen exception identifier
-    , PS_ExceptSqSeen		// Seen '{' for exception
-    , PS_ExceptQsSeen		// Seen '}' for exception
-    , PS_ExceptBodySeen		// Seen complete exception body
-    , PS_OpAttrSeen		// Seen operation attribute
-    , PS_OpTypeSeen		// Seen operation return type
-    , PS_OpIDSeen		// Seen operation ID
-    , PS_OpParsCompleted	// Completed operation param list
-    , PS_OpRaiseCompleted	// Completed operation except list
-    , PS_OpContextCompleted	// Completed operation context spec
-    , PS_OpCompleted		// Completed operation statement
-    , PS_OpSqSeen		// Seen '(' for operation
-    , PS_OpQsSeen		// Seen ')' for operation
-    , PS_OpParCommaSeen		// Seen ',' in list of op params
-    , PS_OpParDirSeen		// Seen parameter direction
-    , PS_OpParTypeSeen		// Seen parameter type
-    , PS_OpParDeclSeen		// Seen parameter declaration
-    , PS_OpRaiseSeen		// Seen RAISES keyword
-    , PS_OpRaiseSqSeen		// Seen '(' for RAISES
-    , PS_OpRaiseQsSeen		// Seen ')' for RAISES
-    , PS_OpContextSeen		// Seen CONTEXT keyword
-    , PS_OpContextSqSeen	// Seen '(' for CONTEXT
-    , PS_OpContextQsSeen	// Seen ')' for CONTEXT
-    , PS_OpContextCommaSeen	// Seen ',' for CONTEXT
-    , PS_DeclsCommaSeen		// Seen ',' in declarators list
-    , PS_DeclsDeclSeen		// Seen complete decl in decls list
-      , PS_NativeSeen             // Seen a native declaration
-  };
-
-  // Constructor
-  IDL_GlobalData();
-  virtual ~IDL_GlobalData() {}
-
-  // Operations
-  virtual UTL_ScopeStack	*scopes();		// Scopes stack
-  virtual void			set_scopes(UTL_ScopeStack *);
-							// Set it
-
-  virtual AST_Root		*root();		// Root of AST
-  virtual void			set_root(AST_Root *);	// Set it
-
-  virtual AST_Generator		*gen();			// Generator
-  virtual void			set_gen(AST_Generator *);// Set it
-
-  virtual UTL_Error		*err();			// Error reporter
-  virtual void			set_err(UTL_Error *);	// Set it
-
-  virtual long			err_count();		// How many errors?
-  virtual void			set_err_count(long);	// Set it
-
-  virtual long			lineno();		// Where in file?
-  virtual void			set_lineno(long);	// Set it
-
-  virtual String		*filename();		// What file?
-  virtual void			set_filename(String *);	// Set it
-
-  virtual String		*main_filename();	// What's the main
-							// file name?
-  virtual void			set_main_filename(String *);
-							// Set it
-
-  virtual String		*real_filename();	// What's the real
-							// file name?
-  virtual void			set_real_filename(String *);
-			                                // Set it
-
-  virtual String		*stripped_filename();	// Stripped filename
-  virtual void			set_stripped_filename(String *);
-							// Set it
-
-  virtual idl_bool		imported();		// Are we imported?
-  virtual idl_bool		import();		// Is import on?
-  virtual void			set_import(idl_bool);	// Set it
-
-  virtual idl_bool		in_main_file();		// Are we?
-  virtual void			set_in_main_file(idl_bool);	// Set it
-
-  virtual char			*prog_name();		// Invoked as..
-  virtual void			set_prog_name(char *);	// Set it
-
-  virtual char			*cpp_location();	// Where's CPP?
-  virtual void			set_cpp_location(char *);// Set it
-
-  virtual long			compile_flags();	// What flags are on?
-  virtual void			set_compile_flags(long);// Turn some on or off
-
-  virtual char			*be();			// Get BE to use
-  virtual void			set_be(char *);		// Set it
-
-  virtual char			*local_escapes();	// Get local escapes
-  virtual void			set_local_escapes(char *);// Set it
-
-  virtual UTL_Indenter		*indent();		// Get indenter
-  virtual void			set_indent(UTL_Indenter *);
-							// Set it
-
-  virtual UTL_StrList		*pragmas();		// Get pragmas
-  virtual void			set_pragmas(UTL_StrList *);// Set it
-
-  virtual idl_bool		read_from_stdin();	// Reading from stdin?
-  virtual void			set_read_from_stdin(idl_bool); // Set it
-
-  virtual void			store_include_file_name(String *);
-
-  virtual String	      **include_file_names();	// Array of file names
-  virtual void			set_include_file_names(String **); // Set it
-
-  virtual unsigned long		n_include_file_names();	// How many
-  virtual void			set_n_include_file_names(unsigned long n);
-
-  virtual ParseState		parse_state();		// What state we're in
-  virtual void			set_parse_state(ParseState s); // Set it
-
-  // Convert from a predefined type to an expression type
-  virtual AST_Expression::ExprType
-				PredefinedTypeToExprType(
-				  AST_PredefinedType::PredefinedType
-				);
-
-  /**************** Added to serve the back end *************/
-  virtual String                *idl_src_file();
-  // returns the IDL source file being copiled
-
-  virtual void                  idl_src_file(String *);
-  // set the source IDL file that is being parsed
-
-  // helper functions that generate the file names for the C++ mapping
-  // generated code
-  static const char  *be_get_client_hdr_fname ();
-  static const char  *be_get_client_stub_fname ();
-  static const char  *be_get_client_inline_fname ();
-  static const char  *be_get_server_hdr_fname ();
-  static const char  *be_get_server_skeleton_fname ();
-  static const char  *be_get_server_inline_fname ();
-
-  // Helper functions: obtain the names of each generated file given
-  // the IDL file name.
-  static const char *be_get_client_hdr (String *idl_file_name);
-  static const char *be_get_client_stub (String *idl_file_name);
-  static const char *be_get_client_inline (String *idl_file_name);
-  static const char *be_get_server_hdr (String *idl_file_name);
-  static const char *be_get_server_skeleton (String *idl_file_name);
-  static const char *be_get_server_inline (String *idl_file_name);
-
-  virtual const char* export_macro (void) const;
-  // returns the macro name for exporting classes in Win32 DLL.
-
-  virtual void export_macro (const char* s);
-  // set the macro name for export classes in Win32 DLL.
-
-  virtual const char* export_include (void) const;
-  // returns the name of the include file that contains the export
-  // macro definition.
-
-  virtual void export_include (const char* s);
-  // set the name of the include file that contains the export
-  // macro definition.
-
-private:
-  // Data
-  UTL_ScopeStack		*pd_scopes;		// Store scopes stack
-  AST_Root			*pd_root;		// Store AST root
-  AST_Generator			*pd_gen;		// Store generator
-  UTL_Error			*pd_err;		// Error object
-  long				pd_err_count;		// Count of errors
-  long				pd_lineno;		// What line #
-  String			*pd_filename;		// What file
-  String			*pd_main_filename;	// What main filename
-  String			*pd_real_filename;	// What real filename
-  String			*pd_stripped_filename;	// Stripped filename
-  idl_bool			pd_import;		// Is import on?
-  idl_bool			pd_in_main_file;	// Are we in it?
-  char				*pd_prog_name;		// Argv[0]
-  char				*pd_cpp_location;	// Where to find CPP
-  long				pd_compile_flags;	// Compile flags
-  char				*pd_be;			// BE name to use
-  char				*pd_local_escapes;	// Trapdoor argument
-  UTL_Indenter			*pd_indent;		// Indent object
-  UTL_StrList			*pd_pragmas;		// List of pragmas
-							// as its being built
-  idl_bool			pd_read_from_stdin;	// Reading from stdin?
-  String			**pd_include_file_names;// Array of file names
-  unsigned long			pd_n_include_file_names;// How many
-  unsigned long			pd_n_alloced_file_names;// How many alloced
-
-  ParseState			pd_parse_state;		// Parse state we're in
-
-  // Operations
-  long				seen_include_file_before(String *);
-							// Seen this include
-							// before?
-  String                        *pd_idl_src_file;       // IDL source file
-
-  char* export_macro_;
-  char* export_include_;
-};
-
-#endif	//_IDL_IDL_GLOBAL_HH
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
deleted file mode 100644
index c2d9e3a8370..00000000000
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_IDL_NARROW_IDL_NARROW_HH
-#define	_IDL_NARROW_IDL_NARROW_HH
-
-// idl_narrow.hh
-//
-// Implement IDL narrowing mechanism. Not intended to be read by humans..
-//
-// Logic:
-//
-// The DEF_xxx macros are used in class declarations.
-// The IMPL_xxx macros are used in class implementations.
-//
-// The DEF_xxx macros come in two flavors. The first one, DEF_NARROW_METHODSn,
-// defines the narrowing mechanism. It declares a static class function whose
-// address is used as the class identifier. Then, it declares a narrow op
-// with an implementation suitable for narrowing from exactly 'n' superclasses.
-// The names of the superclass types are given as arguments. The second flavor
-// implements specific narrowing mechanisms from AST_decl and from UTL_scope.
-// These macros are named DEF_NARROW_FROM_DECL and DEF_NARROW_FROM_SCOPE
-// respectively.
-//
-// The IMPL_xxx macros also come in two flavors, corresponding to the two
-// flavors of DEF_xxx macros. The IMPL_NARROW_METHODSn macros implement the
-// narrowing mechanism for classes which must be narrowed from 'n' ancestors.
-// The IMPL_NARROW_FROM_DECL and IMPL_NARROW_FROM_SCOPE macros implement
-// the narrowing mechanisms for narrowing from instances of AST_decl and
-// UTL_scope.
-//
-// IMPL_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
-// DEF_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
-
-extern	char	*type_id_to_string(long);
-
-#define DEF_NARROW_METHODS0(TYPE)\
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS0(TYPE)\
-int \
-TYPE::type_id()\
-{\
-  return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  return rval; \
-}
-
-#define DEF_NARROW_METHODS1(TYPE,PARENT) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS1(TYPE,PARENT) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) { \
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT4::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT4::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT5::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_FROM_DECL(TYPE)\
-static	TYPE *narrow_from_decl(AST_Decl *t)
-
-
-#define IMPL_NARROW_FROM_DECL(TYPE)\
-TYPE * \
-TYPE::narrow_from_decl(AST_Decl *t) { \
-   return (TYPE *)t->narrow((long)&TYPE::type_id);\
-}
-
-#define DEF_NARROW_FROM_SCOPE(TYPE)\
-static	TYPE *narrow_from_scope(UTL_Scope *t)
-
-
-#define IMPL_NARROW_FROM_SCOPE(TYPE)\
-TYPE * \
-TYPE::narrow_from_scope(UTL_Scope *t) { \
-    return (TYPE *)t->narrow((long)&TYPE::type_id);\
-}
-
-#endif	// _IDL_NARROW_IDL_NARROW_HH
diff --git a/TAO/TAO_IDL/include/intlmacros.h b/TAO/TAO_IDL/include/intlmacros.h
deleted file mode 100644
index 5a2da162932..00000000000
--- a/TAO/TAO_IDL/include/intlmacros.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_IDL_INTLMACROS_HH
-#define _IDL_INTLMACROS_HH
-
-// intlmacros.hh
-//
-// Define macros which conditionalize string internationalization
-
-#ifndef	DOMF_TEXT_DEVEL_DOMAIN
-#define	DOMF_TEXT_DEVEL_DOMAIN	"SUNW_DOE_DOMF_DEVEL"
-#endif	// DOMF_TEXT_DEVEL_DOMAIN
-
-#define	GTDEVEL(s)		s
-
-#if defined(__STDC__)
-#define CONV(p) #p
-#define MKSTR(p) CONV(p)
-#else
-#define MKSTR(p) "p"
-#endif
-
-#endif	// _IDL_INTLMACROS_HH
diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h
deleted file mode 100644
index 2da18cd4c80..00000000000
--- a/TAO/TAO_IDL/include/nr_extern.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _NR_EXTERN_NR_EXTERN_HH
-#define _NR_EXTERN_NR_EXTERN_HH
-
-// nr_extern.hh - Defines entry points provided by narrowing
-
-// Convert between an UTL_Scope and an AST_Decl
-extern	AST_Decl	*ScopeAsDecl(UTL_Scope *s);
-extern	UTL_Scope	*DeclAsScope(AST_Decl *d);
-
-#endif	// _NR_EXTERN_NR_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/util.h b/TAO/TAO_IDL/include/util.h
deleted file mode 100644
index 6b218006c8e..00000000000
--- a/TAO/TAO_IDL/include/util.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTIL_UTIL_HH
-#define _UTIL_UTIL_HH
-
-// util.hh - Includes commonly used things defined in the util directory
-
-#include	"utl_stack.h"		// class fe_stack
-#include	"utl_exprlist.h"	// class UTL_ExprList
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_idlist.h"		// class UTL_IdList
-#include	"utl_exceptlist.h"	// class UTL_ExceptList
-#include	"utl_namelist.h"	// class UTL_NameList
-#include	"utl_labellist.h"	// class UTL_LabelList
-#include	"utl_decllist.h"	// class UTL_DeclList
-
-#include	"idl_global.h"		// Class IDL_GlobalData
-
-#include	"utl_error.h"		// class UTL_Error
-
-#include	"utl_indenter.h"	// class UTL_Indenter
-
-#endif           // _UTIL_UTIL_HH
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
deleted file mode 100644
index 9a0a37298bb..00000000000
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
-#define _UTL_DECLLIST_UTL_DECLLIST_HH
-
-// utl_decllist.hh
-//
-// List of FE_Declarator nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, fe_declarator.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_DeclList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr);
-
-  // Get element
-  FE_Declarator		*head();
-
-private:
-  // Data
-  FE_Declarator		*pd_car_data;	// The element this list stores
-};
-
-// Active iterator fooor UTL_DeclList
-class	UTL_DecllistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DecllistActiveIterator(UTL_DeclList *s);
-
-  // Get current item
-  FE_Declarator		*item();
-};
-
-#endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
deleted file mode 100644
index 0873ae758a1..00000000000
--- a/TAO/TAO_IDL/include/utl_err.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_ERROR_UTL_ERROR_HH
-#define _UTL_ERROR_UTL_ERROR_HH
-
-// utl_error.hh
-//
-// Defines error codes and error handling class for UTL
-// This will change as a result of internationalization
-
-/*
-** DEPENDENCIES: ast.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_Error
-{
-public:
-  enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
-  };
-
-  // Operations
-
-  // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
-
-  // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
-
-  // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
-
-  // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
-
-  // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
-
-  // Report an attempt to use a forward declared interface which
-  // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
-
-  // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
-
-  // Report a situation where a constant was expected but we got
-  // something else instead. This most likely is a case where a union
-  // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report a situation where an enumerator was expected but we got
-  // something else instead. This occurs when a union with an enum
-  // discriminator is being parsed and one of the branch labels is
-  // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
-
-  // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
-
-  // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
-
-  // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
-
-  // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
-
-  // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
-
-  // Report not a type error
-  void	not_a_type(AST_Decl *d);
-
-  // Report back-end error
-  void  back_end(long lineno, String *s);
-};
-
-#endif           // _UTL_ERROR_UTL_ERROR_HH
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
deleted file mode 100644
index 0873ae758a1..00000000000
--- a/TAO/TAO_IDL/include/utl_error.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_ERROR_UTL_ERROR_HH
-#define _UTL_ERROR_UTL_ERROR_HH
-
-// utl_error.hh
-//
-// Defines error codes and error handling class for UTL
-// This will change as a result of internationalization
-
-/*
-** DEPENDENCIES: ast.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_Error
-{
-public:
-  enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
-  };
-
-  // Operations
-
-  // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
-
-  // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
-
-  // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
-
-  // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
-
-  // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
-
-  // Report an attempt to use a forward declared interface which
-  // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
-
-  // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
-
-  // Report a situation where a constant was expected but we got
-  // something else instead. This most likely is a case where a union
-  // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report a situation where an enumerator was expected but we got
-  // something else instead. This occurs when a union with an enum
-  // discriminator is being parsed and one of the branch labels is
-  // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
-
-  // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
-
-  // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
-
-  // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
-
-  // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
-
-  // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
-
-  // Report not a type error
-  void	not_a_type(AST_Decl *d);
-
-  // Report back-end error
-  void  back_end(long lineno, String *s);
-};
-
-#endif           // _UTL_ERROR_UTL_ERROR_HH
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
deleted file mode 100644
index c3c14ccf714..00000000000
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-#define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-
-// utl_exceptlist.hh
-//
-// List of AST_Exception nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_exception.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_ExceptList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr);
-
-  // Get list item
-  AST_Exception		*head();
-
-private:
-  // Data
-  AST_Exception		*pd_car_data;	// Item of this list
-};
-
-// Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptlistActiveIterator(UTL_ExceptList *s);
-
-  // Get current item
-  AST_Exception		*item();
-};
-
-#endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
deleted file mode 100644
index 3e4f7c7079e..00000000000
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
-#define _UTL_EXPRLIST_UTL_EXPRLIST_HH
-
-// utl_exprlist.hh
-//
-// List of strings
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: ast_expression.hh, utl_list.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_ExprList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr);
-
-  // Get list item
-  AST_Expression		*head();
-
-private:
-  // Data
-  AST_Expression		*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprlistActiveIterator(UTL_ExprList *s);
-
-  // Get current item
-  AST_Expression		*item();
-};
-
-#endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
deleted file mode 100644
index a29543127bc..00000000000
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
-#define	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
-
-// utl_identifier.hh
-//
-// Identifier
-
-/*
-** DEPENDENCIES: utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"utl_string.h"
-
-class Identifier
-{
-public:
-  Identifier ();
-  // Default Constructor(s)
-
-  Identifier (char *s, long x=1, long y=0, long z=I_FALSE);
-  // constructor
-
-  virtual ~Identifier ();
-  // destructor
-
-  // =Operations
-
-  char	*get_string ();
-  // get the underlying string
-
-  long	compare (Identifier *other);
-  // compare with other Identifier
-
-  // =Dumping
-
-  virtual void	dump (ostream &o);
-  // dump to an ostream
-
-  private:
-    // Storage for data
-    char	*pv_string;
-};
-
-#endif		// _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
deleted file mode 100644
index c33494c9248..00000000000
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
-
-// utl_idlist.hh
-//
-// List of Identifiers
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_identifier.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class UTL_IdList : public UTL_List
-{
-  // =TITLE
-  //  UTL_IdList
-  // =DESCRIPTION
-  //  Used to maintain a list of identifiers. The primary usage of this class
-  //  is to maintain a scoped name.
-public:
-  UTL_IdList (Identifier *car, UTL_IdList *cdr);
-  // Constructor(s)
-
-  virtual ~UTL_IdList() {}
-  // destructor
-
-  // =AST Dumping
-
-  virtual void dump (ostream &o);
-  // dump to ostream
-
-  // Other operations
-
-  UTL_List *copy ();
-  // Copy the list
-
-  Identifier *head ();
-  // get element
-
-  Identifier  *last_component ();
-  // Get last element in this list
-private:
-  Identifier *pd_car_data;
-};
-
-// Active iterator for UTL_IdList
-
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator
-{
-  // =TITLE
-  //  UTL_IdListActiveIterator
-  // =DESCRIPTION
-  //  Iterator for the IDList
-public:
-  UTL_IdListActiveIterator (UTL_IdList *s);
-  // Constructor(s)
-
-  Identifier *item ();
-  // retrieves the next item
-};
-
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
deleted file mode 100644
index 17a1a509e1e..00000000000
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_INDENTER_UTL_INDENTER_HH
-#define _UTL_INDENTER_UTL_INDENTER_HH
-
-// UTL indenter:
-//
-// Utility class for control of indentation level during dumping
-// May also be useful for BEs that want to produce nicely formatted
-// output
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: in CFE in dumping the AST
-*/
-
-class UTL_Indenter
-{
-  // =TITLE
-  //  UTL_Indenter
-  // =DESCRIPTION
-  //  useful in generating indented output
-public:
-  // Operations
-
-  UTL_Indenter();		// constructor
-  // Constructor(s)
-
-  virtual ~UTL_Indenter() {}
-  // destructor
-
-  void reset();			
-  // Reset indentation level to 0
-
-  void increase();		
-  // Increase indentation level
-
-  void decrease();		
-  // Decrease indentation level
-
-  void skip_to (ostream &o);	
-  // Skip to indentation level stop
-
-  void skip_to (FILE *fp);
-  // skip to indentation level stop
-
-private:
-  // Data
-  long				pd_indent_level;	// How far to indent
-};
-
-#endif           // _UTL_INDENTER_UTL_INDENTER_HH
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
deleted file mode 100644
index e78a04ec372..00000000000
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
-#define _UTL_LABELLIST_UTL_LABELLIST_HH
-
-// utl_labellist.hh
-//
-// List of AST_UnionBranch nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_union_label.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_LabelList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr);
-
-  // Get list item
-  AST_UnionLabel	*head();
-
-private:
-  // Data
-  AST_UnionLabel	*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabellistActiveIterator(UTL_LabelList *source);
-
-  // Get current item
-  AST_UnionLabel	*item();
-};
-
-#endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
deleted file mode 100644
index 017b9be1a18..00000000000
--- a/TAO/TAO_IDL/include/utl_list.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_LIST_UTL_LIST_HH
-#define _UTL_LIST_UTL_LIST_HH
-
-// utl_list.hh
-//
-// General single-linked lists
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-// Forward declare active iterator for UTL_List
-class	UTL_ListActiveIterator;
-
-class	UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_List(UTL_List *c);
-
-  // Smash last cdr pointer in "this" with l
-  void			nconc(UTL_List *l);
-
-  // Copy the list starting at "this"
-  virtual UTL_List	*copy();
-
-  // Get next list
-  UTL_List		*tail();
-
-  // Set next list
-  void			set_tail(UTL_List *l);
-
-  // How long is this list?
-  long			length();
-
-private:
-  // Data
-  UTL_List		*pd_cdr_data;	// The next list
-
-  // Operations
-  long			list_length(long n); // How long is it?
-
-  // Friend class
-  friend class		UTL_ListActiveIterator; // Friend class
-
-};
-
-// Active iterator for lists
-class	UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ListActiveIterator(UTL_List *s);	
-
-  // Get next list
-  virtual void		next();
-
-  // Are we at the end of this list?
-  virtual long		is_done();
-
-protected:
-  // Data
-  UTL_List		*source;		// On what to iterate?
-};
-
-#endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
deleted file mode 100644
index d7f0d8eb526..00000000000
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
-#define _UTL_NAMELIST_UTL_NAMELIST_HH
-
-// utl_namelist.hh
-//
-// List of UTL_ScopedName nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_NameList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr);
-
-  // Get list item
-  UTL_ScopedName	*head();
-
-private:
-  // Data
-  UTL_ScopedName	*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NamelistActiveIterator(UTL_NameList *source);
-
-  // Get current item
-  UTL_ScopedName	*item();
-};
-
-#endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
deleted file mode 100644
index ff105101964..00000000000
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_SCOPE_UTL_SCOPE_HH
-#define _UTL_SCOPE_UTL_SCOPE_HH
-
-// UTL_Scope - Provide scoping mechanism
-//
-// This is the base class for name scoping. Each entity which can
-// be directly contained in a naming scope has an add() function
-// defined for it. The functions defined on the base scoping class
-// all return FALSE. Each subclass of UTL_Scope should
-// define its own add() functions for those types which are legal
-// in that context. Then, for those types for which no local functions
-// have been defined the function on the base class will be called to
-// return FALSE.
-//
-// The "AST_" classes may redefine add() functions to implement any
-// name binding mechanisms needed for their own functionality. It is
-// the responsibility of those functions then to call the add()
-// function defined in the parent "AST_" class.
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scoped_name.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-#include	"ast_expression.h"
-#include	"utl_scoped_name.h"
-
-// Forward declaration of active iterator for UTL_Scope
-class UTL_ScopeActiveIterator;
-
-class	UTL_Scope : public virtual COMMON_Base
-{
-public:
-  // Enum to denote the kind of iteration desired
-  enum ScopeIterationKind {
-      IK_both		// Iterate through both decls and local types
-    , IK_decls		// Iterate only through decls
-    , IK_localtypes	// Iterate only through local types
-  };
-
-  // Operations
-
-  // Constructor(s)
-  UTL_Scope();
-  UTL_Scope(AST_Decl::NodeType nt);
-  virtual ~UTL_Scope() {}
-
-  // Scope Management Protocol
-  virtual AST_PredefinedType	*add_predefined_type(AST_PredefinedType	*t);
-  virtual AST_Module		*add_module(AST_Module			*m);
-  virtual AST_Interface		*add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*add_constant(AST_Constant		*c);
-  virtual AST_Exception		*add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*add_operation(AST_Operation		*o);
-  virtual AST_Argument		*add_argument(AST_Argument		*a);
-  virtual AST_Union		*add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*add_structure(AST_Structure		*s);
-  virtual AST_Field		*add_field(AST_Field			*f);
-  virtual AST_Enum		*add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*add_sequence(AST_Sequence		*s);
-  virtual AST_String		*add_string(AST_String			*s);
-  virtual AST_Array		*add_array(AST_Array			*a);
-  virtual AST_Native            *add_native (AST_Native                 *n);
-
-  // Call back end add_XXX functions for this scope
-  virtual AST_Decl 		*call_add();
-
-  // Data Accessors
-  AST_Decl::NodeType scope_node_type()
-  {
-    return pd_scope_node_type;
-  }
-
-  // Narrowing
-  DEF_NARROW_METHODS0(UTL_Scope);
-  DEF_NARROW_FROM_SCOPE(UTL_Scope);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other Operations
-
-  // Name Lookup Mechanism
-  virtual AST_Decl		*lookup_by_name(UTL_ScopedName *,
-						idl_bool treat_as_ref);
-
-  // Look up the Identifier * specified only in the local scope
-  virtual AST_Decl		*lookup_by_name_local(Identifier *,
-						      idl_bool treat_as_ref);
-
-  // Look up a predefined type by its ExprType
-  virtual AST_Decl
-    *lookup_primitive_type(AST_Expression::ExprType);
-
-  // How many entries are used?
-  virtual unsigned long		nmembers();
-
-protected:
-  // UTL_Scope protected addition protocol. This protocol is
-  // used from sub-classes of UTL_Scope to insert nodes directly
-  // into the specified node table (either decls or local_types)
-  // Additionally, UTL_Scope also maintains a record of what nodes
-  // defined elsewhere were referenced in this scope
-
-  // Add to decls. Node represents a local declaration
-  void				add_to_scope(AST_Decl *e);
-
-  // Add to local types. Node represents a local manifest type
-  void				add_to_local_types(AST_Decl *e);
-
-  // Add to referenced nodes set.
-  void				add_to_referenced(AST_Decl *e,
-						  idl_bool recursive);
-
-  // Has this node been referenced here already?
-  idl_bool			referenced(AST_Decl *e);
-
-  // Look up a scoped name in the inherited interfaces of an
-  // interface
-  virtual AST_Decl		*look_in_inherited(UTL_ScopedName *,
-						   idl_bool treat_as_ref);
-protected:
-  // Operations
-
-  // Lookup based on the local name
-  virtual AST_Decl		*lookup_for_add(AST_Decl *d,
-						idl_bool treat_as_ref);
-
-private:
-  // Data
-
-  // What type is this node? This is a cache of the information
-  // in AST_Decl
-  const	AST_Decl::NodeType	pd_scope_node_type;
-
-  // Storage for declarations in this scope:
-  AST_Decl			**pd_decls;		// Store declarations
-  long				pd_decls_allocated;	// How many allocated?
-  long				pd_decls_used;		// How many used?
-
-  // Storage for local manifest types in this scope:
-  AST_Decl			**pd_local_types;	// Store types
-  long				pd_locals_allocated;	// How many allocated?
-  long				pd_locals_used;		// How many used?
-
-  // Storage for referenced nodes in this scope:
-  AST_Decl			**pd_referenced;	// Store references
-  long				pd_referenced_allocated;// How many allocated?
-  long				pd_referenced_used;	// How many used?
-
-  // Friend class UTL_ScopeActiveIterator defines active iterator for
-  // UTL_Scope. Definition follows below.
-  friend class			UTL_ScopeActiveIterator;
-
-private:
-  friend int yyparse();
-  friend class AST_Enum;
-
-  // Scope Management Protocol
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation		*o);
-  virtual AST_Argument		*fe_add_argument(AST_Argument		*a);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Field		*fe_add_field(AST_Field			*f);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
-  virtual AST_Native            *fe_add_native (AST_Native              *n);
-};
-
-// Active iterator for a UTL_Scope node
-class UTL_ScopeActiveIterator {
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ScopeActiveIterator(UTL_Scope *s, UTL_Scope::ScopeIterationKind ik);
-
-  // Advance to next item
-  virtual void			next();
-
-  // Get current item
-  virtual AST_Decl		*item();
-
-  // Have we iterated over entire scope?
-  virtual idl_bool		is_done();
-
-  // What kind of iterator is this?
-  virtual UTL_Scope::ScopeIterationKind	iteration_kind();
-
-  // What stage are we in with this iterator?
-  virtual UTL_Scope::ScopeIterationKind	iteration_stage();
-
-private:
-  // Data
-  UTL_Scope			*iter_source;	// Scope to iterate over
-  UTL_Scope::ScopeIterationKind	ik;		// What kind of iteration
-  UTL_Scope::ScopeIterationKind	stage;		// What stage
-  long				il;		// What location in stage
-};
-
-#endif           // _UTL_SCOPE_UTL_SCOPE_HH
diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h
deleted file mode 100644
index 5ca4d9c247f..00000000000
--- a/TAO/TAO_IDL/include/utl_scoped_name.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
-#define _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
-
-// Define UTL_ScopedName as a list of strings
-
-/*
-** DEPENDENCIES: utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-typedef UTL_IdList			UTL_ScopedName;
-
-typedef UTL_IdListActiveIterator	UTL_ScopedNameActiveIterator;
-
-#endif           // _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
deleted file mode 100644
index 7e343c17fc4..00000000000
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_STACK_UTL_STACK_HH
-#define _UTL_STACK_UTL_STACK_HH
-
-// utl_stack.hh - Defines the UTL_ScopeStack class - a stack of scopes
-//
-// UTL_ScopeStack implements scope nesting
-
-/*
-** DEPENDENCIES: utl_scope.hh
-**
-** USE: Included from util.hh
-*/
-
-// Forward declaration of active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator;
-
-class	UTL_ScopeStack
-{
-public:
-  // Operations
-
-  // Constructor and destructor
-  UTL_ScopeStack();
-  virtual ~UTL_ScopeStack();
-
-  // Return top element
-  virtual UTL_Scope		*top();
-
-  // Pop top element
-  virtual void			pop();
-
-  // Clear entire stack
-  virtual void			clear();
-
-  // Push an element on the stack and return stack
-  virtual UTL_ScopeStack	*push(UTL_Scope *el);
-
-  // How deep is the stack now?
-  virtual unsigned long		depth();
-
-  // Return bottom element
-  virtual UTL_Scope		*bottom();
-
-  // Return (top - 1) element
-  virtual UTL_Scope		*next_to_top();
-
-  // return topmost non-NULL element
-  virtual UTL_Scope		*top_non_null();
-
-private:
-  // Data
-  UTL_Scope			**pd_stack_data;	// Store scopes stack
-  unsigned long			pd_stack_data_nalloced;	// How many allocated?
-  unsigned long			pd_stack_top;		// How many used?
-
-  // Friend active iterator class for UTL_ScopeStack
-  friend class			UTL_ScopeStackActiveIterator;
-};
-
-// Active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor
-  UTL_ScopeStackActiveIterator(UTL_ScopeStack *s);
-
-  // Advance to next element
-  virtual void			next();
-
-  // Get current item
-  virtual UTL_Scope		*item();
-
-  // Is the iteration finished?
-  virtual long			is_done();
-
-private:
-  // Data
-  UTL_ScopeStack		*source;	// On what to iterate?
-  long				il;		// Where are we in iteration?
-};
-
-#endif           // _UTL_STACK_UTL_STACK_HH
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
deleted file mode 100644
index 35f4fae171f..00000000000
--- a/TAO/TAO_IDL/include/utl_string.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _STRING_STRING_HH
-#define _STRING_STRING_HH
-
-// utl_string.hh - contains a quick and dirty TEMPORARY string implementation
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-#ifndef String
-#define String	UTL_String
-#endif	// String
-
-class	UTL_String
-{
-  // =TITLE
-  //  UTL_String
-  // =DESCRIPTION
-  //  string class to store identifiers
-public:
-  // =Operations
-
-  UTL_String (void);
-  // default constructor
-
-  UTL_String (char *str);
-  // construct from a char *
-
-  UTL_String (unsigned long maxlen);
-  // constructor with an initial string length
-
-  UTL_String (UTL_String *s);
-  // construct using a pointer to UTL_String
-
-  virtual ~UTL_String (void) {}
-  // destructor 
-
-  // =AST Dumping
-
-  virtual void dump (ostream &o);
-  // dump to the ostream
-
-  // =Other Operations
-
-  char *get_string (void);
-  // Get contents of utl_string
-
-  char *get_canonical_rep (void);
-  // Get canonical representation. This is (implemented as) the all upper
-  // case corresponding string
-
-  virtual long compare (UTL_String *s);
-  // Compare two String *
-
-private:
-  // Data
-  char		*p_str;		
-  // Storage for characters
-
-  char		*c_str;		
-  // Canonicalized string
-
-  unsigned long	len;		
-  // How long is string
-
-  unsigned long alloced;	
-  // How much allocated
-
-  // =Private helper operations
-
-  void canonicalize (void);	
-  // Compute canonical representation
-};
-
-#endif           // _STRING_STRING_HH
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
deleted file mode 100644
index 2dac6ce3de6..00000000000
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_STRLIST_UTL_STRLIST_HH
-#define _UTL_STRLIST_UTL_STRLIST_HH
-
-// utl_strlist.hh
-//
-// List of String nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_StrList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrList(String *s, UTL_StrList *cdr);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-  // Other Operations
-
-  // Copy a list of strings
-  virtual UTL_List	*copy();
-
-  // Get list element
-  String		*head();
-
-  // Set the list element
-  void			set_head(String *);
-
-  // Get last element in this list
-  String		*last_component();
-
-private:
-  // Data
-  String		*pd_car_data;	// The list item
-};
-
-// Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrlistActiveIterator(UTL_StrList *s);
-
-  // Get current item
-  String		*item();
-};
-
-#endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
deleted file mode 100644
index 5e5892d4d7f..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
-#define _UTL_DECLLIST_UTL_DECLLIST_HH
-
-// utl_decllist.hh
-//
-// List of FE_Declarator nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, fe_declarator.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"fe_declarator.h"
-
-
-class	UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr);
-  virtual ~UTL_DeclList() {}
-};
-
-// Active iterator for UTL_DeclList
-class	UTL_DecllistActiveIterator :
-    public UTL_ListActiveIterator<UTL_DeclList, FE_Declarator>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DecllistActiveIterator(UTL_DeclList *s);
-  virtual ~UTL_DecllistActiveIterator() {}
-};
-
-#endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
deleted file mode 100644
index b4bacad5510..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-#define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-
-// utl_exceptlist.hh
-//
-// List of AST_Exception nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_exception.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
-#include	"idl_bool.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
-#include	"ast_type.h"
-#include	"ast_concrete_type.h"
-#include	"ast_structure.h"
-#include	"ast_exception.h"
-
-
-class	UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr);
-  virtual ~UTL_ExceptList() {}
-};
-
-// Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_ExceptList, AST_Exception>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptlistActiveIterator(UTL_ExceptList *s);
-  virtual ~UTL_ExceptlistActiveIterator() {}
-};
-
-#endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
deleted file mode 100644
index 155f2bf43d0..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
-#define _UTL_EXPRLIST_UTL_EXPRLIST_HH
-
-// utl_exprlist.hh
-//
-// List of strings
-
-/*
-** DEPENDENCIES: ast_expression.hh, utl_list.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
-
-
-class	UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr);
-  virtual ~UTL_ExprList() {}
-};
-
-// Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_ExprList, AST_Expression>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprlistActiveIterator(UTL_ExprList *s);
-  virtual ~UTL_ExprlistActiveIterator() {}
-};
-
-#endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
deleted file mode 100644
index 081149fe0e1..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
-
-// utl_idlist.hh
-//
-// List of Identifiers
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_identifier.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class	UTL_IdList : public UTL_List<UTL_IdList, Identifier>
-{
-  public:
-    // Constructor(s)
-    UTL_IdList(Identifier *car, UTL_IdList *cdr);
-    virtual ~UTL_IdList() {}
-
-    // AST Dumping
-    virtual void	dump(ostream &o);
-
-    // Other operations
-
-    // Get last element in this list
-    Identifier		*last_component();
-};
-
-// Active iterator for UTL_IdList
-
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator<UTL_IdList, Identifier>
-{
-  public:
-    // Constructor(s)
-    UTL_IdListActiveIterator(UTL_IdList *s);
-};
-
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
deleted file mode 100644
index 80b7146780d..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
-#define _UTL_LABELLIST_UTL_LABELLIST_HH
-
-// utl_labellist.hh
-//
-// List of AST_UnionBranch nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_union_label.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"ast_union_label.h"
-
-
-class	UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr);
-  virtual ~UTL_LabelList() {}
-};
-
-// Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator :
-    public UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabellistActiveIterator(UTL_LabelList *source);
-  virtual ~UTL_LabellistActiveIterator() {}
-};
-
-#endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
deleted file mode 100644
index 420b360c6a4..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_LIST_UTL_LIST_HH
-#define _UTL_LIST_UTL_LIST_HH
-
-// utl_list.hh
-//
-// General single-linked lists
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-// Forward declare active iterator for UTL_List
-template<class L, class T> class UTL_ListActiveIterator;
-
-template<class L, class T>
-class	UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_List(T *c, L *l);
-  virtual ~UTL_List() {}
-
-  // Smash last cdr pointer in "this" with l
-  void			nconc(L *l);
-
-  // Copy the list starting at "this"
-  L			*copy();
-
-  // Get list element
-  T			*head();
-
-  // Get next list
-  L			*tail();
-
-  // Set the list element
-  void			set_head(T *t);
-
-  // Set next list
-  void			set_tail(L *l);
-
-  // How long is this list?
-  long			length();
-
-private:
-  // Data
-  T			*pd_car_data;	// The next list
-  L			*pd_cdr_data;	// The next list
-
-  // Operations
-  long			list_length(long n); // How long is it?
-
-  // Friend class
-  friend class		UTL_ListActiveIterator<L, T>; // Friend class
-
-};
-
-// Active iterator for lists
-template<class L, class T>
-class	UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ListActiveIterator(UTL_List<L, T> *s);	
-  virtual ~UTL_ListActiveIterator() {}
-
-  // Get current item
-  T			*item();
-
-  // Get next list
-  virtual void		next();
-
-  // Are we at the end of this list?
-  virtual long		is_done();
-
-protected:
-  // Data
-  UTL_List<L, T>		*source;		// On what to iterate?
-};
-
-#endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
deleted file mode 100644
index 8668568e983..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
-#define _UTL_NAMELIST_UTL_NAMELIST_HH
-
-// utl_namelist.hh
-//
-// List of UTL_ScopedName nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class	UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr);
-  virtual ~UTL_NameList() {}
-};
-
-// Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator :
-    public UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NamelistActiveIterator(UTL_NameList *source);
-  virtual ~UTL_NamelistActiveIterator() {}
-};
-
-#endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
deleted file mode 100644
index fca9cdb6442..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_STRLIST_UTL_STRLIST_HH
-#define _UTL_STRLIST_UTL_STRLIST_HH
-
-// utl_strlist.hh
-//
-// List of String nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_string.h"
-
-
-class	UTL_StrList : public UTL_List<UTL_StrList, String>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrList(String *s, UTL_StrList *cdr);
-  virtual ~UTL_StrList() {}
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-  // Other Operations
-
-  // Get last element in this list
-  String		*last_component();
-};
-
-// Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_StrList, String>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrlistActiveIterator(UTL_StrList *s);
-  virtual ~UTL_StrlistActiveIterator() {}
-};
-
-#endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/narrow/Makefile b/TAO/TAO_IDL/narrow/Makefile
deleted file mode 100644
index 38e976ef85f..00000000000
--- a/TAO/TAO_IDL/narrow/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libast
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libnarrow
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-NARROW_FILES	= \
-		narrow
-
-FILES	 = $(NARROW_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/narrow.o .obj/narrow.so .shobj/narrow.o .shobj/narrow.so: narrow.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
deleted file mode 100644
index 786e0f95754..00000000000
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Narrowing functions for AST
-
-/*
- * Convert a UTL_Scope node into an AST_Decl node if possible
- */
-AST_Decl *
-ScopeAsDecl(UTL_Scope *s)
-{
-  if (s == NULL) return NULL;
-
-  switch (s->scope_node_type()) {
-  case AST_Decl::NT_module:
-    return AST_Module::narrow_from_scope(s);
-  case AST_Decl::NT_root:
-    return AST_Root::narrow_from_scope(s);
-  case AST_Decl::NT_interface:
-    return AST_Interface::narrow_from_scope(s);
-  case AST_Decl::NT_op:
-    return AST_Operation::narrow_from_scope(s);
-  case AST_Decl::NT_except:
-    return AST_Exception::narrow_from_scope(s);
-  case AST_Decl::NT_union:
-    return AST_Union::narrow_from_scope(s);
-  case AST_Decl::NT_struct:
-    return AST_Structure::narrow_from_scope(s);
-  case AST_Decl::NT_enum:
-    return AST_Enum::narrow_from_scope(s);
-  default:
-    return NULL;
-  }
-}
-
-/*
- * Convert an AST_Decl to a UTL_Scope if possible
- */
-UTL_Scope *
-DeclAsScope(AST_Decl *d)
-{
-   if (d == NULL) return NULL;
-
-   switch (d->node_type()) {
-   case AST_Decl::NT_interface_fwd:
-      /*
-       * Resolve forward declared interface by looking at full_definition()
-       * field and iterating
-       */
-      d = (AST_InterfaceFwd::narrow_from_decl(d))->full_definition();
-      /*
-       * Fall through
-       */
-   case AST_Decl::NT_interface:
-      return AST_Interface::narrow_from_decl(d);
-   case AST_Decl::NT_module:
-      return AST_Module::narrow_from_decl(d);
-   case AST_Decl::NT_root:
-      return AST_Root::narrow_from_decl(d);
-   case AST_Decl::NT_except:
-      return AST_Exception::narrow_from_decl(d);
-   case AST_Decl::NT_union:
-      return AST_Union::narrow_from_decl(d);
-   case AST_Decl::NT_struct:
-      return AST_Structure::narrow_from_decl(d);
-   case AST_Decl::NT_enum:
-      return AST_Enum::narrow_from_decl(d);
-   case AST_Decl::NT_op:
-      return AST_Operation::narrow_from_decl(d);
-   default:
-      return NULL;
-   }
-}
diff --git a/TAO/TAO_IDL/tao_idl.MAK b/TAO/TAO_IDL/tao_idl.MAK
deleted file mode 100644
index 6d2c3adfc4b..00000000000
--- a/TAO/TAO_IDL/tao_idl.MAK
+++ /dev/null
@@ -1,26122 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on tao_idl.dsp
-!IF "$(CFG)" == ""
-CFG=tao_idl - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to tao_idl - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "tao_idl - Win32 Release" && "$(CFG)" !=\
- "tao_idl - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "tao_idl.mak" CFG="tao_idl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "tao_idl - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "tao_idl - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\tao_idl.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\tao_idl.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\ast_argument.obj"
-	-@erase "$(INTDIR)\ast_array.obj"
-	-@erase "$(INTDIR)\ast_attribute.obj"
-	-@erase "$(INTDIR)\ast_check.obj"
-	-@erase "$(INTDIR)\ast_concrete_type.obj"
-	-@erase "$(INTDIR)\ast_constant.obj"
-	-@erase "$(INTDIR)\ast_decl.obj"
-	-@erase "$(INTDIR)\ast_enum.obj"
-	-@erase "$(INTDIR)\ast_enum_val.obj"
-	-@erase "$(INTDIR)\ast_exception.obj"
-	-@erase "$(INTDIR)\ast_expression.obj"
-	-@erase "$(INTDIR)\ast_field.obj"
-	-@erase "$(INTDIR)\ast_generator.obj"
-	-@erase "$(INTDIR)\ast_interface.obj"
-	-@erase "$(INTDIR)\ast_interface_fwd.obj"
-	-@erase "$(INTDIR)\ast_module.obj"
-	-@erase "$(INTDIR)\ast_native.obj"
-	-@erase "$(INTDIR)\ast_operation.obj"
-	-@erase "$(INTDIR)\ast_predefined_type.obj"
-	-@erase "$(INTDIR)\ast_recursive.obj"
-	-@erase "$(INTDIR)\ast_redef.obj"
-	-@erase "$(INTDIR)\ast_root.obj"
-	-@erase "$(INTDIR)\ast_sequence.obj"
-	-@erase "$(INTDIR)\ast_string.obj"
-	-@erase "$(INTDIR)\ast_structure.obj"
-	-@erase "$(INTDIR)\ast_type.obj"
-	-@erase "$(INTDIR)\ast_typedef.obj"
-	-@erase "$(INTDIR)\ast_union.obj"
-	-@erase "$(INTDIR)\ast_union_branch.obj"
-	-@erase "$(INTDIR)\ast_union_label.obj"
-	-@erase "$(INTDIR)\be_args.obj"
-	-@erase "$(INTDIR)\be_argument.obj"
-	-@erase "$(INTDIR)\be_array.obj"
-	-@erase "$(INTDIR)\be_attribute.obj"
-	-@erase "$(INTDIR)\be_codegen.obj"
-	-@erase "$(INTDIR)\be_constant.obj"
-	-@erase "$(INTDIR)\be_decl.obj"
-	-@erase "$(INTDIR)\be_enum.obj"
-	-@erase "$(INTDIR)\be_enum_val.obj"
-	-@erase "$(INTDIR)\be_exception.obj"
-	-@erase "$(INTDIR)\be_expression.obj"
-	-@erase "$(INTDIR)\be_factory.obj"
-	-@erase "$(INTDIR)\be_field.obj"
-	-@erase "$(INTDIR)\be_generator.obj"
-	-@erase "$(INTDIR)\be_helper.obj"
-	-@erase "$(INTDIR)\be_init.obj"
-	-@erase "$(INTDIR)\be_interface.obj"
-	-@erase "$(INTDIR)\be_interface_fwd.obj"
-	-@erase "$(INTDIR)\be_interpretive.obj"
-	-@erase "$(INTDIR)\be_module.obj"
-	-@erase "$(INTDIR)\be_native.obj"
-	-@erase "$(INTDIR)\be_operation.obj"
-	-@erase "$(INTDIR)\be_predefined_type.obj"
-	-@erase "$(INTDIR)\be_produce.obj"
-	-@erase "$(INTDIR)\be_root.obj"
-	-@erase "$(INTDIR)\be_scope.obj"
-	-@erase "$(INTDIR)\be_sequence.obj"
-	-@erase "$(INTDIR)\be_state.obj"
-	-@erase "$(INTDIR)\be_state_argument.obj"
-	-@erase "$(INTDIR)\be_state_array.obj"
-	-@erase "$(INTDIR)\be_state_attribute.obj"
-	-@erase "$(INTDIR)\be_state_exception.obj"
-	-@erase "$(INTDIR)\be_state_operation.obj"
-	-@erase "$(INTDIR)\be_state_sequence.obj"
-	-@erase "$(INTDIR)\be_state_structure.obj"
-	-@erase "$(INTDIR)\be_state_typedef.obj"
-	-@erase "$(INTDIR)\be_state_union.obj"
-	-@erase "$(INTDIR)\be_string.obj"
-	-@erase "$(INTDIR)\be_structure.obj"
-	-@erase "$(INTDIR)\be_sunsoft.obj"
-	-@erase "$(INTDIR)\be_type.obj"
-	-@erase "$(INTDIR)\be_typedef.obj"
-	-@erase "$(INTDIR)\be_union.obj"
-	-@erase "$(INTDIR)\be_union_branch.obj"
-	-@erase "$(INTDIR)\be_union_label.obj"
-	-@erase "$(INTDIR)\be_visitor.obj"
-	-@erase "$(INTDIR)\be_visitor_root.obj"
-	-@erase "$(INTDIR)\be_visitor_sequence.obj"
-	-@erase "$(INTDIR)\drv_args.obj"
-	-@erase "$(INTDIR)\drv_fork.obj"
-	-@erase "$(INTDIR)\drv_init.obj"
-	-@erase "$(INTDIR)\drv_link.obj"
-	-@erase "$(INTDIR)\drv_preproc.obj"
-	-@erase "$(INTDIR)\drv_private.obj"
-	-@erase "$(INTDIR)\fe_declarator.obj"
-	-@erase "$(INTDIR)\fe_extern.obj"
-	-@erase "$(INTDIR)\fe_init.obj"
-	-@erase "$(INTDIR)\fe_interface_header.obj"
-	-@erase "$(INTDIR)\fe_private.obj"
-	-@erase "$(INTDIR)\lex.yy.obj"
-	-@erase "$(INTDIR)\narrow.obj"
-	-@erase "$(INTDIR)\tao_idl.obj"
-	-@erase "$(INTDIR)\utl_decllist.obj"
-	-@erase "$(INTDIR)\utl_error.obj"
-	-@erase "$(INTDIR)\utl_exceptlist.obj"
-	-@erase "$(INTDIR)\utl_exprlist.obj"
-	-@erase "$(INTDIR)\utl_global.obj"
-	-@erase "$(INTDIR)\utl_identifier.obj"
-	-@erase "$(INTDIR)\utl_idlist.obj"
-	-@erase "$(INTDIR)\utl_indenter.obj"
-	-@erase "$(INTDIR)\utl_labellist.obj"
-	-@erase "$(INTDIR)\utl_list.obj"
-	-@erase "$(INTDIR)\utl_namelist.obj"
-	-@erase "$(INTDIR)\utl_scope.obj"
-	-@erase "$(INTDIR)\utl_stack.obj"
-	-@erase "$(INTDIR)\utl_string.obj"
-	-@erase "$(INTDIR)\utl_strlist.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\y.tab.obj"
-	-@erase "$(OUTDIR)\tao_idl.exe"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D\
- "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\"\
- /Fp"$(INTDIR)\tao_idl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /D\
- CPP_LOCATION="\"$(CPP_PATH)\\cl\"" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\tao_idl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=ace.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\tao_idl.pdb" /machine:I386 /out:"$(OUTDIR)\tao_idl.exe"\
- /libpath:"../../ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\ast_argument.obj" \
-	"$(INTDIR)\ast_array.obj" \
-	"$(INTDIR)\ast_attribute.obj" \
-	"$(INTDIR)\ast_check.obj" \
-	"$(INTDIR)\ast_concrete_type.obj" \
-	"$(INTDIR)\ast_constant.obj" \
-	"$(INTDIR)\ast_decl.obj" \
-	"$(INTDIR)\ast_enum.obj" \
-	"$(INTDIR)\ast_enum_val.obj" \
-	"$(INTDIR)\ast_exception.obj" \
-	"$(INTDIR)\ast_expression.obj" \
-	"$(INTDIR)\ast_field.obj" \
-	"$(INTDIR)\ast_generator.obj" \
-	"$(INTDIR)\ast_interface.obj" \
-	"$(INTDIR)\ast_interface_fwd.obj" \
-	"$(INTDIR)\ast_module.obj" \
-	"$(INTDIR)\ast_native.obj" \
-	"$(INTDIR)\ast_operation.obj" \
-	"$(INTDIR)\ast_predefined_type.obj" \
-	"$(INTDIR)\ast_recursive.obj" \
-	"$(INTDIR)\ast_redef.obj" \
-	"$(INTDIR)\ast_root.obj" \
-	"$(INTDIR)\ast_sequence.obj" \
-	"$(INTDIR)\ast_string.obj" \
-	"$(INTDIR)\ast_structure.obj" \
-	"$(INTDIR)\ast_type.obj" \
-	"$(INTDIR)\ast_typedef.obj" \
-	"$(INTDIR)\ast_union.obj" \
-	"$(INTDIR)\ast_union_branch.obj" \
-	"$(INTDIR)\ast_union_label.obj" \
-	"$(INTDIR)\be_args.obj" \
-	"$(INTDIR)\be_argument.obj" \
-	"$(INTDIR)\be_array.obj" \
-	"$(INTDIR)\be_attribute.obj" \
-	"$(INTDIR)\be_codegen.obj" \
-	"$(INTDIR)\be_constant.obj" \
-	"$(INTDIR)\be_decl.obj" \
-	"$(INTDIR)\be_enum.obj" \
-	"$(INTDIR)\be_enum_val.obj" \
-	"$(INTDIR)\be_exception.obj" \
-	"$(INTDIR)\be_expression.obj" \
-	"$(INTDIR)\be_factory.obj" \
-	"$(INTDIR)\be_field.obj" \
-	"$(INTDIR)\be_generator.obj" \
-	"$(INTDIR)\be_helper.obj" \
-	"$(INTDIR)\be_init.obj" \
-	"$(INTDIR)\be_interface.obj" \
-	"$(INTDIR)\be_interface_fwd.obj" \
-	"$(INTDIR)\be_interpretive.obj" \
-	"$(INTDIR)\be_module.obj" \
-	"$(INTDIR)\be_native.obj" \
-	"$(INTDIR)\be_operation.obj" \
-	"$(INTDIR)\be_predefined_type.obj" \
-	"$(INTDIR)\be_produce.obj" \
-	"$(INTDIR)\be_root.obj" \
-	"$(INTDIR)\be_scope.obj" \
-	"$(INTDIR)\be_sequence.obj" \
-	"$(INTDIR)\be_state.obj" \
-	"$(INTDIR)\be_state_argument.obj" \
-	"$(INTDIR)\be_state_array.obj" \
-	"$(INTDIR)\be_state_attribute.obj" \
-	"$(INTDIR)\be_state_exception.obj" \
-	"$(INTDIR)\be_state_operation.obj" \
-	"$(INTDIR)\be_state_sequence.obj" \
-	"$(INTDIR)\be_state_structure.obj" \
-	"$(INTDIR)\be_state_typedef.obj" \
-	"$(INTDIR)\be_state_union.obj" \
-	"$(INTDIR)\be_string.obj" \
-	"$(INTDIR)\be_structure.obj" \
-	"$(INTDIR)\be_sunsoft.obj" \
-	"$(INTDIR)\be_type.obj" \
-	"$(INTDIR)\be_typedef.obj" \
-	"$(INTDIR)\be_union.obj" \
-	"$(INTDIR)\be_union_branch.obj" \
-	"$(INTDIR)\be_union_label.obj" \
-	"$(INTDIR)\be_visitor.obj" \
-	"$(INTDIR)\be_visitor_root.obj" \
-	"$(INTDIR)\be_visitor_sequence.obj" \
-	"$(INTDIR)\drv_args.obj" \
-	"$(INTDIR)\drv_fork.obj" \
-	"$(INTDIR)\drv_init.obj" \
-	"$(INTDIR)\drv_link.obj" \
-	"$(INTDIR)\drv_preproc.obj" \
-	"$(INTDIR)\drv_private.obj" \
-	"$(INTDIR)\fe_declarator.obj" \
-	"$(INTDIR)\fe_extern.obj" \
-	"$(INTDIR)\fe_init.obj" \
-	"$(INTDIR)\fe_interface_header.obj" \
-	"$(INTDIR)\fe_private.obj" \
-	"$(INTDIR)\lex.yy.obj" \
-	"$(INTDIR)\narrow.obj" \
-	"$(INTDIR)\tao_idl.obj" \
-	"$(INTDIR)\utl_decllist.obj" \
-	"$(INTDIR)\utl_error.obj" \
-	"$(INTDIR)\utl_exceptlist.obj" \
-	"$(INTDIR)\utl_exprlist.obj" \
-	"$(INTDIR)\utl_global.obj" \
-	"$(INTDIR)\utl_identifier.obj" \
-	"$(INTDIR)\utl_idlist.obj" \
-	"$(INTDIR)\utl_indenter.obj" \
-	"$(INTDIR)\utl_labellist.obj" \
-	"$(INTDIR)\utl_list.obj" \
-	"$(INTDIR)\utl_namelist.obj" \
-	"$(INTDIR)\utl_scope.obj" \
-	"$(INTDIR)\utl_stack.obj" \
-	"$(INTDIR)\utl_string.obj" \
-	"$(INTDIR)\utl_strlist.obj" \
-	"$(INTDIR)\y.tab.obj"
-
-"$(OUTDIR)\tao_idl.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\tao_idl.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\tao_idl.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\ast_argument.obj"
-	-@erase "$(INTDIR)\ast_array.obj"
-	-@erase "$(INTDIR)\ast_attribute.obj"
-	-@erase "$(INTDIR)\ast_check.obj"
-	-@erase "$(INTDIR)\ast_concrete_type.obj"
-	-@erase "$(INTDIR)\ast_constant.obj"
-	-@erase "$(INTDIR)\ast_decl.obj"
-	-@erase "$(INTDIR)\ast_enum.obj"
-	-@erase "$(INTDIR)\ast_enum_val.obj"
-	-@erase "$(INTDIR)\ast_exception.obj"
-	-@erase "$(INTDIR)\ast_expression.obj"
-	-@erase "$(INTDIR)\ast_field.obj"
-	-@erase "$(INTDIR)\ast_generator.obj"
-	-@erase "$(INTDIR)\ast_interface.obj"
-	-@erase "$(INTDIR)\ast_interface_fwd.obj"
-	-@erase "$(INTDIR)\ast_module.obj"
-	-@erase "$(INTDIR)\ast_native.obj"
-	-@erase "$(INTDIR)\ast_operation.obj"
-	-@erase "$(INTDIR)\ast_predefined_type.obj"
-	-@erase "$(INTDIR)\ast_recursive.obj"
-	-@erase "$(INTDIR)\ast_redef.obj"
-	-@erase "$(INTDIR)\ast_root.obj"
-	-@erase "$(INTDIR)\ast_sequence.obj"
-	-@erase "$(INTDIR)\ast_string.obj"
-	-@erase "$(INTDIR)\ast_structure.obj"
-	-@erase "$(INTDIR)\ast_type.obj"
-	-@erase "$(INTDIR)\ast_typedef.obj"
-	-@erase "$(INTDIR)\ast_union.obj"
-	-@erase "$(INTDIR)\ast_union_branch.obj"
-	-@erase "$(INTDIR)\ast_union_label.obj"
-	-@erase "$(INTDIR)\be_args.obj"
-	-@erase "$(INTDIR)\be_argument.obj"
-	-@erase "$(INTDIR)\be_array.obj"
-	-@erase "$(INTDIR)\be_attribute.obj"
-	-@erase "$(INTDIR)\be_codegen.obj"
-	-@erase "$(INTDIR)\be_constant.obj"
-	-@erase "$(INTDIR)\be_decl.obj"
-	-@erase "$(INTDIR)\be_enum.obj"
-	-@erase "$(INTDIR)\be_enum_val.obj"
-	-@erase "$(INTDIR)\be_exception.obj"
-	-@erase "$(INTDIR)\be_expression.obj"
-	-@erase "$(INTDIR)\be_factory.obj"
-	-@erase "$(INTDIR)\be_field.obj"
-	-@erase "$(INTDIR)\be_generator.obj"
-	-@erase "$(INTDIR)\be_helper.obj"
-	-@erase "$(INTDIR)\be_init.obj"
-	-@erase "$(INTDIR)\be_interface.obj"
-	-@erase "$(INTDIR)\be_interface_fwd.obj"
-	-@erase "$(INTDIR)\be_interpretive.obj"
-	-@erase "$(INTDIR)\be_module.obj"
-	-@erase "$(INTDIR)\be_native.obj"
-	-@erase "$(INTDIR)\be_operation.obj"
-	-@erase "$(INTDIR)\be_predefined_type.obj"
-	-@erase "$(INTDIR)\be_produce.obj"
-	-@erase "$(INTDIR)\be_root.obj"
-	-@erase "$(INTDIR)\be_scope.obj"
-	-@erase "$(INTDIR)\be_sequence.obj"
-	-@erase "$(INTDIR)\be_state.obj"
-	-@erase "$(INTDIR)\be_state_argument.obj"
-	-@erase "$(INTDIR)\be_state_array.obj"
-	-@erase "$(INTDIR)\be_state_attribute.obj"
-	-@erase "$(INTDIR)\be_state_exception.obj"
-	-@erase "$(INTDIR)\be_state_operation.obj"
-	-@erase "$(INTDIR)\be_state_sequence.obj"
-	-@erase "$(INTDIR)\be_state_structure.obj"
-	-@erase "$(INTDIR)\be_state_typedef.obj"
-	-@erase "$(INTDIR)\be_state_union.obj"
-	-@erase "$(INTDIR)\be_string.obj"
-	-@erase "$(INTDIR)\be_structure.obj"
-	-@erase "$(INTDIR)\be_sunsoft.obj"
-	-@erase "$(INTDIR)\be_type.obj"
-	-@erase "$(INTDIR)\be_typedef.obj"
-	-@erase "$(INTDIR)\be_union.obj"
-	-@erase "$(INTDIR)\be_union_branch.obj"
-	-@erase "$(INTDIR)\be_union_label.obj"
-	-@erase "$(INTDIR)\be_visitor.obj"
-	-@erase "$(INTDIR)\be_visitor_root.obj"
-	-@erase "$(INTDIR)\be_visitor_sequence.obj"
-	-@erase "$(INTDIR)\drv_args.obj"
-	-@erase "$(INTDIR)\drv_fork.obj"
-	-@erase "$(INTDIR)\drv_init.obj"
-	-@erase "$(INTDIR)\drv_link.obj"
-	-@erase "$(INTDIR)\drv_preproc.obj"
-	-@erase "$(INTDIR)\drv_private.obj"
-	-@erase "$(INTDIR)\fe_declarator.obj"
-	-@erase "$(INTDIR)\fe_extern.obj"
-	-@erase "$(INTDIR)\fe_init.obj"
-	-@erase "$(INTDIR)\fe_interface_header.obj"
-	-@erase "$(INTDIR)\fe_private.obj"
-	-@erase "$(INTDIR)\lex.yy.obj"
-	-@erase "$(INTDIR)\narrow.obj"
-	-@erase "$(INTDIR)\tao_idl.obj"
-	-@erase "$(INTDIR)\utl_decllist.obj"
-	-@erase "$(INTDIR)\utl_error.obj"
-	-@erase "$(INTDIR)\utl_exceptlist.obj"
-	-@erase "$(INTDIR)\utl_exprlist.obj"
-	-@erase "$(INTDIR)\utl_global.obj"
-	-@erase "$(INTDIR)\utl_identifier.obj"
-	-@erase "$(INTDIR)\utl_idlist.obj"
-	-@erase "$(INTDIR)\utl_indenter.obj"
-	-@erase "$(INTDIR)\utl_labellist.obj"
-	-@erase "$(INTDIR)\utl_list.obj"
-	-@erase "$(INTDIR)\utl_namelist.obj"
-	-@erase "$(INTDIR)\utl_scope.obj"
-	-@erase "$(INTDIR)\utl_stack.obj"
-	-@erase "$(INTDIR)\utl_string.obj"
-	-@erase "$(INTDIR)\utl_strlist.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(INTDIR)\y.tab.obj"
-	-@erase "$(OUTDIR)\tao_idl.exe"
-	-@erase "$(OUTDIR)\tao_idl.ilk"
-	-@erase "$(OUTDIR)\tao_idl.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I\
- "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D\
- IDL_CFE_VERSION=\"1.3.0\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /D\
- CPP_LOCATION="\"$(CPP_PATH)\\cl\"" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\tao_idl.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\tao_idl.pdb" /debug /machine:I386 /out:"$(OUTDIR)\tao_idl.exe"\
- /pdbtype:sept /libpath:"..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\ast_argument.obj" \
-	"$(INTDIR)\ast_array.obj" \
-	"$(INTDIR)\ast_attribute.obj" \
-	"$(INTDIR)\ast_check.obj" \
-	"$(INTDIR)\ast_concrete_type.obj" \
-	"$(INTDIR)\ast_constant.obj" \
-	"$(INTDIR)\ast_decl.obj" \
-	"$(INTDIR)\ast_enum.obj" \
-	"$(INTDIR)\ast_enum_val.obj" \
-	"$(INTDIR)\ast_exception.obj" \
-	"$(INTDIR)\ast_expression.obj" \
-	"$(INTDIR)\ast_field.obj" \
-	"$(INTDIR)\ast_generator.obj" \
-	"$(INTDIR)\ast_interface.obj" \
-	"$(INTDIR)\ast_interface_fwd.obj" \
-	"$(INTDIR)\ast_module.obj" \
-	"$(INTDIR)\ast_native.obj" \
-	"$(INTDIR)\ast_operation.obj" \
-	"$(INTDIR)\ast_predefined_type.obj" \
-	"$(INTDIR)\ast_recursive.obj" \
-	"$(INTDIR)\ast_redef.obj" \
-	"$(INTDIR)\ast_root.obj" \
-	"$(INTDIR)\ast_sequence.obj" \
-	"$(INTDIR)\ast_string.obj" \
-	"$(INTDIR)\ast_structure.obj" \
-	"$(INTDIR)\ast_type.obj" \
-	"$(INTDIR)\ast_typedef.obj" \
-	"$(INTDIR)\ast_union.obj" \
-	"$(INTDIR)\ast_union_branch.obj" \
-	"$(INTDIR)\ast_union_label.obj" \
-	"$(INTDIR)\be_args.obj" \
-	"$(INTDIR)\be_argument.obj" \
-	"$(INTDIR)\be_array.obj" \
-	"$(INTDIR)\be_attribute.obj" \
-	"$(INTDIR)\be_codegen.obj" \
-	"$(INTDIR)\be_constant.obj" \
-	"$(INTDIR)\be_decl.obj" \
-	"$(INTDIR)\be_enum.obj" \
-	"$(INTDIR)\be_enum_val.obj" \
-	"$(INTDIR)\be_exception.obj" \
-	"$(INTDIR)\be_expression.obj" \
-	"$(INTDIR)\be_factory.obj" \
-	"$(INTDIR)\be_field.obj" \
-	"$(INTDIR)\be_generator.obj" \
-	"$(INTDIR)\be_helper.obj" \
-	"$(INTDIR)\be_init.obj" \
-	"$(INTDIR)\be_interface.obj" \
-	"$(INTDIR)\be_interface_fwd.obj" \
-	"$(INTDIR)\be_interpretive.obj" \
-	"$(INTDIR)\be_module.obj" \
-	"$(INTDIR)\be_native.obj" \
-	"$(INTDIR)\be_operation.obj" \
-	"$(INTDIR)\be_predefined_type.obj" \
-	"$(INTDIR)\be_produce.obj" \
-	"$(INTDIR)\be_root.obj" \
-	"$(INTDIR)\be_scope.obj" \
-	"$(INTDIR)\be_sequence.obj" \
-	"$(INTDIR)\be_state.obj" \
-	"$(INTDIR)\be_state_argument.obj" \
-	"$(INTDIR)\be_state_array.obj" \
-	"$(INTDIR)\be_state_attribute.obj" \
-	"$(INTDIR)\be_state_exception.obj" \
-	"$(INTDIR)\be_state_operation.obj" \
-	"$(INTDIR)\be_state_sequence.obj" \
-	"$(INTDIR)\be_state_structure.obj" \
-	"$(INTDIR)\be_state_typedef.obj" \
-	"$(INTDIR)\be_state_union.obj" \
-	"$(INTDIR)\be_string.obj" \
-	"$(INTDIR)\be_structure.obj" \
-	"$(INTDIR)\be_sunsoft.obj" \
-	"$(INTDIR)\be_type.obj" \
-	"$(INTDIR)\be_typedef.obj" \
-	"$(INTDIR)\be_union.obj" \
-	"$(INTDIR)\be_union_branch.obj" \
-	"$(INTDIR)\be_union_label.obj" \
-	"$(INTDIR)\be_visitor.obj" \
-	"$(INTDIR)\be_visitor_root.obj" \
-	"$(INTDIR)\be_visitor_sequence.obj" \
-	"$(INTDIR)\drv_args.obj" \
-	"$(INTDIR)\drv_fork.obj" \
-	"$(INTDIR)\drv_init.obj" \
-	"$(INTDIR)\drv_link.obj" \
-	"$(INTDIR)\drv_preproc.obj" \
-	"$(INTDIR)\drv_private.obj" \
-	"$(INTDIR)\fe_declarator.obj" \
-	"$(INTDIR)\fe_extern.obj" \
-	"$(INTDIR)\fe_init.obj" \
-	"$(INTDIR)\fe_interface_header.obj" \
-	"$(INTDIR)\fe_private.obj" \
-	"$(INTDIR)\lex.yy.obj" \
-	"$(INTDIR)\narrow.obj" \
-	"$(INTDIR)\tao_idl.obj" \
-	"$(INTDIR)\utl_decllist.obj" \
-	"$(INTDIR)\utl_error.obj" \
-	"$(INTDIR)\utl_exceptlist.obj" \
-	"$(INTDIR)\utl_exprlist.obj" \
-	"$(INTDIR)\utl_global.obj" \
-	"$(INTDIR)\utl_identifier.obj" \
-	"$(INTDIR)\utl_idlist.obj" \
-	"$(INTDIR)\utl_indenter.obj" \
-	"$(INTDIR)\utl_labellist.obj" \
-	"$(INTDIR)\utl_list.obj" \
-	"$(INTDIR)\utl_namelist.obj" \
-	"$(INTDIR)\utl_scope.obj" \
-	"$(INTDIR)\utl_stack.obj" \
-	"$(INTDIR)\utl_string.obj" \
-	"$(INTDIR)\utl_strlist.obj" \
-	"$(INTDIR)\y.tab.obj"
-
-"$(OUTDIR)\tao_idl.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "tao_idl - Win32 Release" || "$(CFG)" ==\
- "tao_idl - Win32 Debug"
-SOURCE=.\ast\ast_argument.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_A=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_argument.obj" : $(SOURCE) $(DEP_CPP_AST_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_A=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_argument.obj" : $(SOURCE) $(DEP_CPP_AST_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_array.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_AR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_array.obj" : $(SOURCE) $(DEP_CPP_AST_AR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_AR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_array.obj" : $(SOURCE) $(DEP_CPP_AST_AR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_attribute.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_AT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_attribute.obj" : $(SOURCE) $(DEP_CPP_AST_AT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_AT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_attribute.obj" : $(SOURCE) $(DEP_CPP_AST_AT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_check.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_C=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_check.obj" : $(SOURCE) $(DEP_CPP_AST_C) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_C=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_check.obj" : $(SOURCE) $(DEP_CPP_AST_C) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_concrete_type.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_CO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_concrete_type.obj" : $(SOURCE) $(DEP_CPP_AST_CO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_CO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_concrete_type.obj" : $(SOURCE) $(DEP_CPP_AST_CO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_constant.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_CON=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_constant.obj" : $(SOURCE) $(DEP_CPP_AST_CON) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_CON=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_constant.obj" : $(SOURCE) $(DEP_CPP_AST_CON) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_decl.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_D=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_decl.obj" : $(SOURCE) $(DEP_CPP_AST_D) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_D=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_decl.obj" : $(SOURCE) $(DEP_CPP_AST_D) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_enum.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_E=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_enum.obj" : $(SOURCE) $(DEP_CPP_AST_E) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_E=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_enum.obj" : $(SOURCE) $(DEP_CPP_AST_E) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_enum_val.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_EN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_enum_val.obj" : $(SOURCE) $(DEP_CPP_AST_EN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_EN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_enum_val.obj" : $(SOURCE) $(DEP_CPP_AST_EN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_exception.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_exception.obj" : $(SOURCE) $(DEP_CPP_AST_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_exception.obj" : $(SOURCE) $(DEP_CPP_AST_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_expression.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_expression.obj" : $(SOURCE) $(DEP_CPP_AST_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_expression.obj" : $(SOURCE) $(DEP_CPP_AST_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_field.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_F=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_field.obj" : $(SOURCE) $(DEP_CPP_AST_F) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_F=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_field.obj" : $(SOURCE) $(DEP_CPP_AST_F) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_generator.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_G=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_generator.obj" : $(SOURCE) $(DEP_CPP_AST_G) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_G=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_generator.obj" : $(SOURCE) $(DEP_CPP_AST_G) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_interface.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_interface.obj" : $(SOURCE) $(DEP_CPP_AST_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_interface.obj" : $(SOURCE) $(DEP_CPP_AST_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_interface_fwd.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_AST_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_AST_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_module.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_M=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_module.obj" : $(SOURCE) $(DEP_CPP_AST_M) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_M=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_module.obj" : $(SOURCE) $(DEP_CPP_AST_M) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_native.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_N=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_native.obj" : $(SOURCE) $(DEP_CPP_AST_N) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_N=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_native.obj" : $(SOURCE) $(DEP_CPP_AST_N) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_operation.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_O=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_operation.obj" : $(SOURCE) $(DEP_CPP_AST_O) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_O=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_operation.obj" : $(SOURCE) $(DEP_CPP_AST_O) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_predefined_type.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_P=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_predefined_type.obj" : $(SOURCE) $(DEP_CPP_AST_P) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_P=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_predefined_type.obj" : $(SOURCE) $(DEP_CPP_AST_P) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_recursive.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_R=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_recursive.obj" : $(SOURCE) $(DEP_CPP_AST_R) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_R=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_recursive.obj" : $(SOURCE) $(DEP_CPP_AST_R) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_redef.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_RE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_redef.obj" : $(SOURCE) $(DEP_CPP_AST_RE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_RE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_redef.obj" : $(SOURCE) $(DEP_CPP_AST_RE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_root.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_RO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_root.obj" : $(SOURCE) $(DEP_CPP_AST_RO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_RO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_root.obj" : $(SOURCE) $(DEP_CPP_AST_RO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_sequence.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_sequence.obj" : $(SOURCE) $(DEP_CPP_AST_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_sequence.obj" : $(SOURCE) $(DEP_CPP_AST_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_string.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_string.obj" : $(SOURCE) $(DEP_CPP_AST_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_string.obj" : $(SOURCE) $(DEP_CPP_AST_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_structure.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_structure.obj" : $(SOURCE) $(DEP_CPP_AST_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_structure.obj" : $(SOURCE) $(DEP_CPP_AST_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_type.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_T=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_type.obj" : $(SOURCE) $(DEP_CPP_AST_T) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_T=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_type.obj" : $(SOURCE) $(DEP_CPP_AST_T) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_typedef.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_TY=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_typedef.obj" : $(SOURCE) $(DEP_CPP_AST_TY) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_TY=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_typedef.obj" : $(SOURCE) $(DEP_CPP_AST_TY) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_union.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_U=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_union.obj" : $(SOURCE) $(DEP_CPP_AST_U) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_U=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_union.obj" : $(SOURCE) $(DEP_CPP_AST_U) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_union_branch.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_UN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_union_branch.obj" : $(SOURCE) $(DEP_CPP_AST_UN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_UN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_union_branch.obj" : $(SOURCE) $(DEP_CPP_AST_UN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\ast\ast_union_label.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_AST_UNI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\ast_union_label.obj" : $(SOURCE) $(DEP_CPP_AST_UNI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_AST_UNI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\ast_union_label.obj" : $(SOURCE) $(DEP_CPP_AST_UNI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_args.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_AR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_args.obj" : $(SOURCE) $(DEP_CPP_BE_AR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_AR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_args.obj" : $(SOURCE) $(DEP_CPP_BE_AR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_argument.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_ARG=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_argument.obj" : $(SOURCE) $(DEP_CPP_BE_ARG) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_ARG=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_argument.obj" : $(SOURCE) $(DEP_CPP_BE_ARG) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_array.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_ARR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_array.obj" : $(SOURCE) $(DEP_CPP_BE_ARR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_ARR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_array.obj" : $(SOURCE) $(DEP_CPP_BE_ARR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_attribute.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_AT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_AT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_AT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_AT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_codegen.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_CO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_codegen.obj" : $(SOURCE) $(DEP_CPP_BE_CO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_CO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_codegen.obj" : $(SOURCE) $(DEP_CPP_BE_CO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_constant.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_CON=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_constant.obj" : $(SOURCE) $(DEP_CPP_BE_CON) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_CON=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_constant.obj" : $(SOURCE) $(DEP_CPP_BE_CON) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_decl.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_DE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_decl.obj" : $(SOURCE) $(DEP_CPP_BE_DE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_DE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_decl.obj" : $(SOURCE) $(DEP_CPP_BE_DE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_enum.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_EN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_enum.obj" : $(SOURCE) $(DEP_CPP_BE_EN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_EN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_enum.obj" : $(SOURCE) $(DEP_CPP_BE_EN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_enum_val.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_ENU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_enum_val.obj" : $(SOURCE) $(DEP_CPP_BE_ENU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_ENU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_enum_val.obj" : $(SOURCE) $(DEP_CPP_BE_ENU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_exception.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_exception.obj" : $(SOURCE) $(DEP_CPP_BE_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_exception.obj" : $(SOURCE) $(DEP_CPP_BE_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_expression.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_expression.obj" : $(SOURCE) $(DEP_CPP_BE_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_expression.obj" : $(SOURCE) $(DEP_CPP_BE_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_factory.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_FA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_sunsoft.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_factory.obj" : $(SOURCE) $(DEP_CPP_BE_FA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_FA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_sunsoft.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_factory.obj" : $(SOURCE) $(DEP_CPP_BE_FA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_field.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_FI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_field.obj" : $(SOURCE) $(DEP_CPP_BE_FI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_FI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_field.obj" : $(SOURCE) $(DEP_CPP_BE_FI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_generator.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_GE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_generator.obj" : $(SOURCE) $(DEP_CPP_BE_GE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_GE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_generator.obj" : $(SOURCE) $(DEP_CPP_BE_GE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_helper.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_HE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_helper.obj" : $(SOURCE) $(DEP_CPP_BE_HE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_HE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_helper.obj" : $(SOURCE) $(DEP_CPP_BE_HE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_init.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_init.obj" : $(SOURCE) $(DEP_CPP_BE_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_init.obj" : $(SOURCE) $(DEP_CPP_BE_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_interface.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_INT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_interface.obj" : $(SOURCE) $(DEP_CPP_BE_INT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_INT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_interface.obj" : $(SOURCE) $(DEP_CPP_BE_INT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_interface_fwd.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_INTE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_BE_INTE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_INTE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_BE_INTE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_interpretive.cpp
-DEP_CPP_BE_INTER=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_interpretive.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\be_include\be_visitor_root.h"\
-	".\be_include\be_visitor_sequence.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_interpretive.obj" : $(SOURCE) $(DEP_CPP_BE_INTER) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\be\be_module.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_MO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_module.obj" : $(SOURCE) $(DEP_CPP_BE_MO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_MO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_module.obj" : $(SOURCE) $(DEP_CPP_BE_MO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_native.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_NA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_native.obj" : $(SOURCE) $(DEP_CPP_BE_NA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_NA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_native.obj" : $(SOURCE) $(DEP_CPP_BE_NA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_operation.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_OP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_operation.obj" : $(SOURCE) $(DEP_CPP_BE_OP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_OP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_operation.obj" : $(SOURCE) $(DEP_CPP_BE_OP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_predefined_type.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_predefined_type.obj" : $(SOURCE) $(DEP_CPP_BE_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_predefined_type.obj" : $(SOURCE) $(DEP_CPP_BE_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_produce.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_PRO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_interpretive.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_produce.obj" : $(SOURCE) $(DEP_CPP_BE_PRO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_PRO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_produce.obj" : $(SOURCE) $(DEP_CPP_BE_PRO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_root.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_RO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_root.obj" : $(SOURCE) $(DEP_CPP_BE_RO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_RO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_root.obj" : $(SOURCE) $(DEP_CPP_BE_RO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_scope.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_SC=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_scope.obj" : $(SOURCE) $(DEP_CPP_BE_SC) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_SC=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_scope.obj" : $(SOURCE) $(DEP_CPP_BE_SC) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_sequence.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_SE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\be_include\be_visitor_sequence.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_SE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_SE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_SE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state.obj" : $(SOURCE) $(DEP_CPP_BE_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state.obj" : $(SOURCE) $(DEP_CPP_BE_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_argument.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_argument.obj" : $(SOURCE) $(DEP_CPP_BE_STA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STA=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_argument.obj" : $(SOURCE) $(DEP_CPP_BE_STA) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_array.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STAT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_array.obj" : $(SOURCE) $(DEP_CPP_BE_STAT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STAT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_array.obj" : $(SOURCE) $(DEP_CPP_BE_STAT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_attribute.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_STATE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_STATE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_exception.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_exception.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_exception.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_operation.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_O=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_operation.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_O)\
- "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_O=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_operation.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_O)\
- "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_sequence.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_structure.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_ST)\
- "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_ST)\
- "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_typedef.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_T=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_T) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_T=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_T) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_state_union.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STATE_U=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_state_union.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_U) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STATE_U=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_state_union.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_U) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_string.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_string.obj" : $(SOURCE) $(DEP_CPP_BE_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_string.obj" : $(SOURCE) $(DEP_CPP_BE_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_structure.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_STRU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STRU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_STRU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STRU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_sunsoft.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_SU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_sunsoft.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_sunsoft.obj" : $(SOURCE) $(DEP_CPP_BE_SU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_SU=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_sunsoft.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_sunsoft.obj" : $(SOURCE) $(DEP_CPP_BE_SU) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_type.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_TY=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_type.obj" : $(SOURCE) $(DEP_CPP_BE_TY) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_TY=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_type.obj" : $(SOURCE) $(DEP_CPP_BE_TY) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_typedef.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_TYP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_TYP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_TYP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_TYP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_union.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_UN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_union.obj" : $(SOURCE) $(DEP_CPP_BE_UN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_UN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_union.obj" : $(SOURCE) $(DEP_CPP_BE_UN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_union_branch.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_UNI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_union_branch.obj" : $(SOURCE) $(DEP_CPP_BE_UNI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_UNI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_union_branch.obj" : $(SOURCE) $(DEP_CPP_BE_UNI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_union_label.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_BE_UNIO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_union_label.obj" : $(SOURCE) $(DEP_CPP_BE_UNIO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_BE_UNIO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\be_union_label.obj" : $(SOURCE) $(DEP_CPP_BE_UNIO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\be\be_visitor.cpp
-DEP_CPP_BE_VI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_visitor.obj" : $(SOURCE) $(DEP_CPP_BE_VI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\be\be_visitor_root.cpp
-DEP_CPP_BE_VIS=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\be_include\be_visitor_root.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_visitor_root.obj" : $(SOURCE) $(DEP_CPP_BE_VIS) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\be\be_visitor_sequence.cpp
-DEP_CPP_BE_VISI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\be_include\be.h"\
-	".\be_include\be_argument.h"\
-	".\be_include\be_array.h"\
-	".\be_include\be_attribute.h"\
-	".\be_include\be_codegen.h"\
-	".\be_include\be_constant.h"\
-	".\be_include\be_decl.h"\
-	".\be_include\be_enum.h"\
-	".\be_include\be_enum_val.h"\
-	".\be_include\be_exception.h"\
-	".\be_include\be_expression.h"\
-	".\be_include\be_factory.h"\
-	".\be_include\be_field.h"\
-	".\be_include\be_generator.h"\
-	".\be_include\be_helper.h"\
-	".\be_include\be_interface.h"\
-	".\be_include\be_interface_fwd.h"\
-	".\be_include\be_module.h"\
-	".\be_include\be_native.h"\
-	".\be_include\be_operation.h"\
-	".\be_include\be_predefined_type.h"\
-	".\be_include\be_root.h"\
-	".\be_include\be_scope.h"\
-	".\be_include\be_sequence.h"\
-	".\be_include\be_state.h"\
-	".\be_include\be_string.h"\
-	".\be_include\be_structure.h"\
-	".\be_include\be_type.h"\
-	".\be_include\be_typedef.h"\
-	".\be_include\be_union.h"\
-	".\be_include\be_union_branch.h"\
-	".\be_include\be_union_label.h"\
-	".\be_include\be_visitor.h"\
-	".\be_include\be_visitor_sequence.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\be_visitor_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_VISI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\driver\drv_args.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_A=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_args.obj" : $(SOURCE) $(DEP_CPP_DRV_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_A=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_args.obj" : $(SOURCE) $(DEP_CPP_DRV_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\driver\drv_fork.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_F=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Process.h"\
-	"..\..\ace\Process.i"\
-	"..\..\ace\Process_Manager.h"\
-	"..\..\ace\Process_Manager.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_fork.obj" : $(SOURCE) $(DEP_CPP_DRV_F) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_F=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Process_Manager.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_fork.obj" : $(SOURCE) $(DEP_CPP_DRV_F) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\driver\drv_init.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_init.obj" : $(SOURCE) $(DEP_CPP_DRV_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_init.obj" : $(SOURCE) $(DEP_CPP_DRV_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\driver\drv_link.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_L=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_link.obj" : $(SOURCE) $(DEP_CPP_DRV_L) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_L=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_link.obj" : $(SOURCE) $(DEP_CPP_DRV_L) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\driver\drv_preproc.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_P=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Process.h"\
-	"..\..\ace\Process.i"\
-	"..\..\ace\Process_Manager.h"\
-	"..\..\ace\Process_Manager.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_preproc.obj" : $(SOURCE) $(DEP_CPP_DRV_P) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_P=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Process_Manager.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_preproc.obj" : $(SOURCE) $(DEP_CPP_DRV_P) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\driver\drv_private.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_DRV_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\drv_private.obj" : $(SOURCE) $(DEP_CPP_DRV_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_DRV_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\drv_private.obj" : $(SOURCE) $(DEP_CPP_DRV_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\fe_declarator.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_FE_DE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\fe_declarator.obj" : $(SOURCE) $(DEP_CPP_FE_DE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_FE_DE=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\fe_declarator.obj" : $(SOURCE) $(DEP_CPP_FE_DE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\fe_extern.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_FE_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\fe_extern.obj" : $(SOURCE) $(DEP_CPP_FE_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_FE_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\fe_extern.obj" : $(SOURCE) $(DEP_CPP_FE_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\fe_init.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_FE_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\fe_init.obj" : $(SOURCE) $(DEP_CPP_FE_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_FE_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\fe_init.obj" : $(SOURCE) $(DEP_CPP_FE_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\fe_interface_header.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_FE_INT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\fe_interface_header.obj" : $(SOURCE) $(DEP_CPP_FE_INT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_FE_INT=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\fe_interface_header.obj" : $(SOURCE) $(DEP_CPP_FE_INT) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\fe_private.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_FE_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\fe_private.obj" : $(SOURCE) $(DEP_CPP_FE_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_FE_PR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\fe_private.obj" : $(SOURCE) $(DEP_CPP_FE_PR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\lex.yy.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_LEX_Y=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\fe\y.tab.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\lex.yy.obj" : $(SOURCE) $(DEP_CPP_LEX_Y) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_LEX_Y=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\fe\y.tab.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\lex.yy.obj" : $(SOURCE) $(DEP_CPP_LEX_Y) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\narrow\narrow.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_NARRO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\narrow.obj" : $(SOURCE) $(DEP_CPP_NARRO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_NARRO=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\narrow.obj" : $(SOURCE) $(DEP_CPP_NARRO) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\tao_idl.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_TAO_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\tao_idl.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_TAO_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\drv_link.h"\
-	".\include\drv_private.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\tao_idl.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_decllist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_D=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_decllist.obj" : $(SOURCE) $(DEP_CPP_UTL_D) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_D=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_decllist.obj" : $(SOURCE) $(DEP_CPP_UTL_D) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_error.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_E=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_error.obj" : $(SOURCE) $(DEP_CPP_UTL_E) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_E=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_error.obj" : $(SOURCE) $(DEP_CPP_UTL_E) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_exceptlist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_exceptlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_EX=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_exceptlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EX) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_exprlist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_exprlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_EXP=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_exprlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EXP) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_global.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_G=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_global.obj" : $(SOURCE) $(DEP_CPP_UTL_G) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_G=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_global.obj" : $(SOURCE) $(DEP_CPP_UTL_G) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_identifier.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_identifier.obj" : $(SOURCE) $(DEP_CPP_UTL_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_I=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_identifier.obj" : $(SOURCE) $(DEP_CPP_UTL_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_idlist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_ID=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_idlist.obj" : $(SOURCE) $(DEP_CPP_UTL_ID) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_ID=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_idlist.obj" : $(SOURCE) $(DEP_CPP_UTL_ID) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_indenter.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_indenter.obj" : $(SOURCE) $(DEP_CPP_UTL_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_IN=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_indenter.obj" : $(SOURCE) $(DEP_CPP_UTL_IN) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_labellist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_L=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_labellist.obj" : $(SOURCE) $(DEP_CPP_UTL_L) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_L=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_labellist.obj" : $(SOURCE) $(DEP_CPP_UTL_L) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_list.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_LI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_list.obj" : $(SOURCE) $(DEP_CPP_UTL_LI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_LI=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_list.obj" : $(SOURCE) $(DEP_CPP_UTL_LI) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_namelist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_N=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_namelist.obj" : $(SOURCE) $(DEP_CPP_UTL_N) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_N=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_namelist.obj" : $(SOURCE) $(DEP_CPP_UTL_N) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_scope.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_scope.obj" : $(SOURCE) $(DEP_CPP_UTL_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_S=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_scope.obj" : $(SOURCE) $(DEP_CPP_UTL_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_stack.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_stack.obj" : $(SOURCE) $(DEP_CPP_UTL_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_ST=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_stack.obj" : $(SOURCE) $(DEP_CPP_UTL_ST) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_string.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_string.obj" : $(SOURCE) $(DEP_CPP_UTL_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_STR=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_string.obj" : $(SOURCE) $(DEP_CPP_UTL_STR) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\util\utl_strlist.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_UTL_STRL=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\utl_strlist.obj" : $(SOURCE) $(DEP_CPP_UTL_STRL) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_UTL_STRL=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_extern.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\utl_strlist.obj" : $(SOURCE) $(DEP_CPP_UTL_STRL) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\fe\y.tab.cpp
-
-!IF  "$(CFG)" == "tao_idl - Win32 Release"
-
-DEP_CPP_Y_TAB=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\ws2tcpip.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\y.tab.obj" : $(SOURCE) $(DEP_CPP_Y_TAB) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"
-
-DEP_CPP_Y_TAB=\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	".\include\ast.h"\
-	".\include\ast_argument.h"\
-	".\include\ast_array.h"\
-	".\include\ast_attribute.h"\
-	".\include\ast_concrete_type.h"\
-	".\include\ast_constant.h"\
-	".\include\ast_decl.h"\
-	".\include\ast_enum.h"\
-	".\include\ast_enum_val.h"\
-	".\include\ast_exception.h"\
-	".\include\ast_expression.h"\
-	".\include\ast_extern.h"\
-	".\include\ast_field.h"\
-	".\include\ast_generator.h"\
-	".\include\ast_interface.h"\
-	".\include\ast_interface_fwd.h"\
-	".\include\ast_module.h"\
-	".\include\ast_native.h"\
-	".\include\ast_operation.h"\
-	".\include\ast_predefined_type.h"\
-	".\include\ast_root.h"\
-	".\include\ast_sequence.h"\
-	".\include\ast_string.h"\
-	".\include\ast_structure.h"\
-	".\include\ast_type.h"\
-	".\include\ast_typedef.h"\
-	".\include\ast_union.h"\
-	".\include\ast_union_branch.h"\
-	".\include\ast_union_label.h"\
-	".\include\be_extern.h"\
-	".\include\drv_extern.h"\
-	".\include\fe_declarator.h"\
-	".\include\fe_extern.h"\
-	".\include\fe_interface_header.h"\
-	".\include\fe_private.h"\
-	".\include\global_extern.h"\
-	".\include\idl.h"\
-	".\include\idl_bool.h"\
-	".\include\idl_defines.h"\
-	".\include\idl_extern.h"\
-	".\include\idl_fwd.h"\
-	".\include\idl_global.h"\
-	".\include\idl_narrow.h"\
-	".\include\intlmacros.h"\
-	".\include\nr_extern.h"\
-	".\include\util.h"\
-	".\include\utl_decllist.h"\
-	".\include\utl_error.h"\
-	".\include\utl_exceptlist.h"\
-	".\include\utl_exprlist.h"\
-	".\include\utl_identifier.h"\
-	".\include\utl_idlist.h"\
-	".\include\utl_indenter.h"\
-	".\include\utl_labellist.h"\
-	".\include\utl_list.h"\
-	".\include\utl_namelist.h"\
-	".\include\utl_scope.h"\
-	".\include\utl_scoped_name.h"\
-	".\include\utl_stack.h"\
-	".\include\utl_string.h"\
-	".\include\utl_strlist.h"\
-	
-
-"$(INTDIR)\y.tab.obj" : $(SOURCE) $(DEP_CPP_Y_TAB) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
deleted file mode 100644
index 9cd81643878..00000000000
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
-** drv_main.cc - Main program for IDL compiler driver
-**
-** LOGIC:
-**
-** 1. Initialize compiler driver
-** 2. Parse command line args
-** 3. If more than one file to parse, fork
-** 4. Otherwise, for the single file, invoke DRV_drive
-*/
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-static void
-DRV_version()
-{
-  cerr << idl_global->prog_name() 
-       << GTDEVEL(", version ")
-       << IDL_CFE_VERSION 
-       << "\n";
-  (*DRV_BE_version)();
-}
-
-/*
-** Drive the compilation
-**
-** LOGIC:
-**
-** 1. Initialize the CFE, stage 1. This builds the scope stack
-** 2. Initialize the BE. This builds an instance of the generator
-** 3. Initialize the CFE, stage 2. This builds the global scope
-**    and populates it with the predefined types
-** 4. Invoke FE_yyparse
-** 5. Check for errors from FE_yyparse. If any, exit now
-** 6. Check for undefined forward declared interfaces. If any, exit now
-** 7. Check if asked to dump AST. If so, do.
-** 8. Invoke BE.
-*/
-void
-DRV_drive(char *s)
-{
-  char	*fn;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (fn);
-
-  // set the name of the IDL file we are parsing. This is useful to the backend
-  // when it generates C++ headers and files
-  idl_global->idl_src_file(new UTL_String(s));
-  /*
-   * Pass through CPP
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": preprocessing ")
-	 << s
-	 << "\n";
-  DRV_pre_proc(s);
-  /*
-   * Initialize FE stage 1
-   */
-  (*DRV_FE_init_stage1)();
-  /*
-   * Initialize BE
-   */
-  idl_global->set_gen((*DRV_BE_init)());
-  /*
-   * Initialize FE stage 2
-   */
-  (*DRV_FE_init_stage2)();
-  /*
-   * Parse
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": parsing ")
-	 << s
-	 << "\n";
-  (*DRV_FE_yyparse)();
-  /*
-   * If there were any errors, stop
-   */
-  if (idl_global->err_count() > 0) {
-    cerr << idl_global->prog_name()
-	 << ": "
-	 << s 
-	 << GTDEVEL(": found ");
-    cerr << idl_global->err_count()
-	 << GTDEVEL(" error");
-    cerr << (idl_global->err_count() > 1
-	    ? GTDEVEL("s") : "")
-    	 << "\n";
-    /*
-     * Call BE_abort to allow a BE to clean up after itself
-     */
-    (*DRV_BE_abort)();
-    exit((int) idl_global->err_count());
-  }
-  /*
-   * Dump the code
-   */
-  if ((idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-      && (idl_global->compile_flags() & IDL_CF_DUMP_AST))
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": dump ")
-	 << s
-	 << "\n";
-  if (idl_global->compile_flags() & IDL_CF_DUMP_AST) {
-    cerr << GTDEVEL("Dump of AST:\n");
-    idl_global->root()->dump(cerr);
-  }
-  /*
-   * Call the main entry point for the BE
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": BE processing on ")
-	 << s
-	 << "\n";
-  (*DRV_BE_produce)();
-  /*
-   * Exit cleanly
-   */
-  exit(0);
-}
-
-/*
- * IDL compiler main program. Logic as explained in comment at head
- * of file.
- */
-int
-main(int argc, char **argv)
-{
-  /*
-   * Open front-end library
-   */
-  DRV_FE_open();
-  /*
-   * Initialize driver and global variables
-   */
-  DRV_init();
-  /*
-   * Open back-end library
-   */
-  DRV_BE_open();
-  /*
-   * Parse arguments
-   */
-  DRV_parse_args(argc, argv);
-  /*
-   * If a version message is requested, print it and exit
-   */
-  if (idl_global->compile_flags() & IDL_CF_VERSION) {
-    DRV_version();
-    exit(0);
-  }
-  /*
-   * If a usage message is requested, give it and exit
-   */
-  if (idl_global->compile_flags() & IDL_CF_ONLY_USAGE) {
-    DRV_usage();
-    exit(0);
-  }
-  /*
-   * Fork off a process for each file to process. Fork only if
-   * there is more than one file to process
-   */
-  if (DRV_nfiles > 1) {
-    /*
-     * DRV_fork never returns
-     */
-    DRV_fork();
-  } else {
-    /*
-     * Do the one file we have to parse
-     *
-     * Check if stdin and handle file name appropriately
-     */
-    if (DRV_nfiles == 0) {
-      DRV_files[0] = "standard input";
-    }
-    DRV_file_index = 0;
-    DRV_drive(DRV_files[DRV_file_index]);
-  }
-  exit(0);
-  /* NOTREACHED */
-  return 0;
-}
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
deleted file mode 100644
index e84168a38b6..00000000000
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ /dev/null
@@ -1,1067 +0,0 @@
-# Microsoft Developer Studio Project File - Name="tao_idl" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=tao_idl - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "tao_idl.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "tao_idl.mak" CFG="tao_idl - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "tao_idl - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "tao_idl - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "tao_idl - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"$(CPP_PATH)\\cl\"" /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"

-

-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"$(CPP_PATH)\\cl\"" /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "tao_idl - Win32 Release"

-# Name "tao_idl - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\ast\ast_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_check.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_concrete_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_constant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_decl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_enum.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_enum_val.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_expression.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_field.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_interface.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_interface_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_native.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_predefined_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_recursive.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_redef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_root.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union_branch.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union_label.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_args.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_codegen.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_constant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_decl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_enum.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_enum_val.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_expression.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_field.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_helper.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_interface.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_interface_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_interpretive.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_native.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_predefined_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_produce.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_root.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_scope.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_sunsoft.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union_branch.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union_label.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_args.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_constant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_context.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_decl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_enum.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_field.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_interface.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_interface_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_root.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_scope.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_union_branch.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_args.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_fork.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_link.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_preproc.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_private.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_declarator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_extern.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_interface_header.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_private.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\lex.yy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\narrow\narrow.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\tao_idl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_decllist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_error.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_exceptlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_exprlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_global.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_identifier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_idlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_indenter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_labellist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_list.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_namelist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_scope.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_stack.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_strlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\y.tab.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\include\ast.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_argument.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_array.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_attribute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_concrete_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_constant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_decl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_enum.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_enum_val.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_expression.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_field.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_interface.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_interface_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_native.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_operation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_predefined_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_root.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_structure.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_typedef.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union_branch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union_label.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_argument.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_array.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_attribute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_codegen.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_constant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_decl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_enum.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_enum_val.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_expression.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\be_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_field.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_helper.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_interface.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_interface_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_interpretive.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_native.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_operation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_predefined_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_root.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_scope.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_state.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_structure.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_sunsoft.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_typedef.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union_branch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union_label.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_args.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_attribute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_constant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_decl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_enum.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_field.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_interface.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_interface_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_operation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_root.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_scope.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_structure.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_typedef.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_union.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_union_branch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_link.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_private.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_declarator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_interface_header.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_private.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\global_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_bool.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_defines.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_global.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_narrow.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\intlmacros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\nr_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\util.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_decllist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_error.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_exceptlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_exprlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_identifier.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_idlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_indenter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_labellist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_list.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_namelist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_scope.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_scoped_name.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_stack.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_strlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\y.tab.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/TAO_IDL/tao_idl.dsw b/TAO/TAO_IDL/tao_idl.dsw
deleted file mode 100644
index 6951f0b2106..00000000000
--- a/TAO/TAO_IDL/tao_idl.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "tao_idl"=.\tao_idl.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/TAO_IDL/util/Makefile b/TAO/TAO_IDL/util/Makefile
deleted file mode 100644
index f4db89f026a..00000000000
--- a/TAO/TAO_IDL/util/Makefile
+++ /dev/null
@@ -1,719 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libutil
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libtao_idl_util
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-
-UTIL_FILES	= \
-		utl_scope \
-		utl_stack \
-		utl_string \
-		utl_decllist \
-		utl_labellist \
-		utl_namelist \
-		utl_exceptlist \
-		utl_strlist \
-		utl_list \
-		utl_exprlist \
-		utl_error \
-		utl_indenter \
-		utl_identifier \
-		utl_idlist \
-		utl_global
-
-FILES	 = $(UTIL_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-$(LOBJS): $(LHDRS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/utl_scope.o .obj/utl_scope.so .shobj/utl_scope.o .shobj/utl_scope.so: utl_scope.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_stack.o .obj/utl_stack.so .shobj/utl_stack.o .shobj/utl_stack.so: utl_stack.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_string.o .obj/utl_string.so .shobj/utl_string.o .shobj/utl_string.so: utl_string.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_decllist.o .obj/utl_decllist.so .shobj/utl_decllist.o .shobj/utl_decllist.so: utl_decllist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_labellist.o .obj/utl_labellist.so .shobj/utl_labellist.o .shobj/utl_labellist.so: utl_labellist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_namelist.o .obj/utl_namelist.so .shobj/utl_namelist.o .shobj/utl_namelist.so: utl_namelist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_exceptlist.o .obj/utl_exceptlist.so .shobj/utl_exceptlist.o .shobj/utl_exceptlist.so: utl_exceptlist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_strlist.o .obj/utl_strlist.so .shobj/utl_strlist.o .shobj/utl_strlist.so: utl_strlist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_list.o .obj/utl_list.so .shobj/utl_list.o .shobj/utl_list.so: utl_list.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_exprlist.o .obj/utl_exprlist.so .shobj/utl_exprlist.o .shobj/utl_exprlist.so: utl_exprlist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_error.o .obj/utl_error.so .shobj/utl_error.o .shobj/utl_error.so: utl_error.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_indenter.o .obj/utl_indenter.so .shobj/utl_indenter.o .shobj/utl_indenter.so: utl_indenter.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_identifier.o .obj/utl_identifier.so .shobj/utl_identifier.o .shobj/utl_identifier.so: utl_identifier.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_idlist.o .obj/utl_idlist.so .shobj/utl_idlist.o .shobj/utl_idlist.so: utl_idlist.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-.obj/utl_global.o .obj/utl_global.so .shobj/utl_global.o .shobj/utl_global.so: utl_global.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/ast_native.h ../include/utl_strlist.h \
- ../include/utl_exprlist.h ../include/ast_generator.h \
- ../include/util.h ../include/utl_stack.h ../include/utl_idlist.h \
- ../include/utl_exceptlist.h ../include/utl_namelist.h \
- ../include/utl_labellist.h ../include/utl_decllist.h \
- ../include/idl_global.h ../include/utl_error.h \
- ../include/utl_indenter.h ../include/idl_extern.h \
- ../include/fe_extern.h ../include/be_extern.h ../include/drv_extern.h \
- ../include/ast_extern.h ../include/nr_extern.h \
- ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
deleted file mode 100644
index c5127550b57..00000000000
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_decllist.cc
-//
-// Implementation of a list of declarators
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_DeclList::UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr)
-	    : UTL_List(cdr),
-	      pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-FE_Declarator *
-UTL_DeclList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_DeclList active iterator
-
-/*
- * Constructor
- */
-
-UTL_DecllistActiveIterator::UTL_DecllistActiveIterator(UTL_DeclList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-FE_Declarator *
-UTL_DecllistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-
-  return ((UTL_DeclList *) source)->head();
-}
-
-/*
- * Redefined inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
deleted file mode 100644
index bbc38947132..00000000000
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Helper functions to do:
- *
- * - Convert an error code to an error string
- * - Print out an error message header
- * - Convert an ExprType to a string
- */
-
-// Convert an error code into a char *
-static char *
-error_string(UTL_Error::ErrorCode c)
-{
-  switch (c) {
-  case UTL_Error::EIDL_OK:
-    return GTDEVEL("all is fine ");
-  case UTL_Error::EIDL_SYNTAX_ERROR:
-    return "";
-  case UTL_Error::EIDL_REDEF:
-    return GTDEVEL("illegal redefinition ");
-  case UTL_Error::EIDL_DEF_USE:
-    return GTDEVEL("redefinition after use, ");
-  case UTL_Error::EIDL_MULTIPLE_BRANCH:
-    return GTDEVEL("union with duplicate branch label ");
-  case UTL_Error::EIDL_COERCION_FAILURE:
-    return GTDEVEL("coercion failure ");
-  case UTL_Error::EIDL_SCOPE_CONFLICT:
-    return GTDEVEL("definition scope is different than fwd declare scope, ");
-  case UTL_Error::EIDL_ONEWAY_CONFLICT:
-    return GTDEVEL("oneway operation with OUT or INOUT parameters, ");
-  case UTL_Error::EIDL_DISC_TYPE:
-    return GTDEVEL("union with illegal discriminator type, ");
-  case UTL_Error::EIDL_LABEL_TYPE:
-    return GTDEVEL("label type incompatible with union discriminator type, ");
-  case UTL_Error::EIDL_ILLEGAL_ADD:
-    return GTDEVEL("illegal add operation, ");
-  case UTL_Error::EIDL_ILLEGAL_USE:
-    return GTDEVEL("illegal type used in expression, ");
-  case UTL_Error::EIDL_ILLEGAL_RAISES:
-    return GTDEVEL("error in raises(..) clause, ");
-  case UTL_Error::EIDL_ILLEGAL_CONTEXT:
-    return GTDEVEL("error in context(..) clause, ");
-  case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
-  case UTL_Error::EIDL_LOOKUP_ERROR:
-    return GTDEVEL("error in lookup of symbol: ");
-  case UTL_Error::EIDL_INHERIT_FWD_ERROR:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_CONSTANT_EXPECTED:
-    return GTDEVEL("constant expected: ");
-  case UTL_Error::EIDL_EVAL_ERROR:
-    return GTDEVEL("expression evaluation error: ");
-  case UTL_Error::EIDL_NAME_CASE_ERROR:
-    return GTDEVEL("identifier used with two differing spellings: ");
-  case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
-    return GTDEVEL("enumerator expected: ");
-  case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND:
-    return GTDEVEL("enumerator by this name not defined: ");
-  case UTL_Error::EIDL_AMBIGUOUS:
-    return GTDEVEL("ambiguous definition: ");
-  case UTL_Error::EIDL_DECL_NOT_DEFINED:
-    return GTDEVEL("forward declared but never defined: ");
-  case UTL_Error::EIDL_FWD_DECL_LOOKUP:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_RECURSIVE_TYPE:
-    return GTDEVEL("illegal recursive use of type: ");
-  case UTL_Error::EIDL_NONVOID_ONEWAY:
-    return GTDEVEL("non-void return type in oneway operation: ");
-  case UTL_Error::EIDL_REDEF_SCOPE:
-    return GTDEVEL("redefinition inside defining scope: ");
-  case UTL_Error::EIDL_NOT_A_TYPE:
-    return GTDEVEL("specified symbol is not a type: ");
-  case UTL_Error::EIDL_BACK_END:
-    return GTDEVEL("back end: ");
-  }
-  return NULL;
-}
-
-// Print out an error message header on cerr
-static void
-idl_error_header(UTL_Error::ErrorCode c, long lineno, String *s)
-{
-  cerr << idl_global->prog_name()
-       << ": \""
-       << (idl_global->read_from_stdin() ? "standard input" : s->get_string())
-       << GTDEVEL("\", line ")
-       << ((lineno == -1) ? idl_global->lineno() : lineno)
-       << ": "
-       << error_string(c);
-}
-
-// Convert the type of an AST_Expression to a char *
-static char *
-exprtype_to_string(AST_Expression::ExprType t)
-{
-  switch (t) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Convert a parse state into a possible error message
- */
-static char *
-parse_state_to_error_message(IDL_GlobalData::ParseState ps)
-{
-  switch (ps) {
-  case IDL_GlobalData::PS_NoState:
-    return GTDEVEL("Statement can not be parsed");
-  case IDL_GlobalData::PS_TypeDeclSeen:
-    return GTDEVEL("Malformed typedef declaration");
-  case IDL_GlobalData::PS_ConstDeclSeen:
-    return GTDEVEL("Malformed const declaration");
-  case IDL_GlobalData::PS_ExceptDeclSeen:
-    return
-      GTDEVEL("Malformed exception declaration");
-  case IDL_GlobalData::PS_InterfaceDeclSeen:
-    return
-      GTDEVEL("Malformed interface declaration");
-  case IDL_GlobalData::PS_ModuleDeclSeen:
-    return GTDEVEL("Malformed module declaration");
-  case IDL_GlobalData::PS_AttrDeclSeen:
-    return
-      GTDEVEL("Malformed attribute declaration");
-  case IDL_GlobalData::PS_OpDeclSeen:
-    return
-      GTDEVEL("Malformed operation declaration");
-  case IDL_GlobalData::PS_ModuleSeen:
-    return GTDEVEL("Missing module identifier following MODULE keyword");
-  case IDL_GlobalData::PS_ModuleIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following module identifier");
-  case IDL_GlobalData::PS_ModuleSqSeen:
-    return GTDEVEL("Illegal syntax following module '{' opener");
-  case IDL_GlobalData::PS_ModuleQsSeen:
-    return GTDEVEL("Illegal syntax following module '}' closer");
-  case IDL_GlobalData::PS_ModuleBodySeen:
-    return GTDEVEL("Illegal syntax following module body statement(s)");
-  case IDL_GlobalData::PS_InterfaceSeen:
-    return GTDEVEL("Missing interface identifier following INTERFACE keyword");
-  case IDL_GlobalData::PS_InterfaceIDSeen:
-    return GTDEVEL("Illegal syntax following interface identifier");
-  case IDL_GlobalData::PS_InheritSpecSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following inheritance spec");
-  case IDL_GlobalData::PS_ForwardDeclSeen:
-    return GTDEVEL("Missing ';' following forward interface declaration");
-  case IDL_GlobalData::PS_InterfaceSqSeen:
-    return GTDEVEL("Illegal syntax following interface '{' opener");
-  case IDL_GlobalData::PS_InterfaceQsSeen:
-    return GTDEVEL("Illegal syntax following interface '}' closer");
-  case IDL_GlobalData::PS_InterfaceBodySeen:
-    return GTDEVEL("Illegal syntax following interface body statement(s)");
-  case IDL_GlobalData::PS_InheritColonSeen:
-    return GTDEVEL("Illegal syntax following ':' starting inheritance list");
-  case IDL_GlobalData::PS_SNListCommaSeen:
-    return GTDEVEL("Found illegal scoped name in scoped name list");
-  case IDL_GlobalData::PS_ScopedNameSeen:
-    return GTDEVEL("Missing ',' following scoped name in scoped name list");
-  case IDL_GlobalData::PS_SN_IDSeen:
-    return GTDEVEL("Illegal component in scoped name");
-  case IDL_GlobalData::PS_ScopeDelimSeen:
-    return GTDEVEL("Illegal component in scoped name following '::'");
-  case IDL_GlobalData::PS_ConstSeen:
-    return GTDEVEL("Missing type or illegal syntax following CONST keyword");
-  case IDL_GlobalData::PS_ConstTypeSeen:
-    return GTDEVEL("Missing identifier or illegal syntax following const type");
-  case IDL_GlobalData::PS_ConstIDSeen:
-    return GTDEVEL("Missing '=' or illegal syntax after const identifier");
-  case IDL_GlobalData::PS_ConstAssignSeen:
-    return GTDEVEL("Missing value expr or illegal syntax following '='");
-  case IDL_GlobalData::PS_ConstExprSeen:
-    return GTDEVEL("Missing ';' or illegal syntax following value expr in const");
-  case IDL_GlobalData::PS_TypedefSeen:
-    return GTDEVEL("Missing type or illegal syntax following TYPEDEF keyword");
-  case IDL_GlobalData::PS_TypeSpecSeen:
-    return GTDEVEL("Missing declarators or illegal syntax following type spec");
-  case IDL_GlobalData::PS_DeclaratorsSeen:
-    return GTDEVEL("Illegal syntax following declarators in TYPEDEF declaration");
-  case IDL_GlobalData::PS_StructSeen:
-    return GTDEVEL("Missing struct identifier following STRUCT keyword");
-  case IDL_GlobalData::PS_StructIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following struct identifier");
-  case IDL_GlobalData::PS_StructSqSeen:
-    return GTDEVEL("Illegal syntax following struct '{' opener");
-  case IDL_GlobalData::PS_StructQsSeen:
-    return GTDEVEL("Illegal syntax following struct '}' closer");
-  case IDL_GlobalData::PS_StructBodySeen:
-    return GTDEVEL("Illegal syntax following struct body statement(s)");
-  case IDL_GlobalData::PS_MemberTypeSeen:
-    return GTDEVEL("Illegal syntax of missing identifier following member type");
-  case IDL_GlobalData::PS_MemberDeclsSeen:
-    return GTDEVEL("Illegal syntax following member declarator(s)");
-  case IDL_GlobalData::PS_MemberDeclsCompleted:
-    return GTDEVEL("Missing ',' between member decls of same type(?)");
-  case IDL_GlobalData::PS_UnionSeen:
-    return GTDEVEL("Missing identifier following UNION keyword");
-  case IDL_GlobalData::PS_UnionIDSeen:
-    return GTDEVEL("Illegal syntax following union identifier");
-  case IDL_GlobalData::PS_SwitchSeen:
-    return GTDEVEL("Illegal syntax following SWITCH keyword");
-  case IDL_GlobalData::PS_SwitchOpenParSeen:
-    return GTDEVEL("Illegal syntax following '(' in switch in union");
-  case IDL_GlobalData::PS_SwitchTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in switch in union");
-  case IDL_GlobalData::PS_SwitchCloseParSeen:
-    return GTDEVEL("Missing union '{' opener");
-  case IDL_GlobalData::PS_UnionSqSeen:
-    return GTDEVEL("Illegal syntax following union '{' opener");
-  case IDL_GlobalData::PS_UnionQsSeen:
-    return GTDEVEL("Illegal syntax following union '}' closer");
-  case IDL_GlobalData::PS_DefaultSeen:
-    return GTDEVEL("Illegal syntax or missing ':' following DEFAULT keyword");
-  case IDL_GlobalData::PS_UnionLabelSeen:
-    return GTDEVEL("Illegal syntax following branch label in union");
-  case IDL_GlobalData::PS_LabelColonSeen:
-    return GTDEVEL("Illegal syntax following ':' in branch label in union");
-  case IDL_GlobalData::PS_LabelExprSeen:
-    return GTDEVEL("Illegal syntax following label expression in union");
-  case IDL_GlobalData::PS_UnionElemSeen:
-  case IDL_GlobalData::PS_UnionElemCompleted:
-    return GTDEVEL("Illegal syntax following union element");
-  case IDL_GlobalData::PS_CaseSeen:
-    return GTDEVEL("Illegal syntax following CASE keyword in union");
-  case IDL_GlobalData::PS_UnionElemTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in union element");
-  case IDL_GlobalData::PS_UnionElemDeclSeen:
-    return GTDEVEL("Illegal syntax following declarator in union element");
-  case IDL_GlobalData::PS_UnionBodySeen:
-    return GTDEVEL("Illegal syntax following union body statement(s)");
-  case IDL_GlobalData::PS_EnumSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ENUM keyword");
-  case IDL_GlobalData::PS_EnumIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' following enum identifier");
-  case IDL_GlobalData::PS_EnumSqSeen:
-    return GTDEVEL("Illegal syntax following enum '{' opener");
-  case IDL_GlobalData::PS_EnumQsSeen:
-    return GTDEVEL("Illegal syntax following enum '}' closer");
-  case IDL_GlobalData::PS_EnumBodySeen:
-    return GTDEVEL("Illegal syntax following enum body statement(s)");
-  case IDL_GlobalData::PS_EnumCommaSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ',' in enum");
-  case IDL_GlobalData::PS_SequenceSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following SEQUENCE keyword");
-  case IDL_GlobalData::PS_SequenceSqSeen:
-    return GTDEVEL("Illegal syntax or missing type following '<' in sequence");
-  case IDL_GlobalData::PS_SequenceQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in sequence");
-  case IDL_GlobalData::PS_SequenceTypeSeen:
-    return GTDEVEL("Illegal syntax following sequence type declaration");
-  case IDL_GlobalData::PS_SequenceCommaSeen:
-    return
-      GTDEVEL("Illegal syntax of missing size expr following ',' in sequence");
-  case IDL_GlobalData::PS_SequenceExprSeen:
-    return
-      GTDEVEL("Illegal syntax or missing '>' following size expr in sequence");
-  case IDL_GlobalData::PS_StringSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following STRING keyword");
-  case IDL_GlobalData::PS_StringSqSeen:
-    return GTDEVEL("Illegal syntax or missing size expr following '<' in string");
-  case IDL_GlobalData::PS_StringQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in string");
-  case IDL_GlobalData::PS_StringExprSeen:
-    return GTDEVEL("Illegal syntax or missing '>' after size expr in string");
-  case IDL_GlobalData::PS_StringCompleted:
-    return GTDEVEL("Illegal syntax after string declaration");
-  case IDL_GlobalData::PS_ArrayIDSeen:
-    return GTDEVEL("Illegal syntax or missing dimensions after array identifier");
-  case IDL_GlobalData::PS_ArrayCompleted:
-    return GTDEVEL("Illegal syntax after array declaration");
-  case IDL_GlobalData::PS_DimSqSeen:
-    return
-    GTDEVEL("Illegal syntax or missing size expr after '[' in array declaration");
-  case IDL_GlobalData::PS_DimQsSeen:
-    return GTDEVEL("Illegal syntax after ']' in array declaration");
-  case IDL_GlobalData::PS_DimExprSeen:
-    return
-    GTDEVEL("Illegal syntax or missing ']' after size expr in array declaration");
-  case IDL_GlobalData::PS_AttrROSeen:
-    return GTDEVEL("Illegal syntax after READONLY keyword");
-  case IDL_GlobalData::PS_AttrSeen:
-    return GTDEVEL("Illegal syntax after ATTRIBUTE keyword");
-  case IDL_GlobalData::PS_AttrTypeSeen:
-    return GTDEVEL("Illegal syntax after type in attribute declaration");
-  case IDL_GlobalData::PS_AttrDeclsSeen:
-    return GTDEVEL("Illegal syntax after attribute declarators");
-  case IDL_GlobalData::PS_AttrCompleted:
-    return GTDEVEL("Illegal syntax after attribute declaration");
-  case IDL_GlobalData::PS_ExceptSeen:
-    return
-      GTDEVEL("Illegal syntax or missing identifier after EXCEPTION keyword");
-  case IDL_GlobalData::PS_ExceptIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' after exception identifier");
-  case IDL_GlobalData::PS_ExceptSqSeen:
-    return GTDEVEL("Illegal syntax after exception '{' opener");
-  case IDL_GlobalData::PS_ExceptQsSeen:
-    return GTDEVEL("Illegal syntax after exception '}' closer");
-  case IDL_GlobalData::PS_ExceptBodySeen:
-    return GTDEVEL("Illegal syntax after exception body statement(s)");
-  case IDL_GlobalData::PS_OpAttrSeen:
-    return GTDEVEL("Illegal syntax or missing type after operation attribute");
-  case IDL_GlobalData::PS_OpTypeSeen:
-    return GTDEVEL("Illegal syntax or missing identifier after operation type");
-  case IDL_GlobalData::PS_OpIDSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after operation identifier");
-  case IDL_GlobalData::PS_OpParsCompleted:
-    return GTDEVEL("Illegal syntax after operation parameter list");
-  case IDL_GlobalData::PS_OpRaiseCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional RAISES in operation declaration");
-  case IDL_GlobalData::PS_OpContextCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_OpCompleted:
-    return GTDEVEL("Illegal syntax after operation declaration");
-  case IDL_GlobalData::PS_OpSqSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list '(' opener");
-  case IDL_GlobalData::PS_OpQsSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list ')' closer");
-  case IDL_GlobalData::PS_OpParCommaSeen:
-    return
-      GTDEVEL("Illegal syntax or missing direction in parameter declaration");
-  case IDL_GlobalData::PS_OpParDirSeen:
-    return GTDEVEL("Illegal syntax or missing type in parameter declaration");
-  case IDL_GlobalData::PS_OpParTypeSeen:
-    return
-      GTDEVEL("Illegal syntax or missing declarator in parameter declaration");
-  case IDL_GlobalData::PS_OpParDeclSeen:
-    return GTDEVEL("Illegal syntax following parameter declarator");
-  case IDL_GlobalData::PS_OpRaiseSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after RAISES keyword");
-  case IDL_GlobalData::PS_OpRaiseSqSeen:
-    return GTDEVEL("Illegal syntax after RAISES '(' opener");
-  case IDL_GlobalData::PS_OpRaiseQsSeen:
-    return GTDEVEL("Illegal syntax after RAISES ')' closer");
-  case IDL_GlobalData::PS_OpContextSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after CONTEXT keyword");
-  case IDL_GlobalData::PS_OpContextSqSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT '(' opener");
-  case IDL_GlobalData::PS_OpContextQsSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT ')' closer");
-  case IDL_GlobalData::PS_OpContextCommaSeen:
-    return
-      GTDEVEL("Illegal syntax after ',' in CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_DeclsCommaSeen:
-    return GTDEVEL("Illegal syntax after ',' in declarators list");
-  case IDL_GlobalData::PS_DeclsDeclSeen:
-    return GTDEVEL("Illegal syntax after declarator in declarators list");
-
-  default:
-    return GTDEVEL("Some syntax error");
-  }
-}
-/*
- * Public methods
- */
-
-// Report error messages with various numbers of arguments
-
-void
-UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
-{
-  idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << parse_state_to_error_message(ps) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error0(UTL_Error::ErrorCode c)
-{
-  idl_error_header(c, idl_global->lineno(), idl_global->filename());
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error1(UTL_Error::ErrorCode c, AST_Decl *d)
-{
-  idl_error_header(c, d->line(), d->file_name());
-  d->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << ", ";
-  d3->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed coercion attempt
-void
-UTL_Error::coercion_error(AST_Expression *v, AST_Expression::ExprType t)
-{
-  idl_error_header(EIDL_COERCION_FAILURE, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << GTDEVEL(" to ") << exprtype_to_string(t) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed name lookup attempt
-void
-UTL_Error::lookup_error(UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from an interface which was only
-// declared forward but not yet defined
-void
-UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
-{
-  idl_error_header(EIDL_INHERIT_FWD_ERROR, f->line(), f->file_name());
-  cerr << "interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" cannot inherit from forward declared interface ");
-  f->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from something other than an interface
-void
-UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an error while evaluating an expression
-void
-UTL_Error::eval_error(AST_Expression *v)
-{
-  idl_error_header(EIDL_EVAL_ERROR, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where a constant was expected but we
-// got something else. This may occur in a union when a label
-// evaluates to a non-constant
-void
-UTL_Error::constant_expected(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CONSTANT_EXPECTED, d->line(), d->file_name());
-  n->dump(cerr);
-  cerr << GTDEVEL(" bound to ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was expected but we
-// got something else. This may occur in a union with an enum
-// discriminator where a label did not evaluate to a constant
-// enumerator
-void
-UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
-{
-  idl_error_header(EIDL_ENUM_VAL_EXPECTED, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  l->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was received but we
-// could not find it (by name) in an enum. This occurs when
-// a union with an enum discriminator is being parsed, and a
-// label evaluates to an enumerator which is not a member of
-// the enum discriminator type
-void
-UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  cerr << " enum " << e->local_name()->get_string() << ", ";
-  cerr << " enumerator ";
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report two or more spellings for an identifier
-void
-UTL_Error::name_case_error(char *b, char *n)
-{
-  idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an ambiguous definition of a name
-void
-UTL_Error::ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d)
-{
-  idl_error_header(EIDL_AMBIGUOUS, d->line(), d->file_name());
-  cerr << GTDEVEL(" scope: ")
-       << (ScopeAsDecl(s))->local_name()->get_string()
-       << ", ";
-  cerr << GTDEVEL(" collision: ");
-  d->name()->dump(cerr);
-  cerr << " vs. ";
-  l->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a forward declared interface which was never defined
-void
-UTL_Error::fwd_decl_not_defined(AST_Interface *d)
-{
-  idl_error_header(EIDL_DECL_NOT_DEFINED, d->line(), d->file_name());
-  cerr << "interface ";
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report lookup in undefined forward declared but undefined interface
-void
-UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << GTDEVEL("trying to look up ");
-  n->dump(cerr);
-  cerr << GTDEVEL(" in undefined forward declared interface ");
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a redefinition inside its own scope
-void
-UTL_Error::redefinition_in_scope(AST_Decl *d, AST_Decl *s)
-{
-  idl_error_header(EIDL_REDEF_SCOPE, d->line(), d->file_name());
-  d->name()->dump(cerr);
-  cerr << ", ";
-  s->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report not a type error
-void
-UTL_Error::not_a_type(AST_Decl *d)
-{
-  idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  if (d == NULL || d->name() == NULL)
-    cerr << GTDEVEL("unknown symbol");
-  else
-    d->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::back_end(long lineno, String *s)
-{
-  idl_error_header(EIDL_BACK_END, lineno, s);
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
diff --git a/TAO/TAO_IDL/util/utl_error.cpp b/TAO/TAO_IDL/util/utl_error.cpp
deleted file mode 100644
index bbc38947132..00000000000
--- a/TAO/TAO_IDL/util/utl_error.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Helper functions to do:
- *
- * - Convert an error code to an error string
- * - Print out an error message header
- * - Convert an ExprType to a string
- */
-
-// Convert an error code into a char *
-static char *
-error_string(UTL_Error::ErrorCode c)
-{
-  switch (c) {
-  case UTL_Error::EIDL_OK:
-    return GTDEVEL("all is fine ");
-  case UTL_Error::EIDL_SYNTAX_ERROR:
-    return "";
-  case UTL_Error::EIDL_REDEF:
-    return GTDEVEL("illegal redefinition ");
-  case UTL_Error::EIDL_DEF_USE:
-    return GTDEVEL("redefinition after use, ");
-  case UTL_Error::EIDL_MULTIPLE_BRANCH:
-    return GTDEVEL("union with duplicate branch label ");
-  case UTL_Error::EIDL_COERCION_FAILURE:
-    return GTDEVEL("coercion failure ");
-  case UTL_Error::EIDL_SCOPE_CONFLICT:
-    return GTDEVEL("definition scope is different than fwd declare scope, ");
-  case UTL_Error::EIDL_ONEWAY_CONFLICT:
-    return GTDEVEL("oneway operation with OUT or INOUT parameters, ");
-  case UTL_Error::EIDL_DISC_TYPE:
-    return GTDEVEL("union with illegal discriminator type, ");
-  case UTL_Error::EIDL_LABEL_TYPE:
-    return GTDEVEL("label type incompatible with union discriminator type, ");
-  case UTL_Error::EIDL_ILLEGAL_ADD:
-    return GTDEVEL("illegal add operation, ");
-  case UTL_Error::EIDL_ILLEGAL_USE:
-    return GTDEVEL("illegal type used in expression, ");
-  case UTL_Error::EIDL_ILLEGAL_RAISES:
-    return GTDEVEL("error in raises(..) clause, ");
-  case UTL_Error::EIDL_ILLEGAL_CONTEXT:
-    return GTDEVEL("error in context(..) clause, ");
-  case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
-  case UTL_Error::EIDL_LOOKUP_ERROR:
-    return GTDEVEL("error in lookup of symbol: ");
-  case UTL_Error::EIDL_INHERIT_FWD_ERROR:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_CONSTANT_EXPECTED:
-    return GTDEVEL("constant expected: ");
-  case UTL_Error::EIDL_EVAL_ERROR:
-    return GTDEVEL("expression evaluation error: ");
-  case UTL_Error::EIDL_NAME_CASE_ERROR:
-    return GTDEVEL("identifier used with two differing spellings: ");
-  case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
-    return GTDEVEL("enumerator expected: ");
-  case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND:
-    return GTDEVEL("enumerator by this name not defined: ");
-  case UTL_Error::EIDL_AMBIGUOUS:
-    return GTDEVEL("ambiguous definition: ");
-  case UTL_Error::EIDL_DECL_NOT_DEFINED:
-    return GTDEVEL("forward declared but never defined: ");
-  case UTL_Error::EIDL_FWD_DECL_LOOKUP:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_RECURSIVE_TYPE:
-    return GTDEVEL("illegal recursive use of type: ");
-  case UTL_Error::EIDL_NONVOID_ONEWAY:
-    return GTDEVEL("non-void return type in oneway operation: ");
-  case UTL_Error::EIDL_REDEF_SCOPE:
-    return GTDEVEL("redefinition inside defining scope: ");
-  case UTL_Error::EIDL_NOT_A_TYPE:
-    return GTDEVEL("specified symbol is not a type: ");
-  case UTL_Error::EIDL_BACK_END:
-    return GTDEVEL("back end: ");
-  }
-  return NULL;
-}
-
-// Print out an error message header on cerr
-static void
-idl_error_header(UTL_Error::ErrorCode c, long lineno, String *s)
-{
-  cerr << idl_global->prog_name()
-       << ": \""
-       << (idl_global->read_from_stdin() ? "standard input" : s->get_string())
-       << GTDEVEL("\", line ")
-       << ((lineno == -1) ? idl_global->lineno() : lineno)
-       << ": "
-       << error_string(c);
-}
-
-// Convert the type of an AST_Expression to a char *
-static char *
-exprtype_to_string(AST_Expression::ExprType t)
-{
-  switch (t) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Convert a parse state into a possible error message
- */
-static char *
-parse_state_to_error_message(IDL_GlobalData::ParseState ps)
-{
-  switch (ps) {
-  case IDL_GlobalData::PS_NoState:
-    return GTDEVEL("Statement can not be parsed");
-  case IDL_GlobalData::PS_TypeDeclSeen:
-    return GTDEVEL("Malformed typedef declaration");
-  case IDL_GlobalData::PS_ConstDeclSeen:
-    return GTDEVEL("Malformed const declaration");
-  case IDL_GlobalData::PS_ExceptDeclSeen:
-    return
-      GTDEVEL("Malformed exception declaration");
-  case IDL_GlobalData::PS_InterfaceDeclSeen:
-    return
-      GTDEVEL("Malformed interface declaration");
-  case IDL_GlobalData::PS_ModuleDeclSeen:
-    return GTDEVEL("Malformed module declaration");
-  case IDL_GlobalData::PS_AttrDeclSeen:
-    return
-      GTDEVEL("Malformed attribute declaration");
-  case IDL_GlobalData::PS_OpDeclSeen:
-    return
-      GTDEVEL("Malformed operation declaration");
-  case IDL_GlobalData::PS_ModuleSeen:
-    return GTDEVEL("Missing module identifier following MODULE keyword");
-  case IDL_GlobalData::PS_ModuleIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following module identifier");
-  case IDL_GlobalData::PS_ModuleSqSeen:
-    return GTDEVEL("Illegal syntax following module '{' opener");
-  case IDL_GlobalData::PS_ModuleQsSeen:
-    return GTDEVEL("Illegal syntax following module '}' closer");
-  case IDL_GlobalData::PS_ModuleBodySeen:
-    return GTDEVEL("Illegal syntax following module body statement(s)");
-  case IDL_GlobalData::PS_InterfaceSeen:
-    return GTDEVEL("Missing interface identifier following INTERFACE keyword");
-  case IDL_GlobalData::PS_InterfaceIDSeen:
-    return GTDEVEL("Illegal syntax following interface identifier");
-  case IDL_GlobalData::PS_InheritSpecSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following inheritance spec");
-  case IDL_GlobalData::PS_ForwardDeclSeen:
-    return GTDEVEL("Missing ';' following forward interface declaration");
-  case IDL_GlobalData::PS_InterfaceSqSeen:
-    return GTDEVEL("Illegal syntax following interface '{' opener");
-  case IDL_GlobalData::PS_InterfaceQsSeen:
-    return GTDEVEL("Illegal syntax following interface '}' closer");
-  case IDL_GlobalData::PS_InterfaceBodySeen:
-    return GTDEVEL("Illegal syntax following interface body statement(s)");
-  case IDL_GlobalData::PS_InheritColonSeen:
-    return GTDEVEL("Illegal syntax following ':' starting inheritance list");
-  case IDL_GlobalData::PS_SNListCommaSeen:
-    return GTDEVEL("Found illegal scoped name in scoped name list");
-  case IDL_GlobalData::PS_ScopedNameSeen:
-    return GTDEVEL("Missing ',' following scoped name in scoped name list");
-  case IDL_GlobalData::PS_SN_IDSeen:
-    return GTDEVEL("Illegal component in scoped name");
-  case IDL_GlobalData::PS_ScopeDelimSeen:
-    return GTDEVEL("Illegal component in scoped name following '::'");
-  case IDL_GlobalData::PS_ConstSeen:
-    return GTDEVEL("Missing type or illegal syntax following CONST keyword");
-  case IDL_GlobalData::PS_ConstTypeSeen:
-    return GTDEVEL("Missing identifier or illegal syntax following const type");
-  case IDL_GlobalData::PS_ConstIDSeen:
-    return GTDEVEL("Missing '=' or illegal syntax after const identifier");
-  case IDL_GlobalData::PS_ConstAssignSeen:
-    return GTDEVEL("Missing value expr or illegal syntax following '='");
-  case IDL_GlobalData::PS_ConstExprSeen:
-    return GTDEVEL("Missing ';' or illegal syntax following value expr in const");
-  case IDL_GlobalData::PS_TypedefSeen:
-    return GTDEVEL("Missing type or illegal syntax following TYPEDEF keyword");
-  case IDL_GlobalData::PS_TypeSpecSeen:
-    return GTDEVEL("Missing declarators or illegal syntax following type spec");
-  case IDL_GlobalData::PS_DeclaratorsSeen:
-    return GTDEVEL("Illegal syntax following declarators in TYPEDEF declaration");
-  case IDL_GlobalData::PS_StructSeen:
-    return GTDEVEL("Missing struct identifier following STRUCT keyword");
-  case IDL_GlobalData::PS_StructIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following struct identifier");
-  case IDL_GlobalData::PS_StructSqSeen:
-    return GTDEVEL("Illegal syntax following struct '{' opener");
-  case IDL_GlobalData::PS_StructQsSeen:
-    return GTDEVEL("Illegal syntax following struct '}' closer");
-  case IDL_GlobalData::PS_StructBodySeen:
-    return GTDEVEL("Illegal syntax following struct body statement(s)");
-  case IDL_GlobalData::PS_MemberTypeSeen:
-    return GTDEVEL("Illegal syntax of missing identifier following member type");
-  case IDL_GlobalData::PS_MemberDeclsSeen:
-    return GTDEVEL("Illegal syntax following member declarator(s)");
-  case IDL_GlobalData::PS_MemberDeclsCompleted:
-    return GTDEVEL("Missing ',' between member decls of same type(?)");
-  case IDL_GlobalData::PS_UnionSeen:
-    return GTDEVEL("Missing identifier following UNION keyword");
-  case IDL_GlobalData::PS_UnionIDSeen:
-    return GTDEVEL("Illegal syntax following union identifier");
-  case IDL_GlobalData::PS_SwitchSeen:
-    return GTDEVEL("Illegal syntax following SWITCH keyword");
-  case IDL_GlobalData::PS_SwitchOpenParSeen:
-    return GTDEVEL("Illegal syntax following '(' in switch in union");
-  case IDL_GlobalData::PS_SwitchTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in switch in union");
-  case IDL_GlobalData::PS_SwitchCloseParSeen:
-    return GTDEVEL("Missing union '{' opener");
-  case IDL_GlobalData::PS_UnionSqSeen:
-    return GTDEVEL("Illegal syntax following union '{' opener");
-  case IDL_GlobalData::PS_UnionQsSeen:
-    return GTDEVEL("Illegal syntax following union '}' closer");
-  case IDL_GlobalData::PS_DefaultSeen:
-    return GTDEVEL("Illegal syntax or missing ':' following DEFAULT keyword");
-  case IDL_GlobalData::PS_UnionLabelSeen:
-    return GTDEVEL("Illegal syntax following branch label in union");
-  case IDL_GlobalData::PS_LabelColonSeen:
-    return GTDEVEL("Illegal syntax following ':' in branch label in union");
-  case IDL_GlobalData::PS_LabelExprSeen:
-    return GTDEVEL("Illegal syntax following label expression in union");
-  case IDL_GlobalData::PS_UnionElemSeen:
-  case IDL_GlobalData::PS_UnionElemCompleted:
-    return GTDEVEL("Illegal syntax following union element");
-  case IDL_GlobalData::PS_CaseSeen:
-    return GTDEVEL("Illegal syntax following CASE keyword in union");
-  case IDL_GlobalData::PS_UnionElemTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in union element");
-  case IDL_GlobalData::PS_UnionElemDeclSeen:
-    return GTDEVEL("Illegal syntax following declarator in union element");
-  case IDL_GlobalData::PS_UnionBodySeen:
-    return GTDEVEL("Illegal syntax following union body statement(s)");
-  case IDL_GlobalData::PS_EnumSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ENUM keyword");
-  case IDL_GlobalData::PS_EnumIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' following enum identifier");
-  case IDL_GlobalData::PS_EnumSqSeen:
-    return GTDEVEL("Illegal syntax following enum '{' opener");
-  case IDL_GlobalData::PS_EnumQsSeen:
-    return GTDEVEL("Illegal syntax following enum '}' closer");
-  case IDL_GlobalData::PS_EnumBodySeen:
-    return GTDEVEL("Illegal syntax following enum body statement(s)");
-  case IDL_GlobalData::PS_EnumCommaSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ',' in enum");
-  case IDL_GlobalData::PS_SequenceSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following SEQUENCE keyword");
-  case IDL_GlobalData::PS_SequenceSqSeen:
-    return GTDEVEL("Illegal syntax or missing type following '<' in sequence");
-  case IDL_GlobalData::PS_SequenceQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in sequence");
-  case IDL_GlobalData::PS_SequenceTypeSeen:
-    return GTDEVEL("Illegal syntax following sequence type declaration");
-  case IDL_GlobalData::PS_SequenceCommaSeen:
-    return
-      GTDEVEL("Illegal syntax of missing size expr following ',' in sequence");
-  case IDL_GlobalData::PS_SequenceExprSeen:
-    return
-      GTDEVEL("Illegal syntax or missing '>' following size expr in sequence");
-  case IDL_GlobalData::PS_StringSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following STRING keyword");
-  case IDL_GlobalData::PS_StringSqSeen:
-    return GTDEVEL("Illegal syntax or missing size expr following '<' in string");
-  case IDL_GlobalData::PS_StringQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in string");
-  case IDL_GlobalData::PS_StringExprSeen:
-    return GTDEVEL("Illegal syntax or missing '>' after size expr in string");
-  case IDL_GlobalData::PS_StringCompleted:
-    return GTDEVEL("Illegal syntax after string declaration");
-  case IDL_GlobalData::PS_ArrayIDSeen:
-    return GTDEVEL("Illegal syntax or missing dimensions after array identifier");
-  case IDL_GlobalData::PS_ArrayCompleted:
-    return GTDEVEL("Illegal syntax after array declaration");
-  case IDL_GlobalData::PS_DimSqSeen:
-    return
-    GTDEVEL("Illegal syntax or missing size expr after '[' in array declaration");
-  case IDL_GlobalData::PS_DimQsSeen:
-    return GTDEVEL("Illegal syntax after ']' in array declaration");
-  case IDL_GlobalData::PS_DimExprSeen:
-    return
-    GTDEVEL("Illegal syntax or missing ']' after size expr in array declaration");
-  case IDL_GlobalData::PS_AttrROSeen:
-    return GTDEVEL("Illegal syntax after READONLY keyword");
-  case IDL_GlobalData::PS_AttrSeen:
-    return GTDEVEL("Illegal syntax after ATTRIBUTE keyword");
-  case IDL_GlobalData::PS_AttrTypeSeen:
-    return GTDEVEL("Illegal syntax after type in attribute declaration");
-  case IDL_GlobalData::PS_AttrDeclsSeen:
-    return GTDEVEL("Illegal syntax after attribute declarators");
-  case IDL_GlobalData::PS_AttrCompleted:
-    return GTDEVEL("Illegal syntax after attribute declaration");
-  case IDL_GlobalData::PS_ExceptSeen:
-    return
-      GTDEVEL("Illegal syntax or missing identifier after EXCEPTION keyword");
-  case IDL_GlobalData::PS_ExceptIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' after exception identifier");
-  case IDL_GlobalData::PS_ExceptSqSeen:
-    return GTDEVEL("Illegal syntax after exception '{' opener");
-  case IDL_GlobalData::PS_ExceptQsSeen:
-    return GTDEVEL("Illegal syntax after exception '}' closer");
-  case IDL_GlobalData::PS_ExceptBodySeen:
-    return GTDEVEL("Illegal syntax after exception body statement(s)");
-  case IDL_GlobalData::PS_OpAttrSeen:
-    return GTDEVEL("Illegal syntax or missing type after operation attribute");
-  case IDL_GlobalData::PS_OpTypeSeen:
-    return GTDEVEL("Illegal syntax or missing identifier after operation type");
-  case IDL_GlobalData::PS_OpIDSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after operation identifier");
-  case IDL_GlobalData::PS_OpParsCompleted:
-    return GTDEVEL("Illegal syntax after operation parameter list");
-  case IDL_GlobalData::PS_OpRaiseCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional RAISES in operation declaration");
-  case IDL_GlobalData::PS_OpContextCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_OpCompleted:
-    return GTDEVEL("Illegal syntax after operation declaration");
-  case IDL_GlobalData::PS_OpSqSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list '(' opener");
-  case IDL_GlobalData::PS_OpQsSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list ')' closer");
-  case IDL_GlobalData::PS_OpParCommaSeen:
-    return
-      GTDEVEL("Illegal syntax or missing direction in parameter declaration");
-  case IDL_GlobalData::PS_OpParDirSeen:
-    return GTDEVEL("Illegal syntax or missing type in parameter declaration");
-  case IDL_GlobalData::PS_OpParTypeSeen:
-    return
-      GTDEVEL("Illegal syntax or missing declarator in parameter declaration");
-  case IDL_GlobalData::PS_OpParDeclSeen:
-    return GTDEVEL("Illegal syntax following parameter declarator");
-  case IDL_GlobalData::PS_OpRaiseSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after RAISES keyword");
-  case IDL_GlobalData::PS_OpRaiseSqSeen:
-    return GTDEVEL("Illegal syntax after RAISES '(' opener");
-  case IDL_GlobalData::PS_OpRaiseQsSeen:
-    return GTDEVEL("Illegal syntax after RAISES ')' closer");
-  case IDL_GlobalData::PS_OpContextSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after CONTEXT keyword");
-  case IDL_GlobalData::PS_OpContextSqSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT '(' opener");
-  case IDL_GlobalData::PS_OpContextQsSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT ')' closer");
-  case IDL_GlobalData::PS_OpContextCommaSeen:
-    return
-      GTDEVEL("Illegal syntax after ',' in CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_DeclsCommaSeen:
-    return GTDEVEL("Illegal syntax after ',' in declarators list");
-  case IDL_GlobalData::PS_DeclsDeclSeen:
-    return GTDEVEL("Illegal syntax after declarator in declarators list");
-
-  default:
-    return GTDEVEL("Some syntax error");
-  }
-}
-/*
- * Public methods
- */
-
-// Report error messages with various numbers of arguments
-
-void
-UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
-{
-  idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << parse_state_to_error_message(ps) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error0(UTL_Error::ErrorCode c)
-{
-  idl_error_header(c, idl_global->lineno(), idl_global->filename());
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error1(UTL_Error::ErrorCode c, AST_Decl *d)
-{
-  idl_error_header(c, d->line(), d->file_name());
-  d->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << ", ";
-  d3->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed coercion attempt
-void
-UTL_Error::coercion_error(AST_Expression *v, AST_Expression::ExprType t)
-{
-  idl_error_header(EIDL_COERCION_FAILURE, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << GTDEVEL(" to ") << exprtype_to_string(t) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed name lookup attempt
-void
-UTL_Error::lookup_error(UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from an interface which was only
-// declared forward but not yet defined
-void
-UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
-{
-  idl_error_header(EIDL_INHERIT_FWD_ERROR, f->line(), f->file_name());
-  cerr << "interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" cannot inherit from forward declared interface ");
-  f->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from something other than an interface
-void
-UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an error while evaluating an expression
-void
-UTL_Error::eval_error(AST_Expression *v)
-{
-  idl_error_header(EIDL_EVAL_ERROR, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where a constant was expected but we
-// got something else. This may occur in a union when a label
-// evaluates to a non-constant
-void
-UTL_Error::constant_expected(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CONSTANT_EXPECTED, d->line(), d->file_name());
-  n->dump(cerr);
-  cerr << GTDEVEL(" bound to ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was expected but we
-// got something else. This may occur in a union with an enum
-// discriminator where a label did not evaluate to a constant
-// enumerator
-void
-UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
-{
-  idl_error_header(EIDL_ENUM_VAL_EXPECTED, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  l->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was received but we
-// could not find it (by name) in an enum. This occurs when
-// a union with an enum discriminator is being parsed, and a
-// label evaluates to an enumerator which is not a member of
-// the enum discriminator type
-void
-UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  cerr << " enum " << e->local_name()->get_string() << ", ";
-  cerr << " enumerator ";
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report two or more spellings for an identifier
-void
-UTL_Error::name_case_error(char *b, char *n)
-{
-  idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an ambiguous definition of a name
-void
-UTL_Error::ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d)
-{
-  idl_error_header(EIDL_AMBIGUOUS, d->line(), d->file_name());
-  cerr << GTDEVEL(" scope: ")
-       << (ScopeAsDecl(s))->local_name()->get_string()
-       << ", ";
-  cerr << GTDEVEL(" collision: ");
-  d->name()->dump(cerr);
-  cerr << " vs. ";
-  l->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a forward declared interface which was never defined
-void
-UTL_Error::fwd_decl_not_defined(AST_Interface *d)
-{
-  idl_error_header(EIDL_DECL_NOT_DEFINED, d->line(), d->file_name());
-  cerr << "interface ";
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report lookup in undefined forward declared but undefined interface
-void
-UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << GTDEVEL("trying to look up ");
-  n->dump(cerr);
-  cerr << GTDEVEL(" in undefined forward declared interface ");
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a redefinition inside its own scope
-void
-UTL_Error::redefinition_in_scope(AST_Decl *d, AST_Decl *s)
-{
-  idl_error_header(EIDL_REDEF_SCOPE, d->line(), d->file_name());
-  d->name()->dump(cerr);
-  cerr << ", ";
-  s->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report not a type error
-void
-UTL_Error::not_a_type(AST_Decl *d)
-{
-  idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  if (d == NULL || d->name() == NULL)
-    cerr << GTDEVEL("unknown symbol");
-  else
-    d->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::back_end(long lineno, String *s)
-{
-  idl_error_header(EIDL_BACK_END, lineno, s);
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
deleted file mode 100644
index 9d55984cfb9..00000000000
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_exceptlist.cc
-//
-// Implementation of a list of exceptions
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_ExceptList::UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr)
-	      : UTL_List(cdr),
-	        pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_Exception *
-UTL_ExceptList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExceptList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExceptlistActiveIterator::UTL_ExceptlistActiveIterator(UTL_ExceptList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_Exception *
-UTL_ExceptlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_ExceptList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_exprlist.cpp
deleted file mode 100644
index aa65055ac0a..00000000000
--- a/TAO/TAO_IDL/util/utl_exprlist.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_exprlist.cc
-//
-// Implementation of a list of strings
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_ExprList::UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr)
-	    : UTL_List(cdr),
-	      pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_Expression *
-UTL_ExprList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExprList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExprlistActiveIterator::UTL_ExprlistActiveIterator(UTL_ExprList *s)
-			  : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_Expression *
-UTL_ExprlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_ExprList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
deleted file mode 100644
index 2e38f61ce8e..00000000000
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-//
-// $Id$
-//
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_global.cc - Implementation of class IDL_GlobalData
-//
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Define an increment for the size of the array used to store names of
-// included files
-#undef		INCREMENT
-#define		INCREMENT	64
-
-IDL_GlobalData::IDL_GlobalData()
-    : pd_scopes(NULL),
-      pd_root(NULL),
-      pd_gen(NULL),
-      pd_err(NULL),
-      pd_err_count(0),
-      pd_lineno(0),
-      pd_filename(NULL),
-      pd_main_filename(NULL),
-      pd_real_filename(NULL),
-      pd_in_main_file(I_FALSE),
-      pd_prog_name(NULL),
-      pd_cpp_location(NULL),
-      pd_compile_flags(0),
-      pd_be(NULL),
-      pd_local_escapes(NULL),
-      pd_indent(NULL),
-      pd_pragmas(NULL),
-      pd_read_from_stdin(I_FALSE),
-      pd_include_file_names(NULL),
-      pd_n_include_file_names(0),
-      pd_n_alloced_file_names(0),
-      pd_parse_state(PS_NoState),
-      pd_idl_src_file (0),
-      export_macro_ (0),
-      export_include_ (0)
-{
-  // empty
-}
-
-// Get or set scopes stack
-UTL_ScopeStack *
-IDL_GlobalData::scopes()
-{
-  return pd_scopes;
-}
-void
-IDL_GlobalData::set_scopes(UTL_ScopeStack *s)
-{
-  pd_scopes = s;
-}
-
-// Get or set root of AST
-AST_Root *
-IDL_GlobalData::root()
-{
-  return pd_root;
-}
-void
-IDL_GlobalData::set_root(AST_Root *r)
-{
-  pd_root = r;
-}
-
-// Get or set generator object
-AST_Generator *
-IDL_GlobalData::gen()
-{
-  return pd_gen;
-}
-void
-IDL_GlobalData::set_gen(AST_Generator *g)
-{
-  pd_gen = g;
-}
-
-// Get or set error object
-UTL_Error *
-IDL_GlobalData::err()
-{
-  return pd_err;
-}
-void
-IDL_GlobalData::set_err(UTL_Error *e)
-{
-  pd_err = e;
-}
-
-// Get or set error count
-long
-IDL_GlobalData::err_count()
-{
-  return pd_err_count;
-}
-void
-IDL_GlobalData::set_err_count(long c)
-{
-  pd_err_count = c;
-}
-
-// Get or set line number
-long
-IDL_GlobalData::lineno()
-{
-  return pd_lineno;
-}
-void
-IDL_GlobalData::set_lineno(long n)
-{
-  pd_lineno = n;
-}
-
-// Get or set file name being read now
-String *
-IDL_GlobalData::filename()
-{
-  return pd_filename;
-}
-void
-IDL_GlobalData::set_filename(String *f)
-{
-  pd_filename = f;
-}
-
-// Get or set main file name
-String *
-IDL_GlobalData::main_filename()
-{
-  return pd_main_filename;
-}
-void
-IDL_GlobalData::set_main_filename(String *n)
-{
-  pd_main_filename = n;
-}
-
-// Get or set real file name
-String *
-IDL_GlobalData::real_filename()
-{
-  return pd_real_filename;
-}
-void
-IDL_GlobalData::set_real_filename(String *n)
-{
-  pd_real_filename = n;
-}
-
-// Get or set indicator whether import is on
-idl_bool
-IDL_GlobalData::imported()
-{
-  return pd_in_main_file ? I_FALSE : pd_import;
-}
-idl_bool
-IDL_GlobalData::import()
-{
-  return pd_import;
-}
-void
-IDL_GlobalData::set_import(idl_bool is_in)
-{
-  pd_import = is_in;
-}
-
-// Get or set indicator whether we're reading the main file now
-idl_bool
-IDL_GlobalData::in_main_file()
-{
-  return pd_in_main_file;
-}
-void
-IDL_GlobalData::set_in_main_file(idl_bool is_in)
-{
-  pd_in_main_file = is_in;
-}
-
-// Get or set stripped file name
-String *
-IDL_GlobalData::stripped_filename()
-{
-  return pd_stripped_filename;
-}
-void
-IDL_GlobalData::set_stripped_filename(String *nm)
-{
-  pd_stripped_filename = nm;
-}
-
-// Get or set cache value for argv[0]
-char *
-IDL_GlobalData::prog_name()
-{
-  return pd_prog_name;
-}
-void
-IDL_GlobalData::set_prog_name(char *pn)
-{
-  pd_prog_name = pn;
-}
-
-// Get or set location to find C preprocessor
-char *
-IDL_GlobalData::cpp_location()
-{
-  return pd_cpp_location;
-}
-void
-IDL_GlobalData::set_cpp_location(char *l)
-{
-  pd_cpp_location = l;
-}
-
-// Get or set IDL compiler flags
-long
-IDL_GlobalData::compile_flags()
-{
-  return pd_compile_flags;
-}
-void
-IDL_GlobalData::set_compile_flags(long cf)
-{
-  pd_compile_flags = cf;
-}
-
-// Get or set BE to be used
-char *
-IDL_GlobalData::be()
-{
-  return pd_be;
-}
-void
-IDL_GlobalData::set_be(char *nbe)
-{
-  pd_be = nbe;
-}
-
-// Get or set local escapes string. This provides additional mechanism
-// to pass information to a BE.
-char *
-IDL_GlobalData::local_escapes()
-{
-  return pd_local_escapes;
-}
-void
-IDL_GlobalData::set_local_escapes(char *e)
-{
-  pd_local_escapes = e;
-}
-
-// Get or set indent object
-UTL_Indenter *
-IDL_GlobalData::indent()
-{
-  return pd_indent;
-}
-void
-IDL_GlobalData::set_indent(UTL_Indenter *i)
-{
-  pd_indent = i;
-}
-
-// Get or set list of pragmas being parsed
-UTL_StrList *
-IDL_GlobalData::pragmas()
-{
-  UTL_StrList *p = pd_pragmas;
-
-  pd_pragmas = NULL;
-  return p;
-}
-void
-IDL_GlobalData::set_pragmas(UTL_StrList *p)
-{
-  pd_pragmas = p;
-}
-
-// Get or set indicator whether we're reading from stdin
-idl_bool
-IDL_GlobalData::read_from_stdin()
-{
-  return pd_read_from_stdin;
-}
-void
-IDL_GlobalData::set_read_from_stdin(idl_bool r)
-{
-  pd_read_from_stdin = r;
-}
-
-// Have we seen this include file name before?
-long
-IDL_GlobalData::seen_include_file_before(String *n)
-{
-  unsigned long i;
-
-  for (i = 0; i < pd_n_include_file_names; i++)
-    if (n->compare(pd_include_file_names[i]))
-      return I_TRUE;
-  return I_FALSE;
-}
-
-// Store a name of an #include file
-void
-IDL_GlobalData::store_include_file_name(String *n)
-{
-  String	**o_include_file_names;
-  unsigned long	  o_n_alloced_file_names,
-		  i;
-
-  /*
-   * Check if we need to store it at all or whether we've seen it already
-   */
-  if (seen_include_file_before(n))
-    return;
-  /*
-   * OK, need to store. Make sure there's space for one more string
-   */
-  if (pd_n_include_file_names == pd_n_alloced_file_names) {
-    if (pd_n_alloced_file_names == 0) {
-      pd_n_alloced_file_names = INCREMENT;
-      pd_include_file_names = new String *[pd_n_alloced_file_names];
-    } else {
-      o_include_file_names = pd_include_file_names;
-      o_n_alloced_file_names = pd_n_alloced_file_names;
-      pd_n_alloced_file_names += INCREMENT;
-      pd_include_file_names = new String *[pd_n_alloced_file_names];
-      for (i = 0; i < o_n_alloced_file_names; i++)
-        pd_include_file_names[i] = o_include_file_names[i];
-      delete [] o_include_file_names;
-    }
-  }
-  /*
-   * Store it
-   */
-  pd_include_file_names[pd_n_include_file_names++] = n;
-}
-
-void
-IDL_GlobalData::set_include_file_names(String **ns)
-{
-  pd_include_file_names = ns;
-}
-
-String **
-IDL_GlobalData::include_file_names()
-{
-  return pd_include_file_names;
-}
-
-void
-IDL_GlobalData::set_n_include_file_names(unsigned long n)
-{
-  pd_n_include_file_names = n;
-}
-
-unsigned long
-IDL_GlobalData::n_include_file_names()
-{
-  return pd_n_include_file_names;
-}
-
-void
-IDL_GlobalData::set_parse_state(ParseState ps)
-{
-  pd_parse_state = ps;
-}
-
-IDL_GlobalData::ParseState
-IDL_GlobalData::parse_state()
-{
-  return pd_parse_state;
-}
-
-/*
- * Convert a PredefinedType to an ExprType
- */
-AST_Expression::ExprType
-IDL_GlobalData::PredefinedTypeToExprType(AST_PredefinedType::PredefinedType pt)
-{
-  switch (pt) {
-  case AST_PredefinedType::PT_long:
-    return AST_Expression::EV_long;
-  case AST_PredefinedType::PT_ulong:
-    return AST_Expression::EV_ulong;
-  case AST_PredefinedType::PT_short:
-    return AST_Expression::EV_short;
-  case AST_PredefinedType::PT_ushort:
-    return AST_Expression::EV_ushort;
-  case AST_PredefinedType::PT_float:
-    return AST_Expression::EV_float;
-  case AST_PredefinedType::PT_double:
-    return AST_Expression::EV_double;
-  case AST_PredefinedType::PT_char:
-    return AST_Expression::EV_char;
-  case AST_PredefinedType::PT_octet:
-    return AST_Expression::EV_octet;
-  case AST_PredefinedType::PT_boolean:
-    return AST_Expression::EV_bool;
-  default:
-    return AST_Expression::EV_any;
-  }
-}
-
-// returns the IDL source file being copiled
-String* IDL_GlobalData::idl_src_file()
-{
-  return this->pd_idl_src_file;
-}
-
-// set the source IDL file that is being parsed
-void IDL_GlobalData::idl_src_file(String *s)
-{
-  this->pd_idl_src_file = s;
-}
-
-/************ Helper functions **************/
-static const char*
-be_change_idl_file_extension (String* idl_file,
-			      const char *new_extension)
-{
-  // @@ This shouldn't happen anyway; but a better error handling
-  // mechanism is needed.
-  if (idl_file == 0 || new_extension == 0)
-    {
-      return 0;
-    }
-
-  static char fname[MAXPATHLEN];
-  ACE_OS::memset (fname, 0, MAXPATHLEN);
-
-  const char* string = idl_file->get_string ();
-
-  // get the base part of the filename
-  const char *base = ACE_OS::strstr (string, ".idl");
-
-  if (base == 0)
-    return 0;
-
-  ACE_OS::strncpy (fname, string, base - string);
-  // Turn '\' and '\\' into '/'.
-  char* i = fname;
-  for (char* j = fname; *j != 0; ++i, ++j)
-    {
-      if (*j == '\\')
-	{
-	  *i = '/';
-	  if (*(j+1) == '\\')
-	    ++j;
-	}
-      else
-	*i = *j;
-    }
-  *i = 0;
-  ACE_OS::strcat (fname, new_extension);
-  return fname;
-}
-
-const char *
-IDL_GlobalData::be_get_client_hdr (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.h");
-}
-
-const char *
-IDL_GlobalData::be_get_client_stub (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.cpp");
-}
-
-const char *
-IDL_GlobalData::be_get_client_inline (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.i");
-}
-
-const char *
-IDL_GlobalData::be_get_server_hdr (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.h");
-}
-
-const char *
-IDL_GlobalData::be_get_server_skeleton (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.cpp");
-}
-
-const char *
-IDL_GlobalData::be_get_server_inline (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.i");
-}
-
-const char *
-IDL_GlobalData::be_get_client_hdr_fname ()
-{
-  return be_get_client_hdr (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_client_stub_fname ()
-{
-  return be_get_client_stub (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_client_inline_fname ()
-{
-  return be_get_client_inline (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_hdr_fname ()
-{
-  return be_get_server_hdr (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_skeleton_fname ()
-{
-  return be_get_server_skeleton (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_inline_fname ()
-{
-  return be_get_server_inline (idl_global->idl_src_file ());
-}
-
-const char* IDL_GlobalData::export_macro (void) const
-{
-  if (this->export_macro_ == 0)
-    return "";
-  return this->export_macro_;
-}
-
-void IDL_GlobalData::export_macro (const char *s)
-{
-  this->export_macro_ = ACE_OS::strdup (s);
-}
-
-const char* IDL_GlobalData::export_include (void) const
-{
-  return this->export_include_;
-}
-
-void IDL_GlobalData::export_include (const char *s)
-{
-  this->export_include_ = ACE_OS::strdup (s);
-}
-
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
deleted file mode 100644
index 750810be112..00000000000
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_identifier - Implementation of identifiers
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-
-Identifier::Identifier ()
-  : pv_string (NULL)
-{
-}
-
-Identifier::Identifier (char *s, long, long, long)
-  : pv_string (ACE_OS::strdup (s))
-{
-}
-
-Identifier::~Identifier () 
-{
-  if (this->pv_string != 0)
-    {
-      // The string was allocated using strdup, which uses malloc.
-      ACE_OS::free (this->pv_string);
-    }
-}
-
-// Operations
-
-char *
-Identifier::get_string ()
-{
-  return pv_string;
-}
-
-// Compare two Identifier *
-long
-Identifier::compare (Identifier *o)
-{
-  if (o == NULL) return I_FALSE;
-  if (pv_string == NULL || o->get_string() == NULL)
-    return I_FALSE;
-  return (ACE_OS::strcmp (pv_string, o->get_string ()) == 0) ? I_TRUE : I_FALSE;
-}
-
-// Dumping
-
-void
-Identifier::dump (ostream &o)
-{
-  if (pv_string == NULL) return;
-
-  o << get_string();
-}
-
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
deleted file mode 100644
index 6c06ab18903..00000000000
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_idlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_IdList::UTL_IdList (Identifier *s, UTL_IdList *cdr)
-  : UTL_List ((UTL_List *) cdr),
-    pd_car_data (s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Copy a list
-UTL_List *
-UTL_IdList::copy ()
-{
-  if (tail () == NULL)
-    return (UTL_List *) new UTL_IdList (head (), NULL);
-  return (UTL_List *) new UTL_IdList (head (), (UTL_IdList *) tail ()->copy ());
-}
-
-// Get list item
-Identifier *
-UTL_IdList::head ()
-{
-    return pd_car_data;
-}
-
-// Get last item of this list
-Identifier *
-UTL_IdList::last_component ()
-{
-  if (tail()== NULL)
-    return head ();
-  return ((UTL_IdList *) tail ())->last_component ();
-}
-
-// AST Dumping
-void
-UTL_IdList::dump (ostream &o)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator (this);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done ()))
-    {
-      if (!first)
-        o << "::";
-      else if (second)
-        first = second = I_FALSE;
-      i->item ()->dump (o);
-      if (first)
-        {
-          if (ACE_OS::strcmp (i->item ()->get_string (), "::") != 0)
-            first = I_FALSE;
-          else
-            second = I_TRUE;
-        }
-      i->next ();
-    }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_IdList active iterator
-
-/*
- * Constructor
- */
-
-UTL_IdListActiveIterator::UTL_IdListActiveIterator (UTL_IdList *s)
-    : UTL_ListActiveIterator (s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-Identifier *
-UTL_IdListActiveIterator::item ()
-{
-    if (source == NULL)
-        return NULL;
-    return ((UTL_IdList *) source)->head ();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp
deleted file mode 100644
index 0ebbdf7899d..00000000000
--- a/TAO/TAO_IDL/util/utl_indenter.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_indenter.cc - Implementation of indenter for dumping IDL AST
-//
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-UTL_Indenter::UTL_Indenter ()
-  : pd_indent_level (0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Reset indentation level
-void
-UTL_Indenter::reset ()
-{
-  pd_indent_level = 0;
-}
-
-// Increase indentation level
-void
-UTL_Indenter::increase ()
-{
-  pd_indent_level++;
-}
-
-// Decrease indentation level
-void
-UTL_Indenter::decrease ()
-{
-  if (pd_indent_level > 0)
-    pd_indent_level--;
-}
-
-// Produce white space to indent to current indentation level on ostream o
-void
-UTL_Indenter::skip_to (ostream &o)
-{
-  long i;
-
-  for (i = 0; i < pd_indent_level; i++)
-    o << "  ";
-}
-
-// Produce white space to indent to current indentation level on ostream o
-void
-UTL_Indenter::skip_to (FILE *fp)
-{
-  long i;
-
-  for (i = 0; i < pd_indent_level; i++)
-    ACE_OS::fprintf (fp, "  ");
-}
-
-/*
- * Redefined virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp
deleted file mode 100644
index 43bc82a89cb..00000000000
--- a/TAO/TAO_IDL/util/utl_labellist.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_labellist.cc
-//
-// Implementation of a list of scoped names
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_LabelList::UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr)
-	     : UTL_List(cdr),
-	       pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_UnionLabel *
-UTL_LabelList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_LabelList active iterator
-
-/*
- * Constructor
- */
-
-UTL_LabellistActiveIterator::UTL_LabellistActiveIterator(UTL_LabelList *s)
-			   : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_UnionLabel *
-UTL_LabellistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_LabelList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
deleted file mode 100644
index b6eb1dd16f4..00000000000
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_list.cc
-//
-// Implementation of generic single-linked lists
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_List::UTL_List(UTL_List *c)
-	: pd_cdr_data(c) 
-{
-}
-
-/*
- * Private operations
- */
-
-// Compute list length
-long
-UTL_List::list_length(long n)
-{
-  if (pd_cdr_data == NULL)
-    return n;
-  else
-    return pd_cdr_data->list_length(n+1);
-}
-
-/*
- * Public operations
- */
-
-// Smash last cdr with l
-void
-UTL_List::nconc(UTL_List *l)
-{
-  if (pd_cdr_data == NULL)
-    pd_cdr_data = l;
-  else
-    pd_cdr_data->nconc(l);
-}
-
-/*
- * Override this operation to copy lists of other types
- */
-// Copy a list
-UTL_List *
-UTL_List::copy()
-{
-  if (pd_cdr_data == NULL)
-    return new UTL_List(NULL);
-  return new UTL_List(pd_cdr_data->copy());
-}
-
-// Get next list
-UTL_List *
-UTL_List::tail()
-{
-  return pd_cdr_data;
-}
-
-// Set next list
-void
-UTL_List::set_tail(UTL_List *l)
-{
-  pd_cdr_data = l;
-}
-
-// Compute list length
-long
-UTL_List::length()
-{
-  return list_length(1);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_List active iterator
-
-/*
- * Constructor
- */
-
-UTL_ListActiveIterator::UTL_ListActiveIterator(UTL_List *s)
-		      : source(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Is iterator done?
-long
-UTL_ListActiveIterator::is_done()
-{
-  return (source == NULL) ? I_TRUE : I_FALSE;
-}
-
-// Advance to next item
-void
-UTL_ListActiveIterator::next()
-{
-  if (source != NULL)
-    source = source->tail();
-}
-
-/*
- * Redefinition of inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
deleted file mode 100644
index 63bc96cdc4d..00000000000
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_namelist.cc
-//
-// Implementation of a list of scoped names
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_NameList::UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr)
-	    : UTL_List(cdr),
-	      pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-UTL_ScopedName *
-UTL_NameList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_NameList active iterator
-
-/*
- * Constructor
- */
-
-UTL_NamelistActiveIterator::UTL_NamelistActiveIterator(UTL_NameList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-UTL_ScopedName *
-UTL_NamelistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_NameList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
deleted file mode 100644
index f3428bff74a..00000000000
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ /dev/null
@@ -1,1204 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * utl_scope.cc - Implementation of class UTL_Scope
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Static functions
- */
-static Identifier	*_global_scope_name = NULL;
-static Identifier	*_global_scope_root_name = NULL;
-
-/*
- * Determines if a name is global
- */
-static long
-is_global_name(Identifier *i)
-{
-  long comp_result = 0;
-  char *s;
-
-  if (i == NULL) return comp_result;
-  s = i->get_string();
-
-  if (_global_scope_name == NULL)
-    _global_scope_name = new Identifier("::", 1, 0, I_FALSE);
-
-  if (_global_scope_root_name == NULL)
-    _global_scope_root_name = new Identifier("", 1, 0, I_FALSE);
-
-  comp_result = i->compare(_global_scope_name);
-  if (!comp_result)
-    comp_result = i->compare(_global_scope_root_name);
-
-  return comp_result;
-}
-
-/*
- * Helper function for lookup_by_name. Iterates doing local lookups of
- * subsequent components of a scoped name
- */
-static AST_Decl *
-iter_lookup_by_name_local(AST_Decl *d, UTL_ScopedName *e,
-			  idl_bool treat_as_ref)
-{
-  Identifier			*s;
-  AST_Typedef			*td;
-  UTL_IdListActiveIterator	*i;
-  UTL_Scope			*sc;
-
-  i = new UTL_IdListActiveIterator(e);
-  for (i->next(); !(i->is_done()); ) {
-    s = i->item();
-    /*
-     * Update iterator before loop. This is needed for the check for
-     * typedef, since we only want to look at the base type if there
-     * actually are more components of the name to resolve.
-     */
-    i->next();
-    /*
-     * Next component in name was not found
-     */
-    if (d == NULL) {
-      return NULL;
-    }
-    /*
-     * If this is a typedef and we're not done, we should get the
-     * base type to get the scope it defines (if any)
-     */
-    if (!(i->is_done())) {
-      while (d != NULL && d->node_type() == AST_Decl::NT_typedef) {
-        td = AST_Typedef::narrow_from_decl(d);
-	if (td == NULL)
-	  return NULL;
-	d = td->base_type();
-      }
-      if (d == NULL)
-        return NULL;
-    }
-    /*
-     * Try to convert the AST_Decl to a UTL_Scope
-     */
-    sc = DeclAsScope(d);
-    if (sc == NULL)
-      return NULL;
-    /*
-     * Look up the next element
-     */
-    d = sc->lookup_by_name_local(s, treat_as_ref);
-  }
-  /*
-   * OK, done with the loop
-   */
-  return d;
-}
-
-/*
- * Constructor(s)
- */
-UTL_Scope::UTL_Scope()
-	 : pd_scope_node_type(AST_Decl::NT_module),
-	   pd_decls(NULL),
-	   pd_decls_allocated(0),
-	   pd_decls_used(0),
-	   pd_local_types(NULL),
-	   pd_locals_allocated(0),
-	   pd_locals_used(0),
-	   pd_referenced(NULL),
-	   pd_referenced_allocated(0),
-	   pd_referenced_used(0)
-{
-}
-
-UTL_Scope::UTL_Scope(AST_Decl::NodeType nt)
-	 : pd_scope_node_type(nt),
-	   pd_decls(NULL),
-	   pd_decls_allocated(0),
-	   pd_decls_used(0),
-	   pd_local_types(NULL),
-	   pd_locals_allocated(0),
-	   pd_locals_used(0),
-	   pd_referenced(NULL),
-	   pd_referenced_allocated(0),
-	   pd_referenced_used(0)
-{
-};
-
-/*
- * Private operations
- */
-
-static
-AST_Decl * add_type(AST_Type *type)
-{
-  AST_Decl * result = 0;
-  UTL_Scope * scope = 0;
-  switch (type->node_type()) {
-    case AST_Decl::NT_array:
-      result =
-        idl_global->root()->add_array(AST_Array::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_enum:
-      result = type->defined_in()->add_enum(AST_Enum::narrow_from_decl(type));
-      scope = AST_Enum::narrow_from_decl(type);
-      break;
-    case AST_Decl::NT_sequence:
-      result =
-	idl_global->root()->add_sequence(AST_Sequence::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_string:
-      result =
-	idl_global->root()->add_string(AST_String::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_struct:
-      result =
-        type->defined_in()->
-          add_structure(AST_Structure::narrow_from_decl(type));
-      scope = AST_Structure::narrow_from_decl(type);
-      break;
-    case AST_Decl::NT_union:
-      result =
-	type->defined_in()->add_union(AST_Union::narrow_from_decl(type));
-      scope = AST_Union::narrow_from_decl(type);
-      break;
-    default:
-      // for non-complex types, like predefined types
-      // no additional add needed, assume everything is ok
-      result = (AST_Decl *) 1;
-      break;
-  }
-  if (scope)
-    result = scope->call_add();
-  return result;
-}
-
-/*
- * Protected operations
- */
-
-/*
- * Special version of lookup which only looks at the local name instead of
- * the fully scoped name, when doing lookups. This version is intended to
- * be used only by the CFE add_xxx functions
- */
-AST_Decl *
-UTL_Scope::lookup_for_add(AST_Decl *d, idl_bool treat_as_ref)
-{
-  if (d == NULL)
-    return NULL;
-  return lookup_by_name_local(d->local_name(), treat_as_ref);
-}
-
-/*
- * Public operations
- */
-
-// Narrowing
-IMPL_NARROW_METHODS0(UTL_Scope)
-IMPL_NARROW_FROM_SCOPE(UTL_Scope)
-
-// Scope Management Protocol
-//
-// All members of the protocol defined in UTL_Scope simply return the node
-// and don't do a thing. These members are simply dummies to retain
-// compatibility with pre-two-pass compiler back-ends.
-
-AST_PredefinedType *UTL_Scope::add_predefined_type(AST_PredefinedType *p)
-{
-  if (p == NULL) return NULL;
-  p->set_added(I_TRUE);
-  return p;
-}
-
-AST_Module *UTL_Scope::add_module(AST_Module *m)
-{
-  if (m == NULL) return NULL;
-  m->set_added(I_TRUE);
-  return m;
-}
-
-AST_Interface *UTL_Scope::add_interface(AST_Interface *i)
-{
-  if (i == NULL) return NULL;
-  i->set_added(I_TRUE);
-  return i;
-}
-
-AST_InterfaceFwd *UTL_Scope::add_interface_fwd(AST_InterfaceFwd *i)
-{
-  if (i == NULL) return NULL;
-  i->set_added(I_TRUE);
-  return i;
-}
-
-AST_Exception *UTL_Scope::add_exception(AST_Exception *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_Constant *UTL_Scope::add_constant(AST_Constant *c)
-{
-  if (c == NULL) return NULL;
-  c->set_added(I_TRUE);
-  return c;
-}
-
-UTL_StrList *UTL_Scope::add_context(UTL_StrList *c)
-{
-  return c;
-}
-
-UTL_NameList *UTL_Scope::add_exceptions(UTL_NameList *e)
-{
-  return e;
-}
-
-AST_Attribute *UTL_Scope::add_attribute(AST_Attribute *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->field_type()->added()) {
-    return add_type(a->field_type()) ? a : 0 ;
-  } else
-    return a;
-}
-
-AST_Operation *UTL_Scope::add_operation(AST_Operation *o)
-{
-  if (o == NULL) return NULL;
-  o->set_added(I_TRUE);
-  if (!o->return_type()->added()) {
-    return add_type(o->return_type()) ? o : 0 ;
-  } else
-    return o;
-}
-
-AST_Argument *UTL_Scope::add_argument(AST_Argument *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->field_type()->added()) {
-    return add_type(a->field_type()) ? a : 0 ;
-  } else
-    return a;
-}
-
-AST_Union *UTL_Scope::add_union(AST_Union *u)
-{
-  if (u == NULL) return NULL;
-  u->set_added(I_TRUE);
-  return u;
-}
-
-AST_UnionBranch *UTL_Scope::add_union_branch(AST_UnionBranch *u)
-{
-  if (u == NULL) return NULL;
-  u->set_added(I_TRUE);
-  if (!u->field_type()->added()) {
-    return add_type(u->field_type()) ? u : 0 ;
-  } else
-    return u;
-}
-
-AST_Structure *UTL_Scope::add_structure(AST_Structure *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  return s;
-}
-
-AST_Field *UTL_Scope::add_field(AST_Field *f)
-{
-  if (f == NULL) return NULL;
-  f->set_added(I_TRUE);
-  if (!f->field_type()->added()) {
-    return add_type(f->field_type()) ? f : 0 ;
-  } else
-    return f;
-}
-
-AST_Enum *UTL_Scope::add_enum(AST_Enum *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_EnumVal *UTL_Scope::add_enum_val(AST_EnumVal *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_Typedef *UTL_Scope::add_typedef(AST_Typedef *t)
-{
-  if (t == NULL) return NULL;
-  t->set_added(I_TRUE);
-  if (!t->base_type()->added()) {
-    return add_type(t->base_type()) ? t : 0 ;
-  } else
-    return t;
-}
-
-AST_Sequence *UTL_Scope::add_sequence(AST_Sequence *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  if (!s->base_type()->added()) {
-    return add_type(s->base_type()) ? s : 0 ;
-  } else
-    return s;
-}
-
-AST_String *UTL_Scope::add_string(AST_String *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  return s;
-}
-
-AST_Array *UTL_Scope::add_array(AST_Array *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->base_type()->added()) {
-    return add_type(a->base_type()) ? a : 0 ;
-  } else
-    return a;
-}
-
-AST_Native *UTL_Scope::add_native (AST_Native *n)
-{
-  if (n == NULL) return NULL;
-  n->set_added (I_TRUE);
-  return n;
-}
-
-// Protected Front End Scope Management Protocol
-//
-// All members of the protocol defined in UTL_Scope simply return NULL
-// and don't do a thing. This ensures that runtime errors will discover
-// operations which should have been redefined to allow certain kinds of
-// AST nodes to appear in a given context
-
-AST_PredefinedType *UTL_Scope::fe_add_predefined_type(AST_PredefinedType *)
-{
-  return NULL;
-}
-
-AST_Module *UTL_Scope::fe_add_module(AST_Module *)
-{
-  return NULL;
-}
-
-AST_Interface *UTL_Scope::fe_add_interface(AST_Interface *)
-{
-  return NULL;
-}
-
-AST_InterfaceFwd *UTL_Scope::fe_add_interface_fwd(AST_InterfaceFwd *)
-{
-  return NULL;
-}
-
-AST_Exception *UTL_Scope::fe_add_exception(AST_Exception *)
-{
-  return NULL;
-}
-
-AST_Constant *UTL_Scope::fe_add_constant(AST_Constant *)
-{
-  return NULL;
-}
-
-UTL_StrList *UTL_Scope::fe_add_context(UTL_StrList *)
-{
-  return NULL;
-}
-
-UTL_NameList *UTL_Scope::fe_add_exceptions(UTL_NameList *)
-{
-  return NULL;
-}
-
-AST_Attribute *UTL_Scope::fe_add_attribute(AST_Attribute *)
-{
-  return NULL;
-}
-
-AST_Operation *UTL_Scope::fe_add_operation(AST_Operation *)
-{
-  return NULL;
-}
-
-AST_Argument *UTL_Scope::fe_add_argument(AST_Argument *)
-{
-  return NULL;
-}
-
-AST_Union *UTL_Scope::fe_add_union(AST_Union *)
-{
-  return NULL;
-}
-
-AST_UnionBranch *UTL_Scope::fe_add_union_branch(AST_UnionBranch *)
-{
-  return NULL;
-}
-
-AST_Structure *UTL_Scope::fe_add_structure(AST_Structure *)
-{
-  return NULL;
-}
-
-AST_Field *UTL_Scope::fe_add_field(AST_Field *)
-{
-  return NULL;
-}
-
-AST_Enum *UTL_Scope::fe_add_enum(AST_Enum *)
-{
-  return NULL;
-}
-
-AST_EnumVal *UTL_Scope::fe_add_enum_val(AST_EnumVal *)
-{
-  return NULL;
-}
-
-AST_Typedef *UTL_Scope::fe_add_typedef(AST_Typedef *)
-{
-  return NULL;
-}
-
-AST_Sequence *UTL_Scope::fe_add_sequence(AST_Sequence *)
-{
-  return NULL;
-}
-
-AST_String *UTL_Scope::fe_add_string(AST_String *)
-{
-  return NULL;
-}
-
-AST_Array *UTL_Scope::fe_add_array(AST_Array *)
-{
-  return NULL;
-}
-
-AST_Native *UTL_Scope::fe_add_native (AST_Native *)
-{
-  return NULL;
-}
-
-// This is the second pass of the front end
-// It calls the public add protocol on everything in scope.
-// It calls the add_xx functions of the most derived AST_Node.
-
-AST_Decl *UTL_Scope::call_add()
-{
-  AST_Decl 		*result = NULL;
-  AST_Decl 		*decl;
-
-  UTL_ScopeActiveIterator *i;
-  UTL_Scope *scope;
-
-  i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-  while(!(i->is_done())) {
-    decl = i->item();
-    scope = 0;
-    switch (decl->node_type()) {
-      case AST_Decl::NT_argument:
-        result = add_argument(AST_Argument::narrow_from_decl(decl));
-  	break;
-      case AST_Decl::NT_array:
-    	result = add_array(AST_Array::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_attr:
-        result = add_attribute(AST_Attribute::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_const:
-        result = add_constant(AST_Constant::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_enum:
-        scope = AST_Enum::narrow_from_decl(decl);
-        result = add_enum(AST_Enum::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_enum_val:
-        result = add_enum_val(AST_EnumVal::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_except:
-        scope = AST_Exception::narrow_from_decl(decl);
-        result = add_exception(AST_Exception::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_field:
-        result = add_field(AST_Field::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_interface:
-        scope = AST_Interface::narrow_from_decl(decl);
-        result = add_interface(AST_Interface::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_interface_fwd:
-        result = add_interface_fwd(AST_InterfaceFwd::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_module:
-      	scope = AST_Module::narrow_from_decl(decl);
-  	result = add_module(AST_Module::narrow_from_decl(decl));
-  	break;
-      case AST_Decl::NT_native:
-        result = add_native (AST_Native::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_op:
-	result = add_operation(AST_Operation::narrow_from_decl(decl));
-        scope = AST_Operation::narrow_from_decl(decl);
-	break;
-      case AST_Decl::NT_pre_defined:
-        result =
-	  add_predefined_type(AST_PredefinedType::narrow_from_decl(decl));
- 	break;
-      case AST_Decl::NT_sequence:
-        result = add_sequence(AST_Sequence::narrow_from_decl(decl));
- 	break;
-      case AST_Decl::NT_string:
-        result = add_string(AST_String::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_struct:
-        result = add_structure(AST_Structure::narrow_from_decl(decl));
-        scope = AST_Structure::narrow_from_decl(decl);
-  	break;
-      case AST_Decl::NT_typedef:
-        result = add_typedef(AST_Typedef::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_union:
-        result = add_union(AST_Union::narrow_from_decl(decl));
-        scope = AST_Union::narrow_from_decl(decl);
-	break;
-      case AST_Decl::NT_union_branch:
-        result = add_union_branch(AST_UnionBranch::narrow_from_decl(decl));
-	break;
-      default:
-        return NULL;
-    }
-    if (scope)
-      scope->call_add();
-    i->next();
-  }
-  return result;
-}
-
-// Private lookup mechanism
-
-/*
- * Lookup the node for a primitive (built in) type
- */
-AST_Decl *
-UTL_Scope::lookup_primitive_type(AST_Expression::ExprType et)
-{
-  AST_Decl		   *as_decl;
-  UTL_Scope		   *ancestor;
-  AST_PredefinedType	   *t;
-  UTL_ScopeActiveIterator *i;
-  AST_PredefinedType::PredefinedType pdt;
-
-  as_decl = ScopeAsDecl(this);
-  if (as_decl == NULL)
-    return NULL;
-  ancestor = as_decl->defined_in();
-  if (ancestor != NULL)
-    return ancestor->lookup_primitive_type(et);
-
-  switch (et) {
-  case AST_Expression::EV_short:
-    pdt = AST_PredefinedType::PT_short;
-    break;
-  case AST_Expression::EV_ushort:
-    pdt = AST_PredefinedType::PT_ushort;
-    break;
-  case AST_Expression::EV_long:
-    pdt = AST_PredefinedType::PT_long;
-    break;
-  case AST_Expression::EV_ulong:
-    pdt = AST_PredefinedType::PT_ulong;
-    break;
-  case AST_Expression::EV_longlong:
-    pdt = AST_PredefinedType::PT_longlong;
-    break;
-  case AST_Expression::EV_ulonglong:
-    pdt = AST_PredefinedType::PT_ulonglong;
-    break;
-  case AST_Expression::EV_float:
-    pdt = AST_PredefinedType::PT_float;
-    break;
-  case AST_Expression::EV_double:
-    pdt = AST_PredefinedType::PT_double;
-    break;
-  case AST_Expression::EV_longdouble:
-    pdt = AST_PredefinedType::PT_longdouble;
-    break;
-  case AST_Expression::EV_char:
-    pdt = AST_PredefinedType::PT_char;
-    break;
-  case AST_Expression::EV_wchar:
-    pdt = AST_PredefinedType::PT_wchar;
-    break;
-  case AST_Expression::EV_octet:
-    pdt = AST_PredefinedType::PT_octet;
-    break;
-  case AST_Expression::EV_bool:
-    pdt = AST_PredefinedType::PT_boolean;
-    break;
-  case AST_Expression::EV_any:
-    pdt = AST_PredefinedType::PT_any;
-    break;
-  case AST_Expression::EV_void:
-    pdt = AST_PredefinedType::PT_void;
-    break;
-  case AST_Expression::EV_string:
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_none:
-  default:
-    return NULL;
-  }
-  i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-  while (!(i->is_done())) {
-    as_decl = i->item();
-    if (as_decl->node_type() == AST_Decl::NT_pre_defined) {
-      t = AST_PredefinedType::narrow_from_decl(as_decl);
-      if (t == NULL) {
-        i->next();
-        continue;
-      }
-      if (t->pt() == pdt) {
-	delete i;
-	return t;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look through inherited interfaces
- */
-AST_Decl *
-UTL_Scope::look_in_inherited(UTL_ScopedName *e, idl_bool treat_as_ref)
-{
-  AST_Decl		*d = NULL;
-  AST_Interface		*i = AST_Interface::narrow_from_scope(this);
-  AST_Interface		**is;
-  long			nis;
-
-  /*
-   * This scope is not an interface..
-   */
-  if (i == NULL)
-    return NULL;
-  /*
-   * Can't look in an interface which was not yet defined
-   */
-  if (!i->is_defined()) {
-    idl_global->err()->fwd_decl_lookup(i, e);
-    return NULL;
-  }
-  /*
-   * OK, loop through inherited interfaces. Stop when you find it
-   */
-  for (nis = i->n_inherits(), is = i->inherits(); nis > 0; nis--, is++) {
-    d = (*is)->lookup_by_name(e, treat_as_ref);
-    if (d != NULL)
-      return d;
-  }
-  /*
-   * Not found
-   */
-  return NULL;
-}
-
-/*
- * Look up a String * in local scope only
- */
-AST_Decl *
-UTL_Scope::lookup_by_name_local(Identifier *e, idl_bool)
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this,
-							   UTL_Scope::IK_both);
-  AST_Decl		  *d;
-  AST_InterfaceFwd	  *fwd;
-
-  /*
-   * Iterate over this scope
-   */
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->local_name() != NULL && d->local_name()->compare(e)) {
-      delete i;
-      /*
-       * Special case for forward declared interfaces. Look through the
-       * forward declaration and retrieve the full definition
-       */
-      if (d->node_type() == AST_Decl::NT_interface_fwd) {
-        fwd = AST_InterfaceFwd::narrow_from_decl(d);
-	if (fwd == NULL)
-	  d = NULL;
-	else
-	  d = fwd->full_definition();
-      }
-      return d;
-    }
-    i->next();
-  }
-  /*
-   * OK, not found, return NULL
-   */
-  return NULL;
-}
-
-/*
- * Implements lookup by name for scoped names
- */
-AST_Decl *
-UTL_Scope::lookup_by_name(UTL_ScopedName *e, idl_bool treat_as_ref)
-{
-  AST_Decl		     *d;
-  UTL_Scope		     *t = NULL;
-
-  /*
-   * Empty name? error
-   */
-  if (e == NULL) {
-    return NULL;
-  }
-  /*
-   * If name starts with "::" or "" start look up in global scope
-   */
-  if (is_global_name(e->head())) {
-    /*
-     * Get parent scope
-     */
-    d = ScopeAsDecl(this);
-    if (d == NULL)
-      return NULL;
-    t = d->defined_in();
-    /*
-     * If this is the global scope..
-     */
-    if (t == NULL) {
-      /*
-       * Look up tail of name starting here
-       */
-      d = lookup_by_name((UTL_ScopedName *) e->tail(), treat_as_ref);
-      /*
-       * Now return whatever we have
-       */
-      return d;
-    }
-    /*
-     * OK, not global scope yet, so simply iterate with parent scope
-     */
-    d = t->lookup_by_name(e, treat_as_ref);
-    /*
-     * If treat_as_ref is true and d is not NULL, add d to
-     * set of nodes referenced here
-     */
-    if (treat_as_ref && d != NULL)
-      add_to_referenced(d, I_FALSE);
-    /*
-     * Now return what we have
-     */
-    return d;
-  }
-  /*
-   * The name does not start with "::"
-   *
-   * Is name defined here?
-   */
-  d = lookup_by_name_local(e->head(), treat_as_ref);
-  if (d == NULL) {
-    /*
-     * OK, not found. Go down parent scope chain.
-     */
-    d = ScopeAsDecl(this);
-    if (d != NULL) {
-      t = d->defined_in();
-      if (t == NULL)
-	d = NULL;
-      else
-	d = t->lookup_by_name(e, treat_as_ref);
-    }
-    /*
-     * Special case for scope which is an interface. We have to look
-     * in the inherited interfaces as well..
-     */
-    if (d == NULL) {
-      if (pd_scope_node_type == AST_Decl::NT_interface)
-	d = look_in_inherited(e, treat_as_ref);
-    }
-    /*
-     * If treat_as_ref is true and d is not NULL, add d to
-     * set of nodes referenced here
-     */
-    if (treat_as_ref && d != NULL)
-      add_to_referenced(d, I_FALSE);
-    /*
-     * OK, now return whatever we found
-     */
-    return d;
-  }
-  /*
-   * OK, start of name is defined. Now loop doing local lookups
-   * of subsequent elements of the name
-   */
-  d = iter_lookup_by_name_local(d, e, treat_as_ref);
-  /*
-   * If treat_as_ref is true and d is not NULL, add d to set
-   * of nodes referenced here.
-   */
-  if (treat_as_ref && d != NULL)
-    add_to_referenced(d, I_FALSE);
-  /*
-   * All OK, name fully resolved
-   */
-  return d;
-}
-
-// Add a node to set of nodes referenced in this scope
-void
-UTL_Scope::add_to_referenced(AST_Decl *e, idl_bool recursive)
-{
-  UTL_Scope	*s;
-  AST_Decl	**tmp;
-  AST_Interface *itf;
-  long		oreferenced_allocated;
-  long		i;
-
-  if (e == NULL) return;
-
-  // Special case for forward declared interfaces in the
-  // scope in which they're defined. Cannot add before full
-  // definition is seen
-  if (e->node_type() == AST_Decl::NT_interface) {
-    itf = AST_Interface::narrow_from_decl(e);
-    if (itf != NULL && itf->defined_in() == this && !itf->is_defined())
-      return;
-  }
-  // Only insert if it is not there already
-  if (referenced(e))
-    return;
-
-  // Make sure there's space for one more
-  if (pd_referenced_allocated == pd_referenced_used) {
-
-    oreferenced_allocated	= pd_referenced_allocated;
-    pd_referenced_allocated	+= INCREMENT;
-    tmp				= new AST_Decl *[pd_referenced_allocated];
-
-    for (i = 0; i < oreferenced_allocated; i++)
-      tmp[i] = pd_referenced[i];
-
-    delete []pd_referenced;
-
-    pd_referenced = tmp;
-  }
-
-  // Insert new reference
-  pd_referenced[pd_referenced_used++] = e;
-
-  // Now, if recursive is specified and "this" is not a common ancestor
-  // of the referencing scope and the scope of definition of "e" then
-  // add "e" to the set of referenced nodes in the parent of "this"
-  if (recursive && !(e->has_ancestor(ScopeAsDecl(this)))) {
-    s = e->defined_in();
-    if (s != NULL)
-      s->add_to_referenced(e, recursive);
-  }
-}
-
-// Add a node to set of nodes declared in this scope
-void
-UTL_Scope::add_to_scope(AST_Decl *e)
-{
-  AST_Decl	**tmp;
-  long		odecls_allocated;
-  long		i;
-
-  if (e == NULL) return;
-
-  // Make sure there's space for one more
-  if (pd_decls_allocated == pd_decls_used) {
-
-    odecls_allocated	= pd_decls_allocated;
-    pd_decls_allocated	+= INCREMENT;
-    tmp			= new AST_Decl *[pd_decls_allocated];
-
-    for (i = 0; i < odecls_allocated; i++)
-      tmp[i] = pd_decls[i];
-
-    delete []pd_decls;
-
-    pd_decls = tmp;
-  }
-
-  // Insert new decl
-  pd_decls[pd_decls_used++] = e;
-}
-
-// Add a node to set of nodes representing manifest types defined in this scope
-void
-UTL_Scope::add_to_local_types(AST_Decl *e)
-{
-  AST_Decl	**tmp;
-  long		olocals_allocated;
-  long		i;
-
-  if (e == NULL) return;
-
-  // Make sure there's space for one more
-  if (pd_locals_allocated == pd_locals_used) {
-
-    olocals_allocated	= pd_locals_allocated;
-    pd_locals_allocated 	+= INCREMENT;
-    tmp			= new AST_Decl *[pd_locals_allocated];
-
-    for (i = 0; i < olocals_allocated; i++)
-      tmp[i] = pd_local_types[i];
-
-    delete []pd_local_types;
-
-    pd_local_types = tmp;
-  }
-
-  // Insert new decl
-  pd_local_types[pd_locals_used++] = e;
-}
-
-// Has this node been referenced here before?
-idl_bool
-UTL_Scope::referenced(AST_Decl *e)
-{
-  long		i = pd_referenced_used;
-  AST_Decl	**tmp = pd_referenced;
-
-  for (; i > 0; i--, tmp++)
-    if (*tmp == e)	// Same node?
-      return I_TRUE;
-
-  return I_FALSE;		// Not found
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// AST Dumping
-void
-UTL_Scope::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-
-  if (idl_global->indent() == NULL)
-    idl_global->set_indent(new UTL_Indenter());
-
-  idl_global->indent()->increase();
-
-  if (pd_locals_used > 0) {
-    i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_localtypes);
-
-    o << GTDEVEL("\n/* Locally defined types: */\n");
-    while (!(i->is_done())) {
-      d = i->item();
-      if (!d->imported()) {
-	idl_global->indent()->skip_to(o);
-	d->dump(o);
-	o << "\n";
-      }
-      i->next();
-    }
-    delete i;
-  }
-
-  if (pd_decls_used > 0) {
-    i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-
-    o << GTDEVEL("\n/* Declarations: */\n");
-    while (!(i->is_done())) {
-      d = i->item();
-      if (!d->imported()) {
-	idl_global->indent()->skip_to(o);
-	d->dump(o);
-	o << ";\n";
-      }
-      i->next();
-    }
-    delete i;
-  }
-
-  idl_global->indent()->decrease();
-}
-
-// How many entries are defined?
-unsigned long
-UTL_Scope::nmembers()
-{
-   return pd_decls_used;
-}
-
-// UTL_SCOPE_ACTIVE_ITERATOR
-
-/*
- * Constructor
- */
-
-UTL_ScopeActiveIterator::UTL_ScopeActiveIterator(
-				       UTL_Scope *s,
-				       UTL_Scope::ScopeIterationKind i)
-			: iter_source(s),
-			  ik(i),
-			  stage(i == UTL_Scope::IK_both
-				? UTL_Scope::IK_decls
-				: i),
-			  il(0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Advance to next iterm
-void
-UTL_ScopeActiveIterator::next()
-{
-  il++;
-}
-
-// Get current item
-AST_Decl	*
-UTL_ScopeActiveIterator::item()
-{
-  if (is_done())
-    return NULL;
-  if (stage == UTL_Scope::IK_decls)
-    return iter_source->pd_decls[il];
-  if (stage == UTL_Scope::IK_localtypes)
-    return iter_source->pd_local_types[il];
-
-  return NULL;
-}
-
-// Is this iteration done?
-idl_bool
-UTL_ScopeActiveIterator::is_done()
-{
-  long	limit;
-
-  limit = (stage == UTL_Scope::IK_decls)
-    ? iter_source->pd_decls_used
-    : iter_source->pd_locals_used;
-
-  for (;;) {
-    if (il < limit)				// Last element?
-      return I_FALSE;
-    if (stage == UTL_Scope::IK_localtypes)	// Already done local types?
-      return I_TRUE;
-    if (ik == UTL_Scope::IK_decls)		// Only want decls?
-      return I_TRUE;
-
-    // Switch to next stage
-    stage = UTL_Scope::IK_localtypes;
-    il = 0;
-    limit = iter_source->pd_locals_used;
-  }
-}
-
-// What kind of iterator is this?
-UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_kind()
-{
-  return ik;
-}
-
-// And where are we in the iteration?
-UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_stage()
-{
-  return stage;
-}
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
deleted file mode 100644
index 5c6ef85cbd2..00000000000
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * utl_stack.cc - Implementation of class UTL_ScopeStack
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Class UTL_ScopeStack
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Constructor(s) and destructor
- */
-
-UTL_ScopeStack::UTL_ScopeStack()
-  : pd_stack_data(new UTL_Scope *[INCREMENT]),
-    pd_stack_data_nalloced(INCREMENT),
-    pd_stack_top(0)
-{
-}
-
-UTL_ScopeStack::~UTL_ScopeStack()
-{
-  if (pd_stack_data != NULL)
-    delete pd_stack_data;
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Push an element on the stack
-UTL_ScopeStack *
-UTL_ScopeStack::push(UTL_Scope *el)
-{
-  UTL_Scope	**tmp;
-  AST_Decl	*d = ScopeAsDecl(el);
-  long		ostack_data_nalloced;
-  long		i;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (d);
-
-  // Make sure there's space for one more
-  if (pd_stack_data_nalloced == pd_stack_top) {
-    ostack_data_nalloced = pd_stack_data_nalloced;
-    pd_stack_data_nalloced += INCREMENT;
-    tmp			 = new UTL_Scope *[pd_stack_data_nalloced];
-
-    for (i = 0; i < ostack_data_nalloced; i++)
-      tmp[i] = pd_stack_data[i];
-
-    delete []pd_stack_data;
-    pd_stack_data = tmp;
-  }
-
-  // Insert new scope
-  pd_stack_data[pd_stack_top++] = el;
-
-  return this;
-}
-
-// Pop an element from the stack
-void
-UTL_ScopeStack::pop()
-{
-  UTL_Scope	*s;
-
-  if (pd_stack_top <= 0)
-    return;
-  s = pd_stack_data[--pd_stack_top];
-}
-
-// Return top element on stack
-UTL_Scope *
-UTL_ScopeStack::top()
-{
-  if (pd_stack_top <= 0)
-    return NULL;
-  return pd_stack_data[pd_stack_top - 1];
-}
-
-// Return bottom element on stack
-UTL_Scope *
-UTL_ScopeStack::bottom()
-{
-  if (pd_stack_top == 0)
-    return NULL;
-  return pd_stack_data[0];
-}
-
-// Clear entire stack
-void
-UTL_ScopeStack::clear()
-{
-  pd_stack_top = 0;
-}
-
-// How deep is the stack?
-unsigned long
-UTL_ScopeStack::depth()
-{
-  return pd_stack_top;
-}
-
-// Return (top - 1) element on stack
-UTL_Scope *
-UTL_ScopeStack::next_to_top()
-{
-  UTL_Scope	*tmp, *retval;
-
-  if (depth() < 2)
-    return NULL;
-
-  tmp = top();		// Save top
-  (void) pop();		// Pop it
-  retval = top();	// Get next one down
-  (void) push(tmp);	// Push top back
-  return retval;	// Return next one down
-}
-
-// Return topmost non-NULL element
-UTL_Scope *
-UTL_ScopeStack::top_non_null()
-{
-  long		i;
-
-  for (i = pd_stack_top - 1; i >= 0; i--)
-    if (pd_stack_data[i] != NULL)
-      return pd_stack_data[i];
-  return NULL;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// Class UTL_ScopeStackActiveIterator
-
-/*
- * Constructor(s)
- */
-
-UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator(UTL_ScopeStack *s)
-			    : source(s),
-			      il(s->pd_stack_top - 1)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Advance to next item
-void
-UTL_ScopeStackActiveIterator::next()
-{
-  il--;
-}
-
-// Get current item
-UTL_Scope *
-UTL_ScopeStackActiveIterator::item()
-{
-  if (il >= 0)
-    return source->pd_stack_data[il];
-  return NULL;
-}
-
-// Is this iteration done?
-long
-UTL_ScopeStackActiveIterator::is_done()
-{
-  if (il >= 0)
-    return I_FALSE;
-  return I_TRUE;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
deleted file mode 100644
index 10cc46830a7..00000000000
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_string.cc - Implementation of quick and dirty TEMPORARY String
-//		   for IDL compiler
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-
-UTL_String::UTL_String (void) 
-  : p_str (NULL), 
-    len (0), 
-    alloced (0) 
-{
-}
-
-UTL_String::UTL_String (char *str)
-{
-  if (str == NULL) 
-    {
-      len = alloced = 0;
-      p_str = c_str = NULL;
-    } 
-  else 
-    {
-      len = ACE_OS::strlen (str);
-      alloced = len + 1;
-      p_str = new char [alloced];
-      c_str = new char [alloced];
-      ACE_OS::strcpy (p_str, str);
-      canonicalize ();
-    }
-}
-
-UTL_String::UTL_String (unsigned long maxlen)
-{
-  len = maxlen;
-  alloced = maxlen + 1;
-  p_str = new char [alloced];
-  c_str = new char [alloced];
-  p_str[0] = '\0';
-  c_str[0] = '\0';
-}
-
-UTL_String::UTL_String (UTL_String *s)
-{
-  char	*b;
-
-  if (s == NULL) 
-    {
-     p_str = c_str = NULL;
-     alloced = len = 0;
-    } 
-  else 
-    {
-      b = s->get_string ();
-      if (b == NULL) 
-        {
-          p_str = c_str = NULL;
-          alloced = len = 0;
-        } 
-      else 
-        {
-          len = ACE_OS::strlen (b);
-          alloced = len + 1;
-          p_str = new char [alloced];
-          c_str = new char [alloced];
-          ACE_OS::strcpy (p_str, b);
-          canonicalize ();
-        }
-    }
-}
-
-/*
- * Private operations
- */
-
-// Compute a canonical form for this string. This is (implemented as)
-// a corresponding string with all upper case characters where the
-// original has lower case characters, identical characters otherwise.
-void
-UTL_String::canonicalize (void)
-{
-  unsigned long	i;
-
-  for (i = 0; i < len; i++)
-    c_str[i] = isalpha (p_str[i]) ? toupper (p_str[i]) : p_str[i];
-
-  c_str[i] = '\0';
-}
-
-/*
- * Public operations
- */
-
-// Compare two String *
-long
-UTL_String::compare (UTL_String *s)
-{
-  char	*s_c_str;
-  long	result;
-
-  if (c_str == NULL || s == NULL || (s_c_str = s->get_canonical_rep ()) == NULL)
-    result = I_FALSE;
-  else
-    result = (ACE_OS::strcmp (c_str, s_c_str) == 0) ? I_TRUE : I_FALSE;
-
-  /*
-   * Check that the names are typed consistently
-   */
-  if (result == I_TRUE && ACE_OS::strcmp (p_str, s->get_string ()) != 0)
-    idl_global->err ()->name_case_error (p_str, s->get_string ());
-
-  return result;
-}
-
-// Get the char * from a String
-char *
-UTL_String::get_string (void)
-{
-  return p_str;
-}
-
-// Get the canonical representation from a String
-char *
-UTL_String::get_canonical_rep (void)
-{
-  if (c_str == NULL) 
-    {
-      c_str = new char [alloced];
-      canonicalize ();
-    }
-  return c_str;
-}
-
-/*
- * Redefined virtual operations
- */
-
-// AST Dumping
-void
-UTL_String::dump (ostream &o)
-{
-  o << p_str;
-}
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
deleted file mode 100644
index d2aac678822..00000000000
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// $Id$
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_strlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_StrList::UTL_StrList(String *s, UTL_StrList *cdr)
-	   : UTL_List(cdr),
-	     pd_car_data(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-String *
-UTL_StrList::head()
-{
-  return pd_car_data;
-}
-
-// Set list item
-void
-UTL_StrList::set_head(String *s)
-{
-  pd_car_data = s;
-}
-
-// Get last item of this list
-String *
-UTL_StrList::last_component()
-{
-  if (tail() == NULL)
-    return pd_car_data;
-  return ((UTL_StrList *) tail())->last_component();
-}
-
-// Copy a list
-UTL_List *
-UTL_StrList::copy()
-{
-  if (tail() == NULL)
-    return new UTL_StrList(head(), NULL);
-  return new UTL_StrList(head(), (UTL_StrList *) tail()->copy());
-}
-
-// AST Dumping
-void
-UTL_StrList::dump(ostream &o)
-{
-  char			      *s;
-  UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator(this);
-  idl_bool		       first = I_TRUE;
-  idl_bool		       second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    s = i->item()->get_string();
-    o << s;
-    if (first) {
-      if (strcmp(s, "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_StrList active iterator
-
-/*
- * Constructor
- */
-
-UTL_StrlistActiveIterator::UTL_StrlistActiveIterator(UTL_StrList *s)
-			   : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-String *
-UTL_StrlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_StrList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
deleted file mode 100644
index 2652f24a7c7..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_decllist.cc
-//
-// Implementation of a list of declarators
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_DeclList::UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr)
-	    : UTL_List<UTL_DeclList, FE_Declarator>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_DeclList active iterator
-
-/*
- * Constructor
- */
-
-UTL_DecllistActiveIterator::UTL_DecllistActiveIterator(UTL_DeclList *s)
-		    : UTL_ListActiveIterator<UTL_DeclList, FE_Declarator>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefined inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
deleted file mode 100644
index 323c316756a..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_exceptlist.cc
-//
-// Implementation of a list of exceptions
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_ExceptList::UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr)
-	      : UTL_List<UTL_ExceptList, AST_Exception>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExceptList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExceptlistActiveIterator::UTL_ExceptlistActiveIterator(UTL_ExceptList *s)
-		: UTL_ListActiveIterator<UTL_ExceptList, AST_Exception>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
deleted file mode 100644
index 333f2506774..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_exprlist.cc
-//
-// Implementation of a list of strings
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_ExprList::UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr)
-	    : UTL_List<UTL_ExprList, AST_Expression>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExprList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExprlistActiveIterator::UTL_ExprlistActiveIterator(UTL_ExprList *s)
-		  : UTL_ListActiveIterator<UTL_ExprList, AST_Expression>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
deleted file mode 100644
index e4f0b0a8291..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_idlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_IdList::UTL_IdList(Identifier *s, UTL_IdList *cdr)
-	  : UTL_List<UTL_IdList, Identifier>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get last item of this list
-Identifier *
-UTL_IdList::last_component()
-{
-  if (tail() == NULL)
-    return head();
-  return tail()->last_component();
-}
-
-// AST Dumping
-void
-UTL_IdList::dump(ostream &o)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator(this);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    i->item()->dump(o);
-    if (first) {
-      if (strcmp(i->item()->get_string(), "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_IdList active iterator
-
-/*
- * Constructor
- */
-
-UTL_IdListActiveIterator::UTL_IdListActiveIterator(UTL_IdList *s)
-			: UTL_ListActiveIterator<UTL_IdList, Identifier>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
deleted file mode 100644
index 9d285e036f5..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_labellist.cc
-//
-// Implementation of a list of scoped names
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_LabelList::UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr)
-	     : UTL_List<UTL_LabelList, AST_UnionLabel>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_LabelList active iterator
-
-/*
- * Constructor
- */
-
-UTL_LabellistActiveIterator::UTL_LabellistActiveIterator(UTL_LabelList *s)
-		   : UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
deleted file mode 100644
index 61effde260e..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_list.cc
-//
-// Implementation of generic single-linked lists
-
-#include	<stddef.h>
-#include	<utl_list.hh>
-#include	<idl_bool.hh>
-
-/*
- * Constructor(s)
- */
-
-template<class L, class T>
-UTL_List<L, T>::UTL_List(T *c, L *l)
-	: pd_car_data(c),
-	  pd_cdr_data(l) 
-{
-}
-
-/*
- * Private operations
- */
-
-// Compute list length
-template<class L, class T>
-long
-UTL_List<L, T>::list_length(long n)
-{
-  if (pd_cdr_data == NULL)
-    return n;
-  else
-    return pd_cdr_data->list_length(n+1);
-}
-
-/*
- * Public operations
- */
-
-// Smash last cdr with l
-template<class L, class T>
-void
-UTL_List<L, T>::nconc(L *l)
-{
-  if (pd_cdr_data == NULL)
-    pd_cdr_data = l;
-  else
-    pd_cdr_data->nconc(l);
-}
-
-/*
- * Override this operation to copy lists of other types
- */
-// Copy a list
-template<class L, class T>
-L *
-UTL_List<L, T>::copy()
-{
-  if (pd_cdr_data == NULL)
-    return new L(head(), NULL);
-  return new L(head(), pd_cdr_data->copy());
-}
-
-// Get list item
-template<class L, class T>
-T *
-UTL_List<L, T>::head()
-{
-  return pd_car_data;
-}
-
-// Get next list
-template<class L, class T>
-L *
-UTL_List<L, T>::tail()
-{
-  return pd_cdr_data;
-}
-
-// Set list item
-template<class L, class T>
-void
-UTL_List<L, T>::set_head(T *s)
-{
-  pd_car_data = s;
-}
-
-// Set next list
-template<class L, class T>
-void
-UTL_List<L, T>::set_tail(L *l)
-{
-  pd_cdr_data = l;
-}
-
-// Compute list length
-template<class L, class T>
-long
-UTL_List<L, T>::length()
-{
-  return list_length(1);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_List active iterator
-
-/*
- * Constructor
- */
-
-template<class L, class T>
-UTL_ListActiveIterator<L, T>::UTL_ListActiveIterator(UTL_List<L, T> *s)
-		      : source(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Is iterator done?
-template<class L, class T>
-long
-UTL_ListActiveIterator<L, T>::is_done()
-{
-  return (source == NULL) ? I_TRUE : I_FALSE;
-}
-
-// Get current item
-template<class L, class T>
-T *
-UTL_ListActiveIterator<L, T>::item()
-{
-  if (source == NULL)
-    return NULL;
-  return source->head();
-}
-
-// Advance to next item
-template<class L, class T>
-void
-UTL_ListActiveIterator<L, T>::next()
-{
-  if (source != NULL)
-    source = source->tail();
-}
-
-/*
- * Redefinition of inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
deleted file mode 100644
index 0a5f97d3147..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_namelist.cc
-//
-// Implementation of a list of scoped names
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-typedef UTL_List<UTL_NameList, UTL_ScopedName> _dummy_;
-
-/*
- * Constructor(s)
- */
-
-UTL_NameList::UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr)
-	    : UTL_List<UTL_NameList, UTL_ScopedName>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_NameList active iterator
-
-/*
- * Constructor
- */
-
-UTL_NamelistActiveIterator::UTL_NamelistActiveIterator(UTL_NameList *s)
-		    : UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
deleted file mode 100644
index 3311b089d79..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_strlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_StrList::UTL_StrList(String *s, UTL_StrList *cdr)
-	   : UTL_List<UTL_StrList, String>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get last item of this list
-String *
-UTL_StrList::last_component()
-{
-  if (tail() == NULL)
-    return head();
-  return tail()->last_component();
-}
-
-// AST Dumping
-void
-UTL_StrList::dump(ostream &o)
-{
-  char			      *s;
-  UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator(this);
-  long			       first = I_TRUE;
-  long			       second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    s = i->item()->get_string();
-    o << s;
-    if (first) {
-      if (strcmp(s, "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_StrList active iterator
-
-/*
- * Constructor
- */
-
-UTL_StrlistActiveIterator::UTL_StrlistActiveIterator(UTL_StrList *s)
-			   : UTL_ListActiveIterator<UTL_StrList, String>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/VERSION b/TAO/VERSION
deleted file mode 100644
index d4f6fdd6e35..00000000000
--- a/TAO/VERSION
+++ /dev/null
@@ -1,5 +0,0 @@
-This is TAO version 0.1.13, released Tue Apr 14 00:51:45 1998.
-
-If you have any problems with TAO, please send email to Douglas
-C. Schmidt (schmidt@cs.wustl.edu) and Chris Cleeland
-(cleeland@cs.wustl.edu).
diff --git a/TAO/announcement b/TAO/announcement
deleted file mode 100755
index f9d33c28e9e..00000000000
--- a/TAO/announcement
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-VERSION=`cat VERSION`
-URL="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO.tar.gz"
-
-
-cat <<@EOM
-
-The first official beta release of The ACE ORB (TAO) has been released
-by the Distributed Object Computing (DOC) Group at Washington
-University in St. Louis.  TAO is a freely available CORBA
-2.x-compliant ORB with real-time extensions that can be downloaded
-from the Internet at
-
-http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO.tar.gz
-
-$VERSION
-
-TAO uses IIOP 1.0 as its inter-ORB communication protocol and provides
-the first implementation of the OMG's Portable Object Adapter (POA)
-specification and latest IDL->C++ mappings.  For more information
-about the POA, please see
-
-http://www.cs.wustl.edu/~schmidt/C++-report-col11.ps.gz
-http://www.cs.wustl.edu/~schmidt/C++-report-col12.ps.gz
-
-For more information on TAO, please see
-
-http://www.cs.wustl.edu/~schmidt/TAO.html
-
-TAO has been ported to a range of OS platforms including Windows NT
-4.x using MSVC++ 4.x and 5.x, several versions of UNIX (e.g., Solaris
-2.x, SGI IRIX 6.x, Linux, SCO, NetBSD, and FreeBSD), and Real-Time
-OS's (RTOSs) (e.g., VxWorks and Chorus).  Ultimately, TAO will be
-ported to all OS platforms on which ACE runs.  We have used TAO to
-interwork with other ORBs (e.g., Orbix, COOL, CORBAPlus, and
-VisiBroker), so we're confident that its IIOP implementation is robust
-and interoperable.
-
-For information on installation and system requirements, please see
-http://www.cs.wustl.edu/~schmidt/TAO-INSTALL.html (or INSTALL) in the
-root directory of the unpacked tar file.
-
-Note that ACE is required to build TAO.  Typically the most recent
-beta release is required, which you can obtain at
-
-http://www.cs.wustl.edu/~schmidt/ACE.html
-
-Please see the installation notes for more details.
-
-Other HTML documentation is available in the '$TAO_ROOT/docs/'
-directory.
-
-We welcome suggestions for improvement, bug fixes, portability
-enhancements, etc.  If you have any questions or problems with TAO,
-please post them to the ACE mailing list (ace-users@cs.wustl.edu) or
-send email to Douglas C. Schmidt (schmidt@cs.wustl.edu) and Chris
-Cleeland (cleeland@cs.wustl.edu).
-
-The TAO Team
-@EOM
diff --git a/TAO/docs/DIFFERENCES b/TAO/docs/DIFFERENCES
deleted file mode 100644
index 0a8dd343d4d..00000000000
--- a/TAO/docs/DIFFERENCES
+++ /dev/null
@@ -1,360 +0,0 @@
-@(#)DIFFERENCES	1.1 95/09/13
-
-[ NOTE that the CORBA 2.0 specifications have now been published, but are
-not yet sufficiently available that this document can usefully just list
-any differences between that specification and this software.  As a rule,
-there are no differences between this software and CORBA 2.0 in areas
-where CORBA 2.0 has specified an interface. ]
-
-
-This document summarizes known differences between what is implemented in
-this software and currently available OMG specifications.  As a rule, these
-establish compatibility with revised specifications that are currently being
-prepared for publication. However, in some cases the differences resolve
-problems that are currently being addressed by ORB taskforces.  When those
-revised CORBA specifications are published, this document will be updated to
-reflect any remaining differences from them.
-
-The reason for those changes is that different specifications were adopted
-at the same time and there were in some cases subtle differences which need
-to be resolved.  Minor errata have also been fixed.  None of these changes
-are substantial, with the exception of the TypeCode interpreter API which
-was added to the C++ mapping.
-
-Also, note that the goal of this software is fidelity to the IIOP, so that
-issues relating (in particular) to the C++ language mapping or other OMG
-specifications were judged to be of less importance at this time.
-
-
-DIFFERENCES from IIOP in UNO Spec (95-3-10)
--------------------------------------------
-Some changes to the original specification (94-9-32) for the IIOP protocol
-were found to be necessary; most related to the subsequently adopted Interface
-Repository (IFR) specification (94-11-7).  Others resulted from correction
-of minor editorial errors, and experience gained as multiple teams implement
-to that specification.
-
-The bulk of those changes have been incorporated into the 95-3-10 document,
-but these few have not.
-
-
-CDR TYPECODE INDIRECTION
-
-An additional constraint on the use of typecode indirection has been
-identified.  Specifically, the typecode to which an indirection points
-be "self-sufficient", and may not point "outside of itself" for any
-further indirections.  For example, always indirections occur within
-encapsulations, so it's OK for the indirection to point anywhere in
-that encapsulation, or at the encoded TCKind enum value immediately
-before the encapsulation's length.  For typecode encapsulations nested
-inside other typecode encapsulations, the indirection may point no
-further than the outermost encapsulation.
-
-Also, when an indirection points to another typecode, the byte order
-of that other typecode must be deduced from the encoded value found
-there.  This is straightforward for encoded TCKind values, all of which
-fit into a single byte:  if the first byte of the word is zero, then
-the encoding is big-endian, else it's little-endian.
-
-Indirecting to another indirection is not allowed, since the byte order
-of the encoded offset can't consistently be deduced.
-
-
-MISCELLANY
-
-The type GIOP::Version is assumed to be identical to IIOP::Version.
-As part of the editorial separation of GIOP from its Internet version
-IIOP, this typedef was accidentally omitted.
-
-This implementation of IIOP supports the OMG-IDL Primitive Data Types as
-defined in Appendix A of 94-9-32, but with TCKind numbers following the new
-tk_exception and tk_alias codes.  (That is, rather than using range 21-25,
-these TCKind values are in the range 23-27.)
-
-These data types are currently the topic of an RFP in process in the OMG,
-and are not currently defined as part of a current OMG specification. 
-Clients and servers using these extended data types are relying on CORBA
-extensions that are not yet standardized; and should be prepared to change.
-
-
-CORBA 2.0/CORE Differences
---------------------------
-As of this writing, the new CORBA 2.0/CORE document has not yet been made
-available.  This is a modification of the CORBA 1.2 document, with the
-addition of (mandatory) extensions from the UNO (94-9-32) specification:
-notably DSI and some new object reference operations.  This summarizes
-differences between the as-yet-unpublished CORBA 2.0/CORE document and
-the original text in the UNO specification.
-
-
-DYNAMIC SKELETON INTERFACE
-
-Since the new "tk_except" typecodes now include the exception ID (this is
-the repository ID describing the exception's type) the "exception" operation
-used to report an exception through a ServerRequest no longer includes the
-exception ID.
-
-Since the OperationDef entries for attributes are no longer found in the
-interface repositories, the ServerRequest convenience operation to return
-this has been removed.  Application programs (such as bridges) must compare
-the operation name string with the prefixes "_get_" and "_set_" to see if
-any given operation applies to an attribute.  If an operation is one of the
-two for which an OMG-IDL "attribute" declaration is shorthand, then the
-application must search the interface repository for that attribute.
-
-(There are in fact three categories of operations on which an object adapter
-and implementation collaborate to handle:  user defined operations, user
-defined attributes, and operations defined by CORBA such as "is_a" and
-"get_implementation".  Some object adapters, like the BOA, handle this last
-category directly, rather than exposing it to applications.)
-
-The "non_existent" objref operation accidentally used attribute syntax; this
-has been corrected.  All operations on CORBA::Object references now use
-normal operation syntax in their (pseudo) IDL definitions, and are uniformly
-prefixed with underscores as part of their C++ mapping.
-
-
-DIFFERENCES from IDL C++ Mapping (94-9-14)
-------------------------------------------
-There are four basic ways in which the IIOP framework does not comply
-with the OMG's IDL C++ mapping specification, beyond the use of the CORBA2
-module/namespace rather than the CORBA module/namespace.  (CORBA2 is used
-so that this software can be linked with existing ORBs, which should be
-using the CORBA module/namespace already.)
-
-These ways are beyond the portability-derived use of the "class" construct
-(instead of the C++ namespace construct), and the use of CORBA2::Environment
-(rather than C++ exceptions), both of which are accomodated by the mapping:
-
-    (1) This framework does not attempt to be complete.
-    
-	Completeness is not required to implement the Internet IOP,
-	so time was not spent in providing a complete mapping.
-
-    (2) In some cases the API provided is not the one in the mapping.
-	For example CORBA2::Environment is not always passed in all
-	operations.  This was done to promote ease of implementation
-	and coding.
-
-    (3) Implementation details are generally exposed.
-
-	This isn't so much a noncompliance issue (it's not specified
-	that such details must be hidden) as an issue of allowing
-	noncompliant applications.  The effort required to actively
-	prevent use of implementation details by higher level code
-	would be nontrivial, and could slow down IIOP code, so no
-	time was applied to hiding such details.
-
-	(However, note that when the software was modified to use COM,
-	standard C++ techniques were used to hide most such details.)
-
-    (4) The C++ mapping needs completion in some areas.
-
-	Notably, 94-9-14 does not satisfy requirements to provide
-	support for for all data types in an "Any" or exception without
-	needing any precompiled data type support routines.  The
-	TypeCode interpreter addresses this issue.
-
-	Some additional operations were not adopted at the time 94-9-14
-	was defined; both 94-9-32 and 94-11-7 added new ORB interfaces
-	which are not found in the initial C++ mapping document.
-
-With respect to this fourth issue, descriptions of the API extensions
-used is provided later in this file.  The additional CORBA operations
-are not described since their mapping is straightforward if it isn't given
-in those documents.
-
-
-ACCESS TO ALL DATA IN "ANY" AND EXCEPTIONS
-
-The "void *" value in an "Any", and any "CORBA2::Exception *" value, may
-always be passed to the TypeCode interpreter (see next).  This allows access
-to all data held within an "Any" and an Exception.  The "void *" value in an
-Any with an exception TypeCode is of type CORBA2::Exception *".  Due to
-the way CORBA is specified, it is not possible to tell whether an "Any"
-holding an exception denotes a user or standard (system-defined) exception
-except by exhaustive comparison against exception IDs.
-
-Also, _all_ legal OMG-IDL data types may be held in an "Any", and may be
-manipulated using the TypeCode interpreter.  This satisfies a language
-mapping requirement that DII (and DSI) be able to manipulate all OMG-IDL
-data types without requiring compiler generated support for them.
-
-
-TYPECODE INTERPRETER
-
-In any given C/C++ execution environment there is a binary standard for how
-data is represented.  While that standard will differ between execution
-environments, there are a very limited number of ways in which those
-representations differ.  Those differences are encapsulated only in the
-TypeCode interpreter, so that portable applications using the dynamic
-typing infrastructure in the ORB can completely ignore how it's done in
-any particular environment.
-
-The APIs in this software distribution have been suggested for adoption as
-part of the OMG specification suite.  The two APIs are nonstatic member
-functions in the C++ mapping's TypeCode pseudo-object, and are augmented
-by a single new enumeration type.
-
-    unsigned long	size() 
-
-	This returns the size of an instance of the type that is
-	described by the TypeCode.
-	
-	For example, when invoked on the typecode constant CORBA::_tc_Short,
-	the value returned is sizeof(CORBA::Short); and when invoked on the
-	typecode for a structure, it is the size of that structure (including
-	any internal and tail padding needed).  When invoked on a sequence
-	typecode, it returns a value that does not include the size for
-	any embedded buffer.
-    
-    enum traverse_status {TRAVERSE_STOP, TRAVERSE_CONTINUE };
-	
-	This is a data type used in the traverse() member function.
-	It allows data type traversal to be terminated early for
-	non-exceptional conditions, and eliminates the confusion
-	that some similar APIs have created when they use a single
-	boolean value (does TRUE mean to stop, or to continue?).
-
-    traverse_status	traverse (
-			    const void	*value1;
-			    const void	*value2
-			    traverse_status	visit (
-				    TypeCode_ptr	tc,
-				    const void		*visit_value1,
-				    const void		*visit_value2,
-				    void		*visit_context
-				),
-			    void	*context
-			);
-
-	(In the current language mapping, CORBA2::Environment references
-	are passed as the final parameter to the 'traverse' and 'visit'
-	routines for use when reporting exceptions.)
-
-	The pointers "value1" and "value2" point to instances of the
-	data type described by the typecode (or are null pointers).
-
-	For each constituent of that data type (e.g. structure member)
-	the visit() routine is called once.   The constituent's type
-	is described by "tc"; "visit_value1" points to the constituent
-	of that type in "value1" (assuming the traverse routine was
-	not passed a null pointer) and similarly for "visit_value2".
-	The "visit_context" parameter is the context parameter passed
-	to the traverse() routine, and can point to whatever data is
-	needed by the visit() routine.
-
-	Members are traversed in first-to-last order, as defined in the
-	IDL specification for the data type.  So for example, the
-	visit routine for a structure could print out each element
-	on a IO stream passed through the context parameter, perhaps in
-	a neatly formatted form intended for human consumption.
-
-	The visit() function may choose to recursively traverse() each
-	element.  So for example if "tc->kind()" in a visit routine
-	returned CORBA::tk_struct, the contents of that struct would
-	be ignored unless the visit routine invoked traverse() using
-	the typecode and values passed to it.
-
-	If the visit() routine returns TRAVERSE_CONTINUE, succeeding
-	constituents of the data type are visited in turn; if it
-	returns TRAVERSE_STOP, the traverse() routine returns that
-	value to its caller.  Of course, if a visit() routine calls
-	traverse() itself, it may choose to ignore TRAVERSE_STOP.
-
-The traverse() routine is a powerful tool.  It is used in the IIOP code
-itself in several ways; look at such use for tutorial details.  You could
-implement data value comparison and "debug" data dumping as simple exercises
-in the use of these APIs.
-
-The "marshaling interpreter" (marshal.cc) uses it to encode and decode
-values according to the IIOP protocol specification.  The "Any" code
-(any.cc) uses traverse() both to free embedded pointers, and to make "deep"
-copies of any data structure given its TypeCode.
-
-Only that "deep copy" visit routine uses "value2" as anything other than a
-null pointer; it allows efficient construction of "deep copies" without
-needing extra space for temporary values or coroutine stacks.  (A general
-purpose two-value comparison could also use "value2".)  Most uses of the API
-only manipulate a single data value at a time; no realistic need has yet
-been seen for manipulating more than two data values at once.
-
-With respect to the OMG C and C++ mappings, it is clear that this style API
-must be provided for the C mapping, but some people have noted that a
-"purer" object oriented style API could also be provided in C++.  That style
-would use another internal visit routine, performing the requisite "switch"
-over the fixed number of TCKind values, and then make a virtual function
-call to an instance of a C++ class whose private state was the "context" and
-whose member functions matched the arms of the switch.
-
-
-MEMORY ALLOCATION
-
-In order to dynamically manipulate instances of arbitrary data types,
-applications need to be able to allocate and free memory.  The OMG C++
-mapping only says how to do this for data types which have static C++
-interfaces defined, which is clearly inadequate for using constructed
-types with the DII/DSI/Any family of interfaces.
-
-This infrastructure requires the standard "malloc" and "free" primitives to
-be used, and cast to the appropriate type.  Data allocated using malloc
-will normally be sized according to TypeCode::size(), and then be stored
-inside an Any.  When the Any is deleted, if the ORB deallocates the memory
-it always uses "free" (including for any nested pointers, and correctly
-handling cases such as arrays and sequences).
-
-Note that to support implementations where C and C++ language bindings
-share the same ORB infrastructure, this solution is inadequate.  This is
-because the C binding's CORBA_free() interface would have no way to
-determine the type of the data being freed.  Instead, typed allocation
-APIs will need to be used even when using the dynamically typed CORBA
-subsystem ... a TypeCode::malloc() routine would suffice, if it returned
-memory that was internally tagged with that TypeCode.  In such a case,
-the CORBA_free() routine could use that TypeCode to "deep free" data as
-required, and C++ "new" and "delete" operators would need to know about
-the internal tagging for all those data types.  Such tagged allocation
-would need to be used for all data that was to be freed by the ORB.
-
-(Having the C mapping require use of "typed free" routines, instead of the
-CORBA_free interface, is sufficient to eliminate this problem.)
-
-
-PASSING EXCEPTIONS THROUGH THE DII
-
-The C++ mapping's Dynamic Invocation Interface (DII) has key omissions
-in that it doesn't say how to access to user-defined exception values,
-and implicitly requires ORBs either to pass "excess" data on the wire
-or else to consult an interface repository to deal with exceptions or
-(deprecated) "context" strings.
-
-This software changes the DII specification in two ways to support the
-requirement for DII users to be able to see user-defined exceptions, yet
-not to violate the OMG-IDL type model by reporting illegal exceptions:
-
-    * The Object::_create_request() member function, through which DII
-      users provide all the information included in an IDL operation's
-      signature, has an additional parameter.
-
-      That parameter is a sequence of exception typecodes, describing
-      the user-defined exceptions that the operation can return.  (The
-      standard exceptions defined in CORBA may always be returned.)
-      When any other exception is returned, the client's ORB reports that
-      the object's type definition has been violated by the server's ORB.
-
-    * The TypeCode interpreter (see above) may be used to examine all
-      exception values reported through a CORBA::Environment.  A new
-      Exception::id() operation may be used to determine which typecode
-      should be used.
-
-Note that a number of portability and specification problems have been
-identified in the current C++ mapping for DII, e.g. for details of memory
-management.  Later versions of this code may attempt to closely comply
-with an improved mapping for DII, to the extent that the interpretation
-used here differs from that more unambiguous specification.
-
-Since there is no efficient way to distinguish typecodes for user defined
-exceptions from ones for system-defined ("standard") exceptions (comparing
-the exception ID against all the system defined ones is inefficient :-)
-a new enum type "ExceptionType" is defined.  (An analogous type is already
-defined for the C language mapping.)  This is used to report exceptions
-through DII and DSI.
diff --git a/TAO/docs/HISTORY b/TAO/docs/HISTORY
deleted file mode 100644
index d97a8e35b2e..00000000000
--- a/TAO/docs/HISTORY
+++ /dev/null
@@ -1,44 +0,0 @@
-@(#)HISTORY	1.1 95/09/13
-
-Mmmmmmmm DD, 1995 -- RELEASE 1.3:
----------------------------------
-Release 1.3 includes bugfixes, and support for the COM binary interface
-model, both on UNIX and on MS-Windows platforms.  The source tree has
-been considerably restructured, with the goal of enabling addition of
-other components at both the binary and source levels.
-
-
-September 1, 1995 -- RELEASE 1.2:
----------------------------------
-Release 1.2 includes fixes for problems noted in the recent multivendor
-interoperability testing at Object World, and as reported by other users on
-the Internet.  The most notable of these is that in some cases, when using
-multiple connections to IIOP servers and clients, the connection management
-code previously would get confused about which connection was which.  (One
-consequence of fixing this is that an old test has been removed.)  Also,
-there was no simple way to use Solaris 2.4 threads; see the Makefile for
-details.  A few other minor features were added to facilitate use of this
-code for more than just protocol testing.
-
-
-June 28, 1995 -- RELEASE 1.1:
------------------------------
-Release 1.1 includes support for several new platforms.  Particular thanks
-go to the team at APM, which contributed the bulk of the new "autoconf"
-support (substantially enhancing portability), support for DEC Alpha and
-HP 9000 platforms, runtime initialization of the size and alignment table
-used to drive the typecode interpreter, and more; see README.apm for details.
-
-Release 1.1 includes POSIX.1c threading support; on platforms which provide
-POSIX.1c threads, applications will be able to take advantage of them.
-
-Union and indirection support has been added to the TypeCode interpreter,
-and more typecode utility APIs have been implemented.  Various bugfixes and
-cleanup have also been provided.  Unfinished stubs for the COS Naming service
-are included; these rely on C++ exception support.
-
-
-March 21, 1995 -- RELEASE 1.0:
-------------------------------
-The original release ran on a set of UNIX platforms (including Solaris,
-SunOS, Linux, and NEXTSTEP) as well as with 16-bit and 32-bit MS-Windows.
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
deleted file mode 100644
index 57efeb88fff..00000000000
--- a/TAO/docs/Options.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<HTML>
-<HEAD>
-  <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-  <TITLE>Options for TAO Components</TITLE>
-</HEAD>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-<H1 ALIGN=CENTER>Options for TAO Components</H1>
-
-<H2>Overview</H2>
-<blockquote>
-<P>Certain components in TAO such as the ORB Core or object adapter
-can be tuned by users by providing value for options to them.  These
-options are commonly specified as strings (<EM>e.g.</EM>, passed on
-the command-line) and are passed to component initialization methods
-for consumption.</P>
-
-<P><EM>Programmer's Note:</EM> the internal structure for these
-options is the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector
-of strings style popularized by C and Unix.  By convention, an
-initialization method will consume, <EM>i.e.</EM>, remove from the
-vector, any options that it recognizes.</P> </blockquote>
-
-<H2>Types of Options</H2>
-
-<H2>Roadmap</H2>
-
-<blockquote>
-<P>The following components can be tuned via options:</P>
-
-<UL>
-  <LI><A HREF="#ORB"><CODE>CORBA::ORB</CODE></A>
-  <LI><A HREF="#POA"><CODE>CORBA::POA</CODE></A>
-  <LI><A HREF="#ResourceFactory"><CODE>TAO_Resource_Factory</CODE></A>
-  <LI><A HREF="#DefaultServer"><CODE>TAO_Default_Server_Strategy_Factory</CODE></A>
-  <LI><A HREF="#DefaultClient" TARGET="_top"><CODE>TAO_Default_Client_Strategy_Factory</CODE></A>
-</UL>
-</blockquote>
-
-<H2>Options</H2>
-
-<blockquote>
-<H3><CODE>CORBA::ORB</CODE><A NAME="ORB"></A></H3>
-
-<blockquote>
-<P><TABLE BORDER="2" WIDTH="80%" HEIGHT="96" CELLSPACING="2" CELLPADDING=
-"0">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<!-- <TR NAME="ORBsvcconf"> -->
-<TD HEIGHT="30"><CODE>-ORBsvcconf</CODE> <EM>config file name</EM></TD>
-<TD>Specifies the name of the file from which it will read dynamic service configuration
-directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdaemon</CODE></TD>
-<TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdebug</CODE></TD>
-<TD>Turns on the output of debugging messages within ACE's Service Configurator
-componentry.</TD></TR>
-<TR>
-<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD>
-<TD><a name="-ORBhost"></a>Tells the Object Adapter to listen for requests on the interface associated
-with the host named <I><EM>hostname</EM></I>.</TD></TR>
-<TR>
-<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD>
-<TD>Tells the Object Adapter to listen for requests on the port specified by
-<I><EM>portspec</EM></I>, which can be a name as found in <TT>/etc/services</TT>
-or a number. The default is <TT>10013</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
-<TD>Specifies the user-visible style of object references. The range of values
-is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
-or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjdemux</CODE> <EM>demux_method</EM></TD>
-<TD>Specifies the method used to demultiplex to an object. The range of values
-is <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>, or <CODE>user</CODE>.</TD></TR>
-<TR>
-<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specifies the size of the object table as a positive, non-zero integer.
-If not specified, the default is <TT>64</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
-<TD><A NAME="-ORBrcvsock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-ORBsndsock</CODE> <EM>send buffer size</EM></TD>
-<TD><A NAME="-ORBsndsock"></a>Specify the size of the socket send buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceport</CODE> <EM>portspec</EM></TD>
-<TD>Specifies which port the Naming Service is listening on.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceior</CODE> <EM>ior</EM></TD>
-<TD>Specifies the IOR for the Naming Service.</TD></TR>
-<TR>
-<TD><CODE>-ORBcollocation</CODE> <EM>yes/no</EM></TD>
-<TD>Specifies the use of collocation object optimization.  Default if yes.</TD></TR>
-<TR>
-<TD><CODE>-ORBpreconnect</CODE> <EM>host</EM><STRONG>:</STRONG><EM>port</em>[<STRONG>,</STRONG><EM>host</EM><STRONG>:</STRONG><EM>port</em>...]</TD>
-<TD><A name="-ORBpreconnect"></a>Pre-establishes a blocking connection to each listed
-<em>host</em>:<em>port</em> combination.  If a connection cannot
-be established, a warning is announced and it continues with the
-next listed.  Listing the same combination multiple times will
-properly establish multiple connections to that endpoint.</TD></TR>
-</TABLE>
-</P>
-</blockquote>
-
-<H3><CODE>CORBA::POA</CODE><A NAME="POA"></A></H3>
-
-<blockquote>
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="80%">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<TR>
-<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
-<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
-</TABLE>
-</P>
-</blockquote>
-
-<H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
-
-<blockquote>
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="80%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBresources</CODE> <EM>which</EM></TD>
-<TD>Specify whether each thread uses a global
-(<em>which</em> = <code>global</code>) or a thread-specific
-(<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBpoa</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBpoa"></a>Specify whether each thread uses a global
-(<em>which</em> = <code>global</code>) or a thread-specific
-(<em>which</em> = <code>tss</code>) instance for the Root POA.</TD></TR>
-</TABLE>
-</P>
-</blockquote>
-
-<H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
-
-<blockquote>
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="80%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD>
-<TD>Specify which concurrency strategy to use.  Range of values is <code>reactive</code>
-for a purely Reactor-driven concurrency strategy or
-<code>thread-per-connection</code> for creating a new thread to service each connection.</TD></TR>
-<TR>
-<TD HEIGHT="30"><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specify the size of the object table. If not specified, the default value
-is 64.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBdemuxstrategy</CODE> <EM>demultiplexing strategy</EM></TD>
-<TD>Specify the demultiplexing lookup strategy. The <EM>demultiplexing strategy</EM>
-can be one of <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>,
-or <CODE>user</CODE>.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
-<TD>Specify the flags used for thread creation. Flags can be any logical-OR
-combination of <CODE>THR_DETACHED</CODE>, <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
-<CODE>THE_SUSPENDED</CODE>.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBpoalock</CODE> <EM>lock type</EM></TD>
-<TD><a name="-ORBpoalock"></a>Specify the type of lock to be used for
-POA accesses.  Possible values for <em>lock type</em> are
-<code>thread</code>, which specifies that an inter-thread mutex is
-used to guarantee exclusive acccess, and <code>null</code>, which
-specifies that no locking be performed.  The default is
-<code>null</code>.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBpoamgrlock</CODE> <EM>lock type</EM></TD>
-<TD><a name="-ORBpoamgrlock"></a>Specify the type of lock to be used for
-POA Manager accesses.  Possible values for <em>lock type</em> are
-<code>thread</code>, which specifies that an inter-thread mutex is
-used to guarantee exclusive acccess, and <code>null</code>, which
-specifies that no locking be performed.  The default is
-<code>null</code>.</TD></TR>
-</TABLE>
-</P>
-</blockquote>
-
-<H3><CODE>TAO_Default_Client_Strategy_Factory</CODE><A NAME="DefaultClient"></A></H3>
-
-<BLOCKQUOTE>
-  <P>There are currently no options for the <CODE>TAO_Default_Client_Strategy_Factory</CODE>.</P>
-</BLOCKQUOTE>
-</blockquote>
-
-<P><HR><P>
-Back to the TAO <A HREF="components.html">components documentation</A>.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</HTML>
diff --git a/TAO/docs/REFERENCES b/TAO/docs/REFERENCES
deleted file mode 100644
index a44ef31c16e..00000000000
--- a/TAO/docs/REFERENCES
+++ /dev/null
@@ -1,91 +0,0 @@
-@(#)REFERENCES	1.2 95/11/08
-
-REFERENCES
-==========
-Most of the relevant references here are to OMG documents, however there
-are a few external references of some note:
-
-    *	http://www.uci.agh.edu.pl/research/cs/TOCOOS/COPERNICUS.html
-
-
-OMG REFERENCES
---------------
-As of this writing, OMG is in the process of publishing new versions of the
-base CORBA specifications, merging specifications as needed into single
-documents and splitting out the C mapping from the CORBA/CORE specification.
-
-This software has made every effort to track both the base documents and the
-agreed corrections and revisions.  Since those documents have not yet been
-published, there will inevitably be areas in which it does not reflect the
-versions yet to be published.  See the "DIFFERENCES" file for information
-about where this software differs from these current base documents:
-
-* CORBA 2.0/Interoperability:  Universal Networked Objects (UNO), OMG
-  TC Document 95-3-10.  This includes the mandatory IIOP and bridging
-  support, as well as the optional DCE-CIOP protocol.
-
-* CORBA 1.2 specification, OMG TC Document 93-12-43.  This is the
-  base document on which the CORBA 2.0 CORE specifications build.
-
-* Universal Networked Objects (UNO), OMG TC Document 94-9-32.  Until
-  the CORBA 2.0/CORE document is published, replacing the CORBA 1.2,
-  initialisation, and IFR specifications, you must use this earlier
-  version of UNO to see (only!) the specification for DSI and several
-  other CORBA CORE extensions (for bridging) adopted by the OMG.
-  [ NOTE: use the IIOP specification in 95-3-10, not the one here;
-  95-3-10 has changes required by the IFR specification, 95-11-7. ]
-
-* Initialisation, OMG TC Document 94-10-24.  This defines the portable
-  APIs for initialising ORBs.
-
-* Interface Repository, OMG TC Document 94-11-7.  This updates the
-  CORBA specifications above and is referenced by the UNO document.
-
-* IDL C++ Language Mapping Specification, OMG TC Document 94-9-14.
-  This defines the mapping of CORBA 1.2, including OMG-IDL, onto C++.
-
-There are a few inconsistencies between these documents, which are in the
-process of being resolved.  The inconsistencies arose because different
-groups worked on different parts of the system, at different times and
-with some different goals.  Contact the various revision committees to
-find out how these differences are being resolved:
-
-    - interop@omg.org ... the interop revision task force (RTF)
-    - cxx_revision@omg.org ... the C++ RTF
-    - orb_revision@omg.org ... the general ORB RTF
-
-Also, note that these ORB specifications correspond to only the lowest levels
-of OMG's Object Management Architecture.  In particular, the "Object Services"
-define object interfaces for naming, events, persistence, relationships,
-lifecycle, externalization, transactions, and concurrency control.  Also,
-"Common Facilities" objects will address such things as compound document
-architecture.  If you intend to develop software based on ORBs, these
-specifications are likely to be of interest.  The OMA is available in
-technical bookstores:
-    
-    Richard Soley (ed.), Object Management Architecture Guide,
-    Second Edition, John Wiley & Sons, New York, 1992.
-
-
-ACQUIRING REFERENCE DOCUMENTS
------------------------------
-To acquire those reference documents, use the OMG document server through
-Internet email.  Send a message to "server@omg.org", with content lines
-such as
-
-    send help
-
-to get directions about how to use the server, or 
-
-    send docs/95-3-10.ps
-
-to get a PostScript copy of any particular document.  (OMG specifications
-are available only in PostScript.)
-
-The OMG document server is maintained for use by OMG members, but is also
-available for general Internet access.  Only members will be supported in
-the case of problems.
-
-To find out more about the OMG, send email to "omg@omg.org", or look
-at the Web page at "http://www.omg.org".
-
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
deleted file mode 100644
index 474f3467fe1..00000000000
--- a/TAO/docs/compiler.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-  <!-- $Id$ -->
-  <head>
-    <title>TAO IDL compiler User's Guide</title>
-  </head>
-
-<BODY text = "#000000"
-link="#0000ff"
-vlink="#cc0000"
-bgcolor="#ffffff">
-
-  <body>
-    <CENTER>
-      <h1>TAO IDL compiler User's Guide</h1>
-    </CENTER>
-
-    <H2>Scope</H2>
-
-    <P>
-      This document describes the options and features of TAO IDL
-      compiler,
-      it is not a reference manual or tutorial on IDL.
-    </P>
-
-    <H2>Generated Files</H2>
-
-    <P>
-      The IDL compiler generates 6 files from each <CODE>.idl</CODE>
-      file,
-      the file names are obtained by taking the IDL basename and
-      appending
-      <CODE>C.h</CODE>,
-      <CODE>C.i</CODE>,
-      <CODE>C.cpp</CODE>,
-      <CODE>S.h</CODE>,
-      <CODE>S.i</CODE>
-      and <CODE>S.cpp</CODE>;
-      the client stubs are declared in the <CODE>C.h</CODE> file,
-      the skeletons in the <CODE>S.h</CODE> file.
-    </P>
-
-    <P>
-      Both clients and servers should link against the object files
-      for the stubs and skeletons,
-      this is needed to transparently support collocated objects.
-    </P>
-
-    <H2>Options</H2>
-
-    <P>
-      The IDL compiler invokes your <CODE>C</CODE>
-      (or <CODE>C++</CODE>) preprocessor to resolve included IDL files,
-      it receives the common options for preprocessors
-      (such as <CODE>-D</CODE> or <CODE>-I</CODE>);
-      but also receives other options that are specific to it.
-    </P>
-
-    <P>
-    <TABLE BORDER="2"
-      CELLSPACING="2"
-      CELLPADDING= "0">
-      <TR>
-	<TH>Option</TH><TH>Description</TH></TR>
-      <TR NAME="V">
-	<TD><CODE>-V</CODE></TD>
-	<TD>The compiler printouts its version and exits</TD></TR>
-      <TR NAME="Wb">
-	<TD><CODE>-Wb,</CODE><EM>option_list</EM</TD>
-	<TD>Pass options to the backend.</TD></TR>
-      <TR NAME="export_macro">
-	<TD></TD>
-	<TD><CODE>export_macro=</CODE><EM>macro_name</EM></TD>
-	<TD>
-	  The compiler will emit 
-	  <EM>macro_name</EM>
-	  right after each <CODE>class</CODE> or <CODE>extern</CODE>
-	  keyword,
-	  this is needed for Windows/NT that requires special
-	  directives to export symbols from DLLs,
-	  usually the definition is just a space on unix platforms.
-	</TD>
-      </TR>
-      <TR NAME="export_include">
-	<TD></TD>
-	<TD><CODE>export_include=</CODE><EM>include_path</EM></TD>
-	<TD>
-	  The compiler will generate code to include
-	  <EM>include_path</EM> at the top of the client header,
-	  this is usually a good place to define the export macro.
-	</TD>
-      </TR>
-      <TR NAME="E">
-	<TD><CODE>-E</CODE></TD>
-	<TD>Only invoke the preprocessor</TD></TR>
-      <TR NAME="Wp">
-	<TD><CODE>-Wp,</CODE><EM>option_list</EM</TD>
-	<TD>Pass options to the preprocessor.</TD>
-      <TR NAME="D">
-	<TD><CODE>-D</CODE><EM>macro_definition</EM></TD>
-	<TD>It is passed to the preprocessor</TD></TR>
-      <TR NAME="U">
-	<TD><CODE>-U</CODE><EM>macro_name</EM></TD>
-	<TD>It is passed to the preprocessor</TD></TR>
-      <TR NAME="I">
-	<TD><CODE>-I</CODE><EM>include_path</EM></TD>
-	<TD>It is passed to the preprocessor</TD></TR>
-      <TR NAME="A">
-	<TD><CODE>-A</CODE><EM>assertion</EM></TD>
-	<TD>It is passed to the preprocessor</TD></TR>
-      <TR NAME="Y">
-	<TD><CODE>-Y</CODE></TD>
-	<TD>It is passed to the preprocessor</TD></TR>
-      </TABLE>
-    </P>
-
-    <hr>
-    <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address>
-  </body>
-</html>
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
deleted file mode 100644
index 9e782b2709a..00000000000
--- a/TAO/docs/components.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<HTML>
-  <HEAD>
-    <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-    <TITLE>TAO Component Documentation</TITLE>
-  </HEAD>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-<HR>
-    <H3 ALIGN=CENTER>Component Documentation</H3>
-
-    <P>The following documentation is available on certain TAO components:</P>
-
-    <UL>
-      <LI><A HREF="Options.html">Options</A> &shy; describes the
-	options available to customize various components within TAO.  
-	These customizations can be done by an end-user and do not
-        require C++ programming.<P>
-
-      <li><a href="configurations.html">Configuration</a> &shy;
-      describes how to mix and match component <a
-      href="Options.html">options</a> to customize 
-      how TAO processes requests.  For example, this  
-      document explains how to configure TAO to process
-      all request in one thread, each request in a separate thread, or each connection
-      in a separate thread, <em>etc.</em><P>
-
-    </UL>
-  </BODY>
-
-<P><HR><P>
-Back to the TAO <A HREF="index.html">documentation index</A>.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-
-</HTML>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
deleted file mode 100644
index 4e65b4ed112..00000000000
--- a/TAO/docs/configurations.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<HTML>
-  <HEAD>
-    <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-    <TITLE>Configuring TAO's Components</TITLE>
-  </HEAD>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-    <H1 ALIGN=CENTER>Configuring TAO's Components</H1>
-
-    <H2>Overview</H2>
-    <blockquote>
-      <p>As described in the <a href="Options.html">options</a>
-	documentation, various components in TAO can be "tuned" by specifying
-	options for those components.  Here we present some examples of how to
-	combine these options to achieve certain effects on ORB operations.</P>
-    </blockquote>
-
-    <H2>Where Are Options Specified?</H2>
-    <blockquote>
-      <p>TAO configures itself using the ACE Service Configurator
-      framework.  Thus, options are specified in the familiar
-      <code>svc.conf</code> file (if you want to use a different file
-      name, use the <a
-      href="Options.html#svcfonf"><code>-ORBsvcconf</code></a>
-      option</p>
-    </blockquote>
-
-
-    <H2>Roadmap</H2>
-
-    <blockquote>
-      <P>Details for the following configurations are provided.</P>
-
-      <UL>
-	<LI><A HREF="#reactive">Single-threaded, reactive model.</A>
-	<LI><A HREF="#tpc">Multiple threads, thread-per-connection model.</A>
-	<LI><A HREF="#multiorb">Multiple threads, orb-per-thread model.</A>
-	<LI><A HREF="#multiorb-tpc">Multiple threads, orb-per-thread, thread-per-connection.</A>
-      </UL>
-
-      <p>Each configuration has the following information:</p>
-
-      <p>
-      <table border=2 width="90%" cellspacing="2" cellpadding="0">
-	<tr>
-	<tr>
-	  <th>Typical Use</th>
-	  <td>A brief description of the scenario and its typical use.</td>
-	</tr>
-
-	<tr>
-	  <th>Number Threads</th>
-	  <td>The number of threads used by ORB-related activities.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread Creator</th>
-	  <td>Identifies the creator of the threads discussed above.</td>
-	</tr>
-
-	<tr>
-	  <th>Resource Location</th>
-	  <td>Where information on various resources is stored.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread task</th>
-	  <td>Describes what task is undertaken for each thread.</td>
-	</tr>
-	<tr>
-	  <th>Options</th>
-	  <td>Specifies the options for each service in order to utilize this configuration.</td>
-	</tr>
-      </table>
-      </p>
-
-    </blockquote>
-
-    <H2>Configurations</H2>
-
-    <blockquote>
-
-      <H3>Single-threaded, reactive model.<A NAME="reactive"></A></H3>
-
-      <p>
-      <table border=2 width="90%" cellspacing="2" cellpadding="0">
-	  <th>Typical Use</th>
-	  <td>
-	    This is definitely the most common use of an ORB in a
-	    server situation, where there is a single thread handling
-	    requests from multiple clients.
-	  </td>
-	</tr>
-
-	<tr>
-	  <th>Number Threads</th>
-	  <td>1</td>
-	</tr>
-
-	<tr>
-	  <th>Thread Creator</th>
-	  <td>Operating System or whoever creates the main thread in a process.</td>
-	</tr>
-
-	<tr>
-	  <th>Resource Location</th>
-	  <td>Resources are stored process-wide.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread task</th>
-	  <td>The single thread processes all connection requests and CORBA messages.</td>
-	</tr>
-
-	<tr>
-	  <th>Options</th>
-	  <td>
-	    <code>TAO_Resource_Manager</code>: <code>-ORBresources global</code><br>
-	    <code>TAO_Server_Strategy_Factory</code>: <code>-ORBconcurrency reactive</code>
-	  </td>
-	</tr>
-      </table>
-      </p>
-
-      <H3>Multiple threads, thread-per-connection model.<A NAME="tpc"></A></H3>
-
-      <p>
-      <table border=2 width="90%" cellspacing="2" cellpadding="0">
-	<tr>
-	  <th>Typical Use</th>
-	  <td>A brief description of the scenario and its typical use.</td>
-	</tr>
-
-	<tr>
-	  <th>Number Threads</th>
-	  <td>The number of threads used by ORB-related activities.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread Creator</th>
-	  <td>Identifies the creator of the threads discussed above.</td>
-	</tr>
-
-	<tr>
-	  <th>Resource Location</th>
-	  <td>Where information on various resources is stored.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread task</th>
-	  <td>Describes what task is undertaken for each thread.</td>
-	</tr>
-      </table>
-      </p>
-
-      <H3>Multiple threads, orb-per-thread model.<A NAME="multiorb"></A></H3>
-
-      <p>
-      <table border=2 width="90%" cellspacing="2" cellpadding="0">
-	<tr>
-	  <th>Typical Use</th>
-	  <td>A brief description of the scenario and its typical use.</td>
-	</tr>
-
-	<tr>
-	  <th>Number Threads</th>
-	  <td>The number of threads used by ORB-related activities.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread Creator</th>
-	  <td>Identifies the creator of the threads discussed above.</td>
-	</tr>
-
-	<tr>
-	  <th>Resource Location</th>
-	  <td>Where information on various resources is stored.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread task</th>
-	  <td>Describes what task is undertaken for each thread.</td>
-	</tr>
-      </table>
-      </p>
-
-      <H3>Multiple threads, orb-per-thread, thread-per-connection.<A NAME="multiorb-tpc"></A></H3>
-
-      <p>
-      <table border=2 width="90%" cellspacing="2" cellpadding="0">
-	<tr>
-	  <th>Typical Use</th>
-	  <td>A brief description of the scenario and its typical use.</td>
-	</tr>
-
-	<tr>
-	  <th>Number Threads</th>
-	  <td>The number of threads used by ORB-related activities.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread Creator</th>
-	  <td>Identifies the creator of the threads discussed above.</td>
-	</tr>
-
-	<tr>
-	  <th>Resource Location</th>
-	  <td>Where information on various resources is stored.</td>
-	</tr>
-
-	<tr>
-	  <th>Thread task</th>
-	  <td>Describes what task is undertaken for each thread.</td>
-	</tr>
-      </table>
-      </p>
-
-    </blockquote>
-
-</blockquote>
-
-<P><HR><P>
-Back to the TAO <A HREF="components.html">components documentation</A>.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY>
-</HTML>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
deleted file mode 100644
index 249c3b85862..00000000000
--- a/TAO/docs/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<HTML>
-<HEAD>
-  <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-  <TITLE>TAO Documentation</TITLE>
-</HEAD>
-
-<BODY text = "#000000"
-link="#0000ff"
-vlink="#cc0000"
-bgcolor="#ffffff">
-
-<HR>
-<H3 ALIGN=CENTER>TAO Documentation</H3>
-
-<CENTER>
-<TABLE cellpadding=10 cellspacing=8 border=10>
-
-<TD><FONT SIZE=+1>
-<DL>
-  <DT><A
-      HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical Overview</A> <P>
-  <DT><A HREF="components.html" TARGET="_top">Component Configuration</A><P>
-
-  <DT><A HREF="compiler.html" TARGET="_top">TAO IDL Compiler Options</A><P>
-
-  <DT><A HREF="releasenotes/index.html">Release Notes</A><P>
-
-  <DT><A HREF="poa_migration.html" TARGET="_top">POA Migration Notes</A><P>
-
-  <DT><A
-      HREF="http://www.cs.wustl.edu/~schmidt/events_tutorial.html">Event Service Tutorial</A><P>
-</DL>
-</FONT></TD>
-</TABLE>
-</CENTER>
-
-
-<P><HR><P>
-Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY> 
-
-</BODY>
-</HTML>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
deleted file mode 100644
index c0e84f6bd04..00000000000
--- a/TAO/docs/orbsvcs.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-  <!-- $Id$ -->
-  <head>
-    <title>TAO Services Documentation</title>
-  </head>
-
-  <body>
-   <H1>TAO Services Directory Hierarchy</H1>
-
-    <P>The file and directory organization for TAO services can be
-      confusing at first glance (and even on subsequent ones to be
-      honest),
-      so we felt like some rationale and explanation of the directory
-      hierarchy was needed.</P>
-
-    <P>For general sanity all TAO services files are located under 
-      <CODE>$TAO_ROOT/orbsvcs</CODE>.</P>
-
-    <P>It is expected that clients use more
-      than one service at the same time
-      (in fact some of the services already do, for instance the
-      <B>Event Service</B> uses the <B>Naming Service</B> and the
-      <B>Scheduling Service</B>);
-      for this reason all the services stubs are grouped in one
-      library;
-      this library is located in
-      <CODE>$TAO_ROOT/orbsvcs/orbsvcs</CODE>.
-      Usually the include path is only <CODE>$TAO_ROOT/orbsvcs</CODE>,
-      so files are included like in:</P>
-
-<P><CODE>
-#include "orbsvcs/CosNamingC.h"
-</CODE></P>
-
-    <P>To simplify the IDL generation the skeletons are also on the
-      library,
-      this is not a problem for client programs and most services need
-      to link the library anyway
-      (since they use other services.)
-      Further,
-      the current support for collocation requires that clients link
-      the skeleton files also.
-    </P>
-
-    <P>In the future we intend to use ACE Service Configurator to give
-    the users control over servant collocation.
-    As a first cut all the service implementations are included in the
-    orbsvcs library <CODE>$TAO_ROOT/orbsvcs/orbsvcs</CODE>,
-    since there are serveral services and each one require several
-    files we have given a different directory to each service;
-    for instance <B>Naming Service</B> is in
-    <CODE>$TAO_ROOT/orbsvcs/orbsvcs/Naming</CODE>.
-    This structure could also simplify a future split into several
-    libraries (if it proves necessary).</P>
-
-    <P>Please note that in this revision we still have a separate
-    binary for each service,
-    once the complete support for ACE Service Configurator is included
-    we will probably have a single server,
-    much like in <CODE>$ACE_ROOT/netsvcs</CODE>.</P>
-
-    <P>Finally some test are located in
-      <CODE>$TAO_ROOT/orbsvcs/tests</CODE>,
-      since most tests require several files each one has its own
-      directory.</P>
-
-  <H1>SEE ALSO</H1>
-
-  <P>You may you to check TAO
-     <A HREF="releasenotes/index.html">release notes</A>
-     for up to date information on status, changes, future work, etc.</P>
-
-    <hr>
-
-    <address><a href="mailto:coryan@macarena.cs.wustl.edu">Carlos O'Ryan</a></address>
-  </body>
-</html>
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
deleted file mode 100644
index 220792a0241..00000000000
--- a/TAO/docs/poa_migration.html
+++ /dev/null
@@ -1,44 +0,0 @@
-Migrating from BOA to POA
-
-Client side:
-<ul>
-<li>Very little has changed, and some have not needed any changes.</li>
-<li>You'll have to insure that the Makefile includes .o's for both the server
-and client; this is necessary to support collocation.</li>
-</ul>
-
-Server side:
-<li>POA_init() is replaced with resolve_initial_references("RootPOA") followed
-by a _narrow operation.</li
-<li>The implementation no longer inherits from the client-side stub; they
-inherit from PortableServer::ServantBase.  The implications of this are (a) if
-you want a object reference for that, you must use the _this() method.</li>
-<li>Object ID's are assigned by the POA unless you activate the servant with a
-specific ID; IDL_Cubit has examples on how to do this.</li>
-<li>Unlike the BOA, the POA explicitly addresses the temporal nature of servants
-and declares that a POA can service either transient or persistent servants
-(not both).  The root POA's (mandated, unchangeable) policy is "transient". 
-The implications of this are that in order for a client to be able to
-manufacture an object reference on its own and use that to access an object,
-the servant for that object must be registered with a POA whose policy is
-"persistent".  Thus, you must create a child POA with that policy and register
-the servant with that POA.  NOTE: when the POA declares something as
-"persistent", it is only stating that the key is valid between different runs
-of the server; it makes no claims that state or anything else is persistent.</li
-
-<ul>
-	<li> Servants are not automatically activated, hence you must register 
-	them by calling some of the activate_object* methods on a POA or 
-	calling _this() on the servant; with the latest you have no control on 
-	the ObjectId (which sometimes is good), and the POA must support the 
-	right policies (the RootPOA does).</li>
-    
-	<li>Servant constructors use to take a <const char*> parameter to set 
-	they object id, this is not needed now, in fact in many cases they use 
-	to pass this argument to the skeleton class: this will fail now.</li>
-</ul>
-This list is not intended to be exhaustive, but should give you a good
-starting point.  If you find things along the way which have to change and I
-didn't note them, please send them to me.  Perhaps we can work together on the
-ultimate migration document.
-
diff --git a/TAO/docs/releasenotes.html b/TAO/docs/releasenotes.html
deleted file mode 100644
index 21854918af1..00000000000
--- a/TAO/docs/releasenotes.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML>
-<HEAD>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-    <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (X11; I; Linux 2.0.30_SMP i686) [Netscape]">
-    <META HTTP-EQUIV="Refresh" CONTENT="1;URL=releasenotes/index.html">
-    <TITLE>TAO Release Information and TODO List</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#000FFF" VLINK="#FF0F0F">
-<!-- $Id$ -->
-<CENTER>
-<H2>
-Release Information for The ACE ORB (TAO)</H2></CENTER>
-
-<CENTER>
-<H3>
-Version 0.0.12</H3></CENTER>
-
-<CENTER>
-<H3>
-17-October-1997</H3></CENTER>
-
-<HR>
-
-This document has moved <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html">here</a>.
-
-</HTML>
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
deleted file mode 100644
index ec703e4759c..00000000000
--- a/TAO/docs/releasenotes/ec.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- $Id$ -->
-
-<HTML>
-  <HEAD>
-    <TITLE>Event Service Status</TITLE>
-  </HEAD>
-
-  <BODY>
-      <H3>Event Service Status</H3>
-      Point of contact: <A HREF="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</A>
-
-    <H4>Last Updated: $Date$ </H4>
-
-    <H3>New on this release</H3>
-
-    <UL>
-      <LI>Fixed memory leak in</LI>
-    </UL>
-
-    <H3>Known issues:</H3>
-    <DL>
-      <DT><EM>The schedule cannot be downloaded</EM></DT>
-      <DD>
-	The Scheduling Service seems to compute proper schedules,
-	but it is not possible to download them,
-	apparently there is a marshalling problem for sequences of
-	complex structures.
-
-	<P>Due to this problem we have been unable to test the
-	  run-time scheduler and performance it is impossible to
-	  complete performance measurements and optimizations:
-	  the (global) scheduling service latency and overhead is at
-	  least as large as the EC itself.</P>
-	</DD>
-
-      <DT><EM>Run-time scheduler requires re-link</EM></DT>
-      <DD>
-	During a normal execution of the system
-	there is no
-	need to use the a global Real-time Scheduling Service,
-	a faster,
-	collocated implementation for the service is available.
-	Obviously the scheduling information is precomputed in some
-	config run.
-
-	<P>Unfortunately the current scheme requires a relink of all the
-	involved applications against the generated tables for the
-	run-time scheduling service.</P>
-
-	<P>We should be able to download the schedule to the interested
-	parties,
-	without need for a separate link phase.
-	This will simplify and speed up the developing cycle,
-	but requires a (small and fixed) amount of dynamic memory
-	allocation.
-	It could be interesting to "save" the schedule computation in
-	some persistent form,
-	so startup cost are lower too.</P>
-	
-	<P>The current design contemplates a config run were a global
-	consumer acumulates the QoS requirements of all the objects, 
-	next an external utility is used to force a computation and
-	save of the schedule.
-	In future executions 
-	the global scheduler pre-loads this schedule and 
-	the clients simply download the precomputed schedule,
-	and all scheduling queries are to a local scheduling service, 
-	without any further contact to the global instance.</P>
-      </DD>
-
-      <DT><EM>Users have no control over service
-	  collocations</EM></DT>
-      <DD>
-	The user should have complete control of services collocation,
-	using ACE Service Configurator.
-      </DD>
-
-    </DL>
-
-    <H3>Examples</H3>
-
-    <P>For general documentation on the Event Service please read
-      <A HREF="http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz">
-	The Design and Performance of a Real-time CORBA Event
-	Service</A>.
-
-    <P>The simplest test for the Event Channel is
-      <CODE>Event_Latency</CODE>,
-      below are the basic instructions to run it:</P>
-
-    <OL>
-      <LI> Compile everything under <CODE>$TAO_ROOT/orbsvcs</CODE>, this
-	needs, obviously, <CODE>$TAO_ROOT/tao</CODE> and
-	the IDL compiler in <CODE>$TAO_ROOT/TAO_IDL</CODE>.</LI>
-
-      <LI> Run the naming service, the scheduling service, the event service
-	and the test in
-	<CODE>$TAO_ROOT/TAO/orbsvcs/tests/Event_Latency</CODE>;
-	remember to give a different port to each one,
-	using the <CODE>-ORBport</CODE> option.</LI>
-
-      <LI> If you want real-time behavior on Solaris you may need to run
-	these programs as root; on the other hand, this particular
-	example really has no priority inversion, since only one
-	thread runs at a time.</LI>
-    </OL>
-
-    <P>Another example is <CODE>EC_Multiple</CODE>,
-      please check the README file on
-      <CODE>$TAO_ROOT/orbsvcs/tests/EC_Multiple</CODE> for
-      further detail.</P>
-
-    <H3>Features in previous releases</H3>
-
-<UL>
-      <LI>
-	When several suppliers are consumers are distributed over the
-	network it could be nice to exploit locality and have a
-	separate Event Channel on each process (or host).
-	Only when an event is required by some remote consumer we need
-	to send it through the network. <P>
-
-	The basic architecture to achieve this seems very simple,
-	each Event Channel has a proxy that connects to the EC peers,
-	providing a "merge" of its (local) consumer subscriptions as
-	its own subscription list. <P>
-
-	Locally the proxy connects as a supplier,
-	publishing all the events it has register for. <P>
-
-	To avoid event looping the events carry a time-to-live field
-	that is decremented each time the event goes through a proxy, 
-	when the TTL gets to zero the event is not propagated by the
-	proxy. <P>
-
-	In the current release an experimental implementation is
-	provided,
-	it basically hardcodes all the subscriptions and publications,
-	we are researching on how to automatically build the
-	publication list.<P>
-
-      <LI> <P>
-	We use the COS Time Service types (not the services) to
-	specify time for the Event Service and Scheduling Service.<P>
-</UL>
-
-  </BODY>
-</HTML>
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
deleted file mode 100644
index d8787dfbbbe..00000000000
--- a/TAO/docs/releasenotes/index.html
+++ /dev/null
@@ -1,643 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.04 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
-   <TITLE>TAO Release Information and TODO List</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF">
-<!-- $Id$ -->
-<CENTER>
-<HR></CENTER>
-
-<CENTER>
-<H3>
-Release Information for The ACE ORB (TAO)</H3></CENTER>
-Information is available on the following topics related to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/VERSION">current
-release</A> of <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A>:
-<UL>
-<LI>
-<A HREF="orbcore.html">ORB &amp; ORB Core</A></LI>
-
-<LI>
-<A HREF="#idl">IDL Compiler</A></LI>
-
-<LI>
-<A HREF="ec.html">Event Channel</A></LI>
-
-<LI>
-<A HREF="#apps">Test &amp; Example Applications</A></LI>
-
-<LI>
-<A HREF="#poa">Portable Object Adapter</A></LI>
-
-<LI>
-<A HREF="#nservices">CORBA Naming Service</A></LI>
-
-<LI>
-<A HREF="#tservices">CORBA Trader Service</A></LI>
-
-<LI>
-<A HREF="#pservices">CORBA Property Service</A></LI>
-
-<LI>
-<A HREF="#cservices">CORBA Concurrency Control Service</A></LI>
-
-<LI>
-<A HREF="#av">CORBA Audio/Video Control Service</A></LI>
-
-<LI>
-<A HREF="#ace">ORB-related ACE Changes</A></LI>
-
-<LI>
-<A HREF="#dove">The DOVE Demo</A></LI>
-
-<LI>
-<A HREF="#vc">How to add IDL files into your Visual C++ projects</A></LI>
-</UL>
-<!--#include virtual="orbcore.html" -->
-<HR>
-<H3>
-<A NAME="idl"></A>IDL Compiler</H3>
-Point of contact: <A HREF="mailto:gokhale@cs.wustl.edu">Aniruddha Gokhale</A>
-
-<P>Current status: (As of March 15th, 1998.)
-<UL>
-<LI>
-Completely redesigned the IDL compiler using the Visitor patterns. Many
-incomplete issues have been resolved. These include support for "sequence
-of typecodes", passing object references as in, inout, and out parameters.
-Code generation for sequences is also properly handled i.e., for a named
-sequence such as "typedef sequence&nbsp;<char>CharSeq;", we now generate
-a new class (and hence a type) called "class CharSeq". Arrays are still
-being worked out and will be done soon. An important difference in the
-generated code is that the skeletons now use a table driven approach very
-similar to the stubs.</LI>
-
-<LI>
-Support for the "native" keyword added.</LI>
-
-<LI>
-Introduced tests for object references to TAO. Still incomplete.</LI>
-
-<LI>
-Param_Test example is able to test string sequences, fixed structs, variable
-sized structs and nested structs</LI>
-
-<LI>
-Param_Test test suite can now test fixed structs and string sequences.This
-needed bug fixes to TAO ORB core.</LI>
-
-<LI>
-A new test to test all the parameter passing modes for a number of data
-types has been added. At this point in time, it tests primitive types and
-strings. Other tests will be added. Bugs discovered thru these tests have
-been fixed.</LI>
-
-<LI>
-Very preliminary support for arrays. Not working yet.</LI>
-
-<LI>
-Many bugs associated with stub generation fixed. This included support
-for return values that are variable sized IDL types. Unions improved.</LI>
-
-<LI>
-Support for sequences of strings and object references added. However,
-it is not tested yet so there may be some bugs. We should have these fixed
-in a day or so.</LI>
-
-<LI>
-Support for handling exceptions added. TAO does not use direct C++ exceptions.
-Instead it uses the CORBA::Environment based approach.</LI>
-
-<LI>
-Sequences as out parameters have been tested in the IDL_Cubit example.
-A test suite is currently being built to test all the parameter passing
-modes on a variety of IDL data types.</LI>
-
-<LI>
-Support for attributes completed. Not tested yet.</LI>
-
-<LI>
-The problem of incorrect code generation for typedefs defined in an imported
-file is resolved.</LI>
-
-<LI>
-Problems when interfaces use single or multiple inheritance solved. The
-problem was with the demultiplexing code, the generated operation tables,
-and the dispatching mechanism. We are currently testing this with the Event
-Channel code.</LI>
-
-<LI>
-The problems arising due to public virtual inheritance when casting from
-an interface class to CORBA::Object_ptr has been solved. We do this casting
-inside the stubs/skeletons rather than first converting an interface class
-pointer to a void*, storing it in an Any, and casting it to CORBA::Object_ptr
-in the encode/decode methods. The casting inside the stubs/skeletons work
-because the compiler has knowledge of both types.</LI>
-
-<LI>
-The compiler generates correct code for COSS Naming service and it runs
-properly. Correct code also gets generated for the Event Channel program</LI>
-
-<LI>
-Include files are handled properly. So are the definitions used inside
-the include files that are used in the currently parsed files.</LI>
-
-<LI>
-IN, INOUT, and OUT object reference parameters are now supported properly.
-We think the same approach should work for sequences, structs, and unions.</LI>
-
-<LI>
-Many IDL constructs supported including primitive types, typedefs, sequences,
-structures, and unions.</LI>
-
-<LI>
-Generates C++ stubs and skeletons that use TAO's <A HREF="http://www.cs.wustl.edu/~schmidt/HICSS-97.ps.gz">interpretive
-IIOP protocol engine</A>.</LI>
-
-<LI>
-Generated code closely follows the C++ Mapping specified in the POA Specification
-(ORBOS/97-05-15).</LI>
-
-<LI>
-Support dynamic libraries on NT, i.e., marking classes for DLL export was
-added. Two backend options control the name of the export macro, and the
-name of an extra include file were the macro is defined; the options are
-<TT>-Wp,export_macro=MACRO_NAME</TT> <TT>-Wp,export_include=INCLUDE_NAME</TT>.</LI>
-</UL>
-Known bugs/unimplemented constructs:
-<UL>
-<LI>
-Generation of Managed types must somehow be moved to the ORB Core</LI>
-
-<LI>
-We need support for ``TIEs'' (i.e., the object form of the Adapter pattern).</LI>
-
-<LI>
-TypeCode generation for multidimensional arrays and indirected typecodes
-is still a problem.</LI>
-
-<LI>
-Unions with default cases yet to be handled</LI>
-
-<LI>
-The &lt;&lt;= and >>= operators for user-defined types are not generated
-yet.</LI>
-
-<LI>
-Deal with names in the IDL definition that are C++ keywords.</LI>
-
-<LI>
-IDL is case-insensitive. However, it looks like our front-end is case-sensitive.
-Thanks to Anil Gopinath (anil@ittc.ukans.edu) for pointing this out.</LI>
-
-<LI>
-tao_idl generates code for a *.idl file only inside the directory where
-the *.idl resides. However, it may be required to generate code elsewhere
-i.e., in the directory where the compiler was invoked. Thanks to Tom Richards
-(tomr@MCMEnterprise.com) for this suggestion.</LI>
-</UL>
-Future work:
-<UL>
-<LI>
-Need to relocate the various libraries used by the IDL compiler out of
-the ACE directory. Having them here can cause problems when working with
-multiple versions of TAO and a single version of ACE.</LI>
-
-<LI>
-Improve IDL compiler to generate compiled form of stubs/skeletons.</LI>
-
-<LI>
-Fix bugs in the SunSoft IDL front-end we've uncovered. These primarily
-include support for Unions.</LI>
-
-<LI>
-Add command line options to TAO IDL. These options will decide what strategy
-to use for operation name demultiplexing. Another option may decide whether
-to use the interpretive IIOP engine or generate compiled stubs/skeletons.</LI>
-
-<LI>
-Use <A HREF="http://www.cs.utah.edu/projects/flux/flick/">Flick</A> (from
-the University of Utah) to generate compiled stubs.</LI>
-
-
-<P>Goal is to measure the code size of the interpretive stubs generated
-by TAO IDL compiler <I>vs</I> code size of compiled stubs. Then compare
-the performance of each. We want to prove the thesis that TAO IDL compiler
-generated interpretive stubs have a small code size, yet are comparable
-in performance (or slightly less) than compiled stubs. Hence, it will be
-useful for small distributed equipment such as handsets, PDAs, etc.
-
-<P>In doing the above, improvements to the IIOP protocol engine in terms
-of size/performance/determinism will be made.
-<LI>
-Tweak the IDL compiler to generate code that's more easily integrated back
-into the ORB Core, e.g., POA, etc. This will depend largely on our ability
-to generalize the changes necessary to generated code.</LI>
-</UL>
-
-<HR><!--#include virtual="ec.html" -->
-<HR>
-<H3>
-<A NAME="apps"></A>Test &amp; Example Applications</H3>
-Point of contact: <A HREF="mailto:naga@cs.wustl.edu">Nagarajan Surendran</A>
-
-<P>Current Status:
-
-<P>The TAO IDL_Cubit test application makes use of the Naming Service and
-the server holds a TAO_Naming_Server component.Just running server and
-client is enough to test the application.
-
-<P>The various tests in the tests/POA test the different features of the
-Portable Object Adapter interface like Explicit Activation, On Demand Activation,etc..
-
-<P>Future work:
-
-<P>Developing a one-buttoned test for all the different TAO tests similar
-to the ACE-one buttoned test.
-
-<P>MT_Cubit:
-
-<P>Current status:
-
-<P>The TAO MT_Cubit test application is meant to serve as a starting point
-for real-time tests on the TAO system. It comprises the following parts:
-<UL>
-<LI>
-<I>Server.</I> The server creates multiple CORBA objects (servants), each
-with different real-time priorities. This priority is implemented by using
-real-time thread support provided by the operating system. Thus, requests
-sent to a high-priority servant are handled by a high-priority real-time
-thread, and those sent to a lower priority servant are handled by correspondingly
-lower priority threads.</LI>
-
-<LI>
-<I>Client.</I> The client component binds to the servants, and sends a
-stream of CORBA requests to the servants. It measures the response time,
-i.e. the time taken for the request to complete successfully. In particular,
-it measures the time taken for requests sent to the high priority servant
-to complete. The volume of lower priority requests is configurable. The
-client is thus able to measure the performance of the high-priority servant
-in the presence of competition from several lower-priority servants.</LI>
-</UL>
-Clearly, if the ORB endsystem handles the priorities of the various requests
-correctly, increasing the volume of lower priority requests should not
-affect the performance seen by the higher priority requests. The application
-thus serves as a tool to measure and confirm this behavior.
-
-<P>Future work:
-<UL>
-<LI>
-Study the impacts of scheduling &amp; concurrency strategies on performance.</LI>
-
-<LI>
-Evolve into a testbed for discovering sources of performance non-determinism
-&amp; priority inversion.</LI>
-</UL>
-
-<HR>
-<H3>
-<A NAME="poa"></A>Portable Object Adapter</H3>
-Point of contact: <A HREF="mailto:irfan@cs.wustl.edu">Irfan Pyarali</A>
-
-<P>Current Status:
-<UL>
-<LI>
-TAO fully supports the POA spec. This section will carry updates as
-available.</LI>
-</UL>
-Known issues:
-<DL>
-<DT>
-<I>Support for collocation is not complete.</I></DT>
-
-<DD>
-If an object which should be collocated is created via <TT>string_to_object</TT>,
-it is created as a remote object rather than collocated.</DD>
-
-</DL>
-Critical work:
-<UL>
-<LI>
-None.</LI>
-</UL>
-Future work:
-<UL>
-<LI>
-Determine the degree to which we will support the full semantics of remote
-objects on a collocated object. The spec mandates that collocated object
-should behave <I>exactly</I> like remote objects, but that means that request
-will have to be queued rather than calling a method directly, and this
-could be hazardous to our quest for real-time ORB status.</LI>
-
-<LI>
-Provide extensions of the specification to ensure real-time delivery of
-messages.</LI>
-</UL>
-
-<HR>
-<H3>
-<A NAME="nservices"></A>CORBA Naming Service</H3>
-Point of contact: <A HREF="mailto:sergio@cs.wustl.edu">Sergio Flores-Gaitan</A>
-and <A HREF="mailto:marina@cs.wustl.edu">Marina Spivak</A>
-
-<P>Current status (as of Feb 27th):
-<UL>
-<LI>
-The Naming Service implementation is complete.</LI>
-</UL>
-Future work:
-<UL>
-<LI>
-Currently the bindings are stored as a table in memory. Future work will
-include a persistent database to store the bindings.</LI>
-
-<LI>
-Replication of the bindings to other Naming Service's currently running.
-It will probably be modeled after the LDAP Multi-Master Replication Protocol.
-For more information on this replication protocol please read <A HREF="ftp://ds.internic.net/internet-drafts/draft-ietf-asid-ldap-mult-mast-rep-02.txt">LDAP
-Multi-Master Replication Protocol</A></LI>
-</UL>
-For general documentation on the Naming Service please read <A HREF="ftp://www.omg.org/pub/docs/formal/97-07-12.pdf">The
-Naming Service Specification</A>.
-
-<P>
-<HR>
-<H3>
-<A NAME="tservices"></A>CORBA Trading Service</H3>
-Point of contact: <A HREF="mailto:sbw1@cs.wustl.edu">Seth Widoff</A>
-<p>
-Development is complete, and testing and debugging have commenced on
-the TAO Trading Service. Currently, it
-meets the Linked Trader conformance requirements, in that it supports
-the Lookup, Register, Admin, and Link interfaces. The Lookup interface supports 
-subtype searching, preference sorting, dynamic property evaluation, federated queries, 
-and concurrent queries as a multi-threaded servant.
-<p>
-The Trading Service uses the Object Space implementation of the Standard 
-Template Library.	
-<p>
-Future Work: <p>
-
-<ul>
-  <li> The Proxy Interface.
-  <li> Persistent storage of service types and offers.
-</ul>
-
-
-<P>For general documentation of the Trading Service, please read <A HREF="http://www.omg.org/corba/sectrans.htm#trader">The
-Trading Service Specification.</A> 
-
-
-<P>
-<HR>
-<H3>
-<A NAME="pservices"></A>CORBA Property Service</H3>
-Point of contact: <A HREF="mailto:alex@cs.wustl.edu">Alexander Babu Arulanthu</A>
-
-<P>Current status (as of Mar 19, 1998)
-<BR>&nbsp;
-<BR>&nbsp;&nbsp;&nbsp; It is under development and testing. TAO's&nbsp;
-AVStreams, which is currently being developed will make use of&nbsp; the
-Property Service.&nbsp;&nbsp;&nbsp;&nbsp; The primary PropertySet interface
-and the Iterator interfaces have been implemented and currently AVStreams'
-test application has started using them.
-
-<P>For general documentation of the Property Service, please read <A HREF="http://www.omg.org/corba/sectrans.htm#prop">The
-Property Service Specification.</A>
-
-<P>
-<HR>
-<H3>
-<A NAME="cservices"></A>CORBA Concurrency Control Service</H3>
-Point of contact: <A HREF="mailto:tworm@cs.wustl.edu">Torben Worm</A>
-
-<P>Current status (as of March 25th):
-
-<UL>
-  <LI>The implementation of the service has been postponed until the
-  spec gets more clear.
-</UL>
-
-<P>Future Work:
-
-<UL>
-  <LI>Implementation of the Concurrency Control Service.
-</UL>
-
-<P>For general documentation of the Concurrency Control Service, please read <A HREF="http://www.omg.org/corba/sectrans.htm#concur">The
-Concurrency Control Service Specification.</A>
-
-<P>
-<HR>
-<H3><A NAME="av"></A>CORBA Audio/Video Control Service</H3>
-
-Point of contact: <A HREF="mailto:sumedh@cs.wustl.edu">Sumedh
-Mungee</a> and <A HREF="mailto:naga@cs.wustl.edu">Nagarajan
-Surendran</a> <p>
-
-This is an implementation of the OMG spec addressing the <a
-href=http://www.cs.wustl.edu/~sumedh/research/corbaav.pdf>Control and
-Management of Audio/Video Streams</a>. <p>
-
-We are currently implementing the various interfaces defined in the
-above spec. We are also working on building a audio/video streaming
-demo that will use the above service as the control mechanism and JAWS
-as an efficient transport and protocol processing framework. <p>
-
-Current Status: <p>
-
-<ul>
-  <li> Implemented the handshake mechanism between the consumer and
-      supplier of the stream.
-  <li> Implemented a simple version of the stream controller
-      (StreamCtrl).
-  <li> Implemented the VDev and StreamEndPoint base class
-      functionality.
-  <li> Implemented the MMDevice interface, which is a factory for
-      StreamEndPoint and VDev objects.
-</ul>
-
-Work in progress: <p>
-
-<ul>
-  <li> Implementing the SFP protocol
-  <li> Porting the distributed audio/video player developed at <a
-href=http://www.cse.ogi.edu/~scen/Player>OGI</a> to ACE (and in the
-      future to JAWS)
-  <li> Implementing the CORBA Stream controller for the above
-      audio/video player
-</ul>
-
-<HR>
-<H3>
-<A NAME="ace"></A>ORB-related ACE Changes</H3>
-Points of contact: <A HREF="mailto:cleeland@cs.wustl.edu">Chris Cleeland</A>
-and <A HREF="mailto:irfan@cs.wustl.edu">Irfan Pyrarli</A>
-
-<P>Recently Completed Work:
-<UL>
-<LI>
-Added special declaration to OS.h for <TT>inet_ntoa</TT> and other functions
-because VxWorks doesn't provide full argument prototypes for these library
-functions.</LI>
-
-<LI>
-The current caching connector behaves properly in the face of a non-blocking
-connect request. The "fix" is simply to not support non-blocking connects
-through the cache. When the <TT>connect()</TT> fails with <TT>EWOULDBLOCK</TT>,
-morph the error to -1 and clean up the request.</LI>
-
-<LI>
-Service handlers obtained from the caching connector are now cleaned up.
-The application needs to be able to signal that it's not using it any longer,
-and, when the application encounters an error, needs to effectively close
-down that connection for good so that a new connection can be initiated.</LI>
-
-<BR>Added the ability for a Svc_Handler to recycle itself. idle() can be
-called when the Svc_Handler is done serving a particular connection and
-can how be recycled. The Svc_Handler now also has a pointer to a recycler
-that is responsible for managing the connections. The recycler is usually
-a Cached_Connector.
-<BR>Added new class ACE_Recycling_Strategy. It defines the interface (and
-default implementation) for specifying a recycling strategy for a Svc_Handler.
-This strategy acts as a consular to the Svc_Handler, preparing it for the
-tough times ahead when the Svc_Handler will be recycled.
-<BR>Added new class ACE_NOOP_Concurrency_Strategy. It implements a no-op
-activation strategy in order to avoid calling open on a recycled svc_handler
-multiple times.
-<BR>ACE_Cached_Connect_Strategy now implements the ACE_Connection_Recycling_Strategy
-interface. This allows Svc_Handlers to cache themselves with ACE_Cached_Connect_Strategy
-when they become idle. It also allows them to purge themselves from the
-connection cache when the Svc_Handlers close down.
-<BR>Also added ~ACE_Cached_Connect_Strategy that will cleanup up the connection
-cache.</UL>
-Future work:
-<BLOCKQUOTE><I>None currently scheduled.</I></BLOCKQUOTE>
-
-<HR>
-<H3>
-<A NAME="dove"></A>The DOVE Demo</H3>
-Point of contact: <A HREF="mailto:mk1@cec.wustl.edu">Michael Kircher</A>.
-<P>
-DOVE is described in detail on the following site:
-<A HREF="http://www.cs.wustl.edu/~schmidt/dove.html">DOVE documentation</A>
-<P>
-We focus on the following goals at the moment:
-<UL>
-<LI>
-Have a DOVE Browser running using Java Beans as vizualization components.
-<LI>
-Have the Event Channel as DOVE Agent running with an Event Consumer
-in the DOVE Browser.
-<LI>
-Having a DOVE Management Information Base (MIB), which dumps all 
-events transfered on the Event Channel
-into a file on persistent storage for later reuse. 
-</LI>
-</UL>
-<P>
-The DOVE Browser uses independent visualization components (Java Beans)
-and the Event Channel as DOVE Agent. Connections can be established
-between monitored metrics and the visualization components.
-<P>
-We have three major components: 
-Observables (monitored metrics), Observers (a Java Bean
-for displaying the metric) and a DataHandler (for demultiplexing the 
-monitored metrics to the appropriate Observables).
-Each component inherits from a base class, so that a certain behavior
-of the components can be assured for each component. Relationships
-between components are based on these base classes.
-<P>
-The used Java Beans are required to conform to some standards, as
-they have to support a function called "getProperty" which allows
-the DOVE Browser to determine if the vizualization capabilities of 
-a specific Java Bean are sufficient to display the metric.
-A JavaBean is for example a Java Panel which shows a Graph of
-the delivered doubles. So all metrics can be displayed by this visualization 
-component which can be expressed by a single double.
-<P>
-The DataHandler is connected to the Event Push Consumer (PUSH, because
-we use the push concept of the Event Service). The Event Push Consumer
-does not know what kind of data is transported. The only component 
-knowing all the details about the dependencies of the metrics is
-the DataHandler. This separation allows easy extension and change
-of the demo.
-<P>
-<A HREF="http://students.cec.wustl.edu/~mk1/dove.html">Object Diagrams</A>
-are available about this new concept.
-<P>
-<P>
-Event Service events are used as communication between DOVE Applications
-and the DOVE Browser. The DOVE MIB analyses the event data field of all events
-and stores this information into a file. The event data filed is of
-type CORBA::Any and the DOVE MIB has no notion of what is conveyed in 
-this field. So the DOVE MIB has to discover the content via the 
-embedded type code information.
-
-Future work includes:
-<UL>
-<LI>
-Enhancing MIB functionality
-</LI>
-</UL>
-<P>
-<HR>
-
-<H3>
-<A NAME="#VC"></A>How to add IDL files into your Visual C++ projects</H3>
-Point of contact: <A HREF="mailto:nw1@cs.wustl.edu">Nanbor Wang</A>.
-
-<P>Each IDL file generates .h, .i and .cpp files. Here is an example of
-adding an IDL file named foobar.idl into a VC project.
-<OL>
-<LI>
-Create/open the workspace. Create server project and client project if
-you haven't had them ready. Add the IDL file &lt;foobar.idl> and other
-non-IDL generated files into both client and server projects.</LI>
-
-<LI>
-Added foobarC.h, foobarC.i, foobarC.cpp, foobarS.h, foobarS.i, and foobarS.cpp
-into the server project and foobarC.h, foobarC.i, and foobarC.cpp into
-the client project.</LI>
-
-<LI>
-Now open the project setting window (Project -> Setting... or just press
-Alt-F7.) Select the IDL files in both client and server projects. Choose
-to set the setting for "All Configuration." Make sure the "Exclude from
-build" under the "General" tab is unchecked.</LI>
-
-<LI>
-Click on the "Custom Build" tab. Add this entry as the build command for
-IDL files:</LI>
-
-<PRE>..\..\..\TAO_IDL\tao_idl $(InputName).idl</PRE>
-Notice that your absolute path to TAO_IDL may vary.
-<LI>
-Now add the following entries as "Output file(s)."</LI>
-
-<PRE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)S.h
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)S.i
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)S.cpp
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)C.h
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)C.i
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $(InputName)C.cpp</PRE>
-Add only one entry in each line.
-<LI>
-We are all set. Click OK.</LI>
-
-<LI>
-Add foobarC.cpp to client project and foobarC.cpp and foobarS.cpp to server
-project.</LI>
-</OL>
-Notice that these procedures only setup the IDL compiler to perform correctly.
-
-<P>p.s. If anyone knows how to set a default setting in VC so we don't
-need to perform these procedures every time a new project gets set up,
-please let us know. Thanks.
-<P>
-
-<HR>
-<P>Back to the TAO <A HREF="../index.html">documentation index</A>.&nbsp;<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY>
-</HTML>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
deleted file mode 100644
index 6141dea93b8..00000000000
--- a/TAO/docs/releasenotes/orbcore.html
+++ /dev/null
@@ -1,483 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-
-<!-- $Id$ -->
-
-<html>
-  <head>
-    <title>ORB & ORB Core Status</title>
-  </head>
-
-    <HR> <H3><A NAME="orb"></A>ORB &amp; ORB Core</H3> Point of
-    contact: <A HREF="mailto:nanbor@cs.wustl.edu">Nanbor Wang</A>
-
-    <p>Last Update: $Date$ </P>
-
-    <P>Current status:
-
-    <UL>
-      <LI>Provides dynamically linked wholesale assignment of ORB
-      strategies for communication, concurrency, demultiplexing,
-      scheduling, and dispatching using the ACE Service Configurator
-      framework.</LI>
-
-      <LI>Supports several concurrency models out of the box:
-      Reactive, Thread-per-Connection, and ORB-per-thread. The
-      ORB-per-thread design is optimized for real-time I/O
-      subsystems.</LI>
-
-      <LI>Supports <TT>resolve_initial_references("NameService")</TT>
-	using ACE support for multicast.</LI>
-    </UL>
-
-    <p>Known issues:
-    <dl>
-      <dt><em>Servers cannot properly report OS-chosen port.</em></dt>
-
-      <dd>It is often desireable for a server to start up and not have
-      to specify the TCP port number on which the ORB will listen,
-      i.e., let the OS decide.  While this works properly (by
-      providing an argument <code>-ORBport 0</code>), it is very
-      difficult for the server to publish the IOR for clients' use.
-      This is because the port is not assigned until
-      <code>ORB::run</code> is called.</dd>
-
-      <dt><em>Demarshalling problems with complex types</em></dt>
-
-      <dd>The current demarshalling scheme may not work in cases of
-      complex types such as sequences of unions or anys or object
-      references.  The engine has difficulty determining the dynamic
-      type of the objects.</dd>
-
-      <dt><em>Object references for objects dynamically created within
-      a server may not have proper host.</em> (See also <a
-      href="#hostfix">recent fix</a>.)</dt>
-
-      <dd>When an object is dynamically created and its object
-      reference returned, it simply has to "guess" at the host
-      information that is returned in the IIOP Profile.  Currently, it
-      guesses using the host name, which is a reasonable guess in most
-      cases.<p>
-
-      However, if there are multiple interfaces on a machine
-      <i>and</i> they have different host names, it is possible that
-      the desired effect will not be realized, i.e., the connection to
-      that new object may use a different interface from the original
-      object.  Currently the only way to change this is to use the <a
-      href="../Options.html#-ORBhost"><b>-ORBhost</b> option</a> to
-      manually specify that dynamically-created objects bind to a
-      specific interface so that their IIOP Profile has the desired
-      hostname.  A more desirable fix is being investigated.</dd>
-
-      <dt><em>ORB-per-thread and thread-per-connection models cannot
-      be mixed.</em></dt>
-
-      <dd>
-	<p>
-	  These two concurrency models do not currently mix because
-	  there is no way for the connection-handling threads to gain
-	  access to the resources held by the ORB in thread-specific
-	  storage (TSS).  In order to do this, the Resource Manager
-	  will have to implement some sort of inheritance of
-	  resources.
-	<p>
-	  There are other problems which will need to be solved as
-	  well for this to work properly.  For example, similar to the
-	  problems encountered with
-	  <code>ACE_Reactive_Strategy</code>, we will likely also
-	  encounter problems with the single
-	  <code>ACE_Threaded_Strategy</code>.  Various solutions are
-	  possible, some more generalizable into ACE, other (like the
-	  solution taken with the reactive strategy) localized to TAO.
-      </dd>
-    </dl>
-
-    Recently Completed Work:
-
-    <UL>
-      <li>Added optimization for collocated objects.  This
-          optimization enables TAO to bypass communication layers and
-          talks to collocated objects directly.</li>
-
-      <li>Broke the tight coupling between <code>CORBA_Object</code>
-      and <code>IIOP_Object</code> so that multiple
-      <code>CORBA_Object</code>s can share a single
-      <code>IIOP_Object</code>.  This has a big win in
-      <code>_narrow</code> operations.</li>
-
-      <li>Eliminated substantial memory leaks in servers.</li>
-
-      <li>Added documentation for <a
-      href="../Options.html#-ORBpoa"><b>-ORBpoa</b></a>, which allows
-      individual tweaking of the POA's locality (global
-      vs. thread-specific) independent of the locality of other ORB
-      resources.  Also, <a
-      href="../Options.html#-ORBpoalock"><b>-ORBpoalock</b></a> and <a
-      href="../Options.html#-ORBpoamgrlock"><b>-ORBpoamgrlock</b></a>
-      control locking in the POA and POA manager, respectively,
-      according to application needs.</li>
-
-      <li>Began the process of changing the internals of TAO to use
-      the "underbar" namespace mapping.  This should be completed
-      soon.</li>
-
-      <li>The ORBs manipulation of object keys and object ids is now
-      consistent.  Canonically, everything is managed as an opaque
-      sequence of octets.  Conversion to/from strings is permitted,
-      with non-printables turning into a trigraph <b>\hl</b> where
-      <b>h</b> is the high nibble digit in hex, and <b>l</b> is the
-      low nibble in hex.</li>
-
-      <li><code>CORBA_ORB::run()</code> should be able to be called
-      multiply in the same execution path now.</li>
-
-      <li>Fixed the <b>LOCATION_FORWARD</b> capabilities to work as
-      described in the CORBA 2.1 and the POA specification.</li>
-
-      <li>Fixed problem in the IDL Cubit example which caused the
-      server to dump core when dealing with <code>_out</code> sequence
-      types <em>ONLY</em> when compiled with G++.  It seems that G++
-      decided to interpret the expression <code>output == 0</code>
-      (where <code>output</code> is of type <code>vector_out</code>)
-      differently from Sun's C++ compiler.</li>
-
-      <li>Fixed a slight problem in <a href="#hostfix">other recent
-      work</a> where a servant listening on <code>INADDR_ANY</code>
-      reported an IOR with address <tt>0.0.0.0</tt>.  It now reports
-      the default hostname instead.</li>
-
-      <LI>Working version of TAO on VxWorks with VME transport.</li>
-
-      <li>TAO now reacts gracefully in the face of a non-existent
-      <code>svc.conf</code> file or simply missing entries in the
-      file.  It logs a warning message and uses default values
-      versions of items which it would normally obtain from the
-      Service Repository.</li>
-
-      <li><a name="hostfix"></a>Fixed problem where object references
-      for objects dynamically created within a server do not have
-      proper host, at least if the desired host was specified using <a
-      href="../Options.html#-ORBhost"><b>-ORBhost</b></a> on the
-      command line.</li>
-
-      <li>Added support for <a
-      href="../Options.html#-ORBsndsock"><b>-ORBsndsock</b></a> and <a
-      href="../Options.html#-ORBrcvsock"><b>-ORBrcvsock</b></a> ORB
-      options.  See <a href="../Options.html">options
-      documentation</a> for details.</li>
-
-      <li>Added support for pre-established connections using the <a
-      href="../Options.html#-ORBpreconnect"><b>-ORBpreconnect</b></a>
-      option.  This allows connections to be esablished before any
-      CORBA requests are made.  See <a href="../Options.html">options
-      documentation</a> for details.</li>
-
-      <li>Eliminated deprecated <b>-OAxxx</b> options parsed by the
-      Object Adapter <code>init</code> method but no longer used by
-      part of the ORB.</li>
-
-      <li>Made argument parsing within the ORB and POA consume the
-      arguments it parses.</li>
-
-      <li>Placed an optimization in IIOP::Profile that should speed up
-	invocations on the client side rather substantially.  This was
-	done by caching an instance of <code>ACE_INET_Addr</code> in
-	the private portion of <code>Profile</code> because the cost
-	of constructing one for every invocation (in
-	<code>TAO_GIOP_Invocation::start</code>) was simply
-	enormous--the construction was something like 100 cycles on
-	Solaris.  This is all because deep down this ends up calling
-	<code>gethostbyname()</code>, which can be very costly.  Of
-	course, this is platform-dependent, so the improvements may
-	not be as great on a different platform.</li>
-
-      <li>Got rid of need to have compile in TSS ORB Core
-	(<code>-DTAO_HAS_TSS_ORBCORE</code>).  This is accomplished by
-	having a Resource Factory (<code>TAO_Resource_Factory</code>)
-	singleton which the ORB Core consults in order to get pointers
-	to resources.  The Resource Factory can be configured to
-	return pointers from thread-specific storage, or
-	process-global storage.  By doing this, the ORB Core is
-	shielded from ever having to know whether or not its resources
-	are global or not.</li>
-
-	<li>Made all command-line like options look like the
-	standard-professed options, i.e., <b>-ORBxxx</b> or
-	<b>-OAxxxx</b>.</li>
-
-	<li>Moved ORB option parsing into
-	<code>TAO_ORB_Core::init()</code> rather than in
-	<code>ORB_init()</code>.</li>
-
-	<li>Define <code>_FAR</code> for all cases as an interim fix
-	for LynxOS.</li>
-
-	<li>Fixed TAO so that the default port of 5001 is defined in
-	<code>orb_core.h</code> config header somewhere rather than in
-	<code>orbobj.cpp</code>, and use <b>MAXHOSTNAMELEN</b> ACE
-	constant for the hostname buffer.</li>
-
-	<li>Eliminated need for <code>CORBA::Object</code> to keep a
-	pointer to its orb sitting around anywhere.</li>
-
-	<LI>Tested <code>CORBA_ORB::shutdown()</code> as a manner in
-	which a thread of control can request that
-	<code>CORBA_ORB::run()</code> should return and no longer
-	service requests.  It only honors a
-	<em>wait_for_completion</em> argument of <b>FALSE</b> right
-	now because we haven't fully explored the issues which
-	surround doing all the completion.</li>
-
-	<li>Fixed bugs reported by Steven Wohlever, David Miron,
-	Manojkumar Acharya.</li>
-
-	<li>Created a brief section in <a
-	href="../../TAO-INSTALL.html"><code>$TAO_ROOT/TAO-INSTALL.html</code></a>
-	that <em>briefly</em> documents installation on Unix
-	platforms.  There is also a brief section which documents
-	issues that apply across ALL platforms, such as the fact that
-	TAO and its application will likely not work well if your ACE
-	is linked through Orbix, VisiBroker, or another ORB.  <a
-	href="../../ChangeLog">ChangeLog</a> discovery attribution for
-	this should go to <em>Steve Wohlever
-	&lt;wohlever@mitre.org&gt;</em>.</li>
-
-	<LI>Implemented <code>CORBA_ORB::shutdown()</code> as a manner
-	in which a thread of control can request that
-	<code>CORBA_ORB::run()</code> should return and no longer
-	service requests.</li>
-
-	<LI>Validated movement of Strategy Connector into
-	ORB&nbsp;Core.</LI>
-
-	<li>Debated details of <code>Svc_Handler</code> modifications
-	with Irfan.</li>
-
-	<li>Tested and commited <code>Connector::connect_n</code>
-	changes to ACE</code>.</li>
-
-	<li>ACE & TAO compiling cleanly using Sun's CC on Solaris and
-	G++ on Linux.  Also, the ACE tests run properly.</li>
-
-	<li>Use <code>truss</code> to verify for <a
-	  href="mailto:PAUL.G.WEHLAGE@cdev.com">Paul Wehlage</a> that
-	TAO really uses <code>select</code> vs. <code>recv</code> for
-	<b>-R</b> vs. <b>-T</b>.</li>
-
-	<li>Renamed <code>boa.*</code> to <code>poa.*</code>.</li>
-
-	<LI>Renamed following files:&nbsp;Orb_Core.*&nbsp;->orb_core.*
-	&amp;&nbsp;orbobj.* -> corba_orb.*.</LI>
-
-	<LI>The lock used in <code>giop.cpp:626</code> originally
-	appeared in the IIOP-1.4 code base.  Its purpose was to
-	protect access to the <code>fwd_profile</code> data member.
-	The original features are available, but they are currently
-	not used because none of our concurrency models present a
-	thread-unsafe condition.  The <a
-	  href="../../ChangeLog">ChangeLog</a> presents more details
-	on the subject.</li>
-
-	<li>Fixed problems seen by <a
-	  href="mailto:brian.r.mendel@boeing.com">Brian Mendel</a> of
-	Boeing where the Cubit server application was crashing in
-	<code>TAO_OA_Connection_Handler::handle_message</code> when it
-	was trying to call <code>CORBA::POA::handle_request</code>
-	through a NULL <code>root_poa</code> pointer.  The NULL
-	pointer resulted from the inadvertent use of the
-	Thread-per-Connection concurrency model, which is currently
-	incompatible with the ORB-per-thread model.  It was not caught
-	because the change is normally done in configuration files
-	parsed by the Service Configurator, and VxWorks requires
-	special code in that area which was not tested until Boeing
-	got hold of the code.</li>
-
-	<li>Clean up build under g++.  All 'function used before
-	declared inline' warnings have been eliminated.  Also, all
-	other warnings (except for one that is nearly unavoidable)
-	have been eliminated.
-	</li>
-
-	<LI>Removed BOA and ROA names from the ORB.</LI>
-
-	<LI>Changed <code>CORBA_ORB::open()</code> to return an error
-	status (first cut at this already there--needs to be checked
-	out).</LI>
-
-	<LI>Added README file to multiCubit test.</li>
-    </UL>
-
-    Ongoing Work:
-
-    <UL>
-      <LI>Verify ACE & TAO on Linux using g++, Solaris using CC, and
-	Solaris using g++.</LI>
-
-      <LI>Use Purify to eliminate straggling problems.</LI>
-
-      <LI>Clean up the internals and analyze for performance
-	bottlenecks using Quantify.</LI>
-
-      <li>Resolve <code>// @@</code> comment blocks.  These are
-      questions or comments placed in the code by a reviewer
-      (typically Doug).</li>
-
-      <li>Make more and better documentation on the internals of
-      TAO.</li>
-    </UL>
-
-    Current Work:
-
-    <UL>
-      <li>Adding a new -ORB option to turn on/off collocation
-          optimization.
-      <LI>
-	<p>Verify that, in the ORB-per-thread concurrency model,
-	  it's possible to have a factory in each thread that creates
-	  a client and returns an object reference to that client
-	  within that thread.  This is different from the model that
-	  Sumedh originally had where the factory was trying to turn
-	  out a client in a separate thread/ORB combination.</p>
-
-	<p>There is no application which attempts this at the moment,
-	  so both a client and a server will need to be manufactured.
-	  Using existing Cubit-like examples (that poor app is so
-	  weary) should reduce development time to a couple of
-	  hours.</p>
-
-	<p>The real strategy/solution is to make
-	<code>CORBA::Object</code> not keep a pointer to its orb
-	sitting around anywhere.  It should only get it when it needs
-	it.  This should not be difficult to change.</p>
-      </LI>
-    </UL>
-
-    Critical Work:
-
-    <UL>
-      <LI>Support new concurrency models, e.g., Thread-per-Request,
-      thread pool, etc..</LI>
-
-    </UL>
-
-    Future work:
-    <UL>
-      <li>Performance optimizations, such as:
-	<ol>
-	  <li>Strategize the connection management scheme so that we
-	  don't always have to pay the price of a look up in the
-	  connection cache.  Basically, we want to be able to "hold" a
-	  service handler for a string of requests.  And, of course,
-	  do this in a portable manner.</LI>
-
-	  <li>Replace all uses of <code>new</code> and
-	  <code>delete</code> with allocators that can be put into
-	  TSS.  The main motivation for this is to eliminate lock
-	  contention when multiple threads need to allocate/deallocate
-	  memory, however it might also be possible to substitute an
-	  allocator better-tuned to an application's specific
-	  usage.</li>
-	</ol>
-      </li>
-
-      <li>Robustness improvements:
-	<ol>
-	  <li>Improve connection cache so that it won't crash when there
-	    are no more slots or sockets.</li>
-
-	  <li>Add an option to the ORB core, e.g.,
-	  <b>-ORBnameservicetimeout</b>, to allow specification of an
-	  upper bound on the itime-to-wait for a response from the
-	  ORB's multicast "search" for a running name server.</li>
-	</ol>
-      </li>
-
-      <li>New features:
-	<ol>
-	  <li>Implement <code>ORB::perform_work</code> and
-	    <code>ORB::work_pending</code> so that <code>ORB::run</code>
-	    <em>could</em> be implemented in terms of them.</li>
-
-	  <li>Improve the <code>Service Configurator</code> service
-	    entry faking on VxWorks.</li>
-
-	  <li>Integrate with realtime upcalls (RTUs).</li>
-
-	</ol>
-      </li>
-
-      <li>Internal restructuring:
-	<ol>
-      <li>Remove <code>_FAR</code> from all code.</li>
-
-      <li>Rework underlayment to eliminate <code>IUnknown</code> class.</li>
-
-	  <li>Create some sort of internal "request" object which
-	  carries enough context to suport deferred method invocation
-	  such as one might find in the thread-pool approach or
-	  wherever queuing might occur.</li>
-
-	  <li>Rethink the entire memory allocation model used by the
-	  ORB.  The current one from SSIIOP may no longer be suitable
-	  for our purposes.</li>
-	</ol>
-      </li>
-
-      <li>Documentation:
-	<ol>
-	  <li>Update ORB Patterns paper to reflect the latest TAO has to
-	    offer.  Specifically
-	    <ul>
-	      <li>sections on the Abstract Factory and Concurrency
-		strategies need to be updated, and the entire paper needs to
-		be reviewed for accuracy w.r.t the current TAO.</li>
-	      <li>Metrics must be re-computed.</li>
-	      <li>Tighten existing discussions.</li>
-	      <li>Add information on new patterns (such as TSS) which
-	      have been used since initial work.</li>
-	    </ul>
-
-	  <li>Make the section in <a
-	  href="../../TAO-Install.html"><code>$TAO_ROOT/TAO-Install.html</code></a>
-	  that documents installation on Unix platforms more
-	  complete.</li>
-      </li>
-
-	</ol>
-      </li>
-
-      <li>Miscellany:
-	<ol>
-	  <LI>Assist in porting higher level services (e.g., <A
-	      HREF="#eventchannel">Event Channel</A>) to TAO.</LI>
-
-	  <li>Compile and verify ACE and TAO on Linux using the Kuck and
-	    Associates, Inc. (KAI) compiler tools.</li>
-          <LI>CORBA::TypeCode is causing a memory leak.  Since objects
-              of this type are rather static in nature, this is
-              currently not a big deal.  However, it should be fixed
-              soon. </LI>
-         <LI>CORBA_Exception::Release is not working correctly as the
-             memory is never really freed. </LI>
-	</ol>
-      </li>
-
-
-      <li>Potential Optimizations:
-	<ol>
-	  <LI>There is a certain amount of overhead introduced by the
-              use of TSS Singletons. TSS singletons are very
-              convenient as the variable does not have to be passed
-              from function to function. Even though sort of access is
-              generally acceptable, the overhead of this approach
-              maybe too high when used in code which is executed
-              frequently (e.g., during an upcall). This critical code
-              may have to be restructured not to use TSS Singletons
-              because of the high overhead associated with it. </LI>
-	</ol>
-      </li>
-
-
-    </UL>
-
-  </body>
-</html>
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
deleted file mode 100644
index 4a2c3883162..00000000000
--- a/TAO/docs/releasenotes/trader.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HR>
-<H3><A NAME="tservices"></A>CORBA Trader Service</H3>
-Point of contact: <A HREF="mailto:sbw1@cs.wustl.edu">Seth Widoff</A> and <A HREF="mailto:marina@cs.wustl.edu">Marina Spivak</a><P>
-
-<P>Current status:
-
-<ul>
-<li> Lookup Interface </li>
-<li> Constraint Interpreter (for constraint based lookup)</li>
-<li> Register Interface </li>
-<li> Offer Iterator, Offer Id Iterator </li>
-<li> Abstract Interfaces </li>
-<li> Service Type Repository </li> 
-<li> Admin Interface</li>
-<li> Support for Dynamic Property Evaluation</li>
-</ul>
-
-<P>Future work:
-
-<ul>
-<li>Utilization of Service Type Repository by Register and Lookup  <br>
-    to provide full type checking</li>
-<li>TAO and NT releases</li>
-<li>Link Interface </li>
-</ul>
-
-Complete design information on the TAO Trader service is available <A
-HREF="http://www.cs.wustl.edu/~marina/Trader_status.html">online</A>.
-The source code for the Trader service is also available <A
-HREF="http://www.cs.wustl.edu/~sbw1/trader.zip">online</A>, as well.
-We will be integrating this with TAO shortly. <P>
-</ul>
diff --git a/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java b/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java
deleted file mode 100644
index c10ae7d766a..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    AnswerEvent.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Event definition for the Dialog for selecting Observables.
-//
-// ============================================================================
-
-public class AnswerEvent extends java.util.EventObject {
-
-  protected String selected_;
-
-  public AnswerEvent (Object source, String selected) {
-    super (source);
-    this.selected_ = selected;
-  }
-}
-    
diff --git a/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java b/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java
deleted file mode 100644
index 77d43646729..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    AnswerListener.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   EventListener definition for the Dialog for selecting Observables.
-//
-// ============================================================================
-
-
-public class AnswerListener implements java.util.EventListener {
-  public void ok (AnswerEvent e) {}
-  public void cancel (AnswerEvent e) {}
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html
deleted file mode 100644
index c7410019908..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-<META NAME="DOVEBrowser" Content="DOVE Browser invokation">
-<META HTTP-EQUIV="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Document Title</TITLE>
-</HEAD>
-<BODY>
-
-Note: The gatekeeper must run in the DOVEBrowser directory!
-Note: The IORs are different for each machine!
-
-
-NT Name Service IOR
-<PARAM NAME="NSIOR" VALUE="IOR:010000002000000049444c3a436f734e616d696e672f4e616d696e67436f6e746578743a312e30000100000000000000520000000101000015000000636f727269646f2e63732e777573746c2e65647500003a272e0000005033353265633733313030303537613538526f6f74504f412f6368696c645f706f612f4e616d6553657276696365">
-
-Unix Name ServiceIOR
-<PARAM NAME="NSIOR" VALUE="IOR:000000000000002049444c3a436f734e616d696e672f4e616d696e67436f6e746578743a312e3000000000010000000000000042000100000000000674616e676f00953f0000002e5033353265623733353030306533653133526f6f74504f412f6368696c645f706f612f4e616d6553657276696365">
-
-Use this to run it with the appletviewer
-<param name=org.omg.CORBA.ORBClass value=com.visigenic.vbroker.orb.ORB>
-
-Use this to run it within Netscape
-<param name=USE_ORB_LOCATOR value=true>
-
-<APPLET code="DOVEBrowserApplet.class" width=700 height=600>
-<param name=org.omg.CORBA.ORBClass value=com.visigenic.vbroker.orb.ORB>
-<PARAM NAME="NSIOR" VALUE="IOR:000000000000002049444c3a436f734e616d696e672f4e616d696e67436f6e746578743a312e3000000000010000000000000042000100000000000674616e676f00953f0000002e5033353266383364653030306364306437526f6f74504f412f6368696c645f706f612f4e616d6553657276696365">
-</APPLET>
-
-</BODY>
-</HTML>
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
deleted file mode 100644
index fc653f45c1d..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//   DOVEBrowser.java
-//
-// = AUTHOR
-//   Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Entry point for the demo.
-//
-// ============================================================================
-
-
-import java.awt.*;
-
-public class DOVEBrowser {
-
-  DemoCore demoCore_;
-  
-  public DOVEBrowser () {
-    super (); 
-  }
-  
-  public void init (String nameServiceIOR) {
-
-    demoCore_ = new DemoCore (nameServiceIOR, null); 
-    demoCore_.show ();
-    demoCore_.run ();
-  }
-  
-  public static void main (String[] args) {      
-    String nameServiceIOR = null;
-
-    if (args.length == 2) {
-      if (args[0] == "-ORBnameserviceior") {
-	nameServiceIOR = args[1];
-      }
-    } 
-    
-    DOVEBrowser doveBrowser = new DOVEBrowser();
-    doveBrowser.init (nameServiceIOR);
-  }  
-}
-  
-  
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
deleted file mode 100644
index 622ceb0536e..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//   DOVEBrowserApplet.java
-//
-// = AUTHOR
-//   Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Entry point for the demo when started inside an applet.
-//
-// ============================================================================
-
-
-import java.awt.*;
-
-public class DOVEBrowserApplet extends java.applet.Applet {
-
-  DemoCore demoCore_;
-  static String nameServiceIOR_ = null;
-  
-  public DOVEBrowserApplet () {
-    super (); 
-  }
-  
-  public void init () {
-    // in case of an applet use the following line, else not!
-    nameServiceIOR_ = this.getParameter ("NSIOR");
-    
-    if (nameServiceIOR_ == null) {
-      System.out.println ("The DOVE Browser cannot run, because no Naming Service IOR was found!");
-      return;
-    }
-
-    demoCore_ = new DemoCore (nameServiceIOR_, this); 
-    demoCore_.show ();
-    demoCore_.run ();
-  }
-}
-  
-  
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/DataHandler.java b/TAO/examples/Simulator/DOVEBrowser/DataHandler.java
deleted file mode 100644
index a2a88771b4a..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DataHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    DataHandler.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is the interface for data handling in the simulation demo
-//   using the Event Channel as transport media.
-//
-// ============================================================================
-
-import org.omg.CORBA.*;
-
-public interface DataHandler {
-  
-  // entry point for an consumer to put data into the data handler
-  public void update (Any any_value);
-  
-  // get a list of the Observables names to allow selection
-  public java.util.Enumeration getObservablesList ();
- 
-  // get a specific Observable
-  public DemoObservable getObservable(String name);
-
-  // get the property of an observable
-  public int getObservableProperty (String name);
-}
-
-
-    
-    
diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
deleted file mode 100644
index 376a0fb6c98..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    DemoCore.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This class servers as the core class of the simulation demo.
-//   It connects the push consumer of the event service with 
-//   one or several Java Beans.
-//
-// ============================================================================
-
-
-import java.awt.*;
-import java.awt.event.*;
-
-public class DemoCore extends Frame {
-
-  private static final int MAX_VIS_COMPS = 10;
-
-  private PushConsumerFactory pushConsumerFactory_;
-  private VisCompFactory visCompFactory_;
-  private DataHandler dataHandler_;
-  private java.util.Vector vis_comp_list_;
-  private int countVisComp_ = 0;
-  private GridBagLayout gridbag_;
-  private GridBagConstraints constraints_;
-
-  DemoCore (String nameServiceIOR, java.applet.Applet applet) {
-    super ();
-
-    setSize (600,400);
-    setBounds (new Rectangle (50,50,800,500));
-    setVisible (true);
-
-    gridbag_ = new GridBagLayout();
-    constraints_ = new GridBagConstraints();
-    constraints_.fill = GridBagConstraints.BOTH;
-    constraints_.weightx = 1.0;
-    constraints_.weighty = 1.0;
-    this.setLayout (gridbag_);
-
-    // Instantiate the DataHandler and the PushConsumer
-    dataHandler_ = new NavWeapDataHandler ();
-    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, nameServiceIOR, applet);
-
-    // List of Visualization Components
-    vis_comp_list_ = new java.util.Vector();
-
-
-    MenuBar menubar_ = new MenuBar ();
-    Menu menu_ = new Menu ("File");
-    MenuItem menu_quit_item_ = new MenuItem ("Quit");
-    menu_quit_item_.setEnabled (true);
-    MenuItem menu_add_item_ = new MenuItem ("Add");
-    menu_add_item_.setEnabled (true);
-    menu_.add (menu_add_item_);
-    menu_.add (menu_quit_item_);
-    menubar_.add (menu_);
-    
-    setMenuBar (menubar_);
-    
-    menu_quit_item_.addActionListener (new ActionListener () 
-				       {
-					 public void actionPerformed (ActionEvent e) {
-					   System.exit (0);
-					 }
-				       });      
-      
-    menu_add_item_.addActionListener (new ActionListener () 
-				       {
-					 public void actionPerformed (ActionEvent e) {
-					   ObservablesDialog obsDialog_ = 
-					     new ObservablesDialog (DemoCore.this,
-								    dataHandler_.getObservablesList());
-					   obsDialog_.addAnswerListener (new AnswerListener ()
-									{
-									  public void ok (AnswerEvent e)
-									    {
-									      DemoCore.this.addConnection (e.selected_);
-									    }
-									});
-					   obsDialog_.setVisible (true);
-					 }
-				       });      
-    
-    // instantiate the Factory for Visualization Components
-    visCompFactory_ = new VisCompFactory ();
-
-    // in here the factory is needed
-    addConnection ("Cpu_UsageObservable");
-  }
-  
-	public boolean addConnection (String selected) {	
-		// to not fill too many into it
-		if (countVisComp_ < MAX_VIS_COMPS) {
-      
-			// get a reference to the Observable
-			DemoObservable observable_ = dataHandler_.getObservable (selected);
-	
-			if (observable_ != null) {
-	
-        VisComp visComp_ = visCompFactory_.getNewVisComp (observable_.getProperty (), selected);
-
-	  		if (visComp_ != null) {
-		  		vis_comp_list_.addElement (visComp_);	 
-	    
-			  	// connect the Observer with the Observable
-  				observable_.addObserver (visComp_);
-	  
-	  			countVisComp_++;
-	  
-          // not more than three in a row
-		  		if (countVisComp_ == 3){
-			    	constraints_.gridwidth = GridBagConstraints.REMAINDER;
-          }
-          if (countVisComp_ > 3) {
-				    constraints_.gridwidth = 1;
-			    } 
-	  
-			    gridbag_.setConstraints ((java.awt.Component) visComp_, constraints_);
-	  
-			    // add the Visualization Component to the Frame
-			    DemoCore.this.add ((java.awt.Component) visComp_);
-			    DemoCore.this.show ();
-	  
-          return true;
-        }
-		  }
-    }
-	  return false;
-	}
-  
-  public void init () {
-
-  }
-
-  public void paint (Graphics g) 
-    {
-    }
-
-  public void run () {
-
-    // Wait passive until events come in
-    pushConsumerFactory_.run ();
-
-  } 
-}
-  
-  
diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java b/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java
deleted file mode 100644
index 81c85b961f8..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    DemoObservable.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This class servers as the core class of the simulation demo
-//
-// ============================================================================
-
-
-
-public abstract class DemoObservable extends java.util.Observable {
-
-  public abstract int getProperty ();
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java b/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java
deleted file mode 100644
index 5d636641beb..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java
+++ /dev/null
@@ -1,206 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    DoubleVisComp.java
-//
-// = AUTHOR
-//    Seth Widoff (core graph functionality)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is a Visualization Component for displaying doubles.
-//
-// ============================================================================
-
-
-
-
-import java.awt.*;
-import java.util.*;
-
-public class DoubleVisComp extends Canvas implements VisComp
-{
-  private static final int MIN_SPACING = 2;
-  private static final int POINT_HISTORY = 200;
-  private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10);
-  
-  private Queue plot_;
-  private String title_;
-  private Graphics offgraphics_;
-  private Image offscreen_;
-  private Dimension offscreensize_;
-  private int max_value_;
-  private int old_max_value_;
-  private int spacing_;
-  private float local_max_ = 0;
-  private boolean max_increased_ = false;
-  
-  public DoubleVisComp()
-  {
-    super();
-
-    plot_ = new Queue();
-    spacing_ = MIN_SPACING;
-    title_ = "";
-    max_value_ = 1;
-    // max_value_ = max_value;
-    old_max_value_ = max_value_;
-    
-    java.util.Random rand = new java.util.Random (System.currentTimeMillis());
-    float hue_ = rand.nextFloat();
-    float brightness = rand.nextFloat();
-
-    hue_ += .075;
-    
-    if (hue_ > 1.0)
-      hue_ -= 1.0;
-    
-    if (brightness > 0.75)
-      brightness -= 0.25;
-    
-    Color new_color = Color.getHSBColor(hue_, 1, brightness);
-
-    this.setBackground(new_color);
-    this.setForeground(Color.white);
-  }
-
-
-  public void setName (String title) {
-      title_ = title;
-  }
-  
-  public int getProperty () {
-      return Properties.DOUBLE;
-    }
-
-  public Dimension getMinimumSize () {
-      return new Dimension (75, 75);
-    }
-
-  public Dimension getPreferredSize () {
-      return new Dimension (175, 175);
-    }
-  
-  public String getName() {
-    return title_;
-  }
-
-  public int getMax() {
-      return old_max_value_;
-    }
-
-  public void update(java.util.Observable observable, java.lang.Object obj)
-  {
-    Double double_temp_;
-    try {
-      double_temp_ = (Double) obj;  
-    }
-    catch (Exception excp) {
-      double_temp_ = new Double (0.0);
-      System.out.println (excp);
-      System.out.println ("Visualization Component received wrong data type!");
-    }
-        
-    float new_point = double_temp_.floatValue();
-    Float temp = (Float)plot_.dequeue_tail();
-    plot_.enqueue_head(new Float(new_point));
-    
-    if (new_point > local_max_)
-      local_max_ = new_point;
-    
-    while (local_max_ > max_value_)
-      max_value_ *= 2;
-    
-    while ((local_max_ < max_value_/2) && (max_value_ > old_max_value_))
-      max_value_ /= 2;
-
-    repaint();
-  }
-
-  public void update(Graphics g)
-  {
-    Dimension d = getSize ();
-    float tmp, value_1, value_2;
-    FontMetrics fm = g.getFontMetrics ();
-    Enumeration queue_iter = plot_.forward_iterator();
-    int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i;
-    String value =  "Value (of " + max_value_ + "): " + String.valueOf(plot_.head());
-    
-    if ((offscreen_ == null) ||
-	(offscreensize_.width != d.width - 8) ||
-	(offscreensize_.height != d.height - 8))
-      {
-	offscreen_ = createImage(d.width - 8, d.height - 8);
-	offscreensize_ = new Dimension(d.width - 8, d.height - 8);
-	offgraphics_ = offscreen_.getGraphics();
-	offgraphics_.setFont(FONT);
-      }
-
-    g.setColor (Color.lightGray);
-    g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
-    g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
-    g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-    
-    local_max_ = 0;
-    offgraphics_.setColor (getBackground());
-    offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
-    offgraphics_.setColor (getForeground());    
-    offgraphics_.drawString(title_, 5, fheight);
-    offgraphics_.drawString(value, 5, offscreensize_.height - 5);
-
-    value_1 = ((Float)queue_iter.nextElement()).floatValue();
-    while (queue_iter.hasMoreElements())
-      {
-	value_2 = ((Float)queue_iter.nextElement()).floatValue();
-	
-	if (value_1 > local_max_)
-	  local_max_ = value_1;
-	
-        y1 = normalize(offscreensize_.height - fheight, value_1);
-        y2 = normalize(offscreensize_.height - fheight, value_2);
-	
-	tmp = value_2;
-	value_2 = value_1;
-	value_1 = tmp;
-
-        x2 = x1 - spacing_;
-        offgraphics_.drawLine(x1, y1, x2, y2);
-        x1 = x2;
-	if (x1 <= 5)
-	  break;
-      }
-
-    g.drawImage(offscreen_, 3, 3, null);
-  }
-  
-  public void paint(Graphics g)
-  {
-    Dimension d = getSize ();
-    int plot_length = plot_.length();
-    int num_points = d.width / spacing_;
-    
-    if (plot_.length() < num_points)
-      {
-	for (int i = 0; i < num_points - plot_length; i++)
-	  plot_.enqueue_tail(new Float(0));
-      }
-    else if (plot_.length() > num_points)
-      {
-	for (int i = 0; i < plot_length - num_points; i++)
-	  plot_.dequeue_tail();
-      }
-    
-    update(g);
-  }
-
-
-  private int normalize(int height, float coord)
-  {
-    float ratio = (float)coord/max_value_;
-    float pixels = (float)height*ratio;
-    float location = (float)height - pixels;
-    
-    return Math.round(location);
-  }
-}
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
deleted file mode 100644
index b6a39e63dec..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$ 
-// ============================================================================
-//
-// 
-// = FILENAME
-//    NS_Resolve.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Resolves the initial reference to the Naming service,
-//   the orb has to be given as a parameter to the
-//   resolve_name_service call. 
-// 
-//
-// ============================================================================
-
-
-
-
-import org.omg.CORBA.*;
-import java.net.*;
-import java.io.*;
-
-
-
-public class NS_Resolve 
-{
-  
-  private static final String ACE_DEFAULT_MULTICAST_ADDR = "224.9.9.2";
-  private static final int TAO_DEFAULT_NAME_SERVER_REQUEST_PORT = 10013;
-  private static final int MULTICAST_SEND_PORT = 10060;
-  private static final int MULTICAST_RECEIVE_PORT = 10061;
-  private static final int TAO_SERVICEID_NAMESERVICE = 0;
-  private static final int TAO_SERVICEID_TRADINGSERVICE = 1;
-
-  org.omg.CORBA.Object name_service_;
-
-
-  public org.omg.CORBA.Object resolve_name_service (org.omg.CORBA.ORB orb)
-    {
-      try
-	{
-	  // Create a message with the multicast receive port in it
-	  ByteArrayOutputStream byte_stream_ = new ByteArrayOutputStream ();
-      	  byte_stream_.write ((int)((MULTICAST_RECEIVE_PORT&0xff00)>>>8));
-	  byte_stream_.write ((int)(MULTICAST_RECEIVE_PORT&0x00ff));
-      	  byte_stream_.write ((int)((TAO_SERVICEID_NAMESERVICE&0xff00)>>>8));
-	  byte_stream_.write ((int)(TAO_SERVICEID_NAMESERVICE&0x00ff));
-	  byte[] msg = byte_stream_.toByteArray();
-
-
-	  // Define the group for the multicast
-
-	  InetAddress group = InetAddress.getByName(ACE_DEFAULT_MULTICAST_ADDR);
-	  // Create the multicast socket at any port you want
-	  MulticastSocket multicastsocket_ = new MulticastSocket(MULTICAST_SEND_PORT);
-	  // Create a socket for the answer of the Naming Service 
-	  DatagramSocket socket_ = new DatagramSocket (MULTICAST_RECEIVE_PORT);
-	  // Give three seconds time for the Naming Service to respond
-	  socket_.setSoTimeout (3000);
-	  // Build a packet with the port number in it
-	  DatagramPacket  hello = new DatagramPacket(msg, msg.length,
-						     group, TAO_DEFAULT_NAME_SERVER_REQUEST_PORT);
-
-	  // Send the packet
-	  multicastsocket_.send (hello);
-
-	  // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
-	  byte[] buf = new byte[4096];
-	  // Set up packet which can be received
-	  DatagramPacket recv = new DatagramPacket (buf, buf.length);	  
-	  // Receive a packet or time out
-	  socket_.receive (recv);
-
-	  // Determine the length of the IOR
-	  int length;
-	  for (length = 0; buf[length] != 0; length++);
-
-	  // Store the IOR in a String
-       	  String name_service_ior_ = new String (recv.getData (),0,length);
-
-	  // Convert the String into
-	  return orb.string_to_object (name_service_ior_);
-	}
-      catch (SocketException e)
-	{
-	  System.err.println (e);
-	}
-      catch (java.io.InterruptedIOException e)
-	{
-	  System.err.println ("NS_Resolve: The receive lasted too long");
-	} 
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println(e);
-	}	
-      catch (java.io.IOException e)
-	{
-	  System.err.println (e);
-	}
-      return null;
-      
-    } 
-
-};
-
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java b/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
deleted file mode 100644
index e72155cab3d..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java
+++ /dev/null
@@ -1,220 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    NavWeapDataHandler.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is an implementation of the interface Data Handler,
-//   it handles Navigation and Weapons data, where statistic data is 
-//   part of it. Several Observables are declared, they can be accessed by
-//   any number of Observers, which could reside in a Java Bean for example.
-//
-// ============================================================================
-
-import org.omg.CORBA.*;
-
-public class NavWeapDataHandler implements DataHandler {
-
-  java.util.Hashtable ObservablesTable; 
-  int received_events_;
-
-
-  // Observable for Navigation data
-  class NavigationObservable extends DemoObservable {
-    
-    // to ask which kind of viewer is needed to display data
-    public int getProperty () {
-	return Properties.NAVIGATION;
-    }    
-    
-    public void updateNavigation (Navigation navigation) {
-      setChanged ();
-      notifyObservers (navigation);
-    }
-      
-  }
-
-  class WeaponsObservable extends DemoObservable {
-    
-    // to ask which kind of viewer is needed to display data
-    public int getProperty () {
-	return Properties.WEAPONS;
-      }
-
-    public void updateWeapons (Weapons weapons) {
-      setChanged ();
-      notifyObservers (weapons);
-    }
-  }
-  
-  class Cpu_UsageObservable extends DemoObservable {
-    
-    public int getProperty () {
-      return Properties.DOUBLE;
-    }
-    
-    public void updateCpu_Usage (double utilization) {
-      setChanged ();
-      Double temp_ = new Double (utilization);
-      notifyObservers (temp_);
-    }
-  }
-  class OverheadObservable extends DemoObservable {
-    
-    public int getProperty () {
-      return Properties.DOUBLE;
-    }
-
-    public void updateOverhead (double overhead) {
-      setChanged ();
-      Double temp_ = new Double (overhead);
-      notifyObservers (temp_);
-    }
-  }
-  class JitterObservable extends DemoObservable {
-    double latency = 0.0;
-    double last_latency = 0.0;
-        
-    public int getProperty () {
-      return Properties.DOUBLE;
-    }
-        
-    public void updateJitter (int completion_time,
-			       int computation_time,
-			       int arrival_time ) {
-      last_latency = latency;
-      latency = (double)(completion_time
-                         - computation_time
-                         - arrival_time);
-      latency = latency > 0 ? latency : 0;      
-      double jitter_ = (double)Math.abs(latency - last_latency); 
-
-      setChanged ();
-      Double temp_ = new Double (jitter_);
-      notifyObservers (temp_);
-    }
-  }
-  class DeadlinesObservable extends DemoObservable {
-    
-    public int getProperty () {
-      return Properties.DOUBLE;
-    }
-    
-    public void updateDeadlines (int deadline_time, 
-				 int completion_time) {
-      double missed_ = (double) ((deadline_time 
-				  < completion_time) 
-				 ? 1.0 : 0.0);      	
-
-      Double temp_ = new Double (missed_);
-      setChanged ();
-      notifyObservers (temp_);	
-    }
-  }
-  class LatencyObservable extends DemoObservable {
-    double latency = 0.0;
-    double last_latency = 0.0;
-    
-    public int getProperty () {
-      return Properties.DOUBLE;
-    }
-    
-    public void updateLatency (int completion_time,
-			       int computation_time,
-			       int arrival_time ) {
-      last_latency = latency;
-      latency = (double)(completion_time
-                         - computation_time
-                         - arrival_time);
-      latency = latency > 0 ? latency : 0;
-      
-      setChanged ();
-      Double temp_ = new Double(latency);
-      notifyObservers (temp_);	
-    }
-  }
-  
-  
-  public void update (Any any_value) {
-    
-    if (any_value.type().equal (NavigationHelper.type()))
-      {
-	Navigation navigation_ = NavigationHelper.extract (any_value);
-	NavigationObservable nobs = (NavigationObservable)ObservablesTable.get ("NavigationObservable");
-	nobs.updateNavigation (navigation_);
-	Cpu_UsageObservable cobs = (Cpu_UsageObservable)ObservablesTable.get ("Cpu_UsageObservable");
-	cobs.updateCpu_Usage (navigation_.utilization);
-	OverheadObservable oobs = (OverheadObservable)ObservablesTable.get ("OverheadObservable");
-	oobs.updateOverhead (navigation_.overhead);
-	JitterObservable jobs = (JitterObservable)ObservablesTable.get ("JitterObservable");
-	jobs.updateJitter (navigation_.completion_time,
-			  navigation_.computation_time,
-			  navigation_.arrival_time);
-	DeadlinesObservable dobs = (DeadlinesObservable)ObservablesTable.get ("DeadlinesObservable");
-	dobs.updateDeadlines (navigation_.deadline_time,
-			     navigation_.completion_time);
-	LatencyObservable lobs = (LatencyObservable)ObservablesTable.get ("LatencyObservable");
-	lobs.updateLatency (navigation_.completion_time,
-			   navigation_.computation_time,
-			   navigation_.arrival_time);
-	received_events_++;
-      }
-    else if (any_value.type().equal (WeaponsHelper.type()))
-      {
-	Weapons weapons_ = WeaponsHelper.extract (any_value);
-	WeaponsObservable wobs = (WeaponsObservable)ObservablesTable.get ("WeaponsObservable");;
-	wobs.updateWeapons (weapons_);
-	Cpu_UsageObservable cobs = (Cpu_UsageObservable)ObservablesTable.get ("Cpu_UsageObservable");
-	cobs.updateCpu_Usage (weapons_.utilization);
-	OverheadObservable oobs = (OverheadObservable)ObservablesTable.get ("OverheadObservable");
-	oobs.updateOverhead (weapons_.overhead);
-	JitterObservable jobs = (JitterObservable)ObservablesTable.get ("JitterObservable");
-	jobs.updateJitter (weapons_.completion_time,
-			  weapons_.computation_time,
-			  weapons_.arrival_time);
-	DeadlinesObservable dobs = (DeadlinesObservable)ObservablesTable.get ("DeadlinesObservable");
-	dobs.updateDeadlines (weapons_.deadline_time,
-			     weapons_.completion_time);
-	LatencyObservable lobs = (LatencyObservable)ObservablesTable.get ("LatencyObservable");
-	lobs.updateLatency (weapons_.completion_time,
-			   weapons_.computation_time,
-			   weapons_.arrival_time);
-	received_events_++;
-      }
-	else 
-	System.out.println ("Received wrong type information"+any_value.type());
-  }
-  
-  NavWeapDataHandler () {
-    ObservablesTable = new java.util.Hashtable();
-
-    ObservablesTable.put ("NavigationObservable", new NavigationObservable());
-    ObservablesTable.put ("WeaponsObservable", new WeaponsObservable());
-    ObservablesTable.put ("Cpu_UsageObservable", new Cpu_UsageObservable());
-    ObservablesTable.put ("OverheadObservable", new OverheadObservable());
-    ObservablesTable.put ("JitterObservable", new JitterObservable());
-    ObservablesTable.put ("DeadlinesObservable", new DeadlinesObservable());
-    ObservablesTable.put ("LatencyObservable", new LatencyObservable()); 
-  }
-  
-  public java.util.Enumeration getObservablesList () {
-    return ObservablesTable.keys ();
-  }
-  
-  public DemoObservable getObservable(String name) {
-    return (DemoObservable)ObservablesTable.get (name);
-  }
-  
-  public int getObservableProperty (String name) {
-    DemoObservable obs = (DemoObservable)ObservablesTable.get (name);
-    return obs.getProperty ();
-  }
-  
-}
-
-
-    
-    
diff --git a/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java b/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java
deleted file mode 100644
index 3d7a217389b..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java
+++ /dev/null
@@ -1,350 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    NavigationVisComp.java
-//
-// = AUTHOR
-//    Seth Widoff (core functionality)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is a Visualization Component for displaying navigation.
-//
-// ============================================================================
-
-
-
-import java.awt.*;
-import java.io.*;
-
-public class NavigationVisComp extends Panel implements VisComp
-{
-  private Alt_Horizon alt_hor_ = new Alt_Horizon ();
-  private Position pos_ = new Position ();
-
-  public NavigationVisComp ()
-    {
-      setLayout (new BorderLayout (0, 2));
-      add ("Center", alt_hor_);
-      add ("South", pos_);
-    }
-
-  public void setName (String title) {
-  }
-
-  public int getProperty () {
-      return Properties.NAVIGATION;
-    }
-  
-  public void update (java.util.Observable observable, java.lang.Object obj) {
-    Navigation navigation_ = null;
-    try {
-      navigation_ = (Navigation) obj;  
-    }
-    catch (Exception excp) {
-      System.out.println (excp);
-      System.out.println ("Visualization Component received wrong data type!");
-    }
-    if (navigation_ != null) {            
-      // make sure all the values are in the proper range.
-      navigation_.roll = (navigation_.roll > 180 || navigation_.roll < -180) ? 
-	0 :  navigation_.roll;
-      navigation_.pitch = (navigation_.pitch > 90 || navigation_.pitch < -90) ? 
-	0 :  navigation_.pitch;
-
-      // update the artificial horizon
-      alt_hor_.update_display (navigation_.roll, navigation_.pitch);
-
-      navigation_.pitch = (navigation_.position_latitude > 90 || navigation_.position_latitude < -90) ? 
-	0 :  navigation_.position_latitude;
-      navigation_.pitch = (navigation_.position_longitude > 100 || navigation_.position_longitude < 00) ? 
-	0 :  navigation_.position_longitude;
-      navigation_.pitch = (navigation_.altitude > 90 || navigation_.altitude < -90) ? 
-	0 :  navigation_.altitude;
-      navigation_.pitch = (navigation_.heading > 180 || navigation_.heading < -180) ? 
-	0 :  navigation_.heading;
-
-      // update the position display
-      pos_.update_display (navigation_.position_latitude, 
-			   navigation_.position_longitude, 
-			   navigation_.altitude, 
-			   navigation_.heading);      
-    }
-  }
-}
-
-class Alt_Horizon
-extends Canvas
-{
-  private final static Color GREEN = new Color (0, 100, 0),
-    BLUE = new Color (30, 144, 255);
-  
-  private Graphics offgraphics_;
-  private Image offscreen_;
-  private Dimension offscreensize_;
-
-  private int roll_ = 0, pitch_ = 0;
-  
-  public void update_display (int roll, int pitch)
-    {
-      roll_ = roll;
-      pitch_ = pitch;
-
-      repaint ();
-    }
-  
-  public Dimension getPreferredSize ()
-    {
-      return new Dimension (180, 180);
-    }
-
-  public Dimension getMinimumSize ()
-    {
-      return new Dimension (80, 80);
-    }
-  
-  public void paint (Graphics g)
-    {
-      update (g);
-    }
-  
-  public void update (Graphics g)
-    {
-      Dimension d = getSize ();
-      int rad, angles[] = { 180, 0 };
-      Point center;
-      
-      if ((offscreen_ == null) || (d.width != offscreensize_.width) ||
-	  (d.height != offscreensize_.height))
-	{
-	  offscreen_ = createImage (d.width, d.height);
-	  offscreensize_ = new Dimension (d.width, d.height);
-	  offgraphics_ = offscreen_.getGraphics ();
-	  offgraphics_.setFont (getFont());
-	  
-	  //	  g.setColor (Color.lightGray);
-	  //	  g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
-	  //	  g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
-	  //	  g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-	}
-      
-      offgraphics_.setColor (getBackground());
-      offgraphics_.fillRect (0, 0, d.width, d.height);
-      offgraphics_.setColor (BLUE);
-      
-      // Calculate from the dimensions, the largest square.
-      center = new Point (d.width / 2, d.height / 2);
-      rad = ((center.x < center.y) ? center.x : center.y);
-
-      // Draw a circle of blue
-      offgraphics_.fillOval (center.x - rad, center.y - rad,
-			     2*rad, 2*rad);
-
-      // Roll the horizon based on the roll angle
-      if (roll_ != 0)
-	roll_horizon (rad, angles);
-
-      // Pitch the horizon based on the pitch angle
-      if (pitch_ != 0)
-	pitch_horizon (rad, angles);
-
-      // Draw the resulting terrain
-      draw_horizon (rad, center, angles);
-
-      // Draw the plotted Image. 
-      g.drawImage (offscreen_, 0, 0, null);
-    }
-
-  private void draw_horizon (int rad, Point center, int[] angles)
-    {
-      // Draw an arc
-      int arc_angle =
-	((angles[0] > angles[1]) ?
-	 (360 - angles[0]) + angles[1] :
-	 (angles[1] - angles[0]));
-      
-      Polygon remainder = new Polygon ();
-
-      offgraphics_.setColor (GREEN);
-      offgraphics_.fillArc (center.x - rad, center.y - rad,
-			    2*rad, 2*rad,
-			    angles[0], arc_angle);
-
-      if (pitch_ != 0)
-	{
-	  if ((pitch_ > 0 && Math.abs (roll_) < 90) ||
-	      (pitch_ < 0 && Math.abs (roll_) >= 90))
-	    offgraphics_.setColor (BLUE);
-
-	  int cover_angle = (angles[0] + arc_angle/2 + ((arc_angle < 180) ? 180 : 0)) % 360;
-
-	  // System.out.println (points[0] + " " + points[1]);
-
-	  // System.out.println (accepted_point);
-	  
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, cover_angle),
-			      center.y - polar_to_rect_y (rad, cover_angle)); 
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[0]),
-			      center.y - polar_to_rect_y (rad, angles[0]));
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[1]),
-			      center.y - polar_to_rect_y (rad, angles[1]));
-	  offgraphics_.fillPolygon (remainder);
-	  //offgraphics_.setColor (getBackground ());
-	  //offgraphics_.drawPolygon (remainder);
-	}	
-    }
-  
-  private void pitch_horizon (int rad, int[] angles)
-    {
-      boolean upside_down = Math.abs (roll_) >= 90;
-      int angle_shift = (int) Math.round ((double)(90 - (Math.abs (roll_) % 180)) / 90.0 * pitch_);
-
-      //      System.out.println ("angle_shift " + angle_shift);
-
-      angles[0] += angle_shift;
-      angles[1] -= angle_shift;
-      
-
-    }
-  
-  private void roll_horizon (int rad, int[] angles)
-    {
-      // Roll the left and right points of the terrain.
-      angles[0] += roll_;
-      angles[1] += roll_;
-
-      if (angles[0] < 0)
-	angles[0] += 360;
-
-      if (angles[1] < 0)
-	angles[1] += 360;      
-    }
-
-  private int polar_to_rect_x (int rad, int angle)
-    {
-      return (int) Math.round (rad * Math.cos ((double)angle * Math.PI/180.0));
-    }
-
-  private int polar_to_rect_y (int rad, int angle)
-    {
-      return (int) Math.round (rad * Math.sin ((double)angle * Math.PI/180.0));
-    }
-
-  private double caclulate_slope (int rad, int[] angles)
-    {
-      int x1 = polar_to_rect_x (rad, angles[0]),
-	x2 = polar_to_rect_x (rad, angles[1]),
-	y1 = polar_to_rect_y (rad, angles[0]),
-	y2 = polar_to_rect_y (rad, angles[1]);
-
-      return ((double) (y2 - y1)) / ((double) (x2 - x1));
-    }
-  
-  private Point[] line_circle_intesect (int rad, double y_intercept, double slope)
-    {
-      double r_2 = (double)(rad * rad),
-	s_2 = slope * slope,
-	a_x = s_2 + 1,
-	b_x = 2.0 * slope * y_intercept,
-	c_x = y_intercept * y_intercept - r_2;
-      int[] x_roots = quad_eq (a_x, b_x, c_x),
-	y_roots = { (int) Math.round ((double)((double) x_roots[0])*slope + y_intercept),
-		    (int) Math.round ((double)((double) x_roots[1])*slope + y_intercept) };
-      Point[] points = new Point [2];
-
-      points[0] = new Point (x_roots[0], y_roots[0]);
-      points[1] = new Point (x_roots[1], y_roots[1]);
-
-      return points;
-    }
-  
-  private int calculate_angle (int rad, int x, int y)
-    {
-      /*
-	double angle = 0,
-      sin_value = Math.asin ((double)y / (double)rad),
-      tan_value = Math.atan ((double)y / (double)x);
-
-	if (x >= 0)
-      angle = (x !=  0) ? tan_value : sin_value +
-      ((y < 0) ? 2*Math.PI : 0);
-	  else
-      angle = Math.PI + tan_value;
-
-      return (int) Math.round (angle * 180.0 / Math.PI);
-      */
-
-      double angle = 0.0,
-	sin_value = Math.asin ((double)Math.abs (y) / (double)rad);
-
-      if (x >= 0 && y >= 0)
-	angle = sin_value;
-      else if (x < 0 && y >= 0)
-	angle = sin_value + Math.PI/2.0;
-      else if (x < 0 && y < 0)
-	angle = sin_value + Math.PI;
-      else if (x >= 0 && y < 0)
-	angle = sin_value + 3.0*Math.PI/2.0;
-
-      return (int) Math.round (angle * 180.0 / Math.PI);
-    }
-
-  private int[] quad_eq (double a, double b, double c)
-    {
-      int[] roots = new int [2];
-      double body = Math.sqrt (b*b - 4.0*a*c);
-      
-      roots[0] = (int) Math.round ((-b + body) / (2.0 * a));
-      roots[1] = (int) Math.round ((-b - body) / (2.0 * a));
-
-      return roots;
-    }
-
-  private int distance (Point point1, Point point2)
-    {
-      double xdiff = point1.x - point2.x,
-	ydiff = point1.y - point2.y;
-
-      return (int) Math.round (Math.sqrt (xdiff*xdiff + ydiff*ydiff));
-    }
-}
-
-class Position extends Panel
-{
-  private final static Font FONT = new Font ("Dialog", Font.BOLD, 12);
-  private final static char DEGREE = '\u00B0'; 
-  
-  private Label lat_ = new Label ("0" + DEGREE + " N", Label.RIGHT),
-    long_ = new Label ("0" + DEGREE + " S", Label.RIGHT),
-    alt_ = new Label ("0 Kft", Label.RIGHT),
-    heading_ = new Label ("0" + DEGREE + "  ", Label.RIGHT);
-  
-  public Position ()
-    {
-      Panel grid_panel = new Panel ();
-      
-      lat_.setFont (FONT);
-      long_.setFont (FONT);
-      alt_.setFont (FONT);
-      heading_.setFont (FONT);
-
-      setLayout (new GridLayout (1, 4));
-      add (lat_);
-      add (long_);
-      add (heading_);
-      add (alt_);      
-    }
-
-  public void update_display (int lat, int lon, int alt, int heading)
-    {
-      String lat_str =
-	Math.abs (lat) + "" + DEGREE + ((lat > 0) ? " N" : " S");
-      String long_str =
-	Math.abs (lon) + "" + DEGREE + ((lon > 0) ? " E" : " W");
-
-      lat_.setText (lat_str);
-      long_.setText (long_str);
-      alt_.setText (alt + " Kft");
-      heading_.setText (heading + "" + DEGREE + "  ");
-    }
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java b/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java
deleted file mode 100644
index 2ea856c24e2..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    ObservablesDialog.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Dialog for selecting Observables.
-//
-// ============================================================================
-
-import java.awt.*;
-import java.awt.event.*;
-
-public class ObservablesDialog extends Dialog {
-
-  List list_;
-  DemoCore parent_;
-  AnswerListener listener_;
-
-  ObservablesDialog (DemoCore parent,java.util.Enumeration enumeration) {
-    
-    super ((Frame)parent, "Select Observables", true);
-    parent_ = parent;
-    this.setSize(400, 300);
-    setBounds (new Rectangle (50,50,400,300));
-
-    list_ = new List ();
-    list_.setFont ( new Font ("Helvetica", Font.PLAIN, 10));
-    list_.setSize (200,200);
-
-    for (; enumeration.hasMoreElements();) {
-      list_.add ((String)enumeration.nextElement());      
-    }
-
-
-    Button ok_button_ = new Button ("OK");
-    ok_button_.setFont ( new Font ("DialogHelvetica", Font.PLAIN, 10));
-    Button cancel_button_ = new Button ("Cancel");
-    cancel_button_.setFont ( new Font ("DialogHelvetica", Font.PLAIN, 10));
-
-    GridBagLayout gridbag_ = new GridBagLayout ();
-    GridBagConstraints constraints_ = new GridBagConstraints ();
-
-    constraints_.fill = GridBagConstraints.BOTH;
-    this.setLayout (gridbag_);
-    
-    constraints_.weightx = 1.0;
-    constraints_.weighty = 1.0;
-    constraints_.gridwidth = GridBagConstraints.REMAINDER;
-    gridbag_.setConstraints (list_, constraints_);
-    this.add (list_);
-    
-    constraints_.weightx = 1.0;
-    constraints_.weighty = 1.0;
-    constraints_.gridwidth = GridBagConstraints.RELATIVE;
-    constraints_.fill = GridBagConstraints.NONE; 
-    gridbag_.setConstraints (ok_button_, constraints_);
-    gridbag_.setConstraints (cancel_button_, constraints_);
-    this.add (ok_button_);
-    this.add (cancel_button_);
-
-    ok_button_.addActionListener (new ActionListener () {
-      public void actionPerformed (ActionEvent e) {
-
-	String selected_ = ObservablesDialog.this.list_.getSelectedItem ();
-	  if (selected_ != null) {
-	    System.out.println (">>>>> " + selected_);
-	    if (listener_ != null) {	  
-	      AnswerEvent ev = new AnswerEvent (ObservablesDialog.this, selected_);
-	      listener_.ok (ev);
-	    }
-	    ObservablesDialog.this.setVisible (false);
-	  }
-      }
-    });
-  
-     cancel_button_.addActionListener (new ActionListener () {
-      public void actionPerformed (ActionEvent e) {
-	ObservablesDialog.this.setVisible (false);
-      }
-     });
-  }
-
-  public void addAnswerListener (AnswerListener al) {
-    listener_ = al;
-  }
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/Properties.java b/TAO/examples/Simulator/DOVEBrowser/Properties.java
deleted file mode 100644
index 17ff69e5a18..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/Properties.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    DataHandler.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is the interface for data handling in the simulation demo
-//   using the Event Channel as transport media. Several observables
-//   are created to feed observer Java Beans.
-//
-// ============================================================================
-
-
-public class Properties {
-  public static final int DOUBLE = 0;
-  public static final int NAVIGATION = 1;
-  public static final int WEAPONS = 2;
-}
-  
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
deleted file mode 100644
index d808027b9de..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
+++ /dev/null
@@ -1,198 +0,0 @@
-// $Id $
-//
-// ============================================================================
-//
-// 
-// = FILENAME
-//    PushConsumer.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    This is a Push Consumer which takes the data field of the
-//    event and updates with it a Data Handler.
-// 
-//
-// ============================================================================
-
-
-
-// The Consumer has to implement the Skeleton Consumer
-
-public class PushConsumer extends RtecEventComm._PushConsumerImplBase
-{
-  
-  public static final int ACE_ES_EVENT_ANY = 0;
-  public static final int ACE_ES_EVENT_SHUTDOWN = 1;
-  public static final int ACE_ES_EVENT_ACT = 2;
-  public static final int ACE_ES_EVENT_NOTIFICATION = 3;
-  public static final int ACE_ES_EVENT_TIMEOUT = 4;
-  public static final int ACE_ES_EVENT_INTERVAL_TIMEOUT = 5;
-  public static final int ACE_ES_EVENT_DEADLINE_TIMEOUT = 6;
-  public static final int ACE_ES_GLOBAL_DESIGNATOR = 7;
-  public static final int ACE_ES_CONJUNCTION_DESIGNATOR = 8;
-  public static final int ACE_ES_DISJUNCTION_DESIGNATOR = 9;
-  public static final int ACE_ES_EVENT_UNDEFINED = 16;
-  public static final int TOTAL_MESSAGES = 30;
-
-  // Store the number of received events
-  private int total_received_ = 0;
-  private org.omg.CORBA.ORB orb_;
-  private DataHandler dataHandler_;
-  private RtecScheduler.handle_tHolder rt_info_;
-  private RtecEventChannelAdmin.EventChannel channel_admin_;
-  private RtecEventChannelAdmin.ConsumerAdmin consumer_admin_;
-  private RtecEventChannelAdmin.ProxyPushSupplier suppliers_;
-  
-  public PushConsumer (org.omg.CORBA.ORB orb, DataHandler dataHandler)
-    {
-      orb_ = orb;
-      dataHandler_ = dataHandler;
-    }
-  
-  
-  public void push (RtecEventComm.Event[] events)
-    {
-      if (total_received_ < 5)	  
-	System.out.println ("Demo Consumer: Received an event! ->Number: " + total_received_);
-      else if (total_received_ == 5)
-	System.out.println ("Demo Consumer: Everything is fine. Going to be mute.");
-      
-      
-      if (events.length == 0)
-	{
-	    System.err.println ("No events");
-	}
-      else
-	{
-	  total_received_++;
-
-	  for (int i = 0; i < events.length; ++i)
-	    {
-	      if(events[i].type_ == ACE_ES_EVENT_NOTIFICATION) 
-		{
-		  try
-		    {
-		      dataHandler_.update (events[i].data_.any_value);
-		    }
-		  catch(org.omg.CORBA.SystemException e) 
-		    {
-		      System.err.println(e);
-		    }
-		}		
-	    }
-	}
-    }
-  
-  public void disconnect_push_consumer() 
-    {
-      System.out.println ("Demo Consumer: Have to disconnect!");
-    }
-  
-  public void open_consumer (RtecEventChannelAdmin.EventChannel event_channel_,
-			     RtecScheduler.Scheduler scheduler_,
-			     String name)
-    {
-      try {
-	
-	// Define Real-time information
-	
-	rt_info_ = new RtecScheduler.handle_tHolder (scheduler_.create (name));
-	
-	scheduler_.set (rt_info_.value,
-			RtecScheduler.Criticality.VERY_LOW_CRITICALITY,
-			new TimeBase.ulonglong (0,0), 
-			new TimeBase.ulonglong (0,0),
-			new TimeBase.ulonglong (0,0),
-			2500000,  // period
-			RtecScheduler.Importance.VERY_LOW_IMPORTANCE,
-			new TimeBase.ulonglong (0,0),
-			1,
-			RtecScheduler.Info_Type.OPERATION);	  	        
-	
-	
-	// Register for Notification and Shutdown events
-
-	
-	RtecEventComm.Event disjunction_designator_ = 
-	  new RtecEventComm.Event (ACE_ES_DISJUNCTION_DESIGNATOR,  0, 
-				     1,        // ttl
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new RtecEventComm.EventData (0, 0, orb_.create_any())
-				    );
-	RtecEventComm.Event notification_event_ = 
-	  new RtecEventComm.Event (ACE_ES_EVENT_NOTIFICATION,  0, 
-				   1,        // ttl
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new RtecEventComm.EventData (0, 0, orb_.create_any())
-				    );
-	RtecEventComm.Event shutdown_event_ = 
-	    new RtecEventComm.Event (ACE_ES_EVENT_SHUTDOWN,  0, 
-				     1,        // ttl
-				     new TimeBase.ulonglong (0,0),
-				     new TimeBase.ulonglong (0,0),
-				     new TimeBase.ulonglong (0,0),
-				     new RtecEventComm.EventData (0, 0, orb_.create_any())
-				      );
-	
-	
-	RtecEventChannelAdmin.Dependency dependencies_[] = new RtecEventChannelAdmin.Dependency[3];  
-	dependencies_[0] = new RtecEventChannelAdmin.Dependency (disjunction_designator_, rt_info_.value);
-	dependencies_[1] = new RtecEventChannelAdmin.Dependency (notification_event_, rt_info_.value);
-	dependencies_[2] = new RtecEventChannelAdmin.Dependency (shutdown_event_, rt_info_.value); 
-	
-	
-	
-	RtecEventChannelAdmin.ConsumerQOS qos = new RtecEventChannelAdmin.ConsumerQOS (dependencies_); 
-	  
-	
-	// The channel administrator is the event channel we got from the invocation
-	// of this routine
-	
-	channel_admin_ = event_channel_;
-	
-	// Connect as a consumer
-	
-	consumer_admin_ = channel_admin_.for_consumers ();
-	
-	// Obtain a reference to the proxy push supplier
-	
-	suppliers_ = consumer_admin_.obtain_push_supplier ();
-
-	suppliers_.connect_push_consumer (this, qos);
-	
-	System.out.println ("Registered the consumer successfully.");
-	
-	 
-      }
-      catch (RtecScheduler.UNKNOWN_TASK e)
-	{
-	  System.err.println ("Demo_Consumer.open_consumer: Unknown task");
-	  System.err.println (e);
-	}
-      catch (RtecScheduler.DUPLICATE_NAME e)
-	{
-	  System.err.println ("Demo_Consumer.open_consumer: Duplicate names");
-	  System.err.println (e);
-	  }
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println(e);
-	}		
-    }  
-}
-  
-
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
deleted file mode 100644
index 7fcf2326fa2..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-// $Id$
-//
-// ============================================================================
-// 
-// = FILENAME
-//    PushConsumerFactory.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is the administor/factory for a PushConsumer.
-//
-// ============================================================================
-
-
-
-
-public class PushConsumerFactory {
-
-  private org.omg.CORBA.ORB orb_;
-  private org.omg.CORBA.BOA boa_;
-  private org.omg.CORBA.Object naming_service_object_;
-
-  private DataHandler dataHandler_;
-  private Navigation navigation_;
-  private Weapons weapons_;
-
-
-  public PushConsumerFactory (DataHandler dataHandler, String nameServiceIOR, java.applet.Applet applet)
-    {
-      try {      
-	dataHandler_ = dataHandler;
-
-	// if the DOVE Browser is running as an Applet
-	if (applet != null) {
-	  orb_ = org.omg.CORBA.ORB.init (applet, null);
-	}
-	else { // not running as an Applet, but as an normal Application
-	   orb_ = org.omg.CORBA.ORB.init ();
-	}
-	boa_ = orb_.BOA_init ();
-	
-	// Get the Naming Service initial reference
-	
-	// Name Service Lookup cannot be used when running as an Applet
-	if (nameServiceIOR == null && applet != null) {
-	  System.out.println (" Name Service Lookup cannot be used when running as an Applet! Quit!");
-	  System.exit (1);
-	}
-
-	if (nameServiceIOR == null) {  // only used when running via "java" or "vbj"     
-		System.out.println ("Using the lookup protocol!");
-		NS_Resolve ns_resolve_ = new NS_Resolve ();
-		naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
-	}
-	else {
-	  System.out.println ("Using the following IOR: " + nameServiceIOR);
-	  naming_service_object_ = orb_.string_to_object (nameServiceIOR);
-	}
-
-      } 
-      catch(org.omg.CORBA.SystemException e) {
-	System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization");
-	System.err.println(e);
-      }	
-      
-    }
-
-  public class Object_is_null_exception extends Exception 
-  {
-    Object_is_null_exception (String s)
-      {
-	super (s);
-      }
-  }
-  
-  public void run ()
-    {
-      try
-	{
-	  
-	  // Get the Naming Context to allow resolving the EventService and
-	  // ScheduleService
-	  CosNaming.NamingContext naming_context_ = 
-	    CosNaming.NamingContextHelper.narrow (naming_service_object_);
-
-	  if (naming_context_ == null)
-	    {
-	      System.err.println ("The Naming Context is null");
-	      System.exit (1);
-	    }
-	  System.out.println ("Reference to the Naming Service is ok.");
-
-	  // Get a reference for the EventService
-
-	  CosNaming.NameComponent[] ec_name_components_ = new CosNaming.NameComponent[1];
-	  ec_name_components_[0] = new CosNaming.NameComponent ("EventService","");
-	  org.omg.CORBA.Object event_channel_object_ = naming_context_.resolve (ec_name_components_);
-
-	  if (event_channel_object_ == null)
-	    {
-	      throw new Object_is_null_exception("EventService Object is null");
-	    }
-	 
-       	  RtecEventChannelAdmin.EventChannel event_channel_ = 
-	    RtecEventChannelAdmin.EventChannelHelper.narrow (event_channel_object_);
-
-	  System.out.println ("Reference to the Event Service is ok.");
-
-	  // Get a reference for the ScheduleService
-
-	  CosNaming.NameComponent[] s_name_components_ = new CosNaming.NameComponent[1];
-	  s_name_components_[0] = new CosNaming.NameComponent ("ScheduleService","");
-       	  org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (s_name_components_); 
-
-	  if (scheduler_object_ == null)
-	    {
-	      throw new Object_is_null_exception("ScheduleService Object is null");
-	    }
-	 
-	  RtecScheduler.Scheduler scheduler_ = 
-	    RtecScheduler.SchedulerHelper.narrow (scheduler_object_);
-
-	  System.out.println ("Reference to the Naming Service is ok.");
-	 
- 
-	  // Start the consumer
-	  System.out.println ("Instantiating the Push Consumer.");
-	  PushConsumer pushConsumer_ = new PushConsumer (orb_, dataHandler_);
-	  System.out.println ("Initializing the Push Consumer.");
-	  pushConsumer_.open_consumer (event_channel_, scheduler_, "demo_consumer");
-	 
-	  // Tell the CORBA environment that we are ready
-
-	  boa_.obj_is_ready (pushConsumer_);
-	  
-	  System.out.println ("boa.obj_is_ready succeeded"); 
-
-	  boa_.impl_is_ready ();
-      }
-      catch (CosNaming.NamingContextPackage.CannotProceed e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.CannotProceed");
-	  System.err.println (e);
-	}
-      catch (CosNaming.NamingContextPackage.InvalidName e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.InvalidName");
-	  System.err.println (e);
-	}
-      catch (CosNaming.NamingContextPackage.NotFound e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.NotFound");
-	  System.err.println (e);
-	
-	}
-      catch (Object_is_null_exception e)
-	{
-	  System.err.println (e);
-	}
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println ("PushConsumerFactory.run: Failure");
-	  System.err.println(e);
-	}	
-    }
-
-    
-} // public class PushConsumerFactory
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/Queue.java b/TAO/examples/Simulator/DOVEBrowser/Queue.java
deleted file mode 100644
index 7ffaba15c52..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/Queue.java
+++ /dev/null
@@ -1,190 +0,0 @@
-// $Id$
-
-
-import java.util.Enumeration;
-
-public class Queue
-{
-  // Friendly?
-  Queue_Node head_ = null;
-  Queue_Node tail_ = null;
-  
-  private int length_ = 0;
-  
-  public Queue()
-    {     
-    }
-
-  public Enumeration forward_iterator()
-    {
-      return new Queue_Iterator(this, Queue_Iterator.FORWARD);
-    }
-
-  public Enumeration reverse_iterator()
-    {
-      return new Queue_Iterator(this, Queue_Iterator.REVERSE);
-    }
-  
-  public void enqueue_tail(Object new_data)
-    {
-      Queue_Node new_node = new Queue_Node(new_data);
-
-      if (tail_ == null)
-	{
-	  tail_ = new_node;
-	  head_ = new_node;
-	}
-      else
-	{
-	  new_node.prev_ = tail_;
-	  tail_.next_ = new_node;
-	  tail_ = new_node;
-	}
-
-      length_++;
-    }
-
-  public void enqueue_head(Object new_data)
-    {
-      Queue_Node new_node = new Queue_Node(new_data);
-	    
-      if (head_ == null)
-	{
-	  tail_ = new_node;
-	  head_ = new_node;
-	}
-      else
-	{
-	  new_node.next_ = head_;
-	  head_.prev_ = new_node;
-	  head_ = new_node;
-	}
-
-      length_++;
-    }
-  
-  public Object dequeue_head()
-    {
-      Object return_value = null;
-      
-      if (head_ == null)
-	return_value = null;
-      else if (tail_ == head_)
-	{
-	  return_value = head_.data_;
-	  tail_ = null;
-	  head_ = null;
-	}
-      else
-	{
-	  return_value = head_.data_;
-	  head_ = head_.next_;
-	  head_.prev_ = null;	  
-	}
-
-      length_--;
-
-      return return_value;
-    }
-  
-  public Object dequeue_tail()
-    {
-      Object return_value = null;
-      
-      if (tail_ == null)
-	return_value = null;
-      else if (tail_ == head_)
-	{
-	  return_value = tail_.data_;
-	  tail_ = null;
-	  head_ = null;
-	}
-      else
-	{	  
-	  return_value = tail_.data_;
-	  tail_ = tail_.prev_;
-	  tail_.next_ = null;	  
-	}
-
-      length_--;
-
-      return return_value;
-    }
-
-  public int length()
-    {
-      return length_;
-    }
-
-  public Object head()
-    {
-      if (head_ != null)
-	return head_.data_;
-      else
-	return null;
-    }
-
-  public Object tail()
-    {
-      if (tail_ != null)
-	return tail_.data_;
-      else
-	return null;
-    }
-}
-
-class Queue_Node
-{
-  public Queue_Node prev_ = null;
-  public Queue_Node next_ = null;;
-  public Object data_;
-
-  public Queue_Node(Object data)
-    {
-      data_ = data;
-    }
-}
-
-class Queue_Iterator implements Enumeration
-{
-  public static final boolean FORWARD = true;
-  public static final boolean REVERSE = false;
-  
-  private Queue queue_;
-  private Queue_Node queue_ptr_;
-  private boolean direction_ = FORWARD;
-  
-  public Queue_Iterator(Queue queue)
-    {
-      queue_ = queue;
-      queue_ptr_ = queue.head_;
-    }
-
-  public Queue_Iterator(Queue queue, boolean direction)
-    {
-      queue_ = queue;
-      direction_ = direction;
-
-      if (direction_)
-	queue_ptr_ = queue_.head_;
-      else
-	queue_ptr_ = queue_.tail_;
-    }
-
-  public Object nextElement()
-    {
-      Object data = queue_ptr_.data_;
-      
-      if (direction_)
-	queue_ptr_ = queue_ptr_.next_;
-      else
-	queue_ptr_ = queue_ptr_.prev_;
-
-      return data;
-    }
-
-  public boolean hasMoreElements()
-    {
-      return queue_ptr_ != null;
-    }
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/VisComp.java b/TAO/examples/Simulator/DOVEBrowser/VisComp.java
deleted file mode 100644
index 53294f33ea2..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/VisComp.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    VisComp.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is the interface for Java Beans.
-//
-// ============================================================================
-
-
-public interface VisComp extends java.util.Observer {
-
-  public void setName (String title);
-  public int getProperty ();
-}
diff --git a/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java b/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java
deleted file mode 100644
index 288fcccceec..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    VisCompFactory.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This class serves as factory for Visualization Components
-//
-// ============================================================================
-
-import java.beans.*;
-				
-class VisCompFactory {
-
-  VisComp getNewVisComp (int property, String name) {    
-           
-    ClassLoader classLoader_ = this.getClass().getClassLoader();	
-
-    VisComp visComp_ = null;
-    String visCompName_ = "VisComp";
-    switch (property) {
-      case Properties.DOUBLE:
-        visCompName_ = "Double"+visCompName_;
-        break;
-      case Properties.NAVIGATION:
-        visCompName_ = "Navigation"+visCompName_;
-        break;
-      case Properties.WEAPONS:
-        visCompName_ = "Weapons"+visCompName_;
-        break;
-      default: return null;
-    }
-    try {
-      System.out.println ("Trying to connect: " + visCompName_+ " .. ");
-      visComp_ = (VisComp) Beans.instantiate (classLoader_, visCompName_);
-      visComp_.setName (name);
-      System.out.println ("Connected: " + visCompName_);
-      return visComp_;
-    }
-    catch (Exception e) {
-      System.out.println ("Unable to load JavaBean: " + e);
-      return null;
-    }
-  }
-}
\ No newline at end of file
diff --git a/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java b/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java
deleted file mode 100644
index 8c81bfc9c11..00000000000
--- a/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-// 
-// = FILENAME
-//    WeaponsVisComp.java
-//
-// = AUTHOR
-//    Seth Widoff (core functionality)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This is a Visualization Component for displaying weapons.
-//
-// ============================================================================
-
-
-import java.io.*;
-import java.util.*;
-import java.awt.*;
-
-
-public class WeaponsVisComp extends Panel implements VisComp
-{
-  private final static String ONLINE = "Online";
-  private final static String OFFLINE = "Offline";
-  private final static Font FONT_BIG = new Font ("Dialog", Font.BOLD, 14);
-  private final static Font  FONT_SMALL = new Font ("Dialog", Font.BOLD, 10);
-  private final static Color BLUE = new Color (30, 144, 255);
-
-  private int count_ = 0;
-  private Hashtable weapons_table_ = new Hashtable ();
-  private GridBagLayout gbl_= new GridBagLayout ();
-  private GridBagConstraints gbc_ = new GridBagConstraints ();
-
-  Label default_label_ = new Label ("No weapons available", Label.CENTER);
-
-  public WeaponsVisComp ()
-    {
-      default_label_.setFont (FONT_BIG);
-      default_label_.setForeground (BLUE);
-
-      setLayout (gbl_);
-      gbc_.gridx = 0;
-      gbc_.gridy = 0;
-      gbc_.gridheight = 1;
-      gbc_.gridwidth  = 1;
-      gbc_.anchor = GridBagConstraints.NORTH;
-      gbc_.fill = GridBagConstraints.NONE;
-      setBackground (Color.black);
-
-      gbl_.setConstraints (default_label_, gbc_);
-      add (default_label_);
-    }
-
-  public void setName (String title) {
-  }
-
-  public int getProperty () {
-    return Properties.WEAPONS;
-  }
-  
-  public Dimension getPreferredSize () {
-    return new Dimension (250, 200);
-  }
-
-  public Dimension getMinimumSize () {
-    return new Dimension (80, 80);
-  }
-  
-  public void update (java.util.Observable observable, java.lang.Object obj) {
-    Weapons weapons_ = null;
-    try {
-      weapons_ = (Weapons) obj;  
-    }
-    catch (Exception excp) {
-      System.out.println (excp);
-      System.out.println ("Visualization Component received wrong data type!");
-    }
-    if (weapons_ != null)
-    { 
-      for (int i = 0; i < weapons_.number_of_weapons && i < 5; i++)
-	{
-	  String weapon = "";
-	  int status = 0;
-	  switch (i)
-	    {
-	    default:
-	      break;
-	    case 0: weapon = weapons_.weapon1_identifier;						      
-	      status = weapons_.weapon1_status;
-	      break;
-	    case 1: weapon = weapons_.weapon2_identifier;						      
-	      status = weapons_.weapon2_status;
-	      break;
-	    case 2: weapon = weapons_.weapon3_identifier;						      
-	      status = weapons_.weapon3_status;
-	      break;
-	    case 3: weapon = weapons_.weapon4_identifier;						      
-	      status = weapons_.weapon4_status;
-	      break;
-	    case 4: weapon = weapons_.weapon5_identifier;						      
-	      status = weapons_.weapon5_status;
-	      break;
-	    }
-
-
-	  Label status_label_ = (Label)weapons_table_.get (weapon);
-
-	  if (status_label_ != null)
-	    status_label_.setText ((status == 1) ? ONLINE : OFFLINE);
-	  else
-	    {	 
-	      if (count_ == 0)
-		this.removeAll ();
-
-	      count_++;
-	      Label weapon_label_ = new Label (count_ + ". " + weapon, Label.LEFT);
-	      status_label_ = new Label ((status == 1) ? ONLINE : OFFLINE, Label.RIGHT);
-
-	      status_label_.setFont (FONT_SMALL);
-	      weapon_label_.setFont (FONT_SMALL);
-	      weapon_label_.setForeground (BLUE);
-	      
-	      gbc_.gridx = 0;
-	      gbc_.anchor = GridBagConstraints.WEST;
-	      gbl_.setConstraints (weapon_label_, gbc_);
-	      add (weapon_label_);
-	      gbc_.gridx = 1;
-	      gbc_.anchor = GridBagConstraints.EAST;
-	      gbl_.setConstraints (status_label_, gbc_);
-	      add (status_label_);
-	      
-	      gbc_.gridy++;
-	      weapons_table_.put (weapon, status_label_);
-	    }
-
-	  status_label_.setForeground ((status == 1) ?
-				      Color.lightGray :
-				      Color.darkGray);
-	}
-
-      validate ();
-    }
-  }
-}
diff --git a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp
deleted file mode 100644
index 6fef04c21fc..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    AnyAnalyser.cpp
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//   Accepts an CORBA::Any, traverses it, copies it into a tree structure
-//   and prints out the tree.
-//
-// ============================================================================
-
-#include "AnyAnalyser.h"
-#include "tao/Align.h"
-
-AnyAnalyser::AnyAnalyser (const char *file_name) 
-  : printVisitor_ptr_(new PrintVisitor (file_name)) {
-}
-
-AnyAnalyser::~AnyAnalyser () {
-  delete printVisitor_ptr_;
-}
-
-void
-AnyAnalyser::close () { 
-  printVisitor_ptr_->close();
-}
-
-void 
-AnyAnalyser::printAny (CORBA::TypeCode_ptr any_type, const void *any_value) {
-
-  // Analyse the any and store the results in a tree structure
-  RecurseInfo recurseInfo_ = {PARENT_IS_NO_STRUCT,// identifies parent
-                              0,                  // parent typecode
-                              0,                  // member count
-                              0};                 // recursion level
-
-  // have a variable with can be incremented by all 
-  // recursive analyse calls
-  const unsigned char *value_ptr_ = (const unsigned char *)any_value;
-
-  // analyse the any
-  Node *node_ptr_ = analyse (any_type,      // typecode information
-                             value_ptr_,    // pointer to the memory
-                             recurseInfo_); // recurse information
-
-  // print the results
-  node_ptr_->Accept ((NodeVisitor *)printVisitor_ptr_);
-}
-
-Node *
-AnyAnalyser::analyse (CORBA::TypeCode_ptr tc_ptr, 
-		      const unsigned char *&value_ptr,
-          RecurseInfo ri)
-{
-  CORBA::Long size, alignment, align_offset;
-  CORBA::TypeCode_ptr param;  
-  const unsigned char *start_addr = value_ptr;
-
-  TAO_TRY {
-    Node *node_ptr_ = 0;
-    
-    if (tc_ptr != 0) {
-      
-      switch (tc_ptr->kind(TAO_TRY_ENV)) {
-	
-      	case CORBA::tk_struct:
-	        {	
-            // to hold a pointer to the start of the struct
-            start_addr = value_ptr;
-
-            // create a new Node
-	          StructNode *structNode_ptr_ = new StructNode (tc_ptr->name (TAO_TRY_ENV), 
-                      								   ri.recursion_level);
-	    
-      	    for (unsigned int i = 0; i < tc_ptr->member_count (TAO_TRY_ENV); i++) {
-	      
-	            // get the TypeCode pointer to the ith parameter
-	            // and analyse it recursively
-              RecurseInfo recurseInfo_ = {PARENT_IS_STRUCT,   // identifies parent
-                                          tc_ptr,             // parent typecode
-                                          i,                  // member count
-                                          ri.recursion_level+1};
-
-
-              // get the type code of the child i
-              param = tc_ptr->member_type (i, TAO_TRY_ENV);
-              TAO_CHECK_ENV;
-
-              // get the size
-              size = param->size (TAO_TRY_ENV);
-              TAO_CHECK_ENV;
-
-              // get the alignment
-              alignment = param->alignment (TAO_TRY_ENV);
-              TAO_CHECK_ENV;
-
-              // calculate
-              align_offset =
-                      (ptr_arith_t) ptr_align_binary (value_ptr, alignment)
-                      - (ptr_arith_t) value_ptr
-                      + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-                      - (ptr_arith_t) start_addr;
-              TAO_CHECK_ENV;
-
-              // if both the start_addr and data are not aligned as per
-              // the alignment, we do not add the offset
-              value_ptr = (unsigned char *) ((ptr_arith_t) value_ptr +
-                                           ((align_offset == alignment) ?
-                                            0 : align_offset));              
-           
-	            structNode_ptr_->addChild (analyse (param, 
-                                                  value_ptr,
-						                                      recurseInfo_));
-            }   
-	          node_ptr_ = (Node *)structNode_ptr_;
-          }
-	        break;
-	  
-        case CORBA::tk_double:
-          if (ri.kind == PARENT_IS_STRUCT) {
-	          node_ptr_ = (Node *) new DoubleNode ((CORBA::Double *)value_ptr,
- 					                                       ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-          else {
-	          node_ptr_ = (Node *) new DoubleNode ((CORBA::Double *)value_ptr,
-					                                       tc_ptr->name(TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-	        value_ptr += 8;
-	        break;	      
-	  
-	      case CORBA::tk_long:
-          if (ri.kind == PARENT_IS_STRUCT) {
-  	        node_ptr_ = (Node *) new LongNode ((CORBA::Long *)value_ptr,
-					                                       ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-          else {
-	          node_ptr_ = (Node *) new LongNode ((CORBA::Long *)value_ptr,
-		  			                                   tc_ptr->name(TAO_TRY_ENV),
-			  		                                   ri.recursion_level);
-          }
-	        value_ptr += 4;
-	        break;
-	  
-	      case CORBA::tk_ulong:
-          if (ri.kind == PARENT_IS_STRUCT) {
-  	        node_ptr_ = (Node *) new ULongNode ((CORBA::ULong *)value_ptr,
- 					                                       ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-          else {
-	          node_ptr_ = (Node *) new ULongNode ((CORBA::ULong *)value_ptr,
-					                                      tc_ptr->name(TAO_TRY_ENV),
-					                                      ri.recursion_level);
-          }
-	        value_ptr += 4;
-	        break;
-	  
-	      case CORBA::tk_string:
-          if (ri.kind == PARENT_IS_STRUCT) {
-  	        node_ptr_ = (Node *) new StringNode (*(CORBA::String_var *)value_ptr,
-					                                       ri.parent_tc_ptr->member_name(ri.member_number,
-                                                                               TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-          else {
-  	        node_ptr_ = (Node *) new StringNode (*(CORBA::String_var *)value_ptr,
- 					                                       tc_ptr->name(TAO_TRY_ENV),
-					                                       ri.recursion_level);
-          }
-	     	  value_ptr += 4;
-	        break;
-	  
-	      default: ACE_ERROR ((LM_ERROR, "AnyAnalyser::analyse: No known kind of type detected!\n"));
-	        exit (1);
-	        break;						      						   	  
-      }
-      TAO_CHECK_ENV;
-	    return node_ptr_;
-    }
-    else {
-	    ACE_DEBUG ((LM_ERROR, "AnyAnalyser::analyse: TypeCode pointer to member was Null!\n"));
-    }
-  }
-  TAO_CATCHANY {
-    ACE_ERROR ((LM_ERROR, "(%t)AnyAnalyser::analyse: Error in analysing the any.\n"));
-  }
-  TAO_ENDTRY;	    
-  return 0;
-}
-
-
diff --git a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h
deleted file mode 100644
index eeb0613c661..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    AnyAnalyser.h
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//   Accepts an CORBA::Any, traverses it, copies it into a tree structure
-//   and prints out the tree.
-//
-// ============================================================================
-
-
-#include "PrintVisitor.h"
-#include "tao/corba.h"
-
-#if !defined (ANYANALYSER_H)
-#define ANYANALYSER_H
-
-typedef enum {PARENT_IS_STRUCT, PARENT_IS_NO_STRUCT} KIND;
-
-typedef struct {
-          KIND kind;
-          CORBA::TypeCode_ptr parent_tc_ptr;
-          unsigned int member_number;
-          unsigned int recursion_level;
-} RecurseInfo;
-
-
-class AnyAnalyser {
-
-public:
-  AnyAnalyser (const char *filename);
-  
-  ~AnyAnalyser ();
-
-  // cause the PrintViewer to be deleted to close the file
-  void close ();
-  
-  // main starting point includes analysing and printing
-  void printAny (CORBA::TypeCode_ptr any_type, const void *any_value);
-  
-private:
-  Node *analyse (CORBA::TypeCode_ptr tc_ptr, 
-		             const unsigned char *&value_ptr,
-                 RecurseInfo recurseInfo);
-
-  PrintVisitor *printVisitor_ptr_;
-};
-
-#endif
-
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp
deleted file mode 100644
index cab75b1171d..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Con.cpp
-//
-// = DESCRIPTION
-//   This demo just tests the basic functionality of the Event Service
-//   One Conumer which inherits from the Rtec Consumer.  One Supplier
-//   with an internal Rtec Consumer and one internal Rtec Supplier.
-//   The internal Supplier is just a demo supplier because the
-//   architecture expects an supplier which has inherited from the
-//   Rtec Supplier.
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include <limits.h>
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/Profile_Timer.h"
-#include "tao/Timeprobe.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "DOVEMIB.h"
-
-static const char usage [] = 
-"[-? |\n"
-"            [-O[RBport] ORB port number]"
-"            [-m <count> of messages to receive [100]]"
-"            [-f filename for the repository [event_repository]]]";
-
-static int events_received_ = 0;
-static char *input_file_name = 0;
-static int events_to_receive_ = 100;
-RtecEventChannelAdmin::EventChannel_var ec;
-
-// ************************************************************
-
-MIB_Consumer::MIB_Consumer (void)
-: anyAnalyser_ (input_file_name) {
-}
-
-int 
-MIB_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              const char *my_name) {
-  TAO_TRY {
-    // Get a Scheduler.
-
-    RtecScheduler::Scheduler_ptr server =
-    ACE_Scheduler_Factory::server ();
-
-    // Define Real-time information.
-
-    rt_info_ = server->create (my_name, TAO_TRY_ENV);
-
-    scheduler_->set (rt_info_,
-                       RtecScheduler::VERY_LOW_CRITICALITY,
-                       ORBSVCS_Time::zero,
-                       ORBSVCS_Time::zero,
-                       ORBSVCS_Time::zero,
-                       2500000,
-                       RtecScheduler::VERY_LOW_IMPORTANCE,
-                       ORBSVCS_Time::zero,
-                       1,
-                       RtecScheduler::OPERATION,
-                       TAO_TRY_ENV);
-
-    // Create the event that we're registering for.
-
-    ACE_ConsumerQOS_Factory dependencies;
-    dependencies.start_disjunction_group ();
-    dependencies.insert_type (ACE_ES_EVENT_NOTIFICATION, rt_info_);
-    dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-    // The channel administrator is the event channel we got from
-    // the invocation of this routine.
-
-    this->channel_admin_ = ec;
-
-    // = Connect as a consumer.
-
-    this->consumer_admin_ = channel_admin_->for_consumers (TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    // Obtain a pointer to a push supplier.  "suppliers" is
-    // inherited from a base class.
-
-    this->suppliers_ = consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    // The _this function returns an object pointer. This is needed
-    // because a consumer inherits from a Servant class that is no
-    // CORBA::Object.
-
-    RtecEventComm::PushConsumer_var objref = this->_this (TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-  }
-  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "MIB_Consumer::open: subscribe failed.\n"),
-                        -1);
-  }
-  TAO_CATCHANY {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "MIB_Consumer::open: unexpected exception.\n"),
-                        -1);
-  }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-MIB_Consumer::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Consumer received disconnect from channel.\n"));
-}
-
-
-// This method is called when the Event Service pushes a new
-// event to us
-
-void
-MIB_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &)
-{
-
-  if (events.length () == 0) {
-    ACE_DEBUG ((LM_DEBUG, "no events\n"));
-    return;
-  }
-
-  // count the number of events
-  events_received_++;
-
-  // if we have enough we quit
-  if (events_received_ > events_to_receive_) {
-      this->shutdown ();
-  }
-
-  // Several events could be sent at once
-  for (CORBA::ULong i = 0; i < events.length (); ++i) {
-
-    if (events[i].type_ == ACE_ES_EVENT_SHUTDOWN) {
-
-      ACE_DEBUG ((LM_DEBUG, "MIB Consumer: received shutdown event\n"));
-      this->shutdown ();
-    }
-    else {
-
-      if (events_received_ == 1) {
-        ACE_DEBUG ((LM_DEBUG, "MIB Consumer: received an event, going to be mute.\n"));
-      }
-
-      TAO_TRY {
-        anyAnalyser_.printAny (events[i].data_.any_value.type(), events[i].data_.any_value.value());      
-        TAO_CHECK_ENV;
-      }
-      TAO_CATCHANY {
-        ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
-      }
-      TAO_ENDTRY;
-    }
-  }
-}
-
-void
-MIB_Consumer::shutdown (void)
-{
-  TAO_TRY
-    {
-      // cause the AnyAnalyser to close the file 
-      anyAnalyser_.close();
-
-      // Disconnect from the push supplier.
-      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      TAO_CHECK_ENV;
-
-      ec = 0;
-
-      TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "(%t) MIB_Consumer::shutdown: unexpected exception.\n"));
-    }
-  TAO_ENDTRY;
-}
-
-// function get_options
-
-static unsigned int
-get_options (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "O?f:m:");
-  int opt;
-  unsigned int temp;
-
-  while ((opt = get_opt ()) != EOF)
-  {
-    switch (opt) 
-      {
-      case '?':
-        ACE_DEBUG ((LM_DEBUG,
-                    "Usage: %s %s\n",
-                    argv[0], usage));
-        ACE_OS::exit (0);
-        break;
-
-      case 'f':
-        input_file_name = get_opt.optarg;
-
-        if (!input_file_name || ACE_OS::strlen (input_file_name) == 0) {            
-          input_file_name = 0;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                              "%s: file name must be specified with -f option",
-                               argv[0]),
-                               1);
-        }
-        break;
-
-      case 'm':
-        temp = (unsigned int) ACE_OS::atoi (get_opt.optarg);
-        if (temp > 0) {
-          events_to_receive_ = temp;
-          ACE_DEBUG ((LM_DEBUG,"Messages to receive: %d\n", events_to_receive_));
-        }
-        else {
-          ACE_ERROR_RETURN ((LM_ERROR, "%s: count must be > 0", argv[0]), 1);
-        }
-        break;
-
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: unknown arg, -%c\n"
-                           "Usage: %s %s\n",
-                           argv[0], char(opt),
-                           argv[0], usage), 1);
-      }
-  }
-
-  if (argc != get_opt.optind)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s: too many arguments\n"
-                       "Usage: %s %s\n",
-                       argv[0],
-                       argv[0],
-                       usage),
-                      1);
-  return 0;
-}
-
-// function main.
-
-int
-main (int argc, char *argv [])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager = 
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      if (get_options (argc, argv))
-        ACE_OS::exit (-1);
-
-      // Get the Event Channel.
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup ("EventService");
-
-      CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name,
-                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (ec.ptr() == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Not able to get the Event Service reference.\n"),
-                          -1);
-
-      // Create consumer.
-
-      MIB_Consumer *mIB_Consumer;
-      ACE_NEW_RETURN (mIB_Consumer,
-                      MIB_Consumer (),
-                      -1);
-
-      if (mIB_Consumer->open_consumer (ec.ptr (),
-                                        "MIB_Consumer") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
-                           "Someone was feeling introverted.\n"),
-                          -1);
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the ORB
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "CORBA::ORB::run"),
-                          -1);
-      TAO_CHECK_ENV;
-
-      ec = 0;
-
-      root_poa->destroy (CORBA::B_TRUE,
-                         CORBA::B_TRUE,
-                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp
deleted file mode 100644
index 40b633b3b3c..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp
+++ /dev/null
@@ -1,143 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DOVEMIB" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=DOVEMIB - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "DOVEMIB.MAK".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "DOVEMIB.MAK" CFG="DOVEMIB - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "DOVEMIB - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DOVEMIB - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "DOVEMIB - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "DOVEMIB - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FR /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /pdb:"DOVEMIB.pdb" /debug /machine:I386 /out:"DOVEMIB.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "DOVEMIB - Win32 Release"

-# Name "DOVEMIB - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\AnyAnalyser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DOVEMIB.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeap.idl

-

-!IF  "$(CFG)" == "DOVEMIB - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "DOVEMIB - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\NavWeap.idl

-InputName=NavWeap

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeapC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Node.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PrintVisitor.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsw b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsw
deleted file mode 100644
index 92002d82e84..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "DOVEMIB"=.\DOVEMIB.DSP - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "DOVEMIBx"=.\DOVEMIBx.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TestClient"=.\TestClient.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
deleted file mode 100644
index 8730e2d56d0..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-// ============================================================================
-// 
-// = FILENAME
-//    DOVEMIB.h
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (DOVE_MIB_H)
-#define DOVE_MIB_H
-
-//#include "ace/SString.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "AnyAnalyser.h"
-
-class MIB_Consumer : public POA_RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //    Demo Consumer
-  //
-  // = DESCRIPTION
-  //    Simple example of a consumer that registers for supplier
-  //    notifications.
-public:
-  MIB_Consumer (void);
-
-  int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  // = (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
-
-protected:
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var suppliers_;
-  AnyAnalyser anyAnalyser_;
-private:
-  RtecScheduler::handle_t rt_info_;
-};
-
-#endif /* DOVE_MIB_H */
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp b/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp
deleted file mode 100644
index 6ad38a8cef7..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp
+++ /dev/null
@@ -1,177 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DOVEMIBx" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=DOVEMIBx - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "DOVEMIBx.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "DOVEMIBx.mak" CFG="DOVEMIBx - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "DOVEMIBx - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "DOVEMIBx - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "DOVEMIBx - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "DOVEMIBx - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "DOVEMIB0"

-# PROP BASE Intermediate_Dir "DOVEMIB0"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DOVEMIB0"

-# PROP Intermediate_Dir "DOVEMIB0"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /pdb:"DOVEMIBx.pdb" /debug /machine:I386 /out:"DOVEMIBx.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "DOVEMIBx - Win32 Release"

-# Name "DOVEMIBx - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\any_test.idl

-

-!IF  "$(CFG)" == "DOVEMIBx - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "DOVEMIBx - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\any_test.idl

-InputName=any_test

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\any_test_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\any_testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\any_testS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AnyAnalyser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeap.idl

-

-!IF  "$(CFG)" == "DOVEMIBx - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "DOVEMIBx - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\NavWeap.idl

-InputName=NavWeap

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeapC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Node.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PrintVisitor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svr.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile
deleted file mode 100644
index acb8a465502..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/Makefile
+++ /dev/null
@@ -1,979 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-IDL_SRC= NavWeapC.cpp
-PROG_SRCS = $(IDL_SRC) DOVEMIB.cpp Node.cpp PrintVisitor.cpp AnyAnalyser.cpp
-
-LSRC = $(PROG_SRCS)
-
-MIB_OBJS = DOVEMIB.o NavWeapC.o Node.o PrintVisitor.o AnyAnalyser.o 
-
-
-BIN = DOVEMIB
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-LDLIBS= -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-$(IDL_SRC): NavWeap.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl NavWeap.idl
-
-DOVEMIB:	$(addprefix $(VDIR),$(MIB_OBJS))
-		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-
-realclean: clean
-	-/bin/rm -rf 
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/NavWeapC.o .obj/NavWeapC.so .shobj/NavWeapC.o .shobj/NavWeapC.so: NavWeapC.cpp NavWeapC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h NavWeapC.i \
- NavWeapS.h NavWeapS.i
-.obj/DOVEMIB.o .obj/DOVEMIB.so .shobj/DOVEMIB.o .shobj/DOVEMIB.so: DOVEMIB.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(TAO_ROOT)/tao/Timeprobe.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- DOVEMIB.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- AnyAnalyser.h PrintVisitor.h NodeVisitor.h Node.h
-.obj/Node.o .obj/Node.so .shobj/Node.o .shobj/Node.so: Node.cpp Node.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h NodeVisitor.h
-.obj/PrintVisitor.o .obj/PrintVisitor.so .shobj/PrintVisitor.o .shobj/PrintVisitor.so: PrintVisitor.cpp PrintVisitor.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h NodeVisitor.h \
- Node.h
-.obj/AnyAnalyser.o .obj/AnyAnalyser.so .shobj/AnyAnalyser.o .shobj/AnyAnalyser.so: AnyAnalyser.cpp AnyAnalyser.h PrintVisitor.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h NodeVisitor.h \
- Node.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simulator/DOVEMIB/Node.cpp b/TAO/examples/Simulator/DOVEMIB/Node.cpp
deleted file mode 100644
index 2db05ddf555..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/Node.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    any_test_i.cpp
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//   Implementation of the Nodes for the any evaluator.
-//
-// ============================================================================
-
-#include "Node.h"
-
-
-
-StructNode::StructNode (const char *Name_ptr,
-			unsigned int recursion_level) {
-  Name_ptr_ = Name_ptr;
-  queue_ptr_ = new ACE_Unbounded_Queue<Node *>;
-  recursion_level_ = recursion_level;
-  queue_iterator_ptr_ = 0;
-}
-
-
-StructNode::~StructNode () {
-  for (unsigned int i = 0; i < getChildNumber (); i++) {
-    delete getChild (i);
-  }
-  delete queue_ptr_;
-  delete queue_iterator_ptr_;
-}
-
-
-unsigned int
-StructNode::getChildNumber () {
-  return (unsigned int) queue_ptr_->size ();
-}
-
-Node * 
-StructNode::getChild (unsigned int n) {
-    
-  // create new iterator if some things have changed
-  if (queue_iterator_ptr_ == 0) {      
-    queue_iterator_ptr_ = new ACE_Unbounded_Queue_Iterator<Node *> (*queue_ptr_);
-    queue_position_ = 0;
-  }
-  
-  // check if we have such a Zebra
-  if (n < queue_ptr_->size ()) {
-    // if we are already to far in the queue
-    if (queue_position_ >  n) {
-      queue_position_ = 0;
-      queue_iterator_ptr_->first ();
-    }
-      
-    Node **node_ptr_ptr_;
-    for (; 
-	      !queue_iterator_ptr_->done() && queue_position_ <= n;
-	      queue_iterator_ptr_->advance (), queue_position_++) {
-      queue_iterator_ptr_->next (node_ptr_ptr_);
-    }      
-    return (*node_ptr_ptr_); 
-  }
-  else {
-    return 0;
-  }
-}
-
-int 
-StructNode::addChild (Node *node) {
-  delete queue_iterator_ptr_;
-  queue_iterator_ptr_ = 0;
-  return queue_ptr_->enqueue_tail (node);
-}
-
-const char *
-StructNode::getName () {
-  return Name_ptr_;
-}
-
-void
-StructNode::Accept (NodeVisitor *nodeVisitor) {
-  nodeVisitor->visitStructNode (this);
-}
-
-unsigned int 
-StructNode::getRecursionLevel () {
-  return recursion_level_;
-}
-
-DoubleNode::DoubleNode (CORBA::Double *Double_ptr,
-			const char *Name_ptr,
-			unsigned int recursion_level)  {
-  Double_ptr_ = Double_ptr;
-  Name_ptr_ = Name_ptr; 
-  recursion_level_ = recursion_level;
-}
-
-const char *
-DoubleNode::getName () {
-  return Name_ptr_;
-}
-
-
-
-CORBA::Double 
-DoubleNode::getValue () {
-  return *Double_ptr_;
-}
-
-void
-DoubleNode::Accept (NodeVisitor *nodeVisitor) {
-  nodeVisitor->visitDoubleNode (this);
-}
-
-unsigned int
-DoubleNode::getRecursionLevel () {
-  return recursion_level_;
-}
-
-LongNode::LongNode (CORBA::Long *Long_ptr,
-		    const char *Name_ptr,
-		    unsigned int recursion_level) {
-  Long_ptr_ = Long_ptr;
-  Name_ptr_ = Name_ptr;
-  recursion_level_ = recursion_level;
-}
-
-const char *
-LongNode::getName () {
-  return Name_ptr_;
-}
-
-CORBA::Long
-LongNode::getValue () {
-  return *Long_ptr_;
-}
-
-void
-LongNode::Accept (NodeVisitor *nodeVisitor) {
-  nodeVisitor->visitLongNode (this);
-}
-
-unsigned int 
-LongNode::getRecursionLevel () {
-  return recursion_level_;
-}
-
-ULongNode::ULongNode (CORBA::ULong *ULong_ptr, 
-		      const char *Name_ptr,
-		      unsigned int recursion_level) {
-  ULong_ptr_ = ULong_ptr; 
-  Name_ptr_ = Name_ptr;
-  recursion_level_ = recursion_level;
-}
-
-const char * 
-ULongNode::getName () {
-  return Name_ptr_;
-}
-
-CORBA::ULong
-ULongNode::getValue () {
-  return *ULong_ptr_;
-}
-
-void
-ULongNode::Accept (NodeVisitor *nodeVisitor) {
-  nodeVisitor->visitULongNode (this);
-}
-
-unsigned int 
-ULongNode::getRecursionLevel () {
-  return recursion_level_;
-}
-
-
-StringNode::StringNode (CORBA::String_var String_var, 
-			const char *Name_ptr,
-			unsigned int recursion_level) {
-  String_var_ = String_var;
-  Name_ptr_ = Name_ptr; 
-  recursion_level_ = recursion_level;
-}
-
-const char*
-StringNode::getName () {
-  return Name_ptr_;
-}
-
-CORBA::String_var
-StringNode::getValue () {
-  return String_var_;
-}
-
-void
-StringNode::Accept (NodeVisitor *nodeVisitor) {
-  nodeVisitor->visitStringNode (this);
-}
-
-unsigned int 
-StringNode::getRecursionLevel () {
-  return recursion_level_;
-}
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEMIB/Node.h b/TAO/examples/Simulator/DOVEMIB/Node.h
deleted file mode 100644
index d8029a4fa5e..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/Node.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    Node.h
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//    This file descibes the various node types for analysing 
-//    an CORBA::Any. It is no memory allocated, that means
-//    The values are not really contained by the nodes, but the
-//    nodes refer to the values via pointers.
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "ace/Containers.h"
-#include "NodeVisitor.h"
-
-#if !defined (NODE_H)
-#define NODE_H
-
-
-// base class for nodes
-class Node {
-public: 
-  virtual ~Node () {}
-  virtual void Accept (NodeVisitor *NodeVisitor) = 0;
-  virtual unsigned int getRecursionLevel () = 0;
-
-protected:
-  Node () {}
-};
-
-
-
-// Node to store information about a Struct
-class StructNode : public Node {
-public:
-  StructNode (const char *Name_ptr, 
-	      unsigned int recursion_level);
-  ~StructNode ();
-
-  // accpet a visitor
-  void Accept (NodeVisitor *nodeVisitor);
-
-  // add a new child
-  int addChild (Node *node);
-
-  // retrieve the nth Child starting at 0
-  Node *getChild (unsigned int n);
-
-  // get the number of children
-  unsigned int getChildNumber ();
-  
-  // get the name of the struct
-  const char *getName ();  
-
-  // get recursion level
-  unsigned int getRecursionLevel ();
-    
-
-private: 
-  ACE_Unbounded_Queue<Node *> *queue_ptr_;
-  ACE_Unbounded_Queue_Iterator<Node *> *queue_iterator_ptr_;
-  unsigned int queue_position_;
-  const char *Name_ptr_;
-  unsigned int recursion_level_;
-};
-
-
-// Node to store information about a Double
-class DoubleNode : public Node {
-public:
-  DoubleNode (CORBA::Double *Double_ptr, 
-	      const char *Name_ptr,
-	      unsigned int recursion_level);
-  ~DoubleNode () {}
-
-  // accpet a visitor
-  void Accept (NodeVisitor *nodeVisitor);
-
-  // get the name of the double node
-  const char *getName ();
-
-  // get the value
-  CORBA::Double getValue ();
-
-  // get recursion level
-  unsigned int getRecursionLevel ();
-  
-private:
-  CORBA::Double *Double_ptr_; 
-  const char *Name_ptr_;
-  unsigned int recursion_level_;
-};
-
-
-// Node to store information about a Long
-class LongNode : public Node {
-public:
-  LongNode (CORBA::Long *Long_ptr, 
-	    const char *Name_ptr,
-	    unsigned int recursion_level);
-  ~LongNode () {}
-
-  // accpet a visitor
-  void Accept (NodeVisitor *nodeVisitor);
-
-  //get the name of the long node
-  const char *getName ();
-
-  // get the value
-  CORBA::Long getValue ();
-
-  // get recursion level
-  unsigned int getRecursionLevel ();
-
-private:
-  CORBA::Long *Long_ptr_; 
-  const char *Name_ptr_;
-  unsigned int recursion_level_;
-};
-
-
-// Node to store information about a ULong
-class ULongNode : public Node {
-public:
-  ULongNode (CORBA::ULong *Long_ptr, 
-	     const char *Name_ptr,
-	     unsigned int recursion_level);
-  ~ULongNode () {} 
-  
-  // accpet a visitor
-  void Accept (NodeVisitor *nodeVisitor);
-
-  // get the name of the ulong node
-  const char *getName ();
-
-  // get the value
-  CORBA::ULong getValue ();
-
-  // get recursion level
-  unsigned int getRecursionLevel ();
-
-private:
-  CORBA::ULong *ULong_ptr_;
-  const char *Name_ptr_;
-  unsigned int recursion_level_;
-};
-
-
-// Node to store information about a String
-class StringNode : public Node {
-public:
-  StringNode (CORBA::String_var String_var, 
-	      const char *Name_ptr,
-	      unsigned int recursion_level);
-  ~StringNode () {}
-  
-  // accpet a visitor
-  void Accept (NodeVisitor *nodeVisitor);
-
-  // get the name
-  const char *getName ();
-
-  // get the value
-  CORBA::String_var getValue ();
-
-  // get recursion level
-  unsigned int getRecursionLevel ();
-
-private:
-  CORBA::String_var String_var_;
-  const char *Name_ptr_;
-  unsigned int recursion_level_;
-};
-
-#endif // NODE_H
-
-
diff --git a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h b/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h
deleted file mode 100644
index d19e065ae2c..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    NodeVisitor.h
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//    This file descibes the Visitor used by the any evaluator.
-//
-// ============================================================================
-
-#if !defined (NODE_VISITOR_H)
-#define NODE_VISITOR_H
-
-class StructNode;
-class DoubleNode;
-class LongNode;
-class ULongNode;
-class StringNode;
-
-// base class for all the specialized visitors
-
-class NodeVisitor {
-public:
-  virtual void visitStructNode (StructNode *structNode) = 0;
-  virtual void visitDoubleNode (DoubleNode *doubleNode) = 0;
-  virtual void visitLongNode (LongNode *longNode) = 0;
-  virtual void visitULongNode (ULongNode *uLongNode) = 0;  
-  virtual void visitStringNode (StringNode *stringNode) = 0;
-protected:
-  NodeVisitor () {}
-};
-
-#endif // NODE_VISITOR_H
diff --git a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp
deleted file mode 100644
index 652e5e239a3..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    any_test_i.cpp
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//   Visitor for the Nodes of the any analyser.
-//
-// ============================================================================
-
-#include "PrintVisitor.h"
-#include <stdio.h>
-
-
-PrintVisitor::PrintVisitor (const char *file_name) {
-  
-  TAO_TRY {
-    if (file_name != 0) {
-      output_ =  ACE_OS::fopen(file_name, "w");
-      TAO_CHECK_ENV;
-
-       // print it on the screen if file could be opened
-      if (output_ == 0) {
-
-        output_ = stdout;
-
-        ACE_DEBUG ((LM_DEBUG,"PrintVisitor: Use stdout for output.\n"));
-      }
-
-      // everything is ok
-      ACE_DEBUG ((LM_DEBUG,"PrintVisitor: Opened file <%s> successfully.\n",
-                  file_name));
-    }
-    else {
-       output_ = stdout;
-       ACE_DEBUG ((LM_DEBUG,"PrintVisitor: Use stdout for output.\n"));
-
-    }
-
-  }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "Failing when trying to open the output file.\n"));
-    }
-  TAO_ENDTRY;  
-}
-
-
-PrintVisitor::~PrintVisitor () {
-  this->close ();
-}
-
-void 
-PrintVisitor::close () {
-  if (output_ != stdout && output_ != 0) {
-    ACE_OS::fclose (output_);
-  }
-}
-
-
-// Visit a struct node
-void
-PrintVisitor::visitStructNode (StructNode *structNode) {
-  
-  // print the padding in front of the line
-  printPadding (structNode->getRecursionLevel());
-  ACE_OS::fprintf (output_, "struct %s {\n", structNode->getName ());
-  
-  for (unsigned int i = 0; i < structNode->getChildNumber (); i++) {
-    printPadding (structNode->getChild (i)->getRecursionLevel());
-    structNode->getChild (i)->Accept((NodeVisitor *)this);
-    ACE_OS::fprintf (output_, "\n");  
-  }
-  
-  printPadding (structNode->getRecursionLevel());
-  ACE_OS::fprintf (output_, "}\n");  
-}
-
-void 
-PrintVisitor::visitDoubleNode (DoubleNode *doubleNode) {
-  printPadding (doubleNode->getRecursionLevel());  
-  ACE_OS::fprintf (output_, "CORBA::double %s = %f;", doubleNode->getName(), doubleNode->getValue());
-}
-
-void
-PrintVisitor::visitLongNode (LongNode *longNode) {
-  printPadding (longNode->getRecursionLevel());  
-  ACE_OS::fprintf (output_, "CORBA::Long %s = %d;", longNode->getName(), longNode->getValue());
-}
-
-void
-PrintVisitor::visitULongNode (ULongNode *uLongNode) { 
-  printPadding (uLongNode->getRecursionLevel());  
-  ACE_OS::fprintf (output_, "CORBA::ULong %s = %d;", uLongNode->getName(), uLongNode->getValue());
-}
-
-void
-PrintVisitor::visitStringNode (StringNode *stringNode) { 
-  printPadding (stringNode->getRecursionLevel());  
-  ACE_OS::fprintf (output_, "CORBA::String %s = \"%s\";", stringNode->getName(), (char *)stringNode->getValue());
-}
-
-void
-PrintVisitor::printPadding (unsigned int recursion_level) {
-  switch (recursion_level) {
-  case 0: break;
-  case 1: ACE_OS::fprintf (output_, "   ");
-    break;
-  case 2: ACE_OS::fprintf (output_, "      ");
-    break;
-  case 3: ACE_OS::fprintf (output_, "         ");
-    break;
-  case 4: ACE_OS::fprintf (output_, "            ");
-    break;
-  default: for (unsigned int i = 0; i < recursion_level; i++) 
-    {
-      ACE_OS::fprintf (output_, "   ");
-    }
-  break;
-  }
-}
-  
diff --git a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h
deleted file mode 100644
index 54ad1d4301b..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    PrintVisitor.h
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// = DESCRIPTION
-//    This file descibes the PrintVisitor used by the any evaluator.
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "NodeVisitor.h"
-#include "Node.h"
-
-#if !defined (PRINT_VISITOR_H)
-#define PRINT_VISITOR_H
-
-
-// This is a concrete Visitor using the Visitor design pattern
-class PrintVisitor : public NodeVisitor {
-public:
-
-  PrintVisitor (const char *file_name);
-  ~PrintVisitor ();
-
-  void close ();
-
-  void visitStructNode (StructNode *structNode);
-  void visitDoubleNode (DoubleNode *doubleNode);
-  void visitLongNode (LongNode *longNode);
-  void visitULongNode (ULongNode *uLongNode);  
-  void visitStringNode (StringNode *stringNode);
-private:
-  void printPadding (unsigned int recursion_level);
-
-  FILE *output_;
-};
-   
-#endif // PRINT_VISITOR_H
diff --git a/TAO/examples/Simulator/DOVEMIB/TestClient.dsp b/TAO/examples/Simulator/DOVEMIB/TestClient.dsp
deleted file mode 100644
index 7d412b2290b..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/TestClient.dsp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TestClient" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=TestClient - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TestClient.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TestClient.mak" CFG="TestClient - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TestClient - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "TestClient - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TestClient - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "TestClient - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TestClie"

-# PROP BASE Intermediate_Dir "TestClie"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "TestClie"

-# PROP Intermediate_Dir "TestClie"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /out:"TestClient.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TestClient - Win32 Release"

-# Name "TestClient - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\any_test.idl

-

-!IF  "$(CFG)" == "TestClient - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TestClient - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\any_test.idl

-InputName=any_test

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\any_testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\any_testS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeap.idl

-

-!IF  "$(CFG)" == "TestClient - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TestClient - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\NavWeap.idl

-InputName=NavWeap

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeapC.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/examples/Simulator/DOVEMIB/any_test.idl b/TAO/examples/Simulator/DOVEMIB/any_test.idl
deleted file mode 100644
index 80bf048a2d2..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/any_test.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-interface Any_Test
-  // = TITLE
-  //
-  // = DESCRIPTION
-
-{
-  void try_an_any (in any a);
-};
-
diff --git a/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp b/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp
deleted file mode 100644
index a92950b03af..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/any_test_i.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    any_test_i.cpp
-//
-// = AUTHOR
-//    Michael Kircher 
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "ace/Containers.h"
-#include "any_test_i.h"
-#include "NavWeapC.h"
-#include "AnyAnalyser.h"
-
-
-// Constructor
-Any_Test_i::Any_Test_i (const char *obj_name)
-{
-}
-
-// Destructor
-Any_Test_i::~Any_Test_i (void) 
-{ 
-}
-
-
-void 
-Any_Test_i::try_an_any (const CORBA::Any &a,  CORBA::Environment &env)
-{
-  TAO_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Call to try_an_any succeeded!\n"));
-      
-      AnyAnalyser anyAnalyser_ = AnyAnalyser ("stdout");
-
-      TAO_CHECK_ENV;
-        Weapons *weapons_ = 0; 
-      if (a.type()->equal(_tc_Weapons,TAO_TRY_ENV)) {
-      
-        CORBA::Any b;
-        b = a;
-        weapons_ = (Weapons *)b.value();        
-        cout << "ID: " << a.type()->id(TAO_TRY_ENV) << endl;
-        cout << "CompTime: " << weapons_->computation_time << endl;
-        cout << "Adr number of weapons: " << &(weapons_->number_of_weapons) << endl;
-        cout << "Adr CompTime: " << &(weapons_->computation_time) << endl;
-      }
-      
-      anyAnalyser_.printAny (a.type(), a.value());      
-    }
-  TAO_CATCHANY    
-    {
-      ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the data.\n"));
-    }
-  TAO_ENDTRY;	    
-}
-
-
diff --git a/TAO/examples/Simulator/DOVEMIB/any_test_i.h b/TAO/examples/Simulator/DOVEMIB/any_test_i.h
deleted file mode 100644
index eb877ef23c5..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/any_test_i.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// 
-// = FILENAME
-//    any_test_i.h
-//
-// = AUTHOR
-//   Michael Kircher
-// 
-// ============================================================================
-
-#if !defined (_ANY_TEST_I_HH)
-#define	_ANY_TEST_I_HH
-
-#include "any_testS.h"
-
-// Forward declarations
-class Any_Test_i;
-
-// Typedefs.
-typedef Any_Test_i *Any_Test_i_ptr;
-typedef Any_Test_i_ptr Any_Test_i_ref;
-
-class Any_Test_i : public POA_Any_Test
-  // = TITLE
-  // = DESCRIPTION
-{
-public:
-  Any_Test_i (const char *obj_name = 0);
-  // Constructor
-
-  ~Any_Test_i (void);
-  // Destructor
-
-  virtual void try_an_any (const CORBA::Any &a,
-                                   CORBA::Environment &env);
-};
-
-#endif /* _ANY_TEST_I_HH */
diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.cpp b/TAO/examples/Simulator/DOVEMIB/clnt.cpp
deleted file mode 100644
index b5e63462ec0..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/clnt.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//
-// = AUTHORS
-//   Michael Kircher
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "clnt.h"
-#include "NavWeapC.h"
-
-
-Any_Test_Client::Any_Test_Client ()
-{
-
-}
-
-Any_Test_Client::~Any_Test_Client ()
-{
-    CORBA::release(this->any_test_ptr_);
-}
-
-int
-Any_Test_Client::init (int argc, char *argv [])
-{
-  
-  TAO_TRY {
-     this->argc_ = argc;
-     this->argv_ = argv;
-            
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-				                            this->argv_,
-				                            "internet",
-				                            TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (this->argc_ != 2)
-	    { 
-	      ACE_ERROR_RETURN ((LM_ERROR, "Expected an IOR as parameter\n"),-1);
-	    }
-
-      CORBA::Object_var any_test_object_ =  this->orb_->string_to_object (argv_[1], TAO_TRY_ENV);
-      TAO_CHECK_ENV;  
-
-      this->any_test_ptr_ = Any_Test::_narrow (any_test_object_.in(), TAO_TRY_ENV);	
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->any_test_ptr_))
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-			                    "Invalid IOR specified.\n"),
-			                    -1);
-	    }     
-      return 0;
-  }
-  TAO_CATCHANY {
-    TAO_TRY_ENV.print_exception ("SYS_EX");
-    return 0;
-  }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-Any_Test_Client::run ()
-{
-  TAO_TRY
-    {
-      CORBA::Any data; 
-
-      navigation_.position_latitude = 1;
-      navigation_.position_longitude = 2;
-      navigation_.altitude = 3;
-      navigation_.heading = 4;
-      navigation_.roll = 5;
-      navigation_.pitch = 6;
-
-      navigation_.utilization = 1;
-      navigation_.overhead = 2;
-      navigation_.arrival_time = 3;
-      navigation_.deadline_time = 4;
-      navigation_.completion_time = 5;
-      navigation_.computation_time = 6;
-
-      data.replace (_tc_Navigation, &navigation_, CORBA::B_FALSE, TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG,"Starting test with Any: Navigation\n")); 
-      //any_test_ptr_->try_an_any (data, TAO_TRY_ENV);
-      ACE_DEBUG ((LM_DEBUG,"Ending test with Any: Navigation\n"));   
-
-
-/*      CORBA::Short x_ = 8;
-      data <<= x_;
-
-      ACE_DEBUG ((LM_DEBUG,"Starting test with Any: Navigation\n")); 
-      any_test_ptr_->try_an_any (data, TAO_TRY_ENV);
-      ACE_DEBUG ((LM_DEBUG,"Ending test with Any: Navigation\n"));   
-*/      
-      
-      weapons_.number_of_weapons = 5;
-      weapons_.weapon1_identifier = CORBA::string_alloc (20);
-      strcpy (weapons_.weapon1_identifier, "A");
-      weapons_.weapon1_status = 1;
-      weapons_.weapon2_identifier = CORBA::string_alloc (20);
-      strcpy (weapons_.weapon2_identifier, "B");
-      weapons_.weapon2_status = 2;
-      weapons_.weapon3_identifier = CORBA::string_alloc (20);
-      strcpy (weapons_.weapon3_identifier, "C");
-      weapons_.weapon3_status = 4;
-      weapons_.weapon4_identifier = CORBA::string_alloc (20);
-      strcpy (weapons_.weapon4_identifier, "D");
-      weapons_.weapon4_status = 8;
-      weapons_.weapon5_identifier = CORBA::string_alloc (20);
-      strcpy (weapons_.weapon5_identifier, "E");
-      weapons_.weapon5_status = 16;
-      
-      weapons_.utilization = 1;
-      weapons_.overhead = 2;
-      weapons_.arrival_time = 3;
-      weapons_.deadline_time = 4;
-      weapons_.completion_time = 5;
-      weapons_.computation_time = 6;
-      
-      data.replace (_tc_Weapons, &weapons_, CORBA::B_FALSE, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      ACE_DEBUG ((LM_DEBUG,"Starting test with Any: Weapons\n")); 
-      any_test_ptr_->try_an_any (data, TAO_TRY_ENV);
-      ACE_DEBUG ((LM_DEBUG,"Ending test with Any: Weapons\n"));   	
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Error in Any_Test_Client::run");
-    }
-  TAO_ENDTRY;
-
-      
-  return 0;
-}
-
-
-
-// function main
-
-int
-main (int argc, char *argv [])
-{
-
-  TAO_TRY
-    {
-      Any_Test_Client any_test_client_;
-      TAO_CHECK_ENV;
-
-      if (any_test_client_.init (argc, argv) == -1)
-	return 1;
-      TAO_CHECK_ENV;
-
-      return any_test_client_.run ();
-      TAO_CHECK_ENV;
-
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-
-  return 0;
-}
-
diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.h b/TAO/examples/Simulator/DOVEMIB/clnt.h
deleted file mode 100644
index 67ed5c84d57..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/clnt.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//
-// = AUTHORS
-//   Michael Kircher
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "any_testC.h"
-#include "NavWeapC.h"
-
-class Any_Test_Client
-  // = TITLE
-  //
-  // = DESCRIPTION
-{
-public:
-  // = Constructor and destructor.
-  Any_Test_Client (void);
-  ~Any_Test_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  Navigation navigation_;
-  Weapons weapons_;
-
-  Any_Test_ptr any_test_ptr_;
- //  Reverse_ptr reverse_ptr_;
-  
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-
-  CORBA::Environment env_;
-  // Environment variable
-
-  CORBA::ORB_var orb_;
-  // Remember our orb
-};
-
-
-
-
diff --git a/TAO/examples/Simulator/DOVEMIB/svc.conf b/TAO/examples/Simulator/DOVEMIB/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simulator/DOVEMIB/svr.cpp b/TAO/examples/Simulator/DOVEMIB/svr.cpp
deleted file mode 100644
index f38ba02bcbc..00000000000
--- a/TAO/examples/Simulator/DOVEMIB/svr.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//   Michael Kircher
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "any_test_i.h"
-//#include "Node.h"
-
-// Global Variables
-static int num_of_objs = 1;
-
-// Parses the command line arguments and returns an error status
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  /*
-  CORBA::Long long_ = 4;
-  CORBA::Double double_ = 5.0;
-  StructNode *structNode_ptr_ = new StructNode ("ABC");
-  
-  structNode_ptr_->addChild ((Node *)new DoubleNode (&double_, "My_Double"));
-  structNode_ptr_->addChild ((Node *)new LongNode (&long_, "My_Long"));
-
-  structNode_ptr_->print ();
-  */
-  
-  TAO_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "Having the ORB\n"));
-
-      // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil(poa_object.in()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-  
-      PortableServer::PolicyList policies (2);
-      policies.length (2);  
-      policies[0] =
-	root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-					       TAO_TRY_ENV);
-      policies[1] =
-	root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-					  TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG, "Having the rootPOA\n"));
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      PortableServer::POA_var good_poa =
-	root_poa->create_POA ("RootPOA_is_BAD",
-			      poa_manager.in (),
-			      policies,
-			      TAO_TRY_ENV);  
-      TAO_CHECK_ENV;
-
-      // Parse remaining command line and verify parameters.
-      parse_args (argc, argv);
-
-      ACE_DEBUG ((LM_DEBUG, "Starting the implementation\n"));
-
-      // create a factory implementation
-      Any_Test_i_ptr any_test_i_ptr_ = new Any_Test_i ();
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "Started the implementation\n"));
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("Any_Test");
-      good_poa->activate_object_with_id (id.in (),
-                                         any_test_i_ptr_,
-                                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-      CORBA::Object_var obj =
-        good_poa->id_to_reference (id.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        orb->object_to_string (obj.in (),
-                               TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n", str.in ()));
-
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Handle requests for this object until we're killed, or one of
-      // the methods asks us to exit.
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-      root_poa->destroy (CORBA::B_TRUE, 
-			 CORBA::B_TRUE, 
-			 TAO_TRY_ENV);
-      TAO_CHECK_ENV
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG(sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG(userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/Simulator/Event_Supplier/EDF.dat b/TAO/examples/Simulator/Event_Supplier/EDF.dat
deleted file mode 100644
index 4fbc28d9c0f..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/EDF.dat
+++ /dev/null
@@ -1,72 +0,0 @@
-low_20        1.000000   0.000000         0    500000       180000       180000
-high_20       1.000000   0.000000         0    500000       360000       180000
-low_20        1.000000   0.000000    500000   1000000       680000       180000
-high_20       1.000000   0.000000    500000   1000000       860000       180000
-low_10        1.000000   0.000000         0   1000000       900000       180000
-low_20        1.000000   0.000000   1000000   1500000      1180000       180000
-high_20       1.000000   0.000000   1000000   1500000      1360000       180000
-low_20        1.000000   0.000000   1500000   2000000      1680000       180000
-high_20       1.000000   0.000000   1500000   2000000      1860000       180000
-low_10        1.000000   0.000000   1000000   2000000      1900000       180000
-high_10       1.000000   0.000000         0   1000000      1980000       180000
-low_20        1.000000   0.000000   2000000   2500000      2180000       180000
-high_20       1.000000   0.000000   2000000   2500000      2360000       180000
-low_20        1.000000   0.000000   2500000   3000000      2680000       180000
-high_20       1.000000   0.000000   2500000   3000000      2860000       180000
-low_10        1.000000   0.000000   2000000   3000000      2900000       180000
-low_20        1.000000   0.000000   3000000   3500000      3180000       180000
-high_20       1.000000   0.000000   3000000   3500000      3360000       180000
-low_20        1.000000   0.000000   3500000   4000000      3680000       180000
-high_20       1.000000   0.000000   3500000   4000000      3860000       180000
-low_10        1.000000   0.000000   3000000   4000000      3900000       180000
-high_10       1.000000   0.000000   1000000   2000000      3960000       180000
-low_20        1.000000   0.000000   4000000   4500000      4180000       180000
-high_20       1.000000   0.000000   4000000   4500000      4360000       180000
-low_20        1.000000   0.000000   4500000   5000000      4680000       180000
-high_20       1.000000   0.000000   4500000   5000000      4860000       180000
-low_10        1.000000   0.000000   4000000   5000000      4900000       180000
-low_20        1.000000   0.000000   5000000   5500000      5180000       180000
-high_20       1.000000   0.000000   5000000   5500000      5360000       180000
-low_20        1.000000   0.000000   5500000   6000000      5680000       180000
-high_20       1.000000   0.000000   5500000   6000000      5860000       180000
-low_10        1.000000   0.000000   5000000   6000000      5900000       180000
-high_10       1.000000   0.000000   3000000   4000000      5940000       180000
-low_20        1.000000   0.000000   6000000   6500000      6180000       180000
-high_20       1.000000   0.000000   6000000   6500000      6360000       180000
-low_20        1.000000   0.000000   6500000   7000000      6680000       180000
-high_20       1.000000   0.000000   6500000   7000000      6860000       180000
-low_10        1.000000   0.000000   6000000   7000000      6900000       180000
-low_20        1.000000   0.000000   7000000   7500000      7180000       180000
-high_20       1.000000   0.000000   7000000   7500000      7360000       180000
-low_20        1.000000   0.000000   7500000   8000000      7680000       180000
-high_20       1.000000   0.000000   7500000   8000000      7860000       180000
-low_10        1.000000   0.000000   7000000   8000000      7900000       180000
-high_10       1.000000   0.000000   5000000   6000000      7920000       180000
-low_20        1.000000   0.000000   8000000   8500000      8180000       180000
-high_20       1.000000   0.000000   8000000   8500000      8360000       180000
-low_20        1.000000   0.000000   8500000   9000000      8680000       180000
-high_20       1.000000   0.000000   8500000   9000000      8860000       180000
-low_10        1.000000   0.000000   8000000   9000000      8900000       180000
-high_10       1.000000   0.000000   7000000   8000000      9000000       180000
-low_20        1.000000   0.000000   9000000   9500000      9180000       180000
-high_20       1.000000   0.000000   9000000   9500000      9360000       180000
-low_20        1.000000   0.000000   9500000  10000000      9680000       180000
-high_20       1.000000   0.000000   9500000  10000000      9860000       180000
-low_10        1.000000   0.000000   9000000  10000000      9900000       180000
-high_10       1.000000   0.000000   9000000  10000000     10080000       180000
-low_5         1.000000   0.000000   8000000  10000000     10260000       180000
-high_5        1.000000   0.000000   8000000  10000000     10440000       180000
-low_1         1.000000   0.000000         0  10000000     10620000       180000
-high_1        1.000000   0.000000         0  10000000     10800000       180000
-high_10       1.000000   0.000000   8000000   9000000     10980000       180000
-high_5        1.000000   0.000000   6000000   8000000     11160000       180000
-low_5         1.000000   0.000000   6000000   8000000     11340000       180000
-high_10       1.000000   0.000000   6000000   7000000     11520000       180000
-low_5         1.000000   0.000000   4000000   6000000     11700000       180000
-high_5        1.000000   0.000000   4000000   6000000     11880000       180000
-high_10       1.000000   0.000000   4000000   5000000     12060000       180000
-high_5        1.000000   0.000000   2000000   4000000     12240000       180000
-low_5         1.000000   0.000000   2000000   4000000     12420000       180000
-high_10       1.000000   0.000000   2000000   3000000     12600000       180000
-low_5         1.000000   0.000000         0   2000000     12780000       180000
-high_5        1.000000   0.000000         0   2000000     12960000       180000
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
deleted file mode 100644
index 1c46bdc512f..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Con.cpp
-//
-// = DESCRIPTION
-//   This demo just tests the basic functionality of the Event Service
-//   One Conumer which inherits from the Rtec Consumer.  One Supplier
-//   with an internal Rtec Consumer and one internal Rtec Supplier.
-//   The internal Supplier is just a demo supplier because the
-//   architecture expects an supplier which has inherited from the
-//   Rtec Supplier.
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include <limits.h>
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/Profile_Timer.h"
-#include "tao/Timeprobe.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "Event_Con.h"
-#include "NavWeapC.h"
-
-static const int SOURCE_ID = 1001;
-
-static const char usage [] = 
-"[-? |\n"
-"            [-c <consumers> [4]]\n"
-"            [-d directly connect all consumers/suppliers\n"
-"            [-j to collect jitter statistics]\n"
-"            [-m <count> of messages to send [10]]\n"
-"            [-s <suppliers>, [1]]\n"
-"            [-t <timeout interval>, msec [250]]]";
-
-static int received = 0;
-
-// ************************************************************
-
-Demo_Consumer::Demo_Consumer (void)
-{
-}
-
-int 
-Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              const char *my_name)
-{
-  TAO_TRY
-    {
-      // Get a Scheduler.
-
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      // Define Real-time information.
-
-      rt_info_ = server->create (my_name, TAO_TRY_ENV);
-
-      server->set (rt_info_,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   0,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero,
-                   1,
-                   TAO_TRY_ENV);
-
-      // Create the event that we're registering for.
-
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert_type (ACE_ES_EVENT_NOTIFICATION, rt_info_);
-      dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      // The channel administrator is the event channel we got from
-      // the invocation of this routine.
-
-      this->channel_admin_ = ec;
-
-      // = Connect as a consumer.
-
-      this->consumer_admin_ =
-        channel_admin_->for_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Obtain a pointer to a push supplier.  "suppliers" is
-      // inherited from a base class.
-
-      this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // The _this function returns an object pointer. This is needed
-      // because a consumer inherits from a Servant class that is no
-      // CORBA::Object.
-
-      RtecEventComm::PushConsumer_var objref =
-        this->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demo_Consumer::open: subscribe failed.\n"),
-                        -1);
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demo_Consumer::open: unexpected exception.\n"),
-                        -1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Demo_Consumer::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Consumer received disconnect from channel.\n"));
-}
-
-void
-Demo_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &)
-{
-
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-
-  cout << "Number of events: " << received++ << endl;
-
-  for (CORBA::ULong i = 0; i < events.length (); ++i)
-    {
-      if (events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Demo Consumer: received shutdown event\n"));
-          this->shutdown ();
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Demo Consumer: received ACE_ES_EVENT_NOTIFICATION event.\n"));
-
-          TAO_TRY
-            {
-              cout << "ID: " << events[i].data_.any_value.type()->id(TAO_TRY_ENV) << endl;
-              TAO_CHECK_ENV;
-              cout << "Name: " << events[i].data_.any_value.type()->name(TAO_TRY_ENV) << endl;
-              TAO_CHECK_ENV;
-              cout << "member_count: " << events[i].data_.any_value.type()->member_count(TAO_TRY_ENV) << endl;
-              TAO_CHECK_ENV;
-              cout << "TCKind: " << events[i].data_.any_value.type()->kind(TAO_TRY_ENV) << endl;
-              TAO_CHECK_ENV;
-
-              if (_tc_Navigation->equal (events[i].data_.any_value.type(), TAO_TRY_ENV))
-                {
-                  TAO_CHECK_ENV;
-                  Navigation *navigation_ = (Navigation*) events[i].data_.any_value.value ();
-
-                  cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl;
-                }
-              else if (_tc_Weapons->equal (events[i].data_.any_value.type(), TAO_TRY_ENV))
-                {
-                  TAO_CHECK_ENV;
-                  Weapons *weapons_ = (Weapons*) events[i].data_.any_value.value ();
-
-                  cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl;
-                }
-
-
-            }
-          TAO_CATCHANY
-            {
-              ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
-            }
-          TAO_ENDTRY;
-        }
-    }
-}
-
-void
-Demo_Consumer::shutdown (void)
-{
-  TAO_TRY
-    {
-      // Disconnect from the push supplier.
-
-      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      TAO_CHECK_ENV;
-
-      TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "(%t) Demo_Consumer::shutdown: unexpected exception.\n"));
-    }
-  TAO_ENDTRY;
-}
-
-// function get_options
-
-static unsigned int
-get_options (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?");
-  int opt;
-  int temp;
-
-  while ((opt = get_opt ()) != EOF)
-  {
-    switch (opt) 
-      {
-      case '?':
-        ACE_DEBUG ((LM_DEBUG,
-                    "Usage: %s %s\n",
-                    argv[0], usage));
-        ACE_OS::exit (0);
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: unknown arg, -%c\n"
-                           "Usage: %s %s\n",
-                           argv[0], char(opt),
-                           argv[0], usage), 1);
-      }
-  }
-
-  if (argc != get_opt.optind)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s: too many arguments\n"
-                       "Usage: %s %s\n",
-                       argv[0],
-                       argv[0],
-                       usage),
-                      1);
-  return 0;
-}
-
-// function main.
-
-int
-main (int argc, char *argv [])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager = 
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      if (get_options (argc, argv))
-        ACE_OS::exit (-1);
-
-      // Get the Event Channel.
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup ("EventService");
-
-      CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name,
-                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (ec.ptr() == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Not able to get the Event Service reference.\n"),
-                          -1);
-
-      // Create consumer.
-
-      Demo_Consumer *demo_consumer;
-      ACE_NEW_RETURN (demo_consumer,
-                      Demo_Consumer (),
-                      -1);
-
-      if (demo_consumer->open_consumer (ec.ptr (),
-                                        "demo_consumer") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
-                           "Someone was feeling introverted.\n"),
-                          -1);
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the ORB
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "CORBA::ORB::run"),
-                          -1);
-      TAO_CHECK_ENV;
-
-      delete demo_consumer;
-
-      root_poa->destroy (CORBA::B_TRUE,
-                         CORBA::B_TRUE,
-                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
deleted file mode 100644
index c95efa7f473..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-
-// ============================================================================
-// 
-// = FILENAME
-//    Event_Con.h
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (EVENT_CON_H)
-#define EVENT_CON_H
-
-#include "ace/SString.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-
-class Demo_Consumer : public POA_RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //    Demo Consumer
-  //
-  // = DESCRIPTION
-  //    Simple example of a consumer that registers for supplier
-  //    notifications.
-public:
-  Demo_Consumer (void);
-
-  int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  // = (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
-
-protected:
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var suppliers_;
-
-private:
-  RtecScheduler::handle_t rt_info_;
-};
-
-#endif /* EVENT_CON_H */
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
deleted file mode 100644
index 36adeec054b..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    Event_Sup.cpp
-//
-// = DESCRIPTION
-//   Event Supplier for the flight simulator
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include <limits.h>
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/Profile_Timer.h"
-#include "ace/OS.h"
-#include "tao/Timeprobe.h"
-#include "tao/corba.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "Event_Sup.h"
-#include "NavWeapC.h"
-
-const int SOURCE_ID = 1001;
-
-static const char usage [] = 
-"[-? |\n"
-"            [-O[RBport] ORB port number]"
-"            [-m <count> of messages to send [100]"
-"            [-f name of schedler input data file]]";
-
-static u_int total_messages = 100;
-
-static char *input_file_name = 0;
-
-// ------------ Internal_Demo_Consumer ---------------------------------
-
-Demo_Supplier::Internal_Demo_Consumer::Internal_Demo_Consumer (Demo_Supplier *impl)
-  : impl_ (impl)
-{
-}
-
-void
-Demo_Supplier::Internal_Demo_Consumer::push (const RtecEventComm::EventSet &events,
-                                             CORBA::Environment &env)
-{
-  this->impl_->push (events, env);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Internal Demo Consumer received push.\n"));
-}
-
-void
-Demo_Supplier::Internal_Demo_Consumer::disconnect_push_consumer (CORBA::Environment &) 
-{ 
-}
-
-// -------------------- Internal Demo Supplier -----------------------------
-
-Demo_Supplier::Internal_Demo_Supplier::Internal_Demo_Supplier (Demo_Supplier *impl)
-  : impl_ (impl)
-{
-}
-
-void
-Demo_Supplier::Internal_Demo_Supplier::disconnect_push_supplier (CORBA::Environment &) 
-{ 
-}
-
-// ----------------------------------------------------------------------------
-
-Demo_Supplier::Demo_Supplier (u_int supplier_id)
-  : supplier_id_ (supplier_id),
-    internal_demo_consumer_ (new Internal_Demo_Consumer (this)),
-    internal_demo_supplier_ (new Internal_Demo_Supplier (this)) 
-{
-    // this is neccessary because they are not initialized by the comiler
-   navigation_.roll = 0;
-   navigation_.pitch = 0;
-}
-
-Demo_Supplier::~Demo_Supplier (void)
-{
-  delete internal_demo_consumer_;
-  delete internal_demo_supplier_;
-}
-
-int
-Demo_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              const char *name)
-{
-  TAO_TRY
-    {
-      this->channel_admin_ = ec;
-
-      // Get a Scheduling server.
-
-      RtecScheduler::Scheduler_ptr scheduler_ =
-        ACE_Scheduler_Factory::server ();
-
-      // Generate the Real-time information.
-
-      this->rt_info_ = scheduler_->create (name,
-                                           TAO_TRY_ENV);
-      scheduler_->set (rt_info_,
-                       RtecScheduler::VERY_LOW_CRITICALITY,
-                       ORBSVCS_Time::zero,
-                       ORBSVCS_Time::zero,
-                       ORBSVCS_Time::zero,
-                       2500000,
-                       RtecScheduler::VERY_LOW_IMPORTANCE,
-                       ORBSVCS_Time::zero,
-                       1,
-                       RtecScheduler::OPERATION,
-                       TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Set the publications to report them to the event channel.
-
-      CORBA::Short x = 0;
-      RtecEventChannelAdmin::SupplierQOS qos_;
-      qos_.publications_.length (2);
-      qos_.publications_[0].event_.source_ = SOURCE_ID;
-      qos_.publications_[0].event_.type_ = ACE_ES_EVENT_NOTIFICATION;
-      qos_.publications_[0].event_.ttl_ = 1;
-      qos_.publications_[0].event_.creation_time_ = ORBSVCS_Time::zero; 
-      // default values
-      qos_.publications_[0].event_.ec_recv_time_ = ORBSVCS_Time::zero;
-      qos_.publications_[0].event_.ec_send_time_ = ORBSVCS_Time::zero;
-      qos_.publications_[0].event_.data_.x = 0;
-      qos_.publications_[0].event_.data_.y = 0;
-      qos_.publications_[0].event_.data_.any_value.replace (CORBA::_tc_short,
-                                                            &x,
-                                                            0,
-                                                            TAO_TRY_ENV);
-      qos_.publications_[0].dependency_info_.number_of_calls = 1;
-      qos_.publications_[0].dependency_info_.rt_info = rt_info_;
-      qos_.publications_[1].event_.source_ = SOURCE_ID;
-      qos_.publications_[1].event_.type_ = ACE_ES_EVENT_SHUTDOWN;
-      qos_.publications_[1].event_.ttl_ = 1;
-      qos_.publications_[1].event_.creation_time_ = ORBSVCS_Time::zero; 
-      // default values.
-      qos_.publications_[1].event_.ec_recv_time_ = ORBSVCS_Time::zero;
-      qos_.publications_[1].event_.ec_send_time_ = ORBSVCS_Time::zero;
-      qos_.publications_[1].event_.data_.x = 0;
-      qos_.publications_[1].event_.data_.y = 0;
-      qos_.publications_[1].event_.data_.any_value.replace (CORBA::_tc_short,
-                                                            &x,
-                                                            0,
-                                                            TAO_TRY_ENV);
-      qos_.publications_[1].dependency_info_.number_of_calls = 1;
-      qos_.publications_[1].dependency_info_.rt_info = rt_info_;
-
-      // = Connect as a supplier.
-      this->supplier_admin_ =
-        channel_admin_->for_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->proxy_consumer_ =
-        supplier_admin_->obtain_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // In calling _this we get back an object reference and register
-      // the servant with the POA.
-
-      RtecEventComm::PushSupplier_var objref =
-        this->internal_demo_supplier_->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Connect the supplier to the proxy consumer.
-      this->proxy_consumer_->connect_push_supplier (objref.in (),
-                                                    qos_,
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Demo_Supplier::open");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Demo_Supplier::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier received disconnect from channel.\n"));
-}
-
-void
-Demo_Supplier::start_generating_events (void)
-{
-  u_int total_sent_ = 0;
-
-  // Load the scheduling data for the simulation.
-  ACE_Unbounded_Queue<Schedule_Viewer_Data *> schedule_data;
-  this->load_schedule_data (schedule_data);
-  ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *>
-    schedule_iter (schedule_data);
-
-  if (schedule_iter.done ())
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Demo_Supplier::start_generating_events: "
-                  "there is no scheduling data\n"));
-      return;
-    }
-
-  TAO_TRY
-    {
-      do 
-        {
-          RtecEventComm::Event event;
-          event.source_ = SOURCE_ID;
-          event.type_ = ACE_ES_EVENT_NOTIFICATION;
-          event.ttl_ = 1;
-          event.creation_time_ = ORBSVCS_Time::zero;
-          event.ec_recv_time_ = ORBSVCS_Time::zero;
-          event.ec_send_time_ = ORBSVCS_Time::zero;
-          event.data_.x = 0;
-          event.data_.y = 0;
-
-          this->insert_event_data (event.data_.any_value,
-                                   schedule_iter);
-
-          RtecEventComm::EventSet events;
-          events.length (1);
-          events[0] = event;
-
-          proxy_consumer_->push (events,
-                                 TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          if (total_sent_ < 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Pushing event data.\n"));
-          else if (total_sent_ == 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Everything is running. Going to be mute.\n"));
-        } 
-      while (++total_sent_ < total_messages);
-
-      // Sending a shutdown event -- not wanted right now
-      /*  RtecEventComm::Event event;
-      event.source_ = SOURCE_ID;
-      event.type_ = ACE_ES_EVENT_SHUTDOWN;
-      event.ttl_ = 1;
-      event.creation_time_ = ORBSVCS_Time::zero;
-      event.ec_recv_time_ = ORBSVCS_Time::zero;
-      event.ec_send_time_ = ORBSVCS_Time::zero;
-      event.data_.x = 0;
-      event.data_.y = 0;
-
-      RtecEventComm::EventSet events;
-      events.length (1);
-      events[0] = event;
-      TAO_CHECK_ENV;
-
-      proxy_consumer_->push (events, TAO_TRY_ENV);
-      TAO_CHECK_ENV; */
-
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "Demo_Supplier::start_generating_events: "
-                            " unexpected exception.\n"));
-    }
-  TAO_ENDTRY;
-
-  // clean up the scheduling data
-  Schedule_Viewer_Data **data_temp;
-  for (schedule_iter.first ();
-       schedule_iter.done () == 0;
-       schedule_iter.advance ())
-    if (schedule_iter.next (data_temp) && data_temp)
-      delete (*data_temp);
-
-  this->shutdown ();
-}
-
-void
-Demo_Supplier::load_schedule_data 
-  (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data)
-{
-  Schedule_Viewer_Data *data = 0;
-
-  if (input_file_name)
-    {
-      // Open the scheduler data input file and read its contents into
-      // a queue.
-      FILE *input_file;
-
-      int scan_count = 0;
-      input_file = ACE_OS::fopen(input_file_name, "r");
-
-      if (input_file)
-        {
-          // Get a line at a time from the data file and parse it.
-          char input_buf[BUFSIZ];
-          while (ACE_OS::fgets (input_buf, BUFSIZ, input_file))
-            {
-              // Run through leading whitespace.
-              char *temp = input_buf;
-              while (*temp && isspace (*temp))
-                ++temp;
-
-              // If there is anything besides whitespace in the line
-              // read, scan its fields into the scheduling data
-              // structure.
-              if (ACE_OS::strlen (temp) > 0)
-                {
-                  ACE_NEW (data, Schedule_Viewer_Data);
-                  scan_count = sscanf (temp, "%s %lf %lf %lu %lu %lu %lu",
-                                       &(data->operation_name), &(data->utilitzation),
-                                       &(data->overhead), &(data->arrival_time),
-                                       &(data->deadline_time), &(data->completion_time),
-                                       &(data->computation_time));
-                  if (scan_count != 7)
-                    {
-                      ACE_ERROR ((LM_ERROR,
-                                  "Demo_Supplier::start_generating_events: "
-                                  "scanned incorrect number of data elements: %d\n", scan_count));
-
-                      delete data;
-                      return;
-                    }
-
-                  // Insert the data into the queue.
-                  schedule_data.enqueue_tail (data);
-                }
-            }
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Demo_Supplier::start_generating_events: "
-                      "could not open input file [%s].\n",
-                      input_file_name));
-          return;
-        }
-    }
-  else
-  {
-    u_long last_completion = 0;
-
-    // Just create 10 dummy scheduling records and use them.
-    for (int i = 0; i < 10; ++i)
-    {
-      ACE_NEW (data, Schedule_Viewer_Data);
-
-      char *oper_name = 0;
-      switch (i % 4)
-      {
-      case 0:
-        oper_name = "high_20";
-        break;
-
-      case 1:
-        oper_name = "low_20";
-        break;
-
-      case 2:
-        oper_name = "high_10";
-        break;
-
-      case 3:
-      default:
-        oper_name = "low_10";
-        break;
-      }
-
-      ACE_OS::strncpy (data->operation_name,
-                       oper_name,
-                       BUFSIZ-1);
-
-
-      data->utilitzation = (double)(20.0+ACE_OS::rand() %10);
-      data->overhead = (double)(ACE_OS::rand() %20);
-
-      data->arrival_time = ACE_OS::rand() % 200;
-      data->computation_time = (ACE_OS::rand() % 100) + 10;
-
-      data->completion_time = last_completion + (ACE_OS::rand() % 100) + 100;
-      data->completion_time =
-        data->completion_time <  data->arrival_time + data->computation_time
-        ? data->arrival_time + data->computation_time
-        : data->completion_time;
-
-      last_completion = data->completion_time;
-
-      data->deadline_time = data->completion_time + (ACE_OS::rand() % 200) - 50;
-
-      // insert the data into the queue.
-      schedule_data.enqueue_tail (data);
-    }
-  }
-}
-
-// This function fills in the random data into the anys transported by
-// the event channel.
-
-void
-Demo_Supplier::insert_event_data (CORBA::Any &data,
-                                  ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> &schedule_iter)
-{
-  static u_long last_completion = 0;
-
-  TAO_TRY {
-    Schedule_Viewer_Data **sched_data;
-
-    if ((schedule_iter.next (sched_data)) && (sched_data) && (*sched_data)) {
-      if ((strcmp((*sched_data)->operation_name, "high_20") == 0) ||
-           (strcmp((*sched_data)->operation_name, "low_20") == 0)  ||
-           (strcmp((*sched_data)->operation_name, "high_1") == 0)  ||
-           (strcmp((*sched_data)->operation_name, "low_1") == 0)) {
-        navigation_.position_latitude = ACE_OS::rand() % 90;
-        navigation_.position_longitude = ACE_OS::rand() % 180;
-        navigation_.altitude = ACE_OS::rand() % 100;
-        navigation_.heading = ACE_OS::rand() % 180;
-        navigation_.roll = (navigation_.roll >= 180) ? -180 : navigation_.roll + 1;
-        navigation_.pitch =  (navigation_.pitch >= 90) ? -90 : navigation_.pitch + 1;
-
-        navigation_.utilization =     (*sched_data)->utilitzation;
-        navigation_.overhead =         (*sched_data)->overhead;
-        navigation_.arrival_time =     (*sched_data)->arrival_time;
-        navigation_.deadline_time =    (*sched_data)->deadline_time;
-        navigation_.completion_time =  (*sched_data)->completion_time;
-        navigation_.computation_time = (*sched_data)->computation_time;
-
-        // because the scheduler data does not supply these values
-        navigation_.utilization = (double) (20.0 + ACE_OS::rand() % 10); 
-        navigation_.overhead = (double) (ACE_OS::rand() % 10); 
-
-        data.replace (_tc_Navigation, &navigation_, CORBA::B_TRUE, TAO_TRY_ENV);
-      }
-      else if ((strcmp((*sched_data)->operation_name, "high_10") == 0) ||
-               (strcmp((*sched_data)->operation_name, "low_10") == 0)  ||
-                (strcmp((*sched_data)->operation_name, "high_5") == 0)  ||
-                (strcmp((*sched_data)->operation_name, "low_5") == 0)) {
-        weapons_.number_of_weapons = 2;
-        weapons_.weapon1_identifier = CORBA::string_alloc (30);
-        strcpy (weapons_.weapon1_identifier,"Photon Torpedoes");
-        weapons_.weapon1_status =(ACE_OS::rand() % 4) == 0 ? 0 : 1 ;
-        weapons_.weapon2_identifier = CORBA::string_alloc (30);
-        strcpy (weapons_.weapon2_identifier,"Quantum Torpedoes");
-        weapons_.weapon2_status = (ACE_OS::rand() % 4) == 0 ? 0 : 1;
-        weapons_.weapon3_identifier = CORBA::string_alloc (1);
-        strcpy (weapons_.weapon3_identifier, "");
-        weapons_.weapon3_status = 0;
-        weapons_.weapon4_identifier = CORBA::string_alloc (1);
-        strcpy (weapons_.weapon4_identifier, "");
-        weapons_.weapon4_status = 0;
-        weapons_.weapon5_identifier = CORBA::string_alloc (1);
-        strcpy (weapons_.weapon5_identifier, "");
-        weapons_.weapon5_status = 0;	  
-        weapons_.utilization =     (*sched_data)->utilitzation;
-        weapons_.overhead =         (*sched_data)->overhead;
-        weapons_.arrival_time =     (*sched_data)->arrival_time;
-        weapons_.deadline_time =    (*sched_data)->deadline_time;
-        weapons_.completion_time =  (*sched_data)->completion_time;
-        weapons_.computation_time = (*sched_data)->computation_time;	 
-
-        // because the scheduler data does not supply these values
-        weapons_.utilization = (double) (20.0 + ACE_OS::rand() % 10); 
-        weapons_.overhead = (double) (ACE_OS::rand() % 10); 
-
-        data.replace (_tc_Weapons, &weapons_, CORBA::B_TRUE, TAO_TRY_ENV);
-      }
-      else {
-        ACE_ERROR ((LM_ERROR, "Demo_Supplier::insert_event_data: unrecognized operation name [%s]",
-                      (*sched_data)->operation_name));
-      }
-
-      TAO_CHECK_ENV;
-
-
-	if (last_completion > (*sched_data)->completion_time)
-	  last_completion = 0;
-	
-	if ((*sched_data)->completion_time >= last_completion)
-	  {
-	    ACE_Time_Value pause (0,
-                                    (*sched_data)->completion_time - last_completion);
-	    ACE_OS::sleep (pause);
-	    last_completion = (*sched_data)->completion_time;
-	  }
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "Demo_Supplier::insert_event_data: Could Not access scheduling data"));
-      
-      schedule_iter.advance ();
-
-      if (schedule_iter.done ())
-        schedule_iter.first ();
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "(%t)Error in Demo_Supplier::insert_event_data.\n"));
-    }
-  TAO_ENDTRY;
-}
-
-void
-Demo_Supplier::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &env)
-{
-}
-
-void
-Demo_Supplier::shutdown (void)
-{
-  TAO_TRY
-    {
-      // @@ Had problems with the next command, the application got stuck in it
-      // channel_admin_->destroy (TAO_TRY_ENV);
-      // TAO_CHECK_ENV;
-
-      TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      TAO_CHECK_ENV;
-
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) Demo_Supplier::shutdown:"
-                  " unexpected exception.\n"));
-      TAO_TRY_ENV.print_exception ("Demo_Supplier::shutdown");
-    }
-  TAO_ENDTRY;
-}
-
-// Function get_options.
-
-static u_int
-get_options (int argc,
-             char *argv [])
-{
-  // We need the 'O' in get_opt() because we also want to have ORB
-  // parameters, they all start with 'O'.
-  ACE_Get_Opt get_opt (argc, argv, "O?m:f:");
-  int opt;
-  int temp;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt) 
-        {
-        case '?':
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s %s\n",
-                      argv[0], usage));
-          ACE_OS::exit (0);
-          break;
-        case 'm':
-          temp = ACE_OS::atoi (get_opt.optarg);
-          if (temp > 0)
-            {
-              total_messages = (u_int) temp;
-              cout << "Messages to send:" << total_messages << endl;
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s: count must be > 0",
-                               argv[0]),
-                              1);
-          break;
-        case 'f':
-          input_file_name = get_opt.optarg;
-
-          if (!input_file_name || ACE_OS::strlen (input_file_name) > 0)
-            cout << "Messages to send:" << total_messages << endl;
-          else
-            {
-              input_file_name = 0;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%s: file name must be specified with -f option",
-                                 argv[0]),
-                                1);
-            }
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: unknown arg, -%c\n"
-                             "Usage: %s %s\n",
-                             argv[0], char(opt),
-                             argv[0],
-                             usage),
-                            1);
-        }
-    }
-
-  if (argc != get_opt.optind)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s: too many arguments\n"
-                       "Usage: %s %s\n",
-                       argv[0],
-                       argv[0],
-                       usage),
-                      1);
-
-  return 0;
-}
-
-// function main
-
-int
-main (int argc, char *argv [])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "internet",
-                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Connect to the RootPOA.
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Get the Naming Service object reference.
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable get the Naming Service.\n"),
-                          1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Tell the ScheduleService to use the same naming service.
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      if (get_options (argc, argv))
-        ACE_OS::exit (-1);
-
-      // Get the Event Channel
-      // @@ If you specify an invalid name, the Name Service crashes
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup ("EventService");
-
-      CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(),
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Create the demo supplier.
-      Demo_Supplier *demo_supplier;
-      ACE_NEW_RETURN (demo_supplier,
-                      Demo_Supplier (SOURCE_ID),
-                      -1);
-
-      if (demo_supplier->open_supplier (ec.ptr (),
-                                        "demo_supplier") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
-                           "Supplier open failed.\n"),
-                          -1);
-
-      // Register the internal demo consumer for timeout events.
-      demo_supplier->start_generating_events ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Supplier is registered for timeout events.\n"));
-
-      // The POA Manager has to be activated before starting the ORB
-      // event loop.
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the ORB.
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "CORBA::ORB::run"),
-                          -1);
-      TAO_CHECK_ENV;
-
-      delete demo_supplier;
-      TAO_CHECK_ENV;
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
deleted file mode 100644
index 63f02502753..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ /dev/null
@@ -1,132 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Event_Sup" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Event_Sup - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Sup.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Sup.mak" CFG="Event_Sup - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Event_Sup - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Sup - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Event_Sup - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "Event_Sup - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Event_Sup - Win32 Release"

-# Name "Event_Sup - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\Event_Sup.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeap.idl

-

-!IF  "$(CFG)" == "Event_Sup - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "Event_Sup - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\NavWeap.idl

-InputName=NavWeap

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\NavWeapC.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsw b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsw
deleted file mode 100644
index 8e624d1c218..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Event_Sup"=.\Event_Sup.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
deleted file mode 100644
index 2b45455e181..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// $Id$
-
-// ============================================================================
-// 
-// = FILENAME
-//    Event_Sup.h
-//
-// = DESCRIPTION
-//   Event Supplier for the simulation
-//
-// = AUTHOR
-//    originally
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//    modified
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (EVENT_SUP_H)
-#define EVENT_SUP_H
-
-#include <ctype.h>
-#include <stdio.h>
-#include "ace/OS.h"
-#include "ace/SString.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "NavWeapC.h"
-
-struct Schedule_Viewer_Data
-{
-  char operation_name [BUFSIZ];
-  double utilitzation;
-  double overhead;
-  u_long arrival_time;
-  u_long deadline_time;
-  u_long completion_time;
-  u_long computation_time;
-};
-
-class Demo_Supplier 
-{
-  // = TITLE
-  //    Demo Supplier.
-  //
-  // = DESCRIPTION
-  //    Generates event nofications and a shutdown message.
-public:
-  class Internal_Demo_Consumer : public POA_RtecEventComm::PushConsumer 
-  {
-  public:
-    virtual void push (const RtecEventComm::EventSet &events,
-		       CORBA::Environment &);
-    // The channel pushed some events to us.
-
-    virtual void disconnect_push_consumer (CORBA::Environment &);
-    // The channel is disconnecting.
-
-  private:
-    Internal_Demo_Consumer (Demo_Supplier* impl);
-    friend class Demo_Supplier;
-
-  private:
-    Demo_Supplier* impl_;
-  };
-  
-  // The following Supplier is needed because Demo_Supplier has not
-  // inherited from PushSupplier, therefore we register with the
-  // following and send with Demo_Supplier.
-
-  class Internal_Demo_Supplier : public POA_RtecEventComm::PushSupplier 
-  {
-  public:
-    virtual void disconnect_push_supplier (CORBA::Environment &);
-
-  private:
-    Internal_Demo_Supplier (Demo_Supplier* impl);
-    friend class Demo_Supplier;
-
-  private:
-    Demo_Supplier* impl_;
-  };
-
-  Demo_Supplier (u_int supplier_id);
-  // Construction.  Requires the total number of messages to be
-  // sent.  If the timestamp flag is enabled, then events are
-  // timestamped, e.g., for use in measuring jitter.
-
-  ~Demo_Supplier (void);
-  
-  int open_supplier (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		     const char *name);
-  // Registers with the name server under the given <name>.  Also
-  // connects to the Event Channel as a supplier of notifications and
-  // shutdown messages. 
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void start_generating_events (void);
-
-  void load_schedule_data (ACE_Unbounded_Queue<Schedule_Viewer_Data *> &schedule_data);
-
-  void insert_event_data (CORBA::Any &data, 
-                          ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> &schedule_iter);
-
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-protected:
-
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event Channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_;
-  RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer_;
-
-  // = Because we get timeout events in our internal_demo_consumer.
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier_;
-
-private:
-  Navigation navigation_;
-  Weapons weapons_;
-  RtecScheduler::handle_t rt_info_;
-  u_int supplier_id_;
-
-  Internal_Demo_Consumer *internal_demo_consumer_;
-  Internal_Demo_Supplier *internal_demo_supplier_;
-};
-
-#endif /* EVENT_SUP_H */
diff --git a/TAO/examples/Simulator/Event_Supplier/MLF.dat b/TAO/examples/Simulator/Event_Supplier/MLF.dat
deleted file mode 100644
index 2ab9b47b9af..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/MLF.dat
+++ /dev/null
@@ -1,72 +0,0 @@
-low_20        1.000000   0.000000         0    500000       180000       180000
-high_20       1.000000   0.000000         0    500000       360000       180000
-low_20        1.000000   0.000000    500000   1000000       680000       180000
-high_20       1.000000   0.000000    500000   1000000       860000       180000
-low_10        1.000000   0.000000         0   1000000       900000       180000
-low_20        1.000000   0.000000   1000000   1500000      1180000       180000
-high_20       1.000000   0.000000   1000000   1500000      1360000       180000
-low_20        1.000000   0.000000   1500000   2000000      1680000       180000
-high_20       1.000000   0.000000   1500000   2000000      1860000       180000
-low_10        1.000000   0.000000   1000000   2000000      1900000       180000
-low_5         1.000000   0.000000         0   2000000      1980000       180000
-low_20        1.000000   0.000000   2000000   2500000      2180000       180000
-high_20       1.000000   0.000000   2000000   2500000      2360000       180000
-low_20        1.000000   0.000000   2500000   3000000      2680000       180000
-high_20       1.000000   0.000000   2500000   3000000      2860000       180000
-low_10        1.000000   0.000000   2000000   3000000      2900000       180000
-low_20        1.000000   0.000000   3000000   3500000      3180000       180000
-high_20       1.000000   0.000000   3000000   3500000      3360000       180000
-low_20        1.000000   0.000000   3500000   4000000      3680000       180000
-high_20       1.000000   0.000000   3500000   4000000      3860000       180000
-low_10        1.000000   0.000000   3000000   4000000      3900000       180000
-low_1         1.000000   0.000000         0  10000000      3960000       180000
-low_20        1.000000   0.000000   4000000   4500000      4180000       180000
-high_20       1.000000   0.000000   4000000   4500000      4360000       180000
-low_20        1.000000   0.000000   4500000   5000000      4680000       180000
-high_20       1.000000   0.000000   4500000   5000000      4860000       180000
-low_10        1.000000   0.000000   4000000   5000000      4900000       180000
-low_20        1.000000   0.000000   5000000   5500000      5180000       180000
-high_20       1.000000   0.000000   5000000   5500000      5360000       180000
-low_20        1.000000   0.000000   5500000   6000000      5680000       180000
-high_20       1.000000   0.000000   5500000   6000000      5860000       180000
-low_10        1.000000   0.000000   5000000   6000000      5900000       180000
-high_1        1.000000   0.000000         0  10000000      5940000       180000
-low_20        1.000000   0.000000   6000000   6500000      6180000       180000
-high_20       1.000000   0.000000   6000000   6500000      6360000       180000
-low_20        1.000000   0.000000   6500000   7000000      6680000       180000
-high_20       1.000000   0.000000   6500000   7000000      6860000       180000
-low_10        1.000000   0.000000   6000000   7000000      6900000       180000
-low_20        1.000000   0.000000   7000000   7500000      7180000       180000
-high_20       1.000000   0.000000   7000000   7500000      7360000       180000
-low_20        1.000000   0.000000   7500000   8000000      7680000       180000
-high_20       1.000000   0.000000   7500000   8000000      7860000       180000
-low_10        1.000000   0.000000   7000000   8000000      7900000       180000
-high_10       1.000000   0.000000   5000000   6000000      7920000       180000
-low_20        1.000000   0.000000   8000000   8500000      8180000       180000
-high_20       1.000000   0.000000   8000000   8500000      8360000       180000
-low_20        1.000000   0.000000   8500000   9000000      8680000       180000
-high_20       1.000000   0.000000   8500000   9000000      8860000       180000
-low_10        1.000000   0.000000   8000000   9000000      8900000       180000
-high_10       1.000000   0.000000   7000000   8000000      9000000       180000
-low_20        1.000000   0.000000   9000000   9500000      9180000       180000
-high_20       1.000000   0.000000   9000000   9500000      9360000       180000
-low_20        1.000000   0.000000   9500000  10000000      9680000       180000
-high_20       1.000000   0.000000   9500000  10000000      9860000       180000
-low_10        1.000000   0.000000   9000000  10000000      9900000       180000
-high_10       1.000000   0.000000   9000000  10000000     10080000       180000
-low_5         1.000000   0.000000   8000000  10000000     10260000       180000
-high_5        1.000000   0.000000   8000000  10000000     10440000       180000
-high_10       1.000000   0.000000   8000000   9000000     10620000       180000
-high_5        1.000000   0.000000   6000000   8000000     10800000       180000
-low_5         1.000000   0.000000   6000000   8000000     10980000       180000
-high_10       1.000000   0.000000   6000000   7000000     11160000       180000
-low_5         1.000000   0.000000   4000000   6000000     11340000       180000
-high_5        1.000000   0.000000   4000000   6000000     11520000       180000
-high_10       1.000000   0.000000   4000000   5000000     11700000       180000
-high_5        1.000000   0.000000   2000000   4000000     11880000       180000
-low_5         1.000000   0.000000   2000000   4000000     12060000       180000
-high_10       1.000000   0.000000   3000000   4000000     12240000       180000
-high_10       1.000000   0.000000   2000000   3000000     12420000       180000
-high_10       1.000000   0.000000   1000000   2000000     12600000       180000
-high_5        1.000000   0.000000         0   2000000     12780000       180000
-high_10       1.000000   0.000000         0   1000000     12960000       180000
diff --git a/TAO/examples/Simulator/Event_Supplier/MUF.dat b/TAO/examples/Simulator/Event_Supplier/MUF.dat
deleted file mode 100644
index ac521175070..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/MUF.dat
+++ /dev/null
@@ -1,72 +0,0 @@
-high_20       1.000000   0.000000         0    500000       180000       180000
-high_10       1.000000   0.000000         0   1000000       360000       180000
-high_20       1.000000   0.000000    500000   1000000       680000       180000
-high_5        1.000000   0.000000         0   2000000       720000       180000
-high_1        1.000000   0.000000         0  10000000       900000       180000
-high_20       1.000000   0.000000   1000000   1500000      1180000       180000
-high_10       1.000000   0.000000   1000000   2000000      1360000       180000
-low_5         1.000000   0.000000         0   2000000      1440000       180000
-high_20       1.000000   0.000000   1500000   2000000      1680000       180000
-low_10        1.000000   0.000000   1000000   2000000      1800000       180000
-low_20        1.000000   0.000000   1500000   2000000      1980000       180000
-high_20       1.000000   0.000000   2000000   2500000      2180000       180000
-high_10       1.000000   0.000000   2000000   3000000      2360000       180000
-high_20       1.000000   0.000000   2500000   3000000      2680000       180000
-high_5        1.000000   0.000000   2000000   4000000      2720000       180000
-low_1         1.000000   0.000000         0  10000000      2880000       180000
-high_20       1.000000   0.000000   3000000   3500000      3180000       180000
-high_10       1.000000   0.000000   3000000   4000000      3360000       180000
-low_5         1.000000   0.000000   2000000   4000000      3420000       180000
-high_20       1.000000   0.000000   3500000   4000000      3680000       180000
-low_10        1.000000   0.000000   3000000   4000000      3780000       180000
-low_20        1.000000   0.000000   3500000   4000000      3960000       180000
-high_20       1.000000   0.000000   4000000   4500000      4180000       180000
-high_10       1.000000   0.000000   4000000   5000000      4360000       180000
-high_20       1.000000   0.000000   4500000   5000000      4680000       180000
-high_5        1.000000   0.000000   4000000   6000000      4720000       180000
-low_20        1.000000   0.000000   3000000   3500000      4860000       180000
-high_20       1.000000   0.000000   5000000   5500000      5180000       180000
-high_10       1.000000   0.000000   5000000   6000000      5360000       180000
-low_5         1.000000   0.000000   4000000   6000000      5400000       180000
-high_20       1.000000   0.000000   5500000   6000000      5680000       180000
-low_10        1.000000   0.000000   5000000   6000000      5760000       180000
-low_20        1.000000   0.000000   5500000   6000000      5940000       180000
-high_20       1.000000   0.000000   6000000   6500000      6180000       180000
-high_10       1.000000   0.000000   6000000   7000000      6360000       180000
-high_20       1.000000   0.000000   6500000   7000000      6680000       180000
-high_5        1.000000   0.000000   6000000   8000000      6720000       180000
-low_20        1.000000   0.000000   5000000   5500000      6840000       180000
-high_20       1.000000   0.000000   7000000   7500000      7180000       180000
-high_10       1.000000   0.000000   7000000   8000000      7360000       180000
-low_5         1.000000   0.000000   6000000   8000000      7380000       180000
-high_20       1.000000   0.000000   7500000   8000000      7680000       180000
-low_10        1.000000   0.000000   7000000   8000000      7740000       180000
-low_20        1.000000   0.000000   7500000   8000000      7920000       180000
-high_20       1.000000   0.000000   8000000   8500000      8180000       180000
-high_10       1.000000   0.000000   8000000   9000000      8360000       180000
-high_20       1.000000   0.000000   8500000   9000000      8680000       180000
-high_5        1.000000   0.000000   8000000  10000000      8720000       180000
-low_20        1.000000   0.000000   7000000   7500000      8820000       180000
-low_5         1.000000   0.000000   8000000  10000000      9000000       180000
-high_20       1.000000   0.000000   9000000   9500000      9180000       180000
-high_10       1.000000   0.000000   9000000  10000000      9360000       180000
-high_20       1.000000   0.000000   9500000  10000000      9680000       180000
-low_10        1.000000   0.000000   9000000  10000000      9720000       180000
-low_20        1.000000   0.000000   9500000  10000000      9900000       180000
-low_20        1.000000   0.000000   9000000   9500000     10080000       180000
-low_10        1.000000   0.000000   8000000   9000000     10260000       180000
-low_20        1.000000   0.000000   8500000   9000000     10440000       180000
-low_20        1.000000   0.000000   8000000   8500000     10620000       180000
-low_20        1.000000   0.000000   6500000   7000000     10800000       180000
-low_10        1.000000   0.000000   6000000   7000000     10980000       180000
-low_20        1.000000   0.000000   6000000   6500000     11160000       180000
-low_10        1.000000   0.000000   4000000   5000000     11340000       180000
-low_20        1.000000   0.000000   4500000   5000000     11520000       180000
-low_20        1.000000   0.000000   4000000   4500000     11700000       180000
-low_20        1.000000   0.000000   2500000   3000000     11880000       180000
-low_10        1.000000   0.000000   2000000   3000000     12060000       180000
-low_20        1.000000   0.000000   2000000   2500000     12240000       180000
-low_20        1.000000   0.000000   1000000   1500000     12420000       180000
-low_20        1.000000   0.000000    500000   1000000     12600000       180000
-low_10        1.000000   0.000000         0   1000000     12780000       180000
-low_20        1.000000   0.000000         0    500000     12960000       180000
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile
deleted file mode 100644
index 7ea5bc7224c..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Event_Sup Event_Con
-
-BUILD = $(BIN)
-
-
-IDL_SRC	= \
-	NavWeapC.cpp NavWeapS.cpp
-
-IDL_HDR = \
-	NavWeapC.h 
-
-EVENT_TEST_SRCS= \
-	Event_Sup.cpp Event_Con.cpp 
-
-LSRC= \
-	$(IDL_SRC) $(EVENT_TEST_SRCS) 
-
-EVENT_SUP_OBJS = NavWeapC.o Event_Sup.o
-EVENT_CON_OBJS = NavWeapC.o Event_Con.o
-
-LDLIBS= -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#### Local rules and variables...
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-
-#$(IDL_SRC): NavWeap.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl NavWeap.idl
-
-#.PRECIOUS:$(IDL_HDR) $(IDL_SRC)
-
-Event_Sup: $(addprefix $(VDIR),$(EVENT_SUP_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-Event_Con: $(addprefix $(VDIR),$(EVENT_CON_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simulator/Event_Supplier/RMS.dat b/TAO/examples/Simulator/Event_Supplier/RMS.dat
deleted file mode 100644
index 5038c140a53..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/RMS.dat
+++ /dev/null
@@ -1,72 +0,0 @@
-low_20        1.000000   0.000000         0    500000       180000       180000
-high_20       1.000000   0.000000         0    500000       360000       180000
-low_20        1.000000   0.000000    500000   1000000       680000       180000
-high_20       1.000000   0.000000    500000   1000000       860000       180000
-low_10        1.000000   0.000000         0   1000000       900000       180000
-low_20        1.000000   0.000000   1000000   1500000      1180000       180000
-high_20       1.000000   0.000000   1000000   1500000      1360000       180000
-low_20        1.000000   0.000000   1500000   2000000      1680000       180000
-high_20       1.000000   0.000000   1500000   2000000      1860000       180000
-low_10        1.000000   0.000000   1000000   2000000      1900000       180000
-high_10       1.000000   0.000000         0   1000000      1980000       180000
-low_20        1.000000   0.000000   2000000   2500000      2180000       180000
-high_20       1.000000   0.000000   2000000   2500000      2360000       180000
-low_20        1.000000   0.000000   2500000   3000000      2680000       180000
-high_20       1.000000   0.000000   2500000   3000000      2860000       180000
-low_10        1.000000   0.000000   2000000   3000000      2900000       180000
-low_20        1.000000   0.000000   3000000   3500000      3180000       180000
-high_20       1.000000   0.000000   3000000   3500000      3360000       180000
-low_20        1.000000   0.000000   3500000   4000000      3680000       180000
-high_20       1.000000   0.000000   3500000   4000000      3860000       180000
-low_10        1.000000   0.000000   3000000   4000000      3900000       180000
-high_10       1.000000   0.000000   1000000   2000000      3960000       180000
-low_20        1.000000   0.000000   4000000   4500000      4180000       180000
-high_20       1.000000   0.000000   4000000   4500000      4360000       180000
-low_20        1.000000   0.000000   4500000   5000000      4680000       180000
-high_20       1.000000   0.000000   4500000   5000000      4860000       180000
-low_10        1.000000   0.000000   4000000   5000000      4900000       180000
-low_20        1.000000   0.000000   5000000   5500000      5180000       180000
-high_20       1.000000   0.000000   5000000   5500000      5360000       180000
-low_20        1.000000   0.000000   5500000   6000000      5680000       180000
-high_20       1.000000   0.000000   5500000   6000000      5860000       180000
-low_10        1.000000   0.000000   5000000   6000000      5900000       180000
-high_10       1.000000   0.000000   2000000   3000000      5940000       180000
-low_20        1.000000   0.000000   6000000   6500000      6180000       180000
-high_20       1.000000   0.000000   6000000   6500000      6360000       180000
-low_20        1.000000   0.000000   6500000   7000000      6680000       180000
-high_20       1.000000   0.000000   6500000   7000000      6860000       180000
-low_10        1.000000   0.000000   6000000   7000000      6900000       180000
-low_20        1.000000   0.000000   7000000   7500000      7180000       180000
-high_20       1.000000   0.000000   7000000   7500000      7360000       180000
-low_20        1.000000   0.000000   7500000   8000000      7680000       180000
-high_20       1.000000   0.000000   7500000   8000000      7860000       180000
-low_10        1.000000   0.000000   7000000   8000000      7900000       180000
-high_10       1.000000   0.000000   3000000   4000000      7920000       180000
-low_20        1.000000   0.000000   8000000   8500000      8180000       180000
-high_20       1.000000   0.000000   8000000   8500000      8360000       180000
-low_20        1.000000   0.000000   8500000   9000000      8680000       180000
-high_20       1.000000   0.000000   8500000   9000000      8860000       180000
-low_10        1.000000   0.000000   8000000   9000000      8900000       180000
-high_10       1.000000   0.000000   4000000   5000000      9000000       180000
-low_20        1.000000   0.000000   9000000   9500000      9180000       180000
-high_20       1.000000   0.000000   9000000   9500000      9360000       180000
-low_20        1.000000   0.000000   9500000  10000000      9680000       180000
-high_20       1.000000   0.000000   9500000  10000000      9860000       180000
-low_10        1.000000   0.000000   9000000  10000000      9900000       180000
-high_10       1.000000   0.000000   5000000   6000000     10080000       180000
-high_10       1.000000   0.000000   6000000   7000000     10260000       180000
-high_10       1.000000   0.000000   7000000   8000000     10440000       180000
-high_10       1.000000   0.000000   8000000   9000000     10620000       180000
-high_10       1.000000   0.000000   9000000  10000000     10800000       180000
-low_5         1.000000   0.000000         0   2000000     10980000       180000
-low_5         1.000000   0.000000   2000000   4000000     11160000       180000
-low_5         1.000000   0.000000   4000000   6000000     11340000       180000
-low_5         1.000000   0.000000   6000000   8000000     11520000       180000
-low_5         1.000000   0.000000   8000000  10000000     11700000       180000
-high_5        1.000000   0.000000         0   2000000     11880000       180000
-high_5        1.000000   0.000000   2000000   4000000     12060000       180000
-high_5        1.000000   0.000000   4000000   6000000     12240000       180000
-high_5        1.000000   0.000000   6000000   8000000     12420000       180000
-high_5        1.000000   0.000000   8000000  10000000     12600000       180000
-low_1         1.000000   0.000000         0  10000000     12780000       180000
-high_1        1.000000   0.000000         0  10000000     12960000       180000
diff --git a/TAO/examples/Simulator/Event_Supplier/RMS_Dyn.dat b/TAO/examples/Simulator/Event_Supplier/RMS_Dyn.dat
deleted file mode 100644
index ac521175070..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/RMS_Dyn.dat
+++ /dev/null
@@ -1,72 +0,0 @@
-high_20       1.000000   0.000000         0    500000       180000       180000
-high_10       1.000000   0.000000         0   1000000       360000       180000
-high_20       1.000000   0.000000    500000   1000000       680000       180000
-high_5        1.000000   0.000000         0   2000000       720000       180000
-high_1        1.000000   0.000000         0  10000000       900000       180000
-high_20       1.000000   0.000000   1000000   1500000      1180000       180000
-high_10       1.000000   0.000000   1000000   2000000      1360000       180000
-low_5         1.000000   0.000000         0   2000000      1440000       180000
-high_20       1.000000   0.000000   1500000   2000000      1680000       180000
-low_10        1.000000   0.000000   1000000   2000000      1800000       180000
-low_20        1.000000   0.000000   1500000   2000000      1980000       180000
-high_20       1.000000   0.000000   2000000   2500000      2180000       180000
-high_10       1.000000   0.000000   2000000   3000000      2360000       180000
-high_20       1.000000   0.000000   2500000   3000000      2680000       180000
-high_5        1.000000   0.000000   2000000   4000000      2720000       180000
-low_1         1.000000   0.000000         0  10000000      2880000       180000
-high_20       1.000000   0.000000   3000000   3500000      3180000       180000
-high_10       1.000000   0.000000   3000000   4000000      3360000       180000
-low_5         1.000000   0.000000   2000000   4000000      3420000       180000
-high_20       1.000000   0.000000   3500000   4000000      3680000       180000
-low_10        1.000000   0.000000   3000000   4000000      3780000       180000
-low_20        1.000000   0.000000   3500000   4000000      3960000       180000
-high_20       1.000000   0.000000   4000000   4500000      4180000       180000
-high_10       1.000000   0.000000   4000000   5000000      4360000       180000
-high_20       1.000000   0.000000   4500000   5000000      4680000       180000
-high_5        1.000000   0.000000   4000000   6000000      4720000       180000
-low_20        1.000000   0.000000   3000000   3500000      4860000       180000
-high_20       1.000000   0.000000   5000000   5500000      5180000       180000
-high_10       1.000000   0.000000   5000000   6000000      5360000       180000
-low_5         1.000000   0.000000   4000000   6000000      5400000       180000
-high_20       1.000000   0.000000   5500000   6000000      5680000       180000
-low_10        1.000000   0.000000   5000000   6000000      5760000       180000
-low_20        1.000000   0.000000   5500000   6000000      5940000       180000
-high_20       1.000000   0.000000   6000000   6500000      6180000       180000
-high_10       1.000000   0.000000   6000000   7000000      6360000       180000
-high_20       1.000000   0.000000   6500000   7000000      6680000       180000
-high_5        1.000000   0.000000   6000000   8000000      6720000       180000
-low_20        1.000000   0.000000   5000000   5500000      6840000       180000
-high_20       1.000000   0.000000   7000000   7500000      7180000       180000
-high_10       1.000000   0.000000   7000000   8000000      7360000       180000
-low_5         1.000000   0.000000   6000000   8000000      7380000       180000
-high_20       1.000000   0.000000   7500000   8000000      7680000       180000
-low_10        1.000000   0.000000   7000000   8000000      7740000       180000
-low_20        1.000000   0.000000   7500000   8000000      7920000       180000
-high_20       1.000000   0.000000   8000000   8500000      8180000       180000
-high_10       1.000000   0.000000   8000000   9000000      8360000       180000
-high_20       1.000000   0.000000   8500000   9000000      8680000       180000
-high_5        1.000000   0.000000   8000000  10000000      8720000       180000
-low_20        1.000000   0.000000   7000000   7500000      8820000       180000
-low_5         1.000000   0.000000   8000000  10000000      9000000       180000
-high_20       1.000000   0.000000   9000000   9500000      9180000       180000
-high_10       1.000000   0.000000   9000000  10000000      9360000       180000
-high_20       1.000000   0.000000   9500000  10000000      9680000       180000
-low_10        1.000000   0.000000   9000000  10000000      9720000       180000
-low_20        1.000000   0.000000   9500000  10000000      9900000       180000
-low_20        1.000000   0.000000   9000000   9500000     10080000       180000
-low_10        1.000000   0.000000   8000000   9000000     10260000       180000
-low_20        1.000000   0.000000   8500000   9000000     10440000       180000
-low_20        1.000000   0.000000   8000000   8500000     10620000       180000
-low_20        1.000000   0.000000   6500000   7000000     10800000       180000
-low_10        1.000000   0.000000   6000000   7000000     10980000       180000
-low_20        1.000000   0.000000   6000000   6500000     11160000       180000
-low_10        1.000000   0.000000   4000000   5000000     11340000       180000
-low_20        1.000000   0.000000   4500000   5000000     11520000       180000
-low_20        1.000000   0.000000   4000000   4500000     11700000       180000
-low_20        1.000000   0.000000   2500000   3000000     11880000       180000
-low_10        1.000000   0.000000   2000000   3000000     12060000       180000
-low_20        1.000000   0.000000   2000000   2500000     12240000       180000
-low_20        1.000000   0.000000   1000000   1500000     12420000       180000
-low_20        1.000000   0.000000    500000   1000000     12600000       180000
-low_10        1.000000   0.000000         0   1000000     12780000       180000
-low_20        1.000000   0.000000         0    500000     12960000       180000
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf b/TAO/examples/Simulator/Event_Supplier/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simulator/NavWeap.idl b/TAO/examples/Simulator/NavWeap.idl
deleted file mode 100644
index de695b14522..00000000000
--- a/TAO/examples/Simulator/NavWeap.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-// =========================================================================================================
-//
-// = FILE  
-//     NavWeap.idl
-//
-// = DESCRIPTION
-//    Navigation and Weapon structs for the DOVE/EventService demo.
-
-// = AUTHOR
-//     Michael Kircher <mk1@cec.wustl.edu>
-//
-// ========================================================================================================= 
-
-
-struct Navigation {
-	long position_latitude;
-	long position_longitude;
-	unsigned long altitude;
-	long heading;
-	long roll;
-	long pitch;
-	// common part
-	double utilization;
-	double overhead;
-	unsigned long arrival_time;
-	unsigned long deadline_time;
-	unsigned long completion_time;	
-	unsigned long computation_time;
-};
-
-
-
-struct Weapons {
-	unsigned long number_of_weapons;
-	string weapon1_identifier;
-	unsigned long weapon1_status;
-	string weapon2_identifier;
-	unsigned long weapon2_status;
-	string weapon3_identifier;
-	unsigned long weapon3_status;
-	string weapon4_identifier;
-	unsigned long weapon4_status;
-	string weapon5_identifier;
-	unsigned long weapon5_status;
-	// common part
-	double utilization;
-	double overhead;
-	unsigned long arrival_time;
-	unsigned long deadline_time;
-	unsigned long completion_time;		
-	unsigned long computation_time;
-}; 
diff --git a/TAO/examples/Simulator/README b/TAO/examples/Simulator/README
deleted file mode 100644
index 9596e1fce25..00000000000
--- a/TAO/examples/Simulator/README
+++ /dev/null
@@ -1,171 +0,0 @@
-$Id$
-
-Documentation for the Simulator/DOVE demo
-
-Purpose: To show how the event service can be used to as a media to 
-         transport monitoring events including data. 
-
-Application: The events contain C++ structs with avionics information.
-             They are supllied by sensors of an avionic and are
-             consumed by an JAVA applet running on a different machine and/or
-             location. The collected metrics are displayed in
-			 JAVA Beans. A object called DOVE Management Information
-			 Base keeps track of all sent events.
-
-Implementation: A C++ Supplier pushes events containing a
-            navigation or weapons struct to the Event Service.
-            The Event Service dispatches the events to any number of
-            Consumers which are implemented in JAVA. The JAVA
-            consumer extracts the data of the structs and dispatches
-            it to various Visualization Components.
-
-
-For more informations refer to:
-	$TAO_ROOT/docs/releasenotes/index.html
-
-
-Requirements: 
-           * C++ compiler
-		   * Java JDK 1,1,x
-		   * ACE/TAO environment, 
-		   * Visibroker 3.2 for Java
-		   
-
-!!RELEASE CHANGES: 
-	- A first version of the DOVE MIB is now available.
-        - the DOVEBrowser accepts now the ORBnameserviceior parameter
-
-Parts of the Demo:
-
-	* DOVE Browser (implemented in Java using Visibroker 3.2 for Java)
-
-	* Event Supplier, can be seen as a monitored object, called
-	  DOVE Application (implemented in C++ using TAO)
-
-	* DOVE MIB, storing event data on persistent storage and keeping
-	  track of statistical data (implemented in C++ using TAO)
-
-Files:
-	Common:
-        ss   - restart Naming Service, connect the Event Service and
-               Scheduling service with this Naming Service
-        NavWeap.idl - IDL definition of the Weapons and Navigation struct
-        README - this readme file
-
-
-	Event Supplier: (in directory  $TAO_ROOT/orbsvcs/tests/Simulator/Event_Supplier/)
-        Event_Sup.cpp - Event Supplier
-        Event_Sup.h   - Event Supplier class definition
-        Makefile      - Event Supplier Makefile
-		(Event_Con.cpp, Event_Con.h - Event Consumer for testing)
-		svc.conf - helper file
-
-
-	DOVEBrowswer: (in directory  $TAO_ROOT/orbsvcs/tests/Simulator/DOVEBrowser/)
-		AnswerEvent.java  - Having my own Events
-		AnswerListener.java - Listener for these Events
-		DataHandler.java  - Base class for all Data Handlers
-		DemoCore.java - Core of the Demo to connect Observables with Observers
-		DemoObservable.java - Base class for Observables
-		DoubleVisComp.java  - Visualization Component (will be a JavaBean) for Doubles
-		DOVEBrowser.java - Wrapper around DemoCore
-		NS_Resolve.java  - Resolving the inital reference to the Naming Service
-		NavWeapDataHandler.java  - Specialized Data Handler for Navigation and Weapon data
-		NavigationVisComp.java - Visualization Component (... JavaBean) for Navigation data
-		ObservablesDialog.java - Dialog window for connecting Observables with OBservers
-		Properties.java	- constant definitons
-		PushConsumer.java - Event Service Push Consumer
-		PushConsumerFactory.java - Factory for the Consumer
-		Queue.java - Queue for the DoubleVisComp 
-		VisComp.java - Base class for the Visualization Components
-		WeaponsVisComp.java - Visualization Component for Weapons
-	
-
-	DOVE MIB: (in directory  $TAO_ROOT/orbsvcs/tests/Simulator/DOVEMIB/)
-		DOVEMIB.[cpp,h] - Core routines, connection to the Event Channel
-		Node.[cpp,h] - Nodes used by the AnyAnalyser
-		AnyAnalyser.[cpp,h] - Anaylser for CORBA anys, storing the contained types on 
-						persistent storage
-		NodeVisitor.h - base class definition of a Visitor
-		PrintVisistor.[cpp,h] - Able to print a given tree of type nodes, which is
-						generated by the Anyanalyser
-
-
-Compiling:
-	Common:
-		"make sure that the following definition is in the 
-			$TAO_ROOT/orbsvcs/orbsvcs/RtecEventComm.idl"
-              
-			struct EventData {
-                long x;
-                long y;
-                any any_value;
-            };
-
-		"compile $TAO_ROOT/orbsvcs/orbsvcs"
-		"compile $TAO_ROOT/orbsvcs/Event_Service"
-		"compile $TAO_ROOT/orbsvcs/Naming_Service"
-		"compile $TAO_ROOT/orbsvcs/Scheduling_Service"
-
-
-
-	Supplier: 
-
-		cp ../NavWeap.idl .
-
-		make
-
-
-
-
-    DOVE Browser: 
-		cp ../NavWeap.idl .
-		cp $TAO_ROOT/orbsvcs/orbsvcs/CosNaming.idl .
-		cp $TAO_ROOT/orbsvcs/orbsvcs/CosTimeBase.idl . 
-		cp $TAO_ROOT/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl . 
-		cp $TAO_ROOT/orbsvcs/orbsvcs/RtecEventComm.idl . 
-		cp $TAO_ROOT/orbsvcs/orbsvcs/RtecScheduler.idl .
-		idl2java *.idl
-
-		vbjc *.java
-
-
-	DOVE MIB:
-		cp ../NavWeap.idl .
-			
-		make
-
-       
-Starting:
-	Start in the following order on different ORB ports:
-		* Naming Service
-		* Scheduling Service
-		* Event Service
-
-	Supplier:
-		Event_Sup -ORBport 10040 -f MLF.dat -m 1000
-
-		// -m 1000 for 1000 events sent by the supplier
-		// -f MLF.dat to read scheduling data from this file as input 
-
-
-	DOVE Browser:
-		vbj DOVEBrowser
-                (also supported: vbj DOVEBrowser -ORBnameserviceior <IOR> ) 
-
-		or
-
-                gatekeeper
-		cd /visigenic/vbroker/lib
-		jar xf vbjorb.jar
- 		jar xf vbjtools.jar
-		"setting the Naming Service IOR in the DOVEBrowser.html file"
-		appletviewer DOVEBrowser.html
-                
-
-
-	DOVE MIB:
-		DOVEMIB -ORBport 10041 -f myfile -m 100
-
-		// -m 100 for storing the next 100 events
-		// -f myfile for the name of the file in which it will be stored
diff --git a/TAO/examples/Simulator/Sim_Display/Border_Panel.java b/TAO/examples/Simulator/Sim_Display/Border_Panel.java
deleted file mode 100644
index 1c9b8099499..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Border_Panel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$ 
-import java.awt.*;
-
-public class Border_Panel extends Panel
-{
-  private String title_;
-  private final static Insets SPACE = new Insets (16, 16, 16, 16);
-  
-  public Border_Panel (Component component, String title)
-    {
-      GridBagLayout gb = new GridBagLayout ();
-      GridBagConstraints gbc = new GridBagConstraints ();
-      
-      title_ = title;           
-      setFont (new Font ("Dialog", Font.PLAIN, 12));
-      setLayout (new CardLayout (SPACE.left, SPACE.top));
-		 
-      add ("Front", component);
-    }
-  
-  public void paint (Graphics g)
-    {
-      FontMetrics fm = g.getFontMetrics ();
-      Dimension d = getSize ();
-      int font_height = fm.getAscent (),
-	rect_x = SPACE.left/2,
-	rect_y = SPACE.top/2,
-	rect_width = d.width - SPACE.right,
-	rect_height = d.height - SPACE.top/2 - SPACE.bottom/2,
-	font_x = SPACE.left/2 + 20,
-	font_y = (int)Math.round (SPACE.top/2 + font_height/2.0 - 1);
-
-      g.setColor (getBackground ());
-      
-      g.draw3DRect (rect_x - 1, rect_y - 1,
-		    rect_width + 1,  rect_height + 1, false);
-      g.draw3DRect (rect_x, rect_y,
-		    rect_width - 1, rect_height - 1, true);
-      g.fillRect (font_x - 2, 0, fm.stringWidth (title_) + 4, SPACE.top);
-      
-      g.setColor (Color.black);
-      g.drawString (title_, font_x, font_y);
-    }
-
-  public static void main (String[] args)
-    {
-      Frame yadda = new Frame ("Border Frame Test");
-      Panel blank = new Panel ();
-      Border_Panel bpanel = new Border_Panel (blank, "Border Panel");
-
-      yadda.setLayout (new BorderLayout ());
-      yadda.add ("Center", bpanel);
-      yadda.setBounds (0, 0, 640, 480);
-
-      yadda.show ();
-    }
-}
diff --git a/TAO/examples/Simulator/Sim_Display/Display.java b/TAO/examples/Simulator/Sim_Display/Display.java
deleted file mode 100644
index 21def23be1d..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$ 
-
-
-import java.io.*;
-import java.awt.*;
-
-public class Display extends Panel
-{
-  private Graph_Panel metrics_ = new Graph_Panel ();
-  private Sim_Panel sims_ = new Sim_Panel ();
-  private double last_latency = 0;
-  
-  public Display ()
-    {
-      setLayout (new GridLayout (2, 1));
-      add (new Border_Panel (sims_, "Flight Simulator"));
-      add (new Border_Panel (metrics_, "Scheduling Performance"));
-    }
-  
-  public void update_metric (String name, float new_value)
-    {
-      metrics_.updateGraph (name, new_value);
-    }
-  
-  public void add_metric (String name, int max)
-    {
-      metrics_.addGraph (name, max);
-    }  
-  
-  public void add_simulator (String name)
-    {
-      Display_Object obj =
-	Display_Object_Factory.create_display_object (name);
-
-      if (obj != null)
-	sims_.add_simulator (name, obj);
-    }
-
-  public void update_simulator (String name, Display_Push_Consumer display_push_consumer)
-    {
-      sims_.update_simulator (name, display_push_consumer);
-    }
-
-  
-  public void update_metrics (double utilization,
-			      double overhead,
-			      int arrival_time,
-			      int deadline_time,
-			      int completion_time,
-			      int computation_time)
-    {
-      float latency = (float)(completion_time-computation_time-arrival_time);
-      latency =  latency > 0 ? latency : 0;
-      float jitter = (float)Math.abs(latency - last_latency);
-      // float latency = (float)(dispatch_time - arrival_time > 0 ? dispatch_time - arrival_time : 0);
-      // float jitter = (float)Math.abs(latency - last_latency);
-      float missed_deadline =
-	(float)((deadline_time < completion_time) ? 1.0 : 0.0);
-
-      /*
-      System.out.println ("Metrics: cpu " + header.utilization_ +
-			  " overhead " + header.overhead_ +
-			  " jitter " + jitter +
-			  " deadlines " + missed_deadline +
-			  " latency " + latency);
-			  */
-      update_metric (Display_Client.CPU_USAGE, (float)utilization);
-      update_metric (Display_Client.OVERHEAD, (float)overhead);
-      update_metric (Display_Client.JITTER, jitter);
-      update_metric (Display_Client.DEADLINES, missed_deadline);
-      update_metric (Display_Client.LATENCY, latency);
-    }
-
-  public void update_simulation (long simulation_id,
-				  Display_Push_Consumer display_push_consumer)
-    {
-       String sim_name =
-      	Display_Object_Factory.resolve_name (simulation_id);
-
-      if (sim_name != null)
-	update_simulator (sim_name, display_push_consumer);
-    }
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Art_Horizon.java b/TAO/examples/Simulator/Sim_Display/Display_Art_Horizon.java
deleted file mode 100644
index 4b5c9fd4fe9..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Art_Horizon.java
+++ /dev/null
@@ -1,377 +0,0 @@
-// $Id$
-
-
-import java.awt.*;
-import java.io.*;
-
-public class Display_Art_Horizon
-  extends Panel
-  implements Display_Object
-{
-  private Alt_Horizon alt_hor_ = new Alt_Horizon ();
-  private Position pos_ = new Position ();
-
-  public Display_Art_Horizon ()
-    {
-      setLayout (new BorderLayout (0, 2));
-      add ("Center", alt_hor_);
-      add ("South", pos_);
-    }
-
-  public int update_display (Display_Push_Consumer display_push_consumer) 
-    {
-      Navigation navigation = display_push_consumer.get_navigation ();
-      /*
-      System.out.println ("Art_Horizon: lat " + latitude + " long " + longitude + " alt " +
-			  altitude + " heading " + heading + " roll " +
-			  roll + " pitch " + pitch); 
-			  */
-      
-      alt_hor_.update_display (navigation.roll, navigation.pitch);
-      pos_.update_display (navigation.position_latitude, navigation.position_longitude, navigation.altitude, navigation.heading);
-      
-      return 0;
-    }
-}
-
-class Alt_Horizon
-extends Canvas
-{
-  private final static Color GREEN = new Color (0, 100, 0),
-    BLUE = new Color (30, 144, 255);
-  
-  private Graphics offgraphics_;
-  private Image offscreen_;
-  private Dimension offscreensize_;
-
-  private int roll_ = 0, pitch_ = 0;
-  
-  public void update_display (int roll, int pitch)
-    {
-      roll_ = roll;
-      pitch_ = pitch;
-
-      repaint ();
-    }
-  
-  public Dimension getPreferredSize ()
-    {
-      return new Dimension (180, 180);
-    }
-  
-  public void paint (Graphics g)
-    {
-      update (g);
-    }
-  
-  public void update (Graphics g)
-    {
-      Dimension d = getSize ();
-      int rad, angles[] = { 180, 0 };
-      Point center;
-      
-      if ((offscreen_ == null) || (d.width != offscreensize_.width) ||
-	  (d.height != offscreensize_.height))
-	{
-	  offscreen_ = createImage (d.width, d.height);
-	  offscreensize_ = new Dimension (d.width, d.height);
-	  offgraphics_ = offscreen_.getGraphics ();
-	  offgraphics_.setFont (getFont());
-	  
-	  //	  g.setColor (Color.lightGray);
-	  //	  g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
-	  //	  g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
-	  //	  g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-	}
-      
-      offgraphics_.setColor (getBackground());
-      offgraphics_.fillRect (0, 0, d.width, d.height);
-      offgraphics_.setColor (BLUE);
-      
-      // Calculate from the dimensions, the largest square.
-      center = new Point (d.width / 2, d.height / 2);
-      rad = ((center.x < center.y) ? center.x : center.y);
-
-      // Draw a circle of blue
-      offgraphics_.fillOval (center.x - rad, center.y - rad,
-			     2*rad, 2*rad);
-
-      // Roll the horizon based on the roll angle
-      if (roll_ != 0)
-	roll_horizon (rad, angles);
-
-      // Pitch the horizon based on the pitch angle
-      if (pitch_ != 0)
-	pitch_horizon (rad, angles);
-
-      // Draw the resulting terrain
-      draw_horizon (rad, center, angles);
-
-      // Draw the plotted Image. 
-      g.drawImage (offscreen_, 0, 0, null);
-    }
-
-  private void draw_horizon (int rad, Point center, int[] angles)
-    {
-      // Draw an arc
-      int arc_angle =
-	((angles[0] > angles[1]) ?
-	 (360 - angles[0]) + angles[1] :
-	 (angles[1] - angles[0]));
-      
-      Polygon remainder = new Polygon ();
-
-      offgraphics_.setColor (GREEN);
-      offgraphics_.fillArc (center.x - rad, center.y - rad,
-			    2*rad, 2*rad,
-			    angles[0], arc_angle);
-
-      /*
-      System.out.println ("Start Angle " + angles[0] + 
-      			  " End Angle " + angles[1] + 
-      			  " Arc Angle " + arc_angle);
-			  */
-      if (pitch_ != 0)
-	{
-	  if ((pitch_ > 0 && Math.abs (roll_) < 90) ||
-	      (pitch_ < 0 && Math.abs (roll_) >= 90))
-	    offgraphics_.setColor (BLUE);
-
-	  int cover_angle = (angles[0] + arc_angle/2 + ((arc_angle < 180) ? 180 : 0)) % 360;
-
-	  // System.out.println (points[0] + " " + points[1]);
-
-	  // System.out.println (accepted_point);
-	  
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, cover_angle),
-			      center.y - polar_to_rect_y (rad, cover_angle)); 
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[0]),
-			      center.y - polar_to_rect_y (rad, angles[0]));
-	  remainder.addPoint (center.x + polar_to_rect_x (rad, angles[1]),
-			      center.y - polar_to_rect_y (rad, angles[1]));
-	  offgraphics_.fillPolygon (remainder);
-	  //offgraphics_.setColor (getBackground ());
-	  //offgraphics_.drawPolygon (remainder);
-	}	
-    }
-  
-  private void pitch_horizon (int rad, int[] angles)
-    {
-      boolean upside_down = Math.abs (roll_) >= 90;
-      int angle_shift = (int) Math.round ((double)(90 - (Math.abs (roll_) % 180)) / 90.0 * pitch_);
-
-      //      System.out.println ("angle_shift " + angle_shift);
-
-      angles[0] += angle_shift;
-      angles[1] -= angle_shift;
-      
-      // Shift the terrain line to account for the pitch.
-      //      if (Math.abs (roll_) != 90)
-      //	{
-	  /*
-	    boolean upside_down = Math.abs (roll_) >= 90;
-	    double offset = - (double)rad * (double)pitch_ / 90.0;
-	    double y_intercept = (Math.abs (roll_) <= 90) ? offset : offset;
-	    double slope = caclulate_slope (rad, angles);
-	    Point[] roots = null;
-	    int x_l, x_r, y_l, y_r;
-	    
-	    roots = line_circle_intesect (rad, y_intercept, slope);
-	    
-	    // System.out.println ("Y intercept " + y_intercept + " slope " + slope);
-	    // System.out.println ("Root x1 " + roots[0].x + " x2 " + roots[1].x);
-	    // System.out.println ("Root y1 " + roots[0].y + " y2 " + roots[1].y);
-	    // System.out.println ("Was left_point.x " + left_point.x + " left_point.y " + left_point.y);
-	    // System.out.println ("Was right_point.x " + right_point.x + " right_point.y " + right_point.y);
-	    
-	    x_l = upside_down ? roots[0].x : roots[1].x;
-	    y_l = upside_down ? roots[0].y : roots[1].y;
-	    x_r = upside_down ? roots[1].x : roots[0].x;
-	    y_r = upside_down ? roots[1].y : roots[0].y;
-	    
-	    angles[0] = calculate_angle (rad, x_l, y_l);
-	    angles[1] = calculate_angle (rad, x_r, y_r);
-	  
-	  // System.out.println ("Now left_point.x " + left_point.x + " left_point.y " + left_point.y);
-	  // System.out.println ("Now right_point.x " + right_point.x + " right_point.y " + right_point.y);
-	  */
-      //	}
-    }
-  
-  private void roll_horizon (int rad, int[] angles)
-    {
-      // Roll the left and right points of the terrain.
-      angles[0] += roll_;
-      angles[1] += roll_;
-
-      if (angles[0] < 0)
-	angles[0] += 360;
-
-      if (angles[1] < 0)
-	angles[1] += 360;
-      
-	  //	  boolean rightside_up = Math.abs (roll_) <= 90,
-	  //	    positive_roll = roll_ >= 0;
-	  //	  double roll_rad = (double) roll_ * Math.PI / 180.0;	  
-	  //	  Point tmp =
-	  //	    new Point ((int) Math.round ((double) rad * Math.cos (roll_rad)),
-	  //		       (int) Math.round ((double) rad * Math.sin (roll_rad)));
-
-	  // System.out.println ("Was left_point.x " + left_point.x + " left_point.y " + left_point.y);
-	  // System.out.println ("Was right_point.x " + right_point.x + " right_point.y " + right_point.y);
-
-	  //	  right_point.x = tmp.x;
-	  //	  left_point.x  = -tmp.x;
-	  //	  right_point.y = tmp.y;
-	  //	  left_point.y  = -tmp.y;
-	  
-	  // System.out.println ("Now left_point.x " + left_point.x + " left_point.y " + left_point.y);
-	  // System.out.println ("Now right_point.x " + right_point.x + " right_point.y " + right_point.y);
-    }
-
-  private int polar_to_rect_x (int rad, int angle)
-    {
-      return (int) Math.round (rad * Math.cos ((double)angle * Math.PI/180.0));
-    }
-
-  private int polar_to_rect_y (int rad, int angle)
-    {
-      return (int) Math.round (rad * Math.sin ((double)angle * Math.PI/180.0));
-    }
-
-  private double caclulate_slope (int rad, int[] angles)
-    {
-      int x1 = polar_to_rect_x (rad, angles[0]),
-	x2 = polar_to_rect_x (rad, angles[1]),
-	y1 = polar_to_rect_y (rad, angles[0]),
-	y2 = polar_to_rect_y (rad, angles[1]);
-
-      return ((double) (y2 - y1)) / ((double) (x2 - x1));
-    }
-  
-  private Point[] line_circle_intesect (int rad, double y_intercept, double slope)
-    {
-      double r_2 = (double)(rad * rad),
-	s_2 = slope * slope,
-	a_x = s_2 + 1,
-	b_x = 2.0 * slope * y_intercept,
-	c_x = y_intercept * y_intercept - r_2;
-      int[] x_roots = quad_eq (a_x, b_x, c_x),
-	y_roots = { (int) Math.round ((double)((double) x_roots[0])*slope + y_intercept),
-		    (int) Math.round ((double)((double) x_roots[1])*slope + y_intercept) };
-      Point[] points = new Point [2];
-
-      points[0] = new Point (x_roots[0], y_roots[0]);
-      points[1] = new Point (x_roots[1], y_roots[1]);
-
-      return points;
-    }
-  
-  private int calculate_angle (int rad, int x, int y)
-    {
-      /*
-	double angle = 0,
-      sin_value = Math.asin ((double)y / (double)rad),
-      tan_value = Math.atan ((double)y / (double)x);
-
-	if (x >= 0)
-      angle = (x !=  0) ? tan_value : sin_value +
-      ((y < 0) ? 2*Math.PI : 0);
-	  else
-      angle = Math.PI + tan_value;
-
-      return (int) Math.round (angle * 180.0 / Math.PI);
-      */
-
-      double angle = 0.0,
-	sin_value = Math.asin ((double)Math.abs (y) / (double)rad);
-
-      if (x >= 0 && y >= 0)
-	angle = sin_value;
-      else if (x < 0 && y >= 0)
-	angle = sin_value + Math.PI/2.0;
-      else if (x < 0 && y < 0)
-	angle = sin_value + Math.PI;
-      else if (x >= 0 && y < 0)
-	angle = sin_value + 3.0*Math.PI/2.0;
-
-      return (int) Math.round (angle * 180.0 / Math.PI);
-    }
-
-  private int[] quad_eq (double a, double b, double c)
-    {
-      int[] roots = new int [2];
-      double body = Math.sqrt (b*b - 4.0*a*c);
-      
-      roots[0] = (int) Math.round ((-b + body) / (2.0 * a));
-      roots[1] = (int) Math.round ((-b - body) / (2.0 * a));
-
-      return roots;
-    }
-
-  private int distance (Point point1, Point point2)
-    {
-      double xdiff = point1.x - point2.x,
-	ydiff = point1.y - point2.y;
-
-      return (int) Math.round (Math.sqrt (xdiff*xdiff + ydiff*ydiff));
-    }
-}
-
-class Position
-extends Panel
-{
-  private final static Font FONT = new Font ("Dialog", Font.BOLD, 12);
-  private final static char DEGREE = '\u00B0'; 
-  
-  private Label lat_ = new Label ("0" + DEGREE + " N", Label.RIGHT),
-    long_ = new Label ("0" + DEGREE + " S", Label.RIGHT),
-    alt_ = new Label ("0 Kft", Label.RIGHT),
-    heading_ = new Label ("0" + DEGREE + "  ", Label.RIGHT);
-  
-  public Position ()
-    {
-      Panel grid_panel = new Panel ();
-      
-      lat_.setFont (FONT);
-      long_.setFont (FONT);
-      alt_.setFont (FONT);
-      heading_.setFont (FONT);
-
-      setLayout (new GridLayout (1, 4));
-      add (lat_);
-      add (long_);
-      add (heading_);
-      add (alt_);
-      
-      //      lat_.setBackground (Color.lightGray);
-      //      long_.setBackground (Color.lightGray);
-      //      alt_.setBackground (Color.lightGray);
-      //      heading_.setBackground (Color.lightGray);
-
-      //      setBackground (Color.black);
-      //      setLayout (new CardLayout (1, 1));
-
-      //      grid_panel.setBackground (Color.black);
-      //      grid_panel.setLayout (new GridLayout(1, 4, 1, 0));
-      //      grid_panel.add (lat_);
-      //      grid_panel.add (long_);
-      //      grid_panel.add (alt_);
-      //      grid_panel.add (heading_);
-
-      //      add ("Grid Panel", grid_panel);
-    }
-
-  public void update_display (int lat, int lon, int alt, int heading)
-    {
-      String lat_str =
-	Math.abs (lat) + "" + DEGREE + ((lat > 0) ? " N" : " S");
-      String long_str =
-	Math.abs (lon) + "" + DEGREE + ((lon > 0) ? " E" : " W");
-
-      lat_.setText (lat_str);
-      long_.setText (long_str);
-      alt_.setText (alt + " Kft");
-      heading_.setText (heading + "" + DEGREE + "  ");
-    }
-}
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Client.java b/TAO/examples/Simulator/Sim_Display/Display_Client.java
deleted file mode 100644
index d7140d54c3d..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Client.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$ 
-
-/**
-  * This class pulls the structured simulation data from a socket and
-  * funnels it into the display.
-  *
-  * @author Seth Widoff
-  * @version $Id$
-  * modified by Michael Kircher on 1998/02/19
-  */
-
-import java.util.*;
-import java.awt.*;
-
-class Display_Frame extends Frame
-{
-  MenuBar menubar_;
-  Menu menu_quit_;
-  MenuItem menu_quit_item_;
-
-  public Display_Frame ()
-    {
-      super ();
-      menubar_ = new MenuBar ();
-      menu_quit_ = new Menu ("Quit");
-      menu_quit_item_ = new MenuItem ("Quit");
-      menu_quit_item_.enable ();
-      menu_quit_.add (menu_quit_item_);
-      menubar_.add (menu_quit_);
-
-      setMenuBar (menubar_);
-    }
-
-
- 
-  public boolean action (Event e, Object arg)
-    {
-      System.out.println ("action occured");
-      if (e.target == menu_quit_item_)
-	{
-	  System.exit (0);
-	  return true;
-	}
-      return false;
-    }
-
-}
-
-
-public class Display_Client // extends java.applet.Applet
-{
-  public final static int DEFAULT_PORT = 5555;
-  
-  public final static String CPU_USAGE = "CPU Usage (%)",
-    LATENCY = "Latency (ms)",
-    JITTER = "Jitter (ms)",
-    OVERHEAD = "Overhead (%)",
-    DEADLINES = "Missed Deadlines (#)";
-  
-  
-public synchronized void paint (Graphics g) {}
-
-  public void init () 
-    {
-
-      String art_hor_name =
-	Display_Object_Factory.resolve_name
-	(Display_Object_Factory.ART_HORIZON_ENUM);
-      String weapons_name =
-	Display_Object_Factory.resolve_name
-	(Display_Object_Factory.WEAPONS_ENUM);
-      
-      display.add_metric (CPU_USAGE, 1);
-      display.add_metric (OVERHEAD, 1);
-      display.add_metric (JITTER, 10);
-      display.add_metric (LATENCY, 10);
-      display.add_metric (DEADLINES, 2);
-      display.add_simulator (weapons_name);
-      display.add_simulator (art_hor_name);
-
-      display_consumer = new Display_Consumer (display); //, this.getParameter("NS_IOR"), this);
-      Dimension ss = Toolkit.getDefaultToolkit ().getScreenSize ();
-
-      sim_frame.setResizable (false);
-      sim_frame.setTitle ("Scheduler Demo");
-      sim_frame.setBounds (ss.width/2 - 275, ss.height/2 - 275, 700, 700);
-      sim_frame.setLayout (new BorderLayout ());
-      sim_frame.add ("Center", display);
-
-      sim_frame.show ();
-      
-      display_consumer.run ();
-    }
- 
-
-
-  public Display_Client ()
-    {
-      sim_frame = new Display_Frame ();
-      display = new Display ();
-
-    }
-  
-  private Frame sim_frame;
-  private Display display;
-  private Display_Consumer display_consumer;
-
-  public static void main (String[] args)
-    {
-      
-      Display_Client display_client_ = new Display_Client ();
-      display_client_.init ();
-    }
-}
-
-
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Consumer.java b/TAO/examples/Simulator/Sim_Display/Display_Consumer.java
deleted file mode 100644
index 29b6f4e3535..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Consumer.java
+++ /dev/null
@@ -1,172 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// 
-// = FILENAME
-//    Display_Consumer.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   This Consumer connects to the Event Channel (TAO Event Channel).
-//   It accepts Notification events containing Navigation and 
-//   Weapons data.
-// 
-//
-// ============================================================================
-
-
-
-
-public class Display_Consumer {
-
-  public static final int ACE_ES_EVENT_ANY = 0;
-  public static final int ACE_ES_EVENT_SHUTDOWN = 1;
-  public static final int ACE_ES_EVENT_ACT = 2;
-  public static final int ACE_ES_EVENT_NOTIFICATION = 3;
-  public static final int ACE_ES_EVENT_TIMEOUT = 4;
-  public static final int ACE_ES_EVENT_INTERVAL_TIMEOUT = 5;
-  public static final int ACE_ES_EVENT_DEADLINE_TIMEOUT = 6;
-  public static final int ACE_ES_GLOBAL_DESIGNATOR = 7;
-  public static final int ACE_ES_CONJUNCTION_DESIGNATOR = 8;
-  public static final int ACE_ES_DISJUNCTION_DESIGNATOR = 9;
-  public static final int ACE_ES_EVENT_UNDEFINED = 16;
-  public static final int TOTAL_MESSAGES = 30;
-
-  private org.omg.CORBA.ORB orb_;
-  private org.omg.CORBA.BOA boa_;
-  private org.omg.CORBA.Object naming_service_object_;
-
-  private Display display_;
-  private Navigation navigation_;
-  private Weapons weapons_;
-
-  public synchronized void init () 
-    {
-    }
-
-
-public Display_Consumer (Display display) //, String name_service_ior, java.applet.Applet applet)
-    {
-      display_ = display;
-      try {      
-	orb_ = org.omg.CORBA.ORB.init (); // applet, null);
-	boa_ = orb_.BOA_init ();
-	
-	// Get the Naming Service initial reference
-	 
-        //naming_service_object_ = orb_.string_to_object (name_service_ior);
-
-	NS_Resolve ns_resolve_ = new NS_Resolve ();
-     
-	naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
-      } 
-      catch(org.omg.CORBA.SystemException e) {
-	System.err.println ("Client constructur: Failure");
-	System.err.println(e);
-      }	
-      
-    }
-
-  public class Object_is_null_exception extends Exception 
-  {
-    Object_is_null_exception (String s)
-      {
-	super (s);
-      }
-  }
-  
-  public void run ()
-    {
-      try
-	{
-	  
-	  // Get the Naming Context to allow resolving the EventService and
-	  // ScheduleService
-	  CosNaming.NamingContext naming_context_ = 
-	    CosNaming.NamingContextHelper.narrow (naming_service_object_);
-
-	  if (naming_context_ == null)
-	    {
-	      System.err.println ("The Naming Context is null");
-	    }
-
-	  // Get a reference for the EventService
-
-	  CosNaming.NameComponent[] ec_name_components_ = new CosNaming.NameComponent[1];
-	  ec_name_components_[0] = new CosNaming.NameComponent ("EventService","");
-	  org.omg.CORBA.Object event_channel_object_ = naming_context_.resolve (ec_name_components_);
-
-	  if (event_channel_object_ == null)
-	    {
-	      throw new Object_is_null_exception("EventService Object is null");
-	    }
-	 
-       	  RtecEventChannelAdmin.EventChannel event_channel_ = 
-	    RtecEventChannelAdmin.EventChannelHelper.narrow (event_channel_object_);
-
-	  // Get a reference for the ScheduleService
-
-	  CosNaming.NameComponent[] s_name_components_ = new CosNaming.NameComponent[1];
-	  s_name_components_[0] = new CosNaming.NameComponent ("ScheduleService","");
-       	  org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (s_name_components_); 
-
-	  if (scheduler_object_ == null)
-	    {
-	      throw new Object_is_null_exception("ScheduleService Object is null");
-	    }
-	 
-	  RtecScheduler.Scheduler scheduler_ = 
-	    RtecScheduler.SchedulerHelper.narrow (scheduler_object_);
-	 
- 
-	  // Start the consumer
-	  Display_Push_Consumer display_push_consumer_ = new Display_Push_Consumer (orb_, display_);
-	  display_push_consumer_.open_consumer (event_channel_, scheduler_, "demo_consumer");
-	 
-	  // Tell the CORBA environment that we are ready
-
-	  boa_.obj_is_ready (display_push_consumer_);
-	  
-	  System.out.println ("boa.obj_is_ready succeeded"); 
-
-	  boa_.impl_is_ready ();
-      }
-      catch (CosNaming.NamingContextPackage.CannotProceed e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.CannotProceed");
-	  System.err.println (e);
-	}
-      catch (CosNaming.NamingContextPackage.InvalidName e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.InvalidName");
-	  System.err.println (e);
-	}
-      catch (CosNaming.NamingContextPackage.NotFound e)
-	{
-	  System.err.println ("CosNaming.NamingContextPackage.NotFound");
-	  System.err.println (e);
-	
-	}
-      catch (Object_is_null_exception e)
-	{
-	  System.err.println (e);
-	}
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println ("Client run: Failure");
-	  System.err.println(e);
-	}	
-    }
-
-    
-} // public class Display_Consumer
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Object.java b/TAO/examples/Simulator/Sim_Display/Display_Object.java
deleted file mode 100644
index 9d401f6e723..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Object.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$ 
-
-import java.io.*;
-
-public interface Display_Object
-{
-  public int update_display (Display_Push_Consumer display_push_consumer);
-}
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Object_Factory.java b/TAO/examples/Simulator/Sim_Display/Display_Object_Factory.java
deleted file mode 100644
index c7a036e1132..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Object_Factory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$ 
-
-import java.io.*;
-import java.util.*;
-
-public class Display_Object_Factory
-{
-  public final static int LONG_SIZE = 4;
-  public final static int DOUBLE_SIZE = 8;
-
-  public final static int ART_HORIZON_ENUM = 0,
-    WEAPONS_ENUM = 1;
-
-  private final static String[] DISPLAY_NAMES =
-  {
-    "Artificial Horizon",
-    "Weapons Display",
-  };
-
-  private static Hashtable objs_ = new Hashtable ();
-
-  static
-    {
-      objs_.put (DISPLAY_NAMES[ART_HORIZON_ENUM],
-		 new Display_Art_Horizon ());
-      objs_.put (DISPLAY_NAMES[WEAPONS_ENUM],
-		 new Display_Weapons ());
-    }
-
-  public static String resolve_name (long enum)
-    {
-      return (enum < DISPLAY_NAMES.length) ?
-	DISPLAY_NAMES[(int)enum] : null;
-    }
-  
-  public static Display_Object create_display_object (String name)
-    {
-      Object obj = objs_.get (name);
-      return (obj == null) ? null : (Display_Object) obj;
-    }
-}
-
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Push_Consumer.java b/TAO/examples/Simulator/Sim_Display/Display_Push_Consumer.java
deleted file mode 100644
index 42fca6e7db9..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Push_Consumer.java
+++ /dev/null
@@ -1,248 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// 
-// = FILENAME
-//    Display_Push_Consumer.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    Implemenation of a PushConsumer
-// 
-//
-// ============================================================================
-
-
-
-
-
-// The Consumer has to implement the Skeleton Consumer
-
-public class Display_Push_Consumer extends RtecEventComm._PushConsumerImplBase
-{
-  
-  public static final int ACE_ES_EVENT_ANY = 0;
-  public static final int ACE_ES_EVENT_SHUTDOWN = 1;
-  public static final int ACE_ES_EVENT_ACT = 2;
-  public static final int ACE_ES_EVENT_NOTIFICATION = 3;
-  public static final int ACE_ES_EVENT_TIMEOUT = 4;
-  public static final int ACE_ES_EVENT_INTERVAL_TIMEOUT = 5;
-  public static final int ACE_ES_EVENT_DEADLINE_TIMEOUT = 6;
-  public static final int ACE_ES_GLOBAL_DESIGNATOR = 7;
-  public static final int ACE_ES_CONJUNCTION_DESIGNATOR = 8;
-  public static final int ACE_ES_DISJUNCTION_DESIGNATOR = 9;
-  public static final int ACE_ES_EVENT_UNDEFINED = 16;
-  public static final int TOTAL_MESSAGES = 30;
-
-  // Store the number of received events
-  private int total_received_ = 0;
-  private org.omg.CORBA.ORB orb_;
-  private Navigation navigation_;
-  private Weapons weapons_;
-  private Display display_;
-  private RtecScheduler.handle_tHolder rt_info_;
-  private RtecEventChannelAdmin.EventChannel channel_admin_;
-  private RtecEventChannelAdmin.ConsumerAdmin consumer_admin_;
-  private RtecEventChannelAdmin.ProxyPushSupplier suppliers_;
-  
-  public Display_Push_Consumer (org.omg.CORBA.ORB orb, Display display)
-    {
-      orb_ = orb;
-      display_ = display;
-    }
-  
-  
-  public void push (RtecEventComm.Event[] events)
-    {
-      //if (total_received_ < 5)	  
-      //	System.out.println ("Demo Consumer: Received an event! ->Number: " + total_received_);
-      //else if (total_received_ == 5)
-      //	System.out.println ("Demo Consumer: Everything is fine. Going to be mute.");
-      
-      
-      if (events.length == 0)
-	{
-	    System.err.println ("No events");
-	}
-      else
-	{
-	  total_received_++;
-	  /*
-	    if (total_received_ >= TOTAL_MESSAGES)
-	      {
-	      orb.disconnect (this);
-	      System.exit (0);
-	      } 
-	      */
-	  for (int i = 0; i < events.length; ++i)
-	    {
-	      if(events[i].type_ == ACE_ES_EVENT_NOTIFICATION) 
-		{
-		  try
-		    {		
-		      if (events[i].data_.any_value.type().equal (NavigationHelper.type()))
-			{
-			    navigation_ = NavigationHelper.extract (events[i].data_.any_value);
-			    display_.update_metrics (navigation_.utilization,
-						     navigation_.overhead,
-						     navigation_.arrival_time,
-						     navigation_.deadline_time,
-						     navigation_.completion_time,
-						     navigation_.computation_time);
-			    display_.update_simulation (Display_Object_Factory.ART_HORIZON_ENUM, this);
-			}
-		      else if (events[i].data_.any_value.type().equal (WeaponsHelper.type()))
-			{
-			  weapons_ = WeaponsHelper.extract (events[i].data_.any_value);
-			  display_.update_metrics (weapons_.utilization,
-						   weapons_.overhead,
-						   weapons_.arrival_time,
-						   weapons_.deadline_time,
-						   weapons_.completion_time,
-						   weapons_.computation_time);
-			    display_.update_simulation (Display_Object_Factory.WEAPONS_ENUM, this);			    
-			}
-		      else 
-			{		     
-			  System.out.println ("Demo Consumer: Received an event! ->Number: " + total_received_);
-			  System.out.println (">>TypeCode in the any does not match!");
-			  System.out.println ("Id: " + events[i].data_.any_value.type().id ());
-			  System.out.println ("Name: " + events[i].data_.any_value.type().name ());
-			  System.out.println ("Kind: " + events[i].data_.any_value.type().kind ());			
-			}		
-		    }
-		  catch (org.omg.CORBA.TypeCodePackage.BadKind e)
-		    {
-		      System.err.println (e);
-		    }
-		  catch(org.omg.CORBA.SystemException e) 
-		    {
-		      System.err.println(e);
-		    }
-		}		
-	    }
-	}
-    }
-  
-  public void disconnect_push_consumer() 
-    {
-      System.out.println ("Demo Consumer: Have to disconnect!");
-    }
-  
-  public void open_consumer (RtecEventChannelAdmin.EventChannel event_channel_,
-			     RtecScheduler.Scheduler scheduler_,
-			     String name)
-    {
-      try {
-	
-	// Define Real-time information
-	
-	rt_info_ = new RtecScheduler.handle_tHolder (scheduler_.create (name));
-	
-	scheduler_.set (rt_info_.value,
-			new TimeBase.ulonglong (0,0), 
-			new TimeBase.ulonglong (0,0),
-			new TimeBase.ulonglong (0,0),
-			2500000,  // period
-			RtecScheduler.Importance.VERY_LOW_IMPORTANCE,
-			new TimeBase.ulonglong (0,0),
-			1);	  	        
-	
-	
-	// Register for Notification and Shutdown events
-
-	
-	RtecEventComm.Event disjunction_designator_ = 
-	  new RtecEventComm.Event (ACE_ES_DISJUNCTION_DESIGNATOR,  0, 
-				     1,        // ttl
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new RtecEventComm.EventData (0, 0, orb_.create_any())
-				    );
-	RtecEventComm.Event notification_event_ = 
-	  new RtecEventComm.Event (ACE_ES_EVENT_NOTIFICATION,  0, 
-				   1,        // ttl
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new TimeBase.ulonglong (0,0),
-				   new RtecEventComm.EventData (0, 0, orb_.create_any())
-				    );
-	RtecEventComm.Event shutdown_event_ = 
-	    new RtecEventComm.Event (ACE_ES_EVENT_SHUTDOWN,  0, 
-				     1,        // ttl
-				     new TimeBase.ulonglong (0,0),
-				     new TimeBase.ulonglong (0,0),
-				     new TimeBase.ulonglong (0,0),
-				     new RtecEventComm.EventData (0, 0, orb_.create_any())
-				      );
-	
-	
-	RtecEventChannelAdmin.Dependency dependencies_[] = new RtecEventChannelAdmin.Dependency[3];  
-	dependencies_[0] = new RtecEventChannelAdmin.Dependency (disjunction_designator_, rt_info_.value);
-	dependencies_[1] = new RtecEventChannelAdmin.Dependency (notification_event_, rt_info_.value);
-	dependencies_[2] = new RtecEventChannelAdmin.Dependency (shutdown_event_, rt_info_.value); 
-	
-	
-	
-	RtecEventChannelAdmin.ConsumerQOS qos = new RtecEventChannelAdmin.ConsumerQOS (dependencies_); 
-	  
-	
-	// The channel administrator is the event channel we got from the invocation
-	// of this routine
-	
-	channel_admin_ = event_channel_;
-	
-	// Connect as a consumer
-	
-	consumer_admin_ = channel_admin_.for_consumers ();
-	
-	// Obtain a reference to the proxy push supplier
-	
-	suppliers_ = consumer_admin_.obtain_push_supplier ();
-
-	suppliers_.connect_push_consumer (this, qos);
-	
-	System.out.println ("Registered the consumer successfully.");
-	
-	 
-      }
-      catch (RtecScheduler.UNKNOWN_TASK e)
-	{
-	  System.err.println ("Demo_Consumer.open_consumer: Unknown task");
-	  System.err.println (e);
-	}
-      catch (RtecScheduler.DUPLICATE_NAME e)
-	{
-	  System.err.println ("Demo_Consumer.open_consumer: Duplicate names");
-	  System.err.println (e);
-	  }
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println(e);
-	}		
-    }
-  public Navigation get_navigation ()
-    {
-	return navigation_;    
-    }
-  
-  public Weapons get_weapons ()
-    {
-      return weapons_;
-    } 
-  
-}
-  
-
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Simulator/Sim_Display/Display_Weapons.java b/TAO/examples/Simulator/Sim_Display/Display_Weapons.java
deleted file mode 100644
index c23e68f15be..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Display_Weapons.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// $Id$ 
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.awt.*;
-
-public class Display_Weapons
-  extends Panel
-  implements Display_Object
-{
-  private final static String ONLINE = "Online",
-    OFFLINE = "Offline";
-  private final static Font FONT_BIG = new Font ("Dialog", Font.BOLD, 14),
-    FONT_SMALL = new Font ("Dialog", Font.BOLD, 10);
-  private final static Color BLUE = new Color (30, 144, 255);
-
-  private int count_ = 0;
-  private Hashtable weapons_ = new Hashtable ();
-  private GridBagLayout gbl_= new GridBagLayout ();
-  private GridBagConstraints gbc_ = new GridBagConstraints ();
-  
-  public Display_Weapons ()
-    {
-      Label default_label =
-	new Label ("No weapons available", Label.CENTER);
-
-      default_label.setFont (FONT_BIG);
-      default_label.setForeground (BLUE);
-
-      setLayout (gbl_);
-      gbc_.gridx = 0;
-      gbc_.gridy = 0;
-      gbc_.gridheight = 1;
-      gbc_.gridwidth  = 1;
-      gbc_.anchor = GridBagConstraints.NORTH;
-      gbc_.fill = GridBagConstraints.NONE;
-      setBackground (Color.black);
-
-      gbl_.setConstraints (default_label, gbc_);
-      add (default_label);
-    }
-
-  public Dimension getPreferredSize ()
-    {
-      return new Dimension (250, 200);
-    }
-
-  public Dimension getMinimumSize ()
-    {
-      return new Dimension (250, 100);
-    }
-  
-  public int update_display (Display_Push_Consumer display_push_consumer)
-    {      
-      Weapons weapons = display_push_consumer.get_weapons ();
-
-      for (int i = 0; i < weapons.number_of_weapons && i < 5; i++)
-	{
-	  String weapon;
-	  int status;
-	  switch (i)
-	    {
-	    default:
-	    case 0: weapon = weapons.weapon1_identifier;						      
-	      status = weapons.weapon1_status;
-	      break;
-	    case 1: weapon = weapons.weapon2_identifier;						      
-	      status = weapons.weapon2_status;
-	      break;
-	    case 2: weapon = weapons.weapon3_identifier;						      
-	      status = weapons.weapon3_status;
-	      break;
-	    case 3: weapon = weapons.weapon4_identifier;						      
-	      status = weapons.weapon4_status;
-	      break;
-	    case 4: weapon = weapons.weapon5_identifier;						      
-	      status = weapons.weapon5_status;
-	      break;
-	    }
-
-
-	  Label status_label = (Label)weapons_.get (weapon);
-
-	  if (status_label != null)
-	    status_label.setText ((status == 1) ? ONLINE : OFFLINE);
-	  else
-	    {
-	      if (count_ == 0)
-		removeAll ();
-
-	      count_++;
-	      Label weapon_label =
-		new Label (count_ + ". " + weapon, Label.LEFT);
-	      status_label =
-		new Label ((status == 1) ? ONLINE : OFFLINE, Label.RIGHT);
-
-	      status_label.setFont (FONT_SMALL);
-	      weapon_label.setFont (FONT_SMALL);
-	      weapon_label.setForeground (BLUE);
-	      
-	      gbc_.gridx = 0;
-	      gbc_.anchor = GridBagConstraints.WEST;
-	      gbl_.setConstraints (weapon_label, gbc_);
-	      add (weapon_label);
-	      gbc_.gridx = 1;
-	      gbc_.anchor = GridBagConstraints.EAST;
-	      gbl_.setConstraints (status_label, gbc_);
-	      add (status_label);
-	      
-	      gbc_.gridy++;
-	      weapons_.put (weapon, status_label);
-	    }
-
-	  status_label.setForeground ((status == 1) ?
-				      Color.lightGray :
-				      Color.darkGray);
-	}
-
-      validate ();
-      return 0;
-    }
-}
diff --git a/TAO/examples/Simulator/Sim_Display/Graph.java b/TAO/examples/Simulator/Sim_Display/Graph.java
deleted file mode 100644
index d8be73b54cb..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Graph.java
+++ /dev/null
@@ -1,163 +0,0 @@
-// $Id$
-
-
-import java.awt.*;
-import java.util.*;
-
-public class Graph extends Canvas
-{
-  private static final int MIN_SPACING = 2;
-  private static final int POINT_HISTORY = 200;
-  private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10);
-  
-  private Queue plot_;
-  private String title_;
-  private Graphics offgraphics_;
-  private Image offscreen_;
-  private Dimension offscreensize_;
-  private int max_value_;
-  private int old_max_value_;
-  private int spacing_;
-  private float local_max_ = 0;
-  private boolean max_increased_ = false;
-  
-  public Graph(String title, int max_value)
-  {
-    super();
-
-    plot_ = new Queue();
-    spacing_ = MIN_SPACING;
-    title_ = title;
-    max_value_ = max_value;
-    old_max_value_ = max_value;
-  }
-
-  public Dimension getMinimumSize ()
-    {
-      return new Dimension (75, 75);
-    }
-
-  public Dimension getPreferredSize ()
-    {
-      return new Dimension (175, 175);
-    }
-
-  public void addNewData(float new_point)
-  {
-    Float temp = (Float)plot_.dequeue_tail();
-    plot_.enqueue_head(new Float(new_point));
-    
-    if (new_point > local_max_)
-      local_max_ = new_point;
-    
-    while (local_max_ > max_value_)
-      max_value_ *= 2;
-    
-    while ((local_max_ < max_value_/2) && (max_value_ > old_max_value_))
-      max_value_ /= 2;
-
-    repaint();
-  }
-
-  public void update(Graphics g)
-  {
-    Dimension d = getSize ();
-    float tmp, value_1, value_2;
-    FontMetrics fm = g.getFontMetrics ();
-    Enumeration queue_iter = plot_.forward_iterator();
-    int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i;
-    String value =  "Value (of " + max_value_ + "): " + String.valueOf(plot_.head());
-    
-    if ((offscreen_ == null) ||
-	(offscreensize_.width != d.width - 8) ||
-	(offscreensize_.height != d.height - 8))
-      {
-	offscreen_ = createImage(d.width - 8, d.height - 8);
-	offscreensize_ = new Dimension(d.width - 8, d.height - 8);
-	offgraphics_ = offscreen_.getGraphics();
-	offgraphics_.setFont(FONT);
-      }
-
-    g.setColor (Color.lightGray);
-    g.draw3DRect (0, 0, d.width - 1, d.height - 1, true);
-    g.draw3DRect (1, 1, d.width - 3, d.height - 3, true);
-    g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
-    
-    local_max_ = 0;
-    offgraphics_.setColor (getBackground());
-    offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
-    offgraphics_.setColor (getForeground());    
-    offgraphics_.drawString(title_, 5, fheight);
-    offgraphics_.drawString(value, 5, offscreensize_.height - 5);
-
-    value_1 = ((Float)queue_iter.nextElement()).floatValue();
-    while (queue_iter.hasMoreElements())
-      {
-	value_2 = ((Float)queue_iter.nextElement()).floatValue();
-	
-	if (value_1 > local_max_)
-	  local_max_ = value_1;
-	
-        y1 = normalize(offscreensize_.height - fheight, value_1);
-        y2 = normalize(offscreensize_.height - fheight, value_2);
-	
-	tmp = value_2;
-	value_2 = value_1;
-	value_1 = tmp;
-
-        x2 = x1 - spacing_;
-        offgraphics_.drawLine(x1, y1, x2, y2);
-        x1 = x2;
-	if (x1 <= 5)
-	  break;
-      }
-
-    g.drawImage(offscreen_, 3, 3, null);
-  }
-  
-  public void paint(Graphics g)
-  {
-    Dimension d = getSize ();
-    int plot_length = plot_.length();
-    int num_points = d.width / spacing_;
-    
-    if (plot_.length() < num_points)
-      {
-	for (int i = 0; i < num_points - plot_length; i++)
-	  plot_.enqueue_tail(new Float(0));
-      }
-    else if (plot_.length() > num_points)
-      {
-	for (int i = 0; i < plot_length - num_points; i++)
-	  plot_.dequeue_tail();
-      }
-    
-    update(g);
-  }
-
-  public String getKey()
-  {
-    return title_;
-  }
-
-  public int getMax()
-    {
-      return old_max_value_;
-    }
-
-  private int normalize(int height, float coord)
-  {
-    float ratio = (float)coord/max_value_;
-    float pixels = (float)height*ratio;
-    float location = (float)height - pixels;
-    
-    return Math.round(location);
-  }
-
-  public void updateDisplay(float information)
-    {
-      addNewData(information);
-      repaint();
-    }
-}
-
diff --git a/TAO/examples/Simulator/Sim_Display/Graph_Panel.java b/TAO/examples/Simulator/Sim_Display/Graph_Panel.java
deleted file mode 100644
index 2eb6519f7c3..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Graph_Panel.java
+++ /dev/null
@@ -1,181 +0,0 @@
-// $Id$ 
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-class Graph_Panel
-  extends Panel	  
-  implements ComponentListener,
-	     ContainerListener
-{
-  private final static int VPAD = 4, HPAD = 4,
-    MIN_WIDTH = 100,
-    SUG_WIDTH = 175;
-  private final static Random RAND = new Random (System.currentTimeMillis());
-  private static float hue_ = RAND.nextFloat();
-  
-  private Hashtable graphs_ = new Hashtable();
-  
-  public Graph_Panel()
-    {
-      addComponentListener (this);
-      addContainerListener (this);
-    }  
-  
-  public void addGraph(String name, int max)
-    {
-      int index = name.lastIndexOf('/');
-      String short_name;      
-      
-      if (index != -1)
-	short_name = name.substring(index+1);
-      else
-	short_name = name;
-      
-      Graph graph = constructGraph(short_name, max);
-      graphs_.put(name, graph);
-    }
-
-  public void updateGraph(String name, float new_value)
-    {
-      Graph graph = (Graph)graphs_.get(name);
-
-      if(graph != null)
-	graph.addNewData(new_value);
-    }
-
-  public Graph getGraph(String name)
-    {
-      return (Graph)((Container)graphs_.get(name)).getComponent(0);
-    }
-  
-  public void removeGraph(String name)
-    {
-      graphs_.remove(name);
-
-      if (graphs_.size() > 0)
-	layoutGraphs();
-      else
-	removeAll();
-    }
-
-  public int numGraphs()
-    {
-      return graphs_.size();
-    }
-
-  public void clear()
-    {
-      removeAll();
-    }
-
-  public void componentResized(ComponentEvent e)
-    {
-      System.out.println ("Component resized.");
-      removeContainerListener (this);
-      removeComponentListener (this);
-      layoutGraphs ();
-      addComponentListener (this);
-      addContainerListener (this);
-    }
-
-  public void componentMoved(ComponentEvent e) {}
-  public void componentShown(ComponentEvent e) {}
-  public void componentHidden(ComponentEvent e) {}
-
-  public void componentAdded(ContainerEvent e)
-    {
-      System.out.println ("component added.");
-      removeContainerListener (this);
-      removeComponentListener (this);
-      layoutGraphs ();
-      addComponentListener (this);
-      addContainerListener (this);
-    }
-  
-  public void componentRemoved(ContainerEvent e)
-    {
-      System.out.println ("component removed.");
-    }
-  
-  private void layoutGraphs ()
-    {
-      Dimension current_size = getSize ();
-      int total_area = current_size.width * current_size.height;
-      int num_rows, graphs_per_row, min_width = MIN_WIDTH;
-      int graph_area = graphs_.size () *
-	(SUG_WIDTH + HPAD) *
-	(SUG_WIDTH + VPAD);
-      Enumeration graph_enum = graphs_.elements ();
-
-      removeAll ();
-
-      System.out.println ("Total area: " + total_area + " Graph area: " + graph_area);
-      
-      if ((total_area < graph_area) ||
-	  (current_size.width < MIN_WIDTH) ||
-	  (current_size.height < MIN_WIDTH))
-	{
-	  System.out.println ("adjusting graph size");
-	  min_width = total_area / graphs_.size ();
-	  min_width = (int) Math.round (Math.sqrt (min_width));
-
-	  if (min_width > current_size.height)
-      	    min_width = current_size.height;
-	  if (min_width > current_size.width)
-	    min_width = current_size.width;
-
-	  // Ah, hopeless. Too narrow to draw graphs in this panel.
-	  if (min_width < MIN_WIDTH)
-	    {
-	      System.err.println ("Graph_Panel.layoutGraphs: Giving up!");
-	      return;
-	    }
-	}
-
-      graphs_per_row = current_size.width / (min_width + HPAD);
-      num_rows = (graphs_.size () / graphs_per_row) + 1;
-
-      setLayout (new GridLayout (num_rows, 1, 0, VPAD));
-      for (int i = 0; i < num_rows; i++)
-	{
-	  Panel row = new Panel ();
-	  row.setLayout (new GridLayout (1, graphs_per_row, HPAD, 0));
-	  
-	  for (int j = 0;
-	       j < graphs_per_row && graph_enum.hasMoreElements ();
-	       j++)
-	    {
-	      Component graph = (Component) graph_enum.nextElement ();		  
-	      row.add (graph);
-	    }
-
-	  add (row);
-	}
-
-      validate ();
-    }
-  
-  private final static Graph constructGraph(String label, int max)
-    {
-      Graph graph = new Graph(label, max);
-      
-      float brightness = RAND.nextFloat();
-
-      hue_ += .075;
-
-      if (hue_ > 1.0)
-	hue_ -= 1.0;
-      
-      if (brightness > 0.75)
-	brightness -= 0.25;
-      
-      Color new_color = Color.getHSBColor(hue_, 1, brightness);
-      
-      graph.setBackground(new_color);
-      graph.setForeground(Color.white);
-      
-      return graph;
-    }
-}
diff --git a/TAO/examples/Simulator/Sim_Display/NS_Resolve.java b/TAO/examples/Simulator/Sim_Display/NS_Resolve.java
deleted file mode 100644
index b6a39e63dec..00000000000
--- a/TAO/examples/Simulator/Sim_Display/NS_Resolve.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$ 
-// ============================================================================
-//
-// 
-// = FILENAME
-//    NS_Resolve.java
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   Resolves the initial reference to the Naming service,
-//   the orb has to be given as a parameter to the
-//   resolve_name_service call. 
-// 
-//
-// ============================================================================
-
-
-
-
-import org.omg.CORBA.*;
-import java.net.*;
-import java.io.*;
-
-
-
-public class NS_Resolve 
-{
-  
-  private static final String ACE_DEFAULT_MULTICAST_ADDR = "224.9.9.2";
-  private static final int TAO_DEFAULT_NAME_SERVER_REQUEST_PORT = 10013;
-  private static final int MULTICAST_SEND_PORT = 10060;
-  private static final int MULTICAST_RECEIVE_PORT = 10061;
-  private static final int TAO_SERVICEID_NAMESERVICE = 0;
-  private static final int TAO_SERVICEID_TRADINGSERVICE = 1;
-
-  org.omg.CORBA.Object name_service_;
-
-
-  public org.omg.CORBA.Object resolve_name_service (org.omg.CORBA.ORB orb)
-    {
-      try
-	{
-	  // Create a message with the multicast receive port in it
-	  ByteArrayOutputStream byte_stream_ = new ByteArrayOutputStream ();
-      	  byte_stream_.write ((int)((MULTICAST_RECEIVE_PORT&0xff00)>>>8));
-	  byte_stream_.write ((int)(MULTICAST_RECEIVE_PORT&0x00ff));
-      	  byte_stream_.write ((int)((TAO_SERVICEID_NAMESERVICE&0xff00)>>>8));
-	  byte_stream_.write ((int)(TAO_SERVICEID_NAMESERVICE&0x00ff));
-	  byte[] msg = byte_stream_.toByteArray();
-
-
-	  // Define the group for the multicast
-
-	  InetAddress group = InetAddress.getByName(ACE_DEFAULT_MULTICAST_ADDR);
-	  // Create the multicast socket at any port you want
-	  MulticastSocket multicastsocket_ = new MulticastSocket(MULTICAST_SEND_PORT);
-	  // Create a socket for the answer of the Naming Service 
-	  DatagramSocket socket_ = new DatagramSocket (MULTICAST_RECEIVE_PORT);
-	  // Give three seconds time for the Naming Service to respond
-	  socket_.setSoTimeout (3000);
-	  // Build a packet with the port number in it
-	  DatagramPacket  hello = new DatagramPacket(msg, msg.length,
-						     group, TAO_DEFAULT_NAME_SERVER_REQUEST_PORT);
-
-	  // Send the packet
-	  multicastsocket_.send (hello);
-
-	  // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
-	  byte[] buf = new byte[4096];
-	  // Set up packet which can be received
-	  DatagramPacket recv = new DatagramPacket (buf, buf.length);	  
-	  // Receive a packet or time out
-	  socket_.receive (recv);
-
-	  // Determine the length of the IOR
-	  int length;
-	  for (length = 0; buf[length] != 0; length++);
-
-	  // Store the IOR in a String
-       	  String name_service_ior_ = new String (recv.getData (),0,length);
-
-	  // Convert the String into
-	  return orb.string_to_object (name_service_ior_);
-	}
-      catch (SocketException e)
-	{
-	  System.err.println (e);
-	}
-      catch (java.io.InterruptedIOException e)
-	{
-	  System.err.println ("NS_Resolve: The receive lasted too long");
-	} 
-      catch(org.omg.CORBA.SystemException e) 
-	{
-	  System.err.println(e);
-	}	
-      catch (java.io.IOException e)
-	{
-	  System.err.println (e);
-	}
-      return null;
-      
-    } 
-
-};
-
-
-
-
-
diff --git a/TAO/examples/Simulator/Sim_Display/Queue.java b/TAO/examples/Simulator/Sim_Display/Queue.java
deleted file mode 100644
index 7ffaba15c52..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Queue.java
+++ /dev/null
@@ -1,190 +0,0 @@
-// $Id$
-
-
-import java.util.Enumeration;
-
-public class Queue
-{
-  // Friendly?
-  Queue_Node head_ = null;
-  Queue_Node tail_ = null;
-  
-  private int length_ = 0;
-  
-  public Queue()
-    {     
-    }
-
-  public Enumeration forward_iterator()
-    {
-      return new Queue_Iterator(this, Queue_Iterator.FORWARD);
-    }
-
-  public Enumeration reverse_iterator()
-    {
-      return new Queue_Iterator(this, Queue_Iterator.REVERSE);
-    }
-  
-  public void enqueue_tail(Object new_data)
-    {
-      Queue_Node new_node = new Queue_Node(new_data);
-
-      if (tail_ == null)
-	{
-	  tail_ = new_node;
-	  head_ = new_node;
-	}
-      else
-	{
-	  new_node.prev_ = tail_;
-	  tail_.next_ = new_node;
-	  tail_ = new_node;
-	}
-
-      length_++;
-    }
-
-  public void enqueue_head(Object new_data)
-    {
-      Queue_Node new_node = new Queue_Node(new_data);
-	    
-      if (head_ == null)
-	{
-	  tail_ = new_node;
-	  head_ = new_node;
-	}
-      else
-	{
-	  new_node.next_ = head_;
-	  head_.prev_ = new_node;
-	  head_ = new_node;
-	}
-
-      length_++;
-    }
-  
-  public Object dequeue_head()
-    {
-      Object return_value = null;
-      
-      if (head_ == null)
-	return_value = null;
-      else if (tail_ == head_)
-	{
-	  return_value = head_.data_;
-	  tail_ = null;
-	  head_ = null;
-	}
-      else
-	{
-	  return_value = head_.data_;
-	  head_ = head_.next_;
-	  head_.prev_ = null;	  
-	}
-
-      length_--;
-
-      return return_value;
-    }
-  
-  public Object dequeue_tail()
-    {
-      Object return_value = null;
-      
-      if (tail_ == null)
-	return_value = null;
-      else if (tail_ == head_)
-	{
-	  return_value = tail_.data_;
-	  tail_ = null;
-	  head_ = null;
-	}
-      else
-	{	  
-	  return_value = tail_.data_;
-	  tail_ = tail_.prev_;
-	  tail_.next_ = null;	  
-	}
-
-      length_--;
-
-      return return_value;
-    }
-
-  public int length()
-    {
-      return length_;
-    }
-
-  public Object head()
-    {
-      if (head_ != null)
-	return head_.data_;
-      else
-	return null;
-    }
-
-  public Object tail()
-    {
-      if (tail_ != null)
-	return tail_.data_;
-      else
-	return null;
-    }
-}
-
-class Queue_Node
-{
-  public Queue_Node prev_ = null;
-  public Queue_Node next_ = null;;
-  public Object data_;
-
-  public Queue_Node(Object data)
-    {
-      data_ = data;
-    }
-}
-
-class Queue_Iterator implements Enumeration
-{
-  public static final boolean FORWARD = true;
-  public static final boolean REVERSE = false;
-  
-  private Queue queue_;
-  private Queue_Node queue_ptr_;
-  private boolean direction_ = FORWARD;
-  
-  public Queue_Iterator(Queue queue)
-    {
-      queue_ = queue;
-      queue_ptr_ = queue.head_;
-    }
-
-  public Queue_Iterator(Queue queue, boolean direction)
-    {
-      queue_ = queue;
-      direction_ = direction;
-
-      if (direction_)
-	queue_ptr_ = queue_.head_;
-      else
-	queue_ptr_ = queue_.tail_;
-    }
-
-  public Object nextElement()
-    {
-      Object data = queue_ptr_.data_;
-      
-      if (direction_)
-	queue_ptr_ = queue_ptr_.next_;
-      else
-	queue_ptr_ = queue_ptr_.prev_;
-
-      return data;
-    }
-
-  public boolean hasMoreElements()
-    {
-      return queue_ptr_ != null;
-    }
-}
diff --git a/TAO/examples/Simulator/Sim_Display/Sim_Panel.java b/TAO/examples/Simulator/Sim_Display/Sim_Panel.java
deleted file mode 100644
index 42ed5d7b0f2..00000000000
--- a/TAO/examples/Simulator/Sim_Display/Sim_Panel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$ 
-
-import java.awt.*;
-import java.util.*;
-import java.io.*;
-
-class Sim_Panel extends Panel
-{
-  private GridBagLayout gbl_ = new GridBagLayout ();
-  private GridBagConstraints gbc_ = new GridBagConstraints ();
-
-  private Hashtable sims_ = new Hashtable();
-  
-  public Sim_Panel()
-    {
-      setLayout (gbl_);
-      gbc_.gridy = 0;
-      gbc_.weightx= 1;
-      gbc_.gridwidth = 1;
-      gbc_.gridheight = 1;
-      gbc_.gridx = GridBagConstraints.RELATIVE;
-      gbc_.anchor = GridBagConstraints.CENTER;
-    }  
-
-  public void add_simulator (String name, Display_Object disp_obj)
-    {
-      String short_name;      
-
-      if (! sims_.contains (name))
-	{      
-	  Label label = new Label(name, Label.CENTER);
-	  Panel panel = new Panel();
-	  
-	  label.setFont(new Font("Dialog", Font.BOLD, 12));
-	  
-	  panel.setLayout(new BorderLayout(0, 2));
-	  panel.add("Center", (Component)disp_obj);
-	  panel.add("North", label);
-	  sims_.put(name, panel);
-
-	  gbl_.setConstraints (panel, gbc_);
-	  add (panel);
-	}
-    }
-
-  public void update_simulator (String name, Display_Push_Consumer display_push_consumer)
-   
-    {
-      Container panel = (Container) sims_.get (name);
-      Display_Object sim = (panel != null) ? (Display_Object) panel.getComponent(0) : null;
-
-      if(sim != null)
-	sim.update_display (display_push_consumer);
-    }
-
-  public Display_Object get_simulator(String name)
-    {
-      return (Display_Object)((Container) sims_.get (name)).getComponent (0);
-    }
-}
-
-
-
-
diff --git a/TAO/examples/Simulator/ss b/TAO/examples/Simulator/ss
deleted file mode 100755
index 12177907b25..00000000000
--- a/TAO/examples/Simulator/ss
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/ksh 
-# $Id$
-
-# =TITLE
-#  Restart script
-#
-# =AUTHOR
-#  Michael Kircher (mk1@cs.wustl.edu)
-#
-# =DESCRIPTION
-#  This script restarts the Naming, Scheduling and Event Service,
-#  if "clean" is specified as a parameter, then the old
-#  services are only killed and not restarted 
-
-# save the old working dir
-old_dir=$cwd
-# get the user name
-login=`whoami`
-# get the user id 
-uid=`id | cut -c5-20 | cut -f1 -d"("`
-
-#### Set TAO_ROOT, if it wasn't set.
-if [ ! "$TAO_ROOT" ]; then
-  if [ "$ACE_ROOT" ]; then
-    TAO_ROOT=$ACE_ROOT/TAO
-  else
-    echo $0: you must set ACE_ROOT or TAO_ROOT!
-    exit 1
-  fi
-fi
-
-echo // Killing the old services
-
-ps -ef | grep Service | grep $login | grep -v grep | cut -c10-17 > /tmp/pids$login
-
-if [ -s /tmp/pids$login ]; then
-  pids=`cat /tmp/pids$login`
-  kill $pids
-fi
-
-# stop here if "ss clean" was called
-if [ $1 ]; then 
-  if [ $1 =  "clean" ]; then
-     exit
-  fi
-fi
-
-echo // Initializing the log file
-
-if [ -r /tmp/logfile_$login ]; then
-  rm /tmp/logfile_$login
-fi
-
-echo // Logfile for the script "ss" which startes Name, Scheduling and Event Service  > /tmp/logfile_$login
-
-nameserviceport=`expr 20023 + $uid`
-schedulerserviceport=`expr 60023 + $uid`
-eventserviceport=`expr 100023 + $uid`
-
-cd $TAO_ROOT/orbsvcs/Naming_Service
-./Naming_Service -ORBport $nameserviceport >> /tmp/logfile_$login 2>&1  &
-
-sleep 1
-
-IOR=`cat /tmp/logfile_$login | grep IOR | cut -c22-300 | cut -f1 -d">" `
-
-echo // The IOR of the Naming Service: $IOR
-
-echo // Started Naming Service on port $nameserviceport
-
-cd $TAO_ROOT/orbsvcs/Scheduling_Service
-./Scheduling_Service -ORBnameserviceior $IOR -ORBport $schedulerserviceport  >> /tmp/logfile_$login  2>&1 &
-
-sleep 1
-
-echo // Started Scheduling Service on port $schedulerserviceport
-
-cd $TAO_ROOT/orbsvcs/Event_Service
-./Event_Service -ORBnameserviceior $IOR -ORBport $eventserviceport >> /tmp/logfile_$login 2>&1 &
-
-cd $old_dir
-echo // Started Event Service on port $eventserviceport
-
-echo "// Enjoy the use ;-)"
-ps -ef | grep Service | grep -v grep
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
deleted file mode 100644
index 18be67cb507..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Sched_Params.h"
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
-
-// This program dumps the results of one scheduling in a C++ file.
-
-
-
-int main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil(poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in(), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil(naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      RtecScheduler::RT_Info_Set_var infos;
-      ACE_Scheduler_Factory::server ()->compute_scheduling
-	(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-					 ACE_SCOPE_THREAD),
-	 ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
-					 ACE_SCOPE_THREAD),
-	 infos.out (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::dump_schedule (infos.in (),
-					    "Scheduler_Runtime.cpp");
-    }
-  TAO_CATCH (CORBA::SystemException, sys_ex)
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
deleted file mode 100644
index adadaf485c2..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Dump_Schedule" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Dump_Schedule - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Dump_Schedule.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Dump_Schedule.mak" CFG="Dump_Schedule - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Dump_Schedule - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Dump_Schedule - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Dump_Schedule - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Dump_Schedule - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Dump_Schedule - Win32 Release"

-# Name "Dump_Schedule - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Dump_Schedule.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsw b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsw
deleted file mode 100644
index 7ac8698103e..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Dump_Schedule"=.\Dump_Schedule.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
deleted file mode 100644
index d9b01a3d84a..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-
-BIN = Dump_Schedule
-BUILD = $(BIN)
-
-DUMP_SRCS = \
-	Dump_Schedule.cpp
-
-LSRC = 	$(DUMP_SRCS)
-
-SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
-DUMP_OBJS=$(DUMP_SRCS:.cpp=.o)
-
-LDLIBS     =  -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Dump_Schedule/svc.conf b/TAO/orbsvcs/Dump_Schedule/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
deleted file mode 100644
index 0c64e4e8399..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/Event_Channel.h"
-
-const char* service_name = "EventService";
-
-int
-parse_args (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "n:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-	{
-	case 'n':
-	  service_name = get_opt.optarg;
-	  break;
-	case '?':
-	default:
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Usage: %s "
-		      "-n service_name "
-		      "\n",
-		      argv[0]));
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-
-int main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (parse_args (argc, argv) == -1)
-	return 1;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      // Register Event_Service with Naming Service.
-      ACE_EventChannel ec_impl;
-
-      RtecEventChannelAdmin::EventChannel_var ec = 
-	ec_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-	orb->object_to_string (ec.in (), TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG, "The EC IOR is <%s>\n", str.in ()));
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup (service_name);
-      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "running event service\n"));
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("EC");
-    }
-  TAO_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.dsp b/TAO/orbsvcs/Event_Service/Event_Service.dsp
deleted file mode 100644
index b2cccaa3eee..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.dsp
+++ /dev/null
@@ -1,147 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Event_Service" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Event_Service - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Service.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Service.mak" CFG="Event_Service - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Event_Service - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Service - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Event_Service - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Event_Service - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Event_Service - Win32 Release"

-# Name "Event_Service - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event_Service.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\BCU.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CORBA_Utils_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Debug_Macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Dispatching_Modules.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Fast_Reactor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\GPlot_File.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Local_ESTypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Memory_Pools.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorTask.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RT_Task.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Task_Manager.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.dsw b/TAO/orbsvcs/Event_Service/Event_Service.dsw
deleted file mode 100644
index 2b2901a9725..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Event_Service"=.\Event_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
deleted file mode 100644
index f22fba403d4..00000000000
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Event_Service
-BUILD = $(BIN)
-
-LSRC = 	\
-	Event_Service.cpp \
-
-ES_OBJS=$(LSRC:.cpp=.o)
-
-LDLIBS = -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-ifeq ($(probe),1)
-    CCFLAGS += -DACE_ENABLE_TIMEPROBES
-endif # probe
-
-
-Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Event_Service/svc.conf b/TAO/orbsvcs/Event_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Event_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
deleted file mode 100644
index 1f4bb7b8d64..00000000000
--- a/TAO/orbsvcs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	orbsvcs \
-	Naming_Service \
-	Scheduling_Service \
-	Event_Service \
-	Dump_Schedule \
-	tests \
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
deleted file mode 100644
index 783e0720cea..00000000000
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN 	= Naming_Service
-
-SVR_SRCS=Naming_Service.cpp
-
-LDLIBS  = -lorbsvcs -lTAO
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
deleted file mode 100644
index aaff0ce1af9..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Naming_Service/Naming_Service
-//
-// = FILENAME
-//    Naming_Service.cpp
-//
-// = DESCRIPTION
-//      This class implements a Naming_Service object.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "Naming_Service.h"
-
-// Default Constructor.
-
-Naming_Service::Naming_Service (void)
-  :ior_output_file_ (0)
-{
-}
-
-// Constructor taking command-line arguments
-
-Naming_Service::Naming_Service (int argc,
-				char** argv)
-  :ior_output_file_ (0)
-{
-   this->init (argc,argv);
-}
-
-int
-Naming_Service::parse_args (int argc,
-                            char **argv)
-{
-  ACE_Get_Opt get_opts (argc,argv,"o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o': // outputs the naming service ior to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           " [-o] <ior_output_file>"
-                           " [-s]"
-                           "\n",
-                           argv [0]),
-                          -1);
-        break;
-      }
-  return 0;
-}
-
-// Initialize the state of the Naming_Service object
-int
-Naming_Service::init (int argc,
-		      char** argv)
-{
-  int result;
-  CORBA::ORB_var orb;
-  PortableServer::POA_var child_poa;
-
-  TAO_TRY
-    {
-      this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      orb = this->orb_manager_.orb ();
-      child_poa = this->orb_manager_.child_poa ();
-      
-      result = this->my_naming_server_.init (orb,
-                                             child_poa);
-      TAO_CHECK_ENV;
-      if (result < 0)
-        return result;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Naming_Service::init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  // Check the non-ORB arguments.
-  result = this->parse_args (argc,
-                             argv);
-
-  if (result < 0)
-    return result;
-  if (this->ior_output_file_ != 0) 
-    {
-      CORBA::String_var str =
-        this->my_naming_server_.naming_service_ior ();
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-  return 0;
-}
-
-// Run the ORB event loop
-
-int
-Naming_Service::run (CORBA_Environment& env)
-{
-  return this->orb_manager_.run (env);
-}
-
-// Destructor.
-
-Naming_Service::~Naming_Service (void)
-{
-}
-
-
-int
-main (int argc, char ** argv)
-{
-  int init_result;
-
-  Naming_Service naming_service;
-
-  init_result = naming_service.init (argc,argv);
-  if (init_result < 0)
-    return init_result;
-
-  TAO_TRY
-    {
-      naming_service.run (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("NamingService");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
deleted file mode 100644
index 2635de8e1a1..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Naming_Service" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Naming_Service - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Naming_Service.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Naming_Service.mak" CFG="Naming_Service - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Naming_Service - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Naming_Service - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Naming_Service - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Naming_Service - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Naming_Service - Win32 Release"

-# Name "Naming_Service - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Naming_Service.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\CosNaming_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming_Service.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NS_CosNaming.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsw b/TAO/orbsvcs/Naming_Service/Naming_Service.dsw
deleted file mode 100644
index e324e70ecc8..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Naming_Service"=.\Naming_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
deleted file mode 100644
index c3414273de0..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Naming_Service/Naming_Service
-//
-// = FILENAME
-//    Naming_Service.h
-//
-// = DESCRIPTION
-//      This class implements the functionality of a Naming_Service.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (_NAMING_SERVICE_H)
-#define _NAMING_SERVICE_H
-
-#include "tao/TAO.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-class Naming_Service
-{
-  // =TITLE
-  //   Defines a class that encapsulates the implementation of a
-  //   naming service.
-  // =DESCRIPTION
-  //   This class makes use of the TAO_Naming_Server and
-  //   TAO_ORB_Manager class to implement the Naming_Service.
-
-public:
-  Naming_Service (void);
-  // Default Constructor.
-
-  Naming_Service (int argc,
-		  char** argv);
-  // Constructor taking the command-line arguments.
-
-
-  int
-  init (int argc,
-	char** argv);
-  // Initialize the Naming Service with the arguments.
-
-  int
-  run (CORBA_Environment& env);
-  // Run the Naming_Service
-
-  ~Naming_Service (void);
-  // Destructor.
-	
-private:
-  int parse_args (int argc,char **argv);
-  // parses the arguments.
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-  TAO_Naming_Server my_naming_server_;
-  // Naming Server instance.
-  FILE *ior_output_file_;
-  // File to output the Naming Service IOR.
-};
-
-#endif /* _NAMING_SERVICE_H */
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
deleted file mode 100644
index 1fa3fe11f0b..00000000000
--- a/TAO/orbsvcs/Naming_Service/README
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-README:
-======
-        This directory consists of the files implementing the TAO
-NamingService.
-
-        The TAO NamingService makes use of IP Multicast to process
-requests to the Naming Service.
-
-To Run:
-======
-
-        % Naming_Service [-ORBport port] [-ORBobjrefstyle url]
-                         [-ORBnameserviceport nsport] 
-
-Arguments:
-==========        
-        port - The ORB port
-        nsport - Multicast port.
- 
-Environment Variables:
-=====================
-
-        NameServicePort - Multicast port.
-
-Sample Run:
-==========
-
-      % Naming_Service -ORBport 20000 -ORBobjrefstyle url -ORBnameserviceport 19999
-starting up daemon <unknown>
-opening dynamic service Resource_Factory
-did dynamic on Resource_Factory, error = 0
-opening dynamic service Client_Strategy_Factory
-did dynamic on Client_Strategy_Factory, error = 0
-opening dynamic service Server_Strategy_Factory
-did dynamic on Server_Strategy_Factory, error = 0
-listening as object <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
-The multicast server setup is done.
-
-NameService Client:
-==================        
-
-        A client of the TAO Naming Service will use the ORB
-resolve_initial_references to resolve the NamingService object. This
-will be done using Multicast by default. This behavior can be
-overridden by these 2 ways.
-
-        1. passing the argument -ORBnameserviceior ior. 
-           This ior is got from the output of the Naming_Service from
-           line 'listening as object <iiop:..>'. 
-
-        2. setting the env. variable 'NameService'.
-
-For example if a client wants to use the Naming_Service from the
-sample run it would be like,
-
-        %client -ORBnameserviceior
-                <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService> 
-
-or set the environment variable,
-
-        in a tcsh ,
-
-        % setenv NameService <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
-
-        and then run the client,
-
-        % client <.. client's arguments>
-
-        These methods might be needed in an environment where there is
-more than one NamingService to avoid the confusion of a server
-registering its object with one NamingService and the client getting
-the reply from some other NamingService.
-
-                
diff --git a/TAO/orbsvcs/Naming_Service/svc.conf b/TAO/orbsvcs/Naming_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Naming_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/README b/TAO/orbsvcs/README
deleted file mode 100644
index bffd4dbd907..00000000000
--- a/TAO/orbsvcs/README
+++ /dev/null
@@ -1 +0,0 @@
-Further documentation can be found in ../docs/orbsvcs.html
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
deleted file mode 100644
index 6f43f2fb7ce..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Scheduling_Service
-BUILD = $(BIN)
-
-SCHEDULE_SRCS = \
-	Scheduling_Service.cpp
-
-LSRC = 	$(SCHEDULE_SRCS)
-
-SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
-
-LDLIBS     =  -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
deleted file mode 100644
index 1bc1b03710b..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// $Id$
-//
-
-#include "tao/corba.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-
-int main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Create an Scheduling service servant...
-      ACE_Config_Scheduler scheduler_impl;
-      TAO_CHECK_ENV;
-
-      RtecScheduler::Scheduler_var scheduler = 
-	scheduler_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-	orb->object_to_string (scheduler.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n", str.in ()));
-
-      // Register the servant with the Naming Context....
-      CosNaming::Name schedule_name (1);
-      schedule_name.length (1);
-      schedule_name[0].id = CORBA::string_dup ("ScheduleService");
-      naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "running scheduling service\n"));
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("schedule_service");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
deleted file mode 100644
index ffb8479c780..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Scheduling_Service" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Scheduling_Service - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Scheduling_Service.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Scheduling_Service.mak"\

- CFG="Scheduling_Service - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Scheduling_Service - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Scheduling_Service - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Scheduling_Service - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Scheduling_Service - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Scheduling_Service - Win32 Release"

-# Name "Scheduling_Service - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Scheduling_Service.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Config_Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Generic.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsw b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsw
deleted file mode 100644
index ab63039796a..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Scheduling_Service"=.\Scheduling_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/Scheduling_Service/svc.conf b/TAO/orbsvcs/Scheduling_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
deleted file mode 100644
index 3f18ff891ba..00000000000
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#--------------------------------------------------------------------------
-# $Id$
-# Build the TAO Trading Service
-#--------------------------------------------------------------------------
-
-#---------------
-#   STL (start)
-#---------------
-
-include $(STL_ROOT)/config/local.cfg
-
-CC_INCLUDES += -I$(STD)
-CC_INCLUDES += -pta
-
-CPPFLAGS += \
-	-I$(TOOLKIT) \
-	$(CC_INCLUDES) \
-	$(CC_FLAGS) \
-	$(CC_DEFINES) \
-	$(CC_EH) \
-	$(CC_MT)
-
-ifndef exceptions
-CPPFLAGS += -DOS_NO_EXCEPTION_SPECIFIER
-else
-CPPFLAGS += -DOS_STL_ASSERT
-endif
-
-LDFLAGS += -L$(STL_ROOT)/lib
-
-#---------------
-#   STL (end)
-#---------------
-
-#--------------------------------------------------------------------------
-#	Local macros
-#--------------------------------------------------------------------------
-
-BIN 	= trader
-
-SVR_SRCS= trader.cpp
-
-LDLIBS  = -lorbsvcs -lTAO -lospace
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
-
-#--------------------------------------------------------------------------
-#	Include macros and targets
-#--------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) #-H
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Trading_Service/svc.conf b/TAO/orbsvcs/Trading_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Trading_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Trading_Service/trader.cpp b/TAO/orbsvcs/Trading_Service/trader.cpp
deleted file mode 100644
index c96ae55f1ed..00000000000
--- a/TAO/orbsvcs/Trading_Service/trader.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// $Id$
-
-// ========================================================================
-//
-// = BINARY
-//    trader
-//  
-// = FILENAME 
-//    trader.cpp
-// 
-// = AUTHOR 
-//    Marina Spivak <marina@cs.wustl.edu> 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ======================================================================= 
-
-#include "tao/corba.h"
-#include "ace/Auto_Ptr.h"
-#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-
-int
-main(int argc, char * const *argv)
-{ 
-  TAO_TRY
-    {      
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // 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_Support_Attributes_Impl& sup_attr = trader->support_attributes ();
-      TAO_Trading_Components_Impl& trd_comp = trader->trading_components ();
-
-      // Set the service type repository
-      sup_attr.type_repos (type_repos._this (TAO_TRY_ENV));
-      TAO_CHECK_ENV;
-      
-#if defined (ACE_HAS_IP_MULTICAST)
-      // Get reactor instance from TAO.
-      ACE_Reactor *reactor =
-        TAO_ORB_Core_instance ()->reactor ();
-      
-      // First, see if the user has given us a multicast port number
-      // for the name service on the command-line;
-      u_short port =
-        TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
-
-      if (port == 0)
-	{
-	  const char *port_number =
-            ACE_OS::getenv ("NameServicePort");
-
-	  if (port_number != 0)
-	    port = ACE_OS::atoi (port_number);
-	  else
-	    port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
-	}
-
-      // The Spec says: return a reference to the Lookup interface
-      // from the resolve_initial_references method.
-      CosTrading::Lookup_var lookup = trd_comp.lookup_if ();
-      CORBA::String_var trading_ior =
-	orb->object_to_string (lookup.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Instantiate a server that will receive requests for an ior
-      TAO_IOR_Multicast ior_multicast ((char *) trading_ior.in (),
-				       port,
-				       ACE_DEFAULT_MULTICAST_ADDR,
-				       TAO_SERVICEID_TRADINGSERVICE);
-      
-      // Register event handler for the ior multicast.
-      if (reactor->register_handler (&ior_multicast,
-				     ACE_Event_Handler::READ_MASK) == -1)
-	ACE_DEBUG ((LM_DEBUG,
-                    "cannot register Event handler\n"));
-      else
-	ACE_DEBUG ((LM_DEBUG,
-                    "The multicast server setup is done.\n"));
-#else  /* ACE_HAS_IP_MULTICAST */
-
-      // Should dump the IOR somewhere.
-      
-#endif /* ACE_HAS_IP_MULTICAST */
-
-      
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Begin trading!
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-    }
-    TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("EC");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
diff --git a/TAO/orbsvcs/default.bld b/TAO/orbsvcs/default.bld
deleted file mode 100755
index 505c317883c..00000000000
--- a/TAO/orbsvcs/default.bld
+++ /dev/null
@@ -1,44 +0,0 @@
-#!build
-default:
-	nobuild
-	:cx_template_option=noautomatic
-	:optimize=standard
-	:optimize=memory
-	:optimize=loop
-	:dependency=nodepend
-	:debuglevel=multi
-	:cx_template=never
-	:object_dir=./obj
-	:sourcedirs=..
-	:sourcedirs=../..
-	:sourcedirs=/home/ace/ACE_wrappers.latest
-	:libdirs=../tao
-	:libdirs=/home/ace/ACE_wrappers.latest/ace
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:defines=TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-	:defines=DEBUG
-orbsvcs/orbsvcs.bld
-	library
-	:dependency=nodepend
-Naming_Service/Naming_Service.bld
-	program
-	:dependency=nodepend
-	:outputname=NamingService
-	:libdirs=../orbsvcs
-	:libraries=orbsvcs.a
-Event_Service/Event_Service.bld
-	program
-	:dependency=nodepend
-	:libdirs=../orbsvcs
-	:libraries=orbsvcs.a
-Dump_Schedule/Dump_Schedule.bld
-	program
-	:dependency=nodepend
-	:libdirs=../orbsvcs
-Scheduling_Service/Scheduling_Service.bld
-	program
-	:dependency=nodepend
-	:libdirs=../orbsvcs
-	:libraries=orbsvcs.a
diff --git a/TAO/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs.dsw
deleted file mode 100644
index d75c2d36bed..00000000000
--- a/TAO/orbsvcs/orbsvcs.dsw
+++ /dev/null
@@ -1,89 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Dump_Schedule"=.\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name orbsvcs

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Event_Service"=.\Event_Service\Event_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name orbsvcs

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Naming_Service"=.\Naming_Service\Naming_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name orbsvcs

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Scheduling_Service"=.\Scheduling_Service\Scheduling_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name orbsvcs

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "orbsvcs"=.\orbsvcs\orbsvcs.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
deleted file mode 100644
index ec7171ca5fe..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ /dev/null
@@ -1,771 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   AVStreams_i.cpp
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//    
-//
-// ============================================================================
-
-#include "orbsvcs/AV/AVStreams_i.h"
-
-// ----------------------------------------------------------------------
-// TAO_Basic_StreamCtrl
-// ----------------------------------------------------------------------
-
-// Constructor
-TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (CORBA::ORB_var orb)
-  : orb_ (orb)
-{
-}
-
-TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
-{
-}
-
-// Stop the transfer of data of the stream
-// Empty the_spec means apply operation to all flows
-void 
-TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec,  
-                            CORBA::Environment &env)
-{
-  if (CORBA::is_nil (stream_endpoint_a_.in ()))
-    return;
-
-  // Make the upcall into the application
-  this->stream_endpoint_a_->stop (the_spec, env);
-}
-
-// Start the transfer of data in the stream. 
-// Empty the_spec means apply operation to all flows
-void
-TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env)
-{
-  if (CORBA::is_nil (this->stream_endpoint_a_.in ()))
-    return;
-
-  // Make the upcall into the application
-  this->stream_endpoint_a_->start (the_spec, env);
-}
-
-// Tears down the stream. This will close the connection, and delete 
-// the streamendpoint and vdev associated with this stream
-// Empty the_spec means apply operation to all flows
-void
-TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &the_spec,  
-                               CORBA::Environment &env)
-{
-  if (CORBA::is_nil (this->stream_endpoint_a_.in ()))
-    return;
-
-  // Make the upcall into the application
-  this->stream_endpoint_a_->destroy (the_spec, env);
-}
-
-// Changes the QoS associated with the stream
-// Empty the_spec means apply operation to all flows
-CORBA::Boolean 
-TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, 
-                                  const AVStreams::flowSpec &the_spec,  
-                                  CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (new_qos);
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (env);
-  return 0;
-}
-
-// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
-// E.g., loss of flow, reestablishment of flow, etc..
-void
-TAO_Basic_StreamCtrl::push_event (const char *the_event,  
-                                  CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) Recieved event \"%s\"",
-              the_event));
-  ACE_UNUSED_ARG (env);
-}
-
-// Used to control the flow protocol parameters.
-void
-TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                                    const char *fp_name, 
-                                    const CORBA::Any &fp_settings,  
-                                    CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (fp_name);
-  ACE_UNUSED_ARG (fp_settings);
-  ACE_UNUSED_ARG (env);
-}
-
-// @@ Need to throw not-supported exception here
-CORBA::Object_ptr 
-TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name,  
-                                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (flow_name);
-  ACE_UNUSED_ARG (env);
-  return 0;
-}
-
-// @@ Need to throw not-supported exception here
-void
-TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, 
-                                           CORBA::Object_ptr flow_connection,  
-                                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (flow_name);
-  ACE_UNUSED_ARG (flow_connection);
-  ACE_UNUSED_ARG (env);
-}
-
-// ----------------------------------------------------------------------
-// TAO_StreamCtrl
-// ----------------------------------------------------------------------
-
-TAO_StreamCtrl::TAO_StreamCtrl (CORBA::ORB_var orb)
-  : TAO_Basic_StreamCtrl (orb)
-{
-}
-
-TAO_StreamCtrl::~TAO_StreamCtrl (void)
-{
-}
-
-// request the two MMDevices to create vdev and stream endpoints. save 
-// the references returned.
-
-// The interaction diagram for this method is on page 13 of the spec
-CORBA::Boolean 
-TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, 
-                           AVStreams::MMDevice_ptr b_party, 
-                           AVStreams::streamQoS &the_qos, 
-                           const AVStreams::flowSpec &the_flows,  
-                           CORBA::Environment &env)
-{
-  // Check to see if we have non-nil parties to bind!
-  if (CORBA::is_nil (a_party) || 
-      CORBA::is_nil (b_party))
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "\n(%P|%t) TAO_StreamCtrl::bind_devs: "
-                       "a_party or b_party is null!\n"),
-                      1);
-  
-  // Request a_party to create the endpoint and vdev
-  CORBA::Boolean met_qos;
-  CORBA::String_var named_vdev;
-
-  this->stream_endpoint_a_ =
-    a_party-> create_A (this->_this (env),
-                        this->vdev_a_.out (),
-                        the_qos,
-                        met_qos,
-                        named_vdev.inout (),
-                        the_flows,
-                        env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "\n(%P|%t) TAO_StreamCtrl::create_A: succeeded"));
-
-  // Request b_party to create the endpoint and vdev
-
-  this->stream_endpoint_b_ =
-    b_party-> create_B (this->_this (env),
-                        this->vdev_b_.out (),
-                        the_qos,
-                        met_qos,
-                        named_vdev.inout (),
-                        the_flows,
-                        env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "\n(%P|%t) TAO_StreamCtrl::create_B: succeeded"));
-  
-  ACE_DEBUG ((LM_DEBUG, 
-              "\nstream_endpoint_b_ = %s",
-              this->orb_->object_to_string (this->stream_endpoint_b_,
-                                            env)));
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Tell the 2 VDev's about one another
-  this->vdev_a_->set_peer (this->_this (env),
-                           this->vdev_b_.in (),
-                           the_qos,
-                           the_flows,
-                           env);
-
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  this->vdev_b_->set_peer (this->_this (env),
-                           this->vdev_a_.in (),
-                           the_qos,
-                           the_flows,
-                           env);
-
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-
-  // Now connect the streams together. This will
-  // establish the connection
-  this->stream_endpoint_a_->connect (this->stream_endpoint_b_,
-                                     the_qos,
-                                     the_flows,
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  return 0;
-}
-  
-// Used to establish a connection between two endpoints
-// directly, i.e. without a MMDevice
-CORBA::Boolean 
-TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr a_party, 
-                      AVStreams::StreamEndPoint_B_ptr b_party, 
-                      AVStreams::streamQoS &the_qos, 
-                      const AVStreams::flowSpec &the_flows,  
-                      CORBA::Environment &env)
-{
-  if (CORBA::is_nil (a_party) || 
-      CORBA::is_nil (b_party))
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "(%P|%t) TAO_StreamCtrl::bind:"
-                       "a_party or b_party null!"),
-                      1);
-
-  this->stream_endpoint_a_ = a_party;
-  this->stream_endpoint_b_ = b_party;
-  // Now connect the streams together
-  this->stream_endpoint_a_->connect (this->stream_endpoint_b_,
-                                     the_qos,
-                                     the_flows,
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  return 0;
-}
-
-void 
-TAO_StreamCtrl::unbind (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-}
-
-void 
-TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr the_ep, 
-                              const AVStreams::flowSpec &the_spec,  
-                              CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (the_ep);
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (env);
-}
-
-// ----------------------------------------------------------------------
-// TAO_StreamEndPoint
-// ----------------------------------------------------------------------
-
-TAO_StreamEndPoint::TAO_StreamEndPoint (void)
-{
-}
-
-// Stop the physical flow of data on the stream
-// Empty the_spec --> apply to all flows
-void 
-TAO_StreamEndPoint::stop (const AVStreams::flowSpec &the_spec,  
-                          CORBA::Environment &env)
-{
-  // Make the upcall into the app
-  this->handle_stop (the_spec, env);
-}
-
-// Start the physical flow of data on the stream
-// Empty the_spec --> apply to all flows
-void 
-TAO_StreamEndPoint::start (const AVStreams::flowSpec &the_spec,  
-                           CORBA::Environment &env)
-{
-  // Make the upcall into the app
-  this->handle_start (the_spec, env);
-}
-
-// Close the connection
-void 
-TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env)
-{
-  // Make the upcall into the app
-  this->handle_destroy (the_spec, env);
-}
-
-// Called by streamctrl, requesting us to call request_connection 
-// on the responder (to initiate a connection)
-CORBA::Boolean 
-TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, 
-                             AVStreams::streamQoS &qos_spec, 
-                             const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) In TAO_StreamEndPoint::connect\n"));
-  responder->request_connection (this->_this (env),
-                                 0,
-                                 qos_spec,
-                                 the_spec,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-}
-  
-// Called by our peer endpoint, requesting us to establish
-// a connection
-CORBA::Boolean 
-TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                        CORBA::Boolean is_mcast, 
-                                        AVStreams::streamQoS &qos, 
-                                        AVStreams::flowSpec &the_spec,  
-                                        CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
-              "flowspec has length = %d"
-              "and the strings are:",
-              the_spec.length ()));
-  for (int i = 0; i < the_spec.length (); i++)
-    ACE_DEBUG ((LM_DEBUG,
-                the_spec [i]));
-
-  return 0;
-}
-  
-CORBA::Boolean 
-TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, 
-                                const AVStreams::flowSpec &the_flows,  
-                                CORBA::Environment &env)
-{
-  return 0;
-}
-  
-CORBA::Boolean 
-TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,  
-                                              CORBA::Environment &env)
-{
-  return 0;
-}
-  
-void 
-TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,  
-                                CORBA::Environment &env)
-{
-}
-  
-void 
-TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                                  const char *fp_name, 
-                                  const CORBA::Any &fp_settings,  
-                                  CORBA::Environment &env)
-{
-}
-
-CORBA::Object_ptr 
-TAO_StreamEndPoint::get_fep (const char *flow_name,  
-                             CORBA::Environment &env)
-{
-  return 0;
-}
-  
-char * 
-TAO_StreamEndPoint::add_fep (CORBA::Object_ptr the_fep,  
-                             CORBA::Environment &env)
-{
-  return 0;
-}
-  
-void 
-TAO_StreamEndPoint::remove_fep (const char *fep_name,  
-                                CORBA::Environment &env)
-{
-}
-  
-void 
-TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,  
-                                    CORBA::Environment &env)
-{
-}
-
-void 
-TAO_StreamEndPoint::set_key (const char *flow_name, 
-                             const encryption_key & the_key,
-                             CORBA::Environment &env)
-{
-}
-  
-void 
-TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,  
-                                   CORBA::Environment &env)
-{
-}
-
-TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
-{
-}
-
-// ----------------------------------------------------------------------
-// TAO_Client_StreamEndPoint
-// ----------------------------------------------------------------------
-
-TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint: created"));
-}
-
-CORBA::Boolean 
-TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, 
-                                    AVStreams::streamQoS &qos_spec, 
-                                    const AVStreams::flowSpec &the_spec,  
-                                    CORBA::Environment &env)
-{
-  // Use the base class implementation of connect
-  TAO_StreamEndPoint::connect (responder, 
-                               qos_spec, 
-                               the_spec,  
-                               env);
-
-  // Make the upcall to the app
-  return this->handle_connection_established (responder, 
-                                              qos_spec, 
-                                              the_spec,  
-                                              env);
-  
-}
-
-
-CORBA::Boolean 
-TAO_Client_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos, 
-                                    AVStreams::flowSpec &the_spec,  
-                                    CORBA::Environment &env)
-{
-  return 0;
-}
-  
-CORBA::Boolean 
-TAO_Client_StreamEndPoint::connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                    AVStreams::streamQoS &the_qos, 
-                                    const AVStreams::flowSpec &the_flows,  
-                                    CORBA::Environment &env)
-{
-  return 0;
-}
-  
-void 
-TAO_Client_StreamEndPoint::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                       const AVStreams::flowSpec &theSpec,  
-                                       CORBA::Environment &env)
-{
-}
-  
-TAO_Client_StreamEndPoint::~TAO_Client_StreamEndPoint (void)
-{
-}
-
-// ----------------------------------------------------------------------
-// TAO_Server_StreamEndPoint
-// ----------------------------------------------------------------------
-
-TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint: created"));
-}
-
-CORBA::Boolean 
-TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                               CORBA::Boolean is_mcast, 
-                                               AVStreams::streamQoS &qos, 
-                                               AVStreams::flowSpec &the_spec,  
-                                               CORBA::Environment &env)
-
-{
-  // Use the base class implementation of request_connection
-  TAO_StreamEndPoint::request_connection (initiator, 
-                                          is_mcast, 
-                                          qos, 
-                                          the_spec,  
-                                          env);
-
-  // Make the upcall to the app
-  return this->handle_connection_requested (initiator, 
-                                            is_mcast, 
-                                            qos, 
-                                            the_spec,  
-                                            env);
-
-}
-CORBA::Boolean 
-TAO_Server_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos, 
-                                         AVStreams::flowSpec &the_spec,  
-                                         CORBA::Environment &env)
-{
-  return 0;
-}
-
-TAO_Server_StreamEndPoint::~TAO_Server_StreamEndPoint (void)
-{
-}
-
-// ----------------------------------------------------------------------
-// TAO_VDev
-// ----------------------------------------------------------------------
-
-TAO_VDev::TAO_VDev (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_VDev::TAO_VDev: created"));
-}
-
-// StreamCtrl will call this to give us a reference to itself, and to
-// our peer vdev..
-CORBA::Boolean 
-TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                    AVStreams::VDev_ptr the_peer_dev, 
-                    AVStreams::streamQoS &the_qos, 
-                    const AVStreams::flowSpec &the_spec,  
-                    CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) TAO_VDev::set_peer: called"));
-  this->streamctrl_ = the_ctrl;
-  this->peer_ = the_peer_dev;
-  return 0;
-}
-
-CORBA::Boolean 
-TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                          AVStreams::MCastConfigIf_ptr a_mcastconfigif, 
-                          AVStreams::streamQoS &the_qos, 
-                          const AVStreams::flowSpec &the_spec,  
-                          CORBA::Environment &env)
-{
-  return 0;
-}
-
-void 
-TAO_VDev::configure (const CosPropertyService::Property &the_config_mesg,  
-                     CORBA::Environment &env)
-{
-}
-
-void 
-TAO_VDev::set_format (const char *flowName, 
-                      const char *format_name,  
-                      CORBA::Environment &env)
-{
-}
-
-void 
-TAO_VDev::set_dev_params (const char *flowName, 
-                          const CosPropertyService::Properties &new_params,  
-                          CORBA::Environment &env)
-{
-}
-
-CORBA::Boolean 
-TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, 
-                      const AVStreams::flowSpec &the_spec,  
-                      CORBA::Environment &env)
-{
-  return 0;
-}
-
-TAO_VDev::~TAO_VDev (void)
-{
-}
-
-// ----------------------------------------------------------------------
-// TAO_MMDevice
-// ----------------------------------------------------------------------
-
-
-
-TAO_MMDevice::TAO_MMDevice ()
-{
-}
-
-// create a streamctrl which is colocated with me, use that streamctrl
-// to bind the peer_device with me.
-AVStreams::StreamCtrl_ptr  
-TAO_MMDevice ::bind (AVStreams::MMDevice_ptr peer_device,
-                     AVStreams::streamQoS &the_qos,
-                     CORBA::Boolean_out is_met,
-                     const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env)
-{
-#if 0
-  TAO_TRY
-    {
-      TAO_StreamCtrl *stream_ctrl = new TAO_StreamCtrl ();
-      if (stream_ctrl == 0)
-        return 0;
-      stream_ctrl->bind_devs (peer_device,
-                              AVStreams::StreamCtrl::_duplicate 
-                              (this->_this (TAO_TRY_ENV)),
-                              the_qos,
-                              the_spec,
-                              TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      return stream_ctrl;
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-#endif
-  return 0;
-}
-
-AVStreams::StreamCtrl_ptr  
-TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
-                          AVStreams::streamQoS &the_qos,
-                          CORBA::Boolean_out is_met,
-                          const AVStreams::flowSpec &the_spec,
-                          CORBA::Environment &env)
-{
-  return 0;
-}
-
-void 
-TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                       const char *vdev_name,
-                       CORBA::Environment &env)
-{
-}
-
-// need to throw notsupported exception
-char * 
-TAO_MMDevice::add_fdev (CORBA::Object_ptr the_fdev,
-                        CORBA::Environment &env)
-{
-  return 0;
-}
-
-// need to throw notsupported exception
-CORBA::Object_ptr 
-TAO_MMDevice::get_fdev (const char *flow_name,  
-                        CORBA::Environment &env)
-{
-  return 0;
-}
-
-// need to throw notsupported exception
-void 
-TAO_MMDevice::remove_fdev (const char *flow_name,  
-                           CORBA::Environment &env)
-{
-}
-
-TAO_MMDevice::~TAO_MMDevice (void)
-{
-}
-
-template <class T>
-TAO_Client_MMDevice <T>::TAO_Client_MMDevice ()
-{
-}
-
-// We have been asked to create a new stream_endpoint and a vdev.
-template <class T>
-AVStreams::StreamEndPoint_A_ptr  
-TAO_Client_MMDevice <T>::create_A (AVStreams::StreamCtrl_ptr the_requester, 
-                                   AVStreams::VDev_out the_vdev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   CORBA::Boolean_out met_qos, 
-                                   char *&named_vdev, 
-                                   const AVStreams::flowSpec &the_spec,  
-                                   CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_MMDevice::create_A: called"));
-
-  TAO_VDev *vdev = new TAO_VDev;
-  the_vdev = AVStreams::VDev::_duplicate (vdev->_this (env));
-
-  TAO_Client_StreamEndPoint *stream_endpoint_a = 
-    new T;
-  return AVStreams::StreamEndPoint_A::_duplicate 
-    (stream_endpoint_a->_this (env));
-}
-
-template <class T>
-AVStreams::StreamEndPoint_B_ptr  
-TAO_Client_MMDevice <T>::create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                   AVStreams::VDev_out the_vdev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   CORBA::Boolean_out met_qos, 
-                                   char *&named_vdev, 
-                                   const AVStreams::flowSpec &the_spec,  
-                                   CORBA::Environment &env)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-                     "(%P|%t) Cannot create a B device on the client side!\n"),
-                    0);
-}
-
-template <class T>
-TAO_Server_MMDevice <T>::TAO_Server_MMDevice ()
-{
-}
-
-template <class T>
-AVStreams::StreamEndPoint_A_ptr  
-TAO_Server_MMDevice <T>::create_A (AVStreams::StreamCtrl_ptr the_requester, 
-                                   AVStreams::VDev_out the_vdev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   CORBA::Boolean_out met_qos, 
-                                   char *&named_vdev, 
-                                   const AVStreams::flowSpec &the_spec,  
-                                   CORBA::Environment &env)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-                     "(%P|%t) Cannot create a A device on the server side!\n"),
-                    0);
-}
-
-// We have been asked to create a new stream_endpoint and a vdev.
-template <class T>
-AVStreams::StreamEndPoint_B_ptr  
-TAO_Server_MMDevice <T>::create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                   AVStreams::VDev_out the_vdev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   CORBA::Boolean_out met_qos, 
-                                   char *&named_vdev, 
-                                   const AVStreams::flowSpec &the_spec,  
-                                   CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) TAO_MMDevice::create_B: called"));
-
-  TAO_VDev *vdev = new TAO_VDev;
-  the_vdev = AVStreams::VDev::_duplicate (vdev->_this (env));
-
-  TAO_Server_StreamEndPoint *stream_endpoint_b = 
-    new T;
-  return AVStreams::StreamEndPoint_B::_duplicate 
-    (stream_endpoint_b->_this (env));
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
deleted file mode 100644
index 2d441017466..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ /dev/null
@@ -1,517 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   AVStreams_i.h
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//    
-// 
-// ============================================================================
-
-#if !defined (AVSTREAMS_I_H)
-#define	AVSTREAMS_I_H
-
-#include "orbsvcs/orbsvcs_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "orbsvcs/AVStreamsS.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-
-class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl 
-  : public virtual POA_AVStreams::Basic_StreamCtrl
-// = DESCRIPTION
-//    Base class for StreamCtrl, implements basic stream start
-//    and stop functionality 
-{
- public:
-  TAO_Basic_StreamCtrl (CORBA::ORB_var orb);
-  // Constructor
-
-  virtual void stop (const AVStreams::flowSpec &the_spec,  
-                     CORBA::Environment &env);
-  // Stop the transfer of data of the stream
-  // Empty the_spec means apply operation to all flows
-
-
-  virtual void start (const AVStreams::flowSpec &the_spec,  
-                      CORBA::Environment &env);
-  // Start the transfer of data in the stream. 
-  // Empty the_spec means apply operation to all flows   
-
-  virtual void destroy (const AVStreams::flowSpec &the_spec,  
-                        CORBA::Environment &env);
-  // Tears down the stream. This will close the connection, and delete 
-  // the streamendpoint and vdev associated with this stream
-  // Empty the_spec means apply operation to all flows
-
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, 
-                                     const AVStreams::flowSpec &the_spec,  
-                                     CORBA::Environment &env);
-  // Changes the QoS associated with the stream
-  // Empty the_spec means apply operation to all flows
-
-  virtual void push_event (const char *the_event,  
-                           CORBA::Environment &env);
-  // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
-  // E.g., loss of flow, reestablishment of flow, etc..
-   
-  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                             const char *fp_name, 
-                             const CORBA::Any &fp_settings,  
-                             CORBA::Environment &env);
-  // Used to control the flow protocol parameters.
-
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name,  
-                                                 CORBA::Environment &env);
-  // Not implemented in the light profile, will raise the notsupported 
-  // exception 
-   
-  virtual void set_flow_connection (const char *flow_name, 
-                                    CORBA::Object_ptr flow_connection,  
-                                    CORBA::Environment &env);
-  // Not implemented in the light profile, will raise the notsupported
-  // exception
-   
-  virtual ~TAO_Basic_StreamCtrl (void);
-  // Destructor
-
- protected:
-  CORBA::ORB_var orb_;
-  // ORB reference
-   
-  AVStreams::VDev_var vdev_a_;
-  AVStreams::VDev_var vdev_b_;
-  // The Virtual Devices for this stream
-   
-  AVStreams::StreamEndPoint_A_var stream_endpoint_a_;
-  AVStreams::StreamEndPoint_B_var stream_endpoint_b_;
-  // The Endpoints for this stream
-};
-
-class TAO_ORBSVCS_Export TAO_StreamCtrl 
-  : public virtual POA_AVStreams::StreamCtrl, 
-    public virtual TAO_Basic_StreamCtrl
-// = DESCRIPTION
-//    Implementation the A/V StreamCtrl class. this class
-//    is used to control the stream. It should be subclassed
-//    by applications that want to provide more control features.
-{
-public:
-  TAO_StreamCtrl (CORBA::ORB_var orb);
-  // Constructor
-   
-  virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, 
-                                    AVStreams::MMDevice_ptr b_party, 
-                                    AVStreams::streamQoS &the_qos, 
-                                    const AVStreams::flowSpec &the_flows,  
-                                    CORBA::Environment &env);
-  // Establish a stream between a_party and b_party,
-  // with qos the_qos, and for the flows in the_flows
-  // if the_flows is empty, bind all the flows
-  // Causes a connection to be established between the StreamEndpoints.
-  // Returns success/failure
-
-  virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, 
-                               AVStreams::StreamEndPoint_B_ptr b_party, 
-                               AVStreams::streamQoS &the_qos, 
-                               const AVStreams::flowSpec &the_flows,  
-                               CORBA::Environment &env);
-  // Establish a connection between two streamendpoints. This can
-  // be used if the streamendpoints have been created independent of
-  // a MMDevice
-   
-  virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, 
-                             const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env);
-  // Unbind the_ep from the stream. Empty the_spec means apply to all flows. 
-   
-  virtual void unbind (CORBA::Environment &env);
-  // unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-   
-  virtual ~TAO_StreamCtrl (void);
-  // Destructor
-
-};  
-
-
-class TAO_ORBSVCS_Export TAO_Base_StreamEndPoint
-// = DESCRIPTION
-//    Base class for the A/V StreamEndPoint class. this class
-//    is used to control the stream. It should be subclassed
-//    by applications that want to provide more control features.
-{
-
-public:
-
-  virtual void handle_stop (const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &env) = 0;
-  // Application needs to define this
-  
-  virtual void handle_start (const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env) = 0;
-  // Application needs to define this
-
-  
-  virtual void handle_destroy (const AVStreams::flowSpec &the_spec,  
-                               CORBA::Environment &env) = 0;
-  // Application needs to define this
-};
-
-class TAO_ORBSVCS_Export TAO_Client_Base_StreamEndPoint
-  : public virtual TAO_Base_StreamEndPoint
-{
-public:
-  virtual CORBA::Boolean handle_connection_established (AVStreams::StreamEndPoint_ptr responder, 
-                                                        AVStreams::streamQoS &qos_spec, 
-                                                        const AVStreams::flowSpec &the_spec,  
-                                                        CORBA::Environment &env) = 0;
-  // Application needs to define this
-};
-
-class TAO_ORBSVCS_Export TAO_Server_Base_StreamEndPoint
-  : public virtual TAO_Base_StreamEndPoint
-{
-public:
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::StreamEndPoint_ptr initiator, 
-                                                      CORBA::Boolean is_mcast, 
-                                                      AVStreams::streamQoS &qos, 
-                                                      AVStreams::flowSpec &the_spec,  
-                                                      CORBA::Environment &env) = 0;
-  // Application needs to define this
-};
-
-class TAO_ORBSVCS_Export TAO_StreamEndPoint 
-  : public virtual POA_AVStreams::StreamEndPoint, // The POA class
-    public virtual TAO_Base_StreamEndPoint
-{
-  // = DESCRIPTION
-  //    The Stream EndPoint. Used to implement one endpoint of a stream
-  //    that implements the transport layer.
-public:
-  TAO_StreamEndPoint (void);
-  // Constructor
-
-  virtual void stop (const AVStreams::flowSpec &the_spec,  
-                     CORBA::Environment &env);
-   // Stop the stream. Empty the_spec means, for all the flows
-  
-  virtual void start (const AVStreams::flowSpec &the_spec,  
-                      CORBA::Environment &env);
-  // Start the stream, Empty the_spec means, for all the flows
-
-  virtual void destroy (const AVStreams::flowSpec &the_spec,  
-                        CORBA::Environment &env);
-  // Destroy the stream, Empty the_spec means, for all the flows
-
-
-  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, 
-                                  AVStreams::streamQoS &qos_spec, 
-                                  const AVStreams::flowSpec &the_spec,  
-                                  CORBA::Environment &env);
-  // Called by StreamCtrl. responder is the peer to connect to
-
-  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                             CORBA::Boolean is_mcast, 
-                                             AVStreams::streamQoS &qos, 
-                                             AVStreams::flowSpec &the_spec,  
-                                             CORBA::Environment &env);
-  // Called by the peer StreamEndPoint. The flow_spec indicates the
-  // flows (which contain transport addresses etc.)
-
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, 
-                                     const AVStreams::flowSpec &the_flows,  
-                                     CORBA::Environment &env);
-  // Change the transport qos on a stream
-   
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,  
-                                                   CORBA::Environment &env);
-  // Used to restrict the set of protocols
-   
-  virtual void disconnect (const AVStreams::flowSpec &the_spec,  
-                           CORBA::Environment &env);
-  // disconnect the flows
-   
-  virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, 
-                             const char *fp_name, 
-                             const CORBA::Any &fp_settings,  
-                             CORBA::Environment &env);
-  // Used to control the flow
-   
-  virtual CORBA::Object_ptr get_fep (const char *flow_name,  
-                                     CORBA::Environment &env);
-  // Not implemented in the light profile, throws notsupported
-
-  virtual char * add_fep (CORBA::Object_ptr the_fep,  
-                          CORBA::Environment &env);
-  // Not implemented in the light profile, throws notsupported
-   
-  virtual void remove_fep (const char *fep_name,  
-                           CORBA::Environment &env);
-  // Not implemented in the light profile, throws notsupported
-   
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,  
-                               CORBA::Environment &env);
-  // Used to "attach" a negotiator to the endpoint
-   
-  virtual void set_key (const char *flow_name, 
-                        const encryption_key & the_key,
-                        CORBA::Environment &env);
-  // Used for public key encryption. 
-    
-  virtual void set_source_id (CORBA::Long source_id,  
-                              CORBA::Environment &env);
-  // Used to set a unique id for packets sent by this streamendpoint
-
-  virtual ~TAO_StreamEndPoint (void);
-  // Destructor
-   
-};
-
-class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint : 
-  public virtual POA_AVStreams::StreamEndPoint_A, 
-  public virtual TAO_StreamEndPoint,
-  public virtual TAO_Client_Base_StreamEndPoint
-{
-  // = DESCRIPTION
-  //     The "A" side of a streamendpoint
-public:
-  TAO_Client_StreamEndPoint (void);
-  // Constructor
-
-  virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, 
-                                  AVStreams::streamQoS &qos_spec, 
-                                  const AVStreams::flowSpec &the_spec,  
-                                  CORBA::Environment &env);
-  // Called by StreamCtrl. responder is the peer to connect to
-
-  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, 
-                                       AVStreams::flowSpec &the_spec,  
-                                       CORBA::Environment &env);
-  // Used for ATM-style multicast
-  
-  virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                       AVStreams::streamQoS &the_qos, 
-                                       const AVStreams::flowSpec &the_flows,  
-                                       CORBA::Environment &env);
-  // Used for ATM-style multicast
-
-  virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, 
-                                const AVStreams::flowSpec &theSpec,  
-                                CORBA::Environment &env);
-  // Used to remove a multicast leaf
-
-  virtual ~TAO_Client_StreamEndPoint (void);
-  // Destructor
-
-};
-
-class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint : 
-  public virtual POA_AVStreams::StreamEndPoint_B, 
-  public virtual TAO_StreamEndPoint,
-  public virtual TAO_Server_Base_StreamEndPoint // Abstract interface
-{
-  // = DESCRIPTION
-  //     The "B" side of a streamendpoint
-public:
-  TAO_Server_StreamEndPoint (void);
-  // Constructor
-
-  virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, 
-                                             CORBA::Boolean is_mcast, 
-                                             AVStreams::streamQoS &qos, 
-                                             AVStreams::flowSpec &the_spec,  
-                                             CORBA::Environment &env);
-  // Called by the peer StreamEndPoint. The flow_spec indicates the
-  // flows (which contain transport addresses etc.)
-
-  virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, 
-                                       AVStreams::flowSpec &the_spec,  
-                                       CORBA::Environment &env);
-  // Used for internet-style multicast
-
-  virtual ~TAO_Server_StreamEndPoint (void);
-  // Destructor
-};
-
-class TAO_ORBSVCS_Export TAO_VDev 
-  : public virtual POA_AVStreams::VDev
-// = DESCRIPTION
-//    Implements the VDev interface. One of these is created per connection,
-//    and represents device-specific parameters
-{
- public:
-  TAO_VDev (void);
-  // Constructor
-
-  virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                                   AVStreams::VDev_ptr the_peer_dev, 
-                                   AVStreams::streamQoS &the_qos, 
-                                   const AVStreams::flowSpec &the_spec,  
-                                   CORBA::Environment &env);
-  // Called to tell the vdev who the streamctrl, peer vdev is
-
-  virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, 
-                                         AVStreams::MCastConfigIf_ptr a_mcastconfigif, 
-                                         AVStreams::streamQoS &the_qos, 
-                                         const AVStreams::flowSpec &the_spec,  
-                                         CORBA::Environment &env);
-  // Used to set the streamctrl and multicast device
-   
-  virtual void configure (const CosPropertyService::Property &the_config_mesg,  
-                          CORBA::Environment &env);
-  // Called by the peer VDev to configure the device (catch all)
-  
-  virtual void set_format (const char *flowName, 
-                           const char *format_name,  
-                           CORBA::Environment &env);
-  // Used to set a format on a flowname
-   
-  virtual void set_dev_params (const char *flowName, 
-                               const CosPropertyService::Properties &new_params,  
-                               CORBA::Environment &env);
-  // Used to set device parameters
-  
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, 
-                                     const AVStreams::flowSpec &the_spec,  
-                                     CORBA::Environment &env);
-  // Called to change QoS of the device
-
-  virtual ~TAO_VDev (void);
-  // Destructor
-
- private:
-  AVStreams::StreamCtrl_var streamctrl_;
-  // My stream controller
-   
-  AVStreams::VDev_var peer_;
-  // My peer
-};
-
-class TAO_ORBSVCS_Export TAO_MMDevice 
-  : public virtual TAO_PropertySet, 
-    public virtual POA_AVStreams::MMDevice
-// = DESCRIPTION
-//     Implements a factory to create Endpoints and VDevs
-{
- protected:
-  TAO_MMDevice (void);
-  // Constructor
-
- public:
-
-  virtual AVStreams::StreamCtrl_ptr  bind (AVStreams::MMDevice_ptr peer_device,
-                                           AVStreams::streamQoS &the_qos,
-                                           CORBA::Boolean_out is_met,
-                                           const AVStreams::flowSpec &the_spec,
-                                           CORBA::Environment &env);
-  // Can be used to request the MMDevice to create a new StreamCtrl,
-  // and call bind_devs on it
-
-  virtual AVStreams::StreamCtrl_ptr  bind_mcast (AVStreams::MMDevice_ptr first_peer,
-                                                 AVStreams::streamQoS &the_qos,
-                                                 CORBA::Boolean_out is_met,
-                                                 const AVStreams::flowSpec &the_spec,
-                                                 CORBA::Environment &env);
-  // Multicast bind
-
-  virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                        const char *vdev_name,
-                        CORBA::Environment &env);
-  // Remove the StreamEndPoint and the related vdev
-
-  virtual char * add_fdev (CORBA::Object_ptr the_fdev,
-                           CORBA::Environment &env);
-  // Not supported in the light profile, raises notsupported
-
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name,  
-                                      CORBA::Environment &env);
-  // Not supported in the light profile, raises notsupported
-
-  virtual void remove_fdev (const char *flow_name,  
-                            CORBA::Environment &env);
-  // Not supported in the light profile, raises notsupported
-  
-  virtual ~TAO_MMDevice (void);
-  // Destructor
-};
-
-
-template<class T>
-class TAO_ORBSVCS_Export TAO_Client_MMDevice 
-  : public virtual TAO_MMDevice
-// = DESCRIPTION
-//     Specialiized MMDevice, meant to generate type "A"
-//     endpoints. This is meant to be used on the client side
-//     Trying to create a B type endpoint using this  class will
-//     result in an  error
-//     This class is templatized by the Stream endpoint
-//     that is to be created using create_A. The user
-//     of this class can thus use this as a factory to create
-//     user-defined stream-endpoints
-{
-public:
-  TAO_Client_MMDevice ();
-  // Constructor
-  
-  virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
-                                                     CORBA::Environment &env);
-  // Called by StreamCtrl to create a "A" type streamandpoint and vdev
-  
-  virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
-                                                     CORBA::Environment &env);
-  // Called by StreamCtrl to create a "B" type streamandpoint and vdev
-};
-
-template<class T>
-class TAO_ORBSVCS_Export TAO_Server_MMDevice 
-  : public virtual TAO_MMDevice
-// = DESCRIPTION
-//     Specialiized MMDevice, meant to generate type "B"
-//     endpoints. This is meant to be used on the server side
-//     Trying to create a A type endpoint using this  class will
-//     result in an  error
-//     This class is templatized by the Stream endpoint
-//     that is to be created using create_A. The user
-//     of this class can thus use this as a factory to create
-//     user-defined stream-endpoints
-{
-public:
-  TAO_Server_MMDevice (void);
-
-  virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
-                                                     CORBA::Environment &env);
-  // Called by StreamCtrl to create a "A" type streamandpoint and vdev
-
-  virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                                                     AVStreams::VDev_out the_vdev, 
-                                                     AVStreams::streamQoS &the_qos, 
-                                                     CORBA::Boolean_out met_qos, 
-                                                     char *&named_vdev, 
-                                                     const AVStreams::flowSpec &the_spec,  
-                                                     CORBA::Environment &env);
-  // Called by StreamCtrl to create a "B" type streamandpoint and vdev
-
-};
-#endif /* AVSTREAMS_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
deleted file mode 100644
index 475601dbe17..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-#include "orbsvcs/AV/sfp.h"
-#include "ace/ARGV.h"
-
-// $Id$
-
-// constructor.
-SFP_Encoder::SFP_Encoder ()
-  : orb_ (0),
-    encoder_ (0)
-{
-  // We need to initialize the ORB!
-
-  TAO_TRY
-    {
-      ACE_ARGV orb_args (TAO_SFP_ORB_ARGUMENTS);
-      int argc = orb_args.argc ();
-      this->orb_ = CORBA::ORB_init (argc,
-                                    orb_args.argv (),
-                                    0,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Encoder::ORB_init");
-      return;
-    }
-  TAO_ENDTRY;
-  // new the encoder which we will use
-  ACE_NEW (encoder_,
-           TAO_OutputCDR ());
-  
-}
-
-ACE_Message_Block *
-SFP_Encoder::encode_start_message ()
-{
-  this->encoder_->reset ();
-  TAO_TRY
-    {
-      // construct the start message
-      SFP::start_message start;
-      
-      // copy the magic number into the message
-      start.magic_number = 4;
-      
-      // put the version number into the field
-      start.major_version = TAO_SFP_MAJOR_VERSION;
-      start.minor_version = TAO_SFP_MINOR_VERSION;
-      
-      // flags field is all zeroes
-      start.flags = 0;
-      
-      // encode the start frame
-      if (encoder_->encode (SFP::_tc_start_message,
-                            &start,
-                            0,
-                            TAO_TRY_ENV) 
-          == CORBA_TypeCode::TRAVERSE_CONTINUE)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "(%P|%t) encode of start message succeeded:"
-                      "length == %d\n",
-                      encoder_->length ()));
-
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Source_Endpoint::"
-                                   "start_message");
-      return 0;
-    }
-  TAO_ENDTRY;
-  
-  return this->create_message_block ();
-}
-
-// Encodes a simple frame, i.e. just frameheader and data
-ACE_Message_Block *
-SFP_Encoder::encode_simple_frame (ACE_Message_Block *data)
-{
-  this->encoder_->reset ();
-  TAO_TRY
-    {
-      // construct the frame header
-      SFP::frame_header frame_header;
-      // copy the magic number into the message
-      frame_header.magic_number = 4;
-      
-      // flags field is all zeroes
-      frame_header.flags = 0;
-      
-      // put the message type 
-      frame_header.message_type = SFP::SIMPLEFRAME;
-
-      // size
-      frame_header.message_size = data->length ();
-      
-      // encode the frame
-      if (encoder_->encode (SFP::_tc_frame_header,
-                            &frame_header,
-                            0,
-                            TAO_TRY_ENV) 
-          == CORBA_TypeCode::TRAVERSE_CONTINUE)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "(%P|%t) encode of simple frameheader succeeded:"
-                      "length == %d\n",
-                      encoder_->length ()));
-          
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Encoder::"
-                                   "start_message");
-      return 0;
-    }
-  TAO_ENDTRY;
-
-  ACE_Message_Block *mb = this->create_message_block ();
-
-  // set the next pointer to point to the data
-  mb->next (data);
-
-  return mb;
-}
-
-ACE_Message_Block *
-SFP_Encoder::encode_start_reply_message ()
-{
-  // Reset the internal buffer of the CDR stream
-  this->encoder_->reset ();
-
-  TAO_TRY
-    {
-      // construct the stop message
-      SFP::start_reply start_reply_message;
-      
-
-      // flags field is all zeroes
-      start_reply_message.flags = 0;
-      
-      // encode the start frame
-      if (encoder_->encode (SFP::_tc_start_reply,
-                            &start_reply_message,
-                            0,
-                            TAO_TRY_ENV) 
-          == CORBA_TypeCode::TRAVERSE_CONTINUE)
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "(%P|%t) encode of start_reply message succeeded:"
-                      "length == %d\n",
-                      encoder_->length ()));
-
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Encoder::"
-                                   "encode_start_reply_message");
-      return 0;
-    }
-  TAO_ENDTRY;
-  
-  return this->create_message_block ();
-}
-
-SFP_Encoder::~SFP_Encoder ()
-{
-
-}
-
-// This method copies the CDR buffer into a new
-// ACE_Message_Block and returns it.
-ACE_Message_Block *
-SFP_Encoder::create_message_block (void)
-{
-  // put the cdr encoded buffer into the message block
-  ACE_Message_Block *message;
-  
-  ACE_NEW_RETURN (message, 
-                  ACE_Message_Block (encoder_->length ()),
-                  0);
-  
-  if (message->copy ((char *) encoder_->buffer (),
-                     (size_t) encoder_->length ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "SFP_Encoder: Could not copy"
-                       "CDR::buffer () into "
-                       "ACE_Message_Block"),
-                      0);
-  
-  return message;
-}
-
-
-// ----------------------------------------------------------------------
-
-SFP_Decoder::SFP_Decoder ()
-  : decoder_ (0)
-{
-}
-
-// Attempts to decode the message as an SFP start message
-// returns 0 on success, -1 on failure
-int
-SFP_Decoder::decode_start_message (ACE_Message_Block *message)
-{
-
-  SFP::start_message start;
-
-  TAO_TRY
-    {
-      this->create_cdr_buffer (message->rd_ptr (),
-                               message->length ());
-
-      decoder_->decode (SFP::_tc_start_message,
-			&start,
-			0,
-			TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Decoder::"
-                                   "decode_start_message");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Decoded start message,"
-	      "version number == %d . %d\n",
-	      start.major_version,
-	      start.minor_version));
-
-  return 0;
-}
-
-// Attempts to decode the message as an SFP simple frame.
-// On success, message->rd_ptr () points to the data
-// Returns 0 on success, -1 on failure
-int
-SFP_Decoder::decode_simple_frame (ACE_Message_Block *message)
-{
-
-  // see if the message is long enough, if not, fail
-  if (message->length () < TAO_SFP_FRAME_HEADER_LEN)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) SFP_Decoder::decode_simple_frame: "
-                       "Message too small to be a valid header!"),
-                      -1);
-
-  // create an empty header
-  SFP::frame_header header;
-
-  TAO_TRY
-    {
-      // create an internal CDR buffer
-      this->create_cdr_buffer (message->rd_ptr (),
-                               TAO_SFP_FRAME_HEADER_LEN);
-
-      // decode the frame.
-      decoder_->decode (SFP::_tc_frame_header,
-                        &header,
-                        0,
-                        TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Decoder::"
-                                   "decode_frame_header");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Decoded frame header, "
-	      "magic number == %d "
-              "message length == %d",
-	      header.magic_number,
-	      header.message_size));
-
-  // Make the message read pointer point to the data
-  message->rd_ptr (message->rd_ptr () + 
-                   TAO_SFP_FRAME_HEADER_LEN);
-
-  return 0;
-
-}
-
-// Attempts to decode the message as an SFP start message
-// returns 0 on success, -1 on failure
-int
-SFP_Decoder::decode_start_reply_message (ACE_Message_Block *message)
-{
-
-  SFP::start_reply start_reply_message;
-
-  TAO_TRY
-    {
-      this->create_cdr_buffer (message->rd_ptr (),
-                               message->length ());
-      
-      decoder_->decode (SFP::_tc_start_reply,
-                       &start_reply_message,
-                       0,
-                       TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SFP_Decoder::"
-                                   "decode_start_message");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Decoded start_reply message\n"));
-
-  return 0;
-}
-
-
-// Copies length bytes from the given message into the
-// CDR buffer. Returns 0 on success, -1 on failure
-int
-SFP_Decoder::create_cdr_buffer (char *message,
-                                size_t length)
-{
-  if (this->decoder_)
-    delete this->decoder_;
-
-  ACE_NEW_RETURN (this->decoder_,
-                  TAO_InputCDR (message,
-                                length),
-                  -1);
-  
-  ACE_OS::memcpy (this->decoder_->rd_ptr (), 
-                  message, 
-                  length);
-  
-  return 0;
-}
-  
-
-
-SFP_Decoder::~SFP_Decoder ()
-{
-  if (this->decoder_)
-    delete this->decoder_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
deleted file mode 100644
index 3ea890b3a8a..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (TAO_AV_SFP_H)
-#define TAO_AV_SFP_H
-
-#include "orbsvcs/sfpC.h"
-
-// default arguments to pass to use for the ORB
-const char *TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL";
-
-// SFP magic numbers
-const char *TAO_SFP_MAGIC_NUMBER = "=SFP";
-const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG";
-const char *TAO_SFP_START_MAGIC_NUMBER = "=STA";
-
-// SFP version 1.0
-const unsigned char TAO_SFP_MAJOR_VERSION = 1;
-const unsigned char TAO_SFP_MINOR_VERSION = 0;
-
-// lengths of various SFP headers
-const unsigned char TAO_SFP_FRAME_HEADER_LEN = 12;
-
-class SFP_Encoder
-// = DESCRIPTION
-//     Encodes frames for the SFP protocol
-//     This class uses the CDR encoding format internally.
-{
- public:
-  SFP_Encoder (void);
-  // Default Constructor
-  
-  ACE_Message_Block *encode_start_message (void);
-  // returns a SFP start message. it is the users responsibility
-  // to delete this message block after using it.
-
-  ACE_Message_Block *encode_simple_frame (ACE_Message_Block *data);
-  // Encodes the message_block in an SFP frame
-
-  ACE_Message_Block *encode_start_reply_message (void);
-  // returns a start-reply message. it is the users responsibility to
-  // delete this message block after using it.
-
-  ~SFP_Encoder (void);
-  // Destructor
-
- protected:
-  ACE_Message_Block *create_message_block (void);
-  // Helper method - copies the buffer in encoder_
-  // into a new ACE_Message_Block and returns it.
-  // Returns 0 on failure
-
- private:
-
-  TAO_OutputCDR *encoder_;
-  // Use the TAO CDR encoder to encode everything
-  
-  CORBA::ORB_var orb_;
-  // Need the ORB to initialize the CDR encoder
-};
-
-class SFP_Decoder
-{
-public:
-  SFP_Decoder (void);
-  // Default constructor
-
-  int decode_start_message (ACE_Message_Block *message);
-  // returns 0 if the message is a valid SFP start message
-  // returns -1 otherwise.
-
-  int decode_simple_frame (ACE_Message_Block *message);
-  // decodes the message and returns the data in the message.
-  // Returns the message type.
-                   
-  int decode_start_reply_message (ACE_Message_Block *message);
-  // returns 0 if the message is a valid SFP stop message
-  // returns -1 otherwise.
-  
-  ~SFP_Decoder (void);
-
-protected:
-  int create_cdr_buffer (char *message,
-                         size_t length);
-  // Helper - copies length bytes from the given message into the CDR
-  // buffer. Returns 0 on success, -1 on failure
-
-private:
-  TAO_InputCDR *decoder_;
-  // Use the TAO CDR encoder to encode everything
-  
-  CORBA::ORB_var orb_;
-  // Need the ORB to initialize the CDR encoder
-};
-
-#endif /* !defined (TAO_SFP_H) */
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
deleted file mode 100644
index 6b13d7674bf..00000000000
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ /dev/null
@@ -1,502 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   AVStreams.idl
-//
-// = AUTHOR
-//    OMG
-//    
-// 
-// ============================================================================
-
-#include "CosPropertyService.idl"
-
-module AVStreams
-// = DESCRIPTION
-//    IDL for Control and Management of Audio/Video Streams
-//    Revised Submission
-{
-  struct QoS
-    // This structure represents QoS for a given type.
-    // E.g. {"video_qos", <"video_framerate", 26>,
-    //                    <"video_depth", 9>}
-  {
-    string QoSType;
-    // Name of the Qos type, e.g. "video_qos"
-    string QoSParams;
-    // @@
-    //    CosPropertyService::Properties QoSParams;
-    // Sequence of name value pairs, see e.g. above.
-  };
-  
-  typedef sequence<QoS> streamQoS;
-  // The QoS of a stream is a sequence of QoS structs (defined above)
-  
-  typedef sequence<string> flowSpec;
-  // flowSpec is used to keep transport protocol information
-  // Each string is one endpoint. 
-  
-  typedef sequence<string> protocolSpec;
-  // List of protocols supported
-  // protocol names registered by OMG.
-  // e.g., TCP, UDP, AAL5, IPX, RTP
-
-  typedef sequence<octet> encryption_key;
-  // Used as a key for public-key encryption
-
-  struct SFPStatus
-    // This structure is defined for SFP1.0
-    // Subsequent versions of the protocol may
-    // specify new structures
-  {
-    // = TITLE
-    //   This structure is defined for SFP1.0 Subsequent versions of
-    //   the protocol may specify new structures
-    boolean isFormatted;
-    boolean isSpecialFormat;
-    boolean seqNums;
-    boolean timestamps;
-    boolean sourceIndicators;
-  };
-
-  enum flowState {stopped, started, dead};
-  // represents the state of a flow
-
-  enum dirType {dir_in, dir_out};
-  // the direction of a flow
-
-  struct flowStatus
-    // Used to store the status of a flow
-  {
-    string flowName;
-    dirType directionality;
-    flowState status;
-    SFPStatus theFormat;
-    QoS theQoS;
-  };
-
-  // @@
-  //  typedef CosPropertyService::Property streamEvent;
-  typedef string streamEvent;
-  // Used to convey events, in Basic_StreamCtrl::push_event
-  
-  exception notSupported {};
-  // Used to indicate that an operation is not supported
-
-  exception PropertyException {};
-  // Property exception: raised by VDev::configure ()
-
-  exception FPError { string flow_name; };
-  // An flow protocol related error
-  
-  exception streamOpFailed
-    // Raised by operations on streams
-    {
-      string reason;
-    };
-
-  exception streamOpDenied
-    // Raised by operations on streams
-    {
-      string reason;
-    };
-
-  exception noSuchFlow {};
-  // Used to indicate that an invalid flow name was used for the operation
-
-  exception QoSRequestFailed
-    //  Used to indicate failure in changing QoS
-    {
-      string reason;
-    };
-
-  // @@
-  //  interface Basic_StreamCtrl : CosPropertyService::PropertySet {
-  interface Basic_StreamCtrl 
-    // = DESCRIPTION
-    //    Base class for StreamCtrl, implements basic stream start
-    //    and stop functionality
-    {
-      // Empty flowSpec => apply operation to all flows
-      void stop (in flowSpec the_spec) raises (noSuchFlow);
-      // Stop the transfer of data of the stream
-      // Empty the_spec means apply operation to all flows
-      
-      void start (in flowSpec the_spec) raises (noSuchFlow);
-      // Start the transfer of data in the stream.
-      // Empty the_spec means apply operation to all flows
-      
-      void destroy (in flowSpec the_spec) raises (noSuchFlow);
-      // Tears down the stream. This will close the connection, and delete
-      // the streamendpoint and vdev associated with this stream
-      // Empty the_spec means apply operation to all flows
-      
-      boolean modify_QoS (inout streamQoS new_qos,
-                          in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed);
-      // Changes the QoS associated with the stream
-      // Empty the_spec means apply operation to all flows
-      
-      oneway void push_event (in streamEvent the_event);
-      // Called by StreamEndPoint when something goes wrong
-      // with a flow
-      
-      void set_FPStatus (in flowSpec the_spec,
-                         in string fp_name,		
-                         in any fp_settings)		
-        raises (noSuchFlow, 
-                FPError);
-      // Used to control the flow protocol parameters.
-      
-      
-      Object get_flow_connection (in string flow_name) 
-        raises (noSuchFlow, 
-                notSupported);
-      // Not implemented in the light profile, will raise the notsupported
-      // exception
-      
-      
-      void set_flow_connection (in string flow_name,
-                                in Object flow_connection)
-        raises (noSuchFlow, 
-                notSupported);
-    };
-  // Not implemented in the light profile, will raise the notsupported
-  // exception
-
-  interface Negotiator
-    // = DESCRIPTION
-    //    This class is used to negotiate QoS between two stream endpoints
-    {
-      boolean negotiate (in Negotiator remote_negotiator,
-                         in streamQoS qos_spec);
-      // initiates the process of negotiating the qos_spec
-    };
-
-  // forward declarations
-  interface VDev;
-  interface MMDevice;
-  interface StreamEndPoint;
-  interface StreamEndPoint_A;
-  interface StreamEndPoint_B;
-  
-  interface StreamCtrl : Basic_StreamCtrl 
-    // = DESCRIPTION
-    //    Implementation the A/V StreamCtrl class. this class
-    //    is used to control the stream. It should be subclassed
-    //    by applications that want to provide more control features.
-    {
-      
-      boolean bind_devs (in MMDevice a_party, in MMDevice b_party,
-                         inout streamQoS the_qos,
-                         in flowSpec the_flows)
-        raises (streamOpFailed, 
-                noSuchFlow, 
-                QoSRequestFailed);
-      // Establish a stream between a_party and b_party,
-      // with qos the_qos, and for the flows in the_flows
-      // if the_flows is empty, bind all the flows
-      // Causes a connection to be established between the StreamEndpoints.
-      // Returns success/failure
-      
-      boolean bind (in StreamEndPoint_A a_party,
-                    in StreamEndPoint_B b_party,
-                    inout streamQoS the_qos,
-                    in flowSpec the_flows)
-        raises (streamOpFailed, 
-                noSuchFlow, 
-                QoSRequestFailed);
-      // Establish a connection between two streamendpoints. This can
-      // be used if the streamendpoints have been created independent of
-      // a MMDevice
-      
-      void unbind_party (in StreamEndPoint the_ep,
-                         in flowSpec the_spec)
-        raises (streamOpFailed, noSuchFlow);
-      // Unbind the_ep from the stream. Empty the_spec means apply to all flows.
-      
-      void unbind ()
-        raises (streamOpFailed);
-      // unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-    };
-  
-  // @@
-  //  interface MCastConfigIf : CosPropertyService::PropertySet{
-  interface MCastConfigIf 
-    // multicasting operations are not supported yet  
-    {
-      boolean set_peer (in Object peer,
-                        inout streamQoS the_qos,
-                        in flowSpec the_spec)
-        raises (QoSRequestFailed, 
-                streamOpFailed);
-      // multicasting operations are not supported yet  
-      
-      void configure (in CosPropertyService::Property a_configuration);
-      // multicasting operations are not supported yet  
-      
-      void set_initial_configuration (in CosPropertyService::Properties initial);
-      // multicasting operations are not supported yet  
-      
-      // Uses <format_name> standardised by OMG and IETF
-      void set_format (in string flowName, 
-                       in string format_name)
-        raises (notSupported);
-      // multicasting operations are not supported yet  
-      
-      // Note, some of these device params are standardised by OMG
-      void set_dev_params (in string flowName,
-                           in CosPropertyService::Properties new_params)
-        raises (CosPropertyService::PropertyException,
-                streamOpFailed);
-      // multicasting operations are not supported yet  
-      
-    };
-
-  // @@
-  //  interface StreamEndPoint : CosPropertyService::PropertySet{
-  interface StreamEndPoint 
-    // = DESCRIPTION
-    //    The Stream EndPoint. Used to implement one endpoint of a stream
-    //    that implements the transport layer.
-    {
-      void stop (in flowSpec the_spec) 
-        raises (noSuchFlow);
-      // Stop the stream. Empty the_spec means, for all the flows
-      
-      void start (in flowSpec the_spec) 
-        raises (noSuchFlow);
-      // Start the stream, Empty the_spec means, for all the flows
-      
-      void destroy (in flowSpec the_spec) 
-        raises (noSuchFlow);
-      // Destroy the stream, Empty the_spec means, for all the flows
-      
-      boolean connect (in StreamEndPoint responder,
-                       inout streamQoS qos_spec,
-                       in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
-                streamOpFailed);
-      // Called by StreamCtrl. responder is the peer to connect to
-      
-      boolean request_connection (in StreamEndPoint initiator,
-                                  in boolean is_mcast,
-                                  inout streamQoS qos,
-                                  inout flowSpec the_spec)
-        raises (streamOpDenied, noSuchFlow,
-                QoSRequestFailed, FPError);
-      // Called by the peer StreamEndPoint. The flow_spec indicates the
-      // flows (which contain transport addresses etc.)
-      
-      boolean modify_QoS (inout streamQoS new_qos,
-                          in flowSpec the_flows)
-        raises (noSuchFlow, 
-                QoSRequestFailed);
-      // Change the transport qos on a stream
-      
-      boolean set_protocol_restriction (in protocolSpec the_pspec);
-      // Used to restrict the set of protocols
-      
-      void disconnect(in flowSpec the_spec)
-        raises (noSuchFlow, 
-                streamOpFailed);
-      // disconnect the flows
-      
-      void set_FPStatus (in flowSpec the_spec,
-                         in string fp_name,
-                         in any fp_settings)
-        raises (noSuchFlow, 
-                FPError);
-      // Used to control the SFP parameters
-
-      Object get_fep (in string flow_name)
-        raises (notSupported, 
-                noSuchFlow);
-      // Not implemented in the light profile, throws notsupported
-      
-      string add_fep (in Object the_fep)
-        // Can fail for reasons {duplicateFepName, duplicateRef}
-        raises (notSupported, 
-                streamOpFailed);
-      // Not implemented in the light profile, throws notsupported
-      
-      void remove_fep (in string fep_name)
-        raises (notSupported, 
-                streamOpFailed);
-      // Not implemented in the light profile, throws notsupported
-      
-      void set_negotiator (in Negotiator new_negotiator);
-      // Used to "attach" a negotiator to the endpoint
-
-      void set_key (in string flow_name, 
-                    in encryption_key the_key);
-      // Used for public key encryption.
-    
-      void set_source_id (in long source_id);
-      // Used to set a unique id for packets sent by this streamendpoint
-    };
-
-  interface StreamEndPoint_A : StreamEndPoint
-    // = DESCRIPTION
-    //     The "A" side of a streamendpoint
-    {
-
-      boolean multiconnect (inout streamQoS the_qos,
-                            inout flowSpec the_spec)
-        raises (noSuchFlow, QoSRequestFailed, streamOpFailed);
-      // Used for ATM-style multicast
-
-      boolean connect_leaf (in StreamEndPoint_B the_ep,
-                            inout streamQoS the_qos,
-                            in flowSpec the_flows)
-        raises (streamOpFailed, noSuchFlow,
-                QoSRequestFailed, notSupported);
-      // Used for ATM-style multicast
-
-      void disconnect_leaf (in StreamEndPoint_B the_ep,
-                            in flowSpec theSpec)
-        raises(streamOpFailed, noSuchFlow);
-      // Used for ATM-style multicast
-    };
-
-  interface StreamEndPoint_B : StreamEndPoint 
-    {
-
-      boolean multiconnect (inout streamQoS the_qos,
-                            inout flowSpec the_spec)
-        raises (streamOpFailed, noSuchFlow,
-                QoSRequestFailed, FPError);
-      // Used for ATM-style multicast
-    };
-
-  // @@
-  //  interface VDev : CosPropertyService::PropertySet{
-  interface VDev 
-    // = DESCRIPTION
-    //    Implements the VDev interface. One of these is created per connection,
-    //    and represents device-specific parameters
-    {
-      boolean set_peer (in StreamCtrl the_ctrl,
-                        in VDev the_peer_dev,
-                        inout streamQoS the_qos,
-                        in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
-                streamOpFailed);
-      // Called to tell the vdev who the streamctrl, peer vdev is
-
-      boolean set_Mcast_peer (in StreamCtrl the_ctrl,
-                              in MCastConfigIf a_mcastconfigif,
-                              inout streamQoS the_qos,
-                              in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed, 
-                streamOpFailed);
-      // Used to set the streamctrl and multicast device
-
-      void configure (in CosPropertyService::Property the_config_mesg)
-        raises (PropertyException, 
-                streamOpFailed);
-      // Called by the peer VDev to configure the device (catch all)
-
-      // Uses <formatName> standardised by OMG and IETF
-      void set_format (in string flowName, 
-                       in string format_name)
-        raises (notSupported);
-      // Used to set a format on a flowname
-
-      // Note, some of these device params are standardised by OMG
-      void set_dev_params (in string flowName,
-                           in CosPropertyService::Properties new_params)
-        raises (PropertyException, 
-                streamOpFailed);
-      // Used to set device parameters
-
-      boolean modify_QoS (inout streamQoS the_qos,
-                          in flowSpec the_spec)
-        raises (noSuchFlow, 
-                QoSRequestFailed);
-      // Called to change QoS of the device
-
-    };
-
-  interface MMDevice : CosPropertyService::PropertySet 
-    // = DESCRIPTION
-    //     Implements a factory to create Endpoints and VDevs
-    {
-      StreamEndPoint_A create_A (in StreamCtrl the_requester,
-                                 out VDev the_vdev,
-                                 inout streamQoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_vdev,
-                                 in flowSpec the_spec)
-        raises (streamOpFailed, 
-                streamOpDenied, 
-                notSupported,
-                QoSRequestFailed, 
-                noSuchFlow);
-      // Called by StreamCtrl to create a "A" type streamendpoint and vdev
-
-      StreamEndPoint_B create_B(in StreamCtrl the_requester,
-                                out VDev the_vdev,
-                                inout streamQoS the_qos,
-                                out boolean met_qos,
-                                inout string named_vdev,
-                                in flowSpec the_spec)
-        raises (streamOpFailed, 
-                streamOpDenied, 
-                notSupported,
-                QoSRequestFailed, 
-                noSuchFlow);
-      // Called by StreamCtrl to create a "B" type streamendpoint and vdev
-    
-      StreamCtrl bind (in MMDevice peer_device,
-                       inout streamQoS the_qos,
-                       out boolean is_met,
-                       in flowSpec the_spec)
-        raises (streamOpFailed, 
-                noSuchFlow, 
-                QoSRequestFailed);
-      // Can be used to request the MMDevice to create a new StreamCtrl,
-      // and call bind_devs on it
-    
-      StreamCtrl bind_mcast (in MMDevice first_peer,
-                             inout streamQoS the_qos,
-                             out boolean is_met,
-                             in flowSpec the_spec)
-        raises (streamOpFailed, 
-                noSuchFlow, 
-                QoSRequestFailed);
-      // Multicast bind
-
-      void destroy (in StreamEndPoint the_ep, 
-                    in string vdev_name)
-        // ie VDev not found
-        raises (notSupported);
-      // Remove the StreamEndPoint and the related vdev
-     
-      string add_fdev (in Object the_fdev)
-        raises (notSupported, 
-                streamOpFailed);
-      // Not supported in the light profile, raises notsupported
-
-      Object get_fdev (in string flow_name)
-        raises (notSupported, 
-                noSuchFlow);
-      // Not supported in the light profile, raises notsupported
-
-      void remove_fdev (in string flow_name)
-        raises (notSupported, 
-                noSuchFlow);
-      // Not supported in the light profile, raises notsupported
-    };
-};
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
deleted file mode 100644
index 952301d7091..00000000000
--- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
+++ /dev/null
@@ -1,250 +0,0 @@
-// $Id$ 
-
-// IDL for Control and Management of Audio/Video Streams
-// Revised Submission
-
-// Additional IDL for full profile
-#include "AVStreams.idl"
-
-module AVStreams_Full
-{
-  exception protocolNotSupported{};
-  exception formatNotSupported{};
-  exception formatMismatch{};
-  exception FEPMismatch{};
-  exception alreadyConnected{};
-  exception invalidSettings{string settings;};
-  exception notConnected{};
-  exception deviceQosMismatch{};
-  exception failedToConnect{string reason;};
-  exception failedToListen{string reason;};
-
-
-  interface FlowProducer;
-  interface FlowConsumer;
-  interface FlowEndPoint;
-  interface FDev;
-
-  interface FlowConnection : PropertyService::PropertySet
-    {
-      void stop();
-      void start();
-      void destroy();
-
-      boolean modify_QoS(
-		
-                         inout AVStreams::QoS new_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-      boolean use_flow_protocol(
-                                in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      oneway void push_event(in AVStreams::streamEvent the_event);
-
-      boolean connect_devs(in FDev a_party, in FDev b_party,
-                           inout AVStreams::QoS the_qos)
-        raises (AVStreams::streamOpFailed, 
-                AVStreams::streamOpDenied, 
-                AVStreams::QoSRequestFailed);
-
-      boolean connect(
-                      in FlowProducer flow_producer,
-                      in FlowConsumer flow_consumer,
-                      inout AVStreams::QoS the_qos)
-        raises (formatMismatch, FEPMismatch, alreadyConnected);
-
-      boolean disconnect();
-
-      // The notSupported exception is raised where
-      // flow cannot have multiple producers
-      boolean add_producer(in FlowProducer flow_producer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected, AVStreams::notSupported);
-
-      boolean add_consumer(in FlowConsumer flow_consumer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected);
-
-      boolean drop(in FlowEndPoint target)
-        raises (notConnected);
-    };
-
-  interface FlowEndPoint : PropertyService::PropertySet
-    {
-      boolean lock();
-      void unlock();
-
-      void stop();
-      void start();
-      void destroy();
-
-      // Default is a nil object reference
-      attribute AVStreams::StreamEndPoint related_sep;
-      attribute FlowConnection related_flow_connection;
-
-      FlowEndPoint get_connected_fep()
-        raises (notConnected,
-                AVStreams::notSupported);
-
-      // syntax of fp_name is <flowProtocol>
-      boolean use_flow_protocol(in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      // set_format() initializes 'format' 
-      // as current media format e.g. MPEG.
-      void set_format(in string format)
-        raises (AVStreams::notSupported);
-
-      void set_dev_params(
-                          in PropertyService::Properties new_settings)
-        raises (PropertyService::PropertyException, 
-                AVStreams::streamOpFailed);
-
-      void set_protocol_restriction(in AVStreams::protocolSpec 
-                                    the_spec)
-        raises (AVStreams::notSupported);
-
-      boolean is_fep_compatible(in FlowEndPoint fep) 
-        raises (formatMismatch, deviceQosMismatch);
-
-      boolean set_peer(
-                       in FlowConnection the_fc,
-		
-                       in FlowEndPoint the_peer_fep,
-                       inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed,
-                AVStreams::streamOpFailed);
-
-      boolean set_Mcast_peer(
-                             in FlowConnection the_fc,
-                             in AVStreams::MCastConfigIf a_mcastconfigif,
-                             inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
-      boolean connect_to_peer(inout AVStreams::QoS the_qos,
-                              in string address,
-
-                              in string use_flow_protocol) // syntax <flowProtocol>
-        raises(failedToConnect,
-               AVStreams::FPError, AVStreams::QoSRequestFailed);
-
-      string connect_mcast(inout AVStreams::QoS the_qos,
-                           out boolean is_met,
-                           in string address,
-                           in string use_flow_protocol)
-        raises (failedToConnect,
-                AVStreams::notSupported,
-                AVStreams::FPError,
-                AVStreams::QoSRequestFailed);
-
-      string get_rev_channel(in string pcol_name);
-
-      void set_key(in AVStreams::key the_key);
-      void set_source_id(in long source_id);
-    };
-
-  interface FlowConsumer : FlowEndPoint
-    {
-
-
-      // Needs to know its peer to choose its protocol correctly
-      // Also to ask for a reverse channel for credit-based flow
-      // control, if one is required
-      string go_to_listen(
-                          inout AVStreams::QoS the_qos,
-                          in boolean is_mcast,
-                          in FlowProducer peer,
-                          inout string flowProtocol)// syntax <flowProtocol>
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FDev : PropertyService::PropertySet {
-    FlowProducer create_producer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConsumer create_consumer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConnection bind(in FDev peer_device,
-                        inout AVStreams::QoS the_qos,
-                        out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    FlowConnection bind_mcast(in FDev first_peer,
-                              inout AVStreams::QoS the_qos,
-                              out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    void destroy(in FlowEndPoint the_ep, in string fdev_name)
-      // ie FDev not found
-      raises (AVStreams::notSupported);
-  };
-
-  enum PositionOrigin {
-    AbsolutePosition, RelativePosition, ModuloPosition
-  };
-
-  enum PositionKey {
-    ByteCount, SampleCount, MediaTime
-  };
-
-  struct Position {
-    PositionOrigin origin;
-    PositionKey key;
-    long value;
-  };
-
-  exception PostionKeyNotSupported { PositionKey key;};
-  exception InvalidPosition { PositionKey key;};
-
-  // MediaControl interface is similar to
-  // ControlledStream interface in MSS.
-  // It can be inherited by flow endpoints or
-  // FlowConnection interfaces.
-  interface MediaControl{
-
-    exception PostionKeyNotSupported { PositionKey key;};
-
-    Position get_media_position(
-                                in PositionOrigin an_origin,
-                                in PositionKey a_key)
-      raises (PostionKeyNotSupported);
-
-    void set_media_position(in Position a_position)
-      raises (PostionKeyNotSupported, InvalidPosition);
-
-    void start(in Position a_position)
-      raises(InvalidPosition);
-    void pause(in Position a_position)
-      raises(InvalidPosition);
-    void resume(in Position a_position)
-      raises(InvalidPosition);
-    void stop(in Position a_position)
-      raises(InvalidPosition);
-  };
-};
-
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients.cpp
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
deleted file mode 100644
index 487e688eb2c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    Channel_Clients
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef ACE_CHANNEL_CLIENTS_H
-#define ACE_CHANNEL_CLIENTS_H
-
-#include "orbsvcs/Channel_Clients_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_CHANNEL_CLIENTS_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
deleted file mode 100644
index cc1d2ea78b9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#ifndef ACE_CHANNEL_CLIENTS_T_C
-#define ACE_CHANNEL_CLIENTS_T_C
-
-#include "orbsvcs/Channel_Clients_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
-#endif /* __ACE_INLINE__ */
-
-template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events,
-					CORBA::Environment &_env)
-{
-  target_->push (events, _env);
-}
-
-template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (CORBA::Environment &_env)
-{
-  target_->disconnect_push_consumer (_env);
-}
-
-template<class TARGET> void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (CORBA::Environment &_env)
-{
-  target_->disconnect_push_supplier (_env);
-}
-
-#endif /* ACE_CHANNEL_CLIENTS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
deleted file mode 100644
index 09002a8ebaa..00000000000
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    Channel_Clients_T
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu) and 
-//    Douglas Schmidt (schmidt@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    These classes allow applications to be consumer, suppliers, and
-//    consumer suppliers, as well as being active objects.  This is
-//    accomplished with adapters to prevent the use of multiple
-//    inheritence (which is this root of all evil.)
-//
-// ============================================================================
-
-#ifndef ACE_CHANNEL_CLIENTS_T_H
-#define ACE_CHANNEL_CLIENTS_T_H
-
-#include "orbsvcs/RtecEventCommS.h"
-
-// @@ TODO: Add throw specs to this classes.
-
-template <class TARGET>
-class ACE_PushConsumer_Adapter : public POA_RtecEventComm::PushConsumer
-// = TITLE
-//    ACE Push Consumer Adapter
-//
-// = DESCRIPTION
-//    Forwards all calls to the owner_.
-{
-public:
-  ACE_PushConsumer_Adapter (TARGET *target);
-  // Forwards all calls to <owner>.
-
-  virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &_env);
-  // Forwards to target_.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // Forwards to target_.
-
-private:
-  TARGET *target_;
-};
-
-// ************************************************************
-
-template <class TARGET>
-class ACE_PushSupplier_Adapter : public POA_RtecEventComm::PushSupplier
-// = TITLE
-//    ACE Push Supplier Adapter
-//
-// = DESCRIPTION
-//    Forwards all calls to disconnect_push_supplier the target_.
-{
-public:
-  ACE_PushSupplier_Adapter (TARGET *target);
-  // Forwards all calls to <owner>.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // Forwards to target_.
-
-private:
-  TARGET *target_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Channel_Clients_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Channel_Clients_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_CHANNEL_CLIENTS_T_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
deleted file mode 100644
index 620b6fd04a8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// $Id$
-//
-
-template<class TARGET> ACE_INLINE
-ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t)
-  :  target_ (t)
-{
-}
-
-template<class TARGET> ACE_INLINE
-ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *t)
-  :  target_ (t)
-{
-}
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
deleted file mode 100644
index 95b81728b88..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Concurrency_Service
-//
-// = FILENAME
-//    CC_Lock.cpp
-//
-// = DESCRIPTION
-//      This class implements a lock used by the lock set from the
-//      concurrency control service
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-// #include "tao/corba.h"
-#include "CC_Lock.h"
-
-CC_Lock::CC_Lock(CosConcurrencyControl::lock_mode mode) : mode_ (mode)
-{
-  semaphore_.open("test"); // @@ The semaphore must have a unique name??
-}
-
-CC_Lock::~CC_Lock()
-{
-  semaphore_.close();
-}
-
-void CC_Lock::lock(void)
-{
-  semaphore_.acquire();
-}
-
-CORBA::Boolean CC_Lock::try_lock()
-{
-  semaphore_.tryacquire(); //@@ What does tryacquire return??
-  return CORBA::B_TRUE;
-}
-
-void CC_Lock::unlock(void)
-{
-  semaphore_.release();
-}
-
-void CC_Lock::change_mode(CosConcurrencyControl::lock_mode new_mode)
-{
-  // @@TAO Hmmm, we cannot really do anything at present since there is
-  // only one lock per lock set and that lock is essentially a write lock
-}
-  
-CORBA::Boolean CC_Lock::Compatible(const CC_Lock &other)
-{
-  return this->Compatible(other.mode_);
-}
-
-CORBA::Boolean CC_Lock::Compatible(CosConcurrencyControl::lock_mode mode)
-{
-  return compatible_[this->mode_][mode];
-}
-
-CosConcurrencyControl::lock_mode CC_Lock::GetMode(void)
-{
-  return mode_;
-}
-
-// The check of compatibility is a hard coded table statically allocated
-// This table must be changed if the number of lock modes or their
-// compatibility are changed. 5 = number of lock modes
-CORBA::Boolean CC_Lock::compatible_[5][5] ={
-  {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE},
-  {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE},
-  {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE},
-  {CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_TRUE},
-  {CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE}};
-
-//#if defined (__ACE_INLINE__)
-//#include "CC_Lock.i"
-//#endif // defined INLINE
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
deleted file mode 100644
index 249793df025..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Concurrency_Service
-//
-// = FILENAME
-//    CC_Lock.h
-//
-// = DESCRIPTION
-//      This class implements a lock used by the lock set from the
-//      concurrency control service
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (_CC_LOCK_H)
-#define _CC_LOCK_H
-
-#include "ace/SV_Semaphore_Simple.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
-
-class TAO_ORBSVCS_Export CC_Lock {
-  // = TITLE
-  //     CC_Lock
-  //
-  // = DESCRIPTION
-  //     This class implements the lock concept from the concurrency
-  //     control service. The lock holds its mode - this might later be
-  //     changed to subclasses depending on the differences of the locks.
-  //     At present the is only a lock-pr-thread/client-type which is
-  //     essentially a write lock since it is not allowed to have more
-  //     than one lock pr. servant in this implementation.
-public:
-  CC_Lock(CosConcurrencyControl::lock_mode mode);
-  // Creates the lock with the desired mode
-
-  ~CC_Lock();
-  // Deletes the lock
-
-  void lock(void);
-  // Acquires this lock. Blocks until lock is obtained
-
-  CORBA::Boolean try_lock();
-  // Tries to acquire this lock. If it is not possible to acquire the
-  // lock, false is returned
-
-  void unlock(void);
-  // Releases this lock
-
-  void change_mode(CosConcurrencyControl::lock_mode new_mode);
-  // Changes the mode of this lock
-  
-  CORBA::Boolean Compatible(const CC_Lock &other);
-  // returns true if this lock is compatible with the other lock
-
-  CORBA::Boolean Compatible(CosConcurrencyControl::lock_mode mode);
-  // returns true is this lock is compatible with the referenced mode
-
-  CosConcurrencyControl::lock_mode GetMode(void);
-  // Returns the mode of the lock
-protected:
-  CosConcurrencyControl::lock_mode mode_;
-  // Holds the lock's mode
-private:
-  ACE_SV_Semaphore_Simple semaphore_;
-  // holds the semaphore for this lock
-  static CORBA::Boolean compatible_[5][5];
-  // defines the compatibility of the locks. 5 = number of lock modes
-};
-
-//#if defined (__ACE_INLINE__)
-//#include "CC_Lock.i"
-//#endif // defined INLINE
-
-#endif /* !defined (_CC_LOCK_H) */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
deleted file mode 100644
index 0fe25901e2a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CC_LockSet.cpp
-//
-// = AUTHOR
-//    Torben Worm <tworm@cs.wustl.edu>
-// 
-// ============================================================================
-
-#include "CC_LockSet.h"
-
-// Default constructor. We cannot create the lock at this point because we
-// are not locking anything, and we do not know the mode of the lock. In a
-// full fledged version the lock set (implementation) will be instantiated
-// here
-CC_LockSet::CC_LockSet(void)
-  : related_lockset_ (0)
-{
-  // Do nothing
-}
-
-// Constructor used to create related lock sets.
-CC_LockSet::CC_LockSet(CosConcurrencyControl::LockSet_ptr related)
-  : related_lockset_ (related)
-{
-  // Do nothing
-}
-
-// Destructor. Remove the lock if it exists. In a later version the lock set
-// must be removed here. Actually if all locks have been unlocked no lock
-// instances should exist at this point.
-CC_LockSet::~CC_LockSet(void)
-{
-  if(lock_!=0)
-    delete lock_;
-}
-
-// Locks the lock in the desired mode. Blocks until success. In a later
-// version the lock set should be searched for incompatible locks
-void CC_LockSet::lock(CosConcurrencyControl::lock_mode mode,
-		      CORBA::Environment &env)
-{
-  if(lock==0) {
-    lock_ = new CC_Lock(mode);
-  }
-  lock_->lock();
-}
-
-// Tries to lock. If it is not possible false is returned. Comments for lock
-// holds for later version
-CORBA::Boolean CC_LockSet::try_lock(CosConcurrencyControl::lock_mode mode,
-				    CORBA::Environment &env)
-{
-  return lock_->try_lock();
-}
-
-// Drops the specified lock. In this simple case we have only one lock at
-// any time so we just drop that lock.
-void CC_LockSet::unlock(CosConcurrencyControl::lock_mode mode,
-			CORBA::Environment &env)
-{
-  lock_->unlock();
-}
-
-// Changes the mode of a held lock. In this version we deal with only
-// one type of lock (in reality) and therefore the type is of no meaning
-void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
-			      CosConcurrencyControl::lock_mode new_mode,
-			      CORBA::Environment &env)
-{
-  lock_->change_mode(new_mode);
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
deleted file mode 100644
index d158df6dc3a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Concurrency_Service
-//
-// = FILENAME
-//      CC_LockSet.h
-//
-// = DESCRIPTION
-//      This class implements the lock set interface from the
-//      concurrency service
-//
-// = AUTHORS
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (_CC_LOCKSET_H)
-#define _CC_LOCKSET_H
-
-// #include "tao/corba.h"
-#include "CC_Lock.h"
-#include "orbsvcs/CosConcurrencyControlS.h" // @@OR CosC...C.h???
-
-class TAO_ORBSVCS_Export CC_LockSet :  public POA_CosConcurrencyControl::LockSet
-  // = TITLE
-  //     CC_LockSet
-  //
-  // = DESCRIPTION
-  //     This class implements the LockSet interface that is part
-  //     of the CosConcurrency service. Please consult the idl file for
-  //     detailed descriptions apart from the comments in this file
-{
-public:
-  CC_LockSet(void);
-  // Default constructor
-  
-  CC_LockSet(CosConcurrencyControl::LockSet_ptr related);
-  // Constructor used if create_related is used to create the lock set
-
-  ~CC_LockSet(void);
-  // Destructor
-
-  virtual void lock (CosConcurrencyControl::lock_mode mode,
-		     CORBA::Environment &env);
-  
-  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode,
-				   CORBA::Environment &env);
-  
-  virtual void unlock (CosConcurrencyControl::lock_mode mode,
-		       CORBA::Environment &env);
-  
-  virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-			    CosConcurrencyControl::lock_mode new_mode,
-			    CORBA::Environment &env);
-private:
-  CC_Lock *lock_;
-  // At present the lock set contains only one lock
-
-  CosConcurrencyControl::LockSet_ptr related_lockset_;
-  // If this lock set is related to another lock set, this is the pointer
-  // to the related lock set
-}; // CC_LockSet
-
-//#if defined (__ACE_INLINE__)
-//#include "CC_LockSet.i"
-//#endif // defined INLINE
-
-#endif /* _CC_LOCKSET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
deleted file mode 100644
index f3d2a0c03a1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CC_LockSetFactory.cpp
-//
-// = AUTHOR
-//    Torben Worm <tworm@cs.wustl.edu>
-// 
-// ============================================================================
-
-#include "CC_LockSetFactory.h"
-#include "CC_LockSet.h"
-
-// Default constructor
-CC_LockSetFactory::CC_LockSetFactory(void)
-{
-  ACE_NEW(this->lock_, ACE_Lock_Adapter<ACE_Thread_Mutex> ());
-}
-
-// Destructor
-CC_LockSetFactory::~CC_LockSetFactory(void)
-{
-  delete this->lock_;
-}
-
-CosConcurrencyControl::LockSet_ptr
-  CC_LockSetFactory::create ( CORBA::Environment &env)
-{
-  CC_LockSet *ls = 0;
-
-  env.clear();
-  env.exception(new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD_RETURN(ACE_Lock, ace_mon, *this->lock_,
-                   CosConcurrencyControl::LockSet::_nil());
-
-  env.clear();
-  
-  env.exception(new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_NEW_RETURN(ls, CC_LockSet, CosConcurrencyControl::LockSet::_nil());
-  env.clear();
-
-  return ls->_this(env);
-}
-
-CosConcurrencyControl::LockSet_ptr
-  CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
-				     CORBA::Environment &env)
-{
-  CC_LockSet *ls = 0;
-
-  env.clear();
-  env.exception(new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD_RETURN(ACE_Lock, ace_mon, *this->lock_,
-                   CosConcurrencyControl::LockSet::_nil());
-
-  env.clear();
-  
-  env.exception(new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_NEW_RETURN(ls, CC_LockSet(which),
-                 CosConcurrencyControl::LockSet::_nil());
-  env.clear();
-
-  return ls->_this(env);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
deleted file mode 100644
index 819367452cc..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Concurrency_Service
-//
-// = FILENAME
-//    CC_LockSetFactory.h
-//
-// = DESCRIPTION
-//      This class implements the lock set factory interface from the
-//      concuurency service
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (_CC_LOCKSETFACTORY_H)
-#define _CC_LOCKSETFACTORY_H
-
-// #include "tao/corba.h"
-#include "orbsvcs/CosConcurrencyControlS.h"
-
-class TAO_ORBSVCS_Export CC_LockSetFactory : POA_CosConcurrencyControl::LockSetFactory
-  // = TITLE
-  //     CC_LockSetFactory
-  //
-  // = DESCRIPTION
-  //     This class implements the LockSetFactory interface that is part
-  //     of the CosConcurrency service. Please consult the idl file for
-  //     detailed descriptions apart from the comments in this file
-{
-public:
-  CC_LockSetFactory(void);
-  // Default constructor
-
-  ~CC_LockSetFactory(void);
-  // Destructor
-
-  virtual CosConcurrencyControl::LockSet_ptr create ( CORBA::Environment &env);
-
-  virtual CosConcurrencyControl::LockSet_ptr
-    create_related (CosConcurrencyControl::LockSet_ptr which,
-		    CORBA::Environment &env);
-private:
-  ACE_Lock *lock_;
-  // Lock to serialize the access to the factory.
-}; // CC_LockSetFactory
-
-//#if defined (__ACE_INLINE__)
-//#include "CC_LockSetFactory.i"
-//#endif // defined INLINE
-
-#endif /* _CC_LOCKSETFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
deleted file mode 100644
index 7c6b7fe83d0..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosTransaction.idl
-//
-// = DESCRIPTION
-//    Described in CORBAservices: Common Object Services
-//    Specification, chapter 7 The concurrency service description can
-//    be downloaded from
-//    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    OMG and Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-//CosConcurrencyControl Module, page 7-8
-//Includes the following interfaces:
-//  LockCoordinator, LockSet, TransactionalLockSet, LockSetFactory
-
-// The part depending on the transaction service may be included by defining
-// TAO_HAS_TRANSACTION_CONTROL_SERVICE
-
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
-#include <CosTransactions.idl>
-#endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
-
-module CosConcurrencyControl 
-// = TITLE
-//     CosConcurrencyControl
-//
-// = DESCRIPTION
-//     This idl file describes the concurrency control service.
-//     The purpose of the concurrency control service is to mediate
-//     concurrent access to an pbject such that the consistency of
-//     the object is not compromised when accessed by concurrently
-//     executing computations.
-{
-  enum lock_mode 
-  {
-    read,
-    write,
-    upgrade,
-    intention_read,
-    intention_write
-  };
-  // This is the different lock types supported by this module. For a
-  // description of the compatability between the different lock types
-  // please consult the service description (OMG).
-
-  exception LockNotHeld {};
-  // The LockNotHeld exception is is raised when an operation to unlock
-  // or change the mode of a lock is called and the specified lock is not
-  // held
-
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
-  // @@TAO I'm in doubt here. The lock coordinator is designed for
-  //       transactional lock sets?? - tworm
-  interface LockCoordinator
-    {
-      // = TITLE
-      //     LockCoordinator drops all locks associated with a transaction.
-      // = DESCRIPTION
-      //     The LockCoordinator interface enables a transaction service to 
-      //     drop all locks held by a transaction.
-
-      void drop_locks ();
-      // Releases all the locks held by the transaction. Designet to be
-      // used by transaction service when a transaction commits or aborts.
-    };
-#endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
-
-  interface LockSet
-    {
-      // = TITLE
-      //     LockSet inteface to the concurrency service in implicit mode
-      // = DESCRIPTION
-      //     Clients operating in the implicit mode (i.e. non-transactional
-      //     mode) acquire and release locks in lock sets throug this
-      //     interface. The interface only provides operations to acquire
-      //     and release locks on behalf of the calling thread or transaction.
-
-      void lock (in lock_mode mode);
-      // Acquires a lock on the specified lock set in the specified mode.
-      // Blocks until lock is obtained
-
-      boolean try_lock (in lock_mode mode);
-      // Tries to acquire a lock on the specified lock set. If it is not
-      // possible to acquire the lock false is returned
-
-      void unlock (in lock_mode mode)
-        raises (LockNotHeld);
-      // Releases a single lock on the specified lock set. A lock can be
-      // held multiple times in the same mode. If the lock is not held the
-      // exception LockNotHeld is raised
-
-      void change_mode (in lock_mode held_mode,
-                        in lock_mode new_mode)
-        raises (LockNotHeld);
-      // Changes the mode of the lock on the specified lock set. If a
-      // conflicting lock is held by another client the call blocks until
-      // the new mode can be granted. If the lock is not held in the
-      // specified mode the exception LockNotHeld is raised.
-
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
-      LockCoordinator get_coordinator (in CosTransactions::Coordinator which);
-      // Returns the lock coordinator associated with the specified
-      // transaction.
-#endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
-    };
-
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
-  interface TransactionalLockSet
-    {
-      // = TITLE
-      //     TransactionalLockSet interface to the concurrency service
-      //     in transactional mode
-      // = DESCRIPTION
-      //     Clients operating in the transactional mode acquire and
-      //     release locks in lock sets through this interface. The
-      //     interface provides operations identical to the operations
-      //     described in the LockSet interface section. The difference
-      //     beeing that the coordinator for the transaction is explicitly
-      //     passed as a reference to the operations. Please see the
-      //     description of the LockSet interface for a detailed description.
-      
-      void lock (in CosTransactions::Coordinator current,
-                 in lock_mode mode);
-      // See LockSet::lock
-      
-      boolean try_lock (in CosTransactions::Coordinator current,
-                        in lock_mode mode);
-      // See LockSet::try_lock
-      
-      void unlock (in CosTransactions::Coordinator current,
-                   in lock_mode mode)
-        raises (LockNotHeld);
-      // See LockSet::unlock
-      
-      void change_mode (in CosTransactions::Coordinator current,
-                        in lock_mode held_mode,
-                        in lock_mode new_mode)
-        raises (LockNotHeld);
-      // See LockSet::change_mode
-      
-      LockCoordinator get_coordinator (in CosTransactions::Coordinator which);
-      // See LockSet::get_coordinator
-    };
-#endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
-
-  interface LockSetFactory
-    {
-      // = TITLE
-      //     Factory interface for the LockSet and TransactionalLockSet
-      //     interfaces
-      // = DESCRIPTION
-      //     Factory for creating the lock sets
-
-      LockSet create ();
-      // Creates a new LockSet and lock coordinator
-      // @@TAO ??? is this correct? Lock coordinators are associated with
-      //       transactions. - tworm
-
-      LockSet create_related (in LockSet which);
-      // Creates a lock set related to the specified lock set. Related lock
-      // sets drop their locks together.
-
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
-      TransactionalLockSet create_transactional ();
-      // Creates a new TransactionalLockSet and lock coordinator for
-      // transactional mode clients.
-
-      TransactionalLockSet
-	create_transactional_related (in TransactionalLockSet which);
-      // Creates a new transactional lock set related to the specified lock
-      // set. Related lock sets drop locks together.
-#endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
-    };
-};
-
-
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
deleted file mode 100644
index e687b08fcd5..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosLifeCycle.idl
-//
-// = DESCRIPTION
-//    Described in CORBAservices: Common Object Services Specification,
-//    chapter 6.
-//    The life cycle service description can be downloaded from:
-//      ftp://www.omg.org/pub/docs/formal/97-12-13.pdf
-//    The original IDL file can be downloaede from:
-//      ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    OMG and Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-
-// OMG IDL for CosLifeCycle Module, page 6-10 in 
-// Includes the following interfaces:
-//   FactoryFinder, LifeCycleObject, GenericFactory
-
-#include "CosNaming.idl"
-
-module CosLifeCycle{
-  // = TITLE
-  //     CosLifeCycle
-  //
-  // = DESCRIPTION
-  //     This idl file describes the life cycle service.
-  //     The purpose of the life cycle service is to 
-  //
-  
-  typedef CosNaming::Name Key; 
-  typedef Object Factory;
-  typedef sequence <Factory> Factories;
-  typedef struct NVP {	 
-    CosNaming::Istring name; 
-    any value; 
-  } NameValuePair;
-  typedef sequence <NameValuePair> Criteria;
-  
-  exception NoFactory {
-    Key search_key;
-  };
-  exception NotCopyable { string reason; };
-  exception NotMovable { string reason; };
-  exception NotRemovable { string reason; };
-  exception InvalidCriteria{ 
-    Criteria invalid_criteria;
-  };
-  exception CannotMeetCriteria {
-    Criteria unmet_criteria;
-  };
-  
-  interface FactoryFinder {
-    // = TITLE
-    //     
-    // = DESCRIPTION
-    //     
-    //     
-
-    Factories find_factories(in Key factory_key)
-      raises(NoFactory);
-  };
-  
-  interface LifeCycleObject {
-    // = TITLE
-    //     
-    // = DESCRIPTION
-    //     
-    //     
-
-    LifeCycleObject copy(in FactoryFinder there, 
-			 in Criteria the_criteria)
-      raises(NoFactory, NotCopyable, InvalidCriteria, CannotMeetCriteria);
-    void move(in FactoryFinder there, 
-	      in Criteria the_criteria)
-      raises(NoFactory, NotMovable, InvalidCriteria,  CannotMeetCriteria);
-    void remove()
-      raises(NotRemovable);
-  };
-  
-  interface GenericFactory {
-    // = TITLE
-    //     
-    // = DESCRIPTION
-    //     
-    //     
-
-    boolean supports(in Key k);
-    Object create_object(in Key	k, 
-			 in Criteria the_criteria)
-      raises (NoFactory, InvalidCriteria, CannotMeetCriteria);
-  };
-};
-
-
-
-// Criteria, page 6-17:
-
-typedef struct NVP {
-  CosNaming::Istring name;	
-  any value;
-} NameValuePair;
-
-typedef sequence <NameValuePair> Criteria;
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.idl b/TAO/orbsvcs/orbsvcs/CosNaming.idl
deleted file mode 100644
index e9064eec131..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosNaming.idl
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    CosNaming.idl
-//
-// = AUTHOR
-//    Marina Spivak
-//
-// ============================================================================
-
-module CosNaming
-  // = TITLE
-  // This module provides interface for using COS Naming Service.
-{
-  typedef string Istring;
-  struct NameComponent
-  {
-    Istring id;
-    // This is the name that is used to identify object references.
-
-    Istring kind;
-    // Stores any addtional info about the object reference.
-  };
-  // This is a 'simple' name.
-  // NOTE: both id and kind fields are used in resolving names.
-
-  typedef sequence <NameComponent> Name;
-  // This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
-  // the names of the nested contexts, and cn is the name of the
-  // object bound in cn-1.
-
-  enum BindingType
-  {
-    nobject,
-    // object binding.
-
-    ncontext
-    // naming context binding.
-  };
-
-  struct Binding
-  {
-    Name    	binding_name;
-    BindingType	binding_type;
-  };
-
-  typedef sequence <Binding> BindingList;
-
-  interface BindingIterator;
-  // Forward declaration.
-
-  interface NamingContext
-    // = TITLE
-    // Interface for managing name bindings and naming contexts.
-    {
-      // = Exceptions.
-
-      enum NotFoundReason
-      {
-	missing_node,
-	not_context,
-	not_object
-      };
-
-      exception NotFound
-	{
-	  NotFoundReason why;
-	  Name rest_of_name;
-	};
-      // Indicates that the name does not identify a binding.
-
-      exception CannotProceed
-	{
-	  //Commented out due to the bug in Orbix compiler
-	  NamingContext cxt;
-	  Name rest_of_name;
-	};
-      // Implementation has given up for some reason.  The client,
-      // however, may be able to continue operation at the returned
-      // naming context.
-
-      exception InvalidName {};
-      // A name of length 0 is invalid.
-      // Implementations may place further restrictions.
-
-      exception AlreadyBound {};
-      // Indicates that the specified name is already bound to some
-      // object.  Only one object can be bound to a particular name in
-      // a context.  To change the binding, <rebind> and
-      // <rebind_context> can be used.
-
-      exception NotEmpty {};
-      // Indicates that the context is not empty.
-
-      // = Binding operations.
-
-      void bind (in Name n, in Object obj)
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // create a binding for name <n> and object <obj> in the naming
-      // context.  Compound names are treated as follows: ctx->bind
-      // (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-      // cn-1>))->bind (<cn>, obj) if the there already exists a
-      // binding for the specified name, <AlreadyBound> exception is
-      // thrown.  Naming contexts should be bound using <bind_context>
-      // and <rebind_context> in order to participate in name
-      // resolution later.
-
-      void rebind (in Name n, in Object obj)
-	raises(NotFound, CannotProceed, InvalidName);
-      // this is similar to <bind> operation above, except for when
-      // the binding for the specified name already exists in the
-      // specified context.  In that case, the existing binding is
-      // replaced with the new one.
-
-      void bind_context (in Name n, in NamingContext nc)
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // This is the version of <bind> specifically for binding naming
-      // contexts, so that they will participate in name resolution
-      // when compound names are passed to be resolved.
-
-      void rebind_context (in Name n, in NamingContext nc)
-	raises(NotFound, CannotProceed, InvalidName);
-      // This is a version of <rebind> specifically for naming
-      // contexts, so that they can participate in name resolution
-      // when compound names are passed.
-
-      // = Resolving names.
-
-      Object resolve (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Return object reference that is bound to the name.  Compound
-      // name resolve is defined as follows: ctx->resolve (<c1; c2;
-      // cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-      // naming service does not return the type of the object.
-      // Clients are responsible for "narrowing" the object to the
-      // appropriate type.
-
-      // = Unbinding names.
-
-      void unbind (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Remove the name binding from the context.  When compound
-      // names are used, unbind is defined as follows: ctx->unbind
-      // (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-      // (<cn>)
-
-      // = Creating Naming Contexts.
-
-      NamingContext new_context ();
-      // This operation returns a new naming context implemented by
-      // the same naming server in which the operation was invoked.
-      // The context is not bound.
-
-      NamingContext bind_new_context (in Name n)
-	raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-      // This operation creates a new context and binds it to the name
-      // supplied as an argument.  The newly-created context is
-      // implemented by the same server as the context in which it was
-      // bound (the name argument excluding the last component).
-
-      // = Deleting contexts.
-
-      void destroy ()
-	raises (NotEmpty);
-      // Delete the naming context.  NOTE: the user should <unbind>
-      // any bindings in which the given context is bound to some
-      // names before invoking <destroy> operation on it.  Ignoring
-      // this rule may cause unexpected behaviour.  <destroy> deletes
-      // the context object if it is not bound to any names in the
-      // given address space.  <destroys> decrements the reference
-      // count of the context if bindings to it exist.
-
-      // = Listing the naming context.
-
-      void list (in unsigned long how_many,
-		 out BindingList bl, out BindingIterator bi);
-      // Returns at most the requested number of bindings <how_many>
-      // in <bl>.  If the naming context contains additional bindings,
-      // they are returned with a BindingIterator.  In the naming
-      // context does not contain any additional bindings <bi>
-      // returned as null.
-    };
-
-  interface BindingIterator
-    // = TITLE
-    // Interface for iterating over Bindings returned with the <list>
-    // operation.
-    {
-      boolean next_one (out Binding b);
-      // This operation returns the next binding.  If there are no
-      // more bindings false is returned.
-
-      boolean next_n (in unsigned long how_many,
-		      out BindingList bl);
-      // This operation returns at most the requested number of
-      // bindings.
-
-      void destroy ();
-      // This operation destroys the iterator.
-    };
-};
diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
deleted file mode 100644
index f38224143f3..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
+++ /dev/null
@@ -1,405 +0,0 @@
-// -*-c++-*-
-
-// $Id$
-
-// ===================================================================================
-//
-// = LIBRARY
-//     cos
-//
-// = FILENAME
-//     CosPropertyService.idl
-//
-// = DESCRITION
-//     The property service, downloaded from ftp://ftp.omg.org/pub/docs/1995/95-06-01.ps
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ======================================================================================
-
-module CosPropertyService
-{
-  // = TITLE
-  //     CosPropertyService : To support properties (that are typed
-  //     named values dynamically associated with an object, outside
-  //     of the type system.
-  //
-  // = DESCRIPTION
-  //     The data types and interfaces to deal with property names, property values,
-  //     property modes etc.
-
-  // = Data Types.
-
-  typedef string PropertyName;
-
-  struct Property
-  {
-    PropertyName property_name;
-    any property_value;
-  };
-
-  enum PropertyModeType
-  {
-    normal,
-    read_only,
-    fixed_normal,
-    fixed_readonly,
-    undefined
-  };
-
-  struct PropertyDef
-  {
-    PropertyName property_name;
-    any property_value;
-    PropertyModeType property_mode;
-  };
-
-  struct PropertyMode
-  {
-    PropertyName property_name;
-    PropertyModeType property_mode;
-  };
-
-  typedef sequence<PropertyName> PropertyNames;
-  typedef sequence<Property> Properties;
-  typedef sequence<PropertyDef> PropertyDefs;
-  typedef sequence<PropertyMode> PropertyModes;
-  typedef sequence<TypeCode> PropertyTypes;
-
-  interface PropertyNamesIterator;
-  interface PropertiesIterator;
-  interface PropertySetFactory;
-  interface PropertySetDef;
-  interface PropertySet;
-
-  // = Exceptions
-
-  exception ConstraintNotSupported {};
-  exception InvalidPropertyName {};
-  exception ConflictingProperty {};
-  exception PropertyNotFound {};
-  exception UnsupportedTypeCode {};
-  exception UnsupportedProperty {};
-  exception UnsupportedMode {};
-  exception FixedProperty {};
-  exception ReadOnlyProperty {};
-
-  enum ExceptionReason
-  {
-    invalid_property_name,
-    conflicting_property,
-    property_not_found,
-    unsupported_type_code,
-    unsupported_property,
-    unsupported_mode,
-    fixed_property,
-    read_only_property
-  };
-
-  exception PropertyException
-    {
-      ExceptionReason reason;
-      PropertyName failing_property_name;
-    };
-
-  // @@
-  //  typedef sequence<PropertyException> PropertyExceptions;
-
-  exception MultipleExceptions
-    {
-      // @@
-      //  PropertyExceptions exceptions;
-    };
-
-  // = Interface Definitions.
-
-  interface PropertySetFactory
-    {
-      // = TITLE
-      //     Factory class for PropertySet interface.
-      // = DESCRIPTION
-      //     Support for creating PropertySets with initial
-      //     constraints and properties.
-
-      PropertySet create_propertyset ();
-      // The create_propertyset operation returns a new
-      // PropertySet. It is considered an implementation issue as to
-      // whether the PropertySet contains any initial properties or
-      // has constraints.
-
-      PropertySet create_constrained_propertyset (in PropertyTypes allowed_property_types,
-                                                 in Properties allowed_properties)
-        raises (ConstraintNotSupported);
-      // The create_constrained_propertyset operation allows a client
-      // to create a new PropertySet with specific constraints.
-
-      PropertySet create_initial_propertyset (in Properties initial_properties)
-        raises (MultipleExceptions);
-      // The create_initial_propertyset operation allows a client to
-      // create a new PropertySet with specific initial properties.
-    };
-
-  interface PropertySetDefFactory
-    {
-      // = TITLE
-      //     Factory class for PropertySetDef interface.
-      // = DESCRIPTION
-      //     Support for creating Propsetdefs with initial constraints
-      //     and properties.
-
-      PropertySetDef create_propertysetdef ();
-      //  The create_propertysetdef operation returns a new
-      //  PropertySetDef.
-
-      PropertySetDef create_constrained_propertysetdef (in PropertyTypes allowed_property_types,
-                                                        in PropertyDefs  allowed_property_defs)
-        raises (ConstraintNotSupported);
-      // The create_constrained_propertysetdef operation allows a
-      // client to create a new PropertySetDef with specific
-      // constraints, including property modes.
-
-      PropertySetDef create_initial_propertysetdef (in PropertyDefs initial_property_defs)
-        raises (MultipleExceptions);
-      // The create_initial_propertysetdef operation allows a client
-      // to create a new PropertySetDef with specific initial
-      // properties, including property modes.
-    };
-
-  interface PropertySet
-    {
-      // = TITLE
-      //     The PropertySet interface provides operations to define
-      //     and modify properties, list and get properties, and
-      //     delete properties.
-      //
-      // = DESCRIPTION
-      //     Provides support for defining and modifying properties,
-      //     getting properties and their names and deleting properties.
-
-      // = Support for defining and modifying properties.
-
-      void define_property (in PropertyName property_name,
-                            in any property_value)
-        raises (InvalidPropertyName,
-                ConflictingProperty,
-                UnsupportedTypeCode,
-                UnsupportedProperty,
-                ReadOnlyProperty);
-      // Will modify or add a property to the PropertySet. If the
-      // property already exists, then the property type is checked
-      // before the value is overwritten. If the property does not
-      // exist, then the property is added to the PropertySet.
-
-      void define_properties (in Properties nproperties)
-        raises (MultipleExceptions);
-      // Will modify or add each of the properties in Properties
-      // parameter to the PropertySet. For each property in the list,
-      // if the property already exists, then the property type is
-      // checked before overwriting the value. If the property does
-      // not exist, then the property is added to the PropertySet.
-
-      // = Support for Getting Properties and their Names.
-
-      unsigned long get_number_of_properties ();
-      // Returns the current number of properties associated with this
-      // PropertySet.
-
-      void get_all_property_names (in unsigned long how_many,
-                                   out PropertyNames property_names,
-                                   out PropertyNamesIterator rest);
-      // Returns all of the property names currently defined in the
-      // PropertySet. If the PropertySet contains more than how_many
-      // property names, then the remaining property names are put
-      // into the PropertyNamesIterator.
-
-      any  get_property_value (in  PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName);
-      // Returns the value of a property in the PropertySet.
-
-      boolean get_properties (in PropertyNames property_names,
-                              out Properties nproperties);
-      // Returns the values of the properties listed in
-      // property_names.
-
-      void get_all_properties (in unsigned long how_many,
-                               out Properties nproperties,
-                               out PropertiesIterator rest);
-      // Returns all of the property names currently defined in the
-      // PropertySet. If the PropertySet contains more than how_many
-      // property names, then the remaining property names are put
-      // into the PropertyNamesIterator.
-
-      // = Support for Deleting Properties.
-
-      void delete_property (in PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName,
-                FixedProperty);
-      // Deletes the specified property if it exists from a
-      // PropertySet.
-
-
-      void delete_properties (in PropertyNames property_names)
-        raises (MultipleExceptions);
-      // Deletes the properties defined in the property_names
-      // parameter. This is a batch operation that returns the
-      // MultipleExceptions exception if any delete failed.
-
-      boolean delete_all_properties ();
-      // Variation of delete_properties. Applies to all properties.
-
-      // = Support for Existence Check.
-
-      boolean is_property_defined (in PropertyName property_name)
-        raises (InvalidPropertyName);
-      // The is_property_defined operation returns true if the
-      // property is defined in the PropertySet, and returns false
-      // otherwise.
-    };
-
-  interface PropertySetDef:PropertySet
-    {
-      // = TITLE
-      //     Interface to deal with the Property Modes.
-      //
-      // = DESCRIPTION
-      //     The PropertySetDef interface is a specialization
-      //     (subclass) of the PropertySet interface. The
-      //     PropertySetDef interface provides operations to retrieve
-      //     PropertySet constraints, define and modify properties
-      //     with modes, and to get or set property modes.
-
-      void get_allowed_property_types (out PropertyTypes property_types);
-      // Indicates which types of properties are supported by this
-      // PropertySet. If the output sequence is empty, then there is
-      // no restrictions on the any TypeCode portion of the
-      // property_value field of a Property in this PropertySet,
-      // unless the get_allowed_properties output sequence is not empty.
-
-      void get_allowed_properties (out PropertyDefs property_defs);
-      // Indicates which properties are supported by this
-      // PropertySet. If the output sequence is empty, then there is
-      // no restrictions on the properties that can be in this
-      // PropertySet, unless the get_allowed_property_types output
-      // sequence is not empty.
-
-      void define_property_with_mode (in PropertyName property_name,
-                                      in any property_value,
-                                      in PropertyModeType property_mode)
-        raises (InvalidPropertyName,
-                ConflictingProperty,
-                UnsupportedTypeCode,
-                UnsupportedProperty,
-                UnsupportedMode,
-                ReadOnlyProperty);
-      // This operation will modify or add a property to the
-      // PropertySet. If the property already exists, then the
-      // property type is checked before the value is overwritten. The
-      // property mode is also checked to be sure a new value may be
-      // written. If the property does not exist, then the property is
-      // added to the PropertySet. To change the any TypeCode portion
-      // of the property_value of a property, a client must first
-      // delete_property, then invoke the define_property_with_mode.
-
-      void define_properties_with_modes (in PropertyDefs property_defs)
-        raises (MultipleExceptions);
-      // This operation will modify or add each of the properties in
-      // the Properties parameter to the PropertySet. For each
-      // property in the list, if the property already exists, then
-      // the property type is checked before overwriting the
-      // value. The property mode is also checked to be sure a new
-      // value may be written. If the property does not exist, then
-      // the property is added to the PropertySet. This is a batch
-      // operation that returns the MultipleExceptions exception if
-      // any define operation failed.
-
-      // = Support for Getting and Setting Property Modes.
-
-      PropertyModeType get_property_mode (in  PropertyName property_name)
-        raises (PropertyNotFound,
-                InvalidPropertyName);
-      // Support for Getting and Setting Property Modes.
-
-      boolean get_property_modes (in PropertyNames property_names,
-                                 out PropertyModes property_modes);
-      // Support for Getting and Setting Property Modes.
-
-      void set_property_mode (in PropertyName property_name,
-                             in PropertyModeType property_mode)
-        raises (InvalidPropertyName,
-                PropertyNotFound,
-                UnsupportedMode);
-      // Sets the mode of a property in the PropertySet.
-
-      void set_property_modes (in PropertyModes property_modes)
-        raises (MultipleExceptions);
-      // Sets the mode for each property in the property_modes
-      // parameter. This is a batch operation that returns the
-      // MultipleExceptions exception if any set failed.
-
-    };
-
-  interface PropertyNamesIterator
-    {
-      // = TITLE
-      //     Interface for iterating thru the Property Names.
-      //
-      // = DESCRIPTION
-      //     The PropertyNamesIterator interface allows a client to
-      //     iterate through the names using the next_one or next_n operations.
-
-      void reset ();
-      // The reset operation resets the position in an iterator to the
-      // first property, if one exists.
-
-      boolean next_one (out PropertyName property_name);
-      // The next_one operation returns true if an item exists at the
-      // current position in the iterator with an output parameter of
-      // a property name. A return of false signifies no more items in
-      // the iterator.
-
-      boolean next_n (in unsigned long how_many,
-                      out PropertyNames property_names);
-      // The next_n operation returns true if an item exists at the
-      // current position in the iterator and the how_many parameter
-      // was set greater than zero. The output is a PropertyNames
-      // sequence with at most the how_many number of names. A return
-      // of false signifies no more items in the iterator.
-
-      void destroy ();
-      // The destroy operation destroys the iterator.
-    };
-
-  interface PropertiesIterator
-    {
-      // = TITLE
-      //     Interface for iterating thru the Properties.
-      //
-      // = DESCRIPTION
-      //     allows a client to through the name-value pairs using the
-      //     next_one or next_n operations.
-
-      void reset ();
-      // The reset operation resets the position in an iterator to the
-      // first property, if one exists.
-
-      boolean next_one (out Property aproperty);
-      // The next_one operation returns true if an item exists at the
-      // current position in the iterator with an output parameter of
-      // a property. A return of false signifies no more items in the
-      // iterator.
-
-      boolean next_n (in unsigned long how_many,
-                      out Properties nproperties);
-      // The next_n operation returns true if an item exists at the
-      // current position in the iterator and the how_many parameter
-      // was set greater than zero. The output is a properties
-      // sequence with at most the how_many number of properties. A
-      // return of false signifies no more items in the iterator.
-
-      void destroy ();
-      // The destroy operation destroys the iterator.
-    };
-};
diff --git a/TAO/orbsvcs/orbsvcs/CosTimeBase.idl b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
deleted file mode 100644
index 280031306f0..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef COS_TIME_BASE_IDL
-#define COS_TIME_BASE_IDL
-
-module TimeBase {
-  // = TITLE
-  //   COS Time Service basic types.
-  //
-  // = DESCRIPTION
-  //   The standard CORBA Time Service defines a number of data
-  //   structures to manipulate and express time.
-  //   TAO does not implement this standard service (yet), but we use
-  //   the standard types.
-  //
-
-#if 1
-  // interim definition of type ulonglong pending the
-  // adoption of the type extension RFP.
-  // @@ We also need support for 64-bit integers in TAO IDL compiler.
-  struct ulonglong {
-    unsigned long low;
-    unsigned long high;
-  };
-  typedef ulonglong TimeT;
-#else
-  typedef unsigned long long TimeT;
-#endif
-  // As yet the IDL compiler does not support 64-bit quantities, we
-  // resort to the original definition of TimeT before long long
-  // numbers were added to IDL.
-  //
-  // Time in TimeT is expressed in units of 100 nano seconds (in
-  // other words 10^-7 seconds), and are relative to October 15, 1582;
-  // please read the spec for further details.
-
-  typedef TimeT InaccuracyT;
-  // To express an error estimate for time.
-
-  typedef short TdfT;
-  // Minutes of displacement from the Greenwich time.
-
-  struct UtcT {
-    // = TITLE
-    //   The UTC time structure.
-    TimeT time;
-    unsigned long inacclo;
-    unsigned short inacchi;
-    TdfT tdf;
-  };
-
-  struct IntervalT {
-    // = TITLE
-    //   A time interval
-    TimeT lower_bound;
-    TimeT upper_bound;
-  };
-};
-
-#endif /* COS_TIME_BASE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
deleted file mode 100644
index bfdd695fe31..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ /dev/null
@@ -1,711 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = FILENAME
-//   CosTrading.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-// 
-// ========================================================================
-
-
-module CosTrading {
-
-	// forward references to our interfaces
-
-	interface Lookup;
-	interface Register;
-	interface Link;
-	interface Proxy;
-	interface Admin;
-	interface OfferIterator;
-	interface OfferIdIterator;
-
-	// type definitions used in more than one interface
-
-	typedef string Istring;
-	typedef Object TypeRepository;
-
-	typedef Istring PropertyName;
-	typedef sequence<PropertyName> PropertyNameSeq;
-	typedef any PropertyValue;
-	struct Property {
-		PropertyName name;
-		PropertyValue value;
-	};
-	typedef sequence<Property> PropertySeq;
-
-	struct Offer {
-		Object reference;
-		PropertySeq properties;
-	};
-	typedef sequence<Offer> OfferSeq;
-
-	typedef string OfferId;
-	typedef sequence<OfferId> OfferIdSeq;
-
-	typedef Istring ServiceTypeName;  // similar structure to IR::Identifier
-
-	typedef Istring Constraint;
-
-	enum FollowOption {
-		local_only, 
-		if_no_local, 
-		always
-	};
-
-	typedef Istring LinkName;
-	typedef sequence<LinkName> LinkNameSeq;
-	typedef LinkNameSeq TraderName;
-
-	typedef string PolicyName;  // policy names restricted to Latin1
-	typedef sequence<PolicyName> PolicyNameSeq;
-	typedef any PolicyValue;
-	struct Policy {
-		PolicyName name;
-		PolicyValue value;
-	};
-	typedef sequence<Policy> PolicySeq;
-
-	// exceptions used in more than one interface
-
-	exception UnknownMaxLeft {};
-
-	exception NotImplemented {};
-
-	exception IllegalServiceType {
-		ServiceTypeName type;
-	};
-
-	exception UnknownServiceType {
-		ServiceTypeName type;
-	};
-
-	exception IllegalPropertyName {
-		PropertyName name;
-	};
-
-	exception DuplicatePropertyName {
-		PropertyName name;
-	};
-	exception PropertyTypeMismatch {
-		ServiceTypeName type;
-		Property prop;
-	};
-
-	exception MissingMandatoryProperty {
-		ServiceTypeName type;
-		PropertyName name;
-	};
-
-	exception ReadonlyDynamicProperty {
-		ServiceTypeName type;
-		PropertyName name;
-	};
-
-	exception IllegalConstraint {
-		Constraint constr;
-	};
-
-	exception InvalidLookupRef {
-		Lookup target;
-	};
-	  
-	exception IllegalOfferId {
-		OfferId id;
-	};
-
-	exception UnknownOfferId {
-		OfferId id;
-	};
-
-	exception DuplicatePolicyName {
-		PolicyName name;
-	};
-
-	// the interfaces
-
-	interface TraderComponents {
-
-		readonly attribute Lookup lookup_if;
-		readonly attribute Register register_if;
-		readonly attribute Link link_if;
-		readonly attribute Proxy proxy_if;
-		readonly attribute Admin admin_if;
-	};
-
-	interface SupportAttributes {
-
-		readonly attribute boolean supports_modifiable_properties;
-		readonly attribute boolean supports_dynamic_properties;
-		readonly attribute boolean supports_proxy_offers;
-		readonly attribute TypeRepository type_repos;
-	};
-
-	interface ImportAttributes {
-
-		readonly attribute unsigned long def_search_card;
-		readonly attribute unsigned long max_search_card;
-		readonly attribute unsigned long def_match_card;
-		readonly attribute unsigned long max_match_card;
-		readonly attribute unsigned long def_return_card;
-		readonly attribute unsigned long max_return_card;
-		readonly attribute unsigned long max_list;
-		readonly attribute unsigned long def_hop_count;
-		readonly attribute unsigned long max_hop_count;
-		readonly attribute FollowOption def_follow_policy;
-		readonly attribute FollowOption max_follow_policy;
-	};
-
-	interface LinkAttributes {
-
-		readonly attribute FollowOption max_link_follow_policy;
-	};
-
-	interface Lookup:TraderComponents,SupportAttributes,ImportAttributes {
-
-		typedef Istring Preference;
-
-		enum HowManyProps { none, some, all };
-
-		union SpecifiedProps switch ( HowManyProps ) {
-			case some: PropertyNameSeq prop_names;
-		};
-
-		exception IllegalPreference {
-			Preference pref;
-		};
-
-		exception IllegalPolicyName {
-			PolicyName name;
-		};
-
-		exception PolicyTypeMismatch {
-			Policy the_policy;
-		};
-
-		exception InvalidPolicyValue {
-			Policy the_policy;
-		};
-
-		void query ( 
-			in ServiceTypeName type,
-			in Constraint constr,
-			in Preference pref,
-			in PolicySeq policies,
-			in SpecifiedProps desired_props,
-			in unsigned long how_many,
-			out OfferSeq offers,
-			out OfferIterator offer_itr,
-			out PolicyNameSeq limits_applied
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			IllegalConstraint,
-			IllegalPreference,
-			IllegalPolicyName,
-			PolicyTypeMismatch,
-			InvalidPolicyValue,
-			IllegalPropertyName,
-			DuplicatePropertyName,
-			DuplicatePolicyName
-		);
-	};
-
-	interface Register : TraderComponents, SupportAttributes {
-
-		struct OfferInfo {
-			Object reference;
-			ServiceTypeName type;
-			PropertySeq properties;
-		};
-
-		exception InvalidObjectRef {
-			Object ref;
-		};
-
-		exception UnknownPropertyName {
-			PropertyName name;
-		};
-
-		exception InterfaceTypeMismatch {
-			ServiceTypeName type;
-			Object reference;
-		};
-
-		exception ProxyOfferId {
-			OfferId id;
-		};
-
-		exception MandatoryProperty {
-			ServiceTypeName type;
-			PropertyName name;
-		};
-
-		exception ReadonlyProperty {
-			ServiceTypeName type;
-			PropertyName name;
-		};
-
-		exception NoMatchingOffers {
-			Constraint constr;
-		};
-
-		exception IllegalTraderName {
-			TraderName name;
-		};
-
-		exception UnknownTraderName {
-			TraderName name;
-		};
-
-		exception RegisterNotSupported {
-			TraderName name;
-		};
-
-		OfferId export (
-			in Object reference,
-			in ServiceTypeName type,
-			in PropertySeq properties
-		) raises ( 
-			InvalidObjectRef,
-			IllegalServiceType,
-			UnknownServiceType,
-			InterfaceTypeMismatch, 
-			IllegalPropertyName, // e.g. prop_name = "<foo-bar"
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MissingMandatoryProperty,
-			DuplicatePropertyName
-		);
-
-		void withdraw (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			ProxyOfferId
-		);
-
-		OfferInfo describe (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			ProxyOfferId
-		);
-
-		void modify (
-			in OfferId id,
-			in PropertyNameSeq del_list,
-			in PropertySeq modify_list
-		) raises ( 
-			NotImplemented,
-			IllegalOfferId, 
-			UnknownOfferId,
-			ProxyOfferId,
-			IllegalPropertyName,
-			UnknownPropertyName,
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MandatoryProperty,
-			ReadonlyProperty,
-			DuplicatePropertyName
-		);
-
-		void withdraw_using_constraint (
-			in ServiceTypeName type,
-			in Constraint constr
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			IllegalConstraint,
-			NoMatchingOffers
-		);
-
-		Register resolve (
-			in TraderName name
-		) raises (
-			IllegalTraderName,
-			UnknownTraderName,
-			RegisterNotSupported
-		);
-	};
-
-	interface Link : TraderComponents, SupportAttributes, LinkAttributes {
-
-		struct LinkInfo {
-			Lookup target;
-			Register target_reg;
-			FollowOption def_pass_on_follow_rule;
-			FollowOption limiting_follow_rule;
-		};
-
-		exception IllegalLinkName {
-			LinkName name;
-		};
-
-		exception UnknownLinkName {
-			LinkName name;
-		};
-
-		exception DuplicateLinkName {
-			LinkName name;
-		};
-		exception DefaultFollowTooPermissive {
-			FollowOption def_pass_on_follow_rule;
-			FollowOption limiting_follow_rule;
-		};
-
-		exception LimitingFollowTooPermissive {
-			FollowOption limiting_follow_rule;
-			FollowOption max_link_follow_policy;
-		};
-
-		void add_link ( 
-			in LinkName name,
-			in Lookup target,
-			in FollowOption def_pass_on_follow_rule,
-			in FollowOption limiting_follow_rule
-		) raises ( 
-			IllegalLinkName,
-			DuplicateLinkName,
-			InvalidLookupRef, // e.g. nil
-			DefaultFollowTooPermissive,
-			LimitingFollowTooPermissive
-		);
-
-		void remove_link (
-			in LinkName name
-		) raises (
-			IllegalLinkName,
-			UnknownLinkName
-		);
-
-		LinkInfo describe_link (
-			in LinkName name
-		) raises (
-			IllegalLinkName,
-			UnknownLinkName
-		);
-
-		LinkNameSeq list_links ( );
-
-		void modify_link ( 
-			in LinkName name,
-			in FollowOption def_pass_on_follow_rule,
-			in FollowOption limiting_follow_rule
-		) raises ( 
-			IllegalLinkName,
-			UnknownLinkName,
-			DefaultFollowTooPermissive,
-			LimitingFollowTooPermissive
-		);
-	};
-
-	interface Proxy : TraderComponents, SupportAttributes {
-
-		typedef Istring ConstraintRecipe;
-
-		struct ProxyInfo { 
-			ServiceTypeName type;
-			Lookup target;
-			PropertySeq properties;
-			boolean if_match_all;
-			ConstraintRecipe recipe;
-			PolicySeq policies_to_pass_on;
-		};
-
-		exception IllegalRecipe {
-			ConstraintRecipe recipe;
-		};
-
-		exception NotProxyOfferId {
-			OfferId id;
-		};
-
-		OfferId export_proxy (
-			in Lookup target,
-			in ServiceTypeName type,
-			in PropertySeq properties,
-			in boolean if_match_all,
-			in ConstraintRecipe recipe,
-			in PolicySeq policies_to_pass_on
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			InvalidLookupRef, // e.g. nil
-			IllegalPropertyName,
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MissingMandatoryProperty,
-			IllegalRecipe,
-			DuplicatePropertyName,
-			DuplicatePolicyName
-		);
-
-		void withdraw_proxy (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			NotProxyOfferId
-		);
-
-		ProxyInfo describe_proxy (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			NotProxyOfferId
-		);
-	};
-
-	interface Admin : TraderComponents, SupportAttributes, ImportAttributes,
-						LinkAttributes {
-
-		typedef sequence<octet> OctetSeq;
-
-		readonly attribute OctetSeq request_id_stem;
-
-		unsigned long set_def_search_card (in unsigned long value);
-		unsigned long set_max_search_card (in unsigned long value);
-
-		unsigned long set_def_match_card (in unsigned long value);
-		unsigned long set_max_match_card (in unsigned long value);
-
-		unsigned long set_def_return_card (in unsigned long value);
-		unsigned long set_max_return_card (in unsigned long value);
-
-		unsigned long set_max_list (in unsigned long value);
-
-		boolean set_supports_modifiable_properties (in boolean value);
-		boolean set_supports_dynamic_properties (in boolean value);
-		boolean set_supports_proxy_offers (in boolean value);
-
-		unsigned long set_def_hop_count (in unsigned long value);
-		unsigned long set_max_hop_count (in unsigned long value);
-
-		FollowOption set_def_follow_policy (in FollowOption policy);
-		FollowOption set_max_follow_policy (in FollowOption policy);
-
-		FollowOption set_max_link_follow_policy (in FollowOption policy);
-
-		TypeRepository set_type_repos (in TypeRepository repository);
-
-		OctetSeq set_request_id_stem (in OctetSeq stem);
-
-		void list_offers (
-			in unsigned long how_many,
-			out OfferIdSeq ids,
-			out OfferIdIterator id_itr
-		) raises (
-			NotImplemented
-		);
-
-		void list_proxies (
-			in unsigned long how_many,
-			out OfferIdSeq ids,
-			out OfferIdIterator id_itr
-		) raises (
-			NotImplemented
-		);
-	};
-
-	interface OfferIterator {
-
-		unsigned long max_left (
-		) raises (
-			UnknownMaxLeft
-		);
-
-		boolean next_n (
-			in unsigned long n,
-			out OfferSeq offers
-		);
-
-		void destroy ();
-	};
-
-	interface OfferIdIterator {
-		unsigned long max_left (
-		) raises (
-			UnknownMaxLeft
-		);
-
-		boolean next_n (
-			in unsigned long n,
-			out OfferIdSeq ids
-		);
-
-		void destroy ();
-	};
-
-}; /* end module CosTrading */
-
-
-// OMG IDL for Dynamic Property  Module, p 16-88
-
-module CosTradingDynamic {
-
-	exception DPEvalFailure {
-		CosTrading::PropertyName name;
-		TypeCode returned_type;
-		any extra_info;
-	};
-
-	interface DynamicPropEval {
-
-		any evalDP (
-			in CosTrading::PropertyName name,
-			in TypeCode returned_type,
-			in any extra_info
-		) raises (
-			DPEvalFailure
-		);
-	};
-
-	struct DynamicProp {
-		 DynamicPropEval eval_if;
-		 TypeCode returned_type;
-		 any extra_info;
-	};
-}; /* end module CosTradingDynamic */
-
-
-// OMG IDL for Service Type Repository Module, p 16-89
-
-module CosTradingRepos {
-
-	interface ServiceTypeRepository {
-
-	// local types
-		typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
-		enum PropertyMode {
-			PROP_NORMAL, PROP_READONLY,
-			PROP_MANDATORY, PROP_MANDATORY_READONLY
-		};
-		struct PropStruct {
-			CosTrading::PropertyName name;
-			TypeCode value_type;
-			PropertyMode mode;
-		};
-		typedef sequence<PropStruct> PropStructSeq;
-
-		typedef CosTrading::Istring Identifier;  // IR::Identifier
-		struct IncarnationNumber {
-			unsigned long high;
-			unsigned long low;
-		};
-		struct TypeStruct {
-			Identifier if_name;
-			PropStructSeq props;
-			ServiceTypeNameSeq super_types;
-			boolean masked;
-			IncarnationNumber incarnation;
-		};
-
-		enum ListOption { all, since };
-		union SpecifiedServiceTypes switch ( ListOption ) {
-			case since: IncarnationNumber incarnation;
-		};
-
-	// local exceptions
-		exception ServiceTypeExists {
-			CosTrading::ServiceTypeName name;
-		};
-		exception InterfaceTypeMismatch {
-			CosTrading::ServiceTypeName base_service;
-			Identifier base_if;
-			CosTrading::ServiceTypeName derived_service;
-			Identifier derived_if;
-		};
-		exception HasSubTypes {
-			CosTrading::ServiceTypeName the_type;
-			CosTrading::ServiceTypeName sub_type;
-		};
-		exception AlreadyMasked {
-			CosTrading::ServiceTypeName name;
-		};
-		exception NotMasked {
-			CosTrading::ServiceTypeName name;
-		};
-		exception ValueTypeRedefinition {
-			CosTrading::ServiceTypeName type_1;
-			PropStruct definition_1;
-			CosTrading::ServiceTypeName type_2;
-			PropStruct definition_2;
-		};
-		exception DuplicateServiceTypeName {
-			CosTrading::ServiceTypeName name;
-		};
-
-	// attributes
-		readonly attribute IncarnationNumber incarnation;
-
-	// operation signatures
-		IncarnationNumber add_type (
-			in CosTrading::ServiceTypeName name,
-			in Identifier if_name,
-			in PropStructSeq props,
-			in ServiceTypeNameSeq super_types
-		) raises (
-			CosTrading::IllegalServiceType,
-			ServiceTypeExists,
-			InterfaceTypeMismatch,
-			CosTrading::IllegalPropertyName,
-			CosTrading::DuplicatePropertyName,
-			ValueTypeRedefinition,
-			CosTrading::UnknownServiceType,
-			DuplicateServiceTypeName
-		);
-				
-		void remove_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			HasSubTypes
-		);
-
-		ServiceTypeNameSeq list_types (
-			in SpecifiedServiceTypes which_types
-		);
-
-		TypeStruct describe_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType
-		);
-
-		TypeStruct fully_describe_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType
-		);
-
-		void mask_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			AlreadyMasked
-		);
-
-		void unmask_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			NotMasked
-		);
-
-	};
-}; /* end module CosTradingRepos */
diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.cpp b/TAO/orbsvcs/orbsvcs/Event/BCU.cpp
deleted file mode 100644
index 374fe783ef9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "ace/ACE.h"
-#include "BCU.h"
-
-
-u_long
-ACE_BCU (u_long n)
-{
-  const u_long ACE_BCU_PRIME_NUMBER = 9619;
-
-  u_long retval = 0;
-
-  while (n-- > 0)
-    retval = ACE::is_prime (ACE_BCU_PRIME_NUMBER, 2, ACE_BCU_PRIME_NUMBER / 2);
-
-  return retval;
-}
-
-
-u_long
-ACE_BCU (u_long number,
-         u_long n)
-{
-  u_long retval = 0;
-
-  while (n-- > 0)
-    retval = ACE::is_prime (number, 2, number);
-
-  return retval;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
deleted file mode 100644
index 07d64c46271..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-// 
-// = FILENAME
-//    Benchmark Computation Units
-//
-// = AUTHOR
-//    David Levine and Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//
-//    Times how long it takes to generate each of the first N prime
-//    numbers.
-// ============================================================================
-
-#if !defined (ACE_BCU_H)
-#define ACE_BCU_H
-
-#include "ace/OS.h"
-#include "orbsvcs/orbsvcs_export.h"
-
-
-TAO_ORBSVCS_Export u_long ACE_BCU (u_long n);
-// Check if a specific, hardcoded number is prime (via ACE::is_prime) <n>
-// times.
-
-
-TAO_ORBSVCS_Export u_long ACE_BCU (u_long number, u_long n);
-// Check if <number> is prime (via ACE::is_prime ()) <n> times.
-
-#endif /* ACE_BCU_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp
deleted file mode 100644
index cdffb8aa443..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// $Id$
-
-#if !defined (ACE_CORBA_UTILS_C)
-#define ACE_CORBA_UTILS_C
-
-#include "ace/Log_Msg.h"
-#include "CORBA_Utils_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CORBA_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (const ACE_CORBA_Sequence<TYPE> &source)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-  (*this) = source;
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (void)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::~ACE_CORBA_Sequence (void)
-{
-  if (release_)
-    {
-      this->delete_array (buffer_, maximum_);
-    }
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (CORBA::ULong max)
-  : maximum_ (max),
-    length_ (0),
-    buffer_ (0),
-
-    release_ (0)
-{
-  if (maximum_ > 0)
-    {
-      buffer_ = this->new_array (maximum_);
-      release_ = 1;
-    }
-}
-
-template <class TYPE> TYPE *
-ACE_CORBA_Sequence<TYPE>::new_array (size_t len)
-{
-  return new TYPE[len];
-}
-
-template <class TYPE> void
-ACE_CORBA_Sequence<TYPE>::delete_array (TYPE *buf, size_t)
-{
-  delete [] buf;
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (CORBA::ULong max, 
-					      CORBA::ULong length, 
-					      TYPE* data,
-					      CORBA::Boolean release)
-  : maximum_ (max),
-    length_ (length),
-    buffer_ (data),
-    release_ (release)
-{
-  if ((buffer_ == 0) && (max > 0))
-    {
-      // @@ What should we do here?
-      errno = ENOMEM;
-      ACE_ERROR ((LM_ERROR, "No memory.\n"));
-    }
-}
-
-// @@ This makes a deep copy, dig?
-template <class TYPE> ACE_CORBA_Sequence<TYPE> &
-ACE_CORBA_Sequence<TYPE>::operator= (const ACE_CORBA_Sequence<TYPE> &source)
-{
-  if (source.length () > 0)
-    {
-      // If our buffer is too small, release it and allocate one just big
-      // enough.  If buffer_ == 0, this works fine.
-      if (this->maximum () < source.length ())
-	{
-	  if (release_)
-	    {
-	      this->delete_array (buffer_, maximum_);
-	    }
-	  maximum_ = source.length ();
-	  buffer_ = this->new_array (maximum_);
-	  release_ = 1;
-	}
-
-      // Copy each of the items from the source.
-      for (CORBA::ULong index=0; index < source.length (); index++)
-	(*this)[index] = source[index];
-
-      this->length (source.length ());
-    }
-
-  return *this;
-}
-
-template <class TYPE> void
-ACE_CORBA_Sequence<TYPE>::length (CORBA::ULong len)
-{
-  if (len > maximum_)
-    {
-      // Allocate the space that we need.
-      TYPE* tmp = this->new_array (len);
-      // Copy over the old sequence.
-      for (CORBA::ULong i = 0; i < maximum_; ++i)
-	{
-	  tmp[i] = buffer_[i];
-	}
-      if (release_)
-	{
-	  this->delete_array (buffer_, maximum_);
-	}
-      buffer_ = tmp;
-      release_ = 1;
-      maximum_ = len;
-      // The destructor of -old- will release the old buffer_ if
-      // necessary.
-    }
-
-  length_ = len;
-}
-
-
-// g++ can't handle these operator [] functions if they're inline
-template <class TYPE> TYPE&
-ACE_CORBA_Sequence<TYPE>::operator [] (CORBA::ULong i)
-{
-  // @@ Should we do bounds checking?
-  if (i >= maximum_)
-    {
-      ACE_ERROR ((LM_ERROR, "Trying to write past maximum.\n"));
-      return buffer_[maximum_ - 1];
-    }
-  else
-    return buffer_[i];
-}
-
-template <class TYPE> const TYPE&
-ACE_CORBA_Sequence<TYPE>::operator [] (CORBA::ULong i) const
-{
-  if (i >= length_)
-    {
-      ACE_ERROR ((LM_ERROR, "Trying to read past length.\n"));
-      return buffer_[length_ - 1];
-    }
-    
-  return buffer_[i];
-}
-
-// ********************
-
-/*
-template <class TYPE> void 
-dump (const ACE_CORBA_Sequence<TYPE> &seq)
-{
-  for (CORBA::ULong index=0; index < seq.length (); index++)
-    dump (seq[index]);
-}
-*/
-
-/*
-template <class TYPE> ACE_INLINE void
-operator += (ACE_CORBA_Sequence<TYPE> &seq,
-	     const TYPE &item)
-{
-  CORBA::ULong length = seq.length ();
-  seq.length (length + 1);
-  seq[length] = item;
-}
-*/
-
-template <class TYPE> ACE_INLINE void
-operator += (ACE_CORBA_Sequence<TYPE> &dest,
-	     const ACE_CORBA_Sequence<TYPE> &source)
-{
-  int old_length = dest.length ();
-  int new_length = old_length + source.length ();
-  dest.length (new_length);
-
-  int difference = new_length - old_length;
-  
-  for (int x=0; x < difference; x++)
-    dest[old_length + x] = source[x];
-}
-
-/*
-template <class TYPE> ACE_INLINE void
-remove_item (TYPE &seq, CORBA::ULong index)
-{
-  int new_length = seq.length () - 1;
-
-  // Shift the set back one, starting at <index>.
-  for (int x = index; x < new_length; x++)
-    seq[x] = seq[x+1];
-
-  // Set the new length.
-  seq.length (new_length);
-}
-*/
-
-// ************************************************************
-// ************************************************************
-// ************************************************************
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (const ACE_CORBA_var<TYPE> &source)
-{
-  if (source.me_ != 0)
-    me_ = (TYPE *) source.me_->_duplicate ();
-  // CORBA::duplicate (source.me_);
-}
-
-template<class TYPE>  
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (void)
-  : me_ (0)
-{
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (TYPE *source)
-{
-  me_ = (TYPE *) source->_duplicate ();
-  // CORBA::duplicate (source);
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::~ACE_CORBA_var (void)
-{
-  if (me_ != 0)
-    me_->_release ();
-  //CORBA::release (me_);
-}
-
-template<class TYPE> ACE_CORBA_var<TYPE> &
-ACE_CORBA_var<TYPE>::operator= (TYPE *source)
-{
-  if (me_ != source &&
-      me_ != 0)
-    me_->_release ();
-  //CORBA::release (me_);
-
-  me_ = (TYPE *) source->_duplicate ();
-  // CORBA::duplicate (source);
-  return *this;
-}
-
-template<class TYPE> ACE_CORBA_var<TYPE> & 
-ACE_CORBA_var<TYPE>::operator= (const ACE_CORBA_var<TYPE> &source)
-{
-  if (me_ != source.me_ &&
-      me_ != 0)
-    me_->_release ();
-  // CORBA::release (me_);
-
-  me_ = (TYPE *) source.me_->_duplicate ();
-  // CORBA::duplicate (source.me_);
-  return *this;
-}
-
-template<class TYPE> TYPE *
-ACE_CORBA_var<TYPE>::operator->(void)
-{
-  return me_;
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE *(void) const
-{
-  return me_;
-}
-
-/*
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE *&(void)
-{
-  return me_;
-}
-*/
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE &(void) const
-{
-  return *me_;
-}
-
-// ************************************************************
-// ************************************************************
-
-/*
-ACE_CORBA_Object_Ref<IMPL>::ACE_CORBA_Object_Ref (void)
-  : impl_ (0)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL>::ACE_CORBA_Object_Ref (IMPL *impl)
-  : impl_ (impl)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL>::~ACE_CORBA_Object_Ref (void)
-  : impl_ (0)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL> &
-ACE_CORBA_Object_Ref<IMPL>::operator= (const ACE_CORBA_Object_Ref<IMPL> &source)
-{
-  return *this;
-}
-
-IMPL *
-ACE_CORBA_Object_Ref<IMPL>::operator->(void)
-{
-  return impl_;
-}
-
-IMPL *
-ACE_CORBA_Object_Ref<IMPL>::operator IMPL *(void)
-{
-  return impl_;
-}
-
-ACE_CORBA_Object_Ref<IMPL> *
-ACE_CORBA_Object_Ref<IMPL>::_duplicate (ACE_CORBA_Object_Ref<IMPL> *source)
-{
-  source->ref_count_++;
-  return source;
-}
-
-*/
-#endif /* ACE_CORBA_UTILS_C */
diff --git a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h
deleted file mode 100644
index 8abf180d9e1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace_orb
-// 
-// = FILENAME
-//    CORBA_Utilities.h
-//
-// = AUTHORS
-//    Tim Harrison.
-//
-// = NOTE
-//   This class is a bit ackward when using a real ORB, but we cannot
-//   easily remove it since some of the types are used in the
-//   implementation of the EC. TODO
-// 
-// ============================================================================
-
-#if !defined (ACE_CORBA_UTILS_H)
-#define ACE_CORBA_UTILS_H
-
-#include "ace/Time_Value.h"
-#include "tao/corba.h"
-
-template <class TYPE>
-class ACE_CORBA_Sequence// : public CORBA::Object
-// = TITLE
-//
-// = DESCRIPTION
-{
-public:
-
-  ACE_CORBA_Sequence (const ACE_CORBA_Sequence<TYPE> &source);
-  // Copy construction.
-
-  ACE_CORBA_Sequence (CORBA::ULong max);
-  ACE_CORBA_Sequence (CORBA::ULong max, 
-		      CORBA::ULong length, 
-		      TYPE* data, 
-		      CORBA::Boolean release = 0);
-  ACE_CORBA_Sequence (void);
-
-  virtual ~ACE_CORBA_Sequence (void);
-
-  ACE_CORBA_Sequence<TYPE> &operator= (const ACE_CORBA_Sequence<TYPE> &);
-
-  // static TYPE* allocbuf(CORBA::ULong nelems);
-  // static void freebuf(TYPE* data);
-
-  CORBA::ULong maximum (void) const;
-  CORBA::ULong length (void) const;
-  void length (CORBA::ULong len);
-
-  TYPE& operator [] (CORBA::ULong IT_i);
-
-  const TYPE& operator [] (CORBA::ULong IT_i) const;
-
-  virtual TYPE *new_array (size_t len);
-  // Allocates TYPE[len].  This facilitates template methods through
-  // template specialization to allow the use of different memory
-  // pools.
-
-  virtual void delete_array (TYPE *buf, size_t len);
-  // delete [] <buf>.
-
-protected:
-  CORBA::ULong maximum_;
-  CORBA::ULong length_;
-  TYPE* buffer_;
-  unsigned char release_;
-};
-
-// Utility for debugging sequences.
-//template <class TYPE>
-//void dump (const ACE_CORBA_Sequence<TYPE> &seq);
-
-// Utility for appending single items.  Increases the length of <set>
-// and adds <event> to the end of <set>.
-template <class TYPE> void
-operator += (ACE_CORBA_Sequence<TYPE> &seq,
-	     const TYPE &item)
-{
-  CORBA::ULong length = seq.length ();
-  seq.length (length + 1);
-  seq[length] = item;
-}
-
-// Utility for appending sequences.
-template <class TYPE> void
-operator += (ACE_CORBA_Sequence<TYPE> &dest, 
-	     const ACE_CORBA_Sequence<TYPE> &source);
-
-template <class TYPE> void
-remove_item (TYPE &seq, CORBA::ULong index)
-{
-  int new_length = seq.length () - 1;
-
-  // Shift the set back one, starting at <index>.
-  for (int x = index; x < new_length; x++)
-    seq[x] = seq[x+1];
-
-  // Set the new length.
-  seq.length (new_length);
-}
-// Removes seq[index] by moving everything after <index> back and
-// decrementing the length.
-
-// ************************************************************
-
-template <class TYPE>
-class ACE_CORBA_var
-// = TITLE
-//
-// = DESCRIPTION
-{
-public:
-  ACE_CORBA_var (const ACE_CORBA_var<TYPE> &source);
-  ACE_CORBA_var (void);
-  ACE_CORBA_var (TYPE *source);
-  ~ACE_CORBA_var (void);
-  ACE_CORBA_var<TYPE> &operator= (TYPE *source);
-  ACE_CORBA_var<TYPE> &operator= (const ACE_CORBA_var<TYPE> &source);
-  TYPE *operator->(void);
-  operator TYPE *(void) const;
-  //  operator TYPE *&(void);
-  operator TYPE &(void) const;
-private:
-  TYPE *me_;
-};
-
-// ************************************************************
-
-/*
-template <class IMPL>
-class ACE_CORBA_Object_Ref : public CORBA::Object
-// = TITLE
-//    ACE CORBA Object Reference
-//
-// = DESCRIPTION
-//    A wrapper for making CORBA Object References.  For a single
-//    address space ORB, this points directly to the IMPL
-//    class.  This is supposed to look like a pointer to
-//    IMPL with an additional static _duplicate method.
-{
-public:
-  // ACE_CORBA_Object_Ref (ACE_CORBA_Object_Ref<IMPL> &obj);
-  ACE_CORBA_Object_Ref (void);
-  ACE_CORBA_Object_Ref (IMPL *impl);
-  ~ACE_CORBA_Object_Ref (void);
-  //  ACE_CORBA_Object_Ref<IMPL> &operator= (IMPL *source);
-  ACE_CORBA_Object_Ref<IMPL> &operator= 
-    (const ACE_CORBA_Object_Ref<IMPL> &source);
-  
-  IMPL *operator->(void);
-  // A distributed ORB would require that the CORBA Object Reference
-  // implement all IMPL interfaces, marshall the parameters,
-  // and transmit over IIOP.  For this single address space ORB, we'll
-  // just delegate method calls to the IMPL directly.
-
-  operator IMPL *(void) const;
-  // operator IMPL *&(void);
-  // operator IMPL &(void) const;
-
-  static ACE_CORBA_Object_Ref<IMPL> *_duplicate 
-    (ACE_CORBA_Object_Ref<IMPL> *source);
-
-private:
-  IMPL *impl_;
-};
-*/
-
-// ************************************************************
-
-template <class ITEM, size_t SIZE>
-class ACE_ES_Simple_Array
-// = TITLE
-//    Simple Array
-//
-// = DESCRIPTION
-//    Wraps ITEM[SIZE] with insert and an iterator.  There is no
-//    remove.  It allows duplicates.  It is truly very simple.
-{
- public:
-  ACE_ES_Simple_Array (void);
-  int insert (const ITEM &copy_me);
-  size_t size (void);
-  ITEM *data (void);
- protected:
-  ITEM data_[SIZE];
-  size_t size_;
-};
-
-template <class ITEM>
-class ACE_ES_Array_Iterator
-// = TITLE
-//    Simple Iterator
-//
-// = DESCRIPTION
-//    Iterates through an array of ITEMs.
-{
-public:
-  ACE_ES_Array_Iterator (ITEM *data, size_t size);
-
-  int next (ITEM *&next_item);
-  // Returns 0 when all items have been seen, else 1.  Sets
-  // <next_item> to point at the next ITEM.
-
-  int advance (void);
-  // Move forward by one element in the Stack.  Returns 0 when all the
-  // items in the Stack have been seen, else 1.
-
-  int done (void) const;
-  // Returns 1 when all items have been seen, else 0.
-
-private:
-  ITEM *data_;
-  size_t size_;
-  size_t index_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "CORBA_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "CORBA_Utils_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CORBA_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_CORBA_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i
deleted file mode 100644
index d9ebb9247ad..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-template <class TYPE> ACE_INLINE CORBA::ULong
-ACE_CORBA_Sequence<TYPE>::maximum (void) const
-{
-  return maximum_;
-}
-
-template <class TYPE> ACE_INLINE CORBA::ULong
-ACE_CORBA_Sequence<TYPE>::length() const
-{
-  return length_;
-}
-
-
-// ************************************************************
-
-template <class ITEM, size_t SIZE> ACE_INLINE
-ACE_ES_Simple_Array<ITEM, SIZE>::ACE_ES_Simple_Array (void) :
-  size_ (0)
-{
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE int
-ACE_ES_Simple_Array<ITEM, SIZE>::insert (const ITEM &copy_me)
-{
-  if (size_ >= SIZE)
-    return -1;
-
-  data_[size_++] = copy_me;
-  return 0;
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE size_t
-ACE_ES_Simple_Array<ITEM, SIZE>::size (void)
-{
-  return size_;
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE ITEM *
-ACE_ES_Simple_Array<ITEM, SIZE>::data (void)
-{
-  return data_;
-}
-
-// ************************************************************
-
-template <class ITEM> ACE_INLINE
-ACE_ES_Array_Iterator<ITEM>::ACE_ES_Array_Iterator (ITEM *data, size_t size) :
-  data_ (data),
-  size_ (size),
-  index_ (0)
-{
-}
-
-template <class ITEM> ACE_INLINE int
-ACE_ES_Array_Iterator<ITEM>::next (ITEM *&next_item)
-{
-  next_item = &data_[index_];
-  return index_ < (size_ - 1);
-}
-
-template <class ITEM> ACE_INLINE int
-ACE_ES_Array_Iterator<ITEM>::advance (void)
-{
-  index_++;
-  return index_ < size_;
-}
-
-template<class ITEM> ACE_INLINE int
-ACE_ES_Array_Iterator<ITEM>::done (void) const
-{
-  return index_ < size_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/Channel_Clients.i b/TAO/orbsvcs/orbsvcs/Event/Channel_Clients.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Channel_Clients.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Event/Channel_Clients_T.i
deleted file mode 100644
index f7c0760fd86..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Channel_Clients_T.i
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-template <class TARGET> ACE_INLINE
-ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *target)
-  : target_ (target)
-{
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events,
-					CORBA::Environment &_env)
-{
-  target_->_push (events, _env);
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (CORBA::Environment &_env)
-{
-  target_->_disconnect_push_consumer (_env);
-}
-
-// ************************************************************
-
-template <class TARGET> ACE_INLINE
-ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *target)
-  : target_ (target)
-{
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (CORBA::Environment &_env)
-{
-  target_->_disconnect_push_supplier (_env);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h b/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
deleted file mode 100644
index 8db3d169082..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#if defined (ACE_ES_NOLOGGING)
-#define ACE_ES_DEBUG(X)
-#define ACE_ES_DEBUG_ST(X)
-#else
-#define ACE_ES_DEBUG(X) \
-  do { \
-      ACE_Log_Msg::instance ()->log X; \
-  } while (0)
-#define ACE_ES_DEBUG_ST(X) X
-#endif /* ACE_ES_NOLOGGING */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
deleted file mode 100644
index ce743692b69..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-// $Id$
-
-#include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "Memory_Pools.h"
-
-#include "Dispatching_Modules.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Dispatching_Modules.i"
-#endif /* __ACE_INLINE__ */
-
-// ************************************************************
-
-void
-ACE_ES_Dispatch_Request::make_copy (RtecEventComm::EventSet &dest) const
-{
-  if (use_single_event_)
-    {
-      dest.length (1);
-      dest[0] = single_event_;
-    }
-  else
-    {
-      dest.length (event_set_.length ());
-
-      for (CORBA::ULong index=0; index < event_set_.length (); index++)
-        {
-          RtecEventComm::Event &dest_event = dest[index];
-          ACE_ES_Event_Container_var &source_event_var = ((ACE_ES_Event_Container_var &) event_set_[index]);
-          dest_event = *(source_event_var.operator->());
-        }
-    }
-}
-
-int
-ACE_ES_Dispatch_Request::execute (u_long &command_action)
-{
-  ACE_TIMEPROBE ("  dispatch (dequeue) the event");
-
-  return dispatching_module_->dispatch_event (this, command_action);
-}
-
-#if 0
-void *
-ACE_ES_Dispatch_Request::operator new (size_t nbytes)
-{
-  if (nbytes > sizeof (ACE_ES_Dispatch_Request))
-    {
-      ACE_ERROR ((LM_ERROR, "nbytes = %d, sizeof (ACE_ES_Dispatch_Request_Chunk) = %d.\n",
-                  sizeof (ACE_ES_Dispatch_Request)));
-      ACE_ASSERT (nbytes <= sizeof (ACE_ES_Dispatch_Request));
-    }
-
-  return ACE_ES_Memory_Pools::new_Dispatch_Request ();
-}
-
-void
-ACE_ES_Dispatch_Request::operator delete (void *mem)
-{
-  ACE_ES_Memory_Pools::delete_Dispatch_Request (mem);
-}
-#endif /* 0 */
-
-// ************************************************************
-
-ACE_ES_Priority_Dispatching::ACE_ES_Priority_Dispatching (ACE_EventChannel *channel,
-                                                          int threads_per_queue)
-  : ACE_ES_Dispatching_Base (channel),
-    notification_strategy_ (this),
-    highest_priority_ (0),
-    shutdown_ (0),
-    threads_per_queue_ (threads_per_queue)
-{
-  // If we're single threaded, then we need to use the notification strategy.
-  if ((threads_per_queue_ == 0) &&
-      (notification_strategy_.open () == -1))
-    ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Priority_Dispatching"));
-
-  // Initialize the queues.
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      queues_[x] = 0;
-      delete_me_queues_[x] = 0;
-    }
-
-  this->initialize_queues ();
-}
-
-ACE_ES_Priority_Dispatching::~ACE_ES_Priority_Dispatching (void)
-{
-  // Delete the queues.
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    delete delete_me_queues_[x];
-}
-
-
-void
-ACE_ES_Priority_Dispatching::initialize_queues (void)
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      // Convert ACE_Scheduler_Rate (it's really a period, not a rate!)
-      // to a form we can easily work with.
-      ACE_Time_Value period_tv;
-      ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[x]);
-
-      RtecScheduler::Period period = period_tv.sec () * 10000000 +
-                                     period_tv.usec () * 10;
-
-      queues_[x] = new ACE_ES_Dispatch_Queue (this, &notification_strategy_);
-      if (queues_[x] == 0 ||
-          queues_[x]->open_queue (period,
-                                  threads_per_queue_) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Priority_Dispatching::initialize_queues"));
-          return;
-        }
-
-      queue_count_[x] = 1;
-    }
-
-  highest_priority_ = ACE_Scheduler_MAX_PRIORITIES - 1;
-}
-
-void
-ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
-                                        CORBA::Environment &_env)
-{
-  down_->connected (consumer, _env);
-
-  // This code does dynamic allocation of channel dispatch threads.
-  // It requires that consumer's priorities are known at connection
-  // time and that threads can request priorities from the scheduler
-  // at run-time.  These are both antithetical to static scheduling.
-  // The constructor now allocates a thread per rate group.
-#if 0
-  // We have to tell the lower portions of the channel about the
-  // consumer first.  This is so that any changes to the consumer's
-  // qos will take effect when we get the dispatch priority.
-  down_->connected (consumer, _env);
-
-  RtecScheduler::OS_Priority priority =
-    ACE_Scheduler::instance ().preemption_priority (consumer->qos ().rt_info_);
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-
-    // If a queue has not been created for the consumer's priority,
-    // create one.
-    if (queues_[priority] == 0)
-      {
-        // Allocate a new dispatch queue.
-        queues_[priority] = new ACE_ES_Dispatch_Queue (this, &notification_strategy_);
-        if (queues_[priority] == 0)
-          TAO_THROW (CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO,
-                                          "ACE_ES_Priority_Dispatching::connected"));
-
-        // Initialize the dispatch queue corresponding to the
-        // consumer's priority.  With a full implementation of the
-        // run-time scheduler, the dispatch queue can find it's
-        // scheduling qos online.  However, we pass the rate in case
-        // one is not found.  The rate can be used to obtain the
-        // proper priority.  If threads_per_queue_ == 0, then these
-        // queues will be passive.  Otherwise, they will be active.
-        // This switches us between MT_ORB and ST_ORB.  If we're
-        // single-threaded, this registers us with the ReactorEx using
-        // our notification_strategy_.  If we're multi-threaded, this
-        // spawns the threads.
-        if (queues_[priority]->open_queue (priority,
-                                           threads_per_queue_) == -1)
-          TAO_THROW (DISPATCH_ERROR (0, CORBA::COMPLETED_NO,
-                                     "ACE_ES_Priority_Dispatching::connected:"
-                                     "queue open failed.\n"));
-
-        // When this goes down to 0, we will shutdown the queue.
-        queue_count_[priority] = 1;
-
-        // Keep track of this to optimize handle_signal.
-        if (priority > highest_priority_)
-          highest_priority_ = priority;
-
-        ACE_DEBUG ((LM_DEBUG, "Created queue priority = %d.\n", priority));
-      }
-    else
-      queue_count_[priority]++;
-  }
-#endif
-}
-
-void
-ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer)
-{
-  // We'll not dynamically close down queues.
-  ACE_UNUSED_ARG (consumer);
-
-#if 0
-  RtecScheduler::OS_Priority priority =
-    ACE_Scheduler::instance ().preemption_priority (consumer->qos ().rt_info_);
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-
-    // If there are no more users of this queue, then we *could* shut
-    // it down.  However, we will not.
-    if (--queue_count_[priority] <= 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) unused dispatch queue priority = %d, "
-                    "is_empty = %d.\n",
-                    priority, queues_[priority]->msg_queue ()->is_empty ()));
-
-        queues_[priority]->shutdown_task ();
-      }
-  }
-#endif
-}
-
-// @@ This method could have a bypass optimization.
-// <request> has been dynamically allocated by the filtering module.
-void
-ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                                   CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  push_source_type: Correlation Module");
-
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  if (request->rt_info () != 0)
-    {
-      // @@ TODO use TAO_TRY&friends
-      ACE_TIMEPROBE ("  Priority_Dispatching::push - priority requested");
-      ACE_Scheduler_Factory::server ()->priority
-        (request->rt_info (),
-         thread_priority,
-         subpriority,
-         preemption_priority,
-         _env);
-      ACE_TIMEPROBE ("  Priority_Dispatching::push - priority obtained");
-      if (_env.exception ())
-        {
-          return;
-        }
-    }
-  else
-    {
-      thread_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                        ACE_SCOPE_PROCESS);
-      subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-      preemption_priority = ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
-    }
-
-  // If it's a request to forward an event, it needs a reference to us
-  // to call dispatch_event.
-  request->set (this, preemption_priority, subpriority);
-
-  // Make sure that a queue exists for this priority.
-  if (queues_[preemption_priority] == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Push to closed queue %d, dropping event.\n", preemption_priority));
-      return;
-#if 0
-      TAO_THROW (SYNC_ERROR (0, CORBA::COMPLETED_NO, "ACE_ES_Priority_Dispatching::push"));
-#endif /* 0 */
-    }
-
-  // Enqueue the request.  If we're multi-threaded, this request is a
-  // command object that will be called by the threads in the queue,
-  // or will be dequeued by this->handle_signal if we're
-  // single-threaded.
-  if (queues_[preemption_priority]->try_put (request) == -1)
-    {
-      if (ACE_ES_Dispatch_Request::release (request) != 0)
-        ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Dispatching::push"
-                    " release failed.\n"));
-      if (errno != EPIPE)
-        {
-          TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-          // @@ Orbix parameters
-          // 0, CORBA::COMPLETED_NO,
-          // "ACE_ES_Priority_Dispatching::push enqueue failed"));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Request rejected from closed queue %d.\n",
-                      preemption_priority));
-        }
-    }
-}
-
-// Start at highest priority queue checking for queued events
-// continuing to lowest priority queue.  If an event is ever found,
-// dispatch it and then start back at the highest priority queue
-// again.
-int
-ACE_ES_Priority_Dispatching::handle_signal (int, siginfo_t *, ucontext_t *)
-{
-  int done;
-
-  do
-    {
-      done = 1;
-      for (int x = 0; x <= highest_priority_; x++)
-        {
-          // If the queue is not empty, dispatch the request and then
-          // start the for loop from the beginning.
-          if ((queues_[x] != 0) && (!queues_[x]->msg_queue ()->is_empty ()))
-            {
-              // Dequeue and service the request.
-              queues_[x]->svc_one ();
-
-              // Exit the for loop and start over.
-              done = 0;
-              break;
-            }
-
-          // If we get through the whole for loop without dispatching
-          // anything, then we're done.
-        }
-    }
-  while (!done);
-
-
-  return 0;
-}
-
-// This is only for the non-win32 single-threaded implementation.
-int
-ACE_ES_Priority_Dispatching::handle_input (ACE_HANDLE)
-{
-  return this->handle_signal (0, 0, 0);
-}
-
-// Shutdown each queue.  When each queue exits, they will call back
-// this->dispatch_queue_closed which allows us to free up resources.
-// When the last queue has closed, we'll delete ourselves.
-void
-ACE_ES_Priority_Dispatching::shutdown (void)
-{
-  if (shutdown_)
-    return;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_ES_Priority_Dispatching "
-              "module shutting down.\n"));
-
-  shutdown_ = 1;
-
-  // If we're single threaded, then we need to shut down the
-  // notification strategy so it can remove itself from the reactor.
-  if (threads_per_queue_ == 0)
-    notification_strategy_.shutdown ();
-
-  // Whether these are active or not, they must be shut down.
-  for (int x = 0; x <= highest_priority_; x++)
-    if (queues_[x] != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "shutting down dispatch queue %d.\n", x));
-        queues_[x]->shutdown_task ();
-      }
-}
-
-// This gets called every time a Dispatch Queue closes down.  We
-// search for <queue> and delete it.  If we have been told to delete
-// ourself, after the last queue has been deleted, we delete
-// ourselves.
-void
-ACE_ES_Priority_Dispatching::dispatch_queue_closed (ACE_ES_Dispatch_Queue *queue)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-
-  // Find the queue.
-  for (int x = 0; x <= highest_priority_; x++)
-    {
-      if (queues_[x] == queue)
-        {
-          ACE_DEBUG ((LM_DEBUG, "(%t) Dispatch queue %d is closed.\n", x));
-
-          // Store the queue for deleting in this object's destructor.
-          delete_me_queues_[x] = queues_[x];
-          queues_[x] = 0;
-
-          // Reset highest_priority_.
-          if (x == highest_priority_)
-            {
-              while ((--highest_priority_ >= 0) &&
-                     (queues_[highest_priority_] == 0));
-
-              if (highest_priority_ < 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG, "Dispatching module shut down.\n"));
-                  up_->shutdown ();
-                  return;
-                }
-            }
-
-          // If we found the queue, we can exit the for loop.
-          break;
-        }
-    }
-}
-
-/*
-ACE_HANDLE
-ACE_ES_Priority_Dispatching::get_handle (void) const
-{
-  ACE_ES_Priority_Dispatching *fake_this = (ACE_ES_Priority_Dispatching *) this;
-  return fake_this->notification_strategy_.get_handle ();
-}
-*/
-
-// ************************************************************
-
-ACE_ES_Dispatch_Queue::ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-                                              ACE_ES_Notification_Strategy *notification_strategy)
-  : dispatching_module_ (dispatching_module),
-    notification_strategy_ (notification_strategy)
-{
-}
-
-int
-ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period &period,
-                                   int threads)
-{
-  // First set up the correct message queue according to whether the
-  // dispatch queue will be active or not.
-
-  // If there are no threads specified, we'll register with the
-  // reactor to be called back when someone queues a message.
-  if (threads == 0)
-    {
-      // Allocate a message queue that notifies a reactor when events
-      // arrive via the msg_queue call.  If that succeeds, set the
-      // notification strategy in our message queue via the open call.
-      if (this->msg_queue () == 0 ||
-          this->msg_queue ()->open (ACE_ES_QUEUE::DEFAULT_HWM,
-                                    ACE_ES_QUEUE::DEFAULT_LWM,
-                                    notification_strategy_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p msg_queue.open failed.\n",
-                           "ACE_ES_Dispatch_Queue::open_queue"), -1);
-    }
-  else
-    {
-      // Allocate a message queue that does not notify.
-      ACE_ES_MQ *mq = new ACE_ES_MQ;
-      if (mq == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                           "ACE_ES_Dispatch_Queue::open_queue"), -1);
-      else
-        {
-          // This deletes previous message queue.
-          this->msg_queue (mq);
-          // Set this so that the destructor of ACE_Task deletes our
-          // message queue.  Note, this must be after the call to
-          // msg_queue.
-          delete_msg_queue_ = 1;
-        }
-    }
-
-  // Create a name for ourselves using the period.  The period is
-  // in 100 ns units; first convert to usec by dividing by 10.
-  char temp[64];
-  ACE_OS::sprintf (temp, "ACE_ES_Dispatch_Queue-%u.us", period / 10);
-
-  // Open the task.  This will query the scheduler for our qos
-  // structure.  It will also synch_threads if it succeeds.
-  int result = this->open_task (temp);
-
-  switch (result)
-    {
-    case -1:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                         "ACE_ES_Dispatch_Queue::open_queue"), -1);
-    case 0:
-      TAO_TRY
-        {// @@ TODO: Handle exceptions...
-          ACE_Scheduler_Factory::server()->set (rt_info_,
-                                                RtecScheduler::VERY_HIGH_CRITICALITY,
-                                                ORBSVCS_Time::zero,
-                                                ORBSVCS_Time::zero,
-                                                ORBSVCS_Time::zero,
-                                                0,
-                                                RtecScheduler::VERY_LOW_IMPORTANCE,
-                                                ORBSVCS_Time::zero,
-                                                1,
-                                                RtecScheduler::OPERATION,
-                                                TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-      TAO_CATCHANY
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "ACE_ES_Display_Queue::exception"), -1);
-        }
-      TAO_ENDTRY;
-    case 1:
-      // Found.
-      break;
-    }
-
-  // Spawn threads.
-  return this->synch_threads (threads);
-}
-
-// This is called back by ACE_RT_Task when all the threads have
-// exited.  We're going to forward this event to the dispatching
-// module so it can clean up any resources.
-void
-ACE_ES_Dispatch_Queue::threads_closed (void)
-{
-  dispatching_module_->dispatch_queue_closed (this);
-}
-
-// ************************************************************
-
-ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel)
-  : ACE_ES_Dispatching_Base (channel)
-{
-}
-
-void
-ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &)
-{
-  // If it's a request to forward an event, it needs a reference to us
-  // to call dispatch_event.
-  request->set (this, 0, ACE_Scheduler_MIN_SUB_PRIORITY);
-
-  u_long command_action = ACE_RT_Task_Command::RELEASE;
-
-  // This may be a request to delete a push consumer proxy, so we
-  // should execute it instead of just forwarding it.
-  request->execute (command_action);
-
-  switch (command_action)
-    {
-    case ACE_RT_Task_Command::RELEASE:
-      // Free the request.
-      if (ACE_ES_Dispatch_Request::release (request) != 0)
-        ACE_ERROR ((LM_ERROR, "ACE_ES_EFD_Dispatching::push"
-                    " release failed.\n"));
-      break;
-
-    default:
-      ACE_ERROR ((LM_ERROR, "ACE_ES_EFD_Dispatching::push: unknown command action.\n"));
-    }
-}
-
-// ************************************************************
-
-ACE_ES_RTU_Dispatching::ACE_ES_RTU_Dispatching (ACE_EventChannel *channel)
-  : ACE_ES_Priority_Dispatching (channel, 0)
-{
-}
-
-// We're called from a dispatch queue, so we can not release the request.
-int
-ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
-                                        u_long &command_action)
-{
-  // Store the priority of the task currently running.
-  channel_->rtu_manager ()->priority (request->priority ());
-
-  TAO_TRY
-    {
-      // Forward the request.
-      up_->push (request, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_RTU_Dispatching::dispatch_event unknown exception.\n"));
-    }
-  TAO_ENDTRY;
-
-  // Reset the priority.
-  channel_->rtu_manager ()->priority (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_PROCESS));
-
-  // If the task was preempted, enqueue the request on the head of the
-  // dispatch queue.
-  if (channel_->rtu_manager ()->not_done ())
-    command_action = ACE_RT_Task_Command::UNGETQ;
-  else
-    // We're done with it.
-    command_action = ACE_RT_Task_Command::RELEASE;
-
-  return 0;
-}
-
-void
-ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &_env)
-{
-  // First enqueue the message in the proper queue.
-  ACE_ES_Priority_Dispatching::push (request, _env);
-
-  // If the current event is higher priority (lower value) than the
-  // current running task, then tell the task to preempt itself.
-  int request_priority = request->priority ();
-  int running_priority = channel_->rtu_manager ()->priority ();
-  if (request_priority < running_priority)
-    channel_->rtu_manager ()->should_preempt (1);
-  return;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> >;
-template void operator+=(ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> > &, ACE_CORBA_var<ACE_ES_Event_Container> const &);
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> >
-#pragma instantiate void operator+=(ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> > &, ACE_CORBA_var<ACE_ES_Event_Container> const &)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
deleted file mode 100644
index 3ec2c40da06..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Dispatching_Module
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    This file holds the different Event Service dispatching
-//    mechanisms.  These include null-dispatching (EFD),
-//    single-threaded with (RTU) and without preemption (LAME), and a
-//    multithreaded implementation.
-//
-// ============================================================================
-
-#ifndef ACE_DISPATCHING_MODULES_H
-#define ACE_DISPATCHING_MODULES_H
-
-#include "tao/Timeprobe.h"
-#include "ReactorTask.h"
-#include "Event_Channel.h"
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Queue;
-class ACE_ES_Dispatch_Request;
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Consumer_Module;
-
-class TAO_ORBSVCS_Export ACE_ES_Dispatching_Base : public ACE_Event_Handler
-// = TITLE
-//    Event Service Dispatch Module base class
-//
-// = DESCRIPTION
-//    We inherit from ACE_Event_Handler so that we can be called back
-//    by the ReactorEx when requests are queued.  The virtual
-//    dispatch_event method allows ACE_ES_Dispatch_Requests to call
-//    back the dispatching module when acting as command objects. When
-//    this implementation is used by the Event Channel it forwards all
-//    dispatch calls without any queuing.  Therefore, it can be
-//    used to build an EFD.  It is also inherited by the Priority
-//    Dispatching module.
-{
-public:
-  ACE_ES_Dispatching_Base (ACE_EventChannel *channel);
-  // Default construction.
-
-  virtual void open (ACE_ES_Consumer_Module *up,
-		     ACE_ES_Correlation_Module *down);
-  // Link to adjacent modules.
-
-  virtual void connected (ACE_Push_Consumer_Proxy *consumer,
-			  CORBA::Environment &);
-  // Forward down_.
-
-  virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-			      CORBA::Environment &);
-  // Forward down_.
-
-  virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
-  // Release any unneeded dispatching resources.
-
-  // = Not needed.
-  // void connected (ACE_Push_Supplier_Proxy *supplier);
-  // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &) = 0;
-  // Forward up_.
-
-  virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
-  // Called by ACE_ES_Dispatch_Requests when dequeued by RT_Tasks.
-
-  virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
-  // Called when all the threads of a <q> have exited.
-
-  virtual void shutdown (void);
-  // This is called by the Event Channel.  This will attempt to shut
-  // down all of its threads gracefully.  Wish it luck.
-
-protected:
-  ACE_EventChannel *channel_;
-  // Dat der channel.
-
-  ACE_ES_MUTEX lock_;
-  // To synchronize thr_count_.
-
-  int thr_count_;
-  // The total number of threads in the Dispatching Module.  This will
-  // be the sum of all the Dispatch Queue threads.
-
-  ACE_ES_Consumer_Module *up_;
-  // Next module up.
-
-  ACE_ES_Correlation_Module *down_;
-  // Next module down.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request : public ACE_RT_Task_Command
-// = TITLE
-//    ACE Event Service Dispatch Request
-//
-// = DESCRIPTION
-//    Encapsulates a consumer and the events that will be sent to the
-//    consumer.  Right now, this class keeps a single_event_ that can
-//    be used when only one event is sent to the consumer.  Since this
-//    is frequently the case (except for correlations), this
-//    optimization reduces the amount of dynamic memory allocation is
-//    necessary.  This class is also a GOF Command object since it can
-//    be dequeued by an RT_Task to call back the dispatching module
-//    for request dispatching.
-{
-public:
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-
-  ACE_ES_Dispatch_Request (void);
-  // Default construction.
-  
-  virtual ~ACE_ES_Dispatch_Request (void);
-  // Default destruction.
-  
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   RtecScheduler::handle_t rt_info);
-  // All the events must be added after construction to the
-  // event_set.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   const Event_Set &event_set,
-			   RtecScheduler::handle_t rt_info);
-  // Set consumer_ to <consumer> and copy <event_set> to event_set_.
-  // <rt_info> describes the method receiving this dispatch.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const RtecEventComm::Time &time,
-			   RtecScheduler::handle_t rt_info);
-  // Set consumer_ to <consumer> and sets single_event_.creation_time_
-  // to <time>.  Sets use_single_event_ to 1.  <rt_info> describes the
-  // method receiving this dispatch.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   ACE_ES_Event_Container *event,
-			   RtecScheduler::handle_t rt_info);
-  // Sets consumer_ and the first slot of event_set_.  We use the
-  // event_set_ instead of the single_event_ so that we can just carry
-  // around the pointer to <event>.  <rt_info> describes the method
-  // receiving this dispatch.
-
-  RtecScheduler::handle_t rt_info (void);
-  // Description of the method receiving this request.
-
-  void set (ACE_ES_Dispatching_Base *dispatching_module,
-	    RtecScheduler::OS_Priority priority,
-	    RtecScheduler::Sub_Priority sub_priority);
-  // For multi-threaded implementations, <dispatching_module> is
-  // called back when a request is dequeued.  <priority> is the
-  // dispatch priority of the event.  <sub_priority> is the enqueue
-  // priority of the event and will be forwarded to
-  // ACE_Message_Block.
-
-  ACE_Push_Consumer_Proxy *consumer (void) const;
-  // Consumer accessor.
-
-  const Event_Set &event_set (void) const;
-  // If accessed, make_copy will use event_set_.
-
-  Event_Set &event_set (void);
-  // If accessed, make_copy will use event_set_.
-
-  CORBA::ULong number_of_events (void) const;
-  // Returns 1 if we're using single_event, or event_set_.size ().
-
-  void make_copy (RtecEventComm::EventSet &dest) const;
-  // Copy single_event or event_set into <dest>.
-
-  virtual int execute (u_long &command_action);
-  // Calls dispatching_module_->dispatch_event.
-
-  RtecScheduler::OS_Priority priority (void);
-  // Priority accessor.
-
-#if 0
-  // @@ This cannot be done: the object would be allocated using this
-  // class operator new, but it will be removed using the
-  // ACE_Message_Block operator delete!
-  void *operator new (size_t nbytes);
-  // Allocates memory from a thread-specific memory pool.
-
-  void operator delete (void *);
-  // Returns memory to a thread-specific memory pool.
-#endif
-
-protected:
-  RtecScheduler::OS_Priority priority_;
-
-  RtecScheduler::handle_t rt_info_;
-  // Describes the method receiving this dispatch.
-
-  ACE_ES_Dispatching_Base *dispatching_module_;
-  // The dispatching module called back when we're dequeued by a
-  // thread.
-
-  int use_single_event_;
-  // Is true if we're using a single event.  Is 0 is we're using
-  // event_set_.
-
-  ACE_Push_Consumer_Proxy *consumer_;
-  // The final destination for single_event_ or event_set_.
-
-  ACE_ES_Event_Container single_event_;
-  // This is used for single event dispatches.
-
-  Event_Set event_set_;
-  // This is used for event sets that need to be dispatched.
-};
-
-// ************************************************************
-
-#if defined (ACE_WIN32)
-class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
-// = TITLE 
-//     Event Service ReactorEx Notification Strategy
-//
-// = DESCRIPTION
-//     Integrates the ACE_Message_Queue notification to signal a
-//     handle that will wake up the ACE_ES_Priority_Dispatching
-//     module.  This is used in place of the
-//     ACE_ReactorEx_Notification_Strategy to avoid any queueing by
-//     the ReactorEx::notify mechanism.
-{
-public:
-  ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh);
-  // Stores away <eh> for when this->open is called.
-
-  int open (void);
-  // Registers eh_ with the ReactorEx to be notified when this->notify
-  // is called.
-
-  void shutdown (void);
-  // Removes self from the reactor.
-
-  // = These result in eh_->handle_signal getting called.  eh_ should
-  // point to a dispatching module.
-  virtual int notify (void);
-  virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask);
-
-  //  ACE_HANDLE get_handle (void);
-  // Returns event_.handle ().
-
-private:
-  ACE_Auto_Event event_;
-  // Registered with the ReactorEx.
-};
-
-typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy;
-
-#else // *******************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Strategy
-// = TITLE 
-//     Event Service Reactor Notification Strategy
-//
-// = DESCRIPTION
-//     Maps to the ACE_Reactor_Notification_Strategy interface.  This
-//     version is for non WIN32 platforms.
-{
-public:
-  ACE_ES_Reactor_NS (ACE_Event_Handler *eh);
-  // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor
-  // and signal mask.
-
-  int open (void);
-  // Does nothing.
-
-  void shutdown (void);
-  // Does nothing.
-};
-
-typedef ACE_ES_Reactor_NS ACE_ES_Notification_Strategy;
-
-#endif /* ACE_WIN32 */
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_MQ : public ACE_ES_QUEUE
-// = TITLE
-//    Event Service Message Queue
-{
-  virtual int notify (void) { return 0;}
-  // Does nothing.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Dispatch_Queue : public ACE_RT_Task
-// = TITLE
-//    Event Service Dispatch Queue
-//
-// = DESCRIPTION
-//    An encapsulation of a dispatch queue.  By inheriting from
-//    ACE_RT_Task, we can make this zero-threaded or multi-threaded.
-{
-public:
-  ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-			 ACE_ES_Notification_Strategy *notification_strategy);
-  // Stores <dispatching_module> for this->threads_closed.  Stores
-  // away <notification_strategy> for this->synch_threads.
-
-  int open_queue (RtecScheduler::Period &period,
-		  int threads);
-  // This is a hack to get the channel to work with the new
-  // scheduler.
-
-#if 0
-  int open_queue (RtecScheduler::OS_Priority priority,
-		  int threads);
-  // Creates a name from the <priority> and tries to find a scheduling
-  // qos structure.  If one is not found, but created, qos_ is set
-  // with default values.  Either way, if qos_->thread_ > 0, it calls
-  // this->synch_threads.  Otherwise, our message queue will use
-  // notification_strategy_.  This will cause the ReactorEx to call
-  // back the dispatching_module_ when requests are queued on our
-  // message queue.  Returns 0 on success, -1 on failure.
-#endif
-
-  virtual void threads_closed (void);
-  // Called when every thread has exited.  This will call
-  // dispatching_module_->dispatch_queue_closed.
-
-private:
-  ACE_ES_Dispatching_Base *dispatching_module_;
-  // Used in threads_closed.
-
-  ACE_ES_Notification_Strategy *notification_strategy_;
-  // Notifies the Dispatching Module when a request has been queued on
-  // our message queue.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Priority_Dispatching : public ACE_ES_Dispatching_Base
-// = TITLE
-//    Event Service Priority Dispatching Module
-//
-// = DESCRIPTION
-//    Inherits from ACE_Event_Handler to utilitize the
-//    ACE_Message_Queue notification strategy.  This implementation
-//    does priority dispatching without preemption.
-{
-public:
-  ACE_ES_Priority_Dispatching (ACE_EventChannel *channel,
-			       int threads_per_queue);
-  // Store <channel>.  Spawns <threads_per_queue> thread for each
-  // dispatch queue.  If != 0, then the channel is an MT_CHANNEL.  If
-  // == 0, then the channel is an ST_CHANNEL.
-
-  ~ACE_ES_Priority_Dispatching (void);
-  // Delete queues.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
-  // Allocate any needed dispatching resources for this consumers
-  // priority.
-
-  void disconnected (ACE_Push_Consumer_Proxy *consumer);
-  // Release unneeded dispatch queues.
-
-  // = Not needed.
-  // void connected (ACE_Push_Supplier_Proxy *supplier);
-  // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Enqueues the request on the appropriate Dispatch Queue.
-
-  virtual void shutdown (void);
-  // Closes all queues "asynchronously."  When all queues are closed,
-  // deletes them all and then deletes itself.
-
-  virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
-  // Called when all the threads of a <q> have exited.  Deletes <q>.
-
-  //  virtual ACE_HANDLE get_handle (void) const;
-  // Get the I/O handle.
-
-protected:
-  virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
-  // Called when input has arrived on a message queue.  This is used
-  // for single-threaded implementations.
-
-  virtual int handle_input (ACE_HANDLE);
-  // For single-threaded implementations on non-win32 platforms that
-  // use the ACE_Reactor_Notification_Strategy.  This just forwards
-  // all calls to this->handle_signal ().
-
-  ACE_ES_Notification_Strategy notification_strategy_;
-  // Shared between all dispatch queues.
-
-  void initialize_queues (void);
-  // This is a hack to create a queue for each of the 4 rate groups.
-
-  ACE_ES_Dispatch_Queue *queues_[ACE_Scheduler_MAX_PRIORITIES];
-  // Pointers to dispatch queues.
-
-  ACE_ES_Dispatch_Queue *delete_me_queues_[ACE_Scheduler_MAX_PRIORITIES];
-  // Pointers to dispatch queues that want to die.
-
-  int queue_count_[ACE_Scheduler_MAX_PRIORITIES];
-  // The number of consumers using each queue.
-
-  int highest_priority_;
-  // The highest priority queue in queues_.  This allows us to
-  // optimize the handle_signal method.
-
-  int shutdown_;
-  // Make sure to only shutdown the dispatching module once.
-
-  int threads_per_queue_;
-  // The number of threads to spawn for each dispatch queue.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_EFD_Dispatching : public ACE_ES_Dispatching_Base
-// = TITLE
-//    Event Service EFD Dispatching Module
-//
-// = DESCRIPTION
-//    Implements a zero-threaded dispatcher with no preemption.
-{
-public:
-  ACE_ES_EFD_Dispatching (ACE_EventChannel *channel);
-  // Acquires the proper qos structure and passes <channel> onto to
-  // the dispatching base constructor.
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Forward up_.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_RTU_Dispatching : public ACE_ES_Priority_Dispatching
-// = TITLE
-//    Event Service RTU Dispatching Module
-//
-// = DESCRIPTION
-//    Implements a single-threaded dispatcher with delayed preemption.
-{
-public:
-  ACE_ES_RTU_Dispatching (ACE_EventChannel *channel);
-  // Store <channel>.  
-
-  virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
-  // Called by ACE_Dispatch_Queues and handle_signal when an event
-  // needs to be dequeued.  Implements an RTU-like delayed preemption
-  // policy.
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Calls ACE_ES_Priority_Dispatching::push and then checks if
-  // preemption is necessary.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Dispatching_Modules.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_DISPATCHING_MODULES_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
deleted file mode 100644
index 7148766c9b7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (void) :
-  priority_ (0),
-  rt_info_ (0),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (0),
-  single_event_ (),
-  event_set_ ()
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::~ACE_ES_Dispatch_Request (void)
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  const Event_Set &event_set,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ (event_set)
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  ACE_ES_Event_Container *event,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-  event_set_ += event;
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  const RtecEventComm::Time &time,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (1),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-  single_event_.creation_time_ = time;
-  single_event_.type_ = ACE_ES_EVENT_TIMEOUT;
-}
-
-ACE_INLINE void
-ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module,
-			      RtecScheduler::OS_Priority preemption_priority,
-			      RtecScheduler::Sub_Priority sub_priority)
-{
-  dispatching_module_ = dispatching_module;
-  priority_ = preemption_priority;
-  ACE_Message_Block::msg_priority (sub_priority);
-}
-
-ACE_INLINE ACE_Push_Consumer_Proxy *
-ACE_ES_Dispatch_Request::consumer (void) const
-{
-  return consumer_;
-}
-
-ACE_INLINE const ACE_ES_Dispatch_Request::Event_Set &
-ACE_ES_Dispatch_Request::event_set (void) const
-{
-  return event_set_;
-}
-
-ACE_INLINE ACE_ES_Dispatch_Request::Event_Set &
-ACE_ES_Dispatch_Request::event_set (void)
-{
-  return event_set_;
-}
-
-ACE_INLINE CORBA::ULong
-ACE_ES_Dispatch_Request::number_of_events (void) const
-{
-  if (use_single_event_)
-    return 1;
-  else
-    return event_set_.length ();
-}
-
-ACE_INLINE RtecScheduler::OS_Priority
-ACE_ES_Dispatch_Request::priority (void)
-{
-  return priority_;
-}
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_ES_Dispatch_Request::rt_info (void)
-{
-  return rt_info_;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Dispatching_Base::ACE_ES_Dispatching_Base (ACE_EventChannel *channel)
-  : channel_ (channel),
-    thr_count_ (0),
-    up_ (0),
-    down_ (0)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up,
-			       ACE_ES_Correlation_Module *down)
-{
-  up_ = up;
-  down_ = down;
-  // 1 == 2.
-}
-
-ACE_INLINE void 
-ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer,
-				    CORBA::Environment &_env)
-{
-  down_->connected (consumer, _env);
-}
-
-ACE_INLINE void 
-ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
-{
-  // Do nothing.
-  ACE_UNUSED_ARG (consumer);
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-					CORBA::Environment &_env)
-{
-  down_->disconnecting (consumer, _env);
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::dispatch_queue_closed (ACE_ES_Dispatch_Queue *q)
-{
-  ACE_UNUSED_ARG (q);
-}
-
-// Just forward the request.  This is basically a hook for the RTU
-// stuff. 
-ACE_INLINE int
-ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
-					 u_long &command_action)
-{
-  ACE_TIMEPROBE ("  decode the event");
-
-  TAO_TRY
-    {
-      // Forward the request.
-      up_->push (request, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Dispatching_Base::dispatch_event unknown exception.\n"));
-    }
-  TAO_ENDTRY;
-
-  // Tell our caller to release the request.
-  command_action = ACE_RT_Task_Command::RELEASE;
-
-  // Return zero so our calling thread does not exit.
-  return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::shutdown (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_ES_Dispatching_Base module shutting down.\n"));
-}
-
-// ************************************************************
-
-#if defined (ACE_WIN32)
-ACE_INLINE
-ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh)
-  : ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK)
-{
-}
-
-ACE_INLINE int
-ACE_ES_ReactorEx_NS::open (void)
-{
-  return ACE_Task_Manager::instance ()->
-    GetReactorTask (0)->get_reactor ().register_handler (eh_, event_.handle ());
-}
-
-ACE_INLINE void
-ACE_ES_ReactorEx_NS::shutdown (void)
-{
-  ACE_Task_Manager::instance ()->GetReactorTask (0)->
-    get_reactor ().remove_handler (eh_, ACE_Event_Handler::DONT_CALL);
-}
-
-ACE_INLINE int 
-ACE_ES_ReactorEx_NS::notify (void)
-{
-  return event_.signal ();
-}
-
-ACE_INLINE int 
-ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *eh,
-			       ACE_Reactor_Mask mask)
-{
-  return event_.signal ();
-}
-
-#else /* !defined (ACE_WIN32) */
-// This class is only necessary on non-win32 platforms.
-ACE_INLINE
-ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh)
-  : ACE_Reactor_Notification_Strategy (&(ACE_Task_Manager::instance ()->
-				       GetReactorTask (0)->get_reactor ()),
-				       eh, ACE_Event_Handler::READ_MASK)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Reactor_NS::open (void)
-{
-  return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Reactor_NS::shutdown (void)
-{
-}
-
-#endif /* ACE_WIN32 */
-
-// ************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
deleted file mode 100644
index cade2d53dbf..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ /dev/null
@@ -1,2781 +0,0 @@
-// $Id$
-
-#include "ace/Service_Config.h"
-#include "orbsvcs/Scheduler_Factory.h"
-
-#include "Dispatching_Modules.h"
-#include "Memory_Pools.h"
-#include "Event_Channel.h"
-
-// These are to save space.
-#define WRITE_GUARD ACE_ES_WRITE_GUARD
-#define READ_GUARD ACE_ES_READ_GUARD
-
-#if !defined (__ACE_INLINE__)
-#include "Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
-// ************************************************************
-
-static RtecScheduler::OS_Priority
-Preemption_Priority (RtecScheduler::handle_t rtinfo)
-{
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  TAO_TRY
-    {
-      ACE_TIMEPROBE ("  Preemption_Priority - priority requested");
-      ACE_Scheduler_Factory::server ()->priority
-        (rtinfo,
-         thread_priority,
-         subpriority,
-         preemption_priority,
-         TAO_TRY_ENV);
-      TAO_CHECK_ENV
-      ACE_TIMEPROBE ("  connected - priority obtained");
-    }
-  TAO_CATCH (RtecScheduler::UNKNOWN_TASK, ex_ut)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "UNKNOWN_TASK %p.\n",
-                         "Preemption_Priority"), 0);
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "Unexpected exception %p.\n",
-                         "Preemption_Priority"), 0);
-
-    }
-  TAO_ENDTRY;
-  return preemption_priority;
-}
-
-static RtecScheduler::OS_Priority
-IntervalToPriority (RtecScheduler::Time interval)
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    if (interval <= ACE_Scheduler_Rates[x])
-      return x;
-
-  return ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
-}
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export Shutdown_Consumer : public ACE_ES_Dispatch_Request
-// = TITLE
-//    Shutdown Consumer command
-//
-// = DESCRIPTION
-//    This command object is sent through the system when a consumer
-//    disconnects.  When the Dispatching Module dequeues this request,
-//    it calls execute which execute calls back to the Consumer
-//    Module.  At that point, the Consumer Module can tell the rest of
-//    the system that the consumer has disconnected and delete the
-//    consumer proxy.  This allows all events queued for the consumer
-//    to be flushed to the consumer proxy (which will drop them).
-//    Events can be queued in the ReactorEx (in a dispatch set), or in
-//    the Dispatching Module.
-{
-public:
-  // When executed, tells <consumer_module> that <consumer> has shut
-  // down.
-  Shutdown_Consumer (ACE_ES_Consumer_Module *consumer_module,
-                     ACE_Push_Consumer_Proxy *consumer)
-    : consumer_module_ (consumer_module)
-    {
-      consumer_ = consumer;
-
-      // Set rt_info_ to the lowest priority rt_info in consumer_.
-      // This is so the dispatching module can query us as a dispatch
-      // request to get the appropriate preemption priority.
-      ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
-      while (iter.advance_dependency () == 0)
-        {
-          RtecEventComm::EventType &type = (*iter).event_.type_;
-          if (type != ACE_ES_GLOBAL_DESIGNATOR &&
-              type != ACE_ES_CONJUNCTION_DESIGNATOR &&
-              type != ACE_ES_DISJUNCTION_DESIGNATOR)
-            {
-              if (rt_info_ == 0 ||
-                  ::Preemption_Priority ((*iter).rt_info) <
-                  ::Preemption_Priority (rt_info_))
-                rt_info_ = (*iter).rt_info;
-            }
-        }
-    }
-
-  // Report to the consumer module that consumer_ has shutdown.
-  virtual int execute (u_long &command_action)
-    {
-      consumer_module_->shutdown_request (this);
-      command_action = ACE_RT_Task_Command::RELEASE;
-      return 0;
-    }
-
-  void *operator new (size_t /* nbytes */)
-    { return ::new char[sizeof (Shutdown_Consumer)]; }
-
-  void operator delete (void *buf)
-    { ::delete [] buf; }
-
-  // The module that we report to.
-  ACE_ES_Consumer_Module *consumer_module_;
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export Shutdown_Channel : public ACE_ES_Dispatch_Request
-{
-public:
-  Shutdown_Channel (ACE_EventChannel *channel) :
-    channel_ (channel) {}
-
-  // Report to the consumer module that consumer_ has shutdown.
-  virtual int execute (u_long &command_action)
-    {
-#if 0
-      channel_->destroy_i ();
-#endif
-      command_action = ACE_RT_Task_Command::RELEASE;
-      return 0;
-    }
-
-  void *operator new (size_t /* nbytes */)
-    { return ::new char[sizeof (Shutdown_Channel)]; }
-
-  void operator delete (void *buf)
-    { ::delete [] buf; }
-
-  ACE_EventChannel *channel_;
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Priority_Timer : public ACE_Event_Handler
-// = TITLE
-//    Event Service Timer
-//
-// = DESCRIPTION
-//    Manages a thread per priority, each of which sits on its own
-//    ReactorEx dispatching the timers for its given priority.
-{
-public:
-  ACE_ES_Priority_Timer (void);
-  // Default construction.
-
-  int connected (RtecScheduler::handle_t rt_info);
-  // This allows the Priority Timer to prespawn threads.  Returns 0 on
-  // success, -1 on failure.
-
-  int schedule_timer (RtecScheduler::handle_t rt_info,
-                      const ACE_ES_Timer_ACT *act,
-                      RtecScheduler::OS_Priority preemption_priority,
-                      const RtecScheduler::Time& delta,
-                      const RtecScheduler::Time& interval = ORBSVCS_Time::zero);
-  // Schedule a timer at the appropriate priority for <preemption_priority>.
-  // Returns the preemption priority used on success, -1 on failure.
-
-  int cancel_timer (RtecScheduler::OS_Priority preemption_priority,
-                    int id, ACE_ES_Timer_ACT *&act);
-  // Cancel the timer associated with the priority of
-  // <preemption_priority> and <id>.  <act> is filled in with the
-  // Timer_ACT used when scheduling the timer.  Returns 0 on success,
-  // -1 on failure.
-
-private:
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *act);
-  // Casts <act> to ACE_ES_Timer_ACT and calls execute.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export Flush_Queue_ACT : public ACE_ES_Timer_ACT
-// = TITLE
-//    Flush Queue Asynchronous Completion Token
-//
-// = DESCRIPTION
-//    Carries a single dispatch request through the ReactorEx.
-//    Deletes itself when execute is called.
-{
-public:
-  Flush_Queue_ACT (ACE_ES_Dispatch_Request *request,
-                   ACE_ES_Dispatching_Module *dispatching_module) :
-    request_ (request),
-    dispatching_module_ (dispatching_module) { }
-
-  virtual void execute (void)
-    {
-      TAO_TRY
-        {
-          ACE_ES_Dispatch_Request *request = request_;
-          dispatching_module_->push (request, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-          delete this;
-        }
-      TAO_CATCHANY
-        {
-          ACE_ERROR ((LM_ERROR, "(%t) Flush_Queue_ACT::execute: "
-                      "Unknown exception..\n"));
-        }
-      TAO_ENDTRY;
-    }
-
-  ACE_ES_Dispatch_Request *request_;
-  ACE_ES_Dispatching_Module *dispatching_module_;
-};
-
-// ************************************************************
-
-// Since this class is *defined* in the cpp file, the INLINE
-// definitions must also be in the cpp file.   The should go here
-// before any use of these methods.
-
-ACE_INLINE int
-ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info,
-                                       const ACE_ES_Timer_ACT *act,
-                                       RtecScheduler::OS_Priority preemption_priority,
-                                       const RtecScheduler::Time &delta,
-                                       const RtecScheduler::Time &interval)
-{
-  if (rt_info != 0)
-    {
-      // Add the timer to the task's dependency list.
-      RtecScheduler::handle_t timer_rtinfo =
-        ACE_Task_Manager::instance()->GetReactorTask (preemption_priority)->rt_info ();
-
-      TAO_TRY
-        {
-          ACE_Scheduler_Factory::server()->add_dependency
-            (rt_info, timer_rtinfo, 1, RtecScheduler::ONE_WAY_CALL, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-      TAO_CATCHANY
-        {
-          ACE_ERROR ((LM_ERROR, "add dependency failed"));
-        }
-      TAO_ENDTRY;
-    }
-
-  // @@ We're losing resolution here.
-  ACE_Time_Value tv_delta;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta);
-
-  ACE_Time_Value tv_interval;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
-
-  return ACE_Task_Manager::instance()->
-    GetReactorTask (preemption_priority)->
-    get_reactor ().schedule_timer (this,
-                                   (void *) act,
-                                   tv_delta, tv_interval);
-}
-
-ACE_INLINE int
-ACE_ES_Priority_Timer::cancel_timer (RtecScheduler::OS_Priority preemption_priority,
-                                     int id, ACE_ES_Timer_ACT *&act)
-{
-  const void *vp;
-
-  int result = ACE_Task_Manager::instance()->
-    GetReactorTask (preemption_priority)->
-    get_reactor ().cancel_timer (id, &vp);
-
-  if (result == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Timer::cancel_timer: "
-                  "Tried to cancel nonexistent timer.\n"));
-      act = 0;
-    }
-  else
-    act = (ACE_ES_Timer_ACT *) vp;
-
-  return result;
-}
-
-// ************************************************************
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (void) :
-  //  ACE_ES_Event (),
-  ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container::~ACE_ES_Event_Container (void)
-{
-}
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (const ACE_ES_Event_Container &ec)
- : RtecEventComm_Event (ec),
-   ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (const RtecEventComm_Event &e)
-  : RtecEventComm_Event (e),
-    ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container *
-ACE_ES_Event_Container::_duplicate (void)
-{
-  ref_count_++;
-  return this;
-}
-
-void
-ACE_ES_Event_Container::_release (void)
-{
-  if (--ref_count_ == 0)
-    delete this;
-}
-
-int
-ACE_ES_Event_Container::operator== (const ACE_ES_Event_Container &event)
-{
-  RtecEventComm::Event &event1 = (RtecEventComm::Event &) *this;
-  RtecEventComm::Event &event2 = (RtecEventComm::Event &) event;
-  return event1 == event2;
-}
-
-void *
-ACE_ES_Event_Container::operator new (size_t nbytes)
-{
-  ACE_ASSERT (nbytes <= sizeof (ACE_ES_Event_Container));
-  return ACE_ES_Memory_Pools::new_Event_Container ();
-}
-
-void
-ACE_ES_Event_Container::operator delete (void *mem)
-{
-  ACE_ES_Memory_Pools::delete_Event_Container (mem);
-}
-
-void
-ACE_ES_Event_Container::dump (void)
-{
-  ::dump_event ((RtecEventComm::Event &) *this);
-}
-
-// ************************************************************
-
-ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm)
-  : supplier_module_ (sm),
-    push_supplier_ (0)
-{
-}
-
-void
-ACE_Push_Supplier_Proxy::connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
-                                                const RtecEventChannelAdmin::SupplierQOS &qos,
-                                                CORBA::Environment &_env)
-{
-  if (this->connected ())
-    TAO_THROW (RtecEventChannelAdmin::AlreadyConnected);
-
-  push_supplier_ =
-    RtecEventComm::PushSupplier::_duplicate(push_supplier);
-
-  // ACE_SupplierQOS_Factory::debug (qos);
-
-  // Copy by value.
-  qos_ = qos;
-
-  // ACE_SupplierQOS_Factory::debug (qos_);
-
-  // @@ TODO: The SupplierQOS should have a more reasonable interface to
-  // obtain the supplier_id(), BTW, a callback to push_supplier will
-  // not work: it usually results in some form of dead-lock.
-  source_id_ = qos_.publications_[0].event_.source_;
-
-  supplier_module_->connected (this, _env);
-}
-
-void
-ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
-                               CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  enter Push_Supplier_Proxy::push");
-
-  // @@ TOTAL HACK
-  ACE_hrtime_t ec_recv = ACE_OS::gethrtime ();
-  for (CORBA::ULong i = 0; i < event.length (); ++i)
-    {
-      RtecEventComm::Event& ev =
-        ACE_const_cast(RtecEventComm::Event&,event[i]);
-      ORBSVCS_Time::hrtime_to_TimeT (ev.ec_recv_time_, ec_recv);
-    }
-  supplier_module_->push (this, event, _env);
-}
-
-void
-ACE_Push_Supplier_Proxy::disconnect_push_consumer (CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE_PRINT;
-  if (this->connected ())
-    {
-      push_supplier_ = 0;
-      supplier_module_->disconnecting (this, _env);
-    }
-}
-
-void
-ACE_Push_Supplier_Proxy::shutdown (void)
-{
-  TAO_TRY
-    {
-      push_supplier_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_Push_Supplier_Proxy::shutdown failed.\n"));
-    }
-  TAO_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_Push_Consumer_Proxy::ACE_Push_Consumer_Proxy (ACE_ES_Consumer_Module *cm)
-  : push_consumer_ (0),
-    consumer_module_ (cm)
-{
-}
-
-ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void)
-{
-}
-
-
-void
-ACE_Push_Consumer_Proxy::connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
-                                                const RtecEventChannelAdmin::ConsumerQOS &qos,
-                                                CORBA::Environment &_env)
-{
-  if (this->connected ())
-    TAO_THROW (RtecEventChannelAdmin::AlreadyConnected);
-
-  push_consumer_ =
-    RtecEventComm::PushConsumer::_duplicate(push_consumer);
-  // @@ TODO Find out why are two duplicates needed...
-  RtecEventComm::PushConsumer::_duplicate(push_consumer);
-
-  // ACE_ConsumerQOS_Factory::debug (qos);
-
-  // Copy by value.
-  qos_ = qos;
-
-  // ACE_ConsumerQOS_Factory::debug (qos_);
-
-  consumer_module_->connected (this, _env);
-}
-
-void
-ACE_Push_Consumer_Proxy::disconnect_push_supplier (CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE_PRINT;
-  consumer_module_->disconnecting (this, _env);
-  push_consumer_ = 0;
-}
-
-void
-ACE_Push_Consumer_Proxy::suspend (CORBA::Environment &)
-{
-  correlation_.suspend ();
-}
-
-void
-ACE_Push_Consumer_Proxy::resume (CORBA::Environment &)
-{
-  correlation_.resume ();
-}
-
-void
-ACE_Push_Consumer_Proxy::shutdown (void)
-{
-  TAO_TRY
-    {
-      push_consumer_->disconnect_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_Push_Consumer_Proxy::shutdown failed.\n"));
-    }
-  TAO_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_EventChannel::ACE_EventChannel (u_long type)
-  : rtu_manager_ (0),
-    type_ (type),
-    state_ (INITIAL_STATE),
-    destroyed_ (0)
-{
-  consumer_module_ = new ACE_ES_Consumer_Module (this);
-  // RtecEventChannelAdmin::ConsumerAdmin_duplicate(consumer_module_);
-
-  ACE_NEW(dispatching_module_,
-          ACE_ES_Priority_Dispatching(this, THREADS_PER_DISPATCH_QUEUE));
-
-  correlation_module_ = new ACE_ES_Correlation_Module (this);
-  subscription_module_ = new ACE_ES_Subscription_Module (this);
-  supplier_module_ = new ACE_ES_Supplier_Module (this);
-  timer_ = new ACE_ES_Priority_Timer;
-
-  consumer_module_->open (dispatching_module_);
-  dispatching_module_->open (consumer_module_, correlation_module_);
-  correlation_module_->open (dispatching_module_, subscription_module_);
-  subscription_module_->open (correlation_module_, supplier_module_);
-  supplier_module_->open (subscription_module_);
-}
-
-ACE_EventChannel::~ACE_EventChannel (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_EventChannel deleting all modules.\n"));
-
-  TAO_TRY
-    {
-      this->destroy (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_EventChannel::~ACE_EventChannel"));
-    }
-  TAO_ENDTRY;
-  // @@ TODO: Shouldn't we use _release() instead?
-  delete rtu_manager_;
-  delete consumer_module_;
-  delete dispatching_module_;
-  delete correlation_module_;
-  delete subscription_module_;
-  delete supplier_module_;
-  delete timer_;
-}
-
-void
-ACE_EventChannel::destroy (CORBA::Environment &_env)
-{
-  ACE_UNUSED_ARG (_env);
-
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::destroy"));
-
-  if (destroyed_ != 0)
-    return;
-
-  destroyed_ = 1;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Event Channel shutting down.\n"));
-
-  // Send a shutdown message through the modules.
-  supplier_module_->shutdown ();
-
-#if 0
-  // Flush all messages in the channel.
-  Shutdown_Channel *sc = new Shutdown_Channel (this);
-  if (sc == 0)
-    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-  // Create a wrapper around the dispatch request.
-  Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, dispatching_module_);
-  if (act == 0)
-    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-  // Set a 100ns timer.
-  if (this->timer ()->schedule_timer (0, // no rt-info
-                                      act,
-                                      ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-                                      100, // 10 usec delta
-                                      0) == -1) // no interval
-    {
-      ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
-      delete sc;
-      delete act;
-    }
-#endif
-}
-
-void
-ACE_EventChannel::shutdown (void)
-{
-  // @@ TODO: Find a portable way to shutdown the ORB, on Orbix we have
-  // to call deactive_impl () on a CORBA::POA is that the portable
-  // way?
-  // With TAO we need access to the ORB (to call shutdown() on it).
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
-void
-ACE_EventChannel::report_connect (u_long event)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_connect"));
-
-  ACE_CLR_BITS (state_, event);
-}
-
-void
-ACE_EventChannel::report_disconnect (u_long event)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_disconnect"));
-
-  ACE_SET_BITS (state_, event);
-  if (state_ == SHUTDOWN)
-    ACE_DEBUG ((LM_DEBUG, "(%t) Event Channel has no consumers or suppliers.\n"));
-}
-
-ACE_ES_Disjunction_Group::~ACE_ES_Disjunction_Group (void)
-{
-}
-
-ACE_ES_Conjunction_Group::~ACE_ES_Conjunction_Group (void)
-{
-}
-
-// ************************************************************
-
-ACE_ES_Subscription_Info::~ACE_ES_Subscription_Info (void)
-{
-  Subscriber_Map_Iterator iter (type_subscribers_);
-
-  // Delete all type collections.
-  for (Subscriber_Map_Entry *temp = 0;
-       iter.next (temp) != 0;
-       iter.advance ())
-    {
-      delete temp->int_id_;
-    }
-}
-
-/*
-void
-ACE_ES_Subscription_Info::Type_Subscribers::operator=
-(const ACE_ES_Subscription_Info::Type_Subscribers &rhs)
-{
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (rhs.subscribers_);
-
-  for (ACE_ES_Consumer_Rep **consumer = 0;
-       iter.next (consumer) != 0;
-       iter.advance ())
-    {
-      if (subscribers_.insert (consumer) != 0)
-        ACE_ERROR ((LM_ERROR, "%p insert failed.\n",
-                    "ACE_ES_Subscription_Info::Type_Subscribers::operator="));
-    }
-
-  // Pointer copy.
-  dependency_info_ = rhs.dependency_info_;
-}
-*/
-
-// Remove <consumer> from the consumer set in <type_map> set
-// corresponding to <type>.
-int
-ACE_ES_Subscription_Info::remove (Subscriber_Map &type_map,
-                                  ACE_ES_Consumer_Rep *consumer,
-                                  RtecEventComm::EventType type)
-{
-  Type_Subscribers *subscribers;
-
-  // Find the type set within the type collection.
-  if (type_map.find (type, subscribers) == -1)
-    // type_map does not contain the type.
-    return -1;
-
-  // Remove the consumer from the type set.
-  if (subscribers->consumers_.remove (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p remove failed.\n",
-                       "ACE_ES_Subscriber_Info::remove"), -1);
-  // @@ Should probably remove the supplier from the consumers caller
-  // list.
-
-  // If the set is empty, remove it from the type collection.
-  if (subscribers->consumers_.size () == 0)
-    {
-      Type_Subscribers *removed_subscribers;
-      if (type_map.unbind (type, removed_subscribers) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p unbind failed.\n",
-                           "ACE_ES_Subscriber_Info::remove"), -1);
-
-      // Sanity check.
-      if (removed_subscribers != subscribers)
-        ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscriber_Info::remove: "
-                           "removed wrong set!\n"), -1);
-
-      // Free up the set removed.
-      delete removed_subscribers;
-    }
-
-  return 0;
-}
-
-
-int
-ACE_ES_Subscription_Info::remove (SourceID_Map &source_subscribers,
-                                  ACE_ES_Consumer_Rep *consumer,
-                                  RtecEventComm::EventSourceID sid)
-{
-  Subscriber_Set *subscribers;
-
-  // Find the subscribers of <sid>.
-  if (source_subscribers.find (sid, subscribers) == -1)
-    // does not contain the <sid>.
-    return -1;
-
-  // Remove the consumer from the subscriber set.
-  if (subscribers->remove (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p remove failed.\n",
-                       "ACE_ES_Subscriber_Info::remove"), -1);
-  // @@ Should probably remove the supplier from the consumers caller
-  // list.
-
-  // If the set is empty, remove it from the type collection.
-  if (subscribers->size () == 0)
-    {
-      Subscriber_Set *removed_subscribers;
-      if (source_subscribers.unbind (sid, removed_subscribers) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p unbind failed.\n",
-                           "ACE_ES_Subscriber_Info::remove"), -1);
-
-      // Sanity check.
-      if (removed_subscribers != subscribers)
-        ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscriber_Info::remove: "
-                           "removed wrong set!\n"), -1);
-
-      // Free up the set removed.
-      delete removed_subscribers;
-    }
-
-  return 0;
-}
-
-
-void
-ACE_ES_Subscription_Info::append_subscribers (Subscriber_Set &dest,
-                                              Subscriber_Set &src)
-{
-  Subscriber_Set_Iterator src_iter (src);
-
-  // Iterate through the source set.  Add each source proxy to the
-  // destination set.
-  for (ACE_ES_Consumer_Rep **proxy = 0;
-       src_iter.next (proxy) != 0;
-       src_iter.advance ())
-    {
-      if (dest.insert (*proxy) == -1)
-        ACE_ERROR ((LM_ERROR, "%p: insert failed.\n", "append_subscribers"));
-    }
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_allocate (SourceID_Map &sid_map,
-                                              ACE_ES_Consumer_Rep *consumer,
-                                              RtecEventComm::EventSourceID sid)
-{
-  Subscriber_Set *subscribers;
-
-  if (sid_map.find (sid, subscribers) == -1)
-    {
-      // If the correct type set does not exist, make one with a null
-      // dependency info (since there is no supplier of this event).
-      subscribers = new Subscriber_Set;
-
-      if (sid_map.bind (sid, subscribers) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p bind failed.\n",
-                      "ACE_ES_Subscription_Info::insert_or_allocate"));
-          delete subscribers;
-          return -1;
-        }
-    }
-
-  // 0 and 1 are success for insert.
-  return subscribers->insert (consumer) == -1 ? -1 : 0;
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_allocate (Subscriber_Map &type_map,
-                                              ACE_ES_Consumer_Rep *consumer,
-                                              RtecEventComm::EventType type)
-{
-  Type_Subscribers *subscribers;
-
-  if (type_map.find (type, subscribers) == -1)
-    {
-      // If the correct type set does not exist, make one with a null
-      // dependency info (since there is no supplier of this event).
-      subscribers = new Type_Subscribers (0);
-
-      if (type_map.bind (type, subscribers) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p bind failed.\n",
-                      "ACE_ES_Subscription_Info::insert_or_allocate"));
-          delete subscribers;
-          return -1;
-        }
-    }
-
-  return subscribers->consumers_.insert (consumer);
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_fail (Subscriber_Map &type_map,
-                                          ACE_ES_Consumer_Rep *consumer,
-                                          RtecEventComm::EventType type,
-                                          RtecScheduler::Dependency_Info *&dependency)
-{
-  Type_Subscribers *subscribers;
-
-  // Get the subscriber set for <type>.
-  if (type_map.find (type, subscribers) == -1)
-    return -1;
-
-  // Pass back the description of the method generating <type>.
-  dependency = subscribers->dependency_info_;
-
-  // Insert the new consumer into the subscriber set.
-  return subscribers->consumers_.insert (consumer);
-}
-
-// ************************************************************
-
-ACE_ES_Consumer_Module::ACE_ES_Consumer_Module (ACE_EventChannel* channel)
-  :  lock_ (),
-     all_consumers_ (),
-     channel_ (channel),
-     down_ (0)
-{
-}
-
-void
-ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down)
-{
-  down_ = down;
-}
-
-void
-ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                   CORBA::Environment &_env)
-{
-  channel_->report_connect (ACE_EventChannel::CONSUMER);
-  down_->connected (consumer, _env);
-}
-
-void
-ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
-{
-  Shutdown_Consumer *sc = (Shutdown_Consumer *) request;
-
-  // Tell everyone else that the consumer is disconnected.  This means
-  // that *nothing* is left in the system for the consumer, so
-  // everyone can free up any resources.
-  down_->disconnected (sc->consumer ());
-
-  ACE_DEBUG ((LM_DEBUG, "Deleting proxy for consumer\n"));
-
-  // Delete the consumer proxy.
-  delete sc->consumer ();
-
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    return;
-
-  // Tell the channel that we may need to shut down.
-  if (all_consumers_.size () <= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) No more consumers connected.\n"));
-      channel_->report_disconnect (ACE_EventChannel::CONSUMER);
-    }
-}
-
-void
-ACE_ES_Consumer_Module::shutdown (void)
-{
-  Consumers copy;
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      goto DONE;
-
-    if (all_consumers_.size () == 0)
-      goto DONE;
-
-    // Make a copy so that the consumers can disconnect without the
-    // lock being held.
-    copy = all_consumers_;
-  }
-
-  // This scope is just to thwart the compiler.  It was complaining
-  // about the above goto's bypassing variable initializations.  Yadda
-  // yadda.
-  {
-    Consumer_Iterator iter (copy);
-
-    CORBA::Environment env;
-
-    for (ACE_Push_Consumer_Proxy **proxy = 0;
-         iter.next (proxy) != 0;
-         iter.advance ())
-      {
-        (*proxy)->shutdown ();
-        // @@ Cannnot use CORBA::release (*proxy), since it is a servant.
-        delete *proxy;
-
-        // Remove the consumer from our list.
-        {
-          ACE_ES_GUARD ace_mon (lock_);
-          if (ace_mon.locked () == 0)
-            ACE_ERROR ((LM_ERROR, "%p Failed to acquire lock.\n", "ACE_ES_Consumer_Module::shutdown"));
-
-          if (all_consumers_.remove (*proxy) == -1)
-            ACE_ERROR ((LM_ERROR, "%p Failed to remove consumer.\n", "ACE_ES_Consumer_Module::shutdown"));
-        }
-      }
-  }
-
-DONE:
-  channel_->shutdown ();
-}
-
-void
-ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                                       CORBA::Environment &_env)
-{
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR);
-
-    if (all_consumers_.remove (consumer) == -1)
-      return;
-  }
-
-  // Tell everyone else that the consumer is disconnecting.  This
-  // allows them to remove the consumer from any subscription lists
-  // etc.  However, messages may still be queued in the ReactorEx or
-  // in the Dispatching Module for this consumer, so no queues or
-  // proxies can be deleted just yet.
-  down_->disconnecting (consumer, _env);
-
-  // Send a shutdown message through the system.  When this is
-  // dispatched, the consumer proxy will be deleted.  <request> is
-  // queued in the Priority_Timer at <priority> level.  It will be
-  // scheduled for dispatching in 1 nanosecond.  This gives components
-  // a hook into the first queueing point in the channel.
-
-  // Create a shutdown message.  When this is dispatched, it will
-  // delete the proxy.
-  Shutdown_Consumer *sc = new Shutdown_Consumer (this, consumer);
-  if (sc == 0)
-    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-  // Create a wrapper around the dispatch request.
-  Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, channel_->dispatching_module_);
-  if (act == 0)
-    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) initiating consumer disconnect.\n"));
-
-  // Set a 100ns timer.
-  TimeBase::TimeT ns100;
-  ORBSVCS_Time::hrtime_to_TimeT (ns100, 100);
-  if (channel_->timer ()->schedule_timer (0, // no rt_info
-                                          act,
-                                          // ::Preemption_Priority (consumer->qos ().rt_info_),
-                                          ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-                                          ns100,
-                                          ORBSVCS_Time::zero) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
-      delete sc;
-      delete act;
-    }
-}
-
-// This method executes in the same thread of control that will hand
-// the event set to the consumer (or it's proxy).  A network proxy may
-// copy the event set to the network buffer.  An active client may
-// copy the event set to be queued.  Or a same address-space consumer
-// can read the set we allocated off the stack.
-void
-ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  enter ES_Consumer_Module::push");
-  // We'll create a temporary event set with the size of the incoming
-  // request.
-  RtecEventComm::EventSet event_set (request->number_of_events ());
-  request->make_copy (event_set);
-
-  // Forward the event set.
-  ACE_hrtime_t ec_send = ACE_OS::gethrtime ();
-  for (CORBA::ULong i = 0; i < event_set.length (); ++i)
-    {
-      RtecEventComm::Event& ev =
-        ACE_const_cast(RtecEventComm::Event&,event_set[i]);
-      ORBSVCS_Time::hrtime_to_TimeT (ev.ec_send_time_, ec_send);
-    }
-  request->consumer ()->push (event_set, _env);
-  ACE_TIMEPROBE ("  leave ES_Consumer_Module::push");
-}
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &_env)
-{
-  ACE_Push_Consumer_Proxy *new_consumer = new ACE_Push_Consumer_Proxy (this);
-
-  // Get a new supplier proxy object.
-  if (new_consumer == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_EventChannel"
-                  "::obtain_push_supplier failed.\n"));
-      TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
-    }
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      {
-        delete new_consumer;
-        TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, 0);
-      }
-
-    if (all_consumers_.insert (new_consumer) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n"));
-  }
-
-  // Return the CORBA object reference to the new supplier proxy.
-  return new_consumer->get_ref ();
-}
-
-// ************************************************************
-
-ACE_ES_Correlation_Module::ACE_ES_Correlation_Module (ACE_EventChannel *channel)
-  : channel_ (channel),
-    up_ (0),
-    subscription_module_ (0)
-{
-}
-
-void
-ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up,
-                                 ACE_ES_Subscription_Module *sm)
-{
-  up_ = up;
-  subscription_module_ = sm;
-}
-
-void
-ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                      CORBA::Environment &_env)
-{
-  // Initialize the consumer correlation filter.
-  if (consumer->correlation ().connected (consumer, this) == -1)
-    TAO_THROW (RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR);
-}
-
-void
-ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                                          CORBA::Environment &)
-{
-  if (consumer->correlation ().disconnecting () == -1)
-    ACE_ERROR ((LM_ERROR, "ACE_ES_Correlation_Module::disconnecting failed.\n"));
-}
-
-int
-ACE_ES_Correlation_Module::subscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  return subscription_module_->subscribe (consumer);
-}
-
-/*
-int
-ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr)
-{
-  return subscription_module_->unsubscribe (cr);
-}
-*/
-
-void
-ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
-                                 ACE_ES_Event_Container *event,
-                                 CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  enter ACE_ES_Correlation_Module::push");
-  ACE_ES_Dispatch_Request *request =
-    consumer->correlation ()->push (consumer, event);
-  ACE_TIMEPROBE ("  pushed to Correlation_Module");
-
-  // If request == 0, then the event was queued for later.  Otherwise,
-  // we need to push the event now.
-  if (request != 0)
-    up_->push (request, _env);
-
-  ACE_TIMEPROBE ("  push_source_type: Dispatch Module enqueuing");
-}
-
-// Must check consumer->qos ().use_timeout () before calling this.
-// This method is supposed properly schedule a timer with respect to
-// the consumer's priority AND the correlation that should receive the
-// timeout event.
-int
-ACE_ES_Correlation_Module::schedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  RtecEventComm::Time &interval =
-    consumer->dependency ()->event_.creation_time_;
-  RtecEventComm::Time &delay =
-    consumer->dependency ()->event_.creation_time_;
-
-  // Store the preemption priority so we can cancel the correct timer.
-  // The priority values may change during the process lifetime (e.g.,
-  // after the scheduler has been run).
-  consumer->preemption_priority (::IntervalToPriority (interval));
-
-  // Register the timer.
-  int id = channel_->timer ()->schedule_timer (consumer->dependency ()->rt_info,
-                                               consumer,
-                                               consumer->preemption_priority (),
-                                               delay, interval);
-
-  // Store the timer id for canceling.
-  consumer->timer_id (id);
-
-  if (id == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p schedule timer failed.\n",
-                       "ACE_ES_Correlation_Module::schedule_timeout"), -1);
-
-  return 0;
-}
-
-// Must check consumer->qos ().timeout_ before calling this.
-int
-ACE_ES_Correlation_Module::cancel_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  // Cancel the timer from the Priority Timer.
-  ACE_ES_Timer_ACT *act;
-  channel_->timer ()->cancel_timer (consumer->preemption_priority (),
-                                    consumer->timer_id (),
-                                    act);
-
-  ACE_ASSERT (consumer == act);
-
-  // Free up the Timer ACT.
-  //  delete act;
-
-  return 0;
-}
-
-
-int
-ACE_ES_Correlation_Module::reschedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  if (this->cancel_timeout (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"), -1);
-  else
-    {
-      RtecEventComm::Time &interval =
-        consumer->dependency ()->event_.creation_time_;
-      RtecEventComm::Time &delay =
-        consumer->dependency ()->event_.creation_time_;
-
-      // Store the preemption priority so we can cancel the correct timer.
-      // The priority values may change during the process lifetime (e.g.,
-      // after the scheduler has been run).
-      consumer->preemption_priority (::IntervalToPriority (interval));
-
-      // Register the timer.
-      int id = channel_->timer ()->schedule_timer (0, // Do not pass an RT_Info.
-                                                   consumer,
-                                                   consumer->preemption_priority (),
-                                                   delay, interval);
-
-      // Store the timer id for canceling.
-      consumer->timer_id (id);
-
-      if (id == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p schedule timer failed.\n",
-                           "ACE_ES_Correlation_Module::reschedule_timeout"), -1);
-
-      return 0;
-    }
-}
-
-void
-ACE_ES_Correlation_Module::shutdown (void)
-{
-  // Perhaps this should call disconnecting on all the consumers?
-  // We'll opt to just forward this message for now.
-  up_->shutdown ();
-}
-
-// ************************************************************
-
-ACE_ES_Consumer_Correlation::ACE_ES_Consumer_Correlation (void) :
-  correlation_module_ (0),
-  type_id_index_ (0),
-  channel_ (0),
-  qos_ (),
-  pending_events_ (0),
-  lock_ (),
-  consumer_ (0),
-  pending_flags_ (0),
-  consumer_reps_ (0),
-  n_consumer_reps_ (0),
-  timer_reps_ (0),
-  n_timer_reps_ (0),
-  conjunction_groups_ (0),
-  n_conjunction_groups_ (0),
-  disjunction_groups_ (0),
-  n_disjunction_groups_ (0),
-  connected_ (0)
-{
-}
-
-ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void)
-{
-  delete [] timer_reps_;
-  for (int cr = 0; cr < n_consumer_reps_; cr++)
-    consumer_reps_[cr]->_release ();
-  delete [] consumer_reps_;
-  delete [] conjunction_groups_;
-  delete [] disjunction_groups_;
-  delete [] pending_events_;
-}
-
-void
-ACE_ES_Consumer_Correlation::disconnect_push_supplier (CORBA::Environment &)
-{
-  connected_ = 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::allocate_correlation_resources (ACE_ES_Dependency_Iterator &iter)
-{
-  n_conjunction_groups_ = iter.n_conjunctions ();
-  if (n_conjunction_groups_ > 0)
-    {
-      conjunction_groups_ = new ACE_ES_Conjunction_Group[n_conjunction_groups_];
-      if (conjunction_groups_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-      for (int n=0; n < n_conjunction_groups_; n++)
-        conjunction_groups_[n].set_correlation_module (correlation_module_);
-    }
-
-  n_disjunction_groups_ = iter.n_disjunctions ();
-  if (n_disjunction_groups_ > 0)
-    {
-      disjunction_groups_ = new ACE_ES_Disjunction_Group[n_disjunction_groups_];
-      if (disjunction_groups_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-      for (int n=0; n < n_disjunction_groups_; n++)
-        disjunction_groups_[n].set_correlation_module (correlation_module_);
-    }
-
-  n_consumer_reps_ = iter.n_events ();
-  if (n_consumer_reps_ > 0)
-    {
-      // This allocates more than is needed if there are repeats:
-      // (A+B)|(B+C).  We allocate these individually so that they can
-      // be deleted individually.
-
-      typedef ACE_ES_Consumer_Rep *reparray;
-      consumer_reps_ = new reparray[n_consumer_reps_];
-
-      for (int cr = 0; cr < n_consumer_reps_; cr++)
-        {
-          consumer_reps_[cr] = new ACE_ES_Consumer_Rep;
-          if (consumer_reps_[cr] == 0)
-            ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-        }
-    }
-
-  n_timer_reps_ = iter.n_timeouts ();
-  if (n_timer_reps_ > 0)
-    {
-      timer_reps_ = new ACE_ES_Consumer_Rep_Timeout[n_timer_reps_];
-      if (timer_reps_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-    }
-
-  // This allocates more than is needed.
-  pending_events_ = new Event_Set[n_consumer_reps_ + n_timer_reps_];
-  if (pending_events_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-
-  return 0;
-}
-
-// We don't need synchronization until after we've been connected and
-// subscribed to events.
-int
-ACE_ES_Consumer_Correlation::connected (ACE_Push_Consumer_Proxy *consumer,
-                                        ACE_ES_Correlation_Module *correlation_module)
-{
-  correlation_module_ = correlation_module;
-  consumer_ = consumer;
-
-  //  for (CORBA_Types::ULong index=0; index < consumer->qos ().dependencies_.length (); index++)
-  //    consumer->qos ().dependencies_[index].event_.dump ();
-
-  ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
-  iter.parse ();
-  if (this->allocate_correlation_resources (iter) == -1)
-    return -1;
-
-
-  int cgroup_index = -1;
-  int dgroup_index = -1;
-  int crep_index = 0;
-  int trep_index = 0;
-  RtecEventComm::EventType group_type = 0;
-
-  while (iter.advance_dependency () == 0)
-    {
-      // Keep track of how many conjunction and disjunction groups are
-      // registered.  Update the index pointers so that the helper
-      // functions can update the appropriate group objects.
-      switch ((*iter).event_.type_)
-        {
-        case ACE_ES_CONJUNCTION_DESIGNATOR:
-          cgroup_index++;
-          ACE_ASSERT (cgroup_index < n_conjunction_groups_);
-          group_type = ACE_ES_CONJUNCTION_DESIGNATOR;
-          continue;
-
-        case ACE_ES_DISJUNCTION_DESIGNATOR:
-          dgroup_index++;
-          ACE_ASSERT (dgroup_index < n_disjunction_groups_);
-          group_type = ACE_ES_DISJUNCTION_DESIGNATOR;
-          continue;
-
-        case ACE_ES_GLOBAL_DESIGNATOR:
-          group_type = ACE_ES_GLOBAL_DESIGNATOR;
-          continue;
-
-          // These Delegate to the appropriate registration method.
-#if 0
-          // @@ TODO rt_info_ is a handle_t now, does checking against
-          // 0  still make sense?
-          // Check for a null rt_info.
-          if ((*iter).rt_info_ == 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Found a ConsumerQOS::dependencies[].rt_info_ == 0.\n"));
-              continue;
-            }
-#endif /* 0 */
-
-        case ACE_ES_EVENT_TIMEOUT:
-          // For backwards compatibility.
-        case ACE_ES_EVENT_DEADLINE_TIMEOUT:
-          if (this->register_deadline_timeout (*iter,
-                                               group_type,
-                                               cgroup_index,
-                                               dgroup_index,
-                                               trep_index) == -1)
-            return -1;
-          break;
-
-        case ACE_ES_EVENT_INTERVAL_TIMEOUT:
-          if (this->register_interval_timeout (*iter,
-                                               group_type,
-                                               cgroup_index,
-                                               dgroup_index,
-                                               trep_index) == -1)
-            return -1;
-          break;
-
-        case ACE_ES_EVENT_ACT:
-          // Store the ACT in the current conjunction or disjunction
-          // group.
-          switch (group_type)
-            {
-            case ACE_ES_CONJUNCTION_DESIGNATOR:
-              conjunction_groups_[cgroup_index].set_act ((*iter).event_);
-              break;
-            case ACE_ES_DISJUNCTION_DESIGNATOR:
-              disjunction_groups_[cgroup_index].set_act ((*iter).event_);
-              break;
-            case ACE_ES_GLOBAL_DESIGNATOR:
-            default:
-              ACE_ERROR ((LM_ERROR, "Warning: ACTs not implemented for Global.\n"));
-            }
-          break;
-
-        default:
-          // Non-timer event subscription.
-          if (this->register_event (*iter,
-                                    group_type,
-                                    cgroup_index,
-                                    dgroup_index,
-                                    crep_index) == -1)
-            return -1;
-          break;
-        }
-    }
-
-  // We may not use all of the consumer reps if there are repeats:
-  // (A+B)|(B+C).  Must update n_consumer_reps_ so we don't try to
-  // unsubscribe a blank rep during disconnect.
-  if (crep_index < n_consumer_reps_)
-    n_consumer_reps_ = crep_index;
-
-  return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_deadline_timeout (RtecEventChannelAdmin::Dependency &dependency,
-                                                        RtecEventComm::EventType group_type,
-                                                        int cgindex,
-                                                        int dgindex,
-                                                        int &trep_index)
-{
-  // new_timeout will be returned as an ACT.  When executed, it will
-  // forward *iter.event_ to the consumer.
-  ACE_ES_Consumer_Rep_Timeout *new_timeout = &timer_reps_[trep_index++];
-  new_timeout->init (this, dependency);
-  new_timeout->correlation_type (ACE_ES_Consumer_Rep::DEADLINE_TIMEOUT);
-  // Deadline timers do not need type ids.
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // Reps keep pointers back to the groups that they're deadlines for.
-      new_timeout->add_disjunction_group (conjunction_groups_[cgindex]);
-      // Groups keep references to the deadline timers for rescheduling.
-      if (conjunction_groups_[cgindex].set_deadline_timeout (new_timeout) == -1)
-        return -1;
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-      new_timeout->add_disjunction_group (disjunction_groups_[dgindex]);
-      if (disjunction_groups_[dgindex].set_deadline_timeout (new_timeout) == -1)
-        return -1;
-      break;
-
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      ACE_ERROR_RETURN ((LM_ERROR, "No global deadline timeouts, yet!\n"), -1);
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_interval_timeout (RtecEventChannelAdmin::Dependency &dependency,
-                                                        RtecEventComm::EventType group_type,
-                                                        int cgindex,
-                                                        int /* dgindex */,
-                                                        int &trep_index)
-{
-  // new_timeout will be returned as an ACT.  When executed, it will
-  // forward *iter.event_ to the consumer.
-  ACE_ES_Consumer_Rep_Timeout *new_timeout = &timer_reps_[trep_index++];
-  new_timeout->init (this, dependency);
-  new_timeout->type_id (this->new_type_id ());
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // If it's a conjunction, then we need to perform correlations
-      // on the timeout.
-      new_timeout->correlation_type (ACE_ES_Consumer_Rep::CORRELATE);
-      conjunction_groups_[cgindex].add_type (new_timeout->type_id ());
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      new_timeout->correlation_type (ACE_ES_Consumer_Rep::NO_CORRELATION);
-      break;
-    }
-
-  // Schedule the timeout.
-  if (correlation_module_->schedule_timeout (new_timeout) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-// Search <creps> for a rep matching <dependency>.  If one is not
-// found, allocate one.  All returned reps should have the appropriate
-// type_id set.
-ACE_ES_Consumer_Rep *
-ACE_ES_Consumer_Correlation::get_consumer_rep (RtecEventChannelAdmin::Dependency &dependency,
-                                               int &crep_index)
-{
-  ACE_ES_Consumer_Rep *rep = 0;
-
-  // Step through all existing consumer reps.
-  for (int x=0; x < crep_index; x++)
-    {
-      RtecEventComm::Event& e = consumer_reps_[x]->dependency ()->event_;
-      // If <dependency> matches any previously subscribed consumer
-      // reps, we'll reuse it.
-      if (e.type_ == dependency.event_.type_
-          && e.source_ == dependency.event_.source_ )
-        {
-          rep = consumer_reps_[x];
-          break;
-        }
-    }
-
-  // Check if we didn't find it.
-  if (rep == 0)
-    {
-      if (crep_index >= n_consumer_reps_)
-        ACE_ERROR_RETURN ((LM_ERROR, "Too many event registrations.\n"), 0);
-      // Allocate a new rep and set its type id.
-      rep = consumer_reps_[crep_index];
-      crep_index++;
-      rep->init (this, dependency);
-      rep->type_id (this->new_type_id ());
-    }
-
-  return rep;
-}
-
-int
-ACE_ES_Consumer_Correlation::new_type_id (void)
-{
-  int type_id = type_id_index_;
-  if (++type_id_index_ >= ACE_ES_MAX_SUBSCRIPTIONS)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_MAX_SUBSCRIPTIONS exceeded.\n"),0);
-  else
-    return type_id;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_event (RtecEventChannelAdmin::Dependency &dependency,
-                                             RtecEventComm::EventType group_type,
-                                             int cgindex,
-                                             int dgindex,
-                                             int &crep_index)
-{
-  // These are stored in the subscription module data structures.
-  ACE_ES_Consumer_Rep *consumer_rep = this->get_consumer_rep (dependency, crep_index);
-
-  if (consumer_rep == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Consumer_Correlation::register_event"), -1);
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // If it's a conjunction, then we need to perform correlations
-      // on the object.  Otherwise, NO_CORRELATION is set by default.
-      consumer_rep->correlation_type (ACE_ES_Consumer_Rep::CORRELATE);
-      conjunction_groups_[cgindex].add_type (consumer_rep->type_id ());
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-      consumer_rep->add_disjunction_group (disjunction_groups_[dgindex]);
-      break;
-
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Correlation::register_event: "
-                  "ACE_ES_GLOBAL_DESIGNATOR not implemented.\n"));
-      break;
-    }
-
-  // Subscribe the consumer_rep to the suppliers.
-  if (correlation_module_->subscribe (consumer_rep) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::disconnecting (void)
-{
-  // If we were forwarding events, disconnect as a supplier.
-  if (connected_)
-    {
-      CORBA::Environment env;
-      channel_->disconnect_push_consumer (env);
-      if (env.exception () != 0)
-        ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Correlation::disconnecting failed.\n"));
-    }
-
-  for (int x=0; x < n_timer_reps_; x++)
-    correlation_module_->cancel_timeout (&timer_reps_[x]);
-
-  for (int y=0; y < n_consumer_reps_; y++)
-    if (consumer_reps_[y] != 0)
-      consumer_reps_[y]->disconnect ();
-
-  return 0;
-}
-
-ACE_ES_Dispatch_Request *
-ACE_ES_Consumer_Correlation::push (ACE_ES_Consumer_Rep *cr,
-                                   ACE_ES_Event_Container *event)
-{
-  ACE_TIMEPROBE ("  ACE_ES_Consumer_Correlation::push, enter");
-
-  // Check if this event needs any correlating, or if it should just
-  // be forwarded real fast-like.
-  switch (cr->correlation_type ())
-    {
-    case ACE_ES_Consumer_Rep::NO_CORRELATION:
-      {
-        // Calls reschedule on all disjunction groups it belongs to.
-        cr->reschedule_deadlines ();
-
-        ACE_TIMEPROBE ("  Consumer_Correlation::push, determine NO CORR.");
-        ACE_ES_Dispatch_Request *request =
-          new ACE_ES_Dispatch_Request (consumer_, event, cr->dependency ()->rt_info);
-        ACE_TIMEPROBE ("  Consumer_Correlation::push, NO_CORR: alloc");
-
-        if (request == 0)
-          ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                             "ACE_ES_Consumer_Correlation::push"), 0);
-
-        return request;
-      }
-
-    case ACE_ES_Consumer_Rep::CORRELATE:
-      return this->correlate (cr, event);
-
-    case ACE_ES_Consumer_Rep::DEADLINE_TIMEOUT:
-      {
-        ACE_ES_Dispatch_Request *request =
-          new ACE_ES_Dispatch_Request (consumer_, cr->dependency ()->rt_info);
-
-        if (request == 0)
-          ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                             "ACE_ES_Consumer_Correlation::push"), 0);
-
-        // Add the deadline timeout to the outbox.
-        request->event_set () += event;
-
-        // Add any pending events to the outbox.
-        cr->top_group ()->add_events (&(request->event_set ()),
-                                      pending_events_, pending_flags_);
-
-        return request;
-      }
-
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Consumer_Correlation::push:"
-                         " unknown correlation type\n"), 0);
-    }
-}
-
-// @@ If we're just event forwarding, then no pending_events_ need to
-// be kept!  I'll add this optimization later.
-ACE_ES_Dispatch_Request *
-ACE_ES_Consumer_Correlation::correlate (ACE_ES_Consumer_Rep *cr,
-                                        ACE_ES_Event_Container *event)
-{
-   // If the consumer has specified correlation criteria, then we must
-   // first acquire the mutex.
-   ACE_ES_GUARD ace_mon (lock_);
-   if (ace_mon.locked () == 0)
-     ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                        "ACE_ES_Consumer_Correlation::push"), 0);
-
-   // Add the new event to the pending events.
-   pending_events_[cr->type_id ()] += event;
-
-   // Set the bit corresponding to the arrived event.
-   // This should be pending_flags_->event_arrived (index);
-   ACE_SET_BITS (pending_flags_, ACE_INT2BIT[cr->type_id ()]);
-
-   ACE_ES_Dispatch_Request *request = 0;
-   Event_Set *outbox = 0;
-   // Since add_events changes pending_flags_, we need to keep this
-   // for all iterations through the conjunction groups.
-   u_long freeze_pending_flags = pending_flags_;
-
-   for (int x=0; x < n_conjunction_groups_; x++)
-     {
-       if (conjunction_groups_[x].should_forward (freeze_pending_flags))
-         {
-           // If there is a deadline timer for this conjunction group,
-           // this will reschedule them.
-           conjunction_groups_[x].reschedule_deadline ();
-
-           // First time in, allocate the new dispatch request.
-           if (request == 0)
-             {
-               request =
-                 new ACE_ES_Dispatch_Request (consumer_,
-                                              cr->dependency ()->rt_info);
-               if (request == 0)
-                 ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                                    "ACE_ES_Consumer_Correlation::correlate"), 0);
-               outbox = &(request->event_set ());
-             }
-
-           // Add each of the pending events for this correlation to
-           // the outgoing dispatch request.  If outbox == 0, then
-           // this will just clear any pending events.
-           conjunction_groups_[x].add_events (outbox,
-                                              pending_events_,
-                                              pending_flags_);
-         }
-     }
-
-   return request;
-}
-
-
-// ************************************************************
-
-ACE_ES_Consumer_Rep::~ACE_ES_Consumer_Rep (void)
-{
-}
-
-void
-ACE_ES_Consumer_Rep::execute (void)
-{
-  ACE_ERROR ((LM_ERROR, "Warning!  ACE_ES_Consumer_Rep::execute called.\n"));
-}
-
-// ************************************************************
-
-void
-ACE_ES_Consumer_Rep_Timeout::execute (void)
-{
-  ACE_TIMEPROBE (" Consumer_Rep_Timeout::execute");
-  if (this->receiving_events ())
-    {
-      CORBA::Environment __env;
-      ACE_Time_Value tv = ACE_OS::gettimeofday ();
-      ORBSVCS_Time::Time_Value_to_TimeT
-        (timeout_event_->creation_time_, tv);
-      correlation_->correlation_module_->push (this, timeout_event_, __env);
-      if (__env.exception () != 0)
-        ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep_Timeout::execute: unexpected exception.\n"));
-    }
-}
-
-// ************************************************************
-
-ACE_ES_Subscription_Module::ACE_ES_Subscription_Module (ACE_EventChannel *channel)
-  : channel_ (channel),
-    up_ (0),
-    down_ (0)
-{
-}
-
-void
-ACE_ES_Subscription_Module::open (ACE_ES_Correlation_Module *up,
-                                  ACE_ES_Supplier_Module *down)
-{
-  // Brilliant.
-  up_ = up;
-  down_ = down;
-}
-
-ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void)
-{
-}
-
-// When a supplier connects, we step through each of its
-// publications.  For each event type published, we allocate a set in
-// the suppliers type collection.  Then we build a subscribers list
-// starting with any consumers having a type-based subscription in the
-// global type collection.
-void
-ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &_env)
-{
-  RtecEventComm::EventSourceID sid = 0;
-  // We will record the source_id for later usage.
- {
-    ACE_ES_WGUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR);
-
-    if (all_suppliers_.insert (supplier) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module insert failed.\n"));
-
-    // For every type that this supplier generates, bind a new
-    // Type_Subscribers to the type in the supplier proxy's type
-    // collection.
-    RtecEventChannelAdmin::PublicationSet &publications = supplier->qos ().publications_;
-
-    sid = publications[0].event_.source_;
-    for (CORBA::ULong index=0; index < publications.length (); index++)
-      {
-        // Check to make sure an RT_Info was specified.
-#if 0
-        // @@ TODO: We should check if rt_info is a valid handle_t.
-        if (publications[index].dependency_info_.rt_info.value() == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "Found a SupplierQOS::dependency_info_.rt_info_ == 0\n"));
-            continue;
-          }
-#endif
-
-        RtecEventComm::EventType &event_type =
-          publications[index].event_.type_;
-
-        // Check to make sure a type was specified.
-        if (event_type == ACE_ES_EVENT_ANY)
-          {
-            ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module::connected: "
-                        "source is publishing ACE_ES_EVENT_ANY.\n"));
-            continue;
-          }
-
-        // Make a new set for the proxy.  Include the dependency
-        // info describing the RT_Method that generates this event.
-        // This object will hold all the consumers that subscribe to
-        // this publication.
-        ACE_ES_Subscription_Info::Type_Subscribers *new_subscribers =
-          new ACE_ES_Subscription_Info::Type_Subscribers (&(publications[index].dependency_info_));
-
-        if (new_subscribers == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Subscription_Module::connected"));
-            return;
-          }
-
-        // Check the global type collection for consumers that register
-        // before suppliers.
-        ACE_ES_Subscription_Info::Type_Subscribers *existing_subscribers;
-        if (type_subscribers_.find (event_type, existing_subscribers) == 0)
-          {
-            // Iterate through existing subscribers.
-            ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (existing_subscribers->consumers_);
-
-            for (ACE_ES_Consumer_Rep **proxy = 0;
-                 iter.next (proxy) != 0;
-                 iter.advance ())
-              {
-                // Each existing subscriber will get appended to the
-                // new subscribers list.  Dependencies are updated.
-
-                // @@ TODO: Handle exceptions.
-                ACE_Scheduler_Factory::server()->add_dependency
-                  ((*proxy)->dependency()->rt_info,
-                   new_subscribers->dependency_info_->rt_info,
-                   new_subscribers->dependency_info_->number_of_calls,
-                   RtecScheduler::ONE_WAY_CALL,
-                   _env);
-                if (_env.exception () != 0)
-                  return;
-                // @@ TODO use the TAO_TRY macros.
-
-                if (new_subscribers->consumers_.insert (*proxy) == -1)
-                  {
-                    ACE_ERROR ((LM_ERROR,
-                                "%p: add_dependency/insert failed.\n",
-                                "ACE_ES_Subscription_Module::connected"));
-                    continue;
-                  }
-              }
-          }
-
-        // Put the new subscribers for this event type in the supplier
-        // proxy's type map.
-        if (supplier->subscription_info ().type_subscribers_.
-            bind (event_type, new_subscribers) != 0)
-          {
-            // This may occur with a double bind, I think.
-            ACE_ERROR ((LM_ERROR, "%p can't initialize type.\n",
-                        "ACE_ES_Subscription_Module::connected"));
-            delete new_subscribers;
-            continue;
-          }
-      }
-  } // release lock
-
-  // Reregister any consumers that tried to subscribe before this
-  // supplier connected.
-  // NOTE: We used to call back the supplier here (using
-  // supplier->source_id()), this is ineffective and leads to all kind
-  // of dead-locks (the supplier is blocked and waiting for us).
-  // We use the information on the publications to get the source_id.
-  this->reregister_consumers (sid);
-}
-
-// Step through each of the source_subscribers looking for consumers
-// that registered for <source> before <source> connected.
-void
-ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID source_id)
-{
-  ACE_ES_Subscription_Info::Subscriber_Set *subscribers = 0;
-  if (source_subscribers_.find (source_id, subscribers) == -1)
-    // Not found.
-    return;
-
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (*subscribers);
-
-  // Try to reregister all consumers.
-  for (ACE_ES_Consumer_Rep **consumer = 0;
-       iter.next (consumer) != 0;
-       iter.advance ())
-    if (this->subscribe (*consumer) == -1)
-      ACE_ERROR ((LM_ERROR, "%p.\n" "ACE_ES_Subscription_Module::reregister_consumers"));
-}
-
-
-void
-ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                           CORBA::Environment &_env)
-{
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR);
-
-  if (all_suppliers_.remove (supplier) == -1)
-    TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR);
-
-  // Remove all consumers from the supplier's source-based subscription lists.
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator source_iterator
-    (supplier->subscription_info ().source_subscribers_);
-
-  for (ACE_ES_Consumer_Rep **consumer;
-       source_iterator.next (consumer) != 0;
-       source_iterator.advance ())
-    (*consumer)->_release ();
-
-  // Get the subscriber list for each type.
-  ACE_ES_Subscription_Info::Subscriber_Map_Iterator type_map_iterator
-    (supplier->subscription_info ().type_subscribers_);
-
-  for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *entry;
-       type_map_iterator.next (entry) != 0;
-       type_map_iterator.advance ())
-    {
-      // Remove all consumers from the supplier's source-based subscription lists.
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator type_iterator
-        (entry->int_id_->consumers_);
-
-      for (ACE_ES_Consumer_Rep **c;
-           type_iterator.next (c) != 0;
-           type_iterator.advance ())
-        (*c)->_release ();
-    }
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "Consumer tried to register for all"
-                     "events!  This is not implemented.\n"), -1);
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
-                                              RtecEventComm::EventSourceID source)
-{
-  // Step through all Supplier Proxies looking for a match to
-  // -supplier-.  Add the -consumer- to the correct supplier proxy.
-  Supplier_Iterator iter (all_suppliers_);
-
-  int success = -1;
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      // Operator == checks if <proxy> is a proxy for <supplier>.
-      if ((**proxy) == source)
-        {
-          ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-          ACE_ES_Subscription_Info::Subscriber_Set &set =
-            (*proxy)->subscription_info ().source_subscribers_;
-
-          // Insert the consumer to the supplier's subscription set for
-          // the type.
-          int insert_result = set.insert (consumer);
-          switch (insert_result)
-            {
-            case -1:
-              // Error.
-              ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                                 "Subscription Module::subscribe_source"), -1);
-            case 0:
-            default:
-              {
-                // Increment the consumer rep's reference count.
-                consumer->_duplicate ();
-                // Success.
-                // Add each of the supplier's dependency infos to the
-                // consumer's dependency list.
-                ACE_ES_Subscription_Info::Subscriber_Map_Iterator iter2
-                  ((*proxy)->subscription_info ().type_subscribers_);
-
-                // Delete all type collections.
-                for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *temp = 0;
-                     iter2.next (temp) != 0;
-                     iter2.advance ())
-                  {
-                    TAO_TRY
-                      {
-                        ACE_Scheduler_Factory::server()->add_dependency
-                          (consumer->dependency()->rt_info,
-                           temp->int_id_->dependency_info_->rt_info,
-                           temp->int_id_->dependency_info_->number_of_calls,
-                           RtecScheduler::ONE_WAY_CALL,
-                           TAO_TRY_ENV);
-                        TAO_CHECK_ENV;
-
-                      }
-                    TAO_CATCHANY
-                      {
-                        TAO_TRY_ENV.print_exception ("error adding dependency");
-                        return -1;
-                      }
-                    TAO_ENDTRY;
-                  }
-              }
-
-            case 1:
-              // Already there.
-              success = 0;
-              break;
-            }
-        }
-    }
-
-  // Add the consumer to the global source subscribers list.
-  if (success == -1)
-    return ACE_ES_Subscription_Info::insert_or_allocate (source_subscribers_,
-                                                         consumer,
-                                                         source);
-  else
-    return success;
-}
-
-// Step through all Supplier Proxies.  For each proxy, if it generates
-// <type>, add <consumer> to its subscription info.
-int
-ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
-                                            RtecEventComm::EventType type)
-{
-  // First insert <consumer> into the global type collection set
-  // corresponding to <type>.  The type collection will only be used
-  // when suppliers register late.
-  if (ACE_ES_Subscription_Info::insert_or_allocate (type_subscribers_,
-                                                    consumer, type) == -1)
-    return -1;
-
-  consumer->_duplicate ();
-
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-      // Insert the consumer to the supplier's subscription set for
-      // the type.  If the supplier does not publish this type, the
-      // operation will fail.  If this succeeds, dependency_info will
-      // be added to the consumer.
-      RtecScheduler::Dependency_Info *dependency_info;
-      if (ACE_ES_Subscription_Info::insert_or_fail
-          ((*proxy)->subscription_info ().type_subscribers_,
-           consumer, type, dependency_info) == 0)
-        {
-          consumer->_duplicate ();
-          // Success.  Add the supplier dependency info to the
-          // consumer's dependency list.
-          // @@ TODO handle exceptions.
-          TAO_TRY
-            {
-              ACE_Scheduler_Factory::server()->add_dependency
-                (consumer->dependency ()->rt_info,
-                 dependency_info->rt_info,
-                 dependency_info->number_of_calls,
-                 RtecScheduler::ONE_WAY_CALL,
-                 TAO_TRY_ENV);
-              TAO_CHECK_ENV;
-            }
-          TAO_CATCHANY
-            {
-              ACE_ERROR ((LM_ERROR, "Subscription_Module::subscribe_type:"
-                          " add_dependency failed.\n"));
-              return -1;
-            }
-          TAO_ENDTRY;
-        }
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-                                                   RtecEventComm::EventSourceID source,
-                                                   RtecEventComm::EventType type)
-{
-  // Step through all Supplier Proxies looking for a match to
-  // <supplier>.  Once we find one, find the correct set for the
-  // specified type.  Add the <consumer> to that set.
-  Supplier_Iterator iter (all_suppliers_);
-
-  int success = -1;
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      if ((**proxy) == source)
-        {
-          // Insert the consumer to the supplier's subscription set for
-          // the type.
-          RtecScheduler::Dependency_Info *dependency_info;
-          int insert_result = ACE_ES_Subscription_Info::insert_or_fail
-            ((*proxy)->subscription_info().type_subscribers_,
-             consumer, type, dependency_info);
-
-          switch (insert_result)
-            {
-            case -1:
-              // Error.
-              ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                                 "Subscription Module::subscribe_source_type"), -1);
-            case 0:
-            default:
-              {
-                // Success.
-                // Add the supplier to the consumer's dependency list.
-                // @@ TODO handle exceptions.
-                TAO_TRY
-                  {
-                    ACE_Scheduler_Factory::server()->add_dependency
-                      (consumer->dependency ()->rt_info,
-                       dependency_info->rt_info,
-                       dependency_info->number_of_calls,
-                       RtecScheduler::ONE_WAY_CALL,
-                       TAO_TRY_ENV);
-                    TAO_CHECK_ENV;
-                  }
-                TAO_CATCHANY
-                  {
-                    ACE_ERROR_RETURN ((LM_ERROR, "Subscription_Module::subscribe_source_type:"
-                                       " add_dependency failed.\n"),
-                                      -1);
-                  }
-                TAO_ENDTRY;
-                consumer->_duplicate ();
-              }
-              /* FALLTHROUGH */
-            case 1:
-              success = 0;
-
-              // Already there.
-              break;
-            }
-
-        }
-    }
-
-  if (success == -1)
-    // If we failed to find a source, insert this consumer in the
-    // global source subscriber list.
-    {
-      if (ACE_ES_Subscription_Info::insert_or_allocate (source_subscribers_,
-                                                           consumer,
-                                                           source) == 0)
-        {
-          consumer->_duplicate ();
-          return 0;
-        }
-      else
-        return -1;
-    }
-  else
-    return success;
-}
-
-// <consumer> contains information for one type of subscription.
-// Delegate to the appropriate method for subscription.
-int
-ACE_ES_Subscription_Module::subscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  // We could have finer granularity by putting RGUARDs in some of the
-  // subscribe methods.
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Subscription_Module::subscribe"), -1);
-
-  int result = 0;
-  RtecEventComm::Event &event = consumer->dependency ()->event_;
-
-  if (event.source_ == 0)
-    // Not source-based subscription.
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-        result = this->subscribe_all (consumer);
-      else
-        result = this->subscribe_type (consumer, event.type_);
-    }
-  else
-    // Source-based subscription.
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-        result = this->subscribe_source (consumer, event.source_);
-      else
-        result = this->subscribe_source_type (consumer,
-                                              event.source_,
-                                              event.type_);
-    }
-
-  return result;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  // We could have finer granularity by putting RGUARDs in some of the
-  // unsubscribe methods.
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Subscription_Module::unsubscribe"), -1);
-
-  RtecEventComm::Event &event = consumer->dependency ()->event_;
-
-  if (event.type_ != ACE_ES_EVENT_ANY)
-    {
-      // Remove the consumer from the global type-based subscription list.
-      if (ACE_ES_Subscription_Info::remove (type_subscribers_,
-                                            consumer,
-                                            event.type_) == 0)
-        consumer->_release ();
-    }
-  else
-    // Remove the consumer from the global source-based subscription list.
-    if (ACE_ES_Subscription_Info::remove (source_subscribers_,
-                                          consumer,
-                                          event.source_) == 0)
-      consumer->_release ();
-
-  return 0;
-
-  /*
-
-    This old code manually removed the consumer from the subscription
-    lists.  Now we do lazy removal.
-
-  int result = 0;
-
-  if (CORBA::is_nil (event.source_))
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-        result = this->unsubscribe_all (consumer);
-      else
-        result = this->unsubscribe_type (consumer, event.type_);
-    }
-  else
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-        result = this->unsubscribe_source (consumer, event.source_);
-      else
-        result = this->unsubscribe_source_type (consumer, event.source_, event.type_);
-    }
-  return result;
-    */
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_all (ACE_ES_Consumer_Rep *)
-{
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_type (ACE_ES_Consumer_Rep *consumer,
-                                              RtecEventComm::EventType type)
-{
-  // Step through all Supplier Proxies trying to remove the
-  // consumer-type pair.  ACE_ES_Subscription_Info::remove will fail
-  // if the supplier does not generate <type>, but that's ok.
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      // This remove will be harmless if the supplier does not
-      // generate <type>.
-      ACE_ES_Subscription_Info::remove ((*proxy)->subscription_info ().type_subscribers_,
-                                        consumer, type);
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_source (ACE_ES_Consumer_Rep *consumer,
-                                                RtecEventComm::EventSourceID source)
-{
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      if ((**proxy) == source)
-        {
-          ACE_ES_Subscription_Info::Subscriber_Set &set =
-            (*proxy)->subscription_info ().source_subscribers_;
-          if (set.remove (consumer) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                               "Subscription Module::unsubscribe_source"), -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-                                                     RtecEventComm::EventSourceID source,
-                                                     RtecEventComm::EventType type)
-
-{
-  Supplier_Iterator iter (all_suppliers_);
-
-  // Step through all supplier proxies looking for a match to the
-  // consumer's event.source_.  This is the same as unsubscribe_type,
-  // only we can check the source first.
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    // If the proxy matches the source id we're looking for, try to
-    // remove <consumer> from the proxy's <event.type_> set.
-    if ((**proxy) == source)
-      {
-        ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-        // Continue in spite of errors.
-        ACE_ES_Subscription_Info::remove ((*proxy)->subscription_info ().type_subscribers_,
-                                          consumer, type);
-      }
-
-  return 0;
-}
-
-void
-ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
-                                  ACE_ES_Event_Container *event,
-                                  CORBA::Environment &)
-{
-  ACE_TIMEPROBE ("  deliver to Subscription Module");
-  // These are all inline function calls.
-  if (this->push_source (source, event) == -1)
-    return;
-
-  ACE_TIMEPROBE ("  begin push_source_type");
-
-  if (this->push_source_type (source, event) == -1)
-    return;
-
-  ACE_TIMEPROBE ("  end push_source_type");
-}
-
-void
-ACE_ES_Subscription_Module::shutdown (void)
-{
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "%p.\n",
-                "ACE_ES_Subscription_Module::unsubscribe"));
-
-  // Remove all type_subscribers_ and source_subscribers_.
-
-  ACE_ES_Subscription_Info::Subscriber_Map_Iterator type_iter (type_subscribers_);
-  for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *entry;
-       type_iter.next (entry) != 0;
-       type_iter.advance ())
-    {
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator ts_iter (entry->int_id_->consumers_);
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-           ts_iter.next (consumer) != 0;
-           ts_iter.advance ())
-        (*consumer)->_release ();
-
-      delete entry->int_id_;
-    }
-
-  ACE_ES_Subscription_Info::SourceID_Map_Iterator source_iter (source_subscribers_);
-
-  for (ACE_ES_Subscription_Info::SourceID_Map_Entry *entry2;
-       source_iter.next (entry2) != 0;
-       source_iter.advance ())
-    {
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator ss_iter (*entry2->int_id_);
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-           ss_iter.next (consumer) != 0;
-           ss_iter.advance ())
-        (*consumer)->_release ();
-
-      delete entry2->int_id_;
-    }
-
-  // We don't need to do anything to all_suppliers_ since the supplier
-  // module should have disconnected all suppliers.  To be more
-  // independent from the supplier module, this method should iterate
-  // through all suppliers and call this->disconnecting.
-  up_->shutdown ();
-}
-
-// ************************************************************
-
-ACE_ES_Supplier_Module::ACE_ES_Supplier_Module (ACE_EventChannel *channel) :
-  all_suppliers_ (),
-  lock_ (),
-  up_ (0),
-  channel_ (channel)
-{
-}
-
-void
-ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up)
-{
-  // There is the theory of the Mobius, a twist, in the fabric of
-  // space, where time becomes a loop, where time becomes a loop.
-  up_ = up;
-}
-
-void
-ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                   CORBA::Environment &_env)
-{
-  channel_->report_connect (ACE_EventChannel::SUPPLIER);
-  up_->connected (supplier, _env);
-}
-
-void
-ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &_env)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR);
-
-  if (all_suppliers_.remove (supplier) == -1)
-    TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR);
-
-  up_->disconnecting (supplier, _env);
-
-  if (all_suppliers_.size () <= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) No more suppliers connected.\n"));
-      channel_->report_disconnect (ACE_EventChannel::SUPPLIER);
-    }
-
-  // IMHO this release is broken: supplier is a parameter, we never
-  // actually increased its reference count, so we shouldn't decrease
-  // it.
-  // CORBA::release (supplier);
-}
-
-void
-ACE_ES_Supplier_Module::shutdown (void)
-{
-  Suppliers copy;
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      return;
-
-    copy = all_suppliers_;
-  }
-
-  if (copy.size () > 0)
-    {
-      Supplier_Iterator iter (copy);
-
-      CORBA::Environment env;
-
-      for (ACE_Push_Supplier_Proxy **proxy = 0;
-           iter.next (proxy) != 0;
-           iter.advance ())
-        {
-          (*proxy)->shutdown ();
-          this->disconnecting (*proxy, env);
-        }
-    }
-
-  up_->shutdown ();
-}
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &_env)
-{
-  ACE_Push_Supplier_Proxy *new_supplier = new ACE_Push_Supplier_Proxy (this);
-
-  if (new_supplier == 0)
-    TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      {
-        delete new_supplier;
-        TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, 0);
-      }
-
-    if (all_suppliers_.insert (new_supplier) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n"));
-  }
-
-  return new_supplier->get_ref ();
-}
-
-void
-ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
-                              const RtecEventComm::EventSet &event,
-                              CORBA::Environment &_env)
-{
-  TAO_TRY
-    {
-      for (CORBA::ULong i = 0; i < event.length(); ++i)
-        {
-          ACE_ES_Event_Container *temp =
-            new ACE_ES_Event_Container (event[i]);
-          //RtecEventComm::Event *temp = new RtecEventComm::Event (event);
-
-          if (temp == 0)
-            TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-          // This will guarantee that release gets called when we exit
-          // the scope.
-          ACE_ES_Event_Container_var event_copy (temp);
-          temp->_release ();
-          ACE_TIMEPROBE ("  deliver to Supplier Module (thru Supplier Proxy)");
-          up_->push (proxy, event_copy, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (RtecEventChannelAdmin::TypeError, t)
-    {
-      ACE_ERROR ((LM_ERROR, "%p Type Error.\n",
-                  "ACE_ES_Supplier_Module::push"));
-      TAO_RETHROW;
-    }
-  TAO_CATCH (CORBA::NO_MEMORY, e)
-    {
-      ACE_ERROR ((LM_ERROR, "%p No Memory.\n",
-                  "ACE_ES_Supplier_Module::push"));
-      TAO_RETHROW;
-    }
-  TAO_CATCH (CORBA::SystemException, e)
-    {
-      ACE_ERROR ((LM_ERROR, "%p CORBA System Exception.\n",
-                  "ACE_ES_Supplier_Module::push"));
-      TAO_RETHROW;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module::push: "
-                  "Unknown exception.\n"));
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_ES_Priority_Timer::ACE_ES_Priority_Timer (void)
-{
-}
-
-int
-ACE_ES_Priority_Timer::connected (RtecScheduler::handle_t rt_info)
-{
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  TAO_TRY
-    {
-      ACE_TIMEPROBE ("  connected - priority requested");
-      ACE_Scheduler_Factory::server ()->priority
-        (rt_info, thread_priority,
-         subpriority, preemption_priority, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_TIMEPROBE ("  connected - priority obtained");
-#if 0
-      ACE_ERROR_RETURN ((LM_ERROR, "%p RtecScheduler::Scheduler::priority failed.\n",
-                         "ACE_ES_Priority_Timer::connected"), -1);
-#endif /* 0 */
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p RtecScheduler::Scheduler::priority failed.\n",
-                         "ACE_ES_Priority_Timer::connected"), -1);
-    }
-  TAO_ENDTRY;
-
-  // Just make sure the ORB allocates resources for this priority.
-  if (ACE_Task_Manager::instance()->GetReactorTask (preemption_priority) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Priority_Timer::connected"), -1);
-
-  return 0;
-}
-
-int
-ACE_ES_Priority_Timer::handle_timeout (const ACE_Time_Value &,
-                                       const void *vp)
-{
-  ACE_ES_Timer_ACT *act = (ACE_ES_Timer_ACT *) vp;
-
-  if (act == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Priority_Timer::handle_timeout: "
-                       "received act == 0!!!.\n"), 0);
-
-  ACE_TIMEPROBE ("ES_Priority_Queue - start execute");
-
-  act->execute ();
-
-  ACE_TIMEPROBE ("ES_Priority_Queue - end execute");
-
-  return 0;
-}
-
-// ************************************************************
-
-const char *
-ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos)
-{
-  // The first dependency should designate a correlation group.
-
-  TAO_TRY
-    {
-      ACE_TIMEPROBE ("  Consumer_Name - priority requested");
-      RtecScheduler::RT_Info* rt_info = ACE_Scheduler_Factory::server ()->get
-        (qos.dependencies[1].rt_info, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_TIMEPROBE ("  Consumer_Name - priority obtained");
-
-      return rt_info->entry_point;
-    }
-  TAO_CATCHANY
-    {
-      return "no-name";
-    }
-  TAO_ENDTRY;
-  return "no-name";
-}
-
-// ************************************************************
-
-void
-dump_event (const RtecEventComm::Event &event)
-{
-  ACE_DEBUG ((LM_DEBUG, "source_ = %d "
-              "type_ = %d "
-              "time_ = %u.\n",
-              (void*)event.source_,
-              event.type_,
-              // The divide-by-1 is for ACE_U_LongLong support.
-              ORBSVCS_Time::to_hrtime (event.creation_time_) / 1));
-}
-
-// ************************************************************
-
-#if defined(ACE_ES_LACKS_ORB)
-void
-dump_sequence (const ACE_CORBA_Sequence<ACE_ES_Event> &seq)
-{
-  for (CORBA::ULong index=0; index < seq.length (); index++)
-    ::dump_event (seq[index]);
-}
-#endif /* ACE_ES_LACKS_ORB */
-
-// ************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Atomic_Op<ACE_ES_MUTEX, int>;
-template class ACE_Map_Entry<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT>;
-template class ACE_Map_Entry<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT>;
-template class ACE_Map_Manager<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Manager<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Iterator_Base<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Iterator_Base<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Iterator<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Reverse_Iterator<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Iterator<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Reverse_Iterator<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Node<ACE_ES_Consumer_Rep *>;
-template class ACE_Node<ACE_Push_Consumer_Proxy *>;
-template class ACE_Node<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>;
-
-// For ACE_ES_Event_Container_Allocator.
-template class ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_Null_Mutex>;
-template class ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_Null_Mutex>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Null_Mutex>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk> >;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >;
-
-template class ACE_ES_Array_Iterator<ACE_ES_Consumer_Rep *>;
-template class ACE_ES_Simple_Array<ACE_ES_Consumer_Rep *, 100>;
-
-template class ACE_CORBA_var<ACE_ES_Event_Container>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Atomic_Op<ACE_ES_MUTEX, int>
-#pragma instantiate ACE_Map_Entry<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT>
-#pragma instantiate ACE_Map_Entry<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT>
-#pragma instantiate ACE_Map_Manager<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Manager<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Iterator<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Iterator<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>
-#pragma instantiate ACE_Node<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Node<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Node<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_Null_Mutex>
-#pragma instantiate ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_Null_Mutex>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Null_Mutex>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk> >
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >
-#pragma instantiate ACE_ES_Array_Iterator<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_ES_Simple_Array<ACE_ES_Consumer_Rep *, 100>
-#pragma instantiate ACE_CORBA_var<ACE_ES_Event_Container>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
deleted file mode 100644
index 9e2e458a01a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ /dev/null
@@ -1,1305 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-//
-// = FILENAME
-//    Event_Channel
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    TAO implementation of the Real Time Event Services. For more
-//    detailed information, see
-//    http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//
-// =  NAMING CONVENTIONS
-//    Some of the naming might be confusing.  For instance
-//    ACE_Push_Consumer_Proxy "is-a" ProxyPushSupplier.  To the
-//    channel, ACE_Push_Consumer_Proxy is a proxy to push consumers.
-//    To a push consumer, ACE_Push_Consumer_Proxy is a proxy to push
-//    suppliers.  I chose to name classes relative to the Event
-//    Channel.
-//
-// ============================================================================
-
-#ifndef ACE_EVENT_CHANNEL_H
-#define ACE_EVENT_CHANNEL_H
-
-#include "ace/Containers.h"
-#include "ace/Map_Manager.h"
-
-#include "tao/Timeprobe.h"
-#include "Local_ESTypes.h"
-#include "CORBA_Utils_T.h"
-#include "Task_Manager.h"
-#include "ReactorTask.h"
-
-//ACE_INLINE void operator += (ACE_CORBA_Sequence<RtecEventComm::Event_var> &dest,
-//                               RtecEventComm::Event *item);
-
-ACE_INLINE int operator == (const RtecEventComm::Event &event1,
-                            const RtecEventComm::Event &event2);
-// This operation could be part of the classes, but in order to stay
-// CORBA compliant, we're adding them as global operators.
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Event_Container : public RtecEventComm_Event
-// = TITLE
-//    Event Container
-//
-// = DESCRIPTION
-//    Basically an ACE_ES_Event with reference counting and
-//    thread-specific memory allocation.
-{
-public:
-  ACE_ES_Event_Container (void);
-  // Default construction.
-
-  ~ACE_ES_Event_Container (void);
-  // Destruction.
-
-  ACE_ES_Event_Container (const ACE_ES_Event_Container &);
-  // Copy construction.
-
-  ACE_ES_Event_Container (const RtecEventComm::Event &);
-  // Construction with an event.
-
-  ACE_ES_Event_Container *_duplicate (void);
-  // Increments ref_count_ and returns this.
-
-  void _release (void);
-  // Decrements ref_count_ and deletes if 0.
-
-  int operator== (const ACE_ES_Event_Container &event);
-  // Returns 1 if the two are "equal," 0 otherwise.  Determines
-  // equality using source_ and type_ only.  A 0 source_ is a wildcard
-  // (always equal).  A type_ of ACE_ES_EVENT_ANY is also a wildcard.
-
-  void *operator new (size_t nbytes);
-  // Allocates memory from a thread-specific memory pool.
-
-  void operator delete (void *);
-  // Returns memory to a thread-specific memory pool.
-
-  void dump (void);
-
-private:
-  int ref_count_;
-};
-
-typedef ACE_CORBA_var<ACE_ES_Event_Container> ACE_ES_Event_Container_var;
-
-ACE_INLINE void operator += (ACE_CORBA_Sequence<ACE_ES_Event_Container_var> &dest,
-                             ACE_ES_Event_Container *item);
-
-#if defined(ACE_ES_LACKS_ORB)
-// Utility for debugging sequences.
-ACE_Svc_Export void dump_sequence (const ACE_CORBA_Sequence<RtecEventComm::Event> &seq);
-#endif /* ACE_ES_LACKS_ORB */
-
-// Utility for debugging events.
-void TAO_ORBSVCS_Export dump_event (const RtecEventComm::Event &event);
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_RTU_Manager
-// = TITLE
-//   ACE RTU Manager
-//
-// = DESCRIPTION
-{
-public:
-  ACE_RTU_Manager (int active);
-  // If <active> == 0, everything returns 0.  If <active> != 0, RTUs
-  // galore.
-
-  int should_preempt (void);
-  // Returns 1 if the current task should preempt itself.  Otherwise,
-  // returns 0.  Resets should_preempt to zero.
-
-  void should_preempt (int s);
-  // Called by the dispatching module when the current task should
-  // preempt itself.
-
-  void not_done (int nd);
-  // If <nd> != 0, the current running task will be enqueued at the
-  // head of its dispatch tail.
-
-  int not_done (void);
-  // Returns 1 if the current task needs to be dispatched again.
-  // Resets not_done_ to 0;
-
-  // = Get/set the priority of the current running task.
-  RtecScheduler::OS_Priority priority (void);
-  void priority (RtecScheduler::OS_Priority priority);
-
-private:
-  int active_;
-  int should_preempt_;
-  int not_done_;
-  RtecScheduler::OS_Priority priority_;
-};
-
-// ************************************************************
-
-// Chesire cat.
-class ACE_ES_Priority_Timer;
-// Forward declarations.
-class ACE_ES_Consumer_Module;
-class ACE_ES_Correlation_Module;
-class ACE_ES_Subscription_Module;
-class ACE_ES_Supplier_Module;
-// This forward decl and typedef allow us to remove inheritence later
-// on without changing any code.
-class ACE_ES_Dispatching_Base;
-typedef ACE_ES_Dispatching_Base ACE_ES_Dispatching_Module;
-
-// ec..
-class TAO_ORBSVCS_Export ACE_EventChannel : public RtecEventChannelAdmin_EventChannelBOAImpl
-// = TITLE
-//   ACE Event Channel.
-//
-// = DESCRIPTION
-//   Implementation of COSS Event Channel.  For more detailed
-//   information, see http://www.cs.wustl.edu/~mda/event.html.
-{
-public:
-  enum { INITIAL_STATE = 0,
-         CONSUMER = 1, SUPPLIER = 2,
-         SHUTDOWN = CONSUMER | SUPPLIER };
-
-  ACE_EventChannel (u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE);
-  // Construction of the given <type>.  Check the **_CHANNEL
-  // enumerations defined below.
-
-  virtual ~ACE_EventChannel (void);
-  // Calls destroy.
-
-  // = Accessor methods to Event Channel objects.  The Event Channel
-  // acts as a sort of service repository of object references.  All
-  // objects in the Event Service come to this interface to obtain
-  // object references during initialization.
-
-  virtual RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &);
-  // Consumer administration factory method.
-
-  virtual RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &);
-  // Supplier administration factory method.
-
-  virtual void destroy (CORBA::Environment &);
-  // Explicitly shut down the channel.
-
-  RtecEventChannelAdmin::EventChannel_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::EventChannel.
-
-  ACE_RTU_Manager *rtu_manager (void);
-  // Returns a reference to the RTU manager.
-
-  ACE_ES_Priority_Timer *timer (void);
-  // Timer accessor.
-
-  // = These should be private.
-  ACE_ES_Consumer_Module *consumer_module_;
-  ACE_ES_Dispatching_Module *dispatching_module_;
-  ACE_ES_Correlation_Module *correlation_module_;
-  ACE_ES_Subscription_Module *subscription_module_;
-  ACE_ES_Supplier_Module *supplier_module_;
-
-  ACE_ES_Priority_Timer *timer_;
-
-  void report_connect (u_long);
-  // Consumer or supplier connected.
-
-  void report_disconnect (u_long);
-  // Consumer or supplier disconnected.
-
-  void shutdown (void);
-  // Do not call this.  The last module has shut down.
-
-private:
-  ACE_RTU_Manager *rtu_manager_;
-  // The RTU manager dude!
-
-  u_long type_;
-  // Can be any **_CHANNEL. (well, except NO_CHANNEL).
-
-  u_long state_;
-  // Can be INITIAL_STATE, NO_CONSUMERS, NO_SUPPLIERS, or SHUTDOWN.
-
-  ACE_ES_MUTEX lock_;
-  // Used to lock shared state.
-
-  int destroyed_;
-  // Ensures this->destory is executed only once.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Dependency_Iterator
-// = TITLE
-//    ConsumerQOS Iterator
-//
-// = DESCRIPTION
-//    This is used by the Event Channel to parse ConsumerDependency objects.
-{
-public:
-  ACE_ES_Dependency_Iterator (RtecEventChannelAdmin::DependencySet &rep);
-  // Construct and iterator for <rep>.
-
-  int advance_dependency (void);
-  // Returns 0 if the advance succeeded.  Returns -1 if there are no
-  // more dependencies in the group.
-
-  int parse (void);
-  // Cache values for n_** methods.
-
-  int n_conjunctions (void);
-  // Returns the number of conjunction groups in the dependency set.
-
-  int n_disjunctions (void);
-  // Returns the number of disjunction groups in the dependency set.
-
-  int n_timeouts (void);
-  // Returns the number of timeouts registered.
-
-  int n_events (void);
-  // Returns the number of events registered.
-
-  RtecEventChannelAdmin::Dependency &operator *(void);
-  // Accessor to the current ConsumerDependency pointed to by the
-  // iterator.
-
-  RtecScheduler::handle_t first_rt_info (void);
-  // Returns the first RT_Info in the dependencies.
-
-protected:
-  RtecScheduler::handle_t rt_info_;
-  // The first rt_info in the dependencies.
-
-  RtecEventChannelAdmin::DependencySet &rep_;
-  // Reference to the dependency array.
-
-  int index_;
-  // Index into rep_.
-
-  RtecEventComm::EventType group_type_;
-  // The type of the current correlation group.
-
-  int n_conjunctions_;
-  // Number of conjunction groups.
-
-  int n_disjunctions_;
-  // Number of disjunction groups.
-
-  int n_timeouts_;
-  // Number of timeouts registered.
-
-  int n_events_;
-  // Number of events registered.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Timer_ACT
-// = TITLE
-//    Timer Asynchronous Completion Token
-//
-// = DESCRIPTION
-//    Implements Command pattern with timers.
-{
-public:
-  virtual void execute (void) = 0;
-};
-
-// ************************************************************
-// Forward decl.
-class ACE_ES_Consumer_Rep_Timeout;
-
-class TAO_ORBSVCS_Export ACE_ES_Disjunction_Group
-// = TITLE
-//    Disjunction Group
-//
-// = DESCRIPTION
-//    Represents a disjunction group, such as (A|B|C).
-{
-public:
-  ACE_ES_Disjunction_Group (void);
-  // Default construction.
-
-  virtual ~ACE_ES_Disjunction_Group (void);
-  // Destructor.
-
-  void set_correlation_module (ACE_ES_Correlation_Module *cm);
-  // <cm> is needed for rescheduling deadlines.
-
-  void reschedule_deadline (void);
-  // If deadline_timer_rep_ is set, it is cancelled and rescheduled.
-
-  int set_deadline_timeout (ACE_ES_Consumer_Rep_Timeout *cr);
-  // Set the group's reference to the deadline timer.  Returns 0 on
-  // success, -1 on failure.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-
-  virtual void add_events (Event_Set *outbox,
-                           Event_Set *pending_events,
-                           u_long &pending_flags);
-  // Does nothing.  This is the only virtual method in this little
-  // heirarchy with the conjunction group.
-
-  void set_act (RtecEventComm::Event &act);
-  // Set the ACT for this group.
-
-protected:
-  ACE_ES_Event_Container_var act_;
-  // To be sent with this group.
-
-private:
-  ACE_ES_Consumer_Rep_Timeout *deadline_timer_rep_;
-  // The disjunction group keeps a reference to the deadline timer.
-
-  ACE_ES_Correlation_Module *correlation_module_;
-  // Used for cancelling and scheduling deadline_timer_rep_.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Conjunction_Group : public ACE_ES_Disjunction_Group
-// = TITLE
-//    Conjunction Group
-//
-// = DESCRIPTION
-//    Represents a conjunction group, such as (A+B+C).
-{
-public:
-  ACE_ES_Conjunction_Group (void);
-  // Default construction.
-
-  virtual ~ACE_ES_Conjunction_Group (void);
-  // Destructor.
-
-  int add_type (int type_id);
-  // Set the <type_id>th bit in the forward_value_.
-
-  int should_forward (u_long pending_flags);
-  // Returns 1 if this conjunction group's dependencies have been
-  // satisfied.  Returns 0 otherwise.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-
-  virtual void add_events (Event_Set *outbox,
-                           Event_Set *pending_events,
-                           u_long &pending_flags);
-  // For each bit set in forward_value_, the corresponding events in
-  // <pending_events> is added to <outbox>.  Each bit set in
-  // <forward_value_> is cleared in <pending_flags>.  If <oubox> == 0,
-  // then add_events just clears the pending events and flags.
-
-private:
-  u_long forward_value_;
-};
-
-// ************************************************************
-
-// Forward decl.
-class ACE_ES_Consumer_Correlation;
-
-class TAO_ORBSVCS_Export ACE_ES_Consumer_Rep : public ACE_ES_Timer_ACT
-// = TITLE
-//    Consumer Representation.
-//
-// = DESCRIPTION
-//    These are stored in the subscription module.  They store
-//    information that allows optimized correlations.  It represents
-//    the consumer that will handle *one* type of event.  This
-//    probably shouldn't inherit from ACE_ES_Timer_ACT since it's used
-//    only by ACE_ES_Consumer_Rep_Timeout.  However, this allows me to
-//    minimize dynamic allocation.
-{
-public:
-  ACE_ES_Consumer_Rep (void);
-  // Default construction.
-
-  void init (ACE_ES_Consumer_Correlation *correlation,
-             RtecEventChannelAdmin::Dependency &dep);
-  // <dep> describes the event subscribed to and the method handling
-  // the event.   <correlation> is the parent correlation object.
-
-  virtual ~ACE_ES_Consumer_Rep (void);
-  // Virtual destruction.
-
-  RtecEventChannelAdmin::Dependency *dependency (void);
-  // The event subscribed to and the method that will handle this
-  // event.
-
-  int type_id (void);
-  // Get the correlation group index of this consumer rep's event
-  // type.
-
-  void type_id (int);
-  // Set the correlation group index of this consumer rep's event
-  // type.
-
-  enum Correlation_Type
-  {
-    NO_CORRELATION,
-    CORRELATE,
-    DEADLINE_TIMEOUT,
-    GLOBAL_DEADLINE
-  };
-
-  u_long correlation_type (void);
-  // If this returns 0, then the event associated with this consumer
-  // should be forwarded without running any correlations.
-
-  void correlation_type (u_long ct);
-  // Set whether the event should be correlated.  <ct> is a
-  // Correlation_Type.
-
-  int add_disjunction_group (ACE_ES_Disjunction_Group &);
-  // Add a disjunction group.
-
-  ACE_ES_Disjunction_Group *top_group (void);
-  // Returns the first disjunction group added via
-  // this->add_disjunction_group.
-
-  void reschedule_deadlines (void);
-  // Calls reschedule_deadline on all disjunction groups added through
-  // this->add_disjunction_group.
-
-  int receiving_events (void);
-  // Returns 1 if events should be sent to this consumer.  Returns 0
-  // if they should not (suspended or disconnected).
-
-  void suspend (void);
-  // Stop forwarding events to the calling consumer.
-
-  void resume (void);
-  // Resume forwarding events to the calling consumer.
-
-  ACE_ES_Consumer_Correlation *correlation (void);
-  // Returns the Consumer_Correlation object for the target consumer.
-
-  void disconnect (void);
-  // Schedules the consumer rep to be removed from all subscription
-  // lists.
-
-  int disconnected (void);
-  // Returns 1 if the consumer rep should be removed from all
-  // subscription lists.
-
-  void _duplicate (void);
-  // Increments ref_count_.
-
-  void _release (void);
-  // Decrements ref_count_ and deletes this if 0.
-
-protected:
-  int disconnected_;
-  // Whether the rep should be removed from all subscription lists.
-
-  virtual void execute (void);
-  // This is called when timeouts occur.  This implementation prints
-  // out an error message (since it really shouldn't be implemented in
-  // this class).
-
-  int suspended_;
-  // Whether events should be dropped or forwarded.
-
-  u_long correlation_type_;
-  // Whether any correlating should be done for this event.
-
-  RtecEventChannelAdmin::Dependency *dependency_;
-  // Event subscribed to.
-
-  ACE_ES_Consumer_Correlation *correlation_;
-  // The target consumer of events.
-
-  int type_id_;
-  // Correlation group index of event_->type_.
-
-  ACE_ES_Disjunction_Group *disjunction_group_;
-  // This should be a set.  We'll just have room for one now.
-
-  ACE_Atomic_Op<ACE_ES_MUTEX, int> ref_count_;
-  // Lock for reference count.
-};
-
-class TAO_ORBSVCS_Export ACE_ES_Consumer_Rep_Timeout : public ACE_ES_Consumer_Rep
-// = TITLE
-//    Consumer Representation.
-//
-// = DESCRIPTION
-//    These are stored in the subscription module.  They store
-//    information that allows optimized correlations.  It represents
-//    the consumer that will handle *one* type of event.
-{
-public:
-  ACE_ES_Consumer_Rep_Timeout (void);
-  // Default construction.
-
-  void init (ACE_ES_Consumer_Correlation *correlation,
-             RtecEventChannelAdmin::Dependency &dep);
-  // <dep> describes the event subscribed to and the method handling
-  // the event.   <correlation> is the parent correlation object.
-
-  // = Get/set timer returned from the reactor.
-  int timer_id (void);
-  void timer_id (int);
-
-  // = Get/set preemption priority.
-  RtecScheduler::OS_Priority preemption_priority (void);
-  void preemption_priority (RtecScheduler::OS_Priority pp);
-
-protected:
-  virtual void execute (void);
-  // This is called when timeouts occur.  Calls correlation_->
-
-  int timer_id_;
-  // For cancelling timers.
-
-  RtecScheduler::OS_Priority preemption_priority_;
-  // Store the preemption priority so we can cancel the correct timer.
-  // The priority values may change during the life.
-
-  ACE_ES_Event_Container_var timeout_event_;
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Subscription_Info
-// = TITLE
-//    Event Service Subscription Info
-//
-// = DESCRIPTION
-//    Contains information on all consumers subscribed to a supplier.
-//    Each Push_Supplier_Proxy has an instance of this class.  This
-//    should really be defined in Channel_Modules.h, but I want to
-//    have an instance of it in each ACE_Push_Supplier_Proxy.  This
-//    allows us to reduce the amount of dynamic memory allocation.
-{
-public:
-  ~ACE_ES_Subscription_Info (void);
-  // Free up dynamic resources.
-
-  typedef ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
-  typedef ACE_Unbounded_Set<ACE_ES_Consumer_Rep *> Subscriber_Set;
-
-  class Type_Subscribers
-    // = DESCRIPTION
-    //    There is one of these for each event type generated by the
-    //    supplier.  It contains the subscribers and the
-    //    dependency_info_ describing the method that generates this
-    //    event type.
-  {
-  public:
-    Type_Subscribers (RtecScheduler::Dependency_Info *d)
-      : dependency_info_ (d) {}
-    // Construction requires a dependency info describing the method
-    // that generates events for the consumers_.  We use a pointer so
-    // that a null can be passed in this->insert_or_allocate.
-
-    // void operator= (const Subscriber_Set &);
-    // Copy.
-
-    Subscriber_Set consumers_;
-    // All the consumers that have registered for this event.
-
-    RtecScheduler::Dependency_Info *dependency_info_;
-    // Description of the method that generates this event.
-  };
-
-  typedef RtecEventComm::EventType EXT;
-  typedef Type_Subscribers *INT;
-  typedef ACE_Null_Mutex SYNCH;
-  typedef ACE_Map_Manager<EXT, INT, SYNCH> Subscriber_Map;
-  typedef ACE_Map_Iterator<EXT, INT, SYNCH> Subscriber_Map_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Subscriber_Map_Entry;
-
-  Subscriber_Set source_subscribers_;
-  // Source-based subscribers.
-
-  Subscriber_Map type_subscribers_;
-  // Type-based subscribers.
-
-  // = These are just typedefs for source-based subscriptions.
-  typedef RtecEventComm::EventSourceID sEXT;
-  typedef Subscriber_Set *sINT;
-  typedef ACE_Map_Manager<sEXT, sINT, SYNCH> SourceID_Map;
-  typedef ACE_Map_Iterator<sEXT, sINT, SYNCH> SourceID_Map_Iterator;
-  typedef ACE_Map_Entry<sEXT, sINT> SourceID_Map_Entry;
-
-  ACE_ES_RW_LOCK lock_;
-  // Serializes writes to source_subscribers_ and type_subscribers_.
-
-  static int insert_or_allocate (SourceID_Map &source_subscribers,
-                                 ACE_ES_Consumer_Rep *consumer,
-                                 RtecEventComm::EventSourceID sid);
-  // <source_subscribers> contains a mapping of source id to consumer
-  // list.  Insert <consumer> into the list of consumers subscribed to
-  // <sid>.  Allocate a list for <sid> if necessary.
-
-  static int insert_or_allocate (Subscriber_Map &type_subscribers,
-                                 ACE_ES_Consumer_Rep *consumer,
-                                 RtecEventComm::EventType type);
-  // Add <consumer> to the set of consumers bound to <type> in
-  // <type_subscribers>.  If there is consumer set for <type>, one is
-  // allocated.  Returns -1 on failure, 0 otherwise.
-
-  static int insert_or_fail (Subscriber_Map &type_subscribers,
-                             ACE_ES_Consumer_Rep *consumer,
-                             RtecEventComm::EventType type,
-                             RtecScheduler::Dependency_Info *&dependency);
-  // Add <consumer> to the set of consumers bound to <type> in
-  // <type_subscribers>.  If there is consumer set for <type>, the
-  // operation fails.  Returns -1 on failure, 0 otherwise.
-
-  static int remove (Subscriber_Map &type_map,
-                     ACE_ES_Consumer_Rep *consumer,
-                     RtecEventComm::EventType type);
-  // Remove <consumer> from the consumer set in <type_map> set
-  // corresponding to <type>.
-
-  static int remove (SourceID_Map &source_subscribers,
-                     ACE_ES_Consumer_Rep *consumer,
-                     RtecEventComm::EventSourceID sid);
-  // Remove <consumer> from the consumer set in the
-  // <source_subscribers> set corresponding to <sid>.
-
-  static void append_subscribers (Subscriber_Set &dest,
-                                  Subscriber_Set &src);
-  // Insert all elements of <src> into <dest>.
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Request;
-class ACE_Push_Consumer_Proxy;
-
-class TAO_ORBSVCS_Export ACE_ES_Consumer_Correlation : public RtecEventComm_PushSupplierBOAImpl
-// = TITLE
-//    Event Service Consumer_Correlation
-//
-// = DESCRIPTION
-//    There is one Consumer Correlation object per call to
-//    connect_push_consumer.  It handles all the consumer's
-//    correlation dependencies including timeouts.  This is also a
-//    PushSupplier to support event forwarding.
-{
-public:
-  ACE_ES_Consumer_Correlation (void);
-  // Default construction.
-
-  virtual ~ACE_ES_Consumer_Correlation (void);
-  // Deletes lock_.
-
-  int connected (ACE_Push_Consumer_Proxy *consumer,
-                 ACE_ES_Correlation_Module *correlation_module);
-  // Initialization.  <correlation_module> is stored for delegating
-  // channel operations.  <consumer> is stored to access the consumers
-  // qos and filterin data.  Returns 0 on success, -1 on failure.
-
-  int disconnecting (void);
-  // Shutdown.
-
-  ACE_ES_Dispatch_Request *push (ACE_ES_Consumer_Rep *consumer,
-                                 ACE_ES_Event_Container *event);
-  // Takes <event> and adds it to the correlation.  Returns the
-  // dispatch request that should be forwarded.
-
-  void suspend (void);
-  // Stop forwarding events to the calling consumer.
-
-  void resume (void);
-  // Resume forwarding events to the calling consumer.
-
-  ACE_ES_Correlation_Module *correlation_module_;
-  // Pointer back to the main correlation module.  This is public so
-  // that ACE_ES_Consumer_Rep_Timeout::execute can access it.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-
-private:
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // Called when the channel disconnects us.
-
-  int allocate_correlation_resources (ACE_ES_Dependency_Iterator &iter);
-  // Dynamically allocates structures needed for correlations.  0 on
-  // success, -1 on failure.
-
-  ACE_ES_Dispatch_Request * correlate (ACE_ES_Consumer_Rep *cr,
-                                       ACE_ES_Event_Container *event);
-  // Helper function for this->push.
-
-  // = Registration helper functions.
-  int register_deadline_timeout (RtecEventChannelAdmin::Dependency &dependency,
-                                 RtecEventComm::EventType group_type,
-                                 int cgindex,
-                                 int dgindex,
-                                 int &trep_index);
-  int register_interval_timeout (RtecEventChannelAdmin::Dependency &dependency,
-                                 RtecEventComm::EventType group_type,
-                                 int cgindex,
-                                 int dgindex,
-                                 int &trep_index);
-  int register_event (RtecEventChannelAdmin::Dependency &dependency,
-                      RtecEventComm::EventType group_type,
-                      int cgindex,
-                      int dgindex,
-                      int &crep_index);
-
-  ACE_ES_Consumer_Rep *get_consumer_rep (RtecEventChannelAdmin::Dependency &dependency,
-                                          int &crep_index);
-  int new_type_id (void);
-
-  int type_id_index_;
-
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr channel_;
-  // For event forwarding.
-
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Supplier QOS specifications.
-
-  // Events waiting to be forwarded.
-  Event_Set *pending_events_;
-
-  // Used to synchronize pending_events_ and by the correlation module.
-  ACE_ES_MUTEX lock_;
-  // Used to lock shared state.
-
-  ACE_Push_Consumer_Proxy *consumer_;
-
-  u_long pending_flags_;
-  // A bit is set for each dependency satisfied.
-
-  ACE_ES_Consumer_Rep **consumer_reps_;
-  // Array of consumer rep pointers.
-  int n_consumer_reps_;
-  ACE_ES_Consumer_Rep_Timeout *timer_reps_;
-  int n_timer_reps_;
-
-  ACE_ES_Conjunction_Group *conjunction_groups_;
-  int n_conjunction_groups_;
-  ACE_ES_Disjunction_Group *disjunction_groups_;
-  int n_disjunction_groups_;
-
-  int connected_;
-  // True when we're connected to the channel for forwarding.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_ACT
-// = TITLE
-//    Event Service ACT
-//
-// = DESCRIPTION
-//
-{
-public:
-  ACE_ES_ACT (void);
-  int has_act_;
-  RtecEventComm::Event act_;
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Request;
-
-class TAO_ORBSVCS_Export ACE_ES_Consumer_Module : public RtecEventChannelAdmin_ConsumerAdminBOAImpl
-// = TITLE
-//    Event Service Consumer Module
-//
-// = DESCRIPTION
-//    ProxyPushSupplier factory.
-{
-public:
-  ACE_ES_Consumer_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Dispatching_Module *down);
-  // Link to the next module.
-
-  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (CORBA::Environment &);
-  // Factory method for push consumer proxies.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-                  CORBA::Environment &);
-  // Register the consumer with the Event Service.  This handles all
-  // the details regarding Correlation_Module and Subscription_Module.
-
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                      CORBA::Environment &);
-  // Unregister the consumer from the Event Service.
-
-  void push (const ACE_ES_Dispatch_Request *request,
-             CORBA::Environment &);
-
-  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
-
-  void shutdown_request (ACE_ES_Dispatch_Request *request);
-  // This is called by Shutdown_Consumer command objects when a
-  // consumer proxy is ready to be deleted.
-
-  void shutdown (void);
-  // Actively disconnect from all consumers.
-
-private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *> Consumers;
-
-  ACE_ES_MUTEX lock_;
-  // Protects access to all_consumers_.
-
-  Consumers all_consumers_;
-
-  ACE_EventChannel *channel_;
-  // Used to test for shutdown.
-
-  ACE_ES_Dispatching_Module *down_;
-  // Next module down.
-};
-
-// ************************************************************
-
-// Forward declaration.
-class ACE_ES_Subscription_Module;
-
-class TAO_ORBSVCS_Export ACE_ES_Correlation_Module
-// = TITLE
-//    Event Service Correlation Module
-//
-// = DESCRIPTION
-//
-{
-public:
-  ACE_ES_Correlation_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Dispatching_Module *up,
-             ACE_ES_Subscription_Module *down);
-  // Link to adjacent modules.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-                  CORBA::Environment &);
-  // Create the consumers filter object.
-
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                      CORBA::Environment &);
-  // Release the consumers filter object.
-
-  void push (ACE_ES_Consumer_Rep *consumer,
-             ACE_ES_Event_Container *event,
-             CORBA::Environment &);
-  // Take in an event and its subscriber.  Apply consumer-specific
-  // filters to each event and forward any dispatch requests to the
-  // Dispatching Module.
-
-  // = These are called by ACE_ES_Consumer_Reps.
-
-  int subscribe (ACE_ES_Consumer_Rep *consumer);
-  // Forwards to the subscription module.
-
-  //int unsubscribe (ACE_ES_Consumer_Rep *consumer);
-  // Forwards to the subscription module.
-
-  int schedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Schedule consumer timeout.  Return 0 on success, -1 on failure.
-
-  int cancel_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Cancel consumer timeout.  Return 0 on success, -1 on failure.
-
-  int reschedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Reschedule consumer timeout.  Return 0 on success, -1 on failure.
-
-  ACE_EventChannel *channel_;
-  // The master channel.  This is public so that Consumer_Correlation
-  // objects can access it.
-
-  void shutdown (void);
-  // Does nothing.
-
-private:
-  ACE_ES_Dispatching_Module *up_;
-  // Next module up.
-
-  ACE_ES_Subscription_Module *subscription_module_;
-  // Next module down.
-};
-
-// ************************************************************
-
-// Forward declaration.
-class ACE_ES_Supplier_Module;
-class ACE_Push_Supplier_Proxy;
-
-class TAO_ORBSVCS_Export ACE_ES_Subscription_Module
-// = TITLE
-//    Event Service Subscription Module
-//
-// = DESCRIPTION
-//
-// = SYNCHRONIZATION
-//    This is currently implemented with very coarse-grain
-//    synchronization.  Basically, there is a single readers/writer
-//    lock.  All operations acquire the writer lock to change any
-//    subscription record.  All operations acquire a reader lock to
-//    read any subscription record.  This is fine for normal
-//    operations (which are *all* read operations).  However, the
-//    initialization and shutdown periods might benefit from the
-//    potential increase in concurrency if we used finer grain locks
-//    (e.g., lock-per-source).
-{
-public:
-  ACE_ES_Subscription_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Correlation_Module *up,
-             ACE_ES_Supplier_Module *down);
-  // Link to the adjacent modules.
-
-  ~ACE_ES_Subscription_Module (void);
-  // Deletes the lock_.
-
-  int subscribe (ACE_ES_Consumer_Rep *consumer);
-  // Register a new consumer.  Calls into <consumer> to figure out the
-  // subscription options.  Returns 0 on success, -1 on failure.
-
-  int unsubscribe (ACE_ES_Consumer_Rep *consumer);
-  // Removes the -consumer- from any subscription lists.
-
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-                  CORBA::Environment &);
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                      CORBA::Environment &);
-
-  void push (ACE_Push_Supplier_Proxy *source,
-             ACE_ES_Event_Container *event,
-             CORBA::Environment &);
-  // Takes in a set of events and pushes subscriber sets to the
-  // Correlation Module.
-
-  // void push (ACE_Push_Supplier_Proxy *source,
-  // const RtecEventComm::Event event);
-  // This doesn't need one of these since it will never be called.
-
-  void shutdown (void);
-  // Unsubscribes all consumers from the suppliers.
-
-private:
-  void reregister_consumers (RtecEventComm::EventSourceID source_id);
-  // Reregister any consumers that registered for <source_id> before
-  // it actually connected to the channel.
-
-  ACE_EventChannel *channel_;
-  // The channel of all channels.
-
-  /*
-  typedef ACE_ES_Subscription_Info::Subscriber_Set INT;
-  typedef ACE_Null_Mutex SYNCH;
-  typedef ACE_Map_Manager<EXT, INT, SYNCH> Source_Collection;
-  typedef ACE_Map_Iterator<EXT, INT, SYNCH> Source_Collection_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Source_Collection_Entry;
-  Source_Collection source_subscription_info_;
-  // Source-only subscribers.
-  */
-
-  // = Subscribe helper methods.  Returns 0 on success, -1 on failure.
-
-  int subscribe_all (ACE_ES_Consumer_Rep *consumer);
-
-  int subscribe_type (ACE_ES_Consumer_Rep *consumer,
-                      RtecEventComm::EventType type);
-
-  int subscribe_source (ACE_ES_Consumer_Rep *consumer,
-                        RtecEventComm::EventSourceID source);
-
-  int subscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-                             RtecEventComm::EventSourceID source,
-                             RtecEventComm::EventType type);
-
-  int unsubscribe_all (ACE_ES_Consumer_Rep *consumer);
-
-  int unsubscribe_type (ACE_ES_Consumer_Rep *consumer,
-                        RtecEventComm::EventType type);
-
-  int unsubscribe_source (ACE_ES_Consumer_Rep *consumer,
-                          RtecEventComm::EventSourceID source);
-
-  int unsubscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-                               RtecEventComm::EventSourceID source,
-                               RtecEventComm::EventType type);
-
-  // = Push helper methods.
-
-  int push_source (ACE_Push_Supplier_Proxy *source,
-                    ACE_ES_Event_Container *event);
-  // Push <event> to all consumers subscribed to all events from
-  // <source>.  Returns 0 on success, -1 on failure.
-
-  int push_source_type (ACE_Push_Supplier_Proxy *source,
-                         ACE_ES_Event_Container *event);
-  // Push <event> to all consumers subscribed to <event>.type_ from
-  // <source>.  Returns 0 on success, -1 on failure.
-
-  void push_all (ACE_ES_Event_Container *event,
-                 CORBA::Environment &);
-  // Push <event> to all_suppliers_.
-
-  ACE_ES_Correlation_Module *up_;
-  // Next module up stream.
-
-  ACE_ES_Supplier_Module *down_;
-  // Next module down stream.
-
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
-
-  Suppliers all_suppliers_;
-  // All suppliers.
-
-  ACE_ES_Subscription_Info::Subscriber_Map type_subscribers_;
-  // Type-based subscribers.
-
-  ACE_ES_Subscription_Info::SourceID_Map source_subscribers_;
-  // Source-based subscribers.
-
-  ACE_ES_RW_LOCK lock_;
-  // Protects access to all_suppliers_ and type_suppliers_;
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_ES_Supplier_Module : public RtecEventChannelAdmin_SupplierAdminBOAImpl
-// = TITLE
-//    Event Service Supplier Proxy Module
-//
-// = DESCRIPTION
-//    ProxyPushConsumer factory.
-{
-public:
-  ACE_ES_Supplier_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Subscription_Module *up);
-  // Associate the module to a channel.
-
-  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (CORBA::Environment &);
-  // Factory method for push supplier proxies.
-
-  void push (ACE_Push_Supplier_Proxy *proxy,
-             const RtecEventComm::EventSet &event,
-             CORBA::Environment &);
-  // The supplier module acts on behalf of the supplier proxy to
-  // forward events through the channel.
-
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-                  CORBA::Environment &);
-  // Register the consumer with the Event Service.  This handles all
-  // the details regarding Correlation_Module and Subscription_Module.
-
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                      CORBA::Environment &);
-  // Unregister the consumer from the Event Service.
-
-  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (void);
-  // Allow transformations to RtecEventComm::PushConsumer.
-
-  void shutdown (void);
-  // Actively disconnect from all suppliers.
-
-private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
-
-  Suppliers all_suppliers_;
-  // All suppliers.
-
-  ACE_ES_MUTEX lock_;
-  // Protects access to all_suppliers_ and type_suppliers_;
-
-  ACE_ES_Subscription_Module *up_;
-
-  ACE_EventChannel *channel_;
-  // Used to test for shutdown.
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_EventChannel;
-
-// = Event Channel interfaces.
-
-class TAO_ORBSVCS_Export ACE_Push_Supplier_Proxy : public RtecEventChannelAdmin_ProxyPushConsumerBOAImpl
-// = TITLE
-//    Push Supplier Proxy.
-//
-// = DESCRIPTION
-//    To the channel, this is a proxy to suppliers.  To suppliers, it
-//    exports a PushConsumer interface.  It is a
-//    RtecEventChannelAdmin::ProxyPushConsumer.  Suppliers use this
-//    interface to connect to the channel, push events to consumers,
-//    and to disconnect from the channel.
-{
-public:
-  ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *supplier_module);
-  // Must be created with an owning supplier admin.
-
-  // = Operations public to suppliers.
-
-  virtual void connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
-                                      const RtecEventChannelAdmin::SupplierQOS& qos,
-                                      CORBA::Environment &);
-  // Suppliers connect via this interface.  <push_supplier> is a
-  // reference to the supplier.  <qos> represents the publish types of
-  // the supplier.
-
-  virtual void push (const RtecEventComm::EventSet &event,
-                     CORBA::Environment &);
-  // Data arriving from a PushSupplier that must be sent to
-  // consumers.  This is the entry point of all events.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // Disconnect the supplier from the channel.
-
-  // = Operations for the Event Channel.
-
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ProxyPushConsumer.
-
-  int connected (void);
-  // Returns 1 if the proxy has been connected to a "remote" client.
-
-  void shutdown (void);
-  // Actively disconnect from the supplier.
-
-  // This is a hook so that the Subscription Module can associate
-  // state with supplier proxies.
-  ACE_ES_Subscription_Info &subscription_info (void);
-
-  RtecEventChannelAdmin::SupplierQOS &qos (void);
-  // Filtering criteria.
-
-  int operator== (const RtecEventComm::EventSourceID rhs);
-  // Is this object a proxy for -rhs-.  Simple pointer comparison for now.
-
-  RtecEventComm::EventSourceID source_id (void);
-  // Returns underlying supplier object ref.
-
-private:
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Reference to the supplier's qos params.
-
-  ACE_ES_Subscription_Info subscription_info_;
-
-  ACE_ES_Supplier_Module *supplier_module_;
-
-  RtecEventComm::EventSourceID source_id_;
-  // We keep a proxy of the Supplier source_id_;
-
-  RtecEventComm::PushSupplier_ptr push_supplier_;
-  // CORBA reference to remote push supplier.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_Push_Consumer_Proxy : public RtecEventChannelAdmin_ProxyPushSupplierBOAImpl
-// = TITLE
-//     Push Consumer Proxy.
-//
-// = DESCRIPTION
-//     This is the channels proxy to a push consumer.  It implements
-//     the RtecEventChannelAdmin::ProxyPushSupplier IDL interface.
-//     Consumers use this interface to connect and disconnect from the
-//     channel.
-{
-public:
-  ACE_Push_Consumer_Proxy (ACE_ES_Consumer_Module *cm);
-  // Must be created with an consumer admin.
-
-  virtual ~ACE_Push_Consumer_Proxy (void);
-  // Default destruction
-
-  // = Interfaces exported to consumers.
-
-  virtual void connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
-                                      const RtecEventChannelAdmin::ConsumerQOS& qos,
-                                      CORBA::Environment &);
-  // A push consumer is connecting.  <push_consumer> is a reference to
-  // the consumer.  <qos> is the subscription types for the consumer.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // The consumer is disconnecting.
-
-  virtual void suspend (CORBA::Environment &);
-  // Stop forwarding events to the calling consumer.
-
-  virtual void resume (CORBA::Environment &);
-  // Resume forwarding events to the calling consumer.
-
-  // = Event Channel operations.
-
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &);
-  // Push <events> to push_consumer_.
-
-  int connected (void);
-  // Returns 1 if the proxy has been connected to a "remote" client.
-
-  void shutdown (void);
-  // Actively disconnect from the consumer.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ProxyPushSupplier.
-
-  ACE_ES_Consumer_Correlation &correlation (void);
-  // Access the consumer-specific Consumer_Correlation.
-
-  RtecEventChannelAdmin::ConsumerQOS &qos (void);
-  // Filtering criteria.
-
-private:
-  RtecEventChannelAdmin::ConsumerQOS qos_;
-  // A reference to the consumers Quality of Service parameters.
-
-  ACE_ES_Consumer_Correlation correlation_;
-  // A hook so that the Correlation Module can associate correlation
-  // information with the consumer.
-
-  RtecEventComm::PushConsumer_ptr push_consumer_;
-  // Reference to our push consumer.
-
-  ACE_ES_Consumer_Module *consumer_module_;
-  // TODO: Maybe this should be a _var or _duplicate/_release should
-  // be used
-};
-
-// ************************************************************
-
-// Helper function that returns
-// qos.dependencies_[0].rt_info_->entry_point or "no-name".
-const TAO_ORBSVCS_Export char *
-ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos);
-
-// ************************************************************
-
-typedef ACE_ES_Simple_Array <ACE_ES_Consumer_Rep *,
-  ACE_ES_MAX_CONSUMERS_PER_SUPPLIER> ACE_ES_CRSet;
-
-typedef ACE_ES_Array_Iterator <ACE_ES_Consumer_Rep *> ACE_ES_CRSet_Iterator;
-
-#if defined (__ACE_INLINE__)
-#include "Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
deleted file mode 100644
index 584ee95d69f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ /dev/null
@@ -1,892 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-const unsigned int ACE_INT2BIT[32] =
-{
-  1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192,
-  16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152,
-  4194304, 8388608, 16777216, 33554432, 67108864, 134217728,
-  268435456, 536870912, 1073741824, 2147483648u,
-};
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_Push_Supplier_Proxy::get_ref (void)
-{
-  CORBA::Environment env;
-  return this->_this (env);
-}
-
-ACE_INLINE int
-ACE_Push_Supplier_Proxy::connected (void)
-{
-  return !CORBA::is_nil((CORBA::Object*) push_supplier_);
-}
-
-ACE_INLINE ACE_ES_Subscription_Info &
-ACE_Push_Supplier_Proxy::subscription_info (void)
-{
-  return subscription_info_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS &
-ACE_Push_Supplier_Proxy::qos (void)
-{
-  return qos_;
-}
-
-ACE_INLINE int
-ACE_Push_Supplier_Proxy::operator== (const RtecEventComm::EventSourceID rhs)
-{
-  // Pointer comparison is fine for now.
-  return (source_id_ == rhs);
-}
-
-ACE_INLINE RtecEventComm::EventSourceID
-ACE_Push_Supplier_Proxy::source_id (void)
-{
-  return source_id_;
-}
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_Push_Consumer_Proxy::get_ref (void)
-{
-  CORBA::Environment env;
-  return this->_this (env);
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS &
-ACE_Push_Consumer_Proxy::qos (void)
-{
-  return qos_;
-}
-
-ACE_INLINE int
-ACE_Push_Consumer_Proxy::connected (void)
-{
-  return !CORBA::is_nil(push_consumer_);
-}
-
-ACE_INLINE void
-ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
-			       CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  deliver event to consumer proxy");
-
-  if (push_consumer_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Push to disconnected consumer %s: ",
-		  ::ACE_ES_Consumer_Name (this->qos ())));
-      // ACE_ES_DEBUG_ST (::dump_sequence (events));
-      return;
-    }
-
-  TAO_TRY
-    {
-      push_consumer_->push (events, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (CORBA::SystemException, se)
-    {
-      ACE_ERROR ((LM_ERROR, "system exception.\n"));
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-ACE_INLINE ACE_ES_Consumer_Correlation &
-ACE_Push_Consumer_Proxy::correlation (void)
-{
-  return correlation_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_ES_Consumer_Module::get_ref (void)
-{
-  CORBA::Environment env;
-  return this->_this (env);
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_ES_Supplier_Module::get_ref (void)
-{
-  CORBA::Environment env;
-  return this->_this (env);
-}
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-ACE_EventChannel::get_ref (void)
-{
-  CORBA::Environment env;
-  return this->_this (env);
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_EventChannel::for_suppliers (CORBA::Environment &)
-{
-  return supplier_module_->get_ref ();
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_EventChannel::for_consumers (CORBA::Environment &)
-{
-  return consumer_module_->get_ref ();
-}
-
-ACE_INLINE ACE_ES_Priority_Timer *
-ACE_EventChannel::timer (void)
-{
-  return timer_;
-}
-
-// ************************************************************
-
-// Makes a temporary Event_var and appends it to the <dest>.
-ACE_INLINE void
-operator += (ACE_CORBA_Sequence<ACE_ES_Event_Container_var> &dest,
-	     ACE_ES_Event_Container *item)
-{
-  int length = dest.length ();
-  dest.length (length + 1);
-  dest[length] = item;
-}
-
-/*
-// Makes a temporary Event_var and appends it to the <dest>.
-ACE_INLINE void
-operator += (ACE_CORBA_Sequence<RtecEventComm::Event_var> &dest,
-	     RtecEventComm::Event *item)
-{
-  //  RtecEventComm::Event_var event (item);
-  int length = dest.length ();
-  dest.length (length + 1);
-  dest[length] = item;
-}
-*/
-
-ACE_INLINE int
-operator == (const RtecEventComm::Event &event1,
-	     const RtecEventComm::Event &event2)
-{
-  // Check if the sources are equal.  0 is a wildcard.
-  if ((event1.source_ != 0)
-      && (event2.source_ != 0)
-      && (event1.source_ != event2.source_))
-    return 0;
-
-  // Check if the types are equal.  ACE_ES_EVENT_ANY is a wildcard.
-  if ((event1.type_ != ACE_ES_EVENT_ANY) &&
-      (event2.type_ != ACE_ES_EVENT_ANY) &&
-      (event1.type_ != event2.type_))
-    return 0;
-
-  return 1;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_ACT::ACE_ES_ACT (void)
-  : has_act_ (0)
-{
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Disjunction_Group::ACE_ES_Disjunction_Group (void) :
-  act_ (),
-  deadline_timer_rep_ (0),
-  correlation_module_ (0)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::set_correlation_module (ACE_ES_Correlation_Module *cm)
-{
-  correlation_module_ = cm;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::reschedule_deadline (void)
-{
-  if (deadline_timer_rep_ != 0)
-    {
-      if (correlation_module_->reschedule_timeout (deadline_timer_rep_) == -1)
-	ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"));
-    }
-}
-
-ACE_INLINE int
-ACE_ES_Disjunction_Group::set_deadline_timeout (ACE_ES_Consumer_Rep_Timeout *cr)
-{
-  deadline_timer_rep_ = cr;
-  // Schedule the timeout.
-  if (correlation_module_->schedule_timeout (deadline_timer_rep_) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::add_events (Event_Set *outbox,
-				      Event_Set *pending_events,
-				      u_long &pending_flags)
-{
-  ACE_UNUSED_ARG (pending_events);
-  ACE_UNUSED_ARG (pending_flags);
-
-  // Append the act.
-  if (act_ != 0)
-    *outbox += act_;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::set_act (RtecEventComm::Event &act)
-{
-  ACE_ES_Event_Container *temp = new ACE_ES_Event_Container (act);
-  if (temp == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::set_act"));
-      return;
-    }
-
-  act_ = temp;
-  temp->_release ();
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Consumer_Rep::ACE_ES_Consumer_Rep (void) :
-  disconnected_ (0),
-  suspended_ (0),
-  correlation_type_ (ACE_ES_Consumer_Rep::NO_CORRELATION),
-  dependency_ (0),
-  correlation_ (0),
-  type_id_ (0),
-  disjunction_group_ (0),
-  ref_count_ (1)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::init (ACE_ES_Consumer_Correlation *correlation,
-			   RtecEventChannelAdmin::Dependency& dependency)
-{
-  dependency_ = &dependency;
-  correlation_ = correlation;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency*
-ACE_ES_Consumer_Rep::dependency (void)
-{
-  return dependency_;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::type_id (void)
-{
-  return type_id_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::type_id (int id)
-{
-  type_id_ = id;
-}
-
-ACE_INLINE ACE_ES_Consumer_Correlation *
-ACE_ES_Consumer_Rep::correlation (void)
-{
-  return correlation_;
-}
-
-ACE_INLINE u_long
-ACE_ES_Consumer_Rep::correlation_type (void)
-{
-  return correlation_type_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::correlation_type (u_long ct)
-{
-  correlation_type_ = ct;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::add_disjunction_group (ACE_ES_Disjunction_Group &dg)
-{
-  if (disjunction_group_ != 0)
-    ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep::add_disjunction_group: "
-		"disjunction_group already set!\n"));
-  disjunction_group_ = &dg;
-  return 0;
-}
-
-ACE_INLINE ACE_ES_Disjunction_Group *
-ACE_ES_Consumer_Rep::top_group (void)
-{
-  return disjunction_group_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::reschedule_deadlines (void)
-{
-  if (disjunction_group_ != 0)
-    disjunction_group_->reschedule_deadline ();
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::receiving_events (void)
-{
-  return suspended_ == 0 && disconnected_ == 0;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::suspend (void)
-{
-  suspended_ = 1;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::resume (void)
-{
-  suspended_ = 0;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::_duplicate (void)
-{
-  // This is atomic.
-  ref_count_++;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::_release (void)
-{
-  // This is atomic.  rc is because we want to avoid Atomic_Op's
-  // operator==.  Don't change this code unless you think you're more
-  // studly than ACE_Atomic_Op.
-  int rc = --ref_count_;
-
-  if (rc == 0)
-    delete this;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::disconnected (void)
-{
-  return disconnected_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::disconnect (void)
-{
-  disconnected_ = 1;
-}
-
-// ************************************************************
-
-// Forward <events> to all consumers subscribed to <source> only.
-ACE_INLINE int
-ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
-					 ACE_ES_Event_Container *event)
-{
-  ACE_TIMEPROBE ("  enter ACE_ES_Subscription_Module::push");
-  // If there are now source-based subscribers for this supplier,
-  // return.
-  if (source->subscription_info ().source_subscribers_.size () == 0)
-    return 0;
-
-  ACE_ES_Subscription_Info::Subscriber_Set &set =
-    source->subscription_info ().source_subscribers_;
-
-  // List of consumers that need to be disconnected.
-  ACE_ES_CRSet disconnect_list;
-
-  {
-    // Acquire a read lock.
-    ACE_ES_RGUARD ace_mon (source->subscription_info ().lock_);
-    if (ace_mon.locked () == 0)
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-    ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (set);
-
-    TAO_TRY
-      {
-	// Iterate through all subscribers.
-	for (ACE_ES_Consumer_Rep **consumer = 0;
-	     iter.next (consumer) != 0;
-	     iter.advance ())
-	  {
-	    // Only push the event if the consumer is not suspended
-	    // and not disconnected.
-	    if ((*consumer)->receiving_events ())
-	      {
-		up_->push (*consumer, event, TAO_TRY_ENV);
-		TAO_CHECK_ENV;
-	      }
-	    // If the consumer has disconnected, schedule it for
-	    // disconnection.  We can not modify our list now.  It
-	    // would mess up the iterator.
-	    if ((*consumer)->disconnected ())
-	      disconnect_list.insert (*consumer);
-	  }
-      }
-    TAO_CATCHANY
-      {
-	return -1;
-      }
-    TAO_ENDTRY;
-
-    // Release the read lock.
-  }
-
-  // If there are consumers scheduled for disconnect, acquire a write
-  // lock and disconnect them.
-  if (disconnect_list.size () != 0)
-    {
-      ACE_ES_WGUARD ace_mon (source->subscription_info ().lock_);
-      if (ace_mon.locked () == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-      ACE_ES_CRSet_Iterator iter (disconnect_list.data (), disconnect_list.size ());
-
-      // Iterate through the disconnecting consumers.
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   iter.next (consumer) != 0;
-	   iter.advance ())
-	{
-	  // Remove the consumer from subscriber list.
-	  if (set.remove (*consumer) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p remove failed.\n",
-			"ACE_ES_Subscription_Module::push_source.\n"));
-	  else
-	    // Decrement the consumer rep's reference count.
-	    (*consumer)->_release ();
-	}
-    }
-
-  return 0;
-}
-
-// 1. figure out why we're going through the subscription module,
-// instead of just passing through.
-// 2. where is lock_?  Is there only one per module!?
-
-ACE_INLINE int
-ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
-					      ACE_ES_Event_Container *event)
-{
-  // Step through each event in the set.  For each event type, find
-  // the corresponding set in the type collection.  Push the single
-  // event to each consumer in the set.
-
-  ACE_ES_Subscription_Info::Subscriber_Map &supplier_map =
-    source->subscription_info ().type_subscribers_;
-
-  ACE_ES_CRSet disconnect_list;
-
-  ACE_ES_Subscription_Info::Subscriber_Set *set;
-
-  {
-    ACE_ES_RGUARD ace_mon (source->subscription_info ().lock_);
-    if (ace_mon.locked () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source_type.\n"), -1);
-    }
-
-    ACE_ES_Subscription_Info::Type_Subscribers *subscribers;
-
-    if (supplier_map.current_size () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      return 0;
-    }
-
-    if (supplier_map.find (event->type_, subscribers) == -1)
-      {
-	ACE_DEBUG ((LM_ERROR, "ACE_ES_Subscription_Module::push_source_type"
-		    " Warning: event type %d not registered.\n",
-		    event->type_));
-        ACE_TIMEPROBE ("  push_source_type");
-	return 0; // continue anyway
-      }
-
-    if (subscribers->consumers_.size () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      return 0;
-    }
-
-    set = &subscribers->consumers_;
-
-    // We've found the set of consumers subscribed to this type
-    // of event from this supplier.  Forward the event to each.
-    ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (*set);
-
-    TAO_TRY
-      {
-	for (ACE_ES_Consumer_Rep **consumer = 0;
-	     iter.next (consumer) != 0;
-	     iter.advance ())
-	  {
-	    if ((*consumer)->receiving_events ())
-	      {
-		up_->push (*consumer, event, TAO_TRY_ENV);
-		TAO_CHECK_ENV;
-	      }
-	    if ((*consumer)->disconnected ())
-	      disconnect_list.insert (*consumer);
-	  }
-      }
-    TAO_CATCHANY
-      {
-	ACE_TIMEPROBE ("  push_source_type");
-	return -1;
-      }
-    TAO_ENDTRY;
-  }
-
-  if (disconnect_list.size () != 0)
-    // Acquire a write lock and remove all disconnected consumers.
-    {
-      ACE_ES_WGUARD ace_mon (source->subscription_info ().lock_);
-      if (ace_mon.locked () == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-      ACE_ES_CRSet_Iterator iter (disconnect_list.data (), disconnect_list.size ());
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   iter.next (consumer) != 0;
-	   iter.advance ())
-	{
-	  if (set->remove (*consumer) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p remove failed.\n",
-			"ACE_ES_Subscription_Module::push_source.\n"));
-	  else
-	    (*consumer)->_release ();
-	}
-    }
-
-  ACE_TIMEPROBE ("  push_source_type");
-  return 0;
-}
-
-// ************************************************************
-
-ACE_INLINE ACE_RTU_Manager *
-ACE_EventChannel::rtu_manager (void)
-{
-  return rtu_manager_;
-}
-
-ACE_INLINE
-ACE_RTU_Manager::ACE_RTU_Manager (int active)
-  : active_ (active),
-    should_preempt_ (0),
-    not_done_ (0),
-    priority_ (ACE_Scheduler_MIN_PREEMPTION_PRIORITY)
-{
-}
-
-ACE_INLINE int
-ACE_RTU_Manager::should_preempt (void)
-{
-  if (!active_)
-    return 0;
-  else
-    {
-      // Expire any timers.  Am I evil for putting this here?
-      ACE_Time_Value tv;
-      if (ACE_Task_Manager::instance ()->
-	  GetReactorTask (0)->get_reactor ().handle_events (&tv) == -1)
-	ACE_ERROR ((LM_ERROR, "%p.\n",
-		    "ACE_RTU_Manager::should_preempt"));
-
-      int should_preempt = should_preempt_;
-      should_preempt_ = 0;
-      return should_preempt;
-    }
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::should_preempt (int s)
-{
-  should_preempt_ = s;
-}
-
-ACE_INLINE int
-ACE_RTU_Manager::not_done (void)
-{
-  int not_done = not_done_;
-  not_done_ = 0;
-  return not_done;
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::not_done (int nd)
-{
-  not_done_ = nd;
-}
-
-ACE_INLINE RtecScheduler::OS_Priority
-ACE_RTU_Manager::priority (void)
-{
-  return priority_;
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::priority (RtecScheduler::OS_Priority p)
-{
-  priority_ = p;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Consumer_Rep_Timeout::ACE_ES_Consumer_Rep_Timeout (void) :
-  timer_id_ (0),
-  preemption_priority_ (ACE_Scheduler_MIN_PREEMPTION_PRIORITY),
-  timeout_event_ ()
-{
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::init (ACE_ES_Consumer_Correlation *correlation,
-				   RtecEventChannelAdmin::Dependency &dep)
-{
-  ACE_ES_Event_Container *temp = new ACE_ES_Event_Container (dep.event_);
-  if (temp == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Rep_Timeout::init"));
-      return;
-    }
-
-  timeout_event_ = temp;
-  temp->_release ();
-
-  ACE_ES_Consumer_Rep::init (correlation, dep);
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep_Timeout::timer_id (void)
-{
-  return timer_id_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::timer_id (int id)
-{
-  timer_id_ = id;
-}
-
-ACE_INLINE RtecScheduler::OS_Priority
-ACE_ES_Consumer_Rep_Timeout::preemption_priority (void)
-{
-  return preemption_priority_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::preemption_priority (RtecScheduler::OS_Priority p)
-{
-  preemption_priority_ = p;
-}
-
-// ************************************************************
-
-ACE_INLINE void
-ACE_ES_Consumer_Correlation::suspend (void)
-{
-  for (int x=0; x < n_timer_reps_; x++)
-    timer_reps_[x].suspend ();
-
-  for (int y=0; y < n_consumer_reps_; y++)
-    consumer_reps_[y]->suspend ();
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Correlation::resume (void)
-{
-  for (int x=0; x < n_timer_reps_; x++)
-    timer_reps_[x].resume ();
-
-  for (int y=0; y < n_consumer_reps_; y++)
-    consumer_reps_[y]->resume ();
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Dependency_Iterator::ACE_ES_Dependency_Iterator (RtecEventChannelAdmin::DependencySet &rep) :
-  rt_info_ (0),
-  rep_ (rep),
-  index_ (-1),
-  n_conjunctions_ (0),
-  n_disjunctions_ (0),
-  n_timeouts_ (0),
-  n_events_ (0)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::advance_dependency (void)
-{
-  index_++;
-  if ((CORBA::ULong) index_ >= rep_.length ())
-    return -1;
-  else
-    return 0;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency &
-ACE_ES_Dependency_Iterator::operator *(void)
-{
-  return rep_[index_];
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::parse (void)
-{
-  for (CORBA::ULong x = 0; x < rep_.length (); x++)
-    {
-      if (rt_info_ == 0)
-	rt_info_ = rep_[x].rt_info;
-
-      switch (rep_[x].event_.type_)
-	{
-	case ACE_ES_CONJUNCTION_DESIGNATOR:
-	  n_conjunctions_++;
-	  break;
-
-	case ACE_ES_DISJUNCTION_DESIGNATOR:
-	  n_disjunctions_++;
-	  break;
-
-	case ACE_ES_EVENT_TIMEOUT:
-	case ACE_ES_EVENT_INTERVAL_TIMEOUT:
-	case ACE_ES_EVENT_DEADLINE_TIMEOUT:
-	  n_timeouts_++;
-	  break;
-
-	default:
-	  n_events_++;
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_conjunctions (void)
-{
-  return n_conjunctions_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_disjunctions (void)
-{
-  return n_disjunctions_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_timeouts (void)
-{
-  return n_timeouts_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_events (void)
-{
-  return n_events_;
-}
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_ES_Dependency_Iterator::first_rt_info (void)
-{
-  return rt_info_;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Conjunction_Group::ACE_ES_Conjunction_Group (void) :
-  forward_value_ (0)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Conjunction_Group::add_type (int type_id)
-{
-  ACE_SET_BITS (forward_value_, ACE_INT2BIT[type_id]);
-  return 0;
-}
-
-/*
-  // Set length bits.
-  for (int x=0; x < length; x++)
-  {
-  forward_value_ <<= 1;
-  forward_value_ |= 1;
-  }
-  */
-
-ACE_INLINE int
-ACE_ES_Conjunction_Group::should_forward (u_long pending_flags)
-{
-  if ((forward_value_ & pending_flags) == forward_value_)
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Conjunction_Group::add_events (Event_Set *outbox,
-				      Event_Set *pending_events,
-				      u_long &pending_flags)
-{
-  // Append the act first.
-  if (act_ != 0)
-    *outbox += act_;
-
-  u_long fv = forward_value_;
-  int x = 0;
-  while (fv > 0)
-    {
-      // If this type_id is part of the correlation, then append each
-      // event pending to the outbox.
-      if (ACE_BIT_ENABLED (forward_value_, ACE_INT2BIT[x]))
-	{
-	  // Step through each of the pending events.
-	  Event_Set &pending = pending_events[x];
-	  for (CORBA::ULong y=0; y < pending.length (); y++)
-	    {
-	      // Add the pending event to the outbox.
-	      if (outbox != 0)
-		*outbox += pending[y];
-	      // Remove the event from the pending events array.
-	      pending[y] = 0;
-	    }
-
-	  // Reset the array length.
-	  pending.length (0);
-	  // Since we just emptied the events for this type, clear the
-	  // x^th bit in pending flags.
-	  ACE_CLR_BITS (pending_flags, ACE_INT2BIT[x]);
-	  // Clear the x^th bit in fv.
-	  ACE_CLR_BITS (fv, ACE_INT2BIT[x]);
-	}
-
-      x++;
-    }
-}
-
-// ************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
deleted file mode 100644
index 8924cf3b9e3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// $Id$
-//
-#if !defined (FAST_REACTOR_H)
-#define FAST_REACTOR_H
-
-#if defined (ACE_OLD_STYLE_REACTOR)
-# if defined (ACE_WIN32)
-#   include "ace/ReactorEx.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx 
-# else 
-#   include "ace/Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor 
-# endif /* ACE_WIN32 */
-#else
-# if defined (ACE_WIN32)
-#   include "ace/WFMO_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_WFMO_Reactor
-# else 
-#   include "ace/Select_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor 
-# endif /* ACE_WIN32 */
-#endif /* ACE_OLD_STYLE_REACTOR */
-//## end module.includes
-
-class TAO_ORBSVCS_Export ACE_ES_Fast_Reactor : public ACE_ES_FAST_REACTOR_BASE
-{
-public:
-  virtual int handle_events (ACE_Time_Value *max_wait_time = 0)
-  {
-    ACE_Time_Value timer_buf (0) ;
-    ACE_Time_Value *this_timeout = &timer_buf ;
-
-    if (this->timer_queue_->calculate_timeout (max_wait_time,
-					       this_timeout) == 0) 
-      {
-	ACE_Time_Value t (0, 500000);
-	ACE_OS::select (0, 0, 0, 0, &t);
-      }
-    else
-      {
-	ACE_OS::select (0, 0, 0, 0, this_timeout);
-      }
-
-    return this->timer_queue_->expire () == -1 ? -1 : 0;
-  }
-  virtual int handle_events (ACE_Time_Value &max_wait_time)
-  {
-    return this->handle_events (&max_wait_time);
-  }
-};
-
-#endif /* FAST_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp
deleted file mode 100644
index 587d97728f5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = FILENAME
-//    GPlot_File.cpp
-//
-// = AUTHOR
-//    Tim Harrison
-//
-// ============================================================================
-
-#include "GPlot_File.h"
-
-#if !defined (__ACE_INLINE__)
-#include "GPlot_File.i"
-#endif /* __ACE_INLINE__ */
-
-int
-ACE_GPlot_File::open (const char *filename)
-{
-  ACE_OS::strcpy (filename_, filename);
-
-  FILE *read_file = ACE_OS::fopen (filename_, "r");
-
-  long entry;
-  char *value;
-  ACE_NEW_RETURN (value, char [32], -1);
-
-  if (read_file > 0)
-    {
-      int result;
-      do
-	{
-	  result = fscanf (read_file,
-			   "%ld\t%s\n",
-			   &entry,
-			   value);
-
-	  //if ((result == -1) && (ACE_OS::last_error () != 0))
-	  //ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_GPlot_File::open"), -1);
-
-	  if (result > 0)
-	    // Success.
-	    map_.bind (entry, value);
-	  else if (result != EOF)
-	    // Error.
-	    {
-	      ACE_OS::fclose (read_file);
-	      ACE_ERROR_RETURN
-		((LM_ERROR, "Error reading GPlot file %s.\n", filename_), -1);
-	    }
-	} while (result != EOF);
-
-      fclose (read_file);
-    }
-
-  write_file_ = ACE_OS::fopen (filename_, "w");
-  if (write_file_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p: can't open\n", filename_), -1);
-
-  closed_ = 0;
-
-  return 0;
-}
-
-
-void
-ACE_GPlot_File::close (void)
-{
-  if (closed_ == 0)
-    {
-      closed_ = 1;
-      GPLOT_ITERATOR iterator ((GPLOT_MAP &) map_);
-      for (GPLOT_ENTRY *entry; iterator.next (entry); iterator.advance ())
-        {
-	  ACE_OS::fprintf (write_file_, "%ld\t%s\n",
-			   entry->ext_id_, entry->int_id_);
-          delete [] entry->int_id_;
-        }
-
-      ACE_OS::fclose (write_file_);
-    }
-}
-
-
-void
-ACE_GPlot_File::dump (void)
-{
-  GPLOT_ITERATOR iterator ((GPLOT_MAP &) map_);
-  for (GPLOT_ENTRY *entry; iterator.next (entry); iterator.advance ())
-    {
-      if (entry->int_id_ != 0)
-	ACE_DEBUG ((LM_DEBUG, "%d\t%s\n", entry->ext_id_, entry->int_id_));
-      else
-	{
-	  ACE_ERROR ((LM_ERROR, "Value for entry %d is null.\n",
-		      entry->ext_id_));
-	  return;
-	}
-    }
-}
-
-
-int
-ACE_GPlot_File::get (long entry, long &value)
-{
-  char *val;
-
-  if (map_.find (entry, val) == -1)
-    return -1;
-  else
-    {
-      ::sscanf (val, "%ld", &value);
-      return 0;
-    }
-}
-
-
-int
-ACE_GPlot_File::get (long entry, float &value)
-{
-  char *val;
-
-  if (map_.find (entry, val) == -1)
-    return -1;
-  else
-    {
-      ::sscanf (val, "%f", &value);
-      return 0;
-    }
-}
-
-
-void
-ACE_GPlot_File::set (long entry, long value)
-{
-  long old_entry;
-  char *val;
-  char *old_value;
-
-  ACE_NEW (val, char [32]);
-
-  ::sprintf (val, "%ld", value);
-  map_.rebind (entry, val, old_entry, old_value);
-
-  delete [] old_value;
-}
-
-
-void
-ACE_GPlot_File::set (long entry, float value)
-{
-  long old_entry;
-  char *val;
-  char *old_value;
-
-  ACE_NEW (val, char [32]);
-
-  ::sprintf (val, "%f", value);
-  map_.rebind (entry, val, old_entry, old_value);
-
-  delete [] old_value;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<long, char *>;
-template class ACE_Map_Manager<long, char *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<long, char *, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<long, char *>
-#pragma instantiate ACE_Map_Manager<long, char *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<long, char *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
deleted file mode 100644
index 8ce6e79488b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = FILENAME
-//    GPlot_File.h
-//
-// = AUTHOR
-//    Tim Harrison
-//
-// ============================================================================
-
-#if !defined (ACE_GPlot_File_H)
-#define ACE_GPlot_File_H
-
-#include "ace/Map_Manager.h"
-#include "ace/Synch.h"
-
-class TAO_ORBSVCS_Export ACE_GPlot_File
-// = TITLE
-//    Reads and writes files in GPlot format.
-//
-// = DESCRIPTION
-//    Gplot formats are as follows:
-//      entry   value
-//      entry   value
-//      entry   value
-//	  ...
-//    They represent x,y pairs to be graphed by GPlot.  entry's are
-//    type long.  value's are type long or float.
-{
-public:
-  ACE_GPlot_File (void);
-  // Construction.
-
-  ~ACE_GPlot_File (void);
-  // Destruction.  Calls this->close.
-
-  int open (const char *filename);
-  // If the file does not exist, create it. If the file exists open
-  // the file and read all the entries into map_.  Returns 0 on
-  // success, -1 on failure.
-
-  void close (void);
-  // Close the file and sync all the contents.
-
-  int get (long entry, long &value);
-  // Get the entry at this value.  Returns 0 if a value was found.
-  // Returns -1 if no value has been set for <entry>.
-
-  int get (long entry, float &value);
-  // Get the entry at this value.  Returns 0 if a value was found.
-  // Returns -1 if no value has been set for <entry>.
-
-  void set (long entry, long value);
-  // Set the entry at this value.
-
-  void set (long entry, float value);
-  // Set the entry at this value.
-
-  void set_greatest (long entry, long value);
-  // Compare <value> with the value at <entry>.  Store the largest.
-
-  void set_greatest (long entry, float value);
-  // Compare <value> with the value at <entry>.  Store the largest.
-
-  void set_least (long entry, long value);
-  // Compare <value> with the value at <entry>.  Store the smallest.
-
-  void set_least (long entry, float value);
-  // Compare <value> with the value at <entry>.  Store the smallest.
-
-  void dump (void);
-  // Dump state of the object.
-
-private:
-  // = map_ stores all values.  It is sync'ed to file when this->close
-  // is called.
-  typedef ACE_Map_Entry <long, char *> GPLOT_ENTRY;
-  typedef ACE_Map_Manager<long, char *, ACE_Null_Mutex> GPLOT_MAP;
-  typedef ACE_Map_Iterator <long, char *, ACE_Null_Mutex> GPLOT_ITERATOR;
-
-  GPLOT_MAP map_;
-
-  char filename_[BUFSIZ];
-  FILE *write_file_;
-
-  int closed_;
-  // Only close once.
-};
-
-#if defined (__ACE_INLINE__)
-#include "GPlot_File.i"
-#endif /* __ACE_INLINE__ */
-
-
-#endif /* ACE_GPlot_File_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.i b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.i
deleted file mode 100644
index ab9f235dc39..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.i
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_GPlot_File::ACE_GPlot_File (void)
-  : closed_ (1)
-{
-}
-
-
-ACE_INLINE
-ACE_GPlot_File::~ACE_GPlot_File (void)
-{
-  this->close ();
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_greatest (long entry, long value)
-{
-  long old_value;
-
-  // If there was no previous value, or the <value> is greater than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value > old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_greatest (long entry, float value)
-{
-  float old_value;
-
-  // If there was no previous value, or the <value> is greater than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value > old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_least (long entry, long value)
-{
-  long old_value;
-
-  // If there was no previous value, or the <value> is less than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value < old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_least (long entry, float value)
-{
-  float old_value;
-
-  // If there was no previous value, or the <value> is less than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value < old_value)
-    this->set (entry, value);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
deleted file mode 100644
index ebfd367dc9a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// $Id$
-//
-
-#include "Local_ESTypes.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
deleted file mode 100644
index bf34edee6cc..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ORB Services
-// 
-// = FILENAME
-//    Local_ESTypes.h
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    Manual types that would otherwise be defined/implemented via an
-//    IDL compiler.
-//    NOTE: the file is obsolecent, we have TAO now, but we keep it
-//    to speed up the porting.
-//
-// ============================================================================
-
-#ifndef ACE_LOCAL_ESTYPES_H
-#define ACE_LOCAL_ESTYPES_H
-
-#include "tao/corba.h"
-
-#include "orbsvcs/Event_Service_Constants.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-
-#define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0
-
-// These are to help MSVC++ 4.2 deal with inheritence of nested types.
-// Not needed for Sun C++ or MSVC++ 5.0.
-
-// @@ NOTE: TAO uses the POA mapping instead of the old BOA, but all the
-// code still uses the BOA name for the skeleton classes, to speed up
-// porting we keep to old names.
-
-typedef RtecEventComm::Event RtecEventComm_Event;
-typedef POA_RtecScheduler::Scheduler RtecScheduler_SchedulerBOAImpl;
-typedef POA_RtecEventChannelAdmin::EventChannel RtecEventChannelAdmin_EventChannelBOAImpl;
-typedef POA_RtecEventComm::PushSupplier RtecEventComm_PushSupplierBOAImpl;
-typedef POA_RtecEventChannelAdmin::ConsumerAdmin RtecEventChannelAdmin_ConsumerAdminBOAImpl;
-typedef POA_RtecEventChannelAdmin::SupplierAdmin RtecEventChannelAdmin_SupplierAdminBOAImpl;
-typedef POA_RtecEventChannelAdmin::ProxyPushConsumer RtecEventChannelAdmin_ProxyPushConsumerBOAImpl;
-typedef POA_RtecEventChannelAdmin::ProxyPushSupplier RtecEventChannelAdmin_ProxyPushSupplierBOAImpl;
-typedef POA_RtecEventComm::PushConsumer RtecEventComm_PushConsumerBOAImpl;
-typedef POA_RtecEventComm::PushSupplier RtecEventComm_PushSupplierBOAImpl;
-
-#if defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_LOCAL_ESTYPES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
deleted file mode 100644
index 8f8ef4cfe2d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
deleted file mode 100644
index 8bda764fb41..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#include "Memory_Pools.h"
-#include "Event_Channel.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Memory_Pools.i"
-#endif /* __ACE_INLINE__ */
-
-//ACE_TSS<ACE_ES_Dispatch_Request_Allocator> ACE_ES_Memory_Pools::Dispatch_Request_;
-//ACE_TSS<ACE_ES_Event_Container_Allocator> ACE_ES_Memory_Pools::Event_Container_;
-//ACE_TSS<ACE_ES_Event_Allocator> ACE_ES_Memory_Pools::Event_;
-
-// ************************************************************
-
-int
-ACE_ES_Memory_Pools::thr_init (void)
-{
-  // Allocate the memory pool for this thread.
-  //Event_Container_.ts_object ();
-  //Dispatch_Request_.ts_object ();
-  //Event_.ts_object ();
-  return 0;
-}
-
-// ************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// For ACE_ES_Memory_Pools.
-template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<ACE_ES_Event_Container_Allocator,ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<ACE_ES_Event_Allocator,ACE_SYNCH_MUTEX>;
-// template class ACE_TSS<ACE_ES_Event_Container_Allocator>;
-// template class ACE_TSS<ACE_ES_Dispatch_Request_Allocator>;
-// template class ACE_TSS<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_MEMORY_POOL_MUTEX> >;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<ACE_ES_Event_Container_Allocator,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<ACE_ES_Event_Allocator,ACE_SYNCH_MUTEX>
-// #pragma instantiate ACE_TSS<ACE_ES_Event_Container_Allocator>
-// #pragma instantiate ACE_TSS<ACE_ES_Dispatch_Request_Allocator>
-// #pragma instantiate ACE_TSS<ACE_Malloc<ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options, ACE_MEMORY_POOL_MUTEX> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
deleted file mode 100644
index 3d4068bf94b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ORB Services
-// 
-// = FILENAME
-//    Memory_Pools
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef ACE_MEMORY_POOLS_H
-#define ACE_MEMORY_POOLS_H
-
-#include "ace/Synch.h"
-#include "Event_Channel.h"
-#include "Dispatching_Modules.h"
-
-// ************************************************************
-
-#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) || !defined (ACE_HAS_THREADS)
-  typedef ACE_Null_Mutex ACE_MEMORY_POOL_MUTEX;
-#else
-  // Use the same object for each thread.  Therefore, we have to use
-  // real synchronization.
-  typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX;
-#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION || !ACE_HAS_THREADS */
-
-typedef char 
-        ACE_ES_Dispatch_Request_Chunk[sizeof (ACE_ES_Dispatch_Request)];
-
-typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> 
-        _ACE_Dispatch_Request_Allocator;
-
-class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request_Allocator : public _ACE_Dispatch_Request_Allocator
-// = TITLE
-//     Dispatch Request Allocator
-//
-// = DESCRIPTION
-//     This just sets the size of the Event Container memory pool.
-{
-public:
-  ACE_ES_Dispatch_Request_Allocator (void) :
-    _ACE_Dispatch_Request_Allocator (ACE_ES_DISPATCH_REQUEST_MEMORY_POOL) {}
-};
-
-// ************************************************************
-
-typedef char ACE_ES_Event_Container_Chunk[sizeof (ACE_ES_Event_Container)];
-
-typedef ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Event_Container_Allocator;
-
-class TAO_ORBSVCS_Export ACE_ES_Event_Container_Allocator : public _ACE_Event_Container_Allocator
-// = TITLE
-//     Event Container Allocator
-//
-// = DESCRIPTION
-//     This just sets the size of the Event Container memory pool.
-{
-public:
-  ACE_ES_Event_Container_Allocator (void) :
-    _ACE_Event_Container_Allocator (ACE_ES_EVENT_CONTAINER_MEMORY_POOL) {}
-};
-
-// ************************************************************
-
-typedef char ACE_ES_Event_Chunk[sizeof (RtecEventComm::Event)];
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_MEMORY_POOL_MUTEX> ACE_ES_Event_Allocator;
-//typedef ACE_Cached_Allocator<ACE_ES_Event_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Event_Allocator;
-
-class TAO_ORBSVCS_Export ACE_ES_Memory_Pools
-// = TITLE
-//     Event Service Memory Pools.
-//
-// = DESCRIPTION
-//     These have to be static in order to be accessed by operator
-//     news, right?
-{
-public:
-  static int thr_init (void);
-  // This can be called by every thread that will access these memory
-  // pools to preallocate the thread specific allocators.  It is not
-  // mandatory.
-
-  static void *new_Event_Container (void);
-  static void delete_Event_Container (void *);
-  static void *new_Dispatch_Request (void);
-  static void delete_Dispatch_Request (void *);
-  static void *new_Event (size_t);
-  static void delete_Event (void *);
-
-  typedef ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX> Dispatch_Request_;
-  typedef ACE_Singleton<ACE_ES_Event_Container_Allocator,ACE_SYNCH_MUTEX> Event_Container_;
-  typedef ACE_Singleton<ACE_ES_Event_Allocator,ACE_SYNCH_MUTEX> Event_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Memory_Pools.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_MEMORY_POOLS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.i b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.i
deleted file mode 100644
index f2d73d94ed3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.i
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Event_Container (void)
-{
-  return Event_Container_::instance ()->malloc (sizeof (ACE_ES_Event_Container));
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Event_Container (void *mem)
-{
-  Event_Container_::instance ()->free (mem);
-}
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Dispatch_Request (void)
-{
-  return Dispatch_Request_::instance ()->malloc (sizeof (ACE_ES_Dispatch_Request));
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Dispatch_Request (void *mem)
-{
-  Dispatch_Request_::instance ()->free (mem);
-}
-
-#define USE_MEM_POOLS 1
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Event (size_t len)
-{
-#if USE_MEM_POOLS
-  const u_int ev_size = sizeof (RtecEventComm::Event);
-  const u_int size = (ev_size % ACE_MALLOC_ALIGN) ?
-      ((ev_size / ACE_MALLOC_ALIGN) + 1) * ACE_MALLOC_ALIGN : ev_size;
-
-  char *const addr = (char *) Event_::instance ()->malloc (len * size);
-#else
-  char *const addr = new char[len * sizeof (ACE_ES_Event)];
-#endif
-
-  return addr;
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Event (void *mem)
-{
-#if USE_MEM_POOLS
-  Event_::instance ()->free (mem);
-#else
-  delete [] mem;
-#endif
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
deleted file mode 100644
index 07e23495662..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-// $Id$
-
-#include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "RT_Task.h"
-#include "Debug_Macros.h"
-#include "Event_Channel.h"
-#include "Memory_Pools.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RT_Task.i"
-#endif /* __ACE_INLINE__ */
-
-class ACE_RT_Task_Shutdown : public ACE_RT_Task_Command
-// = TITLE
-//    Flush Queue Command.
-//
-// = DESCRIPTION
-//    This command object will call close on task_.  This is used by
-//    single-threaded tasks to flush any queued messages.
-{
-public:
-  ACE_RT_Task_Shutdown (ACE_ES_TASK *task)
-    : task_ (task) {}
-
-  virtual int execute (u_long &command_action);
-
-  ACE_ES_TASK *task_;
-};
-
-int
-ACE_RT_Task_Shutdown::execute (u_long &command_action)
-{
-  ACE_UNUSED_ARG (command_action);
-
-  if (task_ == 0)
-    return 1;
-  else
-    {
-      task_->close (0);
-      return 0;
-    }
-}
-
-// ************************************************************
-// ************************************************************
-
-ACE_RT_Task::ACE_RT_Task (void)
-  : closed_ (0)
-{
-}
-
-ACE_RT_Task::~ACE_RT_Task (void)
-{
-  msg_queue_->deactivate ();
-}
-
-int
-ACE_RT_Task::svc (void)
-{
-  int done = 0;
-
-  ACE_hthread_t self;
-  ACE_OS::thr_self (self);
-
-  int priority;
-  if (ACE_OS::thr_getprio (self, priority) == 0)
-    ACE_DEBUG ((LM_DEBUG, "(%t) new thread priority = %d.\n", priority));
-
-  // Initialize channel thread-specific data.
-  ACE_ES_Memory_Pools::thr_init ();
-
-  done = this->svc_hook (priority);
-
-  while (!done)
-    {
-      done = this->svc_one ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) thread exiting.\n"));
-  return 0;
-}
-
-int
-ACE_RT_Task::svc_hook (RtecScheduler::OS_Priority)
-{
-  return 0;
-}
-
-int
-ACE_RT_Task::svc_one (void)
-{
-  // Dequeue the command.
-  ACE_Message_Block *mb;
-
-  if (this->getq (mb) == -1)
-    {
-      if (ACE_OS::last_error () == ESHUTDOWN)
-        return 1;
-      else
-        // We'll continue in spite of this error.
-        ACE_ERROR ((LM_ERROR, "%p (%t) getq error.\n", "ACE_RT_Task::svc_one"));
-    }
-
-  // Execute the command.
-  ACE_RT_Task_Command *command = (ACE_RT_Task_Command *) mb;
-
-  int result;
-  u_long command_action = ACE_RT_Task_Command::RELEASE;
-
-  ACE_TIMEPROBE (" RT_Task - start execute");
-
-  // @@ Put exception handling around this!
-  result = command->execute (command_action);
-
-  ACE_TIMEPROBE (" RT_Task - end execute");
-
-  switch (command_action)
-    {
-    case ACE_RT_Task_Command::RELEASE:
-      // Free the message block.
-      if (ACE_RT_Task_Command::release (command) != 0)
-        ACE_ERROR ((LM_ERROR, "ACE_RT_Task::svc_one: "
-                    "ACE_RT_Task_Command::release returned != 0!\n"));
-      break;
-
-    case ACE_RT_Task_Command::UNGETQ:
-      this->ungetq (command);
-      break;
-    }
-
-  return result;
-}
-
-// A thread has exited.
-int
-ACE_RT_Task::close (u_long)
-{
-  // If we're the last one out, call threads_closed.
-  if (thr_count_ == 0)
-    this->threads_closed ();
-
-  return 0;
-}
-
-// All threads have exited.
-void
-ACE_RT_Task::threads_closed (void)
-{
-}
-
-int
-ACE_RT_Task::open_task (const char* name)
-{
-  const char *tempname = name;
-  char tempbuffer[64];
-  if (tempname == 0)
-    {
-      ACE_OS::sprintf (tempbuffer, "unnamed task %d", (long) this);
-      tempname = tempbuffer;
-    }
-
-  TAO_TRY
-    {
-      rt_info_ =
-        ACE_Scheduler_Factory::server()->create (tempname,
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      // @@ TODO: We do no initialization of the new rt_info, the
-      // caller does, this is (IMnsHO) very error prone.
-    }
-  TAO_CATCH (RtecScheduler::DUPLICATE_NAME, dn_ex)
-    {
-      // @@ TODO: Its already registered, IMHO this should at least
-      // report a warning, but I'll stick to the previous code.
-      // ACE_ERROR_RETURN ((LM_WARNING,
-      // "RT_Info for %s was already createn",
-      // tempname), 0);
-      return 0;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-ACE_RT_Task::try_put (ACE_Message_Block *mb)
-{
-  if (!closed_)
-    {
-      return this->msg_queue ()->enqueue_prio (mb);
-    }
-  else
-    {
-      errno = EPIPE;
-      return -1;
-    }
-}
-
-// The point of this method is to spawn or shutdown threads depending
-// on any differences between the task's RT_Info::threads_ and how
-// many threads are actually running.
-int
-ACE_RT_Task::synch_threads (size_t threads)
-{
-  if (threads > this->thr_count ())
-    // Add threads.
-    {
-      RtecScheduler::OS_Priority thread_priority;
-      RtecScheduler::Sub_Priority subpriority;
-      RtecScheduler::Preemption_Priority preemption_priority;
-
-      TAO_TRY
-        {
-          // @@ TODO handle exceptions
-          ACE_TIMEPROBE ("  synch_threads - priority requested");
-          ACE_Scheduler_Factory::server ()->priority
-            (rt_info_,
-             thread_priority,
-             subpriority,
-             preemption_priority, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-          ACE_TIMEPROBE ("  synch_threads - priority obtained");
-
-          ACE_DEBUG ((LM_DEBUG, "(%t) spawning %d threads at os thread"
-                      " priority %d.\n",
-                      threads - this->thr_count (),
-                      thread_priority));
-
-          // This is here so that the constructor does not call it.  The
-          // ORB has an instance of one of these.
-          this->thr_mgr (ACE_Task_Manager::instance ()->ThrMgr ());
-
-          // Add the difference.
-          // First try real-time scheduling with specified priority.
-          long flags = THR_BOUND | THR_SCHED_FIFO;
-          if (this->activate (flags,
-                              threads - this->thr_count (),
-                              1, // Force it to spawn more threads
-                              thread_priority) == -1)
-            {
-              // That didn't work.  Try default scheduling class with
-              // the requested priority.
-              flags = THR_BOUND;
-              if (this->activate (flags,
-                                  threads - this->thr_count (),
-                                  1, // Force it to spawn more threads
-                                  thread_priority) == -1)
-                {
-                  // That didn't work.  Finally, try default
-                  // scheduling class with minimum priority.
-
-                  // On Linux, for example, only the superuser can set
-                  // the policy to other than ACE_SCHED_OTHER.  But
-                  // with ACE_SCHED_OTHER, there is only one thread
-                  // priority value, for example, 0.  So, let the
-                  // superuser run an interesting test, but for other
-                  // users use the minimum ACE_SCHED_OTHER thread
-                  // priority.
-
-                  RtecScheduler::OS_Priority fallback_priority =
-                    ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
-                                                    ACE_SCOPE_THREAD);
-
-                  ACE_DEBUG ((LM_DEBUG, "(%t) task activation at priority %d "
-                              "with flags 0x%X failed; retry at priority %d "
-                              "with flags 0x%X\n",
-                              thread_priority,
-                              flags,
-                              fallback_priority,
-                              THR_BOUND));
-
-                  flags = THR_BOUND;
-
-                  if (this->activate (flags,
-                                      threads - this->thr_count (),
-                                      1, // Force it to spawn more threads
-                                      fallback_priority) == -1)
-                    {
-                      ACE_DEBUG ((LM_ERROR,
-                                  "(%t) thread spawn at priority %d FAILED "
-                                  "(errno is %d%p)!!!!\n",
-                                  fallback_priority,
-                                  errno,
-                                  ""));
-                    }
-                }
-            }
-        }
-      TAO_CATCHANY
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "priority failed\n"), -1);
-        }
-      TAO_ENDTRY;
-
-    }
-  else
-    // Remove threads.
-    {
-      // kill_threads has to be off the stack in case the last thread
-      // deletes this RT_Task.
-      int kill_threads = this->thr_count () - threads;
-
-      for (int x = kill_threads ; x > 0; x--)
-        {
-          // Create a new shutdown command with a task pointer of 0.
-          ACE_RT_Task_Shutdown *te = new ACE_RT_Task_Shutdown (0);
-
-          if (te == 0)
-            return -1;
-
-          ACE_DEBUG ((LM_DEBUG, "(%t) enqueueing thread exit.\n"));
-          if (this->putq (te) == -1)
-            {
-              ACE_ERROR ((LM_ERROR, "%p putq failed.\n",
-                          "ACE_RT_Task::synch_threads"));
-              if (ACE_RT_Task_Shutdown::release (te) != 0)
-                ACE_ERROR ((LM_ERROR, "ACE_RT_Task::synch_threads: "
-                            "ACE_RT_Task_Shutdown::release returned != 0!\n"));
-              return -1;
-            }
-        }
-    }
-
-  return 0;
-}
-
-
-// If we are not active, we will flush the queue and then call
-// this->close.  Otherwise, we will send shutdown messages to each
-// thread.  ~ACE_Task_Exit will call this->close when each thread
-// exits.
-int
-ACE_RT_Task::shutdown_task (void)
-{
-  // Be sure to only execute this once, and only if we're active.
-  if (closed_)
-    return 0;
-
-  // This will keep any messages from entering the queue.
-  closed_ = 1;
-
-  if (thr_count_ > 0)
-    return this->synch_threads (0);
-  else
-    {
-      // Create a new flush queue command.  We're passive, so pass in
-      // a reference to the task for which close will be called.
-      ACE_RT_Task_Shutdown *fq = new ACE_RT_Task_Shutdown (this);
-
-      if (fq == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_RT_Task::shutdown_threads"));
-          return -1;
-        }
-
-      // Enqueue the command.
-      ACE_DEBUG ((LM_DEBUG, "(%t) enqueueing task shutdown.\n"));
-      if (this->putq (fq) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p putq failed.\n",
-                      "ACE_RT_Task::shutdown_task"));
-          if (ACE_RT_Task_Shutdown::release (fq) != 0)
-            ACE_ERROR ((LM_ERROR, "ACE_RT_Task::shutdown_task: "
-                        "ACE_RT_Task_Shutdown::release returned != 0!\n"));
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-// ************************************************************
-
-ACE_RT_Thread_Manager::ACE_RT_Thread_Manager (void)
-  : flags_ (0)
-{
-}
-
-void
-ACE_RT_Thread_Manager::suspend_spawns (void)
-{
-  flags_ |= THR_SUSPENDED;
-}
-
-void
-ACE_RT_Thread_Manager::unsuspend_spawns (void)
-{
-  flags_ = 0;
-  this->resume_all ();
-}
-
-int
-ACE_RT_Thread_Manager::spawn_i (ACE_THR_FUNC func,
-                                void *args,
-                                long flags,
-                                ACE_thread_t *t_id,
-                                ACE_hthread_t *t_handle,
-                                long priority,
-                                int grp_id,
-                                void *stack,
-                                size_t stack_size,
-                                ACE_Task_Base *task)
-{
-  flags |= flags_;
-  return ACE_Thread_Manager::spawn_i (func, args, flags, t_id, t_handle,
-                                      priority, grp_id, stack, stack_size, task);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
deleted file mode 100644
index a74816af215..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    RT_Task
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    Wrapper on top of ACE Task that integrates an Active Object with
-//    the Event Service.
-//
-// ============================================================================
-
-#if !defined (ACE_RT_TASK_H)
-#define ACE_RT_TASK_H
-
-#include "ace/Task.h"
-#include "orbsvcs/RtecSchedulerC.h"
-
-class TAO_ORBSVCS_Export ACE_RT_Thread_Manager : public ACE_Thread_Manager
-  // = TITLE
-  //   
-  // = DESCRIPTION
-{
-public:
-  ACE_RT_Thread_Manager (void);
-  // Default construction.
-
-  void suspend_spawns (void);
-  // Any threads spawned will be suspended until <unsuspend_spawns> is
-  // called.
-
-  void unsuspend_spawns (void);
-  // Resumes all threads.
-
-protected:
-  virtual int spawn_i (ACE_THR_FUNC func, 
-		       void *args, 
-		       long flags, 
-		       ACE_thread_t * = 0, 
-		       ACE_hthread_t *t_handle = 0,
-		       long priority = 0,
-		       int grp_id = -1,
-		       void *stack = 0, 
-		       size_t stack_size = 0,
-		       ACE_Task_Base *task = 0);
-
-  int flags_;
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_RT_Task_Command : public ACE_Message_Block
-// = TITLE
-//   
-// = DESCRIPTION
-{
-public:
-  virtual ~ACE_RT_Task_Command (void) {}
-  // Guarantees that derived destructors get called.
-
-  enum { RELEASE, UNGETQ };
-
-  virtual int execute (u_long &command_action) = 0;
-  // Execute the command.  Returning 1 will make the calling thread
-  // exit.  Returning 0 will allow the thread to continue dispatching
-  // commands.  If <command_action> returns as RELEASE, the command
-  // will be released.  If <command_action> == UNGETQ, then the
-  // command will be requeued and dispatched again.
-};
-
-// ************************************************************
-
-// In Synch_T.h:
-// #define ACE_MT_SYNCH ACE_Thread_Mutex,ACE_Condition_Thread_Mutex
-
-typedef ACE_Task<ACE_SYNCH> ACE_ES_TASK;
-typedef ACE_Message_Queue<ACE_SYNCH> ACE_ES_QUEUE;
-
-class TAO_ORBSVCS_Export ACE_RT_Task : public ACE_ES_TASK
-{
-  // = TITLE
-  //   ACE Real-Time Task
-  //   
-  // = DESCRIPTION
-  //    Real-Time Active Object that integrates with a global
-  //    scheduler and Event Service.  For now, none of the management
-  //    methods are synchronized.  If it turns out that multiple
-  //    threads will be calling the management methods, then we can
-  //    add synchronization.  For the most part, RT_Task threads
-  //    should be dequeueing commands from the message queue.  Only
-  //    one thread should be calling any management methods.
-  friend ACE_RT_Thread_Manager;
-public:
-  ACE_RT_Task (void);
-  // Default construction.
-
-  ~ACE_RT_Task (void);
-  // Deactivates the queue.
-
-  // = Management methods.
-
-  int open_task (const char* name = 0);
-  // <name> is used to look up our qos info from the scheduler.  If
-  // <name> == 0, then we create a "unique" name and ask the scheduler
-  // for a new qos structure.  If we find an existing qos structure,
-  // calls this->synch_threads and returns 1.  If a qos structure is not
-  // found, but created returns 0 and does not call synch_threads.
-  // Returns -1 on failure.
-
-  int try_put (ACE_Message_Block *mb);
-  // Enqueue a request.  Returns 0 on success, -1 on failure.  If the
-  // task is shutdown, -1 is returned with errno == EPIPE.
-
-  int shutdown_task (void);
-  // If active, shutdown all running thread.  Since this is
-  // accomplished via queued shutdown messages, this has the effect of
-  // flushing the queue.  Once all threads exit, threads_closed will
-  // be called.  If this is a passive object, then the queue will be
-  // flushed and threads_closed will be called.
-
-  int synch_threads (size_t threads);
-  // Compare <threads> with what is actually running.  If there are
-  // any differences, update this RT_Task.  This may involve spawning
-  // more threads or changing thread priorities, etc.  This can be
-  // used to close all threads by sending a 0.
-
-  RtecScheduler::handle_t rt_info (void);
-  // QOS accessor.  The behavior of the task can be changed by setting
-  // this and then calling this->synch_threads.
-
-  virtual void threads_closed (void);
-  // Called when every thread has exited.  This hook allows
-  // applications to specify semantics when all threads have exited.
-  // For instance, the Dispatching Module uses this hook to delete
-  // itself when an application is shutting down.
-
-  virtual int svc_hook (RtecScheduler::OS_Priority priority);
-  // This is called the first time the thread is spawned.  <priority>
-  // is the priority of the current thread.  If this returns != 1
-  // (e.g., 0), the event loop will execute (calling this->svc_one).
-  // If this returns 1, the event loop will not execute.
-
-  virtual int svc_one (void);
-  // Call this->getq once and execute the command.  Returns the result
-  // of command->execute ().
-
-protected:
-  RtecScheduler::handle_t rt_info_;
-  // Scheduling characteristics of this active object.
-
-  int closed_;
-  // Set to 1 when this->shutdown_threads or this->close_queue is
-  // called.  Keeps us from enqueuing more that one shutdown message.
-
-  virtual int svc (void);
-  // Run by each thread spawned.  Each thread dequeues
-  // ACE_RT_Task_Commands and executes them.
-
-  virtual int close (u_long flags = 0);
-  // Called each time a thread exits.
-
-  void close_all_threads (void);
-  // Enqueues shutdown message for every thread in the task.
-};
-
-#if defined (__ACE_INLINE__)
-#include "RT_Task.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_RT_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.i b/TAO/orbsvcs/orbsvcs/Event/RT_Task.i
deleted file mode 100644
index b6b21d50494..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.i
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_RT_Task::rt_info (void)
-{
-  return rt_info_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
deleted file mode 100644
index 0f7e7bf38e1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-
-#include "ace/High_Res_Timer.h"
-#include "tao/Timeprobe.h"
-#include "orbsvcs/Scheduler_Factory.h"
-
-#include "ReactorTask.h"
-
-ACE_ES_Reactor_Task::ACE_ES_Reactor_Task() :
-  //  reactor_ (0, &timer_queue_),
-  done_ (0)
-{
-  // Change the timer mechanism used by the reactor and the timer
-  // queue.
-  timer_queue_.gettimeofday (ACE_OS::gettimeofday);
-}
-
-ACE_ES_Reactor_Task::~ACE_ES_Reactor_Task (void)
-{
-}
-
-int
-ACE_ES_Reactor_Task::svc_hook(RtecScheduler::OS_Priority)
-{
-  // Make ourselves owner of the reactor.
-  reactor_.owner (ACE_Thread::self());
-  return 0;
-}
-
-int
-ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period &period)
-{
-  // Create a name for ourselves using the period.  The period is
-  // in 100 ns units; first convert to usec by dividing by 10.
-  char temp[64];
-  ACE_OS::sprintf (temp, "Reactor_Task-%u.us", period / 10);
-
-  // Open the task.  This will query the scheduler for our qos
-  // structure.
-  int result = this->open_task (temp);
-
-  switch (result)
-    {
-    case -1:
-      // Error.
-      ACE_ERROR ((LM_ERROR, "(%t) Scheduler could not find operation %s.\n",
-                  temp));
-      return -1;
-
-    case 0:
-      // @@ TODO handle exceptions
-      {
-        TAO_TRY
-          {
-            ACE_Scheduler_Factory::server()->set(rt_info_,
-                                                 RtecScheduler::VERY_HIGH_CRITICALITY,
-                                                 ORBSVCS_Time::zero,
-                                                 ORBSVCS_Time::zero,
-                                                 ORBSVCS_Time::zero,
-                                                 period,
-                                                 RtecScheduler::VERY_LOW_IMPORTANCE,
-                                                 ORBSVCS_Time::zero,
-                                                 1,
-                                                 RtecScheduler::OPERATION,
-                                                 TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-          }
-        TAO_CATCHANY
-          {
-            ACE_ERROR_RETURN ((LM_ERROR, "set failed\n"), -1);
-          }
-        TAO_ENDTRY;
-      }
-      break;
-
-    case 1:
-      // Found.
-      break;
-    }
-
-  return this->synch_threads (1);
-}
-
-int ACE_ES_Reactor_Task::svc_one()
-{
-  ACE_TIMEPROBE (" Reactor_Task - waiting for events");
-  if (reactor_.handle_events() == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p.\n", "ACE_ES_Reactor_Task::svc"));
-  ACE_TIMEPROBE (" Reactor_Task - events handled");
-
-  if (done_)
-    ACE_DEBUG ((LM_DEBUG, "(%t) Timer Task is done.\n"));
-
-  return done_;
-}
-
-void ACE_ES_Reactor_Task::threads_closed()
-{
-  delete this;
-}
-
-void ACE_ES_Reactor_Task::shutdown_task()
-{
-  done_ = 1;
-  reactor_.notify();
-}
-
-ACE_ES_Reactor_Task::Reactor&
-ACE_ES_Reactor_Task::get_reactor()
-{
-  return reactor_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
deleted file mode 100644
index 3bd0a1c25c1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#if !defined ACE_ReactorTask_H
-#define ACE_ReactorTask_H
-
-// BBM, moved this here from UPSingleProcessorOrb.h
-//## begin module.includes preserve=yes
-#include "Fast_Reactor.h"
-#if defined (ACE_OLD_STYLE_REACTOR)
-# define ACE_ORB_REACTOR ACE_ES_Fast_Reactor
-#endif /* ACE_OLD_STYLE_REACTOR */
-//## end module.includes
-
-// Added these.
-#include "ace/Timer_Heap.h"
-#include "ace/Timer_List.h"
-
-#include "Local_ESTypes.h"
-#include "RT_Task.h"
-
-class TAO_ORBSVCS_Export ACE_ES_Reactor_Task : public ACE_RT_Task
-// = TITLE
-//    Event Service Timer Task
-//
-// = DESCRIPTION
-//    An active object that dispatches timers from its own ReactorEx.
-{
-public:
-  // BBM, added this.
-#if defined (ACE_OLD_STYLE_REACTOR)
-  typedef ACE_ORB_REACTOR Reactor;
-#else
-  typedef ACE_Reactor Reactor;
-#endif /* ACE_OLD_STYLE_REACTOR */
-
-  ACE_ES_Reactor_Task();
-  // Default construction.
-
-  ~ACE_ES_Reactor_Task();
-  // Destruction.
-
-  virtual int svc_hook(RtecScheduler::OS_Priority);
-  // Assume ownership of the reactor_.
-
-  int open_reactor (RtecScheduler::Period &period);
-  // This is a hack for now.
-
-  virtual int svc_one();
-  // Calls reactor_.handle_events until done_ is set.
-
-  void shutdown_task();
-  // Sets done_ and notifies the reactor_.
-
-  Reactor &get_reactor();
-  // ReactorEx accessor.
-
-  virtual void threads_closed();
-  // Deletes this.
-
-private:
-  ACE_Timer_List timer_queue_;
-  // The timer storage mechanism used by reactor_.
-
-#if !defined (ACE_OLD_STYLE_REACTOR)
-  ACE_ES_Fast_Reactor fast_reactor_;
-  // The timer dispatch mechanism.
-#endif /* ! ACE_OLD_STYLE_REACTOR */
-
-  Reactor reactor_;
-  // "Public" handle to fast_reactor_.
-
-  sig_atomic_t done_;
-  // When set, end the event loop.
-};
-
-#endif /* ACE_ReactorTask_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp b/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp
deleted file mode 100644
index fdbf2202eb1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "Task_Manager.h"
-#include "ReactorTask.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Task_Manager::ACE_Task_Manager()
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      reactorTasks[x] = 0;
-    }
-}
-
-void ACE_Task_Manager::initialize()
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      // Convert ACE_Scheduler_Rate (it's really a period, not a rate!)
-      // to a form we can easily work with.
-      ACE_Time_Value period_tv;
-      ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[x]);
-
-      RtecScheduler::Period period = period_tv.sec () * 10000000 +
-                                     period_tv.usec () * 10;
-
-      reactorTasks[x] = new ReactorTask;
-
-      if (reactorTasks[x] == 0 ||
-          reactorTasks[x]->open_reactor (period) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ORB::initialize_reactors"));
-          return;
-        }
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h b/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h
deleted file mode 100644
index 9e097a957e8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-#if !defined(TASK_MANAGER_H)
-#define TASK_MANAGER_H
-
-#include "ace/ACE.h"
-#include "ace/Singleton.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "RT_Task.h"
-
-class ACE_ES_Reactor_Task;
-
-class TAO_ORBSVCS_Export ACE_Task_Manager 
-// = TITLE
-//   Singleton class for the pool of ACE_ReactorTask.
-//
-// = DESCRIPTION
-//   The EventChannel uses a pool of ACE_ReactorTask to handle the
-//   dispatching of Events. In real-time multi-threaded enviroments
-//   this maps to a different thread per priority.
-//   This class offers a centralized access point to those tasks and
-//   some related services.
-//
-{
-public:
-  typedef ACE_ES_Reactor_Task ReactorTask;
-
-  static ACE_Task_Manager* instance();
-  // Returns the singleton.
-
-  ReactorTask* GetReactorTask(RtecScheduler::OS_Priority priority);
-  // Obtain the ReactorTask for the given priority.
-  // The Task must have been created already.
-
-  ACE_RT_Thread_Manager* ThrMgr();
-  // Returns a global ThreadManager for the Task pool.
-
-private:
-  friend class ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>;
-  ACE_Task_Manager();
-
-  void initialize();
-
-private:
-  ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
-  ACE_RT_Thread_Manager thr_mgr;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TASK_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.i b/TAO/orbsvcs/orbsvcs/Event/Task_Manager.i
deleted file mode 100644
index 35abcc0268c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.i
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// $Id$
-//
-
-ACE_INLINE ACE_Task_Manager::ReactorTask*
-ACE_Task_Manager::GetReactorTask(RtecScheduler::OS_Priority priority)
-{
-  if (reactorTasks[priority] == 0)
-    {
-      initialize();
-      //ACE_ERROR_RETURN ((LM_ERROR,
-      //"%p no reactor task for priority %d.\n", 
-      //"ACE_Task_Manager::GetReactor",
-      //priority), 0);
-   }
-   
-  return reactorTasks[priority];
-}
-
-ACE_INLINE ACE_RT_Thread_Manager* ACE_Task_Manager::ThrMgr()
-{
-  return &thr_mgr;
-}
-
-ACE_INLINE ACE_Task_Manager* ACE_Task_Manager::instance()
-{
-  return ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>::instance();
-}
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
deleted file mode 100644
index af5900ffb46..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// = DESCRIPTION
-//    Keep constants required by both Event Service implementation and
-//    the Scheduling Service implementation.
-//
-
-#if !defined (ACE_ES_CONSTANTS_H)
-#define ACE_ES_CONSTANTS_H
-
-#include "ace/Message_Block.h"
-#include "ace/Synch.h"
-#include "orbsvcs/Time_Utilities.h"
-
-const int ACE_ES_MAX_SUBSCRIPTIONS = 32;
-// This is the number of events a consumer can subscribe to.
-
-//const int ACE_ES_MAX_SUPPLIERS = 100;
-// Max number of suppliers that a channel can handle.
-
-const int ACE_ES_MAX_CONSUMERS_PER_SUPPLIER = 100;
-// Max number of consumers that one supplier can have subscribed to
-// one type of event (including source-only).  This restriction is
-// very lightweight since subscription lists are dynamic.  This
-// constant is only used for ACE_ES_Simple_Set in Event_Channel.* for
-// disconnecting consumers.  Since these objects are allocated off the
-// stack, we can increase this number without requiring more heap
-// memory.
-
-// = Predefined event types.  All application defined types should be
-// relative to ACE_ES_EVENT_UNDEFINED.
-const long ACE_ES_EVENT_ANY = 0;
-const long ACE_ES_EVENT_SHUTDOWN = 1;
-const long ACE_ES_EVENT_ACT = 2;
-const long ACE_ES_EVENT_NOTIFICATION = 3;
-const long ACE_ES_EVENT_TIMEOUT = 4;
-const long ACE_ES_EVENT_INTERVAL_TIMEOUT = 5;
-const long ACE_ES_EVENT_DEADLINE_TIMEOUT = 6;
-const long ACE_ES_GLOBAL_DESIGNATOR = 7;
-const long ACE_ES_CONJUNCTION_DESIGNATOR = 8;
-const long ACE_ES_DISJUNCTION_DESIGNATOR = 9;
-const long ACE_ES_EVENT_UNDEFINED = 16;
-
-// The max number of priorities provided by the target platform.
-// TODO: This should be defined in ACE (somehow) and only mapped here
-// to some variables (and even that is doubtful).
-const long ACE_Scheduler_MAX_PRIORITIES = 5;
-
-const TimeBase::TimeT ACE_Scheduler_Rates[ACE_Scheduler_MAX_PRIORITIES] = {
-  {   250000, 0}, // 40 Hz
-  {   500000, 0}, // 20 Hz
-  {  1000000, 0}, // 10 Hz
-  {  2000000, 0}, // 5 Hz
-  { 10000000, 0}  // 1 Hz
-};
-
-// The minimum preemption priority.
-const long ACE_Scheduler_MIN_PREEMPTION_PRIORITY =
-      ACE_Scheduler_MAX_PRIORITIES - 1;
-// Max preemption priority.
-const long ACE_Scheduler_MAX_PREEMPTION_PRIORITY = 0;
-
-// This is the maximum sub priority.
-const u_long ACE_Scheduler_MAX_SUB_PRIORITY =
-      ACE_Message_Block::MB_USER - 1;
-
-// This is the minimum sub priority.
-const u_long ACE_Scheduler_MIN_SUB_PRIORITY =
-      ACE_Message_Block::MB_NORMAL;
-
-typedef ACE_SYNCH_MUTEX ACE_ES_MUTEX;
-typedef ACE_Guard<ACE_ES_MUTEX> ACE_ES_GUARD;
-
-typedef ACE_SYNCH_RW_MUTEX ACE_ES_RW_LOCK;
-typedef ACE_Write_Guard<ACE_ES_RW_LOCK> ACE_ES_WGUARD;
-typedef ACE_Read_Guard<ACE_ES_RW_LOCK> ACE_ES_RGUARD;
-
-// ************************************************************
-// Channel configuration parameters.
-
-// ACE_ES_DISPATCHING_MODULE determines what Dispatching Module is
-// used by the channel.  ACE_ES_Dispatching_Base is a null dispatcher
-// that can be used to build an EFD.
-#define ACE_ES_DISPATCHING_MODULE ACE_ES_Priority_Dispatching
-//#define ACE_ES_DISPATCHING_MODULE ACE_ES_Dispatching_Base
-
-// This is the number of threads spawned for *each* priority queue in
-// the channel's Dispatching Module.  This is used by the channel when
-// creating the dispatch module.
-const int THREADS_PER_DISPATCH_QUEUE = 1;
-
-// This is the chunk size of the cached allocator for
-// ACE_ES_Event_Container.
-const int ACE_ES_EVENT_CONTAINER_MEMORY_POOL = 1024;
-const int ACE_ES_EVENT_MEMORY_POOL = 1024;
-const int ACE_ES_DISPATCH_REQUEST_MEMORY_POOL = 1024;
-
-#endif /* ACE_ES_CONSTANTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
deleted file mode 100644
index 256f4d65b73..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// $Id$
-//
-#include "orbsvcs/Event_Utilities.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ConsumerQOS_Factory::ACE_ConsumerQOS_Factory (void) :
-  qos_ (),
-  designator_set_ (0)
-{
-}
-
-ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void)
-{
-}
-
-int
-ACE_ConsumerQOS_Factory::start_conjunction_group (void)
-{
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l].event_.type_ = ACE_ES_CONJUNCTION_DESIGNATOR;
-  // TODO: qos_.dependencies[l].event_.data_.lval (0);
-  designator_set_ = 1;
-  return 0;
-}
-
-int
-ACE_ConsumerQOS_Factory::start_disjunction_group (void)
-{
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l].event_.type_ = ACE_ES_DISJUNCTION_DESIGNATOR;
-  // TODO: qos_.dependencies[l].event_.data_.lval (0);
-  designator_set_ = 1;
-  return 0;
-}
-
-int
-ACE_ConsumerQOS_Factory::insert (const RtecEventChannelAdmin::Dependency &subscribe)
-{
-  RtecScheduler::RT_Info dummy;
-  // Make sure that a designator is first.
-  if (designator_set_ == 0)
-    {
-      int l = qos_.dependencies.length ();
-      qos_.dependencies.length (l + 1);
-      qos_.dependencies[l].event_.type_ = ACE_ES_GLOBAL_DESIGNATOR;
-      // TODO: IDL union qos_.dependencies[l].event_.data_.lval (0);
-      designator_set_ = 1;
-    }
-
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l] = subscribe;
-  // TODO: IDL union qos_.dependencies[l].event_.data_.lval (0);
-  return 0;
-}
-
-void event_debug (const char* p,
-		  const RtecEventComm::Event& event)
-{
-  int l = ACE_OS::strlen (p);
-  ACE_DEBUG ((LM_DEBUG,
-	      "%*.*s - event.source: %d\n"
-	      "%*.*s   event.type: %d\n"
-	      "%*.*s   event.time: %f\n",
-	      l, l, p, event.source_,
-	      l, l, p, event.type_,
-	      l, l, p, event.creation_time_));
-}
-
-void
-ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos)
-{
-  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
-
-  for (u_int i = 0; i < qos.dependencies.length (); ++i)
-    {
-      char buf[128];
-      ACE_OS::sprintf (buf, " dep[%d]", i);
-      event_debug (buf, qos.dependencies[i].event_);
-      ACE_DEBUG ((LM_DEBUG, "%s  rt_info: %d\n",
-		  buf, qos.dependencies[i].rt_info));
-    }
-  ACE_DEBUG ((LM_DEBUG, "}\n"));
-}
-
-// ************************************************************
-
-ACE_SupplierQOS_Factory::ACE_SupplierQOS_Factory (void) :
-  qos_ ()
-{
-}
-
-int
-ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid,
-				 RtecEventComm::EventType type,
-				 RtecScheduler::handle_t rt_info,
-				 u_int ncalls)
-{
-  int l = qos_.publications_.length ();
-  qos_.publications_.length (l + 1);
-  qos_.publications_[l].event_.source_ = sid;
-  qos_.publications_[l].event_.type_ = type;
-  // TODO: IDL union qos_.publications_[l].event_.data_.lval (0);
-  qos_.publications_[l].dependency_info_.rt_info = rt_info;
-  qos_.publications_[l].dependency_info_.number_of_calls = ncalls;
-  return 0;
-}
-
-void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& qos)
-{
-  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
-  for (u_int i = 0; i < qos.publications_.length (); ++i)
-    {
-      char buf[128];
-      ACE_OS::sprintf (buf, " publications[%d]", i);
-      event_debug (buf, qos.publications_[i].event_);
-      ACE_DEBUG ((LM_DEBUG,
-		  "%s   dependency_info.rt_info: %d\n"
-		  "%s   dependency_info.number_of_calls: %d\n",
-		  buf, qos.publications_[i].dependency_info_.rt_info,
-		  buf, qos.publications_[i].dependency_info_.number_of_calls));
-	}
-  ACE_DEBUG ((LM_DEBUG, "}\n"));
-
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
deleted file mode 100644
index 687513e6b21..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-// 
-// = FILENAME
-//    Event_Utilities
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-// ============================================================================
-
-#ifndef ACE_EVENT_UTILITIES_H
-#define ACE_EVENT_UTILITIES_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-class TAO_ORBSVCS_Export ACE_ConsumerQOS_Factory
-// = TITLE 
-//    Consumer QOS Factory
-//
-// = DESCRIPTION
-//
-//    This class allows easy (free from CORBA IDL constraints)
-//    construction of RtecEventChannelAdmin::ConsumerQOS structures.
-//
-// = CORRELATIONS
-//
-//    ACE_ConsumerQOS_Factory separates subscriptions into conjunction
-//    and disjunction groups.  A group can be thought of as a set of
-//    events inside parenthesis: (A+B+C), where A,B, and C are
-//    events.
-//
-//    The following code would be used to represent (A+B) | (B+C):
-//
-//    ACE_ConsumerQOS_Factor factory;
-//    factory.start_conjunction_group ();
-//    factory.insert (A);
-//    factory.insert (B);
-//    factory.start_conjunction_group ();
-//    factory.insert (B);
-//    factory.insert (C);
-//
-//    The following code would be used to represent (A|B) | (B|C):
-//
-//    ACE_ConsumerQOS_Factor factory;
-//    factory.start_disjunction_group ();
-//    factory.insert (A);
-//    factory.insert (B);
-//    factory.start_disjunction_group ();
-//    factory.insert (B);
-//    factory.insert (C);
-//
-//    First, this may not seem to be initially useful, as (A|B) |
-//    (B|C) seems the same as A|B|C.  However, this form does have a
-//    significant use when deadline timers are specified (described
-//    below). Note that groups end with the next call to
-//    start_XX_group.  Groups are always OR'd together.  That is,
-//    there is no way to directly build (A|B|C) + (D|E|F).  You can
-//    always expand the previous statement to the OR of multiple ANDs.
-//
-// = TIMEOUTS
-//
-//    There are two types of timeout types defined in
-//    Event_Service_Constants.h.
-//
-//    ACE_ES_EVENT_INTERVAL_TIMEOUT - the consumer wants to receive a
-//    timeout every N seconds. 
-//
-//    ACE_ES_EVENT_DEADLINE_TIMEOUT - the consumer wants the timeout
-//    if and only if some dependencies are not resolved first.
-//
-//    Using these timeouts with the correlations discussed above, we
-//    can construct four different timer semantics: Interval Timer,
-//    Deadline Timer, Interval Correlation, Deadline Correlation:
-//
-//    Interval Timer:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+I) | IntervalTimeout
-//
-//    	This registers to receive an interval timeout regardless of
-//    	other dependencies.  Event if events occur, the interval
-//    	timeout will still be sent.
-//
-//    Deadline Timer:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+I) | DeadlineTimeout
-//
-//    	This registers to receive the deadline timeout ONLY if no
-//    	other events occur.  If a single event is sent to the
-//    	consumer, the timer is cancelled and rescheduled.
-//
-//    Deadline Correlation:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+DeadlineTimeout)
-//
-//    	If G and H do not occur within DeadlineTimeout time, a
-//    	deadline timeout is sent.  It is cancelled and rescheduled if G
-//    	and H occur.
-//
-//    Interval Correlation:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+IntervalTimeout)
-//
-//    	G+H+IntervalTimeout are sent ONLY after all have occurred.  If
-//    	G+H occur, they are queued until IntervalTimeout occurs.  If
-//    	IntervalTimeout occurs, it is queued until G+H occur.
-{
-public:
-  ACE_ConsumerQOS_Factory (void);
-  // Default construction.
-
-  ~ACE_ConsumerQOS_Factory (void);
-  // Death and destruction.
-
-  int start_conjunction_group (void);
-  // This signifies that the consumer needs the AND of all following
-  // insert calls (up until the next start_XX_group call).  Returns 0
-  // on success, -1 on failure.
-
-  int start_disjunction_group (void);
-  // This signifies that the consumer needs the OR of all following
-  // insert calls (up until the next start_XX_group call).  Returns 0
-  // on success, -1 on failure.
-
-  // = Insert operations add to the current conjunction or disjunction
-  // group.  These return 0 on success, -1 on failure.  Before insert
-  // is called, a start_XX_group method should be called.  If a
-  // start_XX_group method is not called, start_conjunction_group is
-  // assumed.
-
-  int insert (const RtecEventChannelAdmin::Dependency &subscribe);
-  // Insert the <subscribe> structure describing the event and
-  // receiving method into the current group.
-
-  int insert (RtecEventComm::EventSourceID source,
-	      RtecEventComm::EventType type,
-	      RtecScheduler::handle_t rt_info);
-  // Insert source/type dependency.  <source> of the event (may be
-  // zero), <type> of the event.  <rt_info> describes the method that
-  // will handle the <source>/<type> events.
-
-  int insert_type (RtecEventComm::EventType type,
-		   RtecScheduler::handle_t rt_info);
-  // Insert type-only dependency.
-
-  int insert_source (RtecEventComm::EventSourceID source,
-		     RtecScheduler::handle_t rt_info);
-  // Insert source-only dependency.
-
-  int insert_time (RtecEventComm::EventType type,
-		   RtecEventComm::Time interval,
-		   RtecScheduler::handle_t rt_info);
-  // Register temporal dependency.  <type> designates interval or
-  // deadline timeout that will occur every <interval>.
-
-  int insert_act (RtecEventComm::EventData act);
-  // This will be inserted as type ACE_ES_EVENT_ACT.
-
-  // = Conversion operators.  The Event Channel takes ConsumerQOS
-  // objects.
-
-  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (void);
-  // Allows conversions to ConsumerQOS, which is expected by the
-  // PushSupplierProxy::connect_push_consumer interface.
-
-  operator const RtecEventChannelAdmin::ConsumerQOS &(void);
-  // Calls this->get_ConsumerQOS.
-
-  static void debug (const RtecEventChannelAdmin::ConsumerQOS& qos);
-
-private:
-  RtecEventChannelAdmin::ConsumerQOS qos_;
-  // The representation to be sent to the channel.
-
-  int designator_set_;
-  // Whether a start_XX_group has been called yet.  This is to make
-  // sure that a designator is placed in the subscription list first.
-};
-
-// ************************************************************
-
-class TAO_ORBSVCS_Export ACE_SupplierQOS_Factory
-{
-public:
-  ACE_SupplierQOS_Factory (void);
-  // Default construction.
-
-  int insert (RtecEventComm::EventSourceID sid,
-	      RtecEventComm::EventType type,
-	      RtecScheduler::handle_t rtinfo,
-	      u_int ncalls);
-  // Publish <sid> and <type> that is generate by a method described by
-  // <rtinfo>.  The method generates <type> <ncalls> number of times
-  // per "iteration."
-
-  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (void);
-  // Allows conversions to SupplierQOS, which is expected by the
-  // PushSupplierProxy::connect_push_supplier interface.
-
-  operator const RtecEventChannelAdmin::SupplierQOS &(void);
-  // Calls this->get_SupplierQOS.
-
-  static void debug (const RtecEventChannelAdmin::SupplierQOS& qos);
-
-private:
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Representation needed by channel.
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_EVENT_UTILITIES_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
deleted file mode 100644
index b63b82e5404..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- C++ -*- */
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source,
-				 RtecEventComm::EventType type,
-				 RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = source;
-  dependency.event_.type_ = type;
-  //dependency.event_.creation_time_ = 0;
-  //dependency.event_.ec_recv_time_ = 0;
-  //dependency.event_.ec_send_time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_type (RtecEventComm::EventType type,
-				      RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = type;
-  //dependency.event_.creation_time_ = 0;
-  //dependency.event_.ec_recv_time_ = 0;
-  //dependency.event_.ec_send_time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_source (RtecEventComm::EventSourceID source,
-					RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = source;
-  dependency.event_.type_ = ACE_ES_EVENT_ANY;
-  //dependency.event_.creation_time_ = 0;
-  //dependency.event_.ec_recv_time_ = 0;
-  //dependency.event_.ec_send_time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_time (RtecEventComm::EventType type,
-				      RtecEventComm::Time interval,
-				      RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = type;
-  dependency.event_.creation_time_ = interval;
-  //dependency.event_.ec_recv_time_ = 0;
-  //dependency.event_.ec_send_time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = ACE_ES_EVENT_ACT;
-  //dependency.event_.creation_time_ = 0;
-  //dependency.event_.ec_recv_time_ = 0;
-  //dependency.event_.ec_send_time_ = 0;
-  dependency.event_.data_ = act;
-  return this->insert (dependency);
-}
-
-ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& 
-ACE_ConsumerQOS_Factory::get_ConsumerQOS (void)
-{
-  return qos_;
-}
-
-ACE_INLINE
-ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (void)
-{
-  return qos_;
-}
-
-// ************************************************************
-
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& 
-ACE_SupplierQOS_Factory::get_SupplierQOS (void)
-{
-  return qos_;
-}
-
-ACE_INLINE
-ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (void)
-{
-  return qos_;
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
deleted file mode 100644
index e1f8dcdbee6..00000000000
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// $Id$
-
-#include "IOR_Multicast.h"
-
-ACE_HANDLE
-TAO_IOR_Multicast::get_handle (void) const
-{
-  return this->mcast_dgram_.get_handle ();
-}
-
-TAO_IOR_Multicast::TAO_IOR_Multicast (char * ior,
-                              u_short port,
-                              const char *mcast_addr,
-                              TAO_Service_ID service_id)
-  : service_id_ (service_id),
-    mcast_addr_ (port, mcast_addr),
-    ior_ (ior),
-    response_addr_ ((u_short) 0),
-    response_ (response_addr_)
-{
-  // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
-  if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "subscribe"));
-}
-
-// destructor
-
-TAO_IOR_Multicast::~TAO_IOR_Multicast (void)
-{
-  this->mcast_dgram_.unsubscribe ();
-}
-
-int
-TAO_IOR_Multicast::handle_timeout (const ACE_Time_Value &,
-                               const void *)
-{
-  return 0;
-}
-
-int
-TAO_IOR_Multicast::handle_input (ACE_HANDLE)
-{
-  struct
-  {
-    u_short reply_port;
-    CORBA::Short service_id;
-  } mcast_info;
-
-  ssize_t retcode =
-    this->mcast_dgram_.recv (&mcast_info,
-                             sizeof (mcast_info),
-                             this->remote_addr_);
-
-  if (retcode == -1)
-    return -1;
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Received multicast.\n"));
-
-  // @@ validate data string received is from a valid client here
-  // @@ Probably not needed
-
-  if (retcode != sizeof (mcast_info))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Reply to multicast not sent. Received %d bytes, expected %d.",
-                       retcode,
-                       sizeof (mcast_info)),
-                      -1);
-
-  // Confirm that we were meant to respond to this request.
-  mcast_info.service_id = ntohs (mcast_info.service_id);
-  if (mcast_info.service_id == this->service_id_)
-    {
-      // Convert port number received to network byte order and set port
-      // number to reply;
-      mcast_info.reply_port = ntohs (mcast_info.reply_port);
-      this->remote_addr_.set_port_number (mcast_info.reply_port);
-
-      // send the object reference for the naming service
-      retcode = response_.send (this->ior_,
-                                ACE_OS::strlen (this->ior_) + 1,
-                                this->remote_addr_,
-                                0);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) ior_: <%s>\n"
-                  " sent through port %u.\n"
-                  "retcode=%d\n",
-                  this->ior_,
-                  this->remote_addr_.get_port_number (),
-                  retcode));
-
-      if (retcode == -1)
-        return -1;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Multicast was not for us."));
-    }
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
deleted file mode 100644
index 5107eaa2771..00000000000
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Naming_Service
-//
-// = FILENAME
-//    svr.h
-//
-// = DESCRIPTION 
-//    Defines a class that listens to a multicast address for client requests 
-//    for ior of a bootstrappable service.
-//    
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (TAO_IOR_MULTICAST_H)
-#define TAO_IOR_MULTICAST_H
-
-#include "tao/corba.h"
-#include "orbsvcs/orbsvcs_export.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/Reactor.h"
-
-class TAO_ORBSVCS_Export TAO_IOR_Multicast : public ACE_Event_Handler
-{
-  // @@ Naga, can you please add the standard comments to this class and
-  // make sure that all the comments for each method go underneath the
-  // method name?
-public:
-   // constructor
-  TAO_IOR_Multicast (char * ior,
-		 u_short port,
-		 const char *mcast_addr,
-		 TAO_Service_ID service_id);
-
-  // destructor
-  ~TAO_IOR_Multicast (void);
-
-  // call back when input is received on the handle.
-  virtual int handle_input (ACE_HANDLE fd);
-  
-  // callback when a timeout has occurred.
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
-
-  // returns the internal handle used to receive multicast
-  virtual ACE_HANDLE get_handle (void) const;
-
-private:
-  char buf_[BUFSIZ];
-  // temporary buffer
-
-  TAO_Service_ID service_id_;
-  // Service id that we're waiting for. 
-  
-  ACE_SOCK_Dgram_Mcast mcast_dgram_;
-  // multicast endpoint of communication
-
-  ACE_INET_Addr remote_addr_;
-  // remote address that sent multicast
-
-  ACE_INET_Addr mcast_addr_;
-  // multicast address
-
-  char * ior_;
-  // object reference to send in response to the multicast
-
-  ACE_INET_Addr response_addr_;
-  // address of response.
-
-  ACE_SOCK_Dgram response_;
-  // socket for response to the multicast
-};
-
-#endif /* NAMING_SERVICE_H */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Logger.idl b/TAO/orbsvcs/orbsvcs/Logger.idl
deleted file mode 100644
index 658859115e7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Logger.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Simplified logger and Logger factory interfaces for 
-// testing of the Name Service implementation.
-
-
-interface Logger;
-
-interface Logger_Factory
-{
-  Logger make_logger (in string name);
-};
-
-
-
-
-interface Logger
-{
-  // Transmit a Log_Record to the logging server.
-  oneway void log (in string message);
-};
-
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
deleted file mode 100644
index 73f1399a88d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ /dev/null
@@ -1,601 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile
-LIBNAME  = liborbsvcs
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h
-
-IDL_FILES = \
-	CosNamingC \
-	CosNamingS \
-	CosTimeBaseC \
-	CosTimeBaseS \
-	RtecEventCommC \
-	RtecEventCommS \
-	RtecSchedulerC \
-	RtecSchedulerS \
-	RtecEventChannelAdminC \
-	RtecEventChannelAdminS \
-	LoggerC \
-	LoggerS
-
-# Compile using av=1 to compile the AVStreams stuff.
-ifdef av
-## Add the IDL-compiler generated files
-IDL_FILES += \
-	CosPropertyServiceS \
-	CosPropertyServiceC \
-	\
-	AVStreamsS \
-	AVStreamsC \
-	sfpS \
-	sfpC
-endif
-
-# Lifecycle Service stuff
-ifdef lifecycle
-IDL_FILES += \
-	CosLifeCycleS \
-	CosLifeCycleC
-endif # lifecycle
-
-ifdef trader
-
-IDL_FILES += \
-	CosTradingC \
-	CosTradingS \
-	SequencesC
-
-include $(STL_ROOT)/config/local.cfg
-
-CC_INCLUDES += -I$(STD)
-CC_INCLUDES += -pta
-
-CPPFLAGS += \
-	-I$(TOOLKIT) \
-	$(CC_INCLUDES) \
-	$(CC_FLAGS) \
-	$(CC_DEFINES) \
-	$(CC_EH) \
-	$(CC_MT)
-
-ifndef exceptions
-CPPFLAGS += -DOS_NO_EXCEPTION_SPECIFIER
-else
-CPPFLAGS += -DOS_STL_ASSERT
-endif #exceptions
-
-endif #trader
-
-FILES= $(IDL_FILES) \
-	Event_Utilities \
-	Scheduler_Factory \
-	Runtime_Scheduler \
-	Scheduler_Utilities \
-	Time_Utilities \
-	IOR_Multicast \
-	\
-	Naming/CosNaming_i \
-	Naming/Entries \
-	Naming/Naming_Utils \
-	\
-	Event/BCU \
-	Event/CORBA_Utils_T \
-	Event/Dispatching_Modules \
-	Event/Event_Channel \
-	Event/Local_ESTypes \
-	Event/Memory_Pools \
-	Event/RT_Task \
-	Event/ReactorTask \
-	Event/Task_Manager \
-	\
-	Sched/Config_Scheduler \
-	Sched/DynSched \
-	Sched/SchedEntry \
-	Sched/Scheduler \
-	Sched/Scheduler_Generic \
-	Sched/Strategy_Scheduler \
-	\
-	tmplinst-orbsvcs
-
-VPATH=.:Naming:Event:Sched:AV:Property:Trader
-
-# Compile using av=1 to compile the AVStreams stuff.
-ifdef av
-## Add the implementation files
-FILES += \
-	AV/AVStreams_i \
-	AV/sfp \
-	Property/CosPropertyService_i \
-	Property/CosProperty_Hash
-endif
-
-ifdef trader
-FILES += \
-        Trader/Admin \
-        Trader/Attributes \
-        Trader/Constraint \
-        Trader/Constraint_y \
-        Trader/Constraint_l \
-        Trader/Constraint_Evaluator \
-        Trader/Constraint_Interpreter \
-        Trader/Constraint_Nodes \
-        Trader/Constraint_Validator \
-        Trader/Dynamic_Property \
-        Trader/Interpreter \
-        Trader/Link \
-        Trader/Lookup \
-        Trader/Offer_Filter \
-        Trader/Offer_Id_Iterator \
-        Trader/Offer_Iterator \
-	Trader/Offer_Iterator_Collection \
-        Trader/Offer_Modifier \
-        Trader/Policies \
-        Trader/Policy_Manager \
-        Trader/Preference_Interpreter \
-        Trader/Property_Evaluator \
-        Trader/Property_Filter \
-        Trader/Proxy \
-        Trader/Query_Only_Offer_Iterator \
-        Trader/Register \
-        Trader/Register_Offer_Iterator \
-        Trader/Service_Type_Map \
-        Trader/Service_Type_Repository \
-        Trader/Trader \
-        Trader/Trader_T
-endif
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-LIBS 	+= -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
-
-.PRECIOUS: CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h
-.PRECIOUS: CosTradingC.cpp CosTradingS.cpp CosTradingC.h CosTradingS.h
-.PRECIOUS: RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h
-.PRECIOUS: RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h
-.PRECIOUS: RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h
-.PRECIOUS: LoggerC.cpp LoggerS.cpp LoggerC.h LoggerS.h
-
-.PRECIOUS: CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h
-.PRECIOUS: AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h
-
-idl_stubs: $(addsuffix .h, $(IDL_FILES))
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-ifdef trader
-
-LIBS 	+= -ll -ly
-
-Trader/Constraint_y.cpp: Trader/constraint.y
-	$(YACC) -d $<
-	mv y.tab.c $@
-	mv y.tab.h Trader/Constraint_Tokens.h
-
-Trader/Constraint_l.cpp: Trader/constraint.l
-	$(LEX)   $<
-	mv lex.yy.c $@
-endif
-
-#ifdef av
-#CosProperty : CosProperty_Hash.o
-#	CC -g -o $@ $(LDFLAGS) $(CPPFLAGS) CosProperty_Hash.o
-#endif
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
-.obj/BCU.o .obj/BCU.so .shobj/BCU.o .shobj/BCU.so: Event/BCU.cpp $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i Event/BCU.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h
-.obj/CORBA_Utils_T.o .obj/CORBA_Utils_T.so .shobj/CORBA_Utils_T.o .shobj/CORBA_Utils_T.so: Event/CORBA_Utils_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Event/CORBA_Utils_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- Event/CORBA_Utils_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
deleted file mode 100644
index d4528254ed4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
+++ /dev/null
@@ -1,751 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   CosNaming_i.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> &
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "CosNaming_i.h"
-
-NS_NamingContext::NS_NamingContext (void)
-{
-  // Deal with faults.
-  if (context_.open () == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "NS_NamingContext"));
-
-  // Get the lock from the orb that knows what type is appropriate.
-  // @@ Nanbor, there still is an error if I use this function to get the lock.
-  //  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ();
-  
-  // if orb core returned a null lock, allocate a thread mutex by default
-  //  if (this->lock_ == 0)
-    ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_Thread_Mutex> ());
-}
-
-NS_NamingContext::~NS_NamingContext (void)
-{
-  delete this->lock_;
-}
-
-CosNaming::NamingContext_ptr
-NS_NamingContext::get_context (const CosNaming::Name &name)
-{
-  // Create compound name to be resolved (<name> - last component).
-  CORBA::Environment _env;
-  CORBA::ULong len = name.length ();
-  CosNaming::Name comp_name (name);
-  comp_name.length (len - 1);
-
-  // resolve
-  CORBA::Object_ptr cont_ref = resolve (comp_name, _env);
-
-  // Deal with exceptions in resolve: basically, add the last component
-  // of the name to <rest_of_name> and rethrow.
-  if (_env.exception () != 0)
-    {
-      _env.print_exception ("NS_NamingContext::get_context");
-      return 0;
-    }
-
-  // Reference to a context from <resolve> cannot be nil because
-  // cannot <bind> to a nil object.
-
-  // Try narrowing object reference to a context type.
-  CosNaming::NamingContext_ptr c;
-  c = CosNaming::NamingContext::_narrow (cont_ref, _env);
-  if (_env.exception () != 0)
-    {
-      _env.print_exception ("NS_NamingContext::get_context - _narrow");
-      return 0;
-    }
-
-  CosNaming::Name rest;
-  rest.length (2);
-  rest[0] = name[len - 2];
-  rest[1] = name[len - 1];
-
-  if (CORBA::is_nil (c))
-    {
-      CosNaming::Name rest;
-      rest.length (2);
-      rest[0] = name[len - 2];
-      rest[1] = name[len - 1];
-    }
-  return c;
-}
-
-void
-NS_NamingContext::bind (const CosNaming::Name& n,
-                        CORBA::Object_ptr obj,
-                        CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  int result = 0;
-  _env.clear ();
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return;
-    }
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind (simple_name, obj, _env);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
- else
-    {
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      result = context_.bind (name, entry);
-      if (result == 1)
-        {
-          _env.clear ();
-          _env.exception (new CosNaming::NamingContext::AlreadyBound);
-          return;
-        }
-      // Something went wrong with the internal structure
-      else if (result == -1)
-        {
-          _env.clear ();
-          _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-          return;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "bound: <%s,%s>\n",
-                  n[0].id.in ()==0? "nil" : n[0].id.in (),
-                  n[0].kind.in ()==0? "nil" : n[0].kind.in ()));
-    }
-}
-
-void
-NS_NamingContext::rebind (const CosNaming::Name& n,
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  int result = 0;
-  _env.clear ();
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return;
-    }
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind (simple_name, obj, _env);
-    }
-
-  else
-    {
-      // If we received a simple name, we need to rebind it in this
-      // context.
-
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-
-      // Try rebinding the name.
-      result = context_.rebind (name, entry, oldname, oldentry);
-
-      // Something went wrong with the internal structure
-      if (result == -1)
-        {
-          _env.clear ();
-          _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-          return;
-        }
-    }
-}
-
-void
-NS_NamingContext::bind_context (const CosNaming::Name &n,
-                                CosNaming::NamingContext_ptr nc,
-                                CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  int result = 0;
-  _env.clear ();
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return;
-    }
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind_context (simple_name, nc, _env);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
-  else
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      result = context_.bind (name, entry);
-      if ( result == 1)
-        {
-          _env.clear ();
-          _env.exception (new CosNaming::NamingContext::AlreadyBound);
-          return;
-        }
-      // Something went wrong with the internal structure
-      else if (result == -1)
-        {
-          _env.clear ();
-          _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-          return;
-        }
-    }
-}
-
-void
-NS_NamingContext::rebind_context (const CosNaming::Name &n,
-                                  CosNaming::NamingContext_ptr nc,
-                                  CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  _env.clear ();
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return;
-    }
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind_context (simple_name, nc, _env);
-    }
-
-  // if we received a simple name, we need to rebind it in this context.
-  else
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-
-      // try rebinding the name.
-      if (context_.rebind (name, entry, oldname, oldentry) < 0);
-        // deal with consequences
-    }
-}
-
-CORBA::Object_ptr
-NS_NamingContext::resolve (const CosNaming::Name& n,
-                           CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, CORBA::Object::_nil ());
-
-  // clear the environment.
-  _env.clear ();
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return CORBA::Object::_nil ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Trying to resolve <%s,%s>\n",
-              n[0].id.in (),
-              n[0].kind.in ()));
-
-  // Resolve the first component of the name.
-  NS_ExtId name (n[0].id, n[0].kind);
-  NS_IntId entry;
-  if (context_.find (name, entry) == -1)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
-      return CORBA::Object::_nil ();
-    }
-
-  CORBA::Object_ptr item = entry.ref_;
-
-  // if the name we have to resolve is a compound name
-  // we need to recursively resolve it.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont;
-      if (entry.type_ == CosNaming::ncontext)
-        {
-          cont = CosNaming::NamingContext::_narrow (item, _env);
-          if (_env.exception () != 0)
-            {
-              _env.print_exception ("NS_NamingContext::resolve");
-              return CORBA::Object::_nil ();
-            }
-        }
-      else
-        {
-          _env.clear ();
-          _env.exception (new CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context, n));
-          return CORBA::Object::_nil ();
-        }
-
-      CosNaming::Name rest_of_name (len - 1);
-      rest_of_name.length (len - 1);
-      for (CORBA::ULong i = 1; i < len; i++)
-        rest_of_name[i-1] = n[i];
-
-      return (cont->resolve (rest_of_name, _env));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Resolved <%s,%s> to %08.8x\n",
-              n[0].id.in (),
-              n[0].kind.in (),
-              item));
-
-  // If the name we had to resolve was simple, we just need to return
-  // the result.
-  return CORBA::Object::_duplicate (item);
-}
-
-void
-NS_NamingContext::unbind (const CosNaming::Name& n,
-                          CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  _env.clear ();
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::InvalidName);
-      return;
-    }
-
-  // If we received compound name, resolve it to get the context in
-  // which the unbinding should take place, then perform the unbinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->unbind (simple_name, _env);
-    }
-  else
-    {
-      // If we received a simple name, we need to unbind it in this
-      // context.
-
-      NS_ExtId name (n[0].id, n[0].kind);
-      // try unbinding the name.
-      if (context_.unbind (name) == -1)
-        {
-          _env.clear ();
-          _env.exception (new CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
-          return;
-        }
-    }
-}
-
-CosNaming::NamingContext_ptr
-NS_NamingContext::new_context (CORBA::Environment &_env)
-{
-  NS_NamingContext * c = 0;
-
-  // if allocation fails, the environment must be set to indicate error.
-  _env.clear ();
-  _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_NEW_RETURN (c, NS_NamingContext, CosNaming::NamingContext::_nil ());
-
-  // clear the environment.
-  _env.clear ();
-
-  // (1) do we have to duplicate () the object reference????
-  // (2) Also, how about memory leaks?
-  return c->_this (_env);
-}
-
-CosNaming::NamingContext_ptr
-NS_NamingContext::bind_new_context (const CosNaming::Name& n,
-                                    CORBA::Environment &_env)
-{
-  NS_NamingContext * c = 0;
-
-  // if allocation fails, the environment must be set to indicate error.
-  _env.clear ();
-  _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_NEW_RETURN (c, NS_NamingContext, CosNaming::NamingContext::_nil ());
-
-  // clear the environment.
-  _env.clear ();
-
-  bind_context (n, c->_this (_env), _env);
-
-  // Release object if exception occurs.
-  if (_env.exception () != 0)
-    {
-      delete c;
-      return CosNaming::NamingContext::_nil ();
-    }
-
-  return c->_this (_env);
-}
-
-void
-NS_NamingContext::destroy (CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  _env.clear ();
-
-  if (context_.current_size () != 0)
-    {
-      _env.clear ();
-      _env.exception (new CosNaming::NamingContext::NotEmpty);
-      return;
-    }
-}
-
-void
-NS_NamingContext::list (CORBA::ULong how_many,
-                        CosNaming::BindingList_out bl,
-                        CosNaming::BindingIterator_out bi,
-                        CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD(ACE_Lock, ace_mon, *this->lock_);
-
-  _env.clear ();
-
-  // Dynamically allocate hash map iterator.
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter =
-    new NS_NamingContext::HASH_MAP::ITERATOR (context_);
-
-  // Number of bindings that will go into the BindingList.
-  CORBA::ULong n;
-
-  // Number of bindings in the context is > <how_many> so need to
-  // return a BindingIterator.
-  if (context_.current_size () > how_many)
-     {
-       NS_BindingIterator *bind_iter;
-
-       // if allocation fails, the environment must be set to indicate error.
-       _env.clear ();
-       _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-       ACE_NEW (bind_iter, NS_BindingIterator (hash_iter, this->lock_));
-
-       // clear the environment.
-       _env.clear ();
-
-       bi = bind_iter->_this (_env);
-
-       CosNaming::BindingIterator::_duplicate (bi);
-
-       n = how_many;
-    }
-  else
-    {
-      // Number of bindings in the context is <= <how_many>,
-      // so do not need to return a BindingIterator.
-      bi = CosNaming::BindingIterator::_nil ();
-      n = context_.current_size ();
-    }
-
-  // Use hash iterator to populate a BindingList with bindings.
-  CosNaming::BindingList bindings;
-  bindings.length (n);
-  NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-
-  for (CORBA::ULong i = 0; i < n; i++)
-    {
-      hash_iter->next (hash_entry);
-      hash_iter->advance ();
-
-      bindings[i].binding_type = hash_entry->int_id_.type_;
-
-      bindings[i].binding_name.length (1);
-      bindings[i].binding_name[0].id =
-        CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      bindings[i].binding_name[0].kind =
-        CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-    }
-
-  // check for memory failure.
-  // if allocation fails, the environment must be set to indicate error.
-  _env.clear ();
-  _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_NEW (bl, CosNaming::BindingList (bindings));
-
-  // clear the environment.
-  _env.clear ();
-
-  // If did not allocate BindingIterator, deallocate hash map
-  // iterator.
-  if (context_.current_size () <= how_many)
-    delete hash_iter;
-}
-
-NS_BindingIterator::NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter,
-                                        ACE_Lock * lock)
-  : hash_iter_ (hash_iter),
-    lock_ (lock)
-{
-}
-
-NS_BindingIterator::~NS_BindingIterator (void)
-{
-  delete hash_iter_;
-}
-
-CORBA::Boolean
-NS_BindingIterator::next_one (CosNaming::Binding_out b,
-                              CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-
-  _env.clear ();
-
-  if (hash_iter_->done ())
-    {
-      // We are allocating a binding here because it's an out parameter
-      // and the server will try to free the memory
-
-      // check for memory failure.
-      // if allocation fails, the environment must be set to indicate error.
-      _env.clear ();
-      _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      ACE_NEW_RETURN (b, CosNaming::Binding, 0);
-
-      // clear the environment.
-      _env.clear ();
-
-      return 0;
-    }
-  else
-    {
-      // check for memory failure.
-      // if allocation fails, the environment must be set to indicate error.
-      _env.clear ();
-      _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      ACE_NEW_RETURN (b, CosNaming::Binding, 0);
-
-      // clear the environment.
-      _env.clear ();
-
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      hash_iter_->next (hash_entry);
-      hash_iter_->advance ();
-
-      b->binding_type = hash_entry->int_id_.type_;
-
-      b->binding_name.length (1);
-      b->binding_name[0].id =
-        CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      b->binding_name[0].kind =
-        CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-
-      return 1;
-    }
-}
-
-CORBA::Boolean
-NS_BindingIterator::next_n (CORBA::ULong how_many,
-                            CosNaming::BindingList_out bl,
-                            CORBA::Environment &_env)
-{
-  // if Guard fails to get the lock, the environment must be set.
-  _env.clear ();
-  _env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-
-  _env.clear ();
-
-  if (hash_iter_->done ())
-    {
-      // check for memory failure.
-      // if allocation fails, the environment must be set to indicate error.
-      _env.clear ();
-      _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      ACE_NEW_RETURN (bl, CosNaming::BindingList, 0);
-
-      // clear the environment.
-      _env.clear ();
-
-      return 0;
-    }
-  else
-    {
-      // Statically allocate a BindingList.
-      CosNaming::BindingList bindings;
-
-      // Initially assume that iterator has the requested number of
-      // bindings.
-      bindings.length (how_many);
-
-      // Iterate and populate the BindingList.
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      for (CORBA::ULong i = 0; i < how_many; i++)
-        {
-          hash_iter_->next (hash_entry);
-
-          bindings[i].binding_type = hash_entry->int_id_.type_;
-
-          bindings[i].binding_name.length (1);
-          bindings[i].binding_name[0].id =
-            CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-          bindings[i].binding_name[0].kind =
-            CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-
-          if (hash_iter_->advance () == 0)
-            {
-              // If no more bindings left, reset length to the actual
-              // number of bindings populated and get out of the loop.
-              bindings.length (i + 1);
-              break;
-            }
-        }
-
-      // if mem allocation fails, the environment must be set to throw
-      //   an exception.
-      _env.clear ();
-      _env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-
-      // Check for failed memory allocation.
-      ACE_NEW_RETURN (bl, CosNaming::BindingList (bindings), 0);
-
-      // if allocation went well, clear the exception.
-      _env.clear ();
-
-      return 1;
-    }
-}
-
-void
-NS_BindingIterator::destroy (CORBA::Environment &_env)
-{
-  // @@ Not sure if this is the correct way to do this.
-  CORBA::release (this->_this (_env));
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-template class  ACE_Hash_Map_Entry<NS_ExtId, NS_IntId>;
-template class  ACE_Hash_Map_Iterator_Base<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-template class  ACE_Hash_Map_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-template class  ACE_Hash_Map_Reverse_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<NS_ExtId, NS_IntId>
-#pragma instantiate ACE_Hash_Map_Iterator_Base<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
deleted file mode 100644
index 09296a91e69..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CosNaming_i.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> &
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (COSNAMING_I_H)
-#define	COSNAMING_I_H
-
-#include "orbsvcs/CosNamingS.h"
-#include "Entries.h"
-  
-class TAO_ORBSVCS_Export NS_NamingContext : public POA_CosNaming::NamingContext
-  // = TITLE
-  //     This class implements the NamingContext interface that is part of the 
-  //     CosNaming idl module.  
-  //
-  // = DESCRIPTION
-  //     Extensive comments can be found in the idl file. 
-{
- public:
-  typedef ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex> 
-          HASH_MAP;
-         
-  NS_NamingContext (void);
-  // default constructor.
-
-  ~NS_NamingContext (void);
-  // destructor.
-
-
-  virtual void bind (const CosNaming::Name &n, 
-		     CORBA::Object_ptr obj, 
-		     CORBA::Environment &IT_env);
-
-  // create a binding for name <n> and object <obj> in the naming
-  // context.  Compound names are treated as follows: ctx->bind
-  // (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-  // cn-1>))->bind (<cn>, obj) if the there already exists a
-  // binding for the specified name, <AlreadyBound> exception is
-  // thrown.  Naming contexts should be bound using <bind_context>
-  // and <rebind_context> in order to participate in name
-  // resolution later.
-                
-  virtual void rebind (const CosNaming::Name &n, 
-		       CORBA::Object_ptr obj, 
-		       CORBA::Environment &IT_env);
-  // this is similar to <bind> operation above, except for when
-  // the binding for the specified name already exists in the
-  // specified context.  In that case, the existing binding is
-  // replaced with the new one.
-                
-  virtual void bind_context (const CosNaming::Name &n, 
-			     CosNaming::NamingContext_ptr nc, 
-			     CORBA::Environment &IT_env);
-  // This is the version of <bind> specifically for binding naming
-  // contexts, so that they will participate in name resolution
-  // when compound names are passed to be resolved.
-              
-  virtual void rebind_context (const CosNaming::Name &n, 
-			       CosNaming::NamingContext_ptr nc, 
-			       CORBA::Environment &IT_env);
-  // This is a version of <rebind> specifically for naming
-  // contexts, so that they can participate in name resolution
-  // when compound names are passed.
-              
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, 
-				     CORBA::Environment &IT_env);
-  // Return object reference that is bound to the name.  Compound
-  // name resolve is defined as follows: ctx->resolve (<c1; c2;
-  // cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-  // naming service does not return the type of the object.
-  // Clients are responsible for "narrowing" the object to the
-  // appropriate type.
-              
-  virtual void unbind (const CosNaming::Name &n, 
-		       CORBA::Environment &IT_env);
-  // Remove the name binding from the context.  When compound
-  // names are used, unbind is defined as follows: ctx->unbind
-  // (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-  // (<cn>)
-              
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &IT_env);
-  // This operation returns a new naming context implemented by
-  // the same naming server in which the operation was invoked.
-  // The context is not bound.
-              
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, 
-							 CORBA::Environment &IT_env);
-  // This operation creates a new context and binds it to the name
-  // supplied as an argument.  The newly-created context is
-  // implemented by the same server as the context in which it was
-  // bound (the name argument excluding the last component).
-  
-  virtual void destroy (CORBA::Environment &IT_env);
-  // Delete the naming context.  NOTE: the user should <unbind>
-  // any bindings in which the given context is bound to some
-  // names before invoking <destroy> operation on it.  Ignoring
-  // this rule may cause unexpected behaviour.  <destroy> deletes
-  // the context object if it is not bound to any names in the
-  // given address space.  <destroys> decrements the reference
-  // count of the context if bindings to it exist.
-  
-  virtual void list (CORBA::ULong how_many, 
-		     CosNaming::BindingList_out bl, 
-		     CosNaming::BindingIterator_out bi, 
-		     CORBA::Environment &IT_env);
-  // Returns at most the requested number of bindings <how_many>
-  // in <bl>.  If the naming context contains additional bindings,
-  // they are returned with a BindingIterator.  In the naming
-  // context does not contain any additional bindings <bi>
-  // returned as null.
-
-protected:
-  // = These are the helper methods used by other methods.
-  
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name);
-  // This is used by methods that need to resolve a compound name to
-  // get the reference to the target context before performing the
-  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
-  // (including the last component that doesn't need to be resolved)
-  // Returns a pointer to the target context.
-  
- private:    
-  
-  HASH_MAP context_;
-  // This implementation of NamingContext uses ACE thread-safe Hash
-  // Map for storage and manipulation of name-object bindings.
-  
-  ACE_Lock *lock_;
-  // Lock to serialize access to the underlying data structure.  
-  // This is a lock adapter that hides the type of lock, which may be
-  // a null lock, if the ORB decides it is not needed.
-
-};
-
-class TAO_ORBSVCS_Export NS_BindingIterator : public POA_CosNaming::BindingIterator
-  // = TITLE
-  //     This class implements the BindingIterator interface 
-  //     that is part of the CosNaming idl module.
-  //
-  // = DESCRIPTION
-  //     NS_BindingIterator constructor expects a pointer to a
-  //     DYNAMICALLY allocated hash map iterator. Destructor
-  //     deallocates hash map iterator.
-{
- public:
-  // = Intialization and termination methods.
-  NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter, ACE_Lock * lock);
-  // constructor.
-
-  ~NS_BindingIterator (void);
-  // destructor.
-
-  CORBA::Boolean next_one (CosNaming::Binding_out b, 
-			   CORBA::Environment &IT_env);
-  // This operation returns the next binding.  If there are no
-  // more bindings false is returned.
-
-  CORBA::Boolean next_n (CORBA::ULong how_many, 
-			 CosNaming::BindingList_out bl, 
-			 CORBA::Environment &IT_env);
-  // This operation returns at most the requested number of
-  // bindings.
-
-  void destroy (CORBA::Environment &IT_env);
-  // This operation destroys the iterator.
-   
- private:
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-
-  ACE_Lock *lock_;
-  // lock passed on from NS_NamingContext to serialize access 
-  //   to the internal data structure.
-}; 
-
-#endif /* COSNAMING_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
deleted file mode 100644
index 9781095a35d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    NS_CosNaming.C
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "Entries.h"
-
-NS_IntId::NS_IntId (void)
-  : type_ (CosNaming::nobject)
-{
-  ref_ = CORBA::Object::_nil ();
-}
-
-NS_IntId::NS_IntId (CORBA::Object_ptr obj,
-		    CosNaming::BindingType type)
-  : type_ (type)
-{
-  ref_ = CORBA::Object::_duplicate (obj);
-}
-
-NS_IntId::NS_IntId (const NS_IntId &rhs)
-{
-  type_ = rhs.type_;
-  ref_ = CORBA::Object::_duplicate (rhs.ref_);
-}
-
-NS_IntId::~NS_IntId (void)
-{
-  CORBA::release (ref_);
-}
-
-void
-NS_IntId::operator= (const NS_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  type_ = rhs.type_;
-
-  CORBA::release (ref_);
-  ref_ = CORBA::Object::_duplicate (rhs.ref_);
-}
-
-NS_ExtId::NS_ExtId (void)
-  : kind_ (),
-    id_ ()
-{
-}
-
-NS_ExtId::NS_ExtId (const char *id,
-		    const char *kind)
-  : kind_ (kind),
-    id_ (id)
-{
-}
-
-NS_ExtId::NS_ExtId (const NS_ExtId &rhs)
-{
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-NS_ExtId::~NS_ExtId (void)
-{
-}
-
-void
-NS_ExtId::operator= (const NS_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-int
-NS_ExtId::operator== (const NS_ExtId &rhs) const
-{
-  return id_ == rhs.id_ && kind_ == rhs.kind_;
-}
-
-int
-NS_ExtId::operator!= (const NS_ExtId &rhs) const
-{
-  return id_ != rhs.id_ || kind_ != rhs.kind_;
-}
-
-u_long
-NS_ExtId::hash (void) const
-{
-  ACE_CString temp (id_);
-  temp += kind_;
-
-  return temp.hash ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
deleted file mode 100644
index 7c899f5e952..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   NS_CosNaming.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (NS_COSNAMING_H)
-#define NS_COSNAMING_H
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
-
-class TAO_ORBSVCS_Export NS_IntId 
-  // = TITLE
-  //     Stores information a context keeps for each bound name
-  //     (object reference and the type of binding).
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_IntId (void);
-  // default constructor.
-
-  NS_IntId (CORBA::Object_ptr obj,
-	    CosNaming::BindingType type = CosNaming::nobject);
-  // constructor.
-  
-  NS_IntId (const NS_IntId & rhs);
-  // copy constructor
-
-  ~NS_IntId (void);
-  // destructor 
-
-  void operator= (const NS_IntId & rhs);
-  // Assignment operator (does copy memory).
-
-  CORBA::Object_ptr ref_;   
-  // CORBA object reference of the bound object.
-
-  CosNaming::BindingType type_;  
-  // Indicator of whether the object is a NamingContext that should
-  // participate in name resolution when compound names are used.
-};
-
-class TAO_ORBSVCS_Export NS_ExtId 
-  // = TITLE
-  //    Stores the name to which an object is bound.
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_ExtId (void);
-  // default constructor.
-
-  NS_ExtId (const char *id, 
-	    const char *kind);
-  // constructor.
-  
-  NS_ExtId (const NS_ExtId & rhs);
-  // copy constructor
-
-  ~NS_ExtId (void);
-  // destructor 
-
-  void operator= (const NS_ExtId & rhs);
-  // Assignment operator (does copy memory).
-
-  int operator== (const NS_ExtId &rhs) const;
-  // Equality comparison operator (must match both id_ and kind_).
-
-  int operator!= (const NS_ExtId &rhs) const;
-  // Inequality comparison operator.
-
-  u_long hash (void) const;
-  // This class has to have a hash for use with ACE_Hash_Map_Manager.
-
-  ACE_CString kind_;  
-  // any information user wants to store (not used by Naming Service).
-
-  ACE_CString id_;  
-  // any information user wants to store (not used by Naming Service).
-};
-
-
-#endif /* NS_COSNAMING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
deleted file mode 100644
index e2dd02d77ca..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service
-//
-// = FILENAME
-//    Naming_Utils.cpp
-//
-// = DESCRIPTION
-//      This class implements a Naming Server wrapper class that holds
-//      a Naming Context for TAO NameService.
-//
-// = AUTHOR
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "orbsvcs/CosNamingC.h"
-#include "tao/corba.h"
-#include "Naming_Utils.h"
-
-// Default constructor
-
-TAO_Naming_Server::TAO_Naming_Server (void)
-  :  naming_context_ptr_ (0),
-     ior_multicast_ (0)
-{
-}
-
-// Constructor which takes an ORB and POA.
-
-TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_var &orb,
-                                      PortableServer::POA_var &child_poa)
-{
-  this->init (orb, child_poa);
-}
-
-// Function to initialize the name server object under the passed orb
-// and poa
-
-int
-TAO_Naming_Server::init (CORBA::ORB_var &orb,
-                         PortableServer::POA_var &child_poa)
-{
-  TAO_TRY
-    {
-      // Get the naming context ptr to NameService.
-      naming_context_ptr_ =
-        naming_context_impl_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("NameService");
-
-      child_poa->activate_object_with_id (id.in (),
-                                          &naming_context_impl_,
-                                          TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-      CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in (),
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->naming_service_ior_=
-        orb->object_to_string (obj.in (),
-                               TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "listening as object <%s>\n",
-                  this->naming_service_ior_.in ()));
-
-#if defined (ACE_HAS_IP_MULTICAST)
-      // Get reactor instance from TAO.
-      ACE_Reactor *reactor =
-        TAO_ORB_Core_instance ()->reactor ();
-
-      // First, see if the user has given us a multicast port number
-      // for the name service on the command-line;
-      u_short port =
-        TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
-
-      if (port == 0)
-        {
-          const char *port_number =
-            ACE_OS::getenv ("NameServicePort");
-
-          if (port_number != 0)
-            port = ACE_OS::atoi (port_number);
-        }
-
-      if (port == 0)
-        port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-
-      char *naming_ior = ACE_OS::strdup (this->naming_service_ior_.in ());
-
-      // Instantiate a server which will receive requests for an ior
-      ACE_NEW_RETURN (this->ior_multicast_,
-                      TAO_IOR_Multicast (naming_ior,
-                                     port,
-                                     ACE_DEFAULT_MULTICAST_ADDR,
-                                     TAO_SERVICEID_NAMESERVICE),
-                      -1);
-
-      // Register event handler for the ior multicast.
-      if (reactor->register_handler (this->ior_multicast_,
-                                     ACE_Event_Handler::READ_MASK) == -1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "cannot register Event handler\n"));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "The multicast server setup is done.\n"));
-#endif /* ACE_HAS_IP_MULTICAST */
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Naming Service");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-// Returns the "NameService" NamingContext implementation object.
-
-NS_NamingContext &
-TAO_Naming_Server::GetNamingContext (void)
-{
-  return naming_context_impl_ ;
-}
-
-CORBA::String
-TAO_Naming_Server::naming_service_ior (void)
-{
-  return CORBA::string_dup (this->naming_service_ior_.in ());
-}
-
-// Returns a pointer to the NamingContext.
-
-CosNaming::NamingContext*
-TAO_Naming_Server::operator -> (void) const
-{
-  return this->naming_context_ptr_;
-}
-
-// Destructor.
-
-TAO_Naming_Server::~TAO_Naming_Server (void)
-{
-  if (this->ior_multicast_ != 0)
-    {
-      TAO_ORB_Core_instance ()->reactor ()->remove_handler (this->ior_multicast_,
-                                                            ACE_Event_Handler::READ_MASK);
-      delete this->ior_multicast_;
-    }
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
deleted file mode 100644
index 4f85922775b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service
-//
-// = FILENAME
-//    Naming_Utils.h
-//
-// = DESCRIPTION
-//      This class implements a Naming Server wrapper class which holds
-//      a Naming Context for TAO NameService.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (_NAMING_SERVER_H)
-#define _NAMING_SERVER_H
-
-#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/IOR_Multicast.h"
-#include "CosNaming_i.h"
-
-class TAO_ORBSVCS_Export TAO_Naming_Server
-{
-  // = TITLE
-  //    Defines a wrapper class which holds a Naming Context
-  //    implementation for TAO "NamingService" naming context.
-  //
-  // = DESCRIPTION
-  //    This class takes an orb and Poa reference and activates the
-  //    NamingService naming context object under that. It also
-  //    defines the operator -> so that NamingContext functions like
-  //    bind, unbind .. can be called on a NameServer object.
-public:
-  TAO_Naming_Server (void);
-  //Default constructor.
-
-  TAO_Naming_Server (CORBA::ORB_var &orb,
-                     PortableServer::POA_var &root_poa);
-  // Takes the POA under which to register the Naming Service
-  // implementation object.
-
-  int init (CORBA::ORB_var &orb,
-            PortableServer::POA_var &root_poa);
-  // Initialize the name server under the given ORB and POA.
-
-  NS_NamingContext &GetNamingContext (void);
-  // Returns the "NameService" NamingContext implementation object
-  // reference.
-
-  CORBA::String naming_service_ior (void);
-  // Returns the ior of the naming service.
-
-  CosNaming::NamingContext *operator -> (void) const;
-  // Returns a NamingContext_ptr.
-
-  ~TAO_Naming_Server (void);
-  // Destructor.
-
-private:
-  NS_NamingContext naming_context_impl_;
-  // Naming context implemetation for "NameService".
-
-  CosNaming::NamingContext_ptr naming_context_ptr_;
-  // NamingContext ptr.
-
-  TAO_IOR_Multicast *ior_multicast_;
-  // The ior_multicast event handler.
-
-  CORBA::String_var naming_service_ior_;
-  // The IOR string of the naming service.
-};
-
-#endif /* _NAMING_SERVER_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
deleted file mode 100644
index 9fcd031ffeb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ /dev/null
@@ -1,899 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   CosPropertyService_i.cpp
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "orbsvcs/Property/CosPropertyService_i.h"
-
-TAO_PropertySetFactory::TAO_PropertySetFactory (void)
-{
-}
-
-CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (CORBA::Environment &env) 
-{
-  CosPropertyService::PropertySet_ptr return_val = 0;
-
-  return return_val;
-}
-
-CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, 
-                                                        const CosPropertyService::Properties &allowed_properties, 
-                                                        CORBA::Environment &env)
-{
-  CosPropertyService::PropertySet_ptr return_val = 0;
-
-  return return_val;
-}  
-
-CosPropertyService::PropertySet_ptr 
-TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties, 
-                                                    CORBA::Environment &env) 
-{
-  CosPropertyService::PropertySet_ptr return_val = 0;
-
-  return return_val;
-}
-
-TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
-{
-}
-
-TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
-{
-}
-
-TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void)
-{
-}
-  
-CosPropertyService::PropertySetDef_ptr 
-TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &env)
-{
-  CosPropertyService::PropertySetDef_ptr return_val = 0;
-  
-  return return_val;
-}  
-
-CosPropertyService::PropertySetDef_ptr 
-TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, 
-                                                              const CosPropertyService::PropertyDefs &allowed_property_defs, 
-                                                              CORBA::Environment &env)
-{
-  CosPropertyService::PropertySetDef_ptr return_val = 0;
-  
-  return return_val;
-}
-
-CosPropertyService::PropertySetDef_ptr  
-TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                                          CORBA::Environment &env)
-{
-  CosPropertyService::PropertySetDef_ptr return_val = 0;
-
-  return return_val;
-}
-
-// Makes default sized hash_table_.
-
-TAO_PropertySet::TAO_PropertySet (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "TAO_PropertySet Constructor-Hash_Map_Manager created, current_size %d, total_size %d \n",
-              this->hash_table_.current_size (),
-              this->hash_table_.total_size ()));
-}
-
-// Destructor.
-
-TAO_PropertySet::~TAO_PropertySet (void)
-{
-}
-
-// Function to modify or add a property to the PropertySet alex: Just
-// adds the name value to the set... Doesn't check for Typecode
-// overwriting, duplicate names, void names etc, yet.  @@ Using Normal
-// mode as the default mode of properties, I need to change this based
-// on the Initial set of allowed modes, if there is anything like that
-// set by the client.
-
-void 
-TAO_PropertySet::define_property (const char *property_name,
-                                  const CORBA::Any &property_value,
-                                  CORBA::Environment &env)
-{
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value (property_value,
-                                     CosPropertyService::normal); 
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "define_property : property_name %s \n",
-              property_name));
-  
-  int ret = this->hash_table_.bind (hash_key, hash_value);
-  
-  if (ret == 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "define_property: retval : %d \n",
-                ret));
-}
-
-// Defining a sequence of properties 
-//
-// @@ Need to check for overwriting, duplicate names, void names etc.
-
-void 
-TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties,
-                                    CORBA::Environment &env)
-{
-  for (int pi = 0; pi < nproperties.length (); pi++) 
-    this->define_property (nproperties [pi].property_name.in (),
-                           nproperties [pi].property_value,
-                           env);
-}
-
-// Returns the current number of properties associated with this
-// PropertySet.
-
-CORBA::ULong 
-TAO_PropertySet::get_number_of_properties ( CORBA::Environment &env)
-{
-  return this->hash_table_.current_size ();
-}
-
-//  Returns all of the property names currently defined in the
-//  PropertySet. If the PropertySet contains more than how_many
-//  property names, then the remaining property names are put into the
-//  PropertyNamesIterator.
-
-void
-TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, 
-                                         CosPropertyService::PropertyNames_out property_names, 
-                                         CosPropertyService::PropertyNamesIterator_out rest,
-                                         CORBA::Environment &env)
-{
-  size_t num_of_properties =
-    this->get_number_of_properties (env);
-  
-  if (num_of_properties == 0)
-    // Nothing to do.
-    return;
-
-  // Set the length of the property_names appropriately.
-  CORBA::ULong sequence_length = 0;
-
-  if (how_many > 0)
-    {
-      ACE_NEW (property_names,
-               CosPropertyService::PropertyNames);
-      if (how_many >= num_of_properties)
-        sequence_length = num_of_properties;
-      else
-        sequence_length = how_many;
-      property_names->length (sequence_length);
-    }
-
-  // Iterate thru names and put them in the property_names.
-
-  CosProperty_Hash_Entry_ptr entry_ptr;
-  CosProperty_Hash_Iterator iterator (this->hash_table_);
-
-  for (int ni = 0;
-       ni < sequence_length;
-       ni++, iterator.advance ())
-    if (iterator.next (entry_ptr) != 0)
-      property_names [ni] = CORBA::string_dup (entry_ptr->ext_id_.pname_);
-  
-  // If there are some more properties, put them in the
-  // iterator. How?? Make a new PropertSet and use that to create
-  // propertyNames Iterator.
-
-  if (num_of_properties > how_many)
-    {
-      TAO_PropertySet *property_set;
-
-      ACE_NEW (property_set, TAO_PropertySet);
-
-      for (size_t i = how_many;
-           i < num_of_properties;
-           i++, iterator.advance ())
-        if (iterator.next (entry_ptr) != 0) 
-          if (property_set->hash_table_.bind (entry_ptr->ext_id_,
-                                              entry_ptr->int_id_) < 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Err: get_all_property_names\n"));
-
-      // Make the NamesIterator out of this TAO_PropertySet.
-      TAO_PropertyNamesIterator *names_iterator;
-      ACE_NEW (names_iterator, TAO_PropertyNamesIterator (*property_set));
-
-      rest = CosPropertyService::PropertyNamesIterator::_duplicate (names_iterator->_this (env));
-    }
-}      
-
-// Returns the value of a property in the PropertySet.
-
-CORBA::Any * 
-TAO_PropertySet::get_property_value (const char *property_name,
-                                     CORBA::Environment &env)
-{
-  CosProperty_Hash_Key hash_key (CORBA::string_copy (property_name));
-  CosProperty_Hash_Value hash_value;
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "get_prop_value: hash_key.pname_.in () : %s \n",
-              hash_key.pname_.in ()));
-  if (this->hash_table_.find (hash_key, hash_value) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Find failed\n"),
-                      0);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "Find succeeded \n"));
-  return hash_value.pvalue_._retn ();
-}
-
-// Returns the values of the properties listed in property_names. When
-// the boolean flag is true, the Properties parameter contains valid
-// values for all requested property names. If false, then all
-// properties with a value of type tk_void may have failed due to
-// PropertyNotFound or InvalidPropertyName.
-
-CORBA::Boolean
-TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                 CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &env)
-{
-  size_t n = property_names.length ();
-  
-  if (n == 0)
-    return CORBA::B_FALSE;
-
-  CORBA::Any_ptr any_ptr = 0;
-  
-  ACE_NEW_RETURN (nproperties,
-                  CosPropertyService::Properties,
-                  CORBA::B_FALSE);
-  
-  nproperties->length (n);
-
-  CORBA::Boolean ret_val = CORBA::B_TRUE;
-
-  for (size_t i = 0;  i < n; i++)
-    {
-      any_ptr = get_property_value (property_names [i], env);
-
-      if (any_ptr != 0)
-        {
-          // Property name is valid.
-          nproperties [i].property_name =
-            CORBA::string_dup (property_names [i]);
-          nproperties [i].property_value = *any_ptr;
-        }
-      else 
-        { 
-          // Invalid name. Ret value is False. 
-          ret_val = CORBA::B_FALSE;
-          nproperties [i].property_name =
-            CORBA::string_dup (property_names [i]);
-          
-          // @@ Make any value with tk_void type. Using replace
-          // method, <<= operator doesnot exist yet for this.
-          nproperties [i].property_value.replace (CORBA::_tc_void,
-                                                  0,
-                                                  CORBA::B_FALSE,                                   
-                                                  env);
-        }
-    }
-  TAO_CHECK_ENV_RETURN (env, CORBA::B_FALSE);
-  return ret_val;
-}
-
-void 
-TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
-                                     CosPropertyService::Properties_out nproperties, 
-                                     CosPropertyService::PropertiesIterator_out rest,
-                                     CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nDB:TAO_PropertySet::get_all_properties\n"));
-  size_t num_of_properties =
-    hash_table_.current_size ();
-  
-  if (num_of_properties == 0)
-    return;
-
-  // Alloc memory for nproperties if how_many > 0.
-  CORBA::ULong sequence_length = 0;
-
-  if (how_many > 0)
-    {
-      ACE_NEW (nproperties,
-               CosPropertyService::Properties);
-      if (how_many >= num_of_properties)
-        sequence_length = num_of_properties;
-      else
-        sequence_length = how_many;
-      nproperties->length (sequence_length);
-    }
-  ACE_DEBUG ((LM_DEBUG,
-              "PropertySet::get_all_properties -seq-length :%d\n",
-              sequence_length));
-
-  // Prepare an iterator and iterate thru the PropertySet. Retrive the
-  // values.
-  CosProperty_Hash_Iterator iterator (this->hash_table_);
-  CosProperty_Hash_Entry_ptr entry_ptr = 0;
-  
-  for (CORBA::ULong i = 0;
-       i < sequence_length;
-       i++, iterator.advance ()) 
-    if (iterator.next (entry_ptr) != 0)
-      {
-        nproperties[i].property_name =
-          CORBA::string_dup (entry_ptr->ext_id_.pname_);
-        nproperties[i].property_value =
-          entry_ptr->int_id_.pvalue_.in ();
-      }
-  
-  // If there are more properties, put them in the PropertiesIterator.
-  // Make a new TAO_PropertySet and use that to create an Properties
-  // iterator.  put that in a iterator and assign that to the out
-  // paramerter.
-
-  if (num_of_properties > how_many) 
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "DB:TAO_PropertySet-Creating PropertySet iterator\n"));
-      TAO_PropertySet *prop_set;
-      
-      ACE_NEW (prop_set, TAO_PropertySet);
-      
-      for (size_t i = sequence_length;
-           i < num_of_properties;
-           i++, iterator.advance ())
-        {
-          if (iterator.next (entry_ptr) != 0) 
-            if (prop_set->hash_table_.bind (entry_ptr->ext_id_,
-                                            entry_ptr->int_id_) < 0)
-              ACE_DEBUG ((LM_DEBUG, "Err: get_all_properties\n"));
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "DB:New PropertySet created--size %d\n",
-                  prop_set->get_number_of_properties (env)));
-      
-      // Make the iterator out of the new TAO_Propset.
-      TAO_PropertiesIterator *iterator = 0;
-      ACE_NEW_RETURN (iterator,
-                      TAO_PropertiesIterator (*prop_set),
-                      );
-      
-      rest = CosPropertyService::PropertiesIterator::_duplicate (iterator->_this (env));
-      TAO_CHECK_ENV_RETURN (env, );
-
-      ACE_DEBUG ((LM_DEBUG, "DB:TAO_PropSet::get_all_properties-Done\n"));
-    }
-}
-  
-// Deletes the specified property if it exists from a PropertySet.
-
-void 
-TAO_PropertySet::delete_property (const char *property_name,
-                                  CORBA::Environment &env)
-{
-  CosProperty_Hash_Key hash_key (CORBA::string_copy (property_name));
-  
-  ACE_DEBUG ((LM_DEBUG, "delete_property : hash_key.pname_.in() %s \n",
-              hash_key.pname_.in()));
-  // Doing unbinding.. Not getting CosProperty_Hash_Value
-  // back... Problem if dynamic allocation is done.  @@ Is memory
-  // deallocation done?
-  if (this->hash_table_.unbind (hash_key) != 0)
-    ACE_ERROR ((LM_ERROR,
-                "Unbind failed \n"));
-}
-
-// Deletes the properties defined in the property_names
-// parameter. This is a batch operation that returns the
-// MultipleExceptions exception if any delete failed.
-
-void 
-TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                    CORBA::Environment &env)
-{
-  for (size_t pi = 0; pi < property_names.length (); pi++)
-    this->delete_property (property_names[pi], env);
-}
-
-// Delete all the properties in the current ProperySet : Do it one by
-// one. close () and then open ().
-
-CORBA::Boolean
-TAO_PropertySet::delete_all_properties (CORBA::Environment &env)
-{
-  if (hash_table_.close () != 0) 
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "delete_all_properties:Error Closing the Hash_Map_Manager"),
-                      CORBA::B_FALSE);
-  else if (hash_table_.open () != 0) 
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "Could not open Hash_Map_Manager"),
-                       CORBA::B_FALSE);
-  else
-    return CORBA::B_TRUE;
-}  
-
-// Returns TRUE if the property is defined in the PropertySet.
-
-CORBA::Boolean
-TAO_PropertySet::is_property_defined (const char *property_name,  CORBA::Environment &env)
-{
-  CosProperty_Hash_Key hash_key (property_name);
-  
-  if (this->hash_table_.find (hash_key) == 0) 
-    ACE_DEBUG ((LM_DEBUG,
-                "is_property_defined :find successfull \n"));
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "is_property_defined :find failed \n"),
-                      CORBA::B_FALSE);
-
-  return CORBA::B_TRUE;
-} 
-
-// Makes default sized hash_table_.
-
-TAO_PropertySetDef::TAO_PropertySetDef (void)
-{
-}
-
-// Destructor.
-
-TAO_PropertySetDef::~TAO_PropertySetDef (void)
-{
-}
-
-void 
-TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                                CORBA::Environment &env)
-{
-}
-
-void 
-TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                            CORBA::Environment &env)
-{
-}
-
-// Check for name's validity. If name not there define it. If there
-// and if type is equal and if mode allows define it else raise exception.
-void 
-TAO_PropertySetDef::define_property_with_mode (const char *property_name,
-                                               const CORBA::Any &property_value,
-                                               CosPropertyService::PropertyModeType property_mode,
-                                               CORBA::Environment &env)
-{
-  // Check the names validity.
-  if (property_name == 0)
-    {
-      env.clear ();
-      env.exception (new CosPropertyService::InvalidPropertyName);
-      return;
-    }
-  
-  // Try to bind the Property. 
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value (property_value,
-                                     property_mode);
-  CosProperty_Hash_Entry_ptr entry_ptr;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "define_property with mode : property_name %s \n",
-              property_name));
-  
-  int ret = this->hash_table_.bind (hash_key, hash_value, entry_ptr);
-  CosProperty_Hash_Value old_value;
-  CosProperty_Hash_Key old_key;
-  switch (ret)
-    {
-    case 0: // Bind successful.
-      ACE_DEBUG ((LM_DEBUG,
-                  "define_property with mode: retval : %d\n",
-                  ret));
-      return;
-    case 1: // Property name exists.
-      // Is the pointer valid.
-      if (entry_ptr == 0)
-        {
-          env.clear ();
-          env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-          return;
-        }
-      // If type is not the same, raise exception.
-      if (entry_ptr->int_id_.pvalue_->type () != property_value.type ())
-        {
-          env.clear ();
-          env.exception (new CosPropertyService::ConflictingProperty);
-          return;
-        }
-      // If mode is read only, raise exception.
-      if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
-          (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        {
-          env.clear ();
-          env.exception (new CosPropertyService::ReadOnlyProperty);
-          return;
-        }
-      // Everything is fine. Overwrite the value.
-      if (this->hash_table_.rebind (hash_key,
-                                    hash_value,
-                                    old_key,
-                                    old_value) > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Property Defined\n"));
-          return;
-        }
-    default:
-      {
-        env.clear ();
-        env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-        return;
-      }
-    }
-}  
-
-// Define one by one. If any excceptions raised, build
-// MultipleExceptions sequence and raise that.
-void 
-TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                                  CORBA::Environment &env)
-{
-  //  Get the length, init env.
-  size_t sequence_length = property_defs.length ();
-  env.clear ();
-  
-  // Try defining the propdefs one by one.
-  for (size_t i = 0; i < sequence_length; i++)
-    {
-      this->define_property_with_mode (property_defs[i].property_name,
-                                       property_defs[i].property_value,
-                                       property_defs[i].property_mode,
-                                       env);
-    }
-}
-
-// Get the mode of a property. Raises InvalidpropertyName,
-// PropertyNotFound exceptions.
-CosPropertyService::PropertyModeType 
-TAO_PropertySetDef::get_property_mode (const char *property_name,
-                                       CORBA::Environment &env)
-{
-  // Check for the name's validity.
-  if (property_name == 0)
-    {
-      env.clear ();
-      env.exception (new CosPropertyService::InvalidPropertyName);
-      return CosPropertyService::undefined;
-    }
-  // Find the property in the hash table.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value;
-  
-  int ret = this->hash_table_.find (hash_key, hash_value);
-  switch (ret)
-    {
-    case 0:
-      // Property found.
-      return hash_value.pmode_;
-    default:
-      // Raise exception.
-      env.clear ();
-      env.exception (new CosPropertyService::PropertyNotFound);
-      return CosPropertyService::undefined; 
-    }
-}
-
-CORBA::Boolean 
-TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                        CosPropertyService::PropertyModes_out property_modes,
-                                        CORBA::Environment &env)
-{
-  CORBA::Boolean return_val = CORBA::B_FALSE;
-
-  return return_val;
-}  
-
-// Changing the mode of the property.
-// "Normal" to anything is possible.
-// "Readonly" mode to "Fixed-Readonly" is possible. Others not possible.
-// "Fixed-Normal" to "Fixed-Readonly" is possible. Other things are impossible.
-// "Fixed-Readonly" to anything is *not* possible.
-void 
-TAO_PropertySetDef::set_property_mode (const char *property_name,
-                                       CosPropertyService::PropertyModeType property_mode, 
-                                       CORBA::Environment &env)
-{
-  // Check the names validity.
-  if (property_name == 0)
-    {
-      env.clear ();
-      env.exception (new CosPropertyService::InvalidPropertyName);
-      return;
-    }
-  
-  // Trying to set to undefined mode is not allowed.
-  if (property_mode == CosPropertyService::undefined) 
-    {
-      env.clear ();
-      env.exception (new CosPropertyService::UnsupportedMode);
-      return;
-    }
-  
-  // Find the property from the Hash Table.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value;
-  
-  int ret = this->hash_table_.find (hash_key, hash_value);
-
-  CosProperty_Hash_Value old_value;
-  CosProperty_Hash_Key old_key;
-  switch (ret)
-    {
-    case 0:
-      // Property found.
-      // Check for legality of the mode change.
-      switch (hash_value.pmode_)
-        {
-        case CosPropertyService::normal:
-          // Set the new mode and update the hash table.
-          hash_value.pmode_ = property_mode;
-          if (this->hash_table_.rebind (hash_key,
-                                        hash_value,
-                                        old_key,
-                                        old_value) != 1)
-            {
-              // Return values 0 and -1 are not possible.
-              env.clear ();
-              env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-              return;
-            }
-          ACE_DEBUG ((LM_DEBUG, "Mode set succesful\n"));
-          return;
-          
-        case CosPropertyService::read_only:
-          // Read_only to fixed read only alone is possible.
-          if (property_mode != CosPropertyService::fixed_readonly) 
-            {
-              env.clear ();
-              env.exception (new CosPropertyService::UnsupportedMode);
-              return;
-            }
-          else 
-            {
-              // Change the mode and update hash table.
-              hash_value.pmode_ = property_mode;
-              if (this->hash_table_.rebind (hash_key,
-                                            hash_value,
-                                            old_key,
-                                            old_value) != 1)
-                {
-                  // Return values 0 and -1 are not possible.
-                  env.clear ();
-                  env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-                  return;
-                }
-              ACE_DEBUG ((LM_DEBUG, "Mode set successful\n"));
-              return;
-            }
-
-        case CosPropertyService::fixed_normal:
-          // Fixed_normal to fixed_readonly alone is possible.
-          if (property_mode != CosPropertyService::fixed_readonly)
-            {
-              env.clear ();
-              env.exception (new CosPropertyService::UnsupportedMode);
-              return;
-            }
-          else 
-            {
-              // Change the mode and update the hash table.
-              hash_value.pmode_ = property_mode;
-              if (this->hash_table_.rebind (hash_key,
-                                            hash_value,
-                                            hash_key,
-                                            hash_value) != 1)
-                {
-                  // Return values 0 and -1 are not possible.
-                  env.clear ();
-                  env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-                  return;
-                }
-              ACE_DEBUG ((LM_DEBUG, "Mode set successful\n"));
-              return;
-            } 
-
-        default:
-          // Fixed_readonly to any mode is not possible.
-          env.clear ();
-          env.exception (new CosPropertyService::UnsupportedMode);
-          return;
-        }
-    case -1:
-    default:
-      // Property not found in the Hash Table.
-      env.clear ();
-      env.exception (new CosPropertyService::PropertyNotFound);
-      return;
-    }
-}
-
-void 
-TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                        CORBA::Environment &env)
-{  
-}
-
-// Constructor. Construct the iterator from the PropertySet object.
-
-TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_set)
-  : iterator_ (property_set.hash_table_)
-{
-}  
-
-// Destructor.
-
-TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
-{
-}
-
-// Resets the position in an iterator to the first property name, if
-// one exists.
-
-void 
-TAO_PropertyNamesIterator::reset (CORBA::Environment &env)
-{
-  this->iterator_ = this->iterator_.map ().begin ();
-}
-
-// The next_one operation returns true if an item exists at the
-// current position in the iterator with an output parameter of a
-// property name. A return of false signifies no more items in the
-// iterator.
-
-CORBA::Boolean
-TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
-                                     CORBA::Environment &env)
-{
-  CosProperty_Hash_Entry_ptr entry_ptr;
-
-  if (this->iterator_.next (entry_ptr) != 0)
-    {
-      property_name =
-        CORBA::string_copy (entry_ptr->ext_id_.pname_);
-      this->iterator_.advance ();
-      return CORBA::B_TRUE;
-    }
-  else
-    {
-      property_name = 0;
-      return CORBA::B_FALSE;
-    }
-}
-
-CORBA::Boolean
-TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
-                                   CosPropertyService::PropertyNames_out property_names, 
-                                   CORBA::Environment &env)
-{
-  CosProperty_Hash_Entry_ptr entry_ptr = 0;
-
-  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
-    return CORBA::B_FALSE;
-
-  ACE_NEW_RETURN (property_names,
-                  CosPropertyService::PropertyNames,
-                  CORBA::B_FALSE);
-
-  size_t size = this->iterator_.map ().current_size ();
-
-  property_names->length (how_many <= size ? how_many : size);
-
-  for (size_t ni = 0;
-       ni < property_names->length ();
-       ni++, this->iterator_.advance ())
-    if (this->iterator_.next (entry_ptr) != 0)
-      property_names [ni] = CORBA::string_dup (entry_ptr->ext_id_.pname_);
-
-  return CORBA::B_TRUE;
-}
-
-void 
-TAO_PropertyNamesIterator::destroy (CORBA::Environment &env)
-{    
-}
-
-TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set)
-  : iterator_ (property_set.hash_table_)
-{
-}
-
-TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
-{
-}
-
-void 
-TAO_PropertiesIterator::reset (CORBA::Environment &env)
-{
-  this->iterator_ = this->iterator_.map ().begin ();
-}
-
-CORBA::Boolean
-TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
-                                  CORBA::Environment &env)
-{   
-  CosProperty_Hash_Entry_ptr entry_ptr;
-  
-  if (this->iterator_.next (entry_ptr) != 0)
-    {
-      aproperty = new CosPropertyService::Property;
-      aproperty->property_name = entry_ptr->ext_id_.pname_;
-      aproperty->property_value = entry_ptr->int_id_.pvalue_.in ();
-      this->iterator_.advance ();
-      return CORBA::B_TRUE;
-    }
-  else
-    {
-      aproperty = new CosPropertyService::Property;
-      return CORBA::B_FALSE;
-    }
-}  
-
-CORBA::Boolean
-TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
-                                CosPropertyService::Properties_out nproperties, 
-                                CORBA::Environment &env)
-{
-  CosProperty_Hash_Entry_ptr entry_ptr = 0;
-
-  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
-    return CORBA::B_FALSE;
-
-  ACE_NEW_RETURN (nproperties,
-                  CosPropertyService::Properties,
-                  CORBA::B_FALSE);
-
-  size_t size = this->iterator_.map ().current_size ();
-
-  nproperties->length (how_many <= size ? how_many : size);
-
-  for (size_t ni = 0;
-       ni < nproperties->length ();
-       ni++,
-         this->iterator_.advance ())
-    if (this->iterator_.next (entry_ptr) != 0)
-      {
-        nproperties [ni].property_name = entry_ptr->ext_id_.pname_;
-        nproperties [ni].property_value =
-          entry_ptr->int_id_.pvalue_.in ();
-      }
-    else
-      // @@ Should be an exception.
-      break;
-  return CORBA::B_TRUE;
-}  
-
-void
-TAO_PropertiesIterator::destroy (CORBA::Environment &env)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
deleted file mode 100644
index 24490f2f213..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CosPropertyService_i.h
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//     
-// ============================================================================
-
-#if !defined (COSPROPERTYSERVICE_I_H)
-#define	COSPROPERTYSERVICE_I_H
-
-#include "ace/OS.h"
-#include "orbsvcs/orbsvcs_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "CosProperty_Hash.h"
-
-class TAO_ORBSVCS_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
-{
-  // = TITLE
-  //     Factory class for the TAO_PropertySet class objects.
-  //
-  // = DESCRIPTION
-  //     The object may be created with some predfined properties.
-public:
-  // = Initialization and termination methods.
-  TAO_PropertySetFactory (void);
-  // Constructor.
-
-  virtual ~TAO_PropertySetFactory (void);
-  // Destructor.
-  
-  virtual CosPropertyService::PropertySet_ptr 
-  create_propertyset (CORBA::Environment &env); 
-  // Returns a  new TAO_PropertySet object. 
-  
-  virtual CosPropertyService::PropertySet_ptr  
-  create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, 
-                                  const CosPropertyService::Properties &allowed_properties,
-                                  CORBA::Environment &env);
-  // Allows a client to create a new TAO_PropertySet with specific
-  // constraints.
-  
-  virtual CosPropertyService::PropertySet_ptr 
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                              CORBA::Environment &env) ;
-  // Allows a client to create a new TAO_PropertySet with specific
-  // initial properties.
-};
-
-class TAO_ORBSVCS_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory  
-{
-  // = TITLE
-  //     Factory class for the TAO_PropertySetDef objects.
-  // 
-  // = DESCRIPTION
-  //     The object creation may be done with some predefined properties.
-public:
-  // = Initialization and termination methods.
-  TAO_PropertySetDefFactory(void); 
-  // Constructor.
-
-  virtual ~TAO_PropertySetDefFactory (void);
-  // Destructor.
-  
-  virtual CosPropertyService::PropertySetDef_ptr create_propertysetdef (CORBA::Environment &env); 
-  // Returns a new TAO_PropertySetDef object.
- 
-  virtual CosPropertyService::PropertySetDef_ptr 
-  create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, 
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs, 
-                                     CORBA::Environment &env);
-  // Allows a client to create a new TAO_PropertySet with specific
-  // constraints.
-  
- 
-  virtual CosPropertyService::PropertySetDef_ptr 
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                 CORBA::Environment &env);
-  // Allows a client to create a new TAO_PropertySet with specific
-  // initial properties.
-};
-
-class TAO_ORBSVCS_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet  
-{    
-  // = TITLE
-  //    Gives operations for defining, deleting, enumerating and
-  //    checking of properties.
-  //
-  // = DESCRIPTION
-  //     Uses a HashTable to manage the properties. 
-public:
-  friend class TAO_PropertyNamesIterator;
-  friend class TAO_PropertiesIterator;
-
-  // = Initialization and termination methods.
-  TAO_PropertySet (void);
-  // Default constructor. 
-  
-  virtual ~TAO_PropertySet (void);
-  // Destructor function.
-  
-  virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value,
-                                CORBA::Environment &env);
-  // Store the property in the hash after checking for validity of the
-  // property name, duplicate name, type code over writing etc.
-
-  virtual void define_properties (const CosPropertyService::Properties &nproperties,
-                                  CORBA::Environment &env);
-  // Define a sequence of properties at a time.
-  
-  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env);
-  // Get the number of properties that are currently defined in the
-  // PropertySet.
-  
-  virtual void get_all_property_names (CORBA::ULong how_many,
-                                       CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest,
-                                       CORBA::Environment &env);
-  // Get the names of all the properties that are currently defined in
-  // the property set.
-  
-  virtual CORBA::Any *get_property_value (const char *property_name,
-                                          CORBA::Environment &env);
-  // Get the value of the property, given the name.
-  
-  virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties,
-                                         CORBA::Environment &env);
-  // Get all names and their property values.
-  
-  virtual void get_all_properties (CORBA::ULong how_many,
-                                   CosPropertyService::Properties_out nproperties, 
-                                   CosPropertyService::PropertiesIterator_out rest,
-                                   CORBA::Environment &env);
-  // Returns all of the property names currently defined in the
-  // PropertySet. If the PropertySet contains more than how_many
-  // property names, then the remaining property names are put into the PropertyNamesIterator.
-
-  virtual void delete_property (const char *property_name,
-                                CORBA::Environment &env);
-  // Delete a property given a name.
-  
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                  CORBA::Environment &env);
-  // Delete all the these properties from this property set.
-
-  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env);
-  // Delete everything from this property set.
-  
-  virtual CORBA::Boolean is_property_defined (const char *property_name,
-                                              CORBA::Environment &env);
-  // Tell whether this property is defined or no. Forget about the
-  // value.
-protected:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex> 
-          CosProperty_Hash_Map;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value> 
-          CosProperty_Hash_Entry;
-  typedef CosProperty_Hash_Entry * 
-          CosProperty_Hash_Entry_ptr;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex> 
-          CosProperty_Hash_Iterator;
-  // Typedefs are useful.
-  
-  CosProperty_Hash_Map hash_table_;
-  // This Hash_Table manages storage for our properties.
-  
-  
-};
-
-class TAO_ORBSVCS_Export TAO_PropertySetDef : public virtual TAO_PropertySet
-{
-  // = TITLE
-  //     This class implements PropertySetDef interface, which is
-  //     specialization (subclass) of PropertySet interface. This
-  //     class provides operations to PropertySet constraints, define
-  //     and modify with modes, and to get or set property modes.
-  //
-  // = DESCRIPTION 
-  //     It should be noted that a TAO_PropertySetDef is still considered
-  //     a PropertySet. The specialization operations are simply to
-  //     provide more client access and control of the characteristics
-  //     (metadata) of a PropertySet.       
-public:
-  // = Initialization and termination methods.
-  TAO_PropertySetDef (void);
-  // Constructor.
-  
-  virtual ~TAO_PropertySetDef (void);
-  // Destructor.
-
-  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                           CORBA::Environment &env);
-  // Indicates which types of properties are supported by this
-  // PropertySet. If the output sequence is empty, then there is no
-  // restrictions on the any TypeCode portion of the property_value
-  // field of a Property in this PropertySet, unless the
-  // get_allowed_properties output sequence is not empty.
-
-  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                       CORBA::Environment &env);
-  // Indicates which properties are supported by this PropertySet. If
-  // the output sequence is empty, then there is no restrictions on
-  // the properties that can be in this PropertySet, unless the
-  // get_allowed_property_types output sequence is not empty.
-  
-  virtual void define_property_with_mode (const char *property_name,
-                                          const CORBA::Any &property_value,
-                                          CosPropertyService::PropertyModeType property_mode,
-                                          CORBA::Environment &env);
-  // This operation will modify or add a property to the
-  // PropertySet. If the property already exists, then the property
-  // type is checked before the value is overwritten. The property
-  // mode is also checked to be sure a new value may be written. If
-  // the property does not exist, then the property is added to the
-  // PropertySet.
-  
-  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                             CORBA::Environment &env);
-  // This operation will modify or add each of the properties in the
-  // Properties parameter to the PropertySet.
-
-  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name,
-                                                                  CORBA::Environment &env);
-  // Get the mode of a property. Raises InvalidpropertyName,
-  // PropertyNotFound exceptions.
-  
-  virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                             CosPropertyService::PropertyModes_out property_modes,
-                                             CORBA::Environment &env);
-  // Batch operation for getting the property.
-  
-  virtual void set_property_mode (const char *property_name,
-                                  CosPropertyService::PropertyModeType property_mode, 
-                                  CORBA::Environment &env);
-  // Set the mode of a property. Watch the following. The change of
-  // mode is allowed introduce more constraints, but it should not
-  // relax the constraints. The following decisions have been made, in
-  // TAO's implementation. The Property Spec has left this to the implenters.
-  // "Normal" to anything is possible.
-  // "Readonly" mode to "Fixed-Readonly" is possible. Others not possible.
-  // "Fixed-Normal" to "Fixed-Readonly" is possible. Other things are impossible.
-  // "Fixed-Readonly" to anything is *not* possible.
-  // For all illegal set_mode attempts, UnsupportedMode exception is raised.
-
-  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                   CORBA::Environment &env);
-  // Batch operation for setting the property.
-};
-
-class TAO_ORBSVCS_Export TAO_PropertyNamesIterator :  public virtual POA_CosPropertyService::PropertyNamesIterator
-{
-  // = TITLE
-  //     The PropertyNamesIterator interface allows a client to
-  //     iterate through the names using the next_one or next_n operations.
-  //
-  // = DESCRIPTION
-  //     A PropertySet maintains a set of name-value pairs. The
-  //     get_all_property_names operation returns a sequence of names
-  //     (PropertyNames). If there are additional names, the
-  //     get_all_property_names operation returns an object supporting
-  //     the PropertyNamesIterator interface with the additional names.
-public:
-  // = Initialization and termination methods.
-  TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
-  // Constructor.
-  
-  virtual ~TAO_PropertyNamesIterator (void);
-  // Destructor.
-
-  virtual void reset (CORBA::Environment &env);
-  // The reset operation resets the position in an iterator to the
-  // first property name, if one exists.
-  
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
-                                   CORBA::Environment &env);
-  // The next_one operation returns true if an item exists at the
-  // current position in the iterator with an output parameter of a
-  // property name. A return of false signifies no more items in the iterator.
-  
- 
-  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names, 
-                                 CORBA::Environment &env);
-  // The next_n operation returns true if an item exists at the
-  // current position in the iterator and the how_many parameter was
-  // set greater than zero. The output is a PropertyNames sequence
-  // with at most the how_many number of names. A return of false
-  // signifies no more items in the iterator.
-  
-  virtual void destroy (CORBA::Environment &env);
-  // Destroys the iterator.
-private:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-  CosProperty_Hash_Map;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          CosProperty_Hash_Iterator;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          CosProperty_Hash_Entry;
-  typedef CosProperty_Hash_Entry * CosProperty_Hash_Entry_ptr;
-
-  CosProperty_Hash_Iterator iterator_;
-  // The Iterator object.
-};
-
-class TAO_ORBSVCS_Export TAO_PropertiesIterator :  public virtual POA_CosPropertyService::PropertiesIterator
-{
-  // = TITLE
-  //     Thid class implements PropertiesIterator interface allows a client to
-  //     iterate through the name-value pairs using the next_one or
-  //     next_n operations.
-  // 
-  // = DESCRIPTION
-  //     A PropertySet maintains a set of name-value pairs. The
-  //     get_all_properties operation of the PropertySet interface
-  //     returns a sequence of Property structures (Properties). If
-  //     there are additional properties, the get_all_properties
-  //     operation returns an object supporting the PropertiesIterator
-  //     interface with the additional properties.
-public:
-  // = Initialization and termination methods.
-  TAO_PropertiesIterator (TAO_PropertySet &property_set);
-  // Constructor.
-  
-  virtual ~TAO_PropertiesIterator (void);
-  // Destructor.
-  
-  virtual void reset (CORBA::Environment &env);
-  // Resets the position in an iterator to the first property, if one exists.
-  
-  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty,
-                                   CORBA::Environment &env);
-  // The next_one operation returns true if an item exists at the
-  // current position in the iterator with an output parameter of a
-  // property. A return of false signifies no more items in the
-  // iterator.
-   
-  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::Properties_out nproperties, 
-                                 CORBA::Environment &env);
-  // The next_n operation returns true if an item exists at the
-  // current position in the iterator and the how_many parameter was
-  // set greater than zero. The output is a properties sequence with
-  // at most the how_many number of properties. A return of false
-  // signifies no more items in the iterator.
-  
-  virtual void destroy (CORBA::Environment &env);
-  // Destroys the iterator.
-
-private:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          CosProperty_Hash_Map;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          CosProperty_Hash_Iterator;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          CosProperty_Hash_Entry;
-  typedef CosProperty_Hash_Entry * CosProperty_Hash_Entry_ptr;
-  
-
-  CosProperty_Hash_Iterator iterator_;
-  // The iterator object.
-};
-
-#endif /* COSPROPERTYSERVICE_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.cpp b/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.cpp
deleted file mode 100644
index c0138c527cb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-
-// ===============================================================================================
-//
-// = FILE
-//     CosProperty_Hash.cpp
-//
-// = Description
-//     Defines equal and hash functions for the Hash_Property_Map class.
-//    
-// = Author
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ================================================================================================
-
-#include "CosProperty_Hash.h"
-
-CosProperty_Hash_Key::CosProperty_Hash_Key (void)
-{
-}
-
-CosProperty_Hash_Key::CosProperty_Hash_Key (const char * &name)
-{
-  pname_ = CORBA::string_dup (name);
-}
-
-CosProperty_Hash_Key::CosProperty_Hash_Key (const CosPropertyService::PropertyName &name)
-  : pname_ (CORBA::string_dup (name))
-{
-}
-
-CosProperty_Hash_Key::CosProperty_Hash_Key (const CosProperty_Hash_Key &src) 
-  : pname_ (src.pname_)
-{
-}
-
-int
-CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const   
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "CosProperty_Hash_Key::operator == : %s == %s \n",
-              this->pname_.in (),
-              hash_key.pname_.in ()));
-  return ACE_OS::strcmp (this->pname_.in (),
-                         hash_key.pname_.in ()) == 0;
-}
-
-u_long
-CosProperty_Hash_Key::hash (void) const 
-{
-  u_long ret = ACE::hash_pjw (this->pname_.in ());
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "CosProperty_Hash_Key::hash : hashing %s : val : %d \n",
-              this->pname_.in (),
-              ret));
-  return ret;
-}
-
-CosProperty_Hash_Key::~CosProperty_Hash_Key (void) 
-{
-}
-
-CosProperty_Hash_Value::CosProperty_Hash_Value (void)
-{
-}
-
-#if 0
-CosProperty_Hash_Value::CosProperty_Hash_Value (const CORBA::Any &any)
-  : pvalue_ (new CORBA::Any (any))
-{
-}
-#endif /* 0 */
-
-CosProperty_Hash_Value::CosProperty_Hash_Value (const CORBA::Any &any, 
-                                                const CosPropertyService::PropertyModeType &mode)
-  : pvalue_ (new CORBA::Any (any)),
-    pmode_ (mode)
-{
-}
-
-CosProperty_Hash_Value::CosProperty_Hash_Value (const CosProperty_Hash_Value &src)
-  : pvalue_ (src.pvalue_),
-    pmode_ (src.pmode_)
-{
-}
-
-CosProperty_Hash_Value::~CosProperty_Hash_Value (void)
-{
-}
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.h b/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.h
deleted file mode 100644
index 892404f0b51..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/CosProperty_Hash.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- C++ -*- */
-
-//$Id$
-
-// ===================================================================================================
-//
-// = FILE
-//     CosProperty_Hash.h
-//
-// = DESCRITION
-//     Defines CosProperty_Hash_Value and CosProperty_Hash_Key classes for the Hash_Map_Manager to
-//     be used in the CosPropertyService. 
-//
-// = AUTHOR
-//     Alexander B. Arulanthu <alex@cs.wustl.edu>
-//
-// ===================================================================================================
-
-#if !defined (COSPROPERTY_HASH_H)
-#define	COSPROPERTY_HASH_H
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "orbsvcs/orbsvcs_export.h"
-
-class TAO_ORBSVCS_Export CosProperty_Hash_Key 
-{
-  // = TITLE
-  //     Key for the Hash Table.
-public: 
-  // = Initialization and termination methods.
-  CosProperty_Hash_Key (void);
-  // Default constructor.
-  
-  CosProperty_Hash_Key (const char * &name);
-  // Constructor from a const string.
-  
-  CosProperty_Hash_Key (const CosPropertyService::PropertyName &name);
-  // Costructor that takes PropertyName.
-  
-  CosProperty_Hash_Key (const CosProperty_Hash_Key &hash_key);
-  // Copy constructor.
-  
-  virtual ~CosProperty_Hash_Key (void);
-  // Destructor.
-
-  virtual int operator == (const CosProperty_Hash_Key &hash_key) const;
-  // The operator for hash binding and "find"ing.
-
-  virtual u_long hash (void) const;
-  // The function that computes a hash value.
-
-  CosPropertyService::PropertyName_var pname_; 
-  // This is still the public variable.
-};
-
-class TAO_ORBSVCS_Export CosProperty_Hash_Value
-{
-  // = TITLE 
-  //     This will be the value part in the Hash_Table.
-public: 
-  // = Initialization and termination methods.
-  
-  CosProperty_Hash_Value (void);
-  // Default constructor.
-  
-  //CosProperty_Hash_Value (const CORBA::Any &any);
-  // Constructor with Any value.
-  
-  CosProperty_Hash_Value (const CORBA::Any &any,
-                          const CosPropertyService::PropertyModeType &mode);
-  // Constructor with the property_value and the property_mode.
-  
-  CosProperty_Hash_Value (const CosProperty_Hash_Value &hash_value);
-  // Copy constructor.
-  
-  virtual ~CosProperty_Hash_Value (void);
-  // Destructor.
-  
-  CORBA::Any_var pvalue_;
-  // property value.
-  
-  CosPropertyService::PropertyModeType pmode_;
-  // Property Mode.
-};
-
-#endif /* COSPROPERTY_HASH_H */
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
deleted file mode 100644
index 9ba626ba73e..00000000000
--- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// $Id$
-//
-#include "RtecEventComm.idl"
-#include "RtecScheduler.idl"
-
-module RtecEventChannelAdmin {
-
-  exception AlreadyConnected {};
-  exception TypeError {};
-
-  struct Dependency {
-    RtecEventComm::Event event_;
-    RtecScheduler::handle_t rt_info;
-  };
-  typedef sequence<Dependency> DependencySet;
-
-  struct ConsumerQOS {
-    DependencySet dependencies;
-  };
-
-  struct Publication {
-    RtecEventComm::Event event_;
-    RtecScheduler::Dependency_Info dependency_info_;
-  };
-  typedef sequence<Publication> PublicationSet;
-
-  struct SupplierQOS {
-    PublicationSet publications_;
-  };
-
-  interface ProxyPushConsumer: RtecEventComm::PushConsumer {
-    oneway void connect_push_supplier(
-		in RtecEventComm::PushSupplier push_supplier,
-		in SupplierQOS qos);
-        // raises(AlreadyConnected);
-  };
-
-  interface ProxyPushSupplier: RtecEventComm::PushSupplier {
-    oneway void connect_push_consumer(
-		in RtecEventComm::PushConsumer push_consumer,
-		in ConsumerQOS qos);
-      // raises(AlreadyConnected, TypeError);
-  };
-
-  // TODO: Find out the exception specs for the following interface's
-  // methods.
-  interface ConsumerAdmin {
-    ProxyPushSupplier obtain_push_supplier();
-  };
-  interface SupplierAdmin {
-    ProxyPushConsumer obtain_push_consumer();
-  };
-
-  interface EventChannel {
-    exception SYNCHRONIZATION_ERROR {};
-    exception QOS_ERROR {};
-    exception SUBSCRIPTION_ERROR {};
-    exception CORRELATION_ERROR {};
-    exception DISPATCH_ERROR {};
-
-    ConsumerAdmin for_consumers();
-    SupplierAdmin for_suppliers();
-
-    void destroy();
-  };
-
-};
-
-
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
deleted file mode 100644
index 732a0cfb6ed..00000000000
--- a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// $Id$
-//
-
-#include "CosTimeBase.idl"
-
-module RtecEventComm {
-
-  // = TITLE
-  //   User defined Event Data.
-  //
-  // = DESCRIPTION
-  //   The Event payload is defined by this type.
-  //   Users wanting maximum flexibility can use an Any,
-  //   users that only have one type of event may use structures,
-  //   other users may preffer union, trying to strike a balance
-  //   between performance and flexibility.
-  //   Users willing to implement their own marshalling may use a
-  //   sequence of octet.
-
-#if 0
-  union EventData switch(long) {
-  case 1: double dval;
-  case 2: string sval;
-  case 3: sequence<octet> bval;
-  default: long lval;
-  };
-#else
-  struct EventData {
-    long x;
-    long y;
-  };
-#endif
-
-  typedef TimeBase::TimeT Time;
-
-  typedef long EventSourceID;
-  typedef long EventType;
-
-  struct Event
-  {
-    // = TITLE
-    //   The Event structure.
-    //
-    // = DESCRIPTION
-    //   Events are represented by this structure, it is simply a
-    //   header,data pair. 
-    // 
-
-    EventType type_;
-    // The event type.
-    // This may be different from the discriminator in the EventData
-    // union above, the motivation is to allow filtering by data
-    // contents: different event types are assigned to different data
-    // contents though they use the same discriminator.
-
-    EventSourceID source_;
-    // Some way to identify the supplier.
-
-    long ttl_;
-    // The "Time To Live" count, each time an EC process the event it
-    // decreases the TTL field, when it gets to zero the message is no
-    // longer forwarded.
-
-    Time creation_time_;
-    Time ec_recv_time_;
-    Time ec_send_time_;
-    // Some timestamps, they actually belong in the payload, for some
-    // kind of measument event.
-
-    EventData data_;
-    // The event payload.
-  };
-  typedef sequence<Event> EventSet;
-
-  interface PushConsumer {
-    oneway void push (in EventSet data);
-    oneway void disconnect_push_consumer(); 
-  };
-
-  interface PushSupplier {
-    oneway void disconnect_push_supplier();
-  };
-
-};
-
-
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
deleted file mode 100644
index 11efec1faa0..00000000000
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-#include "CosTimeBase.idl"
-
-module RtecScheduler
-{
-  // Module TimeBase defines the OMG Time Service.
-  typedef TimeBase::TimeT Time; // 100 nanoseconds
-  typedef Time Quantum;
-
-  typedef long Period; // 100 nanoseconds
-
-  enum Criticality
-  // Defines the criticality of the operation.
-  // For use with Dynamic Scheduler.
-  {
-    VERY_LOW_CRITICALITY,
-    LOW_CRITICALITY,
-    MEDIUM_CRITICALITY,
-    HIGH_CRITICALITY,
-    VERY_HIGH_CRITICALITY
-  };
-
-  enum Importance
-  // Defines the importance of the operation,
-  // which can be used by the Scheduler as a
-  // "tie-breaker" when other scheduling
-  // parameters are equal.
-  {
-    VERY_LOW_IMPORTANCE,
-    LOW_IMPORTANCE,
-    MEDIUM_IMPORTANCE,
-    HIGH_IMPORTANCE,
-    VERY_HIGH_IMPORTANCE
-  };
-
-  enum Info_Type
-  // Defines type of operation information.
-  {
-    OPERATION,
-    CONJUNCTION,
-    DISJUNCTION
-  };
-
-  enum Dependency_Type
-  // Specify one-way or two-way call.
-  {
-    ONE_WAY_CALL,
-    TWO_WAY_CALL
-  };
-
-  typedef long handle_t;
-  // RT_Info's are assigned per-application
-  // unique identifiers.
-
-  struct Dependency_Info
-  {
-    Dependency_Type dependency_type;
-    long number_of_calls;
-    handle_t rt_info;
-    // Notice the reference to the RT_Info we
-    // depend on.
-  };
-
-  typedef sequence<Dependency_Info> Dependency_Set;
-
-  typedef long OS_Priority;
-  typedef long Sub_Priority;
-  typedef long Preemption_Priority;
-
-  struct RT_Info
-    // = TITLE
-    //   Describes the QoS for an "RT_Operation".
-    //
-    // = DESCRIPTION
-    // The CPU requirements and QoS for each
-    // "entity" implementing an application
-    // operation is described by the following
-    // information.
-  {
-    // Application-defined string that uniquely
-    // identifies the operation.
-    string entry_point;
-
-    // The scheduler-defined unique identifier.
-    handle_t handle;
-
-    // Execution times.
-    Time worst_case_execution_time;
-    Time typical_execution_time;
-
-    // To account for server data caching.
-    Time cached_execution_time;
-
-    // For rate-base operations, this expresses
-    // the rate.  0 means "completely pasive",
-    // i.e., this operation only executes when
-    // called.
-    Period period;
-
-    // Operation Criticality (user assigned significance).
-    Criticality criticality;
-
-    // Operation importance, used to "break ties".
-    Importance importance;
-
-    // For time-slicing (for BACKGROUND operations only).
-    Quantum quantum;
-
-    // The number of internal threads contained by
-    // the operation.
-    long threads;
-
-    // The following attributes are defined by
-    // the Scheduler once the off-line schedule
-    // is computed.
-
-    // The operations we depend upon.
-    Dependency_Set dependencies;
-
-    // The OS por processing the events generated
-    // from this RT_Info.
-    OS_Priority priority;
-
-    // For ordering RT_Info's with equal priority.
-    Sub_Priority dynamic_subpriority;
-
-    // For ordering RT_Info's with equal priority.
-    Sub_Priority static_subpriority;
-
-    // The queue number for this RT_Info.
-    Preemption_Priority preemption_priority;
-
-    // Info_Type
-    Info_Type info_type;
-
-    // Token reserved for the scheduler's internal use:
-    // information placed here from outside the scheduler
-    // implementation is prone to be overwritten.
-    unsigned long volatile_token;
-  };
-
-  exception DUPLICATE_NAME {};
-  // The application is trying to register the same task again.
-
-  exception UNKNOWN_TASK {};
-  // The RT_Info handle was not valid.
-
-  exception NOT_SCHEDULED {};
-  // The application is trying to obtain scheduling information, but
-  // none is available.
-
-  exception UTILIZATION_BOUND_EXCEEDED {};
-  exception INSUFFICIENT_THREAD_PRIORITY_LEVELS {};
-  exception TASK_COUNT_MISMATCH {};
-  // Problems while computing off-line scheduling.
-
-  typedef sequence<RT_Info> RT_Info_Set;
-
-  // TODO: Find a reasonable name for this interface, maybe we should
-  // change the name of the module to RtecSchedulerAdmin and name this
-  // Scheduler
-  interface Scheduler
-    // = DESCRIPTION
-    //   This class holds all the RT_Info's for a single application.
-    //   During the configuration run this will be implemented as a
-    //   single remote object, whose services are used by the
-    //   suppliers, consumers and the EC.
-    //   At run-time each process will hold a copy of the compiled
-    //   version of the Scheduler, using the precomputed data to
-    //   resolve requests (avoiding any remote calls) and ignoring any
-    //   requests for modifying its state.
-    //   A Factory class will be used to choose the proper
-    //   implementation.
-    //
-    //   This class must be registered with the naming service using a
-    //   well known name ("Scheduler" seems the obvious choice), the
-    //   Naming Context will account for different applications and
-    //   modes.
-    //
-    //   Once the scheduling data is computed it can be retrieved
-    //   remotely to generate the code for the run-time version.
-  {
-    handle_t create (in string entry_point) raises (DUPLICATE_NAME);
-    // Creates a new RT_Info entry for the function identifier
-    // "entry_point", it can be any string, but the fully qualified
-    // name function name is suggested.
-    // Returns a handle to the RT_Info.
-
-    handle_t lookup (in string entry_point);
-    // Lookups a handle for entry_point.
-    // TODO: Should we add INVALID_HANDLE or raise an exception?
-
-    RT_Info get (in handle_t handle) raises (UNKNOWN_TASK);
-    // Retrieve information about an RT_Info.
-
-    void set (in handle_t handle,
-              in Criticality criticality,
-              in Time time,
-              in Time typical_time,
-              in Time cached_time,
-              in Period period,
-              in Importance importance,
-              in Quantum quantum,
-              in long threads,
-              in Info_Type info_type)
-      raises (UNKNOWN_TASK);
-    // Set the attributes of an RT_Info.
-    // Notice that some values may not be modified (like priority).
-    // Criticality and Info_Type are only used with the Dynamic Scheduler.
-
-    void add_dependency (in handle_t handle,
-                         in handle_t dependency,
-                         in long number_of_calls,
-                         in Dependency_Type dependency_type)
-      raises (UNKNOWN_TASK);
-    // Adds <dependency> to <handle>.
-    // Dependency_Type is only used with the Dynamic Scheduler.
-
-    void priority (in handle_t handle,
-                       out OS_Priority priority,
-                       out Sub_Priority subpriority,
-                       out Preemption_Priority p_priority)
-      raises (UNKNOWN_TASK, NOT_SCHEDULED);
-    void entry_point_priority (in string entry_point,
-                               out OS_Priority priority,
-                               out Sub_Priority subpriority,
-                               out Preemption_Priority p_priority)
-      raises (UNKNOWN_TASK, NOT_SCHEDULED);
-    // Obtain the run time priorities.
-    // TODO: Do we need the two interfaces or is it simply confusing?
-    // If we should to keep only the <handle> version: Are the extra
-    // round-trips too expensive?
-    // If we choose only the <entry_point> version: Are the copies for
-    // the string affordable?
-
-    void compute_scheduling (in long minimum_priority,
-                             in long maximum_priority,
-                             out RT_Info_Set infos)
-      raises (UTILIZATION_BOUND_EXCEEDED,
-              INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-              TASK_COUNT_MISMATCH);
-    // Computes the scheduling priorities, returns the RT_Info's with
-    // their priorities properly filled.
-    // This info can be cached by a Run_Time_Scheduler service or
-    // dumped into a C++ file for compilation and even faster (static)
-    // lookup.
-
-    // TODO: The dependencies field can be removed from the RT_Info
-    // and made part of the secrets of "Application", adding the
-    // following to satisfy curious clients:
-    //
-    // struct Dependency {
-    //   long number_of_calls;
-    //   Dependency_Type dependency_type;
-    //   handle_t dependency;
-    // };
-    // typedef sequence<Dependency> Dependency_Set;
-    //
-    // Dependency_Set dependencies (in handle_t handle)
-    //    raises (UNKNOWN_TASK);
-    // Returns the list of dependencies
-    //
-    // long number_of_dependencies (in handle_t handle)
-    //    raises (UNKNOWN_TASK);
-    // Returns the number of dependencies.
-
-  };
-};
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
deleted file mode 100644
index d977034c1af..00000000000
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Runtime_Scheduler::
-ACE_Runtime_Scheduler (int entry_count,
-                       RtecScheduler::RT_Info* rt_info[])
-:  entry_count_ (entry_count),
-   rt_info_ (rt_info)
-{
-}
-
-RtecScheduler::handle_t
-ACE_Runtime_Scheduler::create (const char * entry_point,
-                               CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME))
-{
-  // Just make sure its there and returns its handle (position).
-  int i;
-  for (i = 0; i < entry_count_; ++i)
-    {
-      if (strcmp (entry_point, rt_info_[i]->entry_point) == 0)
-        {
-          return i;
-        }
-    }
-  // TODO: throw an exception or print an error.
-  return -1;
-}
-
-RtecScheduler::handle_t
-ACE_Runtime_Scheduler::lookup (const char * entry_point,
-                               CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return create (entry_point, _env);
-}
-
-RtecScheduler::RT_Info*
-ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
-                            CORBA::Environment &_env)
-     TAO_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      TAO_THROW_RETURN (RtecScheduler::UNKNOWN_TASK(), 0);
-    }
-  return rt_info_[handle];
-}
-
-void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
-                                 RtecScheduler::Criticality criticality,
-                                 const RtecScheduler::Time &time,
-                                 const RtecScheduler::Time &typical_time,
-                                 const RtecScheduler::Time &cached_time,
-                                 RtecScheduler::Period period,
-                                 RtecScheduler::Importance importance,
-                                 const RtecScheduler::Quantum &quantum,
-                                 CORBA::Long threads,
-                                 RtecScheduler::Info_Type info_type,
-                                 CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  // We compare the values with the ones stored and print a message on
-  // any differences.
-  if (handle < 0 || handle > entry_count_)
-    {
-      TAO_THROW (RtecScheduler::UNKNOWN_TASK);
-      ACE_NOTREACHED (return);
-    }
-  if (rt_info_[handle]->criticality != criticality
-      || rt_info_[handle]->worst_case_execution_time != time
-      || rt_info_[handle]->typical_execution_time != typical_time
-      || rt_info_[handle]->cached_execution_time != cached_time
-      || rt_info_[handle]->period != period
-      || rt_info_[handle]->importance != importance
-      || rt_info_[handle]->quantum != quantum
-      || rt_info_[handle]->info_type != info_type
-      || rt_info_[handle]->threads != threads)
-    {
-      ACE_ERROR ((LM_ERROR, "invalid data for RT_Info: %s\n",
-                  (const char*)rt_info_[handle]->entry_point));
-      // TODO: throw something here.
-    }
-}
-
-
-void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
-                                      RtecScheduler::OS_Priority& priority,
-                                      RtecScheduler::Sub_Priority& subpriority,
-                                      RtecScheduler::Preemption_Priority& p_priority,
-                                      CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      TAO_THROW (RtecScheduler::UNKNOWN_TASK());
-      ACE_NOTREACHED (return);
-    }
-  priority = rt_info_[handle]->priority;
-  subpriority = rt_info_[handle]->static_subpriority;
-  p_priority = rt_info_[handle]->preemption_priority;
-}
-
-void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
-                                                  RtecScheduler::OS_Priority& priority,
-                                                  RtecScheduler::Sub_Priority& subpriority,
-                                                  RtecScheduler::Preemption_Priority& p_priority,
-                                                  CORBA::Environment &_env)
-     TAO_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED))
-{
-  RtecScheduler::handle_t handle = lookup (entry_point, _env);
-  if (handle < -1)
-    {
-      // The exception was thrown or is in _env already.
-      return;
-    }
-  this->priority (handle, priority, subpriority, p_priority, _env);
-}
-
-void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
-                                            RtecScheduler::handle_t dependency,
-                                            CORBA::Long number_of_calls,
-                                            RtecScheduler::Dependency_Type
-                                              dependency_type,
-                                            CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      TAO_THROW (RtecScheduler::UNKNOWN_TASK);
-      ACE_NOTREACHED (return);
-    }
-  // Just check that the information is consistent.
-  RtecScheduler::Dependency_Set& deps = rt_info_[handle]->dependencies;
-  for (CORBA::ULong i = 0; i < deps.length (); ++i)
-    {
-      if (deps[i].rt_info == dependency
-          && deps[i].number_of_calls == number_of_calls
-          && deps[i].dependency_type == dependency_type)
-        {
-          return;
-        }
-    }
-  ACE_ERROR ((LM_ERROR, "unmatched dependency on %s\n",
-              (const char*)rt_info_[handle]->entry_point));
-}
-
-void ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
-                                                CORBA::Long maximum_priority,
-                                                RtecScheduler::RT_Info_Set_out infos,
-                                                CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH))
-{
-  // TODO: Right now just do nothing, later we could validate the
-  // priorities (without recomputing).
-  // TODO: fill up the infos.
-  return;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
deleted file mode 100644
index 43df9957a00..00000000000
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#ifndef ACE_RUNTIME_SCHEDULER_H
-#define ACE_RUNTIME_SCHEDULER_H
-
-#include "ace/OS.h"
-
-#include "orbsvcs/RtecSchedulerS.h"
-
-class TAO_ORBSVCS_Export ACE_Runtime_Scheduler
-  : public POA_RtecScheduler::Scheduler
-  // = TITLE
-  //   A proxy server for RtecScheduler::Scheduler.
-  //
-  // = DESCRIPTION
-  //   This class offers the services of the scheduler, but based on
-  //   precomputed and precompiled information. This results in a
-  //   highly optimized execution after the configuration runs.
-{
-public:
-  ACE_Runtime_Scheduler (int entry_count,
-                         RtecScheduler::RT_Info* rt_info[]);
-  // Initialize the data from the RT_Info array.
-  // Only basic validation is done.
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException));
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality criticality,
-                    const RtecScheduler::Time &time,
-                    const RtecScheduler::Time &typical_time,
-                    const RtecScheduler::Time &cached_time,
-                    RtecScheduler::Period period,
-                    RtecScheduler::Importance importance,
-                    const RtecScheduler::Quantum &quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type info_type,
-                    CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void priority (RtecScheduler::handle_t handle,
-                         RtecScheduler::OS_Priority& priority,
-                         RtecScheduler::Sub_Priority& subpriority,
-                         RtecScheduler::Preemption_Priority& p_priority,
-                         CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void entry_point_priority (const char * entry_point,
-                                     RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Sub_Priority& subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
-                                     CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-                               RtecScheduler::handle_t dependency,
-                               CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type dependency_type,
-                               CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-                                   CORBA::Long maximum_priority,
-                                   RtecScheduler::RT_Info_Set_out infos,
-                                   CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                    RtecScheduler::TASK_COUNT_MISMATCH));
-
-private:
-  int entry_count_;
-  RtecScheduler::RT_Info** rt_info_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
deleted file mode 100644
index 96919937af5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
-
-#include "Scheduler_Generic.h"
-#include "Config_Scheduler.h"
-
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Config_Scheduler::ACE_Config_Scheduler (void)
-  : impl(new Scheduler_Generic)
-{
-  // impl->output_level (10);
-}
-
-ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
-{
-  delete impl;
-}
-
-RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const char * entry_point,
-                              CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME))
-{
-  typedef RtecScheduler::RT_Info* RT_Info_ptr;
-
-  RtecScheduler::RT_Info** rt_info;
-  ACE_NEW_RETURN (rt_info, RT_Info_ptr[1], -1);
-
-  ACE_NEW_RETURN (rt_info[0], RtecScheduler::RT_Info, -1);
-
-  rt_info[0]->entry_point = CORBA::string_dup(entry_point);
-  rt_info[0]->handle = -1;
-  rt_info[0]->worst_case_execution_time = ORBSVCS_Time::zero;
-  rt_info[0]->typical_execution_time = ORBSVCS_Time::zero;
-  rt_info[0]->cached_execution_time = ORBSVCS_Time::zero;
-  rt_info[0]->period = 0;
-  rt_info[0]->importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  rt_info[0]->quantum = ORBSVCS_Time::zero;
-  rt_info[0]->threads = 0;
-  rt_info[0]->priority = 0;
-  rt_info[0]->dynamic_subpriority = 0;
-  rt_info[0]->static_subpriority = 0;
-  rt_info[0]->preemption_priority = 0;
-
-  RtecScheduler::handle_t handle = -1;
-  switch (impl->register_task (rt_info, 1, handle))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      break;
-    case ACE_Scheduler::ST_VIRTUAL_MEMORY_EXHAUSTED:
-    case ACE_Scheduler::ST_TASK_ALREADY_REGISTERED:
-    default:
-      delete rt_info[0];
-      delete[] rt_info;
-      ACE_ERROR ((LM_ERROR,
-                  "Config_Scheduler::create - register_task failed\n"));
-      // @@ TODO: throw something.
-      break;
-    }
-  return handle;
-}
-
-RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const char * entry_point,
-                              CORBA::Environment &)
-    TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->get_rt_info (entry_point, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      return rt_info->handle;
-      ACE_NOTREACHED (break);
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  "Config_Scheduler::lookup - get_rt_info failed\n"));
-      // @@ TODO: throw something.
-      break;
-    }
-  return -1;
-}
-
-RtecScheduler::RT_Info*
-ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
-                           CORBA::Environment &)
-     TAO_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      {
-        // IDL memory managment semantics require the we return a copy
-        RtecScheduler::RT_Info* copy;
-        ACE_NEW_RETURN (copy, RtecScheduler::RT_Info (*rt_info), 0);
-        return copy;
-      }
-      ACE_NOTREACHED (break);
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  "Config_Scheduler::get - lookup_rt_info failed\n"));
-      // @@ TODO: throw something.
-      break;
-    }
-  return 0;
-}
-
-void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
-                                RtecScheduler::Criticality criticality,
-                                const RtecScheduler::Time &time,
-                                const RtecScheduler::Time &typical_time,
-                                const RtecScheduler::Time &cached_time,
-                                RtecScheduler::Period period,
-                                RtecScheduler::Importance importance,
-                                const RtecScheduler::Quantum &quantum,
-                                CORBA::Long threads,
-                                RtecScheduler::Info_Type info_type,
-                                CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      rt_info->criticality = criticality,
-      rt_info->worst_case_execution_time = time;
-      rt_info->typical_execution_time = typical_time;
-      rt_info->cached_execution_time = cached_time;
-      rt_info->period = period;
-      rt_info->importance = importance;
-      rt_info->quantum = quantum;
-      rt_info->threads = threads;
-      rt_info->info_type = info_type;
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  "Config_Scheduler::set - lookup_rt_info failed\n"));
-      // @@ TODO: throw something.
-      break;
-    }
-}
-
-void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
-                                     RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Sub_Priority& subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
-                                     CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  ACE_UNUSED_ARG (_env);
-
-  if (impl->priority (handle, priority, subpriority, p_priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Config_Scheduler::priority - priority failed\n"));
-      // TODO: throw something.
-    }
-}
-
-void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
-                                                 RtecScheduler::OS_Priority& priority,
-                                                 RtecScheduler::Sub_Priority& subpriority,
-                                                 RtecScheduler::Preemption_Priority& p_priority,
-                                                 CORBA::Environment &_env)
-     TAO_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED))
-{
-  this->priority (lookup (entry_point, _env),
-                  priority, subpriority, p_priority,
-                  _env);
-}
-
-void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
-                                           RtecScheduler::handle_t dependency,
-                                           CORBA::Long number_of_calls,
-                                           RtecScheduler::Dependency_Type
-                                             dependency_type,
-                                           CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  ACE_UNUSED_ARG (_env);
-
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      {
-        RtecScheduler::Dependency_Info dep;
-        dep.rt_info = dependency;
-        dep.number_of_calls = number_of_calls;
-        dep.dependency_type = dependency_type;
-        ACE_Scheduler::add_dependency(rt_info, dep);
-      }
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  "cannot find %d to add dependency", handle));
-      // TODO: throw something.
-      break;
-    }
-}
-
-void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
-                                               CORBA::Long maximum_priority,
-                                               RtecScheduler::RT_Info_Set_out infos,
-                                               CORBA::Environment &_env)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH))
-{
-  ACE_UNUSED_ARG (_env);
-
-  impl->init (minimum_priority, maximum_priority);
-  if (impl->schedule () != ACE_Scheduler::SUCCEEDED)
-    {
-      // TODO: throw something.
-      ACE_ERROR ((LM_ERROR, "schedule failed\n"));
-      return;
-    }
-  if (infos == 0)
-    {
-      infos = new RtecScheduler::RT_Info_Set(impl->tasks ());
-    }
-  infos->length (impl->tasks ());
-  for (RtecScheduler::handle_t handle = 1;
-       handle <= (RtecScheduler::handle_t) impl->tasks ();
-       ++handle)
-    {
-      RtecScheduler::RT_Info* rt_info = 0;
-      switch (impl->lookup_rt_info (handle, rt_info))
-        {
-        case ACE_Scheduler::SUCCEEDED:
-          // We know that handles start at 1.
-          infos[CORBA::ULong(handle - 1)] = *rt_info;
-          break;
-        case ACE_Scheduler::FAILED:
-        case ACE_Scheduler::ST_UNKNOWN_TASK:
-        default:
-          ACE_ERROR ((LM_ERROR,
-                      "Config_Scheduler::schedule - lookup_rt_info failed\n"));
-          // TODO: throw something.
-          break;
-        }
-    }
-  ACE_DEBUG ((LM_DEBUG, "schedule prepared\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "dumping to stdout\n"));
-  ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), 0);
-  ACE_DEBUG ((LM_DEBUG, "dump done\n"));
-}
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
deleted file mode 100644
index d4c873fcc0e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#ifndef ACE_CONFIG_SCHEDULER_H
-#define ACE_CONFIG_SCHEDULER_H
-
-#include "ace/OS.h"
-
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-class TAO_ORBSVCS_Export ACE_Config_Scheduler
-: public POA_RtecScheduler::Scheduler
-  // = TITLE
-  //   A (local) implementation for the RtecScheduler::Scheduler service.
-  //
-  // = DESCRIPTION
-  //   This class implements a servant for the
-  //   RtecScheduler::Scheduler service, using the Scheduler classes
-  //   distributed with the EC.
-{
-public:
-  ACE_Config_Scheduler (void);
-  virtual ~ACE_Config_Scheduler (void);
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException));
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality criticality,
-                    const RtecScheduler::Time &time,
-                    const RtecScheduler::Time &typical_time,
-                    const RtecScheduler::Time &cached_time,
-                    RtecScheduler::Period period,
-                    RtecScheduler::Importance importance,
-                    const RtecScheduler::Quantum &quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type info_type,
-                    CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void priority (RtecScheduler::handle_t handle,
-                         RtecScheduler::OS_Priority& priority,
-                         RtecScheduler::Sub_Priority& subpriority,
-                         RtecScheduler::Preemption_Priority& p_priority,
-                         CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void entry_point_priority (const char * entry_point,
-                                     RtecScheduler::OS_Priority& priority,
-                                     RtecScheduler::Sub_Priority& subpriority,
-                                     RtecScheduler::Preemption_Priority& p_priority,
-                                     CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-                               RtecScheduler::handle_t dependency,
-                               CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type dependency_type,
-                               CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-                                   CORBA::Long maximum_priority,
-                                   RtecScheduler::RT_Info_Set_out infos,
-                                   CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException,
-                    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                    RtecScheduler::TASK_COUNT_MISMATCH));
-
-private:
-  class ACE_Scheduler* impl;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_CONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
deleted file mode 100644
index 1d42ba65e4c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ /dev/null
@@ -1,1728 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#include "math.h"
-
-#include "ace/Sched_Params.h"
-#include "DynSched.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "DynSched.i"
-#endif /* __ACE_INLINE__ */
-
-//////////////////////
-// Helper functions //
-//////////////////////
-
-// compare the DFS finish times of two task entries, order higher time *first*
-extern "C" int compare_entry_finish_times (const void *first, const void *second)
-{
-  // sort blank entries to the end
-  if (! first)
-  {
-    return (second) ? 1 : 0;
-  }
-  else if (! second)
-  {
-    return -1;
-  }
-
-  Task_Entry *first_entry =
-          * ACE_static_cast (Task_Entry **, first);
-  Task_Entry *second_entry =
-          * ACE_static_cast (Task_Entry **, second);
-
-  // sort blank entries to the end
-  if (! first_entry)
-  {
-    return (second_entry) ? 1 : 0;
-  }
-  else if (! second_entry)
-  {
-    return -1;
-  }
-
-  if (first_entry->finished () > second_entry->finished ())
-  {
-    return -1;
-  }
-  else if (first_entry->finished () < second_entry->finished ())
-  {
-    return 1;
-  }
-
-  return 0;
-}
-
-//////////////////////////////////////////
-// class ACE_DynScheduler member functions //
-//////////////////////////////////////////
-
-const char *
-ACE_DynScheduler::status_message (ACE_DynScheduler::status_t status)
-{
-  switch (status)
-  {
-    case NOT_SCHEDULED :
-      return "NOT_SCHEDULED";
-    case SUCCEEDED :
-      return "SUCCEEDED";
-    case ST_TASK_ALREADY_REGISTERED :
-      return "TASK_ALREADY_REGISTERED";
-    case ST_BAD_DEPENDENCIES_ON_TASK :
-      return "BAD_DEPENDENCIES_ON_TASK";
-    case ST_BAD_INTERNAL_POINTER :
-      return "BAD_INTERNAL_POINTER";
-    case ST_VIRTUAL_MEMORY_EXHAUSTED :
-      return "VIRTUAL_MEMORY_EXHAUSTED";
-    case ST_UNKNOWN_TASK :
-      return "UNKNOWN_TASK";
-    case TASK_COUNT_MISMATCH :
-      return "TASK_COUNT_MISMATCH";
-    case INVALID_PRIORITY :
-      return "INVALID_PRIORITY";
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    // To save a little code space (280 bytes on g++ 2.7.2/Solaris 2.5.1),
-    // we could conditionally compile them so that they're not in the
-    // runtime version.
-    case ST_UTILIZATION_BOUND_EXCEEDED :
-      return "UTILIZATION_BOUND_EXCEEDED";
-    case ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS :
-      return "INSUFFICIENT_THREAD_PRIORITY_LEVELS";
-    case ST_CYCLE_IN_DEPENDENCIES :
-      return "CYCLE_IN_DEPENDENCIES";
-    case ST_INVALID_PRIORITY_ORDERING :
-      return "INVALID_PRIORITY_ORDERING";
-    case UNABLE_TO_OPEN_SCHEDULE_FILE :
-      return "UNABLE_TO_OPEN_SCHEDULE_FILE";
-    case UNABLE_TO_WRITE_SCHEDULE_FILE :
-      return "UNABLE_TO_WRITE_SCHEDULE_FILE";
-    // End of config-only status values.
-
-    default:
-      break;
-  }
-
-  return "UNKNOWN STATUS";
-}
-
-
-ACE_DynScheduler::ACE_DynScheduler ()
-  // Set the minimum and maximum priority to those for the current platform.
-  // This shouldn't be necessary, but UPSingleProcessorOrb::initialize_reactors
-  // creates threads before the Event Channel calls Scheduler::init ().
-  : minimum_priority_ (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                       ACE_SCOPE_PROCESS))
-  , maximum_priority_ (ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
-                                                       ACE_SCOPE_PROCESS))
-  , task_entries_ (0)
-  , ordered_task_entries_ (0)
-  , thread_delineators_ (0)
-  , ordered_thread_dispatch_entries_ (0)
-  , dispatch_entries_ (0)
-  , expanded_dispatches_ (0)
-  , ordered_dispatch_entries_ (0)
-  , dispatch_entry_count_ (0)
-  , threads_ (0)
-  , timeline_ (0)
-  , lock_ ()
-  , rt_info_entries_ ()
-  , handles_ (0)
-  , runtime_filename_ (0)
-  , rt_info_filename_ (0)
-  , timeline_filename_ (0)
-  , tasks_ (0)
-  , status_ (NOT_SCHEDULED)
-  , output_level_ (0)
-  , frame_size_ (1)
-  , critical_set_frame_size_ (0)
-  , utilization_ (0.0)
-  , critical_set_utilization_ (0.0)
-  , minimum_priority_queue_ (0)
-  , minimum_guaranteed_priority_queue_ (-1)
-  , up_to_date_ (0)
-  , min_dispatch_id_ (0)
-  , max_dispatch_id_ (0)
-{
-}
-
-
-ACE_DynScheduler::~ACE_DynScheduler ()
-{
-  // release all resources used for the most recent schedule
-  reset ();
-}
-
-
-void
-ACE_DynScheduler::init (const OS_Priority minimum_priority,
-                     const OS_Priority maximum_priority,
-                     const char *runtime_filename,
-                     const char *rt_info_filename,
-                     const char *timeline_filename)
-{
-  minimum_priority_ = minimum_priority;
-  maximum_priority_ = maximum_priority;
-  runtime_filename_ = runtime_filename;
-  rt_info_filename_ = rt_info_filename;
-  timeline_filename_ = timeline_filename;
-}
-  // = initializes the scheduler.
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle)
-{
-  ACE_DynScheduler::status_t ret;
-
-  // try to store the new task's information . . .
-  switch (rt_info_entries_.insert (rt_info))
-    {
-      case 0 : // successfully inserted
-        {
-          rt_info->handle = (handle = ++handles_);
-
-          ret = SUCCEEDED;
-
-          // zero out the task entry ACT used by the scheduler
-          rt_info->volatile_token = 0;
-
-          // make sure the schedule is reset when a new task is registered
-          reset ();
-
-          if (output_level () >= 5)
-            {
-              ACE_OS::printf ("registered task \"%s\" with RT_Info at %X\n",
-                              (const char*)rt_info->entry_point,
-                              (void *) rt_info);
-            }
-        }
-        break;
-
-      case 1 : // the entry had already been inserted
-        handle = 0;
-        ret = ST_TASK_ALREADY_REGISTERED;
-        break;
-
-      default :
-        // case -1 : insert failed, probably because virtual memory exhaused
-        handle = 0;
-        ret = ST_VIRTUAL_MEMORY_EXHAUSTED;
-        break;
-    }
-
-  return ret;
-}
-  // = registers a task.
-
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::get_rt_info (Object_Name name,
-                            RT_Info* &rtinfo)
-{
-  handle_t handle;
-
-  // This makes a copy.  We can optimize this with our own string
-  // class.
-  ACE_CString lookup (name);
-  // Search the map for the <name>.  If found, return the RT_Info.
-  if (info_collection_.find (lookup, rtinfo) >= 0)
-    {
-      // If we find it, return.
-      return SUCCEEDED;
-    }
-  else
-    // Otherwise, make one, bind it, and register it.
-    {
-      rtinfo = new RT_Info;
-      rtinfo->info_type = RtecScheduler::OPERATION;
-      rtinfo->entry_point = name;
-      // Bind the rtinfo to the name.
-      if (info_collection_.bind (lookup, rtinfo) != 0)
-        {
-          delete rtinfo;
-          rtinfo = 0;
-          return FAILED; // Error!
-        }
-      else
-        {
-          // Register the task
-          status_t result = this->register_task (rtinfo, handle);
-          if (result == SUCCEEDED)
-            {
-              rtinfo->handle = handle;
-              return ST_UNKNOWN_TASK; // Didn't find it, but made one!
-            }
-          else
-            {
-              rtinfo->handle = 0;
-              return FAILED;
-            }
-        }
-    }
-}
-
-
-
-int ACE_DynScheduler::number_of_dependencies(RT_Info* rt_info)
-{
-  return rt_info->dependencies.length();
-}
-
-int ACE_DynScheduler::number_of_dependencies(RT_Info& rt_info)
-{
-  return rt_info.dependencies.length();
-}
-
-int ACE_DynScheduler::add_dependency(RT_Info* rt_info,
-                                              Dependency_Info& d)
-{
-  RT_Info *temp_info = 0; // temporary pointer to the caller's RT_Info
-
-  switch (d.dependency_type)
-  {
-    case RtecScheduler::TWO_WAY_CALL:
-
-      temp_info = rt_info;
-      break;
-
-    case RtecScheduler::ONE_WAY_CALL:
-
-      // swap the handles and point to the caller instead of the called operation
-      if (lookup_rt_info (d.rt_info, temp_info) != SUCCEEDED)
-      {
-        ACE_ERROR ((LM_ERROR, "cannot find %d to add dependency\n", d.rt_info));
-        return -1;
-      }
-
-      d.rt_info = temp_info->handle;
-
-    default:
-
-      ACE_ERROR ((LM_ERROR, "unrecognized dependency type %d for %s\n",
-                  d.dependency_type, rt_info->entry_point.in ()));
-      return -1;
-      break;
-  }
-
-  ACE_DEBUG ((LM_DEBUG, "adding dependecy to: %s\n",
-              (const char*)temp_info->entry_point));
-
-  RtecScheduler::Dependency_Set& set = temp_info->dependencies;
-  int l = set.length();
-  set.length(l + 1);
-  set[l] = d;
-  return 0;
-}
-
-void ACE_DynScheduler::export(RT_Info* info, FILE* file)
-{
-  export(*info, file);
-}
-
-void ACE_DynScheduler::export(RT_Info& info, FILE* file)
-{
-  // The .low selection is for CosTimeBase::ulonglong support.  It
-  // should change after that is finalized to support 64 bit integers
-  // on all platforms.
-  (void) ACE_OS::fprintf (file,
-                          "%s\n%d\n%ld\n%ld\n%ld\n%ld\n%d\n%d\n%ld\n%u\n"
-                          "# begin calls\n%d\n",
-                          info.entry_point.in (),
-                          info.handle,
-                          info.worst_case_execution_time.low,
-                          info.typical_execution_time.low,
-                          info.cached_execution_time.low,
-                          info.period,
-                          info.criticality,
-                          info.importance,
-                          info.quantum.low,
-                          info.threads,
-                          number_of_dependencies(info));
-
-  for (int i = 0; i < number_of_dependencies(info); ++i)
-    {
-      RT_Info tmp;
-      (void) ACE_OS::fprintf (file, "%s, %d\n",
-                              (const char*)tmp.entry_point,
-                              info.dependencies[i].number_of_calls);
-
-    }
-
-// TBD - we'll need to update this to use the information aggregated
-//       within the task entry pointed to by the RT_Info's volatile_token
-//       ACT (in fact, there is now more than one
-//       priority assignment per RT_Info, w/ disjunction on multiple
-//       priority levels, rates, etc. - iterate through and show each dispatch)
-
-  (void) ACE_OS::fprintf (file, "# end calls\n%d\n%d\n%d\n\n",
-                          info.priority,
-                          info.dynamic_subpriority,
-                          info.static_subpriority);
-
-
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::lookup_rt_info (handle_t handle,
-                               RT_Info*& rtinfo)
-{
-  if (handle < 0 || (size_t) handle > rt_info_entries_.size ())
-  {
-    return ST_UNKNOWN_TASK;
-  }
-
-  RT_Info** entry;
-  ACE_Unbounded_Set_Iterator <RT_Info *> i (rt_info_entries_);
-  while (i.next (entry) != 0)
-    {
-      i.advance ();
-      RT_Info* info_ptr = *entry;
-      if (info_ptr->handle == handle)
-        {
-          rtinfo = info_ptr;
-          return SUCCEEDED;
-        }
-    }
-
-  return ST_UNKNOWN_TASK;
-}
-  // obtains an RT_Info based on its "handle".
-
-
-void
-ACE_DynScheduler::reset ()
-{
-  // if the schedule is up to date, free resources
-  // and mark schedule as not being up to date
-  if (up_to_date_)
-  {
-    delete [] task_entries_;
-    task_entries_ = 0;
-
-    delete [] ordered_task_entries_;
-    ordered_task_entries_ = 0;
-
-    delete thread_delineators_;
-    thread_delineators_ = 0;
-
-    delete [] ordered_thread_dispatch_entries_;
-    ordered_thread_dispatch_entries_ = 0;
-
-    if (dispatch_entries_)
-    {
-      // free all the dispatch entries in the list, then the list itself
-      ACE_Unbounded_Set_Iterator <Dispatch_Entry *> iter (*dispatch_entries_);
-      Dispatch_Entry **entry = 0;
-      for (iter.first (); ! iter.done (); iter.advance (), entry = 0)
-      {
-        if ((iter.next (entry) != 0) && (entry) && (*entry))
-        {
-          delete (*entry);
-        }
-      }
-      delete dispatch_entries_;
-      dispatch_entries_ = 0;
-    }
-
-    if (expanded_dispatches_)
-    {
-      // free all the dispatch entries in the list, then the list itself
-      ACE_Unbounded_Set_Iterator <Dispatch_Entry *> expanded_iter (*expanded_dispatches_);
-      Dispatch_Entry **expanded_entry = 0;
-      for (expanded_iter.first (); ! expanded_iter.done ();
-           expanded_iter.advance (), expanded_entry = 0)
-      {
-        if ((expanded_iter.next (expanded_entry) != 0) &&
-            (expanded_entry) && (*expanded_entry))
-        {
-          delete (*expanded_entry);
-        }
-      }
-      delete expanded_dispatches_;
-      expanded_dispatches_ = 0;
-    }
-
-    delete [] ordered_dispatch_entries_;
-    ordered_dispatch_entries_ = 0;
-
-    dispatch_entry_count_ = 0;
-    threads_ = 0;
-
-    status_ = NOT_SCHEDULED;
-
-    frame_size_ = 1;
-    critical_set_frame_size_ = 0;
-    utilization_ = 0.0;
-    critical_set_utilization_ = 0.0;
-    minimum_priority_queue_ = 0;
-    minimum_guaranteed_priority_queue_ = -1;
-
-    if (timeline_)
-    {
-      // iterate over and delete the set of timeline entries
-      ACE_Ordered_MultiSet_Iterator <TimeLine_Entry_Link> t_iter (*timeline_);
-      TimeLine_Entry_Link *t_entry = 0;
-      for (t_iter.first (); ! t_iter.done (); t_iter.advance (), t_entry = 0)
-      {
-        if ((t_iter.next (t_entry) != 0) && (t_entry))
-        {
-          delete &(t_entry->entry ());
-        }
-      }
-      delete timeline_;
-      timeline_ = 0;
-         }
-
-    up_to_date_ = 0;
-  }
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::schedule (void)
-{
-  status_t temp_status = SUCCEEDED;
-
-  ACE_Guard<LOCK> ace_mon (lock_);
-
-  if (up_to_date_)
-  {
-    // do nothing if the RT_Infos have not changed
-    // since the last valid schedule was generated
-    return SUCCEEDED;
-  }
-  else
-  {
-    // save the total number of registered RT_Infos
-    tasks (rt_info_entries_.size ());
-  }
-
-  // set up the task entry data structures, check for call cycles
-  status_ = setup_task_entries ();
-
-  if (status_ == SUCCEEDED)
-  {
-    // check for cycles in the dependency graph: as a side effect, leaves
-    // the ordered_task_entries_ pointer array sorted in topological order,
-    // which is used by propagate_dispatches () to ensure that dispatches
-    // are propagated top down in the call graph.
-    status_ = check_dependency_cycles ();
-  }
-
-  if (status_ == SUCCEEDED)
-  {
-    // task entries are related, now threads can be found
-    status_ = identify_threads ();
-  }
-
-  if (status_ == SUCCEEDED)
-  {
-    // invokes the internal thread scheduling method of the strategy
-    status_ = schedule_threads ();
-  }
-
-  if (status_ == SUCCEEDED)
-  {
-    // propagate the dispatch information from the
-    // threads throughout the call graph
-    status_ = propagate_dispatches ();
-  }
-
-  if (status_ == SUCCEEDED)
-  {
-    // invokes the internal dispatch scheduling method of the strategy
-    status_ = schedule_dispatches ();
-  }
-
-  // calculate utilization, total frame size, critical set
-  if (status_ == SUCCEEDED)
-  {
-    status_ = calculate_utilization_params ();
-  }
-
-  // generate the scheduling timeline over the total frame size
-  if ((status_ == SUCCEEDED) || (status_ == ST_UTILIZATION_BOUND_EXCEEDED))
-  {
-    temp_status = create_timeline ();
-  }
-
-  if (temp_status != SUCCEEDED)
-  {
-    status_ = temp_status;
-  }
-
-  // store the timeline to a file if one was given
-  if ((timeline_filename_ != 0)  &&
-      ((status_ == SUCCEEDED) || (status_ == ST_UTILIZATION_BOUND_EXCEEDED)))
-  {
-    temp_status = output_timeline (timeline_filename_, 0);
-  }
-
-  if (temp_status != SUCCEEDED)
-  {
-    status_ = temp_status;
-  }
-
-  // if a valid schedule was not generated, clean up from the attempt
-  switch (status_)
-  {
-    // these are statuses that indicate a reasonable schedule was generated
-    case SUCCEEDED:
-    case ST_UTILIZATION_BOUND_EXCEEDED:
-
-        // if we made it here, the schedule is done
-        up_to_date_ = 1;
-
-
-      break;
-
-    default:
-
-      // (try to) remove the output files
-      if (timeline_filename_ && ACE_OS::unlink (timeline_filename_) &&
-          errno != ENOENT)
-      {
-        ACE_OS::perror ("ACE_DynScheduler::schedule (); "
-                        "unable to remove timeline file");
-      }
-      if (runtime_filename_ && ACE_OS::unlink (runtime_filename_) &&
-          errno != ENOENT)
-      {
-        ACE_OS::perror ("ACE_DynScheduler::schedule (); "
-                        "unable to remove schedule file");
-      }
-      if (rt_info_filename_  &&  ACE_OS::unlink (rt_info_filename_)  &&
-          errno != ENOENT)
-      {
-        ACE_OS::perror ("ACE_DynScheduler::schedule (); "
-                        "unable to remove rt_info file");
-      }
-
-      // free resources and remove "up_to_date" mark
-      reset ();
-
-      break;
-  }
-
-
-  return status_;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::propagate_dispatches ()
-{
-  u_long i;
-  frame_size_ = 1;
-
-  // iterate through the ordered_task_entries_ array in order
-  // from highest DFS finishing time to lowest, so that every
-  // calling dispatch is accessed before those it calls:
-  // the dispatches propagate top down through the call DAG
-  for (i = 0; i < tasks (); ++i)
-  {
-    if (ordered_task_entries_ [i]->merge_dispatches (*dispatch_entries_) < 0)
-    {
-      return ST_UNKNOWN_TASK;
-    }
-
-    if (ordered_task_entries_ [i]->effective_period () > 0)
-    {
-      frame_size_ =
-        minimum_frame_size (frame_size_,
-                            ordered_task_entries_ [i]->effective_period ());
-    }
-    else
-    {
-      return ST_UNKNOWN_TASK;
-    }
-
-  }
-
-  return SUCCEEDED;
-}
-// propagate the dispatch information from the
-// threads throughout the call graph
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::calculate_utilization_params (void)
-{
-  critical_set_frame_size_ = 0;
-  utilization_ = 0.0;
-  critical_set_utilization_ = 0.0;
-
-  minimum_priority_queue_ =
-    ordered_dispatch_entries_ [0]->priority ();
-
-  minimum_guaranteed_priority_queue_ = -1;
-
-  // iterate through ordered task entries, calculating frame size, utilization
-  for (u_int i = 0; i < dispatch_entry_count_; ++i)
-  {
-    // if we've just finished examining another priority level
-    if (minimum_priority_queue_ != ordered_dispatch_entries_ [i]->priority ())
-    {
-      // update parameters for the previous priority level
-      update_priority_level_params ();
-
-      // update the minimum priority queue
-      minimum_priority_queue_ = ordered_dispatch_entries_ [i]->priority ();
-    }
-
-    // only consider computation times of dispatches on OPERATION descriptors
-    if ((ordered_dispatch_entries_ [i]->task_entry ().info_type () ==
-          RtecScheduler::OPERATION) &&
-        (ordered_dispatch_entries_ [i]->task_entry ().effective_period () > 0))
-    {
-      // Just use low 32 bits of worst_case_execution_time.  This will
-      // have to change when CosTimeBase.idl is finalized.
-      utilization_ +=
-        ACE_static_cast(double,
-                        ordered_dispatch_entries_ [i]->
-                                                  task_entry ().rt_info ()->
-                                                    worst_case_execution_time.low) /
-        ACE_static_cast(double,
-                        ordered_dispatch_entries_ [i]->
-                          task_entry ().effective_period ());
-
-         }
-  }
-
-  // update parameters for the lowest priority level
-  update_priority_level_params ();
-
-  // if the critical set is schedulable, return success
-  return (1.0 - critical_set_utilization_ > DBL_EPSILON)
-    ? SUCCEEDED : ST_UTILIZATION_BOUND_EXCEEDED;
-}
-
-
-
-void
-ACE_DynScheduler::update_priority_level_params ()
-{
-  // if we've just finished examining a critical priority level
-  if (minimum_priority_queue_ <= minimum_critical_priority ())
-  {
-    // update the information about the critical set
-    critical_set_frame_size_ = frame_size_;
-    critical_set_utilization_ = utilization_;
-  }
-
-  // if the lowest priority level considered is schedulable
-  if (1.0 - utilization_ > DBL_EPSILON)
-  {
-    // the minimum guaranteed priority queue is the minimum considered so far
-    minimum_guaranteed_priority_queue_ = minimum_priority_queue_;
-  }
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::setup_task_entries (void)
-{
-  // store number of tasks, based on registrations
-  tasks (rt_info_entries_.size ());
-
-  // clear the decks of any previous scheduling information
-  reset ();
-
-  // allocate new table of task entries (wrappers for rt_infos)
-  ACE_NEW_RETURN (task_entries_, Task_Entry [tasks ()],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // allocate new table of pointers to task entries (for sorting)
-  ACE_NEW_RETURN (ordered_task_entries_, Task_Entry *[tasks ()],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-  ACE_OS::memset (ordered_task_entries_, 0,
-                  sizeof (Task_Entry *) * tasks ());
-
-  // allocate new unbounded set for pointers to
-  // task entries that delineate threads
-  ACE_NEW_RETURN (thread_delineators_, ACE_Unbounded_Set <Dispatch_Entry *>,
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // allocate new unbounded set for pointers to dispatch entries
-  ACE_NEW_RETURN (dispatch_entries_,
-                  ACE_Unbounded_Set <Dispatch_Entry *>,
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-
-  // set up links between rt_info_entries_, task_entries_,
-  // and ordered_task_entries_ tables
-  ACE_Unbounded_Set_Iterator <RT_Info *> iter (rt_info_entries_);
-  for (u_int i = 0; i < tasks (); ++i, iter.advance ())
-  {
-    RT_Info** info_entry;
-
-    // tie task entry to corresponding rt_info
-    if (! iter.next (info_entry))
-    {
-      return ST_UNKNOWN_TASK;
-    }
-    task_entries_ [i].rt_info (*info_entry);
-
-    // tie rt_info to corresponding task entry
-    task_entries_ [i].rt_info ()->volatile_token = (u_long) &(task_entries_ [i]);
-
-    // tie ordered task entry pointer to corresponding task entry
-    ordered_task_entries_ [i] = &(task_entries_ [i]);
-  }
-
-  // set up bidirectional links between task entries
-  return relate_task_entries ();
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::relate_task_entries (void)
-{
-  status_t status = SUCCEEDED;
-
-  // do DFS traversal of the entire RT_Info handle dependency DAG, replicating
-  // the handle dependency DAG as a calls DAG of pointers between task
-  // entries (and creating its transpose, the callers DAG).  This is done
-  // to avoid the O(n) cost of handle lookups in the RT_Infos for further
-  // traversal of the graph during schedule sorting.  One useful side effect
-  // of this traversal is that is produces a topological ordering of dependencies
-  // in the traversal finishing times, which can be used to detect call cycles.
-  long time = 0;
-
-  for (u_int i = 0; i < tasks (); ++i)
-  {
-    if ((status = relate_task_entries_recurse (time, task_entries_[i]))
-        != SUCCEEDED)
-    {
-      break;
-    }
-  }
-
-  return status;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry)
-{
-
-  // may have entered at a non-root node previously, so this does
-  //  not necessarily indicate a cycle in the dependency graph
-        if (entry.dfs_status () != Task_Entry::NOT_VISITED)
-  {
-    return SUCCEEDED;
-  }
-
-  // when a node is discovered, mark it as visited, increment "time" and
-  // store as the entry's discovery time.  This is not currently used in
-  // the scheduling algorithms, but is left in for possible future use
-  // as it shows full parenthetization of entry discovery/finishing.
-  entry.dfs_status (Task_Entry::VISITED);
-  entry.discovered (++time);
-
-  u_int dependency_count = number_of_dependencies (*entry.rt_info ());
-  if (dependency_count > 0)
-  {
-    // traverse dependencies of underlying RT_Info
-    for (u_int i = 0; i < dependency_count; ++i)
-    {
-      // obtain a pointer to the corresponding Task_Entry for each dependency
-
-      RT_Info* dependency_info = 0;
-      lookup_rt_info(entry.rt_info ()->dependencies[i].rt_info, dependency_info);
-
-      if (! dependency_info)
-      {
-        return ST_UNKNOWN_TASK;
-      }
-
-      // obtain a pointer to the Task_Entry from the dependency RT_Info
-      Task_Entry *dependency_entry_ptr =
-        (Task_Entry *) dependency_info->volatile_token;
-
-      if (! dependency_entry_ptr)
-      {
-        return ST_UNKNOWN_TASK;
-      }
-
-      // relate the entries according to the direction of the dependency
-      Task_Entry_Link *link;
-      ACE_NEW_RETURN (link,
-                      Task_Entry_Link (entry,
-                                       *dependency_entry_ptr,
-                                       entry.rt_info ()->dependencies[i].number_of_calls,
-                                       entry.rt_info ()->dependencies[i].dependency_type),
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-      dependency_entry_ptr->callers ().insert (link);
-      entry.calls ().insert (link);
-
-      // depth first recursion on the newly identified entry
-      relate_task_entries_recurse (time, *dependency_entry_ptr);
-    }
-  }
-
-  // when a node is finished, mark it as finished, increment "time" and
-  // store as the entry's finish time.  This produces a topological ordering
-  // based on dependencies, which is used to check for call cycles.
-  entry.dfs_status (Task_Entry::FINISHED);
-  entry.finished (++time);
-
-  return SUCCEEDED;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::identify_threads (void)
-{
-  u_int i, j;
-
-  // walk array of task entries, picking out thread delineators
-  for (i = 0; i < tasks_; i++)
-  {
-    // if entry has exposed threads or no callers, it may be a thread
-    if ((task_entries_ [i].rt_info ()->threads > 0) ||
-        (task_entries_ [i].callers ().is_empty ()))
-    {
-      // if its period is valued, it's a thread delineator
-      if (task_entries_ [i].rt_info ()->period > 0)
-      {
-        task_entries_ [i].effective_period (task_entries_ [i].rt_info ()->period);
-        task_entries_ [i].is_thread_delineator (1);
-
-        // create a Dispatch_Entry for each thread of the delimiting Task_Entry
-        u_int thread_count = (task_entries_ [i].rt_info ()->threads > 0)
-                             ? task_entries_ [i].rt_info ()->threads : 1;
-        // Just use low 32 bits of effective_period.  This will
-        // have to change when CosTimeBase.idl is finalized.
-        const TimeBase::ulonglong zero = {0, 0};
-        for (j = 0; j < thread_count; j++)
-        {
-          Dispatch_Entry *dispatch_ptr;
-          const TimeBase::ulonglong effective_period =
-            {task_entries_ [i].effective_period (), 0};
-          ACE_NEW_RETURN(dispatch_ptr,
-                         Dispatch_Entry (zero,
-                                         effective_period,
-                                         task_entries_ [i].rt_info ()->preemption_priority,
-                                         task_entries_ [i]),
-                         ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-          if ((task_entries_ [i].dispatches ().insert (Dispatch_Entry_Link (*dispatch_ptr)) < 0) ||
-              (dispatch_entries_->insert (dispatch_ptr) < 0) ||
-                          (thread_delineators_->insert (dispatch_ptr) < 0))
-          {
-            return ST_VIRTUAL_MEMORY_EXHAUSTED;
-          }
-
-                  // increase the count of thread dispatches
-          ++ threads_;
-        }
-      }
-      else
-      {
-        // node that no one calls and has neither rate nor threads is suspect
-        ACE_ERROR_RETURN (
-           (LM_ERROR,
-            "An operation identified by \"%s\" does not specify a period or\n"
-            "visible threads, and is not called by any other operation.  "
-            "Are there backwards dependencies?\n",
-            (const char*) task_entries_ [i].rt_info ()->entry_point),
-            ST_BAD_DEPENDENCIES_ON_TASK);
-      }
-    }
-  }
-
-  return SUCCEEDED;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::check_dependency_cycles (void)
-{
-  status_t return_status = SUCCEEDED;
-
-  // sort the pointers to entries in order of descending finish time
-  ::qsort ((void *) ordered_task_entries_,
-           tasks (),
-           sizeof (Task_Entry *),
-           compare_entry_finish_times);
-
-  // set all the dfs_status indicators to NOT_VISITED
-  u_int i;
-  for (i = 0; i < tasks (); ++i)
-  {
-          ordered_task_entries_ [i]->dfs_status (Task_Entry::NOT_VISITED);
-  }
-
-  // recurse on each entry, saving most recent status if it is not SUCCEEDED
-  for (i = 0; i < tasks (); ++i)
-  {
-    status_t status =
-      check_dependency_cycles_recurse (*ordered_task_entries_ [i]);
-
-    if (status != SUCCEEDED)
-    {
-      return_status = status;
-         }
-  }
-
-  return return_status;
-}
-  // uses strongly connected components algorithm: consider entries
-  // in order of finishing time from dependency DAG traversal,
-  // but traverse transpose graph: any entry that has a dependant
-  // that was not previously visited in this traversal is part
-  // of a dependency cycle
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry)
-{
-  status_t return_status = SUCCEEDED;
-
-  // halt DFS recursion on callers graph if entry has already been visited
-  if (entry.dfs_status () != Task_Entry::NOT_VISITED)
-  {
-    return return_status;
-  }
-
-  // mark the entry as visited
-  entry.dfs_status (Task_Entry::VISITED);
-
-  // check all the calling operations: if there is one that has not already been
-  // visited, mark the return status indicating there is a cycle, print
-  // an error message to that effect, and recurse on that dependant
-  Task_Entry_Link **calling_entry_link;
-  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> i (entry.callers ());
-  while (i.next (calling_entry_link) != 0)
-  {
-    i.advance ();
-    if ((*calling_entry_link)->caller ().dfs_status () == Task_Entry::NOT_VISITED)
-    {
-      // indicate the two tasks are in (the same) dependency cycle
-      ACE_ERROR ((LM_ERROR,
-                  "Tasks \"%s\" and \"%s\" are part of a call cycle.\n",
-                  (*calling_entry_link)->caller ().rt_info ()->entry_point.in (),
-                  entry.rt_info ()->entry_point.in ()));
-
-      // set return status, ignore status returned by recursive call:
-      // we already know there are cycles in the dependencies
-      return_status = ST_CYCLE_IN_DEPENDENCIES;
-      check_dependency_cycles_recurse ((*calling_entry_link)->caller ());
-    }
-  }
-
-  // mark the entry as finished
-  entry.dfs_status (Task_Entry::FINISHED);
-
-  return return_status;
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::schedule_threads (void)
-{
-  // make sure there are as many thread delineator
-  // entries in the set as the counter indicates
-  if (threads_ != thread_delineators_->size ())
-  {
-    return THREAD_COUNT_MISMATCH;
-  }
-
-  // allocate an array of pointers to the thread delineators
-  ACE_NEW_RETURN (ordered_thread_dispatch_entries_,
-                  Dispatch_Entry * [threads_],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-  ACE_OS::memset (ordered_thread_dispatch_entries_, 0,
-                  sizeof (Dispatch_Entry *) * threads_);
-
-
-  // copy pointers to the thread delineators from the set to the array
-  ACE_Unbounded_Set_Iterator <Dispatch_Entry *> iter (*thread_delineators_);
-  for (u_int i = 0; i < threads_; ++i, iter.advance ())
-  {
-    Dispatch_Entry** dispatch_entry;
-
-    if (! iter.next (dispatch_entry))
-    {
-      return ST_UNKNOWN_TASK;
-    }
-
-    ordered_thread_dispatch_entries_ [i] = *dispatch_entry;
-  }
-
-  // sort the thread dispatch entries into priority order
-  status_t status = sort_dispatches (ordered_thread_dispatch_entries_, threads_);
-
-  if (status == SUCCEEDED)
-  {
-    // assign priorities to the thread dispatch entries
-    status == assign_priorities (ordered_thread_dispatch_entries_, threads_);
-  }
-
-  return status;
-}
-  // thread scheduling method: sets up array of pointers to task
-  // entries that are threads, calls internal thread scheduling method
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::schedule_dispatches (void)
-{
-  dispatch_entry_count_ = dispatch_entries_->size ();
-
-  ACE_NEW_RETURN (ordered_dispatch_entries_,
-                  Dispatch_Entry * [dispatch_entry_count_],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-  ACE_OS::memset (ordered_dispatch_entries_, 0,
-                  sizeof (Dispatch_Entry *) * dispatch_entry_count_);
-
-
-
-  ACE_Unbounded_Set_Iterator <Dispatch_Entry *> iter (*dispatch_entries_);
-  for (u_int i = 0; i < dispatch_entry_count_; ++i, iter.advance ())
-  {
-    Dispatch_Entry** dispatch_entry;
-
-    if (! iter.next (dispatch_entry))
-    {
-      return ST_UNKNOWN_TASK;
-    }
-
-    ordered_dispatch_entries_ [i] = *dispatch_entry;
-  }
-
-  // sort the entries in order of priority and subpriority
-  sort_dispatches (ordered_dispatch_entries_, dispatch_entry_count_);
-
-  // assign dynamic and static subpriorities to the thread dispatch entries
-  return assign_subpriorities (ordered_dispatch_entries_, dispatch_entry_count_);
-}
-  // dispatch scheduling method: sets up an array of dispatch entries,
-  // calls internal dispatch scheduling method.
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::create_timeline ()
-{
-  // queue of previously scheduled entries that need to be rescheduled
-  ACE_Unbounded_Queue <Dispatch_Entry *> reschedule_queue;
-
-  status_t status = SUCCEEDED;
-
-  ACE_NEW_RETURN(timeline_, ACE_Ordered_MultiSet <TimeLine_Entry_Link>,
-                 ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  ACE_NEW_RETURN(expanded_dispatches_, ACE_Unbounded_Set <Dispatch_Entry *>,
-                     ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // start with the id of the first entry in the array
-  min_dispatch_id_ = ordered_dispatch_entries_[0]->dispatch_id ();
-  max_dispatch_id_ = ordered_dispatch_entries_[0]->dispatch_id ();
-
-  for (u_long i = 0; i < dispatch_entry_count_; ++i)
-  {
-    // update the minimal and maximal id values for the schedule
-    if (ordered_dispatch_entries_[i]->dispatch_id () < min_dispatch_id_)
-    {
-      min_dispatch_id_ = ordered_dispatch_entries_[i]->dispatch_id ();
-    }
-    if (ordered_dispatch_entries_[i]->dispatch_id () > max_dispatch_id_)
-    {
-      max_dispatch_id_ = ordered_dispatch_entries_[i]->dispatch_id ();
-    }
-
-    // only put OPERATION dispatches into the timeline.
-    if (ordered_dispatch_entries_[i]->task_entry().info_type () !=
-                RtecScheduler::OPERATION)
-    {
-      continue;
-    }
-
-    // schedule the current dispatch entry into the timeline
-    status = schedule_timeline_entry (*(ordered_dispatch_entries_[i]),
-                                      reschedule_queue);
-    if (status != SUCCEEDED)
-    {
-      break;
-    }
-
-    // iterate through the set of dispatch entries that need to be rescheduled
-    Dispatch_Entry *rescheduled_entry;
-    while (reschedule_queue.is_empty () == 0)
-    {
-
-      if (reschedule_queue.dequeue_head (rescheduled_entry) < 0)
-      {
-        status = ST_UNKNOWN_TASK;
-        break;
-      }
-
-      status = schedule_timeline_entry (*rescheduled_entry, reschedule_queue);
-      if (status != SUCCEEDED)
-      {
-        break;
-      }
-    }
-    if (status != SUCCEEDED)
-    {
-      break;
-    }
-
-
-    // schedule additional dispatcheds of the entry
-    // over the total frame size into the timeline
-    u_long current_frame_offset = 0;
-    u_long task_period =
-      ordered_dispatch_entries_[i]->task_entry ().effective_period ();
-    for (current_frame_offset = task_period;
-         current_frame_offset < frame_size_;
-                        current_frame_offset += task_period)
-    {
-      Dispatch_Entry *new_dispatch_entry;
-
-      // create a new dispatch entry at the current sub-frame offset
-      // Just use low 32 bits of arrival and deadline.  This will
-      // have to change when CosTimeBase.idl is finalized.
-      const TimeBase::ulonglong arrival =
-        {ordered_dispatch_entries_[i]->arrival ().low + current_frame_offset,
-         0};
-      const TimeBase::ulonglong deadline=
-        {ordered_dispatch_entries_[i]->deadline ().low + current_frame_offset,
-         0};
-
-      ACE_NEW_RETURN (
-        new_dispatch_entry,
-        Dispatch_Entry (arrival,
-                        deadline,
-                        ordered_dispatch_entries_[i]->priority (),
-                        ordered_dispatch_entries_[i]->task_entry (),
-                        ordered_dispatch_entries_[i]),
-        ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-      // add the new dispatch entry to the set of expanded dispatches
-      expanded_dispatches_->insert (new_dispatch_entry);
-
-      // schedule the new dispatch entry into the timeline
-      status = schedule_timeline_entry (*new_dispatch_entry, reschedule_queue);
-      if (status != SUCCEEDED)
-      {
-        break;
-      }
-
-      while (reschedule_queue.is_empty () == 0)
-      {
-
-        if (reschedule_queue.dequeue_head (rescheduled_entry) < 0)
-        {
-          status = ST_UNKNOWN_TASK;
-          break;
-        }
-        status = schedule_timeline_entry (*rescheduled_entry, reschedule_queue);
-        if (status != SUCCEEDED)
-        {
-          break;
-        }
-      }
-      if (status != SUCCEEDED)
-      {
-        break;
-      }
-    }
-
-    if (status != SUCCEEDED)
-    {
-      break;
-    }
-  }
-
-  return status;
-}
-  // Create a timeline.
-
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_dispatch_priorities (const char *filename)
-{
-  status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-
-  // open the file
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-  {
-    status = output_dispatch_priorities (file);
-    fclose (file);
-  }
-
-  return status;
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_dispatch_priorities (FILE *file)
-{
-
-  u_long dispatch_count = 0;
-  u_long i = 0;
-  for (i = 0; i < dispatch_entry_count_; ++i)
-  {
-    dispatch_count += frame_size_ / ordered_dispatch_entries_[i]->task_entry ().effective_period ();
-  }
-
-  if (ACE_OS::fprintf (
-      file, "\n\nSCHEDULING RESULTS:\n\n"
-            "Number of dispatches:              %3u\n"
-            "Number of threads:                 %3u\n"
-            "Number of tasks:                   %3u\n"
-            "Scheduler Status:                    [%d] %s\n"
-            "Total Frame Size:                    %lu nsec (%lf Hz)\n"
-            "Critical Set Frame Size:             %lu nsec (%lf Hz)\n"
-            "Utilization:                         %lf\n"
-            "Critical Set Utilization:            %lf\n"
-            "Minimum Priority Queue:            %3ld\n"
-            "Minimum Guaranteed Priority Queue: %3ld\n"
-            "Minimum Critical Priority:         %3ld\n\n\n"
-
-            "DISPATCH PRIORITIES:\n\n"
-            "                                  (critical              \n"
-            "                                   instant)              \n"
-            "             dispatch              dynamic      static   \n"
-            "operation          ID  priority  subpriority  subpriority\n"
-            "---------    --------  --------  -----------  -----------\n",
-      dispatch_count, threads_, tasks_, status_,
-      status_message(status_), frame_size_, (double) (10000000.0 / ((double) frame_size_)),
-      critical_set_frame_size_, (double) (10000000.0 / ((double) critical_set_frame_size_)),
-      utilization_, critical_set_utilization_, minimum_priority_queue_,
-      minimum_guaranteed_priority_queue_, minimum_critical_priority ()) < 0)
-
-  {
-    return UNABLE_TO_WRITE_SCHEDULE_FILE;
-  }
-
-  for (i = 0; i < dispatch_entry_count_; ++i)
-  {
-    if (ACE_OS::fprintf (file, "%-11s  %8lu  %8lu  %11lu  %11lu\n",
-              ordered_dispatch_entries_[i]->task_entry ().rt_info ()->entry_point.in (),
-              ordered_dispatch_entries_[i]->dispatch_id (),
-              ordered_dispatch_entries_[i]->priority (),
-              ordered_dispatch_entries_[i]->dynamic_subpriority (),
-              ordered_dispatch_entries_[i]->static_subpriority ()) < 0)
-    {
-      return UNABLE_TO_WRITE_SCHEDULE_FILE;
-    }
-  }
-
-  return SUCCEEDED;
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_dispatch_timeline (const char *filename)
-{
-  status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-
-  // open the file
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-  {
-    status = output_dispatch_timeline (file);
-    fclose (file);
-  }
-
-  return status;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_dispatch_timeline (FILE *file)
-{
-  if (ACE_OS::fprintf (
-      file, "\n\nDISPATCH TIMELINE:\n\n"
-            "                dispatch  arrival  deadline     start        stop    execution     latency        laxity\n"
-            "operation             ID   (nsec)    (nsec)    (nsec)      (nsec)  time (nsec)      (nsec)        (nsec)\n"
-            "---------    -----------  -------  --------     -----      ------  -----------      -------       ------\n") < 0)
-  {
-    return UNABLE_TO_WRITE_SCHEDULE_FILE;
-  }
-
-  // iterate through timeline, picking out entries whose prev_ pointer
-  // is null (i.e. those representing the start of a dispatch), find end
-  // of dispatch, output the operation, dispatch, priority, and time info
-  ACE_Ordered_MultiSet_Iterator <TimeLine_Entry_Link> iter (*timeline_);
-  for (iter.first (); iter.done () == 0; iter.advance ())
-  {
-    TimeLine_Entry_Link *link;
-    if ((iter.next (link) == 0) || (! link))
-    {
-      return ST_BAD_INTERNAL_POINTER;
-    }
-
-    // for each timeline entry that starts a dispatch
-    if (link->entry ().prev () == 0)
-    {
-      // find the last time slice for the dispatch
-      TimeLine_Entry *last_entry = &(link->entry ());
-      while (last_entry->next ())
-      {
-        last_entry = last_entry->next ();
-      }
-
-      // Just use low 32 bits of worst_case_execution_time.  This will
-      // have to change when CosTimeBase.idl is finalized.
-      const ACE_UINT32 tmp =
-        last_entry->stop () - link->entry ().arrival () -
-          link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-            worst_case_execution_time.low;
-      if (link->entry ().dispatch_entry ().original_dispatch ())
-      {
-        if (ACE_OS::fprintf (
-              file, "%-11s  [%4lu] %4lu  %7lu  %8lu  %8lu  %10lu  %11lu   %10ld   %10ld\n",
-              link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-                entry_point.in (),
-              link->entry ().dispatch_entry ().original_dispatch ()->dispatch_id (),
-              link->entry ().dispatch_entry ().dispatch_id (),
-              link->entry ().arrival (),
-              link->entry ().deadline (),
-              link->entry ().start (), last_entry->stop (),
-              link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-                worst_case_execution_time,
-              tmp,
-              link->entry ().deadline () - last_entry->stop ()) < 0)
-
-        {
-          return UNABLE_TO_WRITE_SCHEDULE_FILE;
-        }
-      }
-      else
-      {
-        if (ACE_OS::fprintf (
-              file, "%-11s  %11lu  %7lu  %8lu  %8lu  %10lu  %11lu   %10ld   %10ld\n",
-              link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-                entry_point.in (),
-              link->entry ().dispatch_entry ().dispatch_id (),
-              link->entry ().arrival (),
-              link->entry ().deadline (),
-              link->entry ().start (), last_entry->stop (),
-              link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-                worst_case_execution_time,
-              tmp,
-              link->entry ().deadline () - last_entry->stop ()) < 0)
-
-        {
-          return UNABLE_TO_WRITE_SCHEDULE_FILE;
-        }
-      }
-    }
-  }
-
-  return SUCCEEDED;
-}
-  // this prints the entire set of timeline outputs to the specified file
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_preemption_timeline (const char *filename)
-{
-  status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-
-  // open the file
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-  {
-    status = output_preemption_timeline (file);
-    fclose (file);
-  }
-
-  return status;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_preemption_timeline (FILE *file)
-{
-  if (ACE_OS::fprintf (
-        file, "\n\nPREEMPTION TIMELINE:\n\n"
-        "              dispatch     start      stop  \n"
-        "operation           ID    (nsec)    (nsec)\n"
-        "---------  -----------    ------    ------\n") < 0)
-  {
-    return UNABLE_TO_WRITE_SCHEDULE_FILE;
-  }
-
-  ACE_Ordered_MultiSet_Iterator <TimeLine_Entry_Link> iter (*timeline_);
-
-  TimeLine_Entry_Link *link;
-  for (iter.first (); iter.done () == 0; iter.advance ())
-  {
-    if ((iter.next (link) == 0) || (! link))
-    {
-      return ST_BAD_INTERNAL_POINTER;
-    }
-
-    if (link->entry ().dispatch_entry ().original_dispatch ())
-    {
-      if (ACE_OS::fprintf (
-            file, "%-9s  [%4lu] %4lu  %8lu  %8lu\n",
-            link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-              entry_point.in (),
-            link->entry ().dispatch_entry ().original_dispatch ()->dispatch_id (),
-            link->entry ().dispatch_entry ().dispatch_id (),
-            link->entry ().start (),
-            link->entry ().stop ()) < 0)
-      {
-        return UNABLE_TO_WRITE_SCHEDULE_FILE;
-      }
-    }
-    else
-    {
-      if (ACE_OS::fprintf (
-            file, "%-9s  %11lu  %8lu  %8lu\n",
-            link->entry ().dispatch_entry ().task_entry ().rt_info ()->
-              entry_point.in (),
-            link->entry ().dispatch_entry ().dispatch_id (),
-            link->entry ().start (),
-            link->entry ().stop ()) < 0)
-      {
-        return UNABLE_TO_WRITE_SCHEDULE_FILE;
-      }
-    }
-  }
-
-  return SUCCEEDED;
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_viewer_timeline (const char *filename)
-{
-  status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-
-  // open the file
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-  {
-    status = output_dispatch_timeline (file);
-    fclose (file);
-  }
-
-  return status;
-}
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_viewer_timeline (FILE *file)
-{
-  if (ACE_OS::fprintf (
-      file, "\n\nVIEWER TIMELINE:\n\n"
-            "                                    arrival  deadline   completion    execution  \n"
-            "operation  utilization   overhead    (nsec)    (nsec)  time (nsec)  time (nsec)\n"
-            "---------  -----------   --------   -------  --------  -----------  -----------\n") < 0)
-  {
-    return UNABLE_TO_WRITE_SCHEDULE_FILE;
-  }
-
-  // iterate through timeline, picking out dispatches in chronological
-  // order of operation completion time
-  int entries_remain = 1;
-  u_long accumulated_execution = 0;
-  u_long current_accumulated_execution = 0;
-  u_long last_completion = 0;
-  u_long current_completion = 0;
-  TimeLine_Entry *current_entry = 0;
-  TimeLine_Entry *current_last_entry = 0;
-
-  while (entries_remain)
-  {
-    last_completion = current_completion;
-
-    accumulated_execution = 0;
-    current_accumulated_execution = 0;
-    current_completion = 0;
-    current_entry = 0;
-    current_last_entry = 0;
-
-    ACE_Ordered_MultiSet_Iterator <TimeLine_Entry_Link> iter (*timeline_);
-    for (iter.first (); iter.done () == 0; iter.advance ())
-    {
-      TimeLine_Entry_Link *link;
-      if ((iter.next (link) == 0) || (! link))
-      {
-        return ST_BAD_INTERNAL_POINTER;
-      }
-
-      accumulated_execution += link->entry ().stop () -
-                               link->entry ().start ();
-
-      // for each timeline entry that starts a dispatch
-      if (link->entry ().prev () == 0)
-      {
-        // find the last time slice for the dispatch
-        TimeLine_Entry *last_entry = &(link->entry ());
-        while (last_entry->next ())
-        {
-          last_entry = last_entry->next ();
-        }
-
-        if ((last_entry->stop () > last_completion) &&
-            ((last_entry->stop () < current_completion) ||
-             (current_completion == 0)))
-        {
-          current_completion = last_entry->stop ();
-          current_entry = &(link->entry ());
-          current_last_entry = last_entry;
-        }
-      }
-
-      // save the accumulated execution if we're at
-      // the last entry for the current dispatch
-      if (current_last_entry == &(link->entry ()))
-      {
-        current_accumulated_execution = accumulated_execution;
-      }
-    }
-
-    // if we found another entry, print it (otherwise we're done)
-    if (current_entry)
-    {
-      if (ACE_OS::fprintf (
-            file, "%-11s  %9lf  %9lf  %8lu  %8lu  %11lu  %11lu\n",
-            current_entry->dispatch_entry ().task_entry ().rt_info ()->
-              entry_point.in (),
-            (double) (((double) current_accumulated_execution) /
-                      ((double) current_completion)),
-            0.0,
-            current_entry->arrival (),
-            current_entry->deadline (),
-            current_last_entry->stop (),
-            current_entry->dispatch_entry ().task_entry ().rt_info ()->
-              worst_case_execution_time) < 0)
-      {
-        return UNABLE_TO_WRITE_SCHEDULE_FILE;
-      }
-    }
-    else
-    {
-      entries_remain = 0;
-    }
-  }
-
-  return SUCCEEDED;
-}
-
-
-ACE_DynScheduler::status_t
-ACE_DynScheduler::output_timeline (const char *filename, const char *heading)
-{
-  status_t status = SUCCEEDED;
-  FILE *file = 0;
-
-  // bail out if we're not up to date or there is no timeline
-  if ((! up_to_date_) || (! timeline_))
-  {
-    status = NOT_SCHEDULED;
-  }
-
-  if (status == SUCCEEDED)
-  {
-    // open the file
-    file = ACE_OS::fopen (filename, "w");
-    if (! file)
-    {
-      status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-  }
-
-  if ((status == SUCCEEDED) && (heading))
-  {
-    if (ACE_OS::fprintf (file, "%s\n\n", heading) < 0)
-    {
-      status = UNABLE_TO_WRITE_SCHEDULE_FILE;
-    }
-  }
-
-  if (status == SUCCEEDED)
-  {
-    status = output_dispatch_priorities (file);
-  }
-
-  if (status == SUCCEEDED)
-  {
-    status = output_dispatch_timeline (file);
-  }
-
-  if (status == SUCCEEDED)
-  {
-    status = output_preemption_timeline (file);
-  }
-
-  if (status == SUCCEEDED)
-  {
-    status = output_viewer_timeline (file);
-  }
-
-  if (file)
-  {
-    fclose (file);
-  }
-
-  return status;
-}
-  // this prints the entire set of timeline outputs to the specified file
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>;
-template class ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>;
-template class ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>;
-template class ACE_DNode<Dispatch_Entry_Link>;
-template class ACE_DNode<Dispatch_Proxy_Iterator *>;
-template class ACE_DNode<TimeLine_Entry_Link>;
-template class ACE_Node<RtecScheduler::RT_Info *>;
-template class ACE_Node<Task_Entry_Link *>;
-template class ACE_Ordered_MultiSet<Dispatch_Entry_Link>;
-template class ACE_Ordered_MultiSet<Dispatch_Proxy_Iterator *>;
-template class ACE_Ordered_MultiSet<TimeLine_Entry_Link>;
-template class ACE_Ordered_MultiSet_Iterator<Dispatch_Entry_Link>;
-template class ACE_Ordered_MultiSet_Iterator<Dispatch_Proxy_Iterator *>;
-template class ACE_Ordered_MultiSet_Iterator<TimeLine_Entry_Link>;
-template class ACE_Unbounded_Queue<Dispatch_Entry *>;
-template class ACE_Unbounded_Queue_Iterator<Dispatch_Entry *>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info *>;
-template class ACE_Unbounded_Set<Task_Entry_Link *>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info *>;
-template class ACE_Unbounded_Set_Iterator<Task_Entry_Link *>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_Thread_Mutex>
-#pragma instantiate ACE_DNode<Dispatch_Entry_Link>
-#pragma instantiate ACE_DNode<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_DNode<TimeLine_Entry_Link>
-#pragma instantiate ACE_Node<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Node<Task_Entry_Link *>
-#pragma instantiate ACE_Ordered_MultiSet<Dispatch_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_Ordered_MultiSet<TimeLine_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<Dispatch_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<TimeLine_Entry_Link>
-#pragma instantiate ACE_Unbounded_Queue<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Unbounded_Set<Task_Entry_Link *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<Task_Entry_Link *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
deleted file mode 100644
index aa811987a7a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#if ! defined (DYNSCHED_H)
-#define DYNSCHED_H
-
-#include "ace/ACE.h"
-#include "ace/Map_Manager.h"
-#include "ace/Message_Block.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-#include "SchedEntry.h"
-
-class TAO_ORBSVCS_Export ACE_DynScheduler
-  // = TITLE
-  //    dispatch scheduling interface.
-  //
-  // = DESCRIPTION
-  //    This abstract base class provides the majority of the
-  //    implementation of either an off-line scheduler, or the
-  //    necessary on-line component of the Scheduler.
-{
-public:
-
-  //////////////////////////////
-  // public type declarations //
-  //////////////////////////////
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  typedef ACE_Map_Entry <ACE_CString, RT_Info *> Thread_Map_Entry;
-  typedef ACE_Map_Manager <ACE_CString, RT_Info *, ACE_Null_Mutex>
-      Thread_Map;
-  typedef ACE_Map_Iterator <ACE_CString, RT_Info *, ACE_Null_Mutex>
-      Thread_Map_Iterator;
-
-  typedef const char *Object_Name;
-  // Objects are named by unique strings.
-
-  enum status_t {
-    // The following are used both by the runtime Scheduler and during
-    // scheduling.
-      NOT_SCHEDULED = -1    // the schedule () method has not been called yet
-    , FAILED = -1
-    , SUCCEEDED
-    , ST_UNKNOWN_TASK
-    , ST_TASK_ALREADY_REGISTERED
-    , ST_BAD_DEPENDENCIES_ON_TASK
-    , ST_BAD_INTERNAL_POINTER
-    , ST_VIRTUAL_MEMORY_EXHAUSTED
-
-    // The following are only used by the runtime Scheduler.
-    , TASK_COUNT_MISMATCH     // only used by schedule ()
-    , THREAD_COUNT_MISMATCH   // only used by schedule ()
-    , INVALID_PRIORITY        // only used by schedule (): mismatch of
-                              // (off-line, maybe) Scheduler output to
-                              // the runtime Scheduler component.
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    , ST_UTILIZATION_BOUND_EXCEEDED
-    , ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS
-    , ST_CYCLE_IN_DEPENDENCIES
-    , ST_INVALID_PRIORITY_ORDERING
-    , UNABLE_TO_OPEN_SCHEDULE_FILE
-    , UNABLE_TO_WRITE_SCHEDULE_FILE
-  };
-
-
-
-  /////////////////////////////
-  // public member functions //
-  /////////////////////////////
-
-  virtual ~ACE_DynScheduler ();
-    // public dtor
-
-  // = Utility function for outputting the textual
-  //   representation of a status_t value.
-  static const char * status_message (status_t status);
-
-  // = Initialize the scheduler.
-  void init (const OS_Priority minimum_priority,
-             const OS_Priority maximum_priority,
-             const char *runtime_filename = 0,
-             const char *rt_info_filename = 0,
-             const char *timeline_filename = 0);
-  // The minimum and maximum priority are the OS-specific priorities that
-  // are used when creating the schedule (assigning priorities).  The
-  // minimum_priority is the priority value of the lowest priority.
-  // It may be numerically higher than the maximum_priority, on OS's such
-  // as VxWorks that use lower values to indicate higher priorities.
-  //
-  // When Scheduler::schedule is called, the schedule is output to the
-  // file named by "runtime_filename" if it is non-zero.
-  // This file is compilable; it is linked into the runtime executable
-  // to provide priorities to the runtime scheduling component.
-  // If the "rt_info_filename" is non-zero, the RT_Info for
-  // every task is exported to it.  It is not used at runtime.
-  // If the "timeline_filename" is non-zero, the timeline output
-  // file is created.  It is not used at runtime.
-  //
-  // The runtime scheduling component ignores these filenames.  It just
-  // uses the priorities that were linked in to the executable, after
-  // converting them to platform-specific values.
-
-  void reset ();
-  // Prepare for another schedule computation: once a reasonable schedule
-  // has been generated, a new schedule will not be computed unless an
-  // RT_Info is added, or this method is invoked to clear the previous
-  // schedule (allows fault correcting alteration of RT_Infos outside the
-  // scheduler implementation, followed by generation of a new schedule).
-
-  // = Registers a task.
-  status_t register_task (RT_Info *, handle_t &handle);
-  // If the Task registration succeeds, this function returns SUCCEEDED
-  // and sets "handle" to a unique identifier for the task.
-  // Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
-  // TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
-  // only be registered once.)
-
-  status_t get_rt_info (Object_Name name, RT_Info* &rtinfo);
-  // Tries to find the RT_Info corresponding to <name> in the RT_Info
-  // database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
-  // set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
-  // was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
-  // the task must call RT_Info::set to fill in execution properties.
-  // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
-  // (rtinfo, 0, handle) is called.  Returns FAILED if an error
-  // occurs.
-  //
-  // One motivation for allocating RT_Info's from within the Scheduler
-  // is to allow RT_Infos to persist after the tasks that use them.
-  // For instance, we may want to call this->schedule right before the
-  // application exits a configuration run.  If the tasks have been
-  // deleted (deleting their RT_Infos with them), this->schedule will
-  // fail.
-
-  status_t lookup_rt_info (handle_t handle, RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
-
-  status_t schedule (void);
-  // This sets up the data structures, invokes the internal scheduling method.
-
-  status_t output_timeline (const char *filename, const char *heading);
-  // this prints the entire set of timeline outputs to the specified file
-
-
-  // = Access a thread priority.
-//  TBD - put this back in, but with dynamic subpriority as well as static
-//  int priority (const handle_t handle,
-//                OS_Priority &OS_priority,
-//                 Preemption_Priority &preemption_priority,
-//                 Sub_Priority &dynamic_subpriority,
-//                 Sub_Priority &static_subpriority);
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle".  Defines "dynamic subpriority" as the strategy
-  // specific assignment of dynamic subpriority within a priority level, and
-  // "static subpriority" as the minimal importance and topological ordering.
-  // Returns 0 on success, or -1 if an invalid handle was supplied.
-  // Queue numbers are platform-independent priority values, ranging from
-  // a highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()".
-
-  // = Access the platform-independent priority value of the lowest-priority
-  //   thread.
-
-   Preemption_Priority minimum_priority_queue () const;
-  // This is intended for use by the Event Channel, so it can determine the
-  // number of priority dispatch queues to create.
-
-  // = Access the number of tasks.
-  u_int tasks () const;
-
-  // = Access the number of threads.
-  u_int threads () const;
-
-  // = Access the current scheduler status.
-  status_t status () const;
-
-  // = Access the current output (debugging) level.
-  u_int output_level () const;
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
-
-  // = Set the scheduler output (debugging) level.
-  void output_level (const u_int level);
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2 (debug)
-
-  int add_dependency(RT_Info* rt_info,
-                             Dependency_Info& d);
-
-  static int number_of_dependencies(RT_Info* rt_info);
-  static int number_of_dependencies(RT_Info& rt_info);
-
-  // TBD - modify these to take a Task_Entry and show all its dispatches
-  static void export(RT_Info*, FILE* file);
-  static void export(RT_Info&, FILE* file);
-
-  // accessors for the minimal and maximal dispatch entry id in the schedule
-  u_long min_dispatch_id () const;
-  u_long max_dispatch_id () const;
-
-protected:
-
-  ////////////////////////////////
-  // protected member functions //
-  ////////////////////////////////
-
-  ACE_DynScheduler ();
-
-
-  status_t schedule_threads (void);
-  // thread scheduling method: sets up array of pointers to task
-  // entries that are threads, calls internal thread scheduling method
-
-  status_t schedule_dispatches (void);
-  // dispatch scheduling method: sets up an array of dispatch entries,
-  // calls internal dispatch scheduling method.
-
-  // = Set the minimum priority value.
-  void minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number);
-
-  // = Set the number of tasks.
-  void tasks (const u_int tasks);
-
-  // = Set the number of threads.
-  void threads (const u_int threads);
-
-  // = Set the current scheduler status.
-  void status (const status_t new_status);
-
-  /////////////////////////////////////////////
-  // protected pure virtual member functions //
-  /////////////////////////////////////////////
-
-  virtual Preemption_Priority minimum_critical_priority () = 0;
-  // = determine the minimum critical priority number
-
-  virtual status_t sort_dispatches (Dispatch_Entry **, u_int) = 0;
-  // internal sorting method: this orders the dispatches by
-  // static priority and dynamic and static subpriority.
-
-  virtual status_t assign_priorities (Dispatch_Entry **dispatches,
-                                      u_int count) = 0;
-  // = assign priorities to the sorted dispatches
-
-  virtual status_t assign_subpriorities (Dispatch_Entry **dispatches,
-                                         u_int count) = 0;
-  // = assign dynamic and static sub-priorities to the sorted dispatches
-
-  virtual status_t
-    schedule_timeline_entry (Dispatch_Entry &dispatch_entry,
-                             ACE_Unbounded_Queue <Dispatch_Entry *>
-                               &reschedule_queue) = 0;
-  // = schedule a dispatch entry into the timeline being created
-
-  ////////////////////////////
-  // protected data members //
-  ////////////////////////////
-
-  OS_Priority minimum_priority_;
-  // The minimum OS thread priority value that the application specified (in
-  // its call to init ()).
-
-  OS_Priority maximum_priority_;
-  // The maximum OS thread priority value that the application specified (in
-  // its call to init ()).
-
-  Task_Entry *task_entries_;
-  // Collection of known tasks.
-
-  Task_Entry **ordered_task_entries_;
-  // An array of pointers to task entries which wrap RT_Infos. It is
-  // sorted by the DFS finishing time and then the resulting topological
-  // over the call graph is used both to check for call chain cycles and
-  // to correctly propagate scheduling information away from the threads.
-
-  ACE_Unbounded_Set <Dispatch_Entry *> *thread_delineators_;
-    // identifies dispatch entries whose underlying
-    // Task Entries delineate threads
-
-  Dispatch_Entry **ordered_thread_dispatch_entries_;
-  // An array of pointers to task entries which initiate call chains.
-  // It is sorted by the schedule_threads method defined in the derived class.
-
-  ACE_Unbounded_Set <Dispatch_Entry *> *dispatch_entries_;
-    // the set of dispatch entries
-
-  ACE_Unbounded_Set <Dispatch_Entry *> *expanded_dispatches_;
-    // expanded set of dispatch entries (all dispatch entries produced by
-    // expanding sub-frames to the total frame size during timeline creation)
-
-  Dispatch_Entry **ordered_dispatch_entries_;
-  // An array of pointers to  dispatch entries. It is
-  // sorted by the schedule_dispatches method.
-
-  u_int dispatch_entry_count_;
-  // the number of dispatch entries in the schedule
-
-  u_int threads_;
-  // the number of dispatch entries in the schedule
-
-  ACE_Ordered_MultiSet <TimeLine_Entry_Link> *timeline_;
-  // Ordered MultiSet of timeline entries.
-
-private:
-
-  ///////////////////////////////
-  // private type declarations //
-  ///////////////////////////////
-
-  typedef ACE_CString EXT;
-  typedef RT_Info *INT;
-
-#if defined (ACE_HAS_THREADS)
-  typedef ACE_Thread_Mutex SYNCH;
-  typedef ACE_Recursive_Thread_Mutex LOCK;
-#else
-  typedef ACE_Null_Mutex SYNCH;
-  typedef ACE_Null_Mutex LOCK;
-#endif /* ACE_HAS_THREADS */
-
-  typedef ACE_Map_Manager<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection;
-  typedef ACE_Map_Iterator<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry;
-
-  //////////////////////////////
-  // private member functions //
-  //////////////////////////////
-
-  status_t create_timeline ();
-  // Create a timeline.
-
-  status_t output_dispatch_timeline (const char *filename);
-  status_t output_dispatch_timeline (FILE *file);
-  // this prints a dispatch timeline to the specified file
-
-  status_t output_preemption_timeline (const char *filename);
-  status_t output_preemption_timeline (FILE *file);
-  // this prints a preemption timeline to the specified file
-
-  status_t output_viewer_timeline (const char *filename);
-  status_t output_viewer_timeline (FILE *file);
-  // this prints a scheduling viewer timeline to the specified file
-
-  status_t output_dispatch_priorities (const char *filename);
-  status_t output_dispatch_priorities (FILE *file);
-  // this prints the scheduling parameters and assigned priorities to the specified file
-
-  // = Set up the task entry data structures
-  status_t setup_task_entries (void);
-
-  // = Relate the task entries according to the
-  //   dependencies of the underlying RT_Infos
-  status_t relate_task_entries (void);
-
-  // recursively traverse dependency graph, relating
-  // task entries and performing DFS start/end marking
-  status_t relate_task_entries_recurse (long &time, Task_Entry &entry);
-
-  // identify thread delimiters
-  status_t identify_threads (void);
-
-  // checks for cycles in the dependency graph
-  status_t check_dependency_cycles (void);
-
-  // recursion used to check for cycles in the dependency graph
-  status_t check_dependency_cycles_recurse (Task_Entry &entry);
-
-  // = Aggregate the scheduling parameters of the threads
-  status_t aggregate_thread_parameters (void);
-
-  // = recursion over oneway dependencies used to aggregate thread parameters
-  status_t aggregate_oneways_recurse (Task_Entry &entry);
-
-  // = recursion over twoway dependencies used to aggregate thread parameters
-  status_t aggregate_twoways_recurse (Task_Entry &entry);
-
-  // update the scheduling parameters for the previous priority level
-  void update_priority_level_params ();
-
-  status_t propagate_dispatches ();
-  // propagate the dispatch information from the
-  // threads throughout the call graph
-
-  status_t calculate_utilization_params ();
-  // calculate utilization, frame size, etc.
-
-  // the following functions are not implememented
-  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler (const ACE_DynScheduler &))
-  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler &operator= (const ACE_DynScheduler &))
-
-  //////////////////////////
-  // private data members //
-  //////////////////////////
-
-  LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
-
-  ACE_Unbounded_Set <RT_Info *> rt_info_entries_;
-  // Collection of known tasks.
-
-  u_int handles_;
-  // The number of task handles dispensed so far.
-
-  const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
-
-  const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
-
-  const char *timeline_filename_;
-  // The destination of the timeline.
-
-  Info_Collection info_collection_;
-  // A binding of name to rt_info.  This is the mapping for every
-  // rt_info in the process.
-
-  u_int tasks_;
-
-  status_t status_;
-
-  u_int output_level_;
-
-  u_long frame_size_; /* 100 nanosec */
-    // minimum frame size for all tasks
-
-  u_long critical_set_frame_size_; /* 100 nanosec */
-    // minimum frame size for guaranteed schedulable tasks
-
-  double utilization_;
-    // total utilization for all tasks
-
-  double critical_set_utilization_;
-    // minimum frame size for guaranteed schedulable tasks
-
-  Preemption_Priority minimum_priority_queue_;
-    // The platform-independent priority value of the Event Channel's
-    // minimum priority dispatch queue.  The value of the maximum priority
-    // dispatch queue is always 0.
-
-  Preemption_Priority minimum_guaranteed_priority_queue_;
-    // The platform-independent priority value of the minimum priority dispatch
-    // queue whose operations are guaranteed to be schedulable.  The value of
-    // the maximum priority dispatch queue is always 0, -1 indicates none can
-    // be guaranteed.
-
-  u_int up_to_date_;
-    // indicates whether the a valid schedule has been generated since the last
-    // relevant change (addition, alteration or removal of an RT_Info, etc.)
-
-  u_long min_dispatch_id_;
-
-  u_long max_dispatch_id_;
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "DynSched.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* DYNSCHED_H */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
deleted file mode 100644
index 3eb2a3c0bda..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    DynSched.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-
-////////////////////////////
-// Class ACE_DynScheduler //
-////////////////////////////
-
-ACE_INLINE ACE_DynScheduler::Preemption_Priority
-ACE_DynScheduler::minimum_priority_queue () const
-{
-  return minimum_priority_queue_;
-}
-  // This is intended for use by the Event Channel, so it can determine the
-  // number of priority dispatch queues to create.
-
-// = Access the number of tasks.
-ACE_INLINE u_int
-ACE_DynScheduler::tasks () const
-{
-  return tasks_;
-}
-
-  // = Access the number of threads.
-ACE_INLINE u_int
-ACE_DynScheduler::threads () const
-{
-  return threads_;
-}
-
-  // = Access the current scheduler status.
-ACE_INLINE ACE_DynScheduler::status_t
-ACE_DynScheduler::status () const
-{
-  return status_;
-}
-
-  // = Access the current output (debugging) level.
-ACE_INLINE u_int
-ACE_DynScheduler::output_level () const {
-  return output_level_;
-}
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
-
-  // = Set the scheduler output (debugging) level.
-ACE_INLINE void
-ACE_DynScheduler::output_level (const u_int level)
-{
-  output_level_ = level;
-}
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2
-  // (debug)
-
-ACE_INLINE void
-ACE_DynScheduler::minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number)
-{
-  minimum_priority_queue_ = minimum_priority_queue_number;
-}
-
-  // = Set the number of tasks.
-ACE_INLINE void
-ACE_DynScheduler::tasks (const u_int tasks)
-{
-  tasks_ = tasks;
-}
-
-  // = Set the number of threads.
-// TBD - remove this - allowing the application to modify this is *not* good
-ACE_INLINE void
-ACE_DynScheduler::threads (const u_int threads)
-{
-  threads_ = threads;
-}
-
-  // = Set the current scheduler status.
-ACE_INLINE void
-ACE_DynScheduler::status (const status_t new_status)
-{
-  status_ = new_status;
-}
-
-ACE_INLINE u_long
-ACE_DynScheduler::min_dispatch_id () const
-{
-  return min_dispatch_id_;
-}
-
-ACE_INLINE u_long
-ACE_DynScheduler::max_dispatch_id () const
-{
-  return max_dispatch_id_;
-}
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
deleted file mode 100644
index 32adf6fc001..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.cpp
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#include "SchedEntry.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "SchedEntry.i"
-#endif /* __ACE_INLINE__ */
-
-//////////////////////
-// Helper Functions //
-//////////////////////
-
-// TBD - move this to the ACE class
-// Euclid's greatest common divisor algorithm
-u_long gcd (u_long x, u_long y)
-{
-  if (y == 0)
-  {
-    return x;
-  }
-  else
-  {
-    return gcd (y, x % y);
-  }
-}
-
-
-// TBD - move this to the ACE class
-// calculate the minimum frame size that
-u_long minimum_frame_size (u_long period1, u_long period2)
-{
-  // first, find the greatest common divisor of the two periods
-  u_long greatest_common_divisor = gcd (period1, period2);
-
-  // explicitly consider cases to reduce risk of possible overflow errors
-  if (greatest_common_divisor == 1)
-  {
-    // periods are relative primes: just multiply them together
-    return period1 * period2;
-  }
-  else if (greatest_common_divisor == period1)
-  {
-    // the first period divides the second: return the second
-    return period2;
-  }
-  else if (greatest_common_divisor == period2)
-  {
-    // the second period divides the first: return the first
-    return period1;
-  }
-  else
-  {
-    // the current frame size and the entry's effective period
-    // have a non-trivial greatest common divisor: return the
-    // product of factors divided by those in their gcd.
-    return (period1 * period2) / greatest_common_divisor;
-  }
-}
-
-
-//////////////////////
-// Class Task_Entry //
-//////////////////////
-
-Task_Entry::Task_Entry ()
-  : rt_info_ (0)
-  , effective_period_(0)
-  , dfs_status_ (NOT_VISITED)
-  , discovered_ (-1)
-  , finished_ (-1)
-  , is_thread_delineator_ (0)
-  , calls_ ()
-  , callers_ ()
-{
-}
-
-Task_Entry::~Task_Entry ()
-{
-  // zero out the task entry ACT in the corresponding rt_info
-  rt_info_->volatile_token = 0;
-
-  // iterate through the "calls" set of Task Entry Links and free each one
-  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter(calls_);
-  Task_Entry_Link **link = 0;
-  for (iter.first (); ! iter.done (); iter.advance (), link = 0)
-  {
-    if ((iter.next (link) != 0) && (link) && (*link))
-    {
-      // remove the link object pointer from the calling
-      // entry's "callers" set and destroy the link object
-      (*link)->called ().callers_.remove (*link);
-      delete (*link);
-    }
-  }
-}
-
-// merge dispatches according to info type and type of call,
-// update relevant scheduling characteristics for this entry
-int
-Task_Entry::merge_dispatches (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries)
-{
-  int result = 0;
-  switch (info_type ())
-  {
-    case RtecScheduler::DISJUNCTION:
-
-      // prohibit two-way dispatches of a disjunction group,
-      // and disjunctively merge its one-way dispatches.
-      // NOTE: one interpretation of disjunction for two-way calls
-      //       is that the caller calls one OR the other, but this
-      //       is problematic: how do we map the dispatches for this ?
-      result = prohibit_dispatches (RtecScheduler::TWO_WAY_CALL);
-      if (result == 0)
-      {
-        result = disjunctive_merge (RtecScheduler::ONE_WAY_CALL, dispatch_entries);
-      }
-
-      break;
-
-    case RtecScheduler::CONJUNCTION:
-
-      // prohibit two-way dispatches of a conjunction group,
-      // and conjunctively merge its one-way dispatches.
-      // NOTE: one interpretation of disjunction for two-way calls
-      //       is that the caller calls BOTH, so that there is a
-      //       disjunctive merge of each two-way, as for the OPERATION
-      //       (prohibit for now, as the additional complexity of allowing
-      //       conjunctions of two-ways, but not disjunctions does not
-      //       buy us anything, anyway).
-      result = prohibit_dispatches (RtecScheduler::TWO_WAY_CALL);
-      if (result == 0)
-      {
-        result = conjunctive_merge (RtecScheduler::ONE_WAY_CALL, dispatch_entries);
-      }
-
-      break;
-
-    case RtecScheduler::OPERATION:
-
-      // disjunctively merge the operation's two-way dispatches,
-      // and conjunctively merge its one-way dispatches.
-      result = disjunctive_merge (RtecScheduler::TWO_WAY_CALL, dispatch_entries);
-      if (result == 0)
-      {
-        result = conjunctive_merge (RtecScheduler::ONE_WAY_CALL, dispatch_entries);
-      }
-
-      break;
-
-
-    default:
-
-      // there should not be any other kind of RT_Info, or if
-      // there is, the above switch logic is in need of repair.
-      result = -1;
-      break;
-  }
-
-  return result;
-}
-
-
-
-// prohibit calls of the given type: currently used to enforce
-// the notion that two-way calls to disjunctive or conjunctive
-// RT_Infos do not have any defined meaning, and thus should be
-// considered dependency specification errors: if these constraints
-// are removed in the future, this method should be removed as well
-// Returns 0 if all is well, or -1 if an error has occurred.
-int
-Task_Entry::prohibit_dispatches (Dependency_Type dt)
-{
-  // iterate over the set of dependencies, ensuring
-  // none of them has the given dependency type
-  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
-  while (! iter.done ())
-  {
-    Task_Entry_Link **link;
-    if ((iter.next (link) == 0) || (! link) || (! (*link)) ||
-        ((*link)->dependency_type () == dt))
-    {
-      return -1;
-    }
-
-    iter.advance ();
-  }
-
-  return 0;
-}
-
-
-// perform disjunctive merge of arrival times of oneway calls:
-// all arrival times of all dependencies are duplicated by the
-// multiplier and repetition over the new frame size and merged
-int
-Task_Entry::disjunctive_merge (
-  Dependency_Type dt,
-  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries)
-{
-  // iterate over the set of dependencies, ensuring
-  // none of them has the given dependency type
-  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> iter (callers_);
-  while (! iter.done ())
-  {
-    Task_Entry_Link **link;
-    if ((iter.next (link) == 0) || (! link) || (! (*link)))
-    {
-      return -1;
-    }
-
-    // the link matches the dependency type given
-    if ((*link)->dependency_type () == dt)
-    {
-      // merge the caller's dispatches into the current set
-      if (merge_frames (dispatch_entries, *this, dispatches_,
-                       (*link)->caller ().dispatches_, effective_period_,
-                       (*link)->caller ().effective_period_,
-                       (*link)->number_of_calls ()) < 0)
-      {
-        return -1;
-      }
-    }
-
-    iter.advance ();
-  }
-
-  return 0;
-}
-
-// perform conjunctive merge of arrival times of calls:
-// all arrival times of all dependencies are duplicated by the
-// multiplier and repetition over the new frame size and then
-// iteratively merged by choosing the maximal arrival time at
-// the current position in each queue (iteration is in lockstep
-// over all queues, and ends when any queue ends).
-int
-Task_Entry::conjunctive_merge (
-  Dependency_Type dt,
-  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries)
-{
-  int result = 0;
-
-  // iterate over the dependencies, and determine the total frame size
-  u_long frame_size = 1;
-  ACE_Unbounded_Set_Iterator <Task_Entry_Link *> dep_iter (callers_);
-  for (dep_iter.first (); dep_iter.done () == 0; dep_iter.advance ())
-  {
-    Task_Entry_Link **link;
-    if ((dep_iter.next (link) == 0) || (! link) || (! (*link)))
-    {
-      return -1;
-    }
-
-    // the link matches the dependency type given
-    if ((*link)->dependency_type () == dt)
-    {
-      frame_size = minimum_frame_size (frame_size, (*link)->caller ().effective_period_);
-    }
-  }
-
-  // reframe dispatches in the set to the new frame size
-  // (expands the set's effective period to be the new enclosing frame)
-  if (reframe (dispatch_entries, *this, dispatches_,
-               effective_period_, frame_size) < 0)
-  {
-    return -1;
-  }
-
-  // A set and iterator for virtual dispatch sets
-  // over which the conjunction will iterate
-  ACE_Ordered_MultiSet <Dispatch_Proxy_Iterator *> conj_set;
-  ACE_Ordered_MultiSet_Iterator <Dispatch_Proxy_Iterator *> conj_set_iter (conj_set);
-
-  // iterate over the dependencies, and for each of the given call type,
-  // create a Dispatch_Proxy_Iterator for the caller's dispatch set, using
-  // the caller's period, the total frame size, and the number of calls:
-  // if any of the sets is empty, just return 0;
-  for (dep_iter.first (); dep_iter.done () == 0; dep_iter.advance ())
-  {
-    Task_Entry_Link **link;
-    if ((dep_iter.next (link) == 0) || (! link) || (! (*link)))
-    {
-      return -1;
-    }
-
-    // the link matches the dependency type given
-    if ((*link)->dependency_type () == dt)
-    {
-      Dispatch_Proxy_Iterator *proxy_ptr;
-      ACE_NEW_RETURN (proxy_ptr,
-                      Dispatch_Proxy_Iterator (
-                        (*link)->caller ().dispatches_,
-                        (*link)->caller ().effective_period_,
-                        frame_size, (*link)->number_of_calls ()),
-                      -1);
-
-      // if there are no entries in the virtual set, we're done
-      if (proxy_ptr->done ())
-      {
-        return 0;
-      }
-      if (conj_set.insert (proxy_ptr, conj_set_iter) < 0)
-      {
-        return -1;
-      }
-    }
-  }
-
-  // loop, adding conjunctive dispatches, until one of the conjunctive
-  // dispatch sources runs out of entries over the total frame
-  conj_set_iter.first ();
-  int more_dispatches = (conj_set_iter.done ()) ? 0 : 1;
-  while (more_dispatches)
-  {
-    u_long arrival = 0;
-    u_long deadline = 0;
-    long priority = 0;
-
-    for (conj_set_iter.first ();
-         conj_set_iter.done () == 0;
-         conj_set_iter.advance ())
-         {
-      // initialize to earliest arrival and deadline, and highest priority
-      arrival = 0;
-      deadline = 0;
-      priority = 0;
-
-      // Policy: conjunctively dispatched operations get the latest deadline of any
-      //         of the dispatches in the conjunction at the time they were dispatched
-      //          - when and if it is useful to change any of the merge policies, this
-      //         should be one of the decisions factored out into the conjunctive merge
-      //         strategy class.
-
-      // Policy: conjunctively dispatched operations get the lowest priority of any
-      //         of the dispatches in the conjunction at the time they were dispatched
-      //          - when and if it is useful to change any of the merge policies, this
-      //         should be one of the decisions factored out into the conjunctive merge
-      //         strategy class.
-
-      // obtain a pointer to the current dispatch proxy iterator
-      Dispatch_Proxy_Iterator **proxy_iter;
-      if ((conj_set_iter.next (proxy_iter) == 0) || (! proxy_iter) || (! (*proxy_iter)))
-      {
-        return -1;
-      }
-
-      // use latest arrival, latest deadline, lowest priority (0 is highest)
-      arrival = (arrival < (*proxy_iter)->arrival ())
-        ? arrival : (*proxy_iter)->arrival ();
-      deadline = (deadline < (*proxy_iter)->deadline ())
-        ? deadline : (*proxy_iter)->deadline ();
-      priority = (priority < (*proxy_iter)->priority ())
-        ? priority : (*proxy_iter)->priority ();
-
-      (*proxy_iter)->advance ();
-      if ((*proxy_iter)->done ())
-      {
-        more_dispatches = 0;
-      }
-    }
-
-    Dispatch_Entry *entry_ptr;
-    // The following two statements should be removed when
-    // CosTimeBase.idl is finalized.
-    const TimeBase::ulonglong arrival_tb = {arrival, 0};
-    const TimeBase::ulonglong deadline_tb = {deadline, 0};
-    ACE_NEW_RETURN (entry_ptr,
-                    Dispatch_Entry (arrival_tb, deadline_tb, priority, *this),
-                    -1);
-
-    // if even one new dispatch was inserted, result is "something happened".
-    result = 1;
-
-    // add the new dispatch entry to the set of all dispatches, and
-    //  a link to it to the dispatch links for this task entry
-    if (dispatch_entries.insert (entry_ptr) < 0)
-    {
-      return -1;
-    }
-
-    // use iterator for efficient insertion into the dispatch set
-    ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> insert_iter (dispatches_);
-    if (dispatches_.insert (Dispatch_Entry_Link (*entry_ptr), insert_iter) < 0)
-    {
-      return -1;
-    }
-
-    // TBD - Clients are not assigned priority, but rather obtain it from
-    // their call dependencies.  We could complain here if there is a
-    // priority specified that doesn't match (or is lower QoS?)
-  }
-
-  return result;
-}
-
-// this static method is used to reframe an existing dispatch set
-// to the given new period multiplier, creating new instances of
-// each existing dispatch (with adjusted arrival and deadline)
-// in each successive sub-frame.  Returns 1 if the set was reframed
-// to a new period, 0 if the set was not changed (the new period
-// was not a multiple of the old one), or -1 if an error occurred.
-int
-Task_Entry::reframe (
-  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-  Task_Entry &owner,
-  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
-  u_long &set_period, u_long new_period)
-{
-  // make sure the new period is greater than the current
-  // set period, and that they are harmonically related
-  if (new_period <= set_period)
-  {
-    // return an error if they're not harmonically related,
-    // do nothing if set's frame is a multiple of the new frame
-    return (set_period % new_period) ? -1 : 0;
-  }
-  else if (new_period % set_period)
-  {
-    return -1;
-  }
-
-  // make a shallow copy of the set in a new ordered
-  // multiset using the Dispatch_Entry_Link smart pointers
-  ACE_Ordered_MultiSet <Dispatch_Entry_Link> new_set;
-  ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> new_iter (new_set);
-  ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> set_iter (set);
-
-  for (set_iter.first (); set_iter.done () == 0; set_iter.advance ())
-  {
-    Dispatch_Entry_Link *link;
-    if (set_iter.next (link) == 0)
-    {
-      return -1;
-    }
-
-    if (new_set.insert (*link, new_iter) < 0)
-    {
-      return -1;
-    }
-  }
-
-  // do a deep copy merge back into the set using the new period and starting
-  // after the 0th sub-frame: this puts all dispatches after the 0th
-  // sub-frame of the new period into the set, and leaves existing dispatches
-  // in the 0th sub-frame of the new period in the set as well.
-  int result = merge_frames (dispatch_entries, owner, set,
-                         new_set, new_period, set_period, 1, 1);
-
-  // update the set's period to be the new frame
-  set_period = new_period;
-
-  return result;
-}
-
-
-// this static method is used to merge an existing dispatch set,
-// multiplied by the given multipliers for the period and number of
-// instances in each period of each existing dispatch, into the
-// given "into" set, without affecting the "from set".
-int
-Task_Entry::merge_frames (
-  ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-  Task_Entry &owner,
-  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &dest,
-  ACE_Ordered_MultiSet <Dispatch_Entry_Link> &src,
-  u_long &dest_period,
-  u_long src_period,
-  u_long number_of_calls,
-  u_long starting_dest_sub_frame)
-{
-  int status = 0;
-
-  // reframe dispatches in the destination set to the new frame size
-  // (expands the destination set's period to be the new enclosing frame)
-  if (reframe (dispatch_entries, owner, dest, dest_period,
-               minimum_frame_size (dest_period, src_period)) < 0)
-  {
-    return -1;
-  }
-
-  // use iterator for efficient insertion into the destination set
-  ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> dest_iter (dest);
-
-  // do virutal iteration over the source set in the new frame,
-  // adding adjusted dispatch entries to the destination
-  Dispatch_Proxy_Iterator src_iter (src, src_period, dest_period,
-                                    number_of_calls,
-                                    starting_dest_sub_frame);
-
-  for (src_iter.first (starting_dest_sub_frame); src_iter.done () == 0; src_iter.advance ())
-  {
-
-    // Policy: disjunctively dispatched operations get their deadline and
-    //         priority from the original dispatch - when and if it is useful
-    //         to change any of the merge policies, this should be one of the
-    //         decisions factored out into the disjunctive merge strategy
-    //         class.
-
-    Dispatch_Entry *entry_ptr;
-    // The following two statements should be removed when
-    // CosTimeBase.idl is finalized.
-    const TimeBase::ulonglong arrival_tb = {src_iter.arrival (), 0};
-    const TimeBase::ulonglong deadline_tb = {src_iter.deadline (), 0};
-    ACE_NEW_RETURN (entry_ptr,
-                    Dispatch_Entry (arrival_tb,
-                                    deadline_tb,
-                                    src_iter.priority (), owner),
-                    -1);
-
-    // if even one new dispatch was inserted, status is "something happened".
-    status = 1;
-
-    // add the new dispatch entry to the set of all dispatches, and
-    //  a link to it to the dispatch links for this task entry
-    if (dispatch_entries.insert (entry_ptr) < 0)
-    {
-      return -1;
-    }
-
-    if (dest.insert (Dispatch_Entry_Link (*entry_ptr), dest_iter) < 0)
-    {
-      return -1;
-    }
-
-    // TBD - Clients are not assigned priority, but rather obtain it from
-    // their call dependencies.  We could complain here if there is a
-    // priority specified that doesn't match (or is lower QoS?)
-  }
-
-  return status;
-}
-
-
-///////////////////////////
-// Class Task_Entry_Link //
-///////////////////////////
-
-
-Task_Entry_Link::Task_Entry_Link (
-  Task_Entry &caller,
-  Task_Entry &called,
-  CORBA::Long number_of_calls,
-  RtecScheduler::Dependency_Type dependency_type)
-  : number_of_calls_ (number_of_calls)
-  , caller_ (caller)
-  , called_ (called)
-  , dependency_type_ (dependency_type)
-{
-}
-
-
-//////////////////////////
-// Class Dispatch_Entry //
-//////////////////////////
-
-Dispatch_Entry::Dispatch_Id Dispatch_Entry::next_id_ = 0;
-
-Dispatch_Entry::Dispatch_Entry (
-      Time arrival,
-      Time deadline,
-           Preemption_Priority priority,
-      Task_Entry &task_entry,
-      Dispatch_Entry *original_dispatch)
-
-  : priority_ (priority)
-  , OS_priority_ (0)
-  , dynamic_subpriority_ (0)
-  , static_subpriority_ (0)
-  , arrival_ (arrival)
-  , deadline_ (deadline)
-  , task_entry_ (task_entry)
-  , original_dispatch_ (original_dispatch)
-{
-  // obtain, increment the next id
-  dispatch_id_ = next_id_++;
-}
-
-Dispatch_Entry::Dispatch_Entry (const Dispatch_Entry &d)
-  : priority_ (d.priority_)
-  , OS_priority_ (d.OS_priority_)
-  , dynamic_subpriority_ (d.dynamic_subpriority_)
-  , static_subpriority_ (d.static_subpriority_)
-  , arrival_ (d.arrival_)
-  , deadline_ (d.deadline_)
-  , task_entry_ (d.task_entry_)
-  , original_dispatch_ (d.original_dispatch_)
-{
-  // obtain, increment the next id
-  dispatch_id_ = next_id_++;
-}
-
-
-int
-Dispatch_Entry::operator < (const Dispatch_Entry &d) const
-{
-  // for positioning in the ordered dispatch multiset
-
-  // lowest arrival time first
-  if (this->arrival_ != d.arrival_)
-  {
-    return (this->arrival_ < d.arrival_) ? 1 : 0;
-  }
-
-  // highest priority second
-  if (this->priority_ != d.priority_)
-  {
-    return (this->priority_ > d.priority_) ? 1 : 0;
-  }
-
-  // lowest laxity (highest dynamic sub-priority) third
-  // Just use low 32 bits of worst_case_execution_time.  This will
-  // have to change when CosTimeBase.idl is finalized.
-  ACE_INT32 /* Time */ this_laxity = deadline_.low -
-                     task_entry ().rt_info ()->worst_case_execution_time.low;
-  ACE_INT32 /* Time */ that_laxity = d.deadline_.low -
-                     d.task_entry ().rt_info ()->worst_case_execution_time.low;
-  if (this_laxity != that_laxity)
-  {
-    return (this_laxity < that_laxity) ? 1 : 0;
-  }
-
-  // finally, by higher importance
-  return (task_entry ().rt_info ()->importance >
-          d.task_entry ().rt_info ()->importance) ? 1 : 0;
-}
-
-
-///////////////////////////////
-// Class Dispatch_Entry_Link //
-///////////////////////////////
-
-
-Dispatch_Entry_Link::Dispatch_Entry_Link (Dispatch_Entry &d)
-  : dispatch_entry_ (d)
-{
-}
-  // ctor
-
-Dispatch_Entry_Link::Dispatch_Entry_Link (
-  const Dispatch_Entry_Link &d)
-  : dispatch_entry_ (d.dispatch_entry_)
-{
-}
-  // copy ctor
-
-
-///////////////////////////////////
-// Class Dispatch_Proxy_Iterator //
-///////////////////////////////////
-
-Dispatch_Proxy_Iterator::Dispatch_Proxy_Iterator
-  (ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
-   u_long actual_frame_size,
-   u_long virtual_frame_size,
-   u_long number_of_calls,
-   u_long starting_sub_frame)
-  : number_of_calls_ (number_of_calls)
-  , current_call_ (0)
-  , actual_frame_size_ (actual_frame_size)
-  , virtual_frame_size_ (virtual_frame_size)
-  , current_frame_offset_ (actual_frame_size * starting_sub_frame)
-  , iter_ (set)
-{
-  first (starting_sub_frame);
-}
-      // ctor
-
-int
-Dispatch_Proxy_Iterator::first (u_int sub_frame)
-{
-  if (actual_frame_size_ * (sub_frame) >= virtual_frame_size_)
-  {
-    // can not position the virtual iterator
-    // in the given range: do nothing
-    return 0;
-  }
-
-  // restart the call counter
-  current_call_ = 0;
-
-  // use the given sub-frame offset if it's valid
-  current_frame_offset_ = actual_frame_size_ * sub_frame;
-
-  // restart the iterator
-  return iter_.first ();
-}
-  // positions the iterator at the first entry of the passed
-  // sub-frame, returns 1 if it could position the iterator
-  // correctly, 0 if not, and -1 if an error occurred.
-
-int
-Dispatch_Proxy_Iterator::last ()
-{
-  // use the last call
-  current_call_ = number_of_calls_ - 1;
-
-  // use the last sub-frame
-  current_frame_offset_ = virtual_frame_size_ - actual_frame_size_;
-
-  // position the iterator at the last dispatch
-  return iter_.first ();
-}
-  // positions the iterator at the last entry of the total
-  // frame, returns 1 if it could position the iterator
-  // correctly, 0 if not, and -1 if an error occurred.
-
-int
-Dispatch_Proxy_Iterator::advance ()
-{
-  int result = 1;
-
-  if (iter_.done ())
-  {
-    result = 0; // cannot retreat if we're out of bounds
-  }
-  else if (current_call_ < number_of_calls_ - 1)
-  {
-    // if we're still in the same set of calls, increment the call counter
-    ++current_call_;
-  }
-  else
-  {
-    // roll over the call counter
-    current_call_ = 0;
-
-    // advance the iterator in the current sub-frame
-    if (! iter_.advance ())
-    {
-      // if we're not already in the last sub_frame
-      if (current_frame_offset_ + actual_frame_size_ < virtual_frame_size_)
-      {
-        // increment the sub-frame offset
-        current_frame_offset_ += actual_frame_size_;
-
-        // restart the iterator at the front of the sub-frame
-        result = iter_.first ();
-      }
-      else
-      {
-        result = 0; // cannot advance if we're already at the end
-      }
-    }
-  }
-
-  return result;
-}
-  // positions the iterator at the next entry of the total
-  // frame, returns 1 if it could position the iterator
-  // correctly, 0 if not, and -1 if an error occurred.
-
-int
-Dispatch_Proxy_Iterator::retreat ()
-{
-  int result = 1;
-
-  if (iter_.done ())
-  {
-    result = 0; // cannot retreat if we're out of bounds
-  }
-  else if (current_call_ > 0)
-  {
-    // if we're still in the same set of calls, decrement the call counter
-    --current_call_;
-  }
-  else
-  {
-    // roll over the call counter
-    current_call_ = number_of_calls_ - 1;
-
-    // back up the iterator in the current sub-frame
-    if (!iter_.retreat ())
-    {
-      // if we're not already in the 0th sub_frame
-      if (current_frame_offset_ > 0)
-      {
-        // decrement the sub-frame offset
-        current_frame_offset_ -= actual_frame_size_;
-
-        // restart the iterator at the tail of the sub-frame
-        result = iter_.last ();
-      }
-      else
-      {
-        result = 0; // cannot retreat if we're already at the start
-      }
-    }
-  }
-
-  return result;
-}
-  // positions the iterator at the previous entry of the total
-  // frame, returns 1 if it could position the iterator
-  // correctly, 0 if not, and -1 if an error occurred.
-
-u_long
-Dispatch_Proxy_Iterator::arrival () const
-{
-  Dispatch_Entry_Link *link;
-  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
-  {
-    return 0;
-  }
-
-  // Just use low 32 bits of arrival.  This will
-  // have to change when CosTimeBase.idl is finalized.
-  return link->dispatch_entry ().arrival ().low + current_frame_offset_;
-}
-  // returns the adjusted arrival time of the virtual entry
-
-u_long
-Dispatch_Proxy_Iterator::deadline () const
-{
-  Dispatch_Entry_Link *link;
-  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
-  {
-    return 0;
-  }
-
-  // Just use low 32 bits of deadline.  This will
-  // have to change when CosTimeBase.idl is finalized.
-  return link->dispatch_entry ().deadline ().low + current_frame_offset_;
-}
-  // returns the adjusted deadline time of the virtual entry
-
-Dispatch_Proxy_Iterator::Preemption_Priority
-Dispatch_Proxy_Iterator::priority () const
-{
-  Dispatch_Entry_Link *link;
-  if ((iter_.done ()) || (iter_.next(link) == 0) || (! link))
-  {
-    return 0;
-  }
-
-  return link->dispatch_entry ().priority ();
-}
-  // returns the scheduler priority of the virtual entry
-
-
-
-//////////////////////////
-// Class TimeLine_Entry //
-//////////////////////////
-
-
-    // time slice constructor
-TimeLine_Entry::TimeLine_Entry (Dispatch_Entry &dispatch_entry,
-                                u_long start, u_long stop,
-                                u_long arrival, u_long deadline,
-                                TimeLine_Entry *next,
-                                TimeLine_Entry *prev)
-  : dispatch_entry_ (dispatch_entry)
-  , start_ (start)
-  , stop_ (stop)
-  , arrival_ (arrival)
-  , deadline_ (deadline)
-  , next_ (next)
-  , prev_ (prev)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
deleted file mode 100644
index 8912fe33075..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ /dev/null
@@ -1,591 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.h
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#if ! defined (SCHEDENTRY_H)
-#define SCHEDENTRY_H
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-//////////////////////
-// Helper Functions //
-//////////////////////
-
-// TBD - move this to the ACE class
-// Euclid's greatest common divisor algorithm
-u_long gcd (u_long x, u_long y);
-
-// TBD - move this to the ACE class
-// calculate the minimum frame size
-u_long minimum_frame_size (u_long period1, u_long period2);
-
-// forward declaration of classes
-class Task_Entry;
-class Task_Entry_Link;
-class Dispatch_Entry;
-class Dispatch_Entry_Link;
-class Dispatch_Proxy_Iterator;
-
-
-class TAO_ORBSVCS_Export Dispatch_Entry_Link
-// = TITLE
-//        Dispatch Entry Link
-//
-// = DESCRIPTION
-//    Light-weight sortable "smart pointer" to a dispatch entry.
-//
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  Dispatch_Entry_Link (Dispatch_Entry &d);
-    // ctor
-
-  Dispatch_Entry_Link (const Dispatch_Entry_Link &d);
-    // copy ctor
-
-  ~Dispatch_Entry_Link ();
-    // dtor
-
-  // TBD - make this a global comparison operator
-  // instead of a class member function
-  int operator < (const Dispatch_Entry_Link &d) const;
-    // LT comparator
-
-  Dispatch_Entry &dispatch_entry () const;
-    // accessor for reference to dispatch entry
-
-private:
-
-  Dispatch_Entry &dispatch_entry_;
-};
-
-
-// Wrapper for the RT_Info, which aggregates all its dispatches
-class TAO_ORBSVCS_Export Task_Entry
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  // info for DFS traversal, topological sort of call graph
-  enum DFS_Status {NOT_VISITED, VISITED, FINISHED};
-
-  // ctor
-  Task_Entry ();
-
-  // dtor
-  ~Task_Entry ();
-
-  // merge dispatches according to info type, update
-  // relevant scheduling characteristics for this entry.
-  // Returns 0 if all is well, or -1 if an error occurred
-  int merge_dispatches (
-    ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries);
-
-  // get, set pointer to underlying RT_Info
-  RT_Info *rt_info () const;
-  void rt_info (RT_Info *info);
-
-
-  // get effective period for the task entry
-  Period effective_period () const;
-  void effective_period (Period p);
-
-  // set/get time when node was discovered in DFS traversal
-  void discovered (long l);
-  long discovered () const;
-
-  // set/get time when node was finished in DFS traversal
-  void finished (long l);
-  long finished () const;
-
-  // set/get DFS traversal status of node
-  void dfs_status (DFS_Status ds);
-  DFS_Status dfs_status () const;
-
-  // set/get flag indicating whether node is a thread delineator
-  void is_thread_delineator (int i);
-  int is_thread_delineator () const;
-
-  // get set of links to Task Entries which this entry calls
-  ACE_Unbounded_Set <Task_Entry_Link *> & calls ();
-
-  // get set of links to Task Entries which call this entry
-  ACE_Unbounded_Set <Task_Entry_Link *> & callers ();
-
-  // get set of arrivals in the effective period
-  ACE_Ordered_MultiSet<Dispatch_Entry_Link> &dispatches ();
-
-  // get the type of Info the entry wraps
-  Info_Type info_type () const;
-
-  // effective execution time for the task entry
-  u_long effective_execution_time () const;
-
-private:
-
-  // prohibit calls of the given type: currently used to enforce
-  // the notion that two-way calls to disjunctive or conjunctive
-  // RT_Infos do not have any defined meaning, and thus should be
-  // considered dependency specification errors: if these constraints
-  // are removed in the future, this method should be removed as well
-  // Returns 0 if all is well, or -1 if an error has occurred.
-  int prohibit_dispatches (Dependency_Type dt);
-
-  // performs disjunctive merge of arrival times of calls of the given
-  // type: all arrival times of all callers of that type are duplicated by
-  // the multiplier and repetition over the new frame size and merged.
-  // Returns 0 if all is well, or -1 if an error has occurred.
-  int disjunctive_merge (
-    Dependency_Type dt,
-    ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries);
-
-  // perform conjunctive merge of arrival times of calls of the given
-  // type: all arrival times of all callers of that type are duplicated
-  //  by the multiplier and repetition over the new frame size and then
-  // iteratively merged by choosing the maximal arrival time at
-  // the current position in each queue (iteration is in lockstep
-  // over all queues, and ends when any queue ends).  Returns 0 if
-  // all is well, or -1 if an error has occurred.
-  int conjunctive_merge (
-    Dependency_Type dt,
-    ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries);
-
-
-  // this static method is used to reframe an existing dispatch set
-  // to the given new period multiplier, creating new instances of
-  // each existing dispatch (with adjusted arrival and deadline)
-  // in each successive sub-frame.  Returns 1 if the set was reframed
-  // to a new period, 0 if the set was not changed (the new period
-  // was not a multiple of the old one), or -1 if an error occurred.
-  static int reframe (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                      Task_Entry &owner,
-                      ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
-                      u_long &set_period, u_long new_period);
-
-  // this static method is used to merge an existing dispatch set,
-  // multiplied by the given multipliers for the period and number of
-  // instances in each period of each existing dispatch, into the
-  // given "into" set, without affecting the "from set". Returns 1 if
-  // the source set was correctly merged into the destination set,
-  // 0 if nothing happened, and -1 if an error occurred.
-  static int merge_frames (ACE_Unbounded_Set <Dispatch_Entry *> &dispatch_entries,
-                           Task_Entry &owner,
-                           ACE_Ordered_MultiSet <Dispatch_Entry_Link> &dest,
-                           ACE_Ordered_MultiSet <Dispatch_Entry_Link> &src,
-                           u_long &dest_period,
-                           u_long src_period,
-                           u_long number_of_calls = 1,
-                           u_long starting_dest_sub_frame = 0);
-
-  // pointer to the underlying RT_Info
-  RT_Info *rt_info_;
-
-  // effective period for the task entry
-  u_long effective_period_;
-
-  // set of arrivals in the effective period
-  ACE_Ordered_MultiSet<Dispatch_Entry_Link> dispatches_;
-
-  // count of the arrivals in the effective period
-  u_long arrival_count_;
-
-  DFS_Status dfs_status_;
-  long discovered_;
-  long finished_;
-
-  // info for identifying threads in the oneway call graph
-  int is_thread_delineator_;
-
-  // get set of links to Task Entries which this entry calls
-  ACE_Unbounded_Set <Task_Entry_Link *> calls_;
-
-  // get set of links to Task Entries which call this entry
-  ACE_Unbounded_Set <Task_Entry_Link *> callers_;
-};
-
-
-class TAO_ORBSVCS_Export Task_Entry_Link
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  // ctor
-  Task_Entry_Link (Task_Entry &caller,
-                   Task_Entry &called,
-                   CORBA::Long number_of_calls,
-                   Dependency_Type dependency_type);
-
-  // accessor: number of calls
-  CORBA::Long number_of_calls () const;
-
-  // accessor: dependency type
-  Dependency_Type dependency_type () const;
-
-  // accessor: calling task entry
-  Task_Entry &caller () const;
-
-  // accessor: called task entry
-  Task_Entry &called () const;
-
-private:
-
-  // the number of calls of the operation
-  CORBA::Long number_of_calls_;
-
-  // the calling operation
-  Task_Entry &caller_;
-
-  // the called operation
-  Task_Entry &called_;
-
-  // the type of call dependency
-  Dependency_Type dependency_type_;
-};
-
-
-class TAO_ORBSVCS_Export Dispatch_Entry
-{
-// = TITLE
-//        Dispatch Entry
-//
-// = DESCRIPTION
-//     Descriptor object for a single dispatch of an operation.
-//
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  typedef u_long Dispatch_Id;
-
-  // ctor
-  Dispatch_Entry (Time arrival,
-                  Time deadline,
-                  Preemption_Priority priority,
-                  Task_Entry &task_entry,
-                  Dispatch_Entry *original_dispatch = 0);
-
-  // copy ctor
-  Dispatch_Entry (const Dispatch_Entry &d);
-
-  // id accessor
-  Dispatch_Id dispatch_id () const;
-
-  // arrival accessor
-  Time arrival () const;
-
-  // deadline accessor
-  Time deadline () const;
-
-  // scheduler priority accessor and mutator
-  Preemption_Priority priority () const;
-  void priority (Preemption_Priority p);
-
-  // scheduler priority accessor and mutator
-  OS_Priority Dispatch_Entry::OS_priority () const;
-  void Dispatch_Entry::OS_priority (OS_Priority p);
-
-  // dynamic subpriority accessor and mutator
-  Sub_Priority dynamic_subpriority () const;
-  void dynamic_subpriority (Sub_Priority p);
-
-  // static subpriority accessor and mutator
-  Sub_Priority static_subpriority () const;
-  void static_subpriority (Sub_Priority p);
-
-  // task entry accessor
-  Task_Entry &task_entry () const;
-
-  // LT comparator
-  //  TBD - make this a global comparison operator
-  //  instead of a class member function
-  int operator < (const Dispatch_Entry &d) const;
-
-  // accessor for pointer to original dispatch
-  Dispatch_Entry *original_dispatch ();
-
-private:
-  // TBD - add reference counting to Dispatch Entry class,
-  // make the link a friend, up/down count as links come and go,
-  // and call entry dtor when ref count drops to 0
-
-  // stores the next dispatch entry id to be used
-  static Dispatch_Id next_id_;
-
-  // the id of the current dispatch entry
-  Dispatch_Id dispatch_id_;
-
-  // scheduler priority of the current dispatch entry
-  Preemption_Priority priority_;
-
-  // OS priority of the current dispatch entry
-  OS_Priority OS_priority_;
-
-  // scheduler dynamic subpriority of the current dispatch entry
-  Sub_Priority dynamic_subpriority_;
-
-  // scheduler static subpriority of the current dispatch entry
-  Sub_Priority static_subpriority_;
-
-  // the arrival time of the current dispatch entry
-  Time arrival_;
-
-  // the deadline of the current dispatch entry
-  Time deadline_;
-
-  // stores the id of the related task entry
-  Task_Entry &task_entry_;
-
-  // stores a pointer to the original dispatch entry if this
-  // is a dispatch generated by expanding the original frame
-  Dispatch_Entry *original_dispatch_;
-
-};
-
-class TAO_ORBSVCS_Export Dispatch_Proxy_Iterator
-// = TITLE
-//   This class implements an iterator abstraction over a virtual
-//   frame size and number of calls, using an actual ordered
-//   multiset of dispatch entries over an actual frame size.
-//   It also serves as a proxy for the virtual dispatch to which
-//   it refers.  Rhetorical question: is it possible to separate
-//   the iterator and proxy abstractions here without defeating the
-//   purpose of the design, which is to avoid constructing
-//   superfluous dispatch entries (per the conjunctive merge use case) ?
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  Dispatch_Proxy_Iterator (ACE_Ordered_MultiSet <Dispatch_Entry_Link> &set,
-                           u_long actual_frame_size,
-                           u_long virtual_frame_size,
-                           u_long number_of_calls_ = 1,
-                           u_long starting_sub_frame = 0);
-    // ctor
-
-  ////////////////////////
-  // iterator interface //
-  ////////////////////////
-
-  int done () const;
-    // returns 0 if there are more entries to see, 1 if not
-
-  int first (u_int sub_frame = 0);
-    // positions the iterator at the first entry of the passed
-    // sub-frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
-
-  int last ();
-    // positions the iterator at the last entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
-
-  int advance ();
-    // positions the iterator at the next entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
-
-  int retreat ();
-    // positions the iterator at the previous entry of the total
-    // frame, returns 1 if it could position the iterator
-    // correctly, 0 if not, and -1 if an error occurred.
-
-  /////////////////////
-  // proxy interface //
-  /////////////////////
-
-  u_long arrival () const;
-    // returns the adjusted arrival time of the virtual entry
-
-  u_long deadline () const;
-    // returns the adjusted deadline time of the virtual entry
-
-  Preemption_Priority priority () const;
-    // returns the scheduler priority of the virtual entry
-
-
-private:
-
-  u_long number_of_calls_;
-    // the number of calls corresponding to each actual dispatch
-
-  u_long current_call_;
-    // the current call number for this dispatch (zero based)
-
-  u_long actual_frame_size_;
-    // the frame size of the actual dispatches
-
-  u_long virtual_frame_size_;
-    // the virtaul frame size over which to iterate
-
-  u_long current_frame_offset_;
-    // the current offset into the virtual frame
-    // (should be a multiple of the actual frame size)
-
-  ACE_Ordered_MultiSet_Iterator <Dispatch_Entry_Link> iter_;
-};
-
-
-
-class TAO_ORBSVCS_Export TimeLine_Entry
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  // time slice constructor
-  TimeLine_Entry (Dispatch_Entry &dispatch_entry,
-                  u_long start,
-                  u_long stop,
-                  u_long arrival,
-                  u_long deadline,
-                  TimeLine_Entry *next = 0,
-                  TimeLine_Entry *prev = 0);
-
-  // dispatch entry accessor
-  Dispatch_Entry &dispatch_entry () const;
-
-  // accessors for time slice start and stop times (100 nanoseconds)
-  u_long start () const;
-  u_long stop () const;
-  u_long arrival () const;
-  u_long deadline () const;
-
-  // accessor and mutator for next and prev slices for this dispatch
-  TimeLine_Entry *next (void) const;
-  void next (TimeLine_Entry *);
-  TimeLine_Entry *prev (void) const;
-  void prev (TimeLine_Entry *);
-
-  int operator < (const TimeLine_Entry&) const;
-
-private:
-
-  // the dispatch entry to which the time slice corresponds
-  Dispatch_Entry &dispatch_entry_;
-
-  // priority time slice times (100 nanoseconds)
-  u_long start_;
-  u_long stop_;
-  u_long arrival_;
-  u_long deadline_;
-
-  // next and previous priority time slices for this dispatch entry
-  TimeLine_Entry *next_;
-  TimeLine_Entry *prev_;
-
-};
-
-class TAO_ORBSVCS_Export TimeLine_Entry_Link
-{
-public:
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  typedef RtecScheduler::Time Time;
-  typedef RtecScheduler::Period Period;
-  typedef RtecScheduler::Info_Type Info_Type;
-  typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-  TimeLine_Entry_Link  (TimeLine_Entry &t);
-  // ctor
-
-  TimeLine_Entry &entry () const;
-  // accessor for the underlying entry
-
-  int operator < (const TimeLine_Entry_Link&) const;
-  // comparison operator
-
-private:
-
-  TimeLine_Entry &entry_;
-  // the underlying entry
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "SchedEntry.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDENTRY_H */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
deleted file mode 100644
index a529b59d50d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ /dev/null
@@ -1,402 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    SchedEntry.i
-//
-// = CREATION DATE
-//    7 February 1998
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-//////////////////////
-// Class Task_Entry //
-//////////////////////
-
-// return a pointer to the underlying RT_Info
-ACE_INLINE Task_Entry::RT_Info *
-Task_Entry::rt_info () const
-{
-  return rt_info_;
-}
-
-// set the underlying RT_Info pointer
-ACE_INLINE void
-Task_Entry::rt_info (Task_Entry::RT_Info *info)
-{
-  rt_info_ = info;
-}
-
-// get effective period for the task entry
-ACE_INLINE Task_Entry::Period
-Task_Entry::effective_period () const
-{
-  return effective_period_;
-}
-
-// set effective period for the task entry
-ACE_INLINE void
-Task_Entry::effective_period (Task_Entry::Period p)
-{
-  effective_period_ = p;
-}
-
-ACE_INLINE void
-Task_Entry::discovered (long l)
-{
-  discovered_ = l;
-  dfs_status_ = VISITED;
-}
-
-ACE_INLINE long
-Task_Entry::discovered () const
-{
-  return discovered_;
-}
-
-ACE_INLINE void
-Task_Entry::finished (long l)
-{
-  finished_ = l;
-  dfs_status_ = FINISHED;
-}
-
-ACE_INLINE long
-Task_Entry::finished () const
-{
-  return finished_;
-}
-
-ACE_INLINE Task_Entry::DFS_Status
-Task_Entry::dfs_status () const
-{
-  return dfs_status_;
-}
-
-ACE_INLINE void
-Task_Entry::dfs_status (Task_Entry::DFS_Status ds)
-{
-  dfs_status_ = ds;
-}
-
-ACE_INLINE void
-Task_Entry::is_thread_delineator (int i)
-{
-  is_thread_delineator_ = i;
-}
-
-ACE_INLINE int
-Task_Entry::is_thread_delineator () const
-{
-  return is_thread_delineator_;
-}
-
-// access set of Task Entries on which this entry depends
-ACE_INLINE ACE_Unbounded_Set <Task_Entry_Link *> &
-Task_Entry::calls ()
-{
-  return calls_;
-}
-
-// access set of Task Entries which depend on this entry
-ACE_INLINE ACE_Unbounded_Set <Task_Entry_Link *> &
-Task_Entry::callers ()
-{
-  return callers_;
-}
-
-// get set of arrivals in the effective period
-ACE_INLINE ACE_Ordered_MultiSet<Dispatch_Entry_Link> &
-Task_Entry::dispatches ()
-{
-  return dispatches_;
-}
-
-
-ACE_INLINE Task_Entry::Info_Type
-Task_Entry::info_type () const
-{
-  return rt_info_->info_type;
-}
-
-ACE_INLINE u_long
-Task_Entry::effective_execution_time () const
-{
-  // Just use low 32 bits.  This will have to change when CosTimeBase.idl
-  // is finalized.
-  ACE_UINT32 worst_case_execution_time =
-    ACE_static_cast (ACE_UINT32, rt_info_->worst_case_execution_time.low);
-
-  return (rt_info_->info_type == RtecScheduler::OPERATION)
-         ? worst_case_execution_time * arrival_count_
-         : 0;
-}
-
-
-///////////////////////////
-// Class Task_Entry_Link //
-///////////////////////////
-
-
-// accessor: number of calls of dependency by dependant
-ACE_INLINE CORBA::Long
-Task_Entry_Link::number_of_calls () const
-{
-  return number_of_calls_;
-}
-
-ACE_INLINE Task_Entry_Link::Dependency_Type
-Task_Entry_Link::dependency_type () const
-{
-  return dependency_type_;
-}
-
-// accessor: dependant task entry
-ACE_INLINE Task_Entry &
-Task_Entry_Link::caller () const
-{
-  return caller_;
-}
-
-// accessor: dependency task entry
-ACE_INLINE Task_Entry &
-Task_Entry_Link::called () const
-{
-  return called_;
-}
-
-//////////////////////////
-// Class Dispatch Entry //
-//////////////////////////
-
-ACE_INLINE u_long
-Dispatch_Entry::dispatch_id () const
-{
-  return dispatch_id_;
-}
-
-ACE_INLINE Dispatch_Entry::Preemption_Priority
-Dispatch_Entry::priority () const
-{
-  return priority_;
-}
-
-ACE_INLINE void
-Dispatch_Entry::priority (Dispatch_Entry::Preemption_Priority p)
-{
-  priority_ = p;
-}
-
-ACE_INLINE Dispatch_Entry::OS_Priority
-Dispatch_Entry::OS_priority () const
-{
-  return OS_priority_;
-}
-
-ACE_INLINE void
-Dispatch_Entry::OS_priority (Dispatch_Entry::OS_Priority p)
-{
-  OS_priority_ = p;
-}
-
-ACE_INLINE Dispatch_Entry::Sub_Priority
-Dispatch_Entry::dynamic_subpriority () const
-{
-  return dynamic_subpriority_;
-}
-
-ACE_INLINE void
-Dispatch_Entry::dynamic_subpriority (Dispatch_Entry::Sub_Priority p)
-{
-  dynamic_subpriority_ = p;
-}
-
-ACE_INLINE Dispatch_Entry::Sub_Priority
-Dispatch_Entry::static_subpriority () const
-{
-  return static_subpriority_;
-}
-
-ACE_INLINE void
-Dispatch_Entry::static_subpriority (Dispatch_Entry::Sub_Priority p)
-{
-  static_subpriority_ = p;
-}
-
-
-ACE_INLINE Dispatch_Entry::Time
-Dispatch_Entry::arrival () const
-{
-  return arrival_;
-}
-
-ACE_INLINE Dispatch_Entry::Time
-Dispatch_Entry::deadline () const
-{
-  return deadline_;
-}
-
-ACE_INLINE Task_Entry &
-Dispatch_Entry::task_entry () const
-{
-  return task_entry_;
-}
-
-
-// accessor for pointer to original dispatch
-ACE_INLINE Dispatch_Entry *
-Dispatch_Entry::original_dispatch ()
-{
-  return original_dispatch_;
-}
-
-
-///////////////////////////////
-// Class Dispatch_Entry_Link //
-///////////////////////////////
-
-ACE_INLINE
-Dispatch_Entry_Link::~Dispatch_Entry_Link ()
-{
-}
-  // dtor
-
-ACE_INLINE int
-Dispatch_Entry_Link::operator < (const Dispatch_Entry_Link &d) const
-{
-  return (this->dispatch_entry_ < d.dispatch_entry_);
-}
-  // GT comparator
-
-
-ACE_INLINE Dispatch_Entry &
-Dispatch_Entry_Link::dispatch_entry () const
-{
-  return dispatch_entry_;
-}
-  // accessor for reference to dispatch entry
-
-
-///////////////////////////////////
-// Class Dispatch_Proxy_Iterator //
-///////////////////////////////////
-
-ACE_INLINE int
-Dispatch_Proxy_Iterator::done () const
-{
-  return iter_.done ();
-}
-  // returns 0 if there are more entries to see, 1 if not
-
-
-//////////////////////////
-// Class TimeLine_Entry //
-//////////////////////////
-
-    // dispatch entry accessor
-ACE_INLINE Dispatch_Entry &
-TimeLine_Entry::dispatch_entry () const
-{
-  return dispatch_entry_;
-}
-
-
-// accessor for time slice start time (100 nanoseconds)
-ACE_INLINE u_long
-TimeLine_Entry::start () const
-{
-  return start_;
-}
-
-// accessor for time slice stop time (100 nanoseconds)
-ACE_INLINE u_long
-TimeLine_Entry::stop () const
-{
-  return stop_;
-}
-
-// accessor for time slice stop time (100 nanoseconds)
-ACE_INLINE u_long
-TimeLine_Entry::arrival () const
-{
-  return arrival_;
-}
-
-// accessor for time slice stop time (100 nanoseconds)
-ACE_INLINE u_long
-TimeLine_Entry::deadline () const
-{
-  return deadline_;
-}
-
-
-// accessor for next slice for this dispatch
-ACE_INLINE TimeLine_Entry *
-TimeLine_Entry::next (void) const
-{
-  return next_;
-}
-
-// mutator for next slice for this dispatch
-ACE_INLINE void
-TimeLine_Entry::next (TimeLine_Entry *t)
-{
-  next_ = t;
-}
-
-// accessor for previous slice for this dispatch
-ACE_INLINE TimeLine_Entry *
-TimeLine_Entry::prev (void) const
-{
-  return prev_;
-}
-
-// mutator for previous slice for this dispatch
-ACE_INLINE void
-TimeLine_Entry::prev (TimeLine_Entry *t)
-{
-  prev_ = t;
-}
-
-
-ACE_INLINE int
-TimeLine_Entry::operator < (const TimeLine_Entry &t) const
-{
-  return (start_ < t.start_) ? 1 : 0;
-}
-  // comparison operator
-
-
-///////////////////////////////
-// Class TimeLine_Entry_Link //
-///////////////////////////////
-
-
-ACE_INLINE TimeLine_Entry_Link::TimeLine_Entry_Link  (TimeLine_Entry &t)
-  : entry_ (t)
-{
-}
-  // ctor
-
-ACE_INLINE TimeLine_Entry &
-TimeLine_Entry_Link::entry () const
-{
-  return entry_;
-}
-  // accessor for the underlying entry
-
-ACE_INLINE int
-TimeLine_Entry_Link::operator < (const TimeLine_Entry_Link &l) const
-{
-  return (entry_ < l.entry_) ? 1 : 0;
-}
-  // comparison operator
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
deleted file mode 100644
index 4caf5bb269b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#include "ace/Sched_Params.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "Scheduler.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scheduler static members
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-const ACE_Scheduler::mode_t ACE_Scheduler::CURRENT_MODE = 0xFFFFFFFF;
-
-ACE_Scheduler *ACE_Scheduler::instance_ = 0;
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class ACE_Scheduler static functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-void
-ACE_Scheduler::output (FILE *file, const status_t status)
-{
-  switch (status)
-  {
-    case NOT_SCHEDULED :
-      ACE_OS::fprintf (file, "NOT_SCHEDULED");
-      break;
-    case SUCCEEDED :
-      ACE_OS::fprintf (file, "SUCCEEDED");
-      break;
-    case ST_TASK_ALREADY_REGISTERED :
-      ACE_OS::fprintf (file, "TASK_ALREADY_REGISTERED");
-      break;
-    case ST_VIRTUAL_MEMORY_EXHAUSTED :
-      ACE_OS::fprintf (file, "VIRTUAL_MEMORY_EXHAUSTED");
-      break;
-    case ST_UNKNOWN_TASK :
-      ACE_OS::fprintf (file, "UNKNOWN_TASK");
-      break;
-    case INVALID_MODE :
-      ACE_OS::fprintf (file, "INVALID_MODE");
-      break;
-    case MODE_COUNT_MISMATCH :
-      ACE_OS::fprintf (file, "MODE_COUNT_MISMATCH");
-      break;
-    case TASK_COUNT_MISMATCH :
-      ACE_OS::fprintf (file, "TASK_COUNT_MISMATCH");
-      break;
-    case INVALID_PRIORITY :
-      ACE_OS::fprintf (file, "INVALID_PRIORITY");
-      break;
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    // To save a little code space (280 bytes on g++ 2.7.2/Solaris 2.5.1),
-    // we could conditionally compile them so that they're not in the
-    // runtime version.
-    case ST_UTILIZATION_BOUND_EXCEEDED :
-      ACE_OS::fprintf (file, "UTILIZATION_BOUND_EXCEEDED");
-      break;
-    case ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS :
-      ACE_OS::fprintf (file, "INSUFFICIENT_THREAD_PRIORITY_LEVELS");
-      break;
-    case ST_CYCLE_IN_DEPENDENCIES :
-      ACE_OS::fprintf (file, "CYCLE_IN_DEPENDENCIES");
-      break;
-    case UNABLE_TO_OPEN_SCHEDULE_FILE :
-      ACE_OS::fprintf (file, "UNABLE_TO_OPEN_SCHEDULE_FILE");
-      break;
-    case UNABLE_TO_WRITE_SCHEDULE_FILE :
-      ACE_OS::fprintf (file, "UNABLE_TO_WRITE_SCHEDULE_FILE");
-      break;
-    // End of config-only status values.
-
-    default:
-      ACE_OS::fprintf (file, "UNKNOWN STATUS: %d", status);
-  }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class ACE_Scheduler member functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-ACE_Scheduler::ACE_Scheduler () :
-  minimum_priority_queue_ (0),  // Could initialize this to -1, but it's
-                                // unsigned and we don't really need to
-                                // distinguish between no queues and one
-                                // queue.
-  modes_ (0),
-  tasks_ (0),
-  threads_ (0),
-  mode_ (0),
-  status_ (NOT_SCHEDULED),
-  output_level_ (0)
-{
-}
-
-
-ACE_Scheduler::~ACE_Scheduler ()
-{
-}
-
-
-// ************************************************************
-
-ACE_Scheduler::status_t
-ACE_Scheduler::get_rt_info (Object_Name name,
-                        RT_Info* &rtinfo)
-{
-  handle_t handle;
-
-  // This makes a copy.  We can optimize this with our own string
-  // class.
-  ACE_CString lookup (name);
-  // Search the map for the <name>.  If found, return the RT_Info.
-  RT_Info **info_array = 0;
-  if (info_collection_.find (lookup, info_array) >= 0)
-    {
-      rtinfo = info_array[0];
-      // If we find it, return.
-      return SUCCEEDED;
-    }
-  else
-    // Otherwise, make one, bind it, and register it.
-    {
-      rtinfo = new RT_Info;
-      rtinfo->entry_point = name;
-      // Create and array (size one) of RT_Info*
-      info_array = new RT_Info*[1];
-      info_array[0] = rtinfo;
-      // Bind the rtinfo to the name.
-      if (info_collection_.bind (lookup, info_array) != 0)
-        {
-          delete rtinfo;
-          delete info_array;
-          rtinfo = 0;
-          return FAILED; // Error!
-        }
-      else
-        {
-          // Register the array.
-          status_t result = this->register_task (info_array, 1, handle);
-          if (result == SUCCEEDED)
-            {
-              rtinfo->handle = handle;
-              return ST_UNKNOWN_TASK; // Didn't find it, but made one!
-            }
-          else
-            {
-              rtinfo->handle = 0;
-              return FAILED;
-            }
-        }
-    }
-}
-
-
-
-int ACE_Scheduler::number_of_dependencies(RT_Info* rt_info)
-{
-  return rt_info->dependencies.length();
-}
-
-int ACE_Scheduler::number_of_dependencies(RT_Info& rt_info)
-{
-  return rt_info.dependencies.length();
-}
-
-int ACE_Scheduler::add_dependency(RT_Info* rt_info,
-                              const Dependency_Info& d)
-{
-  ACE_DEBUG ((LM_DEBUG, "adding dependecy to: %s\n",
-              (const char*)rt_info->entry_point));
-  RtecScheduler::Dependency_Set& set = rt_info->dependencies;
-  int l = set.length();
-  set.length(l + 1);
-  set[l] = d;
-  return 0;
-}
-
-void ACE_Scheduler::export(RT_Info* info, FILE* file)
-{
-  export(*info, file);
-}
-
-void ACE_Scheduler::export(RT_Info& info, FILE* file)
-{
-  // The divide-by-1 is for ACE_U_LongLong support.
-  (void) ACE_OS::fprintf (file,
-                          "%s\n%d\n%ld\n%ld\n%ld\n%ld\n%d\n%ld\n%u\n"
-                          "# begin dependencies\n%d\n",
-                          (const char*)info.entry_point,
-                          info.handle,
-                          ORBSVCS_Time::to_hrtime (info.worst_case_execution_time) / 1,
-                          ORBSVCS_Time::to_hrtime (info.typical_execution_time) / 1,
-                          ORBSVCS_Time::to_hrtime (info.cached_execution_time) / 1,
-                          info.period,
-                          info.importance,
-                          ORBSVCS_Time::to_hrtime (info.quantum) / 1,
-                          info.threads,
-                          number_of_dependencies(info));
-
-  for (int i = 0; i < number_of_dependencies(info); ++i)
-    {
-      RT_Info tmp;
-      // TODO: info.dependencies [i].rt_info >>= &tmp;
-      (void) ACE_OS::fprintf (file, "%s, %d\n",
-                              (const char*)tmp.entry_point,
-                              info.dependencies[i].number_of_calls);
-
-    }
-
-  (void) ACE_OS::fprintf (file, "# end dependencies\n%d\n%d\n%d\n\n",
-                          info.priority,
-                          info.dynamic_subpriority,
-                          info.static_subpriority);
-
-
-}
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>;
-
-template class ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<ACE_CString,
-                               ACE_Scheduler::RT_Info **,
-                               ACE_SYNCH_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **,
-                                     ACE_SYNCH_MUTEX>;
-template class ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **,
-                                ACE_SYNCH_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **,
-                                        ACE_SYNCH_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>
-
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Manager<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
deleted file mode 100644
index 8cd1cd53054..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#if ! defined (SCHEDULER_H)
-#define SCHEDULER_H
-
-#include "ace/ACE.h"
-#include "ace/Map_Manager.h"
-#include "ace/Message_Block.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-class TAO_ORBSVCS_Export ACE_Scheduler
-  // = TITLE
-  //    Thread scheduler interface.
-  //
-  // = DESCRIPTION
-  //    This virtual base class is the interface to either an off-line
-  //    scheduler, or to the necessary on-line component of the Scheduler.
-{
-public:
-  typedef u_int mode_t;
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Thread_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  // Map some types to simplify re-use.
-
-  typedef const char *Object_Name;
-  // Objects are named by unique strings.
-
-  static const mode_t CURRENT_MODE;
-
-  enum status_t {
-    // The following are used both by the runtime Scheduler and during
-    // scheduling.
-    NOT_SCHEDULED = -1        // the schedule () method has not been called yet
-    , FAILED = -1
-    , SUCCEEDED
-    , ST_UNKNOWN_TASK
-    , ST_TASK_ALREADY_REGISTERED
-    , ST_VIRTUAL_MEMORY_EXHAUSTED
-
-    // The following are only used by the runtime Scheduler.
-    , INVALID_MODE
-    , MODE_COUNT_MISMATCH     // only used by schedule ()
-    , TASK_COUNT_MISMATCH     // only used by schedule ()
-    , INVALID_PRIORITY        // only used by schedule (): mismatch of
-                              // (off-line, maybe) Scheduler output to
-                              // the runtime Scheduler component.
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    , ST_UTILIZATION_BOUND_EXCEEDED
-    , ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS
-    , ST_CYCLE_IN_DEPENDENCIES
-    , UNABLE_TO_OPEN_SCHEDULE_FILE
-    , UNABLE_TO_WRITE_SCHEDULE_FILE
-  };
-
-  virtual ~ACE_Scheduler ();
-
-  // = Utility function for outputting the textual representation of a
-  //   status_t value to a FILE.
-  static void output (FILE *, const status_t);
-
-  // = Initialize the scheduler.
-  virtual void init (const int minimum_priority,
-                     const int maximum_priority,
-                     const char *runtime_filename = 0,
-                     const char *rt_info_filename = 0,
-                     const char *timeline_filename = 0) = 0;
-  // The minimum and maximum priority are the OS-specific priorities that
-  // are used when creating the schedule (assigning priorities).  The
-  // minimum_priority is the priority value of the lowest priority.
-  // It may be numerically higher than the maximum_priority, on OS's such
-  // as VxWorks that use lower values to indicate higher priorities.
-  //
-  // When Scheduler::schedule is called, the schedule is output to the
-  // file named by "runtime_filename" if it is non-zero.
-  // This file is compilable; it is linked into the runtime executable
-  // to provide priorities to the runtime scheduling component.
-  // If the "rt_info_filename" is non-zero, the RT_Info for
-  // every task is exported to it.  It is not used at runtime.
-  // If the "timeline_filename" is non-zero, the timeline output
-  // file is created.  It is not used at runtime.
-  //
-  // The runtime scheduling component ignores these filenames.  It just
-  // uses the priorities that were linked in to the executable, after
-  // converting them to platform-specific values.
-
-  // = Registers a task.
-  virtual status_t register_task (RT_Info *[],
-                                  const u_int number_of_modes,
-                                  handle_t &handle) = 0;
-  // If the Task registration succeeds, this function returns SUCCEEDED
-  // and sets "handle" to a unique identifier for the task.
-  // Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
-  // TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
-  // only be registered once.)
-  // The RT_Info * array is indexed by mode; there must be one element for
-  // each mode, as specified by number_of_modes.  If a task does not
-  // run in a mode, then its entry in the array for that mode must
-  // be 0.
-
-  virtual status_t get_rt_info (Object_Name name,
-                                RT_Info* &rtinfo);
-  // Tries to find the RT_Info corresponding to <name> in the RT_Info
-  // database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
-  // set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
-  // was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
-  // the task must call RT_Info::set to fill in execution properties.
-  // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
-  // (rtinfo, 0, handle) is called.  Returns FAILED if an error
-  // occurs.
-  // 
-  // One motivation for allocating RT_Info's from within the Scheduler
-  // is to allow RT_Infos to persist after the tasks that use them.
-  // For instance, we may want to call this->schedule right before the
-  // application exits a configuration run.  If the tasks have been
-  // deleted (deleting their RT_Infos with them), this->schedule will
-  // fail.
-
-  virtual status_t lookup_rt_info (handle_t handle,
-				   RT_Info* &rtinfo) = 0;
-  // Obtains an RT_Info based on its "handle".
-
-  // = Computes the schedule.
-  virtual status_t schedule (void) = 0;
-  // This actually generates the files.
-
-  // = Access a thread priority.
-  virtual int priority (const handle_t handle,
-                        OS_Thread_Priority &priority,
-                        Sub_Priority &subpriority,
-                        Preemption_Priority &preemption_prio,
-                        const mode_t = CURRENT_MODE) const = 0;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or -1 if an invalid mode or handle are supplied.
-  // Queue numbers are platform-independent priority values, ranging from
-  // a highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()".
-
-  // = Access the platform-independent priority value of the lowest-priority
-  //   thread.
-  u_int minimum_priority_queue () const { return minimum_priority_queue_; }
-  // This is intended for use by the Event Channel, so it can determine the
-  // number of priority dispatch queues to create.
-
-  // = Access the number of modes.
-  u_int modes () const { return modes_; }
-
-  // = Access the number of tasks.
-  u_int tasks () const { return tasks_; }
-
-  // = Access the number of threads.
-  u_int threads () const { return threads_; }
-
-  // = Access the current mode.
-  mode_t mode () const { return mode_; }
-
-  // = Set the current mode.
-  void mode (const mode_t mode) { mode_ = mode; }
-
-  // = Access the current scheduler status.
-  status_t status () const { return status_; }
-
-  // = Access the current output (debugging) level.
-  u_int output_level () const { return output_level_; }
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
-
-  // = Set the scheduler output (debugging) level.
-  void output_level (const u_int level) { output_level_ = level; }
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2
-  // (debug)
-
-  static int add_dependency(RT_Info* rt_info,
-			    const Dependency_Info& d);
-
-  static int number_of_dependencies(RT_Info* rt_info);
-  static int number_of_dependencies(RT_Info& rt_info);
-
-  static void export(RT_Info*, FILE* file);
-  static void export(RT_Info&, FILE* file);
-
-protected:
-  ACE_Scheduler ();
-
-  // = Set the minimum priority value.
-  void minimum_priority_queue (const u_int minimum_priority_queue_number)
-    { minimum_priority_queue_ = minimum_priority_queue_number; }
-
-  // = Set the number of modes.
-  void modes (const u_int modes) { modes_ = modes; }
-
-  // = Set the number of tasks.
-  void tasks (const u_int tasks) { tasks_ = tasks; }
-
-  // = Set the number of threads.
-  void threads (const u_int threads) { threads_ = threads; }
-
-  // = Set the current scheduler status.
-  void status (const status_t new_status) { status_ = new_status; }
-
-private:
-  typedef ACE_CString EXT;
-  typedef RT_Info **INT;
-
-  typedef ACE_Map_Manager<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection;
-  typedef ACE_Map_Iterator<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry;
-
-  Info_Collection info_collection_;
-  // A binding of name to rt_info.  This is the mapping for every
-  // rt_info in the process.
-
-  static ACE_Scheduler *instance_;
-
-  u_int minimum_priority_queue_;
-  // The platform-independent priority value of the Event Channel's
-  // minimum priority dispatch queue.  The value of the maximum priority
-  // dispatch queue is always 0.
-
-  u_int modes_;
-  u_int tasks_;
-  u_int threads_;
-
-  mode_t mode_;
-  status_t status_;
-  u_int output_level_;
-
-  // the following functions are not implememented
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler (const ACE_Scheduler &))
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler &operator= (const ACE_Scheduler &))
-};
-
-typedef ACE_Scheduler Scheduler;
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDULER_H */
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
deleted file mode 100644
index 57875ae26d1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
deleted file mode 100644
index 1b36d49e1d6..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.cpp
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#include "ace/Sched_Params.h"
-
-#include "Scheduler_Generic.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// static functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-// Structure for storing the RT_Info information for each task, per mode.
-struct Mode_Entry
-{
-  RtecScheduler::RT_Info *rt_info_;
-  u_long start_time_; // microseconds
-  u_long stop_time_;  // microseconds
-
-  Mode_Entry() :
-    rt_info_ (0),
-    start_time_ (0),
-    stop_time_ (0)
-  {
-  }
-
-  Mode_Entry(RtecScheduler::RT_Info *const rt_info,
-             const u_long start_time = 0,
-             const u_long stop_time = 0) :
-    rt_info_ (rt_info),
-    start_time_ (start_time),
-    stop_time_ (stop_time)
-  {
-  }
-
-  ~Mode_Entry () {}
-
-  Mode_Entry &operator= (const Mode_Entry &entry)
-  {
-    if (this != &entry)
-      {
-        rt_info_ = entry.rt_info_;
-        start_time_ = entry.start_time_;
-        stop_time_ = entry.stop_time_;
-      }
-
-    return *this;
-  }
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scheduler_Generic member functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-Scheduler_Generic::Scheduler_Generic () :
-  Scheduler (),
-  handles_ (0),
-  // Set the minimum priority to that for the current platform.  This
-  // shouldn't be necessary, but UPSingleProcessorOrb::initialize_reactors
-  // creates threads before the Event Channel calls Scheduler::init ().
-  minimum_priority_ (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                     ACE_SCOPE_THREAD)),
-  increasing_priority_ (-1),
-  task_entries_ ()
-{
-}
-
-
-Scheduler_Generic::~Scheduler_Generic ()
-{
-  reset ();
-}
-
-
-void
-Scheduler_Generic::reset ()
-{
-}
-
-Scheduler::status_t
-Scheduler_Generic::lookup_rt_info (handle_t handle,
-                                   RT_Info*& rtinfo)
-{
-  if (handle < 0 || (size_t) handle > task_entries_.size ())
-    {
-      return ST_UNKNOWN_TASK;
-    }
-  RT_Info*** entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> i (task_entries_);
-  while (i.next (entry) != 0)
-    {
-      i.advance ();
-      RT_Info** array = *entry;
-      if (array[0]->handle == handle)
-        {
-          rtinfo = array[0];
-          return SUCCEEDED;
-        }
-    }
-
-  return ST_UNKNOWN_TASK;
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::register_task (RT_Info *rt_info [],
-                                   const u_int number_of_modes,
-                                   handle_t &handle)
-{
-  status_t ret;
-
-  // try to store the new task's information . . .
-  switch (task_entries_.insert (rt_info))
-    {
-      case 0 : // successfully inserted
-        {
-          rt_info [0]->handle = (handle = ++handles_);
-
-          // assigned the same handle to the RT_Info for each of its modes
-          for (u_int i = 1; i < number_of_modes; ++i)
-            {
-              if (rt_info [i] != 0)
-                rt_info [i]->handle = handle;
-            }
-
-          if (number_of_modes > modes ())
-            {
-              modes (number_of_modes);
-            }
-
-          ret = SUCCEEDED;
-
-          if (output_level () >= 5)
-            {
-              ACE_OS::printf ("registered task \"%s\" with RT_Info starting "
-                                "at %X\n",
-                              (const char*)rt_info[0]->entry_point,
-                              (void *) rt_info[0]);
-            }
-        }
-        break;
-
-      case 1 : // the entry had already been inserted
-        handle = 0;
-        ret = ST_TASK_ALREADY_REGISTERED;
-        break;
-
-      default :
-        // case -1 : insert failed, probably because virtual memory exhaused
-        handle = 0;
-        ret = ST_VIRTUAL_MEMORY_EXHAUSTED;
-        break;
-    }
-
-  return ret;
-}
-
-
-void
-Scheduler_Generic::init (const int minimum_priority,
-                          const int maximum_priority,
-                          const char *runtime_filename,
-                          const char *rt_info_filename,
-                          const char *timeline_filename)
-{
-  minimum_priority_ = minimum_priority;
-  maximum_priority_ = maximum_priority;
-  runtime_filename_ = runtime_filename;
-  rt_info_filename_ = rt_info_filename;
-  timeline_filename_ = timeline_filename;
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::schedule (void)
-{
-  ACE_Guard<LOCK> ace_mon (lock_);
-
-  // here goes . . .
-
-  increasing_priority_ = maximum_priority_ >= minimum_priority_;
-
-  status_t status = ACE_Scheduler::SUCCEEDED;
-
-  // store number of tasks, based on registrations
-  tasks (task_entries_.size ());
-
-  if (output_level () > 0)
-    {
-      print_schedule ();
-    }
-
-  return status;
-}
-
-
-int
-Scheduler_Generic::priority (const handle_t handle,
-                             OS_Thread_Priority &priority,
-                             Sub_Priority &subpriority,
-                             Preemption_Priority &preemption_prio,
-                             const mode_t requested_mode) const
-{
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (requested_mode);
-
-  priority = minimum_priority_;
-  subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-  preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY;
-
-  if (output_level () >= 3)
-    {
-      ACE_OS::printf ("preemption_prio %d: min %d, pri %d, min_pri %d\n",
-                      preemption_prio, minimum_priority_queue (),
-                      priority, minimum_priority_);
-    }
-
-  return 0;
-}
-
-
-void
-Scheduler_Generic::print_schedule ()
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<RtecScheduler::RT_Info **>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::RT_Info **>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
deleted file mode 100644
index 4e27a9999ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.h
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#if ! defined (SCHEDULER_INTERNAL_H)
-#define SCHEDULER_INTERNAL_H
-
-#include "Scheduler.h"
-
-class TAO_ORBSVCS_Export Scheduler_Generic : public ACE_Scheduler
-  // = TITLE
-  //    Implementation of an off-line scheduler.
-  //
-  // = DESCRIPTION
-  //    Schedules tasks, assigning the same priority to all of them.
-{
-public:
-  Scheduler_Generic ();
-  virtual ~Scheduler_Generic ();
-
-  // = Initialize the scheduler.
-  virtual void init (const int minimum_priority,
-                     const int maximum_priority,
-                     const char *runtime_filename = 0,
-                     const char *rt_info_filename = 0,
-                     const char *timeline_filename = 0);
-
-  // = Registers a task.
-  virtual status_t register_task (RT_Info *[],
-                                  const u_int number_of_modes,
-                                  handle_t &handle);
-
-  virtual status_t lookup_rt_info (handle_t handle,
-                                   RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
-
-  // = Computes the schedule.
-  virtual status_t schedule (void);
-
-  // = Access a thread priority.
-  virtual int priority (const handle_t handle,
-                        OS_Thread_Priority &priority,
-                        Sub_Priority &subpriority,
-                        Preemption_Priority &preemption_prio,
-                        const mode_t = CURRENT_MODE) const;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or 1 if an invalid mode or handle are supplied.
-
-private:
-  u_int handles_;
-  // The number of task handles dispensed so far.
-
-  int minimum_priority_;
-  // The minimum priority value that the application specified (in
-  // its call to init ()).
-
-  int maximum_priority_;
-  // The maximum priority value that the application specified (in
-  // its call to init ()).
-
-  const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
-
-  const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
-
-  const char *timeline_filename_;
-  // The destination of the timeline.
-
-  int increasing_priority_;
-  // Set to 1 if priority values increase with increasing priority,
-  // such as on Solaris and Win32, or 0 if they decrease, such as on
-  // VxWorks.
-
-  ACE_Unbounded_Set <RT_Info **> task_entries_;
-  // Collection of known tasks.
-
-#if defined (ACE_HAS_THREADS)
-  typedef ACE_Recursive_Thread_Mutex LOCK;
-#else
-  typedef ACE_Null_Mutex LOCK;
-#endif /* ACE_HAS_THREADS */
-
-  LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
-
-
-  ///////////////////////////////////////
-  // member functions for internal use //
-  ///////////////////////////////////////
-
-  void reset ();
-  // Prepare for another schedule computation, but do not
-  // disturb the "output" (priorities that have already been assigned).
-
-  void print_schedule ();
-  // Display the schedule, task-by-task.
-
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic (const Scheduler_Generic &))
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic &operator= (
-    const Scheduler_Generic &))
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDULER_INTERNAL_H */
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
deleted file mode 100644
index 71e3695dc35..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
deleted file mode 100644
index 2469a118c58..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ /dev/null
@@ -1,1236 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.cpp
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#include "math.h"
-
-#include "ace/Sched_Params.h"
-
-#include "Strategy_Scheduler.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-//////////////////////////////////////////////
-// helper function type definition for sort //
-//////////////////////////////////////////////
-
-// this is awkward, but it makes MSVC++ happy
-extern "C"
-{
-typedef int (*COMP_FUNC) (const void*, const void*);
-}
-
-///////////////////////////////////////////////////
-// class ACE_Strategy_Scheduler member functions //
-///////////////////////////////////////////////////
-
-ACE_Strategy_Scheduler::ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy)
-  : ACE_DynScheduler (),
-    strategy_ (strategy)
-{
-}
-  // = ctor
-
-
-ACE_Strategy_Scheduler::~ACE_Strategy_Scheduler ()
-{
-}
-  // = virtual dtor
-
-
-ACE_DynScheduler::status_t
-ACE_Strategy_Scheduler::sort_dispatches (Dispatch_Entry **dispatches,
-                                         u_int count)
-{
-  // sort the entries in order of priority and subpriority
-  strategy_.sort (dispatches, count);
-
-  return ACE_DynScheduler::SUCCEEDED;
-}
-  // = sets up the schedule in the order generated
-  //   by the strategy's comparison operators
-
-ACE_DynScheduler::status_t
-ACE_Strategy_Scheduler::assign_priorities (Dispatch_Entry **dispatches,
-                                           u_int count)
-{
-  // start with happy status
-  ACE_DynScheduler::status_t status = ACE_DynScheduler::SUCCEEDED;
-
-  // start with the highest OS priority in the given range and work downward:
-  // if we run out of values to assign, return an error.
-  int current_OS_priority = maximum_priority_;
-
-  // start scheduler priority at 0 (highest priority queue number)
-  // NOTE: 0 is highest for priority, lowest for dynamic and static subpriority
-  Preemption_Priority current_scheduler_priority = 0;
-
-  // value the OS and scheduler priorities in 0th dispatch entry
-  dispatches[0]->OS_priority (current_OS_priority);
-  dispatches[0]->priority (current_scheduler_priority);
-
-  // traverse ordered dispatch entry array, assigning priority
-  // (array is sorted from highest to lowest priority)
-  for (u_int i = 1; i < count; ++i)
-  {
-    switch (strategy_.priority_comp (*(dispatches[i-1]),
-                                     *(dispatches[i])))
-    {
-      case -1:  // the current entry is at lower priority than the previous
-                {
-        // decrease priority by incrementing the current scheduling priority
-        //  number: 0 is the highest priority number.
-        ++current_scheduler_priority;
-
-        // check for OS priority level boundaries: because OS priority values
-        // can run in either increasing or decreasing order, there is no easy,
-        // portable way to check other than exact comparison to the bounds
-        // that were given in init () or that came from the platform itself.
-        if ((current_OS_priority == minimum_priority_) ||
-            (current_OS_priority == ACE_Sched_Params::previous_priority (
-                                      ACE_SCHED_FIFO,
-                                      current_OS_priority,
-                                      ACE_SCOPE_PROCESS)))
-        {
-          // if we have run out of priority levels to assign, indicate
-          // this in the return status, but keep right on assigning the
-          // minimum OS priority in the range to the remaining tasks.
-          status = ACE_DynScheduler::ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS;
-        }
-        else
-        {
-          // we're still in range, so decrement the current OS priority level
-          current_OS_priority =
-            ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                 current_OS_priority,
-                                                 ACE_SCOPE_PROCESS);
-        }
-
-                break;
-                }
-      case 0:  // still at the same priority level
-
-        break;
-
-      default: // should never reach here: something *bad* has happened
-
-        ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "Priority assignment failure: tasks"
-          " \"%s\" and \"%s\" are out of order.\n",
-          dispatches [i-1]->task_entry ().rt_info ()->entry_point.in (),
-          dispatches [i]->task_entry ().rt_info ()->entry_point.in ()),
-          ACE_DynScheduler::ST_INVALID_PRIORITY_ORDERING);
-    }
-
-    // set OS priority of the current dispatch entry
-    dispatches[i]->OS_priority (current_OS_priority);
-
-    // set scheduler priority of the current dispatch entry
-    dispatches[i]->priority (current_scheduler_priority);
-  }
-
-  return status;
-}
-  // = assigns priorities and sub-priorities to the sorted schedule,
-  //   according to the strategy's priority comparison operator.
-
-ACE_DynScheduler::status_t
-ACE_Strategy_Scheduler::assign_subpriorities (Dispatch_Entry **dispatches,
-                                              u_int count)
-{
-  // start subpriority levels and element counts at 1, set level values in
-  // the first entry, increment the static subpriority level,
-  Sub_Priority dynamic_subpriority_level = 0;
-  Sub_Priority static_subpriority_level = 0;
-  u_int dynamic_subpriority_elements = 1;
-  u_int static_subpriority_elements = 1;
-  dispatches[0]->dynamic_subpriority (dynamic_subpriority_level);
-  dispatches[0]->static_subpriority (static_subpriority_level++);
-
-  u_int i,j;
-  // traverse ordered dispatch entry array, assigning priority
-  // (array is sorted from highest to lowest priority)
-  for (i = 1; i < count; ++i)
-  {
-    switch (strategy_.priority_comp (*(dispatches[i-1]),
-                                     *(dispatches[i])))
-    {
-      case -1:  // the current entry is at lower priority than the previous
-                {
-        // fill in the high to low dynamic subpriority values by subtracting
-        // the previously assigned subpriority value of each of element in the
-                // current priority level from the value of last subpriority level
-        for (j = 1; j <= dynamic_subpriority_elements; ++j)
-        {
-          dispatches[i - j]->
-                          dynamic_subpriority (dynamic_subpriority_level -
-                                   dispatches[i - j]->
-                                                                     dynamic_subpriority ());
-        }
-        for (j = 1; j <= static_subpriority_elements; ++j)
-        {
-          dispatches[i - j]->
-                          static_subpriority (static_subpriority_level -
-                                  dispatches[i - j]->
-                                                                    static_subpriority () - 1);
-        }
-
-        // reset the subpriority counters, set these values in the
-        // current entry, and increment the static subpriority counter
-        dynamic_subpriority_elements = 1;
-        static_subpriority_elements = 1;
-        dynamic_subpriority_level = 0;
-        static_subpriority_level = 0;
-        dispatches[i]->dynamic_subpriority (dynamic_subpriority_level);
-        dispatches[i]->static_subpriority (static_subpriority_level++);
-
-        break;
-                }
-
-      case 0:  // still at the same priority level
-
-        // compare the dynamic subpriorities
-        switch (strategy_.dynamic_subpriority_comp (*(dispatches[i-1]),
-                                                    *(dispatches[i])))
-        {
-          case -1:  // the current entry is at lower dynamic subpriority
-
-            // increment dynamic subpriority level
-            ++dynamic_subpriority_level;
-
-            // update the static subpriority as well: this avoids problems
-            // with non-determinism if due to run-time conditions, two
-            // dispatches line up with identical dynamic subpriority that
-            // were considered different with respect to the critical instant
-            dispatches[i]->static_subpriority (static_subpriority_level++);
-            static_subpriority_elements++;
-            break;
-
-          case 0:  // still at the same dynamic subpriority level
-
-                         {
-            switch (strategy_.static_subpriority_comp (*(dispatches[i-1]),
-                                                       *(dispatches[i])))
-            {
-              case -1:
-              case  0:
-
-                // assign and then increment the static subpriority: even if
-                // still at the same dynamic or static subpriority level as
-                // far as the scheduling strategy is concerned, assign a new
-                // one anyway, to give a completely deterministic schedule
-                // even if the dynamic subpriorities happen to align due to
-                // run-time variation
-                dispatches[i]->static_subpriority (static_subpriority_level++);
-                static_subpriority_elements++;
-                break;
-
-              default: // should never reach here: something *bad* has happened
-
-                ACE_ERROR_RETURN ((
-                  LM_ERROR,
-                  "Static subpriority assignment failure: tasks"
-                  " \"%s\" and \"%s\" are out of order.\n",
-                  dispatches[i-1]->task_entry ().rt_info ()->entry_point.in (),
-                  dispatches[i]->task_entry ().rt_info ()->entry_point.in ()),
-                  ACE_DynScheduler::ST_INVALID_PRIORITY_ORDERING);
-            }
-
-            break;
-                         }
-
-          default: // should never reach here: something *bad* has happened
-
-            ACE_ERROR_RETURN ((
-              LM_ERROR,
-              "Dynamic subpriority assignment failure: tasks"
-              " \"%s\" and \"%s\" are out of order.\n",
-              dispatches[i-1]->task_entry ().rt_info ()->entry_point.in (),
-              dispatches[i]->task_entry ().rt_info ()->entry_point.in ()),
-              ACE_DynScheduler::ST_INVALID_PRIORITY_ORDERING);
-        }
-
-        dispatches[i]->dynamic_subpriority (dynamic_subpriority_level);
-                dynamic_subpriority_elements++;
-        break;
-
-      default: // should never reach here: something *bad* has happened
-
-        ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "Priority assignment failure: tasks"
-          " \"%s\" and \"%s\" are out of order.\n",
-          dispatches[i-1]->task_entry ().rt_info ()->entry_point.in (),
-          dispatches[i]->task_entry ().rt_info ()->entry_point.in ()),
-          ACE_DynScheduler::ST_INVALID_PRIORITY_ORDERING);
-    }
-  }
-
-  // fill in the high to low subpriority values for the last priority
-  // level by subtracting the previously assigned subpriorities from
-  // the total number of subpriorities
-  for (j = 1; j <= dynamic_subpriority_elements; ++j)
-  {
-    dispatches[i - j]->
-      dynamic_subpriority (dynamic_subpriority_level -
-                           dispatches[i - j]->dynamic_subpriority ());
-  }
-  for (j = 1; j <= static_subpriority_elements; ++j)
-  {
-    dispatches[i - j]->
-      static_subpriority (static_subpriority_level -
-                          dispatches[i - j]->static_subpriority () - 1);
-  }
-
-  return ACE_DynScheduler::SUCCEEDED;
-}
-
-
-ACE_DynScheduler::Preemption_Priority
-ACE_Strategy_Scheduler::minimum_critical_priority ()
-{
-  return strategy_.minimum_critical_priority ();
-}
-  // = determine the minimum critical priority number
-
-
-ACE_DynScheduler::status_t
-ACE_Strategy_Scheduler::schedule_timeline_entry (
-  Dispatch_Entry &dispatch_entry,
-  ACE_Unbounded_Queue <Dispatch_Entry *> &reschedule_queue)
-{
-  status_t status = SUCCEEDED;
-
-  // timeline entries cover the execution time of the dispatch
-  CORBA::ULong remaining_time =
-    dispatch_entry.task_entry().rt_info ()->worst_case_execution_time.low;
-
-  // initialize last stop time to arrival time of the dispatch
-  CORBA::ULong last_stop = dispatch_entry.arrival ().low;
-
-  TimeLine_Entry *last_entry = 0;
-  TimeLine_Entry *current_entry = 0;
-  ACE_Ordered_MultiSet_Iterator <TimeLine_Entry_Link> iter (*timeline_);
-  for (iter.first (); (remaining_time > 0) && (iter.done () == 0);
-       iter.advance ())
-  {
-    TimeLine_Entry_Link *link;
-    if ((iter.next (link) == 0) || (! link))
-    {
-      return ST_BAD_INTERNAL_POINTER;
-    }
-
-    // for each entry already in the timeline that is the first one for a
-    // dispatch, and has lower dynamic subpriority and does not have greater
-    // static priority, and starts in the period in which the new entry would
-    // execute, then advance the iterator to the next timeline entry
-    // having a different dispatch entry (if there is such), add its dispatch
-    // entry to the reschedule set, remove all TimeLine_Entry_Links that
-    // correspond to that dispatch entry, and delete all its TimeLine_Entry
-    // objects as well.  NOTE: 0 is highest priority, 1 next, etc.
-    while ((iter.done () == 0) &&
-           (link->entry ().start() < last_stop + remaining_time) &&
-           (link->entry ().start() >= last_stop) &&
-           (link->entry ().prev () == 0) &&
-           (link->entry ().dispatch_entry().priority () >=
-            dispatch_entry.priority ()) &&
-           (strategy_.dynamic_subpriority (dispatch_entry, link->entry ().start ()) >
-            strategy_.dynamic_subpriority (link->entry ().dispatch_entry (),
-                                           link->entry ().start ())))
-    {
-      // point to the dispatch entry whose timeline entries will be removed and
-      // rescheduled, and to the timeline entry heading the bilinked list of
-      // timeline entries to be removed
-      Dispatch_Entry *removed_dispatch_entry
-        = &(link->entry ().dispatch_entry());
-      TimeLine_Entry *remove_entry = & (link->entry ());
-
-      // put the dispatch entry into the set of entries that will be
-      // rescheduled at the end of this method (tail recursively)
-      reschedule_queue.enqueue_tail (removed_dispatch_entry);
-
-      // advance the iterator to the next timeline entry (if there is one)
-      // that is not for the dispatch entry being removed
-      while (iter.done () == 0)
-      {
-        // point to the current link
-        if ((iter.next (link) == 0) || (! link))
-        {
-          return ST_BAD_INTERNAL_POINTER;
-        }
-
-        // advance until a different dispatch entry is found,
-        // or we run off the end of the timeline
-        if (&(link->entry ().dispatch_entry ()) ==
-            removed_dispatch_entry)
-        {
-          iter.advance ();
-        }
-        else
-        {
-          break;
-        }
-      }
-
-      // remove entries corresponding to the rescheduled
-      // dispatch from the timeline and destroy them
-      TimeLine_Entry *next_remove_entry = 0;
-      while (remove_entry)
-      {
-        next_remove_entry = remove_entry->next ();
-
-        timeline_->remove (TimeLine_Entry_Link (*remove_entry));
-        delete remove_entry;
-
-        remove_entry = next_remove_entry;
-      }
-    }
-
-    // exit the outer loop if there are no more entries in the timeline
-    if (iter.done () != 0)
-    {
-      break;
-    }
-
-    // if there's room, schedule a new timeline entry for the dispatch
-    if (link->entry ().start() > last_stop)
-    {
-      ACE_NEW_RETURN (
-        current_entry,
-        TimeLine_Entry (
-          dispatch_entry,
-          last_stop,
-          (((remaining_time + last_stop) < link->entry ().start())
-             ? (remaining_time + last_stop) : link->entry ().start()),
-          dispatch_entry.arrival ().low,
-          dispatch_entry.deadline ().low,
-          (TimeLine_Entry *) 0, last_entry),
-        ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-      // patch up the pointers within the list of entries for this dispatch
-      if (last_entry)
-      {
-        last_entry->next (current_entry);
-      }
-      last_entry = current_entry;
-
-      timeline_->insert(TimeLine_Entry_Link(*current_entry));
-
-      // update the remaining time and last stop values
-      remaining_time -= ((remaining_time < (link->entry ().start() - last_stop))
-                          ? remaining_time : (link->entry ().start() - last_stop));
-    }
-
-    // update the last stop time
-    if (last_stop < link->entry ().stop ())
-    {
-      last_stop = link->entry ().stop ();
-    }
-  }
-
-  // if there is still dispatch time remaining, and we've
-  // reached the end of the list, insert what's left
-  if (remaining_time > 0)
-  {
-    ACE_NEW_RETURN (
-      current_entry,
-      TimeLine_Entry (
-        dispatch_entry,
-        last_stop,
-        remaining_time + last_stop,
-        dispatch_entry.arrival ().low,
-        dispatch_entry.deadline ().low,
-        0, last_entry),
-      ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-    // patch up the pointers within the list of entries for this dispatch
-    if (last_entry)
-    {
-      last_entry->next (current_entry);
-    }
-
-    timeline_->insert(TimeLine_Entry_Link(*current_entry));
-  }
-
-  return status;
-}
-
-
-
-////////////////////////////////////////////////////////////////////
-// class template ACE_Strategy_Scheduler_Factory member functions //
-////////////////////////////////////////////////////////////////////
-
-template <class STRATEGY>
-ACE_Strategy_Scheduler *
-ACE_Strategy_Scheduler_Factory<STRATEGY>::create (ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-{
-  ACE_Strategy_Scheduler *the_scheduler = 0;
-  STRATEGY *the_strategy;
-
-  ACE_NEW_RETURN(the_strategy, STRATEGY(minimum_critical_priority), 0);
-
-  ACE_NEW_RETURN (the_scheduler, ACE_Strategy_Scheduler (*the_strategy), 0);
-
-  return the_scheduler;
-};
-  // construct and return a scheduler strategized with
-  // an instance of the the parameterized strategy type
-
-
-
-/////////////////////////////////////////////////////////////////
-// abstract base class ACE_Scheduler_Strategy member functions //
-/////////////////////////////////////////////////////////////////
-
-
-ACE_Scheduler_Strategy::ACE_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  : minimum_critical_priority_ (minimum_critical_priority)
-{
-}
-  // ctor
-
-int
-ACE_Scheduler_Strategy::sort_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  // order first by the priority ordering
-  int result = priority_comp (first_entry, second_entry);
-
-  // within same priority, order by dynamic subpriority
-  if (result == 0)
-  {
-    result = dynamic_subpriority_comp (first_entry, second_entry);
-  }
-
-  // if same dynamic subpriority, order by static subpriority
-  if (result == 0)
-  {
-    result = static_subpriority_comp (first_entry, second_entry);
-  }
-
-  return result;
-}
-  // = comparison of two dispatch entries using the specific priority, dynamic
-  //   subpriority, and static subpriority method definitions provided by
-  //   the derived strategy class to produce the strategy specific sort
-  //   ordering: returns -1 if the first Dispatch_Entry is greater in the order,
-  //   0 if they are equivalent, or 1 if the second Dispatch_Entry is greater in
-  //   the order
-
-
-int
-ACE_Scheduler_Strategy::static_subpriority_comp (
-  const Dispatch_Entry &first_entry,
-  const Dispatch_Entry &second_entry)
-{
-  // order first by importance assigned to underlying RT_Info (descending)
-  if (first_entry.task_entry ().rt_info ()->importance   >
-      second_entry.task_entry ().rt_info ()->importance)
-  {
-    return -1;
-  }
-  else if (first_entry.task_entry ().rt_info ()->importance   <
-           second_entry.task_entry ().rt_info ()->importance)
-  {
-    return 1;
-  }
-  else
-  {
-    // order last by the topological sort finishing time (ascending)
-    if (first_entry.task_entry ().finished ()   <
-        second_entry.task_entry ().finished ())
-    {
-      return -1;
-    }
-    else if (first_entry.task_entry ().finished ()   >
-             second_entry.task_entry ().finished ())
-    {
-      return 1;
-    }
-    else
-    {
-      return 0;
-    }
-  }
-}
-
-ACE_DynScheduler::Preemption_Priority
-ACE_Scheduler_Strategy::minimum_critical_priority ()
-{
-  return 0;
-}
-  // = returns 0 for minimum critical priority number
-
-
-/////////////////////////////////////////////////////////////////////////
-// class ACE_MUF_Scheduler_Strategy static data member initializations //
-/////////////////////////////////////////////////////////////////////////
-
-ACE_MUF_Scheduler_Strategy * ACE_MUF_Scheduler_Strategy::instance_ = 0;
-
-///////////////////////////////////////////////////////
-// class ACE_MUF_Scheduler_Strategy member functions //
-///////////////////////////////////////////////////////
-
-ACE_MUF_Scheduler_Strategy *
-ACE_MUF_Scheduler_Strategy::instance ()
-{
-  if (0 == ACE_MUF_Scheduler_Strategy::instance_)
-  {
-    ACE_NEW_RETURN (ACE_MUF_Scheduler_Strategy::instance_,
-                    ACE_MUF_Scheduler_Strategy, 0);
-  }
-
-  return ACE_MUF_Scheduler_Strategy::instance_;
-}
-
-int
-ACE_MUF_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
-                                           const Dispatch_Entry &second_entry)
-{
-  // order by criticality (descending)
-  if (first_entry.task_entry ().rt_info ()->criticality   >
-      second_entry.task_entry ().rt_info ()->criticality)
-  {
-    return -1;
-  }
-  else if (first_entry.task_entry ().rt_info ()->criticality   <
-           second_entry.task_entry ().rt_info ()->criticality)
-  {
-    return 1;
-  }
-  else
-  {
-    return 0;  // same priority level
-  }
-}
-  // = comparison of two dispatch entries by maximum criticality: returns -1 if the
-  //   first Dispatch_Entry is greater in the order, 0 if they're equivalent, or
-  //   1 if the second Dispatch_Entry is greater in the order.
-
-
-void
-ACE_MUF_Scheduler_Strategy::sort (Dispatch_Entry **dispatch_entries, u_int size)
-{
-  ::qsort ((void *) dispatch_entries,
-           size,
-           sizeof (Dispatch_Entry *),
-           (COMP_FUNC) ACE_MUF_Scheduler_Strategy::sort_function);
-}
-  // = sort the dispatch entry pointer array in descending urgency order
-
-
-ACE_MUF_Scheduler_Strategy::ACE_MUF_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  :ACE_Scheduler_Strategy (minimum_critical_priority)
-{
-}
-    // = default ctor
-
-ACE_MUF_Scheduler_Strategy::~ACE_MUF_Scheduler_Strategy ()
-{
-}
-    // = virtual dtor
-
-long
-ACE_MUF_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 u_long current_time)
-{
-  long laxity =
-    entry.deadline ().low - current_time -
-    entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  return (laxity > 0) ? LONG_MAX - laxity : laxity;
-}
-  // = returns a dynamic subpriority value for the given entry and the
-  //   current time: if the operation has non-negative laxity, then the
-  //   value is positive, and a lower laxity gives a higher dynamic
-  //   subpriority; if the operation has negative laxity, the value
-  //   is the (negative) laxity value
-
-
-int
-ACE_MUF_Scheduler_Strategy::dynamic_subpriority_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  // order by descending dynamic priority according to ascending laxity
-  u_long laxity1 =
-    first_entry.deadline ().low - first_entry.arrival ().low -
-    first_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  u_long laxity2 =
-    second_entry.deadline ().low - first_entry.arrival ().low -
-    second_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-
-  if (laxity1 < laxity2)
-  {
-    return -1;
-  }
-  else if (laxity1 > laxity2)
-  {
-    return 1;
-  }
-  else
-  {
-    return 0;
-  }
-}
-  // = orders of two dispatch entries by ascending laxity: returns -1 if the
-  // first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-  // 1 if the second Dispatch_Entry is greater in the order.
-
-
-int
-ACE_MUF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
-{
-  return ACE_MUF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
-}
-  // comparison function to pass to qsort
-
-ACE_DynScheduler::Preemption_Priority
-ACE_MUF_Scheduler_Strategy::minimum_critical_priority ()
-{
-  return minimum_critical_priority_;
-}
-  // = returns minimum critical priority number
-
-/////////////////////////////////////////////////////////////////////////
-// class ACE_RMS_Scheduler_Strategy static data member initializations //
-/////////////////////////////////////////////////////////////////////////
-
-ACE_RMS_Scheduler_Strategy * ACE_RMS_Scheduler_Strategy::instance_ = 0;
-
-///////////////////////////////////////////////////////
-// class ACE_RMS_Scheduler_Strategy member functions //
-///////////////////////////////////////////////////////
-
-ACE_RMS_Scheduler_Strategy *
-ACE_RMS_Scheduler_Strategy::instance ()
-{
-  if (0 == ACE_RMS_Scheduler_Strategy::instance_)
-  {
-    ACE_NEW_RETURN (ACE_RMS_Scheduler_Strategy::instance_,
-                    ACE_RMS_Scheduler_Strategy, 0);
-  }
-
-  return ACE_RMS_Scheduler_Strategy::instance_;
-}
-
-int
-ACE_RMS_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
-                                           const Dispatch_Entry &second_entry)
-{
-  // compare by decreasing dispatch period
-  if ((first_entry.deadline ().low - first_entry.arrival ().low)    <
-      (second_entry.deadline ().low - second_entry.arrival ().low))
-  {
-    return -1;
-  }
-  else if ((first_entry.deadline ().low - first_entry.arrival ().low)    >
-           (second_entry.deadline ().low - second_entry.arrival ().low))
-  {
-    return 1;
-  }
-  else
-  {
-    return 0;  // same priority level
-  }
-}
-  // = comparison of two dispatch entries by minimum period: returns -1 if the
-  //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-  //   or 1 if the second Dispatch_Entry is greater in the order.
-
-void
-ACE_RMS_Scheduler_Strategy::sort (
-  Dispatch_Entry **dispatch_entries_, u_int size)
-{
-  ::qsort ((void *) dispatch_entries_,
-           size,
-           sizeof (Dispatch_Entry *),
-           (COMP_FUNC) ACE_RMS_Scheduler_Strategy::sort_function);
-}
-  // = sort the dispatch entry pointer array in descending RMS (rate) order
-
-ACE_RMS_Scheduler_Strategy::ACE_RMS_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  :ACE_Scheduler_Strategy (minimum_critical_priority)
-{
-}
-    // = default ctor
-
-ACE_RMS_Scheduler_Strategy::~ACE_RMS_Scheduler_Strategy ()
-{
-}
-    // = virtual dtor
-
-long
-ACE_RMS_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 u_long current_time)
-{
-  return 0;
-}
-  // = all entries have the same dynamic subpriority value
-
-int
-ACE_RMS_Scheduler_Strategy::dynamic_subpriority_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  return 0;
-}
-  // = all tasks in a given priority level have the same dynamic
-  //   subpriority under RMS
-
-
-int
-ACE_RMS_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
-{
-  return ACE_RMS_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
-}
-  // comparison function to pass to qsort
-
-
-ACE_DynScheduler::Preemption_Priority
-ACE_RMS_Scheduler_Strategy::minimum_critical_priority ()
-{
-  return minimum_critical_priority_;
-}
-  // = returns minimum critical priority number
-
-/////////////////////////////////////////////////////////////////////////
-// class ACE_MLF_Scheduler_Strategy static data member initializations //
-/////////////////////////////////////////////////////////////////////////
-
-ACE_MLF_Scheduler_Strategy * ACE_MLF_Scheduler_Strategy::instance_ = 0;
-
-///////////////////////////////////////////////////////
-// class ACE_MLF_Scheduler_Strategy member functions //
-///////////////////////////////////////////////////////
-
-ACE_MLF_Scheduler_Strategy *
-ACE_MLF_Scheduler_Strategy::instance ()
-{
-  if (0 == ACE_MLF_Scheduler_Strategy::instance_)
-  {
-    ACE_NEW_RETURN (ACE_MLF_Scheduler_Strategy::instance_,
-                    ACE_MLF_Scheduler_Strategy, 0);
-  }
-
-  return ACE_MLF_Scheduler_Strategy::instance_;
-}
-
-int
-ACE_MLF_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
-                                           const Dispatch_Entry &second_entry)
-{
-  return 0;
-}
-  // = just returns 0, as all dispatch entries are of equivalent priority under MLF.
-
-void
-ACE_MLF_Scheduler_Strategy::sort (
-  Dispatch_Entry **dispatch_entries_, u_int size)
-{
-  ::qsort ((void *) dispatch_entries_,
-           size,
-           sizeof (Dispatch_Entry *),
-           (COMP_FUNC) ACE_MLF_Scheduler_Strategy::sort_function);
-}
-  // = sort the dispatch entry pointer array in ascending laxity order
-
-
-ACE_MLF_Scheduler_Strategy::ACE_MLF_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  :ACE_Scheduler_Strategy (0)
-{
-}
-    // = default ctor
-
-ACE_MLF_Scheduler_Strategy::~ACE_MLF_Scheduler_Strategy ()
-{
-}
-    // = virtual dtor
-
-
-long
-ACE_MLF_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 u_long current_time)
-{
-  long laxity =
-    entry.deadline ().low - current_time -
-    entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  return (laxity > 0) ? LONG_MAX - laxity : laxity;
-}
-  // = returns a dynamic subpriority value for the given entry and the
-  //   current time relative to its arrival
-
-int
-ACE_MLF_Scheduler_Strategy::dynamic_subpriority_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  // order by laxity (ascending)
-  // order by descending dynamic priority according to ascending laxity
-  u_long laxity1 =
-    first_entry.deadline ().low - first_entry.arrival ().low -
-    first_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  u_long laxity2 =
-    second_entry.deadline ().low - first_entry.arrival ().low -
-    second_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  if (laxity1 < laxity2)
-  {
-    return -1;
-  }
-  else if (laxity1 > laxity2)
-  {
-    return 1;
-  }
-  else
-  {
-    return 0;
-  }
-}
-  // = orders two dispatch entries by ascending laxity: returns -1 if the
-  //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-  //   or 1 if the second Dispatch_Entry is greater in the order.
-
-
-int
-ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
-{
-  return ACE_MLF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
-}
-  // comparison function to pass to qsort
-
-
-/////////////////////////////////////////////////////////////////////////
-// class ACE_EDF_Scheduler_Strategy static data member initializations //
-/////////////////////////////////////////////////////////////////////////
-
-ACE_EDF_Scheduler_Strategy * ACE_EDF_Scheduler_Strategy::instance_ = 0;
-
-///////////////////////////////////////////////////////
-// class ACE_EDF_Scheduler_Strategy member functions //
-///////////////////////////////////////////////////////
-
-ACE_EDF_Scheduler_Strategy *
-ACE_EDF_Scheduler_Strategy::instance ()
-{
-  if (0 == ACE_EDF_Scheduler_Strategy::instance_)
-  {
-    ACE_NEW_RETURN (ACE_EDF_Scheduler_Strategy::instance_,
-                    ACE_EDF_Scheduler_Strategy, 0);
-  }
-
-  return ACE_EDF_Scheduler_Strategy::instance_;
-}
-
-
-int
-ACE_EDF_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
-                                           const Dispatch_Entry &second_entry)
-{
-  return 0;
-}
-  // = just returns 0, as all dispatch entries are of equivalent priority under EDF.
-
-void
-ACE_EDF_Scheduler_Strategy::sort (
-  Dispatch_Entry **dispatch_entries_, u_int size)
-{
-  ::qsort ((void *) dispatch_entries_,
-           size,
-           sizeof (Dispatch_Entry *),
-           (COMP_FUNC) ACE_EDF_Scheduler_Strategy::sort_function);
-}
-  // = sort the dispatch entry pointer array in ascending deadline (period) order
-
-
-ACE_EDF_Scheduler_Strategy::ACE_EDF_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  :ACE_Scheduler_Strategy (0)
-{
-}
-    // = default ctor
-
-ACE_EDF_Scheduler_Strategy::~ACE_EDF_Scheduler_Strategy ()
-{
-}
-    // = virtual dtor
-
-long
-ACE_EDF_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                 u_long current_time)
-{
-  long time_to_deadline = entry.deadline ().low - current_time;
-  return (time_to_deadline > 0)
-         ? LONG_MAX - time_to_deadline : time_to_deadline;
-}
-  // = returns a dynamic subpriority value for the given entry and the
-  //   current time relative to its arrival
-
-int
-ACE_EDF_Scheduler_Strategy::dynamic_subpriority_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  // order by dispatchable interval (ascending)
-  if (first_entry.deadline ().low - first_entry.arrival ().low <
-      second_entry.deadline ().low - first_entry.arrival ().low)
-  {
-    return -1;
-  }
-  else if (first_entry.deadline ().low - first_entry.arrival ().low >
-           second_entry.deadline ().low - first_entry.arrival ().low)
-  {
-    return 1;
-  }
-  else
-  {
-    return 0;
-  }
-}
-  // = orders two dispatch entries by ascending time to deadline: returns -1 if
-  //   the first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-  //   or 1 if the second Dispatch_Entry is greater in the order.
-
-
-int
-ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
-{
-  return ACE_EDF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
-}
-  // comparison function to pass to qsort
-
-/////////////////////////////////////////////////////////////////////////////
-// class ACE_RMS_Dyn_Scheduler_Strategy static data member initializations //
-/////////////////////////////////////////////////////////////////////////////
-
-ACE_RMS_Dyn_Scheduler_Strategy * ACE_RMS_Dyn_Scheduler_Strategy::instance_ = 0;
-
-///////////////////////////////////////////////////////////
-// class ACE_RMS_Dyn_Scheduler_Strategy member functions //
-///////////////////////////////////////////////////////////
-
-ACE_RMS_Dyn_Scheduler_Strategy *
-ACE_RMS_Dyn_Scheduler_Strategy::instance ()
-{
-  if (0 == ACE_RMS_Dyn_Scheduler_Strategy::instance_)
-  {
-    ACE_NEW_RETURN (ACE_RMS_Dyn_Scheduler_Strategy::instance_,
-                    ACE_RMS_Dyn_Scheduler_Strategy, 0);
-  }
-
-  return ACE_RMS_Dyn_Scheduler_Strategy::instance_;
-}
-
-
-int
-ACE_RMS_Dyn_Scheduler_Strategy::priority_comp (const Dispatch_Entry &first_entry,
-                                               const Dispatch_Entry &second_entry)
-{
-  if ((first_entry.task_entry ().rt_info ()->criticality >=
-       RtecScheduler::HIGH_CRITICALITY)                    &&
-      (second_entry.task_entry ().rt_info ()->criticality >=
-       RtecScheduler::HIGH_CRITICALITY))
-  {
-    // if they're both in the high criticality bracket,
-    // order by dispatch period as in RMS scheduling
-    if ((first_entry.deadline ().low - first_entry.arrival ().low)    <
-        (second_entry.deadline ().low - second_entry.arrival ().low))
-    {
-      return -1;
-    }
-    else if ((first_entry.deadline ().low - first_entry.arrival ().low)    >
-             (second_entry.deadline ().low - second_entry.arrival ().low))
-    {
-      return 1;
-    }
-
-    return 0;  // same priority level
-  }
-  else if ((first_entry.task_entry ().rt_info ()->criticality <
-            RtecScheduler::HIGH_CRITICALITY)                   &&
-           (second_entry.task_entry ().rt_info ()->criticality <
-            RtecScheduler::HIGH_CRITICALITY))
-  {
-    // if they're both in the low criticality bracket, they have the same priority
-    return 0;
-  }
-
-  // they're in different criticality brackets: order by criticality (descending)
-  return (first_entry.task_entry ().rt_info ()->criticality   >
-          second_entry.task_entry ().rt_info ()->criticality)
-         ? -1 : 1;
-}
-  // = comparison of two dispatch entries by maximum criticality: returns -1
-  //   if the first Dispatch_Entry is greater in the order, 0 if they're
-  //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
-
-
-void
-ACE_RMS_Dyn_Scheduler_Strategy::sort (
-  Dispatch_Entry **dispatch_entries_, u_int size)
-{
-  ::qsort ((void *) dispatch_entries_,
-           size,
-           sizeof (Dispatch_Entry *),
-           (COMP_FUNC) ACE_RMS_Dyn_Scheduler_Strategy::sort_function);
-}
-  // = sort the dispatch entry pointer array in descending priority order
-
-
-ACE_RMS_Dyn_Scheduler_Strategy::ACE_RMS_Dyn_Scheduler_Strategy (
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority)
-  :ACE_Scheduler_Strategy (minimum_critical_priority)
-{
-}
-    // = default ctor
-
-ACE_RMS_Dyn_Scheduler_Strategy::~ACE_RMS_Dyn_Scheduler_Strategy ()
-{
-}
-    // = virtual dtor
-
-long
-ACE_RMS_Dyn_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry,
-                                                     u_long current_time)
-{
-  if (entry.task_entry ().rt_info ()->criticality <
-      RtecScheduler::HIGH_CRITICALITY)
-  {
-  long laxity =
-    entry.deadline ().low - current_time -
-    entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-  return (laxity > 0) ? LONG_MAX - laxity : laxity;
-  }
-
-  return 0;
-}
-  // = returns a dynamic subpriority value for the given entry and the
-  //   current time relative to its arrival
-
-int
-ACE_RMS_Dyn_Scheduler_Strategy::dynamic_subpriority_comp
-  (const Dispatch_Entry &first_entry,
-   const Dispatch_Entry &second_entry)
-{
-  // if either is in the high criticality bracket, we do not
-  // distinguish between them on the basis of dynamic subpriority
-  if ((first_entry.task_entry ().rt_info ()->criticality >=
-       RtecScheduler::HIGH_CRITICALITY)                    ||
-      (second_entry.task_entry ().rt_info ()->criticality >=
-       RtecScheduler::HIGH_CRITICALITY))
-  {
-    // for HIGH_CRITICALITY and VERY_HIGH_CRITICALITY, all
-    // entries have the same dynamic subpriority as in RMS
-    return 0;
-  }
-  else
-  {
-    // for VERY_LOW_CRITICALITY, LOW_CRITICALITY and MEDIUM_CRITICALITY,
-    // order second by laxity (ascending)
-    u_long laxity1 =
-      first_entry.deadline ().low - first_entry.arrival ().low -
-      first_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-    u_long laxity2 =
-      second_entry.deadline ().low - first_entry.arrival ().low -
-      second_entry.task_entry ().rt_info ()->worst_case_execution_time.low;
-
-    if (laxity1 < laxity2)
-    {
-      return -1;
-    }
-    else if (laxity1 > laxity2)
-    {
-      return 1;
-    }
-    else
-    {
-      return 0;
-    }
-  }
-}
-  // = comparison of two dispatch entries within the very high and high
-  //   criticality sets by minimum period (RMS) or of two dispatch entries
-  //   within the medium, low, and very low criticality sets by minimum
-  //   laxity: returns -1 if the first Dispatch_Entry is greater in the order,
-  //   0 if they're equivalent, or 1 if the second Dispatch_Entry is greater
-  //   in the order.
-
-int
-ACE_RMS_Dyn_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
-{
-  return ACE_RMS_Dyn_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
-}
-  // comparison function to pass to qsort
-
-
-ACE_DynScheduler::Preemption_Priority
-ACE_RMS_Dyn_Scheduler_Strategy::minimum_critical_priority ()
-{
-  return minimum_critical_priority_;
-}
-  // = returns 0 for minimum critical priority number
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<Dispatch_Entry *>;
-template class ACE_Unbounded_Set<Dispatch_Entry *>;
-template class ACE_Unbounded_Set_Iterator<Dispatch_Entry *>;
-template class ACE_Strategy_Scheduler_Factory<ACE_MUF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_RMS_Dyn_Scheduler_Strategy>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<Dispatch_Entry *>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_MUF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_RMS_Dyn_Scheduler_Strategy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
deleted file mode 100644
index c7977092167..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ /dev/null
@@ -1,474 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.h
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-#if ! defined (STRATEGY_SCHEDULER_H)
-#define STRATEGY_SCHEDULER_H
-
-#include "DynSched.h"
-
-// forward declaration of the abstract base class for scheduler strategies
-class ACE_Scheduler_Strategy;
-
-/////////////////////////////////
-// Strategized scheduler class //
-/////////////////////////////////
-
-class TAO_ORBSVCS_Export ACE_Strategy_Scheduler : public ACE_DynScheduler
-  // = TITLE
-  //    ACE_Strategy_Scheduler
-  //
-  // = DESCRIPTION
-  //    Strategized scheduler implementation.  Provides an implementation
-  //    of all strategy specific scheduling mechanisms, which relies on the
-  //    methods of the associated strategy class.
-{
-// public interface
-public:
-
-  ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy);
-    // = strategized ctor
-
-  virtual ~ACE_Strategy_Scheduler ();
-    // = virtual dtor
-
-  status_t assign_priorities (Dispatch_Entry **dispatches, u_int count);
-    // = assigns priorities to the sorted dispatch schedule,
-    //   according to the strategy's priority comparison operator.
-
-  status_t assign_subpriorities (Dispatch_Entry **dispatches, u_int count);
-    // = assigns dynamic and static sub-priorities to the sorted dispatch
-    //   schedule, according to the strategy's subpriority comparisons.
-
-  virtual Preemption_Priority minimum_critical_priority ();
-  // = determine the minimum critical priority number
-
-private:
-
-  virtual status_t schedule_timeline_entry (Dispatch_Entry &dispatch_entry,
-                                            ACE_Unbounded_Queue <Dispatch_Entry *>
-                                              &reschedule_queue);
-  // = schedules a dispatch entry into the timeline being created
-
-  virtual status_t sort_dispatches (Dispatch_Entry **dispatches, u_int count);
-    // = sets up the schedule in the order generated by the strategy
-
-  ACE_Scheduler_Strategy &strategy_;
-    // = strategy for comparison, sorting of dispatch entries
-
-  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler &operator= (
-    const ACE_Strategy_Scheduler &))
-};
-
-
-
-////////////////////////////////////////
-// Factory for strategized schedulers //
-////////////////////////////////////////
-
-template <class STRATEGY>
-class ACE_Strategy_Scheduler_Factory
-  // = TITLE
-  //    ACE_Strategy_Scheduler_Factory
-  //
-  // = DESCRIPTION
-  //    Provides a type parameterized factory method that constructs
-  //    and returns a scheduler that uses the given scheduling strategy
-{
-public:
-
-        static ACE_Strategy_Scheduler * create (ACE_DynScheduler::Preemption_Priority minimum_critical_priority);
-    // construct and return a scheduler strategized with
-    // an instance of the the parameterized strategy type
-};
-
-
-//////////////////////////
-// Scheduler Strategies //
-//////////////////////////
-
-class TAO_ORBSVCS_Export ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Abstract Base Class for scheduling strategies: each derived class
-  //    must define an ordering strategy for dispatch entries based on a specific
-  //    scheduling algorithm.
-{
-public:
-
-        ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // ctor
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry) = 0;
-    // = comparison of two dispatch entries in strategy specific high to low priority
-    //   ordering: returns -1 if the first Dispatch_Entry is greater in the order,
-    //   0 if they are equivalent, or 1 if the second Dispatch_Entry is greater in
-    //   the order
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count) = 0;
-    // = sort the dispatch entry link pointer array according to
-    //   the specific sort order defined by the strategy
-
-  virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = determine the minimum critical priority number
-
-  virtual int dynamic_subpriority_comp (const Dispatch_Entry &first_entry,
-                                        const Dispatch_Entry &second_entry) = 0;
-    // = comparison of two dispatch entries in strategy specific high to low
-    //   dynamic subpriority ordering: returns -1 if the first Dispatch_Entry
-    //   is greater in the order, 0 if they are equivalent, or 1 if the
-    //   second Dispatch_Entry is greater in the order
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time) = 0;
-    // = returns a dynamic subpriority value
-    //   for the given timeline entry at the current time
-
-  virtual int static_subpriority_comp (const Dispatch_Entry &first_entry,
-                                       const Dispatch_Entry &second_entry);
-    // = provide a lowest level ordering based first on importance (descending),
-    //   and then on the dependency topological sort finishing time (ascending).
-
-
-protected:
-
-  int sort_comp (const Dispatch_Entry &first_entry,
-                 const Dispatch_Entry &second_entry);
-    // = comparison of two dispatch entries using the specific priority, dynamic
-    //   subpriority, and static subpriority method definitions provided by
-    //   the derived strategy class to produce the strategy specific sort
-    //   ordering: returns -1 if the first Dispatch_Entry is greater in the order,
-    //   0 if they are equivalent, or 1 if the second Dispatch_Entry is greater in
-    //   the order.  This is an example of the Template Method pattern (and also
-    //   of Pree's Unification Metapattern), in which derived classes provide
-    //   definitions of the methods on which the sort_comp Template Method relies.
-
-  ACE_DynScheduler::Preemption_Priority minimum_critical_priority_;
-  // = the minimum critical priority number for the strategy
-};
-
-
-
-class TAO_ORBSVCS_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_MUF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Maximum Urgency First
-  //    scheduling algorithm.
-{
-public:
-
-  ACE_MUF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // ctor
-
-  virtual ~ACE_MUF_Scheduler_Strategy ();
-  // = virtual dtor
-
-
-  static ACE_MUF_Scheduler_Strategy *instance ();
-    // returns an instance of the strategy
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry);
-    // = comparison of two dispatch entries by maximum criticality: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent, or
-    //   1 if the second Dispatch_Entry is greater in the order.
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count);
-    // = sort the dispatch entry link pointer array in descending urgency order
-
-  virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = determine the minimum critical priority number
-
-protected:
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time);
-    // = returns a dynamic subpriority value at the current time for
-    //   the given timeline entry: if the operation has
-    //   non-negative laxity, then the value is positive, and a lower
-    //   laxity gives a higher dynamic subpriority; if the operation
-    //   has negative laxity, the value is the (negative) laxity value
-
-  virtual int dynamic_subpriority_comp (
-    const Dispatch_Entry &first_entry,
-    const Dispatch_Entry &second_entry);
-    // = orders of two dispatch entries by ascending laxity: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   1 if the second Dispatch_Entry is greater in the order.
-
-private:
-
-  static int sort_function (void *arg1, void *arg2);
-    // comparison function to pass to qsort: calls instance ()->sort_comp ();
-
-  static ACE_MUF_Scheduler_Strategy *instance_;
-    // instance of the strategy
-};
-
-
-class TAO_ORBSVCS_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_RMS_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Rate Monotonic
-  //    Scheduling algorithm.
-{
-public:
-
-  ACE_RMS_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // ctor
-
-  virtual ~ACE_RMS_Scheduler_Strategy ();
-    // = virtual dtor
-
-  static ACE_RMS_Scheduler_Strategy *instance ();
-    // returns an instance of the strategy
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry);
-    // = comparison of two dispatch entries by minimum period: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count);
-    // = sort the dispatch entry link pointer array in descending RMS (rate) order
-
-  virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-    // = determine the minimum critical priority number
-
-protected:
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time);
-    // = just returns 0: all operations have
-    //   the same dynamic subpriority value
-
-  virtual int dynamic_subpriority_comp
-    (const Dispatch_Entry &first_entry,
-     const Dispatch_Entry &second_entry);
-    // = all dispatches in a given priority level have the same dynamic
-    //   subpriority under RMS: just returns 0
-
-private:
-
-  static int sort_function (void *arg1, void *arg2);
-    // comparison function to pass to qsort: calls instance ()->sort_comp ();
-
-  static ACE_RMS_Scheduler_Strategy *instance_;
-    // instance of the strategy
-
-};
-
-
-
-
-
-class TAO_ORBSVCS_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_MLF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Minimum Laxity First
-  //    scheduling algorithm.
-{
-public:
-
-  ACE_MLF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = ctor
-
-  virtual ~ACE_MLF_Scheduler_Strategy ();
-    // = virtual dtor
-
-  static ACE_MLF_Scheduler_Strategy *instance ();
-    // returns an instance of the strategy
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry);
-    // = just returns 0, as all dispatch entries are of equivalent priority under MLF.
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count);
-    // = sort the dispatch entry link pointer array in ascending laxity order
-
-protected:
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time);
-    // = returns a dynamic subpriority value at the current time for
-    //   the given timeline entry: if the operation has
-    //   non-negative laxity, then the value is positive, and a lower
-    //   laxity gives a higher dynamic subpriority; if the operation
-    //   has negative laxity, the value is the (negative) laxity value
-
-  virtual int dynamic_subpriority_comp
-    (const Dispatch_Entry &first_entry,
-     const Dispatch_Entry &second_entry);
-    // = orders two dispatch entries by ascending laxity: returns -1 if the
-    //   first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
-
-private:
-
-  static int sort_function (void *arg1, void *arg2);
-    // comparison function to pass to qsort: calls instance ()->sort_comp ();
-
-  static ACE_MLF_Scheduler_Strategy *instance_;
-    // instance of the strategy
-
-};
-
-
-class TAO_ORBSVCS_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_EDF_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Earliest Deadline First
-  //    scheduling algorithm.
-{
-public:
-
-  ACE_EDF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = default ctor
-
-  virtual ~ACE_EDF_Scheduler_Strategy ();
-    // = virtual dtor
-
-  static ACE_EDF_Scheduler_Strategy *instance ();
-    // returns an instance of the strategy
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry);
-    // = returns 0, as all dispatch entries are of equivalent priority under EDF.
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count);
-    // = sort the dispatch entry link pointer array in ascending deadline (period) order
-
-protected:
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time);
-    // = returns a dynamic subpriority value at the current time for the
-    //   given timeline entry: if the operation has non-negative
-    //   time to deadline, then value is positive, and a shorter time to
-    //   deadline gives a higher dynamic subpriority; if the operation has a
-    //   negative time to deadline, the value is (negative) time to deadline
-
-
-  virtual int dynamic_subpriority_comp
-    (const Dispatch_Entry &first_entry,
-     const Dispatch_Entry &second_entry);
-    // = orders two dispatch entries by ascending time to deadline: returns -1 if
-    //   the first Dispatch_Entry is greater in the order, 0 if they're equivalent,
-    //   or 1 if the second Dispatch_Entry is greater in the order.
-
-private:
-
-  static int sort_function (void *arg1, void *arg2);
-    // comparison function to pass to qsort: calls instance ()->sort_comp ();
-
-  static ACE_EDF_Scheduler_Strategy *instance_;
-    // instance of the strategy
-
-};
-
-
-class TAO_ORBSVCS_Export ACE_RMS_Dyn_Scheduler_Strategy : public ACE_Scheduler_Strategy
-  // = TITLE
-  //    ACE_RMS_Dyn_Scheduler_Strategy
-  //
-  // = DESCRIPTION
-  //    Defines "schedule" method using Rate Monotonic priority assignment for
-  //    the critical set, single priority for the dynamic (non-critical) set.
-{
-public:
-
-  ACE_RMS_Dyn_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0);
-    // = ctor
-
-  virtual ~ACE_RMS_Dyn_Scheduler_Strategy ();
-    // = virtual dtor
-
-  static ACE_RMS_Dyn_Scheduler_Strategy *instance ();
-    // returns an instance of the strategy
-
-  virtual int priority_comp (const Dispatch_Entry &first_entry,
-                             const Dispatch_Entry &second_entry);
-    // = comparison of two dispatch entries by maximum criticality: returns -1
-    //   if the first Dispatch_Entry is greater in the order, 0 if they're
-    //   equivalent, or 1 if the second Dispatch_Entry is greater in the order.
-
-  virtual void sort (Dispatch_Entry **dispatch_entries,
-                     u_int count);
-    // = sort the dispatch entry pointer array in descending priority order
-
-    virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority ();
-  // = determine the minimum critical priority number
-
-protected:
-
-  virtual long dynamic_subpriority (Dispatch_Entry &entry,
-                                    u_long current_time);
-    // = returns a dynamic subpriority value at the current time for the
-    //   given timeline entry: if the operation is in the
-    //   critical set, the dynamic subpriority value is always 0; if the
-    //   operation is non-critical and has non-negative laxity, then the
-    //   dynamic subpriority value is positive, and a lower laxity gives a
-    //   higher dynamic subpriority if the operation is non-critical and has
-    //   negative laxity, the value is the (negative) laxity value
-
-
-  virtual int dynamic_subpriority_comp
-    (const Dispatch_Entry &first_entry,
-     const Dispatch_Entry &second_entry);
-    // = comparison of two dispatch entries within the very high and high
-    //   criticality sets by minimum period (RMS) or of two dispatch entries
-    //   within the medium, low, and very low criticality sets by minimum
-    //   laxity: returns -1 if the first Dispatch_Entry is greater in the order,
-    //   0 if they're equivalent, or 1 if the second Dispatch_Entry is greater
-    //   in the order.
-
-private:
-
-  static int sort_function (void *arg1, void *arg2);
-    // comparison function to pass to qsort: calls instance ()->sort_comp ();
-
-  static ACE_RMS_Dyn_Scheduler_Strategy *instance_;
-    // instance of the strategy
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* STRATEGY_SCHEDULER_H */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
deleted file mode 100644
index c84e9e2da77..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.i
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
deleted file mode 100644
index 66a161b7883..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// $Id$
-
-#include "ace/OS.h"
-
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Scheduler_Factory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0;
-
-static int entry_count = -1;
-static ACE_Scheduler_Factory::POD_RT_Info* rt_info = 0;
-
-int ACE_Scheduler_Factory::use_runtime (int ec,
-                                        POD_RT_Info rti[])
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "ACE_Scheduler_Factory::use_runtime - "
-                         "server already configured\n"), -1);
-    }
-
-  entry_count = ec;
-  rt_info = rti;
-
-  return 0;
-}
-
-RtecScheduler::Scheduler_ptr static_server ()
-{
-  RtecScheduler::Scheduler_ptr server_ = 0;
-
-  typedef RtecScheduler::RT_Info* RT_Info_ptr;
-  RtecScheduler::RT_Info** info;
-  ACE_NEW_RETURN (info, RT_Info_ptr[entry_count], 0);
-  for (int i = 0; i < entry_count; ++i)
-    {
-      info[i] = new RtecScheduler::RT_Info;
-      if (info[i] == 0)
-        {
-          for (int j = 0; j < i; ++j)
-            {
-              delete info[i];
-            }
-          delete[] info;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "ACE_Scheduler_Factory::config_runtime - "
-                             "cannot allocate RT_Info\n"), 0);
-        }
-      info[i]->entry_point = rt_info[i].entry_point;
-      info[i]->handle = rt_info[i].handle;
-      info[i]->worst_case_execution_time = rt_info[i].worst_case_execution_time;
-      info[i]->typical_execution_time = rt_info[i].typical_execution_time;
-      info[i]->cached_execution_time = rt_info[i].cached_execution_time;
-      info[i]->period = rt_info[i].period;
-      info[i]->importance = rt_info[i].importance;
-      info[i]->quantum = rt_info[i].quantum;
-      info[i]->threads = rt_info[i].threads;
-      info[i]->priority = rt_info[i].priority;
-      info[i]->static_subpriority = rt_info[i].static_subpriority;
-      info[i]->preemption_priority = rt_info[i].preemption_priority;
-    }
-  static ACE_Runtime_Scheduler scheduler(entry_count, info);
-  TAO_TRY
-    {
-      server_ = scheduler._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "ACE_Scheduler_Factory - configured static server\n"));
-    }
-  TAO_CATCHANY
-    {
-      for (int i = 0; i < entry_count; ++i)
-        {
-          delete info[i];
-        }
-      delete[] info;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "ACE_Scheduler_Factory::config_runtime - "
-                         "cannot allocate server\n"), 0);
-    }
-  TAO_ENDTRY;
-  return server_;
-}
-
-int
-ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming)
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      // No errors, runtime execution simply takes precedence over
-      // config runs.
-      return 0;
-    }
-
-  TAO_TRY
-    {
-      CosNaming::Name schedule_name (1);
-      schedule_name[0].id = CORBA::string_dup ("ScheduleService");
-      schedule_name.length (1);
-      CORBA::Object_ptr objref =
-        naming->resolve (schedule_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      server_ =
-        RtecScheduler::Scheduler::_narrow(objref, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecScheduler::Scheduler::_duplicate (server_);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      server_ = 0;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "ACE_Scheduler_Factory::use_context - "
-                         " exception while resolving server\n"), -1);
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-ACE_Scheduler_Factory::use_config (CORBA::ORB_ptr orb)
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      // No errors, runtime execution simply takes precedence over
-      // config runs.
-      return 0;
-    }
-
-  TAO_TRY
-    {
-      CORBA::Object_ptr objref =
-        orb->resolve_initial_references ("ScheduleService");
-      TAO_CHECK_ENV;
-
-      server_ =
-        RtecScheduler::Scheduler::_narrow(objref, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecScheduler::Scheduler::_duplicate (server_);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      server_ = 0;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "ACE_Scheduler_Factory::use_context - "
-                         " exception while resolving server\n"), -1);
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-
-RtecScheduler::Scheduler_ptr
-ACE_Scheduler_Factory::server (void)
-{
-  if (server_ == 0 && entry_count != -1)
-    {
-      server_ = static_server ();
-    }
-
-  if (server_ == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "ACE_Scheduler_Factor::server - "
-                         "no scheduling service configured\n"), 0);
-    }
-  return server_;
-}
-
-static char header[] =
-"// This file was automatically generated by Scheduler_Factory\n"
-"// before editing the file please consider generating it again\n"
-"\n"
-"#include \"orbsvcs/Scheduler_Factory.h\"\n"
-"\n";
-
-static char footer[] =
-"\n"
-"// This setups Scheduler_Factory to use the runtime version\n"
-"static int scheduler_factory_setup = \n"
-"  ACE_Scheduler_Factory::use_runtime (sizeof (infos)/sizeof (infos[0]),\n"
-"                                      infos);\n"
-"\n"
-"// EOF\n";
-
-static char start_infos[] =
-"static ACE_Scheduler_Factory::POD_RT_Info infos[] = {\n";
-
-static char end_infos[] =
-"};\n";
-
-int ACE_Scheduler_Factory::dump_schedule
-    (const RtecScheduler::RT_Info_Set& infos,
-     const char* filename)
-{
-  FILE* file = stdout;
-  if (filename != 0)
-    {
-      file = ACE_OS::fopen (filename, "w");
-      if (file == 0)
-        {
-          return -1;
-        }
-    }
-  ACE_OS::fprintf(file, header);
-
-  ACE_OS::fprintf(file, start_infos);
-  for (u_int i = 0; i < infos.length (); ++i)
-    {
-      if (i != 0)
-        {
-          // Finish previous line
-          ACE_OS::fprintf(file, ",\n");
-        }
-      const RtecScheduler::RT_Info& info = infos[i];
-      ACE_OS::fprintf (file,
-"{ \"%s\", %d, %f, %f, %f, %d, %d, %f, %d, %d, %d, %d }",
-                       (const char*)info.entry_point,
-                       info.handle,
-                       info.worst_case_execution_time,
-                       info.typical_execution_time,
-                       info.cached_execution_time,
-                       info.period,
-                       info.importance,
-                       info.quantum,
-                       info.threads,
-                       info.priority,
-                       info.static_subpriority,
-                       info.preemption_priority);
-    }
-  // finish last line.
-  ACE_OS::fprintf(file, "\n");
-  ACE_OS::fprintf(file, end_infos);
-  ACE_OS::fprintf(file, footer);
-  ACE_OS::fclose (file);
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
deleted file mode 100644
index 7cf7649295d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#ifndef ACE_SCHEDULER_FACTORY_H
-#define ACE_SCHEDULER_FACTORY_H
-
-#include "ace/OS.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-
-class TAO_ORBSVCS_Export ACE_Scheduler_Factory
-  // = TITLE
-  //   Factory of scheduler services.
-  //
-  // = DESCRIPTION
-  //   This class acts as a factory for scheduler servers. At config
-  //   time it will return a remote server, which will actually
-  //   compute the scheduling parameters. At run-time it returns a
-  //   local server, which will use the results of the config runs to
-  //   actually do the scheduling, without incurring in RPC overheads.
-{
-public:
-  struct POD_RT_Info
-    // = TITLE
-    //   Plain Old Data for RT_Infos.
-    //
-    // = DESCRIPTION
-    //   This class provide us with a plain old data version of
-    //   RT_Info, this is useful for implementing static arrays or  of
-    //   those.
-  {
-    const char* entry_point;
-    RtecScheduler::handle_t handle;
-    RtecScheduler::Time worst_case_execution_time;
-    RtecScheduler::Time typical_execution_time;
-    RtecScheduler::Time cached_execution_time;
-    RtecScheduler::Period period;
-    RtecScheduler::Importance importance;
-    RtecScheduler::Quantum quantum;
-    CORBA::Long threads;
-    RtecScheduler::OS_Priority priority;
-    RtecScheduler::Sub_Priority static_subpriority;
-    RtecScheduler::Sub_Priority dynamic_subpriority;
-    RtecScheduler::Preemption_Priority preemption_priority;
-  };
-
-  static int use_config (CosNaming::NamingContext_ptr naming);
-  // Setup the variables needed for a config run, using the
-  // NamingContext to locate a Scheduler.
-
-  static int use_config (CORBA::ORB_ptr orb);
-  // Setup the variable needed for a config run, using an environment
-  // variable to locate a Scheduler.
-
-  static int use_runtime (int entry_count,
-                          POD_RT_Info rt_info[]);
-  // Disable config runs in the Factory and setups the precomputed
-  // scheduling.
-
-  static RtecScheduler::Scheduler_ptr server (void);
-  // Return the Real-time Scheduling Service used for this run.
-  // Must have been configured either using use_context() or use_data().
-  //
-  // Normally use_data() is called at static elaboration time, so
-  // everything is automatic.
-  // On config runs use_context() is called from main, after
-  // resolve_initial_references.
-
-  static int dump_schedule (const RtecScheduler::RT_Info_Set& infos,
-                            const char* file_name = 0);
-  // This helper function will dump the schedule returned by a
-  // RtecScheduler::Scheduler into a file, the file can be compiled to
-  // create an efficient local implementation of the Scheduler.
-
-  // TODO: How to do cleanup()? Use the ACE_Object_Manager stuff?
-
-protected:
-  static int no_config_run (void);
-  // By default this factory assumes we are runnning a config
-  // run. Calling this method disables that.
-  // Since the methods returns an int it can be used to initialize a
-  // static variable, hence calling it before main(); this technique
-  // can be used in the code emitted for the run-time scheduler,
-  // automagically disabling the config_run() when that code is linked
-  // in.
-
-private:
-  static RtecScheduler::Scheduler_ptr server_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_SCHEDULER_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
deleted file mode 100644
index 8d85b9d5a37..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
deleted file mode 100644
index ffea37fb9fe..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include "ace/OS.h"
-
-#include "orbsvcs/Scheduler_Utilities.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
deleted file mode 100644
index 8b66e3d04d6..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#ifndef ACE_SCHEDULER_UTILITIES_H
-#define ACE_SCHEDULER_UTILITIES_H
-
-#include "ace/OS.h"
-
-#include "orbsvcs/RtecSchedulerC.h"
-
-class TAO_ORBSVCS_Export ACE_RT_Info : public RtecScheduler::RT_Info
-  // = TITLE
-  //   Offers a convenient C++ interface to the IDL RT_Info structure.
-  //
-  // = DESCRIPTION
-  //   For performance reasons the RT_Info data is represented as an
-  //   IDL structure, this permits sending complete RT_Info's from the
-  //   client to the server.
-  //   Unfortunately this precludes the usage of member functions and
-  //   constructors, this class serves as a helper to implement those
-  //   without loosing the performance on IDL.
-{
-public:
-  ACE_RT_Info (const char* entry_point,
-	       RtecScheduler::Time worst_time,
-	       RtecScheduler::Time typical_time,
-	       RtecScheduler::Time cached_time,
-	       RtecScheduler::Period period,
-	       RtecScheduler::Importance importance,
-	       RtecScheduler::Quantum quantum,
-	       CORBA::Long threads);
-
-  ACE_RT_Info (const RtecScheduler::RT_Info& rt_info);
-
-  int add_dependency(RtecScheduler::handle_t dep,
-		     int number_of_calls = 1);
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_SCHEDULER_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
deleted file mode 100644
index 1d62ceffaf5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
+++ /dev/null
@@ -1,32 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-ACE_INLINE
-ACE_RT_Info::ACE_RT_Info (const char* entry_point_,
-			  RtecScheduler::Time worst_time_,
-			  RtecScheduler::Time typical_time_,
-			  RtecScheduler::Time cached_time_,
-			  RtecScheduler::Period period_,
-			  RtecScheduler::Importance importance_,
-			  RtecScheduler::Quantum quantum_,
-			  CORBA::Long threads_)
-{
-  this->entry_point = entry_point_;
-  this->worst_case_execution_time = worst_time_;
-  this->typical_execution_time = typical_time_;
-  this->cached_execution_time = cached_time_;
-  this->period = period_;
-  this->importance = importance_;
-  this->quantum = quantum_;
-  this->threads = threads_;
-}
-
-ACE_INLINE
-ACE_RT_Info::ACE_RT_Info (const RtecScheduler::RT_Info& rt_info)
-  :  RtecScheduler::RT_Info (rt_info)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Sequences.idl b/TAO/orbsvcs/orbsvcs/Sequences.idl
deleted file mode 100644
index a148feccf81..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sequences.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Sequences.idl
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// ========================================================================
-
-// Used for extracting simple sequences from anys.
-
-module TAO_Sequences
-{
-  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/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
deleted file mode 100644
index 485435edfb1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// $Id$
-//
-#include "orbsvcs/Time_Utilities.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Time_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-TimeBase::TimeT ORBSVCS_Time::zero = {0, 0};
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
deleted file mode 100644
index 586f9508855..00000000000
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-#ifndef ORBSVCS_TIME_UTILITIES_H
-#define ORBSVCS_TIME_UTILITIES_H
-
-#include "orbsvcs/CosTimeBaseC.h"
-
-class TAO_ORBSVCS_Export ORBSVCS_Time
-{
-  // = TITLE
-  //   Time conversion utilities.
-  //
-  // = DESCRIPTION
-  //   This class define several static methods to convert between
-  //   several time structures and the CORBA TimeT structure.
-  //
-  //   Recall that TimeT stores time in a 64-bit long long (or
-  //   structure when that is not available) and uses hundreds of
-  //   nanoseconds as time units (i.e. 1 second is 10^7 TimeT units).
-  //
-public:
-
-  // = A helper constant, IDL does not have constant for structures.
-  static TimeBase::TimeT zero;
-
-  // = ACE_hrtime_t conversion routines, we interpret an ACE_hrtime_t
-  // as nanoseconds.
-  static void
-  hrtime_to_TimeT (TimeBase::TimeT& lhs,
-		   ACE_hrtime_t rhs);
-  static void
-  TimeT_to_hrtime (ACE_hrtime_t &lhs,
-		   const TimeBase::TimeT& rhs);
-  static ACE_hrtime_t
-  to_hrtime (const TimeBase::TimeT& t);
-
-  // = ACE_Time_Value conversion routines, recall that they are
-  // <seconds,useconds> pairs.
-  static void
-  Time_Value_to_TimeT (TimeBase::TimeT& lhs, 
-		       const ACE_Time_Value& rhs);
-  static void
-  TimeT_to_Time_Value (ACE_Time_Value& lrs,
-		       const TimeBase::TimeT& rhs);
-  static ACE_Time_Value
-  to_Time_Value (const TimeBase::TimeT& rhs);
-};
-
-#if !defined (__ACE_INLINE__)
-
-extern TAO_ORBSVCS_Export int operator== (const TimeBase::TimeT &lhs,
-					  const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator!= (const TimeBase::TimeT &lhs,
-					  const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator< (const TimeBase::TimeT &lhs,
-					 const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator<= (const TimeBase::TimeT &lhs,
-					  const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator< (const TimeBase::TimeT &lhs,
-					 const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator> (const TimeBase::TimeT &lhs,
-					 const TimeBase::TimeT &rhs);
-extern TAO_ORBSVCS_Export int operator>= (const TimeBase::TimeT &lhs,
-					  const TimeBase::TimeT &rhs);
-
-#else /* defined (__ACE_INLINE__) */
-#include "orbsvcs/Time_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ORBSVCS_TIME_UTILITIES_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
deleted file mode 100644
index 83a84cb0c52..00000000000
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-ACE_INLINE void
-ORBSVCS_Time::TimeT_to_hrtime (ACE_hrtime_t &lhs,
-                               const TimeBase::TimeT& rhs)
-{
-  lhs = rhs.high;
-  lhs <<= 32;
-  lhs |= rhs.low;
-  lhs *= 100;
-}
-
-ACE_INLINE void
-ORBSVCS_Time::hrtime_to_TimeT (TimeBase::TimeT& lhs,
-                               ACE_hrtime_t rhs)
-{
-  ACE_UINT64 t = rhs / 100; // convert to 100ns
-  ACE_UINT32 mask = ~0L;
-  lhs.low = ACE_static_cast(ACE_UINT32, t & mask);
-#if defined (ACE_LACKS_LONGLONG_T)
-  lhs.high = ACE_static_cast (ACE_UINT32, t.hi ());
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  lhs.high = ACE_static_cast (ACE_UINT32, t >> 32);
-#endif /* ! ACE_LACKS_LONGLONG_T */
-}
-
-ACE_INLINE ACE_hrtime_t
-ORBSVCS_Time::to_hrtime (const TimeBase::TimeT& t)
-{
-  ACE_hrtime_t r;
-  ORBSVCS_Time::TimeT_to_hrtime (r, t);
-  return r;
-}
-
-ACE_INLINE void
-ORBSVCS_Time::Time_Value_to_TimeT (TimeBase::TimeT& lhs,
-                                   const ACE_Time_Value& rhs)
-{
-  ACE_hrtime_t t = rhs.sec () * ACE_ONE_SECOND_IN_NSECS + rhs.usec () * 1000;
-  ORBSVCS_Time::hrtime_to_TimeT (lhs, t);
-}
-
-ACE_INLINE void
-ORBSVCS_Time::TimeT_to_Time_Value (ACE_Time_Value& lhs,
-                                   const TimeBase::TimeT& rhs)
-{
-  ACE_hrtime_t t;
-
-  ORBSVCS_Time::TimeT_to_hrtime (t, rhs);
-
-  lhs.set (ACE_static_cast(ACE_UINT32, t / ACE_ONE_SECOND_IN_NSECS),
-           ACE_static_cast(ACE_UINT32, (t % ACE_ONE_SECOND_IN_NSECS) / 1000));
-}
-
-ACE_INLINE ACE_Time_Value
-ORBSVCS_Time::to_Time_Value (const TimeBase::TimeT& t)
-{
-  ACE_Time_Value r;
-  ORBSVCS_Time::TimeT_to_Time_Value (r, t);
-  return r;
-}
-
-ACE_INLINE int
-operator== (const TimeBase::TimeT &lhs,
-            const TimeBase::TimeT &rhs)
-{
-  return (lhs.low == rhs.low
-          && lhs.high == rhs.high);
-}
-
-ACE_INLINE int
-operator!= (const TimeBase::TimeT &lhs,
-            const TimeBase::TimeT &rhs)
-{
-  return !(lhs == rhs);
-}
-
-ACE_INLINE int
-operator< (const TimeBase::TimeT &lhs,
-           const TimeBase::TimeT &rhs)
-{
-  return (lhs.high < rhs.high
-          || (lhs.high == rhs.high && lhs.low < rhs.low));
-}
-
-ACE_INLINE int
-operator<= (const TimeBase::TimeT &lhs,
-            const TimeBase::TimeT &rhs)
-{
-  return (lhs.high < rhs.high
-          || (lhs.high == rhs.high && lhs.low <= rhs.low));
-}
-
-ACE_INLINE int
-operator> (const TimeBase::TimeT &lhs,
-           const TimeBase::TimeT &rhs)
-{
-  return !(rhs <= lhs);
-}
-
-ACE_INLINE int
-operator>= (const TimeBase::TimeT &lhs,
-            const TimeBase::TimeT &rhs)
-{
-  return !(rhs < lhs);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Admin.cpp b/TAO/orbsvcs/orbsvcs/Trader/Admin.cpp
deleted file mode 100644
index 90267b9e47e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Admin.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-//
-// = LIBRARY
-//    Admin
-// 
-// = FILENAME
-//    Admin.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (TAO_ADMIN_C)
-#define TAO_ADMIN_C
-
-#include "Admin.h"
-
-template <class TRADER>
-const char* TAO_Admin<TRADER>::NAME = "Trader: Admin";
-
-template <class TRADER>  
-TAO_Admin<TRADER>::TAO_Admin (TRADER &trader)
-  : trader_ (trader),
-    TAO_Trader_Components <POA_CosTrading::Admin> (trader.trading_components ()),
-    TAO_Import_Attributes <POA_CosTrading::Admin> (trader.import_attributes ()),
-    TAO_Support_Attributes <POA_CosTrading::Admin> (trader.support_attributes ()),
-    TAO_Link_Attributes <POA_CosTrading::Admin> (trader.link_attributes ()),
-    sequence_number_ (0)
-{
-  // Because a servant is uniquely identified by a POA name and an
-  // ObjectID number, the concatenation of the two prefixed before a
-  // sequence number will ensure the request_id_stem space between
-  // traders will not overlap. The sequence number space will be four
-  // octets.
-  CORBA::Environment _env;
-  PortableServer::POA_var poa = this->_default_POA (_env);
-  PortableServer::ObjectId_var id = poa->servant_to_id (this, _env);
-  CORBA::String_var poa_name = poa->the_name (_env);
-  int name_length = ACE_OS::strlen (poa_name.in ()),
-    id_length = id->length (),
-    total_length = name_length + id_length + sizeof (CORBA::ULong);
-  
-  this->stem_id_.length (total_length);
-  for (int i = total_length - 1, j = name_length - 1; j >= 0; i--, j--)
-    this->stem_id_[i] = (CORBA::Octet) poa_name[j];
-  
-  for (j = id_length - 1; j >= 0; j--, i--)
-    this->stem_id_[i] = id[j];
-}
-
-template <class TRADER>
-TAO_Admin<TRADER>::~TAO_Admin (void)
-{
-}
-
-template <class TRADER> CosTrading::Admin::OctetSeq * 
-TAO_Admin<TRADER>::request_id_stem (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // Add one to the sequence_number and concatenate it to the unique
-  // prefix. The sequence number is four octets long.
-  for (int i = sizeof (CORBA::ULong) - 1; i >= 0; i--)
-    this->stem_id_[i] = (this->sequence_number_ >> (8*i)) & 0xff;
-
-  // Increment the sequence number and return a copy of the stem_id.
-  this->sequence_number_++;
-  return new CosTrading::Admin::OctetSeq (this->stem_id_);
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_def_search_card (CORBA::ULong value,
-					CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException)) 
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().def_search_card ();
-
-  this->trader_.import_attributes ().def_search_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_max_search_card (CORBA::ULong value,
-					CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().max_search_card ();
-
-  this->trader_.import_attributes ().max_search_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_def_match_card (CORBA::ULong value,
-				       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().def_match_card ();
-
-  this->trader_.import_attributes ().def_match_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_max_match_card (CORBA::ULong value,
-				       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().max_match_card ();
-
-  this->trader_.import_attributes ().max_match_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_def_return_card (CORBA::ULong value,
-					CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().def_return_card ();
-  
-  this->trader_.import_attributes ().def_return_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_max_return_card (CORBA::ULong value,
-					CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().max_return_card ();
-  
-  this->trader_.import_attributes ().max_return_card (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_max_list (CORBA::ULong value,
-				 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().max_list ();
-  
-  this->trader_.import_attributes ().max_list (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::Boolean 
-TAO_Admin<TRADER>::
-set_supports_modifiable_properties (CORBA::Boolean value,
-				    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Boolean return_value =
-    this->trader_.support_attributes ().supports_modifiable_properties ();
-  
-  this->trader_.support_attributes ().supports_modifiable_properties (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::Boolean 
-TAO_Admin<TRADER>::
-set_supports_dynamic_properties (CORBA::Boolean value,
-				 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Boolean return_value =
-    this->trader_.support_attributes ().supports_dynamic_properties ();
-  
-  this->trader_.support_attributes ().supports_dynamic_properties (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::Boolean 
-TAO_Admin<TRADER>::set_supports_proxy_offers (CORBA::Boolean value,      
-					      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Boolean return_value =
-    this->trader_.support_attributes ().supports_proxy_offers ();
-  
-  this->trader_.support_attributes ().supports_proxy_offers (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_def_hop_count (CORBA::ULong value,
-				      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().def_hop_count ();
-  
-  this->trader_.import_attributes ().def_hop_count (value);
-  return return_value;
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Admin<TRADER>::set_max_hop_count (CORBA::ULong value,
-				      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong return_value =
-    this->trader_.import_attributes ().max_hop_count ();
-    
-  this->trader_.import_attributes ().max_hop_count (value);
-  return return_value;
-}
-
-template <class TRADER> CosTrading::FollowOption 
-TAO_Admin<TRADER>::set_def_follow_policy (CosTrading::FollowOption policy,
-					  CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CosTrading::FollowOption return_value =
-    this->trader_.import_attributes ().def_follow_policy ();
-    
-  this->trader_.import_attributes ().def_follow_policy (policy);
-  return return_value;
-}
-
-template <class TRADER> CosTrading::FollowOption 
-TAO_Admin<TRADER>::set_max_follow_policy (CosTrading::FollowOption policy,
-					  CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CosTrading::FollowOption return_value =
-    this->trader_.import_attributes ().max_follow_policy ();
-    
-  this->trader_.import_attributes ().max_follow_policy (policy);
-  return return_value;
-}
-
-template <class TRADER> CosTrading::FollowOption 
-TAO_Admin<TRADER>::
-set_max_link_follow_policy (CosTrading::FollowOption policy,
-			    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CosTrading::FollowOption return_value =
-    this->trader_.link_attributes ().max_link_follow_policy ();
-  
-  this->trader_.link_attributes ().max_link_follow_policy (policy);
-  return return_value;
-}
-
-template <class TRADER> CosTrading::TypeRepository_ptr 
-TAO_Admin<TRADER>::
-set_type_repos (CosTrading::TypeRepository_ptr repository,
-		CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CosTrading::TypeRepository_ptr return_value =
-    this->trader_.support_attributes ().type_repos ();
-  
-  this->trader_.support_attributes ().type_repos (repository);
-  return return_value;
-}
-
-template <class TRADER> CosTrading::Admin::OctetSeq* 
-TAO_Admin<TRADER>::set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-					CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return 0;
-}
-
-template <class TRADER> void 
-TAO_Admin<TRADER>::list_offers (CORBA::ULong how_many, 
-				CosTrading::OfferIdSeq_out ids, 
-				CosTrading::OfferIdIterator_out id_itr,
-				CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,) 
-		  CosTrading::NotImplemented)
-{
-  // This method only applies when the register interface is implemented
-  if (CORBA::is_nil(this->trader_.trading_components().register_if()))
-    TAO_THROW (CosTrading::NotImplemented());
-
-  TRADER::SERVICE_TYPE_MAP& type_map = this->trader_.service_type_map();
-
-  CosTrading::OfferIdIterator_ptr oi =
-    type_map.retrieve_all_offer_ids ()->_this (_env);
-  TAO_CHECK_ENV_RETURN (_env,);
-      
-  id_itr = CosTrading::OfferIdIterator::_nil ();
-  if (how_many > 0)
-    {      
-      if (oi->next_n (how_many, ids, _env) == CORBA::B_FALSE)
-	{
-	  // No more items left in the iterator.
-	  oi->destroy (_env);
-	  oi = CosTrading::OfferIdIterator::_nil ();
-	}
-      else
-	id_itr = oi;
-    }
-  else
-    ids = new CosTrading::OfferIdSeq(0);
-}
-
-template <class TRADER> void 
-TAO_Admin<TRADER>::list_proxies (CORBA::ULong how_many, 
-				 CosTrading::OfferIdSeq_out ids, 
-				 CosTrading::OfferIdIterator_out id_itr,
-				 CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::NotImplemented))
-{
-  TAO_THROW (CosTrading::NotImplemented ());
-}
-
-#endif /* TAO_ADMIN_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Admin.h b/TAO/orbsvcs/orbsvcs/Trader/Admin.h
deleted file mode 100644
index 75925b99978..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Admin.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Admin.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_ADMIN_H
-#define TAO_ADMIN_H
-
-#include "Attributes.h"
-
-template <class TRADER>
-class TAO_Admin : 
-  public TAO_Trader_Components <POA_CosTrading::Admin>,
-  public TAO_Support_Attributes <POA_CosTrading::Admin>,
-  public TAO_Import_Attributes <POA_CosTrading::Admin>,
-  public TAO_Link_Attributes <POA_CosTrading::Admin>
-//
-// = TITLE
-//     This class implements CosTrading::Admin IDL interface.
-// 
-// = DESCRIPTION (FROM SPEC)
-// 
-// The admin interface enables the values of the trader attributes to
-// be read and written. All attributes are defined as readonly in
-// either SupportAttributes, ImportAttributes, LinkAttributes, or
-// Admin. To set the trader "attribute" to a new value,
-// set_<attribute_name> operations are defined in Admin. Each of these
-// set operations returns the previous value of the attribute as its
-// function value. If the admin interface operation
-// set_support_proxy_offers is invoked with a value set to FALSE in a
-// trader which supports the proxy interface, the
-// set_support_proxy_offer value does not affect the function of
-// operations in the proxy interface. However, in this case, it does
-// have the effect of making any proxy offers exported via the proxy
-// interface for that trader unavailable to satisfy queries on that
-// trader's lookup interface. 
-{
-public:
-
-  TAO_Admin (TRADER &trader);
-
-  ~TAO_Admin (void);
-
-  // = Importing Parameters (used by the Lookup Interface)
-
-  virtual CORBA::ULong set_def_search_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_search_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // search card is the cardinality of the offers searched for
-  // constraint compliance. 
-
-
-  virtual CORBA::ULong set_def_match_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_match_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // match card is the cardinality of offers found compliant with the
-  // constraints. 
-
-  virtual CORBA::ULong set_def_return_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_return_card (CORBA::ULong value,
-					    CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // return card is the cardinality of the offers returned from
-  // Lookup.
-
-  virtual CORBA::ULong set_max_list (CORBA::ULong value,
-				     CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Boolean
-    set_supports_modifiable_properties (CORBA::Boolean value,
-					CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Boolean
-    set_supports_dynamic_properties (CORBA::Boolean value,
-				     CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Boolean
-    set_supports_proxy_offers (CORBA::Boolean value,
-			       CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Types of offers available for consideration. Ween out those
-  // offers with modifiable properties
-  
-  // = Link Interface parameters
-
-  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value,
-					  CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value,
-					  CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CosTrading::FollowOption
-    set_def_follow_policy (CosTrading::FollowOption policy,
-			   CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CosTrading::FollowOption
-    set_max_follow_policy (CosTrading::FollowOption policy,
-			   CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  virtual CosTrading::FollowOption
-    set_max_link_follow_policy (CosTrading::FollowOption policy,
-				CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // = Set Type Repository
-  
-  virtual CosTrading::TypeRepository_ptr
-    set_type_repos (CosTrading::TypeRepository_ptr repository,
-		    CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CosTrading::Admin::OctetSeq*
-    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-			 CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void list_offers (CORBA::ULong how_many,
-			    CosTrading::OfferIdSeq_out ids,
-			    CosTrading::OfferIdIterator_out id_itr,
-			    CORBA::Environment& env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
-
-
-  // BEGIN SPEC
-  // The list_offers operation allows the administrator of a trader to
-  // perform housekeeping by obtaining a handle on each of the offers
-  // within a trader (e.g., for garbage collection etc.). Only the
-  // identifiers of ordinary offers are returned, identifiers of proxy
-  // offers are not returned via this operation. If the trader does
-  // not support the Register interface, the NotImplemented exception
-  // is raised. The returned identifiers are passed back in one of two
-  // ways (or a combination of both). ° The "ids" return result
-  // conveys a list of offer identifiers and the "id_itr" is a
-  // reference to an interface at which additional offer identities
-  // can be obtained. ° The "how_many" parameter states how many
-  // identifiers are to be returned via the "ids" result; any
-  // remaining are available via the iterator interface. If the
-  // "how_many" exceeds the number of offers held in the trader, then
-  // the "id_itr" is nil. 
-  // END SPEC
-
-  virtual void list_proxies (CORBA::ULong how_many,
-			     CosTrading::OfferIdSeq_out ids,
-			     CosTrading::OfferIdIterator_out id_itr,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
-
-  
-  static const char* NAME;
-  
-private:
-
-  TRADER &trader_;
-
-  CosTrading::Admin::OctetSeq stem_id_;
-  // Unique prefix to create a sequence number space.
-  
-  CORBA::ULong sequence_number_;
-  // Current sequence number.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Admin.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-
-#endif /* TAO_ADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp
deleted file mode 100644
index 78d46fda208..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes.cpp
+++ /dev/null
@@ -1,589 +0,0 @@
-// Attributes.h
-// $Id$
-
-#if !defined (TAO_ATTRIBUTES_C)
-#define TAO_ATTRIBUTES_C
-
-#include "Attributes.h"
-#include "Trader.h"
-
-TAO_Support_Attributes_Impl::TAO_Support_Attributes_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
-    supports_modifiable_properties_ (CORBA::B_TRUE),
-    supports_dynamic_properties_ (CORBA::B_TRUE),
-    supports_proxy_offers_ (CORBA::B_FALSE),
-    type_repos_ (CosTrading::TypeRepository::_nil ())
-{
-}
-
-TAO_Support_Attributes_Impl::~TAO_Support_Attributes_Impl (void)
-{
-}
-  
-CORBA::Boolean
-TAO_Support_Attributes_Impl::supports_modifiable_properties (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CORBA::B_FALSE);
-  return this->supports_modifiable_properties_;
-}
-
-void
-TAO_Support_Attributes_Impl::supports_modifiable_properties (CORBA::Boolean new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->supports_modifiable_properties_ = new_value;
-}
-
-CORBA::Boolean
-TAO_Support_Attributes_Impl::supports_dynamic_properties (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CORBA::B_FALSE);
-
-  return this->supports_dynamic_properties_;
-}
-    
-void
-TAO_Support_Attributes_Impl::supports_dynamic_properties (CORBA::Boolean new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->supports_dynamic_properties_ = new_value;
-}
-    
-CORBA::Boolean
-TAO_Support_Attributes_Impl::supports_proxy_offers (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CORBA::B_FALSE);
-    
-  return this->supports_proxy_offers_;
-}
-
-void
-TAO_Support_Attributes_Impl::supports_proxy_offers (CORBA::Boolean new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->supports_proxy_offers_ = new_value;
-}
-
-CosTrading::TypeRepository_ptr
-TAO_Support_Attributes_Impl::type_repos (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::TypeRepository::_nil ());
-  return this->type_repos_;
-}
-  
-void
-TAO_Support_Attributes_Impl::type_repos (CosTrading::TypeRepository_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->type_repos_ = new_value;
-}
-  
-
-TAO_Import_Attributes_Impl::TAO_Import_Attributes_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
-    def_search_card_ (10),
-    max_search_card_ (100),
-    def_match_card_ (10),
-    max_match_card_ (100), 
-    def_return_card_ (10),
-    max_return_card_ (100), 
-    max_list_ (0),
-    def_hop_count_ (5),
-    max_hop_count_ (5),
-    def_follow_policy_ (CosTrading::if_no_local),
-    max_follow_policy_ (CosTrading::always)
-{
-}
- 
-
-TAO_Import_Attributes_Impl::~TAO_Import_Attributes_Impl (void)
-{
-}
-  
-CORBA::ULong
-TAO_Import_Attributes_Impl::def_search_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
-  return this->def_search_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::def_search_card (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  if (new_value > this->max_search_card_)
-    this->def_search_card_ = this->max_search_card_;
-  else
-    this->def_search_card_ = new_value;
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::max_search_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
-  return this->max_search_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_search_card (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  this->max_search_card_ = new_value;
-
-  if (this->def_search_card_ > this->max_search_card_)
-    this->def_search_card_ = this->max_search_card_;
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::def_match_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
-  return this->def_match_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::def_match_card (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  if (new_value > this->max_match_card_)
-    this->def_match_card_ = this->max_match_card_;
-  else
-    this->def_match_card_ = new_value;  
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::max_match_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
-  return this->max_match_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_match_card (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_match_card_ = new_value;
-
-  if (this->def_match_card_ > this->max_match_card_)
-    this->def_match_card_ = this->max_match_card_;
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::def_return_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10);
-  return this->def_return_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::def_return_card (CORBA::ULong new_value)
-{  
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  if (new_value > this->max_return_card_)
-    this->def_return_card_ = this->max_return_card_;
-  else
-    this->def_return_card_ = new_value;  
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::max_return_card (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 10); 
-  return this->max_return_card_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_return_card (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_return_card_ = new_value;
-
-  if (this->def_return_card_ > this->max_return_card_)
-    this->def_return_card_ = this->max_return_card_;
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::max_list (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0); 
-  return this->max_list_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_list (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_list_ = new_value;
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::def_hop_count (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0);  
-  return this->def_hop_count_;
-}
-
-void
-TAO_Import_Attributes_Impl::def_hop_count (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  if (new_value > this->max_hop_count_)
-    this->def_hop_count_ = this->max_hop_count_;
-  else
-    this->def_hop_count_ = new_value;  
-}
-
-CORBA::ULong
-TAO_Import_Attributes_Impl::max_hop_count (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), 0);  
-  return this->max_hop_count_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_hop_count (CORBA::ULong new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_hop_count_ = new_value;
-
-  if (this->def_hop_count_ > this->max_hop_count_)
-    this->def_hop_count_ = this->max_hop_count_;
-}
-
-CosTrading::FollowOption
-TAO_Import_Attributes_Impl::def_follow_policy (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), CosTrading::local_only); 
-  return this->def_follow_policy_;
-}
-
-void
-TAO_Import_Attributes_Impl::def_follow_policy (FollowOption new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());
-
-  if (new_value > this->max_follow_policy_)
-    this->def_follow_policy_ = this->max_follow_policy_;
-  else
-    this->def_follow_policy_ = new_value;  
-}
-
-FollowOption
-TAO_Import_Attributes_Impl::max_follow_policy (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (), CosTrading::local_only); 
-  return this->max_follow_policy_;
-}
-
-void
-TAO_Import_Attributes_Impl::max_follow_policy (FollowOption new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_follow_policy_ = new_value;
-
-  if (this->def_follow_policy_ > this->max_follow_policy_)
-    this->def_follow_policy_ = this->max_follow_policy_;
-}
-
-
-TAO_Trading_Components_Impl::TAO_Trading_Components_Impl (TAO_Trader_Base &trader)
-  : trader_ (trader),
-    lookup_ (CosTrading::Lookup::_nil ()),
-    register_ (CosTrading::Register::_nil ()),
-    link_ (CosTrading::Link::_nil ()),
-    proxy_ (CosTrading::Proxy::_nil ()),
-    admin_ (CosTrading::Admin::_nil ())  
-{
-}
-
-TAO_Trading_Components_Impl::~TAO_Trading_Components_Impl (void)
-{
-}
-
-CosTrading::Lookup_ptr
-TAO_Trading_Components_Impl::lookup_if (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::Lookup::_nil ());  
-  return this->lookup_;
-}
-
-void
-TAO_Trading_Components_Impl::lookup_if (CosTrading::Lookup_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->lookup_ = new_value;
-}
-
-CosTrading::Register_ptr
-TAO_Trading_Components_Impl::register_if (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::Register::_nil ());  
-  return this->register_;
-}
-
-void
-TAO_Trading_Components_Impl::register_if (CosTrading::Register_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->register_ = new_value;
-}
-
-CosTrading::Link_ptr
-TAO_Trading_Components_Impl::link_if (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::Link::_nil ());  
-  return this->link_;
-}
-
-void
-TAO_Trading_Components_Impl::link_if (CosTrading::Link_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->link_ = new_value;
-}
-
-CosTrading::Proxy_ptr
-TAO_Trading_Components_Impl::proxy_if (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::Proxy::_nil ());  
-  return this->proxy_;
-}
-  
-void
-TAO_Trading_Components_Impl::proxy_if (CosTrading::Proxy_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->proxy_ = new_value;
-}
-  
-CosTrading::Admin_ptr
-TAO_Trading_Components_Impl::admin_if (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::Admin::_nil ());  
-  return this->admin_;
-}
-
-void
-TAO_Trading_Components_Impl::admin_if (CosTrading::Admin_ptr new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->admin_ = new_value;
-}
-
-  
-TAO_Link_Attributes_Impl::TAO_Link_Attributes_Impl (TAO_Trader_Base &trader)
-  :trader_ (trader),
-   max_link_follow_policy_ (CosTrading::local_only)
-{
-}
- 
-TAO_Link_Attributes_Impl::~TAO_Link_Attributes_Impl (void)
-{
-}
-
-CosTrading::FollowOption 
-TAO_Link_Attributes_Impl::max_link_follow_policy (void) const
-{
-  ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->trader_.lock (),
-			 CosTrading::local_only);  
-  return this->max_link_follow_policy_;
-}
-  
-void  
-TAO_Link_Attributes_Impl::max_link_follow_policy (CosTrading::FollowOption new_value)
-{
-  ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->trader_.lock ());  
-  this->max_link_follow_policy_ = new_value;
-}
-
-template <class IF>
-TAO_Trader_Components<IF>::
-TAO_Trader_Components (const TAO_Trading_Components_Impl& comps) 
-  : comps_ (comps)
-{
-}
-
-template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
-}
-
-template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Returning Register Interface.\n"));
-  return CosTrading::Register::_duplicate (this->comps_.register_if ());
-}
-
-template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
-}
-
-template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
-}
-
-template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return CosTrading::Link::_duplicate (this->comps_.link_if ());
-}
-template <class IF> 
-TAO_Support_Attributes<IF>::
-TAO_Support_Attributes (const TAO_Support_Attributes_Impl& attrs) 
-  : attrs_ (attrs)
-{
-}
-
-template <class IF> CORBA::Boolean 
-TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.supports_modifiable_properties ();
-}
-
-template <class IF> CORBA::Boolean 
-TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.supports_dynamic_properties ();
-}
-
-template <class IF> CORBA::Boolean 
-TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.supports_proxy_offers ();
-}
-
-template <class IF> CosTrading::TypeRepository_ptr 
-TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Returning Service Type Repository.\n"));
-  return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
-}
-
-template <class IF> 
-TAO_Import_Attributes<IF>::
-TAO_Import_Attributes (const TAO_Import_Attributes_Impl& attrs)
-  : attrs_ (attrs)
-{
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.def_search_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_search_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.def_match_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_match_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.def_return_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_return_card ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::max_list (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_list ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.def_hop_count ();
-}
-
-template <class IF> CORBA::ULong 
-TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_hop_count ();
-}
-
-template <class IF> CosTrading::FollowOption 
-TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.def_follow_policy ();
-}
-
-template <class IF> CosTrading::FollowOption 
-TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_follow_policy ();
-}
-
-template <class IF> 
-TAO_Link_Attributes<IF>::
-TAO_Link_Attributes (const TAO_Link_Attributes_Impl& attrs)
-  : attrs_ (attrs)
-{
-}
-
-template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->attrs_.max_link_follow_policy ();
-}
-
-#endif /* TAO_ATTRIBUTES_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h b/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
deleted file mode 100644
index 68e71880d72..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Attributes.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_ATTRIBUTES_H
-#define TAO_ATTRIBUTES_H
-
-#include "orbsvcs/CosTradingS.h"
-
-class TAO_Trader_Base;
- 
-class TAO_Export TAO_Support_Attributes_Impl
-  // = TITLE
-  //     This class stores, allows access to and modification of 
-  //     trader's support attributes.
-  //
-  // = DESCRIPTION
-  //     Contains a reference to the trader from which it is
-  //     used so it can use trader's lock.
-{
-public:
-  // = Initialization and termination methods.
-  TAO_Support_Attributes_Impl (TAO_Trader_Base &trader);
-  ~TAO_Support_Attributes_Impl ();
-
-  // = Accessor methods.
-  CORBA::Boolean supports_modifiable_properties (void) const;
-  void supports_modifiable_properties (CORBA::Boolean);
-
-  CORBA::Boolean supports_dynamic_properties (void) const;
-  void supports_dynamic_properties (CORBA::Boolean);
-
-  CORBA::Boolean supports_proxy_offers (void) const;
-  void supports_proxy_offers (CORBA::Boolean);
-
-  CosTrading::TypeRepository_ptr type_repos (void) const;
-  void type_repos (CosTrading::TypeRepository_ptr);
-
-private:
-
-  TAO_Trader_Base &trader_;
-  // A reference to the trader (needed for obtaining the lock.)
-
-  CORBA::Boolean supports_modifiable_properties_;
-  // Indicator of whether the trader supports property modification.
-
-  CORBA::Boolean supports_dynamic_properties_;
-  // Indicator of whether the trader supports dynamic properties.
-
-  CORBA::Boolean supports_proxy_offers_;
-  // Indicator of whether the trader supports proxy offers.
-
-  CORBA::Object_var type_repos_;
-  // A reference to the TypeRepostitory used by the trader.
-};
-
-class TAO_Export TAO_Link_Attributes_Impl
-  // = TITLE
-  //     This class stores, allows access to and modification of 
-  //     trader's link attributes.
-  //
-  // = DESCRIPTION
-  //     Contains a reference to the trader from which it is
-  //     used so it can use trader's lock.
-{
-public:
-  // = Initialization and termination methods.
-
-  TAO_Link_Attributes_Impl (TAO_Trader_Base &trader);
-  ~TAO_Link_Attributes_Impl ();
-
-  // = Accessor methods.
-  
-  CosTrading::FollowOption max_link_follow_policy (void) const;
-  void  max_link_follow_policy (CosTrading::FollowOption);
-
-private:
-
-  TAO_Trader_Base &trader_;
-  // A reference to the trader (needed for obtaining the lock.)
-
-  CosTrading::FollowOption max_link_follow_policy_;
-  // 
-};
-
-class TAO_Export TAO_Import_Attributes_Impl
-  // = TITLE
-  //     This class stores, allows access to and modification of 
-  //     trader's import attributes.
-  //
-  // = DESCRIPTION
-  //     Contains a reference to the trader from which it is
-  //     used so it can use trader's lock.
-{
-public:
-  // = Initialization and termination methods.
-
-  TAO_Import_Attributes_Impl (TAO_Trader_Base &trader);
-
-  ~TAO_Import_Attributes_Impl (void);
-
-  // = Accessor methods.
-  
-  CORBA::ULong def_search_card (void) const;
-  void def_search_card (CORBA::ULong);
-	
-  CORBA::ULong max_search_card (void) const;
-  void max_search_card (CORBA::ULong);
-
-  CORBA::ULong def_match_card (void) const;
-  void def_match_card (CORBA::ULong);
-
-  CORBA::ULong max_match_card (void) const;
-  void max_match_card (CORBA::ULong);
-
-  CORBA::ULong def_return_card (void) const;
-  void def_return_card (CORBA::ULong);
-
-  CORBA::ULong max_return_card (void) const;
-  void max_return_card (CORBA::ULong);
-
-  CORBA::ULong max_list (void) const;
-  void max_list (CORBA::ULong);
-
-  CORBA::ULong def_hop_count (void) const;
-  void def_hop_count (CORBA::ULong);
-
-  CORBA::ULong max_hop_count (void) const;
-  void max_hop_count (CORBA::ULong);
-
-  CosTrading::FollowOption def_follow_policy (void) const;
-  void def_follow_policy (CosTrading::FollowOption);
-
-  CosTrading::FollowOption max_follow_policy (void) const;
-  void max_follow_policy (CosTrading::FollowOption);
-
-private:
-
-  TAO_Trader_Base &trader_;
-
-  CORBA::ULong def_search_card_;
-  // Upper bound of offers to be searched if <search_card>
-  // is not specified.  
-
-  CORBA::ULong max_search_card_;
-  // Maximum upper bound of offers to be searched.
-
-  CORBA::ULong def_match_card_;
-  // Upper bound of matched offers to be ordered if 
-  // <match_card> is not specified).  
-
-  CORBA::ULong max_match_card_; 
-  // Maximum upper bound of matched offers to be ordered.
-
-  CORBA::ULong def_return_card_;
-  // Upper bound of ordered offers to be returned if 
-  // <returned_card> is not specified.
-
-  CORBA::ULong max_return_card_; 
-  // Maximum upper bound of ordered offers to be returned.
-
-  CORBA::ULong max_list_;
-  // Upper bound of depth
-    
-  CORBA::ULong def_hop_count_;
-  // Upper bound of depth of links to be traversed if <hop_count> is
-  // not specified.
-
-  CORBA::ULong max_hop_count_;
-  // Maximum upper bound of depth of links to be traversed.
-    
-  CosTrading::FollowOption def_follow_policy_;
-  // Default link follow policy for a particular trader.
-
-  CosTrading::FollowOption max_follow_policy_;
-  // Limiting link follow policy for all links of the trader -
-  // overrides both link and importer policies.
-};
-
-class TAO_Export TAO_Trading_Components_Impl
-  //
-  // = TITLE
-  //     Set/get methods for references to various
-  //     interfaces of the trader.
-  //
-  // = DESCRIPTION
-  //     Note, this class is for use in local address space only and is NOT a
-  //     direct implementation of IDL methods. (Implementation of 
-  //     IDL methods in CosTrading::Trader_Components would need
-  //     add a _duplicate call for each get method). 
-{
-public:
-
-  // = Initialization and termination methods.
-  TAO_Trading_Components_Impl (TAO_Trader_Base &trader);
-  ~TAO_Trading_Components_Impl (void);
-
-  // = CosTrading::TraderComponents methods. 
-
-  CosTrading::Lookup_ptr lookup_if (void) const;
-  // Returns an object reference to the Lookup interface of the trader.
-  // Returns nil if the trader does not support Lookup interface.
-
-  void lookup_if (CosTrading::Lookup_ptr);
-  // Set the reference to the Lookup interface.
-  
-  CosTrading::Register_ptr register_if (void) const;
-  // Returns object reference for the Register interface of the trader.
-  // Returns nil if the trader does not support Register interface.
-
-  void register_if (CosTrading::Register_ptr);
-  // Set the reference to the Register interface of the trader.
-  
-  CosTrading::Link_ptr link_if (void) const;
-  // Returns object reference for the Link interface of the trader.
-  // Returns nil if the trader does not support Link interface.
-
-  void link_if (CosTrading::Link_ptr);
-  // Set the reference to the Link interface of the trader.
-
-  CosTrading::Proxy_ptr proxy_if (void) const;
-  // Returns object reference to the Proxy interface of the trader.
-  // Returns nil if the trader does not support Proxy interface. 
-
-  void proxy_if (CosTrading::Proxy_ptr);
-  // Set the reference to the Proxy interface of the trader.
-  
-  CosTrading::Admin_ptr admin_if (void) const;
-  // Returns object reference for the Admin interface of the trader.
-  // Returns nil if the trader does not support Admin interface.
-
-  void admin_if (CosTrading::Admin_ptr);
-  // Set the reference to the Admin interface of the trader.
-
-private:
-
-  TAO_Trader_Base &trader_;
-
-  CosTrading::Lookup_var lookup_;
-  CosTrading::Register_var register_;
-  CosTrading::Link_var link_;
-  CosTrading::Proxy_var proxy_;
-  CosTrading::Admin_var admin_;
-};
-
-
-template <class IF>
-class TAO_Trader_Components : public virtual IF
-{
-public:
-
-  TAO_Trader_Components (const TAO_Trading_Components_Impl& comps);
-  
-  // = CosTrading::TraderComponents methods. 
-  virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Returns an object reference to the Lookup interface of the trader.
-  // Returns nil if the trader does not support Lookup interface.
-  
-  virtual CosTrading::Register_ptr register_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Returns object reference for the Register interface of the trader.
-  // Returns nil if the trader does not support Register interface.
-  
-  virtual CosTrading::Link_ptr link_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException)); 
-  // Returns object reference for the Link interface of the trader.
-  // Returns nil if the trader does not support Link interface.
-
-  virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Returns object reference to the Proxy interface of the trader.
-  // Returns nil if the trader does not support Proxy interface. 
-   
-  virtual CosTrading::Admin_ptr admin_if (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Returns object reference for the Admin interface of the trader.
-  // Returns nil if the trader does not support Admin interface.
-
-private:
-
-  const TAO_Trading_Components_Impl& comps_;
-};
-
-template <class IF>
-class TAO_Support_Attributes : public virtual IF
-{
-public:
-
-  TAO_Support_Attributes (const TAO_Support_Attributes_Impl& attrs);
-
-  // = CosTrading::SupportAttributes methods.
-  
-  virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-private:
-
-  const TAO_Support_Attributes_Impl& attrs_;
-};
-
-template <class IF>
-class TAO_Import_Attributes : public virtual IF
-{
-public:
-
-  TAO_Import_Attributes (const TAO_Import_Attributes_Impl& attrs);
-
-  // = CosTrading::ImportAttributes methods.
-  
-  virtual CORBA::ULong def_search_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong max_search_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // Search cardinality determines the maximum number of offers searched
-  // before not considering other offers. 
-  
-  virtual CORBA::ULong def_match_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong max_match_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // Match cardinality determines the maximum number of offers
-  // matched to the constraints before not considering other offers..
-  
-  virtual CORBA::ULong def_return_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong max_return_card (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // Return cardinality determines the maximum number of offers marked 
-  // to return before not considering other offers.
-
-  
-  virtual CORBA::ULong max_list (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong def_hop_count (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong max_hop_count (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  
-private:
-
-  const TAO_Import_Attributes_Impl& attrs_;
-};
-
-template <class IF>
-class TAO_Link_Attributes : public virtual IF
-{
-public:
-
-  TAO_Link_Attributes (const TAO_Link_Attributes_Impl& attrs);
-
-  // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-    
-private:
-
-  const TAO_Link_Attributes_Impl& attrs_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Attributes.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_ATTRIBUTES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint.cpp
deleted file mode 100644
index bd384d9984e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Constraint.cpp
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-
-#include "Constraint.h"
-
-char* TAO_Lex_String_Input::string_ = 0;
-char* TAO_Lex_String_Input::current_ = 0;
-char* TAO_Lex_String_Input::end_ = 0;
-
-// Routine to have Lex read its input from the constraint string.
-
-int
-TAO_Lex_String_Input::copy_into(char* buf, int max_size)
-{
-  int chars_left =  TAO_Lex_String_Input::end_ - TAO_Lex_String_Input::current_;
-  int n = (max_size > chars_left) ? chars_left : max_size;
-
-  
-  if (n > 0)
-    {
-      memcpy(buf, TAO_Lex_String_Input::current_, n);
-      TAO_Lex_String_Input::current_ += n;
-    }
-  
-  return n;
-}
-
-void
-TAO_Lex_String_Input::reset(char* input_string)
-{    
-  TAO_Lex_String_Input::string_ = input_string;
-  TAO_Lex_String_Input::current_ = input_string;
-  TAO_Lex_String_Input::end_ = input_string +
-    ACE_OS::strlen(TAO_Lex_String_Input::string_);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint.h
deleted file mode 100644
index ec0008d195b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Constraint.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-#ifndef TAO_CONSTRAINT_H
-#define TAO_CONSTRAINT_H
-
-#include "Constraint_Nodes.h"
-
-// Functions we need for parsing.
-extern int yyparse(void);
-extern void yyrestart(FILE*);
-extern int yylex(void);
-
-// Have yylex read from the constraint string, not from stdin.
-#undef YY_INPUT
-#define YY_INPUT(b, r, ms) (r = TAO_Lex_String_Input::copy_into(b, ms))
-
-#undef yyerror
-#define yyerror(x) 
-
-class TAO_Lex_String_Input
-// = TITLE
-//   Stupid hack to have Lex read from a string and not from
-//   stdin. Essentially, the interpreter needs to call yylex() until
-//   EOF, and call TAO_Lex_String_Input::reset() with the new string,
-//   prior to calling yyparse.
-{
-public:  
-
-  static void reset(char* input_string);
-  // Reset the lex input.
-  
-  static int copy_into(char* buf, int max_size);
-  // Method lex will call to read from the input string.
-  
-private:
-
-  static char* string_;
-  static char* current_;
-  static char* end_;
-  // Pointers to keep track of the input string.
-};
-
-// The union used by lex and yacc to build the Abstract Syntax Tree.
-typedef union
-{
-  TAO_Constraint* constraint_;	
-} YYSTYPE;
-
-extern YYSTYPE yylval;
-extern YYSTYPE yyval;
-
-#endif /* CONSTRAINT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp
deleted file mode 100644
index 267a664b239..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-// Constraint_Evaluator.cpp
-// $Id$
-
-// ========================================================================
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Evaluator.cpp
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-
-#define get_left_operand() (this->queue_.rbegin()[1])
-#define get_right_operand() this->queue_.back()
-#define get_operand() this->queue_.back()
-
-#include "Constraint_Evaluator.h"
-
-TAO_Constraint_Evaluator::
-TAO_Constraint_Evaluator(CosTrading::Offer* offer,
-			 CORBA::Boolean supports_dp)
-  : prop_eval_ (*offer, supports_dp)
-{
-  this->props_.clear();
-  int length = offer->properties.length();
-
-  // Create a map of property names to their values.
-  for (int i = 0; i < length; i++)
-    {
-      string name = (const char*)offer->properties[i].name;
-      this->props_[name] = i;
-    }    
-}
-
-
-CORBA::Boolean
-TAO_Constraint_Evaluator::evaluate_constraint(TAO_Constraint* root)
-{
-  CORBA::Boolean result = 0;
-  while (! this->queue_.empty())
-    this->queue_.pop_back();
-   
-  // Evaluate the offer according to the constraints in root_;
-  if (root != 0)
-    {
-      if ((root->accept(this) == 0) &&
-	  (! this->queue_.empty ()))
-	{
-	  result = (CORBA::Boolean) get_operand();
-	  this->queue_.pop_back ();
-	}
-    }
-
-  // If a property couldn't be evaluated we must return 0.
-  return result;
-}
-
-int
-TAO_Constraint_Evaluator::
-evaluate_preference(TAO_Constraint* root,
-		    TAO_Literal_Constraint& result)
-{
-  int return_value = -1;
-  while (! this->queue_.empty())
-    this->queue_.pop_back();
-
-  // Evaluate the offer according to the constraints in root_;
-  if (root != 0)
-    {
-      if ((root->accept(this) == 0) &&
-	  (! this->queue_.empty ()))
-	{
-	  result = get_operand();
-	  this->queue_.pop_back();
-	  return_value = 0;
-	}
-    }
-  
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::visit_constraint(TAO_Unary_Constraint* constraint)
-{
-  TAO_Constraint* operand = constraint->operand ();
-  return operand->accept(this);
-}
-
-int
-TAO_Constraint_Evaluator::visit_with(TAO_Unary_Constraint* unary_with)
-{
-  TAO_Constraint* operand = unary_with->operand ();
-  return operand->accept(this);
-}
-
-int
-TAO_Constraint_Evaluator::visit_min(TAO_Unary_Constraint* unary_min)
-{
-  TAO_Constraint* operand = unary_min->operand ();
-  return operand->accept(this);
-}
-
-int
-TAO_Constraint_Evaluator::visit_max(TAO_Unary_Constraint* unary_max)
-{
-  TAO_Constraint* operand = unary_max->operand ();
-  return operand->accept(this);
-}
-
-int
-TAO_Constraint_Evaluator::visit_random(TAO_Noop_Constraint* noop_random)
-{
-  TAO_Literal_Constraint random((CORBA::Long) (ACE_OS::rand ()));
-  this->queue_.push_back(random);  
-  return 0;
-}
-
-int
-TAO_Constraint_Evaluator::visit_first(TAO_Noop_Constraint* noop_first)
-{
-  TAO_Literal_Constraint first((CORBA::Long) 0);
-  this->queue_.push_back (first);  
-  return 0;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_and(TAO_Binary_Constraint* boolean_and)
-{
-  int return_value = -1;
-  CORBA::Boolean result = (CORBA::Boolean) 0;
-  TAO_Constraint* left = boolean_and->left_operand(),
-    *right = boolean_and->right_operand();
-
-  // Short circuiting AND.
-  
-  if (left->accept(this) == 0)
-    {
-      result = (CORBA::Boolean) get_operand();
-      this->queue_.pop_back ();
-      
-      if (result)
-	{
-	  if (right->accept(this) == 0)
-	    {
-	      result = (CORBA::Boolean) get_operand();
-	      this->queue_.pop_back ();
-
-	      return_value = 0;
-	    }
-	}
-      else
-	return_value = 0;
-    }
-
-  if (return_value != -1)
-    this->queue_.push_back (TAO_Literal_Constraint (result));
-  
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_or(TAO_Binary_Constraint* boolean_or)
-{
-  int return_value = -1;
-  CORBA::Boolean result = (CORBA::Boolean) 0;
-  TAO_Constraint* left = boolean_or->left_operand (),
-    *right = boolean_or->right_operand ();
-
-  // Short-circuiting OR.
-  
-  if (left->accept(this) == 0)
-    {
-      result = (CORBA::Boolean) get_operand();
-      this->queue_.pop_back ();
-      
-      if (result == (CORBA::Boolean) 0)
-	{
-	  if (right->accept (this) == 0)
-	    {
-	      result = (CORBA::Boolean) get_operand();
-	      this->queue_.pop_back();
-	      return_value = 0;
-	    }
-	}
-      else
-	return_value = 0;
-    }
-
-  if (return_value != -1)
-    this->queue_.push_back (TAO_Literal_Constraint (result));
-  
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_not(TAO_Unary_Constraint* unary_not)
-{
-  int return_value = -1;
-  TAO_Constraint* operand = unary_not->operand();
-
-  // Logical NOT.
-  
-  if (operand->accept(this) == 0)
-    {
-      CORBA::Boolean result = ! (CORBA::Boolean)get_operand();
-      this->queue_.pop_back ();
-      this->queue_.push_back (TAO_Literal_Constraint (result));
-
-      return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_exist(TAO_Unary_Constraint* unary_exist)
-{
-  TAO_Property_Constraint* operand =
-    (TAO_Property_Constraint*) unary_exist->operand ();
-  string property_name ((const char*) operand->name ());
-
-  // Determine if a property is defined on this offer.
-  
-  CORBA::Boolean result = (CORBA::Boolean)
-    (this->props_.find (property_name) != this->props_.end());
-
-  this->queue_.push_back (TAO_Literal_Constraint (result));
-  
-  return 0;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_unary_minus(TAO_Unary_Constraint* unary_minus)
-{
-  int return_value = -1;
-  TAO_Constraint* operand = unary_minus->operand();
-
-  if (operand->accept(this) == 0)
-    {
-      TAO_Literal_Constraint& result = - get_operand();
-      this->queue_.pop_back ();
-      this->queue_.push_back (result);
-
-      return_value = 0;
-    }
-
-  return return_value;
-}
-
-void
-TAO_Constraint_Evaluator::do_the_op (int operation)
-{
-  TAO_Literal_Constraint& l_op = get_left_operand();
-  TAO_Literal_Constraint& r_op = get_right_operand();
-
-  // Perform the listed bindary operation on the first two elements on 
-  // the stack.
-  
-  TAO_Literal_Constraint& result =
-    (operation <= TAO_NE)
-    ?
-    TAO_Literal_Constraint
-    ((CORBA::Boolean)
-     ((operation == TAO_GT) ? l_op > r_op :
-      (operation == TAO_GE) ? l_op >= r_op :
-      (operation == TAO_LT) ? l_op < r_op :
-      (operation == TAO_LE) ? l_op <= r_op :
-      (operation == TAO_NE) ? l_op != r_op :
-      (operation == TAO_EQ) ? l_op == r_op : 0))
-    :    
-    ((operation == TAO_PLUS) ? l_op + r_op :
-     (operation == TAO_MINUS) ? l_op - r_op :
-     (operation == TAO_MULT) ? l_op * r_op :
-     (operation == TAO_DIV) ? l_op / r_op :
-     TAO_Literal_Constraint ());
-    
-  this->queue_.pop_back ();
-  this->queue_.pop_back ();
-  this->queue_.push_back (result);
-}
-
-int
-TAO_Constraint_Evaluator::visit_bin_op (TAO_Binary_Constraint* op,
-					 int operation)
-{
-  int return_value = -1;
-  TAO_Constraint* left = op->left_operand(),
-    *right = op->right_operand(); 
-
-  // Perform an operation on the results of evaluating the left and
-  // right branches of this subtree.
-  if (left->accept (this) == 0)
-    {
-      if (right->accept (this) == 0)
-	{	  
-	  this->do_the_op (operation);
-	  return_value = 0;
-	}
-      else
-	this->queue_.pop_back ();
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_add(TAO_Binary_Constraint* boolean_add)
-{
-  return this->visit_bin_op (boolean_add, TAO_PLUS);  
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_sub(TAO_Binary_Constraint* boolean_sub)
-{
-  return this->visit_bin_op (boolean_sub, TAO_MINUS);
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_mult(TAO_Binary_Constraint* boolean_mult)
-{
-  return this->visit_bin_op (boolean_mult, TAO_MULT);  
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_div(TAO_Binary_Constraint* boolean_div)
-{
-  return this->visit_bin_op (boolean_div, TAO_DIV);  
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_twiddle(TAO_Binary_Constraint* binary_twiddle)
-{
-  int return_value = -1;
-  TAO_Constraint* left = binary_twiddle->left_operand(),
-    *right = binary_twiddle->right_operand();
-
-  // Determine if the left operand is a substring of the right.
-  
-  if (left->accept (this) == 0)
-    {
-      if (right->accept(this) == 0)
-	{
-	  TAO_Literal_Constraint& left_operand = get_left_operand();
-	  TAO_Literal_Constraint& right_operand = get_right_operand();
-	  
-	  CORBA::Boolean result = (CORBA::Boolean)
-	    (ACE_OS::strstr ((const char*)left_operand,
-			     (const char*)right_operand) != 0);
-	  
-	  this->queue_.pop_back();
-	  this->queue_.pop_back();
-	  this->queue_.push_back (TAO_Literal_Constraint (result));
-	  return_value = 0;
-	}
-      else
-	this->queue_.pop_back ();
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_in(TAO_Binary_Constraint* binary_in)
-{
-  int return_value = -1;
-  TAO_Constraint* left = binary_in->left_operand(),
-    *right = binary_in->right_operand();
-
-  // Determine if the left operand is contained in the right.
-  
-  if (left->accept(this) == 0)
-    {
-      if (this->visit_property ((TAO_Property_Constraint*) right) == 0)
-	{
-	  TAO_Literal_Constraint& left_value = get_left_operand(); 
-	  const CORBA::Any* any = (const CORBA::Any*) get_right_operand();
-
-	  if (any != 0)
-	    {
-	      CORBA::Boolean result =
-		this->sequence_does_contain ((CORBA::Any*) any, left_value);
-	      
-	      this->queue_.pop_back ();
-	      this->queue_.pop_back ();
-	      this->queue_.push_back (TAO_Literal_Constraint (result));
-	      return_value = 0;
-	    }
-	  else
-	    this->queue_.pop_back ();	  
-	}
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_less_than(TAO_Binary_Constraint* boolean_lt)
-{
-  return this->visit_bin_op (boolean_lt, TAO_LT);
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_less_than_equal(TAO_Binary_Constraint* boolean_lte)
-{
-  return this->visit_bin_op (boolean_lte, TAO_LE);
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_greater_than(TAO_Binary_Constraint* boolean_gt)
-{
-  return this->visit_bin_op (boolean_gt, TAO_GT);
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_greater_than_equal(TAO_Binary_Constraint* boolean_gte)
-{
-  return this->visit_bin_op (boolean_gte, TAO_GE); 
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_equal(TAO_Binary_Constraint* boolean_eq)
-{
-  return this->visit_bin_op (boolean_eq, TAO_EQ); 
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_not_equal(TAO_Binary_Constraint* boolean_neq)
-{
-  return this->visit_bin_op (boolean_neq, TAO_NE); 
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_literal(TAO_Literal_Constraint* literal)
-{
-  this->queue_.push_back (*literal);
-  return 0;
-}
-
-int
-TAO_Constraint_Evaluator::
-visit_property(TAO_Property_Constraint* literal)
-{
-  int return_value = -1;
-  // Handle case where property is not, in fact, mapped to a value
-  string prop_name((const char*) literal->name ());
-  Property_Map_Iter prop_iter = this->props_.find (prop_name);
-
-  if (prop_iter != this->props_.end())
-    {
-      CORBA::Environment env;
-      // Retrieve the value of the property from the Property_Evaluator
-      int prop_index = (*prop_iter).second;
-
-      CORBA::Any* value =
-	this->prop_eval_.property_value (prop_index, env);
-
-      if (value != 0)
-	{
-	  this->queue_.push_back (TAO_Literal_Constraint (value));
-	  return_value = 0;
-	}
-    }
-
-  return return_value;
-}
-
-
-template <class SEQ, class OPERAND_TYPE> CORBA::Boolean
-TAO_find (SEQ& sequence, const OPERAND_TYPE element)
-{
-  int length = sequence.length(),
-    return_value = 0;
-
-  for (int i = 0; i < length; i++)
-    {
-      if (sequence[i] == element)
-	{	  
-	  return_value = 1;
-	  break;
-	}
-    }
-
-  return (CORBA::Boolean) return_value;
-}
-
-#ifdef ACE_HAS_TEMPLATE_SPECIALIZATION
-template<> CORBA::Boolean
-TAO_find (TAO_Sequences::StringSeq& sequence, const char* element)
-#else
-CORBA::Boolean
-TAO_find_string (TAO_Sequences::StringSeq& sequence, const char* element)
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-{
- int length = sequence.length(),
-    return_value = 0;
-
-  for (int i = 0; i < length; i++)
-    {
-      if (ACE_OS::strcmp(sequence[i], element) == 0)
-	{	  
-	  return_value = 1;
-	  break;
-	}
-    }
-
-  return (CORBA::Boolean) return_value;
-}
-
-CORBA::Boolean
-TAO_Constraint_Evaluator::
-sequence_does_contain(CORBA::Any* sequence,
-		      TAO_Literal_Constraint& element)
-{
-  // Helper method to cast the void* value returned from the sequence
-  // any into a sequence type locally compiled from idl. The sequence
-  // wrapper uses the [] operator to locate the target element in the
-  // sequence. 
-
-  CORBA::Environment env;
-  CORBA::Boolean return_value = CORBA::B_FALSE;
-  CORBA::TypeCode_ptr type = sequence->type ();
-  CORBA::TypeCode_ptr content = type->content_type (env);
-  TAO_CHECK_ENV_RETURN (env, return_value);
-  CORBA::TCKind sequence_type = content->kind (env);
-  TAO_CHECK_ENV_RETURN (env, return_value);
-
-  // What's up with this?
-  if (sequence_type == CORBA::tk_sequence)
-    {
-      CORBA::TypeCode_ptr tmp = content->content_type (env);
-      TAO_CHECK_ENV_RETURN (env, return_value);
-      sequence_type = tmp->kind (env);
-      TAO_CHECK_ENV_RETURN (env, return_value);
-    }
-
-  /*
-  switch(sequence_type)
-    {
-    case CORBA::tk_short:
-      {
-	TAO_Sequences::ShortSeq short_seq;
-	if ((*sequence) >>= short_seq)
-	  return_value = ::TAO_find (short_seq, (CORBA::Long)element);
-      }
-    break;
-    case CORBA::tk_ushort:
-      {
-	TAO_Sequences::UShortSeq ushort_seq;
-	if ((*sequence) >>= ushort_seq)
-	  return_value = ::TAO_find (ushort_seq, (CORBA::ULong)element);
-      }
-      break;
-    case CORBA::tk_long:
-      {
-	TAO_Sequences::LongSeq long_seq;
-	if ((*sequence) >>= long_seq)
-	  return_value = ::TAO_find (long_seq, (CORBA::Long)element);
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-	TAO_Sequences::ULongSeq ulong_seq;
-	if ((*sequence) >>= ulong_seq)
-	  return_value = ::TAO_find (ulong_seq, (CORBA::ULong)element);
-      }
-      break;
-    case CORBA::tk_float:
-      {
-	TAO_Sequences::FloatSeq float_seq;
-	if ((*sequence) >>= float_seq)
-	  return_value = ::TAO_find (float_seq, (CORBA::Double)element);
-      }
-      break;
-    case CORBA::tk_double:
-      {
-	TAO_Sequences::DoubleSeq double_seq;
-	if ((*sequence) >>= double_seq)
-	  return_value = ::TAO_find (double_seq, (CORBA::Double)element);
-      }
-      break;
-    case CORBA::tk_boolean:
-      {
-	TAO_Sequences::BooleanSeq bool_seq;
-	if ((*sequence) >>= bool_seq)
-	  return_value = ::TAO_find (bool_seq, (CORBA::ULong)element);
-      }
-      break;
-    case CORBA::tk_string:
-      {
-	TAO_Sequences::StringSeq string_seq;
-	if ((*sequence) >>= string_seq)
-	  {
-#ifdef ACE_HAS_TEMPLATE_SPECIALIZATION
-	    return_value = ::TAO_find (string_seq, (const char *)element);
-#else
-	    return_value = ::TAO_find_string (string_seq, (const char*) element);
-#endif // ACE_HAS_TEMPLATE_SPECIALIZATION 
-	  }
-	break;
-      }
-      }
-            */
-return return_value;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
deleted file mode 100644
index 88e8ae9cd07..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Evaluator.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-#ifndef TAO_CONSTRAINT_EVALUATOR_H
-#define TAO_CONSTRAINT_EVALUATOR_H
-
-#include <map> 
-#include <deque>
-#include <string>
-
-#include "Property_Evaluator.h"
-#include "Constraint_Visitor.h"
-#include "Constraint_Nodes.h"
-
-#include "orbsvcs/SequencesC.h"
-
-class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
-//
-// = TITLE
-//     TAO_Constraint_Evaluator traverse a constraint expression tree,
-//     and determines whether an offer fits the constraints
-//     represented by the tree
-// 
-// = DESCRIPTION
-//     Using the Visitor pattern, the TAO_Constraint_Evaluator has each
-//     node of the expression tree call back to it with the method
-//     designated for its type. In that method, the visitor will
-//     evaluate its operands and perform the operation designated by
-//     that node's type, and return the result. Note: the
-//     EvaluationVisitor assumes the tree is semantically correct,
-//     that is, the validate method on SemanticValidatorVisitor return
-//     true. The only possible evaluation time error is a divide by a
-//     property whose value is zero.
-{
-public:
-
-  TAO_Constraint_Evaluator(CosTrading::Offer* offer,
-			   CORBA::Boolean supports_dynamic_properties = 1);
-  
-  CORBA::Boolean evaluate_constraint(TAO_Constraint* root);
-  // Evaluate returns 1 if the offer satisfies the constraints
-  // represented by the the expression tree rooted at <root>, 0 if it
-  // doesn't. If an error occurs during process, the constraint
-  // automatically fails.
-
-  int evaluate_preference(TAO_Constraint* root,
-			  TAO_Literal_Constraint& result);
-  // The result of the preference evaluation is stored in result. The
-  // method returns 0 upon success, -1 upon failure.
-  
-  // = Visitor Methods
-  
-  virtual int visit_constraint(TAO_Unary_Constraint* constraint);
-
-  virtual int visit_with(TAO_Unary_Constraint* unary_with);
-  virtual int visit_min(TAO_Unary_Constraint* unary_min);
-  virtual int visit_max(TAO_Unary_Constraint* unary_max);
-  virtual int visit_first(TAO_Noop_Constraint* noop_first);
-  virtual int visit_random(TAO_Noop_Constraint* noop_random);
-  
-  virtual int visit_and(TAO_Binary_Constraint* boolean_and);
-  // Takes the logical and of the results of both operands. Note that
-  // in the case where the left operand returns zero, the result is
-  // immediately known.
-
-  virtual int visit_or(TAO_Binary_Constraint* boolean_or);
-  // Takes the logical or of the results of both operands. Note that
-  // in the case where the left operand returns one, the result is
-  // immediately known.
-
-  virtual int visit_not(TAO_Unary_Constraint* unary_not);
-  // Logically negates the value of the operand.
-  
-  virtual int visit_exist(TAO_Unary_Constraint* unary_exist);
-  // The property exists if its name is bound to a value in the
-  // <props_> map.
-
-  virtual int visit_unary_minus(TAO_Unary_Constraint* unary_minus);
-  // Mathematically negates the return value the operand.
-  
-  virtual int visit_add(TAO_Binary_Constraint* boolean_add);
-  // Add the results of evaluating the left and right operands.
-  
-  virtual int visit_sub(TAO_Binary_Constraint* boolean_sub);
-  // Subtract the results of evaluating the left and right operands.
-  
-  virtual int visit_mult(TAO_Binary_Constraint* boolean_mult);
-  // Multiply the results of evaluating the left and right operands.
-
-  virtual int visit_div(TAO_Binary_Constraint* boolean_div);
-  // Divide the results of evaluating the left and right operands.
-
-  virtual int visit_twiddle(TAO_Binary_Constraint* binary_twiddle);
-  // Determines if the right operand is a substring of the left.
-
-  virtual int visit_in(TAO_Binary_Constraint* binary_in);
-  // Determines if the sequence represented by the right operand
-  // contains the left operand.
-
-  // = Compare the results of evaluating left and right operands.
-  virtual int visit_less_than(TAO_Binary_Constraint* boolean_lt);
-  virtual int visit_less_than_equal(TAO_Binary_Constraint* boolean_lte);
-  virtual int visit_greater_than(TAO_Binary_Constraint* boolean_gt);
-  virtual int visit_greater_than_equal(TAO_Binary_Constraint* boolean_gte);
-  virtual int visit_equal(TAO_Binary_Constraint* boolean_eq);
-  virtual int visit_not_equal(TAO_Binary_Constraint* boolean_neq);
-
-  virtual int visit_literal(TAO_Literal_Constraint* literal);
-  // Copy the value of the literal into the result container.
-
-  virtual int visit_property(TAO_Property_Constraint* literal);
-  // Copy the value of the property into the result container.
-  
-private:
-  
-  typedef map<string, int, less<string> > Property_Map;
-  typedef Property_Map::iterator Property_Map_Iter;   
-  typedef deque<TAO_Literal_Constraint> Operand_Queue;
-
-  void do_the_op (int operation);
-  int visit_bin_op (TAO_Binary_Constraint* op, int operation);
-
-  
-  CORBA::Boolean sequence_does_contain(CORBA::Any* sequence,
-				       TAO_Literal_Constraint& element);
-  // Determine if sequence contains <element>, a literal of the same
-  // simple type as <sequence_type>. Return 1 in this eventuality.
-
-  TAO_Literal_Constraint& left_operand(void);
-  TAO_Literal_Constraint& right_operand(void);
-  
-  Property_Map props_;
-  // The map of property names to their values for a property.
-
-  TAO_Property_Evaluator prop_eval_;
-  // Utility with which to evaluate the properties of an offer, be
-  // they dyanmic or static. 
-
-  Operand_Queue queue_;
-  // The result of a non_boolean operation.
-};
-
-template <class SEQ, class OPERAND_TYPE>
-CORBA::Boolean TAO_find (SEQ& sequence, const OPERAND_TYPE operand);
-
-#ifdef ACE_HAS_TEMPLATE_SPECIALIZATION
-template<> 
-CORBA::Boolean TAO_find (StringSeq& sequence, const char* element);
-#else
-CORBA::Boolean TAO_find_string (StringSeq& sequence, const char* element);
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
-#endif /* CONSTRAINT_EVALUATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
deleted file mode 100644
index 4077030341f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Constraint_Interpreter.cpp
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Constraint_Interpreter.cpp
-// 
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-
-#include "Constraint_Interpreter.h"
-#include <ctype.h>
-#include <stdio.h>
-
-TAO_Constraint_Interpreter::
-TAO_Constraint_Interpreter(CosTradingRepos::ServiceTypeRepository::TypeStruct* ts,
-			   const char* constraints,
-			   CORBA::Environment& _env)
-  TAO_THROW_SPEC (CosTrading::IllegalConstraint)
-  : TAO_Interpreter ()
-{
-  TAO_Constraint_Validator type_checker(ts);
-
-  if (TAO_Interpreter::is_empty_string (constraints))
-    this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1);
-  else
-    {
-      if (this->build_tree (constraints) != 0)
-	TAO_THROW (CosTrading::IllegalConstraint (constraints));	  
-
-      if (type_checker.validate (this->root_) == -1)
-	TAO_THROW (CosTrading::IllegalConstraint (constraints));
-    }
-}
-
-TAO_Constraint_Interpreter::
-TAO_Constraint_Interpreter(TAO_Constraint_Validator& validator,
-			   const char* constraints,
-			   CORBA::Environment& _env)
-  TAO_THROW_SPEC (CosTrading::IllegalConstraint)
-{
-  if (TAO_Interpreter::is_empty_string (constraints))
-    this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1);
-  else
-    {
-      if (this->build_tree (constraints) != 0)
-	TAO_THROW (CosTrading::IllegalConstraint (constraints));	  
-      
-      if (validator.validate (this->root_) == -1)
-	TAO_THROW (CosTrading::IllegalConstraint (constraints));
-    } 
-}
-
-TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter (void)
-{
-}
-
-CORBA::Boolean
-TAO_Constraint_Interpreter::evaluate (CosTrading::Offer* offer)
-{
-  TAO_Constraint_Evaluator evaluator (offer);
-  return evaluator.evaluate_constraint (this->root_);
-}
-
-CORBA::Boolean
-TAO_Constraint_Interpreter::evaluate(TAO_Constraint_Evaluator& evaluator)
-{
-  return evaluator.evaluate_constraint (this->root_);
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
deleted file mode 100644
index c1247b6d5ff..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Constraint_Interpreter.h
-// 
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_CONSTRAINT_INTERPRETER_H
-#define TAO_CONSTRAINT_INTERPRETER_H
-
-#include <stack>
-#include <deque>
-#include "Interpreter.h"
-#include "Constraint_Validator.h"
-#include "Constraint_Evaluator.h"
-
-class TAO_Constraint_Interpreter : public TAO_Interpreter
-//
-// = TITLE
-//   TAO_Constraint_Interpreter will, given a constraint string whose
-//   syntax and semantics comply with the trader specification for the
-//   constraint language, determine if a CosTrading::Offer meets the
-//   constraints. 
-//
-// = DESCRIPTION
-//   TAO_Constraint_Interpreter will first build an expression tree
-//   representing the constraint expression using Lex and Yacc. Then,
-//   using a TAO_Constraint_Validator, it will validate the semantic
-//   correctness of the tree. When the evaluate method is invoked with
-//   an Offer, the TAO_Constraint_Interpreter will construct an
-//   EvaluationVisitor, which will evaluate the tree and decide
-//   whether the offer meets the constraints.
-{
-public:
-  
-  TAO_Constraint_Interpreter(CosTradingRepos::ServiceTypeRepository::TypeStruct* ts,
-			     const char* constraints,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC (CosTrading::IllegalConstraint);
-  
-  TAO_Constraint_Interpreter(TAO_Constraint_Validator& validator,
-			     const char* constraints,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC (CosTrading::IllegalConstraint);
-  // This constructor builds an expression tree representing the
-  // constraint specified in <constraints>, and throws an Illegal
-  // Constraint exception if the constraint given has syntax errors or
-  // semantic errors, such as mismatched types.
-  
-  ~TAO_Constraint_Interpreter(void);
-  // Destructor
-  
-  CORBA::Boolean evaluate(CosTrading::Offer* offer);
-
-  CORBA::Boolean evaluate(TAO_Constraint_Evaluator& evaluator);
-  
-  // Determine whether an offer fits the constraints with which the
-  // tree was constructed. This method is thread safe (hopefully).
-};
-
-#endif /* TAO_CONSTRAINT_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
deleted file mode 100644
index d2befe8dc47..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-// Constraint_Nodes.cpp
-
-// =====================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    Lookup
-//  
-// = FILENAME
-//    Constraint_Nodes.cpp
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// =====================================================================
-
-
-#include "Constraint_Nodes.h"
-
-const CORBA::Long MAX_SIGNED_INTEGER = (~(CORBA::Long)0) >> 1;
-const CORBA::Long MIN_SIGNED_INTEGER = ~(MAX_SIGNED_INTEGER);
-const CORBA::ULong MAX_UNSIGNED_INTEGER = (~(CORBA::ULong)0);
-
-int
-TAO_Noop_Constraint::accept(TAO_Constraint_Visitor* visitor)
-{
-  int return_value = -1;
-  switch(this->type_)
-    {
-    case TAO_FIRST:
-      return_value = visitor->visit_first(this);
-      break;
-    case TAO_RANDOM:
-      return_value = visitor->visit_random(this);
-    }
-
-  return return_value;
-}
-
-TAO_Binary_Constraint::
-TAO_Binary_Constraint(TAO_Expression_Type op_type,
-				TAO_Constraint* left,
-				TAO_Constraint* right)
-  : op_ (op_type),
-    left_ (left),
-    right_ (right)
-{
-}
-
-TAO_Binary_Constraint::~TAO_Binary_Constraint()
-{
-  delete left_;
-  delete right_;
-}
-
-// Dispatch table for the accept method
-static int (*dispatch_table[]) (TAO_Constraint_Visitor*,
-				 TAO_Binary_Constraint*)=
-{
-  TAO_Binary_Constraint::visit_greater_than,
-  TAO_Binary_Constraint::visit_greater_than_equal,
-  TAO_Binary_Constraint::visit_less_than,
-  TAO_Binary_Constraint::visit_less_than_equal,
-  TAO_Binary_Constraint::visit_equal,
-  TAO_Binary_Constraint::visit_not_equal,
-  0,
-  TAO_Binary_Constraint::visit_and,
-  TAO_Binary_Constraint::visit_or,
-  0,
-  TAO_Binary_Constraint::visit_in,
-  TAO_Binary_Constraint::visit_twiddle,
-  0,
-  TAO_Binary_Constraint::visit_add,
-  TAO_Binary_Constraint::visit_sub,
-  TAO_Binary_Constraint::visit_mult,
-  TAO_Binary_Constraint::visit_div
-};
-
-// Simulate the fun of actual double dispatching.
-int
-TAO_Binary_Constraint::accept(TAO_Constraint_Visitor* visitor)
-{
-  int offset = this->op_ - TAO_GT,
-    return_value = -1;
-
-  if (dispatch_table[offset] != 0)
-    return_value = dispatch_table[offset](visitor, this);
-
-  return return_value;
-}
-
-int
-TAO_Binary_Constraint::
-visit_or(TAO_Constraint_Visitor* visitor,
-		  TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_or(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_and(TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_and(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_less_than(TAO_Constraint_Visitor* visitor,
-		TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_less_than(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_less_than_equal(TAO_Constraint_Visitor* visitor,
-		      TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_less_than_equal(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_greater_than(TAO_Constraint_Visitor* visitor,
-		   TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_greater_than(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_greater_than_equal(TAO_Constraint_Visitor* visitor,
-			 TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_greater_than_equal(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_equal(TAO_Constraint_Visitor* visitor,
-	    TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_equal(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_not_equal(TAO_Constraint_Visitor* visitor,
-		TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_not_equal(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_add(TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_add(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_sub(TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_sub(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_mult(TAO_Constraint_Visitor* visitor,
-	   TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_mult(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_div(TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_div(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_twiddle(TAO_Constraint_Visitor* visitor,
-	      TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_twiddle(expr);
-}
-
-int
-TAO_Binary_Constraint::
-visit_in(TAO_Constraint_Visitor* visitor,
-	 TAO_Binary_Constraint* expr)
-{
-  return visitor->visit_in(expr);
-}
-
-
-TAO_Constraint*
-TAO_Binary_Constraint::left_operand()
-{
-  return this->left_;
-}
-
-TAO_Constraint*
-TAO_Binary_Constraint::right_operand()
-{
-  return this->right_;
-}
-
-TAO_Unary_Constraint::
-TAO_Unary_Constraint(TAO_Expression_Type op_type,
-		     TAO_Constraint* operand)
-  : op_ (op_type),
-    operand_ (operand)
-{
-}
-
-TAO_Unary_Constraint::~TAO_Unary_Constraint()
-{
-  delete operand_;
-}
-
-  
-int
-TAO_Unary_Constraint::accept(TAO_Constraint_Visitor* visitor)
-{
-  // Since there are only three unary operators, there's no need for a
-  // dispatch table.
-  int return_value = -1;
-  switch (this->op_)
-    {
-    case TAO_CONSTRAINT:
-      return_value = visitor->visit_constraint(this);
-      break;
-    case TAO_WITH:
-      return_value = visitor->visit_with(this);
-      break;
-    case TAO_MIN:
-      return_value = visitor->visit_min(this);
-      break;
-    case TAO_MAX:
-      return_value = visitor->visit_max(this);
-      break;
-    case TAO_NOT:
-      return_value = visitor->visit_not(this);
-      break;
-    case TAO_UMINUS:
-      return_value = visitor->visit_unary_minus(this);
-      break;
-    case TAO_EXIST:
-      return_value = visitor->visit_exist(this);
-      break;
-    }
-
-  return return_value;
-}
-
-TAO_Constraint*
-TAO_Unary_Constraint::operand()
-{
-  return this->operand_;
-}
-
-TAO_Property_Constraint::
-TAO_Property_Constraint(const char* name)
-  : name_ (ACE_OS::strdup (name))
-{
-}
-
-TAO_Property_Constraint::~TAO_Property_Constraint()
-{
-  delete this->name_;
-}
-  
-int
-TAO_Property_Constraint::accept(TAO_Constraint_Visitor* visitor)
-{
-  return visitor->visit_property(this);
-}
-
-const char*
-TAO_Property_Constraint::name() const
-{
-  return name_;
-}
-
-TAO_Literal_Constraint::
-TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
-{
-  this->copy (lit);
-}
-
-
-TAO_Literal_Constraint::
-TAO_Literal_Constraint(CORBA::Any* any)
-  : type_ (TAO_Literal_Constraint::comparable_type (any->type ()))
-{
-  CORBA::Environment env;
-  CORBA::Any& any_ref = *any;
-  CORBA::TCKind corba_type = any_ref.type()->kind(env);
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  switch(this->type_)
-    {
-    case TAO_SIGNED:
-      this->op_.integer_ = 0;
-      if (corba_type == CORBA::tk_short)
-	{
-	  CORBA::Short sh;
-	  any_ref >>= sh;
-	  this->op_.integer_ = (CORBA::Long)sh;
-	}
-      else
-	any_ref >>= this->op_.integer_;
-      break;
-    case TAO_UNSIGNED:
-      this->op_.uinteger_ = 0;
-      if (corba_type == CORBA::tk_ushort)
-	{
-	  CORBA::UShort sh;
-	  any_ref >>= sh;
-	  this->op_.uinteger_ = (CORBA::ULong)sh;
-	}
-      else
-	any_ref >>= this->op_.uinteger_;
-      break;
-    case TAO_DOUBLE:
-      if (corba_type == CORBA::tk_float)
-	{
-	  CORBA::Float fl;
-	  (*any) >>= fl;
-	  this->op_.double_ = (CORBA::Double)fl;
-	}
-      else
-	(*any) >>= this->op_.double_;
-      break;
-    case TAO_BOOLEAN:
-      {
-	CORBA_Any::to_boolean tmp(this->op_.bool_);
-	(*any) >>= tmp;
-      }
-      break;
-    case TAO_STRING:
-      {
-	char * s;
-	any_ref >>= s;
-	this->op_.str_ = ACE_OS::strdup(s);
-      }
-      break;
-    case TAO_SEQUENCE:
-      this->op_.any_ = any;
-    }
-}
-
-TAO_Literal_Constraint::TAO_Literal_Constraint(CORBA::ULong uinteger)
-  : type_ (TAO_UNSIGNED)
-{
-  this->op_.uinteger_ = uinteger;
-}
-
-TAO_Literal_Constraint::TAO_Literal_Constraint(CORBA::Long integer)
-  : type_ (TAO_SIGNED)
-{
-  this->op_.integer_ = integer;
-}
-
-TAO_Literal_Constraint::TAO_Literal_Constraint(CORBA::Boolean boolean)
-  : type_ (TAO_BOOLEAN)
-{
-  this->op_.bool_ = boolean;
-}
-
-TAO_Literal_Constraint::TAO_Literal_Constraint(CORBA::Double doub)
-  : type_ (TAO_DOUBLE)
-{
-  this->op_.double_ = doub;
-}
-
-TAO_Literal_Constraint::TAO_Literal_Constraint(const char* str)
-  : type_ (TAO_STRING)
-{
-  this->op_.str_ = ACE_OS::strdup(str);
-}
-
-TAO_Literal_Constraint::~TAO_Literal_Constraint(void)
-{
-  if (this->type_ == TAO_STRING)
-    free (this->op_.str_);
-}
-
-int
-TAO_Literal_Constraint::accept(TAO_Constraint_Visitor* visitor)
-{
-  return visitor->visit_literal(this);
-}
-
-void
-TAO_Literal_Constraint::operator= (const TAO_Literal_Constraint& co)
-{
-  this->copy (co);
-}
-
-TAO_Literal_Constraint::operator CORBA::Boolean(void) const
-{
-  return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : CORBA::B_FALSE;
-}
-
-TAO_Literal_Constraint::operator CORBA::ULong(void) const
-{
-  CORBA::ULong return_value = (CORBA::ULong)0;
-  
-  if (this->type_ == TAO_UNSIGNED)
-    return_value = this->op_.uinteger_;
-  else if (this->type_ == TAO_SIGNED)
-    return_value =
-      (this->op_.integer_ > 0) ? (CORBA::ULong)this->op_.integer_ : 0;
-  else if (this->type_ == TAO_DOUBLE)
-    return_value =
-      (this->op_.double_ > 0) ?
-      ((this->op_.double_ > MAX_UNSIGNED_INTEGER) ?
-       MAX_UNSIGNED_INTEGER :
-       (CORBA::ULong)this->op_.double_)
-      : 0;
-  
-  return return_value;
-}
-
-TAO_Literal_Constraint::operator CORBA::Long(void) const
-{
-  CORBA::Long return_value = (CORBA::Long)0;
-
-  if (this->type_ == TAO_SIGNED)
-    return_value = this->op_.integer_;
-  else if (this->type_ == TAO_UNSIGNED)
-    return_value =
-      (this->op_.uinteger_ > MAX_SIGNED_INTEGER) ?
-      MAX_SIGNED_INTEGER : this->op_.uinteger_;
-  else if (this->type_ == TAO_DOUBLE)
-    return_value  =
-      (this->op_.double_ > 0) ?
-      ((this->op_.double_ > MAX_SIGNED_INTEGER) ?
-       MAX_SIGNED_INTEGER :
-       (CORBA::Long)this->op_.double_) :
-    ((this->op_.double_ < MIN_SIGNED_INTEGER) ?
-     MIN_SIGNED_INTEGER :
-     (CORBA::Long)this->op_.double_);
-
-  return return_value;
-}
-
-TAO_Literal_Constraint::operator CORBA::Double(void) const
-{
-  CORBA::Double return_value = (CORBA::Double)0.0;
-  
-  if (this->type_ == TAO_DOUBLE)
-    return_value = this->op_.double_;
-  else if (this->type_ == TAO_SIGNED)
-    return_value = (CORBA::Double)this->op_.integer_;
-  else if (this->type_ == TAO_UNSIGNED)
-    return_value = (CORBA::Double)this->op_.uinteger_;
-
-  return return_value;
-}
-
-TAO_Literal_Constraint::operator const char* (void) const
-{
-  return (this->type_ == TAO_STRING) ? this->op_.str_ : 0;
-}
-
-TAO_Literal_Constraint::operator const CORBA::Any* (void) const
-{
-  return (this->type_ == TAO_SEQUENCE) ? this->op_.any_ : 0;
-}
-
-TAO_Expression_Type
-TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
-{
-  // Convert a CORBA::TCKind into a TAO_Literal_Type
-  CORBA::Environment env;
-  TAO_Expression_Type return_value = TAO_UNKNOWN;
-  CORBA::TCKind kind = type->kind(env);
-  TAO_CHECK_ENV_RETURN (env, return_value);
-  
-  switch (kind)
-    {
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-      return_value = TAO_UNSIGNED;
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_short:
-      return_value = TAO_SIGNED;
-      break;
-    case CORBA::tk_boolean:
-      return_value = TAO_BOOLEAN;
-      break;
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-      return_value = TAO_DOUBLE;
-      break;
-    case CORBA::tk_string:
-      return_value = TAO_STRING;
-      break;
-    case CORBA::tk_sequence:
-      return_value = TAO_SEQUENCE;
-      break;
-    case CORBA::tk_alias:
-      {
-	CORBA::TypeCode_ptr typecode = type->content_type (env);
-	TAO_CHECK_ENV_RETURN (env, return_value);
-	CORBA::TCKind kind = typecode->kind (env);
-	TAO_CHECK_ENV_RETURN (env, return_value);
-	
-	if (kind == CORBA::tk_sequence)
-	  return_value = TAO_SEQUENCE;
-      }
-      break;
-    default:
-      return_value = TAO_UNKNOWN;
-    }
-
-  return return_value;
-}
-
-int
-operator== (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) == 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left == (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left == (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left == (CORBA::ULong)right;
-      break;
-    case TAO_BOOLEAN:
-      return_value = (CORBA::Boolean)left == (CORBA::Boolean)right;
-      break;
-    }
-
-  return return_value;
-}
-
-
-int
-operator!= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) != 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left != (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left != (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left != (CORBA::ULong)right;
-      break;
-    case TAO_BOOLEAN:
-      return_value = (CORBA::Boolean)left != (CORBA::Boolean)right;
-      break;
-    }
-
-  return return_value;
-}
-
-int
-operator< (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) < 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left < (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left < (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left < (CORBA::ULong)right;
-      break;
-    case TAO_BOOLEAN:
-      return_value = (CORBA::Boolean) left < (CORBA::Boolean) right;
-      break;
-    }
-
-  return return_value;
-}
-
-int
-operator<= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-  
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) <= 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left <= (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left <= (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left <= (CORBA::ULong)right;
-      break;
-    }
-  
-  return return_value;
-}
-
-int
-operator> (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) > 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left > (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left > (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left > (CORBA::ULong)right;
-      break;
-    }
-
-  return return_value;
-}
-
-int
-operator>= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
-{
-  int return_value = 0;
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_STRING:
-      return_value = (ACE_OS::strcmp((const char*)left, (const char*)right) >= 0);
-      break;
-    case TAO_DOUBLE:
-      return_value = (CORBA::Double)left >= (CORBA::Double)right;
-      break;
-    case TAO_SIGNED:
-      return_value = (CORBA::Long)left >= (CORBA::Long)right;
-      break;
-    case TAO_UNSIGNED:
-      return_value = (CORBA::ULong)left >= (CORBA::ULong)right;
-      break;
-    }
-
-  return return_value;
-}
-
-
-int
-operator== (CORBA::Double left, const TAO_Literal_Constraint& right)
-{
-  return (left == (CORBA::Double) right);
-}
-
-int
-operator== (const TAO_String_Manager& left,
-	    const TAO_Literal_Constraint& right)
-{
-  int result =  0;
-
-  if ((const char*)right != 0)
-    result = ACE_OS::strcmp ((const char*) left,
-			     (const char*) right) == 0;
-  return result;
-}
- 
-
-TAO_Literal_Constraint
-operator+ (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_DOUBLE:
-      {
-	CORBA::Double result = (CORBA::Double)left + (CORBA::Double)right;
-	return TAO_Literal_Constraint((CORBA::Double)result);
-      }
-      break;
-    case TAO_SIGNED:
-      {
-	CORBA::Long result = (CORBA::Long)left + (CORBA::Long)right;
-	return TAO_Literal_Constraint((CORBA::Long)result);
-      }
-      break;
-    case TAO_UNSIGNED:
-      {
-	CORBA::ULong result = (CORBA::ULong)left + (CORBA::ULong)right;
-	return TAO_Literal_Constraint((CORBA::ULong)result);
-      }
-      break;
-    default:
-      return TAO_Literal_Constraint((CORBA::Long)0);
-    }
-}
-
-TAO_Literal_Constraint
-operator- (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_DOUBLE:
-      {
-	CORBA::Double result = (CORBA::Double)left - (CORBA::Double)right;
-	return TAO_Literal_Constraint((CORBA::Double)result);
-      }
-      break;
-    case TAO_SIGNED:
-      {
-	CORBA::Long result = (CORBA::Long)left - (CORBA::Long)right;
-	return TAO_Literal_Constraint((CORBA::Long)result);
-      }
-      break;
-    case TAO_UNSIGNED:
-      {
-	CORBA::ULong result = (CORBA::ULong)left - (CORBA::ULong)right;
-	return TAO_Literal_Constraint((CORBA::ULong)result);
-      }
-      break;
-    default: 
-      return TAO_Literal_Constraint((CORBA::Long)0);
-    }
-}
-
-TAO_Literal_Constraint
-operator* (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{  
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_DOUBLE:
-      {
-	CORBA::Double result = (CORBA::Double)left * (CORBA::Double)right;
-	return TAO_Literal_Constraint((CORBA::Double)result);
-      }
-      break;
-    case TAO_SIGNED:
-      {
-	CORBA::Long result = (CORBA::Long)left * (CORBA::Long)right;
-	return TAO_Literal_Constraint((CORBA::Long)result);
-      }
-      break;
-    case TAO_UNSIGNED:
-      {
-	CORBA::ULong result = (CORBA::ULong)left * (CORBA::ULong)right;
-	return TAO_Literal_Constraint((CORBA::ULong)result);
-      }
-      break;
-    default:
-      return TAO_Literal_Constraint((CORBA::Long)0);
-    }  
-}
-
-TAO_Literal_Constraint
-operator/ (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
-{
-  TAO_Expression_Type widest_type =
-    TAO_Literal_Constraint::widest_type(left, right);
-
-  switch (widest_type)
-    {
-    case TAO_DOUBLE:
-      {
-	CORBA::Double result = (CORBA::Double)left / (CORBA::Double)right;
-	return TAO_Literal_Constraint((CORBA::Double)result);
-      }
-      break;
-    case TAO_SIGNED:
-      {
-	CORBA::Long result = (CORBA::Long)left / (CORBA::Long)right;
-	return TAO_Literal_Constraint((CORBA::Long)result);
-      }
-      break;
-    case TAO_UNSIGNED:
-      {
-	CORBA::ULong result = (CORBA::ULong)left / (CORBA::ULong)right;
-	return TAO_Literal_Constraint((CORBA::ULong)result);
-      }
-      break;
-    default:
-      return TAO_Literal_Constraint((CORBA::Long)0);
-    }  
-}
-
-TAO_Literal_Constraint
-operator- (const TAO_Literal_Constraint& operand)
-{  
-  switch (operand.expr_type())
-    {
-    case TAO_DOUBLE:
-      {
-	CORBA::Double result = - (CORBA::Double)operand;
-	return TAO_Literal_Constraint((CORBA::Double)result);
-      }
-      break;
-    case TAO_SIGNED:
-      {
-	CORBA::Long result = - (CORBA::Long)operand;
-	return TAO_Literal_Constraint((CORBA::Long)result);
-      }
-      break;
-    case TAO_UNSIGNED:
-      {
-	CORBA::Long result = - (CORBA::ULong)operand;
-	return TAO_Literal_Constraint((CORBA::ULong)result);
-      }
-      break;
-    default:
-      return TAO_Literal_Constraint((CORBA::Long)0);
-    }  
-}
-
-TAO_Expression_Type
-TAO_Literal_Constraint::widest_type(const TAO_Literal_Constraint& left,
-				    const TAO_Literal_Constraint& right)
-{
-  TAO_Expression_Type left_type = left.expr_type(),
-    right_type = right.expr_type(),
-    return_value = right_type;
-
-  if (right_type != left_type)
-    {
-      if (right_type > left_type)
-	return_value = right_type;
-      else
-	return_value = left_type;
-    }
-
-  return return_value;
-}
-
-void
-TAO_Literal_Constraint::copy (const TAO_Literal_Constraint& lit)
-{
-  this->type_ = lit.type_;
-  if (this->type_ == TAO_STRING)
-    this->op_.str_ = ACE_OS::strdup(lit.op_.str_);
-  else if (this->type_ == TAO_DOUBLE)
-    this->op_.double_ = lit.op_.double_;
-  else if (this->type_ == TAO_UNSIGNED)
-    this->op_.uinteger_ = lit.op_.uinteger_;
-  else if (this->type_ == TAO_SIGNED)
-    this->op_.integer_ = lit.op_.integer_;
-  else if (this->type_ == TAO_BOOLEAN)
-    this->op_.bool_ = lit.op_.bool_;
-  else if (this->type_ == TAO_SEQUENCE)
-    this->op_.any_ = lit.op_.any_;
-  else
-    type_ = TAO_UNKNOWN;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
deleted file mode 100644
index e5b922084af..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- C++ -*- */
-
-// =====================================================================
-// $Id$
-//
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Nodes.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// =====================================================================
-
-#ifndef TAO_CONSTRAINT_NODES_H
-#define TAO_CONSTRAINT_NODES_H
-
-#include "Constraint_Visitor.h"
-#include "Constraint_Tokens.h"
-
-#include "orbsvcs/CosTradingC.h"
-#include "orbsvcs/SequencesC.h"
-
-typedef unsigned short TAO_Expression_Type;
-
-class TAO_Constraint
-//
-// = TITLE
-//     TAO_Constraint is the base class of all nodes on the
-//     constraint expression tree.
-//
-// = DESCRIPTION
-//     An TAO_Constraint knows what type of operation or entity
-//     it represents, and which method on TAO_Constraint_Visitor
-//     correlates to its type. When the accept method is invoked, a
-//     subclass dispatches the method on an InterpreterVisitor
-//     correlating to its type.
-{
-public:
-
-  virtual int accept(TAO_Constraint_Visitor* visitor) = 0;
-  // Implementing the pattern of double dispatching, each subclass of
-  // TAO_Constraint will call back on an InterpreterVisitor the
-  // method to handle a node of its ExpressionType.
-  
-  virtual TAO_Expression_Type expr_type(void) const = 0;
-  // Return the expression type represented by this node.
-  
-  virtual ~TAO_Constraint(void) {}  
-};
-
-class TAO_Noop_Constraint : public TAO_Constraint
-{
-public:
-
-  TAO_Noop_Constraint(TAO_Expression_Type type)
-    : type_ (type) {}
-  
-  virtual int accept(TAO_Constraint_Visitor* visitor);
-
-  virtual TAO_Expression_Type expr_type(void) const
-    { return this->type_; }
-
-private:
-
-  TAO_Expression_Type type_;
-};
-
-class TAO_Binary_Constraint : public TAO_Constraint
-//
-// = TITLE
-//      TAO_Binary_Constraint represents an operation with left
-//      and right operands.
-{
-public:
-  
-  TAO_Binary_Constraint(TAO_Expression_Type op_type,
-				  TAO_Constraint* left,
-				  TAO_Constraint* right);
-
-  virtual int accept(TAO_Constraint_Visitor* visitor);
-
-  virtual ~TAO_Binary_Constraint(void);
-
-  virtual TAO_Expression_Type expr_type(void) const
-    { return this->op_; }
-  
-  TAO_Constraint* left_operand(void);
-  // Return the left operand of the binary expression
-  
-  TAO_Constraint* right_operand(void);
-  // Return the right operand of the binary expression
-
-  // Allow double dispatching without creating an inundation of
-  // classes by using a dispatch table of static method pointers to
-  // invoke the correct visitor method as efficiently as a virtual
-  // method invocation.
-  static int visit_or(TAO_Constraint_Visitor*, TAO_Binary_Constraint*);
-  static int visit_and(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_less_than(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_less_than_equal(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_greater_than(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_greater_than_equal(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_equal(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_not_equal(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_add(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_sub(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_mult(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_div(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_twiddle(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
-  static int visit_in(TAO_Constraint_Visitor* , TAO_Binary_Constraint*);  
-  
-private:
-  
-  TAO_Expression_Type op_;
-  // The operator type
-  
-  TAO_Constraint* left_;
-  TAO_Constraint* right_;
-  // The operands of the expression
-};
-
-class TAO_Unary_Constraint : public TAO_Constraint
-//
-// = TITLE
-//      TAO_Unary_Constraint represents an operation with only
-//      one operand.
-{
-public:
-  
-  TAO_Unary_Constraint(TAO_Expression_Type op_type,
-				 TAO_Constraint* operand);
-  
-  virtual ~TAO_Unary_Constraint(void);
-  
-  virtual int accept(TAO_Constraint_Visitor* visitor);
-
-  virtual TAO_Expression_Type expr_type(void) const
-    { return this->op_; }
-  
-  TAO_Constraint* operand(void);
-  
-private:
-
-  TAO_Expression_Type op_;
-  // The operator type
-  
-  TAO_Constraint* operand_;
-  // The operand of the expression
-};
-
-class TAO_Property_Constraint : public TAO_Constraint
-//
-// = TITLE
-//      TAO_Property_Constraint represents a property whose
-//      value is determined by the offer being evaluated.
-{
-public:
-  
-  TAO_Property_Constraint(const char* name);
-
-  virtual ~TAO_Property_Constraint(void);
-  
-  virtual int accept(TAO_Constraint_Visitor* visitor);
-
-  virtual TAO_Expression_Type expr_type(void) const
-    { return TAO_IDENT; }
-  
-  const char* name(void) const;
-  // Returns the name of the property.
-  
-private:
-
-  char* name_;
-  // The name of the property.
-};
-
-class TAO_Literal_Constraint : public TAO_Constraint
-//
-// = TITLE
-//     TAO_Literal_Constraint represents a literal occuring in
-//     the constraint expression tree. 
-{
- public:
-
-  TAO_Literal_Constraint(void)
-    : type_ (TAO_UNKNOWN) {}
-
-  // = Constructors for each of the various types of literals.
-  
-  TAO_Literal_Constraint(CORBA::Any* any);
-  
-  TAO_Literal_Constraint(CORBA::ULong uinteger);
-
-  TAO_Literal_Constraint(CORBA::Long integer);
-
-  TAO_Literal_Constraint(CORBA::Boolean boolean);
-
-  TAO_Literal_Constraint(CORBA::Double doub);
-  
-  TAO_Literal_Constraint(const char* str);
-
-  TAO_Literal_Constraint (const TAO_Literal_Constraint& lit);
-  
-  ~TAO_Literal_Constraint(void);
-  
-  virtual int accept(TAO_Constraint_Visitor* visitor);
-  
-  virtual TAO_Expression_Type expr_type(void) const
-    { return type_; }
-
-  void operator= (const TAO_Literal_Constraint& co);
-  
-  // Conversion routines.
-  operator CORBA::Boolean(void) const;
-  operator CORBA::ULong(void) const;
-  operator CORBA::Long(void) const; 
-  operator CORBA::Double(void) const;
-  operator const char* (void) const;
-  operator const CORBA::Any* (void) const; 
-  
-  // Return the type represented by this MysteryOperand.
-  
-  // = Comparison operators.
-  
-  friend int
-    operator< (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator<= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator> (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator>= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator== (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator!= (const TAO_Literal_Constraint& left,
-		const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator== (double left,
-		const TAO_Literal_Constraint& right);
-  
-  friend int
-    operator== (const TAO_String_Manager& left,
-		const TAO_Literal_Constraint& right);
-  
-  // = Arithmetic operators.
-  
-  friend TAO_Literal_Constraint
-    operator+ (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend TAO_Literal_Constraint
-    operator- (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend TAO_Literal_Constraint
-    operator* (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend TAO_Literal_Constraint
-    operator/ (const TAO_Literal_Constraint& left,
-	       const TAO_Literal_Constraint& right);
-  
-  friend TAO_Literal_Constraint
-    operator- (const TAO_Literal_Constraint& operand);
-  
-  static TAO_Expression_Type
-    widest_type (const TAO_Literal_Constraint& left,
-		 const TAO_Literal_Constraint& right);
-  // Ensure both operands are of the same simple numeric type.
-  
-  static TAO_Expression_Type
-    comparable_type (CORBA::TypeCode_ptr type);
-  // Determine the comparable Expression Type from the CORBA type
-  
- private:
-
-  void copy (const TAO_Literal_Constraint& co);
-  
-  union
-  {
-    char* str_;
-    CORBA::Any_ptr any_;
-    CORBA::ULong uinteger_;
-    CORBA::Long integer_;
-    CORBA::Boolean bool_;
-    CORBA::Double double_;
-  } op_;
-  // Union of the possible literal types.
-  
-  TAO_Expression_Type type_;
-  // The actual types of the TAO_Literal_Constraint.
-  
-};
-
-#endif /* TAO_CONSTRAINT_NODES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
deleted file mode 100644
index 4636d909dc5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
+++ /dev/null
@@ -1,34 +0,0 @@
-# define TAO_GT 257
-# define TAO_GE 258
-# define TAO_LT 259
-# define TAO_LE 260
-# define TAO_EQ 261
-# define TAO_NE 262
-# define TAO_EXIST 263
-# define TAO_AND 264
-# define TAO_OR 265
-# define TAO_NOT 266
-# define TAO_IN 267
-# define TAO_TWIDDLE 268
-# define TAO_BOOLEAN 269
-# define TAO_PLUS 270
-# define TAO_MINUS 271
-# define TAO_MULT 272
-# define TAO_DIV 273
-# define TAO_UMINUS 274
-# define TAO_NUMBER 275
-# define TAO_RPAREN 276
-# define TAO_LPAREN 277
-# define TAO_IDENT 278
-# define TAO_STRING 279
-# define TAO_UNKNOWN 280
-# define TAO_UNSIGNED 281
-# define TAO_SIGNED 282
-# define TAO_DOUBLE 283
-# define TAO_CONSTRAINT 284
-# define TAO_SEQUENCE 285
-# define TAO_WITH 286
-# define TAO_MAX 287
-# define TAO_MIN 288
-# define TAO_FIRST 289
-# define TAO_RANDOM 290
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp
deleted file mode 100644
index 70897a7157b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.cpp
+++ /dev/null
@@ -1,467 +0,0 @@
-// Constraint_Validator.cpp
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Validator.cpp
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-#include "Constraint_Validator.h"
-
-TAO_Constraint_Validator::
-TAO_Constraint_Validator(TypeStruct* type_struct)
-{
-  PropStructSeq& prop_seq = type_struct->props;
-  int length = prop_seq.length();
-  
-  // Create a map of the service type properties to their types.
-  for (int i = 0; i < length; i++)
-    {
-      string prop_name_str((const char*)prop_seq[i].name);
-      CORBA::TypeCode_var corba_type = prop_seq[i].value_type;
-      this->type_map_[prop_name_str] = (const TypeCode_ptr)corba_type;
-    }
-}
-
-int
-TAO_Constraint_Validator::validate (TAO_Constraint* root)
-{
-  return root->accept(this);
-}
-
-int
-TAO_Constraint_Validator::visit_constraint(TAO_Unary_Constraint* constraint)
-{
-  int return_value = -1;
-  TAO_Expression_Type type;
-  TAO_Constraint* operand = constraint->operand();
-  this->extract_type(operand, type);
-  
-  if (this->expr_returns_boolean (type))
-    return_value =  operand->accept (this);
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::visit_first(TAO_Noop_Constraint* noop)
-{
-  return 0;
-}
-
-int
-TAO_Constraint_Validator::visit_random(TAO_Noop_Constraint* noop)
-{
-  return 0;
-}
-
-int
-TAO_Constraint_Validator::visit_with(TAO_Unary_Constraint* unary_with)
-{
-  return this->visit_constraint(unary_with);
-}
-
-int
-TAO_Constraint_Validator::visit_min(TAO_Unary_Constraint* unary_min)
-{
-  return this->visit_unary_minus(unary_min);
-}
-
-int
-TAO_Constraint_Validator::visit_max(TAO_Unary_Constraint* unary_max)
-{
-  return this->visit_unary_minus(unary_max);
-}
-
-int 
-TAO_Constraint_Validator::
-visit_and(TAO_Binary_Constraint* boolean_and)
-{
-  int return_value = -1;
-  TAO_Constraint* left = boolean_and->left_operand(),
-    *right = boolean_and->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-  
-  // Can only "and" expressions that return a boolean value
-  if (this->expr_returns_boolean(left_type) &&
-      this->expr_returns_boolean(right_type))
-    {
-      if (left->accept(this) == 0 &&
-	  right->accept(this) == 0)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_or(TAO_Binary_Constraint* boolean_or)
-{
-  // The types for or are the same as those for and.
-  return this->visit_and(boolean_or);
-}
-
-int
-TAO_Constraint_Validator::
-visit_not(TAO_Unary_Constraint* unary_not)
-{
-  int return_value = -1;
-  // Not can only negate an expression that returns a boolean.
-  TAO_Expression_Type type;
-  TAO_Constraint* operand = unary_not->operand();
-  this->extract_type(operand, type);
-
-  if (this->expr_returns_boolean(type))
-    return_value = operand->accept(this);
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_exist(TAO_Unary_Constraint* unary_exist)
-{
-  // Exist simply requires that its operand be a property name
-  // included in the service type.
-  int return_value = -1;
-  TAO_Constraint* operand = unary_exist->operand();
-  TAO_Expression_Type type = operand->expr_type();
-  
-  if (type == TAO_IDENT)
-    return_value = operand->accept(this);
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_unary_minus(TAO_Unary_Constraint* unary_minus)
-{
-  // Unary minus can only negate a numeric operand.
-  int return_value = -1;
-  TAO_Expression_Type type;
-  TAO_Constraint* operand = unary_minus->operand();
-  this->extract_type(operand, type);
-    
-  if (this->expr_returns_number(type))
-    return_value = operand->accept(this);
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_add(TAO_Binary_Constraint* boolean_add)
-{
-  // All the mathematical operators require numeric operands.
-  int return_value = -1;
-  TAO_Constraint* left = boolean_add->left_operand(),
-    *right = boolean_add->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-
-  if (this->expr_returns_number(left_type) &&
-      this->expr_returns_number(right_type))
-    {
-      if (left->accept(this) == 0 &&
-	  right->accept(this) == 0)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_sub(TAO_Binary_Constraint* boolean_sub)
-{
-  return this->visit_add(boolean_sub);
-}
-
-int
-TAO_Constraint_Validator::
-visit_mult(TAO_Binary_Constraint* boolean_mult)
-{
-  return this->visit_add(boolean_mult);
-}
-
-int
-TAO_Constraint_Validator::
-visit_div(TAO_Binary_Constraint* boolean_div)
-{
-  // Div not only requires that both of its operands be numeric, but
-  // also the the demoninator not be zero. However, since the
-  // denominator can be an expression who's value can only be
-  // determined while evaulating the constraint expression, this
-  // method detects only when the demoniator is a literal whose value
-  // is zero.
-  int return_value = -1;
-  TAO_Constraint* left = boolean_div->left_operand(),
-    *right = boolean_div->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-
-  if (this->expr_returns_number(left_type) &&
-      this->expr_returns_number(right_type))
-    {
-      // Prevent division by zero, a no no.
-      int right_isnt_zero = 1;
-      switch(right->expr_type())
-	{
-	case TAO_UNSIGNED:
-	  right_isnt_zero = (CORBA::ULong)(*((TAO_Literal_Constraint*)right));
-	  break;
-	case TAO_SIGNED:
-	  right_isnt_zero = (CORBA::Long)(*((TAO_Literal_Constraint*)right));
-	  break;
-	case TAO_DOUBLE:
-	  right_isnt_zero = (CORBA::Double)(*((TAO_Literal_Constraint*)right));
-	  break;
-	}
-
-      if (right_isnt_zero)
-	{
-	  if (left->accept(this) == 0 &&
-	      right->accept(this) == 0)
-	    return_value = 0;
-	}
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_twiddle(TAO_Binary_Constraint* binary_twiddle)
-{
-  // Twiddle requires that both of its operand be strings.
-  int return_value = -1;
-  TAO_Constraint* left = binary_twiddle->left_operand(),
-    *right = binary_twiddle->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-  
-  if (this->expr_returns_string(left_type) &&
-      this->expr_returns_string(right_type))
-    {
-      if (left->accept(this) == 0 &&
-	  right->accept(this) == 0)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_in (TAO_Binary_Constraint* binary_in)
-{
-  // In requires that the right operand be a sequence of a simple type
-  // and that its left operand be an expression that evaluates to a
-  // value of the same simple type.
-  int return_value = -1;
-  TAO_Constraint* left = binary_in->left_operand(),
-    *right = binary_in->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  CORBA::TypeCode* prop_type = this->extract_type(right, right_type);
-  this->extract_type(left, left_type);
-
-  if (right_type == TAO_SEQUENCE)
-    {   
-      int types_match = 0;
-      CORBA::Environment env;
-      
-      if (this->expr_returns_number (left_type))
-	{
-	  types_match =
-	    prop_type->equal (TAO_Sequences::_tc_ShortSeq, env) ||
-	    prop_type->equal (TAO_Sequences::_tc_UShortSeq, env) ||
-	    prop_type->equal (TAO_Sequences::_tc_LongSeq, env) ||
-	    prop_type->equal (TAO_Sequences::_tc_ULongSeq, env) ||
-	    prop_type->equal (TAO_Sequences::_tc_DoubleSeq, env) ||
-	    prop_type->equal (TAO_Sequences::_tc_FloatSeq, env);
-	}
-      else if (this->expr_returns_boolean (left_type))
-	types_match = prop_type->equal (TAO_Sequences::_tc_BooleanSeq, env);
-      else if (this->expr_returns_string (left_type))
-	types_match = prop_type->equal (TAO_Sequences::_tc_StringSeq, env);
-      
-      if (types_match)
-	return_value = left->accept(this);
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_less_than(TAO_Binary_Constraint* boolean_lt)
-{
-  // Comparison operations require that both operands be of the same
-  // simple type.
-  int return_value = -1;
-  TAO_Constraint* left = boolean_lt->left_operand(),
-    *right = boolean_lt->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-
-  if ((this->expr_returns_number(left_type) &&
-       this->expr_returns_number(right_type)) ||
-      (this->expr_returns_string(left_type) &&
-       this->expr_returns_string(right_type)))
-    {
-      if (left->accept(this) == 0 &&
-	  right->accept(this) == 0)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_less_than_equal(TAO_Binary_Constraint* boolean_lte)
-{
-  return this->visit_less_than(boolean_lte);
-}
-
-int
-TAO_Constraint_Validator::
-visit_greater_than(TAO_Binary_Constraint* boolean_gt)
-{
-  return this->visit_less_than(boolean_gt);
-}
-
-int
-TAO_Constraint_Validator::
-visit_greater_than_equal(TAO_Binary_Constraint* boolean_gte)
-{
-  return this->visit_less_than(boolean_gte);
-}
-
-int
-TAO_Constraint_Validator::
-visit_equal(TAO_Binary_Constraint* boolean_eq)
-{
-  int return_value = -1;
-  TAO_Constraint* left = boolean_eq->left_operand(),
-    *right = boolean_eq->right_operand();
-  TAO_Expression_Type left_type, right_type;
-  this->extract_type(left, left_type);
-  this->extract_type(right, right_type);
-
-  if ((this->expr_returns_number(left_type) &&
-       this->expr_returns_number(right_type)) ||
-      (this->expr_returns_string(left_type) &&
-       this->expr_returns_string(right_type)) ||
-      (this->expr_returns_boolean(left_type) &&
-       this->expr_returns_boolean(right_type)))
-    {
-      if (left->accept(this) == 0 &&
-	  right->accept(this) == 0)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::
-visit_not_equal(TAO_Binary_Constraint* boolean_neq)
-{
-  return this->visit_equal(boolean_neq);
-}
-
-int
-TAO_Constraint_Validator::
-visit_literal(TAO_Literal_Constraint* literal)
-{
-  return 0;
-}
-
-int
-TAO_Constraint_Validator::
-visit_property(TAO_Property_Constraint* literal)
-{
-  return 0;
-}
-
-CORBA::TypeCode*
-TAO_Constraint_Validator::extract_type (TAO_Constraint* expr,
-					TAO_Expression_Type& type)
-{
-  CORBA::TypeCode* return_value = 0;
-  type = expr->expr_type();
-  if (type == TAO_IDENT)
-    {
-      TAO_Property_Constraint* prop = (TAO_Property_Constraint*) expr;
-      string prop_name(prop->name());
-      Property_Type_Map_Iter type_iter =
-	this->type_map_.find (prop_name);
-
-      if (type_iter != this->type_map_.end())
-	{
-	  return_value = (*type_iter).second;
-	  type = TAO_Literal_Constraint::comparable_type(return_value);
-	}
-    }
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::expr_returns_boolean(TAO_Expression_Type expr_type)
-{
-  // If the expression is a boolean operations, a boolean literal, or
-  // a boolean property, return 1.
-  int return_value = 0;
-  
-  if (expr_type <= TAO_BOOLEAN)
-    return_value = 1;
-  
-  return return_value;
-}
-
-
-int
-TAO_Constraint_Validator::expr_returns_number(TAO_Expression_Type expr_type)
-{
-  // If the expression is a number operation, a numeric literal, or a
-  // numeric property, return 1.
-  int return_value = 0;
-  
-  if ((expr_type >= TAO_PLUS && expr_type <= TAO_NUMBER) ||
-      (expr_type >= TAO_UNSIGNED && expr_type <= TAO_DOUBLE))
-    return_value = 1;
-
-  return return_value;
-}
-
-int
-TAO_Constraint_Validator::expr_returns_string(TAO_Expression_Type expr_type)
-{
-  // If the expression is an operation with a string return value, a
-  // string literal, or a property whose type is string, return 1.
-  int return_value = 0;
-
-  if (expr_type == TAO_STRING)
-    return_value = 1;
-
-  return return_value;
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.h
deleted file mode 100644
index 9ba7a6baa00..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Validator.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Validator.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-#ifndef TAO_CONSTRAINT_VALIDATOR_H
-#define TAO_CONSTRAINT_VALIDATOR_H
-
-#include <map>
-#include <string>
-
-#include "Constraint_Nodes.h"
-
-class TAO_Constraint_Validator : public TAO_Constraint_Visitor
-  //
-  // = TITLE
-  //     TAO_Constraint_Validator ensures that in an expression tree
-  //     passed to it, the operands of each operation match the
-  //     correct types.
-  //
-  // = DESCRIPTION
-  //    TAO_Constraint_Validator uses the visitor pattern to
-  //    traverse all the nodes in an expression tree, checking each
-  //    for operands of the proper type. The algorithm for type
-  //    checking is as follows: ensure that operand expression(s)
-  //    return the correct types using exprReturns* methods, and their
-  //    types. If they (or it) return the correct types, call accept
-  //    on the operands until all return true, or one returns false,
-  //    at which point we can back out of the traversal.
-{
-public:
-
-  typedef
-    map<string, CORBA::TypeCode_ptr, less<string> >
-    Property_Type_Map;
-
-  typedef Property_Type_Map::iterator
-    Property_Type_Map_Iter;
-  
-  typedef
-    CosTradingRepos::ServiceTypeRepository::TypeStruct
-    TypeStruct;
-  
-  typedef
-    CosTradingRepos::ServiceTypeRepository::PropStructSeq
-    PropStructSeq;
-  
-  TAO_Constraint_Validator(TypeStruct* type_struct);
-  // The constructor creates a map of property names to their values
-  // from the Type Description retrieved from the
-  // ServiceTypeRepository. The ServiceTypeRepository throws
-  // exceptions when it's displeased with the type name provided to
-  // it. The map allows O(lg n) associative access, rather than the
-  // O(n) sequential lookup from the CORBA data structures.
-  
-  int validate(TAO_Constraint* root);
-  // Validate returns 1 if the expression tree whose root is <root>
-  // makes semantic sense, in that the operands for each operation
-  // comply with each other and the types accepted by the operator.
-  
-  // = Visitor Methods
-
-  virtual int visit_constraint(TAO_Unary_Constraint* constraint);
-
-  virtual int visit_with(TAO_Unary_Constraint* unary_with);
-  virtual int visit_min(TAO_Unary_Constraint* unary_min);
-  virtual int visit_max(TAO_Unary_Constraint* unary_max);
-  virtual int visit_first(TAO_Noop_Constraint* noop_first);
-  virtual int visit_random(TAO_Noop_Constraint* noop_random);
-  
-  virtual int visit_and(TAO_Binary_Constraint* boolean_and);
-  virtual int visit_or(TAO_Binary_Constraint* boolean_or);
-  // The two operands must return a boolean value.
-  
-  virtual int visit_not(TAO_Unary_Constraint* unary_not);
-  // The operand must return a boolean value.
-  
-  virtual int visit_exist(TAO_Unary_Constraint* unary_exist);
-  // The operand must return a valid (i.e., present in the service
-  // type description) property name.
-  
-  virtual int visit_unary_minus(TAO_Unary_Constraint* unary_minus);
-  // The operand must return a number to be negated.
-  
-  virtual int visit_add(TAO_Binary_Constraint* boolean_add);
-  virtual int visit_sub(TAO_Binary_Constraint* boolean_sub);
-  virtual int visit_mult(TAO_Binary_Constraint* boolean_mult);
-  virtual int visit_div(TAO_Binary_Constraint* boolean_div);
-  // Both operands must return numeric results.
-  
-  virtual int visit_twiddle(TAO_Binary_Constraint* binary_twiddle);
-  // Both operands must return strings.
-  
-  virtual int visit_in(TAO_Binary_Constraint* binary_in);
-  // The right operand must be a sequence of the same simple type as
-  // the left operand.
-  
-  virtual int visit_less_than(TAO_Binary_Constraint* boolean_lt);
-  virtual int visit_less_than_equal(TAO_Binary_Constraint* boolean_lte);
-  virtual int visit_greater_than(TAO_Binary_Constraint* boolean_gt);
-  virtual int visit_greater_than_equal(TAO_Binary_Constraint* boolean_gte);
-  virtual int visit_equal(TAO_Binary_Constraint* boolean_eq);
-  virtual int visit_not_equal(TAO_Binary_Constraint* boolean_neq);
-  // The left and right operands must both be of the same simple type.
-  
-  virtual int visit_literal(TAO_Literal_Constraint* literal);
-  virtual int visit_property(TAO_Property_Constraint* literal);
-  // The property must be defined in the service type description.
-  
-private:
-
-  Property_Type_Map type_map_;
-  // A map gleaned from the ServiceTypeStruct, which correlates
-  // property names with their types.
-
-  CORBA::TypeCode* extract_type(TAO_Constraint* expr_type,
-				TAO_Expression_Type& type);
-  
-  int expr_returns_boolean(TAO_Expression_Type expr_type);
-  // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
-  // return a boolean. 
-  
-  int expr_returns_number(TAO_Expression_Type expr_type);
-  // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
-  // return a number. 
-  
-  int expr_returns_string(TAO_Expression_Type expr_type);
-  // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will
-  // return a string. 
-};
-
-#endif /* TAO_CONSTRAINT_VALIDATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitor.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitor.h
deleted file mode 100644
index 255b483b490..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitor.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Constraint_Visitor.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-#ifndef TAO_CONSTRAINT_VISITOR_H
-#define TAO_CONSTRAINT_VISITOR_H
-
-class TAO_Binary_Constraint;
-class TAO_Unary_Constraint;
-class TAO_Property_Constraint;
-class TAO_Literal_Constraint;
-class TAO_Noop_Constraint;
-
-class TAO_Constraint_Visitor
-//
-// = TITLE
-//     This is the base class for all visitors who wish to preform
-//     some operation from the state of the expression tree. Using
-//     double dispatching, subclasses of Constraint expression call
-//     back to the InterpreterVisitor subclass from the accept method.
-//
-// = DESCRIPTION
-//     Traversal of the expression tree uses the "Visitor" pattern. To
-//     "visit" a node, a client invokes the "accept" method on a
-//     subclass of ConstraintExpression, which, in turn, invokes the
-//     appropriate method on the visitor passed to it, based on its
-//     own type. So, the Constraint_Visitor has a method to deal with
-//     each possible type of node in an expression tree; one for each
-//     operator in the grammar. 
-{
-public:
-
-  virtual int visit_constraint(TAO_Unary_Constraint* constraint) = 0;
-
-  virtual int visit_with(TAO_Unary_Constraint* unary_with) = 0;
-  virtual int visit_min(TAO_Unary_Constraint* unary_min) = 0;
-  virtual int visit_max(TAO_Unary_Constraint* unary_max) = 0;
-  virtual int visit_first(TAO_Noop_Constraint* noop_first) = 0;
-  virtual int visit_random(TAO_Noop_Constraint* noop_random) = 0;
-  
-  virtual int visit_and(TAO_Binary_Constraint* boolean_and) = 0;
-  virtual int visit_or(TAO_Binary_Constraint* boolean_or) = 0;
-  virtual int visit_not(TAO_Unary_Constraint* unary_not) = 0;
-
-  virtual int visit_exist(TAO_Unary_Constraint* unary_exist) = 0;
-  virtual int visit_unary_minus(TAO_Unary_Constraint* unary_minus) = 0;
-
-  virtual int visit_add(TAO_Binary_Constraint* boolean_add) = 0;
-  virtual int visit_sub(TAO_Binary_Constraint* boolean_sub) = 0;
-  virtual int visit_mult(TAO_Binary_Constraint* boolean_mult) = 0;
-  virtual int visit_div(TAO_Binary_Constraint* boolean_div) = 0;
-
-  virtual int visit_twiddle(TAO_Binary_Constraint* binary_twiddle) = 0;
-  virtual int visit_in(TAO_Binary_Constraint* binary_in) = 0;
-
-  virtual int visit_less_than(TAO_Binary_Constraint* boolean_lt) = 0;
-  virtual int visit_less_than_equal(TAO_Binary_Constraint* boolean_lte) = 0;
-  virtual int visit_greater_than(TAO_Binary_Constraint* boolean_gt) = 0;
-  virtual int visit_greater_than_equal(TAO_Binary_Constraint* boolean_gte) = 0;
-  virtual int visit_equal(TAO_Binary_Constraint* boolean_eq) = 0;
-  virtual int visit_not_equal(TAO_Binary_Constraint* boolean_neq) = 0;
-
-  virtual int visit_literal(TAO_Literal_Constraint* literal) = 0;
-  virtual int visit_property(TAO_Property_Constraint* literal) = 0;
-};
-
-#endif /* CONSTRAINT_VISITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
deleted file mode 100644
index 7f191d8cb14..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ /dev/null
@@ -1,1782 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header$
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 31
-#define YY_END_OF_BUFFER 32
-static yyconst short int yy_accept[81] =
-    {   0,
-        0,    0,   32,   30,   31,   30,   30,   22,   23,   14,
-       12,   13,   30,   15,   26,   16,   30,   18,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       11,   21,    0,   28,    0,   27,    0,   26,   17,   20,
-       19,   29,   29,   29,   29,   29,   29,   10,   29,   29,
-       29,    9,   29,   29,    0,    0,   29,   29,    8,   29,
-       29,    2,    1,    7,   29,   29,    0,   27,   29,   24,
-       29,   29,   29,    5,   25,    6,    3,   29,    4,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    3,    1,    1,    1,    1,    1,    4,    5,
-        6,    7,    8,    1,    9,   10,   11,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,    1,    1,   13,
-       14,   15,    1,    1,   16,   17,   17,   17,   18,   19,
-       17,   17,   17,   17,   17,   20,   17,   17,   17,   17,
-       17,   21,   22,   23,   24,   17,   17,   17,   17,   17,
-        1,   25,    1,    1,   26,    1,   27,   17,   17,   28,
-
-       29,   30,   17,   31,   32,   17,   17,   17,   33,   34,
-       35,   17,   17,   36,   37,   38,   17,   17,   39,   40,
-       17,   17,    1,    1,    1,   41,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[42] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    1,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    1,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        1
-    } ;
-
-static yyconst short int yy_base[83] =
-    {   0,
-        0,    0,  104,  105,  105,   89,   38,  105,  105,  105,
-      105,  105,   90,  105,   33,   87,   86,   85,    0,   82,
-       76,   62,   55,   62,   59,   17,   57,   55,   63,   57,
-      105,  105,   42,  105,   43,   36,   76,   40,  105,  105,
-      105,    0,   67,   62,   57,   52,   47,    0,   42,   47,
-       42,    0,   45,   40,   47,   47,   55,   58,    0,   38,
-       34,    0,    0,    0,   42,   38,   54,   52,   44,    0,
-       23,   22,   23,    0,    0,    0,    0,   24,    0,  105,
-       72,   51
-    } ;
-
-static yyconst short int yy_def[83] =
-    {   0,
-       80,    1,   80,   80,   80,   80,   81,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       80,   80,   81,   80,   80,   80,   80,   80,   80,   80,
-       80,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   81,   80,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   80,   80,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,    0,
-       80,   80
-    } ;
-
-static yyconst short int yy_nxt[147] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,   18,   19,   19,   19,   20,   19,
-       19,   19,   21,   19,    4,    4,   22,   19,   23,   24,
-       19,   25,   26,   27,   28,   29,   19,   19,   30,   19,
-       31,   34,   37,   49,   38,   34,   55,   36,   50,   37,
-       34,   38,   42,   56,   67,   67,   79,   78,   68,   77,
-       76,   75,   35,   68,   56,   68,   35,   55,   74,   73,
-       72,   35,   33,   33,   71,   70,   69,   66,   65,   64,
-       63,   62,   61,   60,   59,   58,   57,   36,   54,   53,
-       52,   51,   48,   47,   46,   45,   44,   43,   41,   40,
-
-       39,   36,   32,   80,    3,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80
-    } ;
-
-static yyconst short int yy_chk[147] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    7,   15,   26,   15,   33,   35,   36,   26,   38,
-       55,   38,   82,   36,   56,   56,   78,   73,   56,   72,
-       71,   69,    7,   68,   36,   67,   33,   35,   66,   65,
-       61,   55,   81,   81,   60,   58,   57,   54,   53,   51,
-       50,   49,   47,   46,   45,   44,   43,   37,   30,   29,
-       28,   27,   25,   24,   23,   22,   21,   20,   18,   17,
-
-       16,   13,    6,    3,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "Trader/constraint.l"
-#define INITIAL 0
-#line 2 "Trader/constraint.l"
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    constraint.l
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-#include "Constraint.h"
-#include "Constraint_Nodes.h"
-#include "Constraint_Tokens.h"
-
-static TAO_Literal_Constraint* extract_string(const char*);
-
-#define TAO_YY_LEX_DEBUG
-
-#ifdef TAO_CONSTRAINT_DEBUG
-#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
-#endif /* TAO_CONSTRAINT_DEBUG */
-
-
-#line 448 "lex.yy.c"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 42 "Trader/constraint.l"
-
-
-#line 602 "lex.yy.c"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 81 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 105 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 44 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_MIN; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 45 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_MAX; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 46 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_FIRST; }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 47 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_RANDOM; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 48 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_WITH; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 49 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_EXIST; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 50 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_NOT; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 51 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_AND; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 52 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_OR; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 53 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_IN; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 54 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_TWIDDLE; }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 55 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_PLUS; }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 56 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_MINUS; }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 57 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_MULT; }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 58 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_DIV; }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 59 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_LT; }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 60 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_LE; }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 61 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_GT; }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 62 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_GE; }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 63 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_EQ; }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 64 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_NE; }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 65 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_LPAREN; }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 66 "Trader/constraint.l"
-{ TAO_YY_LEX_DEBUG; return TAO_RPAREN; }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 67 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(CORBA::B_TRUE);
-		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
-		}
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 72 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(CORBA::B_FALSE);
-		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
-		}
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 77 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Long)atoi(yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
-		}
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 82 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Double)atof(yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
-		}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 87 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = extract_string(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_STRING; 
-		}
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 91 "Trader/constraint.l"
-{ 
-		  yylval.constraint_ = 
-		    new TAO_Property_Constraint(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_IDENT; 
-		}
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 96 "Trader/constraint.l"
-{ 
-                  TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
-                }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 99 "Trader/constraint.l"
-ECHO;
-	YY_BREAK
-#line 865 "lex.yy.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 81 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 81 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 80);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 99 "Trader/constraint.l"
-
-
-TAO_Literal_Constraint*
-extract_string(const char* total)
-{
-  int prev_slash = 0, 
-    ctr = 0;
-  char str[BUFSIZ],
-   *tmp = (char*) total + 1;
-
-  while (*tmp != '\0')
-    {
-      if (*tmp == '\\')
-        {
-          if (prev_slash)
-            prev_slash = 0;
-          else
-            {
-              prev_slash = 1;
-              continue;
-            }
-        }
-      else if (*tmp == '\'')
-        prev_slash = 0;
-
-      str[ctr++] = *tmp;
-      tmp++;
-    }
-
-  str[ctr - 1] = '\0';
-  return new TAO_Literal_Constraint(str);
-}
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
deleted file mode 100644
index 0c84915206c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ /dev/null
@@ -1,907 +0,0 @@
-
-# line 2 "Trader/constraint.y"
-  // $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    constraint.y
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-#include "Constraint.h"
-#include "Constraint_Nodes.h"
-
-//#define YYDEBUG 1
-# define TAO_GT 257
-# define TAO_GE 258
-# define TAO_LT 259
-# define TAO_LE 260
-# define TAO_EQ 261
-# define TAO_NE 262
-# define TAO_EXIST 263
-# define TAO_AND 264
-# define TAO_OR 265
-# define TAO_NOT 266
-# define TAO_IN 267
-# define TAO_TWIDDLE 268
-# define TAO_BOOLEAN 269
-# define TAO_PLUS 270
-# define TAO_MINUS 271
-# define TAO_MULT 272
-# define TAO_DIV 273
-# define TAO_UMINUS 274
-# define TAO_NUMBER 275
-# define TAO_RPAREN 276
-# define TAO_LPAREN 277
-# define TAO_IDENT 278
-# define TAO_STRING 279
-# define TAO_UNKNOWN 280
-# define TAO_UNSIGNED 281
-# define TAO_SIGNED 282
-# define TAO_DOUBLE 283
-# define TAO_CONSTRAINT 284
-# define TAO_SEQUENCE 285
-# define TAO_WITH 286
-# define TAO_MAX 287
-# define TAO_MIN 288
-# define TAO_FIRST 289
-# define TAO_RANDOM 290
-
-#ifdef __STDC__
-#include <stdlib.h>
-#include <string.h>
-#else
-#include <malloc.h>
-#include <memory.h>
-#endif
-
-#include <values.h>
-
-#ifdef __cplusplus
-
-#ifndef yyerror
-	void yyerror(const char *);
-#endif
-
-#ifndef yylex
-#ifdef __EXTERN_C__
-	extern "C" { int yylex(void); }
-#else
-	int yylex(void);
-#endif
-#endif
-	int yyparse(void);
-
-#endif
-#define yyclearin yychar = -1
-#define yyerrok yyerrflag = 0
-extern int yychar;
-extern int yyerrflag;
-YYSTYPE yylval;
-YYSTYPE yyval;
-typedef int yytabelem;
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 150
-#endif
-#if YYMAXDEPTH > 0
-int yy_yys[YYMAXDEPTH], *yys = yy_yys;
-YYSTYPE yy_yyv[YYMAXDEPTH], *yyv = yy_yyv;
-#else	/* user does initial allocation */
-int *yys;
-YYSTYPE *yyv;
-#endif
-static int yymaxdepth = YYMAXDEPTH;
-# define YYERRCODE 256
-
-# line 133 "Trader/constraint.y"
-
-
-//extern int yydebug = 1;
-yytabelem yyexca[] ={
--1, 1,
-	0, -1,
-	-2, 0,
-	};
-# define YYNPROD 38
-# define YYLAST 93
-yytabelem yyact[]={
-
-    19,    54,    44,    16,    45,    19,    24,    37,    22,    38,
-    39,    24,    21,    22,    18,    20,    23,    21,    25,    18,
-    20,    23,    36,     7,     6,     5,     8,     9,    19,    60,
-    26,    16,    40,    41,    24,    25,    22,    38,    39,    15,
-    21,    11,    18,    20,    23,    32,    33,    34,    35,    30,
-    31,    14,    10,    17,    13,    12,     4,     3,     1,     2,
-     0,     0,     0,     0,     0,    27,    28,    29,     0,     0,
-    42,     0,    48,    49,    50,    51,    52,    53,    43,    47,
-    58,    59,    46,     0,     0,     0,     0,     0,     0,     0,
-    56,    57,    55 };
-yytabelem yypact[]={
-
-  -263,-10000000,  -230,-10000000,  -234,  -235,  -235,  -235,-10000000,-10000000,
--10000000,  -212,  -245,  -261,  -240,-10000000,  -258,-10000000,  -235,  -276,
--10000000,-10000000,  -271,-10000000,-10000000,  -235,  -235,  -230,  -230,  -230,
-  -235,  -235,  -235,  -235,  -235,  -235,  -277,  -235,  -235,  -235,
-  -235,  -235,-10000000,  -247,-10000000,-10000000,  -234,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,  -233,  -240,  -240,-10000000,-10000000,
--10000000 };
-yytabelem yypgo[]={
-
-     0,    58,    57,    59,    56,    52,    41,    55,    54,    51,
-    39,    53 };
-yytabelem yyr1[]={
-
-     0,     1,     1,     2,     2,     2,     2,     2,     3,     3,
-     4,     4,     5,     5,     5,     5,     5,     5,     5,     6,
-     6,     7,     7,     8,     8,     8,     9,     9,     9,    10,
-    10,    11,    11,    11,    11,    11,    11,    11 };
-yytabelem yyr2[]={
-
-     0,     3,     3,     5,     5,     5,     3,     3,     7,     3,
-     7,     3,     7,     7,     7,     7,     7,     7,     3,     7,
-     3,     7,     3,     7,     7,     3,     7,     7,     3,     5,
-     3,     7,     5,     3,     3,     5,     3,     3 };
-yytabelem yychk[]={
-
--10000000,    -1,    -3,    -2,    -4,   288,   287,   286,   289,   290,
-    -5,    -6,    -7,    -8,    -9,   -10,   266,   -11,   277,   263,
-   278,   275,   271,   279,   269,   265,   264,    -3,    -3,    -3,
-   261,   262,   257,   258,   259,   260,   267,   268,   270,   271,
-   272,   273,   -11,    -3,   278,   275,    -4,    -5,    -6,    -6,
-    -6,    -6,    -6,    -6,   278,    -8,    -9,    -9,   -10,   -10,
-   276 };
-yytabelem yydef[]={
-
-     0,    -2,     1,     2,     9,     0,     0,     0,     6,     7,
-    11,    18,    20,    22,    25,    28,     0,    30,     0,     0,
-    33,    34,     0,    36,    37,     0,     0,     3,     4,     5,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    29,     0,    32,    35,     8,    10,    12,    13,
-    14,    15,    16,    17,    19,    21,    23,    24,    26,    27,
-    31 };
-typedef struct
-#ifdef __cplusplus
-	yytoktype
-#endif
-{ char *t_name; int t_val; } yytoktype;
-#ifndef YYDEBUG
-#	define YYDEBUG	0	/* don't allow debugging */
-#endif
-
-#if YYDEBUG
-
-yytoktype yytoks[] =
-{
-	"TAO_GT",	257,
-	"TAO_GE",	258,
-	"TAO_LT",	259,
-	"TAO_LE",	260,
-	"TAO_EQ",	261,
-	"TAO_NE",	262,
-	"TAO_EXIST",	263,
-	"TAO_AND",	264,
-	"TAO_OR",	265,
-	"TAO_NOT",	266,
-	"TAO_IN",	267,
-	"TAO_TWIDDLE",	268,
-	"TAO_BOOLEAN",	269,
-	"TAO_PLUS",	270,
-	"TAO_MINUS",	271,
-	"TAO_MULT",	272,
-	"TAO_DIV",	273,
-	"TAO_UMINUS",	274,
-	"TAO_NUMBER",	275,
-	"TAO_RPAREN",	276,
-	"TAO_LPAREN",	277,
-	"TAO_IDENT",	278,
-	"TAO_STRING",	279,
-	"TAO_UNKNOWN",	280,
-	"TAO_UNSIGNED",	281,
-	"TAO_SIGNED",	282,
-	"TAO_DOUBLE",	283,
-	"TAO_CONSTRAINT",	284,
-	"TAO_SEQUENCE",	285,
-	"TAO_WITH",	286,
-	"TAO_MAX",	287,
-	"TAO_MIN",	288,
-	"TAO_FIRST",	289,
-	"TAO_RANDOM",	290,
-	"-unknown-",	-1	/* ends search */
-};
-
-char * yyreds[] =
-{
-	"-no such reduction-",
-	"constraint : bool_or",
-	"constraint : preference",
-	"preference : TAO_MIN bool_or",
-	"preference : TAO_MAX bool_or",
-	"preference : TAO_WITH bool_or",
-	"preference : TAO_FIRST",
-	"preference : TAO_RANDOM",
-	"bool_or : bool_or TAO_OR bool_and",
-	"bool_or : bool_and",
-	"bool_and : bool_and TAO_AND bool_compare",
-	"bool_and : bool_compare",
-	"bool_compare : expr_in TAO_EQ expr_in",
-	"bool_compare : expr_in TAO_NE expr_in",
-	"bool_compare : expr_in TAO_GT expr_in",
-	"bool_compare : expr_in TAO_GE expr_in",
-	"bool_compare : expr_in TAO_LT expr_in",
-	"bool_compare : expr_in TAO_LE expr_in",
-	"bool_compare : expr_in",
-	"expr_in : expr_twiddle TAO_IN TAO_IDENT",
-	"expr_in : expr_twiddle",
-	"expr_twiddle : expr TAO_TWIDDLE expr",
-	"expr_twiddle : expr",
-	"expr : expr TAO_PLUS term",
-	"expr : expr TAO_MINUS term",
-	"expr : term",
-	"term : term TAO_MULT factor_not",
-	"term : term TAO_DIV factor_not",
-	"term : factor_not",
-	"factor_not : TAO_NOT factor",
-	"factor_not : factor",
-	"factor : TAO_LPAREN bool_or TAO_RPAREN",
-	"factor : TAO_EXIST TAO_IDENT",
-	"factor : TAO_IDENT",
-	"factor : TAO_NUMBER",
-	"factor : TAO_MINUS TAO_NUMBER",
-	"factor : TAO_STRING",
-	"factor : TAO_BOOLEAN",
-};
-#endif /* YYDEBUG */
-# line	1 "/usr/ccs/bin/yaccpar"
-/*
- * Copyright (c) 1993 by Sun Microsystems, Inc.
- */
-
-#pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
-
-/*
-** Skeleton parser driver for yacc output
-*/
-
-/*
-** yacc user known macros and defines
-*/
-#define YYERROR		goto yyerrlab
-#define YYACCEPT	return(0)
-#define YYABORT		return(1)
-#define YYBACKUP( newtoken, newvalue )\
-{\
-	if ( yychar >= 0 || ( yyr2[ yytmp ] >> 1 ) != 1 )\
-	{\
-		yyerror( "syntax error - cannot backup" );\
-		goto yyerrlab;\
-	}\
-	yychar = newtoken;\
-	yystate = *yyps;\
-	yylval = newvalue;\
-	goto yynewstate;\
-}
-#define YYRECOVERING()	(!!yyerrflag)
-#define YYNEW(type)	malloc(sizeof(type) * yynewmax)
-#define YYCOPY(to, from, type) \
-	(type *) memcpy(to, (char *) from, yynewmax * sizeof(type))
-#define YYENLARGE( from, type) \
-	(type *) realloc((char *) from, yynewmax * sizeof(type))
-#ifndef YYDEBUG
-#	define YYDEBUG	1	/* make debugging available */
-#endif
-
-/*
-** user known globals
-*/
-int yydebug;			/* set to 1 to get debugging */
-
-/*
-** driver internal defines
-*/
-#define YYFLAG		(-10000000)
-
-/*
-** global variables used by the parser
-*/
-YYSTYPE *yypv;			/* top of value stack */
-int *yyps;			/* top of state stack */
-
-int yystate;			/* current state */
-int yytmp;			/* extra var (lasts between blocks) */
-
-int yynerrs;			/* number of errors */
-int yyerrflag;			/* error recovery flag */
-int yychar;			/* current input token number */
-
-
-
-#ifdef YYNMBCHARS
-#define YYLEX()		yycvtok(yylex())
-/*
-** yycvtok - return a token if i is a wchar_t value that exceeds 255.
-**	If i<255, i itself is the token.  If i>255 but the neither 
-**	of the 30th or 31st bit is on, i is already a token.
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int yycvtok(int i)
-#else
-int yycvtok(i) int i;
-#endif
-{
-	int first = 0;
-	int last = YYNMBCHARS - 1;
-	int mid;
-	wchar_t j;
-
-	if(i&0x60000000){/*Must convert to a token. */
-		if( yymbchars[last].character < i ){
-			return i;/*Giving up*/
-		}
-		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
-			mid = (first+last)/2;
-			j = yymbchars[mid].character;
-			if( j==i ){/*Found*/ 
-				return yymbchars[mid].tvalue;
-			}else if( j<i ){
-				first = mid + 1;
-			}else{
-				last = mid -1;
-			}
-		}
-		/*No entry in the table.*/
-		return i;/* Giving up.*/
-	}else{/* i is already a token. */
-		return i;
-	}
-}
-#else/*!YYNMBCHARS*/
-#define YYLEX()		yylex()
-#endif/*!YYNMBCHARS*/
-
-/*
-** yyparse - return 0 if worked, 1 if syntax error not recovered from
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int yyparse(void)
-#else
-int yyparse()
-#endif
-{
-	register YYSTYPE *yypvt;	/* top of value stack for $vars */
-
-#if defined(__cplusplus) || defined(lint)
-/*
-	hacks to please C++ and lint - goto's inside switch should never be
-	executed; yypvt is set to 0 to avoid "used before set" warning.
-*/
-	static int __yaccpar_lint_hack__ = 0;
-	switch (__yaccpar_lint_hack__)
-	{
-		case 1: goto yyerrlab;
-		case 2: goto yynewstate;
-	}
-	yypvt = 0;
-#endif
-
-	/*
-	** Initialize externals - yyparse may be called more than once
-	*/
-	yypv = &yyv[-1];
-	yyps = &yys[-1];
-	yystate = 0;
-	yytmp = 0;
-	yynerrs = 0;
-	yyerrflag = 0;
-	yychar = -1;
-
-#if YYMAXDEPTH <= 0
-	if (yymaxdepth <= 0)
-	{
-		if ((yymaxdepth = YYEXPAND(0)) <= 0)
-		{
-			yyerror("yacc initialization error");
-			YYABORT;
-		}
-	}
-#endif
-
-	{
-		register YYSTYPE *yy_pv;	/* top of value stack */
-		register int *yy_ps;		/* top of state stack */
-		register int yy_state;		/* current state */
-		register int  yy_n;		/* internal state number info */
-	goto yystack;	/* moved from 6 lines above to here to please C++ */
-
-		/*
-		** get globals into registers.
-		** branch to here only if YYBACKUP was called.
-		*/
-	yynewstate:
-		yy_pv = yypv;
-		yy_ps = yyps;
-		yy_state = yystate;
-		goto yy_newstate;
-
-		/*
-		** get globals into registers.
-		** either we just started, or we just finished a reduction
-		*/
-	yystack:
-		yy_pv = yypv;
-		yy_ps = yyps;
-		yy_state = yystate;
-
-		/*
-		** top of for (;;) loop while no reductions done
-		*/
-	yy_stack:
-		/*
-		** put a state and value onto the stacks
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, look up token value in list of value vs.
-		** name pairs.  0 and negative (-1) are special values.
-		** Note: linear search is used since time is not a real
-		** consideration while debugging.
-		*/
-		if ( yydebug )
-		{
-			register int yy_i;
-
-			printf( "State %d, token ", yy_state );
-			if ( yychar == 0 )
-				printf( "end-of-file\n" );
-			else if ( yychar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
-					yy_i++ )
-				{
-					if ( yytoks[yy_i].t_val == yychar )
-						break;
-				}
-				printf( "%s\n", yytoks[yy_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ++yy_ps >= &yys[ yymaxdepth ] )	/* room on stack? */
-		{
-			/*
-			** reallocate and recover.  Note that pointers
-			** have to be reset, or bad things will happen
-			*/
-			int yyps_index = (yy_ps - yys);
-			int yypv_index = (yy_pv - yyv);
-			int yypvt_index = (yypvt - yyv);
-			int yynewmax;
-#ifdef YYEXPAND
-			yynewmax = YYEXPAND(yymaxdepth);
-#else
-			yynewmax = 2 * yymaxdepth;	/* double table size */
-			if (yymaxdepth == YYMAXDEPTH)	/* first time growth */
-			{
-				char *newyys = (char *)YYNEW(int);
-				char *newyyv = (char *)YYNEW(YYSTYPE);
-				if (newyys != 0 && newyyv != 0)
-				{
-					yys = YYCOPY(newyys, yys, int);
-					yyv = YYCOPY(newyyv, yyv, YYSTYPE);
-				}
-				else
-					yynewmax = 0;	/* failed */
-			}
-			else				/* not first time */
-			{
-				yys = YYENLARGE(yys, int);
-				yyv = YYENLARGE(yyv, YYSTYPE);
-				if (yys == 0 || yyv == 0)
-					yynewmax = 0;	/* failed */
-			}
-#endif
-			if (yynewmax <= yymaxdepth)	/* tables not expanded */
-			{
-				yyerror( "yacc stack overflow" );
-				YYABORT;
-			}
-			yymaxdepth = yynewmax;
-
-			yy_ps = yys + yyps_index;
-			yy_pv = yyv + yypv_index;
-			yypvt = yyv + yypvt_index;
-		}
-		*yy_ps = yy_state;
-		*++yy_pv = yyval;
-
-		/*
-		** we have a new state - find out what to do
-		*/
-	yy_newstate:
-		if ( ( yy_n = yypact[ yy_state ] ) <= YYFLAG )
-			goto yydefault;		/* simple state */
-#if YYDEBUG
-		/*
-		** if debugging, need to mark whether new token grabbed
-		*/
-		yytmp = yychar < 0;
-#endif
-		if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
-			yychar = 0;		/* reached EOF */
-#if YYDEBUG
-		if ( yydebug && yytmp )
-		{
-			register int yy_i;
-
-			printf( "Received token " );
-			if ( yychar == 0 )
-				printf( "end-of-file\n" );
-			else if ( yychar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
-					yy_i++ )
-				{
-					if ( yytoks[yy_i].t_val == yychar )
-						break;
-				}
-				printf( "%s\n", yytoks[yy_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ( ( yy_n += yychar ) < 0 ) || ( yy_n >= YYLAST ) )
-			goto yydefault;
-		if ( yychk[ yy_n = yyact[ yy_n ] ] == yychar )	/*valid shift*/
-		{
-			yychar = -1;
-			yyval = yylval;
-			yy_state = yy_n;
-			if ( yyerrflag > 0 )
-				yyerrflag--;
-			goto yy_stack;
-		}
-
-	yydefault:
-		if ( ( yy_n = yydef[ yy_state ] ) == -2 )
-		{
-#if YYDEBUG
-			yytmp = yychar < 0;
-#endif
-			if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
-				yychar = 0;		/* reached EOF */
-#if YYDEBUG
-			if ( yydebug && yytmp )
-			{
-				register int yy_i;
-
-				printf( "Received token " );
-				if ( yychar == 0 )
-					printf( "end-of-file\n" );
-				else if ( yychar < 0 )
-					printf( "-none-\n" );
-				else
-				{
-					for ( yy_i = 0;
-						yytoks[yy_i].t_val >= 0;
-						yy_i++ )
-					{
-						if ( yytoks[yy_i].t_val
-							== yychar )
-						{
-							break;
-						}
-					}
-					printf( "%s\n", yytoks[yy_i].t_name );
-				}
-			}
-#endif /* YYDEBUG */
-			/*
-			** look through exception table
-			*/
-			{
-				register int *yyxi = yyexca;
-
-				while ( ( *yyxi != -1 ) ||
-					( yyxi[1] != yy_state ) )
-				{
-					yyxi += 2;
-				}
-				while ( ( *(yyxi += 2) >= 0 ) &&
-					( *yyxi != yychar ) )
-					;
-				if ( ( yy_n = yyxi[1] ) < 0 )
-					YYACCEPT;
-			}
-		}
-
-		/*
-		** check for syntax error
-		*/
-		if ( yy_n == 0 )	/* have an error */
-		{
-			/* no worry about speed here! */
-			switch ( yyerrflag )
-			{
-			case 0:		/* new error */
-				yyerror( "syntax error" );
-				goto skip_init;
-			yyerrlab:
-				/*
-				** get globals into registers.
-				** we have a user generated syntax type error
-				*/
-				yy_pv = yypv;
-				yy_ps = yyps;
-				yy_state = yystate;
-			skip_init:
-				yynerrs++;
-				/* FALLTHRU */
-			case 1:
-			case 2:		/* incompletely recovered error */
-					/* try again... */
-				yyerrflag = 3;
-				/*
-				** find state where "error" is a legal
-				** shift action
-				*/
-				while ( yy_ps >= yys )
-				{
-					yy_n = yypact[ *yy_ps ] + YYERRCODE;
-					if ( yy_n >= 0 && yy_n < YYLAST &&
-						yychk[yyact[yy_n]] == YYERRCODE)					{
-						/*
-						** simulate shift of "error"
-						*/
-						yy_state = yyact[ yy_n ];
-						goto yy_stack;
-					}
-					/*
-					** current state has no shift on
-					** "error", pop stack
-					*/
-#if YYDEBUG
-#	define _POP_ "Error recovery pops state %d, uncovers state %d\n"
-					if ( yydebug )
-						printf( _POP_, *yy_ps,
-							yy_ps[-1] );
-#	undef _POP_
-#endif
-					yy_ps--;
-					yy_pv--;
-				}
-				/*
-				** there is no state on stack with "error" as
-				** a valid shift.  give up.
-				*/
-				YYABORT;
-			case 3:		/* no shift yet; eat a token */
-#if YYDEBUG
-				/*
-				** if debugging, look up token in list of
-				** pairs.  0 and negative shouldn't occur,
-				** but since timing doesn't matter when
-				** debugging, it doesn't hurt to leave the
-				** tests here.
-				*/
-				if ( yydebug )
-				{
-					register int yy_i;
-
-					printf( "Error recovery discards " );
-					if ( yychar == 0 )
-						printf( "token end-of-file\n" );
-					else if ( yychar < 0 )
-						printf( "token -none-\n" );
-					else
-					{
-						for ( yy_i = 0;
-							yytoks[yy_i].t_val >= 0;
-							yy_i++ )
-						{
-							if ( yytoks[yy_i].t_val
-								== yychar )
-							{
-								break;
-							}
-						}
-						printf( "token %s\n",
-							yytoks[yy_i].t_name );
-					}
-				}
-#endif /* YYDEBUG */
-				if ( yychar == 0 )	/* reached EOF. quit */
-					YYABORT;
-				yychar = -1;
-				goto yy_newstate;
-			}
-		}/* end if ( yy_n == 0 ) */
-		/*
-		** reduction by production yy_n
-		** put stack tops, etc. so things right after switch
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, print the string that is the user's
-		** specification of the reduction which is just about
-		** to be done.
-		*/
-		if ( yydebug )
-			printf( "Reduce by (%d) \"%s\"\n",
-				yy_n, yyreds[ yy_n ] );
-#endif
-		yytmp = yy_n;			/* value to switch over */
-		yypvt = yy_pv;			/* $vars top of value stack */
-		/*
-		** Look in goto table for next state
-		** Sorry about using yy_state here as temporary
-		** register variable, but why not, if it works...
-		** If yyr2[ yy_n ] doesn't have the low order bit
-		** set, then there is no action to be done for
-		** this reduction.  So, no saving & unsaving of
-		** registers done.  The only difference between the
-		** code just after the if and the body of the if is
-		** the goto yy_stack in the body.  This way the test
-		** can be made before the choice of what to do is needed.
-		*/
-		{
-			/* length of production doubled with extra bit */
-			register int yy_len = yyr2[ yy_n ];
-
-			if ( !( yy_len & 01 ) )
-			{
-				yy_len >>= 1;
-				yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
-				yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
-					*( yy_ps -= yy_len ) + 1;
-				if ( yy_state >= YYLAST ||
-					yychk[ yy_state =
-					yyact[ yy_state ] ] != -yy_n )
-				{
-					yy_state = yyact[ yypgo[ yy_n ] ];
-				}
-				goto yy_stack;
-			}
-			yy_len >>= 1;
-			yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
-			yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
-				*( yy_ps -= yy_len ) + 1;
-			if ( yy_state >= YYLAST ||
-				yychk[ yy_state = yyact[ yy_state ] ] != -yy_n )
-			{
-				yy_state = yyact[ yypgo[ yy_n ] ];
-			}
-		}
-					/* save until reenter driver code */
-		yystate = yy_state;
-		yyps = yy_ps;
-		yypv = yy_pv;
-	}
-	/*
-	** code supplied by user is placed in this switch
-	*/
-	switch( yytmp )
-	{
-		
-case 1:
-# line 38 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yypvt[-0].constraint_); } break;
-case 2:
-# line 40 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 3:
-# line 44 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yypvt[-0].constraint_); } break;
-case 4:
-# line 46 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yypvt[-0].constraint_); } break;
-case 5:
-# line 48 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yypvt[-0].constraint_); } break;
-case 6:
-# line 50 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); } break;
-case 7:
-# line 52 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); } break;
-case 8:
-# line 56 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 9:
-# line 58 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 10:
-# line 62 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 11:
-# line 64 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 12:
-# line 68 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 13:
-# line 70 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 14:
-# line 72 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 15:
-# line 74 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 16:
-# line 76 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 17:
-# line 78 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 18:
-# line 80 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 19:
-# line 84 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 20:
-# line 86 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 21:
-# line 90 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 22:
-# line 92 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 23:
-# line 96 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 24:
-# line 98 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 25:
-# line 100 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 26:
-# line 104 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 27:
-# line 106 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yypvt[-2].constraint_, yypvt[-0].constraint_); } break;
-case 28:
-# line 108 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 29:
-# line 112 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yypvt[-0].constraint_); } break;
-case 30:
-# line 114 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 31:
-# line 118 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-1].constraint_; } break;
-case 32:
-# line 120 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yypvt[-0].constraint_); } break;
-case 33:
-# line 122 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 34:
-# line 124 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 35:
-# line 126 "Trader/constraint.y"
-{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yypvt[-0].constraint_); } break;
-case 36:
-# line 128 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-case 37:
-# line 130 "Trader/constraint.y"
-{ yyval.constraint_ = yypvt[-0].constraint_; } break;
-# line	532 "/usr/ccs/bin/yaccpar"
-	}
-	goto yystack;		/* reset registers in driver code */
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp
deleted file mode 100644
index de7373e2e4d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#include "Dynamic_Property.h"
-
-TAO_Dynamic_Property::TAO_Dynamic_Property(const char* name)
-{  
-}
-
-TAO_Dynamic_Property::~TAO_Dynamic_Property (void)
-{
-}
-
-CosTradingDynamic::DynamicProp*
-TAO_Dynamic_Property::register_handler(const char* name,
-				       CORBA::TypeCode_ptr returned_type,
-				       const CORBA::Any& extra_info,
-				       TAO_DP_Evaluation_Handler* handler)
-{
-  string prop_name(name);
-  CosTradingDynamic::DynamicProp* dp_struct = 0;
-  TAO_Dynamic_Property::HANDLER_MAP::iterator handlers_iter =
-    this->handlers_.find(prop_name);
-
-  // Set up the handler to receive evaluations for prop_name
-  if (handlers_iter == this->handlers_.end())
-    this->handlers_[prop_name] = handler;
-
-  // Create the dp_struct for this dynamic property.
-  dp_struct = new CosTradingDynamic::DynamicProp;
-  if (dp_struct != 0)
-    {
-      CORBA::Environment env;
-      
-      dp_struct->eval_if = this->_this (env);
-      TAO_CHECK_ENV_RETURN (env, dp_struct);      
-      dp_struct->returned_type =
-	CORBA::TypeCode::_duplicate (returned_type);
-      dp_struct->extra_info = extra_info;
-    }
-  
-  return dp_struct;
-}
-
-TAO_DP_Evaluation_Handler*
-TAO_Dynamic_Property::remove_handler(const char* name)
-{
-  string prop_name(name);
-  TAO_DP_Evaluation_Handler* handler = 0;
-  HANDLER_MAP::iterator handlers_iter = this->handlers_.find(prop_name);
-
-  if (handlers_iter != this->handlers_.end())
-    {
-      handler = (*handlers_iter).second;
-      this->handlers_.erase(handlers_iter);
-    }
-
-  return handler;
-}
-
-CORBA::Any*
-TAO_Dynamic_Property::evalDP(const char* name,
-			     CORBA::TypeCode_ptr returned_type,
-			     const CORBA::Any& extra_info,
-			     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTradingDynamic::DPEvalFailure))
-{
-  string prop_name(name);
-  CORBA::Any* result = 0;
-  HANDLER_MAP::iterator handlers_iter = this->handlers_.find(prop_name);
-
-  if (handlers_iter != this->handlers_.end())
-    {
-      TAO_DP_Evaluation_Handler* handler = (*handlers_iter).second;
-      result = handler->evalDP (extra_info, returned_type, _env);
-      TAO_CHECK_ENV_RETURN (_env, result);
-      
-      if (! returned_type->equal(result->type(), _env))
-	{
-	  TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure
-			    (name, returned_type, extra_info),
-			    result);
-	}
-    }
-  else
-    {
-      TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure
-			(name, returned_type, extra_info),
-			result);
-    }
-
-  return result;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
deleted file mode 100644
index bf3123e7836..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Dynamic_Property.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-
-#ifndef TAO_DYNAMIC_PROPERTY_H
-#define TAO_DYNAMIC_PROPERTY_H
-
-#include <map>
-#include <string>
-
-#include "orbsvcs/CosTradingS.h"
-
-class TAO_DP_Evaluation_Handler
-{
-public:
-
-  virtual CORBA::Any* evalDP(const CORBA::Any& extra_info,
-			     CORBA::TypeCode_ptr returned_type,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) = 0;
-  
-};
-
-class TAO_Dynamic_Property :
-  public POA_CosTradingDynamic::DynamicPropEval
-// = TITLE
-//   This class exhibits one strategy for handling many dynamic
-//   properties from a single process. Dynamic_Property, when
-//   registered with the orb, will receive and dispatch to registered
-//   handlers, incoming evalDP requests. This pushes the
-//   demultiplexing of dynamic property evaluation up from the orb
-//   level and into the application. 
-{
-public:
-
-  TAO_Dynamic_Property(const char* name = "Dynamic Property");
-
-  ~TAO_Dynamic_Property (void);
-  
-  CosTradingDynamic::DynamicProp*
-    register_handler(const char* name,
-		     CORBA::TypeCode_ptr returned_type,
-		     const CORBA::Any& extra_info,
-		     TAO_DP_Evaluation_Handler* handler);
-  // Registers a handler with the Dynamic_Property
-  // demultiplexer. Returns a constructed dynamic property struct
-  // upon success, which the caller must then deallocate when
-  // finished, or 0 on failure (i.e., a property with the same name
-  // is already registered).
-  
-  TAO_DP_Evaluation_Handler* remove_handler(const char* name);
-  
-  virtual CORBA::Any* evalDP(const char* name,
-			     CORBA::TypeCode_ptr returned_type,
-			     const CORBA::Any& extra_info,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTradingDynamic::DPEvalFailure));
-  // Point of demultiplexing.  
-  
-private:
-
-  typedef map
-    <
-    string,
-    TAO_DP_Evaluation_Handler*,
-    less<string>
-    > HANDLER_MAP;
-
-  HANDLER_MAP handlers_;
-
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Dynamic_Property.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_DYNAMIC_PROPERTY_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
deleted file mode 100644
index 07afac4ce3f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-#include "Interpreter.h"
-
-TAO_Interpreter::~TAO_Interpreter (void)
-{
-  delete root_;
-}
-
-int
-TAO_Interpreter::build_tree(const char* constraints)
-{
-  TAO_Lex_String_Input::reset((char*)constraints);  
-  int return_value = 0;
-
-  yyval.constraint_ = 0;
-  return_value = ::yyparse();
-  
-  if (return_value == 0 && yyval.constraint_ != 0)
-    this->root_ = yyval.constraint_;
-  else
-    {
-      while (yylex() > 0)
-	;
-      this->root_ = 0;
-    }
-  
-  return return_value;
-}
-
-
-int
-TAO_Interpreter::is_empty_string(const char* str)
-{
-  int return_value = 0;
-
-  if (str != 0)
-    {
-      int i = 0;
-      while (str[i] != '\0')
-	{
-	  if (str[i] != ' ')
-	    break;
-
-	  i++;
-	}
-
-      if (str[i] == '\0')
-	return_value = 1;
-    }
-
-  return return_value;
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
deleted file mode 100644
index 08dee14637a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// ============================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Interpreter.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-
-#ifndef TAO_INTERPRETER_H
-#define TAO_INTERPRETER_H
-
-#include "Constraint.h"
-#include "Constraint_Nodes.h"
-
-class TAO_Interpreter
-// = TITLE
-//      TAO_Interpreter is the superclass for all interpreters. It's
-//      build tree method invoke the yacc parser to parse a constraint 
-//      or preference string. 
-{   
-protected:
-
-  TAO_Interpreter (void) : root_ (0) {}
-
-  ~TAO_Interpreter (void);
-  
-  int build_tree (const char* preferences);
-  // Using the Yacc generated parser, construct an expression
-  // tree representing <constraints> from the tokens returned by it.
-
-  static int is_empty_string (const char* str);
-  
-  TAO_Constraint* root_;
-  // The root of the expression tree, not equal to null if build_tree
-  // successfully builds a tree from the constraints.
-};
-
-#endif /* TAO_Interpreter */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Link.cpp b/TAO/orbsvcs/orbsvcs/Trader/Link.cpp
deleted file mode 100644
index 7920d301bbf..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Link.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Link.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#if !defined (TAO_LINK_C)
-#define TAO_LINK_C
-
-#include "Link.h"
-#include "Locking.h"
-#include "Trader.h"
-
-template <class TRADER, class MAP_LOCK_TYPE>  
-TAO_Link<TRADER,MAP_LOCK_TYPE>::TAO_Link (TRADER &trader)
-  : trader_ (trader),
-    TAO_Trader_Components <POA_CosTrading::Link> (trader.trading_components ()),
-    TAO_Link_Attributes <POA_CosTrading::Link> (trader.link_attributes ()),
-    TAO_Support_Attributes <POA_CosTrading::Link> (trader.support_attributes ())
-{
-}
-
-template <class TRADER, class MAP_LOCK_TYPE>
-TAO_Link<TRADER,MAP_LOCK_TYPE>::~TAO_Link (void)
-{
-}
-
-template <class TRADER, class MAP_LOCK_TYPE> void
-TAO_Link<TRADER,MAP_LOCK_TYPE>::
-add_link (const char *name, 
-	  CosTrading::Lookup_ptr target, 
-	  CosTrading::FollowOption def_pass_on_follow_rule, 
-	  CosTrading::FollowOption limiting_follow_rule,
-	  CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::Link::IllegalLinkName, 
-		  CosTrading::Link::DuplicateLinkName, 
-		  CosTrading::InvalidLookupRef, 
-		  CosTrading::Link::DefaultFollowTooPermissive, 
-		  CosTrading::Link::LimitingFollowTooPermissive))
-{
-  TAO_WRITE_GUARD (MAP_LOCK_TYPE, 
-		   ace_mon, 
-		   this->links_.lock ());
-  
-  // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
-
-  // Ensure this isn't a duplicate link name.
-  string link_name (name);
-  LINKS::iterator links_iter = this->links_.find (link_name);
-  if (links_iter != this->links_.end ())
-    TAO_THROW (CosTrading::Link::DuplicateLinkName (name));
-
-  // Ensure the lookup_ptr isn't nil.
-  if (target == CosTrading::Lookup::_nil())
-    TAO_THROW (CosTrading::InvalidLookupRef (target));
-
-  // Ensure that the default link behavior isn't stronger than the
-  // limiting link behavior.
-  if (def_pass_on_follow_rule > limiting_follow_rule)
-    TAO_THROW (CosTrading::Link::DefaultFollowTooPermissive
-	       (def_pass_on_follow_rule, limiting_follow_rule));
-
-  // Ensure that the limiting link behavior for this link doesn't
-  // exceed the maximum allowed for a link.
-  if (limiting_follow_rule < this->max_link_follow_policy (_env))
-    TAO_THROW (CosTrading::Link::LimitingFollowTooPermissive
-	       (limiting_follow_rule, this->max_link_follow_policy (_env)));
-
-  // Create a link info structure for this link of the federation.
-  CosTrading::Link::LinkInfo link_info;
-  link_info.target = target;
-  link_info.target_reg = target->register_if (_env);
-  link_info.def_pass_on_follow_rule = def_pass_on_follow_rule;
-  link_info.limiting_follow_rule = limiting_follow_rule;
-  TAO_CHECK_ENV_RETURN (_env,);
-
-  // Insert this link into the collection of links.
-  this->links_.insert (link_name, link_info);
-}
-
-template <class TRADER, class MAP_LOCK_TYPE> void
-TAO_Link<TRADER,MAP_LOCK_TYPE>::remove_link (const char *name,
-			       CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::Link::IllegalLinkName, 
-		  CosTrading::Link::UnknownLinkName))
-{
-  TAO_WRITE_GUARD (MAP_LOCK_TYPE, 
-		   ace_mon, 
-		   this->links_.lock ());
-
-  // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
-
-  // Ensure this isn't a duplicate link name.
-  string link_name (name);
-  LINKS::iterator links_iter = this->links_.find (link_name);
-  if (links_iter == this->links_.end ())
-    TAO_THROW (CosTrading::Link::UnknownLinkName (name));
-
-  // Erase the link state from the map.
-  this->links_.erase (links_iter);
-}
-
-template <class TRADER, class MAP_LOCK_TYPE> CosTrading::Link::LinkInfo * 
-TAO_Link<TRADER,MAP_LOCK_TYPE>::describe_link (const char *name,
-					       CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CosTrading::SystemException,
-		  CosTrading::Link::IllegalLinkName, 
-		  CosTrading::Link::UnknownLinkName))
-{
-  TAO_READ_GUARD_RETURN (MAP_LOCK_TYPE, 
-			 ace_mon, 
-			 this->links_.lock (),
-			 (CosTrading::Link::LinkInfo*) 0);
-
-  // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
-  
-  // Ensure this isn't a duplicate link name.
-  string link_name (name);
-  LINKS::iterator links_iter = this->links_.find (link_name);
-  if (links_iter == this->links_.end ())
-    TAO_THROW_RETURN (CosTrading::Link::UnknownLinkName (name), 0);
-
-  // return the link infor for this link name.
-  return &(*links_iter).second;
-}
-
-template <class TRADER, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* 
-TAO_Link<TRADER,MAP_LOCK_TYPE>::list_links (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_READ_GUARD_RETURN (MAP_LOCK_TYPE, 
-			 ace_mon, 
-			 this->links_.lock (),
-			 (CosTrading::LinkNameSeq*) 0);
-
-  // Allocate space for the link names.
-  CORBA::ULong size = this->links_.size (), i = 0;
-  CosTrading::LinkName* link_seq =
-    CosTrading::LinkNameSeq::allocbuf (size);
-
-  // Copy the link names into the buffer.
-  for (LINKS::iterator links_iter = this->links_.begin ();
-       links_iter != this->links_.end ();
-       links_iter++)
-    link_seq[i++] = CORBA::string_dup ((*links_iter).first.data ());
-
-  // Return a sequence of the buf names.
-  return new CosTrading::LinkNameSeq (i, i, link_seq, 1);
-}
-
-template <class TRADER, class MAP_LOCK_TYPE> void
-TAO_Link<TRADER,MAP_LOCK_TYPE>::
-modify_link (const char *name, 
-	     CosTrading::FollowOption def_pass_on_follow_rule, 
-	     CosTrading::FollowOption limiting_follow_rule,
-	     CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::Link::IllegalLinkName, 
-		  CosTrading::Link::UnknownLinkName, 
-		  CosTrading::Link::DefaultFollowTooPermissive, 
-		  CosTrading::Link::LimitingFollowTooPermissive))
-{
-  TAO_WRITE_GUARD (MAP_LOCK_TYPE, 
-		   ace_mon, 
-		   this->links_.lock ());
-
-  // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::Link::IllegalLinkName (name));
-
-  // Ensure this isn't a duplicate link name.
-  string link_name (name);
-  LINKS::iterator links_iter = this->links_.find (link_name);
-  if (links_iter == this->links_.end ())
-    TAO_THROW (CosTrading::Link::UnknownLinkName (name));
-
-  // Ensure that the default link behavior isn't stronger than the
-  // limiting link behavior.
-  if (def_pass_on_follow_rule > limiting_follow_rule)
-    TAO_THROW (CosTrading::Link::DefaultFollowTooPermissive
-	       (def_pass_on_follow_rule, limiting_follow_rule));
-
-  // Ensure that the limiting link behavior for this link doesn't
-  // exceed the maximum allowed for a link.
-  if (limiting_follow_rule < this->max_link_follow_policy (_env))
-    TAO_THROW (CosTrading::Link::LimitingFollowTooPermissive
-	       (limiting_follow_rule, this->max_link_follow_policy (_env)));
-
-  // Adjust the link settings
-  CosTrading::Link::LinkInfo& link_info = (*links_iter).second;
-  link_info.def_pass_on_follow_rule = def_pass_on_follow_rule;
-  link_info.limiting_follow_rule = limiting_follow_rule;
-}
-
-#endif /* TAO_LINK_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Link.h b/TAO/orbsvcs/orbsvcs/Trader/Link.h
deleted file mode 100644
index b10e5a73c79..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Link.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Link.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>,
-//    Irfan Pyarali <irfan@cs.wustl.edu>,
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_LINK_H
-#define TAO_LINK_H
-
-#include "Attributes.h"
-#include "Monitor.h" 
-#include <string>
-#include <map>
-
-template <class TRADER, class MAP_LOCK_TYPE>
-class TAO_Link : 
-  public TAO_Trader_Components <POA_CosTrading::Link>,
-  public TAO_Support_Attributes <POA_CosTrading::Link>,
-  public TAO_Link_Attributes <POA_CosTrading::Link>
-{
-public:
-
-  TAO_Link (TRADER &trader);
-
-  ~TAO_Link (void);
-		
-  virtual void add_link (const char *name, 
-			 CosTrading::Lookup_ptr target, 
-			 CosTrading::FollowOption def_pass_on_follow_rule, 
-			 CosTrading::FollowOption limiting_follow_rule,
-			 CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::DuplicateLinkName, 
-		    CosTrading::InvalidLookupRef, 
-		    CosTrading::Link::DefaultFollowTooPermissive, 
-		    CosTrading::Link::LimitingFollowTooPermissive));
-  // BEGIN SPEC
-  // The add_link operation allows a trader subsequently to use the
-  // service of another trader in the performance of its own trading
-  // service operations. 
-
-  // The "name" parameter is used in subsequent link management
-  // operations to identify the intended link. If the parameter is not
-  // legally formed, then the IllegalLinkName exception is raised. An
-  // exception of DuplicateLinkName is raised if the link name already
-  // exists. The link name is also used as a component in a sequence
-  // of name components in naming a trader for resolving or forwarding
-  // operations. The sequence of context relative link names provides
-  // a path to a trader.
-
-  // The "target" parameter identifies the Lookup interface at which
-  // the trading service provided by the target trader can be
-  // accessed. Should the Lookup interface parameter be nil, then an
-  // exception of InvalidLookupRef is raised. The target interface is
-  // used to obtain the associated Register interface, which will be
-  // subsequently returned as part of a describe_link operation and
-  // invoked as part of a resolve operation.
-
-  // The "def_pass_on_follow_rule" parameter specifies the default
-  // link behavior for the link if no link behavior is specified on an
-  // importer's query request. If the "def_pass_on_follow_rule"
-  // exceeds the "limiting_follow_rule" specified in the next
-  // parameter, then a DefaultFollowTooPermissive exception is
-  // raised.
-
-  // The "limiting_follow_rule" parameter specifies the most
-  // permissive link follow behavior that the link is willing to
-  // tolerate. The exception LimitingFollowTooPermissive is raised if
-  // this parameter exceeds the trader's attribute of
-  // "max_link_follow_policy" at the time of the link's creation. Note
-  // it is possible for a link's "limiting_follow_rule" to exceed the
-  // trader's "max_link_follow_policy" later in the life of a link, as
-  // it is possible that the trader could set its
-  // "max_link_follow_policy" to a more restrictive value after the
-  // creation of the link. 
-  // END SPEC
-  
-  virtual void remove_link (const char *name,
-			    CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName));
-
-  // BEGIN SPEC
-  // The remove_link operation removes all knowledge of the target
-  // trader. The target trader cannot be used subsequently to resolve,
-  // forward, or propagate trading operations from this trader.
-
-  // The "name" parameter identifies the link to be removed. The
-  // exception IllegalLinkName is raised if the link is formed poorly
-  // and the UnknownLinkName exception is raised if the named link is
-  // not in the trader. 
-  // END SPEC
-  
-  virtual CosTrading::Link::LinkInfo* describe_link (const char *name,
-						     CORBA::Environment&) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName));
-
-  // BEGIN SPEC
-  // The describe_link operation returns information on a link held in
-  // the trader.
-
-  // The "name" parameter identifies the link whose description is
-  // required. For a malformed link name, the exception
-  // IllegalLinkName is raised. An UnknownLinkName exception is raised
-  // if the named link is not found in the trader.
-
-  // The operation returns a LinkInfo structure comprising: ° the
-  // Lookup interface of the target trading service, ° the Register
-  // interface of the target trading service, and ° the default, as
-  // well as the limiting follow behavior of the named link.
-
-  // If the target service does not support the Register interface,
-  // then that field of the LinkInfo structure is nil. Given the
-  // description of the Register::resolve() operation in "Resolve
-  // Operation" on page 16-45, most implementations will opt for
-  // determining the Register interface when add_link is called and
-  // storing that information statically with the rest of the link
-  // state. 
-  // END SPEC
-  
-  virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // BEGIN SPEC
-  // The list_links operation returns a list of the names of all
-  // trading links within the trader. The names can be used
-  // subsequently for other management operations, such as
-  // describe_link or remove_link. 
-  // END SPEC
-  
-  virtual void modify_link (const char *name, 
-			    CosTrading::FollowOption def_pass_on_follow_rule, 
-			    CosTrading::FollowOption limiting_follow_rule,
-			    CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, 
-		    CosTrading::Link::UnknownLinkName, 
-		    CosTrading::Link::DefaultFollowTooPermissive, 
-		    CosTrading::Link::LimitingFollowTooPermissive));
-
-  // BEGIN SPEC
-  // The modify_link operation is used to change the existing link
-  // follow behaviors of an identified link. The Lookup interface
-  // reference of the target trader and the name of the link cannot be
-  // changed.
-
-  // The "name" parameter identifies the link whose follow behaviors
-  // are to be changed. A poorly formed "name" raises the
-  // IllegalLinkName exception. An UnknownLinkName exception is raised
-  // if the link name is not known to the trader.
-
-  // The "def_pass_on_follow_rule" parameter specifies the new default
-  // link behavior for this link. If the "def_pass_on_follow_rule"
-  // exceeds the "limiting_follow_rule" specified in the next
-  // parameter, then a DefaultFollowTooPermissive exception is
-  // raised.
-
-  // The "limiting_follow_rule" parameter specifies the new limit for
-  // the follow behavior of this link. The exception
-  // LimitingFollowTooPermissive is raised if the value exceeds the
-  // current "max_link_follow_policy" of the trader. 
-  // END SPEC
-  		
-private:
-
-  typedef TAO_Monitor
-  <
-  map <string, CosTrading::Link::LinkInfo, less <string> >, 
-  MAP_LOCK_TYPE
-  >
-  LINKS;
-
-  LINKS links_;
-  // The collection of link connecting this trader to others in the
-  // federation. 
-  
-  TRADER &trader_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Link.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_LINK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
deleted file mode 100644
index 7a583405dc9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-
-// =========================================================================
-// $Id$
-//
-// = LIBRARY
-//    Trading
-// 
-// = FILENAME
-//    Locking.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
-// ==========================================================================
-#ifndef TAO_LOCKING_H
-#define TAO_LOCKING_H
-
-#if defined (OS_NO_NAMESPACE)
-#define queue booga
-#endif /* OS_NO_NAMESPACE */
-
-#include "tao/corba.h"
-
-#if defined (OS_NO_NAMESPACE)
-#undef queue
-#endif /* OS_NO_NAMESPACE */
-
-
-// Macros for obtaining read/write locks that are
-// automatically released at the end of scope.
-// In case of failure, CORBA::SystemException is thrown.
-
-#define TAO_WRITE_GUARD(MUTEX,OBJ,LOCK) \
-ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-
-#define TAO_READ_GUARD(MUTEX,OBJ,LOCK) \
-ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-
-#define TAO_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), RETURN);
-
-#define TAO_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
-ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), RETURN);
-
-#endif /* TAO_LOCKING_H */
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
deleted file mode 100644
index 80dd4e0362f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
+++ /dev/null
@@ -1,818 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Lookup.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#if !defined (TAO_LOOKUP_C)
-#define TAO_LOOKUP_C
-
-#include "Lookup.h"
-#include "ace/Auto_Ptr.h"
-#include <iostream.h>
-
-#include "Query_Only_Offer_Iterator.h"
-#include "Register_Offer_Iterator.h"
-#include "Offer_Iterator_Collection.h"
-
-template <class TRADER>
-const char* TAO_Lookup<TRADER>::NAME = "Trader: Lookup";
-
-template <class TRADER>
-TAO_Lookup<TRADER>::TAO_Lookup (TRADER &trader)
-  : trader_ (trader),
-    TAO_Trader_Components<POA_CosTrading::Lookup> (trader.trading_components ()),
-    TAO_Support_Attributes<POA_CosTrading::Lookup> (trader.support_attributes ()),
-    TAO_Import_Attributes<POA_CosTrading::Lookup> (trader.import_attributes ())
-{
-}
-
-template <class TRADER>
-TAO_Lookup<TRADER>::~TAO_Lookup (void)
-{
-}
-
-template <class TRADER> void
-TAO_Lookup<TRADER>::
-query (const char *type,
-       const char *constraint,
-       const char *preferences,
-       const CosTrading::PolicySeq &in_policies,
-       const CosTrading::Lookup::SpecifiedProps &desired_props,
-       CORBA::ULong how_many,
-       CosTrading::OfferSeq_out returned_offers,
-       CosTrading::OfferIterator_out returned_offer_iterator,
-       CosTrading::PolicyNameSeq_out returned_limits_applied,
-       CORBA::Environment& env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType,
-		   CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::IllegalPolicyName,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::DuplicatePolicyName))
-{    
-  // Initializing out parameters
-  returned_offers = new CosTrading::OfferSeq;
-  returned_offer_iterator = CosTrading::OfferIterator::_nil ();
-  returned_limits_applied = new CosTrading::PolicyNameSeq;
-  
-  // Get service type map
-  TRADER::SERVICE_TYPE_MAP& service_type_map =
-    this->trader_.service_type_map ();
-  
-  TAO_Policies policies (this->trader_, in_policies, env);
-  TAO_CHECK_ENV_RETURN (env,);
-
-  // If the importer has specified a starting trader, foward the
-  // query.
-  CosTrading::TraderName* trader_name = policies.starting_trader (env);
-  TAO_CHECK_ENV_RETURN (env,);
-
-  if (trader_name != 0)
-    {
-      CosTrading::TraderName_var starting_trader (trader_name);
-      this->forward_query (starting_trader.in (),
-			   type,
-			   constraint,
-			   preferences,
-			   policies,
-			   desired_props,
-			   how_many,
-			   returned_offers,
-			   returned_offer_iterator,
-			   returned_limits_applied,
-			   env);
-      return;
-    }
-  
-  // If a federated query returns to us, ignore it to prevent
-  // redundant results.
-  if (this->duplicate_stem_id (policies, env))
-    return;
-
-  // If the type is invalid or unknown, let us know now.
-  TAO_Support_Attributes_Impl support_attrs =
-    this->trader_.support_attributes ();  
-  CosTrading::TypeRepository_ptr type_repos =
-    support_attrs.type_repos ();
-  CosTradingRepos::ServiceTypeRepository_ptr rep = 
-    CosTradingRepos::ServiceTypeRepository::_narrow (type_repos, env);
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  // If type is not found, there is nothing to consider - return.
-  // Else we found the service type....proceed with lookup.
-  // We will store the matched offers in here.
-  LOOKUP_OFFER_LIST ordered_offers;
-  
-  // Perform the lookup, placing the ordered results in ordered_offers.
-  this->perform_lookup (type,
-			constraint,
-			preferences,
-			service_type_map,
-			rep,
-			policies,
-			ordered_offers,
-			returned_limits_applied,
-			env);      
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  // Fill the return sequence and iterator with the bountiful results.
-  CORBA::ULong offers_returned = 
-    this->fill_receptacles (type,
-			    ordered_offers,
-			    how_many,			  
-			    desired_props,
-			    returned_offers,
-			    returned_offer_iterator,
-			    env);
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  // Determine if we should perform a federated query, and if so
-  // construct a sequence of links to follow.
-  CosTrading::LinkNameSeq* links = 0;
-  CosTrading::LinkNameSeq_var links_to_follow (links);  
-  CORBA::Boolean should_follow =
-    this->retrieve_links (policies,
-			  offers_returned,
-			  CosTrading::LinkNameSeq_out (links),
-			  env);
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  if (should_follow)
-    {
-      // Perform the sequence of fedrated queries.
-      this->federated_query (*links,
-			     type,
-			     constraint,
-			     preferences,
-			     policies,
-			     desired_props,
-			     how_many - returned_offers->length (),
-			     returned_offers,
-			     returned_offer_iterator,
-			     returned_limits_applied,
-			     env);
-    }
-  TAO_CHECK_ENV_RETURN (env,);  
-}
-
-template <class TRADER> void
-TAO_Lookup<TRADER>::
-perform_lookup (const char* type,
-		const char* constraint,
-		const char* preferences,
-		SERVICE_TYPE_MAP& service_type_map,
-		CosTradingRepos::ServiceTypeRepository_ptr rep,		
-		TAO_Policies& policies,
-		LOOKUP_OFFER_LIST& ordered_offers,
-		PolicyNameSeq_out returned_limits_applied,
-		CORBA::Environment& env)
-  TAO_THROW_SPEC ((CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType))
-{    
-  // TAO_Offer_Filter -- ensures that we don't consider offers with
-  // modifiable or dynamic properties if the Trader doesn't support
-  // them, or the importer has turned them off using policies.
-  // TAO_Constraint_Validator -- validates the constraint with the
-  // property types in the supplied type.
-  // TAO_Constraint_Interpreter -- parses the constraint string, and
-  // determines whether an offer meets those constraints.
-  // TAO_Preference_Interpreter -- parses the preference string and
-  // orders offers according to those constraints.
-  TYPE_STRUCT type_struct (rep->fully_describe_type (type, env));
-  TAO_CHECK_ENV_RETURN (env,);
-  TAO_Offer_Filter offer_filter (type_struct.ptr (), policies, env);
-  TAO_CHECK_ENV_RETURN (env,);
-  TAO_Constraint_Validator validator (type_struct.ptr ());
-  TAO_Constraint_Interpreter constr_inter (validator, constraint, env);
-  TAO_CHECK_ENV_RETURN (env,);
-  TAO_Preference_Interpreter pref_inter (validator, preferences, env);
-  TAO_CHECK_ENV_RETURN (env,);
-  CORBA::ULong return_card = policies.return_card (env);
-  TAO_CHECK_ENV_RETURN (env,);
-  
-  // Try to find the map of offers of desired service type.
-  this->lookup_one_type (type,
-			 service_type_map,
-			 constr_inter,
-			 pref_inter,
-			 offer_filter);
-
-  // If the importer hasn't demanded an exact match search, we search
-  // all the subtypes of the supplied type. NOTE: Only the properties
-  // belonging to the provided type are considered on
-  // subtypes. Additional properties on the subtype are generally
-  // ignored. This is as it should be, consistent with the notions of
-  // type inheritence.
-  if (! policies.exact_type_match (env))
-    {
-      TAO_CHECK_ENV_RETURN (env,);
-      this->lookup_all_subtypes (type,
-				 type_struct->incarnation,
-				 service_type_map,
-				 rep,
-				 constr_inter,
-				 pref_inter,
-				 offer_filter);
-    }
-  TAO_CHECK_ENV_RETURN (env,);
-
-  // Pull the matched offers out of the pref_inter in order, and stick 
-  // them in a queue. The offers in the queue will be emptied into
-  // the return sequence and iterator for later purusal by the
-  // importer. Only prepare for the importer no more offers than the
-  // return cardinality default or policy allows.
-  int num_offers = pref_inter.num_offers ();
-  for (int i = 0; i < num_offers && i < return_card; i++)
-    {
-      CosTrading::Offer* offer;
-      CosTrading::OfferId offer_id;
-      if (pref_inter.remove_offer (offer_id, offer))
-	ordered_offers.push_back (make_pair (offer_id, offer));
-      else
-	break;
-    }
-
-  // Take note of the limits applied in this query.
-  returned_limits_applied = offer_filter.limits_applied ();
-}
-
-template <class TRADER> void
-TAO_Lookup<TRADER>::
-lookup_one_type (const char* type,
-		 SERVICE_TYPE_MAP& service_type_map,
-		 TAO_Constraint_Interpreter& constr_inter,
-		 TAO_Preference_Interpreter& pref_inter,
-		 TAO_Offer_Filter& offer_filter)
-{
-  ACE_DEBUG ((LM_DEBUG, "TAO_Lookup: Performing query for %s\n", type));
-  
-  // Retrieve an iterator over the offers for a given type.
-  auto_ptr<LOCAL_OFFER_ITER>
-    offer_iter (service_type_map.get_offers (type));
-
-  if (offer_iter.get () != 0)
-    {
-      while (offer_filter.ok_to_consider_more () &&
-	     offer_iter->has_more_offers ())
-	{
-	  // For each offer in the iterator, attempt to match it with
-	  // the constraints passed to the Query method. If it matches 
-	  // the constraint, use the TAO_Preference_Interpreter to
-	  // order the matched offers with respect to the preference
-	  // string passed to the method. All the while the offer
-	  // iterator ensures we don't exceed the match cardinality
-	  // constraints. 
-	  CosTrading::Offer* offer = offer_iter->get_offer ();
-	  
-	  TAO_Constraint_Evaluator evaluator (offer);      
-	  if (offer_filter.ok_to_consider (offer) &&
-	      constr_inter.evaluate (evaluator))
-	    {
-	      // Shove the offer and its id into the preference
-	      // ordering object, pref_inter.
-	      CosTrading::OfferId offer_id = offer_iter->get_id ();
-	      pref_inter.order_offer (offer_id, offer, evaluator);
-	      offer_filter.matched_offer ();
-	    }
-      
-	  offer_iter->next_offer ();
-	}
-    }
-}
-
-template <class TRADER> void
-TAO_Lookup<TRADER>::
-lookup_all_subtypes (const char* type,
-		     SERVICE_TYPE_REPOS::IncarnationNumber& inc_num,
-		     SERVICE_TYPE_MAP& service_type_map,
-		     CosTradingRepos::ServiceTypeRepository_ptr rep,
-		     TAO_Constraint_Interpreter& constr_inter,
-		     TAO_Preference_Interpreter& pref_inter,
-		     TAO_Offer_Filter& offer_filter)
-{
-  // BEGIN SPEC
-  // The trader may return a service offer of a subtype of the "type"
-  // requested. Sub-typing of service types is discussed in "Service
-  // Types" on page 16-4. A service subtype can be described by the
-  // properties of its supertypes. This ensures that a well-formed query
-  // for the "type" is also a well-formed query with respect to any
-  // subtypes. However, if the importer specifies the policy of
-  // exact_type_match = TRUE, then only offers with the exact (no
-  // subtype) service type requested are returned.  
-  // END SPEC
-
-  // The algorithm works as follows:
-  // Starting with the asked for type, iterate through all other types
-  // looking for those that have it as their direct supertype. Upon
-  // finding a direct subtype of the top-level types, consider all of
-  // that type's offer and stick it onto the list of subtypes. On the
-  // second iteration, locate subtypes of those subtypes. This
-  // proceeds until all of the subtypes for the original class have
-  // been located and their offers considered, or we've exhausted the
-  // cardinality constraints.
-
-  typedef deque<char*> TYPE_LIST;
-  typedef deque<pair <SERVICE_TYPE_REPOS::IncarnationNumber, char*> >
-    TYPE_NUM_LIST;
-
-  TYPE_NAME_SEQ all_types;
-  TYPE_NUM_LIST sub_types;
-  TYPE_LIST unconsidered_types;
-
-  CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes sst;
-  
-  // Optimization: Since a subtype can't have a higher incarnation
-  // number than a supertype, we don't need to consider those
-  // types with lower incarnation numbers.  
-  sst._d (SERVICE_TYPE_REPOS::since);
-  sst.incarnation (inc_num);  
-  
-  //  TAO_TRY
-  //    {
-  CORBA::Environment env;
-  all_types = rep->list_types (sst, env);
-  //      TAO_CHECK_ENV;
-  //    }
-  //  TAO_CATCHANY { return; }
-  //  TAO_ENDTRY;  
-  
-  // All types save the supertype are initially unconsidered.
-  sub_types.push_back (make_pair (inc_num, (char *) type));
-  for (int i = all_types->length () - 1; i >= 0; i--)
-    {
-      if (ACE_OS::strcmp (type, all_types[i]) != 0)
-	unconsidered_types.push_back ((char *) (const char *) all_types[i]);
-    }
-
-  // Iterate over the remaining subtypes to locate their subtypes.
-  // We could meet our cardinality constraints prior searching all
-  // types, at which point the algorithm ends gracefully.
-  while (! sub_types.empty () && offer_filter.ok_to_consider_more ())  
-  {
-    // For each potential supertype, iterate over the remaining types.
-    const char* super_type = sub_types.front ().second;
-    SERVICE_TYPE_REPOS::IncarnationNumber in = sub_types.front ().first;
-    sub_types.pop_front ();
-    
-    for (int j = unconsidered_types.size () - 1;
-	 j >= 0 && offer_filter.ok_to_consider_more ();
-	 j--)
-      {
-	TYPE_STRUCT type_struct;
-	CORBA::Boolean is_sub_type = 0;
-	const char* type_name = unconsidered_types.front ();
-	unconsidered_types.pop_front ();
-	
-	TAO_TRY
-	  {
-	    // Obtain a description of the prospective type.
-	    type_struct = rep->describe_type (type_name, TAO_TRY_ENV);
-	    TAO_CHECK_ENV;
-	  }
-	TAO_CATCHANY
-	  {
-	    break;
-	  }
-	TAO_ENDTRY;
-
-	// If this incarnation number is less than the supertype's,
-	// this can't be a subtype. 
-	if (type_struct->incarnation > in)
-	  {	  	  	
-	    // Determine if the prospective type is a subtype of the current
-	    // one -- that is, has the current one as its supertype.
-	    for (int k = type_struct->super_types.length () - 1;
-		 k >= 0; k--)
-	      {
-		is_sub_type = (ACE_OS::strcmp
-			       ((const char *) type_struct->super_types[k],
-				super_type) == 0);
-
-		if (is_sub_type)
-		  break;
-	      }
-	  }
-
-	// If this type isn't a subtype, return it to the queue for
-	// later consideration.
-	if (is_sub_type)
-	  {
-	    // Otherwise, perform a constraint match on the type, and
-	    // add it to the queue of potential supertypes.
-	    this->lookup_one_type (type_name,
-				   service_type_map,
-				   constr_inter,
-				   pref_inter,
-				   offer_filter);
-	    sub_types.push_back (make_pair (in, (char *) type_name));
-	  }
-	else
-	  unconsidered_types.push_back ((char *) type_name);
-      }
-  }
-}
-
-
-template <class TRADER> int
-TAO_Lookup<TRADER>::
-fill_receptacles (const char* type,
-		  LOOKUP_OFFER_LIST& ordered_offers,
-		  CORBA::ULong how_many,		  
-		  const CosTrading::Lookup::SpecifiedProps& desired_props,
-		  CosTrading::OfferSeq*& offers,
-		  CosTrading::OfferIterator_ptr& offer_itr,
-		  CORBA::Environment& env)
-  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		  CosTrading::DuplicatePropertyName))
-{
-  // BEGIN SPEC
-  // The returned offers are passed back in one of two ways (or a
-  // combination of both). ° The "offers" return result conveys a list
-  // of offers and the "offer_itr" is a reference to an interface at
-  // which offers can be obtained. ° The "how_many" parameter states
-  // how many offers are to be returned via the "offers" result, any
-  // remaining offers are available via the iterator interface. If the
-  // "how_many" exceeds the number of offers to be returned, then the
-  // "offer_itr" will be nil.
-  // END SPEC
-  
-  // Ordered offers iterator.
-  LOOKUP_OFFER_LIST::iterator ordered_offers_iterator = 
-    ordered_offers.begin ();
-  TAO_Property_Filter prop_filter (desired_props, env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-  
-  // RETURNING: Calculate how many offers go into the sequence
-  //  Calculate how many go into the iterator
-  int size = ordered_offers.size ();
-  CORBA::ULong offers_in_sequence = (how_many < size) ? how_many : size;
-  CORBA::ULong offers_in_iterator = size - offers_in_sequence;
-  CORBA::ULong total_offers = offers_in_sequence + offers_in_iterator;
-  
-  offers->length (offers_in_sequence);
-  
-  // Add to the sequence, filtering out the undesired properties.
-  for (int i = 0; i < offers_in_sequence; ordered_offers_iterator++, i++)
-    {
-      CosTrading::Offer& source = *((*ordered_offers_iterator).second);
-      CosTrading::Offer& destination = (*offers)[i];
-      prop_filter.filter_offer (source, destination);
-    }
-    
-  // Any remaining offers go into iterator
-  if (offers_in_iterator > 0)
-    {
-      // Create an iterator implementation 
-      TAO_Offer_Iterator *oi =
-	this->create_offer_iterator (type, prop_filter);  
-      offer_itr = oi->_this (env);
-      TAO_CHECK_ENV_RETURN (env,total_offers - offers_in_iterator);
-      
-      // Add to the iterator
-      for (i = 0;
-	   i < offers_in_iterator;
-	   ordered_offers_iterator++, i++)
-	{
-	  oi->add_offer ((*ordered_offers_iterator).first, 
-			 (*ordered_offers_iterator).second);
-	}
-    }
-
-  return total_offers;
-}
-
-template <class TRADER>
-TAO_Offer_Iterator *
-TAO_Lookup<TRADER>::
-create_offer_iterator (const char *type,
-		       const TAO_Property_Filter& pfilter)
-{
-  // This is the factory method that creates the appropriate type of
-  // offer iterator. If there's no Register interface, then we can
-  // just stick the offers directly into an iterator, since these
-  // offers will never be removed from the Trader. If there's a
-  // Register interface, then there's a chance that by the time the
-  // importer calls the next_n method on the iterator that the offer
-  // will have been withdrawn. So the Register_Offer_Iterator retains only
-  // the offer ids, and will recognize when an offer id no longer
-  // identifies an offer in the trader.
-
-  // We pass the property filter to the iterators, so when the iterators
-  // return the offers, they can remove the undesirable properties
-  // from those offers.  
-  TAO_Offer_Iterator* iterator = 0;
-  
-  if (CORBA::is_nil (this->trader_.trading_components ().register_if ()))
-    iterator =  new TAO_Query_Only_Offer_Iterator (pfilter);
-  else
-    {
-      iterator =
-	new TAO_Register_Offer_Iterator<TRADER> (this->trader_, pfilter);
-    }
-
-  return iterator;
-}
-
-template <class TRADER> CORBA::Boolean
-TAO_Lookup<TRADER>::duplicate_stem_id (TAO_Policies& policies,
-				       CORBA::Environment& _env)
-{
-  // Determine whether the stem_id passed to this query is one we've 
-  // already seen. If this is the case, then we shouldn't pursue this
-  // query any further.
-  CORBA::Boolean return_value = CORBA::B_FALSE;
-  CosTrading::Admin::OctetSeq_var request_id = policies.request_id (_env);
-  TAO_CHECK_ENV_RETURN (_env, return_value);
-
-  // If the stem_id was provided and is a duplicate, return true.
-  if ((request_id.ptr () != 0) &&
-      (this->request_ids_.insert (request_id)).second == 0)
-    return_value = CORBA::B_TRUE;
-
-  return return_value;
-}
-
-template <class TRADER> CORBA::Boolean
-TAO_Lookup<TRADER>::retrieve_links (TAO_Policies& policies,
-				    CORBA::ULong offers_returned,
-				    CosTrading::LinkNameSeq_out links,
-				    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::Lookup::PolicyTypeMismatch))
-{
-  CORBA::Boolean should_follow = CORBA::B_FALSE;
-  CosTrading::FollowOption follow_rule = policies.link_follow_rule (_env);
-  TAO_CHECK_ENV_RETURN (_env, should_follow);
-  
-  // Determine whether or not a federated query is warranted. A query
-  // is waranted if the follow_rule governing this query is 'always'
-  // or if_no_local and the local query returned nothing.
-  if ((follow_rule == CosTrading::always ||
-       (follow_rule == CosTrading::if_no_local && offers_returned == 0))
-      && policies.hop_count (_env) > 0)
-    should_follow = CORBA::B_TRUE;
-
-  if (should_follow)
-    {
-      // Grab the names of all the links in the trader, and push
-      // the suitable ones onto <valid_links>.
-      CosTrading::Link_var link_interface
-	= this->trader_.trading_components ().link_if ();
-      deque<CosTrading::LinkName> valid_links;
-      CosTrading::LinkNameSeq_var link_path =
-	link_interface->list_links (_env);
-      TAO_CHECK_ENV_RETURN (_env, should_follow);
-      
-      // Determine which of the links registered with the Link
-      // interface are suitable to follow. 
-      for (int i = link_path->length () - 1; i >= 0; i--)
-	{
-	  CosTrading::FollowOption link_rule =
-	    policies.link_follow_rule ((const char*) link_path[i], _env);
-	  if (link_rule == CosTrading::always ||
-	      (link_rule == CosTrading::if_no_local &&
-	       offers_returned == 0))
-	    valid_links.push_back ((char *)((const char*) link_path[i]));
-	}
-
-      // Collect those valid links into a sequence suitable for
-      // passing into the federated_query method.
-      links = new CosTrading::LinkNameSeq (valid_links.size ());
-      for (i = valid_links.size (); i >= 0; i--, valid_links.pop_front ())
-	links[i] = valid_links.front ();
-    }
-
-  return should_follow;
-}
-
-
-template <class TRADER> void
-TAO_Lookup<TRADER>::
-federated_query (const CosTrading::LinkNameSeq& links,
-		 const char *type,
-		 const char *constr,
-		 const char *pref,
-		 TAO_Policies& policies,
-		 const CosTrading::Lookup::SpecifiedProps& desired_props,
-		 CORBA::ULong how_many,
-		 CosTrading::OfferSeq_out offers,
-		 CosTrading::OfferIterator_out offer_iter,
-		 CosTrading::PolicyNameSeq_out limits,
-		 CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType,
-		   CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::IllegalPolicyName,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::DuplicatePolicyName))
-{
-  // The general idea here is this: We've assembled a number of links
-  // to follow, and we'll query each of them in turn. When we've
-  // assembled <return_card> number of offers, we've hit the ceiling
-  // and we back out. On each query we adjust the policies for the new 
-  // trader by reducing the return_card, hop_count, etc..., and merge
-  // the results from the new query with the results from the previous 
-  // queries.
-  
-  // We'll need the link and admin interfaces for this part of the
-  // federated query.
-  CORBA::ULong total_returned = 0,
-    return_card = policies.return_card (_env);
-  CosTrading::Link_var link_interface
-    = this->trader_.trading_components ().link_if ();
-  CosTrading::Admin_var admin_interface
-    = this->trader_.trading_components ().admin_if ();
-
-  // Begin collecting all the various offer_iterators into a
-  // collection. The end result is a distributed tree of offer
-  // iterators, which if traversed in its entirety is probably hugely
-  // inefficient, but oh well, I can't think of a better solution.
-  TAO_Offer_Iterator_Collection* offer_iter_collection;
-  ACE_NEW_RETURN (offer_iter_collection,
-		  TAO_Offer_Iterator_Collection,);
-
-  offer_iter_collection->add_offer_iterator (offer_iter);
-  total_returned = offers->length () +
-    offer_iter_collection->max_left (_env);
-
-  for (int i = links.length () - 1; i >= 0; i--)
-    {
-      CosTrading::OfferSeq* out_offers = 0;
-      CosTrading::OfferIterator* out_offer_iter = 0;
-      CosTrading::PolicyNameSeq* out_limits = 0; 
-      CosTrading::OfferSeq_var out_offers_var (out_offers);
-      CosTrading::OfferIterator_var out_offer_iter_var (out_offer_iter);
-      CosTrading::PolicyNameSeq_var out_limits_var (out_limits);
-	    
-      TAO_TRY
-	{
-	  // Obtain information about the link we're traversing.
-	  CosTrading::Link::LinkInfo_var link_info =
-	    link_interface->describe_link (links[i], TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  // Prepare a set of policies to pass to the next trader.
-	  CosTrading::PolicySeq_var new_pols =
-	    policies.policies_to_pass (link_info->def_pass_on_follow_rule,
-				       total_returned,
-				       admin_interface.in ());
-	  
-	  // Perform the federated query.
-	  link_info->target->
-	    query (type,
-		   constr,
-		   pref,
-		   new_pols.in (),
-		   desired_props,
-		   how_many - offers->length (),
-		   CosTrading::OfferSeq_out (out_offers),
-		   CosTrading::OfferIterator_out (out_offer_iter),
-		   CosTrading::PolicyNameSeq_out (out_limits),
-		   _env);
-	  TAO_CHECK_ENV;
-	  
-	  // Merge the results.
-	  CORBA::ULong offset = offers->length ();
-	  offers->length (out_offers->length () + offset);
-	  offer_iter_collection->add_offer_iterator (out_offer_iter);
-	  for (int j = out_offers->length () - 1; j >= 0; j--)
-	    offers[j + offset] = out_offers_var[j];
-
-	  // Concatenate the limits applied.
-	  offset = limits->length ();
-	  offers->length (out_limits->length () + offset);
-	  for (j = out_limits->length () - 1; j >= 0; j--)
-	    limits[j + offset] = out_limits_var[j];
-
-	  // If we've obtained all the offers we need, let's blow this 
-	  // joint. 
-	  if (total_returned >= return_card)
-	    break;
-	}
-      TAO_CATCHANY
-	{
-	  break;
-	}
-      TAO_ENDTRY;
-    }
-
-  // Return the collection of offer iterators.
-  offer_iter = offer_iter_collection->_this (_env);
-}
-
-template <class TRADER> void
-TAO_Lookup<TRADER>
-::forward_query (const CosTrading::TraderName& starting_trader,
-		 const char *type,
-		 const char *constr,
-		 const char *pref,
-		 TAO_Policies& policies,
-		 const CosTrading::Lookup::SpecifiedProps& desired_props,
-		 CORBA::ULong how_many,
-		 CosTrading::OfferSeq_out offers,
-		 CosTrading::OfferIterator_out offer_itr,
-		 CosTrading::PolicyNameSeq_out limits_applied,
-		 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType,
-		   CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::IllegalPolicyName,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::DuplicatePolicyName))
-{
-  // Forward this query to the next link in the starting_trader sequence.
-  CosTrading::Link_var link_interface
-    = this->trader_.trading_components ().link_if ();
-  CosTrading::Admin_var admin_interface
-    = this->trader_.trading_components ().admin_if ();
-
-  TAO_TRY
-    {  
-      CosTrading::Link::LinkInfo_var link_info =
-	link_interface->describe_link (starting_trader[0], TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      CosTrading::PolicySeq_var in_policies = policies.policies_to_forward ();
-
-      // Perform forwarding query.
-      link_info->target->query (type,
-				constr,
-				pref,
-				in_policies.in (),
-				desired_props,
-				how_many,
-				offers,
-				offer_itr,
-				limits_applied,
-				_env);
-      TAO_CHECK_ENV_RETURN (_env,);
-    }
-  TAO_CATCHANY
-    {
-      TAO_THROW (CosTrading::Lookup::InvalidPolicyValue ());
-    }
-  TAO_ENDTRY;
-}
-
-int
-operator< (const CosTrading::Admin::OctetSeq_var& l,
-	   const CosTrading::Admin::OctetSeq_var& r)
-{
-  int return_value = 0;
-  CosTrading::Admin::OctetSeq& left = l;
-  CosTrading::Admin::OctetSeq& right = r;
-  CORBA::ULong left_length = left.length (),
-    right_length = right.length ();
-
-  
-  if (left_length < right_length)
-    return_value = 1;
-  else if (left_length == right_length)
-    {
-      for (int i = 0; i < left_length; i++)
-	{
-	  if (left[i] < right[i])
-	    {
-	      return_value = 1;
-	      break;
-	    }
-	  else if (left[i] > right[i])
-	    break;
-	}
-    }
-
-  return return_value;
-}
-
-#endif /* TAO_LOOKUP_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
deleted file mode 100644
index c304bc9195a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Lookup.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_LOOKUP_H
-#define TAO_LOOKUP_H
-
-#include "Policies.h"
-#include "Offer_Filter.h"
-#include "Offer_Iterator.h"
-#include "Constraint_Interpreter.h"
-#include "Preference_Interpreter.h"
-
-#include <list>
-
-template<class TRADER>
-class TAO_Lookup :
-  public TAO_Trader_Components<POA_CosTrading::Lookup>,
-  public TAO_Support_Attributes<POA_CosTrading::Lookup>,
-  public TAO_Import_Attributes<POA_CosTrading::Lookup>
-  //
-  // = TITLE
-  //     This class implements CosTrading::Lookup IDL interface.
-{    
-public:
-  
-  TAO_Lookup (TRADER &trader);
-
-  ~TAO_Lookup (void);
-  
-  virtual void
-    query (const char *type,
-	   const char *constr,
-	   const char *pref,
-	   const CosTrading::PolicySeq& policies,
-	   const CosTrading::Lookup::SpecifiedProps& desired_props,
-	   CORBA::ULong how_many,
-	   CosTrading::OfferSeq_out offers,
-	   CosTrading::OfferIterator_out offer_itr,
-	   CosTrading::PolicyNameSeq_out limits_applied,
-	   CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType,
-		    CosTrading::UnknownServiceType,
-		    CosTrading::IllegalConstraint,
-		    CosTrading::Lookup::IllegalPreference,
-		    CosTrading::Lookup::IllegalPolicyName,
-		    CosTrading::Lookup::PolicyTypeMismatch,
-		    CosTrading::Lookup::InvalidPolicyValue,
-		    CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName,
-		    CosTrading::DuplicatePolicyName));
-
-  // BEGIN SPEC
-  // The query operation is the means by which an object can obtain
-  // references to other objects that provide services meeting its
-  // requirements.
-  
-  // The "type" parameter conveys the required service type. It is key
-  // to the central purpose of trading: to perform an introduction for
-  // future type safe interactions between importer and exporter. By
-  // stating a service type, the importer implies the desired interface
-  // type and a domain of discourse for talking about properties of the
-  // service.
-
-  // The trader may return a service offer of a subtype of the "type"
-  // requested. Sub-typing of service types is discussed in "Service
-  // Types" on page 16-4. A service subtype can be described by the
-  // properties of its supertypes. This ensures that a well-formed
-  // query for the "type" is also a well-formed query with respect to
-  // any subtypes. However, if the importer specifies the policy of
-  // exact_type_match = TRUE, then only offers with the exact (no
-  // subtype) service type requested are returned. 
-
-  // The constraint "constr" is the means by which the importer states
-  // those requirements of a service that are not captured in the
-  // signature of the interface. These requirements deal with the
-  // computational behavior of the desired service, non-functional
-  // aspects, and non-computational aspects (such as the organization
-  // owning the objects that provide the service). An importer is
-  // always guaranteed that any returned offer satisfies the matching
-  // constraint at the time of import. If the "constr" does not obey
-  // the syntax rules for a legal constraint expression, then an
-  // IllegalConstraint exception is raised.
-
-  // The "pref" parameter is also used to order those offers that
-  // match the "constr" so that the offers returned by the trader are
-  // in the order of greatest interest to the importer. If "pref" does
-  // not obey the syntax rules for a legal preference expression, then
-  // an IllegalPreference exception is raised.
-
-  // The "policies" parameter allows the importer to specify how the
-  // search should be performed as opposed to what sort of services
-  // should be found in the course of the search. This can be viewed
-  // as parameterizing the algorithms within the trader
-  // implementation. The "policies" are a sequence of name-value
-  // pairs. The names available to an importer depend on the
-  // implementation of the trader. However, some names are
-  // standardized where they effect the interpretation of other
-  // parameters or where they may impact linking and federation of
-  // traders. 
-
-  // The "desired_props" parameter defines the set of properties
-  // describing returned offers that are to be returned with the
-  // object reference. There are three possibilities, the importer
-  // wants one of the properties, all of the properties (but without
-  // having to name them), or some properties (the names of which are
-  // provided).
-
-  // The desired_props parameter does not affect whether or not a
-  // service offer is returned. To avoid "missing" desired properties,
-  // the importer should specify "exists prop_name" in the
-  // constraint. 
-
-  // The returned offers are passed back in one of two ways (or a
-  // combination of both). °The "offers" return result conveys a list
-  // of offers and the "offer_itr" is a reference to an interface at
-  // which offers can be obtained. The "how_many" parameter states
-  // how many offers are to be returned via the "offers" result, any
-  // remaining offers are available via the iterator interface. If the
-  // "how_many" exceeds the number of offers to be returned, then the
-  // "offer_itr" will be nil. 
-
-  // If any cardinality or other limits were applied by one or more
-  // traders in responding to a particular query, then the
-  // "limits_applied" parameter will contain the names of the policies
-  // which limited the query. The sequence of names returned in
-  // "limits_applied" from any federated or proxy queries must be
-  // concatenated onto the names of limits applied locally and
-  // returned.
-  // END SPEC
-  
-  static const char* NAME;
-
-  // Handy Typedefs
-  typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-  typedef CosTradingRepos::ServiceTypeRepository::TypeStruct_var TYPE_STRUCT;
-  typedef CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var TYPE_NAME_SEQ;
-  
-private:
-
-  typedef TRADER::LOCAL_OFFER_ITER LOCAL_OFFER_ITER;
-  typedef TRADER::SERVICE_TYPE_MAP SERVICE_TYPE_MAP;
-  typedef pair<CosTrading::OfferId, CosTrading::Offer*> OFFER;
-  typedef deque<OFFER> LOOKUP_OFFER_LIST;
-  
-  TAO_Offer_Iterator*
-    create_offer_iterator (const char *type,
-			   const TAO_Property_Filter& filter);
-  // Factory method for creating an appropriate Offer Iterator based
-  // on the presence of the Register Interface. 
-  
-  void perform_lookup (const char* type,
-		       const char* constraint,
-		       const char* preferences,
-		       SERVICE_TYPE_MAP& service_type_map,
-		       CosTradingRepos::ServiceTypeRepository_ptr rep,
-		       TAO_Policies& policies,
-		       LOOKUP_OFFER_LIST& ordered_offers,
-		       PolicyNameSeq_out returned_limits_applied,
-		       CORBA::Environment& env)
-    TAO_THROW_SPEC ((CosTrading::IllegalConstraint,
-		    CosTrading::Lookup::IllegalPreference,
-		    CosTrading::Lookup::PolicyTypeMismatch,
-		    CosTrading::Lookup::InvalidPolicyValue,
-		    CosTrading::IllegalServiceType,
-		    CosTrading::UnknownServiceType));
-  // This method has three phases. The first phase passes the
-  // offer_map through the constraint interpreter, winnowing away
-  // those offers that don't match the validated constraint. The
-  // second phase orders the offers using the specified
-  // preferences. The last phase places the ordered offers into a list 
-  // for returning. At each phase, the cardinality policies specified
-  // in the policies structure determine the number of offers
-  // submitted to each phase. 
-
-  void lookup_all_subtypes (const char* type,
-			    SERVICE_TYPE_REPOS::IncarnationNumber& inc_num,
-			    SERVICE_TYPE_MAP& service_type_map,
-			    CosTradingRepos::ServiceTypeRepository_ptr rep,
-			    TAO_Constraint_Interpreter& constr_inter,
-			    TAO_Preference_Interpreter& pref_inter,
-			    TAO_Offer_Filter& offer_filter);
-  // Traverse the type hierarchy to pull the matching offers from all
-  // subtypes of the root type.
-  
-  void lookup_one_type (const char* type,
-			SERVICE_TYPE_MAP& service_type_map,
-			TAO_Constraint_Interpreter& constr_inter,
-			TAO_Preference_Interpreter& pref_inter,
-			TAO_Offer_Filter& offer_filter);
-  // Check if offers of a type fit the constraints and order them
-  // according to the preferences submitted.
-    
-  int fill_receptacles (const char* type,
-			 LOOKUP_OFFER_LIST& ordered_offers,
-			 CORBA::ULong how_many,
-			 const CosTrading::Lookup::SpecifiedProps& desired_props,			 
-			 CosTrading::OfferSeq*& offers,
-			 CosTrading::OfferIterator_ptr& offer_itr,
-			 CORBA::Environment& env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName));
-  // This method takes the list of ordered offers and places a number
-  // of them in the sequence of returned offers and the rest into thr
-  // iterator. In addition, fill_receptacles uses the
-  // TAO_Property_Filter to ensure the returned offers contain the
-  // properties specified in the desired_props in parameter.
-
-  void forward_query (const CosTrading::TraderName& starting_trader,
-		      const char *type,
-		      const char *constr,
-		      const char *pref,
-		      TAO_Policies& policies,
-		      const CosTrading::Lookup::SpecifiedProps& desired_props,
-		      CORBA::ULong how_many,
-		      CosTrading::OfferSeq_out offers,
-		      CosTrading::OfferIterator_out offer_itr,
-		      CosTrading::PolicyNameSeq_out limits_applied,
-		      CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
-  // If a starting_trader policy was specfied, foward the query to the 
-  // next link in the sequence.
-		      
-  CORBA::Boolean duplicate_stem_id (TAO_Policies& policies,
-				    CORBA::Environment& _env);
-  // Determine if the stem id provided to the query is one we've
-  // already seen.
-
-  CORBA::Boolean retrieve_links (TAO_Policies& policies,
-				 CORBA::ULong offer_returned,
-				 CosTrading::LinkNameSeq_out links,
-				 CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::Lookup::PolicyTypeMismatch));
-  // Assemble a sequence of links that the federate_query method
-  // should follow. Use the starting_trader policy, if one's provided, 
-  // otherwise use the Link interface to determine which of the
-  // registered links should be followed in this query.
-  
-  void federated_query (const CosTrading::LinkNameSeq& links,
-			const char *type,
-			const char *constr,
-			const char *pref,
-			TAO_Policies& policies,
-			const CosTrading::Lookup::SpecifiedProps& desired_props,
-			CORBA::ULong how_many,
-			CosTrading::OfferSeq_out offers,
-			CosTrading::OfferIterator_out offer_itr,
-			CosTrading::PolicyNameSeq_out limits_applied,
-			CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
-  // Perform and pass on a query over a set of links. Merge the
-  // results of the federated queries into a single set of results
-  // suitable for returning to the user.  
-  
-  TRADER &trader_;
-  // A reference to the trader for obtaining offer maps.
-
-  typedef set
-    <
-    CosTrading::Admin::OctetSeq_var,
-    less <CosTrading::Admin::OctetSeq_var>
-    >
-    REQUEST_IDS;
-  
-  REQUEST_IDS request_ids_;
-  // A list of recent request_id_stems 
-};
-
-int operator< (const CosTrading::Admin::OctetSeq_var& left,
-	       const CosTrading::Admin::OctetSeq_var& right);
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Lookup.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_LOOKUP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Monitor.h b/TAO/orbsvcs/orbsvcs/Trader/Monitor.h
deleted file mode 100644
index 21741ca7bda..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Monitor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-//
-// = LIBRARY
-//    orsvcs
-// 
-// = FILENAME
-//    Monitor.h
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
-// ============================================================================
-
-#ifndef TAO_MONITOR_H
-#define TAO_MONITOR_H
-
-template <class TYPE, class TAO_LOCK>
-class TAO_Monitor : public TYPE
-{
-  //
-  // = TITLE
-  //
-  //     A utility class for writing applications where access to an
-  //     object must be synchronized in a multithreaded environment.
-  //     
-  //
-  // = DESCRIPTION
-  //
-  //     A monitor associates a lock of type TAO_LOCK with an object
-  //     of type TYPE.  The user is fully responsible for invoking all
-  //     necessary acquire/release operations on that lock (i.e. the
-  //     monitor does not automate any lock operations - all
-  //     operations are invoked explicitly by the user).  The
-  //     usefullness of a monitor is in associating one lock with one
-  //     object without the need for inheritance or much code.
-  //  
-  //
-public:
-  
-  typedef TAO_LOCK LOCK_TYPE;
-
-  TAO_Monitor (void)
-    : delete_ (1)
-    {
-      ACE_NEW (this->lock_, TAO_LOCK);
-    }
-  
-  TAO_Monitor (const TAO_Monitor& monitor)
-    {
-      // Assume control of their lock.
-      TAO_Monitor* mon = (TAO_Monitor*)&monitor;
-      mon->delete_ = 0;
-      this->delete_ = 1;
-      this->lock_ = mon->lock_;
-    }
-
-  ~TAO_Monitor (void)
-    {
-      if (this->delete_)
-	delete this->lock_;
-    }
-  
-  // Return a reference to the lock that I use.
-  TAO_LOCK &lock (void)
-  {
-    return *this->lock_;
-  }
-
-  // Return a reference to the lock that I use.
-  const TAO_LOCK &lock (void) const
-  {
-    return *this->lock_;
-  }
-
-protected:
-
-  int delete_;
-  
-  TAO_LOCK* lock_;
-  // Lock used to monitor the object.
-};
-
-#endif /* #define TAO_MONITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.cpp
deleted file mode 100644
index 8ab65eac401..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "Offer_Filter.h"
-
-TAO_Offer_Filter::
-TAO_Offer_Filter (SERVICE_TYPE_REPOS::TypeStruct* type_struct,
-		  TAO_Policies& policies,
-		  CORBA::Environment& _env)
-  : search_card_ (policies.search_card (_env)),
-    match_card_ (policies.match_card (_env)),
-    return_card_ (policies.return_card (_env)),
-    dp_ (policies.use_dynamic_properties (_env)),
-    mod_ (policies.use_modifiable_properties (_env))
-{
-  SERVICE_TYPE_REPOS::PropStructSeq& prop_seq = type_struct->props;
-
-  // Take note of modifiable properties in the type_struct
-  for (int i = prop_seq.length () - 1; i >= 0; i--)
-    {
-      SERVICE_TYPE_REPOS::PropertyMode mode = prop_seq[i].mode;
-      if (mode != SERVICE_TYPE_REPOS::PROP_MANDATORY_READONLY ||
-	  mode != SERVICE_TYPE_REPOS::PROP_READONLY)
-	this->mod_props_.insert (string (prop_seq[i].name));
-    }
-
-  if (policies.exact_type_match (_env) == CORBA::B_TRUE)
-    this->limits_.insert
-      (string (TAO_Policies::POLICY_NAMES[TAO_Policies::EXACT_TYPE_MATCH]));
-    
-}
-
-CORBA::Boolean
-TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer)
-{
-  const char* use_mods =
-    TAO_Policies::POLICY_NAMES[TAO_Policies::USE_MODIFIABLE_PROPERTIES];
-  const char* use_dyns =
-    TAO_Policies::POLICY_NAMES[TAO_Policies::USE_DYNAMIC_PROPERTIES];
-  CORBA::Boolean return_value = CORBA::B_TRUE;
-  TAO_Property_Evaluator prop_eval (*offer);
-
-  // If we should screen offers, determine if this offer is unworthy
-  // for consideration. 
-  if (! (this->mod_ && this->dp_))
-    {
-      for (int i = offer->properties.length () - 1;
-	   i >= 0 && return_value;
-	   i--)
-	{
-	  // Winnow away the unwanted offers with modifiable or
-	  // dynamic properties.
-	  if (! this->mod_)
-	    {
-	      // Determine if this property name is found in the set
-	      // of modifiable properties for the type being considered.
-	      string prop_name (offer->properties[i].name);
-	      if (this->mod_props_.find (prop_name) !=
-		  this->mod_props_.end ())
-		{
-		  this->limits_.insert (string (use_mods));
-		  return_value = 0;
-		}
-	    }
-
-	  if (! this->dp_ && return_value)
-	    {
-	      // Determine if this property is dynamic.
-	      if (prop_eval.is_dynamic_property (i))
-		{
-		  this->limits_.insert (string (use_dyns));
-		  return_value = 0;
-		}
-	    }
-
-	  if (return_value == 0)
-	    break;
-	}
-    }
-
-  // If we're good to go, consider this offer considered and decrement 
-  // the search cardinality counter. 
-  if (return_value)
-    {
-      this->search_card_--;
-      if (this->search_card_ == 0)
-	{
-	  string search_card =
-	    TAO_Policies::POLICY_NAMES[TAO_Policies::SEARCH_CARD];
-	  this->limits_.insert (search_card);
-	}
-    }
-
-  return return_value;
-}
-
-CORBA::Boolean
-TAO_Offer_Filter::ok_to_consider_more (void)
-{
-  return this->search_card_ > 0 && this->match_card_ > 0;
-}
-
-void
-TAO_Offer_Filter::matched_offer (void)
-{
-  this->match_card_--;
-  this->return_card_--;
-
-  if (this->match_card_ == 0)
-    {
-      string match_card =
-	TAO_Policies::POLICY_NAMES[TAO_Policies::MATCH_CARD];
-      this->limits_.insert (match_card);
-    }
-
-  if (this->return_card_ == 0)
-    {
-      string return_card =
-	TAO_Policies::POLICY_NAMES[TAO_Policies::MATCH_CARD];
-      this->limits_.insert (return_card);
-    }
-}
-
-CosTrading::PolicyNameSeq*
-TAO_Offer_Filter::limits_applied (void)
-{
-  int i = 0;
-  CORBA::ULong size = this->limits_.size ();
-  CosTrading::PolicyName* temp =
-    CosTrading::PolicyNameSeq::allocbuf (size);
-
-  for (NAMES::iterator p_iter = this->limits_.begin();
-       p_iter != this->limits_.end ();
-       p_iter++)  
-    temp[i++] = CORBA::string_dup ((*p_iter).data ());
-  
-  return new CosTrading::PolicyNameSeq (i, i, temp, 1);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.h
deleted file mode 100644
index 30ec30a994c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Filter.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Offer_Filter.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_OFFER_FILTER_H
-#define TAO_OFFER_FILTER_H
-
-#include "Policies.h"
-#include "Property_Evaluator.h"
-
-#include <set>
-#include <string>
-
-class TAO_Offer_Filter
-// = TITLE
-//    The purpose of this class is to ensure that offers that
-//    shouldn't be considered by the TAO_Constraint_Interpreter
-//    aren't.
-// 
-// = DESCRIPTION
-//    There two classes of reasons why an offer for a correct
-//    type shouldn't be considered: 1) The default parameters of the
-//    Trader or policies passed to the Lookup::query method deem it
-//    inappropriate to consider offers with modifiable (i.e., not
-//    readonly) or dynamic properties. 2) We've exceeded the
-//    default or provided cardinality constraints. TAO_Offer_Filter
-//    ensures that violation of policies doesn't occur. It's the
-//    enforcer. 
-{
-public:
-  
-  typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-  
-  TAO_Offer_Filter (SERVICE_TYPE_REPOS::TypeStruct* type_struct,
-		    TAO_Policies& policies,
-		    CORBA::Environment& _env);
-  // Glean from the TypeStruct and Policy setting the appropriate way
-  // to screen unsuitable offers from consideration.
-  
-  CORBA::Boolean ok_to_consider (CosTrading::Offer* offer);
-  // Determine whether the poicies contained in the given policy
-  // object allow the Lookup interface to consider the offer. That is, 
-  // if use_modifiable_properties is false, and the offer contains
-  // modifiable properties as designated in the type struct, return
-  // false. If use_dynamic_properties is false, and the offer contains 
-  // dynamic properties, then return false. If the lookup interface is 
-  // safe in considering this offer, return true and subtract from the 
-  // search card value. When the search card value falls to zero,
-  // ok_to_consider always returns false.
-  
-  CORBA::Boolean ok_to_consider_more (void);
-  // It's ok to consider more offers when lookup hasn't exceeded the
-  // cardinality values for searching and matching offers.
-
-  void matched_offer (void);
-  // Signal that the Lookup method has matched an offer; decrement the 
-  // match_card.
-
-  // = Return the limits applied.  
-  CosTrading::PolicyNameSeq* limits_applied (void);
-  // BEGIN SPEC
-  // If any cardinality or other limits were applied by one or more
-  // traders in responding to a particular query, then the
-  // "limits_applied" parameter will contain the names of the policies
-  // which limited the query. The sequence of names returned in
-  // "limits_applied" from any federated or proxy queries must be
-  // concatenated onto the names of limits applied locally and
-  // returned. 
-  // END SPEC
-  
-private:
-
-  typedef set<string, less<string> > NAMES;
-  
-  NAMES mod_props_;
-  // The set of the name of modifiable properties.
-
-  NAMES limits_;
-  // Cardinality and property limitations applied.
-  
-  CORBA::ULong search_card_, match_card_, return_card_;
-  // Keep track of the cardinalities.
-  
-  CORBA::Boolean dp_;
-  CORBA::Boolean mod_;
-  // Keep track of property limitations: modifiable or dynamic ones
-  // may be bad.
-};
-
-#endif /* TAO_OFFER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.cpp
deleted file mode 100644
index 0353428ab57..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Offer_Id_terator.cpp
-//
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//  
-// ============================================================================ 
-
-#include "Offer_Id_Iterator.h"
-
-TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator(void)
-{
-}
-
-TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
-{
-  int items_left = this->ids_.size ();
-
-  for (int i = 0; i < items_left; i++)
-    {
-      CORBA::string_free (this->ids_.front ());
-      this->ids_.pop ();
-    }
-}
-
-CORBA::ULong
-TAO_Offer_Id_Iterator::max_left(CORBA::Environment& env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::UnknownMaxLeft))
-{
-  return this->ids_.size ();
-}
-
-void
-TAO_Offer_Id_Iterator::destroy(CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  
-  TAO_TRY
-    {
-      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      poa->deactivate_object (id.in (), TAO_TRY_ENV);
-    }
-  TAO_CATCHANY
-    {      
-    }
-  TAO_ENDTRY;
-  
-  delete this;  
-}
-
-CORBA::Boolean
-TAO_Offer_Id_Iterator::next_n(CORBA::ULong n,
-			      CosTrading::OfferIdSeq_out _ids,
-			      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // Calculate the number of Ids to be returned in this.
-  int items_left = this->ids_.size(),
-    difference = items_left - n,
-    returnable_items = (difference >= 0) ? n : items_left;
-  CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0);
-    
-  if (returnable_items == 0)
-    {
-      ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value);
-    }
-  else
-    {
-      // Allocate space for the returned OfferIds.
-      CosTrading::OfferId* id_buf =
-	CosTrading::OfferIdSeq::allocbuf (returnable_items);
-
-      if (id_buf != 0)
-	{      
-	  // Copy in those ids!
-	  for (int i = 0; i < returnable_items; i++)
-	    {
-	      char* offer_id = this->ids_.front ();
-	      id_buf[i] = offer_id;
-	      this->ids_.pop ();
-	    }
-	  
-	  // Place them into an OfferIdSeq.
-	  ACE_NEW_RETURN (_ids,
-			  CosTrading::OfferIdSeq (returnable_items,
-						  returnable_items,
-						  id_buf,
-						  1),
-			  return_value);
-	}
-      else
-	ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value);
-    }
-
-  // Return true only if there are items left to be returned in
-  // subsequent calls.
-  return return_value;
-}
-
-void
-TAO_Offer_Id_Iterator::insert_id(CosTrading::OfferId new_id)
-{
-  this->ids_.push (new_id);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h
deleted file mode 100644
index 95dd129763d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Offer_Id_terator.h
-//
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//  
-// ======================================================================= 
-
-#ifndef TAO_OFFER_ID_ITERATOR_H
-#define TAO_OFFER_ID_ITERATOR_H
-
-#include <deque>
-#include <queue>
-#include <string>
-
-#include "orbsvcs/CosTradingS.h"
-
-class TAO_Offer_Id_Iterator : public POA_CosTrading::OfferIdIterator
-// = TITLE
-//   Silly little iterator that contains the overflow of offer ids
-//   from the Admin list_offers method.
-// 
-// = DESCRIPTION
-//
-//   BEGIN SPEC
-//   The OfferIdIterator interface is used to return a set of offer
-//   identifiers from the list_offers operation and the list_proxies
-//   operation in the Admin interface by enabling the offer identifiers
-//   to be extracted by successive operations on the OfferIdIterator
-//   interface. 
-//   END SPEC
-{
- public:
-  
-  TAO_Offer_Id_Iterator(void);
-  // No op constructor
-
-  ~TAO_Offer_Id_Iterator (void);
-  
-  virtual CORBA::ULong max_left(CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::UnknownMaxLeft));
-  // The max_left operation returns the number of offer identifiers
-  // remaining in the iterator. The exception UnknownMaxLeft is raised
-  // if the iterator cannot determine the remaining number of offer
-  // identifiers (e.g., if the iterator determines its set of offer
-  // identifiers through lazy evaluation). 
-  
-  virtual void destroy(CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // The destroy operation destroys the iterator. No further
-  // operations can be invoked on an iterator after it has been
-  // destroyed. 
-  
-  virtual CORBA::Boolean next_n(CORBA::ULong _n,
-				CosTrading::OfferIdSeq_out _ids,
-				CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // The next_n operation returns a set of offer identifiers in the
-  // output parameter "ids." The operation returns n offer identifiers
-  // if there are at least n offer identifiers remaining in the
-  // iterator. If there are fewer than n offer identifiers in the
-  // iterator, then all remaining offer identifiers are returned. The
-  // actual number of offer identifiers returned can be determined
-  // from the length of the "ids" sequence. The next_n operation
-  // returns TRUE if there are further offer identifiers to be
-  // extracted from the iterator. It returns FALSE if there are no
-  // further offer identifiers to be extracted. 
-  
-  void insert_id(CosTrading::OfferId new_id);
-  // Insert a <new_id> into the contents of the iterator.
-  
- private:
-
-#ifdef OS_NO_DEFAULT_TEMPLATE_ARGUMENTS
-  typedef queue<CosTrading::OfferId, deque<CosTrading::OfferId> > OFFER_ID_QUEUE;
-#else
-  typedef queue<CosTrading::OfferId> OFFER_ID_QUEUE;
-#endif /* OS_NO_DEFAULT_TEMPLATE_ARGUMENTS */
-  
-  OFFER_ID_QUEUE ids_;
-};
-
-#endif /* TAO_OFFER_ID_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.cpp
deleted file mode 100644
index 7732f2c7fa4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Offer_Iterator.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#define ACE_BUILD_DLL
-
-#include "Offer_Iterator.h"
-
-
-TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter)
-  : pfilter_ (pfilter)
-{
-}
-
-TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
-{
-}
-
-void 
-TAO_Offer_Iterator::destroy (CORBA::Environment& env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  
-  TAO_TRY
-    {
-      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      poa->deactivate_object (id.in (), TAO_TRY_ENV);
-    }
-  TAO_CATCHANY
-    {      
-    }
-  TAO_ENDTRY;
-  
-  delete this;  
-}
-
-                
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.h
deleted file mode 100644
index 9f74af2b6e1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Offer_Iterator.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-#ifndef TAO_OFFER_ITERATOR_H
-#define TAO_OFFER_ITERATOR_H
-
-#include "Property_Filter.h"
-
-class TAO_Export TAO_Offer_Iterator :
-  public POA_CosTrading::OfferIterator
-  // = TITLE
-  //     This class implements CosTrading::OfferIterator IDL
-  //     interface. 
-
-  // = DESCRIPTION
-  //     This is an abstract base class  to allow for different
-  //     implementations of OfferIterator.
-  // BEGIN SPEC
-  //   The OfferIterator interface is used to return a set of service
-  //   offers from the query operation by enabling the service offers
-  //   to be extracted by successive operations on the OfferIterator
-  //   interface.
-  // END SPEC
-{
-public:
-  // = Initialization and termination methods.
-
-  TAO_Offer_Iterator (const TAO_Property_Filter& property_filter);
-
-  virtual ~TAO_Offer_Iterator (void);
-  
-  virtual void destroy (CORBA::Environment& _env)  
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // BEGIN SPEC
-  // The destroy operation destroys the iterator. No further
-  // operations can be invoked on an iterator after it has been
-  // destroyed. 
-  // END SPEC
-  
-  virtual void add_offer (CosTrading::OfferId offer_id,
-			  CosTrading::Offer* offer) = 0;
-  // Add an offer to the collection of offers the iterator will
-  // iterate over. 
-
-  virtual CORBA::ULong max_left (CORBA::Environment &env) = 0
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::UnknownMaxLeft));
-
-  // BEGIN SPEC
-  // The max_left operation returns the number of service offers
-  // remaining in the iterator. The exception UnknownMaxLeft is raised
-  // if the iterator cannot determine the remaining number of service
-  // offers (e.g., if the iterator determines its set of service
-  // offers through lazy evaluation). 
-  // END SPEC
-  
-  virtual CORBA::Boolean next_n (CORBA::ULong n,
-				 CosTrading::OfferSeq_out offers,
-				 CORBA::Environment &env) = 0
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // BEGIN SPEC
-  // The next_n operation returns a set of service offers in the
-  // output parameter "offers." The operation returns n service offers
-  // if there are at least n service offers remaining in the
-  // iterator. If there are fewer than n service offers in the
-  // iterator, then all remaining service offers are returned. The
-  // actual number of service offers returned can be determined from
-  // the length of the "offers" sequence. The next_n operation returns
-  // TRUE if there are further service offers to be extracted from the
-  // iterator. It returns FALSE if there are no further service offers
-  // to be extracted.  
-  // END SPEC
- protected:
-
-  TAO_Property_Filter pfilter_;
-};
-
-#endif /* TAO_OFFER_ITERATOR */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp
deleted file mode 100644
index ec78e9f2921..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-
-#include "Offer_Iterator_Collection.h"
-
-TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection (void)
-  : total_left_ (0)
-{
-}
-
-void
-TAO_Offer_Iterator_Collection::
-add_offer_iterator (CosTrading::OfferIterator* offer_iter)
-{
-  Iter_Info iter_info;
-
-  if (offer_iter != CosTrading::OfferIterator::_nil ())
-    {  
-      TAO_TRY
-	{
-	  iter_info.iter_ = offer_iter;
-	  iter_info.num_left_ = offer_iter->max_left (TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	}
-      TAO_CATCHANY
-	{
-	  // I don't know what to do here if the offer_iterator throws
-	  // an UnknownMaxLeft exception.
-	}
-      TAO_ENDTRY;
-
-      this->total_left_ += iter_info.num_left_;
-      this->iters_.push_back (iter_info);
-    }
-}
-
-CORBA::Boolean
-TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
-				       CosTrading::OfferSeq_out offers,
-				       CORBA::Environment &env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::ULong offers_left = n;
-  CORBA::Boolean return_value = CORBA::B_TRUE;
-  CosTrading::OfferSeq_var out_offers;
-  
-  ACE_NEW_RETURN (offers, CosTrading::OfferSeq, return_value);
-  while (offers_left > 0 && ! this->iters_.empty ())
-    {
-      Iter_Info& iter_info = this->iters_.front ();
-
-      // Determine how many offers we should retrieve from this
-      // iterator. 
-      CORBA::ULong offers_to_retrieve =
-	(offers_left > iter_info.num_left_)
-	? iter_info.num_left_
-	: offers_left;
-
-      // Retrieve the set of offers.
-      iter_info.iter_->next_n
-	(offers_to_retrieve,
-	 CosTrading::OfferSeq_out (out_offers.out ()),
-	 env);
-
-      // Merge it with the passed set.
-      CORBA::ULong offset = offers->length ();
-      offers->length (out_offers->length () + offset);
-      for (int j = out_offers->length () - 1; j >= 0; j--)
-	offers[j + offset] = out_offers[j];
-
-      // Adjust the offer counters.
-      offers_left -= offers_to_retrieve;
-      iter_info.num_left_ -= offers_to_retrieve;
-      this->total_left_ -= offers_to_retrieve;
-
-      // If we've exhausted this iterator, destroy it.
-      if (iter_info.num_left_ == 0)
-	{
-	  iter_info.iter_->destroy (env);
-	  this->iters_.pop_front ();
-	}
-    }
-
-  // Determine if we have anything left to offer.
-  if (this->iters_.empty ())
-    return_value = B_FALSE;
-
-  return return_value;
-}
-
-void
-TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& _env)  
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // Destroy all iterators in the collection.
-  for (OFFER_ITERS::iterator iters_iter = this->iters_.begin ();
-       iters_iter != this->iters_.end ();
-       iters_iter++)
-    (*iters_iter).iter_->destroy (_env);
-
-  this->total_left_ = 0;
-
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  
-  TAO_TRY
-    {
-      PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      PortableServer::ObjectId_var id =
-	poa->servant_to_id (this, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      poa->deactivate_object (id.in (), TAO_TRY_ENV);
-    }
-  TAO_CATCHANY
-    {      
-    }
-  TAO_ENDTRY;
-  
-  delete this;  
-}
-
-CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::UnknownMaxLeft))
-{
-  return this->total_left_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h
deleted file mode 100644
index 74b5cd06eef..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Offer_Iterator_Collection.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_OFFER_ITERATOR_COLLECTION_H
-#define TAO_OFFER_ITERATOR_COLLECTION_H
-
-#include <deque>
-#include "orbsvcs/CosTradingS.h"
-
-class TAO_Offer_Iterator_Collection : public POA_CosTrading::OfferIterator
-// = TITLE
-//   A collection of offer iterator to query in turn.
-//
-// = DESCRIPTION
-//   Since a query could conceivable query several other traders, it
-//   needs a way to merge the results into a single set of results
-//   suitable for being returned to the user. And since all the query
-//   method can return to the user is a sequence and an iterator, and
-//   the size of the sequence is constrained, there needs to be some
-//   way to collect all the returned offer_iterators into a single
-//   offer_iterator. This is that collection. The results of
-//   collecting all the iterators in this way is a distributed tree of 
-//   iterators, which could conceivably become hugely inefficient if
-//   the trader graphs is deep enough.
-{
-public:
-
-  // = Constructors.
-  
-  TAO_Offer_Iterator_Collection (void);
-
-  virtual ~TAO_Offer_Iterator_Collection (void) {}
-
-  virtual CORBA::Boolean next_n (CORBA::ULong n,
-				 CosTrading::OfferSeq_out offers,
-				 CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Retrieve n offers from the set of iterators.
-  
-  virtual void destroy (CORBA::Environment& _env)  
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Destroy the collection of iterators.
-  
-  virtual CORBA::ULong max_left (CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::UnknownMaxLeft));
-  // Determine how many offers are left in the collection
- 
-  void add_offer_iterator (CosTrading::OfferIterator* offer_iter);
-  // Add an iterator to the collection.  
-
-private:
-
-  struct Iter_Info
-  {
-    CosTrading::OfferIterator_var iter_;
-    // Object reference for this iterator in the collection.
-    
-    CORBA::ULong num_left_;
-    // Cached value of the number of elements left in this iterator. 
-  };
-  
-  typedef deque<Iter_Info> OFFER_ITERS;
-
-  OFFER_ITERS iters_;
-  // The iterator collection.
-  
-  CORBA::ULong total_left_;
-  // Cached value of the number of offers left in the collection.
-};
-
-#endif /* TAO_OFFER_ITERATOR_COLLECTION_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.cpp
deleted file mode 100644
index e433eaa9023..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// $Id$
-
-#include "Offer_Modifier.h"
-
-TAO_Offer_Modifier::
-TAO_Offer_Modifier (const char* type_name,
-		    TYPE_STRUCT* type_struct,
-		    CosTrading::Offer& offer)
-  : offer_ (offer),
-    type_ (type_name)
-{
-  typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-
-  CosTrading::PropertySeq& prop_seq = this->offer_.properties;
-  SERVICE_TYPE_REPOS::PropStructSeq& pstructs = type_struct->props;
-  int pstructs_length = pstructs.length (),
-    props_length = prop_seq.length ();
-
-  // Separate the type defined properties into mandatory and readonly
-  for (int i = 0; i < pstructs_length; i++)
-    {
-      if (pstructs[i].mode == SERVICE_TYPE_REPOS::PROP_MANDATORY)
-	this->mandatory_.insert (string (pstructs[i].name));
-      else if (pstructs[i].mode == SERVICE_TYPE_REPOS::PROP_READONLY)
-	this->readonly_.insert (string (pstructs[i].name));
-    }
-
-  // Insert the properties of the offer into a map.
-  for (i = 0; i < props_length; i++)
-    this->props_[string (prop_seq[i].name)] = &prop_seq[i];
-}
-
-void
-TAO_Offer_Modifier::
-delete_properties (const CosTrading::PropertyNameSeq& deletes,
-		   CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, 
-		  CosTrading::Register::MandatoryProperty,
-		  CosTrading::IllegalPropertyName,
-		  CosTrading::DuplicatePropertyName))
-{
-  PROP_NAMES delete_me;
-  // Validate that the listed property names can be deleted
-  for (int i = 0, length = deletes.length (); i < length; i++)
-    {
-      CosTrading::PropertyName dname = (char*)((const char *) deletes[i]);
-      if (! TAO_Trader_Base::is_valid_identifier_name (dname))
-	TAO_THROW (CosTrading::IllegalPropertyName (dname));
-      else
-	{
-	  string prop_name (dname);
-	  if (this->mandatory_.find (prop_name) != this->mandatory_.end ())
-	    TAO_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
-	  else if ((delete_me.insert (prop_name)).second == 0)
-	    TAO_THROW (CosTrading::DuplicatePropertyName (dname));
-	  else if (this->props_.find (prop_name) == this->props_.end ())
-	    TAO_THROW (CosTrading::Register::UnknownPropertyName (dname));
-	}
-    }
-
-  // Delete those properties from the offer.
-  for (i = 0; i < length; i++)
-    {
-      string prop_name = (const char *) deletes[i];
-      this->props_.erase (prop_name);
-    } 
-}
-
-void
-TAO_Offer_Modifier::
-merge_properties (const CosTrading::PropertySeq& modifies,
-		  CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::Register::ReadonlyProperty))
-{
-  PROP_NAMES modify_me;
-  // Ensure that the proposed changes aren't to readonly properties or
-  // otherwise invalid.
-  for (int i = 0, length = modifies.length (); i < length; i++)
-    {
-      CosTrading::PropertyName mname =
-	(char*) ((const char *) modifies[i].name);
-      if (! TAO_Trader_Base::is_valid_identifier_name (mname))
-	TAO_THROW (CosTrading::IllegalPropertyName (mname));
-      else
-	{
-	  string prop_name (mname);
-	  if (this->readonly_.find (prop_name) != this->readonly_.end () &&
-	      this->props_.find (prop_name) == this->props_.end ())
-	    TAO_THROW (CosTrading::Register::ReadonlyProperty (this->type_, mname));
-	  else if ((modify_me.insert (prop_name)).second == 0)
-	    TAO_THROW (CosTrading::DuplicatePropertyName (mname));
-	}
-    }
-
-  for (i = 0; i < length; i++)
-    {
-      // Add a property to the destination if it doesn't already exist.
-      pair <PROPS::iterator, bool> insert_return = 
-	this->props_.insert (make_pair (string (modifies[i].name),
-					(CosTrading::Property *) &modifies[i]));
-
-      // Modify a property if it already exists in the destination.
-      if (! insert_return.second)
-	{
-	  PROPS::iterator& dup = insert_return.first;
-	  CosTrading::Property* prop = (*dup).second;
-
-	  prop->value = modifies[i].value;
-	}
-    }
-}
-
-CosTrading::Offer&
-TAO_Offer_Modifier::affect_change (void)
-{
-  int elem = 0;
-  CosTrading::PropertySeq prop_seq;
-
-  // Create a new property list reflecting the deletes, modifies, and
-  // add operations performed, and place this property list in the
-  // offer. 
-  prop_seq.length (this->props_.size ());
-  for (PROPS::iterator props_iter = this->props_.begin ();
-       props_iter != this->props_.end ();
-       props_iter++, elem++)
-    {
-      prop_seq[elem] = *(*props_iter).second;
-    }
-
-  this->offer_.properties = prop_seq;
-  return this->offer_;
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.h
deleted file mode 100644
index 755ce79c189..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Modifier.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Offer_Modifier
-//
-// = AUTHOR
-//    Seth Widoff   <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef ACE_OFFER_MODIFIER_H
-#define ACE_OFFER_MODIFIER_H
-
-#include <set>
-#include <map>
-#include "Trader.h"
-
-class TAO_Offer_Modifier
-// = TITLE
-//   This class deletes, modifies, and adds properties to a given
-//   offer according to the rules of the modify method on the Register 
-//   interface.
-{
-public:
-
-  typedef CosTradingRepos::ServiceTypeRepository::TypeStruct TYPE_STRUCT;  
-  
-  TAO_Offer_Modifier (const char* type,
-		      TYPE_STRUCT* type_struct,
-		      CosTrading::Offer& offer);
-  // Modify an <offer> of type <type>, whose properties are described
-  // by <type_struct>
-  
-  void delete_properties (const CosTrading::PropertyNameSeq& deletes,
-			  CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, 
-		    CosTrading::Register::MandatoryProperty,
-		    CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName));
-  // Delete the properties whose names were given to the
-  // constructor. Ensure we don't delete mandatory properties.
-
-  void merge_properties (const CosTrading::PropertySeq& modifies,
-			 CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		    CosTrading::DuplicatePropertyName,
-		    CosTrading::Register::ReadonlyProperty));
-  // Copy to the destination the union of the source and destination
-  // properties. In the case of duplicate properties, update the
-  // destination with the source's value.
-
-  CosTrading::Offer& affect_change (void);
-  // Return a reference to the Offer with the changes affected.
-  
-private:
-
-  typedef set< string, less <string> > PROP_NAMES;
-  typedef map< string, CosTrading::Property*, less <string> > PROPS;
-
-  const char* type_;
-  // The type of the offer.
-  
-  PROPS props_;
-  // The map of properties in the offer.
-  
-  PROP_NAMES readonly_, mandatory_;
-  // The set of readonly and mandatory property names in the offer's
-  // type.
-  
-  CosTrading::Offer& offer_;
-  // A reference to the offer undergoing change.
-};
-
-#endif /* TAO_OFFER_MODIFIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policies.cpp b/TAO/orbsvcs/orbsvcs/Trader/Policies.cpp
deleted file mode 100644
index f2bfba6bd13..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Policies.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-// $Id$
-
-#include "Policies.h"
-
-const char* TAO_Policies::POLICY_NAMES[] = 
-{
-  "exact_type_match",
-  "hop_count",
-  "link_follow_rule",
-  "match_card",
-  "return_card",
-  "search_card",
-  "starting_trader",
-  "use_dynamic_properties",
-  "use_modifiable_properties",
-  "use_proxy_offers",
-  "request_id"
-};
-
-TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
-			    const CosTrading::PolicySeq& policies,
-			    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
-		  CosTrading::DuplicatePolicyName))
-  : trader_ (trader),
-    policies_ (USE_PROXY_OFFERS + 1)
-{
-  for (int i = 0; i <= REQUEST_ID; i++)
-    this->policies_[i] = 0;
-
-  for (int j = 0; j < policies.length (); j++)
-    {      
-      const char* pol_name = (const char*) policies[j].name;
-      int length = (pol_name == 0) ? 0 : ACE_OS::strlen (pol_name),
-	index = -1;
-
-      if (length < ACE_OS::strlen (POLICY_NAMES[HOP_COUNT]))
-	TAO_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
-      
-      switch (pol_name[0])
-	{
-	case 'e':
-	  index = EXACT_TYPE_MATCH;
-	  break;
-	case 'h':
-	  index = HOP_COUNT;
-	  break;
-	case 'l':
-	  index = LINK_FOLLOW_RULE;
-	  break;
-	case 'm':
-	  index = MATCH_CARD;
-	  break;
-	case 'r':
-	  if (pol_name[2] == 't')
-	    index = RETURN_CARD;
-	  else if (pol_name[2] == 'q')
-	    index = REQUEST_ID;
-	  break;
-	case 's':
-	  if (pol_name[1] == 't')
-	    index == STARTING_TRADER;
-	  else if (pol_name[1] == 'e')
-	    index = SEARCH_CARD;
-	  break;
-	case 'u':
-	  if (pol_name[4] == 'd')
-	    index = USE_DYNAMIC_PROPERTIES;
-	  if (pol_name[4] == 'm')
-	    index = USE_MODIFIABLE_PROPERTIES;
-	  if (pol_name[4] == 'p')
-	    index = USE_PROXY_OFFERS;
-	}
-
-      // Match the name of the policy, and insert its value into the
-      // vector. 
-      if (index == -1 || ::strcmp (POLICY_NAMES[index], pol_name) != 0)
-	TAO_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
-      else
-	{
-	  if (this->policies_[index] != 0)
-	    TAO_THROW (CosTrading::DuplicatePolicyName (pol_name));
-	  else
-	    this->policies_[index] = (CosTrading::Policy *) &(policies[j]);
-	}
-    }
-}
-
-CORBA::ULong
-TAO_Policies::ulong_prop (POLICY_TYPE pol,
-			  CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  CORBA::ULong return_value = 0, max_value;
-  TAO_Import_Attributes_Impl& import_attrs =
-    this->trader_.import_attributes ();
-
-  // Discover the default values for each of the possible cardinality
-  // policies. 
-  switch (pol)
-    {
-    case SEARCH_CARD:
-      return_value = import_attrs.def_search_card ();
-      max_value = import_attrs.max_search_card ();
-      break;
-    case MATCH_CARD:
-      return_value = import_attrs.def_match_card ();
-      max_value = import_attrs.max_match_card ();
-      break;
-    case RETURN_CARD:
-      return_value = import_attrs.def_return_card ();
-      max_value = import_attrs.max_return_card ();
-      break;
-    case HOP_COUNT:
-      return_value = import_attrs.def_hop_count ();
-      max_value = import_attrs.max_hop_count ();
-      break;
-    }
-  
-  if (this->policies_[pol] != 0)
-    {
-      // Extract the desired policy value.
-      CosTrading::Policy* policy = this->policies_[pol];
-      CosTrading::PolicyValue& value = policy->value;
-      CORBA::TypeCode* type = value.type ();
-      
-      if (!type->equal (CORBA::_tc_ulong, _env))
-	TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			  return_value);
-      else
-	value >>= return_value;
-
-      if (max_value < return_value)
-	return_value = max_value;
-    }
-  
-  return return_value;
-}
-
-CORBA::ULong
-TAO_Policies::search_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->ulong_prop (SEARCH_CARD, _env);
-}
-
-CORBA::ULong
-TAO_Policies::match_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->ulong_prop (MATCH_CARD, _env);
-}
-
-CORBA::ULong
-TAO_Policies::return_card (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->ulong_prop (RETURN_CARD, _env);
-}
-
-CORBA::Boolean
-TAO_Policies::boolean_prop (POLICY_TYPE pol,
-			    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  CORBA::Boolean def_value = CORBA::B_TRUE,
-    return_value = CORBA::B_TRUE;
-  TAO_Support_Attributes_Impl& support_attrs =
-    this->trader_.support_attributes ();
-
-  switch (pol)
-    {
-    case USE_MODIFIABLE_PROPERTIES:
-      def_value = support_attrs.supports_modifiable_properties ();
-      break;
-    case USE_DYNAMIC_PROPERTIES:
-      def_value = support_attrs.supports_dynamic_properties ();
-      break;
-    case USE_PROXY_OFFERS:
-      def_value = support_attrs.supports_proxy_offers ();
-      break;
-    case EXACT_TYPE_MATCH:
-      def_value = CORBA::B_FALSE;
-      break;
-    }
-  
-  if (this->policies_[pol] != 0)
-    {
-      CosTrading::Policy* policy = this->policies_[pol];
-      CosTrading::PolicyValue& value = policy->value;
-      CORBA::TypeCode* type = value.type ();
-      
-      if (!type->equal (CORBA::_tc_boolean, _env))
-	TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			  return_value);
-      else
-	value >>= to_boolean (return_value);
-
-      if (def_value == CORBA::B_FALSE)
-	return_value = CORBA::B_FALSE;
-    }
-  else
-    return_value = def_value;
-
-  return return_value;
-}
-
-
-CORBA::Boolean
-TAO_Policies::use_modifiable_properties (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, _env);
-}
-
-CORBA::Boolean
-TAO_Policies::use_dynamic_properties (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES, _env);
-}
-
-CORBA::Boolean
-TAO_Policies::use_proxy_offers (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->boolean_prop (USE_PROXY_OFFERS, _env);
-}
-
-CORBA::Boolean
-TAO_Policies::exact_type_match (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->boolean_prop (EXACT_TYPE_MATCH, _env);
-}
-
-
-CosTrading::TraderName*
-TAO_Policies::starting_trader (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue))
-{
-  CosTrading::TraderName* trader_name = 0;
-  
-  if (this->policies_[STARTING_TRADER] != 0)
-    {
-      CosTrading::Policy* policy = this->policies_[STARTING_TRADER];
-      CosTrading::PolicyValue& value = policy->value;
-      CORBA::TypeCode* type = value.type ();
-      
-      if (!type->equal (CosTrading::_tc_TraderName, _env))
-	TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			  trader_name);
-      else
-	{
-	  ACE_NEW_RETURN (trader_name, CosTrading::TraderName, 0);
-	  //	  value >>= *trader_name;
-	}
-    }
-
-  return trader_name;
-}
-
-CosTrading::FollowOption
-TAO_Policies::link_follow_rule (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  CosTrading::FollowOption return_value = 
-    this->trader_.import_attributes ().def_follow_policy ();
-
-  if (this->policies_[LINK_FOLLOW_RULE] != 0)
-    {
-      CosTrading::FollowOption max_follow_policy = 
-	this->trader_.import_attributes ().max_follow_policy ();
-
-      CosTrading::Policy* policy = this->policies_[LINK_FOLLOW_RULE];
-      CosTrading::PolicyValue& value = policy->value;
-      CORBA::TypeCode* type = value.type ();
-
-      // Extract the link follow rule 
-      if (!type->equal (CosTrading::_tc_FollowOption, _env))
-	TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			  return_value);
-      else
-	//	    value >>= return_value;
-	;
-
-      if (return_value > max_follow_policy)
-	return_value = max_follow_policy;
-    }
-
-  return return_value;
-}
-
-CosTrading::FollowOption
-TAO_Policies::link_follow_rule (const char* link_name,
-				CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::Link::IllegalLinkName,
-		   CosTrading::Link::UnknownLinkName))
-{
-  CosTrading::FollowOption return_value = CosTrading::local_only;
-  CosTrading::Link_var link
-    (this->trader_.trading_components ().link_if ());
-
-  if (link != CosTrading::Link::_nil ())
-    {
-      CosTrading::Link::LinkInfo_var
-	link_info (link->describe_link (link_name, _env));
-      TAO_CHECK_ENV_RETURN (_env, return_value);
-      CosTrading::FollowOption trader_max_follow_policy = 
-	this->trader_.import_attributes ().max_follow_policy ();
-      
-      if (this->policies_[LINK_FOLLOW_RULE] != 0)
-	{
-	  CosTrading::FollowOption query_link_follow_rule;
-	  CosTrading::FollowOption link_limiting_follow_rule =
-	    link_info->limiting_follow_rule;
-	  CosTrading::Policy* policy = this->policies_[LINK_FOLLOW_RULE];
-	  CosTrading::PolicyValue& value = policy->value;
-	  CORBA::TypeCode* type = value.type ();
-
-	  // Extract the link follow rule 
-	  if (!type->equal (CosTrading::_tc_FollowOption, _env))
-	    TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			      return_value);
-	  else
-	    {
-	      //	    value >>= query_link_follow_rule;
-	    }
-
-	  return_value = (query_link_follow_rule < trader_max_follow_policy) 
-	    ? query_link_follow_rule : trader_max_follow_policy;
-	  return_value = (return_value < link_limiting_follow_rule)
-	    ? return_value : link_limiting_follow_rule;
-	}
-      else
-	{
-	  CosTrading::FollowOption link_def_follow_rule =
-	    this->trader_.import_attributes ().max_follow_policy ();
-
-	  return_value = (link_def_follow_rule < trader_max_follow_policy)
-	    ? link_def_follow_rule : trader_max_follow_policy;
-	}           
-    }
-
-  return return_value;
-}
-
-CORBA::ULong
-TAO_Policies::hop_count (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  return this->ulong_prop (HOP_COUNT, _env);
-}
-
-CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
-{
-  CosTrading::Admin::OctetSeq* request_id = 0;
-  
-  if (this->policies_[REQUEST_ID] != 0)
-    {
-      CosTrading::Policy* policy = this->policies_[REQUEST_ID];
-      CosTrading::PolicyValue& value = policy->value;
-      CORBA::TypeCode* type = value.type ();
-      
-      if (!type->equal (CosTrading::Admin::_tc_OctetSeq_seq, _env))
-	TAO_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
-			  request_id);
-      else
-	{
-	  ACE_NEW_RETURN (request_id, CosTrading::Admin::OctetSeq, 0);
-	  //	value >>= *request_id;
-	}
-    }
-
-  return request_id;
-}
-
-CosTrading::PolicySeq*
-TAO_Policies::policies_to_forward (void)
-{
-  // Create a new policy sequence, shortening the starting trader
-  // policy by one link.
-  
-  CORBA::Environment env;
-  CORBA::ULong counter = 0;
-  CosTrading::Policy* policy_buffer =
-    CosTrading::PolicySeq::allocbuf (REQUEST_ID + 1);
-  
-  if (policy_buffer == 0)
-    return 0;
-  
-  for (int i = EXACT_TYPE_MATCH; i <= REQUEST_ID; i++)
-    {
-      CosTrading::Policy& new_policy = policy_buffer[counter];
-      
-      if (this->policies_[i] != 0)
-	{
-	  // Copy in the existing policies.
-	  new_policy.name = this->policies_[i]->name;
-
-	  if (i == STARTING_TRADER)
-	    {
-	      TAO_TRY
-		{
-		  // Eliminate the first link of the trader name.
-		  CosTrading::TraderName* trader_name =
-		    this->starting_trader (env);
-		  CORBA::ULong length = trader_name->length ();
-		  
-		  for (int j = 1; j < length; j++)
-		    trader_name[j - 1] = trader_name[j];		  
-		  trader_name->length (length - 1);
-
-		  //		  new_policy.value <<= *trader_name;
-		}
-	      TAO_CATCHANY {}
-	      TAO_ENDTRY;	      
-	    }
-	  else
-	    new_policy.value = this->policies_[i]->value;
-	}
-    }
-
-  // Create the new sequence
-  return new CosTrading::PolicySeq (REQUEST_ID + 1, counter,
-				    policy_buffer, CORBA::B_TRUE);
-}
-
-CosTrading::PolicySeq*
-TAO_Policies::
-policies_to_pass (CosTrading::FollowOption def_pass_on_follow_rule,
-		  CORBA::ULong offers_returned,
-		  CosTrading::Admin_ptr admin_if)
-{
-  // Create a new policy sequence to pass to a federated
-  // query. Decrement the hop count, add a stem id if none exists, and 
-  // add a follow rule if none exists. Also adjust the return_card to
-  // account for previous queries.
-  CORBA::Environment env;
-  CORBA::ULong counter = 0;
-  CosTrading::Policy* policy_buffer =
-    CosTrading::PolicySeq::allocbuf (REQUEST_ID + 1);
-
-  if (policy_buffer == 0)
-    return 0;
-  
-  for (int i = EXACT_TYPE_MATCH; i <= REQUEST_ID; i++)
-    {
-      CosTrading::Policy& new_policy = policy_buffer[counter];
-      
-      if (this->policies_[i] != 0)
-	{
-	  // Add an existing query.
-	  new_policy.name = this->policies_[i]->name;
-	  new_policy.value = this->policies_[i]->value;
-	}
-      else
-	{	  
-	  if (i == LINK_FOLLOW_RULE)
-	    {
-	      // Add a link follow rule if one didn't exist.
-	      new_policy.name = POLICY_NAMES[i];
-	      //	      new_policy.value <<= def_pass_on_follow_rule;
-	    }
-	  else if (i == REQUEST_ID)
-	    {
-	      // Add the request id if one didn't exist.
-	      new_policy.name = POLICY_NAMES[i];
-	      //	      new_policy.value <<= *(admin_if->request_id_stem (env));
-	    }
-	}    
-
-      if (i == HOP_COUNT)
-	{
-	  // Decrement the hop count.
-	  new_policy.name =  POLICY_NAMES[i];
-	  new_policy.value <<= this->hop_count (env) - 1;
-	}
-      else if (i == RETURN_CARD)
-	{
-	  // Adjust the return card.
-	  new_policy.name =  POLICY_NAMES[i];
-	  new_policy.value <<= this->return_card (env) - offers_returned;
-	}
-    }
-
-  // Create the new sequence.
-  return new CosTrading::PolicySeq (REQUEST_ID + 1, counter,
-				    policy_buffer, CORBA::B_TRUE);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policies.h b/TAO/orbsvcs/orbsvcs/Trader/Policies.h
deleted file mode 100644
index 82e1964d834..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Policies.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Policies.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ======================================================================= 
-
-#ifndef TAO_POLICIES_H
-#define TAO_POLICIES_H
-
-// STL fun stuff.
-#include <vector>
-#include <set>
-#include <string>
-
-#include "Trader.h"
-
-class TAO_Policies
-//
-// = TITLE
-// This class ensures that policies submitted to Lookup make sense,
-// have the correct value types, and don't exceed the maximums set
-// through the Admin Interface. 
-//
-// = DESCRIPTION
-// TAO_Policies does an admirable job of reconciling differences
-// between the default parameter settings of the Trader and the import 
-// and other policies set by the client. Unbeknownst to its client
-// TAO_Policies hides this arbitration, and records whether the user
-// policy was chosen, or the default. This information gets returned
-// to the invoker of the query method.
-{
-public:
-
-  enum POLICY_TYPE
-  {
-    EXACT_TYPE_MATCH,
-    HOP_COUNT,
-    LINK_FOLLOW_RULE,
-    MATCH_CARD,
-    RETURN_CARD,
-    SEARCH_CARD,
-    STARTING_TRADER,
-    USE_DYNAMIC_PROPERTIES,
-    USE_MODIFIABLE_PROPERTIES,
-    USE_PROXY_OFFERS,
-    REQUEST_ID
-  };
-  
-  static const char * POLICY_NAMES[];
-  
-  TAO_Policies (TAO_Trader_Base& trader,
-		const CosTrading::PolicySeq& policies,
-		CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::DuplicatePolicyName));
-
-  // BEGIN SPEC
-  // The "policies" parameter allows the importer to specify how the
-  // search should be performed as opposed to what sort of services
-  // should be found in the course of the search. This can be viewed
-  // as parameterizing the algorithms within the trader
-  // implementation. The "policies" are a sequence of name-value
-  // pairs. The names available to an importer depend on the
-  // implementation of the trader. However, some names are
-  // standardized where they effect the interpretation of other
-  // parameters or where they may impact linking and federation of
-  // traders. ° If a policy name in this parameter does not obey the
-  // syntactic rules for legal PolicyName's, then an IllegalPolicyName
-  // exception is raised. ° If the type of the value associated with a
-  // policy differs from that specified in this specification, then a
-  // PolicyTypeMismatch exception is raised. ° If subsequent
-  // processing of a PolicyValue yields any errors (e.g., the
-  // starting_trader policy value is malformed), then an
-  // InvalidPolicyValue exception is raised. ° If the same policy name
-  // is included two or more times in this parameter, then the
-  // DuplicatePolicyName exception is raised. 
-  // END SPEC
-  
-  CORBA::ULong search_card (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "search_card" policy indicates to the trader the maximum
-  // number of offers it should consider when looking for type
-  // conformance and constraint expression match. The lesser of this
-  // value and the trader's max_search_card attribute is used by the
-  // trader. If this policy is not specified, then the value of the
-  // trader's def_search_card attribute is used.
-  // END SPEC
-  
-  CORBA::ULong match_card (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "match_card" policy indicates to the trader the maximum
-  // number of matching offers to which the preference specification
-  // should be applied. The lesser of this value and the trader's
-  // max_match_card attribute is used by the trader. If this policy is
-  // not specified, then the value of the trader's def_match_card
-  // attribute is used.
-  // END SPEC
-  
-  CORBA::ULong return_card (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "return_card" policy indicates to the trader the maximum
-  // number of matching offers to return as a result of this
-  // query. The lesser of this value and the trader's max_return_card
-  // attribute is used by the trader. If this policy is not specified,
-  // then the value of the trader's def_return_card attribute is
-  // used. 
-  // END SPEC
-  
-  // = Offer consideration policies
-  
-  CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "use_modifiable_properties" policy indicates whether the
-  // trader should consider offers which have modifiable properties
-  // when constructing the set of offers to which type conformance and
-  // constraint processing should be applied. If the value of this
-  // policy is TRUE, then such offers will be included; if FALSE, they
-  // will not. If this policy is not specified, such offers will be
-  // included.
-  // END SPEC
-  
-  CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "use_dynamic_properties" policy indicates whether the trader
-  // should consider offers which have dynamic properties when
-  // constructing the set of offers to which type conformance and
-  // constraint processing should be applied. If the value of this
-  // policy is TRUE, then such offers will be included; if FALSE, they
-  // will not. If this policy is not specified, such offers will be
-  // included.
-  // END SPEC
-  
-  CORBA::Boolean use_proxy_offers (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "use_proxy_offers" policy indicates whether the trader should
-  // consider proxy offers when constructing the set of offers to
-  // which type conformance and constraint processing should be
-  // applied. If the value of this policy is TRUE, then such offers
-  // will be included; if FALSE, they will not. If this policy is not
-  // specified, such offers will be included.
-  // END SPEC
-  
-  CORBA::Boolean exact_type_match (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "exact_type_match" policy indicates to the trader whether the
-  // importer's service type must exactly match an offer's service
-  // type; if not (and by default), then any offer of a type
-  // conformant to the importer's service type is considered.
-  // END SPEC
-  
-  // = Federated trader policies (not implemented yet)
-  
-  CosTrading::TraderName* starting_trader (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		    CosTrading::Lookup::InvalidPolicyValue));
-  // BEGIN SPEC
-  // The "starting_trader" policy facilitates the distribution of the
-  // trading service itself. It allows an importer to scope a search
-  // by choosing to explicitly navigate the links of the trading
-  // graph. If the policy is used in a query invocation it is
-  // recommended that it be the first policy-value pair; this
-  // facilitates an optimal forwarding of the query operation. A
-  // "policies" parameter need not include a value for the
-  // "starting_trader" policy. Where this policy is present, the first
-  // name component is compared against the name held in each link. If
-  // no match is found, the InvalidPolicyValue exception is
-  // raised. Otherwise, the trader invokes query() on the Lookup
-  // interface held by the named link, but passing the
-  // "starting_trader" policy with the first component removed.
-  // END SPEC
-
-  CosTrading::FollowOption link_follow_rule (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-  // Determine the link follow policy for this query overall.
-  
-  CosTrading::FollowOption link_follow_rule (const char* link_name,
-					     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue));
-  // Determine the link follow policy for a given <link_name>.
-  
-  // BEGIN SPEC
-  //The "link_follow_rule" policy indicates how the client wishes
-  //links to be followed in the resolution of its query. See the
-  //discussion in "Link Follow Behavior" on page 16-16 for details. 
-  // END SPEC
-
-  // This method returns the link_follow_rule for a link whose name is 
-  // <link_name> using the following formula:
-  // if the importer specified a link_follow_rule policy
-  //      min(trader.max_follow_policy, link.limiting_follow_rule,
-  //          query.link_follow_rule)
-  // else min(trader.max_follow_policy, link.limiting_follow_rule,
-  //          trader.def_follow_policy) 
-  
-  CORBA::ULong hop_count (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-
-  // BEGIN SPEC
-  // The "hop_count" policy indicates to the trader the maximum number
-  // of hops across federation links that should be tolerated in the
-  // resolution of this query. The hop_count at the current trader is
-  // determined by taking the minimum of the trader's max_hop_count
-  // attribute and the importer's hop_count policy, if provided, or
-  // the trader's def_hop_count attribute if it is not. If the
-  // resulting value is zero, then no federated queries are
-  // permitted. If it is greater than zero, then it must be
-  // decremented before passing on to a federated trader. 
-  // END SPEC
-
-  CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-  // Return the request_id passed to the query method across a link to
-  // another trader. 
-  
-  CosTrading::PolicySeq* policies_to_forward (void);
-  // Policies to forward to the next trader in a directed federated query.
-  
-  CosTrading::PolicySeq*
-    policies_to_pass (CosTrading::FollowOption def_pass_on_follow_rule,
-		      CORBA::ULong offers_returned,
-		      CosTrading::Admin_ptr admin_if);
-  // Policies to pass on to the next generation of queries. Decrements 
-  // the hop counter,adds a link_follow_rule if none exists, adjusts
-  // the return_card, and adds the stem_id if none exists.
-  
-private:
-
-  typedef vector <CosTrading::Policy*> POL_VECTOR;
-    
-  CORBA::ULong ulong_prop (POLICY_TYPE pol,
-			   CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-  // Reconclile a ULong property with its default.
-  
-  CORBA::Boolean boolean_prop (POLICY_TYPE pol,
-			       CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
-  // Reconcile a Boolean property with its debault.
-   
-  POL_VECTOR policies_;
-  // The policies indexable from the enumerated type.
-  
-  TAO_Trader_Base& trader_;
-  // For the validating identifier names.
-};
-
-
-#endif /* TAO_POLICIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.cpp b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.cpp
deleted file mode 100644
index 19b697199e6..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// $Id$
-
-#include "Policy_Manager.h"
-
-TAO_Policy_Manager::TAO_Policy_Manager (int num_policies)
-  : policies_ (num_policies),
-    num_policies_ (0)
-{
-  for (int i = 0; i < TAO_Policies::REQUEST_ID + 1; i++)
-    this->poltable_[i] = -1;
-}
-
-void
-TAO_Policy_Manager::search_card (CORBA::ULong scard)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::SEARCH_CARD);  
-  policy.value <<= scard;    
-}
-  
-void
-TAO_Policy_Manager::match_card (CORBA::ULong mcard)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::MATCH_CARD);  
-  policy.value <<= mcard;  
-}
-
-void
-TAO_Policy_Manager::return_card (CORBA::ULong rcard)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::RETURN_CARD);  
-  policy.value <<= rcard;  
-}
-
-void
-TAO_Policy_Manager::use_modifiable_properties (CORBA::Boolean mod_props)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::USE_MODIFIABLE_PROPERTIES);  
-  policy.value <<= CORBA::Any::from_boolean (mod_props);  
-}
-
-void
-TAO_Policy_Manager::use_dynamic_properties (CORBA::Boolean dyn_props)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::USE_DYNAMIC_PROPERTIES);  
-  policy.value <<= CORBA::Any::from_boolean (dyn_props);  
-}
-
-void
-TAO_Policy_Manager::use_proxy_offers (CORBA::Boolean prox_offs)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::USE_PROXY_OFFERS);  
-  policy.value <<= CORBA::Any::from_boolean (prox_offs);  
-}
-
-void
-TAO_Policy_Manager::starting_trader (CosTrading::TraderName* name)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::STARTING_TRADER);  
-  //  policy.value <<= *name;  
-}
-
-void
-TAO_Policy_Manager::
-link_follow_rule (CosTrading::FollowOption follow_option)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::LINK_FOLLOW_RULE);  
-  policy.value <<= follow_option;  
-}
-
-void
-TAO_Policy_Manager::hop_count (CORBA::ULong hop_count)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::HOP_COUNT);  
-  policy.value <<= hop_count;  
-}
-
-void
-TAO_Policy_Manager::exact_type_match (CORBA::Boolean exact_type)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::EXACT_TYPE_MATCH);  
-  policy.value <<= CORBA::Any::from_boolean (exact_type);  
-}
-
-void
-TAO_Policy_Manager::request_id (CosTrading::Admin::OctetSeq* request_id)
-{
-  CosTrading::Policy& policy =
-    this->fetch_next_policy (TAO_Policies::REQUEST_ID);  
-  //  policy.value <<= *request_id
-}
-
-TAO_Policy_Manager::operator const CosTrading::PolicySeq& (void) const
-{
-  return this->policies_;
-}
-
-const CosTrading::PolicySeq&
-TAO_Policy_Manager::policy_seq (void) const
-{
-  return this->policies_;
-}
-
-CosTrading::Policy&
-TAO_Policy_Manager::fetch_next_policy (POLICY_TYPE pol_type)
-{
-  CORBA::ULong index = 0;
-
-  if (this->poltable_[pol_type] == -1)
-    {
-      int length = this->policies_.length ();
-      this->num_policies_++;
-      
-      if (length < this->num_policies_)
-	this->policies_.length (this->num_policies_);
-      
-      index = this->num_policies_ - 1;
-      this->policies_[index].name = TAO_Policies::POLICY_NAMES[pol_type];
-      this->poltable_[pol_type] = index;
-    }
-  else
-    index = this->poltable_[pol_type];
-
-  return this->policies_[index];
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
deleted file mode 100644
index 3275f75dd28..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    ACE_Policies.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ======================================================================= 
-
-#ifndef TAO_POLICY_MANAGER_H
-#define TAO_POLICY_MANAGER_H
-
-#include <map>
-#include <string>
-
-#include "Policies.h"
-
-class TAO_Policy_Manager
-// = TITLE
-//
-// This class is a utility for clients using the CosTrading::Lookup
-// interface that helps them build a policy sequence without violating 
-// syntax rules and having to mess with typecodes.
-{
-public:
-
-  TAO_Policy_Manager (int num_policies = 0);
-
-  // = Routines to set policies.
-  
-  void search_card (CORBA::ULong scard);
-  
-  void match_card (CORBA::ULong mcard);
-    
-  void return_card (CORBA::ULong rcard);
-
-  void use_modifiable_properties (CORBA::Boolean mod_props);
-
-  void use_dynamic_properties (CORBA::Boolean dyn_props);
-
-  void use_proxy_offers (CORBA::Boolean prox_offs);
-
-  void starting_trader (CosTrading::TraderName* name);
-  
-  void link_follow_rule (CosTrading::FollowOption follow_option);
-
-  void hop_count (CORBA::ULong hop_count);
-
-  void request_id (CosTrading::Admin::OctetSeq* reqiest_id);
-  
-  void exact_type_match (CORBA::Boolean exact_type);
-
-  operator const CosTrading::PolicySeq& (void) const;
-
-  const CosTrading::PolicySeq& policy_seq (void) const;
-  // Return a PolicySeq suitable for passing to the query method of
-  // the Lookup interface.
-  
-private:
-
-  CosTrading::Policy& fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type);
-  
-  int poltable_[TAO_Policies::REQUEST_ID + 1];
-  
-  CosTrading::PolicySeq policies_;
-
-  CORBA::ULong num_policies_;
-};
-
-#endif /* TAO_POLICY_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp
deleted file mode 100644
index 55fd85864a8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// Preference_Interpreter.cpp
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Preference_Interpreter.cpp
-// 
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#include "Preference_Interpreter.h"
-#include <values.h>
-#include <ctype.h>
-#include <stdio.h>
-
-TAO_Preference_Interpreter::
-TAO_Preference_Interpreter(CosTradingRepos::ServiceTypeRepository::TypeStruct* ts,
-			   const char* preference,
-			   CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
-  : TAO_Interpreter ()
-{
-  TAO_Constraint_Validator type_checker(ts);
-
-  if (TAO_Interpreter::is_empty_string(preference))
-    this->root_ = new TAO_Noop_Constraint(TAO_FIRST);
-  else
-    {
-      if (this->build_tree (preference) != 0)
-	TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));	  
-
-      if (type_checker.validate (this->root_) == -1)
-	TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
-    }
-}
-
-TAO_Preference_Interpreter::
-TAO_Preference_Interpreter(TAO_Constraint_Validator& validator,
-			   const char* preference,
-			   CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
-    : TAO_Interpreter ()
-{
-  if (TAO_Interpreter::is_empty_string(preference))
-    this->root_ = new TAO_Noop_Constraint(TAO_FIRST);
-  else
-    {
-      if (this->build_tree (preference) != 0)
-	TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));	  
-      
-      if (validator.validate (this->root_) == -1)
-	TAO_THROW (CosTrading::Lookup::IllegalPreference (preference));
-    }
-}
-
-TAO_Preference_Interpreter::~TAO_Preference_Interpreter()
-{
-}
-
-void 
-TAO_Preference_Interpreter::
-order_offer (CosTrading::OfferId offer_id,
-	     CosTrading::Offer* offer)
-{
-  TAO_Constraint_Evaluator evaluator(offer);
-  this->order_offer (offer_id, offer, evaluator);
-}
-
-void 
-TAO_Preference_Interpreter::
-order_offer (CosTrading::OfferId offer_id,
-	     CosTrading::Offer* offer,
-	     TAO_Constraint_Evaluator& evaluator)
-{
-  if (this->root_ != 0)
-    {
-      TAO_Literal_Constraint return_value;	  
-      TAO_Expression_Type expr_type = this->root_->expr_type ();
-      if (evaluator.evaluate_preference (this->root_, return_value) == 0)
-	this->offers_.insert (return_value, make_pair (offer_id, offer));
-      else
-	{
-	  TAO_Literal_Constraint end ((CORBA::Double) MAXDOUBLE);
-	  this->offers_.insert (end, make_pair (offer_id, offer));      
-	}
-    }
-}
-
-int
-TAO_Preference_Interpreter::
-remove_offer (CosTrading::OfferId& offer_id,
-	      CosTrading::Offer*& offer)
-{
-  int return_value = 0;
-  TAO_Expression_Type expr_type = this->root_->expr_type ();
-  ORDERED_OFFERS::iterator offer_beg = this->offers_.begin ();
-  ORDERED_OFFERS::iterator offer_end = this->offers_.end ();
-
-  if (offer_beg != offer_end)
-    {
-      if (expr_type == TAO_WITH || expr_type == TAO_MAX)
-	{
-	  offer_end--;
-	  offer_id = (*offer_end).second.first;
-	  offer = (*offer_end).second.second;
-	  this->offers_.erase (offer_end);
-	}
-      else
-	{
-	  offer_id = (*offer_beg).second.first;
-	  offer = (*offer_beg).second.second;
-	  this->offers_.erase (offer_beg);
-	}
-      
-      return_value = 1;
-    }
-  
-  return return_value;
-}
-
-int 
-TAO_Preference_Interpreter::num_offers(void)
-{
-  return this->offers_.size();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h
deleted file mode 100644
index 7ff86a6ba17..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Preference_Interpreter.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Preference_Interpreter.h
-// 
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_PREFERENCE_INTERPRETER_H
-#define TAO_PREFERENCE_INTERPRETER_H
-
-#include <map>
-#include "Interpreter.h"
-#include "Constraint_Evaluator.h"
-#include "Constraint_Validator.h"
-
-class TAO_Preference_Interpreter : public TAO_Interpreter
-// = TITLE
-//   The TAO_Preference_Interpreter will, given a valid preference
-//   string and offers, will order the offers based on the offers'
-//   compliance with the preferences.
-//
-// = DESCRIPTION
-//   Each time the order_offer method is invoked, the
-//   TAO_Preference_Interpreter stores the offer reference in the
-//   order dictated by its evaluation of the preference string. After
-//   the TAO_Preference_Interpreter client has finished ordering all
-//   the offers, it will extract the offers in order using the
-//   remove_offer method.
-{
-public:
-
-  TAO_Preference_Interpreter(CosTradingRepos::ServiceTypeRepository::TypeStruct* ts,
-			     const char* preference,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
-
-  TAO_Preference_Interpreter(TAO_Constraint_Validator& validator,
-			     const char* preference,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
-
-  // Parse the preference string, determining first if it's
-  // valid. Throw an IllegalPreference exception if the preference
-  // doesn't conform to the BNF grammar for preferences. 
-  
-  ~TAO_Preference_Interpreter(void);
-  // Destructor
-  
-  void order_offer (CosTrading::OfferId offer_id,
-		    CosTrading::Offer* offer);
-
-  void order_offer (CosTrading::OfferId offer_id,
-		    CosTrading::Offer* offer,
-		    TAO_Constraint_Evaluator& evaluator);
-  // Evaluate the offer, and order it internally based on the results
-  // of the evaluation.
-
-  int remove_offer (CosTrading::OfferId& offer_id,
-		    CosTrading::Offer*& offer);
-  // Remove the next offer. The offer returned will be the next in the 
-  // ordering determined by the preference string. 
-
-  int num_offers(void);
-  // Return the number of offers remaining in the ordering.
-
-private:
-
-  typedef multimap
-  < TAO_Literal_Constraint,
-    pair < CosTrading::OfferId, CosTrading::Offer* >,
-    less < TAO_Literal_Constraint > >
-  ORDERED_OFFERS;
-  // The map of ordered offers to their order value.
-    
-  ORDERED_OFFERS offers_;
-};
-
-#endif /* TAO_PREFERENCE_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp
deleted file mode 100644
index 2b82ba5966f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// File: Property_Evaluator.cpp
-// $Id$
-
-#include "Trader.h"
-#include "Property_Evaluator.h"
-
-// Constructor
-
-TAO_Property_Evaluator::
-TAO_Property_Evaluator(const CosTrading::PropertySeq& props,
-		       CORBA::Boolean supports_dp)
-  : props_ (props),
-    supports_dp_ (supports_dp)
-{
-}
-
-
-TAO_Property_Evaluator::
-TAO_Property_Evaluator(CosTrading::Offer& offer,
-		       CORBA::Boolean supports_dp)
-  : props_ (offer.properties),
-    supports_dp_ (supports_dp)
-{
-}
-
-int
-TAO_Property_Evaluator::is_dynamic_property (int index)
-{
-  CORBA::Environment env;
-  int return_value = 0,
-    num_properties = this->props_.length();
-
-  // Ensure index is in bounds. 
-  if (index >= 0 && index < num_properties)
-    {
-      // Obtain the value of the property at index <index>.
-      const CORBA::Any& value = this->props_[index].value;
-      CORBA::TypeCode* type = value.type();
-      
-      if (type->equal(CosTradingDynamic::_tc_DynamicProp, env))
-	return_value = 1;
-    }
-  
-  return return_value;
-}
-
-CORBA::Any*
-TAO_Property_Evaluator::property_value(int index,
-				       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
-{
-  CORBA::Any* prop_val = 0;
-  
-  if (! this->is_dynamic_property(index))
-    prop_val = (CORBA::Any *) &(this->props_[index].value);
-  else if (this->supports_dp_)
-    {
-      // Property is defined at this point.
-      DP_Eval* dp_eval;
-      DP_Struct dp_struct;
-      const CORBA::String_var name = this->props_[index].name;
-      const CORBA::Any& value = this->props_[index].value;
-
-      // Extract the DP_Struct.
-      //value >>= dp_struct;
-      dp_eval = dp_struct.eval_if;
-	  
-      if (CORBA::is_nil (dp_eval))
-	TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure (), prop_val);
-      else
-	{
-	  CORBA::TypeCode* type = dp_struct.returned_type;
-	  CORBA::Any& info = dp_struct.extra_info;
-	  
-	  TAO_TRY
-	    {
-	      // Retrieve the value of the dynamic property.
-	      prop_val = dp_eval->evalDP(name, type, info, TAO_TRY_ENV);
-	    }
-	  TAO_CATCH (CORBA::SystemException, excp)
-	    {
-	      TAO_THROW_RETURN
-		(CosTradingDynamic::DPEvalFailure (name, type, info),
-		 prop_val);
-	    }
-	  TAO_ENDTRY;
-	}
-    }
-
-  return prop_val;
-}
-
-CORBA::TypeCode*
-TAO_Property_Evaluator::property_type(int index)
-{
-  CORBA::TypeCode* prop_type = CORBA::TypeCode::_nil();
-  
-  // Determine if property is both defined and dynamic.
-  if (this->is_dynamic_property (index))
-    {
-      // Extract type information from the DP_Struct.
-      const CORBA::Any& value = this->props_[index].value;
-      DP_Struct dp_struct;
-      //value >>= dp_struct;
-      
-      // Grab a pointer to the returned_type description
-      prop_type = CORBA::TypeCode::_duplicate(dp_struct.returned_type);
-    }
-  else
-    // TypeCode is self-evident at this point.
-    prop_type = this->props_[index].value.type();
-  
-  return prop_type;
-}
-
-TAO_Property_Evaluator_By_Name::
-TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-				CORBA::Environment& _env,
-				CORBA::Boolean supports_dp)
-  TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName,
-		   CosTrading::IllegalPropertyName))
-    : TAO_Property_Evaluator (properties, supports_dp)
-{
-  string prop_name;
-  int length = this->props_.length();
-
-  for (int i = 0; i < length; i++)
-    {
-      const CosTrading::Property& prop = this->props_[i];
-
-      if (! TAO_Trader_Base::is_valid_identifier_name (prop.name))
-	TAO_THROW (CosTrading::IllegalPropertyName (prop.name));
-      
-      prop_name = prop.name;
-      if (! (this->table_.insert (make_pair (prop_name, i))).second)
-	TAO_THROW (CosTrading::DuplicatePropertyName (prop.name));
-    }
-}
-
-TAO_Property_Evaluator_By_Name::
-TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer,
-			       CORBA::Boolean supports_dp)
-  : TAO_Property_Evaluator(offer, supports_dp)
-{
-  int length = this->props_.length();
-
-  for (int i = 0; i < length; i++)
-    {
-      string prop_name = (const char*) this->props_[i].name;
-      this->table_[prop_name] = i;
-    }
-}
-
-int
-TAO_Property_Evaluator_By_Name::
-is_dynamic_property(const char* property_name)
-{
-  int predicate = 0;
-  string prop_name (property_name);
-  Lookup_Table_Iter lookup_iter = this->table_.find (prop_name);
-
-  // If the property name is in the map, delegate evaluation to our
-  // superclass. Otherwise, throw an exception.
-  if (lookup_iter != this->table_.end())
-    {
-      int index = (*lookup_iter).second;
-      predicate = TAO_Property_Evaluator::is_dynamic_property(index);
-    }
-
-  return predicate;
-}
-  
-CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value(const char* property_name,
-					       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
-{
-  CORBA::Any* prop_value = 0;
-  string prop_name(property_name);
-  Lookup_Table_Iter lookup_iter = this->table_.find(prop_name);
-
-  // If the property name is in the map, delegate evaluation to our
-  // superclass. Otherwise, throw an exception.
-  if (lookup_iter != this->table_.end())
-    {
-      int index = (*lookup_iter).second;
-      prop_value = TAO_Property_Evaluator::property_value(index, _env);
-    }
-
-  return prop_value;
-}
-  
-CORBA::TypeCode*
-TAO_Property_Evaluator_By_Name::property_type(const char* property_name)
-{
-  string prop_name(property_name);
-  CORBA::TypeCode* prop_type = CORBA::TypeCode::_nil();
-  Lookup_Table_Iter lookup_iter = this->table_.find(prop_name);
-  
-  // If the property name is in the map, delegate evaluation to our
-  // superclass. Otherwise, throw an exception.
-  if (lookup_iter != this->table_.end())
-    {
-      int index = (*lookup_iter).second;
-      prop_type = TAO_Property_Evaluator::property_type(index);
-    }
-
-  return prop_type;
-}
-
-const CosTrading::Property*
-TAO_Property_Evaluator_By_Name::get_property (const char* property_name)
-{
-  CosTrading::Property* property = 0;
-  string prop_name (property_name);
-  Lookup_Table_Iter lookup_iter = this->table_.find(prop_name);
-
-  if (lookup_iter != this->table_.end())
-    property = (CosTrading::Property *) &this->props_[(*lookup_iter).second];
-
-  return property;
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
deleted file mode 100644
index 3007ba98f46..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME
-//    Property_Evaluator.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu> 
-//   
-// ========================================================================
-
-#ifndef TAO_PROPERTY_EVALUATOR_H
-#define TAO_PROPERTY_EVALUATOR_H
-
-#include <map>
-#include <set>
-#include <string>
-
-#include "orbsvcs/CosTradingC.h"
-
-class TAO_Property_Evaluator
-//
-// = TITLE
-//   This class abstracts away the details of obtaining property
-//   values and property types. Since the procedure for obtaining the
-//   value or type of a dynamic property is disparate from the method
-//   for a static property, TAO_Property_Evaluator provides methods
-//   that will unify the two approaches under a single
-//   interface. Since dynamic properties aren't necessarily supported
-//   by a trader, this class accounts for that contingency. The use of 
-//   indexed lookups allows them to occur in constant time on the
-//   CORBA sequences, but requires that the client know the layout of
-//   properties ahead of time. 
-{
-public:
-  
-  TAO_Property_Evaluator(const CosTrading::PropertySeq& properties,
-			 CORBA::Boolean supports_dp = 1);
-  
-  TAO_Property_Evaluator(CosTrading::Offer& offer,
-			 CORBA::Boolean supports_dp = 1);
-  // Construct an instance of TAO_Property_Evaluator that operates on
-  // an <offer> where the support for dynamic properties is dictated
-  // by <supports_dynamic_properties>.
-  
-  int is_dynamic_property(int index);
-  // Returns 1 if the property at index <index> is dynamic. Returns a
-  // 0 when the index is out of bounds.
-  
-  CORBA::Any* property_value(int index, CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-  // Returns value of the property whose index is <index>. If the
-  // property at that index is dynamic and the trader supports dynamic 
-  // properties, then the property_value method will obtain the value
-  // of the dynamic property using the evalDP method on the
-  // CosTradingDynamic::DynamicPropEval interface, passing on a
-  // CosTradingDynamic::DPEvalFailure exception on failure. If the
-  // property index is undefined, the method returns a null pointer.
-  
-  CORBA::TypeCode* property_type(int index);
-  // Returns the type of the property whose index is <index>. If the
-  // property is dynamic and the trader supports dynamic properties,
-  // then the method returns the <returned_type> field of the
-  // CosTradingDynamic::DynamicProp struct associated with the
-  // property name. If the index is out of bounds, the method returns 
-  // a null pointer (that is, 0).
-  
-protected:
-
-  typedef CosTradingDynamic::DynamicProp DP_Struct;
-  typedef CosTradingDynamic::DynamicPropEval DP_Eval;
-  
-  const CosTrading::PropertySeq& props_;
-  // The offer from which the TAO_Property_Evaluator extracts property 
-  // information.
-
-  int supports_dp_;
-};
-
-class TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator
-//
-// = TITLE
-//    This class extends the TAO_Property_Evaluator to allow lookups
-//    based on the property name of interest. Since the property
-//    information is contained within an integer indexed array,
-//    lookups may occur in O(n) time, where n is the length of the
-//    array. To make lookups by name more efficient,
-//    TAO_Property_Evaluator_By_Name creates a mapping of property
-//    names to integer indicies, upon which lookups are guaranteed to
-//    be O(lg n).
-{
-public:
-
-  TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-				  CORBA::Environment& _env,
-				  CORBA::Boolean supports_dp = 1)
-    TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName,
-		     CosTrading::IllegalPropertyName));
-  
-  TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer,
-				 CORBA::Boolean supports_dp = 1);
-  // Construct an instance of TAO_Property_Evaluator that operates on
-  // an <offer> where the support for dynamic properties is dictated
-  // by <supports_dynamic_properties>.
-
-  int is_dynamic_property(const char* property_name);
-  // Returns 1 if the property whose name is <property_name> is
-  // defined and dynamic. If the property is undefined, this method
-  // will throw a Property_Undefined exception with impunity.
-  
-  CORBA::Any* property_value(const char* property_name,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-  // This method is identical to its counterpart in
-  // TAO_Property_Evaluator, except property_value first discovers the 
-  // index through a string matching lookup.
-  
-  CORBA::TypeCode* property_type(const char* property_name);
-  // This method is identical to its counterpart in
-  // TAO_Property_Evaluator, exception property_type first discovers
-  // the index through a string matching lookup.
-
-  const CosTrading::Property* get_property (const char* property_name);
-  
-private:
-  
-  typedef map<string, int, less<string> > Lookup_Table;
-  typedef Lookup_Table::iterator Lookup_Table_Iter;
-  // A mapping, upon which lookups will take O(lg n), of property
-  // names to sequence indices.
-  
-  Lookup_Table table_;
-  // The instance of the above mapping for the offer provided in the
-  // constructor. 
-};
-
-#endif /* TAO_PROPERTY_EVALUATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.cpp
deleted file mode 100644
index 1692b46a144..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id$
-
-#include "Property_Filter.h"
-
-TAO_Property_Filter::
-TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-		     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName))
-  : policy_  (desired_props._d ())
-{
-  if (this->policy_ == CosTrading::Lookup::some)
-    {
-      const PropertyNameSeq& prop_seq = desired_props.prop_names ();
-      int length = prop_seq.length ();
-
-      for (int i = 0; i < length; i++)
-	{
-	  const char* pname = prop_seq[i];
-
-	  // Check for errors or duplicates
-	  if (! TAO_Trader_Base::is_valid_identifier_name (pname))
-	    TAO_THROW_SPEC (CosTrading::IllegalPropertyName (pname));
-	  else
-	    {
-	      // Insert returns a pair whose second element is a flag
-	      // indicating whether a collision occured.
-	      string prop_name (pname);
-	      if (this->props_.insert (prop_name).second == 0)
-		TAO_THROW_SPEC (CosTrading::DuplicatePropertyName (pname));
-	    }	    
-	}
-    }
-}
-
-TAO_Property_Filter::
-TAO_Property_Filter (const TAO_Property_Filter& prop_filter)
-  : props_ (prop_filter.props_),
-    policy_ (prop_filter.policy_)
-{  
-}
-
-void
-TAO_Property_Filter::filter_offer (CosTrading::Offer& source,
-				   CosTrading::Offer& destination)
-{
-  PROP_QUEUE prop_queue;
-  CosTrading::PropertySeq& s_props = source.properties;
-  CosTrading::PropertySeq& d_props = destination.properties;
-  int length = s_props.length (), elem = 0;
-  
-  if (this->policy_ != CosTrading::Lookup::none)
-    {
-      for (int i = 0; i < length; i++)
-	{
-	  if (this->policy_ == CosTrading::Lookup::all)
-	    prop_queue.push_back (&s_props[i]);
-	  else
-	    {
-	      string prop_name (s_props[i].name);
-
-	      // Save those property that match.
-	      if (this->props_.find (prop_name) != this->props_.end ())
-		prop_queue.push_back (&s_props[i]);
-	    }
-	}
-
-      // Shove the matched properties into the destination property
-      // sequence. 
-      length = prop_queue.size ();
-      d_props.length (prop_queue.size ());
-      for (PROP_QUEUE::iterator prop_iter = prop_queue.begin ();
-	   prop_iter != prop_queue.end ();
-	   prop_iter++)      
-	d_props[elem++] = *(*prop_iter);
-    }
-}
-
-int
-TAO_Property_Filter::verify_property_name (const char* name)
-{
-  int return_value = -1,
-    length = ACE_OS::strlen (name);
-
-  if (length >= 1 && isalpha (name[0]))
-      {
-	for (int i = 0; i < length; i++)
-	  {
-	    if (! (isalnum (name[i]) || name[i] == '_'))
-	      break;
-	  }
-
-	return_value = 0;
-      }
-
-  return return_value;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.h b/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.h
deleted file mode 100644
index a0a86dae54c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Filter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY 
-//    orbsvcs
-//  
-// = FILENAME 
-//    Property_Filter.h
-// 
-// = AUTHOR 
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ======================================================================= 
-
-#ifndef TAO_PROPERTY_FILTER_H
-#define TAO_PROPERTY_FILTER_H
-
-#include <set>
-#include <deque>
-#include "Trader.h"
-
-class TAO_Property_Filter
-// = TITLE
-//
-//   The Ace_Property_Filter copies those properties specified in a
-//   CosTrading::Lookup::SpecifiedProps from a source
-//   CosTrading::Offer to a destination CosTrading::Offer. 
-{
-public:
-
-  typedef CosTrading::Lookup::SpecifiedProps SPECIFIED_PROPS;
-  
-  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-		       CORBA::Environment& env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName));
-  // Verify that the specified properties are correct.
-
-  TAO_Property_Filter (const TAO_Property_Filter& prop_filter);
-
-  void filter_offer (CosTrading::Offer& source,
-		     CosTrading::Offer& destination);
-  // Copy the desired properties from the source offer to the
-  // destination offer.
-  
-private:
-
-  typedef set< string,  less <string> > PROP_NAMES;
-  typedef deque< CosTrading::Property* > PROP_QUEUE;
-  
-  int verify_property_name (const char* name);
-
-  PROP_NAMES props_;
-  CosTrading::Lookup::HowManyProps policy_;
-};
-
-#endif /* TAO_PROPERTY_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Trader/Proxy.cpp
deleted file mode 100644
index 0e9e17a82ef..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Proxy.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    Trading
-// 
-// = FILENAME
-//    Proxy.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (TAO_PROXY_C)
-#define TAO_PROXY_C
-
-#include "Proxy.h"
-
-template <class TRADER>  
-TAO_Proxy<TRADER>::TAO_Proxy (TRADER &trader)
-  : trader_ (trader),
-    TAO_Trader_Components <POA_CosTrading::Proxy> (trader.trading_components ()),
-    TAO_Support_Attributes <POA_CosTrading::Proxy> (trader.support_attributes ())
-{
-}
-
-template <class TRADER>
-TAO_Proxy<TRADER>::~TAO_Proxy (void)
-{
-}
-
-template <class TRADER> CosTrading::OfferId 
-TAO_Proxy<TRADER>::export_proxy (CosTrading::Lookup_ptr target, 
-				 const char *type, 
-				 const CosTrading::PropertySeq& properties, 
-				 CORBA::Boolean if_match_all, 
-				 const char * recipe, 
-				 const CosTrading::PolicySeq& policies_to_pass_on,
-				 CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  CosTrading::InvalidLookupRef, 
-		  CosTrading::IllegalPropertyName, 
-		  CosTrading::PropertyTypeMismatch, 
-		  CosTrading::ReadonlyDynamicProperty, 
-		  CosTrading::MissingMandatoryProperty, 
-		  CosTrading::Proxy::IllegalRecipe, 
-		  CosTrading::DuplicatePropertyName, 
-		  CosTrading::DuplicatePolicyName))
-{
-  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), 0);
-}
-
-template <class TRADER> void
-TAO_Proxy<TRADER>::withdraw_proxy (const char *id,
-				   CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalOfferId, 
-		  CosTrading::UnknownOfferId, 
-		  CosTrading::Proxy::NotProxyOfferId))
-{
-  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-}
-
-template <class TRADER> CosTrading::Proxy::ProxyInfo *
-TAO_Proxy<TRADER>::describe_proxy (const char *id,
-				   CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalOfferId, 
-		  CosTrading::UnknownOfferId, 
-		  CosTrading::Proxy::NotProxyOfferId))
-{
-  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), 0);
-}
-
-template <class TRADER> void
-TAO_Proxy<TRADER>::list_proxies (CORBA::ULong how_many,
-				 CosTrading::OfferIdSeq*& ids,
-				 CosTrading::OfferIdIterator_ptr& id_itr,
-				 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::NotImplemented))
-{
-  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-}
-
-
-#endif /* TAO_PROXY_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Proxy.h b/TAO/orbsvcs/orbsvcs/Trader/Proxy.h
deleted file mode 100644
index 67f3c2677b8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Proxy.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Proxy.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_PROXY_H
-#define TAO_PROXY_H
-
-#include "Attributes.h"
-
-template <class TRADER>
-class TAO_Proxy : 
-  public TAO_Trader_Components <POA_CosTrading::Proxy>,
-  public TAO_Support_Attributes <POA_CosTrading::Proxy>
-{
-public:
-
-  TAO_Proxy (TRADER &trader);
-
-  ~TAO_Proxy (void);
-
-  virtual CosTrading::OfferId
-    export_proxy (CosTrading::Lookup_ptr target, 
-		  const char *type, 
-		  const CosTrading::PropertySeq& properties, 
-		  CORBA::Boolean if_match_all, 
-		  const char * recipe, 
-		  const CosTrading::PolicySeq& policies_to_pass_on,
-		  CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTrading::InvalidLookupRef, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::MissingMandatoryProperty, 
-		    CosTrading::Proxy::IllegalRecipe, 
-		    CosTrading::DuplicatePropertyName, 
-		    CosTrading::DuplicatePolicyName));
-
-  virtual void withdraw_proxy (const char *id,
-			       CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Proxy::NotProxyOfferId));
-
-  virtual CosTrading::Proxy::ProxyInfo *
-  describe_proxy (const char *id,
-		  CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Proxy::NotProxyOfferId));
-
-   // = CosTrading::TraderComponents methods. 
-
-  virtual void list_proxies (CORBA::ULong how_many,
-			     CosTrading::OfferIdSeq*& ids,
-			     CosTrading::OfferIdIterator_ptr& id_itr,
-			     CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::NotImplemented));
-				
-private:
-  TRADER &trader_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Proxy.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-
-#endif /* TAO_PROXY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.cpp
deleted file mode 100644
index 5dadb8746d4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
- /* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Query_Only_Offer_Iterator.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-#define ACE_BUILD_DLL
-
-#include "Query_Only_Offer_Iterator.h"
-#include <iostream.h>
-
-TAO_Query_Only_Offer_Iterator::
-TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter)
-  : TAO_Offer_Iterator (pfilter)
-{
-}
-
-TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void)
-{
-  //  cerr << "In iterator destructor now" << endl;
-}
-
-void
-TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
-					  CosTrading::Offer* offer)
-{
-  this->offers_.push_back (offer);
-  CORBA::string_free (offer_id);
-}
-
-CORBA::ULong 
-TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment& _env) 
-  TAO_THROW_SPEC((CORBA::SystemException, 
-		 CosTrading::UnknownMaxLeft))
-{
-  return this->offers_.size ();
-}
-
-CORBA::Boolean 
-TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, 
-				       OfferSeq_out offers,
-				       CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  offers = new CosTrading::OfferSeq;
-
-  CORBA::ULong offers_in_sequence =
-    min (n, (CORBA::ULong)this->offers_.size ());
-  offers->length (offers_in_sequence);
-  
-  // populate the sequence.
-  for (CORBA::ULong i = 0; i < offers_in_sequence; i++)
-    {
-      CosTrading::Offer& source = *(this->offers_.front ());
-      CosTrading::Offer& destination = (*offers)[i];
-
-      this->pfilter_.filter_offer (source, destination);
-      offers_.pop_front ();
-    }
-  
-  return offers_in_sequence != 0;
-}
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h
deleted file mode 100644
index b0610c4481b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Query_Only_Offer_Iterator.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-#ifndef TAO_QUERY_ONLY_OFFER_ITERATOR_H
-#define TAO_QUERY_ONLY_OFFER_ITERATOR_H
-    
-#include "Offer_Iterator.h"
-#include <deque>
-
-class TAO_Export TAO_Query_Only_Offer_Iterator : public TAO_Offer_Iterator
-  // = TITLE
-  //     An implementation of the CosTrading::OfferIterator IDL
-  //     interface that takes advantage of the fact that the trader is
-  //     Query Only, and therefore its service offers are not being
-  //     changed or removed.
-  //
-  // = DESCRIPTION
-  //     The iterator stores pointers to Offers to be iterated over,
-  //     and later accesses the Offers directly through the pointers.
-  //
-{
-public:
-  // = Initialization and termination methods.
-  
-  TAO_Query_Only_Offer_Iterator (const TAO_Property_Filter& pfilter);
-
-  virtual ~TAO_Query_Only_Offer_Iterator (void);
-
-  virtual CORBA::Boolean next_n (CORBA::ULong n, 
-				 CosTrading::OfferSeq_out offers,
-				 CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Deposit at maximum n offers into the return sequence and return 1,
-  // or return 0 if the iterator is done and no offers are returned.
-  
-  virtual CORBA::ULong max_left (CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::UnknownMaxLeft));
-  // Return the number of items left in the iterator.  
-
-  void add_offer (CosTrading::OfferId offer_id,
-		  CosTrading::Offer* offer);
-  // Add an offer the iterator should iterate over.
-  
-private:
-  
-  deque <CosTrading::Offer *> offers_;
-  // Structure that stores pointers to offers
-  // to iterate over.
-};
-
-
-#endif /* TAO_QUERY_ONLY_OFFER_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/README b/TAO/orbsvcs/orbsvcs/Trader/README
deleted file mode 100644
index fcdae03e73f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/README
+++ /dev/null
@@ -1,60 +0,0 @@
-$Id$
-
-Thank you for your interest in the TAO Trading Service. The TAO
-Trading Service is in the process of being ported to TAO from
-VisiBroker, and therefore it won't compile. I'll send mail to the
-group when the port is complete, and then people can play with it. 
-
-Thanks,
-Seth
-
----------------------------------------------------------------------------
-
-Note: This version of the trading service requires the Object Space
-STL. To have the trading service compile properly, prepend the following
-to the makefile:
-
-include $(STL_ROOT)/config/local.cfg
-
-CC_INCLUDES += -I$(STD)
-CC_INCLUDES += -pta
-
-CPPFLAGS += \
-	-I$(TOOLKIT) \
-	$(CC_INCLUDES) \
-	$(CC_FLAGS) \
-	$(CC_DEFINES) \
-	$(CC_EH) \
-	$(CC_MT)
-
-The final trading service server application needs to link with the
-following library:
-
-LDFLAGS += -L$(STL_ROOT)/lib
-LDLIBS  += -lospace
-
-Where currently: STL_ROOT=/project/doc/irfan/ObjectSpace/SC4.0,
-		 STD=$STL_ROOT/ospace/std, and
-		 STL=$STL_ROOT/stl
-
-Also, the Sequences.idl file needs to be compiled by tao_idl before
-the C++ compilation begins. These sequences are used to extract
-simple sequences from offer property values.
-
-The constraint.y and constraint.l files have been compiled
-into Constraint_y.cpp and Constraint_l.cpp by:
-
-Constraint_y.cpp: constraint.y
-	$(YACC) -d $<
-	mv y.tab.c $@
-	mv y.tab.h Constraint_Tokens.h
-
-Constraint_l.cpp: constraint.l
-	$(LEX)   $<
-	mv lex.yy.c $@
-
-It shouldn't be necessary to recompile them, but it's handy to have
-this information around just in case.
-
-Thanks,
-Seth
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register.cpp b/TAO/orbsvcs/orbsvcs/Trader/Register.cpp
deleted file mode 100644
index 007d3dc98f7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Register.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Register.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (TAO_REGISTER_C)
-#define TAO_REGISTER_C
-
-#include "Register.h"
-#include "Property_Evaluator.h"
-#include "Trader.h"
-#include <iostream.h>
-#include <algorithm>
-
-template <class TRADER>
-const char* TAO_Register<TRADER>::NAME = "Trader: Register";
-
-template <class TRADER>
-TAO_Register<TRADER>::TAO_Register (TRADER &trader)
-  : trader_ (trader),
-    TAO_Trader_Components<POA_CosTrading::Register> (trader.trading_components ()),
-    TAO_Support_Attributes<POA_CosTrading::Register> (trader.support_attributes ())
-{
-}
-
-template <class TRADER>
-TAO_Register<TRADER>::~TAO_Register (void)
-{
-}
-
-template <class TRADER> CosTrading::OfferId 
-TAO_Register<TRADER>::export (CORBA::Object_ptr reference, 
-			      const char *type, 
-			      const CosTrading::PropertySeq &properties,
-			      CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::Register::InvalidObjectRef, 
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  CosTrading::Register::InterfaceTypeMismatch, 
-		  CosTrading::IllegalPropertyName, 
-		  CosTrading::PropertyTypeMismatch, 
-		  CosTrading::ReadonlyDynamicProperty, 
-		  CosTrading::MissingMandatoryProperty, 
-		  CosTrading::DuplicatePropertyName))
-{
-  // Get service type map
-  TRADER::SERVICE_TYPE_MAP &service_type_map = 
-    this->trader_.service_type_map ();
-
-  CosTrading::Offer offer;
-  TAO_Support_Attributes_Impl& support_attrs =
-    this->trader_.support_attributes ();  
-  CosTrading::TypeRepository_ptr type_repos =
-    support_attrs.type_repos ();
-  CosTradingRepos::ServiceTypeRepository_ptr rep = 
-    CosTradingRepos::ServiceTypeRepository::_narrow (type_repos, _env);
-  TAO_CHECK_ENV_RETURN (_env, 0);
-  
-  // Yank our friend, the type struct, and confirm that the given
-  // properties match the type definition.
-  TYPE_STRUCT* type_struct = rep->fully_describe_type (type, _env);
-  TAO_CHECK_ENV_RETURN (_env, 0);
-  
-  // Oops the type is masked, we shouldn't let exporters know the type 
-  // exists.
-  if (type_struct->masked)
-    TAO_THROW_RETURN (CosTrading::UnknownServiceType (type), 0);
-
-  // TAO-specific way to determine if an object is derived from or is
-  // an interface type.
-  if (! reference->_is_a (type_struct->if_name, _env))
-    TAO_THROW_RETURN (CosTrading::Register::
-		      InterfaceTypeMismatch (type, reference), 0);
-  
-  // Validate that the properties defined for this offer are correct
-  // to their types and strength.
-  this->validate_properties (type, type_struct,
-			     (CosTrading::PropertySeq) properties, _env);
-  TAO_CHECK_ENV_RETURN (_env, 0);
-  
-  offer.reference = (reference->_duplicate (reference));
-  offer.properties = properties;
-  
-  // Insert the offer into the underlying type map.
-  CosTrading::OfferId id = service_type_map.insert_offer (type, offer);
-  
-  if (id == 0)
-    {
-      // Add type, if it's already been added in that split second
-      // since we've released the lock, nothing bad will happen.
-      service_type_map.add_type (type);      
-      id = service_type_map.insert_offer (type, offer);
-    }
-  
-  return id;
-}
-
-template <class TRADER> void 
-TAO_Register<TRADER>::withdraw (const char *id,
-				CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::IllegalOfferId, 
-		   CosTrading::UnknownOfferId, 
-		   CosTrading::Register::ProxyOfferId))
-{
-  // Get service type map.
-  TRADER::SERVICE_TYPE_MAP &service_type_map = 
-    this->trader_.service_type_map ();
-
-  service_type_map.remove_offer ((CosTrading::OfferId) id, _env);
-}
-
-template <class TRADER> CosTrading::Register::OfferInfo * 
-TAO_Register<TRADER>::describe (const char *id,
-				CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::IllegalOfferId, 
-		  CosTrading::UnknownOfferId, 
-		  CosTrading::Register::ProxyOfferId))
-{
-  // Get service type map.
-  char* type = 0;
-  TRADER::SERVICE_TYPE_MAP &service_type_map = 
-    this->trader_.service_type_map ();
-
-  // Perform a lookup to find the offer.
-  CosTrading::Offer* offer =
-    service_type_map.lookup_offer ((CosTrading::OfferId) id, type, _env);
-  TAO_CHECK_ENV_RETURN (_env, (CosTrading::Register::OfferInfo *) 0);
-      
-  CosTrading::Register::OfferInfo *offer_info = 
-    new CosTrading::Register::OfferInfo ();
-
-  offer_info->reference = offer->reference->_duplicate (offer->reference);
-  offer_info->type = CORBA::string_dup (type);
-  offer_info->properties = offer->properties;
-
-  return offer_info;
-}
-
-template <class TRADER> void 
-TAO_Register<TRADER>::modify (const char *id, 
-			      const CosTrading::PropertyNameSeq& del_list, 
-			      const CosTrading::PropertySeq& modify_list,
-			      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::NotImplemented, 
-		  CosTrading::IllegalOfferId, 
-		  CosTrading::UnknownOfferId, 
-		  CosTrading::Register::ProxyOfferId, 
-		  CosTrading::IllegalPropertyName, 
-		  CosTrading::Register::UnknownPropertyName, 
-		  CosTrading::PropertyTypeMismatch, 
-		  CosTrading::ReadonlyDynamicProperty, 
-		  CosTrading::Register::MandatoryProperty, 
-		  CosTrading::Register::ReadonlyProperty, 
-		  CosTrading::DuplicatePropertyName))
-{
-  // Throw an exception if the trader is not configured
-  // to support properties modification.
-  if (! this->supports_modifiable_properties (_env))
-    TAO_THROW (CosTrading::NotImplemented ());
-  else
-    {
-      char* type = 0;
-      TAO_Support_Attributes_Impl& support_attrs =
-	this->trader_.support_attributes ();  
-      CosTrading::TypeRepository_ptr type_repos =
-	support_attrs.type_repos ();
-      CosTradingRepos::ServiceTypeRepository_ptr rep = 
-	CosTradingRepos::ServiceTypeRepository::_narrow (type_repos, _env);
-      TAO_CHECK_ENV_RETURN (_env,);
-      TRADER::SERVICE_TYPE_MAP &service_type_map = 
-	this->trader_.service_type_map ();
-      
-      CosTrading::Offer* offer =
-	service_type_map.lookup_offer ((CosTrading::OfferId) id, type, _env);
-      TAO_CHECK_ENV_RETURN (_env,);
-      
-      if (offer != 0)
-	{
-	  // Yank our friend, the type struct.
-	  TYPE_STRUCT* type_struct = rep->describe_type (type, _env);
-	  TAO_CHECK_ENV_RETURN (_env,);
-	  TAO_Offer_Modifier offer_mod (type, type_struct, *offer);
-
-	  // Delete, add, and change properties of the offer.
-	  this->validate_properties (type, type_struct,
-				     (CosTrading::PropertySeq) modify_list, _env);
-	  TAO_CHECK_ENV_RETURN (_env,);
-	  offer_mod.delete_properties (del_list, _env);
-	  TAO_CHECK_ENV_RETURN (_env,);
-	  offer_mod.merge_properties (modify_list, _env);
-	  TAO_CHECK_ENV_RETURN (_env,);
-
-	  // Alter our reference to the offer. 
-	  offer_mod.affect_change ();
-	}
-    }
-}
-
-template <class TRADER> void 
-TAO_Register<TRADER>::withdraw_using_constraint (const char *type, 
-						 const char *constr,
-						 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  CosTrading::IllegalConstraint, 
-		  CosTrading::Register::NoMatchingOffers))
-{
-  int num_removed = 0;
-  deque<CosTrading::OfferId_var> ids;
-  TAO_Support_Attributes_Impl& support_attrs =
-    this->trader_.support_attributes ();  
-  CosTrading::TypeRepository_ptr type_repos =
-    support_attrs.type_repos ();
-  CosTradingRepos::ServiceTypeRepository_ptr rep = 
-    CosTradingRepos::ServiceTypeRepository::_narrow (type_repos, _env);
-  TRADER::SERVICE_TYPE_MAP &service_type_map = 
-    this->trader_.service_type_map ();
-  CORBA::Boolean dp_support =
-    support_attrs.supports_dynamic_properties ();
-  
-  // Retrieve the type struct
-  TYPE_STRUCT* type_struct = rep->describe_type (type, _env);
-  TAO_CHECK_ENV_RETURN (_env,);
-
-  // Try to find the map of offers of desired service type.
-  TRADER::SERVICE_TYPE_MAP::Local_Offer_Iterator*
-    offer_iter = service_type_map.get_offers (type);
-
-  if (offer_iter != 0)
-    {
-      TAO_Constraint_Validator validator (type_struct);
-      TAO_Constraint_Interpreter constr_inter (validator, constr, _env);
-      TAO_CHECK_ENV_RETURN (_env,);
-      
-      while (offer_iter->has_more_offers ())
-	{
-	  CosTrading::Offer* offer = offer_iter->get_offer ();
-	  // Add offer if it matches the constraints
-	  
-	  TAO_Constraint_Evaluator evaluator (offer, dp_support);
-	  if (constr_inter.evaluate (evaluator))
-	    ids.push_back (offer_iter->get_id ());
-	  
-	  offer_iter->next_offer ();
-	}
-      
-      // Must delete the iterator, so we can write to the service type map.
-      delete offer_iter;
-    }
-  
-  if (ids.size () == 0)
-    TAO_THROW (CosTrading::Register::NoMatchingOffers (constr));
-  else
-    {      
-      for (deque<CosTrading::OfferId_var>::iterator id_iter = ids.begin ();
-	   id_iter != ids.end ();
-	   id_iter++)
-	{
-	  service_type_map.remove_offer
-	    ((CosTrading::OfferId) ids.front ().in (), _env);
-	}
-    }
-}
-           
-template <class TRADER> CosTrading::Register_ptr 
-TAO_Register<TRADER>::resolve (const CosTrading::TraderName &name,
-			       CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::Register::IllegalTraderName, 
-		  CosTrading::Register::UnknownTraderName, 
-		  CosTrading::Register::RegisterNotSupported))
-{
-  // Determine if the first link is a legal link name.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name[0]))
-    TAO_THROW_RETURN (CosTrading::Register::IllegalTraderName (name),
-		      CosTrading::Register::_nil ());
-
-  // Grab a reference to the link interface, and get a link description.
-  CosTrading::Link_var link (this->link_if (_env));
-  TAO_CHECK_ENV_RETURN (_env, CosTrading::Register::_nil ());
-  CosTrading::Link::LinkInfo_var link_info;
-  
-  TAO_TRY
-    {
-      // Ensure that the link to the next trader exists.
-      link_info = link->describe_link (name[0], TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_THROW_RETURN (CosTrading::Register::UnknownTraderName (name),
-			CosTrading::Register::_nil ());
-    }
-  TAO_ENDTRY;
-  
-  // Ensure that the register pointer isn't nil.
-  if (link_info->target_reg == CosTrading::Register::_nil ())
-    TAO_THROW_RETURN (CosTrading::Register::RegisterNotSupported (name),
-		      CosTrading::Register::_nil ());
-
-  CosTrading::Register_ptr return_value = link_info->target_reg;
-  
-  if (name.length () > 1)
-    {
-      // Create a new Trader Name with the first link removed.
-      CosTrading::TraderName trader_name (name.length () - 1);
-      for (int i = trader_name.length () - 1; i >= 0; i--)
-	trader_name[i] = name[i + 1];
-
-      return_value = link_info->target_reg->resolve (trader_name, _env);
-      TAO_CHECK_ENV_RETURN (_env, CosTrading::Register::_nil ());
-    }
-
-  return return_value;
-}
-
-template <class TRADER> void
-TAO_Register<TRADER>::
-validate_properties (const char* type, 
-		     TYPE_STRUCT* type_struct,
-		     CosTrading::PropertySeq& properties,
-		     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, 
-		  CosTrading::PropertyTypeMismatch, 
-		  CosTrading::ReadonlyDynamicProperty, 
-		  CosTrading::MissingMandatoryProperty, 
-		  CosTrading::DuplicatePropertyName))
-{
-  typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-  
-  int length = properties.length ();
-  SERVICE_TYPE_REPOS::PropStructSeq& prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties, _env);
-  TAO_CHECK_ENV_RETURN (_env,);
-  
-  // Perform property validation
-  length = prop_types.length ();
-  for (int i = 0; i < length; i++)
-    {
-      SERVICE_TYPE_REPOS::PropStruct& prop_struct = prop_types[i]; 
-      const char* prop_name  = prop_struct.name;
-      
-      // Obtain the type of the exported property.
-      CORBA::TypeCode* prop_type = prop_eval.property_type (prop_name);
-      
-      if (prop_type == CORBA::TypeCode::_nil ())
-	{
-	  // Offer cannot have a missing mandatory property.
-	  if (prop_types[i].mode == SERVICE_TYPE_REPOS::PROP_MANDATORY)
-	    TAO_THROW (CosTrading::MissingMandatoryProperty (type, prop_name));
-	}
-      else
-	{
-	  if (! prop_type->equal (prop_struct.value_type, _env))
-	    {
-	      // Offer cannot redefine the type of an property. 
-	      const CosTrading::Property* prop = prop_eval.get_property (prop_name);
-	      TAO_THROW (CosTrading::PropertyTypeMismatch (type, *prop));
-	    }
-	  else if (prop_struct.mode == SERVICE_TYPE_REPOS::PROP_READONLY &&
-		   prop_eval.is_dynamic_property (prop_name))
-	    TAO_THROW (CosTrading::ReadonlyDynamicProperty (type, prop_name));
-	}
-    }
-}
-
-#endif /* TAO_REGISTER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register.h b/TAO/orbsvcs/orbsvcs/Trader/Register.h
deleted file mode 100644
index 36975416071..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Register.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$ 
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Register.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff   <sbw1@cs.wustl.edu>
-// 
-// ============================================================================
-#ifndef ACE_REGISTER_H
-#define ACE_REGISTER_H
-
-#include "Offer_Modifier.h"
-
-#include <map>
-#include <string>
-#include <deque>
-
-template <class TRADER>
-class TAO_Register :
-  public TAO_Trader_Components<POA_CosTrading::Register>,
-  public TAO_Support_Attributes<POA_CosTrading::Register>
-  //
-  // = TITLE
-  //     This class implements CosTrading::Register IDL interface.
-{
-public:
-
-  TAO_Register (TRADER &trader);
-
-  virtual ~TAO_Register (void);
-
-  virtual CosTrading::OfferId export (CORBA::Object_ptr reference, 
-				      const char *type, 
-				      const CosTrading::PropertySeq& properties,
-				      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::Register::InvalidObjectRef, 
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTrading::Register::InterfaceTypeMismatch, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::MissingMandatoryProperty, 
-		    CosTrading::DuplicatePropertyName));
-
-  // BEGIN SPEC
-  // The export operation is the means by which a service is
-  // advertised, via a trader, to a community of potential
-  // importers. The OfferId returned is the handle with which the
-  // exporter can identify the exported offer when attempting to
-  // access it via other operations. The OfferId is only meaningful in
-  // the context of the trader that generated it.
-
-  //   The "reference" parameter is the information that enables a client
-  // to interact with a remote server. If a trader implementation chooses
-  // to consider certain types of object references (e.g., a nil object
-  // reference) to be unexportable, then it may return the InvalidObjectRef
-  // exception in such cases.
-
-  // The "type" parameter
-  // identifies the service type, which contains the interface type of
-  // the "reference" and a set of named property types that may be
-  // used in further describing this offer (i.e., it restricts what is
-  // acceptable in the properties parameter). °
-
-  // If the string
-  // representation of the "type" does not obey the rules for
-  // identifiers, then an IllegalServiceType exception is raised. ° If
-  // the "type" is correct syntactically but a trader is able to
-  // unambiguously determine that it is not a recognized service type,
-  // then an UnknownServiceType exception is raised. °
-
-  // If the trader
-  // can determine that the interface type of the "reference"
-  // parameter is not a subtype of the interface type specified in
-  // "type," then an InterfaceTypeMismatch exception is raised. The
-  // "properties" parameter is a list of named values that conform to
-  // the property value types defined for those names. They describe
-  // the service being offered. This description typically covers
-  // behavioral, non-functional, and non-computational aspects of the
-  // service. °
-
-  // If any of the property names do not obey the syntax
-  // rules for PropertyNames, then an IllegalPropertyName exception is
-  // raised. °
-
-  // If the type of any of the property values is not the
-  // same as the declared type (declared in the service type), then a
-  // PropertyTypeMismatch exception is raised. 
-
-  // ° If an attempt is made to assign a dynamic property value to a
-  // readonly property, then the ReadonlyDynamicProperty exception is
-  // raised. ° If the "properties" parameter omits any property
-  // declared in the service type with a mode of mandatory, then a
-  // MissingMandatoryProperty exception is raised. ° If two or more
-  // properties with the same property name are included in this
-  // parameter, the DuplicatePropertyName exception is raised.
-  // END SPEC
- 
-  virtual void withdraw (const char *id, CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Register::ProxyOfferId));
-
-  // BEGIN SPEC
-  // The withdraw operation removes the service offer from the trader
-  // (i.e., after withdraw the offer can no longer be returned as the
-  // result of a query). The offer is identified by the "id" parameter
-  // which was originally returned by export. ° If the string
-  // representation of "id" does not obey the rules for offer
-  // identifiers, then an IllegalOfferId exception is raised. ° If the
-  // "id" is legal but there is no offer within the trader with that
-  // "id," then an UnknownOfferId exception is raised. ° If the "id"
-  // identifies a proxy offer rather than an ordinary offer, then a
-  // ProxyOfferId exception is raised. 
-  // END SPEC
-  
-  virtual CosTrading::Register::OfferInfo*
-    describe (const char * id,
-	      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Register::ProxyOfferId));
-
-  // BEGIN SPEC
-  // The describe operation returns the information about an offered
-  // service that is held by the trader. It comprises the "reference"
-  // of the offered service, the "type" of the service offer, and the
-  // "properties" that describe this offer of service. The offer is
-  // identified by the "id" parameter which was originally returned by
-  // export. ° If the string representation of "id" does not obey the
-  // rules for object identifiers, then an IllegalOfferId exception is
-  // raised. ° If the "id" is legal but there is no offer within the
-  // trader with that "id," then an UnknownOfferId exception is
-  // raised. ° If the "id" identifies a proxy offer rather than an
-  // ordinary offer, then a ProxyOfferId exception is raised. 
-  // END SPEC
-  
-  virtual void modify (const char * id, 
-		       const CosTrading::PropertyNameSeq& del_list, 
-		       const CosTrading::PropertySeq& modify_list,
-		       CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::NotImplemented, 
-		    CosTrading::IllegalOfferId, 
-		    CosTrading::UnknownOfferId, 
-		    CosTrading::Register::ProxyOfferId, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::Register::UnknownPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::Register::MandatoryProperty, 
-		    CosTrading::Register::ReadonlyProperty, 
-		    CosTrading::DuplicatePropertyName));
-
-  // BEGIN SPEC
-  // The modify operation is used to change the description of a
-  // service as held within a service offer. The object reference and
-  // the service type associated with the offer cannot be
-  // changed. This operation may: ° add new (non-mandatory) properties
-  // to describe an offer, ° change the values of some existing (not
-  // readonly) properties, or ° delete existing (neither mandatory nor
-  // readonly) properties.
-
-  // The modify operation either succeeds completely or it fails
-  // completely. The offer is identified by the "id" parameter which
-  // was originally returned by export. ° If the string representation
-  // of "id" does not obey the rules for offer identifiers, then an
-  // IllegalOfferId exception is raised. ° If the "id" is legal but
-  // there is no offer within the trader with that "id," then an
-  // UnknownOfferId exception is raised. ° If the "id" identifies a
-  // proxy offer rather than an ordinary offer, then a ProxyOfferId
-  // exception is raised.
-
-  // The "del_list" parameter gives the names of the properties that
-  // are no longer to be recorded for the identified offer. Future
-  // query and describe operations will not see these properties. ° If
-  // any of the names within the "del_list" do not obey the rules for
-  // PropertyName's, then an IllegalPropertyName exception is
-  // raised. ° If a "name" is legal but there is no property for the
-  // offer with that "name," then an UnknownPropertyName exception is
-  // raised. ° If the list includes a property that has a mandatory
-  // mode, then the MandatoryProperty exception is raised. ° If the
-  // same property name is included two or more times in this
-  // parameter, the DuplicatePropertyName exception is raised.
-
-  // The "modify_list" parameter gives the names and values of
-  // properties to be changed. If the property is not in the offer,
-  // then the modify operation adds it. The modified (or added)
-  // property values are returned in future query and describe
-  // operations in place of the original values. ° If any of the names
-  // within the "modify_list" do not obey the rules for
-  // PropertyName's, then an IllegalPropertyName exception is
-  // raised. ° If the list includes a property that has a readonly
-  // mode, then the ReadonlyProperty exception is raised unless that
-  // readonly property is not currently recorded for the offer. The
-  // ReadonlyDynamicProperty exception is raised if an attempt is made
-  // to assign a dynamic property value to a readonly property. ° If
-  // the value of any modified property is of a type that is not the
-  // same as the type expected, then the PropertyTypeMismatch
-  // exception is raised. ° If two or more properties with the same
-  // property name are included in this argument, the
-  // DuplicatePropertyName exception is raised.
-
-  // The NotImplemented exception shall be raised if and only if the
-  // supports_modifiable_properties attribute yields FALSE. 
-  // END SPEC
-  
-  virtual void withdraw_using_constraint (const char *type, 
-					  const char *constr,
-					  CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    CosTrading::IllegalConstraint, 
-		    CosTrading::Register::NoMatchingOffers));
-
-  // BEGIN SPEC
-  // The withdraw_using_constraint operation withdraws a set of offers
-  // from within a single trader. This set is identified in the same
-  // way that a query operation identifies a set of offers to be
-  // returned to an importer.
-
-  // The "type" parameter conveys the required service type. Each
-  // offer of the specified type will have the constraint expression
-  // applied to it. If it matches the constraint expression, then the
-  // offer will be withdrawn.° If "type" does not obey the rules for
-  // service types, then an IllegalServiceType exception is raised. °
-  // If the "type" is correct syntactically but is not recognized as a
-  // service type by the trader, then an UnknownServiceType exception
-  // is raised. 
-
-  // The constraint "constr" is the means by which the client
-  // restricts the set of offers to those that are intended for
-  // withdrawal. ° If "constr" does not obey the syntax rules for a
-  // constraint then an IllegalConstraint exception is raised. ° If
-  // the constraint fails to match with any offer of the specified
-  // service type, then a NoMatchingOffers exception is raised. 
-  // END SPEC
-  
-  virtual CosTrading::Register_ptr
-    resolve (const CosTrading::TraderName &name,
-	     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::Register::IllegalTraderName, 
-		    CosTrading::Register::UnknownTraderName, 
-		    CosTrading::Register::RegisterNotSupported));
-
-  // BEGIN SPEC
-  // This operation is used to resolve a context relative name for
-  // another trader. In particular, it is used when exporting to a
-  // trader that is known by a name rather than by an object
-  // reference. The client provides the name, which will be a sequence
-  // of name components. ° If the content of the parameter cannot
-  // yield legal syntax for the first component, then the
-  // IllegalTraderName exception is raised. Otherwise, the first name
-  // component is compared against the name held in each link. ° If no
-  // match is found, or the trader does not support links, the
-  // UnknownTraderName exception is raised. Otherwise, the trader
-  // obtains the register_if held as part of the matched link. ° If
-  // the Register interface is not nil, then the trader binds to the
-  // Register interface and invokes resolve but passes the TraderName
-  // with the first component removed; if it is nil, then the
-  // RegisterNotSupported exception is raised. When a trader is able
-  // to match the first name component leaving no residual name, that
-  // trader returns the reference for the Register interface for that
-  // linked trader. In unwinding the recursion, intermediate traders
-  // return the Register interface reference to their client (another
-  // trader).
-  // END SPEC
-    
-  static const char* NAME;
-  
-protected:
-
-  typedef CosTradingRepos::ServiceTypeRepository::TypeStruct TYPE_STRUCT;
-  
-  void validate_properties (const char* type,
-			    TYPE_STRUCT* type_struct,
-			    CosTrading::PropertySeq& properties,
-			    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, 
-		    CosTrading::PropertyTypeMismatch, 
-		    CosTrading::ReadonlyDynamicProperty, 
-		    CosTrading::MissingMandatoryProperty, 
-		    CosTrading::DuplicatePropertyName));
-  
-  // Type is a known service type.
-  
-  CORBA::Boolean find_property (CosTrading::PropertySeq &properties,
-				const char *property_name,
-				CORBA::ULong &position);
-  
- private:
-  TRADER &trader_;
-};
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Register.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* ACE_REGISTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp
deleted file mode 100644
index 4f9d4190b27..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Register_Offer_Iterator.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// ============================================================================
-
-#if !defined (TAO_REGISTER_OFFER_ITERATOR_C)
-#define  TAO_REGISTER_OFFER_ITERATOR_C
-
-#include "Register_Offer_Iterator.h"
-#include <iostream.h>
-
-#ifndef min
-#define        min(a, b)               ((a) > (b) ? (b) : (a))
-#endif
-
-template <class TRADER>
-TAO_Register_Offer_Iterator<TRADER>::
-TAO_Register_Offer_Iterator (TRADER &trader,
-			     const TAO_Property_Filter& pfilter)
-  : TAO_Offer_Iterator (pfilter),
-    trader_ (trader)
-{
-}
-
-template <class TRADER>
-TAO_Register_Offer_Iterator<TRADER>::~TAO_Register_Offer_Iterator (void)
-{
-}
-
-template <class TRADER> void
-TAO_Register_Offer_Iterator<TRADER>::add_offer (CosTrading::OfferId id,
-						CosTrading::Offer* offer)
-{
-  this->offer_ids_.push_back (id);
-}
-
-template <class TRADER> CORBA::ULong 
-TAO_Register_Offer_Iterator<TRADER>::max_left (CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::UnknownMaxLeft))
-{
-  return this->offer_ids_.size ();
-}
-
-template <class TRADER> CORBA::Boolean 
-TAO_Register_Offer_Iterator<TRADER>::next_n (CORBA::ULong n, 
-					     OfferSeq_out offers,
-					     CORBA::Environment& _env) 
-  TAO_THROW_SPEC (CORBA::SystemException)
-{
-  offers = new CosTrading::OfferSeq;
-
-  CORBA::ULong ret_offers = 0;
-  
-  // Get service type map (monitor object).
-  TRADER::SERVICE_TYPE_MAP &service_type_map = 
-    this->trader_.service_type_map ();
-
-  CORBA::ULong max_possible_offers_in_sequence =
-    min(n, this->offer_ids_.size ());
-  offers->length (max_possible_offers_in_sequence);  
-  
-  // While there are entries left and we haven't filled <offers>
-  // with requested number.
-  while (! this->offer_ids_.empty () 
-	 && n > ret_offers)
-    {
-      // If offer is found, put it into the sequence.	  
-      // remove this id irrespective of whether the offer is found
-      // or not.      
-      CosTrading::OfferId_var id = this->offer_ids_.front ();
-      
-      TAO_TRY
-	{
-	  CosTrading::Offer* offer =
-	    service_type_map.lookup_offer (id, TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	  
-	  if (offer != 0)
-	    {
-	      CosTrading::Offer& destination = (*offers)[ret_offers++];
-	      this->pfilter_.filter_offer (*offer, destination);
-	    }
-	}
-      TAO_CATCHANY {}
-      TAO_ENDTRY;
-      
-      this->offer_ids_.pop_front ();
-    }
-  
-  // Reset the length to the correct value
-  offers->length (ret_offers);
-
-  return (CORBA::Boolean)(ret_offers != 0);
-}
-
-#endif /* TAO_REGISTER_OFFER_ITERATOR_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h
deleted file mode 100644
index 133a771ab35..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Register_Offer_Iterator.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_REGISTER_OFFER_ITERATOR_H
-#define TAO_REGISTER_OFFER_ITERATOR_H
-    
-#include "Offer_Iterator.h"
-#include <deque>
-
-template <class TRADER>
-class TAO_Register_Offer_Iterator : public TAO_Offer_Iterator
-  // = TITLE
-  //     An implementation of CosTrading::OfferIterator IDL interface
-  //     appropriate when trader has Register functionality.
-  //
-  // = DESCRIPTION
-  //     Stores ids of offers to be iterated over.  Before returning
-  //     an offer, checks if the offer is still there (since it may
-  //     have been removed by the Register). 
-{
-public:
-
-  // = Initialization and termination methods.
-
-  TAO_Register_Offer_Iterator (TRADER &trader,
-			       const TAO_Property_Filter& pfilter);
-  // Takes service type and trader reference in order to 
-  // later locate offers using their ids.
-
-  virtual ~TAO_Register_Offer_Iterator (void);
-  // destructor.
-
-  virtual CORBA::Boolean next_n (CORBA::ULong n, 
-				 CosTrading::OfferSeq_out offers,
-				 CORBA::Environment& _env)  
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  // Deposit at maximum n offers into the return sequence and return 1,
-  // or return 0 if the iterator is done and no offers are returned.
-  
-  virtual CORBA::ULong max_left (CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::UnknownMaxLeft));
-  // Throws CosTrading::UnknownMaxLeft since with the presence of 
-  // "Register" functionality, the iterator cannot guarantee that 
-  // the trader will have all the offers it has now when the time
-  // to return them comes.
-
-  void add_offer (CosTrading::OfferId id,
-		  CosTrading::Offer* offer);
-  // Add an offer the iterator should iterate over.
-
-private:
-
-  TRADER &trader_;
-  // A reference to the trader is needed for access to the map of offers.
-
-  deque <CosTrading::OfferId_var> offer_ids_;
-  // Offer ids of offers to iterate over.
-};
-
-
-#if defined (TAO_TEMPLATES_REQUIRE_SOURCE)
-#include "Register_Offer_Iterator.cpp"
-#endif /* TAO_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_REGISTER_OFFER_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.cpp
deleted file mode 100644
index ff54bdf0329..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// $Id$
-#ifndef TAO_SERVICE_TYPE_MAP_C
-#define TAO_SERVICE_TYPE_MAP_C
-
-#include "Service_Type_Map.h"
-#include "Offer_Id_Iterator.h"
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::TAO_Service_Type_Map (void)
-{
-}
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator*
-TAO_Service_Type_Map<LOCK_TYPE>::get_offers (const char* type)
-{
-  // Construct a Local_Offer_Iterator
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  Local_Offer_Iterator* iterator = 0;
-  string service_type (type);
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (service_type);
-  
-  if (type_iter != this->type_map_.end ())
-    {
-      iterator = new Local_Offer_Iterator (type,
-					   this->type_map_, 
-					   (*type_iter).second.first);
-    }
-  
-  return iterator;
-}
-
-template <class LOCK_TYPE> int
-TAO_Service_Type_Map<LOCK_TYPE>::add_type (const char* type)
-{
-  ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), -1);
-
-  int return_value = -1; 
-  string service_type (type);
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (service_type);
-
-  if (type_iter == this->type_map_.end ())
-    {
-      OFFER_MAP offer_map;
-      SERVICE_TYPE_MAP::value_type
-	new_entry (service_type, make_pair (offer_map, 1));	  
-
-      if (! (this->type_map_.insert (new_entry)).second)
-	return_value = 0;
-    }
-
-  return return_value;
-}
-
-template <class LOCK_TYPE> int
-TAO_Service_Type_Map<LOCK_TYPE>::remove_type (const char* type)
-{
-  ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), -1);
-
-  int return_value = -1; 
-  string service_type (type);
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (service_type);
-
-  if (type_iter != this->type_map_.end ())
-    {
-      this->type_map_.erase (type_iter);
-      return_value = 0;
-    }
-
-  return return_value;
-}
-
-template <class LOCK_TYPE> char*
-TAO_Service_Type_Map<LOCK_TYPE>::
-insert_offer (const char* type,
-	      const CosTrading::Offer& offer)
-{
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  char* return_value = 0;
-  string service_type (type);
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (service_type);
-  
-  if (type_iter != this->type_map_.end ())
-    {
-      // If type is found, insert the offer
-      OFFER_MAP_PLUS_COUNTER& mc = (*type_iter).second;
-      OFFER_MAP &offer_map = mc.first;
-      HUGE_NUMBER& starting_number = mc.second;
-      
-      ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map.lock (), 0);
-
-      return_value = this->generate_offer_id (type, starting_number);
-      offer_map[starting_number++] = offer;
-    }
-
-  return return_value;
-}
-
-template <class LOCK_TYPE> int
-TAO_Service_Type_Map<LOCK_TYPE>::
-remove_offer (const char* type, HUGE_NUMBER id)
-{
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), -1);
-  
-  int return_value = -1;
-  SERVICE_TYPE_MAP::iterator type_iter;
-
-  type_iter = this->type_map_.find (string (type));
-  
-  if (type_iter != this->type_map_.end ())
-    {
-      OFFER_MAP::iterator offer_iter;
-      OFFER_MAP_PLUS_COUNTER& mc = (*type_iter).second;
-      OFFER_MAP &offer_map = mc.first;
-      
-      ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map.lock (), -1);
-
-      offer_iter = offer_map.find (id);
-      if (offer_iter != offer_map.end ())
-	{
-	  offer_map.erase (offer_iter);      
-	  return_value = 0;
-	}
-    }
-
-  return return_value;
-}
-  
-template <class LOCK_TYPE> int
-TAO_Service_Type_Map<LOCK_TYPE>::
-remove_offer (const CosTrading::OfferId offer_id,
-	      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		  CosTrading::UnknownOfferId))
-{
-  char* stype = 0;
-  HUGE_NUMBER index = -1;
-
-  this->parse_offer_id (offer_id, stype, index, _env);
-  TAO_CHECK_ENV_RETURN (_env, -1);
-
-  if (this->remove_offer (stype, index) == -1)
-    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), -1);
-
-  return 0;
-}
-
-template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Type_Map<LOCK_TYPE>::
-lookup_offer (const CosTrading::OfferId offer_id,
-	      char*& type_name,
-	      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		  CosTrading::UnknownOfferId))
-{
-  HUGE_NUMBER index;
-  CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index, _env);
-  TAO_CHECK_ENV_RETURN (_env, offer);
-
-  if ((offer = this->lookup_offer (type_name, index)) == 0)
-    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
-
-  return offer;
-}
-
-
-template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Type_Map<LOCK_TYPE>::
-lookup_offer (const CosTrading::OfferId offer_id,
-	      CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		  CosTrading::UnknownOfferId))
-{
-  char* type_name;
-  HUGE_NUMBER index;
-  CosTrading::Offer* offer = 0;
-
-  this->parse_offer_id (offer_id, type_name, index, _env);
-  TAO_CHECK_ENV_RETURN (_env, offer);
-
-  if ((offer = this->lookup_offer (type_name, index)) == 0)
-    TAO_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
-
-  return offer;
-}
-  
-template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Type_Map<LOCK_TYPE>::
-lookup_offer (const char* type, HUGE_NUMBER id)
-{
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  CosTrading::Offer* return_value = 0;
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (string (type));
-  
-  if (type_iter != this->type_map_.end ())
-    {
-      OFFER_MAP::iterator offer_iter;
-      OFFER_MAP_PLUS_COUNTER& mc = (*type_iter).second;
-      OFFER_MAP &offer_map = mc.first;
-
-      ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map.lock (), 0);
-      
-      offer_iter = offer_map.find (id);
-      if (offer_iter != offer_map.end ())
-	return_value = &((*offer_iter).second);
-    }
-  
-  return return_value;
-}
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Random_Offer_Locator*
-TAO_Service_Type_Map<LOCK_TYPE>::lookup_offers (const char* type)
-{
-  // Construct a Random_Offer_Locator.
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  Random_Offer_Locator* iterator = 0;
-  string service_type (type);
-  SERVICE_TYPE_MAP::iterator type_iter =
-    this->type_map_.find (service_type);
-  
-  if (type_iter != this->type_map_.end ())
-    {
-      iterator = new Random_Offer_Locator (this->type_map_, 
-					   (*type_iter).second.first);
-    }
-
-  return iterator;
-}
-
-template <class LOCK_TYPE> TAO_Offer_Id_Iterator*
-TAO_Service_Type_Map<LOCK_TYPE>::retrieve_all_offer_ids (void)
-{
-  // Fill an TAO_Offer_Id_Iterator with the offer_ids of all offers
-  // exported to the TAO_Service_Type_Map. Iterates through the entire 
-  // map, cramming offer_id strings into a newly constructed
-  // TAO_Offer_Id_Iterator. 
-  TAO_Offer_Id_Iterator* id_iterator = new TAO_Offer_Id_Iterator ();
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  for (SERVICE_TYPE_MAP::iterator type_iter = this->type_map_.begin ();
-       type_iter != this->type_map_.end ();
-       type_iter++)
-    {
-      char* service_type = (char *) (*type_iter).first.data ();
-      OFFER_MAP& offer_map = (*type_iter).second.first;
-
-      ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map.lock (), 0);
-      
-      for (OFFER_MAP::iterator offer_iter = offer_map.begin();
-	   offer_iter != offer_map.end();
-	   offer_iter++)
-	{
-	  HUGE_NUMBER offer_index = (*offer_iter).first;
-	  CosTrading::OfferId offer_id = 
-	    this->generate_offer_id (service_type, offer_index); 
-
-	  id_iterator->insert_id (offer_id);
-	}
-    }      
-  
-  return id_iterator;
-}
-
-template <class LOCK_TYPE> TAO_Service_Type_Map<LOCK_TYPE>::TYPE_NAME_SEQ*
-TAO_Service_Type_Map<LOCK_TYPE>::list_all_types (void)
-{
-  ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->type_map_.lock (), 0);
-  
-  CORBA::ULong i = 0;
-  TYPE_NAME* type_names = TYPE_NAME_SEQ::allocbuf (this->type_map_.size ());
-  
-  for (SERVICE_TYPE_MAP::iterator type_iter = this->type_map_.begin ();
-       type_iter != this->type_map_.end ();
-       type_iter++)
-    type_names[i++] = CORBA::string_dup ((*type_iter).first.data ());
-
-  return new TYPE_NAME_SEQ (i, i, type_names, 1);
-}
-
-template <class LOCK_TYPE> void
-TAO_Service_Type_Map<LOCK_TYPE>::parse_offer_id (const char *offer_id,
-						 char*&service_type,
-						 HUGE_NUMBER& id,
-						 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalOfferId))
-{
-  // Get service type: it is everything from 17th character to the end.
-  service_type = (char *) offer_id + 16;
-  
-  // Get id: temporarily put the end of string character where the service 
-  // type starts, convert to number, replace the character back.
-  char &start_of_type = (char) *(offer_id + 16);
-  char temp = start_of_type;
-  start_of_type = '\0';
-  id = ACE_OS::atoi (offer_id);
-
-  start_of_type = temp;
-
-  if (! TAO_Trader_Base::is_valid_identifier_name (service_type))
-    TAO_THROW (CosTrading::IllegalOfferId (offer_id));
-}
-
-template <class LOCK_TYPE> char*
-TAO_Service_Type_Map<LOCK_TYPE>::
-generate_offer_id (const char *service_type_name,
-		   HUGE_NUMBER id)
-{
-    // holds final id string.
-  string offer_id;
-
-  // hold portions of id string.
-  char id_string[16];
-  char padding [16];
-
-  ACE_OS::sprintf(id_string, "%d", id);
-
-  size_t padding_size = 16 - ACE_OS::strlen (id_string);
-   // Fill padding with zeros.
-  for (int i = 0; i < padding_size; i++)
-    padding[i] = '0';
-  padding[padding_size] = '\0';
-  
-  offer_id += padding;
-  offer_id += id_string;
-  offer_id += service_type_name;
-
-  return CORBA::string_dup (offer_id.data ());
-}
-
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::
-Local_Offer_Iterator (const char* type,
-		      TAO_Service_Type_Map<LOCK_TYPE>::SERVICE_TYPE_MAP& stm,
-		      TAO_Service_Type_Map<LOCK_TYPE>::OFFER_MAP& offer_map)
-  : offer_map_ (offer_map),
-    stm_ (stm),    
-    offer_iter_ (offer_map.begin ()),
-    type_ (type)
-{
-  if (this->stm_.lock ().acquire_read () == -1)
-    ;
-  
-  if (this->offer_map_.lock ().acquire_read () == -1)
-    ;  
-}
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::
-~Local_Offer_Iterator (void)
-{  
-  if (this->offer_map_.lock ().release () == -1)
-    ;
-
-  if (this->stm_.lock ().release () == -1)
-    ;
-}
-
-template <class LOCK_TYPE> CosTrading::OfferId
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::get_id (void)
-{
-  return TAO_Service_Type_Map<LOCK_TYPE>::
-    generate_offer_id (this->type_, (*this->offer_iter_).first);
-}
-
-template <class LOCK_TYPE> int
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::
-has_more_offers (void)
-{
-  return this->offer_iter_ != this->offer_map_.end ();
-}
-
-  
-template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::
-get_offer (void)
-{
-  return &(*this->offer_iter_).second;
-}
-
-template <class LOCK_TYPE> void
-TAO_Service_Type_Map<LOCK_TYPE>::Local_Offer_Iterator::
-next_offer (void)
-{
-  this->offer_iter_++;
-}
-
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Random_Offer_Locator::
-Random_Offer_Locator (TAO_Service_Type_Map<LOCK_TYPE>::SERVICE_TYPE_MAP& stm,
-		      TAO_Service_Type_Map<LOCK_TYPE>::OFFER_MAP& offer_map)
-  : offer_map_ (offer_map),
-    offer_iter_ (offer_map_.begin ()),
-    stm_ (stm)
-{
-  if (this->stm_.lock ().acquire_read () == -1)
-    ;
-  
-  if (this->offer_map_.lock ().acquire_read () == -1)
-    ;  
-}
-
-template <class LOCK_TYPE>
-TAO_Service_Type_Map<LOCK_TYPE>::Random_Offer_Locator::
-~Random_Offer_Locator (void)
-{  
-  if (this->offer_map_.lock ().release () == -1)
-    ;
-
-  if (this->stm_.lock ().release () == -1)
-    ;
-}
-
-template <class LOCK_TYPE> CosTrading::Offer*
-TAO_Service_Type_Map<LOCK_TYPE>::Random_Offer_Locator::
-get_offer (TAO_Service_Type_Map<LOCK_TYPE>::HUGE_NUMBER id)
-{
-  CosTrading::Offer* return_value = 0;
-  
-  this->offer_iter_ = this->offer_map_.find (id);
-  if (this->offer_iter_ != this->offer_map_.end ())
-    return_value = &(*this->offer_iter_).second;
-
-  return return_value;
-}
-
-#endif /* TAO_SERVICE_TYPE_MAP_C */
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.h
deleted file mode 100644
index c6b3cbd03b7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Map.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Service_Type_Map.h
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_SERVICE_TYPE_MAP_H
-#define TAO_SERVICE_TYPE_MAP_H
-
-#include "Trader.h"
-#include "Monitor.h"
-
-class TAO_Offer_Id_Iterator;
-
-template <class LOCK_TYPE>
-class TAO_Service_Type_Map
-// = DESCRIPTION
-//   The TAO_Service_Type_Map encapsulates the mapping of service
-//   types to those offers exported with that service types. The
-//   underlying structure is a map of maps. The first maps maps the
-//   service type name to a map of exported offers. The second map
-//   maps the identifying index for that offer within the service
-//   types. So a service type name and an index uniquely identifies an 
-//   exported offer. In fact, when the register export interface
-//   returns a CosTrading::OfferId, it's returning no more than a
-//   simple string concatenation of these two values. In addition to
-//   all these wonderful things, the TAO_Service_Type_Map has built-in 
-//   locking, one reader/writer-style lock for modifying the top-level 
-//   map and a reader/writer-style for each of the offer
-//   maps. Needless to say the locks are acquired when the
-//   TAO_Service_Type_Map performs operations on the structures they
-//   guard.
-//
-//   NOTE: TAO_Service_Type_Map needs to be parameterized by a
-//   READER/WRITER LOCK, a RECURSIVE MUTEX, or a NULL MUTEX, not a
-//   simple binary mutex! Mutexes will cause deadlock when you try to
-//   contruct an iterator (which acquires a read lock on the map under
-//   an existing read lock). Just don't do it, ok?
-{
-public:
-
-  typedef int HUGE_NUMBER;
-  typedef map<HUGE_NUMBER, CosTrading::Offer, less<HUGE_NUMBER> > OFFERS;
-  typedef TAO_Monitor<OFFERS, LOCK_TYPE> OFFER_MAP;
-  typedef pair<OFFER_MAP, HUGE_NUMBER> OFFER_MAP_PLUS_COUNTER;
-  typedef TAO_Monitor <map <string, OFFER_MAP_PLUS_COUNTER, less<string> >, LOCK_TYPE> SERVICE_TYPE_MAP;
-  
-  class Local_Offer_Iterator;
-  class Random_Offer_Locator;
-  
-  TAO_Service_Type_Map (void);
-  // No arg constructor.
-  
-  Local_Offer_Iterator* get_offers (const char* type);
-  // Return an iterator for traversing the list of offers whose type
-  // is <type>, or 0 if the type doesn't exist.
-  
-  int add_type (const char* type);
-  // Add a new service type. Returns 0 on success (that is, the type
-  // was found), -1 on failure (the type wasn't found).
-  
-  int remove_type (const char* type);
-  // Remove a service type. returns 0 on success (the type was found
-  // and removed), and -1 on failure (the type wasn't found).
-  
-  CosTrading::OfferId insert_offer (const char* type,
-				    const CosTrading::Offer& offer);
-  // Add an offer of type <type> and generate a CosTrading::OfferId
-  // for it. Returns 0 on failure.
-  
-  int remove_offer (const CosTrading::OfferId offer_id,
-		    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
-
-  int remove_offer (const char* type, HUGE_NUMBER id);
-  // Remove an offers whose id is <offer_id>. Returns 0 on success, -1 
-  // on failure, and throws a CosTrading::IllegalOfferId if it can't
-  // parse the CosTrading::OfferId.
-
-  
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-				   CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
-  // Lookup an offer whose offer_id is <offer_id>, and return
-  // it. Otherwise, throw the appropriate exception.
-
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-				   char*& type_name,
-				   CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-		    CosTrading::UnknownOfferId));
-  // Lookup an offer whose OfferId is <offer_id> and return in
-  // <type_name> the type name of the object. Type name is just a
-  // pointer to a location in offer_id, so DON'T DELETE IT.
-
-  CosTrading::Offer* lookup_offer (const char* type, HUGE_NUMBER id);
-  // Lookup an offer whose type is <type> and id, <id>. Return 0 on
-  // failure. 
-
-  Random_Offer_Locator* lookup_offers (const char* type);
-  // Return a random access iterator to the set of offers of type
-  // <type>.
-
-  TAO_Offer_Id_Iterator* retrieve_all_offer_ids (void);
-  // Return an iterator that will traverse and return all the offer
-  // ids in the service type map.
-
-  typedef CosTrading::ServiceTypeName TYPE_NAME;
-  typedef CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq TYPE_NAME_SEQ;
-  TYPE_NAME_SEQ* list_all_types (void);
-  
-  class Local_Offer_Iterator
-    // = TITLE
-    //   Local_Offer_Iterator iterates over the set of exported
-    //   offers for a given type. Handily, it takes care of all the
-    //   necessary locking, acquiring them in the constructor, and
-    //   releasing them in the destructor. Since Local_Offer_Iterator
-    //   is dynamically allocated by TAO_Offer_Id_Iterator, make sure
-    //   to EXPLICITLY CALL DELETE when you're done with it.
-  {
-    friend TAO_Service_Type_Map<LOCK_TYPE>;
-  public:
-    
-    ~Local_Offer_Iterator (void);
-    // Release all the locks acquired.
-    
-    int has_more_offers (void);
-    // Returns 1 if there are more offers, 0 otherwise.
-    
-    CosTrading::OfferId get_id (void);
-    // Get the id for the current offer.
-    
-    CosTrading::Offer* get_offer (void);
-    // Returns the next offer in the series.
-    
-    void next_offer (void);
-    // Advances the iterator 1.
-    
-  private:
-
-    Local_Offer_Iterator (const char* type,
-			  SERVICE_TYPE_MAP& stm,
-			  OFFER_MAP& offer_map);
-    // Protected constructor.
-    
-    OFFER_MAP& offer_map_;
-    // The underlying map of offers.
-    
-    SERVICE_TYPE_MAP& stm_;
-    // The top level map on which we're going to acquire a read lock.
-    
-    OFFER_MAP::iterator offer_iter_;
-    //
-
-    const char* type_;
-  };
-
-  class Random_Offer_Locator
-    // = TITLE
-    //   Random_Offer_Locator locates offers in a set of exported
-    //   offers for a given type. Handily, it takes care of all the
-    //   necessary locking, acquiring them in the constructor, and
-    //   releasing them in the destructor. Since Random_Offer_Locator
-    //   is dynamically allocated by TAO_Offer_Id_Iterator, make sure
-    //   to EXPLICITLY CALL DELETE when you're done with it.
-
-  {
-    friend TAO_Service_Type_Map<LOCK_TYPE>;
-  public:
-    
-    ~Random_Offer_Iterator (void);
-    // Release all the read locks acquire by the constructor.
-    
-    CosTrading::Offer* get_offer (HUGE_NUMBER id);
-    // Returns the offer in the series of id <id>
-    
-  private:
-    
-    Random_Offer_Locator (SERVICE_TYPE_MAP& stm,
-			  OFFER_MAP& offer_map);
-    
-    OFFER_MAP& offer_map_;
-    SERVICE_TYPE_MAP& stm_;
-    OFFER_MAP::iterator offer_iter_;
-  };
-
-  // Should be private:
-  
-  static char* generate_offer_id (const char *service_type_name,
-				  HUGE_NUMBER id);
-  // Take in a service type name for the offer the current value of 
-  // of the counter and generate an offer id.
-  
-private:
-  
-  static void parse_offer_id (const char *offer_id,
-			      char* &service_type,
-			      HUGE_NUMBER& id,
-			      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalOfferId));
-  // Take in a previously generated offer id and return the type
-  // and id that were used to generate the offer id.  
-
-  SERVICE_TYPE_MAP type_map_;
-  // The protected data structure.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Service_Type_Map.cpp"
-#endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_SERVICE_TYPE_MAP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
deleted file mode 100644
index 39e4b8ad822..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ /dev/null
@@ -1,499 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Service_Type_Repository.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#include "Locking.h"
-#include "Service_Type_Repository.h"
-
-TAO_Service_Type_Repository::
-TAO_Service_Type_Repository (ACE_Lock* lock)
-  : lock_ (lock)
-{
-  incarnation_.low = 0;
-  incarnation_.high = 0;
-
-  // If a lock wasn't provided, let's assume the user doesn't want any
-  // kind of lock at all.
-  if (this->lock_ == 0)
-    ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_Null_Mutex> ());
-}
-
-
-TAO_Service_Type_Repository::
-~TAO_Service_Type_Repository (void)
-{
-  delete this->lock_;
-}
-
-
-SERVICE_TYPE_REPOS::IncarnationNumber 
-TAO_Service_Type_Repository::
-incarnation (CORBA::Environment& _env)
-{
-  SERVICE_TYPE_REPOS::IncarnationNumber inc_num;
-  TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, inc_num);
-  return incarnation_;
-}
-
-
-SERVICE_TYPE_REPOS::IncarnationNumber 
-TAO_Service_Type_Repository::
-add_type (const char * name, 
-	  const char * if_name, 
-	  const SERVICE_TYPE_REPOS::PropStructSeq& props, 
-	  const SERVICE_TYPE_REPOS::ServiceTypeNameSeq& super_types,
-	  CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalServiceType, 
-		  SERVICE_TYPE_REPOS::ServiceTypeExists, 
-		  SERVICE_TYPE_REPOS::InterfaceTypeMismatch, 
-		  CosTrading::IllegalPropertyName, 
-		  CosTrading::DuplicatePropertyName, 
-		  SERVICE_TYPE_REPOS::ValueTypeRedefinition, 
-		  CosTrading::UnknownServiceType, 
-		  SERVICE_TYPE_REPOS::DuplicateServiceTypeName))
-{
-  PROP_MAP prop_map;
-  SUPER_TYPE_MAP super_map;
-  SERVICE_TYPE_REPOS::TypeStruct info;
-  SERVICE_TYPE_MAP::iterator type_iterator;
-  SERVICE_TYPE_REPOS::IncarnationNumber inc_num;
-  
-  TAO_WRITE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, inc_num);
-
-  // make sure Type name is valid
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW_RETURN (CosTrading::IllegalServiceType (name),
-		      this->incarnation_);
-
-  // check if the service type already exists.
-  type_iterator = this->type_map_.find (name);
-  if (type_iterator != this->type_map_.end ())
-    TAO_THROW_RETURN (SERVICE_TYPE_REPOS::ServiceTypeExists (),
-		      this->incarnation_);
-  
-  // make sure all property names are valid and appear only once.
-  this->validate_properties (props, prop_map, _env);
-  TAO_CHECK_ENV_RETURN (_env, this->incarnation_);
-  
-  // check that all super_types exist, and none are duplicated.
-  this->validate_supertypes (super_types, super_map, _env);
-  TAO_CHECK_ENV_RETURN (_env, this->incarnation_);
-
-  // NOTE: I don't really know a way to do this without an Interface
-  // Repository, since the Interface Repository IDs don't contain
-  // information about supertypes.
-  // 
-  // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types, _env);
-  //  TAO_CHECK_ENV_RETURN(_env, this->incarnation);
-  //
-  // Instead, we do this:
-  // 
-  if (if_name == 0)
-    TAO_THROW_RETURN (SERVICE_TYPE_REPOS::InterfaceTypeMismatch (),
-		      this->incarnation_);
-  
-  // collect and make sure that properties of all supertypes and this type
-  // are compatible.  We can use prop_map and super_types_map for the job.
-  this->validate_inheritance (prop_map, super_map, _env);
-  TAO_CHECK_ENV_RETURN (_env, this->incarnation_);
-  
-  // we can now use prop_map to construct a sequence of all properties the
-  // this type.
-  info.if_name = if_name;
-  info.props = props;
-  info.super_types = super_types;
-  info.masked = 0;
-  info.incarnation = this->incarnation_; 
-  this->update_type_map (name, info, prop_map, super_map);
-
-  // increment incarnation number
-  this->incarnation_.low++;
-  // if we wrapped around in lows...
-  if (this->incarnation_.low == 0)
-    this->incarnation_.high++;
-
-  return this->type_map_[name].type_info_.incarnation;
-}
-
-
-void 
-TAO_Service_Type_Repository::
-remove_type (const char * name,
-	     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  SERVICE_TYPE_REPOS::HasSubTypes))
-{
-  ACE_DEBUG ((LM_DEBUG, "TAO_Service_Type_Repository::remove_type (%s)\n",
-	      name));
-	      
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::IllegalServiceType (name));
-
-  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-
-  // check if the type exists.
-  SERVICE_TYPE_MAP::iterator type_iterator = this->type_map_.find (name);
-  if (type_iterator == this->type_map_.end ())
-    TAO_THROW (CosTrading::UnknownServiceType (name));
-
-  // check if has any subtypes.
-  Type_Info& type_info = (*type_iterator).second;
-  if (type_info.sub_types_.empty () == 0)
-    {
-      const char* type_name = type_info.sub_types_.front ().data ();
-      TAO_THROW (SERVICE_TYPE_REPOS::HasSubTypes (name, type_name));
-    }
-
-  // remove this type from an entry of each of its supertypes.
-  SERVICE_TYPE_REPOS::ServiceTypeNameSeq &super =
-    type_info.type_info_.super_types;
-
-  for (CORBA::ULong i = 0; i < super.length (); i++)
-    {
-      // find the super type
-      const char *n = super[i];
-      SERVICE_TYPE_MAP::iterator super_iterator = this->type_map_.find (n);
-      
-      // remove this type from its list of subtypes
-      (*super_iterator).second.sub_types_.remove (name);
-    }
-
-  // remove the type from the map.
-  this->type_map_.erase (type_iterator);
-}
-           
-
-SERVICE_TYPE_REPOS::ServiceTypeNameSeq* 
-TAO_Service_Type_Repository::
-list_types (const SERVICE_TYPE_REPOS::SpecifiedServiceTypes& which_types,
-	    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_READ_GUARD_RETURN (ACE_Lock, 
-			 ace_mon, 
-			 *this->lock_,
-			 (SERVICE_TYPE_REPOS::ServiceTypeNameSeq*) 0);
-
-  CORBA::ULong i = 0;
-  SERVICE_TYPE_REPOS::IncarnationNumber num;
-  CORBA::ULong length = this->type_map_.size ();
-  CosTrading::ServiceTypeName* types =
-    SERVICE_TYPE_REPOS::ServiceTypeNameSeq::allocbuf (length);
-
-  if (types == 0)
-    return 0;
-  
-  if (which_types._d () == SERVICE_TYPE_REPOS::all)
-    {
-      num.high = 0;
-      num.low = 0;
-    }
-  else
-    num = which_types.incarnation ();
-
-  for (SERVICE_TYPE_MAP::iterator itr = this->type_map_.begin ();
-       itr != this->type_map_.end ();
-       itr++)
-    {
-      if (num < (*itr).second.type_info_.incarnation)
-	types[i++] = CORBA::string_dup ((*itr).first.c_str ());
-    }
-  
-  return new SERVICE_TYPE_REPOS::
-    ServiceTypeNameSeq (length, i, types, CORBA::B_TRUE);
-}
-
-           
-
-SERVICE_TYPE_REPOS::TypeStruct*
-TAO_Service_Type_Repository::
-describe_type (const char * name,
-	       CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType))
-{
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW_RETURN (CosTrading::IllegalServiceType (name),
-		      (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-
-  TAO_READ_GUARD_RETURN (ACE_Lock, 
-			 ace_mon, 
-			 *this->lock_,
-			 (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-
-  // make sure the type exists.
-  SERVICE_TYPE_MAP::iterator type_iterator = this->type_map_.find (name);
-  if (type_iterator == this->type_map_.end ())
-    TAO_THROW_RETURN (CosTrading::UnknownServiceType (name),
-		      (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-  
-  // return appropriate information about the type.
-  SERVICE_TYPE_REPOS::TypeStruct* descr = new SERVICE_TYPE_REPOS::TypeStruct;
-  SERVICE_TYPE_REPOS::TypeStruct & s = (*type_iterator).second.type_info_;
-
-  (*descr) = s;
-
-  return descr;
-}
-       
-
-SERVICE_TYPE_REPOS::TypeStruct* 
-TAO_Service_Type_Repository::
-fully_describe_type (const char * name,
-		     CORBA::Environment& _env) 
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType))
-{
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW_RETURN (CosTrading::IllegalServiceType (name),
-		      (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-  
-  TAO_READ_GUARD_RETURN (ACE_Lock, 
-			 ace_mon, 
-			 *this->lock_,
-			 (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-
-  // make sure the type exists.
-  SERVICE_TYPE_MAP::iterator type_iterator = this->type_map_.find (name);
-  if (type_iterator == this->type_map_.end ())
-    TAO_THROW_RETURN (CosTrading::UnknownServiceType (name),
-		      (SERVICE_TYPE_REPOS::TypeStruct*) 0);
-
-  // return appropriate information about the type.
-  SERVICE_TYPE_REPOS::TypeStruct* descr =
-    new SERVICE_TYPE_REPOS::TypeStruct;
-  SERVICE_TYPE_REPOS::TypeStruct & s =
-    (*type_iterator).second.type_info_;
-
-  // We do the explicit copy, since otherwise we'd have excessive
-  // properties copying.
-  descr->if_name = s.if_name;
-  descr->props = (*type_iterator).second.all_prop_; 
-  descr->super_types = s.super_types; 
-  descr->masked = s.masked; 
-  descr->incarnation = s.incarnation; 
-
-  return descr;  
-}
-
-
-void 
-TAO_Service_Type_Repository::
-mask_type (const char * name,
-	   CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  SERVICE_TYPE_REPOS::AlreadyMasked))
-{
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::IllegalServiceType (name));
-
-  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-
-  // make sure the type exists.
-  SERVICE_TYPE_MAP::iterator type_iterator = this->type_map_.find (name);
-  if (type_iterator == this->type_map_.end ())
-    TAO_THROW (CosTrading::UnknownServiceType (name));
-
-  // make sure the type is unmasked.
-  CORBA::Boolean & mask = (*type_iterator).second.type_info_.masked;
-  if (mask == 1)
-    TAO_THROW (SERVICE_TYPE_REPOS::AlreadyMasked (name));
-  // mask.
-  else
-    mask = 1;
-}
-       
-
-void 
-TAO_Service_Type_Repository::
-unmask_type (const char * name,
-	     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		  CosTrading::IllegalServiceType, 
-		  CosTrading::UnknownServiceType, 
-		  SERVICE_TYPE_REPOS::NotMasked))
-{
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
-    TAO_THROW (CosTrading::IllegalServiceType (name));
-
-  TAO_WRITE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-
-  // make sure the type exists.
-  SERVICE_TYPE_MAP::iterator type_iterator = this->type_map_.find (name);
-  if (type_iterator == this->type_map_.end ())
-    TAO_THROW (CosTrading::UnknownServiceType (name));
-
-  // make sure the type is masked.
-  CORBA::Boolean & mask = (*type_iterator).second.type_info_.masked;
-  if (mask == 0)
-    TAO_THROW (SERVICE_TYPE_REPOS::NotMasked (name));
-  // unmask.
-  else
-    mask = 0;
-}
-
- void
-TAO_Service_Type_Repository::
-validate_properties (const SERVICE_TYPE_REPOS::PropStructSeq& props,
-		     PROP_MAP& prop_map,
-		     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName))
-{
-  for (CORBA::ULong i = 0; i < props.length (); i++)
-    {
-      const char* n = props[i].name;
-      if (! TAO_Trader_Base::is_valid_identifier_name (n))
-	TAO_THROW (CosTrading::IllegalPropertyName (n));
-      else
-	{
-	  string prop_name (n);
-	  SERVICE_TYPE_REPOS::PropStruct* prop_struct =
-	    (SERVICE_TYPE_REPOS::PropStruct *) &props[i];
-
-	  if (! prop_map.insert
-	      (make_pair (prop_name, prop_struct)).second)
-	    TAO_THROW (CosTrading::DuplicatePropertyName (n));
-	}
-    }
-}
-
- void
-TAO_Service_Type_Repository::
-validate_supertypes (const SERVICE_TYPE_REPOS::ServiceTypeNameSeq& super_types,
-		     SUPER_TYPE_MAP& super_map,
-		     CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
-		  CosTrading::UnknownServiceType,
-		  CosTrading::DuplicatePropertyName))
-{
-  for (CORBA::ULong i = 0; i < super_types.length (); i++)
-    {
-      char* type = (char*)((const char*)super_types[i]);
-      
-      if (! TAO_Trader_Base::is_valid_identifier_name (type))
-	TAO_THROW (CosTrading::IllegalServiceType (type));
-      else
-	{
-	  string s_type (type);
-	  SERVICE_TYPE_MAP::iterator super_iter =
-	    this->type_map_.find (s_type);
-	  
-	  if (super_iter == this->type_map_.end ())
-	    TAO_THROW (CosTrading::UnknownServiceType (type));
-	  else
-	    if (! super_map.insert (make_pair (s_type, super_iter)).second)
-	      TAO_THROW (SERVICE_TYPE_REPOS::DuplicateServiceTypeName (type));
-	}
-    }
-}
-
-void
-TAO_Service_Type_Repository
-::validate_inheritance (PROP_MAP& prop_map,
-			SUPER_TYPE_MAP& super_map,
-			CORBA::Environment& _env)
-  TAO_THROW_SPEC ((SERVICE_TYPE_REPOS::ValueTypeRedefinition))
-{
-  SERVICE_TYPE_REPOS::PropertyMode mode;
-  // for each super_type
-  for (SUPER_TYPE_MAP::iterator super_map_iterator = super_map.begin ();
-       super_map_iterator != super_map.end ();
-       super_map_iterator++)
-    {
-      SERVICE_TYPE_MAP::iterator super_iter = (*super_map_iterator).second;
-      
-      // for each property in a super_type
-      for (int i = 0; i < (*super_iter).second.all_prop_.length (); i++)
-	{
-	  SERVICE_TYPE_REPOS::PropStruct& property =
-	    (*super_iter).second.all_prop_[i];
-	  
-	  // insert property into the map.
-	  string prop_name = (const char*) property.name;
-	  if (prop_map.insert (prop_name, &property).second == 0)
-	    {
-	      // if already there, check that it is compatible with
-	      // properties of other types. Value Types have to be the
-	      // same. 
-	      SERVICE_TYPE_REPOS::PropStruct& property_in_map =
-		*(prop_map[prop_name]);
-	      
-	      if (! property.value_type->equal (property_in_map.value_type, _env))
-		{
-		  TAO_THROW (SERVICE_TYPE_REPOS::ValueTypeRedefinition
-			     (property.name, property,
-			      property_in_map.name, property_in_map));
-		}
-	      
-	      // Mode of the parent type has to be the same or less
-	      // restrictive. 
-	      if (property.mode >= property_in_map.mode)
-		{
-		  TAO_THROW (SERVICE_TYPE_REPOS::ValueTypeRedefinition
-			     (property.name, property,
-			      property_in_map.name, property_in_map));
-		}
-	    }
-	}
-    }
-}
-
-void
-TAO_Service_Type_Repository::
-update_type_map (const char* name,
-		 SERVICE_TYPE_REPOS::TypeStruct& info,
-		 PROP_MAP& prop_map,
-		 SUPER_TYPE_MAP& super_map)
-{
-  Type_Info type;
-  SERVICE_TYPE_REPOS::PropStructSeq all_prop;
-
-  CORBA::ULong i = 0;
-  all_prop.length (prop_map.size ());
-  for (PROP_MAP::iterator prop_map_iterator = prop_map.begin ();
-       prop_map_iterator != prop_map.end ();
-       prop_map_iterator++, i++)
-    {
-      all_prop[i] = *((*prop_map_iterator).second); 
-    }
-
-  // update entries for all supertypes to include this type as a subtype. 
-  // we can use the super_types_map we have constructed.
-
-  for (SUPER_TYPE_MAP::iterator super_map_iterator = super_map.begin ();
-       super_map_iterator != super_map.end ();
-       super_map_iterator++)
-    {
-      SERVICE_TYPE_MAP::iterator super_iter = (*super_map_iterator).second;
-      (*super_iter).second.sub_types_.push_back (name);
-    }
-
-  // all parameters are valid, create an entry for this service type
-  // in the this->type_map_. 
-  type.type_info_ = info;
-  type.all_prop_ = all_prop;
-  this->type_map_[name] = type;
-
-}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
deleted file mode 100644
index 01ca39249ed..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//   Service_Type_Repository.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-// 
-// ========================================================================
-
-#ifndef TAO_SERVICE_TYPE_REPOSITORY_H
-#define TAO_SERVICE_TYPE_REPOSITORY_H
-
-#include <list>
-#include "Trader.h"
-#include "Monitor.h"
-
-class TAO_Service_Type_Repository :
-  public POA_CosTradingRepos::ServiceTypeRepository
-  //
-  // = TITLE
-  //     This class implements CosTradingRepos::ServiceTypeRepository
-  //     IDL interface. 
-{
-public:
-  
-  TAO_Service_Type_Repository (ACE_Lock* lock = 0);
-  // Parameterize the Service_Type_Repository with a lock to serialize
-  // access to the type repository map. A reader/writer lock is
-  // probably best. The Service_Type_Repository assumes control of the 
-  // lock.
-  
-  ~TAO_Service_Type_Repository (void);
-  
-  virtual SERVICE_TYPE_REPOS::IncarnationNumber 
-    incarnation (CORBA::Environment& _env);  
-
-  virtual SERVICE_TYPE_REPOS::IncarnationNumber 
-    add_type (const char * name, 
-	      const char * if_name, 
-	      const SERVICE_TYPE_REPOS::PropStructSeq& props,
-	      const SERVICE_TYPE_REPOS::ServiceTypeNameSeq& super_types,
-	      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    SERVICE_TYPE_REPOS::ServiceTypeExists, 
-		    SERVICE_TYPE_REPOS::InterfaceTypeMismatch, 
-		    CosTrading::IllegalPropertyName, 
-		    CosTrading::DuplicatePropertyName, 
-		    SERVICE_TYPE_REPOS::ValueTypeRedefinition, 
-		    CosTrading::UnknownServiceType, 
-		    SERVICE_TYPE_REPOS::DuplicateServiceTypeName));
-
-  // BEGIN SPEC
-  // The add_type operation enables the creation of new service types
-  // in the service type repository. The caller supplies the "name"
-  // for the new type, the identifier for the interface associated
-  // with instances of this service type, the properties definitions
-  // for this service type, and the service type names of the
-  // immediate super-types to this service type.
-
-  // If the type creation is successful, an incarnation number is
-  // returned as the value of the operation. Incarnation numbers are
-  // opaque values that are assigned to each modification to the
-  // repository's state. An incarnation number can be quoted when
-  // invoking the list_types operation to retrieve all changes to the
-  // service repository since a particular logical time. (Note:
-  // IncarnationNumber is currently declared as a struct consisting of
-  // two unsigned longs; what we really want here is an unsigned hyper
-  // [64-bit integer]. A future revision task force should modify this
-  // when CORBA systems support IDL 64-bit integers.)
-
-  // If the "name" parameter is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised. ° If the type
-  // already exists, then the ServiceTypeExists exception is raised. °
-  // If the "if_name" parameter is not a sub-type of the interface
-  // associated with a service type from which this service type is
-  // derived, such that substitutability would be violated, then the
-  // InterfaceTypeMismatch exception is raised. ° If a property name
-  // supplied in the "props" parameter is malformed, the
-  // CosTrading::IllegalPropertyName exception is raised. ° If the
-  // same property name appears two or more times in the "props"
-  // parameter, the CosTrading::DuplicatePropertyName exception is
-  // raised. ° If a property value type associated with this service
-  // type illegally modifies the value type of a super-type's
-  // property, or if two super-types incompatibly declare value types
-  // for the same property name, then the ValueTypeRedefinition
-  // exception is raised. ° If one of the ServiceTypeNames in
-  // "super_types" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised. If one of the
-  // ServiceTypeNames in "super_types" does not exist, then the
-  // CosTrading::UnknownServiceType exception is raised. ° If the same
-  // service type name is included two or more times in this
-  // parameter, the DuplicateServiceTypeName exception is raised. 
-  // END SPEC
-  
-
-  virtual void remove_type (const char * name,
-			    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    SERVICE_TYPE_REPOS::HasSubTypes));
-
-  // BEGIN SPEC
-  // The remove_type operation removes the named type from the service
-  // type repository. ° If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised. ° If "name"
-  // does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised. ° If "name"
-  // has a service type which has been derived from it, then the
-  // HasSubTypes exception is raised. 
-  // END SPEC
-  
-  virtual SERVICE_TYPE_REPOS::ServiceTypeNameSeq* 
-    list_types (const SERVICE_TYPE_REPOS::SpecifiedServiceTypes& which_types,
-		CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  // BEGIN SPEC
-  // The list_types operation permits a client to obtain the names of
-  // service types which are in the repository. The "which_types"
-  // parameter permits the client to specify one of two possible
-  // values: ° all types known to the repository ° all types
-  // added/modified since a particular incarnation number The names of
-  // the requested types are returned by the operation for subsequent
-  // querying via the describe_type or the fully_describe_type
-  // operation. 
-  // END SPEC 
-           
-  virtual SERVICE_TYPE_REPOS::TypeStruct*
-    describe_type (const char * name,
-		   CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
-  // BEGIN SPEC
-  // The describe_type operation permits a client to obtain the
-  // details for a particular service type. ° If "name" is malformed,
-  // then the CosTrading::IllegalServiceType exception is raised. ° If
-  // "name" does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised. 
-  // END SPEC
-  
-  virtual SERVICE_TYPE_REPOS::TypeStruct* 
-    fully_describe_type (const char * name,
-			 CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
-  // BEGIN SPEC
-  // The fully_describe_type operation permits a client to obtain the
-  // details for a particular service type. The property sequence
-  // returned in the TypeStruct includes all properties inherited from
-  // the transitive closure of its super types; the sequence of super
-  // types in the TypeStruct contains the names of the types in the
-  // transitive closure of the super type relation. ° If "name" is
-  // malformed, then the CosTrading::IllegalServiceType exception is
-  // raised. ° If "name" does not exist within the repository, then
-  // the CosTrading::UnknownServiceType exception is raised. 
-  // END SPEC 
-
-  virtual void mask_type (const char * name,
-			  CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     SERVICE_TYPE_REPOS::AlreadyMasked));
-  // BEGIN SPEC
-  // The mask_type operation permits the deprecation of a particular
-  // type (i.e., after being masked, exporters will no longer be able
-  // to advertise offers of that particular type). The type continues
-  // to exist in the service repository due to other service types
-  // being derived from it. ° If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised. ° If "name"
-  // does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised. ° If the type
-  // is currently in the masked state, then the AlreadyMasked
-  // exception is raised. 
-  // END SPEC 
-       
-  virtual void unmask_type (const char * name,
-			    CORBA::Environment& _env) 
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		    CosTrading::IllegalServiceType, 
-		    CosTrading::UnknownServiceType, 
-		    SERVICE_TYPE_REPOS::NotMasked));
-  // BEGIN SPEC
-  // The unmask_type undeprecates a type (i.e., after being unmasked,
-  // exporters will be able to resume advertisement of offers of that
-  // particular type). ° If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised. ° If "name"
-  // does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised. ° If the type
-  // is not currently in the masked state, then the NotMasked
-  // exception is raised. 
-  // END SPEC
-
-private:
-  
-  struct Type_Info {
-    // storage structure for information pertinent to the type.
-
-    typedef list<string> TYPE_LIST;
-
-    SERVICE_TYPE_REPOS::TypeStruct type_info_; 
-    // standard type info.
-
-    SERVICE_TYPE_REPOS::PropStructSeq all_prop_; 
-    // complete listing of the type's properties (including inherited).
-    
-    TYPE_LIST sub_types_;
-    // names of subtypes.
-  };
-  
-  typedef map< string, Type_Info, less <string> > SERVICE_TYPE_MAP;
-  typedef SERVICE_TYPE_MAP::iterator SERVICE_TYPE_ITERATOR;
-  
-  typedef map
-    <
-    string,
-    SERVICE_TYPE_REPOS::PropStruct*,
-    less < string >
-    > PROP_MAP;
-  
-  typedef map
-    <
-    string,
-    SERVICE_TYPE_MAP::iterator,
-    less < string >
-    > SUPER_TYPE_MAP;
-  
-  void validate_properties (const SERVICE_TYPE_REPOS::PropStructSeq& props,
-			    PROP_MAP& prop_map,
-			    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName));
-  // Confirm that the properties in props have valid names, and aren't
-  // duplicated. Cram those properties into the prop_map.
-  
-  void validate_supertypes (const SERVICE_TYPE_REPOS::ServiceTypeNameSeq& super_types,
-			    SUPER_TYPE_MAP& super_map,
-			    CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
-		    CosTrading::UnknownServiceType,
-		    CosTrading::DuplicatePropertyName));   
-  // Confirm that the each super type exists, and cram them into super_map. 
-  
-  void validate_inheritance (PROP_MAP& prop_map,
-			     SUPER_TYPE_MAP& super_map,
-			     CORBA::Environment& _env)
-    TAO_THROW_SPEC ((SERVICE_TYPE_REPOS::ValueTypeRedefinition));
-  // Ensure that properties of a super_type aren't having their types
-  // or retstrictions redefined.
-
-  //  void validate_interface (const char* if_name,
-  //			   SUPER_TYPE_MAP& super_map,
-  //			   CORBA::Environment& _env)
-  //    TAO_THROW_SPEC ((SERVICE_TYPE_REPOS::InterfaceTypeMismatch));
-  // Ensure that the interface type derives from its superclasses'.
-  
-  void update_type_map (const char* name,
-			SERVICE_TYPE_REPOS::TypeStruct& type,
-			PROP_MAP& prop_map,
-			SUPER_TYPE_MAP& super_map);
-  // Update the type map with the information contained in the
-  // TypeStruct, prop_map, and super_map.
-
-  ACE_Lock* lock_;
-  // Lock with which to serialize access to the service type map.
-  
-  SERVICE_TYPE_MAP type_map_;
-  // Stores information for each service type in the repository.
-  // This is a mapping from service type name to a Type_Info struct
-  // which serves as a storage for various information for the given type.
-
-  SERVICE_TYPE_REPOS::IncarnationNumber incarnation_;
-  // incarnation number to be used for the next modification to the repository.
-};
-
-// This are temporary functions, until the format of the incarnation number
-// will be changed in the spec.
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Service_Type_Repository.cpp"
-#endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* TAO_SERVICE_TYPE_REPOSITORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
deleted file mode 100644
index 9f18a49ca6b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Trader_Base.cpp
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
-// ============================================================================
-
-#define ACE_BUILD_DLL
-
-#include "Trader.h"
-#include "ace/OS.h"
-#include <iostream.h>
-
-TAO_Trader_Base::TAO_Trader_Base (void)
-  : trading_components_ (*this),
-    import_attributes_ (*this),
-    support_attributes_ (*this),
-    link_attributes_ (*this)
-{
-}
-
-TAO_Import_Attributes_Impl &
-TAO_Trader_Base::import_attributes (void)
-{
-  return this->import_attributes_;
-}
-
-const TAO_Import_Attributes_Impl &
-TAO_Trader_Base::import_attributes (void) const
-{
-  return this->import_attributes_;
-}
-
-TAO_Support_Attributes_Impl &
-TAO_Trader_Base::support_attributes (void) 
-{
-  return this->support_attributes_;
-}
-
-const TAO_Support_Attributes_Impl &
-TAO_Trader_Base::support_attributes (void) const
-{
-  return this->support_attributes_;
-}
-
-TAO_Link_Attributes_Impl &
-TAO_Trader_Base::link_attributes (void) 
-{
-  return this->link_attributes_;
-}
-
-const TAO_Link_Attributes_Impl &
-TAO_Trader_Base::link_attributes (void) const
-{
-  return this->link_attributes_;
-}
-
-TAO_Trading_Components_Impl &
-TAO_Trader_Base::trading_components (void)
-{
-  return this->trading_components_;
-}
-
-const TAO_Trading_Components_Impl &
-TAO_Trader_Base::trading_components (void) const
-{
-  return this->trading_components_;
-}
-
-
-CORBA::Boolean
-TAO_Trader_Base::is_valid_identifier_name (const char* ident)
-{
-  int return_value = CORBA::B_FALSE;
-
-  if (ident == 0)
-    return return_value;
-  
-  int length = ACE_OS::strlen (ident);
-  if (length >= 1 && isalpha (ident[0]))
-    {
-      return_value = 1;
-      for (int i = 0; i < length; i++)
-	{
-	  if (! (isalnum (ident[i]) || ident[i] == '_'))
-	    {
-	      return_value = 0;
-	      break;
-	    }
-	}     
-    }
-
-  return return_value;
-}
-
-int
-operator< (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
-	   const SERVICE_TYPE_REPOS::IncarnationNumber &r)
-{
-  if (l.high < r.high)
-    return 1;
-  else if (l.high == r.high) 
-    return (l.low < r.low);
-  else
-    return 0;
-}
-
-
-int
-operator> (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
-	   const SERVICE_TYPE_REPOS::IncarnationNumber &r)
-{
-  return (r < l);
-}
-
-#include "Trader_T.h"
-
-TAO_Trader_Factory::TAO_TRADER*
-TAO_Trader_Factory::create_linked_trader (void)
-{
-  typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>  NULL_TRADER;
-  
-  NULL_TRADER::Trader_Components linked_trader =
-    (NULL_TRADER::Trader_Components)
-    (NULL_TRADER::LOOKUP |
-     NULL_TRADER::REGISTER |
-     NULL_TRADER::ADMIN |
-     NULL_TRADER::LINK);
-  return new NULL_TRADER (linked_trader);
-}
-
-#ifdef ACE_HAS_THREADS
-/*
-TAO_Trader_Factory::TAO_TRADER*
-TAO_Trader_Factory::create_MT_linked_trader (void)
-{
-  typedef TAO_Trader<ACE_Thread_Mutex, ACE_RW_Mutex>  MT_TRADER;
-  MT_TRADER::Trader_Components linked_trader =
-    (MT_TRADER::Trader_Components)
-    (MT_TRADER::LOOKUP |
-     MT_TRADER::REGISTER |
-     MT_TRADER::ADMIN |
-     MT_TRADER::LINK);
-  return new MT_TRADER (linked_trader);
-}
-*/
-#endif /* ACE_HAS_THREADS */
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
deleted file mode 100644
index e8015c17e20..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Trader_Base.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
-// ============================================================================
-
-#ifndef TAO_TRADER_BASE_H
-#define TAO_TRADER_BASE_H
-
-#include <string>
-#include <map>
-
-#include "Attributes.h"
-
-typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-
-// Forward Declaration.
-class TAO_Trader_Base;
-
-// Cludge to avoid template instantiation in the executable.
-class TAO_Trader_Factory
-{
-public:
-
-  typedef TAO_Trader_Base TAO_TRADER;
-  static TAO_TRADER* create_linked_trader (void);
-  
-#ifdef ACE_HAS_THREADS
-  
-  //  static TAO_TRADER* create_MT_linked_trader (void);
-  
-#endif /* ACE_HAS_THREADS */
-};
-
-class TAO_Export TAO_Trader_Base
-  //
-  // = TITLE
-  //     TAO_Trader inherits from this "helper" class.
-  //     The sole purpose of this class is to factor some of TAO_Trader's 
-  //     data members out, so that they would not have to be templatized   
-  //     and be be aware of the type of lock they use.
-  //
-  // = DESCRIPTION
-  //     TAO_Trader is a template class.  And while we want
-  //     <import_attributes_>, <trader_components_>, and 
-  //     <support_attributes> use a lock contained in TAO_Trader, we do not 
-  //     want all these classes to be templatized.  TAO_Trader_Base class solves 
-  //     this problem.
-{    
-public:
-  typedef int HUGE_NUMBER;
-  
-  TAO_Trader_Base (void);
-  
-  // = Accessors for objects that manage trader's configuration.
-
-  TAO_Trading_Components_Impl &trading_components (void);
-
-  const TAO_Trading_Components_Impl &trading_components (void) const;
-
-  TAO_Import_Attributes_Impl &import_attributes (void);
-
-  const TAO_Import_Attributes_Impl &import_attributes (void) const;
-
-  TAO_Support_Attributes_Impl &support_attributes (void);
-
-  const TAO_Support_Attributes_Impl &support_attributes (void) const;
-
-  TAO_Link_Attributes_Impl &link_attributes (void);
-
-  const TAO_Link_Attributes_Impl &link_attributes (void) const;
-
-  // = Accessor for trader's lock.
-
-  virtual ACE_Lock &lock (void) = 0;
-  // return lock that guards trader's current configuration.
-
-  static CORBA::Boolean is_valid_identifier_name (const char* ident);
-  // Determine whether the identifier is a valid one (i.e., if the
-  // first character is a letter, and the subsequent ones letter,
-  // numbers, or underscores.)
-  
-protected:
-  // = Objects determining current configuration of a trader.
-
-  TAO_Trading_Components_Impl trading_components_;
-  // Stores and allows lookup of trader's components.
-
-  TAO_Import_Attributes_Impl import_attributes_;
-  // Stores and allows access/modification of trader's import attributes.
-
-  TAO_Support_Attributes_Impl support_attributes_;
-  // Stores and allows access/modification of trader's support attributes.
-
-  TAO_Link_Attributes_Impl link_attributes_;
-  // Stores and allows access/modification of trader's link attributes.
-};
-
-int
-operator> (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
-	   const SERVICE_TYPE_REPOS::IncarnationNumber &r);
-
-int
-operator< (const SERVICE_TYPE_REPOS::IncarnationNumber &l,
-	   const SERVICE_TYPE_REPOS::IncarnationNumber &r);
-
-
-#endif /* TAO_TRADER_BASE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
deleted file mode 100644
index e89267ba9ac..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- C++ -*- */
-// ============================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Trader.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (TAO_TRADER_C)
-#define TAO_TRADER_C
-
-#include "Trader_T.h"
-#include "Lookup.h"
-#include "Register.h"
-#include "Link.h"
-#include "Proxy.h"
-#include "Admin.h"
-
-template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> 
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::TAO_Trader (Trader_Components components)
-{
-  CORBA::Environment env;
-  for (int i = LOOKUP_IF; i <= LINK_IF; i++)
-    this->ifs_[i] = 0;
-  
-  if (ACE_BIT_ENABLED (components, LOOKUP))
-    {
-      TAO_Lookup<TRADER_SELF>* lookup = new TAO_Lookup<TRADER_SELF> (*this);
-      this->trading_components ().lookup_if (lookup->_this (env));
-      this->ifs_[LOOKUP_IF] = lookup;
-    }
-  if (ACE_BIT_ENABLED (components, REGISTER))
-    {
-      TAO_Register<TRADER_SELF>* reg = new TAO_Register<TRADER_SELF> (*this);
-      this->trading_components ().register_if (reg->_this (env));
-      this->ifs_[REGISTER_IF] = reg;
-    }
-  if (ACE_BIT_ENABLED (components, ADMIN))
-    {
-      TAO_Admin<TRADER_SELF>* admin = new TAO_Admin<TRADER_SELF> (*this);
-      this->trading_components ().admin_if (admin->_this (env));
-      this->ifs_[ADMIN_IF] = admin;
-    }
-  if (ACE_BIT_ENABLED (components, PROXY))
-    {
-      TAO_Proxy<TRADER_SELF>* proxy = new TAO_Proxy<TRADER_SELF> (*this);
-      this->trading_components ().proxy_if (proxy->_this (env));
-      this->ifs_[PROXY_IF] = proxy;
-    }
-  if (ACE_BIT_ENABLED (components, LINK))
-    {
-      TAO_Link<TRADER_SELF, MAP_LOCK_TYPE>* link =
-	new TAO_Link<TRADER_SELF, MAP_LOCK_TYPE> (*this);
-      this->trading_components ().link_if (link->_this (env));
-      this->ifs_[LINK_IF] = link;
-    }
-}
-
-template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> 
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
-{
-  // Remove Trading Components from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-
-  for (int i = LOOKUP_IF; i <= LINK_IF; i++)
-    {
-      if (this->ifs_[i] != 0)
-	{
-	  TAO_TRY
-	    {
-	      PortableServer::POA_var poa =
-		this->ifs_[i]->_default_POA (TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-	      PortableServer::ObjectId_var id =
-		poa->servant_to_id (this->ifs_[i], TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-	      poa->deactivate_object (id.in (), TAO_TRY_ENV);
-	    }
-	  TAO_CATCHANY
-	    {      
-	    }
-	  TAO_ENDTRY;
-	  
-	  delete this->ifs_[i];	  
-	}
-    }
-}
-
-template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::SERVICE_TYPE_MAP&
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::service_type_map (void) 
-{
-  return this->service_type_map_;
-}
-
-template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> ACE_Lock &
-TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock (void)
-{
-  return this->lock_;
-}
-
-#endif /* TAO_TRADER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
deleted file mode 100644
index e38650f5cb6..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-// 
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Trader.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//   
-// ========================================================================
-
-#ifndef TAO_TRADER_H
-#define TAO_TRADER_H
-
-// ACE includes
-#include "Trader.h"
-#include "Monitor.h"
-#include "Service_Type_Map.h"
-
-template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
-class TAO_Trader : public TAO_Trader_Base
-  //
-  // = TITLE
-  //     This class packages together all the various pieces that
-  //     provide functionality specified in COS Trading specification.
-  //
-  // = DESCRIPTION
-  //     TAO_Trader contains all the components that together represent
-  //     a single trader.  Based on its constructor arguments, 
-  //     TAO_Trader creates instances of appropriate interface 
-  //     implementations as well as instances of objects common to
-  //     more than one interface (offers, attributes, etc.).
-  //     TAO_Trader also enforces the proper order on all
-  //     initializations.  TAO_Trader acts like a "glue" class that
-  //     creates appropriate components, holds everything together,
-  //     and enforces order. TAO_Trader is parameterized by two types
-  //     of locks: one for its service service offers, one for its
-  //     state (configuration). 
-{    
-public:
-
-  enum Trader_Components
-  { 
-    LOOKUP = 0x001,  
-    REGISTER = 0x002,
-    LINK = 0x004,
-    PROXY = 0x008,
-    ADMIN = 0x010
-  };
-  // The desired combination of interfaces to be passed to the 
-  // TAO_Trader constructor.
-
-  typedef TAO_Service_Type_Map<MAP_LOCK_TYPE> SERVICE_TYPE_MAP;
-  typedef SERVICE_TYPE_MAP::Local_Offer_Iterator LOCAL_OFFER_ITER;
-  typedef MAP_LOCK_TYPE LOCK_TYPE;
-  
-  TAO_Trader (Trader_Components components = LOOKUP);
-  // Constructor which based on its arguments will create 
-  // a particular type of trader (e.g. Query trader, Simple trader, etc.)
-  // The argument is a bitwise OR of desired Trader_Components as listed
-  // in enumerated type above.
-
-  ~TAO_Trader (void);
-  // destructor.
-  
-  SERVICE_TYPE_MAP& service_type_map (void);
-  // Accessor for the structure with all the service offers.
-
-  ACE_Lock &lock (void);
-  // returns the trader
-  
-protected:
-
-  typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF;
-  
-  SERVICE_TYPE_MAP service_type_map_; 
-  // A monitor (i.e. an STL map + a lock) serving as a storage for
-  // all the service offers of a trader.
-  // Structure: a map (actually a monitor) of service type names to  
-  // a counter + a map (a monitor) of offers for that service type.  A map of offers for 
-  // a service type (an internal map) is  a mapping from a number ids to offers.
-
-  ACE_Lock_Adapter<TRADER_LOCK_TYPE> lock_;
-  // lock that guards the state of the trader (its configuration).
-
-  enum { LOOKUP_IF, REGISTER_IF, ADMIN_IF, PROXY_IF, LINK_IF };
-  
-  PortableServer::ServantBase* ifs_[5];
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Trader.cpp"
-#endif  /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* ACE_TRADER_H */
-	
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l
deleted file mode 100644
index 76ab1b2cb6c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l
+++ /dev/null
@@ -1,130 +0,0 @@
-%{
-// $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    constraint.l
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-#include "Constraint.h"
-#include "Constraint_Nodes.h"
-#include "Constraint_Tokens.h"
-
-static TAO_Literal_Constraint* extract_string(const char*);
-
-#define TAO_YY_LEX_DEBUG
-
-#ifdef TAO_CONSTRAINT_DEBUG
-#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
-#endif /* TAO_CONSTRAINT_DEBUG */
-
-
-%}
-
-white_space     [ \t]
-letter		[a-zA-Z]
-digit		[0-9]
-alpha_num	({letter}|{digit})
-integer		{digit}+ 
-float		({digit}*\.{digit}+)([eE][-+]?{digit}+)? 
-string		'(([^'\\]*)|([^'\\]*\\')|([^'\\]*\\\\))*'
-ident		{letter}({alpha_num}|[_])*
-newline		\n
-unknown         [^ \t]
-
-%%
-
-min             { TAO_YY_LEX_DEBUG; return TAO_MIN; }
-max             { TAO_YY_LEX_DEBUG; return TAO_MAX; }
-first           { TAO_YY_LEX_DEBUG; return TAO_FIRST; }
-random          { TAO_YY_LEX_DEBUG; return TAO_RANDOM; }
-with            { TAO_YY_LEX_DEBUG; return TAO_WITH; }
-exist		{ TAO_YY_LEX_DEBUG; return TAO_EXIST; }
-not		{ TAO_YY_LEX_DEBUG; return TAO_NOT; }
-and		{ TAO_YY_LEX_DEBUG; return TAO_AND; }
-or		{ TAO_YY_LEX_DEBUG; return TAO_OR; }
-in		{ TAO_YY_LEX_DEBUG; return TAO_IN; }
-"~"             { TAO_YY_LEX_DEBUG; return TAO_TWIDDLE; }
-"+"		{ TAO_YY_LEX_DEBUG; return TAO_PLUS; }
-"-"		{ TAO_YY_LEX_DEBUG; return TAO_MINUS; }
-"*"		{ TAO_YY_LEX_DEBUG; return TAO_MULT; }
-"/"		{ TAO_YY_LEX_DEBUG; return TAO_DIV; }
-"<"		{ TAO_YY_LEX_DEBUG; return TAO_LT; }
-"<="		{ TAO_YY_LEX_DEBUG; return TAO_LE; }
-">"		{ TAO_YY_LEX_DEBUG; return TAO_GT; }
-">="		{ TAO_YY_LEX_DEBUG; return TAO_GE; }
-"=="		{ TAO_YY_LEX_DEBUG; return TAO_EQ; }
-"!="		{ TAO_YY_LEX_DEBUG; return TAO_NE; }
-"("             { TAO_YY_LEX_DEBUG; return TAO_LPAREN; }
-")"             { TAO_YY_LEX_DEBUG; return TAO_RPAREN; }
-TRUE		{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(CORBA::B_TRUE);
-		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
-		}
-FALSE		{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(CORBA::B_FALSE);
-		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
-		}
-{integer}	{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Long)atoi(yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
-		}
-{float}		{ 
-		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint((CORBA::Double)atof(yytext));
-		  TAO_YY_LEX_DEBUG; return TAO_NUMBER; 
-		}
-{string}	{ 
-		  yylval.constraint_ = extract_string(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_STRING; 
-		}
-{ident}		{ 
-		  yylval.constraint_ = 
-		    new TAO_Property_Constraint(yytext);
-		  TAO_YY_LEX_DEBUG; return TAO_IDENT; 
-		}
-{unknown}       { 
-                  TAO_YY_LEX_DEBUG; return TAO_UNKNOWN;
-                }
-%%
-
-TAO_Literal_Constraint*
-extract_string(const char* total)
-{
-  int prev_slash = 0, 
-    ctr = 0;
-  char str[BUFSIZ],
-   *tmp = (char*) total + 1;
-
-  while (*tmp != '\0')
-    {
-      if (*tmp == '\\')
-        {
-          if (prev_slash)
-            prev_slash = 0;
-          else
-            {
-              prev_slash = 1;
-              continue;
-            }
-        }
-      else if (*tmp == '\'')
-        prev_slash = 0;
-
-      str[ctr++] = *tmp;
-      tmp++;
-    }
-
-  str[ctr - 1] = '\0';
-  return new TAO_Literal_Constraint(str);
-}
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
deleted file mode 100644
index b6ead834a7e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y
+++ /dev/null
@@ -1,135 +0,0 @@
-%{
-  // $Id$
-// ========================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    constraint.y
-//
-// = AUTHOR
-//    Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ========================================================================
-
-#include "Constraint.h"
-#include "Constraint_Nodes.h"
-
-//#define YYDEBUG 1
-%}
-
-%token TAO_GT TAO_GE TAO_LT TAO_LE TAO_EQ TAO_NE TAO_EXIST
-%token TAO_AND TAO_OR TAO_NOT TAO_IN TAO_TWIDDLE TAO_BOOLEAN
-%token TAO_PLUS TAO_MINUS TAO_MULT TAO_DIV TAO_UMINUS TAO_NUMBER 
-%token TAO_RPAREN TAO_LPAREN TAO_IDENT TAO_STRING TAO_UNKNOWN
-%token TAO_UNSIGNED TAO_SIGNED TAO_DOUBLE TAO_CONSTRAINT TAO_SEQUENCE 
-%token TAO_WITH TAO_MAX TAO_MIN TAO_FIRST TAO_RANDOM
-
-%start constraint
-
-%type <constraint_> TAO_IDENT TAO_NUMBER TAO_STRING TAO_BOOLEAN
-%type <constraint_> constraint preference bool_or bool_and bool_compare 
-%type <constraint_> expr_in expr_twiddle expr term factor_not factor
-
-%%
-
-constraint: bool_or
-	{ $$ = new TAO_Unary_Constraint(TAO_CONSTRAINT, $1); }
-        | preference
-        { $$ = $1; }
-	;
-
-preference:     TAO_MIN bool_or
-{ $$ = new TAO_Unary_Constraint(TAO_MIN, $2); }
-        |       TAO_MAX bool_or
-{ $$ = new TAO_Unary_Constraint(TAO_MAX, $2); }
-        |       TAO_WITH bool_or
-{ $$ = new TAO_Unary_Constraint(TAO_WITH, $2); }
-        |       TAO_FIRST
-{ $$ = new TAO_Noop_Constraint(TAO_FIRST); }
-        |       TAO_RANDOM
-{ $$ = new TAO_Noop_Constraint(TAO_RANDOM); }
-        ;
-
-bool_or:	bool_or TAO_OR bool_and
-		{ $$ = new TAO_Binary_Constraint(TAO_OR, $1, $3); }
-	|	bool_and
-		{ $$ = $1; }
-	;
-
-bool_and:	bool_and TAO_AND bool_compare
-		{ $$ = new TAO_Binary_Constraint(TAO_AND, $1, $3); }
-	|	bool_compare
-		{ $$ = $1; }
-	;
-
-bool_compare:	expr_in TAO_EQ expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_EQ, $1, $3); }
-	|	expr_in TAO_NE expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_NE, $1, $3); }
-	|	expr_in TAO_GT expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_GT, $1, $3); }
-	|	expr_in TAO_GE expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_GE, $1, $3); }
-	|	expr_in	TAO_LT expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_LT, $1, $3); }
-	|	expr_in TAO_LE expr_in
-	{ $$ = new TAO_Binary_Constraint(TAO_LE, $1, $3); }
-	|	expr_in
-	{ $$ = $1; }	
-	;
-
-expr_in:	expr_twiddle TAO_IN TAO_IDENT
-	{ $$ = new TAO_Binary_Constraint(TAO_IN, $1, $3); }
-	|	expr_twiddle
-	{ $$ = $1; }
-	;
-
-expr_twiddle:	expr TAO_TWIDDLE expr
-	{ $$ = new TAO_Binary_Constraint(TAO_TWIDDLE, $1, $3); }
-	|	expr
-	{ $$ = $1; }
-	;
-
-expr:		expr TAO_PLUS term
-	{ $$ = new TAO_Binary_Constraint(TAO_PLUS, $1, $3); }
-	|	expr TAO_MINUS term
-	{ $$ = new TAO_Binary_Constraint(TAO_MINUS, $1, $3); }
-	|	term
-	{ $$ = $1; }
-	;
-
-term:		term TAO_MULT factor_not
-	{ $$ = new TAO_Binary_Constraint(TAO_MULT, $1, $3); }
-	|	term TAO_DIV factor_not
-	{ $$ = new TAO_Binary_Constraint(TAO_DIV, $1, $3); }
-	|	factor_not
-	{ $$ = $1; }
-	;
-
-factor_not:	TAO_NOT factor
-	{ $$ = new TAO_Unary_Constraint(TAO_NOT, $2); }
-	|	factor
-	{ $$ = $1; }
-	;
-
-factor:		TAO_LPAREN bool_or TAO_RPAREN
-	{ $$ = $2; }
-	|	TAO_EXIST TAO_IDENT
-	{ $$ = new TAO_Unary_Constraint(TAO_EXIST, $2); }
-	|	TAO_IDENT
-	{ $$ = $1; }
-	|	TAO_NUMBER
-	{ $$ = $1; }
-	|	TAO_MINUS TAO_NUMBER
-	{ $$ = new TAO_Unary_Constraint(TAO_UMINUS, $2); }
-	|	TAO_STRING
-	{ $$ = $1; }
-	|	TAO_BOOLEAN
-	{ $$ = $1; }
-	;
-
-%%
-
-//extern int yydebug = 1;
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
deleted file mode 100644
index 08d690c74a3..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ /dev/null
@@ -1,857 +0,0 @@
-# Microsoft Developer Studio Project File - Name="orbsvcs" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=orbsvcs - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs.mak" CFG="orbsvcs - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "orbsvcs - Win32 Release" (based on\

- "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "orbsvcs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../.." /I "../../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# Begin Special Build Tool

-SOURCE=$(InputPath)

-PostBuild_Desc=Copying DLL to $TAO_ROOT/tao

-PostBuild_Cmds=copy orbsvcs.dll ..\..\tao

-# End Special Build Tool

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "orbsvcs_"

-# PROP BASE Intermediate_Dir "orbsvcs_"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "../.." /I "../../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /YX /FD /c

-# SUBTRACT CPP /WX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# Begin Special Build Tool

-SOURCE=$(InputPath)

-PostBuild_Desc=Copying DLL to $TAO_ROOT/tao

-PostBuild_Cmds=copy orbsvcs.dll ..\..\tao

-# End Special Build Tool

-

-!ENDIF 

-

-# Begin Target

-

-# Name "orbsvcs - Win32 Release"

-# Name "orbsvcs - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event\BCU.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Config_Scheduler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\CosNaming_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Dispatching_Modules.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Entries.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Event_Channel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Utilities.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_Multicast.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Local_ESTypes.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Memory_Pools.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Naming_Utils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\ReactorTask.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\RT_Task.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Runtime_Scheduler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Scheduler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Scheduler_Generic.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Utilities.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Task_Manager.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time_Utilities.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event\BCU.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Config_Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\CosNaming_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Dispatching_Modules.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Entries.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Event_Channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Service_Constants.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Utilities.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOR_Multicast.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Local_ESTypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Memory_Pools.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Naming_Utils.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\ReactorTask.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\RT_Task.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Runtime_Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sched\Scheduler_Generic.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Utilities.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Task_Manager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time_Utilities.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\CosLifeCycleC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBaseS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Dispatching_Modules.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Event_Channel.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Utilities.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\CosLifeCycle.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosLifeCycle.idl

-InputName=CosLifeCycle

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNaming.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosNaming.idl

-InputName=CosNaming

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosNaming.idl

-InputName=CosNaming

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTimeBase.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\CosTimeBase.idl

-InputName=CosTimeBase

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosTimeBase.idl

-InputName=CosTimeBase

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Logger.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Logger.idl

-InputName=Logger

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Logger.idl

-InputName=Logger

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdmin.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventChannelAdmin.idl

-InputName=RtecEventChannelAdmin

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventChannelAdmin.idl

-InputName=RtecEventChannelAdmin

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventComm.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventComm.idl

-InputName=RtecEventComm

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventComm.idl

-InputName=RtecEventComm

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecScheduler.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecScheduler.idl

-InputName=RtecScheduler

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecScheduler.idl

-InputName=RtecScheduler

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs/orbsvcs.dsw
deleted file mode 100644
index 8a33ecb6923..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "orbsvcs"=.\orbsvcs.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "orbsvcs_lib"=.\orbsvcs_lib.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
deleted file mode 100644
index 044c4281975..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
-// ------------------------------
-#if !defined (TAO_ORBSVCS_EXPORT_H)
-#define TAO_ORBSVCS_EXPORT_H
-
-#include "ace/OS.h"
-
-#if defined (TAO_ORBSVCS_HAS_DLL) 
-#  if (TAO_ORBSVCS_HAS_DLL == 1)
-#    if defined (TAO_ORBSVCS_BUILD_DLL)
-#      define TAO_ORBSVCS_Export ACE_Proper_Export_Flag
-#      define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-#    else
-#      define TAO_ORBSVCS_Export ACE_Proper_Import_Flag
-#      define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
-#    endif /* TAO_ORBSVCS_BUILD_DLL */
-#  else 
-#    define TAO_ORBSVCS_Export
-#    define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
-#    define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
-#  endif   /* ! TAO_ORBSVCS_HAS_DLL == 1 */
-#else
-#  define TAO_ORBSVCS_Export
-#  define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
-#  define TAO_ORBSVCS_SINGLETON_INSTANTIATION(T)
-#endif     /* TAO_ORBSVCS_HAS_DLL */
-
-#endif     /* TAO_ORBSVCS_EXPORT_H */
-           // End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp
deleted file mode 100644
index 2a9aaed9004..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp
+++ /dev/null
@@ -1,519 +0,0 @@
-# Microsoft Developer Studio Project File - Name="orbsvcs_lib" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=orbsvcs_lib - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs_lib.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "orbsvcs_lib.mak" CFG="orbsvcs_lib - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "orbsvcs_lib - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "orbsvcs_lib - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../.." /I "../../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I ".." /I "../.." /I "../../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"orbsvcs_s.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "orbsvcs_lib - Win32 Release"

-# Name "orbsvcs_lib - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "*.idl,*.cpp"

-# Begin Source File

-

-SOURCE=.\Channel_Clients.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNaming.idl

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosNaming.idl

-InputName=CosNaming

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\CosNaming.idl

-InputName=CosNaming

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Utilities.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Logger.idl

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Logger.idl

-InputName=Logger

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Logger.idl

-InputName=Logger

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdmin.idl

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventChannelAdmin.idl

-InputName=RtecEventChannelAdmin

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventChannelAdmin.idl

-InputName=RtecEventChannelAdmin

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventChannelAdminS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventComm.idl

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventComm.idl

-InputName=RtecEventComm

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecEventComm.idl

-InputName=RtecEventComm

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecEventCommS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecScheduler.idl

-

-!IF  "$(CFG)" == "orbsvcs_lib - Win32 Release"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecScheduler.idl

-InputName=RtecScheduler

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "orbsvcs_lib - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\RtecScheduler.idl

-InputName=RtecScheduler

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

- -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecSchedulerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Runtime_Scheduler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Utilities.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "*.h"

-# Begin Source File

-

-SOURCE=.\Channel_Clients.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Channel_Clients_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Service_Constants.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Utilities.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Runtime_Scheduler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Utilities.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "*.i"

-# Begin Source File

-

-SOURCE=.\Event_Utilities.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Runtime_Scheduler.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Scheduler_Utilities.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
deleted file mode 100644
index 24536b7e307..00000000000
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-/* $Id$ */
-
-module SFP
-{
-  enum message_type
-  {
-    // Messages in the forward direction 
-    START, 
-    ENDOFSTREAM, 
-    SIMPLEFRAME, 
-    SEQUENCEDFRAME, 
-    FRAME, 
-    SPECIALFRAME, 
-    // Messages in the reverse direction 
-    STARTREPLY, 
-    CREDIT
-  }; 
-  
-  struct frame_header
-  { 
-    //sequence <char> magic_number; 
-    unsigned long magic_number;
-    // '=', 'S', 'F', 'P' 
-    octet flags;   
-    // bit 0 = byte order, 
-    // 1 = fragments, 2-7 always 0 
-    octet message_type; 
-    unsigned long message_size; 
-    // Size following this header 
-  }; 
-  
-  struct fragment
-  { 
-    sequence <char> magic_number; 
-    // 'F', 'R', 'A', 'G' 
-    octet flags; 
-    // bit 1 = more fragments 
-    unsigned long frag_number; 
-    // 0,..,n 
-    unsigned long frag_sz; 
-    unsigned long source_id; 
-    // Required for UDP multicast with multiple sources 
-  };                    
-  
-  struct start_message
-  { 
-    //    sequence <char> magic_number; 
-    // '=', 'S', 'T', 'A' 
-    unsigned long magic_number;
-    octet major_version; 
-    octet minor_version; 
-    octet flags; 
-    // bit 0 = byte order 
-  }; 
-  
-  // Acknowledge successful processing of 
-  // Start 
-  
-  struct start_reply
-  { 
-    octet flags; 
-    // bit 0 = byte order, 1 = exception 
-  }; 
-  
-  // If the message_type in frameHeader is sequencedFrame 
-  // the the frameHeader will be followed by this 
-  // (See also RTP note) 
-  
-  struct sequenced_frame 
-  { 
-    unsigned long sequence_num; 
-  }; 
-  // If the message_type is Frame then 
-  // the frameHeader is followed by this 
-  // See also RTP note 
-  
-  struct frame
-  { 
-    unsigned long timestamp; 
-    unsigned long synch_source; 
-    sequence<unsigned long> source_ids;
-  };
-};
diff --git a/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp b/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp
deleted file mode 100644
index 59a3a1f3aba..00000000000
--- a/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CosNaming::NameComponent>;
-template class TAO_Unbounded_Sequence<CosNaming::Binding>;
-template class TAO_Unbounded_Sequence<RtecEventComm::Event>;
-template class TAO_Unbounded_Sequence<RtecEventChannelAdmin::Dependency>;
-template class TAO_Unbounded_Sequence<RtecEventChannelAdmin::Publication>;
-template class TAO_Unbounded_Sequence<RtecScheduler::Dependency_Info>;
-template class TAO_Unbounded_Sequence<RtecScheduler::RT_Info>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CosNaming::NameComponent>
-#pragma instantiate TAO_Unbounded_Sequence<CosNaming::Binding>
-#pragma instantiate TAO_Unbounded_Sequence<RtecEventComm::Event>
-#pragma instantiate TAO_Unbounded_Sequence<RtecEventChannelAdmin::Dependency>
-#pragma instantiate TAO_Unbounded_Sequence<RtecEventChannelAdmin::Publication>
-#pragma instantiate TAO_Unbounded_Sequence<RtecScheduler::Dependency_Info>
-#pragma instantiate TAO_Unbounded_Sequence<RtecScheduler::RT_Info>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile b/TAO/orbsvcs/tests/AVStreams/Makefile
deleted file mode 100644
index 313324a45e1..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the AVStreams demo of the TAO ORB
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lorbsvcs -lTAO
-
-PROG_SRCS =  main.cpp
-
-LSRC = $(PROG_SRCS)
-
-AVStreams_SERVER_OBJS = server.o
-AVStreams_CLIENT_OBJS = client.o
-
-COSPROPERTY_OBJS = main.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
-	$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf 
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/client.cpp b/TAO/orbsvcs/tests/AVStreams/client.cpp
deleted file mode 100644
index d63a79f2d8e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/client.cpp
+++ /dev/null
@@ -1,748 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION 
-//    Test client for the AVStreams demo
-//   
-// = AUTHORS
-//   Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "client.h"
-
-Video_Client_StreamEndPoint::Video_Client_StreamEndPoint (void)
-{
-}
-
-void 
-Video_Client_StreamEndPoint::handle_stop (const AVStreams::flowSpec &the_spec,
-                                          CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Client_StreamEndPoint::handle_stop: called\n"));
-}
-
-void 
-Video_Client_StreamEndPoint::handle_start (const AVStreams::flowSpec &the_spec,  
-                                           CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Client_StreamEndPoint::handle_start: called\n"));
-}
-
-void 
-Video_Client_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &the_spec,  
-                                             CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Client_StreamEndPoint::handle_destroy: called\n"));
-}
-
-CORBA::Boolean 
-Video_Client_StreamEndPoint::handle_connection_established (AVStreams::StreamEndPoint_ptr responder, 
-                                                            AVStreams::streamQoS &qos_spec, 
-                                                            const AVStreams::flowSpec &the_spec,  
-                                                            CORBA::Environment &env) 
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Client_StreamEndPoint::handle_connection_established: called\n"));
-  return 1;
-}
-
-Client::Client (void)
-{
-}
-
-// initialize the ORB, get a grip on the remote mmdevice, and store it
-// in this->remote_mmdevice_.  Also create a stream controlller and a
-// local mmdevice.
-
-int
-Client::init (int argc, 
-              char *argv[],
-              CORBA::Environment &env)
-{
-  // Init the ORB.
-  manager_.init (argc,
-                 argv,
-                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Create the local mmdevice.
-  TAO_Client_MMDevice <Video_Client_StreamEndPoint> *mmdevice_impl;
-
-  ACE_NEW_RETURN (mmdevice_impl,
-                  TAO_Client_MMDevice <Video_Client_StreamEndPoint>,
-                  -1);
-
-  this->local_mmdevice_ = mmdevice_impl->_this (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Create the local streamctrl.
-  TAO_StreamCtrl *stream_ctrl;
-
-  ACE_NEW_RETURN (stream_ctrl,
-                  TAO_StreamCtrl (manager_.orb ()),
-                  -1);
-  this->stream_ctrl_ = stream_ctrl->_this (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Bind to a remote mmdevice, as supplied by argc argv.
-  this->bind_to_remote_mmdevice (argc, argv, env);
-
-  manager_.orb ()->open ();
-  // Create a locall mmdevice for now..
-  //  mmdevice_impl = new TAO_MMDevice;
-  //  this->remote_mmdevice_ = mmdevice_impl->_this (env);
-
-  TAO_CHECK_ENV_RETURN (env, 1);
-}
-
-// Use stream_ctrl_ to bind local_mmdevice_ and remote_mmdevice_.
-
-int
-Client::run (CORBA::Environment &env)
-{
-  // Initialize the in parameters.
-
-  // @@ Alex, please make sure you restructure this code so that you
-  // test for allocation failures.
-  AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
-  AVStreams::flowSpec_var the_flows (new AVStreams::flowSpec);
-
-  // Allocate the qos_list.
-  struct AVStreams::QoS qos_list;
-  // @@ Alex, please take a careful look at this code and figure out
-  // if you really need to use "magic numbers" like 64 here.
-  qos_list.QoSType = CORBA::string_alloc (64);
-  qos_list.QoSParams = CORBA::string_alloc (64);
-  strcpy (qos_list.QoSType, "foo");
-  strcpy (qos_list.QoSParams, "bar");
-
-  the_qos->length (1);
-  the_qos [0] = qos_list;
-
-  // Allocate the flow_list.
-  const char *flow_list [] =
-  {
-    "alpha",
-    "beta",
-    "gamma"
-  };
-
-  CORBA::ULong len = sizeof (flow_list)/sizeof (char *);
-
-  // Set the length of the sequence.
-  the_flows->length (len);
-
-  // Now set each individual element.
-  for (CORBA::ULong i=0; i < the_flows->length (); i++)
-    {
-      // Generate some arbitrary string to be filled into the ith
-      // location in the sequence.
-      //      char *str = gen->gen_string ();
-      //this->in_[i] = str;
-      the_flows [i] = flow_list [i];
-    }
-
-  // Bind the devices together.
-  this->stream_ctrl_->bind_devs (local_mmdevice_,
-                                 remote_mmdevice_,
-                                 the_qos.inout (),
-                                 the_flows.in (),
-                                 env);
-  
-  TAO_CHECK_ENV_RETURN (env, 1);
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Devices bound successfully!\n"));
-  
-  // Start the flow of the stream.
-  this->stream_ctrl_-> start (the_flows.in (),
-                              env);
-
-  TAO_CHECK_ENV_RETURN (env, 1);
-  return 0;
-}
-
-// Bind to a remote mmdevice, as given by the command line arguments.
-
-int
-Client::bind_to_remote_mmdevice (int argc,
-                                 char *argv[],
-                                 CORBA::Environment &env)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-  char *ior = 0;
-  
-  // @@ Alex, can you please move this into a "parse_args()" helper
-  // method?
-
-  // Parse the command line.
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-	ior = 
-          ACE_OS::strdup (get_opts.optarg);
-	break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-k mmdevice_key]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // We didn't get an IOR from the command line!
-  if (ior == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-k mmdevice_key]"
-                           "\n",
-                           argv [0]),
-                          -1);
-  
-  // Get the object reference.
-  CORBA::Object_var mmdevice_object = 
-    this->manager_.orb ()->string_to_object (ior,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Narrow the reference.
-  this->remote_mmdevice_ = 
-    AVStreams::MMDevice::_narrow (mmdevice_object.in (),
-                                  env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  if (CORBA::is_nil (this->remote_mmdevice_.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "invalid key <%s>\n",
-                       ior),
-                      -1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Object received OK\n"));
-  
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n(%P|%t) Bound to remote mmdevice"));
-  return 0;
-}
-
-
-// Testing the methods of the property service.
-
-int 
-Client::property_tester (CORBA::Environment &env)
-{
-  // Testing define_property () of PropertySet interface.
-  this->test_define_property (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Test the number of properties.
-  this->test_get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Testing get_all_property_names.
-  this->test_get_all_property_names (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Testing delete property.
-  this->test_delete_property ("string_property",env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Testing get_properties.
-  this->test_get_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Testing delete_properties.
-  this->test_delete_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Test the number of properties.
-  this->test_get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Testing define_properties.
-  this->test_define_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Test the number of properties.
-  this->test_get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  // Testing get_all_property_names.
-  this->test_get_all_property_names (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Testing get_all_properties.
-  this->test_get_all_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-}
-
-// Testing define_property.
-
-int
-Client::test_define_property (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking define_property\n"));
-  
-  CORBA::Any anyval;
- 
-  // Prepare a char and "define" that in the PropertySet.
-  CORBA::Char ch = '#';
-  anyval <<= from_char (ch);
-  ch = '*';
-  anyval >>= to_char (ch);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Char ch = %c\n",
-              ch));
-  this->remote_mmdevice_->define_property ("char_property",
-                                           anyval,
-                                           env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a Short and "define" that in the PropertySet.
-  CORBA::Short s = 3;
-  anyval <<= s; 
-  s = 7; 
-  anyval >>= s;
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Short s = %d\n",
-              s));
-  remote_mmdevice_->define_property ("short_property",
-                                     anyval,
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a Long and "define" that in the PropertySet.
-  CORBA::Long l = 931232;
-  anyval <<= l;
-  l = 931233;
-  anyval >>= l;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Long l = %d\n",
-              l));
-  CORBA::Any newany(anyval);
-  remote_mmdevice_->define_property ("long_property",
-                                     anyval,
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  
-  // Prepare a Float and "define" that in the PropertySet.
-  CORBA::Float f = 3.14;
-  anyval <<= f;
-  f = 4.14;
-  anyval >>= f;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Float f = %f\n",
-              f));
-  remote_mmdevice_->define_property ("float_property", 
-                                     anyval, 
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a String and "define" that in the PropertySet.
-  ACE_DEBUG ((LM_DEBUG,
-              "Main: Any holding String\n"));
-  CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
-  anyval <<= strvar.in ();
-  CORBA::String newstr;
-  anyval >>= newstr;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Main: String :  %s, From any :  %s\n",
-              strvar.in (),
-              newstr));
-  remote_mmdevice_->define_property ("string_property",
-                                     anyval,
-                                     env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-}
-
-// Testing get_all_property_names of the PropertySet.
-
-int
-Client::test_get_all_property_names (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTesting get_all_property_names ()\n"));
-
-  // Get the size.
-  CORBA::ULong num_of_properties =
-    remote_mmdevice_->get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Get half on the names and half of on the iterator.
-  CORBA::ULong how_many = num_of_properties / 2;
-  CosPropertyService::PropertyNames_var names_var;
-  CosPropertyService::PropertyNamesIterator_var iterator_var;
-  remote_mmdevice_->get_all_property_names (how_many,
-                                           names_var.out (),
-                                           iterator_var.out (), 
-                                           env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Print out the names in the names-sequence.
-  if (names_var.ptr () != 0)
-    {
-      CORBA::ULong len = names_var->length ();
-
-      for (CORBA::ULong ni = 0; ni < len; ni++)
-        ACE_DEBUG ((LM_DEBUG,
-                    "%s\n",
-                    (const char *) names_var [ni]));
-    }
-
-  // Iterate thru and print out the names in the iterator, if any.
-  if (iterator_var.ptr () != 0)
-    {
-      CosPropertyService::PropertyName_var name_var;
-
-      while (iterator_var->next_one (name_var.out (), env) == CORBA::B_TRUE)
-        {
-          TAO_CHECK_ENV_RETURN (env, 1);
-          ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
-        }
-
-      TAO_CHECK_ENV_RETURN (env, 1);
-    }
-}
-  
-// Test get_properties. Give a sequence of names and get all their
-// properties.
-
-int   
-Client::test_get_properties (CORBA::Environment &env)
-{
-  // Get float_property, string_property and no_property. If return
-  // value is false and type is tc_void then that name is not there in
-  // the PropertySet.
-  ACE_DEBUG ((LM_DEBUG, "\nTesting get_properties\n"));
-  CosPropertyService::PropertyNames_var names;
-  CosPropertyService::PropertyNames_ptr names_ptr;
-    
-  ACE_NEW_RETURN (names_ptr,
-                  CosPropertyService::PropertyNames,
-                  -1);
-  names = names_ptr;
-  
-  names->length (3);
-  names [0] = CORBA::string_dup ("float_property");
-  //names [1] = CORBA::string_dup ("string_property");
-  names [1] = CORBA::string_dup ("long_property");
-  //names [2] = CORBA::string_dup ("char_property");
-  names [2] = CORBA::string_dup ("no_property");
-  
-  CosPropertyService::Properties_var properties;
-  
-  // Get the properties.
-  CORBA::Boolean return_val = remote_mmdevice_->get_properties (names.in (),
-                                                                properties.out (),
-                                                                env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  if (properties.ptr () != 0)
-    {
-      // Go thru the properties and print them out, if they are not
-      // _tc_void typed values.
-      CORBA::ULong len = properties->length ();
-
-      for (CORBA::ULong pi = 0; pi < len; pi++)
-        {
-          // Print the name.
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s : ",
-                      (const char *) properties [pi].property_name.in ())); 
-
-          // Print the value if type is not tk_void.
-          if (properties [pi].property_value.type () == CORBA::_tc_void) 
-            ACE_DEBUG ((LM_DEBUG,"Void\n"));
-
-          if (properties [pi].property_value.type () == CORBA::_tc_float)
-            {
-              CORBA::Float f;
-              properties [pi].property_value >>= f;
-              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
-            }
-
-          if (properties [pi].property_value.type () == CORBA::_tc_string)
-            {
-              CORBA::String str;
-              properties [pi].property_value >>= str;
-              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
-            }
-
-          if (properties [pi].property_value.type () == CORBA::_tc_long)
-            {
-              CORBA::Long l;
-              properties [pi].property_value >>= l;
-              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
-            }
-          if (properties [pi].property_value.type () == CORBA::_tc_char)
-            {
-              CORBA::Char ch;
-              properties [pi].property_value >>= to_char (ch);
-              ACE_DEBUG ((LM_DEBUG,"%c\n", ch));
-            }
-        }
-    }
-  return 0;
-}
-
-// Testing, get_number_of_properties.
-
-int
-Client::test_get_number_of_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "\nNumber of props : %d\n",
-              this->remote_mmdevice_->get_number_of_properties (env)));
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  return 0;
-}
-
-// Test delete_property.
-
-int 
-Client::test_delete_property (CORBA::String property_name,
-                              CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nDeleting %s\n",property_name));
-
-  this->remote_mmdevice_->delete_property (property_name, env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}  
-
-// Test delete_properties.
-// Make a sequence of property names and delete them from the
-// PropertySet.  Deleting char, short, long, float and string
-// properties.
-
-int
-Client::test_delete_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking delete_properties\n"));
-  CosPropertyService::PropertyNames prop_names;
-  prop_names.length (4);
-  prop_names [0] = CORBA::string_dup ("char_property");
-  prop_names [1] = CORBA::string_dup ("short_property");
-  prop_names [2] = CORBA::string_dup ("long_property");
-  prop_names [3] = CORBA::string_dup ("float_property");
-  ACE_DEBUG ((LM_DEBUG,
-              "Length of sequence %d, Maxlength : %d\n",
-              prop_names.length (),
-              prop_names.maximum ()));
-  this->remote_mmdevice_->delete_properties (prop_names,
-                                   env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-  
-  return 0;
-}
-
-// Defines a sequnce of properties containing, char, short, long,
-// float in the property set.
-
-int
-Client::test_define_properties (CORBA::Environment &env)
-{  
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking define_properties\n"));
-  CosPropertyService::Properties nproperties;
-  nproperties.length (4);
-  CORBA::Any anyval;
-  // Prepare a char and "define" that in the PropertySet.
-  CORBA::Char ch = '#';
-  anyval <<= from_char (ch);
-  ch = '*';
-  anyval >>= to_char (ch);  
-  nproperties[0].property_name  = CORBA::string_copy ("char_property");
-  nproperties[0].property_value <<= from_char (ch);
-  
-  // Prepare a Short and "define" that in the PropertySet.
-  CORBA::Short s = 3;
-  anyval <<= s; 
-  s = 7; 
-  anyval >>= s;
-  nproperties[1].property_name  = CORBA::string_copy ("short_property");
-  nproperties[1].property_value <<= s;
-  
-  // Prepare a Long and "define" that in the PropertySet.
-  CORBA::Long l = 931232;
-  anyval <<= l;
-  l = 931233;
-  anyval >>= l;
-  nproperties[2].property_name  = CORBA::string_copy ("long_property");
-  nproperties[2].property_value <<= l;
-  
-  // Prepare a Float and "define" that in the PropertySet.
-  CORBA::Float f = 3.14;
-  anyval <<= f;
-  f = 4.14;
-  anyval >>= f;
-  nproperties[3].property_name  = CORBA::string_copy ("float_property");
-  nproperties[3].property_value <<= f;
-  
-  // Define this sequence of properties now.
-  this->remote_mmdevice_->define_properties (nproperties, env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Test get_all_properties.
-
-int   
-Client::test_get_all_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTesting get_all_properties\n"));
-  // Get the number of current properties.
-  CORBA::ULong num_of_properties = 
-    this->remote_mmdevice_->get_number_of_properties (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Get half on the properties and half of on the iterator.
-  CORBA::ULong how_many = 0;
-  CosPropertyService::Properties_var properties;
-  CosPropertyService::PropertiesIterator_var iterator;
-  remote_mmdevice_->get_all_properties (how_many,
-                                        properties.out (),
-                                        iterator.out (), 
-                                        env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Print out the properties now.
-  if (properties.ptr () != 0)
-    {
-      CORBA::ULong len = properties->length ();
-
-      for (CORBA::ULong pi = 0; pi < len; pi++)
-        {
-          // Print the property_name.
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s : ",
-                      properties [pi].property_name.in ()));
-          
-          // Print the value if type is not tk_void.
-          if (properties [pi].property_value.type () == CORBA::_tc_void) 
-            ACE_DEBUG ((LM_DEBUG,"Void\n"));
-
-          if (properties [pi].property_value.type () == CORBA::_tc_float)
-            {
-              CORBA::Float f;
-              properties [pi].property_value >>= f;
-              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
-            }
-
-          if (properties [pi].property_value.type () == CORBA::_tc_string)
-            {
-              CORBA::String str;
-              properties [pi].property_value >>= str;
-              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
-            }
-
-          if (properties [pi].property_value.type () == CORBA::_tc_long)
-            {
-              CORBA::Long l;
-              properties [pi].property_value >>= l;
-              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
-            }
-        }
-    }
-
-  // Pass thru the iterator.
-  if (iterator.ptr () != 0)
-    {
-      CosPropertyService::Property_var property;
-      
-      while (iterator->next_one (property.out (), env) != CORBA::B_FALSE)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Iteration over PropertyIterartor"));
-          TAO_CHECK_ENV_RETURN (env, 1);
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s : ",
-                      property->property_name.in ()));
-
-          // Print the property_value.
-          if (property->property_value.type () == CORBA::_tc_char)
-            {
-              CORBA::Char c;
-              property->property_value >>= to_char (c);
-              ACE_DEBUG ((LM_DEBUG,"%c\n", c));
-            }
-
-          if (property->property_value.type () == CORBA::_tc_short)
-            {
-              CORBA::Short s;
-              property->property_value >>= s;
-              ACE_DEBUG ((LM_DEBUG,"%d\n", s));
-            }
-
-          if (property->property_value.type () == CORBA::_tc_float)
-            {
-              CORBA::Float f;
-              property->property_value >>= f;
-              ACE_DEBUG ((LM_DEBUG,"%f\n", f));
-            }
-
-          if (property->property_value.type () == CORBA::_tc_string)
-            {
-              CORBA::String str;
-              property->property_value >>= str;
-              ACE_DEBUG ((LM_DEBUG,"%s\n", str));
-            }
-
-          if (property->property_value.type () == CORBA::_tc_long)
-            {
-              CORBA::Long l;
-              property->property_value >>= l;
-              ACE_DEBUG ((LM_DEBUG,"%d\n", l));
-            }
-        }
-      TAO_CHECK_ENV_RETURN (env, 1);
-    }  
-}
-
-int
-main (int argc, char **argv)
-{
-  TAO_TRY
-    {
-      Client client;
-      
-      if (client.init (argc, 
-                       argv, 
-                       TAO_TRY_ENV) == -1)
-        return 1;
-      TAO_CHECK_ENV;
-
-      client.run (TAO_TRY_ENV);
-      client.property_tester (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("AVStreams: client");
-      return -1;
-    }
-  TAO_ENDTRY;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/client.h b/TAO/orbsvcs/tests/AVStreams/client.h
deleted file mode 100644
index 9f9916c9f03..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/client.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION 
-//    Test client for the AVStreams demo
-//   
-// = AUTHORS
-//   Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (AVSTREAMS_CLIENT_H)
-#define AVSTREAMS_CLIENT_H
-
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "ace/Get_Opt.h"
-#include "tao/tao_util.h"
-
-class Client
-{
-  // = TITLE
-  //    Client for A/V Streams demo.
-  //
-  // = DESCRIPTION
-  //    Encapsulates client functionality.
-public:
-  Client (void);
-  // Constructor.
-  
-  int init (int argc, 
-            char **argv,
-            CORBA::Environment &env);
-  // Initialize the ORB etc, and bind the MMDevices.
-
-  int run (CORBA::Environment &env);
-  // Run the client.  This will call StreamCtrl::bind_devs.
-  
-  int property_tester (CORBA::Environment &env);
-  // Testing  the property service methods.
-
-protected:
-  int bind_to_remote_mmdevice (int argc,
-                               char *argv[],
-                               CORBA::Environment &env);
-  // Bind to the remote MMDevice.
-  
-  // = Property Testing.
-  
-  int test_define_property (CORBA::Environment &env);
-  // Testing the define property method.
-  
-  int test_get_number_of_properties (CORBA::Environment &env);
-  // Testing the number of properties, currently in the Property Set. 
-
-  int test_get_all_property_names (CORBA::Environment &env);
-  //Testing get_all_property_names.
-  
-  int test_get_properties (CORBA::Environment &env);
-  //Testing get_properties.  Give the names and get their properties.
-
-  int test_get_all_properties (CORBA::Environment &env);
-  // Testing get_all_properties.
-  
-  int test_delete_property (CORBA::String property_name,
-                            CORBA::Environment &env);
-  // Testing delete_property.
-  
-  int test_delete_properties (CORBA::Environment &env);
-  // Testing delete_properties.
-
-  int test_define_properties (CORBA::Environment &env);
-  // Defining a sequence of properties.
-
-  TAO_ORB_Manager manager_;
-  // The ORB manager, handles ORB initialization etc.
-  
-  AVStreams::MMDevice_var local_mmdevice_;
-  // Our MMDevice.
-  
-  AVStreams::MMDevice_var remote_mmdevice_;
-  // Servers MMDevice.
-  
-  AVStreams::StreamCtrl_var stream_ctrl_;
-  // Stream Controller.
-};
-
-class Video_Client_StreamEndPoint
-  : public virtual TAO_Client_StreamEndPoint
-{
-  // = TITLE
-  //    Stream Endpoint for the video client.
-  //
-  // = DESCRIPTION
-  //    Implements the callbacks that are made by the AVStreams library.
-public:
-  Video_Client_StreamEndPoint (void);
-  // Constructor.
-
-  virtual void handle_stop (const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &env);
-  // Handles stream stoppage.
-  
-  virtual void handle_start (const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env);
-  // Handles stream start. Starts the flow of data.
-  
-  virtual void handle_destroy (const AVStreams::flowSpec &the_spec,  
-                               CORBA::Environment &env);
-  // Handles the destruction of the stream, tears down the transport.
-
-  virtual CORBA::Boolean handle_connection_established (AVStreams::StreamEndPoint_ptr responder, 
-                                                        AVStreams::streamQoS &qos_spec, 
-                                                        const AVStreams::flowSpec &the_spec,  
-                                                        CORBA::Environment &env);
-  // Handles stream bind, establishes the transport.
-};
-
-#endif /* AVSTREAMS_CLIENT_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/ANNOUNCE b/TAO/orbsvcs/tests/AVStreams/mpeg/ANNOUNCE
deleted file mode 100644
index 77ccd3aaeb1..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/ANNOUNCE
+++ /dev/null
@@ -1,45 +0,0 @@
-Sent to: 
-    comp.multimedia, comp.sources.x, comp.windows.x,
-    comp.windows.x.announce,
-    ogi.general, ogi.cse.general, ogi.cse.software
-
-ANNOUNCE: Internet MPEG Player v2.0
-
-The Distributed Systems Research Group of the Department of Computer
-Science and Engineering, Oregon Graduate Institute of Science and
-Technology is pleased to announce the release of version 2.0 of its
-Internet-based distributed real-time MPEG video audio player.
-
-The MPEG player has following salient features:
-
-	- Real-time synchronized playback of MPEG1 video and SPARC audio.
-	- Movie data stream from server to client, NO NEED to download
-	  all bits beforehand.
-	- Launch-able from within WWW browsers.
-	- Users can specify QoS parameters like desired video frame
-	  rate.
-	- Novel software feedback mechanisms are used to make the
-	  player robust across Internet:
-		- synchronizing client and server clocks.
-		- adapting video frame rate to current Internet
-		  workload.
-
-
-The video player is publicly available via following WWW pointer:
-
-  http://cse.ogi.edu/DISC/projects/synthetix/Player/
-
-or following anonymous ftp pointer:
-
-  ftp.cse.ogi.edu (129.29.20.2) in /pub/dsrg/Player/
-
-
-Best wishes,
-
-Shanwei Cen
-
-Distributed Systems Research Group
-Department of Computer Science and Engineering
-Oregon Graduate Institute of Science & Technology
-
-scen@cse.ogi.edu
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/BUGS b/TAO/orbsvcs/tests/AVStreams/mpeg/BUGS
deleted file mode 100644
index dbb12fd2df5..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/BUGS
+++ /dev/null
@@ -1,21 +0,0 @@
-Reporting bugs:
-
-    If you find any bugs in this MPEG video audio player,
-    please report them to
-
-    			scen@cse.ogi.edu.
-
-    Since this software
-    is unsupported, we make no guarantee about how long it will
-    take to fix the bugs, or if it will be fixed at all.  Bug fixes
-    will be cheerfully accepted.  Please include as much detailed
-    information as possible, including:
-
-	1) the version number of the program you are using (cf. VERSION)
-	2) the data file that caused the bug (if possible)
-	3) the OS version and machine type you ran the program on
-	4) the compiler used to compile the program
-
-Known problems:
-
-    Please see man page vcr(1) for a list of them.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/COPYING b/TAO/orbsvcs/tests/AVStreams/mpeg/COPYING
deleted file mode 100644
index a43ea2126fb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL b/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL
deleted file mode 100644
index 20c5d01aae5..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL
+++ /dev/null
@@ -1,231 +0,0 @@
-Following are the instructions for installing the distributed
-real-time MPEG video and audio player.
-
-To install this MPEG video audio player on an architecture, you need
-to login to a machine of the same architecture, and follow the
-instructions below.
-
-Building this software needs a Motif environment.
-
-The player can be built to have or not to have audio capacity. If your
-workstation or X-terminal has audio output, you may want to play audio
-with the player.
-
-Audio can be supported either through native audio device or
-AudioFile.  If you want to build the player to use AudioFile, you need
-AudioFile client environment: header files and libraries.  Those who
-are interested in getting AudioFile may want to follow the pointer(ftp
-or WWW):
-
-      file://crl.dec.com/pub/DEC/AF/
-
-Upon reading this file, you should have uncompressed and untared the
-file vcr.tar.Z. Suppose you are now in the root directory of the
-source tree, which contains this file and several other files as well
-as a source subdirectory ./source.
-
-Prior to installation, please read all files 'INSTALL*', and 'README*'
-in current directory, to get more information.
-
-The software and Makefile's are coded so that you can build the player
-for several architectures at the same time, without copying the source
-code, or making symbolic links to source files.
-
-There are plenty of sample Makefile's in directory ./source for
-architectures HPUX (Makefile.ohp[.debug|.static]), SunOS4 for
-Sparc-stations (Makefile.osun4[.debug|.static]), Solaris 2.4 for x86
-(Makefile.osolpc[.debug]) and Solaris 2.x for SparcStation
-(Makefile.solsparc). Makefile's with suffix '.debug' are with
-debugging mode turned on, otherwise most optimizations are turned on.
-
-Also you will find a file 'Makefile.rules'. This file contains all
-dependency information, which is independent from specific environment
-setting. This file is included by all other sample Makefile's in that
-directory. Separate 'Makefile.rules' make it easier for you to
-understand and modify the sample Makefile's, and/or create your own
-Makefile's.
-
-The Makefile's in ./source defines following variables:
-
-	LIBDIRS  -- a list of internal library directories your version
-		    of binaries need.
-	CC -- name of the compiler used.
-	CFLAGS -- flags for the compiler. This should also include
-		  paths of the header files for X11, AudioFile, etc.
-		  In the sample Makefile's, the pathes are defined by
-		  the name INCLUDEDIR.
-	LD -- name of the linker used.
-	LDFLAGS -- flags for the linker.
-	AR -- name and options of archive mantenance program
-	RANLIB -- name an option of ranlib, if your platform (like SunOS4)
-		needs ranlib, you need to define this, otherwise leave it
-		undefined.
-	CLIBS  -- a list of external libraries for client, like X11,
-		 Xm, AF, etc. including the paths of these libraries,
-		 if they are not in default path.
-	CILIBS -- a list of internal libraries for client, each element
-		  in this list should be in a directory listed in LIBDIRS.
-	SLIBS  -- a list of external libraries for server, like X11,
-		 Xm, AF, etc. including the paths of these libraries,
-		 if they are not in default path.
-	SILIBS -- a list of internal libraries for server, each element
-		  in this list should be in a directory listed in LIBDIRS.
-
-The Makefile's finally include the 'Makefile.rules' in ./source.
-
-In the definition of the name CFLAGS, one or more of following micros
-may need to be defined through '-D' compiler option, for compiling the
-client and/or the server:
-
-    Shared by client and server:
-
-	SunOS -- If you are building the player on SunOS4. For both
-	         the client and the server.
-	__srv4__ -- If you are building the player on Solaris 2.x.
-		    For both the client and the server.
-	_HPUX_SOURCE -- If you are building the player on HPUX.
-			For both the client and the server.
-	ULTRIX -- If you are building the player on Ultrix 4.x. For
-		  both the client and the server
-	IRIX	-- For SGI IRIX 5.x
-	FreeBSD -- For FreeBSD 2.x
-	LINUX -- For Linux 1.x
-
-	BIG_ENDIAN -- If you are building the player on big-endian
-			machines, like HP and SunSPARC. For both the
-			client and the server.
-	LITTLE_ENDIAN -- If you are building the player on little-endian
-			machines, like x86 PC and DEC MIPS. For both the
-			client and the server.
-
-	STAT -- If you want to build the player WITH the code for
-		statistics. For both the client and the server.
-
-	NDEBUG -- If you want to include assertion checking in the
-		  player. For both the client and the server.
-
-    Used by client only:
-
-	AUDIOFILE -- If you want to build the player to output audio
-		     to AudioFile server. You need to have at least
-		     AudioFile client side library to use AudioFile.
-		     Otherwise, you may access directly audio devices.
-	SH_MEM -- If you want the player to output to X-window via
-		  shared memory. For the client only.
-
-
-Following are the steps for installing the software, with
-installing on HPUX as an example.
-
-If you are installing on an architecture other than HPUX, you may want
-to create working directories with different names. If your
-architecture is in above architecture list, you may want to make use
-of the sample Makefile's for your architecture instead of HPUX, and
-edit them to suit your environment.
-
-If you are porting the player to an architecture which is not in above
-list, you may need to create your own Makefile's. Nevertheless, you
-will find useful hints from existing sample Makefile's. Among other
-things, choose to define BIG_ENDIAN or LITTLE_ENDIAN in CFLAGS
-depending on the endianness of your platform, and you may need to
-define a name for your porting, like SunOS ULTRIX etc. mentioned
-above. Also, you may need to modify some architecture specific code,
-which is usually around where names like ULTRIX, _HPUX_SOURCE or
-__svr4__ show up.
-
-Suppose now you are to build the player on the HPUX architecture, in
-working subdirectory ./hpux. In fact, you can choose any names you
-like for this working directory.
-
-Now, you have or will create following directories for building the
-software:
-
-./        -- root directory for the source package.
-./source  -- source code directory tree.
-
-Above directories have been created automatically when you untar the
-source package.  You will create following working directory for
-compiling the software.
-
-./hpux    -- directory for building the whole package.
-
-
-Steps for building the package on HPUX
-
-(1). 
-	% mkdir ./hpux
-	% cd ./hpux
-	% tar xf ../dirtree.tar
-	% ln -s ../source/Makefile.hp Makefile
-
-(2). Edit ./Makefile, to suit your environment.
-
-(3).
-	% make
-	% make clean
-	% cd ..
-
-If no error is reported, you should have got ./hpux/vcrs, the server
-program, and ./hpux/vcr, the client programs of the player.
-
-In editing the Makefile's, make sure to set right values to all
-variables like CC, CFLAGS, etc., so that the right compiler is chosen,
-the right compile flags are set, the header files and the libraries
-for TCP/UNIX socket are accessible when compiling both the server and
-the client, and the header files and the libraries for X11,
-X11-toolkit, Motif, and AudioFile (if applicable) are all accessible
-when compiling the client.  Also make sure you set all reasonal
-compile-time optimization flags on with CFLAGS. This makes things
-different, because the client takes very much CPU time to decode video
-frames.
-
-If you have problem with the meaning of CC, CFLAGS, LD, LDFLAGS,
-etc. or the syntax or structure of the Makefile's you are to edit or
-create, please read the man page of 'make'. If you are not sure which
-compiler to use and what compile and link flags to set, please find
-out the compilers available in your system (usually they are 'cc' or
-'gcc') and read their man pages.
-
-Only compilers accepting prototypes will compile successfully. gcc is
-one of them. The Makefiles in this package work with 'make' programs
-which support pattern match rules. gnu make is one of them.
-
-3. Install the compiled programs into proper directories
-
-For example, suppose you are in the root dir of the source kit, and
-want to install the player in /usr/local, run following commands:
-
-	% cp ./vcr.1 ./vcrs.1 /usr/local/man/man1/.
-	% cp ./hpux/vcrs ./hpux/vcr /usr/local/bin/.
-
-
-4. Run the player.
-
-(1). Start the server program on hosts on which there are video and/or
-audio files to be played. Refer to vcrs(1) for instructions.
-
-(2). Set environment for accessing AudioFile, X, Motif, start the client
-program. Refer to vcr(1) for instructions. Following are sample steps
-(assume you are using csh on Sparc-station, and use AudioFile):
-
-	% set path=(/usr/local/bin $path)
-	% setenv  LD_LIBRARY_PATH /usr/lib:/usr/local/lib
-	% setenv DISPLAY hostname:0.0
-	% Asparc &
-	% ahost hostname
-	% vcr
-
-(3). The first invocation of the client programs will create a
-directory $(HOME)/.vcr, and a movie list file $(HOME)/.vcr/vcrPrograms
-with default movie list. After the first invocation, edit the movie
-list file to include all your favorite programs in this file, and
-invoke the client again to play your favorite programs.  Refer to man
-page vcr(1) for structure of this file.
-
-5. Add yourself to our mailing list by sending a mail (with your name
-and email address) to the following address, so that we can keep you
-informed of software upgrade and bug fix.
-
-                      scen@cse.ogi.edu
-
-If you experience any problem, please read file BUGS for bug report.
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL.UCB b/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL.UCB
deleted file mode 100644
index 38a656a538b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/INSTALL.UCB
+++ /dev/null
@@ -1,105 +0,0 @@
-These are the instructions for compiling mpeg_play, the software MPEG
-decoder and player.
-
-1) Untar the file mpeg_play.tar.Z. This is best done by creating a new
-directory for the files involved, moving the tar file into this directory
-and invoking the command:
-
-	zcat mpeg_play-2.0.tar.Z | tar xvf -
-
-2) Create and customize the Makefile. Do this by copying the file
-Makefile.proto to Makefile. Then edit Makefile for your particular needs.
-
-In the makefile the CFLAGS definition is multiply defined for a couple of
-different machines, uncomment the one you want to use, or define your own
-if necessary. 
-
-The INCLUDEDIR variable should be set to include the paths leading to the
-standard header files such as stdio.h as well as to X11/Xlib.h  (on most
-systems, this is /usr/include).  To do this set the INCLUDEDIR variable to
--I followed by the pathname. For example, if the path is /usr/local/include,
-edit the Makefile to look like this:
-
-	INCLUDEDIR       = -I/usr/local/include
-
-If more than one pathname is necessary, simply prepend -I to each path.
-For example if you needed to include /usr/local/include and /usr/X11/include,
-the variable definition would look like:
-
-	INCLUDEDIR       = -I/usr/local/include -I/usr/X11/include
-
-Finally, make sure the LIBS variable is set to the path and name of your X11
-library. For example:
-
-	LIBS             = /usr/lib/X11/libX11.a
-
-3) Type make all.
-
-4) To remove .o files, type make clean
-
-5) Add yourself to the mailing list by sending mail to
-   mpeg-list-request@roger-rabbit.cs.berkeley.edu with the subject line
-   "ADD" (you can delete yourself by sending the subject line "DEL").
-   If you are a uunet user, you can use the mail path
-   'uunet!ucbvax!roger-rabbit.cs!mpeg-list-request'
-
-    mail mpeg-list-request@roger-rabbit.cs.berkeley.edu
-    Subject: ADD
-    ^D
-
-6) Try it out! You can ftp some sample data files from the same site
-   you got this player from. Data files usually end in .mpg or .mpeg
-   The command line for the player is described in the man page, but
-   is basically:
-
-   mpeg_play [options] [file_name] 
-
-7) If you want the player to collect statistics on size of frames, 
-   macroblocks, time to decode, etc., add the following to the 
-   definition of CFLAGS in the Makefile:
-	-DANALYSIS
-   Remove all .o files with "make clean" and remake with "make all"
-   The player will now print summarized statistics at the end of the
-   video clip and can be made to print frame by frame statistics with
-   the use of the -eachstat flag. Read man page for more info.
-------------------------------------------------------------------------
-
-Using Imake
-
-We have included an Imakefile for use with Imake. Since we do not use
-Imake ourselves and the file was provided by someone else, we can not
-give any specific instructions on how to use it. Please, consult
-someone more experienced with Imake. 
-Thanks.
-
-------------------------------------------------------------------------
-NOTES
-
-It seems that much of the time is spent converting the 24 bit MPEG image
-to an 8 bit color space. This process is called "dithering".  We've included
-several dithering algorithms.  Read the man pages for more instructions.
-
-The data files available are produced by XING. These images are
-usually small (~160X120). XING data does not take advantage
-of P or B frames (ie, frames with motion compensation). The data is simply
-a series of I frames.  Performance of the player on XING data is
-significantly lower (half or less) of the performance when motion compensated
-MPEG data is decoded. 
-
-Reporting bugs:
-    If you find any bugs in this software, please send them to
-    mpeg-bugs@roger-rabbit.cs.berkeley.edu.  Since this software
-    is unsupported, we make no guarantees about how long it will
-    take to fix the bug, or if it will be fixed at all.  Bug fixes
-    will be cheerfully accepted.  Please include as much detailed
-    information as possible, including:
-
-	1) the version number of the program you are using (cf. VERSION)
-	2) the data file that caused the bug (if possible)
-	3) the OS version and machine type you ran the program on
-	4) the compiler used to compile the program
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/PatchLevel b/TAO/orbsvcs/tests/AVStreams/mpeg/PatchLevel
deleted file mode 100644
index fc8384029fb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/PatchLevel
+++ /dev/null
@@ -1,12 +0,0 @@
-
-1. Current patch level: version 2.0, patch level 1
-
-Sun Jun  9 12:26:16 PDT 1996
-
-(1). Port to linux 1.3
-(2). Reduce the number of semaphores used in the client to ONE.
-(3). Various bug fix
-
-2. Patch level: version 2.0, patch level 0
-
-Tue Nov 28 14:14:58 PST 1995
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/README b/TAO/orbsvcs/tests/AVStreams/mpeg/README
deleted file mode 100644
index 26a835dac7f..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/README
+++ /dev/null
@@ -1,142 +0,0 @@
-      Distributed real-time MPEG video audio player v2.0
- 
-	  Distributed Systems Research Group
-      Department of Computer Science and Engineering
-    Oregon Graduate Institute of Science & Technology
-                       November, 1995
-
-
-This directory contains a freely available software distributed
-real-time MPEG video and audio player, for use across the
-Internet. Please install it, run it, play movies and music, and have
-fun !
-
-The player features common VCR functionalities like synchronized video
-and audio play back, play speed change on the fly, fast-forward, rewind,
-step forward, random Positioning, and more.
-
-This version of the player plays MPEG1 video (elementary stream) and
-Sun Sparc format (mu-law) audio. It does not play MPEG1 system streams
-or MPEG2 streams yet.
-
-The player is of server/client architecture, with audio/video servers
-and a client distributed across the Internet. The server manages audio
-video file retrieval and distribution. The client decodes video
-frames, plays video and audio streams, and provides a Motif style user
-interface.
-
-The servers stream out media data to clients, so there is NO NEED to
-download all bits beforehand.
-
-Some important characteristics of Internet are resource sharing,
-highly dynamic workload, no resource reservation facility, and lack of
-a common clock.  This player uses novel software feedback mechanisms
-to synchronize servers and clients, and to adapt playback quality to
-the current Internet workload.
-
-
-As compared to version 1.0, this version has following improvements:
-
-	- UDP/TCP video audio data connection choice
-	- support of both native audio device and AudioFile
-	- client invocable from web browser
-	- better organized source code tree
-	- bug fix
-	- and more...
-
-
-The player has been compiled and tested on following architectures:
-
-	HP-UX 09.03
-	SunOS 4.1.3_U1 (sparc)
-	Solaris 2.3 (sparc)
-	Solaris 2.4 (i86pc)
-	Solaris 2.4 (sparc)
-	Ultrix 4.x
-	FreeBSD 2.0.5
-	LINUX 1.3
-
-If you decide to port the player to a new architecture, please let
-us know so that we can incorporate the changes into our sources.
-
-
-The player is publicly available via anonymous ftp from:
-
-  ftp.cse.ogi.edu (129.29.20.2) in /pub/dsrg/Player/
-
-or through following WWW pointer:
-
-  http://cse.ogi.edu/DISC/projects/synthetix/Player/
-
-To install the player, ftp file vcr.tar.Z to local host, move it to a
-suitable directory (best to create a new directory for this software),
-uncompress and untar the .Z file, and see INSTALL for instructions.
-Following is an example of steps to ftp and untar the package:
-
-	% mkdir vcr
-	% cd vcr
-	% ftp ftp.cse.ogi.edu
-	*** login as anonymous and your email address as passwd ***
-	ftp> cd pub/dsrg/Player
-	ftp> binary
-	ftp> get README
-	ftp> get vcr.tar.Z
-	ftp> quit
-	% gunzip vcr.tar.Z (or you may also use 'uncompress vcr.tar.Z')
-	% tar xf vcr.tar
-
-Binary code for platforms HPUX, Solaris 2.4 for x86, Solaris 2.x for
-Sparc, SunOS4.1.3 and FreeBSD are also available in directory
-/pub/dsrg/Player/binaries/.
-
-
-This software is covered by copyrights. It contains code contributed
-by the author and several other parties. Please see the beginning of
-source files and copyright file(s) in the root directory of the source
-tree for more information.
-
-
-Please add yourself to our mailing list by sending a mail (with your
-name and address) to following address, so that we can keep you
-informed of software upgrade and bug fix.
-
-                      scen@cse.ogi.edu
-
-
-We would highly appreciate it if you can share with us the performance
-result you get when you play movies retrieved from the OGI
-server. Please let us know following information:
-
-	- The platform you use for the client.
-
-	- How many hops from your site to OGI, and what is the
-	  estimated bandwidth,
-
-	- Which picture size (320x240, 256x192, 128x96 or 64x48)
-	  works best for you, and on average how many
-	  frames-per-second can be displayed.
-
-	- Questions, comments, suggestions, and bug report.
-
-Information can also be sent to: scen@cse.ogi.edu  Thank you! 
-
-
-ACKNOWLEDGMENT
-
-We gratefully thank ARPA and the National Science Foundation for their
-financial support, and thank Tektronix, Hewlett-Packard and the
-Portland Trail Blazers for their donations.
-
-We also want to thank following people for their code:
-
-  Lawrence A. Rowe, Ketan Patel, and Brian Smith of Computer Science
-  Division-EECS, Univ. of Calif. at Berkeley.  The MPEG decoder used by
-  the client of the player is originated from their MPEG decoder 2.0
-
-  Thomas M. Levergood, Andrew C. Payne, James Gettys, G. Winfield
-  Treese, and Lawrence C. Stewart of Cambridge Research Lab, Digital
-  Equipment Corporation. The player uses AudioFile as audio output.
-
-  Daeron Meyer of the Geometry Center, University of Minnesota.  The
-  Motif user interface is based on his version.
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/README.MI b/TAO/orbsvcs/tests/AVStreams/mpeg/README.MI
deleted file mode 100644
index 85a3069e979..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/README.MI
+++ /dev/null
@@ -1,39 +0,0 @@
-Hello animation addicts,
-
-I'll be brief. This is the modified source of mpeg_play that has a new motif
-user interface (finally!). I hope you will enjoy spending many hours using it!
-This is a very rough first release and the source files + make files are not
-particularly well organized. You might have to do a lot of hand tweaking to get
-it to compile.
-
-Here are some helpful hints:
-
-/mib directory contains the source for my mib interface construction toolkit
-     which is really just a wrapper around motif. This is the majority of the
-     new code and is the same toolkit I used for the X11 version of Geomview
-     (3d visualization program), also available via ftp from geom.umn.edu.
-
-/interface directory contains the bitmaps for buttons, and the interface
-     geometry specified with .mib files.
-
-ui.c file contains the code which sets up the interface and processes button
-     callbacks.
-
-More minor modifications were made to gdith.c util.c util32.c and video.c.
-
-To compile you will need a decent compiler (gcc works the best!), as well as
-the X11, Xt, and Xm (motif) libraries.
-
-You must first get mib/libmib.a to be created. The Makefile in /mib should take
-care of this when properly tweaked. The main makefile should handle linking the
-library into the mpeg_play binary.
-
-If you have any questions or need help with the compile feel free to send me
-mail, but I may take a while to respond. I tend to correspond with quite a
-few people about many different things.
-
-best wishes,
-
-Daeron Meyer
-
-daeron@geom.umn.edu
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/README.UCB b/TAO/orbsvcs/tests/AVStreams/mpeg/README.UCB
deleted file mode 100644
index 3c122f92421..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/README.UCB
+++ /dev/null
@@ -1,105 +0,0 @@
-                  MPEG Video Software Decoder
-                  (Version 2.0; Jan 27, 1993)
-
-        Lawrence A. Rowe, Ketan Patel, and Brian Smith
- Computer Science Division-EECS, Univ. of Calif. at Berkeley
-
-This directory contains a public domain MPEG video software
-decoder. The decoder is implemented as a library that will
-take a video stream and display it in an X window on an 8, 24
-or 32 bit deep display.  The main routine is supplied to
-demonstrate the use of the decoder library. Several dithering
-algorithms are supplied based on the Floyd-Steinberg, ordered
-dither, and half-toning algorithms that tradeoff quality and
-performance. Neither the library nor the main routine handle
-real-time synchronization or audio streams.
-
-The decoder implements the standard described in the Committee 
-Draft ISO/IEC CD 11172 dated December 6, 1991 which is
-sometimes refered to as "Paris Format." The code has been
-compiled and tested on the following platforms:
-
- HP PA-RISC (HP/UX 8.X, X11R4) (i.e., HP 9000/7XX and 9000/3XX)
- Sun Sparc (SunOS 4.X, X11R5)
- DECstation 5000 and Alpha
- IBM RS6000
- Silicon Graphics Indigo
- MIPS RISC/os 4.51
- Sequent Symmetry
- Sony NEWS
- and more than we can list here.
-
-If you decide to port the code to a new architecture, please let
-us know so that we can incorporate the changes into our sources.
-
-This directory contains everything required to build and
-display video. We have included source code, a makefile, an Imakefile,
-installation instructions, and a man page. Data files can
-be obtained from the same ftp site this was located in.
-See the INSTALL file for instructions on how to
-compile and run the decoder. 
-
-The data files were produced by XING. XING data does not take
-advantage of P or B frames (ie, frames with motion compensation). 
-Performance of the player on XING data is significantly slower 
-(half or less) than the performance when motion compensated MPEG 
-data is decoded. We are very interested in running the software 
-on other MPEG streams.  Please contact us if you have a stream 
-that does not decode correctly. Also, please send us new streams
-produced by others that do utilize P and B frames.
-
-NOTE: One particular XING data file: raiders.mpg, is not a 
-valid MPEG stream since it does not contain a sequence
-header. 
-
-We have established several mailing lists for messages about
-the decoder:
-
-mpeg-list-dist@CS.Berkeley.EDU 
-   General information on the decoder for everyone interested 
-   should be sent to this list.  This should become active after
-   11/20/92
-
-mpeg-list-request@CS.Berkeley.EDU
-   Requests to join or leave the list should be sent to this 
-   address. The subject line should contain the single word 
-   ADD or DELETE.
-
-mpeg-bugs@CS.Berkeley.EDU
-   Problems, questions, or patches should be sent to this address.
-
-Our future plans include porting the decoder to run on other
-platforms, integrating it into a video playback system that
-supports real-time synchronization and audio streams, and
-further experiments to improve the performance of the
-decoder. Vendors or other organizations interested in supporting 
-this research or discussing other aspects of this project should 
-contact Larry Rowe at Rowe@CS.Berkeley.EDU.
-
-We also plan on producing an MPEG encoder. The encoder will NOT be
-a real time digitizer, but will be intended for offline processing
-of video data. 
-
-ACKNOWLEDGEMENTS:
-	We gratefully thank Hewlett-Packard, Fujitsu, the Semiconductor
-	Research Corporation for financial support.
-
-	We also want to thank the following people for their help:
-
-	Tom Lane of the Independent JPEG Group provided us with
-		the basic inverse DCT code used by our player.
-		(tom_lane@g.gp.cs.cmu.edu)
-
-	Reid Judd of Sun Microsystems provided advice and assistance.
-
-	Todd Brunhoff of NVR provided advise and assistance.
-
-	Toshihiko Kawai of Sony provided advise and assistance.
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/VERSION b/TAO/orbsvcs/tests/AVStreams/mpeg/VERSION
deleted file mode 100644
index b8dcb387060..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-Distributed real-time MPEG video and audio player version 2.0
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile
deleted file mode 100644
index 436da0b23b9..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-## $Id$
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	
-#
-#	Makefile for MPEG stuff
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	mpeg_shared \
-	mpeg_mib \
-	mpeg_server \
-	mpeg_client \
-	client \
-	server
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/TODO b/TAO/orbsvcs/tests/AVStreams/mpeg/source/TODO
deleted file mode 100644
index ad7698e62f4..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/TODO
+++ /dev/null
@@ -1,45 +0,0 @@
-$Id$
-
-Use - for things to do, * for urgent things, and + for things that
-have been done.
-
-Things to do
-------------
-
-"Simple" things
-
-- Clear the semaphores on the client and the server!
-
-- Semaphore on the client side is exclusive ?! Sometimes one
-  client blocks forever when the server exits
-
-- rttag is enabled with -r
-  does it work ?
-
-- Make #define's into enums in common.h/globals.h
-
-+ Change handle_input to handle_connection in
-  Mpeg_Svc_Handler
-
-+ Video_Sig_Handler is in Mpeg_Server -- needs to be moved to Video_Server
-  -- done
-
-+ Split up VIDEO_FAST into two commands - VIDEO_FAST_{FORWARD,BACKWARD}
-
-+ create a helper class for video, and put FBread et al in that
-
-- try compiling ACE and the application with fast=1 to see if
-  performance improves
-
-- Rename "play", "play_send" etc. appropriately
-
-
-
-"Not-so-simple" things 
-
-
-- Logic for Video_Server is convoluted!!
-
-- Need to modularize Audio_Server
-
-- Seperate command parsing in its own class
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
deleted file mode 100644
index 13ae89f9b8e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-BIN = vcr
-
-BUILD = $(BIN)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES= vcr
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-
-LIBS 	+= -lTAO -lACE -lorbsvcs
-MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
-CPPFLAGS += -I$(MPEG_ROOT)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS +=  -lmpeg_shared -lmpeg_mib -lmpeg_client -lXm  -lXext -lXt -lSM -lICE  -lX11  -lsocket -lnsl -ldl
-CPPFLAGS += -i -DSH_MEM -DNDEBUG -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/vcr.o .obj/vcr.so .shobj/vcr.o .shobj/vcr.so: vcr.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
deleted file mode 100644
index 34b0336fb59..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- *
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <X11/Intrinsic.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/wait.h>
-#ifndef MIPS
-#include <netinet/in.h>
-#else
-#include <bsd/netinet/in.h>
-#endif
-#if defined(sun) || defined(FreeBSD)
-#include <stdlib.h>
-#endif
-#include <time.h>
-#include <sys/time.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
-
-#include "include/common.h"
-
-#include "mpeg_client/video.h"
-#include "mpeg_client/proto.h"
-#include "mpeg_client/newproto.h"
-#include "mpeg_client/global.h"
-
-#include "mpeg_client/util.h"
-#include "mpeg_client/dither.h"
-
-#include "mpeg_shared/routine.h"
-
-static int mainPid;
-
-static time_t start_time;
-/*
- *--------------------------------------------------------------
- *
- * usage --
- *
- *	Print mpeg_play usage
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	exits with a return value -1
- *
- *--------------------------------------------------------------
- */
-
-void
-usage(char *s)	/* program name */
-{
-    fprintf(stderr, "Usage:\n");
-    fprintf(stderr, "%s [-rt] [-shmem] [-rmsem]\n", s);
-    fprintf(stderr, "    [-dither ordered|ordered2|fs4|fs2|fs2fast|hybrid|\n");
-    fprintf(stderr, "             hybrid2|2x2|gray|color|mono|threshold]\n");
-    fprintf(stderr, "    [X-window options]\n");
-    fprintf(stderr, "    [-v [host_name:]video_file_name]\n");
-    fprintf(stderr, "    [-a [host_name:]audio_file_name]\n");
-    
-    fprintf(stderr, "    [-p movie_file_name]\n");
-    fprintf(stderr, "    [-l movie_list_file_name]\n");
-    
-    fprintf(stderr, "    [-help]\n");
-    fprintf(stderr, "    [-quiet]\n");
-    
-    exit (-1);
-}
-
-/*
- *--------------------------------------------------------------
- *
- * int_handler --
- *
- *	Handles Cntl-C interupts..
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-static int on_exit_tag = 1;
-
-void set_exit_routine_tag(int tag)
-{
-  on_exit_tag = tag;
-}
-void on_exit_routine(void)
-{
-  if (!on_exit_tag)
-    return;
-  if (mainPid == getpid())
-  {
-    extern void delete_semaphore();
-    ABdeleteSem();
-    VBdeleteSem();
-    VDdeleteSem();
-    delete_semaphore();
-    if (getuid() != DEVELOPER_UID)
-    {
-      FILE * fp;
-      char *buf = (char *)malloc(100);
-      char *tbuf;
-      if (buf != NULL) {
-	sprintf(buf, "%s%s", LOG_DIR, "vcrSession.log");
-	if ((fp = fopen(buf, "a")) != NULL) {
-	  time_t val = time(NULL);
-	  get_hostname(buf, 100);
-	  buf[99] = 0;
-	  tbuf = ctime(&start_time);
-	  tbuf[strlen(tbuf) - 1] = 0;
-	  fprintf(fp, "User %d on %s at %s %dm%ds\n", getuid(), buf,
-		  tbuf, (val - start_time) / 60, (val - start_time) % 60);
-	}
-	free(buf);
-      }
-    }
-  }
-  on_exit_tag = 0;
-  kill(0, SIGINT);
-}
-
-static void int_handler(int sig)
-{
-  exit(0);
-}
-
-static void clear_child(int sig)
-{
-  int pid;
-  int status;
-  
-  while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
-  {
-    if (status == 0) {
-      continue;
-    }
-    fprintf(stderr, "VCR: child %d (status %d) ", pid, status);
-    if (WIFEXITED(status)) {
-      fprintf(stderr, "exited with status %d\n", WEXITSTATUS(status));
-    }
-    else if (WIFSIGNALED(status)) {
-#if defined(_HPUX_SOURCE) || defined(__svr4__) || defined(IRIX)
-      fprintf(stderr, "terminated at signal %d%s.\n", WTERMSIG(status),
-	      WCOREDUMP(status) ? ", core dumped" : "");
-#else
-      fprintf(stderr, "terminated at signal %d.\n", WTERMSIG(status));
-#endif
-    }
-    else if (WIFSTOPPED(status)) {
-      fprintf(stderr, "stopped at signal %d\n", WSTOPSIG(status));
-    }
-
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * main --
- *
- *	Parses command line, starts decoding and displaying.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-int main(int argc, char ** argv)
-{
-
-  int mark;
-  int rmsemFlag = 0;
-
-  argc_share	= argc;
-  argv_share	= argv;
-  mark = 1;
-  argc--;
-
-  displayName[0] = 0;
-  ditherType = ORDERED2_DITHER;
-  LUM_RANGE = 8;
-  CR_RANGE = CB_RANGE = 4;
-  noDisplayFlag = 0;
-
-#ifdef SH_MEM
-  shmemFlag = 0;
-#endif
-
-  if (getenv("DISPLAY")!= NULL)
-  {
-    char * disp = getenv("DISPLAY");
-    if (strncmp(disp, "anquetil:0", 10) == 0 ||
-	strncmp(disp, "helix:0", 7) == 0 ||
-	strncmp(disp, "hinault:0", 9) == 0 ||
-	strncmp(disp, "lemond:0", 8) == 0 ||
-	strncmp(disp, "indurain:0", 10) == 0)
-      ditherType = ORDERED_DITHER;
-    else
-      ditherType = ORDERED_DITHER;
-  }
-
-  while (argc) {
-    if (strcmp(argv[mark], "-rt") == 0) {
-      realTimeFlag = 1;
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-rt1") == 0) {
-      realTimeFlag = 2;
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-rt2") == 0) {
-      realTimeFlag = 3;
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-shmem") == 0) {
-      argc--; mark++;
-      shmemFlag = 1;
-    }
-    else if (strcmp(argv[mark], "-rmsem") == 0) {
-      argc--; mark++;
-      rmsemFlag = 1;
-    }
-#if 0
-    else if (strcmp(argv[mark], "-nop") == 0) {
-      TogglePFlag();
-      argc--; mark++;
-    } else if (strcmp(argv[mark], "-nob") == 0) {
-      ToggleBFlag();
-      argc--; mark++;
-    }
-#endif
-    else if (strcmp(argv[mark], "-l") == 0) {   /* program list file name */
-      strcpy(proglistName, argv[++mark]);
-      argc -= 2; mark++;
-      
-    } else if (strcmp(argv[mark], "-display") == 0) {
-      strcpy(displayName,argv[++mark]);
-      argc -= 2; mark++;
-    } else if (strcmp(argv[mark], "-dither") == 0) {
-      argc--; mark++;
-      if (argc < 1) {
-	perror("Must specify dither option after -dither flag");
-	usage(argv[0]);
-      }
-      if (strcmp(argv[mark], "hybrid") == 0) {
-	argc--; mark++;
-	ditherType = HYBRID_DITHER;
-      } else if (strcmp(argv[mark], "hybrid2") == 0) {
-	argc--; mark++;
-	ditherType = HYBRID2_DITHER;
-      } else if (strcmp(argv[mark], "fs4") == 0) {
-	argc--; mark++;
-	ditherType = FS4_DITHER;
-      } else if (strcmp(argv[mark], "fs2") == 0) {
-	argc--; mark++;
-	ditherType = FS2_DITHER;
-      } else if (strcmp(argv[mark], "fs2fast") == 0) {
-	argc--; mark++;
-	ditherType = FS2FAST_DITHER;
-      } else if (strcmp(argv[mark], "hybrid2") == 0) {
-	argc--; mark++;
-	ditherType = HYBRID2_DITHER;
-      } else if (strcmp(argv[mark], "2x2") == 0) {
-	argc--; mark++;
-	ditherType = Twox2_DITHER;
-      } else if (strcmp(argv[mark], "gray") == 0) {
-	argc--; mark++;
-	ditherType = GRAY_DITHER;
-      } else if (strcmp(argv[mark], "color") == 0) {
-	argc--; mark++;
-	ditherType = FULL_COLOR_DITHER;
-      }
-      /*
-      else if (strcmp(argv[mark], "none") == 0) {
-	argc--; mark++;
-	ditherType = NO_DITHER;
-      }
-      */
-      else if (strcmp(argv[mark], "ordered") == 0) {
-	argc--; mark++;
-	ditherType = ORDERED_DITHER;
-      } else if (strcmp(argv[mark], "ordered2") == 0) {
-	argc--; mark++;
-	ditherType = ORDERED2_DITHER;
-      }
-      /*
-      else if (strcmp(argv[mark], "mbordered") == 0) {
-	argc--; mark++;
-	ditherType = MBORDERED_DITHER;
-      }
-      */
-      else if (strcmp(argv[mark], "mono") == 0) {
-	argc--; mark++;
-	ditherType = MONO_DITHER;
-      } else if (strcmp(argv[mark], "threshold") == 0) {
-	argc--; mark++;
-	ditherType = MONO_THRESHOLD;
-      } else {
-	perror("Illegal dither option.");
-	usage(argv[0]);
-      }
-    }
-    else if (strcmp(argv[mark], "-quiet") == 0) {
-      argc--; mark++;
-      quietFlag = 1;
-    }
-    else if (strcmp(argv[mark], "-l_range") == 0) {
-      argc--; mark++;
-      LUM_RANGE = atoi(argv[mark]);
-      if (LUM_RANGE < 1) {
-	fprintf(stderr, "Illegal luminance range value: %d\n", LUM_RANGE);
-	exit(1);
-      }
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-cr_range") == 0) {
-      argc--; mark++;
-      CR_RANGE = atoi(argv[mark]);
-      if (CR_RANGE < 1) {
-	fprintf(stderr, "Illegal cr range value: %d\n", CR_RANGE);
-	exit(1);
-      }
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-cb_range") == 0) {
-      argc--; mark++;
-      CB_RANGE = atoi(argv[mark]);
-      if (CB_RANGE < 1) {
-	fprintf(stderr, "Illegal cb range value: %d\n", CB_RANGE);
-	exit(1);
-      }
-      argc--; mark++;
-    }
-    else if (strcmp(argv[mark], "-help") == 0) {
-      usage(argv[0]);
-    }
-    else {
-      argc--; mark++;
-    }
-    /*
-    else if (argv[mark][0] == '-') {
-      fprintf(stderr, "Un-recognized flag %s\n",argv[mark]);
-      usage(argv[0]);
-    }
-    */
-    /* the input video and audio files with options '-v', '-a' and '-p' are processed
-       at the end of 'ui.c' */
-  }
-  if (ditherType == MBORDERED_DITHER)
-  {
-    fprintf(stderr, "Sorry, mbordered dithertype no longer supported.\n");
-    exit(1);
-  }
-  //  setsignal(SIGCHLD, clear_child);
-  //  setsignal(SIGINT, int_handler);
-  //  setsignal(SIGHUP, int_handler);
-  /*
-  setsignal(SIGKILL, int_handler);
-  setsignal(SIGSEGV, int_handler);
-  */
-  //  setsignal(SIGQUIT, int_handler);
-  //  setsignal(SIGTERM, int_handler);
-  //  setsignal(SIGALRM, SIG_IGN);
-  setsignal(SIGPIPE, SIG_IGN);
-
-
-  atexit (on_exit_routine);
-  
-  if (rmsemFlag) {
-    if (geteuid() == 0) { /* root, refuse to remove shm and sem ids */
-      fprintf(stderr, "You are ROOT, -rmsem is ignored 'cause it's too dangerous.\n");
-    }
-    else {
-      char *tmpf = tempnam("/tmp", "");
-      if (tmpf != NULL) {
-	char buf[128];
-	FILE *fp;
-	sprintf(buf, "ipcs >%s", tmpf);
-	system(buf);
-	if ((fp = fopen(tmpf, "r")) != NULL) {
-	  while (fgets(buf, 128, fp) != NULL && (int)(strlen(buf)) > 10) {
-	    int id;
-	    sscanf(&buf[1], "%d", &id);
-	    if (buf[0] == 'm') {
-	      shmctl(id, IPC_RMID, NULL);
-	    }
-	    else if (buf[0] == 's') {
-	      semctl(id, 0, IPC_RMID, 0);
-	    }
-	  }
-	  fclose(fp);
-	  unlink(tmpf);
-	}
-	free(tmpf);
-      }
-    }
-  }
-
-  if (quietFlag) {
-    if ((freopen("/dev/null", "w", stdout) == NULL) ||
-	(freopen("/dev/null", "w", stderr) == NULL)) {
-      exit(10);
-    }
-  }
-  
-  start_time = time(NULL);
-
-  setsid();  /* break controlling terminal and creat a new session */
-
-  mainPid = getpid();
-
-  CTRmain();
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
deleted file mode 100644
index f393c2d615b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
+++ /dev/null
@@ -1,580 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#if !defined (_MPEG_COMMON_H)
-#define _MPEG_COMMON_H
-
-#include "ace/OS.h"
-
-extern int gethostname (char*, size_t);
-
-#define VERSION 200   /* version 2.00 */
-
-#ifdef LITTLE_ENDIAN
-#define NeedByteOrderConversion
-#elif !defined(BIG_ENDIAN)
-#if (defined(vax) || defined(i386) || defined(i486)) && !defined(NeedByteOrderConversion)
-#define NeedByteOrderConversion
-#endif
-#endif
-
-/*following is defined so that debuging information is printed out for only
-  specific user (usually software developer), LOG_DIR is also defined */
-
-/*
-#define LOG_DIR "/home/shanweic/log/"
-#define DEVELOPER_UID	8640
-*/
-
-/* %% this is where the logging is done.." */
-#define LOG_DIR "./"
-#define DEVELOPER_UID	1735
-
-#define SFprintf	if ((!getuid()) || getuid() == DEVELOPER_UID) fprintf
-#define Fprintf		if (shared->config.verbose) fprintf
-
-#define VCR_TCP_PORT 	7101
-#define VCR_UNIX_PORT 	"/tmp/vcr_unix_port01"
-#define VCR_ATM_PORT	"3005"
-
-#define SPEEDUP_INV_SCALE 5  /* VS fast starts at 5/(5-1) normal speed */
-
-#define AB_BUF_SIZE (64 * 1024)   /* size of client AB buffer */
-
-#if 0
-#define VB_BUF_SIZE (256 * 1024)  /* Size of client VB buffer */
-#endif
-
-#define VB_BUF_SIZE (1024 * 1024)  /* Size of client VB buffer */
-
-#define VD_BUF_SIZE (1024 * 1024)  /* Size of client VD buffer */
-
-#define PATH_SIZE 	256
-#define PATTERN_SIZE 	100
-#define MAX_FRAMES 	54000  /* half hour video at 30FPS */
-#define MAX_VDQUEUE_SIZE 20
-#define MAX_FB_PACKETS	20  /* max number of feedback packet info collected. */
-#define POSITION_RANGE 	100
-#define MSGGAP_MIN 	-10  /* these are used for recording stat of
-				msgs received by VB */
-#define MSGGAP_MAX	50
-
-#define INET_SOCKET_BUFFER_SIZE 1400
-
-/* audio type constants */
-
-#define AudioTypeMuLaw 0
-#define AudioTypeALaw 1
-#define AudioTypeRIFF 2
-#define AudioTypeLiner16 3
-#define AudioTypeLiner8  4
-#define AudioTypeLiner8Offset 5
-
-/* Video and audio compression format */
-
-#define VIDEO_MPEG1	0
-#define VIDEO_MPEG2	1
-#define VIDEO_JPEG	3
-#define VIDEO_SIF	4
-
-#define AUDIO_RAW	10
-#define AUDIO_MPEG1	11
-#define AUDIO_MPEG2	12
-
-
-/* system configuration default values */
-
-#define DEFAULT_maxFPS 60
-#define DEFAULT_maxSPS 16000
-#define DEFAULT_ffFPS 150
-#define DEFAULT_fbFPS 150
-#define DEFAULT_feedBackDelay 2000
-#define DEFAULT_audioMask 0x1
-#define DEFAULT_encodeType AudioTypeMuLaw
-#define DEFAULT_channels 1
-#define DEFAULT_samplesPerSecond 8000
-#define DEFAULT_bytesPerSample 1
-#define DEFAULT_audioTimerDuration 500
-#define DEFAULT_audioBufferedIntervals 2
-#define DEFAULT_framesPerAudioPlay  4
-#define DEFAULT_audioForward   800
-#define DEFAULT_filterPara  50
-#define DEFAULT_maxSPframes 60
-#define DEFAULT_VStimeAdvance 100
-
-#define DEFAULT_volume 0
-
-/* audio parameter data structure */
-
-typedef struct
-{
-  int	encodeType;
-  int	channels;
-  int	samplesPerSecond;
-  int	bytesPerSample;
-} AudioParameter;
-
-/* client processes shared data structure definition */
-
-typedef struct
-{
-  int VDframeNumber;
-  int VBbufId, VDbufId;
-  char * VBbufAddr, * VDbufAddr;
-  int pixelValid;
-  unsigned char pixel[256];  /* for transfering pixel value from VP to VD */
-  
-  /* command and status   */
-  int cmd;
-  int cmdsn;
-  int cmdBusy;
-
-  int loopBack;
-  
-  int framesPerSecond;   /* Frames per second */
-  int usecPerFrame;    /* micro-seconds per frame, actual video speed */
-  int samplesPerSecond;   /* Samples per second */
-  int usecPerSample;   /* micro-seconds per sample, actual audio speed */
-
-  int volumePosition;
-  int balancePosition;
-  int speedPosition;
-  int locationPosition;
-  struct hostent audioHost;
-  char audioPath[PATH_SIZE];
-  struct hostent videoHost;
-  char videoPath[PATH_SIZE];
-
-  int live;  /* non-zero if any of the video/audio streams are live source */
-  int videoFormat;
-  int audioFormat;
-  
-  /*  video channel parameters  */
-  int totalFrames;
-  int totalGroups;
-  int totalHeaders;
-  int averageFrameSize;
-  double  pictureRate;
-  int horizontalSize;
-  int verticalSize;
-  int pelAspectRatio;
-  int vbvBufferSize;
-  int firstGopFrames;
-  int patternSize;
-  char pattern[PATTERN_SIZE];
-  int IframeGap;
-  int VStimeAdvance;
-  
-  int lastIframeDecoded;
-  int sendPatternGops;
-  char sendPattern[PATTERN_SIZE];
-  float frameRateLimit;
-  int framesDropped;
-  int qosRecomputes;
-  
-  /*  video channel status  */
-  int currentGroup;
-  int currentFrame;
-  int currentDisplay;
-  int nextFrame;
-  int nextGroup;
-  
-  /* audio channel parameters  */
-  int totalSamples;
-  AudioParameter audioPara;
-
-  /* audio channel status  */
-  int nextSample;   /* played by AP */
-
-  /* AudioFile device parameter */
-  AudioParameter AFPara;
-
-  int currentUPF;
-  int rtplay;           /* realtime tag, -- VD needs to drop frames when needed */
-  int collectStat;  /* to indicate if statistics should be collected or not */
-  int VBheadFrame;	/* ID of last frame put to VBbuffer by VB */
-  int needHeader;   /* VD requests resending of systerm Header */
-  int playRoundTripDelay; /* play round trip time (from issuing play/FF/FB
-			     command to first Decoded frame showup in
-			     VD buffer) estimated by CTR start_timer() */
-  int audioMaxPktSize;	/* 0 -- reliable byte stream,
-			   >0 - non-discard mode packet stream,
-			   <0 - discard mode packet stream */
-  int videoMaxPktSize;
-
-  /* System configuration parameters */
-  struct
-  {
-    int rt;		/* play as fast as possible without dropping frames,
-			   and audio turned off when this tag is set to 0 (zero)
-				   */
-    int maxFPS;		/* maximum PLAY frames-per-second, this play speed is used
-			   during playback when speed scale is set to 100 */
-    int maxSPS;         /* similar to maxFPS, used when audio is played without
-			   corresponding video
-			   */
-    int ffFPS;		/* play speed when Fast forward */
-    int fbFPS;		/* play speed when fast rewind */
-    int feedBackDelay;  /* msec, delay of feedback when AB, VB received first
-			   packet, 0 (zero) default to adaptive */
-    int audioMask; /* mask for audio output device */
-    AudioParameter audioPara; /* default audio parameter by system */
-    int audioTimerDuration; /* for audio-only case, miliseconds */
-    int audioBufferedIntervals; /* for audio-only case,
-				   audioTimerDuration * audioBufferedIntervals
-				   milliseconds of audio samples will be buffered
-				   in AF buffer
-				   */
-    int framesPerAudioPlay;   /* for audio-video case, each time, samples corresponding
-				 to this number of video frames will be played */
-    int audioForward;    /* forward value for audio channel, in AFTime unit
-			    (number of samples), audio channel is played ahead of video
-			    by this number of samples. This is introduce to compensate
-			    the dely to AF in audio channel, and usually should be less
-			    than 1 (one) second, but greater than zero.
-			  */
-    int VStimeAdvance;  /* target VB buffer level to be mentained (micro-seconds). This
-			   is sent in INIT message to VS, to decide how many frames to
-			   be maintained in VB buffer
-			  */
-    float frameRateLimit; /* playback frame rate limit (frames per second) */
-    int collectStat;    /* tag to collect statistics to file 'stat.n' when set */
-    int collectFrameInfo; /* collect MPEG frame info to file 'stat.n' when set*/
-    int syncEffective;  /* tag to make sync mechanism effective when set */
-    int qosEffective;   /* tag to make QoS control effective when set */
-    int audioOffset; 	/* offset added to audio channel 'nextSample' when play().
-			   usually audio and video are not recorded strictly
-			   synchronized. This parameter is to compensate it. The
-			   value can be any integer value.
-			 */
-    int filterPara;     /* 1/R of Median, nsamples of Mean and Average */
-    int maxSPframes;	/* max number of frame in a sendPattern */
-    int audioConn;	/* tag for connection oriented audio data channel */
-    int videoConn;	/* tag for connection oriented video data channel */
-    int verbose;
-  } config;
-
-#ifdef STAT
-  struct
-  {
-    unsigned VBmaxBytes;    	/* max fill level (bytes) in VB */
-    unsigned VBdroppedFrames;	/* accumulative total number of frames dropped by VB
-				   because VB buffer full */
-    unsigned VBemptyTimes;	/* number of time VD fail to get a frame from VB
-				   immediately */
-    unsigned VDnoRef;            /* # of frames without reference */
-    unsigned VDagainstSendPattern; /* # of frames against send pattern */
-    unsigned VDtooLateI;         /* # of I frames dropped 'cause too late */
-    unsigned VDtooLateP;         /* # of P frames dropped 'cause too late */
-    unsigned VDtooLateB;         /* # of B frames dropped 'cause too late */
-    unsigned VDlastFrameDecoded;	/* ID of last frame decoded by VD */
-    unsigned CTRdropLate;
-    unsigned CTRdropOutOrder;
-    unsigned CTRdispOnTime;
-    unsigned CTRdispLate;
-    unsigned fbPacketNumber;	/* # packets sent by feedback mechanism */
-    struct {
-      int frameId;
-      int addUsecPerFrame;
-      int addFrames;
-      int frames;
-      int framesDropped;
-      float frameRateLimit;
-      int advance;
-    } fbPackets[MAX_FB_PACKETS]; 	/* recording FB packet contents */
-    unsigned VDqueue[MAX_VDQUEUE_SIZE]; /* record number of frames with VD queue
-					   length of index number */
-    int  VBmsgGaps[MSGGAP_MAX + 1 - MSGGAP_MIN]; /* # of ind-sized gaps between msgs */
-    char VBframesReceived[(MAX_FRAMES + 7)/8];  /* bit array for frames received by VB */
-    char VDframesDecoded[(MAX_FRAMES + 7)/8];	/* bit array for frames decoded by VD */
-    char VPframesDisplayed[(MAX_FRAMES + 7)/8];	/* bit array for frames displayed by VP */
-    short VBfillLevel[MAX_FRAMES];	/* VB buffer fill level (frames) recorded by CTR */
-  } stat;
-#endif
-} SharedData;
-
-/* command and reply: GUI-CTR, CTR-VS, CTR-AS */
-
-/* GUI to CTR, (and also CTR to VS and/or AS) */
-
-#define CmdINIT 0    /* followed by: videoHost, videoPath, audioHost, audioPath
-			each item is passed as a string (without 0), led with length(int) */
-#define CmdINITaudio	1   /* for CTR-AS */
-#define CmdINITvideo	2   /* for CTR-VS */
-#define CmdSTOP 3
-#define CmdFF	4
-#define CmdFB	5
-#define CmdSTEP 6
-#define CmdPLAY	7
-#define CmdREF	20		/* this is for sending REFerence frame by VS
-				   for CmdSTEP and CmdPLAY */
-#define CmdPOSITION	8         /* followed by position */
-#define CmdPOSITIONrelease	9 /* followed by position */
-#define CmdVOLUME	10	  /* followed by position */
-#define CmdBALANCE	11	  /* followed by position */
-#define CmdSPEED	12	  /* followed by position */
-#define CmdLOOPenable	13
-#define CmdLOOPdisable	14
-#define CmdSTATstream	23   /* reply with { | type(byte) | size(int) }+ | */
-#define CmdSTATsent	24   /* reply with { | byte }+ | */
-#define CmdCLOSE	18
-#define CmdFAIL		19   /* followed by a string */
-
-#define CmdDONE		15	/* CTR to GUI:
-				   replay for accptance and execution of Above Cmd */
-
-#define CmdVPinitScreen 30    /* CTR to VP(GUI), audio-only screen clearning */
-#define CmdVPdisplayFrame 31  /* CTR to VP(GUI) to display the single frame in buffer */
-#define CmdVPclearScreen 32   /* CTR to VP(GUI), to clear all images in VD buffer */
-#define CmdVPaudioPosition 33 /* CTR to VP(GUI), in audio-only case, set position bar */
-
-// to terminate the event loop
-#define CmdExit  34
-
-/* CTR-VS */
-
-/* CmdINITvideo: followd by parameters of a fixed structure of 3 integers
-   reply with CmdINITvideo followed by reply or CmdFAIL followed by a string,
-*/
-typedef struct
-{
-  int sn;
-  int version;
-  int nameLength;    /* the length of the video file */
-  /* this structure is followed by a zero-terminated file name as follows:
-      char videoFile[];
-   */
-} INITvideoPara;
-
-typedef struct
-{
-  int live;
-  int format;
-  
-  int totalHeaders;
-  int totalFrames;
-  int totalGroups;
-  int horizontalSize;
-  int verticalSize;
-  int pelAspectRatio;
-  int pictureRate1000;
-  int vbvBufferSize;
-  int sizeIFrame;
-  int sizePFrame;
-  int sizeBFrame;
-  int sizeSystemHeader;
-  int sizeGop;
-  int averageFrameSize;
-  int firstGopFrames;
-  int patternSize;
-  char pattern[PATTERN_SIZE];
-} INITvideoReply;
-
-/* CmdPOSITION, CmdPOSITIONrelease: followed by following parameter */
-typedef struct
-{
-  int sn;
-  int nextGroup;
-} POSITIONpara;
-
-/* CmdSTEP: followed by following parameter */
-typedef struct
-{
-  int sn;
-  int nextFrame;
-} STEPpara;
-
-/* CmdFF, CmdFB: followed by following parameter */
-typedef struct
-{
-  int sn;
-  int nextGroup;
-  int usecPerFrame;
-  int framesPerSecond;
-  int VStimeAdvance;
-} FFpara;
-
-/*CmdPLAY: followed by following parameter */
-typedef struct
-{
-  int sn;
-  int collectStat;
-  int nextFrame;
-  int usecPerFrame;
-  int framesPerSecond;
-  int frameRateLimit1000;
-  int VStimeAdvance;
-  int sendPatternGops;
-  char sendPattern[PATTERN_SIZE];
-} PLAYpara;
-
-/* CmdSPEED: parameter */
-typedef struct
-{
-  int sn;
-  int usecPerFrame;
-  int framesPerSecond;
-  int frameRateLimit1000;
-  int sendPatternGops;
-  char sendPattern[PATTERN_SIZE];
-} SPEEDpara;
-
-/* CmdLOOPenabe, CmdLOOPdisable, CmdSTOP: following by SN */
-
-
-/* video channel data packet structure */
-
-typedef struct
-{
-  int cmd;
-  int cmdsn;
-  int sh;
-  int gop;
-  int frame;
-  int display;  /* display frame number */
-  int future;
-  int past;
-  int currentUPF;
-  int dataBytes;
-} VideoPacket;
-
-
-/* video channel data message structure */
-
-typedef struct
-{
-  int packetsn;
-  int packetSize;
-  int msgsn;
-  int msgOffset;
-  int msgSize;
-} VideoMessage;
-
-
-/* Feedback parameter structure */
-
-typedef struct
-{
-  int cmdsn;
-  int needHeader;
-  int addUsecPerFrame;
-  int addFrames;
-  int frameRateLimit1000;
-  int sendPatternGops;
-  int sendPattern[PATTERN_SIZE];
-} VideoFeedBackPara;
-
-
-
-/* audio channel commands and parameters */
-
-/* CmdINITaudio parameter of fixed structure of 3 integers and a AudioPara,
-   replys with CmdINITaudio followed by reply or CmdFAIL followed by a string */
-typedef struct
-{
-  int sn;
-  int version;
-  AudioParameter para;
-  int nameLength;
-  /* char audioFile[] */
-} INITaudioPara;
-
-typedef struct
-{
-  int live;
-  int format;
-  
-  AudioParameter para;
-  int totalSamples;
-} INITaudioReply;
-
-
-/* CmdPLAY parameter */
-typedef struct
-{
-  int sn;
-  int nextSample;
-#if 0
-  int samplesPerSecond; /* <= shared->audioPara.samplesPerSecond   */
-#endif
-  int samplesPerSecond; /* audio playback speed */
-  int samplesPerPacket; /* Number of samples in a packet */
-  int ABsamples; /* size of client VB buffer in samples */
-  int spslimit;  /* QoS parameter: sps supported by the audio channel */
-} PLAYaudioPara;
-
-/* STOP followed only by SN */
-
-/* CmdSPEED parameter */
-typedef struct
-{
-  int sn;
-  int samplesPerSecond;
-  int samplesPerPacket; /* Number of samples in a packet */
-  int spslimit;
-} SPEEDaudioPara;
-
-/* audio packet structure */
-typedef struct
-{
-  int cmdsn;
-  int resend;
-  int samplesPerSecond;
-  int firstSample;
-  int samples;
-  int actualSamples;
-  int dataBytes;
-} AudioPacket;
-
-typedef struct
-{
-  int firstSample;  /* Id of the first sample in this packet */
-  int samples;   /* number of samples in current packet */
-} APdescriptor; /* audio packet decriptor */
-
-/* audio feedback packet */
-typedef struct
-{
-  int cmdsn;
-  int type;   /* 0 - feedback command; >=1 - Number of packets to be resent */
-  union {
-    struct {
-      int addsps;
-      int addSamples;
-    } fb;
-    APdescriptor ap;
-  } data;
-} AudioFeedBackPara;
-/* One actual resent request may have multiple APdescriptors depending on
-   the value in element type, all execpt the first one follows above structure*/
-
-typedef struct {
-  int sh, gop, frame, display, future, past;
-  int refcount;				 /* reference count    */
-  unsigned char * data;                  /* data buffer for image */
-} FrameBlock;
-
-
-#endif /* _MPEG_COMMON_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp
deleted file mode 100644
index 40fa6f6ca4e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include <stdlib.h>
-#include <string.h>
-#include "video.h"
-#include "dither.h"
-#include "proto.h"
-
-/*
- * We'll define the "ConvertColor" macro here to do fixed point arithmetic
- * that'll convert from YCrCb to RGB using:
- *	R = L + 1.40200*Cr;
- *	G = L - 0.34414*Cb - 0.71414*Cr
- *	B = L + 1.77200*Cb;
- *
- * We'll use fixed point by adding two extra bits after the decimal.
- */
-
-#define BITS	8
-#define ONE     ((int) 1)
-#define CONST_SCALE	(ONE << BITS)
-#define ROUND_FACTOR	(ONE << (BITS-1))
-
-/* Macro to convert integer to fixed. */
-#define UP(x)	(((int)(x)) << BITS)
-
-/* Macro to convert fixed to integer (with rounding). */
-#define DOWN(x)	(((x) + ROUND_FACTOR) >> BITS)
-
-/* Macro to convert a float to a fixed */
-#define FIX(x)  ((int) ((x)*CONST_SCALE + 0.5))
-
-#define CLAMP(ll,x,ul)	( ((x)<(ll)) ?(ll):( ((x)>(ul)) ?(ul):(x)))
-
-static int *Cb_r_tab, *Cr_g_tab, *Cb_g_tab, *Cr_b_tab;
-
-/*
- *--------------------------------------------------------------
- *
- * InitColorDither --
- *
- *	To get rid of the multiply and other conversions in color
- *	dither, we use a lookup table.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The lookup tables are initialized.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitColorDither()
-{
-    int CR, CB, i;
-
-    Cr_b_tab = (int *)malloc(256*sizeof(int));
-    Cr_g_tab = (int *)malloc(256*sizeof(int));
-    Cb_g_tab = (int *)malloc(256*sizeof(int));
-    Cb_r_tab = (int *)malloc(256*sizeof(int));
-
-    for (i=0; i<256; i++) {
-	CB = CR = i;
-
-	CB -= 128; CR -= 128;
-
-	Cb_r_tab[i] = FIX(1.40200) * CB;
-	Cr_g_tab[i] = -FIX(0.34414) * CR;
-	Cb_g_tab[i] = -FIX(0.71414) * CB;   
-	Cr_b_tab[i] = FIX(1.77200) * CR;
-    }
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ColorDitherImage --
- *
- *	Converts image into 24 bit color.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-void
-ColorDitherImage(unsigned char *lum, unsigned char *cr,
-		 unsigned char *cb, unsigned char *out,
-		 int rows, int cols)
-{
-    int L, CR, CB;
-    unsigned int *row1, *row2;
-    unsigned char *lum2;
-    int x, y;
-    unsigned int r, b, g;
-    int cb_r;
-    int cr_g;
-    int cb_g;
-    int cr_b;
-
-    row1 = (unsigned int *)out;
-    row2 = row1 + cols;
-    lum2 = lum + cols;
-    for (y=0; y<rows; y+=2) {
-	for (x=0; x<cols; x+=2) {
-	    int R, G, B;
-
-	    CR = *cr++;
-	    CB = *cb++;
-	    cb_r = Cb_r_tab[CB];
-	    cr_g = Cr_g_tab[CR];
-	    cb_g = Cb_g_tab[CB];
-	    cr_b = Cr_b_tab[CR];
-
-	    L = *lum++;
-	    L = UP(L);
-	    R = L + cb_r;
-	    G = L + cr_g + cb_g;
-	    B = L + cr_b;
-#ifndef LITTLE_ENDIAN
-	    r = CLAMP(0,R,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    b = (CLAMP(0,B,UP(255)) & 0xff00) << BITS;
-#else
-	    b = CLAMP(0,B,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    r = (CLAMP(0,R,UP(255)) & 0xff00) << BITS;
-#endif
-	    *row1++ = r | g | b;
-
-	    L = *lum++;
-	    L = UP(L);
-	    R = L + cb_r;
-	    G = L + cr_g + cb_g;
-	    B = L + cr_b;
-#ifndef LITTLE_ENDIAN
-	    r = CLAMP(0,R,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    b = (CLAMP(0,B,UP(255)) & 0xff00) << BITS;
-#else
-	    b = CLAMP(0,B,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    r = (CLAMP(0,R,UP(255)) & 0xff00) << BITS;
-#endif
-	    *row1++ = r | g | b;
-
-	    /*
-	     * Now, do second row.
-	     */
-	    L = *lum2++;
-	    L = UP(L);
-	    R = L + cb_r;
-	    G = L + cr_g + cb_g;
-	    B = L + cr_b;
-#ifndef LITTLE_ENDIAN
-	    r = CLAMP(0,R,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    b = (CLAMP(0,B,UP(255)) & 0xff00) << BITS;
-#else
-	    b = CLAMP(0,B,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    r = (CLAMP(0,R,UP(255)) & 0xff00) << BITS;
-#endif
-	    *row2++ = r | g | b;
-
-	    L = *lum2++;
-	    L = UP(L);
-	    R = L + cb_r;
-	    G = L + cr_g + cb_g;
-	    B = L + cr_b;
-#ifndef LITTLE_ENDIAN
-	    r = CLAMP(0,R,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    b = (CLAMP(0,B,UP(255)) & 0xff00) << BITS;
-#else
-	    b = CLAMP(0,B,UP(255)) >> BITS;
-	    g = CLAMP(0,G,UP(255)) & 0xff00;
-	    r = (CLAMP(0,R,UP(255)) & 0xff00) << BITS;
-#endif
-	    *row2++ = r | g | b;
-	}
-	lum += cols;
-	lum2 += cols;
-	row1 += cols;
-	row2 += cols;
-    }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp
deleted file mode 100644
index ba59df34e12..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include <string.h>
-#include <stdlib.h>
-#include "video.h"
-#include "dither.h"
-#include "proto.h"
-
-#define RAND_ERR_RANGE 7
-#define RAND_ERR_SUBVAL 3
-
-/* Array containing actual pixel values for each possible 2x2 dither pattern. */
-
-static unsigned char *dith_a;
-
-/* Arrays mapping lum, cr, and cb values to portions of dither pattern code. 
-   The addtion of one value from each array yields a valid dither pattern
-   code.
-*/
-
-static int lval_a[256+RAND_ERR_RANGE-1];
-static int rval_a[256+RAND_ERR_RANGE-1];
-static int bval_a[256+RAND_ERR_RANGE-1];
-
-/* Range of possible dither patterns in each channel. */
-
-#define L_DITH_RANGE (((LUM_RANGE-1)*4)+1)
-#define CR_DITH_RANGE (((CR_RANGE-1)*4)+1)
-#define CB_DITH_RANGE (((CB_RANGE-1)*4)+1)
-
-/* Arrays of random error terms added to break up contours. */
-
-static int *randval_a;
-static int **randptr_a;
-
-
-/*
- *--------------------------------------------------------------
- *
- *  Init2x2Dither--
- *
- *	Initializes structures used for 2x2 dithering.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-void
-Init2x2Dither()
-{  
-  unsigned char *dith_ca;
-  int numcodes;
-  int l_range, cr_range, cb_range;
-  int p1, p2, p3, p4;
-  int l_dith, cr_dith, cb_dith;
-  int big_part, small_part;
-  int i, j;
-
-  l_range = L_DITH_RANGE;
-  cr_range = CR_DITH_RANGE;
-  cb_range = CB_DITH_RANGE;
-
-  numcodes =  l_range * cr_range * cb_range;
-
-  dith_a = (unsigned char *) malloc(numcodes*4);
-
-  dith_ca =  dith_a;
-
-  for (i=0; i<numcodes; i++) {
-    l_dith = i  % l_range;
-
-    big_part = l_dith / 4;
-    small_part = l_dith % 4;
-
-    p1 = big_part + ((small_part > 0) ? 1 : 0);
-    p2 = big_part + ((small_part > 2) ? 1 : 0);
-    p3 = big_part;
-    p4 = big_part + ((small_part > 1) ? 1 : 0);
-
-    p1 *= CR_RANGE * CB_RANGE;
-    p2 *= CR_RANGE * CB_RANGE;
-    p3 *= CR_RANGE * CB_RANGE;
-    p4 *= CR_RANGE * CB_RANGE;
-
-    cr_dith = (i/l_range) % cr_range;
-
-    big_part = cr_dith / 4;
-    small_part = cr_dith % 4;
-
-    p1 += (big_part + ((small_part > 0) ? 1 : 0))*CB_RANGE;
-    p2 += (big_part + ((small_part > 2) ? 1 : 0))*CB_RANGE;
-    p3 += (big_part)*CB_RANGE;
-    p4 += (big_part + ((small_part > 1) ? 1 : 0))*CB_RANGE;
-
-    cb_dith = (i/(cr_range*l_range)) % cb_range;
-
-    big_part = cb_dith / 4;
-    small_part = cb_dith % 4;
-
-    p1 += (big_part + ((small_part > 0) ? 1 : 0));
-    p2 += (big_part + ((small_part > 2) ? 1 : 0));
-    p3 += (big_part);
-    p4 += (big_part + ((small_part > 1) ? 1 : 0));
-
-    *dith_ca++ = p1;
-    *dith_ca++ = p2;
-    *dith_ca++ = p3;
-    *dith_ca++ = p4;
-  }
-
-  for (i=RAND_ERR_SUBVAL; i<256+RAND_ERR_SUBVAL; i++) {
-    j = i-RAND_ERR_SUBVAL;
-    lval_a[i] = (j * L_DITH_RANGE)/256;
-    rval_a[i] = (j * CR_DITH_RANGE)/256;
-    bval_a[i] = (j * CB_DITH_RANGE)/256;
-
-    bval_a[i] *= CR_DITH_RANGE * L_DITH_RANGE * 4;
-    rval_a[i] *= L_DITH_RANGE * 4;
-    lval_a[i] *= 4;
-  }
-
-  for (i=0; i<RAND_ERR_SUBVAL; i++) {
-    lval_a[i] = lval_a[RAND_ERR_SUBVAL];
-    rval_a[i] = rval_a[RAND_ERR_SUBVAL];
-    bval_a[i] = bval_a[RAND_ERR_SUBVAL];
-  }
-
-   for(i=256+RAND_ERR_SUBVAL; i<256+RAND_ERR_RANGE-1; i++) {
-     lval_a[i] = lval_a[255+RAND_ERR_SUBVAL];
-     rval_a[i] = rval_a[255+RAND_ERR_SUBVAL];
-     bval_a[i] = bval_a[255+RAND_ERR_SUBVAL];
-   }
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * RandInit --
- *
- *	Initializes the random values used for 2x2 dithering.
- *
- * Results:
- *	randval_a filled with random values.
- *      randptr_a filled with random pointers to random value arrays.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void RandInit(int h, int w)
-{
-  int i;
-
-  randval_a = (int *) malloc(w*5*sizeof(int));
-  randptr_a = (int **) malloc(h*sizeof(int *));
-
-#ifdef NO_LRAND48
-  for (i=0; i<w*5; i++) {
-    long int random();
-
-    randval_a[i] = random() % RAND_ERR_RANGE;
-  }
-
-  for (i=0; i<h; i++) {
-    long int random();
-
-    randptr_a[i] = randval_a + (random() % (w*2));
-  }
-#else /* NO_LRAND48 */
-
-  for (i=0; i<w*5; i++) {
-    
-    randval_a[i] = lrand48() % RAND_ERR_RANGE;
-  }
-  
-  for (i=0; i<h; i++) {
-
-    randptr_a[i] = randval_a + (lrand48() % (w*2));
-  }
-#endif
-  
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- *  PostInit2x2Dither--
- *
- *	Remaps color numbers in dither patterns to actual pixel
- *      values allocated by the X server.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-PostInit2x2Dither() 
-{
-  unsigned char *dith_ca;
-  int i;
-
-  dith_ca = dith_a;
-
-  for (i=0; i < (L_DITH_RANGE * CR_DITH_RANGE * CB_DITH_RANGE); i++) {
-    
-    *dith_ca = pixel[*dith_ca];
-    dith_ca++;
-    *dith_ca = pixel[*dith_ca];
-    dith_ca++;
-    *dith_ca = pixel[*dith_ca];
-    dith_ca++;
-    *dith_ca = pixel[*dith_ca];
-    dith_ca++;
-  }
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * Twox2DitherImage --
- *
- *	Dithers lum, cr, and cb channels togethor using predefined
- *      and computed 2x2 dither patterns. Each possible combination of
- *      lum, cr, and cb values combines to point to a particular dither
- *      pattern (2x2) which is used to represent the pixel. This assumes
- *      That the display plane is 4 times larger than the lumianance 
- *      plane. 
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void 
-Twox2DitherImage(unsigned char *lum, unsigned char *cr,
-		 unsigned char *cb, unsigned char *out,
-		 int h, int w)
-{
-  int i, j;
-  unsigned short *o1, *o2, *o3, *o4;
-  unsigned char *l1, *l2, *base;
-  unsigned char B, R;
-  unsigned short *dith_ca;
-  int big_adv = 3*w;
-  int b_val, r_val, l_val;
-  int *randvalptr;
-  int randval;
-  static int first = 1;
-
-  if (first) {
-    RandInit(h, w);
-    first = 0;
-  }
-
-  o1 = (unsigned short *)out;
-  o2 = (unsigned short *)(out+(2*w));
-  o3 = (unsigned short *)(out+(4*w));
-  o4 = (unsigned short *)(out+(6*w));
-  l1 = lum;
-  l2 = lum+w;
-
-  for (i=0; i<h; i+=2) {
-    for(j=0; j<w; j+= 4) {
- 
-      B = cb[0];
-      b_val = bval_a[B];
-      R = cr[0];
-      r_val = rval_a[R];
-      base = dith_a + b_val + r_val;
-
-      l_val = lval_a[l1[0]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o1[0] = dith_ca[0];
-      o2[0] = dith_ca[1];
-
-      l_val = lval_a[l1[1]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o1[1] = dith_ca[0];
-      o2[1] = dith_ca[1];
-
-      l_val = lval_a[l2[0]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o3[0] = dith_ca[0];
-      o4[0] = dith_ca[1];
-
-      l_val = lval_a[l2[1]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o3[1] = dith_ca[0];
-      o4[1] = dith_ca[1];
-
-      B = cb[1];
-      b_val = bval_a[B];
-      R = cr[1];
-      r_val = rval_a[R];
-      base = dith_a + b_val + r_val;
-
-      l_val = lval_a[l1[2]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o1[2] = dith_ca[0];
-      o2[2] = dith_ca[1];
-
-      l_val = lval_a[l1[3]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o1[3] = dith_ca[0];
-      o2[3] = dith_ca[1];
-
-      l_val = lval_a[l2[2]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o3[2] = dith_ca[0];
-      o4[2] = dith_ca[1];
-
-      l_val = lval_a[l2[3]];
-      dith_ca = (unsigned short *)(base + l_val);
-      o3[3] = dith_ca[0];
-      o4[3] = dith_ca[1];
-
-      o1 += 4;
-      o2 += 4;
-      o3 += 4;
-      o4 += 4;
-      l1 += 4;
-      l2 += 4;
-      cb += 2;
-      cr += 2;
-    }    
-
-    l1 += w;
-    l2 += w;
-    o1 += big_adv;
-    o2 += big_adv;
-    o3 += big_adv;
-    o4 += big_adv;
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
deleted file mode 100644
index a66e8a76c03..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
+++ /dev/null
@@ -1,1516 +0,0 @@
-// $Id$
-
-#include "Command_Handler.h"
-
-// %% yikes!!!
-#include "ctr.cpp"
-
-const char *TAO_AV_ORB_ARGUMENTS = "-ORBobjrefstyle URL";
-
-Command_Handler::Command_Handler (ACE_HANDLE command_handle)
-  : command_handle_ (command_handle),
-    orb_manager_ (0)
-{
-}
-
-Command_Handler::~Command_Handler (void)
-{
-  ACE_Reactor::instance ()->remove_handler (this,
-                                            ACE_Event_Handler::READ_MASK);
-}
-
-int
-Command_Handler::init (void)
-{
-  ACE_ARGV orb_args (TAO_AV_ORB_ARGUMENTS);
-  int argc = orb_args.argc ();
-
-  ACE_NEW_RETURN (this->orb_manager_,
-                  TAO_ORB_Manager,
-                  -1);
-
-  TAO_TRY
-    {
-      this->orb_manager_->init (argc,
-                                orb_args.argv (),
-                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Command_Handler::init");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-Command_Handler::resolve_server_reference (void)
-{
-  TAO_TRY
-    {
-      CORBA::Object_var naming_obj =
-        this->orb_manager_->orb ()->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the Name Service.\n"),
-                          -1);
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CosNaming::Name Video_Control_name (1);
-
-      Video_Control_name.length (1);
-      Video_Control_name [0].id = CORBA::string_dup ("Video_Control");
-      CORBA::Object_var Video_Control_obj =
-        naming_context->resolve (Video_Control_name,
-                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->video_control_ =
-        Video_Control::_narrow (Video_Control_obj.in (),
-                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->video_control_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Video_Control in Naming service <%s>\n"),
-                          -1);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Command_Handler::resolve_server_reference");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-
-ACE_HANDLE
-Command_Handler::get_handle (void) const
-{
-  return this->command_handle_;
-}
-
-
-// handle the command sent to us by the GUI process 
-// this is a reactor callback method
-int
-Command_Handler::handle_input (ACE_HANDLE fd)
-{
-
-  unsigned char cmd;
-  int val;
-  val = OurCmdRead ((char*)&cmd, 1);
-  ::TimerProcessing ();
-
-  // if we get an interrupt while reading we go back to the event loop    
-  if (val == 1)
-    return 0;
-
-  FILE * fp = NULL;   /* file pointer for experiment plan */
-  usr1_flag = 0;
-    
-    //    fprintf(stderr, "CTR: cmd received - %d\n", cmd);
-  TAO_TRY
-    {
-      switch (cmd)
-        {
-        case CmdINIT:
-          this->init_video ();
-          // automatic experiment code zapped :-)
-          fp = NULL;
-          break;
-        case CmdSTOP:
-          this->stop();
-          break;
-        case CmdFF:
-          this->fast_forward ();
-          break;
-        case CmdFB:
-          this->fast_backward ();
-          break;
-        case CmdSTEP:
-          this->step ();
-          break;
-        case CmdPLAY:
-          // automatic experiment code zapped :-)
-          this->play (fp != NULL,
-                      TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-          break;
-        case CmdPOSITION:
-          this->position ();
-          break;
-        case CmdPOSITIONrelease:
-          this->position_release ();
-          break;
-        case CmdVOLUME:
-          this->volume ();
-          break;
-        case CmdBALANCE:
-          this->balance ();
-          break;
-        case CmdSPEED:
-          this->speed ();
-          break;
-        case CmdLOOPenable:
-          {
-            shared->loopBack = 1;
-            break;
-          }
-        case CmdLOOPdisable:
-          {
-            shared->loopBack = 0;
-            break;
-          }
-        default:
-          fprintf(stderr, "CTR: unexpected command from UI: cmd = %d.\n", cmd);
-          exit(1);
-          break;
-        }
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Command_Handler::handle_input ()");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean 
-Command_Handler::init_video (void)
-{
-
-  //  :: init ();
-  //  return 0;
-
-  int i, j;
-
-  /* try to stop and close previous playing */
-  if (audioSocket >= 0 || videoSocket >= 0)
-    {
-      unsigned char tmp = CmdCLOSE;
-      int result = 
-        this->stop_playing();
-      if (result < 0)
-        return result;
-    
-      if (audioSocket >= 0)
-        {
-          if (ABpid > 0) {
-            kill(ABpid, SIGUSR1);
-            ABpid = -1;
-          }
-          usleep(10000);
-          AudioWrite(&tmp, 1);
-          ComCloseConn(audioSocket);
-          audioSocket = -1;
-        }
-    
-      if (videoSocket >= 0)
-        {
-          if (VBpid > 0) {
-            kill(VBpid, SIGUSR1);
-            VBpid = -1;
-          }
-          usleep(10000);
-          this->close ();
-          ComCloseConn(videoSocket);
-          videoSocket = -1;
-          while ((!VBbufEmpty()) || !VDbufEmpty()) {
-            while (VDpeekMsg() != NULL) {
-              VDreclaimMsg(VDgetMsg());
-            }
-            usleep(10000);
-          }
-          usleep(10000);
-        }
-    }
-
-  /* read in video/audio files */
-  NewCmd(CmdINIT);
-  CmdRead((char*)&i, 4);
-  CmdRead(vh, i);
-  vh[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(vf, i);
-  vf[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(ah, i);
-  ah[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(af, i);
-  af[i] = 0;
-  /*
-    fprintf(stderr, "INIT: vh-%s, vf-%s, ah-%s, af-%s\n", vh, vf, ah, af);
-  */
-
-  shared->live = 0;
-  shared->audioMaxPktSize = !shared->config.audioConn;
-  shared->videoMaxPktSize = !shared->config.videoConn;
-  
-  if (af[0] != 0)
-    {
-      if (InitAudioChannel(ah, af))
-        {
-          audioSocket = -1;
-          shared->totalSamples = 0;
-        }
-      else
-        {      
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) Initialized audio\n"));
-          shared->nextSample = 0;
-          if (shared->config.maxSPS < shared->audioPara.samplesPerSecond)
-            shared->config.maxSPS < shared->audioPara.samplesPerSecond;
-        }
-    }
-  else
-    {
-      shared->totalSamples = 0;
-      audioSocket = -1;
-    }
-  if (vf[0] != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t) Initializing video\n"));
-      if (this->init_video_channel(vh, vf))
-        {
-          shared->totalFrames = 0;      /* disable video channel */
-          videoSocket = -1;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s %d\n",
-                      __FILE__,__LINE__));
-          shared->nextFrame = 1;
-          shared->nextGroup = 0;
-          shared->currentFrame = shared->currentGroup = shared->currentDisplay = 0;
-          if (shared->config.maxFPS < shared->framesPerSecond)
-            shared->config.maxFPS = shared->framesPerSecond;
-        }
-    }
-  else
-    {
-      videoSocket = -1;
-      shared->totalFrames = 0;  /* disable video channel */
-    }
-  if (audioSocket < 0 && videoSocket < 0)  /* none of video/audio channels is setup */
-    {
-      unsigned char tmp = CmdFAIL;
-      CmdWrite(&tmp, 1);
-      /*
-        fprintf(stderr, "CTR initialization failed.\n");
-      */
-      return 0;
-    }
-  else
-    {
-      unsigned char tmp = CmdDONE;
-      set_speed();
-      if (videoSocket >= 0)
-        wait_display();
-      CmdWrite(&tmp, 1);
-      if (videoSocket < 0)
-        {
-          tmp = CmdVPclearScreen;
-          CmdWrite(&tmp, 1);
-        }
-      return 0;
-    }
-  return 0;
-}
-
-int
-Command_Handler::init_video_channel (char *phostname, char *videofile)
-{  
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-  int dataSocket = -1;
-
-  //  if (ComOpenConnPair(phostname, &videoSocket,
-  //                      &dataSocket, &shared->videoMaxPktSize) == -1) {
-  //    return -1;
-  // }
-  if (this->connect_to_server (phostname,
-                               &videoSocket,
-                               &dataSocket,
-                               &shared->videoMaxPktSize) == -1)
-    return -1;
-
-
-  /* Initialize with VS */
-  {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-    Video_Control::INITvideoPara_var  para (new
-                                            Video_Control::INITvideoPara);
-    Video_Control::INITvideoReply *reply_ptr = 0;
-    Video_Control::INITvideoReply_out reply (reply_ptr);
-
-    para->sn = shared->cmdsn;
-    para->version = VERSION;
-    para->videofile.length (strlen(videofile));
-
-    // string to sequence <char>    
-    for (int i=0;i<para->videofile.length ();i++)
-      para->videofile [i] = videofile [i];
-
-    // CORBA call
-    TAO_TRY
-      {
-        CORBA::Boolean result;
-        result = this->video_control_->init_video (para.in (),
-                                                   reply,
-                                                   TAO_TRY_ENV);
-        TAO_CHECK_ENV;
-        if (result == (CORBA::B_FALSE))
-          return -1;
-        else
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) init_video success \n"));
-      }
-    TAO_CATCHANY
-      {
-        TAO_TRY_ENV.print_exception ("video_control_->init_video (..)");
-        return -1;
-      }
-    TAO_ENDTRY;
-    shared->live += reply->live;
-    shared->videoFormat = reply->format;
-    shared->totalHeaders = reply->totalHeaders;
-    shared->totalFrames = reply->totalFrames;
-    shared->totalGroups = reply->totalGroups;
-    shared->averageFrameSize = reply->averageFrameSize;
-    shared->horizontalSize = reply->horizontalSize;
-    shared->verticalSize = reply->verticalSize;
-    shared->pelAspectRatio = reply->pelAspectRatio;
-    shared->pictureRate = ((double)reply->pictureRate1000) / 1000.0;
-    shared->vbvBufferSize = reply->vbvBufferSize;
-    shared->firstGopFrames = reply->firstGopFrames;
-    shared->patternSize = reply->pattern.length ();
-    if (shared->patternSize == 0) {
-	
-      Fprintf(stderr, "CTR warning: patternsize %d\n", shared->patternSize);
-	
-      shared->patternSize = 1;
-      shared->pattern[0]  = 'I';
-      shared->pattern[1] = 0;
-      shared->IframeGap = 1;
-    }
-    else if (shared->patternSize < PATTERN_SIZE)
-      {
-        int i;
-        char * ptr = shared->pattern + shared->patternSize;
-        //       strncpy(shared->pattern, reply->pattern, shared->patternSize);
-        for (i=0;i<shared->patternSize;i++)
-          shared->pattern[i] = reply->pattern [i];
-        for (i = 1; i < PATTERN_SIZE / shared->patternSize; i ++) {
-          //         memcpy(ptr, shared->pattern, shared->patternSize);
-          for (int j=0; j < shared->patternSize ;j++)
-            ptr [j] = shared->pattern [j];
-          ptr += shared->patternSize;
-        }
-        shared->IframeGap = 1;
-        while (shared->IframeGap < shared->patternSize)
-          {
-            if (shared->pattern[shared->IframeGap] == 'I')
-              break;
-            else
-              shared->IframeGap ++;
-          }
-      }
-    else
-      {
-        fprintf(stderr, "CTR Error: patternSize %d greater than PATTERN_SIZE %d.\n",
-                shared->patternSize, PATTERN_SIZE);
-        exit(1);
-      }
-    fprintf(stderr, "Video: %s, %s\n",
-            shared->videoFormat == VIDEO_SIF ? "SIF" :
-            shared->videoFormat == VIDEO_JPEG ? "JPEG" :
-            shared->videoFormat == VIDEO_MPEG1 ? "MPEG1" :
-            shared->videoFormat == VIDEO_MPEG2 ? "MPEG2" : "UNKOWN format",
-            reply->live ? "live source" : "stored source");
-	      
-    fprintf(stderr, "Video: numS-%d, numG-%d, numF-%d, aveFrameSize-%d\n",
-            reply->totalHeaders, reply->totalGroups, reply->totalFrames,
-            reply->averageFrameSize);
-    fprintf(stderr, "Video: maxS-%d, maxG-%d, maxI-%d, maxP-%d, maxB-%d\n",
-            reply->sizeSystemHeader, reply->sizeGop,
-            reply->sizeIFrame, reply->sizePFrame, reply->sizeBFrame);
-    fprintf(stderr,
-            "Video: SHinfo: hsize-%d, vsize-%d, pelAspect-%d, rate-%f, vbv-%d.\n",
-            reply->horizontalSize, reply->verticalSize, reply->pelAspectRatio,
-            shared->pictureRate, reply->vbvBufferSize);
-    shared->pattern[shared->patternSize] = 0;
-    fprintf(stderr, "Video: firstGopFrames %d, IframeGap %d\n",
-            reply->firstGopFrames,  shared->IframeGap);
-    shared->pattern[shared->patternSize] = 'I';
-    if (reply->totalFrames > MAX_FRAMES && (!shared->live))
-      {
-        fprintf(stderr,
-                "Error: totalFrames %d > MAX_FRAMES %d, needs change and recompile.\n",
-                reply->totalFrames, MAX_FRAMES);
-        ComCloseConn(dataSocket);
-        ComCloseConn(videoSocket);
-        videoSocket = -1;
-        return -1;
-      }
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-  
-    /* create VB, and put INIT frame to VB*/
-    {
-      int sp[2];  /* sp[0] is for CTR and sp[1] is for VB */
-      
-      /* create command socket pair for sending INIT frame to VB, the pipe
-         should be discard/non-discard in consistent with videoSocket*/
-      if (socketpair(AF_UNIX,
-                     shared->videoMaxPktSize >= 0 ? SOCK_STREAM :
-                     SOCK_DGRAM, 0, sp) == -1)
-        {
-          perror("CTR error on open CTR-VB socketpair");
-          exit(1);
-        }
-      
-      switch (VBpid = fork())
-        {
-        case -1:
-          perror("CTR error on forking VB process");
-          exit(1);
-          break;
-        case 0:
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-          if (realTimeFlag) {
-            SetRTpriority("VB", -1);
-          }
-          free(vh);
-          free(videofile);
-          free(ah);
-          free(af);
-          ::close(sp[0]);
-          //        ::close (videoSocket);
-          if (audioSocket >= 0)
-            ComCloseFd(audioSocket);
-          ABdeleteBuf();
-          VDdeleteBuf();
-          if (cmdSocket >= 0)
-            ::close(cmdSocket);
-          if (realTimeFlag >= 2) {
-#ifdef __svr4__
-            if (SetRTpriority("VB", 0)) realTimeFlag = 0;
-#elif defined(_HPUX_SOURCE)
-            if (SetRTpriority("VB", 1)) realTimeFlag = 0;
-#endif
-          }
-          VBprocess(sp[1], dataSocket);
-          break;
-        default:
-          ::close(sp[1]);
-          //          ::close(dataSocket);
-          {
-            int bytes, res;
-            /* passing all messages of INIT frame to VB here. */
-            char * buf = (char *)malloc(INET_SOCKET_BUFFER_SIZE);
-            VideoMessage *msg = (VideoMessage *)buf;
-            int pkts = 1, msgo = 0, msgs = 0;
-	  
-            if (buf == NULL) {
-              perror("CTR error on malloc() for INIT frame");
-              exit(1);
-            }
-            while (msgo + msgs < pkts) {
-              ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-              cerr << "expecting a packet of size " << sizeof (*msg)
-                   << endl;
-              VideoRead(buf, sizeof(*msg));
-              //~~ we need to read the first frame from the 
-              //  data socket instead of control socket.
-              //              SocketRecv(dataSocket, buf, size);
-              pkts = ntohl(msg->packetSize);
-              msgo = ntohl(msg->msgOffset);
-              msgs = ntohl(msg->msgSize);
-              if (shared->videoMaxPktSize >= 0) {  /* non-discard mode */
-                ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
-                write_bytes(sp[0], buf, sizeof(*msg));
-                bytes = msgs;
-                while (bytes > 0) {
-                  int size = min(bytes, INET_SOCKET_BUFFER_SIZE);
-                  VideoRead(buf, size);
-                  write_bytes(sp[0], buf, size);
-                  bytes -= size;
-                }
-              }
-              else {
-                cerr << "expecting a packet of size " << msgs
-                     << endl;
-                VideoRead(buf + sizeof(*msg), msgs);
-                bytes = sizeof(*msg) + msgs;
-                while ((res = write(sp[0], buf, bytes)) == -1) {
-                  if (errno == EINTR || errno == ENOBUFS) continue;
-                  perror("CTR error on sending INIT frame to VB");
-                  exit(1);
-                }
-                if (res < bytes) {
-                  fprintf(stderr, "CTR warn: send() res %dB < bytes %dB\n", res, bytes);
-                }
-                /*
-                  Fprintf(stderr,
-                  "CTR transferred INIT frame to VB: pkts %d, msgo %d, msgs %d\n",
-                  pkts, msgo, msgs);
-                */
-              }
-            }
-            read(sp[0], buf, 1); /* read a garbage byte, to sync with VB */
-            ::close(sp[0]);
-            free(buf);
-          }
-          break;
-        }
-    }
-  }
-  return 0;
-}
-
-CORBA::Boolean 
-Command_Handler::stat_stream (CORBA::Char_out ch,
-                              CORBA::Long_out size)
-{
-  return 0;
-}
-
-
-CORBA::Boolean 
-Command_Handler::close (void)
-{
-  if (this->video_control_.in () == 0)
-    return CORBA::B_TRUE;
-  TAO_TRY
-    {
-      CORBA::Boolean result;
-      result = this->video_control_->close (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      if (result == (CORBA::B_FALSE))
-        return CORBA::B_FALSE;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t) close done \n"));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("video_control_->close (..)");
-      return CORBA::B_FALSE;
-    }
-  TAO_ENDTRY;
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Command_Handler::stat_sent (void)
-{
-  return 0;
-}
-
-
-CORBA::Boolean 
-Command_Handler::fast_forward (void)
-                               
-{
-  //  ::ff ();
-   // CORBA call
-  unsigned char tmp;
-  Video_Control::FFpara_var para (new Video_Control::FFpara);
-  /*
-  fprintf(stderr, "CTR: FF . . .\n");
-  */
-  if (shared->live) {
-    beep();
-  }
-  else {
-    this->stop_playing ();
-    if (shared->nextGroup < 0)
-      shared->nextGroup = 0;
-    if (videoSocket >= 0 && shared->nextGroup < shared->totalGroups)
-      {
-        NewCmd(CmdFF);
-        shared->needHeader = 0;
-        shared->framesPerSecond = shared->config.ffFPS /
-          shared->patternSize;
-        shared->usecPerFrame = (int)(1000000.0 / (float)shared->config.ffFPS) *
-          shared->patternSize;
-        
-        shared->VStimeAdvance =
-	  max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-        if (shared->VStimeAdvance < shared->usecPerFrame)
-          shared->VStimeAdvance = shared->usecPerFrame;
-        
-        para->VStimeAdvance = shared->VStimeAdvance;
-        para->sn = shared->cmdsn;
-        para->nextGroup = shared->nextGroup;
-        para->usecPerFrame = shared->usecPerFrame;
-        para->framesPerSecond = shared->framesPerSecond;
-        startTime = get_usec();
-        TAO_TRY
-          {
-            CORBA::Boolean result;
-            result = this->video_control_->fast_forward (para.in (),
-                                                         TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-            if (result == (CORBA::B_FALSE))
-              return CORBA::B_FALSE;
-            ACE_DEBUG ((LM_DEBUG,"(%P|%t) fast_forward done \n"));
-          }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("video_control_->fast_forward_video (..)");
-            return CORBA::B_FALSE;
-          }
-        TAO_ENDTRY;
-        start_timer();
-      }
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Command_Handler::fast_backward (void)
-                                
-{
-  //  ::fb ();
-  //  return 0;
-  unsigned char tmp;
-  Video_Control::FBpara_var para (new Video_Control::FBpara);
-  /*
-  fprintf(stderr, "CTR: FB . . .\n");
-  */
-  if (shared->live) {
-    beep();
-  }
-  else {
-    this->stop_playing();
-    if (shared->nextGroup >= shared->totalGroups)
-      shared->nextGroup = shared->totalGroups - 1;
-    if (videoSocket >= 0 && shared->nextGroup >= 0)
-    {
-      NewCmd(CmdFB);
-      shared->needHeader = 0;
-      shared->framesPerSecond = shared->config.fbFPS /
-			     shared->patternSize;
-      shared->usecPerFrame = (int)(1000000.0 / (float)shared->config.fbFPS) *
-			     shared->patternSize;
-
-      shared->VStimeAdvance =
-	  max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-      if (shared->VStimeAdvance < shared->usecPerFrame)
-	shared->VStimeAdvance = shared->usecPerFrame;
-
-      para->VStimeAdvance = shared->VStimeAdvance;
-      para->sn = shared->cmdsn;
-      para->nextGroup = shared->nextGroup;
-      para->usecPerFrame = shared->usecPerFrame;
-      para->framesPerSecond = shared->framesPerSecond;
-      startTime = get_usec();
-        TAO_TRY
-          {
-            CORBA::Boolean result;
-            result = this->video_control_->fast_backward (para.in (),
-                                                          TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-            if (result == (CORBA::B_FALSE))
-              return CORBA::B_FALSE;
-            ACE_DEBUG ((LM_DEBUG,"(%P|%t) fast_backward done \n"));
-          }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("video_control_->fast_forward_video (..)");
-            return CORBA::B_FALSE;
-          }
-        TAO_ENDTRY;
-
-        start_timer();
-    }
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Command_Handler::step (void)
-                       
-{
-  //  ::step ();
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Command_Handler::step ()\n"));
-  Video_Control::STEPpara_var para (new Video_Control::STEPpara);
-  this->stop_playing ();
-  NewCmd (CmdSTEP);
-  if (videoSocket >= 0 && shared->nextFrame <= shared->totalFrames)
-    { /* when shared->nextFrame == shared->totalFrame, it will force VS to send a ENDSEQ,
-         to let VD give out the remaining frame in its ring[] buffer */
-      para->sn = shared->cmdsn;
-      para->nextFrame = shared->nextFrame;
-      TAO_TRY
-        {
-          CORBA::Boolean result;
-          result = this->video_control_->step (para.in (),
-                                               TAO_TRY_ENV);
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) step done \n"));          
-          TAO_CHECK_ENV;
-          if (result == (CORBA::B_FALSE))
-            return CORBA::B_FALSE;
-          }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("video_control_->step (..)");
-            return CORBA::B_FALSE;
-          }
-        TAO_ENDTRY;
-     /*
-        fprintf(stderr, "CTR: STEP . . . frame-%d\n", para.nextFrame);
-    */
-    ::wait_display ();
-  }
-  unsigned char tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return CORBA::B_TRUE;
-}
-
-CORBA::Boolean
-Command_Handler::play (int auto_exp,
-                       CORBA::Environment& env)
-{
-  /*
-  ::play (auto_exp);
-  return 0;
-  */
-
-  CORBA::Long vts;
-  unsigned char tmp;
-  unsigned int  ats;
-  int cmdstarted = 0;
-  int stuffsamples = 0;
-  /*
- fprintf (stderr, "CTR: PLAY . . .\n");
- */
-  this->stop_playing ();
-
-  if (!shared->live && !shared->config.rt && videoSocket >= 0) {
-    /* rtplay turned off only when video avaible and not want RT play */
-    rtplay = 0;
-    fprintf (stderr, "VCR is not playing at in realtime mode, audio disabled\n");
-  }
-  else {
-    rtplay = 1;
-  }
- 
-  if (shared->live) {
-    rtplay = 1;
-    shared->nextFrame = 0;
-    shared->nextSample = 0;
-  }
-
-  shared->rtplay = rtplay;
- 
-  if (shared->nextFrame < 0)
-    shared->nextFrame = 0;
-  else if (shared->nextFrame >= shared->totalFrames)
-    shared->nextFrame = shared->totalFrames - 1;
-
-  if (audioSocket >= 0 && shared->nextSample < shared->totalSamples && rtplay)
-    {
-      PLAYaudioPara para;
-      if (cmdstarted == 0)
-        {
-          NewCmd (CmdPLAY);
-          if (!auto_exp) set_speed ();
-          cmdstarted = 1;
-        }
-
-      if (videoSocket >= 0 && rtplay && !shared->live) {
-        /* video channel also active, recompute nextSample */
-        shared->nextSample = (int) ( (double)shared->audioPara.samplesPerSecond *
-                                     ( (double)shared->nextFrame / shared->pictureRate));
-        shared->nextSample += shared->config.audioOffset;
-        if (shared->nextSample < 0) {
-          stuffsamples = (- shared->nextSample);
-          shared->nextSample = 0;
-        }
-        else if (shared->nextSample >= shared->totalSamples)
-          shared->nextSample = shared->totalSamples - 1;
-      }
-
-      ABflushBuf (shared->nextSample);
-  
-      para.sn = htonl (shared->cmdsn);
-      para.nextSample = htonl (shared->nextSample);
-      para.samplesPerSecond = htonl (shared->samplesPerSecond);
-      para.samplesPerPacket = htonl (1024 / shared->audioPara.bytesPerSample);
-      para.ABsamples = htonl (AB_BUF_SIZE / shared->audioPara.bytesPerSample);
-      para.spslimit = htonl (32000);
-  
-      startTime = get_usec ();
-      tmp = CmdPLAY;
-      AudioWrite (&tmp, 1);
-      AudioWrite (&para, sizeof (para));
-      read_int (audioSocket, (int *)&ats);
-    }
-
-  if (videoSocket >= 0 && shared->nextFrame < shared->totalFrames)
-    {
-      Video_Control::PLAYpara_var para (new Video_Control::PLAYpara);
-        
-      if (cmdstarted == 0)
-        {
-          NewCmd (CmdPLAY);
-          if (!auto_exp) set_speed ();
-          cmdstarted = 1;
-        }
-      shared->VBheadFrame = -1;
-      shared->needHeader = 0;
-      {
-        int i = shared->config.maxSPframes;
-        i = (int) ( (double)i * (1000000.0 / (double)shared->usecPerFrame) /
-                    shared->pictureRate);
-        shared->sendPatternGops = max (min (i, PATTERN_SIZE) / shared->patternSize, 1);
-      }
-      cmdstarted = 1;
-#ifdef STAT
-      shared->collectStat = (shared->config.collectStat && (!shared->live));
-      if (shared->collectStat)
-        {
-          int i;
-          memset (& (shared->stat), 0, sizeof (shared->stat));
-          shared->stat.VDlastFrameDecoded = (unsigned)-1;
-          for (i = 0; i < MAX_FRAMES; i++)
-            shared->stat.VBfillLevel[i] = SHRT_MIN;
-          speedPtr = 0;
-        }
-#endif
-      shared->VStimeAdvance =
-        max (shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-      if (shared->VStimeAdvance < shared->usecPerFrame)
-        shared->VStimeAdvance = shared->usecPerFrame;
-  
-      para->VStimeAdvance = shared->VStimeAdvance;
-      para->sn = shared->cmdsn;
-      para->nextFrame = shared->nextFrame;
-      para->usecPerFrame = shared->usecPerFrame;
-      para->framesPerSecond = shared->framesPerSecond;
-      para->collectStat = shared->collectStat;
-      frate = shared->config.frameRateLimit;
-      if (frate <= 0.0) {
-        frate = 1.0;
-      }
-      shared->frameRateLimit = frate;
-      para->frameRateLimit1000 =
-         (long) (shared->frameRateLimit * 1000.0);
-      compute_sendPattern ();
-      para->sendPatternGops = shared->sendPatternGops;
-      //      memcpy (para->sendPattern, shared->sendPattern, PATTERN_SIZE);
-      
-      // Sequence of chars
-
-      para->sendPattern.length (PATTERN_SIZE);
-
-      for (int i=0; i<PATTERN_SIZE ; i++)
-        para->sendPattern [i] = shared->sendPattern [i];
-             
-      startTime = get_usec ();
-      /*
-      tmp = CmdPLAY;
-      VideoWrite (&tmp, 1);
-      VideoWrite (&para, sizeof (para));
-      read_int (videoSocket, (int *)&vts);
-      */
-      // CORBA call
-      this->video_control_->play (para,
-                                  vts,
-                                  env);
-      
-      if (shared->config.qosEffective) {
-        /*
-          fprintf (stderr, "CTR start FeedBack with init frameRateLimit %lf\n",
-          frate);
-        */
-        maxfr = frate;  /* max frame rate all the time during one playback */
-        minupf = (int) (1000000.0 / maxfr); /* min usec-per-frame all the time
-                                               during one playback */
-        maxrate = (double)minupf / (double)max (shared->usecPerFrame, minupf);
-        /* this is current max frame rate in percentage against 'maxfr',
-           current max frame rate is the lower of 'maxfr' and play speed */
-        frate = 1.0; /* current sending frame rate, in percentage against 'maxfr'
-                        This value is set with init value as 1.0, so that if current
-                        speed is lower than frameRateLimit, no frames are dropped,
-                        then when play speed increases frame rate will increase
-                        accordingly until frames are dropped*/
-        adjstep = ( (double)minupf / (double)shared->usecPerFrame) /
-          (double)max (shared->patternSize * shared->sendPatternGops, 5);
-        /* adjust step for current play speed, in percentage against
-           'maxfr' */
-   
-        fbstate = 1;
-        fb_startup = 1;
-   
-        /*
-          fprintf (stderr, "CTR init frate: %lf minupf %d, shared->upf %d\n",
-          frate, minupf, shared->usecPerFrame);
-        */
-      }
-    }
- 
-  if (shared->live && (videoSocket >= 0) && (audioSocket >= 0)) {
-    int gap = get_duration (ats, vts);
-    if (gap < 0 || gap >= 5000000) {
-      Fprintf (stderr, "Error for live source: ats %u, vts %u, gap %d\n",
-               ats, vts, gap);
-    }
-    else {
-      int skipped = gap * shared->audioPara.samplesPerSecond / 1000000;
-      skipped += shared->config.audioOffset;
-      ABskipSamples (skipped);
-      Fprintf (stderr, "Live source: skipped %d audio samples\n", skipped);
-    }
-  }
-  else if (stuffsamples) {
-    ABskipSamples (-stuffsamples);
-  }
-  if (cmdstarted)
-    start_timer ();
-  tmp = CmdDONE;
-  CmdWrite (&tmp, 1);
-  return 0;
-}
-
-int
-Command_Handler::position_action (int operation_tag)
-{
-  int val;
-  unsigned char tmp = CmdDONE;
-  CmdRead ((char*)&val, 4);
-  if (shared->live) {
-    beep();
-  }
-  else {
-    shared->locationPosition = val;
-    this->stop_playing ();
-    NewCmd(CmdPOSITION);
-    if (videoSocket >= 0)
-    {
-      int gop = shared->nextGroup;
-      Video_Control::POSITIONpara_var para (new Video_Control::POSITIONpara);
-      shared->nextGroup = ((shared->totalGroups-1) * val) / POSITION_RANGE;
-      /*
-      fprintf(stderr, "CTR: POSITION%s %d (nextGop %d). . .\n",
-              operation_tag ? "_released" : "", val, shared->nextGroup);
-      */
-      if (gop != shared->nextGroup || operation_tag)
-      {
-        shared->nextFrame = ((shared->totalFrames-1) * val) / POSITION_RANGE;
-        para->sn = htonl(shared->cmdsn);
-        para->nextGroup = htonl(shared->nextGroup);
-        tmp = CmdPOSITION;
-        TAO_TRY
-          {
-            CORBA::Boolean result;
-            result = this->video_control_->position (para.in (),
-                                                     TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-            if (result == (CORBA::B_FALSE))
-              return -1;
-            ACE_DEBUG ((LM_DEBUG,"(%P|%t) position done \n"));
-          }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("video_control_->position (..)");
-            return -1;
-          }
-        TAO_ENDTRY;
-        if (operation_tag)  /* release or LOOPrewind */
-          wait_display();
-      }
-      if (operation_tag && audioSocket >= 0) /* needs to adjust audio position */
-      {
-        shared->nextSample = (int)((double)shared->audioPara.samplesPerSecond *
-                             ((double)shared->nextFrame / shared->pictureRate));
-      }
-    }
-    else if (audioSocket >= 0)
-      shared->nextSample  = (shared->totalSamples-1) * val / POSITION_RANGE;
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return 0;
-}
-
-int
-Command_Handler::position (void)
-                           
-{
-  return this->position_action (0);
-}
-
-int
-Command_Handler::position_release (void)
-                           
-{
-  return this->position_action (1);
-}
-
-int
-Command_Handler::volume (void)
-                           
-{
-  CmdRead((char *)&shared->volumePosition, 4);
-  if (audioSocket >= 0) {
-    SetAudioGain();
-  }
-  /*
-  unsigned char tmp = CmdDONE;
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  */
-  return 0;
-}
-
-int
-Command_Handler::balance (void)
-                           
-{
-  CmdRead((char *)&shared->balancePosition, 4);
-  /*
-  unsigned char tmp = CmdDONE;
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  */
-  return 0;
-}
-
-CORBA::Boolean 
-Command_Handler::speed (void)
-                        
-{
-  
-  //  ::speed ();
-  //  return 0;
-  
-  unsigned char tmp;
-  CmdRead((char *)&shared->speedPosition, 4);
-  set_speed();
-  if (!shared->live && shared->cmd == CmdPLAY)
-    {
-      if (videoSocket >= 0) {
-        Video_Control::SPEEDpara_var para (new Video_Control::SPEEDpara);
-        para->sn = shared->cmdsn;
-        para->usecPerFrame = shared->usecPerFrame;
-        para->framesPerSecond = shared->framesPerSecond;
-        para->frameRateLimit1000 =
-          (long)(shared->frameRateLimit * 1000.0);
-        {
-          int i = shared->config.maxSPframes;
-          i = (int) ((double)i * (1000000.0 / (double)shared->usecPerFrame) /
-                     shared->pictureRate);
-          shared->sendPatternGops = max(min(i, PATTERN_SIZE) / shared->patternSize, 1);
-        }
-        compute_sendPattern();
-        para->sendPatternGops = shared->sendPatternGops;
-        
-        //        memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
-        para->sendPattern.length (PATTERN_SIZE);
-        for (int i=0; i< PATTERN_SIZE ; i++)
-          para->sendPattern[i]=shared->sendPattern[i];
-        // CORBA call
-        TAO_TRY
-          {
-            CORBA::Boolean result =
-              this->video_control_->speed (para.in (),
-                                           TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) CORBA call returned %d\n",
-                        result));
-            if (result == (CORBA::B_FALSE))
-              // ~~ what about audio if video fails
-              // ~~ Eventually audio will have a separate audio command handler and 
-              // hence this shouldn't be a problem.
-              return -1;
-          }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("video_control->speed ()");
-            return -1;
-          }
-        TAO_ENDTRY;
-
-        if (fbstate) {
-          maxrate = (double)minupf / (double)max(shared->usecPerFrame, minupf);
-          adjstep = ((double)minupf / (double)shared->usecPerFrame) /
-	    (double)max(shared->patternSize * shared->sendPatternGops, 5);
-          fbstate = 1;
-        }
-      }
-      if (audioSocket >= 0) {
-        SPEEDaudioPara para;
-        para.sn = htonl(shared->cmdsn);
-        para.samplesPerSecond = htonl(shared->samplesPerSecond);
-        para.samplesPerPacket = htonl(1024 / shared->audioPara.bytesPerSample);
-        para.spslimit = htonl(32000);
-        tmp = CmdSPEED;
-        AudioWrite(&tmp, 1);
-        AudioWrite(&para, sizeof(para));
-      }
-    }
-  return 0;
-
-}
-
-
-CORBA::Boolean 
-Command_Handler::stop (void)
-                       
-{
-  /*
-  ::stop ();
-  return 0;
-  */
-#ifdef STAT
-  unsigned char preCmd = shared->cmd;
-#endif
-  /*
-    fprintf(stderr, "CTR: STOP . . .\n");
-  */
-  this->stop_playing ();
-
-  if (shared->live && videoSocket >= 0) {
-    Fprintf(stderr, "CTR live video stat: average disp frame rate: %5.2f fps\n",
-	    shared->pictureRate * displayedFrames / shared->nextFrame);
-  }
-  unsigned char tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-
-  return CORBA::B_TRUE;
-}
-
-int
-Command_Handler::stop_playing (void)
-{
-  unsigned char precmd = shared->cmd;
-  
-  if (precmd == CmdFF || precmd == CmdFB || precmd == CmdPLAY)
-    {
-      unsigned char tmp = CmdSTOP;
-      NewCmd(CmdSTOP);
-    
-      /* notify AS and/or VS */
-      if (audioSocket >= 0 && precmd == CmdPLAY && rtplay)
-        {
-          int cmdsn = htonl(shared->cmdsn);
-          AudioWrite(&tmp, 1);
-          AudioWrite(&cmdsn, 4);
-        }
-      if (videoSocket >= 0)
-        {
-          // CORBA call
-          TAO_TRY
-            {
-              CORBA::Boolean result =
-                this->video_control_->stop (shared->cmdsn,
-                                            TAO_TRY_ENV);
-              if (result == (CORBA::B_FALSE))
-                return -1;
-            }
-          TAO_CATCHANY
-            {
-              TAO_TRY_ENV.print_exception ("video_control_->stop(..)");
-              return -1;
-            }
-          TAO_ENDTRY;
-        }
-    
-      /* stop timer and sleep for a while */
-      stop_timer();
-      usleep(100000);
-
-      /* purge VDbuf and audio channel from AS*/
-      if (videoSocket >= 0)
-        {
-          while (VDpeekMsg() != NULL)
-            VDreclaimMsg(VDgetMsg());
-          /*
-            Fprintf(stderr, "CTR: VDbuf purged.\n");
-          */
-          fbstate = 0;
-      
-        }
-    
-      /* adjust some info */
-      if (precmd == CmdPLAY && videoSocket >= 0)
-        shared->nextFrame = shared->currentFrame+1;
-      else
-        shared->nextGroup = shared->currentGroup + 1;
-    }
-}
-
-// connects and handshakes with the server
-int
-Command_Handler::connect_to_server (char *address, 
-                                    int *ctr_fd, 
-                                    int *data_fd, 
-                                    int *max_pkt_size)
-{
-
-  // set the pointers to the correct values
-  *max_pkt_size = -INET_SOCKET_BUFFER_SIZE;
-
-  // construct the server addr
-  ACE_INET_Addr server_addr (VCR_TCP_PORT,
-                             address);
-
-  if (this->connector_.connect (this->stream_,
-                                server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Connection to server failed: %p\n",
-                       "connect"),
-                      -1);
-  // Write the CmdINITvideo to tell the server that this is a video
-  // client.
-  int tmp;
-  tmp = CmdINITvideo;
-  this->stream_.send_n (&tmp, sizeof (tmp));
-  int ack;
-  this->stream_.recv_n (&ack, sizeof (ack));
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) got ack :%d\n", 
-              ack));
-  
-  // initialize the command handler , ORB
-  if (this->resolve_server_reference () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) command_handler: resolve_server_reference returned -1"),
-                       -1);
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  // Resolve the video control object reference.
-//   int i = sizeof (sockaddr_in);
-//  struct sockaddr_in addressIn;
-//  if (::getsockname(*data_fd, 
-//                    (struct sockaddr *)&addressIn, 
-//                    &i) == -1) 
-//    ACE_ERROR_RETURN ((LM_ERROR, 
-//                       "(%P|%t) Command_Handler::connect_to_server"
-//                       " failed to getsocketname on TCP dfd:"),
-//                      -1);
-// 
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  CORBA::UShort server_port;
-  ACE_INET_Addr local_addr;
-  CORBA::String client_address_string;
-  TAO_TRY
-    {
-      ACE_NEW_RETURN (client_address_string,
-                      char [BUFSIZ],
-                      -1);
-      // Get the local UDP address
-      if (this->dgram_.open (ACE_Addr::sap_any) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)datagram open failed %p"),-1);
-
-      if (this->dgram_.get_local_addr (local_addr) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)datagram get local addr failed %p"),-1);
-      // form a string 
-      ::sprintf (client_address_string,
-                 "%s:%d",
-                 local_addr.get_host_name (),
-                 local_addr.get_port_number ());
-      
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Client string is %s\n",
-                  client_address_string));
-      
-      server_port = this->video_control_->set_peer (client_address_string,
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      if (server_port == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) set_peer failed\n"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t) set_peer done:server port =%d\n",server_port));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("video_control_->fast_forward_video (..)");
-      return CORBA::B_FALSE;
-    }
-  TAO_ENDTRY;
-
-  ACE_INET_Addr server_udp_addr (server_port,
-                                 address);
-
-  if (ACE_OS::connect (this->dgram_.get_handle (),(sockaddr *) server_udp_addr.get_addr (),
-                       server_udp_addr.get_size ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)datagram connect failed %p"),-1);
-  //  if (this->dgram_.open (server_udp_addr,
-  //                         local_addr) == -1)
-  //    ACE_ERROR_RETURN ((LM_ERROR,
-  //                       "(%P|%t) Command_Handler::connect_to_server:%p\n",
-  //                       "dgram.open "),
-  //                      -1);
-  
-//   this->dgram_.get_local_addr (local_addr);
-//   // form a string 
-//   ::sprintf (client_address_string,
-//              "%s:%d",
-//              local_addr.get_host_name (),
-//              local_addr.get_port_number ());
-  
-//   ACE_DEBUG ((LM_DEBUG,
-//               "(%P|%t) Client string is %s\n",
-//               client_address_string));
-  // set the pointers to the correct values
-
-  *ctr_fd = *data_fd = this->dgram_.get_handle ();
-  // set both the control and data socket the same UDP socket.
-  ACE_DEBUG ((LM_DEBUG,
-              "Control and data fd = %d\n",
-              *ctr_fd));
-  return 0;
-}
-
-// ----------------------------------------------------------------------
-
-// Client_Sig_Handler methods
-// handles the timeout SIGALRM signal
-Client_Sig_Handler::Client_Sig_Handler (Command_Handler *command_handler)
-  : command_handler_ (command_handler)
-{
-}
-
-Client_Sig_Handler::~Client_Sig_Handler (void)
-{
-  ACE_Reactor::instance ()->remove_handler (this,
-                                            ACE_Event_Handler::NULL_MASK);
-
-  ACE_Reactor::instance ()->remove_handler (this->sig_set);
-}
-
-int
-Client_Sig_Handler::register_handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (ACE_Reactor::instance ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "register_handler"),
-                      -1);
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-
-  this->sig_set.sig_add (SIGINT);
-  this->sig_set.sig_add (SIGQUIT);
-  this->sig_set.sig_add (SIGALRM);  
-  this->sig_set.sig_add (SIGUSR1);
-  this->sig_set.sig_add (SIGUSR2);  
-
-  // Register the signal handler object to catch the signals.
-  if (ACE_Reactor::instance ()->register_handler (sig_set, 
-                                                  this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "register_handler"),
-                      -1);
-  return 0;
-}
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Client_Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-int 
-Client_Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
-  return 0;
-}
-
-int 
-Client_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Client_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  int status;
-  pid_t pid;
-  //  ACE_DEBUG ((LM_DEBUG, "(%t) received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Handle the timeout
-      ::TimerHandler (signum);
-      // %% ??!!!
-      break;
-    case SIGUSR1:
-      usr1_handler (signum);
-      break;
-    case SIGUSR2:
-      default_usr2_handler (signum);
-      break;
-    case SIGCHLD:
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
-      pid = ACE_OS::wait (&status);
-      if (pid == UIpid)
-        {
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) UI process died, removing signal handlers from the reactor\n", signum));
-          this->command_handler_->close ();
-          ACE_Reactor::instance ()->remove_handler (this->sig_set);
-          ACE_Reactor::instance ()->end_event_loop ();
-        }
-      return 0;
-    case SIGINT:
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S, removing signal handlers from the reactor\n", signum));
-      this->command_handler_->close ();
-      ACE_Reactor::instance ()->remove_handler (this->sig_set);
-      ACE_Reactor::instance ()->end_event_loop ();
-      return 0;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-                  "(%t) %S: not handled, returning to program\n", 
-                  signum));
-      break;
-    }
-  TimerProcessing ();
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
deleted file mode 100644
index e8f2cefc39d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- C++ -*- */
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#if !defined (AV_COMMAND_HANDLER_H)
-#define AV_COMMAND_HANDLER_H
-
-#include "ace/Reactor.h"
-#include "ace/Event_Handler.h"
-#include "ace/ARGV.h"
-#include "tao/TAO.h"
-#include "mpeg_shared/Video_ControlC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "ace/SOCK_Dgram.h"
-#include "ace/SOCK_Connector.h"
-
-class Command_Handler 
-  : public virtual ACE_Event_Handler
-{
-  // = TITLE
-  //   Defines the event handler class for the client commands
-  //
-  // = DESCRIPTION
-  //   This class makes use of a UNIX socket, over which
-  //   it will receive commands from the GUI
-
-public:
-
-  Command_Handler (ACE_HANDLE command_handle);
-  // Construct this handler with a control (UNIX) handle
-
-  ~Command_Handler (void);
-  // Destructor
-
-  int init (void);
-  // initialize the ORB
-
-  int resolve_server_reference (void);
-  // Resolve the video control reference
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // Called when input events occur (e.g., connection or data).
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // Returns the handle used by the event_handler.
-  
-  CORBA::Boolean init_video (void);
-  
-  int init_video_channel (char *phostname,char *videofile);
-
-  CORBA::Boolean stat_stream (CORBA::Char_out ch,
-                              CORBA::Long_out size) ;
-  
-  CORBA::Boolean close (void) ;
-  
-  CORBA::Boolean stat_sent (void) ;
-  
-  CORBA::Boolean fast_forward (void);
-  
-  CORBA::Boolean fast_backward (void);
-  
-  CORBA::Boolean step (void);
-  
-  CORBA::Boolean play (int flag,
-                       CORBA::Environment& env);
-                      
-  int position_action (int operation_tag);
-
-  int position (void);
-  
-  int position_release (void);
-
-  int volume (void);
-
-  int balance (void);
-
-  CORBA::Boolean speed (void);
-  
-  CORBA::Boolean stop (void);
-
-  int stop_playing (void);
-
-  int connect_to_server (char *address,
-                         int *ctr_fd,
-                         int *data_fd,
-                         int *max_pkt_size);
-
-private:
-  ACE_SOCK_Dgram dgram_;
-  // UDP datagram on which to send/recv data
-  
-  ACE_SOCK_Stream stream_;
-  // TCP stream socket
-
-  ACE_SOCK_Connector connector_;
-
-  ACE_HANDLE command_handle_;
-  // The fd for the UNIX command socket
-
-  TAO_ORB_Manager *orb_manager_;
-  // the ORB manager
-
-  Video_Control_var video_control_;
-  // Video Control CORBA object
-};
-
-
-class Client_Sig_Handler 
-  : public virtual ACE_Event_Handler
-  // = TITLE
-  //   Defines the signal handler class for the client timer processing
-  //
-  // = DESCRIPTION
-  //     %%
-{
-public:
-  Client_Sig_Handler (Command_Handler *command_handler);
-  // We need the command handler to call close ()
-
-  ~Client_Sig_Handler (void);
-  // Destructor
-
-  virtual ACE_HANDLE get_handle (void) const;
-
-  int register_handler (void);
-  // this will register this sig_handler
-  // with the reactor for SIGCHLD,SIGTERM,SIGINT
-
-  virtual int shutdown (ACE_HANDLE, 
-                        ACE_Reactor_Mask);
-  // handles the reactor shutdown
-
-  virtual int handle_input (ACE_HANDLE);
-  // handle input on the dummy handle.
-
-  virtual int handle_signal (ACE_HANDLE signum,
-                             siginfo_t * = 0,
-                             ucontext_t* = 0);
-  // handles SIGALRM
-
-private:
-  ACE_HANDLE handle_;
-  // dummy handle for the sig handler.
-
-  ACE_Sig_Set sig_set;
-  // the signal set
-
-  Command_Handler *command_handler_;
-  // We need the command handler to call close ()
-
-};
-
-
-#endif /* AV_COMMAND_HANDLER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
deleted file mode 100644
index 88318d56c9b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
+++ /dev/null
@@ -1,514 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libmpeg_client
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES= 24bit            \
-       2x2              \
-       ab               \
-       audio            \
-       decoders         \
-       file             \
-       fs2              \
-       fs2fast          \
-       fs4              \
-       global           \
-       gray             \
-       hybrid           \
-       hybriderr        \
-       info             \
-       jrevdct          \
-       mb_ordered       \
-       mono             \
-       motionvector     \
-       ordered          \
-       ordered2         \
-       para             \
-       parseblock       \
-       prog             \
-       ui               \
-       util             \
-       util32           \
-       vb               \
-       vd               \
-       video            \
-       vp               \
-       Command_Handler
-
-MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
-CPPFLAGS += -I$(MPEG_ROOT) -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-##LIBS 	+= -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
-CPPFLAGS += -i -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/24bit.o .obj/24bit.so .shobj/24bit.o .shobj/24bit.so: 24bit.cpp video.h dither.h proto.h
-.obj/2x2.o .obj/2x2.so .shobj/2x2.o .shobj/2x2.so: 2x2.cpp video.h dither.h proto.h
-.obj/ab.o .obj/ab.so .shobj/ab.o .shobj/ab.so: ab.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
-.obj/audio.o .obj/audio.so .shobj/audio.o .shobj/audio.so: audio.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h
-.obj/decoders.o .obj/decoders.so .shobj/decoders.o .shobj/decoders.so: decoders.cpp decoders.h util.h video.h proto.h
-.obj/file.o .obj/file.so .shobj/file.o .shobj/file.so: file.cpp video.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h
-.obj/fs2.o .obj/fs2.so .shobj/fs2.o .shobj/fs2.so: fs2.cpp video.h dither.h fs2.h proto.h
-.obj/fs2fast.o .obj/fs2fast.so .shobj/fs2fast.o .shobj/fs2fast.so: fs2fast.cpp video.h proto.h dither.h
-.obj/fs4.o .obj/fs4.so .shobj/fs4.o .shobj/fs4.so: fs4.cpp fs4.h video.h proto.h dither.h
-.obj/global.o .obj/global.so .shobj/global.o .shobj/global.so: global.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/gray.o .obj/gray.so .shobj/gray.o .shobj/gray.so: gray.cpp video.h proto.h dither.h
-.obj/hybrid.o .obj/hybrid.so .shobj/hybrid.o .shobj/hybrid.so: hybrid.cpp video.h proto.h dither.h
-.obj/hybriderr.o .obj/hybriderr.so .shobj/hybriderr.o .shobj/hybriderr.so: hybriderr.cpp video.h proto.h dither.h
-.obj/info.o .obj/info.so .shobj/info.o .shobj/info.so: info.cpp
-.obj/jrevdct.o .obj/jrevdct.so .shobj/jrevdct.o .shobj/jrevdct.so: jrevdct.cpp video.h proto.h
-.obj/mb_ordered.o .obj/mb_ordered.so .shobj/mb_ordered.o .shobj/mb_ordered.so: mb_ordered.cpp video.h proto.h dither.h
-.obj/mono.o .obj/mono.so .shobj/mono.o .shobj/mono.so: mono.cpp video.h proto.h dither.h
-.obj/motionvector.o .obj/motionvector.so .shobj/motionvector.o .shobj/motionvector.so: motionvector.cpp video.h proto.h util.h
-.obj/ordered.o .obj/ordered.so .shobj/ordered.o .shobj/ordered.so: ordered.cpp video.h proto.h dither.h
-.obj/ordered2.o .obj/ordered2.so .shobj/ordered2.o .shobj/ordered2.so: ordered2.cpp video.h proto.h dither.h
-.obj/para.o .obj/para.so .shobj/para.o .shobj/para.so: para.cpp video.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h
-.obj/parseblock.o .obj/parseblock.so .shobj/parseblock.o .shobj/parseblock.so: parseblock.cpp video.h proto.h decoders.h util.h
-.obj/prog.o .obj/prog.so .shobj/prog.o .shobj/prog.so: prog.cpp video.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h
-.obj/ui.o .obj/ui.so .shobj/ui.o .shobj/ui.so: ui.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i interface/fb.xbm \
- interface/play.xbm interface/step.xbm interface/stop.xbm \
- interface/loop.xbm interface/ff.xbm interface/MainWindow.mib \
- interface/Info.mib video.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h
-.obj/util.o .obj/util.so .shobj/util.o .shobj/util.so: util.cpp video.h proto.h util.h
-.obj/util32.o .obj/util32.so .shobj/util32.o .shobj/util32.so: util32.cpp video.h proto.h ui.h
-.obj/vb.o .obj/vb.so .shobj/vb.o .shobj/vb.so: vb.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
-.obj/vd.o .obj/vd.so .shobj/vd.o .shobj/vd.so: vd.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h dither.h video.h proto.h
-.obj/video.o .obj/video.so .shobj/video.o .shobj/video.so: video.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i decoders.h util.h \
- video.h proto.h global.h ui.h
-.obj/vp.o .obj/vp.so .shobj/vp.o .shobj/vp.so: vp.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h dither.h video.h proto.h ui.h
-.obj/Command_Handler.o .obj/Command_Handler.so .shobj/Command_Handler.o .shobj/Command_Handler.so: Command_Handler.cpp Command_Handler.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i ctr.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- newproto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- global.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp
deleted file mode 100644
index c2829df769c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-#ifdef __svr4__
-#include <stropts.h>
-#include <sys/conf.h>
-#endif
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "mpeg_shared/filters.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"
-
-/* magic number -- deviation is considered
-   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
-   */
-#define MAX_CLOCK_DRIFT 50
-
-#define max(a,b) ((a)>(b) ? (a) : (b))
-#define min(a,b) ((a)<(b) ? (a) : (b))
-
-typedef struct {
-  int bufsize; /* number of bytes for the buffer pointed by 'buf' */
-  char * buf;  /* pointer to the data buffer area */
-  int bps; /* current byte-per-sample */
-  int size;  /* number of samples the buffer can hold */
-  int samples; /* number of samples in the buffer; */
-  int stuff; /* number of stuff samples to be read by ABgetSamples() */
-  int ts;  /* tail-sample: the next sample to be comsumed by CTR */
-  int hs;  /* head-sample: the next sample to be expected from the network */
-  int tind; /* index of the ts-sample in the buf */
-} ABBuffer;
-
-static ABBuffer * abuf;
-static int sid;
-static int exit_tag = 0;
-static int savedSocket;
-
-static void set_silence(char *buf, int samples)
-{
-  memset(buf, 0xff, samples * shared->audioPara.bytesPerSample);
-}
-
-void ABinitBuf(int size) /* size in bytes */
-{
-  abuf = (ABBuffer *)creat_shared_mem(size);
-  abuf->bufsize = size - sizeof(*abuf);
-  abuf->buf = (char *)abuf + sizeof(*abuf);
-  sid = creat_semaphore();
-}
-
-void ABflushBuf(int nextSample)  /* flush the whole buffer */
-{
-  enter_cs(sid);
-  abuf->bps = shared->audioPara.bytesPerSample;
-  abuf->size = abuf->bufsize / abuf->bps;
-  abuf->samples = 0;
-  abuf->stuff = 0;
-  abuf->ts = abuf->hs = nextSample;
-  abuf->tind = 0;
-  set_silence(abuf->buf, abuf->size);
-  leave_cs(sid);
-}
-
-int ABcheckSamples(void) /* returns # of samples in ABbuf */
-{
-  return abuf->samples;
-}
-
-int ABgetSamples(char * buf, int samples)
-    /* read at most given number of samples from AB to buf, returns
-       number of sample actually read */
-{
-  int as;
-  int tsamples = samples;
-  enter_cs(sid);
-  if (abuf->stuff > 0) {
-    as = min(abuf->stuff, samples);
-    set_silence(buf, as);
-    abuf->stuff -= as;
-    samples -= as;
-    buf += as * abuf->bps;
-  }
-  if (samples > 0) {
-    as = min(samples, max(0, abuf->samples));
-	 /* there may be fewer samples in abuf */
-    if (as > 0) {
-      int part1 = min(as, abuf->size - abuf->tind);
-      memcpy(buf, abuf->buf + (abuf->bps * abuf->tind), part1 * abuf->bps);
-      set_silence(abuf->buf + (abuf->bps * abuf->tind), part1);
-      if (part1 < as) {  /* This read cross the boundary of abuf */
-	memcpy(buf + (part1 * abuf->bps),
-	       abuf->buf,
-	       (as - part1) * abuf->bps);
-	set_silence(abuf->buf, as - part1);
-      }
-    }
-    abuf->samples -= samples;
-    abuf->ts += samples;
-    abuf->tind = (abuf->tind + samples) % abuf->size;
-    if (as < samples) set_silence(buf + (as * abuf->bps), samples - as);
-  }
-  leave_cs(sid);
-  return tsamples;
-}
-
-/* if samples < 0; then stuff |samples| silient samples to ABgetSamples(),
-   otherwise wipe out this number of samples from AB */
-int ABskipSamples(int samples)
-{
-  enter_cs(sid);
-  if (samples <= 0) {
-    abuf->stuff += (- samples);
-  }
-  else {
-    abuf->samples -= samples;
-    abuf->ts += samples;
-    abuf->tind = (abuf->tind + samples) % abuf->size;
-  }
-  leave_cs(sid);
-  return samples;
-}
-
-void ABdeleteBuf(void)
-{
-  remove_shared_mem((char *)abuf);
-}
-
-void ABdeleteSem(void)
-{
-  remove_semaphore(sid);
-}
-
-/* SIGUSR1 from CTR is for killing this process, without affecting any other ones. */
-
-static void usr1_handler(int sig)
-{
-  exit_tag = 1;
-}
-
-static void exit_on_kill(void)
-{
-  extern void set_exit_routine_tag(int tag);
-  set_exit_routine_tag(0);
-  ComCloseConn(savedSocket);
-  VBdeleteBuf();
-  exit(0);
-}
-
-static void usr2_handler(int sig)
-{
-  Fprintf(stderr, "VB void usr2_handler (supposed for stat).\n");
-}
-
-#define PACKET_SIZE 8192
-#define STARTUP_WAIT 10000000
-#define ACTION_WAIT 5000000
-
-void ABprocess(int dataSocket)
-{
-  
-  AudioPacket * packet;
-  char * pkt_data;
-  int conn_tag = shared->audioMaxPktSize;
-
-  /* following are for feedback */
-  int fbstate = 0;
-  unsigned waketime;
-  int pcmdsn = -1; /* previous cmdsn */
-  
-  exit_tag = 0;
-  
-  savedSocket = dataSocket;
-  
-  setsignal(SIGUSR1, usr1_handler);
-  setsignal(SIGUSR2, usr2_handler);
-
-  packet = (AudioPacket *)malloc(PACKET_SIZE);
-  if (packet == NULL) {
-    perror("AB failed to allocate mem for packet buffer");
-    exit(1);
-  }
-  pkt_data = (char *)packet + sizeof(*packet);
-
-  for (;;) {
-    int len;
-    int bytes;
-    if (conn_tag >= 0) {
-      bytes = sizeof(*packet);
-      len = wait_read_bytes(dataSocket, (char *)packet, bytes);
-      if (exit_tag) exit_on_kill();
-    }
-    else {  /* discard mode packet stream, read all bytes */
-      bytes = PACKET_SIZE;
-      len = read(dataSocket, (char *)packet, bytes);
-      if (exit_tag) exit_on_kill();
-      if (len == -1) {
-	if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) {
-	  usleep(10000);
-	  if (exit_tag) exit_on_kill();
-	  continue;
-	}
-	perror("AB read() audio packet from discard-mode packet stream");
-	exit(1);
-      }
-    }
-    if (len == 0) {
-      fprintf(stderr, "Error: AB found dataSocket broken\n");
-      exit(1);
-    }
-    if (len < sizeof(*packet)) { /* unknown packet */
-      fprintf(stderr, "Warn: AB discard len = %d bytes of supposed header.\n", len);
-      continue;
-    }
-#ifdef NeedByteOrderConversion
-    packet->dataBytes = ntohl(packet->dataBytes);
-#endif
-
-    if (packet->dataBytes <= 0) {
-      fprintf(stderr, "AB Error: pkt->dataBytes %d, len %d\n",
-	      packet->dataBytes,
-	      len);
-      exit(1);
-    }
-    bytes = packet->dataBytes + sizeof(*packet);
-    
-    if (bytes > PACKET_SIZE) {
-      Fprintf(stderr, "Fatal error: AB packet buf (%dB) too small (%d)\n",
-	      PACKET_SIZE, bytes);
-      exit(1);
-    }
-    if (conn_tag >= 0) {
-      len = wait_read_bytes(dataSocket, (char *)packet + sizeof(*packet),
-			    bytes - sizeof(*packet));
-      if (len <= 0) {
-	if (len == -1) perror("AB encounter error on wait_read_bytes()");
-	else fprintf(stderr, "AB encounter EOF on wait_read_bytes()\n");
-      }
-    }
-#ifdef NeedByteOrderConversion
-    packet->cmdsn = ntohl(packet->cmdsn);
-    packet->samplesPerSecond = ntohl(packet->samplesPerSecond);
-    packet->resend = ntohl(packet->resend);
-    packet->firstSample = ntohl(packet->firstSample);
-    packet->samples = ntohl(packet->samples);
-    packet->actualSamples = ntohl(packet->actualSamples);
-    /* dataBytes already byte-reordered */
-#endif
-    /*
-    Fprintf(stderr, "AB got a packet: %d(%d)\n",
-	packet->firstSample, packet->samples);
-    */
-    /*
-    if (packet->firstSample % 10240 && !packet->resend) continue;
-    */
-    if (packet->samples * abuf->bps > PACKET_SIZE - sizeof(*packet)) {
-      fprintf(stderr, "Fatal error: AB has too small packet buffer, %d out of %d\n",
-	      PACKET_SIZE, packet->samples * abuf->bps + sizeof(*packet));
-      exit(1);
-    }
-
-    if (packet->cmdsn != shared->cmdsn) { /* outdated packet */
-      /*
-      Fprintf(stderr, "AB discarded an outdated packet\n");
-      */
-      continue;
-    }
-    enter_cs(sid);
-    if (packet->firstSample + packet->samples <= abuf->ts) {
-      /* all samples too late, discard it */
-      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-      abuf->samples = abuf->hs - abuf->ts;
-      leave_cs(sid);
-      /*
-      Fprintf(stderr, "AB all sample in packet %d(%d) too late\n",
-	      packet->firstSample, packet->samples);
-      */
-      goto feedback_code;
-    }
-    if (packet->firstSample >= abuf->ts + abuf->size) {
-      /* all samples too early, discard the packet */
-      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-      abuf->samples = abuf->hs - abuf->ts;
-      leave_cs(sid);
-      /*
-      Fprintf(stderr, "AB all sample in packet %d(%d) too early\n",
-	      packet->firstSample, packet->samples);
-      */
-      goto feedback_code;
-    }
-    
-    if (packet->samples > packet->actualSamples) {
-      leave_cs(sid);
-      fprintf(stderr, "Error: AB interpolation not available yet.\n");
-      exit(1);
-    }
-    
-    {
-      int oldhs = abuf->hs;
-      int firstSample = max(packet->firstSample, abuf->ts);
-      int samples = min(packet->samples -
-			  (firstSample - packet->firstSample),
-			(abuf->ts + abuf->size) - packet->firstSample);
-      char * data = pkt_data +
-                    (firstSample - packet->firstSample) * abuf->bps;
-      int dstart = (abuf->tind + (firstSample - abuf->ts)) % abuf->size;
-      int part1 = min(samples, abuf->size - dstart);
-      memcpy(abuf->buf + (dstart * abuf->bps), data, part1 * abuf->bps);
-      if (part1 < samples) {
-	memcpy(abuf->buf, data + part1 * abuf->bps,
-	       (samples - part1) * abuf->bps);
-      }
-      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-      abuf->samples = abuf->hs - abuf->ts;
-      dstart =max(oldhs, abuf->ts);
-      
-      leave_cs(sid);
-      
-      part1 = firstSample - dstart;
-      if (packet->resend) {
-	Fprintf(stderr, "AB got resent %d(%d)\n",
-		packet->firstSample, packet->samples);
-      }
-      else if (part1 > 0) {
-	int res;
-	AudioFeedBackPara para;
-	Fprintf(stderr, "AB found gap %d(%d)\n", dstart, part1);
-	para.cmdsn = htonl(shared->cmdsn);
-	para.type = htonl(1);
-	para.data.ap.firstSample = htonl(dstart);
-	para.data.ap.samples = htonl(part1);
-	if (conn_tag != 0) { /* packet stream */
-	  while ((res = write(dataSocket, (char *)&para, sizeof(para))) == -1)
-	  {
-	    if (errno == EINTR)
-	      continue;
-	    if (errno == ENOBUFS) {
-	      perror("AB Warning, resend-req packet discarded for");
-	      break;
-	    }
-	    perror("AB error, resend-req  packet sending failed");
-	    exit(1);
-	  }
-	}
-	else {
-	  res = wait_write_bytes(dataSocket, (char *)&para, sizeof(para));
-	  if (res == -1) {
-	    perror("AB error, resend-req  packet sending failed");
-	    exit(1);
-	  }
-	}
-	if (res < sizeof(para)) {
-	  fprintf(stderr, "AB warn: send() for gap res %dB < sizeof(para) %dB\n",
-		  res, sizeof(para));
-	}
-      }
-    }
-	
-    /* following is feedback algorithm */
-    
-  feedback_code:
-    
-    if (shared->live || (!shared->config.syncEffective)) continue;
-    /*
-    fprintf(stderr, "AB fbstate = %d\n", fbstate);
-    */
-    switch (fbstate) {
-    case 0: /* startup init */
-      if (pcmdsn != packet->cmdsn) {
-	fbstate = 0;
-	pcmdsn = packet->cmdsn;
-      }
-      else {
-	fbstate = 1;
-	waketime = get_usec() + STARTUP_WAIT;
-      }
-      break;
-    case 1: /* startup wait */
-      if (pcmdsn != packet->cmdsn) {
-	fbstate = 0;
-	break;
-      }
-      if (get_usec() >= waketime) {
-	fbstate = 2;
-      }
-      break;
-    case 2: /* monitoring */
-      if (pcmdsn != packet->cmdsn) {
-	fbstate = 0;
-	break;
-      }
-      if (abuf->samples < abuf->size >>2 ||
-	  abuf->samples > (abuf->size * 3) >> 2) {
-	/* feedback action needed */
-	AudioFeedBackPara para;
-	int res;
-	para.data.fb.addsps = 0;
-	para.data.fb.addSamples = (abuf->size >> 2) - abuf->samples;
-	
-	Fprintf(stderr, "AB sends fb: %dsps, %dsamples\n",
-		para.data.fb.addsps,
-		para.data.fb.addSamples);
-	para.cmdsn = htonl(shared->cmdsn);
-	para.type = htonl(0);
-	para.data.fb.addsps = htonl(para.data.fb.addsps);
-	para.data.fb.addSamples = htonl(para.data.fb.addSamples);
-	if (conn_tag != 0) {
-	  while ((res = write(dataSocket, (char *)&para, sizeof(para))) == -1)
-	  {
-	    if (errno == EINTR)
-	    continue;
-	    if (errno == ENOBUFS) {
-	      perror("AB Warning, fb packet discarded for");
-	      break;
-	    }
-	    perror("AB error, fb  packet sending failed");
-	    exit(1);
-	  }
-	}
-	else {
-	  res = wait_write_bytes(dataSocket, (char *)&para, sizeof(para));
-	  if (res == -1) {
-	    perror("AB error, fb  packet sending failed");
-	    exit(1);
-	  }
-	}
-	if (res < sizeof(para)) {
-	  fprintf(stderr, "AB warn: send() for sync res %dB < sizeof(para) %dB\n",
-		  res, sizeof(para));
-	}
-	
-	waketime = get_usec() + STARTUP_WAIT;
-	fbstate = 1;
-      }
-      break;
-    default:
-      break;
-    }
-  }
-}  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
deleted file mode 100644
index 5389b3e5f09..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
+++ /dev/null
@@ -1,490 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-/* ##################################################################
-
-   When you port to a new architecture, you much add native audio
-   device support in this file by adding stuff to all relevant
-   functions, otherwise, it is disabled by default.
-   
-   ################################################################# */
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#ifdef __svr4__
-#include <sys/audioio.h>
-#elif defined(FreeBSD)
-#include <machine/pcaudioio.h>
-#elif defined(sun)
-#include <sys/audioio.h>
-#elif defined(_HPUX_SOURCE)
-#include <sys/audio.h>
-#elif defined(IRIX)
-#include <audio.h>
-#endif
-
-#ifdef FreeBSD
-#define AUDIO_DEVICE "/dev/pcaudio"
-#define AUDIO_CONTROL "/dev/pcaudioctl"
-#elif defined(__svr4__) || defined(sun)
-#define AUDIO_DEVICE "/dev/audio"
-#define AUDIO_CONTROL "/dev/audioctl"
-#elif defined(_HPUX_SOURCE)
-#define AUDIO_DEVICE "/dev/audio"
-#define AUDIO_CONTROL "/dev/audioCtl"
-#elif defined(IRIX)
-#define AUDIO_DEVICE "proprietary device"
-#define AUDIO_CONTROL "proprietary device"
-#elif defined(LINUX)
-#define AUDIO_DEVICE "/dev/audio"
-#define AUDIO_CONTROL "NO CONTROL DEV"
-#endif
-
-#include <time.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-
-static int cfd = -1, afd = -1;  /* afd == -1 mean no native device available */
-static long start_time;
-static long current_time;
-
-#ifdef IRIX
-#define audioDevice AL_DEFAULT_DEVICE
-static ALport playPort = NULL;
-#endif
-
-#ifdef AUDIOFILE
-
-#include <AF/AFlib.h>
-#include <AF/AFUtils.h>
-
-static int useAF = 0;
-
-static AFAudioConn *aud;
-static AC ac;
-static AFSetACAttributes attributes;
-
-/*
- * Find a suitable default device
- * Returns -1 if no suitable device can be found.
- */
-static int FindDefaultDevice(AFAudioConn *aud)
-{
-  AFDeviceDescriptor *audioDevice;
-  int i;
-  for(i=0; i<ANumberOfAudioDevices(aud); i++)
-  {
-    audioDevice = AAudioDeviceDescriptor(aud, i);
-    if(audioDevice->inputsFromPhone == 0 && audioDevice->outputsToPhone == 0)
-    return i;
-  }
-  return -1;
-}
-#endif
-
-/*
-   returns: 0 - succ
-           -1 - failed
-*/
-int InitAudioDevice(void)
-{
-#ifdef AUDIOFILE
-  int device;
-  int gain;
-  unsigned int channels;
-  int endianflag = 0;
-#endif
-
-#ifdef AUDIOFILE
-  device = -1;
-  attributes.preempt = Mix;
-  attributes.start_timeout = 0;
-  attributes.end_silence = 0;
-  attributes.play_gain = 0;
-  attributes.rec_gain =  0;
-  attributes.type = UNKNOWN_ENCODETYPE;
-
-  if ( (aud = AFOpenAudioConn(NULL)) == NULL)
-  {
-    fprintf(stderr, "Failed locating default AudioFile.\n");
-    goto native_audio;
-  }
-  
-  /* set up audio context, find sample size and sample rate
-     At this time, we only support default setings */
-  device = FindDefaultDevice(aud);
-  attributes.type = aud->devices[device].playBufType;
-  ac = AFCreateAC(aud, device, (ACPlayGain | ACEncodingType | endianflag), 
-		  &attributes);
-  if (ac == NULL)
-  {
-    fprintf(stderr, "Failed Initializing default AudioFile.\n");
-    AFCloseAudioConn(aud);
-    goto native_audio;
-  }
-  AFSync(aud, 0);	/* Make sure we confirm encoding type support. */
-  shared->AFPara.encodeType = attributes.type;
-  shared->AFPara.channels = ac->device->playNchannels;
-  shared->AFPara.bytesPerSample =
-               BytesPerUnit(attributes.type) / SampsPerUnit(attributes.type);
-  shared->AFPara.samplesPerSecond = ac->device->playSampleFreq;
-  /*
-  memcpy(&(shared->AFPara), &(shared->config.audioPara), sizeof(AudioParameter));
-  */
-  useAF = 1;
-  fprintf(stderr, "Using default AudioFile.\n");
-  return 0;
-#elif defined(__svr4__) || defined(sun) || defined(FreeBSD) \
-  || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
-  fprintf(stderr, "This vcr compiled without AudioFile, try native audio.\n");
-#else
-  fprintf(stderr, "This vcr compiled without AudioFile, audio to be ignored\n");
-  afd = -1;
-  return -1;
-#endif
-  
- native_audio:
-  
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD) || defined(_HPUX_SOURCE)
-
-  afd = open(AUDIO_DEVICE, O_WRONLY | O_NDELAY);
-  if (afd == -1) {
-    fprintf(stderr, "%s", AUDIO_DEVICE);
-    perror(" can't be opened for write");
-    return -1;
-  }
-  cfd = open(AUDIO_CONTROL, O_WRONLY | O_NDELAY);
-  if (cfd == -1) {
-    fprintf(stderr, "%s", AUDIO_DEVICE);
-    perror(" can't be opened for write");
-    close(afd);
-    afd = -1;
-    return -1;
-  }
-#if defined(_HPUX_SOURCE)
-  
-  if (ioctl(cfd, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) < 0) {
-    fprintf(stderr, "%s" AUDIO_DEVICE);
-    perror("can't be set to u-law");
-    close(afd);
-    close(cfd);
-    afd = -1;
-    return -1;
-  }
-  if (ioctl(cfd, AUDIO_SET_CHANNELS, 1) < 0) {
-    fprintf(stderr, "%s" AUDIO_DEVICE);
-    perror("can't be set to have single channel");
-    close(afd);
-    close(cfd);
-    afd = -1;
-    return -1;
-  }
-  if (ioctl(cfd, AUDIO_SET_SAMPLE_RATE, 8000) < 0) {
-    fprintf(stderr, "%s" AUDIO_DEVICE);
-    perror("can't be set to 8000sps");
-    close(afd);
-    close(cfd);
-    afd = -1;
-    return -1;
-  }
-  if (ioctl(cfd, AUDIO_SET_OUTPUT, AUDIO_OUT_SPEAKER | AUDIO_OUT_HEADPHONE))
-  {
-    fprintf(stderr, "%s" AUDIO_DEVICE);
-    perror("can't be set output to both internal speaker and headphone");
-    close(afd);
-    close(cfd);
-    afd = -1;
-    return -1;
-  }
-  if(ioctl(cfd, AUDIO_SET_TXBUFSIZE, 1024*64) < 0)
-  {
-    fprintf(stderr, "%s" AUDIO_DEVICE);
-    perror("can't be set output buffer size to 64K");
-    close(afd);
-    close(cfd);
-    afd = -1;
-    return -1;
-  }
-#endif  /* _HPUX_SOURCE */
-
-#elif defined(IRIX)
-  {
-#define NCH 1
-#define MSQUEUE 100
-    ALconfig c;
-    long params[2];
-
-    params[0] = AL_OUTPUT_RATE;
-    params[1] = 8000;
-    ALsetparams(audioDevice, params, 2);
-
-    if ((c = ALnewconfig()) == NULL) {
-      afd = -1;
-      return -1;
-    }
-    ALsetwidth(c, AL_SAMPLE_16);
-    ALsetchannels(c, AL_MONO);
-    ALsetqueuesize(c, 10240); /* Minimal queue size */
-    playPort = ALopenport(AUDIO_DEVICE, "w", c);
-    ALfreeconfig(c);
-    if (playPort == NULL) {
-      afd = -1;
-      return -1;
-    }
-    afd = 0;
-  }
-#elif defined(LINUX)
-  
-  afd = open(AUDIO_DEVICE, O_WRONLY);
-  if (afd == -1) {
-    fprintf(stderr, "%s", AUDIO_DEVICE);
-    perror(" can't be opened for write");
-    return -1;
-  }
-  
-#else  /* no audio device supported on other platforms */
-
-  fprintf(stderr, "Audio device access not supported, audio to be ignored\n");
-  afd = -1;
-  return -1;
-
-#endif  /* sun, FreeBSD, _HPUX_SOURCE, ... */
-  shared->AFPara.encodeType = AudioTypeMuLaw;
-  shared->AFPara.channels = 1;
-  shared->AFPara.bytesPerSample = 1;
-  shared->AFPara.samplesPerSecond = 8000;
-  start_time = get_msec();
-  current_time = 0;
-  fprintf(stderr, "Using native %s\n", AUDIO_DEVICE);
-  return 0;
-}
-
-void SetAudioParameter(AudioParameter * para)
-{
-}
-
-unsigned int GetAudioTime(void)
-{
-#ifdef AUDIOFILE
-  if (useAF) return AFGetTime(ac);
-#endif
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
-  || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
-  if (afd == -1) return 0;
-  return get_duration(start_time, get_msec()) * 8; /* 8K sampling speed */
-#else
-  return 0;
-#endif
-}
-
-/* Play size number of samples to AF */
-unsigned int PlayAudioSamples(unsigned int time, char * buf, int size)
-{
-#ifdef AUDIOFILE
-  if (useAF) return AFPlaySamples(ac, time, size * shared->audioPara.bytesPerSample,
-				  (unsigned char *)buf);
-#endif
-
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
-  || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
-  if (afd == -1) return 0;
-
-#ifdef IRIX
-  {
-#define BUFSIZE 1024
-    static short   AF_cvt_u2s[]={
-        -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
-        -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
-        -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
-        -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316,
-         -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140,
-         -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092,
-         -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004,
-         -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980,
-         -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436,
-         -1372, -1308, -1244, -1180, -1116, -1052,  -988,  -924,
-          -876,  -844,  -812,  -780,  -748,  -716,  -684,  -652,
-          -620,  -588,  -556,  -524,  -492,  -460,  -428,  -396,
-          -372,  -356,  -340,  -324,  -308,  -292,  -276,  -260,
-          -244,  -228,  -212,  -196,  -180,  -164,  -148,  -132,
-          -120,  -112,  -104,   -96,   -88,   -80,   -72,   -64,
-           -56,   -48,   -40,   -32,   -24,   -16,    -8,     0,
-         32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956,
-         23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764,
-         15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
-         11900, 11388, 10876, 10364,  9852,  9340,  8828,  8316,
-          7932,  7676,  7420,  7164,  6908,  6652,  6396,  6140,
-          5884,  5628,  5372,  5116,  4860,  4604,  4348,  4092,
-          3900,  3772,  3644,  3516,  3388,  3260,  3132,  3004,
-          2876,  2748,  2620,  2492,  2364,  2236,  2108,  1980,
-          1884,  1820,  1756,  1692,  1628,  1564,  1500,  1436,
-          1372,  1308,  1244,  1180,  1116,  1052,   988,   924,
-           876,   844,   812,   780,   748,   716,   684,   652,
-           620,   588,   556,   524,   492,   460,   428,   396,
-           372,   356,   340,   324,   308,   292,   276,   260,
-           244,   228,   212,   196,   180,   164,   148,   132,
-           120,   112,   104,    96,    88,    80,    72,    64,
-            56,    48,    40,    32,    24,    16,     8,     0
-      };
-    int left = size;
-    unsigned char * src = buf;
-    int i;
-    while (left > 0) {
-      short buffer[BUFSIZE];
-      short * dst = buffer;
-      int len = left;
-      if (len > BUFSIZE) len = BUFSIZE;
-      left -= len;
-      for (i = 0; i < len; i ++) {
-	*(dst ++) = AF_cvt_u2s[*(src ++)];
-      }
-      ALwritesamps(playPort, buffer, len);
-    }
-  }
-#else
-  write(afd, buf, size);
-#endif
-
-  current_time += size;
-  return get_duration(start_time, get_msec()) * 8; /* 8K sampling speed */
-#else
-  return 0;
-#endif
-}
-
-void StartAudioPlaySession(void)
-{
-  SetAudioGain();
-#ifdef AUDIOFILE
-  if (useAF) return;
-#endif
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
-  || defined(_HPUX_SOURCE) || defined(IRIX)
-  if (afd == -1) return;
-#else
-  return;
-#endif
-}
-void SetAudioGain(void)
-{
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD)
-  audio_info_t sun_gapo;
-#elif defined(_HPUX_SOURCE)
-  struct audio_gain ag;
-#elif defined(IRIX)
-  long params[4];
-#endif
-  int volume = shared->volumePosition;
-
-#ifdef AUDIOFILE
-  if (useAF) {
-    AFSetOutputGain(ac, volume * 2);
-    /*
-      AFSetOutputGain(ac, (volume - 10)/3); 
-    fprintf(stderr, "CTR audio.c: volume changed to %d.\n", volume);
-    */
-    return;
-  }
-#endif
-#if defined(__svr4__) || defined(sun) || defined(FreeBSD)
-   if (afd == -1) return;
-  ioctl(cfd, AUDIO_GETINFO, &sun_gapo);
-  sun_gapo.play.gain = volume * 2;
-  ioctl(cfd, AUDIO_SETINFO, &sun_gapo);
-  return;
-#elif defined(_HPUX_SOURCE)
-  ioctl(cfd, AUDIO_GET_GAINS, &ag);
-  ag.cgain[0].transmit_gain = AUDIO_OFF_GAIN+(AUDIO_MAX_GAIN-AUDIO_OFF_GAIN)*volume/100;
-  ag.cgain[1].transmit_gain = ag.cgain[0].transmit_gain;
-  ioctl(cfd, AUDIO_SET_GAINS, &ag);
-  return;
-#elif defined(IRIX)
-  params[0] = AL_LEFT_SPEAKER_GAIN;
-  params[1] = volume;
-  params[2] = AL_RIGHT_SPEAKER_GAIN;
-  params[3] = volume;
-  ALsetparams(audioDevice, params, 4);
-  return;
-#else
-  return;
-#endif
-}
-
-void AudioInterpolate(char *rBuf, int len, char * cBuf, int convLen)
-{
-  unsigned char *rawBuf = (unsigned char *)rBuf;
-  unsigned char *convBuf = (unsigned char *)cBuf;
-  int i;
-  float factor = (float)len / (float)convLen;
-
-#ifdef AUDIOFILE
-  if ((!useAF) && afd == -1) return;
-#else
-  if (afd == -1) return;
-#endif
-  
-  /*
-  Fprintf(stderr, "factor %5.2lf, len %d, convLen %d\n", factor, len, convLen);
-  */
-  if (shared->audioPara.bytesPerSample == 1)
-  {
-    for (i=0; i<convLen; i++)
-    {
-      float a = i * factor;
-      int k = (int) (a + 0.5);
-      /*
-      int k = a;
-      a = a - k;
-      */
-      if (k < len - 1) { /* interpolation algorithm can be improved */
-	/*
-        convBuf[i] = AF_comp_u[(int)(a * AF_exp_u[(int)rawBuf[k+1] & 0xff] + (1.0 - a) *
-				     AF_exp_u[(int)rawBuf[k] & 0xff]) + 8192];
-	*/
-	
-        convBuf[i] = rawBuf[k];
-	
-      }
-      else
-        convBuf[i] = rawBuf[len-1];
-    }
-  }
-  else
-  {
-    fprintf(stderr, "CTR audio.c error: multi_byte samples not supported.\n");
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
deleted file mode 100644
index 33412c67fa9..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
+++ /dev/null
@@ -1,3016 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#ifdef ULTRIX
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
-#include <time.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/sendpt.h"
-#include "mpeg_shared/filters.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"
-#include "Command_Handler.h"
-
-#define SPEEDHIST_SIZE 20
-
-#define max(a,b) (a>b ? a : b)
-#define min(a,b) (a<b ? a : b)
-
-static int usr1_flag = 0;
-static int rtplay = 1;
-static int cmdSocket = -1;
-static int CTRpid = -1, VBpid = -1, VDpid = -1, UIpid = -1;
-static int ABpid = -1;
-static int videoSocket = -1;
-static int audioSocket = -1;
-static int hasAudioDevice = 0;
-static int cmdBytes = 0;
-static char *cmdBuffer = NULL;
-static char *vh, *vf, *ah, *af;
-static int cmdAcks = 0;
-static int speedPtr = 0;
-static struct
-{
-  int frameId;
-  int usecPerFrame;
-  float frameRateLimit;
-  int frames;
-  int framesDropped;
-} speedHistory[SPEEDHIST_SIZE];
-
-/* following are for live video */
-static unsigned startTime;  /* used to record start time for live playback,
-			     also used to record FF/FB/PLAY round trip time */
-static unsigned startVSA; /* VS advance at the begining of playback of live video */
-static int displayedFrames;
-
-/* following static variable is for frameRate feedback. See comments on
- initialization of these variables in function play()*/
-
-static int fbstate = 0;   /* state value of frame-rate feedback */
-static double maxfr = 0;  /* frame-rate limit during playback, in fps. This is deduced
-			   from frameRateLimit, a constant during a playback, even if
-			   play speed changes */
-static int minupf = 0;    /* minimum usec/frame, equals to 1000000/maxfr */
-static double maxrate = 0; /* current max frame rate, in percent of maxfr, after taken
-			      playspeed into consideration. If play speed > maxfr,
-			      then this value would be 1.0. Otherwise it would be
-			      playspeed/maxfr */
-static double frate = 0;  /* current server frame rate, in percentage of maxrate */
-static double adjstep = 0; /* step of frame-rate adjustment. In percentage value.
-			      This is basically
-			      maxrate/#frames-in-feedback-frame-sequence */
-static int fb_startup = 0; /* Indicate the first feedback action. The first feedback
-			      action is to set the server fps directly according to
-			      actully measured display frame-rate. All following
-			      feedback action would then adjust server fps linearly
-			      adjstep each time */
-
-#define max(a,b) (a>b ? a : b)
-#define min(a,b) (a<b ? a : b)
-
-#define NewCmd(val) {shared->cmd = val; shared->cmdsn ++; }
-
-static void compute_sendPattern(void);
-
-int
-OurCmdRead(char *buf, int size)
-{
-  int val;
-  if (size == 0) return 0;
-  if (cmdBytes > 0)
-  {
-    memcpy(buf, cmdBuffer, size);
-    cmdBytes -= size;
-    cmdBuffer += size;
-    return 0;
-  }
-  while ((val = read(cmdSocket, (buf), (size))) <= 0)
-    {
-    if (val == -1 && errno == EINTR) return 1;
-    if (!val) {
-      perror("CTR error, EOF reached unexpected within CmdRead()");
-    }
-    else {
-      perror("CTR CmdRead() from UI through CmdSocket");
-    }
-    exit(1);
-  }
-  return 0;
-}
-
-void CmdRead(char *buf, int size)
-{
-  int val;
-  if (size == 0) return;
-  if (cmdBytes > 0)
-  {
-    memcpy(buf, cmdBuffer, size);
-    cmdBytes -= size;
-    cmdBuffer += size;
-    return;
-  }
-  while ((val = read(cmdSocket, (buf), (size))) <= 0)
-    {
-    if (val == -1 && errno == EINTR) continue;
-    if (!val) {
-      perror("CTR error, EOF reached unexpected within CmdRead()");
-    }
-    else {
-      perror("CTR CmdRead() from UI through CmdSocket");
-    }
-    exit(1);
-  }
-  return;
-}
-
-static int CmdReadNW(char *buf, int size)
-{
-  struct fd_set read_mask;
-  int nfds = cmdSocket+1;
-  int val;
-  
-  if (size == 0) return 0;
-  
-  if (cmdBytes > 0)
-  {
-    memcpy(buf, cmdBuffer, size);
-    cmdBytes -= size;
-    cmdBuffer += size;
-    return 0;
-  }
-  
-  FD_ZERO(&read_mask);
-  FD_SET(cmdSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-  if (select(nfds, (int *)&read_mask, NULL, NULL, NULL) == -1)
-#else
-  if (select(nfds, &read_mask, NULL, NULL, NULL) == -1)
-#endif
-  {
-    if (errno == EINTR)
-      return -1;
-    perror("CTR CmdReadNW by select");
-    exit(1);
-  }
-  if ((val = read(cmdSocket, (buf), (size))) < 0)
-  {
-    if (errno == EINTR)
-      return -1;
-    
-    perror("CTR CmdReadNW by read");
-    exit(1);
-  }
-  if (val == 0)
-  {
-    fprintf(stderr, "Error: EOF reached unexpectedly within CmdReadNW().");
-    exit(1);
-  }
-  return 0;
-}
-
-static void CmdWrite(unsigned char * buf, int size)
-{
-  if (cmdAcks > 0 && size == 1 && *buf == CmdDONE)
-  {
-    cmdAcks --;
-    return;
-  }
-    
-  while (write(cmdSocket, buf, size) == -1)
-  {
-    if (errno == EINTR)
-      continue;
-    perror("CTR writes to UI through cmdSocket");
-    exit(1);
-  }
-}
-
-/* following function can be replaced by ../shared/fileio.c:read_bytes()
-   but SocketRead provides more error info */
-
-static void SocketRead(int s, char *buf, int size)
-{ int val, remain = size;
-  char * ptr = buf;
-  fprintf (stderr, "SocketRead: videoSocket = %d\n",
-           videoSocket);
-  for (;;)
-  {
-    val = read(s, ptr, remain);
-    
-    fprintf(stderr, "CTR got from %sSocket %d of %d.\n",
-	    s == videoSocket ? "video" : "audio", val, remain);
-    
-    if (val == -1 && errno == EINTR)
-    {
-      errno = 0;
-      continue;
-    }
-    if (val == -1)
-    {
-      fprintf(stderr, "CTR error read %sSocket, ret=%d(size=%d)",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      perror("");
-      exit(1);
-    }
-    if (val == 0)
-    {
-      fprintf(stderr, "CTR error read %sSocket, EOF met, ret=%d(size=%d).\n",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      exit(1);
-    }
-    ptr += val;
-    remain -= val;
-    if (remain < 0)
-    {
-      fprintf(stderr, "CTR error read %sSocket, read too much, ret=%d(size=%d).\n",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      exit(1);
-    }
-    if (remain == 0)
-      break;
-  }
-}
-
-#if 0
-static void SocketRecv(int s, char *buf, int size)
-{ int val, remain = size;
-  char * ptr = buf;
-  for (;;)
-  {
-    val = read(s, ptr, remain);
-    /*
-    fprintf(stderr, "CTR got from %sSocket %d of %d.\n",
-	    s == videoSocket ? "video" : "audio", val, remain);
-    */
-    if (val == -1 && errno == EINTR)
-    {
-      errno = 0;
-      continue;
-    }
-    if (val == -1)
-    {
-      fprintf(stderr, "CTR error read %sSocket, ret=%d(size=%d)",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      perror("");
-      exit(1);
-    }
-    if (val == 0)
-    {
-      fprintf(stderr, "CTR error read %sSocket, EOF met, ret=%d(size=%d).\n",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      exit(1);
-    }
-    ptr += val;
-    remain -= val;
-    if (remain < 0)
-    {
-      fprintf(stderr, "CTR error read %sSocket, read too much, ret=%d(size=%d).\n",
-	      s == videoSocket ? "video" : "audio", size-remain, size);
-      exit(1);
-    }
-    if (remain == 0)
-      break;
-  }
-}
-#endif
-
-#define VideoRead(buf, size) SocketRead(videoSocket, buf, size)
-
-#define VideoWrite(buf, psize) \
-  { int val; while ((val = write(videoSocket, (buf), (psize))) == -1) \
-    { if (errno == EINTR) continue; \
-      perror("CTR writes to VS through videoSocket");\
-      exit(1); \
-    } \
-    if (val < (int)(psize)) { \
-      fprintf(stderr, "CTR bad VideoWrite, size %d, val %d", psize, val); perror(""); }\
-  }
-
-#define AudioRead(buf, size) SocketRead(audioSocket, buf, size)
-
-#define AudioWrite(buf, size) \
-  { while (write(audioSocket, (buf), (size)) == -1) \
-    { if (errno == EINTR) continue; \
-      perror("CTR writes to AS through audioSocket"); \
-      exit(1); \
-    } \
-  }
-
-static void start_timer(void);
-static void stop_timer(void);
-static void timer_speed(void);
-static void wait_display(void);
-static void stop_playing();
-
-static int InitVideoChannel(char * phostname, char * vf)
-{
-  int dataSocket = -1;
-
-  if (ComOpenConnPair(phostname, &videoSocket,
-		      &dataSocket, &shared->videoMaxPktSize) == -1) {
-    return -1;
-  }
-
-  /* Initialize with VS */
-  {
-    INITvideoPara para;
-    INITvideoReply reply;
-    unsigned char tmp;
-    tmp = CmdINITvideo;
-    VideoWrite(&tmp, 1);
-    
-    para.sn = htonl(shared->cmdsn);
-    para.version = htonl(VERSION);
-    para.nameLength = htonl(strlen(vf)+1);
-    
-    VideoWrite(&para, sizeof(para));
-    VideoWrite(vf, strlen(vf)+1);
-    /*
-    fprintf(stderr, "InitCommand to VSwritten.\n");
-    */
-    /*
-    VideoRead((char*)&tmp, 1);
-    */
-    errno = 0;
-    if (read(videoSocket, (char*)&tmp, 1) <= 0) {
-      if (errno) {
-	perror("CTR error read first byte from videoSocket");
-      }
-      else {
-	fprintf(stderr, "CTR error: videoSocket closed by VS.\n");
-      }
-      ComCloseConn(dataSocket);
-      ComCloseConn(videoSocket);
-      videoSocket = -1;
-      return -1;
-    }
-    if (tmp == CmdFAIL)
-    {
-      char errmsg[128];
-      read_string(videoSocket, errmsg, 128);
-      fprintf(stderr, "CTR failed to connect to VS: %s.\n", errmsg);
-      ComCloseConn(dataSocket);
-      ComCloseConn(videoSocket);
-      videoSocket = -1;
-      return -1;
-    }
-    else
-    {
-      VideoRead((char*)&reply, sizeof(reply));
-#ifdef NeedByteOrderConversion
-      reply.live = ntohl(reply.live);
-      reply.format = ntohl(reply.format);
-      reply.totalHeaders = ntohl(reply.totalHeaders);
-      reply.totalGroups = ntohl(reply.totalGroups);
-      reply.totalFrames = ntohl(reply.totalFrames);
-      reply.horizontalSize = ntohl(reply.horizontalSize);
-      reply.verticalSize = ntohl(reply.verticalSize);
-      reply.pelAspectRatio = ntohl(reply.pelAspectRatio);
-      reply.pictureRate1000 = ntohl(reply.pictureRate1000);
-      reply.vbvBufferSize = ntohl(reply.vbvBufferSize);
-      reply.sizeIFrame = ntohl(reply.sizeIFrame);
-      reply.sizePFrame = ntohl(reply.sizePFrame);
-      reply.sizeBFrame = ntohl(reply.sizeBFrame);
-      reply.sizeSystemHeader = ntohl(reply.sizeSystemHeader);
-      reply.sizeGop = ntohl(reply.sizeGop);
-      reply.averageFrameSize = ntohl(reply.averageFrameSize);
-      reply.firstGopFrames = ntohl(reply.firstGopFrames);
-      reply.patternSize = ntohl(reply.patternSize);
-#endif
-      shared->live += reply.live;
-      shared->videoFormat = reply.format;
-      shared->totalHeaders = reply.totalHeaders;
-      shared->totalFrames = reply.totalFrames;
-      shared->totalGroups = reply.totalGroups;
-      shared->averageFrameSize = reply.averageFrameSize;
-      shared->horizontalSize = reply.horizontalSize;
-      shared->verticalSize = reply.verticalSize;
-      shared->pelAspectRatio = reply.pelAspectRatio;
-      shared->pictureRate = ((double)reply.pictureRate1000) / 1000.0;
-      shared->vbvBufferSize = reply.vbvBufferSize;
-      shared->firstGopFrames = reply.firstGopFrames;
-      shared->patternSize = strlen(reply.pattern);
-      if (shared->patternSize == 0) {
-	
-	Fprintf(stderr, "CTR warning: patternsize %d\n", shared->patternSize);
-	
-	shared->patternSize = 1;
-	shared->pattern[0]  = 'I';
-	shared->pattern[1] = 0;
-	shared->IframeGap = 1;
-      }
-      else if (shared->patternSize < PATTERN_SIZE)
-      {
-	int i;
-	char * ptr = shared->pattern + shared->patternSize;
-	strncpy(shared->pattern, reply.pattern, shared->patternSize);
-	for (i = 1; i < PATTERN_SIZE / shared->patternSize; i ++) {
-	  memcpy(ptr, shared->pattern, shared->patternSize);
-	  ptr += shared->patternSize;
-	}
-	shared->IframeGap = 1;
-	while (shared->IframeGap < shared->patternSize)
-	{
-	  if (shared->pattern[shared->IframeGap] == 'I')
-	    break;
-	  else
-	    shared->IframeGap ++;
-	}
-      }
-      else
-      {
-	fprintf(stderr, "CTR Error: patternSize %d greater than PATTERN_SIZE %d.\n",
-		shared->patternSize, PATTERN_SIZE);
-	exit(1);
-      }
-      fprintf(stderr, "Video: %s, %s\n",
-	      shared->videoFormat == VIDEO_SIF ? "SIF" :
-	      shared->videoFormat == VIDEO_JPEG ? "JPEG" :
-	      shared->videoFormat == VIDEO_MPEG1 ? "MPEG1" :
-	      shared->videoFormat == VIDEO_MPEG2 ? "MPEG2" : "UNKOWN format",
-	      reply.live ? "live source" : "stored source");
-	      
-      fprintf(stderr, "Video: numS-%d, numG-%d, numF-%d, aveFrameSize-%d\n",
-	      reply.totalHeaders, reply.totalGroups, reply.totalFrames,
-	      reply.averageFrameSize);
-      fprintf(stderr, "Video: maxS-%d, maxG-%d, maxI-%d, maxP-%d, maxB-%d\n",
-              reply.sizeSystemHeader, reply.sizeGop,
-	      reply.sizeIFrame, reply.sizePFrame, reply.sizeBFrame);
-      fprintf(stderr,
-	      "Video: SHinfo: hsize-%d, vsize-%d, pelAspect-%d, rate-%f, vbv-%d.\n",
-	      reply.horizontalSize, reply.verticalSize, reply.pelAspectRatio,
-	      shared->pictureRate, reply.vbvBufferSize);
-      shared->pattern[shared->patternSize] = 0;
-      fprintf(stderr, "Video: firstGopFrames %d, pattern: %s, IframeGap %d\n",
-	      reply.firstGopFrames, reply.pattern, shared->IframeGap);
-      shared->pattern[shared->patternSize] = 'I';
-      if (reply.totalFrames > MAX_FRAMES && (!shared->live))
-      {
-	fprintf(stderr,
-		"Error: totalFrames %d > MAX_FRAMES %d, needs change and recompile.\n",
-		reply.totalFrames, MAX_FRAMES);
-	ComCloseConn(dataSocket);
-	ComCloseConn(videoSocket);
-	videoSocket = -1;
-	return -1;
-      }
-  
-    }
-
-    /* create VB, and put INIT frame to VB*/
-    {
-      int sp[2];  /* sp[0] is for CTR and sp[1] is for VB */
-      
-      /* create command socket pair for sending INIT frame to VB, the pipe
-       should be discard/non-discard in consistent with videoSocket*/
-      if (socketpair(AF_UNIX,
-		     shared->videoMaxPktSize >= 0 ? SOCK_STREAM :
-		     SOCK_DGRAM, 0, sp) == -1)
-      {
-	perror("CTR error on open CTR-VB socketpair");
-	exit(1);
-      }
-      
-      switch (VBpid = fork())
-      {
-      case -1:
-	perror("CTR error on forking VB process");
-	exit(1);
-	break;
-      case 0:
-	if (realTimeFlag) {
-	  SetRTpriority("VB", -1);
-	}
-	free(vh);
-	free(vf);
-	free(ah);
-	free(af);
-	close(sp[0]);
-	ComCloseFd(videoSocket);
-	if (audioSocket >= 0)
-	  ComCloseFd(audioSocket);
-	ABdeleteBuf();
-	VDdeleteBuf();
-	if (cmdSocket >= 0)
-	  close(cmdSocket);
-	if (realTimeFlag >= 2) {
-#ifdef __svr4__
-	  if (SetRTpriority("VB", 0)) realTimeFlag = 0;
-#elif defined(_HPUX_SOURCE)
-	  if (SetRTpriority("VB", 1)) realTimeFlag = 0;
-#endif
-	}
-	VBprocess(sp[1], dataSocket);
-	break;
-      default:
-	close(sp[1]);
-	ComCloseFd(dataSocket);
-	{
-	  int bytes, res;
-	  /* passing all messages of INIT frame to VB here. */
-	  char * buf = (char *)malloc(INET_SOCKET_BUFFER_SIZE);
-	  VideoMessage *msg = (VideoMessage *)buf;
-	  int pkts = 1, msgo = 0, msgs = 0;
-	  
-	  if (buf == NULL) {
-	    perror("CTR error on malloc() for INIT frame");
-	    exit(1);
-	  }
-	  while (msgo + msgs < pkts) {
-	    VideoRead(buf, sizeof(*msg));
-	    pkts = ntohl(msg->packetSize);
-	    msgo = ntohl(msg->msgOffset);
-	    msgs = ntohl(msg->msgSize);
-	    if (shared->videoMaxPktSize >= 0) {  /* non-discard mode */
-	      write_bytes(sp[0], buf, sizeof(*msg));
-	      bytes = msgs;
-	      while (bytes > 0) {
-		int size = min(bytes, INET_SOCKET_BUFFER_SIZE);
-		VideoRead(buf, size);
-		write_bytes(sp[0], buf, size);
-		bytes -= size;
-	      }
-	    }
-	    else {
-	      VideoRead(buf + sizeof(*msg), msgs);
-	      bytes = sizeof(*msg) + msgs;
-	      while ((res = write(sp[0], buf, bytes)) == -1) {
-		if (errno == EINTR || errno == ENOBUFS) continue;
-		perror("CTR error on sending INIT frame to VB");
-		exit(1);
-	      }
-	      if (res < bytes) {
-		fprintf(stderr, "CTR warn: send() res %dB < bytes %dB\n", res, bytes);
-	      }
-	      /*
-		 Fprintf(stderr,
-			 "CTR transferred INIT frame to VB: pkts %d, msgo %d, msgs %d\n",
-			 pkts, msgo, msgs);
-		*/
-	    }
-	  }
-	  read(sp[0], buf, 1); /* read a garbage byte, to sync with VB */
-	  close(sp[0]);
-	  free(buf);
-	}
-	break;
-      }
-    }
-  }
-#ifdef STAT
-  if (shared->config.collectFrameInfo && (!shared->live))
-  {
-    int i;
-    int count = 0;
-    char ch;
-    char buf[100];
-    FILE *fp;
-    
-    for (;;)
-    {
-      sprintf(buf, "struct.%d", count++);
-      if (access(buf, 0))
-        break;
-      if (count > 10000)
-      {
-	fprintf(stderr, "CTR generating struct file, weired thing happened.\n");
-	exit(1);
-      }
-    }
-    fprintf(stderr, "MPEG info collected to %s. . .", buf);
-    fp = fopen(buf, "w");
-    if (fp == NULL)
-    {
-      fprintf(stderr, "CTR failed to open %s for write.\n", buf);
-      perror("");
-      exit(1);
-    }
-    {
-      time_t val = time(NULL);
-      get_hostname(buf, 100);
-      buf[99] = 0;
-      fprintf(fp, "ClientHost: %s\n", buf);
-      fprintf(fp, "Date: %s\n", ctime(&val));
-    }
-    fprintf(fp, "VideoHost: %s\nVideoFile: %s\n", vh, vf);
-    fprintf(fp, "AudioHost: %s\nAudioFile: %s\n\n", ah, af);
-    fprintf(fp, "TotalFrames: %d\nTotalGroups: %d\n",
-	    shared->totalFrames, shared->totalGroups);
-    fprintf(fp, "TotalHeaders: %d\n", shared->totalHeaders);
-    fprintf(fp, "PictureRate: %f\nPictureSize: %d x %d\n",
-	    shared->pictureRate, shared->horizontalSize, shared->verticalSize);
-    fprintf(fp, "AverageFrameSize: %d\n", shared->averageFrameSize);
-    shared->pattern[shared->patternSize] = 0;
-    fprintf(fp, "Pattern(%d frames): %s\n\n", shared->patternSize, shared->pattern);
-    shared->pattern[shared->patternSize] = 'I';
-    {
-      fprintf(fp, "FrameInfo:\n      ");
-      for (i = 0; i < 10; i++)
-        fprintf(fp, " %-6d", i);
-      fprintf(fp, "\n      ----------------------------------------------------");
-      ch = CmdSTATstream;
-      VideoWrite(&ch, 1);
-      for (i = 0; i < shared->totalFrames; i++)
-      {
-	short size;
-	VideoRead(&ch, 1);
-	VideoRead((char*)&size, 2);
-	size = ntohs(size);
-	if (i % 10 == 0)
-          fprintf(fp, "\n%4d: ", i / 10);
-	fprintf(fp, "%c%-6d", ch, (int)size);
-      }
-    }
-  }
-#endif
-  return 0;
-}
-
-static int InitAudioChannel(char * phostname, char * af)
-{
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) InitAudioChannel called\n"));
-  int dataSocket = -1;
-
-  if (!hasAudioDevice)
-  {
-    fprintf(stderr, "CTR warning: Audio device not available, Audio ignored.\n");
-    return -1;
-  }
-
-  if (ComOpenConnPair(phostname, &audioSocket,
-		      &dataSocket, &shared->audioMaxPktSize) == -1) {
-    return -1;
-  }
-  
-  /* Initialize with AS */
-  {
-    INITaudioPara para;
-    INITaudioReply reply;
-    unsigned char tmp;
-    //     tmp = CmdINITaudio;
-    //     AudioWrite(&tmp, 1);
-    para.sn = htonl(shared->cmdsn);
-    para.version = htonl(VERSION);
-    para.para.encodeType = htonl(shared->AFPara.encodeType);
-    para.para.channels = htonl(shared->AFPara.channels);
-    para.para.samplesPerSecond = htonl(shared->AFPara.samplesPerSecond);
-    para.para.bytesPerSample = htonl(shared->AFPara.bytesPerSample);
-    para.nameLength = htonl(strlen(af)+1);
-    /*
-    fprintf(stderr, "AF Audio para: encode %d, ch %d, sps %d, bps %d.\n",
-	    para.para.encodeType, para.para.channels,
-	    para.para.samplesPerSecond, para.para.bytesPerSample);
-     */
-    AudioWrite(&para, sizeof(para));
-    AudioWrite(af, strlen(af)+1);
-    /*
-    fprintf(stderr, "CTR: InitCommand to AS written.\n");
-    */
-    /*
-    AudioRead((char*)&tmp, 1);
-    */
-    errno = 0;
-    if (read(audioSocket, (char*)&tmp, 1) <= 0) {
-      if (errno) {
-	perror("CTR error read first byte from audioSocket");
-      }
-      else {
-	fprintf(stderr, "CTR error: audioSocket closed by AS.\n");
-      }
-      ComCloseConn(audioSocket);
-      ComCloseConn(dataSocket);
-      videoSocket = -1;
-      return -1;
-    }
-    if (tmp == CmdFAIL)
-    {
-      char errmsg[128];
-      read_string(audioSocket, errmsg, 128);
-      fprintf(stderr, "CTR failed to connect to AS: %s\n", errmsg);
-      ComCloseConn(audioSocket);
-      ComCloseConn(dataSocket);
-      audioSocket = -1;
-      return -1;
-    }
-    else
-    {
-      int flag = 1;
-      AudioRead((char*)&reply, sizeof(reply));
-      shared->live += ntohl(reply.live);
-      shared->audioFormat = ntohl(reply.format);
-      shared->audioPara.encodeType = ntohl(reply.para.encodeType);
-      shared->audioPara.channels = ntohl(reply.para.channels);
-      shared->audioPara.samplesPerSecond = ntohl(reply.para.samplesPerSecond);
-      shared->audioPara.bytesPerSample = ntohl(reply.para.bytesPerSample);
-      shared->totalSamples = ntohl(reply.totalSamples);
-      
-      fprintf(stderr, "Audio: samples %d, sps %d, bps %d\n",
-	      shared->totalSamples, shared->AFPara.samplesPerSecond,
-	      shared->AFPara.bytesPerSample);
-      
-      SetAudioParameter(&shared->audioPara);
-    }
-  
-    /* create AB */
-    {
-      switch (ABpid = fork())
-      {
-      case -1:
-	perror("CTR error on forking AB process");
-	exit(1);
-	break;
-      case 0:
-	if (realTimeFlag) {
-	  SetRTpriority("AB", -1);
-	}
-	free(vh);
-	free(vf);
-	free(ah);
-	free(af);
-	ComCloseFd(audioSocket);
-	if (videoSocket >= 0)
-	  ComCloseFd(videoSocket);
-	VBdeleteBuf();
-	VDdeleteBuf();
-	if (cmdSocket >= 0)
-	  close(cmdSocket);
-	if (realTimeFlag >= 2) {
-#ifdef __svr4__
-	  if (SetRTpriority("AB", 0)) realTimeFlag = 0;
-#elif defined(_HPUX_SOURCE)
-	  if (SetRTpriority("AB", 1)) realTimeFlag = 0;
-#endif
-	}
-	ABprocess(dataSocket);
-	break;
-      default:
-	ComCloseFd(dataSocket);
-	ABflushBuf(0);
-	break;
-      }
-    }
-  }
-  return 0;
-}
-
-static void set_speed(void)
-{
-  int val;
-  if (shared->live) {
-    shared->speedPosition = 50;
-  }
-  val = shared->speedPosition;
-  if (val == 0)
-    val = 1;
-  if (shared->cmd == CmdPLAY && audioSocket >= 0 && videoSocket >= 0 && rtplay) {
-    /* limit audio signal period to no more than 1.0 seconds, because AudioFile
-       will block if one send more than 4 seconds of sample ahead of current
-       time. and our timing control is not precise.
-       */
-    double s = ((1.0 / shared->pictureRate) * 50.0) *
-            (double)max(shared->config.framesPerAudioPlay, 1) / 1.0;
-    if (s > 50.0) {
-      fprintf(stderr, "CTR warning: lower value of parameter framesPerAudioPlay,\n");
-      fprintf(stderr, "             otherwise the Player may not work properly.\n");
-    }
-    if (val < s) {
-      if (shared->config.verbose) {
-	if (val < s * 1.0 / 2.0) {
-	  val = (int)s;
-	  fprintf(stderr, "CTR warning: speed too low, set to %d scale val.\n", val);
-	}
-	else {
-	  fprintf(stderr, "CTR warning: audio signal period %3.2f > 1 sec.\n",
-		  1.0 * (float)s / (float) val);
-	  fprintf(stderr, "    lower framesPerAudioPlay or increase speed.\n");
-	}
-      }
-      else {
-	val = (int)s;
-      }
-    }
-  }
-  if (videoSocket >= 0)
-  {
-    float fps;
-    if (val <= 50)
-      fps = shared->pictureRate * (float)val / 50.0;
-    else
-    {
-      float rate = shared->config.maxFPS - shared->pictureRate;
-      fps = shared->pictureRate + (float)rate * (float)(val - 50) / 50.0;
-                    /* only B frames are to be dropped */
-    }
-    Fprintf(stderr, "Play speed video %5.1ffps\n", fps);
-    shared->framesPerSecond = (int)fps;
-    shared->usecPerFrame = (int) (1000000.0/fps);
-    if (audioSocket >= 0)
-    {
-      float sps = shared->audioPara.samplesPerSecond * fps / shared->pictureRate;
-      shared->samplesPerSecond = (int)sps;
-      shared->usecPerSample = (int)(1000000.0/sps);
-    }
-  }
-  else if (audioSocket >= 0)
-  {
-    float sps;
-    if (val <= 50)
-      sps = (float)shared->audioPara.samplesPerSecond * (float)val / 50.0;
-    else
-    {
-      int rate = shared->config.maxSPS - shared->audioPara.samplesPerSecond;
-      sps = shared->audioPara.samplesPerSecond + (float)rate * (float)(val - 50) / 50.0;
-    }
-    Fprintf(stderr, "Play speed audio %5.1fsps\n", sps);
-    shared->samplesPerSecond = (int)sps;
-    shared->usecPerSample = (int)(1000000.0/sps);
-  }
-}
-
-static void init()
-{
-  int i, j;
- 
-  /* try to stop and close previous playing */
-  if (audioSocket >= 0 || videoSocket >= 0)
-  {
-    unsigned char tmp = CmdCLOSE;
-    stop_playing();
-    
-    if (audioSocket >= 0)
-    {
-      if (ABpid > 0) {
-        kill(ABpid, SIGUSR1);
-        ABpid = -1;
-      }
-      usleep(10000);
-      AudioWrite(&tmp, 1);
-      ComCloseConn(audioSocket);
-      audioSocket = -1;
-    }
-    
-    if (videoSocket >= 0)
-    {
-      if (VBpid > 0) {
-        kill(VBpid, SIGUSR1);
-        VBpid = -1;
-      }
-      usleep(10000);
-      VideoWrite(&tmp, 1);
-      ComCloseConn(videoSocket);
-      videoSocket = -1;
-      while ((!VBbufEmpty()) || !VDbufEmpty()) {
-        while (VDpeekMsg() != NULL) {
-          VDreclaimMsg(VDgetMsg());
-        }
-        usleep(10000);
-      }
-      usleep(10000);
-    }
-  }
- 
-  /* read in video/audio files */
-  NewCmd(CmdINIT);
-  CmdRead((char*)&i, 4);
-  CmdRead(vh, i);
-  vh[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(vf, i);
-  vf[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(ah, i);
-  ah[i] = 0;
-  CmdRead((char*)&i, 4);
-  CmdRead(af, i);
-  af[i] = 0;
-  /*
-  fprintf(stderr, "INIT: vh-%s, vf-%s, ah-%s, af-%s\n", vh, vf, ah, af);
-  */
- 
-  shared->live = 0;
-  shared->audioMaxPktSize = !shared->config.audioConn;
-  shared->videoMaxPktSize = !shared->config.videoConn;
-  
-  if (af[0] != 0)
-  {
-    if (InitAudioChannel(ah, af))
-    {
-      audioSocket = -1;
-      shared->totalSamples = 0;
-    }
-    else
-    {
-      shared->nextSample = 0;
-      if (shared->config.maxSPS < shared->audioPara.samplesPerSecond)
-        shared->config.maxSPS < shared->audioPara.samplesPerSecond;
-    }
-  }
-  else
-  {
-    shared->totalSamples = 0;
-    audioSocket = -1;
-  }
-  if (vf[0] != 0)
-  {
-    if (InitVideoChannel(vh, vf))
-    {
-      shared->totalFrames = 0;      /* disable video channel */
-      videoSocket = -1;
-    }
-    else
-    {
-      shared->nextFrame = 1;
-      shared->nextGroup = 0;
-      shared->currentFrame = shared->currentGroup = shared->currentDisplay = 0;
-      if (shared->config.maxFPS < shared->framesPerSecond)
-        shared->config.maxFPS = shared->framesPerSecond;
-    }
-  }
-  else
-  {
-    videoSocket = -1;
-    shared->totalFrames = 0;  /* disable video channel */
-  }
-  if (audioSocket < 0 && videoSocket < 0)  /* none of video/audio channels is setup */
-  {
-    unsigned char tmp = CmdFAIL;
-    CmdWrite(&tmp, 1);
-    /*
-    fprintf(stderr, "CTR initialization failed.\n");
-    */
-    return;
-  }
-  else
-  {
-    unsigned char tmp = CmdDONE;
-    set_speed();
-    if (videoSocket >= 0)
-      wait_display();
-    CmdWrite(&tmp, 1);
-    if (videoSocket < 0)
-    {
-      tmp = CmdVPclearScreen;
-      CmdWrite(&tmp, 1);
-    }
-     return;
-   }
-}
- 
-static void stop(void)
-{
-#ifdef STAT
-  unsigned char preCmd = shared->cmd;
-#endif
-  unsigned char tmp = CmdDONE;
-  /*
-  fprintf(stderr, "CTR: STOP . . .\n");
-  */
-  stop_playing();
- 
-  if (shared->live && videoSocket >= 0) {
-    Fprintf(stderr, "CTR live video stat: average disp frame rate: %5.2f fps\n",
-            shared->pictureRate * displayedFrames / shared->nextFrame);
-  }
-  CmdWrite(&tmp, 1);
-  
-#ifdef STAT
-  if (shared->collectStat && preCmd == CmdPLAY && videoSocket >= 0)
-  {
-    int i;
-    int count = 0;
-    char ch;
-    char buf[100];
-    FILE *fp;
-    
-    for (;;)
-    {
-      sprintf(buf, "stat.%02d", count++);
-      if (access(buf, 0))
-        break;
-      if (count > 10000)
-      {
-        fprintf(stderr, "CTR generating stat file, weired thing happened.\n");
-        exit(1);
-      }
-    }
-    fprintf(stderr, "Statistics is being collected to file %s. . .", buf);
-    fp = fopen(buf, "w");
-    if (fp == NULL)
-    {
-      fprintf(stderr, "CTR failed to open %s for write.\n", buf);
-      perror("");
-      exit(1);
-    }
-    {
-      time_t val = time(NULL);
-      get_hostname(buf, 100);
-      buf[99] = 0;
-      fprintf(fp, "ClientHost: %s\n", buf);
-      fprintf(fp, "Date: %s\n", ctime(&val));
-    }
-    fprintf(fp, "VideoHost: %s\nVideoFile: %s\n", vh, vf);
-    fprintf(fp, "AudioHost: %s\nAudioFile: %s\n\n", ah, af);
-    fprintf(fp, "TotalFrames: %d\nTotalGroups: %d\n",
-            shared->totalFrames, shared->totalGroups);
-    fprintf(fp, "TotalHeaders: %d\n", shared->totalHeaders);
-    fprintf(fp, "PictureRate: %f\nPictureSize: %d x %d\n",
-            shared->pictureRate, shared->horizontalSize, shared->verticalSize);
-    fprintf(fp, "AverageFrameSize: %d\n", shared->averageFrameSize);
-    shared->pattern[shared->patternSize] = 0;
-    fprintf(fp, "Pattern(%d frames): %s\n", shared->patternSize, shared->pattern);
-    shared->pattern[shared->patternSize] = 'I';
- 
-    fprintf(fp, "\nStartPlayRoundTripDelay: %d (millisec)\n",
-            shared->playRoundTripDelay);
-    fprintf(fp, "VBmaxBytes: %d\nVBdroppedFrames: %d\n",
-            shared->stat.VBmaxBytes, shared->stat.VBdroppedFrames);
-    fprintf(fp, "VBemptyTimes: %d\nVDlastFrameDecoded: %d\n",
-            shared->stat.VBemptyTimes, shared->stat.VDlastFrameDecoded);
-    
-    fprintf(fp, "\nVDframesDroppedWithoutReference: %d\n",
-            shared->stat.VDnoRef);
-    fprintf(fp, "VDframesDroppedAgainstSendPattern: %d\n",
-            shared->stat.VDagainstSendPattern);
-    fprintf(fp, "VDIframesDroppedTooLate: %d\n",
-            shared->stat.VDtooLateI);
-    fprintf(fp, "VDPframesDroppedTooLate: %d\n",
-            shared->stat.VDtooLateP);
-    fprintf(fp, "VDBframesDroppedTooLate: %d\n",
-            shared->stat.VDtooLateB);
- 
-    fprintf(fp, "CTRframesDisplayedOnTime: %d\n", shared->stat.CTRdispOnTime);
-    fprintf(fp, "CTRframesDisplayedLate:   %d\n", shared->stat.CTRdispLate);
-    fprintf(fp, "CTRframesDroppedOutOrder: %d\n", shared->stat.CTRdropOutOrder);
-    fprintf(fp, "CTRframesDroppedLate:     %d\n", shared->stat.CTRdropLate);
-    
-    fprintf(fp,
-"\nSpeedChangeHistory:\n(frameId, UPF, FPS, frameRateLimit, frames, dropped):\n");
-    for (i = 0; i < min(speedPtr, SPEEDHIST_SIZE); i ++)
-      fprintf(fp, "%-4d %-6d %6.2f %6.2f %-4d %d\n",
-              speedHistory[i].frameId, speedHistory[i].usecPerFrame,
-              1000000.0 / (double)speedHistory[i].usecPerFrame,
-              speedHistory[i].frameRateLimit,
-              speedHistory[i].frames, speedHistory[i].framesDropped);
-    if (speedPtr > SPEEDHIST_SIZE)
-      fprintf(fp, "Actual speed change times: %d (>%d)\n",
-              speedPtr, SPEEDHIST_SIZE);
- 
-    fprintf(fp, "\nVDbufferFillLevel:\n(frames, times):\n");
-    for (i = 0; i < MAX_VDQUEUE_SIZE; i ++) {
-      if (shared->stat.VDqueue[i]) {
-        fprintf(fp, "%-6d %d\n", i, shared->stat.VDqueue[i]);
-      }
-    }
- 
-    fprintf(fp, "\nVBmessageGap:\n(width, times):\n");
-    {
-      for (i = 0; i <= MSGGAP_MAX  - MSGGAP_MIN; i ++) {
-        if (shared->stat.VBmsgGaps[i]) {
-          fprintf(fp, "%-6d %d\n", i + MSGGAP_MIN, shared->stat.VBmsgGaps[i]);
-        }
-      }
-    }
-    
-    if (shared->stat.fbPacketNumber > 0)
-    {
-      fprintf(fp,
-"\nFeedbackPackets:\n(fId,addUPF,addf,rateLimit,frames,fdropped,advance):\n");
-      for (i = 0; i < min(shared->stat.fbPacketNumber, MAX_FB_PACKETS); i++)
-        fprintf(fp, "%-6d %-6d %-6d %6.2f %4d %4d %d\n",
-                shared->stat.fbPackets[i].frameId,
-                shared->stat.fbPackets[i].addUsecPerFrame,
-                shared->stat.fbPackets[i].addFrames,
-                shared->stat.fbPackets[i].frameRateLimit,
-                shared->stat.fbPackets[i].frames,
-                shared->stat.fbPackets[i].framesDropped,
-                shared->stat.fbPackets[i].advance);
-      if (shared->stat.fbPacketNumber > MAX_FB_PACKETS)
-        fprintf(fp, "Actual # of FB packets: %d\n", shared->stat.fbPacketNumber);
-    }
- 
-    ch = CmdSTATsent;
-    VideoWrite(&ch, 1);
-    fprintf(fp, "\n\nVSFramesSent:\n       ");
-    for (i = 0; i < 8; i++)
-      fprintf(fp, "%-10d", i * 10);
-    fprintf(fp, "\n       -----------------------------------------------------");
-    count = 0;
-    for (i = 0; i < (shared->totalFrames + 7)/8; i ++)
-    {
-      int j;
-      VideoRead(&ch, 1);
-      if (i % 10 == 0)
-        fprintf(fp, "\n%5d: ", i * 8);
-      for (j = 0; j < 8; j++)
-      {
-        if (ch & (1 << j))
-        {
-          count ++;
-          fputc('x', fp);
-        }
-        else
-          fputc('-', fp);
-      }
-    }
-    fprintf(fp, "\nVSTotalFramesSent: %d\n", count);
-    fprintf(fp, "\nVBFramesReceived:\n       ");
-    for (i = 0; i < 8; i++)
-      fprintf(fp, "%-10d", i * 10);
-    fprintf(fp, "\n       -----------------------------------------------------");
-    count = 0;
-    for (i = 0; i < (shared->totalFrames + 7)/8; i ++)
-    {
-      int j;
-      if (i % 10 == 0)
-        fprintf(fp, "\n%5d: ", i * 8);
-      for (j = 0; j < 8; j++)
-      {
-        if (shared->stat.VBframesReceived[i] & (1 << j))
-        {
-          count ++;
-          fputc('x', fp);
-        }
-        else
-          fputc('-', fp);
-      }
-    }
-    fprintf(fp, "\nVBTotalFramesReceived: %d\n", count);
-    fprintf(fp, "\nVDFramesDecoded:\n       ");
-    for (i = 0; i < 8; i++)
-      fprintf(fp, "%-10d", i * 10);
-    fprintf(fp, "\n       -----------------------------------------------------");
-    count = 0;
-    for (i = 0; i < (shared->totalFrames + 7)/8; i ++)
-    {
-      int j;
-      if (i % 10 == 0)
-        fprintf(fp, "\n%5d: ", i * 8);
-      for (j = 0; j < 8; j++)
-      {
-        if (shared->stat.VDframesDecoded[i] & (1 << j))
-        {
-          count ++;
-          fputc('x', fp);
-        }
-        else
-          fputc('-', fp);
-      }
-    }
-    fprintf(fp, "\nVDTotalFramesDecoded: %d\n", count);
-    fprintf(fp, "\nVPFramesDisplayed:\n       ");
-    for (i = 0; i < 8; i++)
-      fprintf(fp, "%-10d", i * 10);
-    fprintf(fp, "\n       -----------------------------------------------------");
-    count = 0;
-    for (i = 0; i < (shared->totalFrames + 7)/8; i ++)
-    {
-      int j;
-      if (i % 10 == 0)
-        fprintf(fp, "\n%5d: ", i * 8);
-      for (j = 0; j < 8; j++)
-      {
-        if (shared->stat.VPframesDisplayed[i] & (1 << j))
-        {
-          count ++;
-          fputc('x', fp);
-        }
-        else
-          fputc('-', fp);
-      }
-    }
-    fprintf(fp, "\nVPTotalFramesDisplayed: %d\n", count);
- 
-    fprintf(fp, "\nVBBufferFillLevelHistory:\n       ");
-    for (i = 0; i < 10; i ++)
-      fprintf(fp, "%-7d", i);
-    fprintf(fp, "\n       -----------------------------------------------------");
-    for (i = 0; i < shared->totalFrames; i++)
-    {
-      if (i % 10 == 0)
-        fprintf(fp, "\n%5d: ", i / 10);
-      if (shared->stat.VBfillLevel[i] == SHRT_MIN)
-        fprintf(fp, "x      ");
-      else
-        fprintf(fp, "%-7d", shared->stat.VBfillLevel[i]);
-    }
-    fprintf(fp, "\nHistoryEnd\n");
-    fclose(fp);
-    fprintf(stderr, "Statistics collecting done.\n");
-  }
-#endif
-  
-  return;
-}
-
-static void ff(void)
-{
-  unsigned char tmp;
-  FFpara para;
-  /*
-  fprintf(stderr, "CTR: FF . . .\n");
-  */
-  if (shared->live) {
-    beep();
-  }
-  else {
-    stop_playing();
-    if (shared->nextGroup < 0)
-      shared->nextGroup = 0;
-    if (videoSocket >= 0 && shared->nextGroup < shared->totalGroups)
-    {
-      NewCmd(CmdFF);
-      shared->needHeader = 0;
-      shared->framesPerSecond = shared->config.ffFPS /
-                             shared->patternSize;
-      shared->usecPerFrame = (int)(1000000.0 / (float)shared->config.ffFPS) *
-                             shared->patternSize;
- 
-      shared->VStimeAdvance =
-          max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-      if (shared->VStimeAdvance < shared->usecPerFrame)
-        shared->VStimeAdvance = shared->usecPerFrame;
- 
-      para.VStimeAdvance = htonl(shared->VStimeAdvance);
-      para.sn = htonl(shared->cmdsn);
-      para.nextGroup = htonl(shared->nextGroup);
-      para.usecPerFrame = htonl(shared->usecPerFrame);
-      para.framesPerSecond = htonl(shared->framesPerSecond);
-      tmp = CmdFF;
-      startTime = get_usec();
-      VideoWrite(&tmp, 1);
-      VideoWrite(&para, sizeof(para));
-      start_timer();
-    }
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return;
-}
-
-static void fb(void)
-{
-  unsigned char tmp;
-  FFpara para;
-  /*
-  fprintf(stderr, "CTR: FB . . .\n");
-  */
-  if (shared->live) {
-    beep();
-  }
-  else {
-    stop_playing();
-    if (shared->nextGroup >= shared->totalGroups)
-      shared->nextGroup = shared->totalGroups - 1;
-    if (videoSocket >= 0 && shared->nextGroup >= 0)
-    {
-      NewCmd(CmdFB);
-      shared->needHeader = 0;
-      shared->framesPerSecond = shared->config.fbFPS /
-                             shared->patternSize;
-      shared->usecPerFrame = (int)(1000000.0 / (float)shared->config.fbFPS) *
-                             shared->patternSize;
- 
-      shared->VStimeAdvance =
-          max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-      if (shared->VStimeAdvance < shared->usecPerFrame)
-        shared->VStimeAdvance = shared->usecPerFrame;
- 
-      para.VStimeAdvance = htonl(shared->VStimeAdvance);
-      para.sn = htonl(shared->cmdsn);
-      para.nextGroup = htonl(shared->nextGroup);
-      para.usecPerFrame = htonl(shared->usecPerFrame);
-      para.framesPerSecond = htonl(shared->framesPerSecond);
-      tmp = CmdFB;
-      startTime = get_usec();
-      VideoWrite(&tmp, 1);
-      VideoWrite(&para, sizeof(para));
-      start_timer();
-    }
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return;
-}
- 
-static void step()
-{
-  unsigned char tmp;
-  STEPpara para;
-  stop_playing();
-  NewCmd(CmdSTEP);
-  if (videoSocket >= 0 && shared->nextFrame <= shared->totalFrames)
-  { /* when shared->nextFrame == shared->totalFrame, it will force VS to send a ENDSEQ,
-       to let VD give out the remaining frame in its ring[] buffer */
-    para.sn = htonl(shared->cmdsn);
-    para.nextFrame = htonl(shared->nextFrame);
-    /*
-    fprintf(stderr, "CTR: STEP . . . frame-%d\n", para.nextFrame);
-    */
-    tmp = CmdSTEP;
-    VideoWrite(&tmp, 1);
-    VideoWrite(&para, sizeof(para));
-    wait_display();
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return;
-}
- 
-static void play(int auto_exp)
-{
-  unsigned char tmp;
-  unsigned ats, vts;
-  int cmdstarted = 0;
-  int stuffsamples = 0;
-  /*
-  fprintf(stderr, "CTR: PLAY . . .\n");
-  */
-  stop_playing();
- 
-  if (!shared->live && !shared->config.rt && videoSocket >= 0) {
-    /* rtplay turned off only when video avaible and not want RT play */
-    rtplay = 0;
-    fprintf(stderr, "VCR is not playing at in realtime mode, audio disabled\n");
-  }
-  else {
-    rtplay = 1;
-  }
-  
-  if (shared->live) {
-    rtplay = 1;
-    shared->nextFrame = 0;
-    shared->nextSample = 0;
-  }
- 
-  shared->rtplay = rtplay;
-  
-  if (shared->nextFrame < 0)
-    shared->nextFrame = 0;
-  else if (shared->nextFrame >= shared->totalFrames)
-    shared->nextFrame = shared->totalFrames - 1;
- 
-  if (audioSocket >= 0 && shared->nextSample < shared->totalSamples && rtplay)
-  {
-    PLAYaudioPara para;
-    if (cmdstarted == 0)
-    {
-      NewCmd(CmdPLAY);
-      if (!auto_exp) set_speed();
-      cmdstarted = 1;
-    }
- 
-    if (videoSocket >= 0 && rtplay && !shared->live) {
-      /* video channel also active, recompute nextSample */
-      shared->nextSample =(int) ((double)shared->audioPara.samplesPerSecond *
-                           ((double)shared->nextFrame / shared->pictureRate));
-      shared->nextSample += shared->config.audioOffset;
-      if (shared->nextSample < 0) {
-        stuffsamples = (- shared->nextSample);
-        shared->nextSample = 0;
-      }
-      else if (shared->nextSample >= shared->totalSamples)
-        shared->nextSample = shared->totalSamples - 1;
-    }
- 
-    ABflushBuf(shared->nextSample);
-    
-    para.sn = htonl(shared->cmdsn);
-    para.nextSample = htonl(shared->nextSample);
-    para.samplesPerSecond = htonl(shared->samplesPerSecond);
-    para.samplesPerPacket = htonl(1024 / shared->audioPara.bytesPerSample);
-    para.ABsamples = htonl(AB_BUF_SIZE / shared->audioPara.bytesPerSample);
-    para.spslimit = htonl(32000);
-    
-    startTime = get_usec();
-    tmp = CmdPLAY;
-    AudioWrite(&tmp, 1);
-    AudioWrite(&para, sizeof(para));
-    read_int(audioSocket, (int *)&ats);
-  }
- 
-  if (videoSocket >= 0 && shared->nextFrame < shared->totalFrames)
-  {
-    PLAYpara para;
-    if (cmdstarted == 0)
-    {
-      NewCmd(CmdPLAY);
-      if (!auto_exp) set_speed();
-      cmdstarted = 1;
-    }
-    shared->VBheadFrame = -1;
-    shared->needHeader = 0;
-    {
-      int i = shared->config.maxSPframes;
-      i = (int) ((double)i * (1000000.0 / (double)shared->usecPerFrame) /
-          shared->pictureRate);
-      shared->sendPatternGops = max(min(i, PATTERN_SIZE) / shared->patternSize, 1);
-    }
-    cmdstarted = 1;
-#ifdef STAT
-    shared->collectStat = (shared->config.collectStat && (!shared->live));
-    if (shared->collectStat)
-    {
-      int i;
-      memset(&(shared->stat), 0, sizeof(shared->stat));
-      shared->stat.VDlastFrameDecoded = (unsigned)-1;
-      for (i = 0; i < MAX_FRAMES; i++)
-        shared->stat.VBfillLevel[i] = SHRT_MIN;
-      speedPtr = 0;
-    }
-#endif
-    shared->VStimeAdvance =
-        max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
-    if (shared->VStimeAdvance < shared->usecPerFrame)
-      shared->VStimeAdvance = shared->usecPerFrame;
-    
-    para.VStimeAdvance = htonl(shared->VStimeAdvance);
-    para.sn = htonl(shared->cmdsn);
-    para.nextFrame = htonl(shared->nextFrame);
-    para.usecPerFrame = htonl(shared->usecPerFrame);
-    para.framesPerSecond = htonl(shared->framesPerSecond);
-    para.collectStat = htonl(shared->collectStat);
-    frate = shared->config.frameRateLimit;
-    if (frate <= 0.0) {
-      frate = 1.0;
-    }
-    shared->frameRateLimit = frate;
-    para.frameRateLimit1000 =
-           htonl((long)(shared->frameRateLimit * 1000.0));
-    compute_sendPattern();
-    para.sendPatternGops = htonl(shared->sendPatternGops);
-    memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
-    startTime = get_usec();
-    tmp = CmdPLAY;
-    VideoWrite(&tmp, 1);
-    VideoWrite(&para, sizeof(para));
-    read_int(videoSocket, (int *)&vts);
- 
-    if (shared->config.qosEffective) {
-      /*
-      fprintf(stderr, "CTR start FeedBack with init frameRateLimit %lf\n",
-              frate);
-      */
-      maxfr = frate;    /* max frame rate all the time during one playback */
-      minupf = (int) (1000000.0 / maxfr);  /* min usec-per-frame all the time
-                                      during one playback */
-      maxrate = (double)minupf / (double)max(shared->usecPerFrame, minupf);
-                /* this is current max frame rate in percentage against 'maxfr',
-                   current max frame rate is the lower of 'maxfr' and play speed */
-      frate = 1.0; /* current sending frame rate, in percentage against 'maxfr'
-                    This value is set with init value as 1.0, so that if current
-                    speed is lower than frameRateLimit, no frames are dropped,
-                    then when play speed increases frame rate will increase
-                    accordingly until frames are dropped*/
-      adjstep = ((double)minupf / (double)shared->usecPerFrame) /
-          (double)max(shared->patternSize * shared->sendPatternGops, 5);
-               /* adjust step for current play speed, in percentage against
-                  'maxfr' */
-      
-      fbstate = 1;
-      fb_startup = 1;
-      
-      /*
-      fprintf(stderr, "CTR init frate: %lf minupf %d, shared->upf %d\n",
-              frate, minupf, shared->usecPerFrame);
-       */
-    }
-  }
-  
-  if (shared->live && (videoSocket >= 0) && (audioSocket >= 0)) {
-    int gap = get_duration(ats, vts);
-    if (gap < 0 || gap >= 5000000) {
-      Fprintf(stderr, "Error for live source: ats %u, vts %u, gap %d\n",
-              ats, vts, gap);
-    }
-    else {
-      int skipped = gap * shared->audioPara.samplesPerSecond / 1000000;
-      skipped += shared->config.audioOffset;
-      ABskipSamples(skipped);
-      Fprintf(stderr, "Live source: skipped %d audio samples\n", skipped);
-    }
-  }
-  else if (stuffsamples) {
-    ABskipSamples(-stuffsamples);
-  }
-  if (cmdstarted)
-    start_timer();
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return;
-}
- 
-static void position_action(int operation_tag)
-{
-  int val;
-  unsigned char tmp = CmdDONE;
-  CmdRead((char*)&val, 4);
-  if (shared->live) {
-    beep();
-  }
-  else {
-    shared->locationPosition = val;
-    stop_playing();
-    NewCmd(CmdPOSITION);
-    if (videoSocket >= 0)
-    {
-      int gop = shared->nextGroup;
-      POSITIONpara para;
-      shared->nextGroup = ((shared->totalGroups-1) * val) / POSITION_RANGE;
-      /*
-      fprintf(stderr, "CTR: POSITION%s %d (nextGop %d). . .\n",
-              operation_tag ? "_released" : "", val, shared->nextGroup);
-      */
-      if (gop != shared->nextGroup || operation_tag)
-      {
-        shared->nextFrame = ((shared->totalFrames-1) * val) / POSITION_RANGE;
-        para.sn = htonl(shared->cmdsn);
-        para.nextGroup = htonl(shared->nextGroup);
-        tmp = CmdPOSITION;
-        VideoWrite(&tmp, 1);
-        VideoWrite(&para, sizeof(para));
-        if (operation_tag)  /* release or LOOPrewind */
-          wait_display();
-      }
-      if (operation_tag && audioSocket >= 0) /* needs to adjust audio position */
-      {
-        shared->nextSample = (int)((double)shared->audioPara.samplesPerSecond *
-                             ((double)shared->nextFrame / shared->pictureRate));
-      }
-    }
-    else if (audioSocket >= 0)
-      shared->nextSample  = (shared->totalSamples-1) * val / POSITION_RANGE;
-  }
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  return;
-}
- 
-static void position()
-{
-  position_action(0);
-}
- 
-static void position_release()
-{
-  position_action(1);
-}
- 
-static void volume()
-{
-  CmdRead((char *)&shared->volumePosition, 4);
-  if (audioSocket >= 0) {
-    SetAudioGain();
-  }
-  /*
-  unsigned char tmp = CmdDONE;
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  */
-  return;
-}
- 
-static void balance()
-{
-  CmdRead((char *)&shared->balancePosition, 4);
-  /*
-  unsigned char tmp = CmdDONE;
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  */
-  return;
-}
- 
-static void speed(void)
-{
-  unsigned char tmp;
-  CmdRead((char *)&shared->speedPosition, 4);
-  set_speed();
-  if (!shared->live && shared->cmd == CmdPLAY)
-  {
-    if (videoSocket >= 0) {
-      SPEEDpara para;
-      para.sn = htonl(shared->cmdsn);
-      para.usecPerFrame = htonl(shared->usecPerFrame);
-      para.framesPerSecond = htonl(shared->framesPerSecond);
-      para.frameRateLimit1000 =
-                  htonl((long)(shared->frameRateLimit * 1000.0));
-      {
-        int i = shared->config.maxSPframes;
-        i = (int) ((double)i * (1000000.0 / (double)shared->usecPerFrame) /
-            shared->pictureRate);
-        shared->sendPatternGops = max(min(i, PATTERN_SIZE) / shared->patternSize, 1);
-      }
-      compute_sendPattern();
-      para.sendPatternGops = htonl(shared->sendPatternGops);
-      memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
-      tmp = CmdSPEED;
-      VideoWrite(&tmp, 1);
-      VideoWrite(&para, sizeof(para));
-      if (fbstate) {
-        maxrate = (double)minupf / (double)max(shared->usecPerFrame, minupf);
-        adjstep = ((double)minupf / (double)shared->usecPerFrame) /
-            (double)max(shared->patternSize * shared->sendPatternGops, 5);
-        fbstate = 1;
-      }
-    }
-    if (audioSocket >= 0) {
-      SPEEDaudioPara para;
-      para.sn = htonl(shared->cmdsn);
-      para.samplesPerSecond = htonl(shared->samplesPerSecond);
-      para.samplesPerPacket = htonl(1024 / shared->audioPara.bytesPerSample);
-      para.spslimit = htonl(32000);
-      tmp = CmdSPEED;
-      AudioWrite(&tmp, 1);
-      AudioWrite(&para, sizeof(para));
-    }
-    /*
-    timer_speed();
-    */
-  }
-  /*
-  tmp = CmdDONE;
-  CmdWrite(&tmp, 1);
-  */
-  return;
-}
-
-static int timer_on = 0;     
-static int timer_signals_skip = 0;
-static int timerCount = 0;   
-static int lastCount = 0;    
-static int timerUPF;         
-static int wait_usr2 = 0;    
-static int last_disp_fid = 0;
-
-static void stop_playing(void)
-{
-  unsigned char precmd = shared->cmd;
-  
-  if (precmd == CmdFF || precmd == CmdFB || precmd == CmdPLAY)
-  {
- 
-    unsigned char tmp = CmdSTOP;
-    NewCmd(CmdSTOP);
-    
-    /* notify AS and/or VS */
-    if (audioSocket >= 0 && precmd == CmdPLAY && rtplay)
-    {
-      int cmdsn = htonl(shared->cmdsn);
-      AudioWrite(&tmp, 1);
-      AudioWrite(&cmdsn, 4);
-    }
-    if (videoSocket >= 0)
-    {
-      // CORBA call
-      int cmdsn = htonl(shared->cmdsn);
-      VideoWrite(&tmp, 1);
-      VideoWrite(&cmdsn, 4);
-    }
-    
-    /* stop timer and sleep for a while */
-    stop_timer();
-    usleep(100000);
- 
-    /* purge VDbuf and audio channel from AS*/
-    if (videoSocket >= 0)
-    {
-      while (VDpeekMsg() != NULL)
-        VDreclaimMsg(VDgetMsg());
-      /*
-      Fprintf(stderr, "CTR: VDbuf purged.\n");
-      */
-      fbstate = 0;
-      
-    }
-    
-    /* adjust some info */
-    if (precmd == CmdPLAY && videoSocket >= 0)
-      shared->nextFrame = shared->currentFrame+1;
-    else
-      shared->nextGroup = shared->currentGroup + 1;
-  }
-}
- 
-static void loopBack(void)
-{
-  static char loopBackCmd[7] = {CmdSTOP, CmdPOSITIONrelease,
-                                0, 0, 0, 0, CmdPLAY};
-  cmdBuffer = loopBackCmd;
-  cmdBytes = 7;
-  cmdAcks = 3;
-}
- 
-void TimerHandler(int sig)
-{
-  int currentUPF = shared->currentUPF;
-  /*
-  Fprintf(stderr, "CTR in TimerHandler.\n");
-  */
-  if (videoSocket >= 0 && shared->cmd == CmdPLAY && currentUPF != timerUPF)
-  {
-    struct itimerval val;
-    {
-      val.it_interval.tv_sec =  val.it_value.tv_sec = currentUPF / 1000000;
-      val.it_interval.tv_usec = val.it_value.tv_usec = currentUPF % 1000000;
-      setitimer(ITIMER_REAL, &val, NULL);
-      /*
-      fprintf(stderr, "CTR: timer speed changed to %d upf.\n", shared->currentUPF);
-      */
-    }
-    timerUPF = currentUPF;
-#ifdef STAT
-    if (shared->collectStat && speedPtr < SPEEDHIST_SIZE)
-    {
-      speedHistory[speedPtr].frameId = shared->nextFrame;
-      speedHistory[speedPtr].usecPerFrame = timerUPF;
-      speedHistory[speedPtr].frameRateLimit = shared->frameRateLimit;
-      speedHistory[speedPtr].frames = shared->sendPatternGops * shared->patternSize;
-      speedHistory[speedPtr].framesDropped = shared->framesDropped;
-    }
-    speedPtr ++;
-#endif
-  }
-  /*
-  fprintf(stderr, "+\n");
-  */
-  if (!timerCount) {
-    int addedVSwat;
-    if (shared->cmd == CmdPLAY) {
-      addedVSwat = shared->usecPerFrame * (shared->VBheadFrame - shared->nextFrame);
-    }
-    else if (shared->cmd == CmdFF) {
-      addedVSwat = shared->usecPerFrame * (shared->VBheadFrame - shared->nextGroup);
-    }
-    else { /* shared->cmd == CmdFB */
-      addedVSwat = shared->usecPerFrame * (shared->nextGroup - shared->VBheadFrame);
-    }
-    shared->VStimeAdvance += addedVSwat;
-  }
-  timerCount += timer_signals_skip + 1;
-  timer_signals_skip = 0;
-  
-  if (shared->live ) {
-    if (audioSocket <= 0) {  /* video only */
-      unsigned t = shared->VBheadFrame - startVSA;
-      if (timerCount < t) {
-        /*
-        Fprintf(stderr, "CTR: (av) timerCount %d, t %d\n", timerCount, t);
-        */
-        timerCount = t;
-      }
-    }
-    /* audio involved,  TimerProcessing() will adjust the rate automatically */
-  }
-}
- 
-static void DisplayPicture(void)
-{
-  int toDisplay = 1;
-  int count = timerCount;
-  
-  if ((shared->cmd != CmdPLAY &&
-       shared->cmd != CmdFF &&
-       shared->cmd != CmdFB) ||
-      lastCount == count)
-    return;
-  if (timer_on >4)   /* 4 is a magic number */
-  {
-    stop_timer();
- 
-    /* tries to rewind and play again */
-    if (shared->cmd == CmdPLAY && shared->loopBack)
-      loopBack();
- 
-    return;
-  }
-  /*
-  Fprintf(stderr, "CTR in diplayPicture().\n");
-  */
-  {
-    int i, j;
-    FrameBlock *buf, *next;
-#if 0
-    if (shared->cmd == CmdPLAY && rtplay &&
-        (i = shared->nextFrame - shared->firstGopFrames) > 0) {
-      j = (i / shared->patternSize) % shared->sendPatternGops;
-      i %= shared->patternSize;
-      if (shared->pattern[i] != 'B') {
-        while (i > 0) {
-          if (shared->pattern[--i] != 'B') break;
-        }
-      }
-      toDisplay = (shared->sendPattern + j * shared->patternSize)[i];
-    }
-    else if (shared->cmd != CmdPLAY) {
-      if (last_disp_fid != shared->nextGroup) toDisplay = 1;
-      else toDisplay = 0;
-    }
-    if (toDisplay)
-#endif
-    {
-      if (shared->cmd == CmdPLAY && !rtplay) {  /* if play with best effort */
-        while (VDcheckMsg() <= 0)  /* keep sleeping for 10 millisec until a decoded
-                                      frame show up in VD buffer */
-          usleep(10000);
-      }
-#ifdef STAT
-      if (shared->collectStat)
-      {
-        shared->stat.VBfillLevel[shared->nextFrame] =
-            shared->VBheadFrame - shared->nextFrame;
-        i = VDcheckMsg();
-        if (i < 0) i = 0;
-        else if (i >= MAX_VDQUEUE_SIZE) i = MAX_VDQUEUE_SIZE - 1;
-        shared->stat.VDqueue[i] ++;
-      }
-#endif
-      toDisplay = 0;
-      for (;;)
-      {
-        buf = VDpeekMsg();
- 
-        if (buf == NULL) {
-          goto loop_end;
-        }
- 
-        switch (shared->cmd)
-        {
-          int position;
-        case CmdPLAY:
-          position = shared->nextFrame;
-          /*
-          Fprintf(stderr, "CTR PLAY: buf->display %d, position %d\n",
-                  buf->display, position);
-          */
-          if (buf->display == position)
-          {  /* display it */
-            buf = VDgetMsg();
-            shared->nextGroup = buf->gop + 1;
-#ifdef STAT
-            shared->stat.CTRdispOnTime ++;
-#endif
-            goto display_picture;
-          }
-          else if (buf->display > position)
-          {  /* too early, wait for future display */
-            goto loop_end;
-          }
-          else  /* this picture too late */
-          {
-            // this line gets the buffer or dequeues from the shared memory queue
-            buf = VDgetMsg();
-            if (((next = VDpeekMsg()) == NULL || next->display > position) &&
-                buf->display > last_disp_fid) {
-#ifdef STAT
-              shared->stat.CTRdispLate ++;
-#endif
-              /* buf is the last one, or next too to early, display it anyway */
-              goto display_picture;
-            }
-            else   /* next not too early, discard buf */
-            {
-#ifdef STAT
-              if (buf->display < last_disp_fid)
-                shared->stat.CTRdropOutOrder ++;
-              else
-                shared->stat.CTRdropLate ++;
-#endif
-              /*
-              Fprintf(stderr, "CTR drops frame display=%d, shared->nextFrame=%d\n",
-                      buf->display, shared->nextFrame);
-              */
-              VDreclaimMsg(buf);
-              continue;
-            }
-          }
-          break;
-        case CmdFF:
-          position = shared->nextGroup;
-          if (buf->gop == position)
-          {  /* display it */
-            buf = VDgetMsg();
-            shared->nextFrame = buf->display;
-            goto display_picture;
-          }
-          else if (buf->gop > position)
-          {  /* hold it for future display */
-            goto loop_end;
-          }
-          else   /* discard late picture */
-          {
-            buf = VDgetMsg();
-            if ((next = VDpeekMsg()) == NULL || next->gop > position)
-              /* buf is the last one, or next too to early, display it anyway */
-              goto display_picture;
-            else   /* next not too early, discard buf */
-            {
-              VDreclaimMsg(buf);
-              continue;
-            }
-          }
-          break;
-        case CmdFB:
-          position = shared->nextGroup;
-          if (buf->gop == position)
-          {  /* display it */
-            buf = VDgetMsg();
-            shared->nextFrame = buf->display;
-            goto display_picture;
-          }
-          else if (buf->gop < position)
-          {  /* hold it for future display */
-            goto loop_end;
-          }
-          else   /* discard late picture */
-          {
-            buf = VDgetMsg();
-            if ((next = VDpeekMsg()) == NULL || next->gop < position)
-              /* buf is the last one, or next too to early, display it anyway */
-              goto display_picture;
-            else   /* next not too early, discard buf */
-            {
-              VDreclaimMsg(buf);
-              continue;
-            }
-          }
-          break;
-        default:
-          goto loop_end;
-        }
-      }
-    display_picture:
-      toDisplay = 1;
-      if (shared->cmd == CmdPLAY) last_disp_fid = buf->display;
-      else last_disp_fid = buf->gop;
-#ifdef STAT
-      if (shared->live) displayedFrames ++;
-      if (shared->collectStat)
-        shared->stat.VPframesDisplayed[buf->display >> 3] |= 1 << (buf->display % 8);
-#endif
-      {
-        unsigned char tmp = CmdVPdisplayFrame;
-        CmdWrite(&tmp, 1);
-      }
-      CmdWrite((unsigned char *)&buf, sizeof(char *));
-    loop_end:;
-    }
-  }
-  
-  if (shared->cmd == CmdPLAY)
-  {
-    shared->nextFrame += rtplay ? count - lastCount : 1;
-    if (shared->nextFrame >= shared->totalFrames)
-    {
-      timer_on ++;
-      shared->nextFrame = shared->totalFrames;
-    }
-    
-    /* following is frameRate feedback algorithm */
-    if (fbstate && toDisplay && rtplay) {
-      static Filter *fr = NULL;  /* frame-rate filter */
-      static int start;  /* feedback action time, in microseconds */
-      static int delay;  /* time to delay after each action, and to charge
-                          the filter after action-delay */
-      static int pretime; /* time of previous frame, in microseconds */
-      static int throw_outlier = 0;
-      /* tag to throw away outlier. In case there are outliers, this
-         tag is flipped by the algorithm, so that If there are two
-         consecutive sample deviating very much from the filtered mean
-         value, the second is not considered outlier. This may mean
-         that the frame rate has dropped significantly. */
-      static double vr; /* filtered frame-rate value, in microseconds/frame */
-      double r, nr;
-      int t = get_usec();
- 
-      switch (fbstate) {
-      case 3:  /* working, monitoring */
-        {
-          int interval = get_duration(pretime, t);
-          if (throw_outlier) {
-            if (interval >> 2 >= vr) {
-              /* at least four times the filtered mean value to be
-                 considered outlier */
-              /* In case an outlier is detected and thrown away, then
-                 the following sample will never be classified as an
-                 outlier, and the current time is recorded */
-              throw_outlier = 0;
-              pretime = t;
-              Fprintf(stderr, "CTR detected a gap %d (vr = %d) us\n",
-                      interval, (int)vr);
-              break;
-            }
-          }
-          else {
-            throw_outlier = 1;
-          }
-          vr = DoFilter(fr, (double)interval);
-        }
-        pretime = t;
- 
-        r = minupf / vr; /* convert the display fps to percentage of maxfr */
-        
-        nr = 0; /* This variable contains the newly computed server frame rate */
- 
-        /* let nr oscillate around 1.5 ~ 2.5 */
-        if (min(frate, maxrate) - r >= 3.0 * adjstep) {
-          /* pipeline is considered overloaded if server fps is more than 3 adjsteps
-           higher than display fps */
-          nr = min(frate, maxrate) - adjstep; /* slow down server frame rate
-                                                 one step */
-          if (fb_startup) {  /* startup feedback action: jump set the server fps
-                                to a value close to actually measure display
-                                frame rate */
-            fb_startup = 0;
-            while (nr >= r + 2.5 * adjstep) {
-              nr -= adjstep;
-            }
-          }
-        }
-        else if (frate - r <= 0.5 * adjstep && frate < maxrate) {
-          /* pipeline load is considered too light if the server frame rate
-             is less than 0.5fps higher than display frame rate, while the server
-             fps is no maximum yet. The server fps then is stepped up. */
-          nr = min(frate + adjstep, maxrate);
-        }
-        if (nr > 0) { /* nr = 0 if not feedback action needs to be taken */
-          shared->frameRateLimit = maxfr * nr;
-          compute_sendPattern();
-          /*
-          fprintf(stderr,
-            "CTR adjust frameRate to %lf, vr=%lf minupf=%d, r=%lf, frate=%lf, nr=%lf\n",
-                  shared->frameRateLimit, vr, minupf, r, frate, nr);
-           */
-          frate = nr;  /* remember new server frame rate */
-          shared->qosRecomputes ++;
-          start = t;  /* remember the action time */
-          /* delay for some time before restarts, to let feedback take effect */
-          delay = shared->usecPerFrame * (shared->VBheadFrame - shared->nextFrame) +
-                  shared->playRoundTripDelay;
-          if (delay < 0) delay = shared->usecPerFrame;
-          fbstate = 4;
-        }
-        break;
-      case 4:  /* delay and reset after action*/
-        if (get_duration(start, t) >= delay) {
-          /*
-          fprintf(stderr,
-                  "CTR VB from s2 to s3, vr %lf, frate %lf, maxrate %lf, step %lf\n",
-                  vr, frate, maxrate, adjstep);
-           */
-          fr = ResetFilter(fr, shared->config.filterPara >= 1 ?
-                           shared->config.filterPara : 100);
-          delay = shared->usecPerFrame *
-                  max(shared->sendPatternGops * shared->patternSize,
-                      shared->config.filterPara);
-                  /* charge filter for time */
-          start = pretime = t;
-          throw_outlier = 0;
-          fbstate = 2;
-        }
-        break;
-      case 2:  /* charge the filter */
-        {
-          int interval = get_duration(pretime, t);
-          if (throw_outlier) {
-            if (interval >> 2 >= vr) {  /* at least four times the previous average */
-              throw_outlier = 0;
-              pretime = t;
-              Fprintf(stderr, "CTR detected a gap %d (vr = %d) us\n",
-                      interval, (int)vr);
-              break;
-            }
-          }
-          else {
-            throw_outlier = 1;
-          }
-          vr = DoFilter(fr, (double)interval);
-        }
-        pretime = t;
-        if (get_duration(start, t) >= delay) {
-          /*
-          fprintf(stderr,
-                  "CTR VB from s2 to s3, vr %lf, frate %lf, maxrate %lf, step %lf\n",
-                  vr, frate, maxrate, adjstep);
-           */
-          fbstate = 3;
-        }
-        break;
-      case 1:  /* start or speed change, wait until speed data consistant */
-        if (shared->currentUPF == shared->usecPerFrame) {
-          if (fr == NULL) {
-            fr = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-                          shared->config.filterPara : 100);
-          }
-          else {
-            fr = ResetFilter(fr, shared->config.filterPara >= 1 ?
-                            shared->config.filterPara : 100);
-          }
-          if (fr == NULL) {
-            perror("CTR failed to allocate space for fr filter");
-            fbstate = 0;
-          }
-          vr = DoFilter(fr, (double)shared->usecPerFrame);
-          delay = shared->usecPerFrame *
-                  shared->sendPatternGops * shared->patternSize;
-                  /* charge filter for some time */
-          pretime = start = t;
-          throw_outlier = 0;
-          fbstate = 2;
-        }
-        break;
-      default:
-        fprintf(stderr, "CTR error: unknown feedback state: %d\n", fbstate);
-        fbstate = 1;
-        break;
-      }
-    }
-    /* end of frame rate control algorithm */
-    
-  }
-  else if (shared->cmd == CmdFF)
-  {
-    shared->nextGroup += count - lastCount;
-    if (shared->nextGroup >= shared->totalGroups)
-    {
-      timer_on ++;
-      shared->nextGroup = shared->totalGroups - 1;
-    }
-  }
-  else
-  {
-    shared->nextGroup -= count - lastCount;
-    if (shared->nextGroup < 0)
-    {
-      timer_on ++;
-      shared->nextGroup = 0;
-    }
-  }
-  lastCount = count;
-}
- 
-#define AUDIO_BUFSIZE   2048
- 
-static int audioCount = 0;
-static int audioFirst = 0;
-static int needAudioSkip = 0;
-static int bufferedSamples;
-static int nextASSample, startSample;
-static unsigned int nextAFtime;
-static int forward, forwardDelta;
-static int audioForward, framesPerAudioPlay;
-static int AudioBufSize;
-static char * rawBuf = NULL, * workBuf = NULL, * convBuf = NULL;
- 
-static void PlayAudioInit(void)
-{
-  audioCount = -1;
-  audioFirst = 1;
-  needAudioSkip = 0;
-  startSample = nextASSample = shared->nextSample;
-  audioForward = shared->config.audioForward;
-  framesPerAudioPlay = max(shared->config.framesPerAudioPlay, 1);
-  if (audioForward <= 0)
-    audioForward = DEFAULT_audioForward;
-  fprintf(stderr, "CTR audioForward: %d samples.\n", audioForward);
-  bufferedSamples = (int)(((double)
-                     (shared->config.audioTimerDuration *
-                      shared->config.audioBufferedIntervals))
-                    * (double)shared->audioPara.samplesPerSecond / 1000.0);
-  if (rawBuf == NULL)
-  {
-    if ((rawBuf = (char *)malloc(AUDIO_BUFSIZE)) == NULL)
-    {
-      perror("CTR fails to allocate rawBuf for audio channel");
-      exit(1);
-    }
-     if ((workBuf = (char *)malloc(AUDIO_BUFSIZE)) == NULL)
-    {
-      perror("CTR fails to allocate workBuf for audio channel");
-      exit(1);
-    }
-  }
-  AudioBufSize = (AUDIO_BUFSIZE / shared->audioPara.bytesPerSample) *
-                 shared->audioPara.bytesPerSample;
- 
-  StartAudioPlaySession();
-}
- 
-/* input the number of samples in the raw buffer,
-   returns the numberof samples in theconverted buffer */
-static int AudioConvert(int len)
-{
-  int convLen;
-  
-  if (shared->samplesPerSecond == shared->audioPara.samplesPerSecond)
-  {
-    convBuf = rawBuf;
-    return len;
-  }
-  
-  convBuf = workBuf;
-  convLen = len * shared->audioPara.samplesPerSecond / shared->samplesPerSecond;
-  AudioInterpolate(rawBuf, len, convBuf, convLen);
-  return convLen;
-}
- 
-static void PlayAudioOnly(void)
-{
-  int maxSize;
-  int size, csize;  /* all in samples */
-  unsigned int AFtime;
-  
-  if (audioFirst)
-  {
-    audioFirst = 0;
-    nextAFtime = GetAudioTime() + audioForward;
-  }
-  else
-    if ((int)(nextAFtime - GetAudioTime()) >= bufferedSamples)
-      return;
-  
-  if (timer_on >4)
-  {
-    stop_timer();
-    
-    /* tries to rewind and play again */
-    if (shared->loopBack)
-    {
-      /*
-      fprintf(stderr, "CTR: trying loopBack().\n");
-      */
-      loopBack();
-    }
- 
-    return;
-  }
-  if (nextASSample >= shared->totalSamples)
-  {
-    timer_on ++;
-    return;
-  }
-  if (shared->samplesPerSecond >= shared->audioPara.samplesPerSecond)
-    maxSize = (AudioBufSize/shared->audioPara.bytesPerSample);
-  else
-    maxSize = ((AudioBufSize/shared->audioPara.bytesPerSample) *
-               shared->samplesPerSecond) /
-              shared->audioPara.samplesPerSecond;
-  for (;;)
-  {
-    size = ABgetSamples(rawBuf, maxSize);
-    csize = AudioConvert(size);
-    AFtime = PlayAudioSamples(nextAFtime, convBuf, csize);
-    nextASSample += size;
-    shared->nextSample += size;
-    nextAFtime += csize;
-    if ((int)(nextAFtime - AFtime) < 0)
-      nextAFtime = AFtime;
-    if (nextASSample >= shared->totalSamples)
-    {
-      timer_on ++;
-      break;
-    }
-    /*
-    Fprintf(stderr, "CTR: nextAFtime:%d, AFtime:%d, bufferedSamples:%d\n",
-            nextAFtime, AFtime, bufferedSamples);
-            */
-    if ((int)(nextAFtime - AFtime) >= bufferedSamples)
-      break;
-  }
-  {
-    unsigned char tmp = CmdVPaudioPosition;
-    CmdWrite(&tmp, 1);
-  }
-}
- 
-/* returns: 0 - no forward calculated , 1 - forward calculated */
-static int PlayAudio(void)
-{
-  int timer_count = timerCount;
-  int i = timer_count / framesPerAudioPlay;
-  if (audioFirst)
-  {
-    audioFirst = 0;
-    nextAFtime = GetAudioTime() + audioForward;;
-    audioCount = -1; /* guarantee that PlayAudio do the first step */
-  }
-  if (audioCount == i)  /* current audio timer signal already processed */
-    return 0;
-  if (audioCount < i - 1) /* some audio timer signal missing */
-  {
-    needAudioSkip = 1;
-    /*
-    Fprintf(stderr, "CTR: some audio timer signal missed.\n");
-    */
-  }
-  if (nextASSample >= shared->totalSamples)
-  {
-    /*
-       timer_on ++;
-       */
-    return 0;
-  }
-  
-  audioCount = i;
- 
-  if (needAudioSkip)
-  {
-    /* return if not enough skip can be done */
-    int next_sample = (int)(startSample +
-                      ((double)timer_count / shared->pictureRate) *
-                      shared->audioPara.samplesPerSecond);
-    int skip_samples = next_sample - nextASSample;
-    ABskipSamples(skip_samples);
-    nextAFtime += (unsigned int)(((double)skip_samples *
-                   (double)shared->audioPara.samplesPerSecond) /
-                  (double)shared->samplesPerSecond);
-    nextASSample += skip_samples;
-    needAudioSkip = 0;
-  }
-  
-  /* read current block, convert, put to AF, and update nextAFtime */
-  {
-    int frame_samples = (int)(startSample +
-                        ((double)(timer_count + framesPerAudioPlay) / shared->pictureRate) *
-                        (double)shared->audioPara.samplesPerSecond -
-                        nextASSample);
-    int fsize = frame_samples * shared->audioPara.bytesPerSample;
-    int read_samples;
-    unsigned int curAFtime;
-    unsigned int oldAFtime = nextAFtime;
-    char * ptr = rawBuf;
-    if (fsize > AudioBufSize)
-    {  /* make sure the rawBuf is big enough */
-      Fprintf(stderr, "CTR PlayAudio error: BytesPerFrame=%d > AudioBufSize=%d.\n",
-              fsize, AudioBufSize);
-      Fprintf(stderr,
-              "CTR PlayAudio: startSample=%d, timer_count=%d, nextASSmple=%d.\n",
-              startSample, timer_count, nextASSample);
-      fprintf(stderr, "Internal error: audio resampling buffer not big enough,\n\
-  please reduce value of parameter 'Audio timer interval',\n\
-  or 'Audio buffered intervals' or Frames per audio play',\n\
-  and try again.\n");
-      exit(1);
-    }
-    
-    read_samples = ABgetSamples(ptr, frame_samples);
-    
-    /* convert and play to AF */
-    {
-      int maxSamples;
-      int left_samples = read_samples;
-      if (shared->samplesPerSecond >= shared->audioPara.samplesPerSecond)
-        maxSamples = (AudioBufSize/shared->audioPara.bytesPerSample);
-      else
-        maxSamples = ((AudioBufSize/shared->audioPara.bytesPerSample) *
-                      shared->samplesPerSecond) /
-                     shared->audioPara.samplesPerSecond;
-      for (;;)
-      {
-        int samples = (left_samples > maxSamples) ? maxSamples : left_samples;
-        int convSamples = AudioConvert(samples);
-        curAFtime = PlayAudioSamples(nextAFtime, convBuf, convSamples);
-        nextAFtime += convSamples;
-        left_samples -= samples;
-        if (left_samples == 0)
-          break;
-        else
-        {
-          memcpy(rawBuf, rawBuf + samples * shared->audioPara.bytesPerSample,
-                 left_samples * shared->audioPara.bytesPerSample);
-        }
-      }
-    }
-    
-    /* possible bugs in AF some times cause PlayAudioSample() to return 0 */
-    forward = curAFtime ? (oldAFtime - curAFtime) : audioForward;
-    /*
-    if ((oldAFtime - curAFtime) > (audioForward << 6)) {
-      fprintf(stderr, "forward %d, oldAFtime %d, curAFtime %d\n",
-              oldAFtime - curAFtime, oldAFtime, curAFtime);
-    }
-    */
-    /* check condition */
-    if (read_samples == frame_samples) { /* all bytes for current frame already read */
-      nextASSample += frame_samples;
-    }
-    else {  /* read to the end of audio file */
-      /*
-      timer_on ++;
-      */
-      nextASSample += read_samples;
-    }
-    shared->nextSample = nextASSample;
-  }
-  return 1;
-}
- 
- 
-void TimerProcessing(void)
-{
-  if (audioSocket >= 0 && shared->cmd == CmdPLAY)
-  {
-    if (videoSocket < 0)
-      PlayAudioOnly();
-    else if (rtplay)
-    {
-      int res = PlayAudio();
-      /* and also tries to sync audio and video */
-      if (res)
-      {
-        int jit;
-        res = forward - audioForward;
-        jit = (res>0 ? res : -res);
-        jit = (int)(((double)jit / (double)shared->samplesPerSecond) * 1000000.0);
-        if (res < -audioForward/2) /* needs to speedup the clock */
-        {
-          struct itimerval val;
-          getitimer(ITIMER_REAL, &val);
-          if ((int)val.it_value.tv_usec > jit)
-            val.it_value.tv_usec -= jit;
-          else
-          {
-            timer_signals_skip ++;
-            val.it_value.tv_usec = 2;
-          }
-          setitimer(ITIMER_REAL, &val, NULL);
-        }
-        else if (res > audioForward) /* needs to slow down the clock */
-        {
-          struct itimerval val;
-          /*
-          val.it_interval.tv_sec =  val.it_value.tv_sec = 0;
-          val.it_interval.tv_usec = val.it_value.tv_usec = 0;
-          */
-          getitimer(ITIMER_REAL, &val);
-          val.it_value.tv_usec += (jit % 1000000);
-          val.it_value.tv_sec += (jit / 1000000);
-          setitimer(ITIMER_REAL, &val, NULL);
-        }
-        /*
-        if (res < -audioForward || res > audioForward)
-        */
-        if (res < -16000 || res > 16000)
-        {
-          Fprintf(stderr, "Audio forward jit %d samples\n", res);
-        }
-      }
-    }
-  }
-  if (videoSocket >= 0 &&
-      (shared->cmd == CmdPLAY || shared->cmd == CmdFF || shared->cmd == CmdFB)) {
-    DisplayPicture();
-  }
-}
- 
-#define MAX_WAIT_USEC 10000000
- 
-static void start_timer(void)
-{
-  struct itimerval val;
-  
-  if (audioSocket >= 0 && shared->cmd == CmdPLAY && rtplay)
-    PlayAudioInit();
- 
-  /* sleep for a while to wait for decoding the first picture
-     and/or audio stream ready */
-  {
-    unsigned val1 = startTime;
-    if (audioSocket >= 0 && shared->cmd == CmdPLAY && rtplay)
-    {
-      int samples = videoSocket >= 0 ? 1200 : 1200;
-      while (ABcheckSamples() <= samples)
-      {
-        if (get_duration(val1, get_usec()) >= MAX_WAIT_USEC) {
-          fprintf(stderr, "CTR warning: audio is not ready yet.\n");
-          break;
-        }
-        else {
-          usleep(10000);
-          continue;
-        }
-      }
-    }
-    if (videoSocket >= 0)
-    {
-      while (VDcheckMsg() <= 0) {  /* keep sleeping for 1 millisec until a decoded
-                                      frame show up in VD buffer */
-        if (get_duration(val1, get_usec()) >= MAX_WAIT_USEC) {
-          fprintf(stderr, "CTR warning: video is not ready yet.\n");
-          break;
-        }
-        usleep(10000);
-      }
-    }
-    val1 = get_duration(val1, get_usec()) / 1000;
-    shared->playRoundTripDelay = val1;
-    
-    Fprintf(stderr, "CTR: estimated play round trip delay: %d millisec.\n", val1);
- 
-    /*
-    if (shared->collectStat)
-    {
-      fprintf(stderr, "CTR: estimated play round trip delay: %d millisec.\n", val1);
-    }
-    */
-  }
-  timer_on = 1;
-  timer_signals_skip = 0;
-  timerCount = 0;
-  lastCount = 0;
-  
-  if (shared->live) {
- 
-    /* delay for shared->config.VStimeAdvance milliseconds, adjustable delay */
-    if (shared->config.VStimeAdvance > 0) {
-      Fprintf(stderr, "CTR adds %d millisec of latency\n",
-              shared->config.VStimeAdvance);
-      usleep(shared->config.VStimeAdvance * 1000);
-    }
-    displayedFrames = 0;
-    startTime = get_usec();
-    startVSA = shared->nextFrame - shared->VBheadFrame;
-    if (startVSA < 5) startVSA = 5;
-    /*
-    Fprintf(stderr, "CTR: startVSA %d\n", startVSA);
-    */
-  }
-  
-  if (shared->cmd == CmdPLAY && rtplay) {
-    wait_usr2 = 0;
-  }
-  else {
-    wait_usr2 = 1;
-  }
-  last_disp_fid = -1;
-  /*
-  fprintf(stderr, "CTR start_timer() - %s for usr2\n",
-          wait_usr2 ? "wait" : "NOwait");
-   */
-  if (shared->cmd == CmdPLAY && audioSocket >= 0 && videoSocket < 0)
-    timerUPF = shared->config.audioTimerDuration * 1000;
-  else {
-    timerUPF = shared->usecPerFrame;
-  }
-#ifdef STAT
-  speedPtr = 1;
-  speedHistory[0].frameId = shared->nextFrame;
-  speedHistory[0].usecPerFrame = timerUPF;
-  speedHistory[0].frameRateLimit = shared->frameRateLimit;
-  speedHistory[0].frames = shared->sendPatternGops * shared->patternSize;
-  speedHistory[0].framesDropped = shared->framesDropped;
-#endif
-  /*
-  fprintf(stderr, "CTR: timer started at %d upf.\n", timerUPF);
-  */
-  val.it_interval.tv_sec =  val.it_value.tv_sec = timerUPF / 1000000;
-  val.it_interval.tv_usec = val.it_value.tv_usec = timerUPF % 1000000;
-  //  setsignal(SIGALRM, TimerHandler);
-  setitimer(ITIMER_REAL, &val, NULL);
-}
- 
-static void stop_timer(void)
-{
-  struct itimerval val;
-  
-  if (!timer_on)
-    return;
-  
-  timer_on = 0;
- 
-  //  setsignal(SIGALRM, SIG_IGN);
-  
-  val.it_interval.tv_sec =  val.it_value.tv_sec = 0;
-  val.it_interval.tv_usec = val.it_value.tv_usec = 0;
-  setitimer(ITIMER_REAL, &val, NULL);
-  /*
-  fprintf(stderr, "CTR: timer stopped.\n");
-  */
-  /*
-  usleep(200000);
-  */
-}
- 
-static void timer_speed()
-{
-  /*
-  struct itimerval val;
-  if (timer_on && videoSocket >= 0 &&
-      (shared->cmd == CmdPLAY || shared->cmd == CmdFF || shared->cmd == CmdFB))
-  {
-    fprintf(stderr, "CTR: timer speed changed to %d upf.\n", shared->usecPerFrame);
-    val.it_interval.tv_sec =  val.it_value.tv_sec = shared->usecPerFrame / 1000000;
-    val.it_interval.tv_usec = val.it_value.tv_usec = shared->usecPerFrame % 1000000;
-    setitimer(ITIMER_REAL, &val, NULL);
-  }
-  */
-}
- 
-static void wait_display(void)
-{
-  if (!usr1_flag) {
-    if (shared->cmd == CmdINIT) usleep(5000000);// XXX hack to make the client wait until the server gets a chance.
-    else usleep(800000);
-  }
-  if (!usr1_flag)
-  {
-    if (shared->cmd == CmdSTEP) /* to skip undecodable pictures */
-      shared->nextFrame ++;
-    else if (shared->cmd == CmdINIT) {
-      fprintf(stderr, "Warning: initialilzation failed. Please reinitialize the program.\n");
-    }
-    return;
-  }
-  usr1_flag = 0;
-}
- 
-static void usr1_handler(int sig)
-{
-  FrameBlock *buf;
-  unsigned char tmp;
-  /*
-  Fprintf(stderr, "CTR got USR1 for displaying single frame.\n");
-  */
-  usr1_flag = 1;
-  
-  if (shared->cmd == CmdINIT) { /* Initialize display window */
-    tmp = CmdVPinitScreen;
-    CmdWrite(&tmp, 1);
-  }
-  /*
-     fprintf(stderr, "CTR: %d frames in VDbuf.\n", VDcheckMsg());
-     */
-  while (VDcheckMsg() > 1)
-  {
-    /*
-    Fprintf(stderr, "CTR: VDcheckMsg() = %d, to discard a picture.\n", VDcheckMsg());
-    */
-    if ((buf = VDgetMsg()) != NULL)
-      VDreclaimMsg(buf);
-    else
-      fprintf(stderr, "CTR error: VDgetMsg is NULL, unexpected.\n");
-  }
-  if (VDcheckMsg() >0 ) {
-    /*
-    Fprintf(stderr, "CTR to display a frame in user1_handler()\n");
-    */
-    buf = VDgetMsg();
-  }
-  else {
-    /*
-    Fprintf(stderr, "CTR no frame to display in user_handler()\n");
-    */
-    buf = NULL;
-  }
-  
-  if (buf != NULL) {
-    if (shared->cmd == CmdSTEP)
-    {
-      shared->nextFrame ++;
-      shared->nextGroup = buf->gop + 1;
-    }
-    else
-    {
-      shared->nextFrame = buf->display;
-      shared->nextGroup = buf->gop;
-    }
-    tmp = CmdVPdisplayFrame;
-    CmdWrite(&tmp, 1);
-    CmdWrite((unsigned char *)&buf, sizeof(char *));
-  }
-  else if (shared->cmd == CmdSTEP) {
-    shared->nextFrame ++;
-  }
-}
- 
-static void default_usr2_handler(int sig)
-{
-  Fprintf(stderr, "CTR warning: void SIGUSR2 handler.\n");
-}
- 
-static void compute_sendPattern(void)
-{
-  char buf[PATTERN_SIZE];
-  float limit = shared->frameRateLimit;
-  char * pat = shared->pattern;
-  int len = shared->patternSize * shared->sendPatternGops;
-  int f;
- 
-  if (limit <= 0)
-    limit = 1.0;
-  if (rtplay) {
-    f = (int)((double)len *
-        ((double)limit / (1000000.0 / (double)shared->usecPerFrame)) + 0.5);
-    /* rounded to integer, instead of truncated */
-  }
-  else {
-    f = len;
-  }
-  if (f >= len)
-    f = len;
-  else if (f <= 1)
-    f = 1;
- 
-  ComputeSendPattern(pat, buf, len, f);
-  shared->qosRecomputes ++;
-  
-  memcpy(shared->sendPattern, buf, PATTERN_SIZE);
- 
-  f = len - f;
-  if (shared->config.verbose) {
-    fprintf(stderr, "speed %dupf, %d frames dropped, frames %d:\nsend pattern:",
-            shared->usecPerFrame, f, len);
-    shared->framesDropped = f;
-    {
-      int i;
-      for (i = 0; i < len; i ++)
-        fputc(buf[i] ? pat[i] : '-', stderr);
-    }
-    fputc('\n', stderr);
-  }
-}
- 
-/* about automatic experiment plan by software developers or specific users:
-   to be able to conduct experiment plan, the user need to have a uid defined
-   by DEVELOPER_UID in "../include/common.h", and he/she needs to prepare a file
-   EXP_PLAN_FILE, with following format:
- 
-   {Delay #seconds |
-    Expriment } *
-   EndExpriment
- 
-   An experiment command is followed by one or more of following parameters:
- 
-   playSpeed 	#float
-   frameRateLimit #float
-   maxSPframes 	#int
-   filterPara	#int
-   collectStat 	0/1
-   qosEffective 0/1
-   syncEffective 0/1
- 
-   and the parameter is terminated by an empty line.
- 
-   The automatic experiment plan file is opened after init() and experiment
-   setting read just before calling play(). The Player will be terminated
-   after all experiments are done.
-   
-   */
- 
-static void on_exit_routine(void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) %s:%d\n",
-              __FILE__,
-              __LINE__));
-  unsigned char tmp = CmdCLOSE;
- 
-  if (getpid() != CTRpid) return;
-  
-  if (audioSocket >= 0)
-  {
-    write(audioSocket, &tmp, 1);
-    ComCloseConn(audioSocket);
-    audioSocket = -1;
-  }
-  if (videoSocket >= 0)
-  {
-    write(videoSocket, &tmp, 1);
-    ComCloseConn(videoSocket);
-    videoSocket = -1;
-    if (VBpid > 0) {
-      kill(VBpid, SIGUSR1);
-      VBpid = -1;
-    }
-  }
-  ComCloseClient();
-}
- 
-#define EXP_PLAN_FILE "experiment_plan"
- 
-int CTRmain(void)
-{
-  int sv[2];
-  extern void set_exit_routine_tag(int tag);
- 
-  FILE * fp = NULL;   /* file pointer for experiment plan */
- 
-  set_exit_routine_tag(0);
-  //  setsignal(SIGUSR2, default_usr2_handler);
-  
-  /* allocate shared data structure and initialize it */
-  shared = (SharedData *) creat_shared_mem(sizeof(*shared));
-  shared->cmd = 0;
-  shared->cmdsn = 0;
-  shared->cmdBusy = 0;
-  shared->loopBack = 0;
-  shared->volumePosition = 0;
-  shared->balancePosition = 50;
-  shared->locationPosition = 0;
-  shared->speedPosition = 0;
-  shared->qosRecomputes = 0;
- 
-  shared->pixelValid = 0;
-  
-  shared->config.rt = 1;
-  shared->config.maxFPS = DEFAULT_maxFPS;
-  shared->config.maxSPS = DEFAULT_maxSPS;
-  shared->config.ffFPS = DEFAULT_ffFPS;
-  shared->config.fbFPS = DEFAULT_fbFPS;
-  shared->config.feedBackDelay = DEFAULT_feedBackDelay;
-  shared->config.audioMask = DEFAULT_audioMask;
-  shared->config.audioPara.encodeType = DEFAULT_encodeType;
-  shared->config.audioPara.channels = DEFAULT_channels;
-  shared->config.audioPara.samplesPerSecond = DEFAULT_samplesPerSecond;
-  shared->config.audioPara.bytesPerSample = DEFAULT_bytesPerSample;
-  shared->config.audioTimerDuration = DEFAULT_audioTimerDuration;
-  shared->config.audioBufferedIntervals = DEFAULT_audioBufferedIntervals;
-  shared->config.framesPerAudioPlay = DEFAULT_framesPerAudioPlay;
-  shared->config.audioForward = DEFAULT_audioForward;
-  shared->config.VStimeAdvance = DEFAULT_VStimeAdvance;
-  shared->config.frameRateLimit = DEFAULT_maxFPS;
-  shared->config.collectStat = 0;
-  shared->config.collectFrameInfo = 0;
-  shared->config.syncEffective = 1;
-  shared->config.qosEffective = 1;
-  shared->config.audioOffset = 0;
-  shared->config.filterPara = DEFAULT_filterPara;
-  shared->config.maxSPframes = DEFAULT_maxSPframes;
-  shared->config.audioConn = 0;
-  shared->config.videoConn = 0;
-  shared->config.verbose = (!getuid()) || getuid() == DEVELOPER_UID;
- 
-  /* create all shared buffers: AB-CTR, VB-VD, VD-VP */
-  ABinitBuf(AB_BUF_SIZE);
-  VBinitBuf(VB_BUF_SIZE);
-  VDinitBuf(VD_BUF_SIZE);
- 
-  CTRpid = getpid();
-  set_exit_routine_tag(1);
- 
-  /* create command socket pair */
-  if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == -1)
-  {
-    perror("CTR error on open cmd socketpair");
-    exit(1);
-  }
-  cmdSocket = sv[0];
-  
-  /* fork processes: VD, GUI */
- 
-  if ((VDpid = fork()) == -1)
-  {
-    perror("CTR error on fork VD");
-    exit(1);
-  } else if (VDpid == 0)
-  {
-    ABdeleteBuf();
-    close(sv[0]);
-    close(sv[1]);
-    if (realTimeFlag >= 3) {
-      if (SetRTpriority("VD", 0)) realTimeFlag = 0;
-    }
-    VDprocess(CTRpid);
-  }
- 
-  if ((UIpid = fork()) == -1)
-  {
-    perror("CTR error on fork UI");
-    exit(1);
-  } else if (UIpid == 0)
-  {
-    VBdeleteBuf();
-    ABdeleteBuf();
-    close(sv[0]);
-    if (realTimeFlag >= 2) {
-#ifdef __svr4__
-      if (SetRTpriority("VB", 0)) realTimeFlag = 0;
-#elif defined(_HPUX_SOURCE)
-      if (SetRTpriority("VB", 2)) realTimeFlag = 0;
-#endif
-    }
-    UIprocess(sv[1]);
-  }
-  close(sv[1]);
-  //  setsignal(SIGUSR1, usr1_handler);
-  
-  /* initialize Audio device */
-  if (InitAudioDevice() == 0)
-    hasAudioDevice = 1;
-  else
-    hasAudioDevice = 0;
- 
-  ComInitClient(VCR_TCP_PORT, VCR_UNIX_PORT, VCR_ATM_PORT);
- 
-  if ((vh = (char *)malloc(PATH_SIZE)) == NULL)
-  {
-    perror("CTR failed to allocate space for vh");
-    exit(1);
-  }
-  if ((vf = (char *)malloc(PATH_SIZE)) == NULL)
-  {
-    perror("CTR failed to allocate space for vf");
-    exit(1);
-  }
-  if ((ah = (char *)malloc(PATH_SIZE)) == NULL)
-  {
-    perror("CTR failed to allocate space for ah");
-    exit(1);
-  }
-  if ((af = (char *)malloc(PATH_SIZE)) == NULL)
-  {
-    perror("CTR failed to allocate space for af");
-    exit(1);
-  }
-  if (realTimeFlag) {
-    if (SetRTpriority("CTR", 4)) realTimeFlag = 0;
-  }
- 
- 
-  //  atexit(on_exit_routine);
- 
- 
-  // instantiate our command handler
-  Command_Handler command_handler (cmdSocket);
-//   ACE_NEW_RETURN (command_handler,
-//                   Command_Handler (cmdSocket),
-//                   -1);
- 
-  //  if (command_handler->init () == -1)
-  if (command_handler.init () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) command_handler: init returned -1"),
-                      -1);
- 
-  // .. and register it with the reactor.
-  if (ACE_Reactor::instance ()->register_handler (&command_handler,
-                                                  ACE_Event_Handler::READ_MASK) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) register_handler for command_handler failed\n"),
-                        -1);
-  
-  // and now instantiate the sig_handler
-  Client_Sig_Handler client_sig_handler (&command_handler);
-//   Client_Sig_Handler *client_sig_handler;
-//   ACE_NEW_RETURN (client_sig_handler,
-//                   Client_Sig_Handler (command_handler),
-//                   -1);
- 
-  // .. and ask it to register itself with the reactor
-  if (client_sig_handler.register_handler () < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) register_handler for sig_handler failed\n"),
-                      -1);
-  
-  // and run the event loop
-  ACE_Reactor::instance ()->run_event_loop ();
- 
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Exited the client command handler event loop\n"
-              "%p\n",
-              "run_event_loop"));
-  
-  return 0;
-}
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp
deleted file mode 100644
index b57d8bb4419..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.cpp
+++ /dev/null
@@ -1,933 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/*
- * decoders.c
- *
- * This file contains all the routines for Huffman decoding required in 
- * MPEG
- *
- */
-
-#include <stdio.h>
-#include <assert.h>
-#include "decoders.h"
-#include "util.h" 
-#include "video.h"
-#include "proto.h"
-
-/* Decoding table for macroblock_address_increment */
-mb_addr_inc_entry     mb_addr_inc[2048];
-
-/* Decoding table for macroblock_type in predictive-coded pictures */
-mb_type_entry         mb_type_P[64];
-
-/* Decoding table for macroblock_type in bidirectionally-coded pictures */
-mb_type_entry         mb_type_B[64];
-
-/* Decoding table for motion vectors */
-motion_vectors_entry  motion_vectors[2048];
-
-/* Decoding table for coded_block_pattern */
-
-coded_block_pattern_entry coded_block_pattern[512] = 
-{ {(unsigned int)ERROR, 0}, {(unsigned int)ERROR, 0}, {39, 9}, {27, 9}, {59, 9}, {55, 9}, {47, 9}, {31, 9},
-    {58, 8}, {58, 8}, {54, 8}, {54, 8}, {46, 8}, {46, 8}, {30, 8}, {30, 8},
-    {57, 8}, {57, 8}, {53, 8}, {53, 8}, {45, 8}, {45, 8}, {29, 8}, {29, 8},
-    {38, 8}, {38, 8}, {26, 8}, {26, 8}, {37, 8}, {37, 8}, {25, 8}, {25, 8},
-    {43, 8}, {43, 8}, {23, 8}, {23, 8}, {51, 8}, {51, 8}, {15, 8}, {15, 8},
-    {42, 8}, {42, 8}, {22, 8}, {22, 8}, {50, 8}, {50, 8}, {14, 8}, {14, 8},
-    {41, 8}, {41, 8}, {21, 8}, {21, 8}, {49, 8}, {49, 8}, {13, 8}, {13, 8},
-    {35, 8}, {35, 8}, {19, 8}, {19, 8}, {11, 8}, {11, 8}, {7, 8}, {7, 8},
-    {34, 7}, {34, 7}, {34, 7}, {34, 7}, {18, 7}, {18, 7}, {18, 7}, {18, 7},
-    {10, 7}, {10, 7}, {10, 7}, {10, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, 
-    {33, 7}, {33, 7}, {33, 7}, {33, 7}, {17, 7}, {17, 7}, {17, 7}, {17, 7}, 
-    {9, 7}, {9, 7}, {9, 7}, {9, 7}, {5, 7}, {5, 7}, {5, 7}, {5, 7}, 
-    {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, {63, 6}, 
-    {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, {3, 6}, 
-    {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, 
-    {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, 
-    {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5},
-    {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5}, {62, 5},
-    {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, 
-    {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, {2, 5}, 
-    {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, 
-    {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, {61, 5}, 
-    {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, 
-    {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, {1, 5}, 
-    {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, 
-    {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, {56, 5}, 
-    {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, 
-    {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, {52, 5}, 
-    {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, 
-    {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, {44, 5}, 
-    {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, 
-    {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, 
-    {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, 
-    {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, {40, 5}, 
-    {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, 
-    {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, {20, 5}, 
-    {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, 
-    {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, {48, 5}, 
-    {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, 
-    {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, 
-    {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, 
-    {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, 
-    {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, 
-    {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, 
-    {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, 
-    {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, 
-    {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, 
-    {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, 
-    {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, 
-    {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, 
-    {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, 
-    {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {8, 4},
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, 
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, 
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4},
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, 
-    {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}, {60, 3}
-};
-
-/* Decoding table for dct_dc_size_luminance */
-dct_dc_size_entry dct_dc_size_luminance[128] =
-{   {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, 
-    {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, 
-    {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, 
-    {5, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4}, 
-    {6, 5}, {6, 5}, {6, 5}, {6, 5}, {7, 6}, {7, 6}, {8, 7}, {(unsigned int)ERROR, 0}
-};
-
-/* Decoding table for dct_dc_size_chrominance */
-dct_dc_size_entry dct_dc_size_chrominance[256] =
-{ {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, {1, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, 
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, 
-    {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, 
-    {5, 5}, {5, 5}, {5, 5}, {5, 5}, {5, 5}, {5, 5}, {5, 5}, {5, 5}, 
-    {6, 6}, {6, 6}, {6, 6}, {6, 6}, {7, 7}, {7, 7}, {8, 8}, {(unsigned int)ERROR, 0}
-};
-
-/* DCT coeff tables. */
-
-unsigned short int dct_coeff_tbl_0[256] =
-{
-0xffff, 0xffff, 0xffff, 0xffff, 
-0xffff, 0xffff, 0xffff, 0xffff, 
-0xffff, 0xffff, 0xffff, 0xffff, 
-0xffff, 0xffff, 0xffff, 0xffff, 
-0x052f, 0x051f, 0x050f, 0x04ff, 
-0x183f, 0x402f, 0x3c2f, 0x382f, 
-0x342f, 0x302f, 0x2c2f, 0x7c1f, 
-0x781f, 0x741f, 0x701f, 0x6c1f, 
-0x028e, 0x028e, 0x027e, 0x027e, 
-0x026e, 0x026e, 0x025e, 0x025e, 
-0x024e, 0x024e, 0x023e, 0x023e, 
-0x022e, 0x022e, 0x021e, 0x021e, 
-0x020e, 0x020e, 0x04ee, 0x04ee, 
-0x04de, 0x04de, 0x04ce, 0x04ce, 
-0x04be, 0x04be, 0x04ae, 0x04ae, 
-0x049e, 0x049e, 0x048e, 0x048e, 
-0x01fd, 0x01fd, 0x01fd, 0x01fd, 
-0x01ed, 0x01ed, 0x01ed, 0x01ed, 
-0x01dd, 0x01dd, 0x01dd, 0x01dd, 
-0x01cd, 0x01cd, 0x01cd, 0x01cd, 
-0x01bd, 0x01bd, 0x01bd, 0x01bd, 
-0x01ad, 0x01ad, 0x01ad, 0x01ad, 
-0x019d, 0x019d, 0x019d, 0x019d, 
-0x018d, 0x018d, 0x018d, 0x018d, 
-0x017d, 0x017d, 0x017d, 0x017d, 
-0x016d, 0x016d, 0x016d, 0x016d, 
-0x015d, 0x015d, 0x015d, 0x015d, 
-0x014d, 0x014d, 0x014d, 0x014d, 
-0x013d, 0x013d, 0x013d, 0x013d, 
-0x012d, 0x012d, 0x012d, 0x012d, 
-0x011d, 0x011d, 0x011d, 0x011d, 
-0x010d, 0x010d, 0x010d, 0x010d, 
-0x282c, 0x282c, 0x282c, 0x282c, 
-0x282c, 0x282c, 0x282c, 0x282c, 
-0x242c, 0x242c, 0x242c, 0x242c, 
-0x242c, 0x242c, 0x242c, 0x242c, 
-0x143c, 0x143c, 0x143c, 0x143c, 
-0x143c, 0x143c, 0x143c, 0x143c, 
-0x0c4c, 0x0c4c, 0x0c4c, 0x0c4c, 
-0x0c4c, 0x0c4c, 0x0c4c, 0x0c4c, 
-0x085c, 0x085c, 0x085c, 0x085c, 
-0x085c, 0x085c, 0x085c, 0x085c, 
-0x047c, 0x047c, 0x047c, 0x047c, 
-0x047c, 0x047c, 0x047c, 0x047c, 
-0x046c, 0x046c, 0x046c, 0x046c, 
-0x046c, 0x046c, 0x046c, 0x046c, 
-0x00fc, 0x00fc, 0x00fc, 0x00fc, 
-0x00fc, 0x00fc, 0x00fc, 0x00fc, 
-0x00ec, 0x00ec, 0x00ec, 0x00ec, 
-0x00ec, 0x00ec, 0x00ec, 0x00ec, 
-0x00dc, 0x00dc, 0x00dc, 0x00dc, 
-0x00dc, 0x00dc, 0x00dc, 0x00dc, 
-0x00cc, 0x00cc, 0x00cc, 0x00cc, 
-0x00cc, 0x00cc, 0x00cc, 0x00cc, 
-0x681c, 0x681c, 0x681c, 0x681c, 
-0x681c, 0x681c, 0x681c, 0x681c, 
-0x641c, 0x641c, 0x641c, 0x641c, 
-0x641c, 0x641c, 0x641c, 0x641c, 
-0x601c, 0x601c, 0x601c, 0x601c, 
-0x601c, 0x601c, 0x601c, 0x601c, 
-0x5c1c, 0x5c1c, 0x5c1c, 0x5c1c, 
-0x5c1c, 0x5c1c, 0x5c1c, 0x5c1c, 
-0x581c, 0x581c, 0x581c, 0x581c, 
-0x581c, 0x581c, 0x581c, 0x581c, 
-};
-
-unsigned short int dct_coeff_tbl_1[16] = 
-{
-0x00bb, 0x202b, 0x103b, 0x00ab, 
-0x084b, 0x1c2b, 0x541b, 0x501b, 
-0x009b, 0x4c1b, 0x481b, 0x045b, 
-0x0c3b, 0x008b, 0x182b, 0x441b, 
-};
-
-unsigned short int dct_coeff_tbl_2[4] =
-{
-0x4019, 0x1429, 0x0079, 0x0839, 
-};
-
-unsigned short int dct_coeff_tbl_3[4] = 
-{
-0x0449, 0x3c19, 0x3819, 0x1029, 
-};
-
-unsigned short int dct_coeff_next[256] = 
-{
-0xffff, 0xffff, 0xffff, 0xffff, 
-0xf7d5, 0xf7d5, 0xf7d5, 0xf7d5, 
-0x0826, 0x0826, 0x2416, 0x2416, 
-0x0046, 0x0046, 0x2016, 0x2016, 
-0x1c15, 0x1c15, 0x1c15, 0x1c15, 
-0x1815, 0x1815, 0x1815, 0x1815, 
-0x0425, 0x0425, 0x0425, 0x0425, 
-0x1415, 0x1415, 0x1415, 0x1415, 
-0x3417, 0x0067, 0x3017, 0x2c17, 
-0x0c27, 0x0437, 0x0057, 0x2817, 
-0x0034, 0x0034, 0x0034, 0x0034, 
-0x0034, 0x0034, 0x0034, 0x0034, 
-0x1014, 0x1014, 0x1014, 0x1014, 
-0x1014, 0x1014, 0x1014, 0x1014, 
-0x0c14, 0x0c14, 0x0c14, 0x0c14, 
-0x0c14, 0x0c14, 0x0c14, 0x0c14, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0xfbe1, 0xfbe1, 0xfbe1, 0xfbe1, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-0x0011, 0x0011, 0x0011, 0x0011, 
-};
-
-unsigned short int dct_coeff_first[256] = 
-{
-0xffff, 0xffff, 0xffff, 0xffff, 
-0xf7d5, 0xf7d5, 0xf7d5, 0xf7d5, 
-0x0826, 0x0826, 0x2416, 0x2416, 
-0x0046, 0x0046, 0x2016, 0x2016, 
-0x1c15, 0x1c15, 0x1c15, 0x1c15, 
-0x1815, 0x1815, 0x1815, 0x1815, 
-0x0425, 0x0425, 0x0425, 0x0425, 
-0x1415, 0x1415, 0x1415, 0x1415, 
-0x3417, 0x0067, 0x3017, 0x2c17, 
-0x0c27, 0x0437, 0x0057, 0x2817, 
-0x0034, 0x0034, 0x0034, 0x0034, 
-0x0034, 0x0034, 0x0034, 0x0034, 
-0x1014, 0x1014, 0x1014, 0x1014, 
-0x1014, 0x1014, 0x1014, 0x1014, 
-0x0c14, 0x0c14, 0x0c14, 0x0c14, 
-0x0c14, 0x0c14, 0x0c14, 0x0c14, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0023, 0x0023, 0x0023, 0x0023, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0813, 0x0813, 0x0813, 0x0813, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0412, 0x0412, 0x0412, 0x0412, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-0x0010, 0x0010, 0x0010, 0x0010, 
-};
-
-/* Macro for filling up the decoding table for mb_addr_inc */
-#define ASSIGN1(start, end, step, val, num) \
-  for (i = start; i < end; i+= step) { \
-    for (j = 0; j < step; j++) { \
-      mb_addr_inc[i+j].value = val; \
-      mb_addr_inc[i+j].num_bits = num; \
-    } \
-    val--; \
-    }
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * init_mb_addr_inc --
- *
- *	Initialize the VLC decoding table for macro_block_address_increment
- *
- * Results:
- *	The decoding table for macro_block_address_increment will
- *      be filled; illegal values will be filled as ERROR.
- *
- * Side effects:
- *	The global array mb_addr_inc will be filled.
- *
- *--------------------------------------------------------------
- */
-static void
-init_mb_addr_inc()
-{
-  int i, j, val;
-
-  for (i = 0; i < 8; i++) {
-    mb_addr_inc[i].value = (unsigned int)ERROR;
-    mb_addr_inc[i].num_bits = 0;
-  }
-
-  mb_addr_inc[8].value = MACRO_BLOCK_ESCAPE;
-  mb_addr_inc[8].num_bits = 11;
-
-  for (i = 9; i < 15; i++) {
-    mb_addr_inc[i].value = (unsigned int)ERROR;
-    mb_addr_inc[i].num_bits = 0;
-  }
-
-  mb_addr_inc[15].value = MACRO_BLOCK_STUFFING;
-  mb_addr_inc[15].num_bits = 11;
-
-  for (i = 16; i < 24; i++) {
-    mb_addr_inc[i].value = (unsigned int)ERROR;
-    mb_addr_inc[i].num_bits = 0;
-  }
-
-  val = 33;
-
-  ASSIGN1(24, 36, 1, val, 11);
-  ASSIGN1(36, 48, 2, val, 10);
-  ASSIGN1(48, 96, 8, val, 8);
-  ASSIGN1(96, 128, 16, val, 7);
-  ASSIGN1(128, 256, 64, val, 5);
-  ASSIGN1(256, 512, 128, val, 4);
-  ASSIGN1(512, 1024, 256, val, 3);
-  ASSIGN1(1024, 2048, 1024, val, 1);
-}
-
-
-/* Macro for filling up the decoding table for mb_type */
-#define ASSIGN2(start, end, quant, motion_forward, motion_backward, pattern, intra, num, mb_type) \
-  for (i = start; i < end; i ++) { \
-    mb_type[i].mb_quant = quant; \
-    mb_type[i].mb_motion_forward = motion_forward; \
-    mb_type[i].mb_motion_backward = motion_backward; \
-    mb_type[i].mb_pattern = pattern; \
-    mb_type[i].mb_intra = intra; \
-    mb_type[i].num_bits = num; \
-  }
-	 
-
-
-/*
- *--------------------------------------------------------------
- *
- * init_mb_type_P --
- *
- *	Initialize the VLC decoding table for macro_block_type in
- *      predictive-coded pictures.
- *
- * Results:
- *	The decoding table for macro_block_type in predictive-coded
- *      pictures will be filled; illegal values will be filled as ERROR.
- *
- * Side effects:
- *	The global array mb_type_P will be filled.
- *
- *--------------------------------------------------------------
- */
-static void
-init_mb_type_P()
-{
-  int i;
-
-  mb_type_P[0].mb_quant = mb_type_P[0].mb_motion_forward 
-    = mb_type_P[0].mb_motion_backward = mb_type_P[0].mb_pattern 
-      = mb_type_P[0].mb_intra = (unsigned int)ERROR;
-  mb_type_P[0].num_bits = 0;
-
-  ASSIGN2(1, 2, 1, 0, 0, 0, 1, 6, mb_type_P)
-  ASSIGN2(2, 4, 1, 0, 0, 1, 0, 5, mb_type_P)
-  ASSIGN2(4, 6, 1, 1, 0, 1, 0, 5, mb_type_P);
-  ASSIGN2(6, 8, 0, 0, 0, 0, 1, 5, mb_type_P);
-  ASSIGN2(8, 16, 0, 1, 0, 0, 0, 3, mb_type_P);
-  ASSIGN2(16, 32, 0, 0, 0, 1, 0, 2, mb_type_P);
-  ASSIGN2(32, 64, 0, 1, 0, 1, 0, 1, mb_type_P);
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * init_mb_type_B --
- *
- *	Initialize the VLC decoding table for macro_block_type in
- *      bidirectionally-coded pictures.
- *
- * Results:
- *	The decoding table for macro_block_type in bidirectionally-coded
- *      pictures will be filled; illegal values will be filled as ERROR.
- *
- * Side effects:
- *	The global array mb_type_B will be filled.
- *
- *--------------------------------------------------------------
- */
-static void
-init_mb_type_B()
-{
-  int i;
-
-  mb_type_B[0].mb_quant = mb_type_B[0].mb_motion_forward 
-    = mb_type_B[0].mb_motion_backward = mb_type_B[0].mb_pattern 
-      = mb_type_B[0].mb_intra = (unsigned int)ERROR;
-  mb_type_B[0].num_bits = 0;
-
-  ASSIGN2(1, 2, 1, 0, 0, 0, 1, 6, mb_type_B);
-  ASSIGN2(2, 3, 1, 0, 1, 1, 0, 6, mb_type_B);
-  ASSIGN2(3, 4, 1, 1, 0, 1, 0, 6, mb_type_B);
-  ASSIGN2(4, 6, 1, 1, 1, 1, 0, 5, mb_type_B);
-  ASSIGN2(6, 8, 0, 0, 0, 0, 1, 5, mb_type_B);
-  ASSIGN2(8, 12, 0, 1, 0, 0, 0, 4, mb_type_B);
-  ASSIGN2(12, 16, 0, 1, 0, 1, 0, 4, mb_type_B);
-  ASSIGN2(16, 24, 0, 0, 1, 0, 0, 3, mb_type_B);
-  ASSIGN2(24, 32, 0, 0, 1, 1, 0, 3, mb_type_B);
-  ASSIGN2(32, 48, 0, 1, 1, 0, 0, 2, mb_type_B);
-  ASSIGN2(48, 64, 0, 1, 1, 1, 0, 2, mb_type_B);
-}
-
-
-/* Macro for filling up the decoding tables for motion_vectors */
-#define ASSIGN3(start, end, step, val, num) \
-  for (i = start; i < end; i+= step) { \
-    for (j = 0; j < step / 2; j++) { \
-      motion_vectors[i+j].code = val; \
-      motion_vectors[i+j].num_bits = num; \
-    } \
-    for (j = step / 2; j < step; j++) { \
-      motion_vectors[i+j].code = -val; \
-      motion_vectors[i+j].num_bits = num; \
-    } \
-    val--; \
-  }
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * init_motion_vectors --
- *
- *	Initialize the VLC decoding table for the various motion
- *      vectors, including motion_horizontal_forward_code, 
- *      motion_vertical_forward_code, motion_horizontal_backward_code,
- *      and motion_vertical_backward_code.
- *
- * Results:
- *	The decoding table for the motion vectors will be filled;
- *      illegal values will be filled as ERROR.
- *
- * Side effects:
- *	The global array motion_vector will be filled.
- *
- *--------------------------------------------------------------
- */
-static void
-init_motion_vectors()
-{
-  int i, j, val = 16;
-
-  for (i = 0; i < 24; i++) {
-    motion_vectors[i].code = (unsigned int)ERROR;
-    motion_vectors[i].num_bits = 0;
-  }
-
-  ASSIGN3(24, 36, 2, val, 11);
-  ASSIGN3(36, 48, 4, val, 10);
-  ASSIGN3(48, 96, 16, val, 8);
-  ASSIGN3(96, 128, 32, val, 7);
-  ASSIGN3(128, 256, 128, val, 5);
-  ASSIGN3(256, 512, 256, val, 4);
-  ASSIGN3(512, 1024, 512, val, 3);
-  ASSIGN3(1024, 2048, 1024, val, 1);
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * init_tables --
- *
- *	Initialize all the tables for VLC decoding; this must be
- *      called when the system is set up before any decoding can
- *      take place.
- *
- * Results:
- *	All the decoding tables will be filled accordingly.
- *
- * Side effects:
- *	The corresponding global array for each decoding table 
- *      will be filled.
- *
- *--------------------------------------------------------------
- */    
-void
-init_tables()
-{
-  extern void init_pre_idct();
-
-  init_mb_addr_inc();
-  init_mb_type_P();
-  init_mb_type_B();
-  init_motion_vectors();
-  init_pre_idct();
-
-#ifdef ANALYSIS
-  {
-    init_stats();
-  }
-#endif
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DecodeDCTDCSizeLum --
- *
- *	Huffman Decoder for dct_dc_size_luminance; location where
- *      the result of decoding will be placed is passed as argument.
- *      The decoded values are obtained by doing a table lookup on
- *      dct_dc_size_luminance.
- *
- * Results:
- *	The decoded value for dct_dc_size_luminance or ERROR for 
- *      unbound values will be placed in the location specified.
- *
- * Side effects:
- *	Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */        
-void
-decodeDCTDCSizeLum(unsigned int *value)
-{
-  unsigned int index;
-
-  show_bits7(index);
-  
-  *value = dct_dc_size_luminance[index].value;
-
-  flush_bits(dct_dc_size_luminance[index].num_bits);
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * DecodeDCTDCSizeChrom --
- *
- *	Huffman Decoder for dct_dc_size_chrominance; location where
- *      the result of decoding will be placed is passed as argument.
- *      The decoded values are obtained by doing a table lookup on
- *      dct_dc_size_chrominance.
- *
- * Results:
- *	The decoded value for dct_dc_size_chrominance or ERROR for
- *      unbound values will be placed in the location specified.
- *
- * Side effects:
- *	Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */    
-void    
-decodeDCTDCSizeChrom(unsigned int *value)
-{
-  unsigned int index;
-
-  show_bits8(index);
-  
-  *value = dct_dc_size_chrominance[index].value;
-
-  flush_bits(dct_dc_size_chrominance[index].num_bits);
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * decodeDCTCoeff --
- *
- *	Huffman Decoder for dct_coeff_first and dct_coeff_next;
- *      locations where the results of decoding: run and level, are to
- *      be placed and also the type of DCT coefficients, either
- *      dct_coeff_first or dct_coeff_next, are being passed as argument.
- *      
- *      The decoder first examines the next 8 bits in the input stream,
- *      and perform according to the following cases:
- *      
- *      '0000 0000' - examine 8 more bits (i.e. 16 bits total) and
- *                    perform a table lookup on dct_coeff_tbl_0.
- *                    One more bit is then examined to determine the sign
- *                    of level.
- *
- *      '0000 0001' - examine 4 more bits (i.e. 12 bits total) and 
- *                    perform a table lookup on dct_coeff_tbl_1.
- *                    One more bit is then examined to determine the sign
- *                    of level.
- *      
- *      '0000 0010' - examine 2 more bits (i.e. 10 bits total) and
- *                    perform a table lookup on dct_coeff_tbl_2.
- *                    One more bit is then examined to determine the sign
- *                    of level.
- *
- *      '0000 0011' - examine 2 more bits (i.e. 10 bits total) and 
- *                    perform a table lookup on dct_coeff_tbl_3.
- *                    One more bit is then examined to determine the sign
- *                    of level.
- *
- *      otherwise   - perform a table lookup on dct_coeff_tbl. If the
- *                    value of run is not ESCAPE, extract one more bit
- *                    to determine the sign of level; otherwise 6 more
- *                    bits will be extracted to obtain the actual value 
- *                    of run , and then 8 or 16 bits to get the value of level.
- *                    
- *      
- *
- * Results:
- *	The decoded values of run and level or ERROR for unbound values
- *      are placed in the locations specified.
- *
- * Side effects:
- *	Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-static void
-decodeDCTCoeff(unsigned short int *dct_coeff_tbl, unsigned int *run, int *level)
-{
-  unsigned int temp, index, num_bits;
-  unsigned int value, next32bits, flushed;
-
-  /*
-   * Grab the next 32 bits and use it to improve performance of
-   * getting the bits to parse. Thus, calls are translated as:
-   *
-   *	show_bitsX  <-->   next32bits >> (32-X)
-   *	get_bitsX   <-->   val = next32bits >> (32-flushed-X);
-   *			   flushed += X;
-   *			   next32bits &= bitMask[flushed];
-   *	flush_bitsX <-->   flushed += X;
-   *			   next32bits &= bitMask[flushed];
-   *
-   */
-  show_bits32(next32bits);
-  flushed = 0;
-
-  /* show_bits8(index); */
-  index = next32bits >> 24;
-
-  if (index > 3) {
-    value = dct_coeff_tbl[index];
-    *run = (value & RUN_MASK) >> RUN_SHIFT;
-    if (*run == END_OF_BLOCK) {
-      *level = END_OF_BLOCK;
-    }
-    else {
-      /* num_bits = (value & NUM_MASK) + 1; */
-      /* flush_bits(num_bits); */
-      flushed = (value & NUM_MASK) + 1;
-      next32bits &= bitMask[flushed];
-      if (*run != ESCAPE) {
-         *level = (value & LEVEL_MASK) >> LEVEL_SHIFT;
-	 /* get_bits1(value); */
-	 /* if (value) *level = -*level; */
-	 if (next32bits >> (31-flushed)) *level = -*level;
-	 flushed++;
-	 /* next32bits &= bitMask[flushed];  last op before update */
-       }
-       else {    /* *run == ESCAPE */
-         /* get_bits14(temp); */
-	 temp = next32bits >> (18-flushed);
-	 flushed += 14;
-	 next32bits &= bitMask[flushed];
-	 *run = temp >> 8;
-	 temp &= 0xff;
-	 if (temp == 0) {
-            /* get_bits8(*level); */
-	    *level = next32bits >> (24-flushed);
-	    flushed += 8;
-	    /* next32bits &= bitMask[flushed];  last op before update */
- 	    assert(*level >= 128);
-	 } else if (temp != 128) {
-	    /* Grab sign bit */
-	    *level = ((int) (temp << 24)) >> 24;
-	 } else {
-            /* get_bits8(*level); */
-	    *level = next32bits >> (24-flushed);
-	    flushed += 8;
-	    /* next32bits &= bitMask[flushed];  last op before update */
-	    *level = *level - 256;
-	    assert(*level <= -128 && *level >= -255);
-	 }
-       }
-       /* Update bitstream... */
-       flush_bits(flushed);
-    }
-  }
-  else {
-    if (index == 2) { 
-      /* show_bits10(index); */
-      index = next32bits >> 22;
-      value = dct_coeff_tbl_2[index & 3];
-    }
-    else if (index == 3) { 
-      /* show_bits10(index); */
-      index = next32bits >> 22;
-      value = dct_coeff_tbl_3[index & 3];
-    }
-    else if (index) {	/* index == 1 */
-      /* show_bits12(index); */
-      index = next32bits >> 20;
-      value = dct_coeff_tbl_1[index & 15];
-    }
-    else {   /* index == 0 */
-      /* show_bits16(index); */
-      index = next32bits >> 16;
-      value = dct_coeff_tbl_0[index & 255];
-    }
-    *run = (value & RUN_MASK) >> RUN_SHIFT;
-    *level = (value & LEVEL_MASK) >> LEVEL_SHIFT;
-
-    /*
-     * Fold these operations together to make it fast...
-     */
-    /* num_bits = (value & NUM_MASK) + 1; */
-    /* flush_bits(num_bits); */
-    /* get_bits1(value); */
-    /* if (value) *level = -*level; */
-
-    flushed = (value & NUM_MASK) + 2;
-    if ((next32bits >> (32-flushed)) & 0x1) *level = -*level;
-
-    /* Update bitstream ... */
-    flush_bits(flushed);
-  }
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * decodeDCTCoeffFirst --
- *
- *	Huffman Decoder for dct_coeff_first. Locations for the
- *      decoded results: run and level, are being passed as
- *      arguments. Actual work is being done by calling DecodeDCTCoeff,
- *      with the table dct_coeff_first.
- *
- * Results:
- *	The decoded values of run and level for dct_coeff_first or
- *      ERROR for unbound values are placed in the locations given.
- *
- * Side effects:
- *	Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */        
-void
-decodeDCTCoeffFirst(unsigned int *run, int *level)
-{
-  decodeDCTCoeff(dct_coeff_first, run, level);
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * decodeDCTCoeffNext --
- *
- *	Huffman Decoder for dct_coeff_first. Locations for the
- *      decoded results: run and level, are being passed as
- *      arguments. Actual work is being done by calling DecodeDCTCoeff,
- *      with the table dct_coeff_next.
- *
- * Results:
- *	The decoded values of run and level for dct_coeff_next or
- *      ERROR for unbound values are placed in the locations given.
- *
- * Side effects:
- *	Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */ 
-void       
-decodeDCTCoeffNext(unsigned int *run, int *level)
-{
-  decodeDCTCoeff(dct_coeff_next, run, level);
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h
deleted file mode 100644
index eaed06d00cb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/decoders.h
+++ /dev/null
@@ -1,475 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/*
- * decoders.h
- *
- * This file contains the declarations of structures required for Huffman
- * decoding
- *
- */
-
-/* Include util.h for bit i/o parsing macros. */
-
-#include "util.h"
-
-/* Code for unbound values in decoding tables */
-#define ERROR -1
-#define DCT_ERROR 63
-
-#define MACRO_BLOCK_STUFFING 34
-#define MACRO_BLOCK_ESCAPE 35
-
-/* Two types of DCT Coefficients */
-#define DCT_COEFF_FIRST 0
-#define DCT_COEFF_NEXT 1
-
-/* Special values for DCT Coefficients */
-#define END_OF_BLOCK 62
-#define ESCAPE 61
-
-/* Structure for an entry in the decoding table of 
- * macroblock_address_increment */
-typedef struct {
-  unsigned int value;       /* value for macroblock_address_increment */
-  int num_bits;             /* length of the Huffman code */
-} mb_addr_inc_entry;
-
-/* Decoding table for macroblock_address_increment */
-extern mb_addr_inc_entry mb_addr_inc[2048];
-
-
-/* Structure for an entry in the decoding table of macroblock_type */
-typedef struct {
-  unsigned int mb_quant;              /* macroblock_quant */
-  unsigned int mb_motion_forward;     /* macroblock_motion_forward */
-  unsigned int mb_motion_backward;    /* macroblock_motion_backward */
-  unsigned int mb_pattern;            /* macroblock_pattern */
-  unsigned int mb_intra;              /* macroblock_intra */
-  int num_bits;                       /* length of the Huffman code */
-} mb_type_entry;
-
-/* Decoding table for macroblock_type in predictive-coded pictures */
-extern mb_type_entry mb_type_P[64];
-
-/* Decoding table for macroblock_type in bidirectionally-coded pictures */
-extern mb_type_entry mb_type_B[64];
-
-
-/* Structures for an entry in the decoding table of coded_block_pattern */
-typedef struct {
-  unsigned int cbp;            /* coded_block_pattern */
-  int num_bits;                /* length of the Huffman code */
-} coded_block_pattern_entry;
-
-/* External declaration of coded block pattern table. */
-
-extern coded_block_pattern_entry coded_block_pattern[512];
-
-
-
-/* Structure for an entry in the decoding table of motion vectors */
-typedef struct {
-  int code;              /* value for motion_horizontal_forward_code,
-			  * motion_vertical_forward_code, 
-			  * motion_horizontal_backward_code, or
-			  * motion_vertical_backward_code.
-			  */
-  int num_bits;          /* length of the Huffman code */
-} motion_vectors_entry;
-
-
-/* Decoding table for motion vectors */
-extern motion_vectors_entry motion_vectors[2048];
-
-
-/* Structure for an entry in the decoding table of dct_dc_size */
-typedef struct {
-  unsigned int value;    /* value of dct_dc_size (luminance or chrominance) */
-  int num_bits;          /* length of the Huffman code */
-} dct_dc_size_entry;
-
-/* External declaration of dct dc size lumiance table. */
-
-extern dct_dc_size_entry dct_dc_size_luminance[128];
-
-/* External declaration of dct dc size chrom table. */
-
-extern dct_dc_size_entry dct_dc_size_chrominance[256];
-
-
-/* DCT coeff tables. */
-
-#define RUN_MASK 0xfc00
-#define LEVEL_MASK 0x03f0
-#define NUM_MASK 0x000f
-#define RUN_SHIFT 10
-#define LEVEL_SHIFT 4
-
-/* External declaration of dct coeff tables. */
-
-extern unsigned short int dct_coeff_tbl_0[256];
-extern unsigned short int dct_coeff_tbl_1[16];
-extern unsigned short int dct_coeff_tbl_2[4];
-extern unsigned short int dct_coeff_tbl_3[4];
-extern unsigned short int dct_coeff_next[256];
-extern unsigned short int dct_coeff_first[256];
-
-#define DecodeDCTDCSizeLum(macro_val)                    \
-{                                                    \
-  unsigned int index;                                \
-                                                     \
-  show_bits7(index);                              \
-                                                     \
-  macro_val = dct_dc_size_luminance[index].value;       \
-                                                     \
-  flush_bits(dct_dc_size_luminance[index].num_bits); \
-}
-
-#define DecodeDCTDCSizeChrom(macro_val)                      \
-{                                                        \
-  unsigned int index;                                    \
-                                                         \
-  show_bits8(index);                                  \
-                                                         \
-  macro_val = dct_dc_size_chrominance[index].value;         \
-                                                         \
-  flush_bits(dct_dc_size_chrominance[index].num_bits);   \
-}
-
-#define DecodeDCTCoeff(dct_coeff_tbl, run, level)			\
-{									\
-  unsigned int temp, index;						\
-  unsigned int value, next32bits, flushed;				\
-									\
-  /*									\
-   * Grab the next 32 bits and use it to improve performance of		\
-   * getting the bits to parse. Thus, calls are translated as:		\
-   *									\
-   *	show_bitsX  <-->   next32bits >> (32-X)				\
-   *	get_bitsX   <-->   val = next32bits >> (32-flushed-X);		\
-   *			   flushed += X;				\
-   *			   next32bits &= bitMask[flushed];		\
-   *	flush_bitsX <-->   flushed += X;				\
-   *			   next32bits &= bitMask[flushed];		\
-   *									\
-   * I've streamlined the code a lot, so that we don't have to mask	\
-   * out the low order bits and a few of the extra adds are removed.	\
-   */									\
-  show_bits32(next32bits);						\
-									\
-  /* show_bits8(index); */						\
-  index = next32bits >> 24;						\
-									\
-  if (index > 3) {							\
-    value = dct_coeff_tbl[index];					\
-    run = value >> RUN_SHIFT;						\
-    if (run != END_OF_BLOCK) {						\
-      /* num_bits = (value & NUM_MASK) + 1; */				\
-      /* flush_bits(num_bits); */					\
-      if (run != ESCAPE) {						\
-	 /* get_bits1(value); */					\
-	 /* if (value) level = -level; */				\
-	 flushed = (value & NUM_MASK) + 2;				\
-         level = (value & LEVEL_MASK) >> LEVEL_SHIFT;			\
-	 value = next32bits >> (32-flushed);				\
-	 value &= 0x1;							\
-	 if (value) level = -level;					\
-	 /* next32bits &= ((~0) >> flushed);  last op before update */	\
-       }								\
-       else {    /* run == ESCAPE */					\
-	 /* Get the next six into run, and next 8 into temp */		\
-         /* get_bits14(temp); */					\
-	 flushed = (value & NUM_MASK) + 1;				\
-	 temp = next32bits >> (18-flushed);				\
-	 /* Normally, we'd ad 14 to flushed, but I've saved a few	\
-	  * instr by moving the add below */				\
-	 temp &= 0x3fff;						\
-	 run = temp >> 8;						\
-	 temp &= 0xff;							\
-	 if (temp == 0) {						\
-            /* get_bits8(level); */					\
-	    level = next32bits >> (10-flushed);				\
-	    level &= 0xff;						\
-	    flushed += 22;						\
- 	    assert(level >= 128);					\
-	 } else if (temp != 128) {					\
-	    /* Grab sign bit */						\
-	    flushed += 14;						\
-	    level = ((int) (temp << 24)) >> 24;				\
-	 } else {							\
-            /* get_bits8(level); */					\
-	    level = next32bits >> (10-flushed);				\
-	    level &= 0xff;						\
-	    flushed += 22;						\
-	    level = level - 256;					\
-	    assert(level <= -128 && level >= -255);			\
-	 }								\
-       }								\
-       /* Update bitstream... */					\
-       flush_bits(flushed);						\
-       assert (flushed <= 32);						\
-    }									\
-  }									\
-  else {								\
-    if (index == 2) { 							\
-      /* show_bits10(index); */						\
-      index = next32bits >> 22;						\
-      value = dct_coeff_tbl_2[index & 3];				\
-    }									\
-    else if (index == 3) { 						\
-      /* show_bits10(index); */						\
-      index = next32bits >> 22;						\
-      value = dct_coeff_tbl_3[index & 3];				\
-    }									\
-    else if (index) {	/* index == 1 */				\
-      /* show_bits12(index); */						\
-      index = next32bits >> 20;						\
-      value = dct_coeff_tbl_1[index & 15];				\
-    }									\
-    else {   /* index == 0 */						\
-      /* show_bits16(index); */						\
-      index = next32bits >> 16;						\
-      value = dct_coeff_tbl_0[index & 255];				\
-    }									\
-    run = value >> RUN_SHIFT;						\
-    level = (value & LEVEL_MASK) >> LEVEL_SHIFT;			\
-									\
-    /*									\
-     * Fold these operations together to make it fast...		\
-     */									\
-    /* num_bits = (value & NUM_MASK) + 1; */				\
-    /* flush_bits(num_bits); */						\
-    /* get_bits1(value); */						\
-    /* if (value) level = -level; */					\
-									\
-    flushed = (value & NUM_MASK) + 2;					\
-    value = next32bits >> (32-flushed);					\
-    value &= 0x1;							\
-    if (value) level = -level;						\
-									\
-    /* Update bitstream ... */						\
-    flush_bits(flushed);						\
-    assert (flushed <= 32);						\
-  }									\
-}
-
-#define DecodeDCTCoeffFirst(runval, levelval)         \
-{                                                     \
-  DecodeDCTCoeff(dct_coeff_first, runval, levelval);  \
-}          
-
-#define DecodeDCTCoeffNext(runval, levelval)          \
-{                                                     \
-  DecodeDCTCoeff(dct_coeff_next, runval, levelval);   \
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DecodeMBAddrInc --
- *
- *      Huffman Decoder for macro_block_address_increment; the location
- *      in which the result will be placed is being passed as argument.
- *      The decoded value is obtained by doing a table lookup on
- *      mb_addr_inc.
- *
- * Results:
- *      The decoded value for macro_block_address_increment or ERROR
- *      for unbound values will be placed in the location specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-#define DecodeMBAddrInc(val)				\
-{							\
-    unsigned int index;					\
-    show_bits11(index);					\
-    val = mb_addr_inc[index].value;			\
-    flush_bits(mb_addr_inc[index].num_bits);		\
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DecodeMotionVectors --
- *
- *      Huffman Decoder for the various motion vectors, including
- *      motion_horizontal_forward_code, motion_vertical_forward_code,
- *      motion_horizontal_backward_code, motion_vertical_backward_code.
- *      Location where the decoded result will be placed is being passed
- *      as argument. The decoded values are obtained by doing a table
- *      lookup on motion_vectors.
- *
- * Results:
- *      The decoded value for the motion vector or ERROR for unbound
- *      values will be placed in the location specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-#define DecodeMotionVectors(value)			\
-{							\
-  unsigned int index;					\
-  show_bits11(index);					\
-  value = motion_vectors[index].code;			\
-  flush_bits(motion_vectors[index].num_bits);		\
-}
-/*
- *--------------------------------------------------------------
- *
- * DecodeMBTypeB --
- *
- *      Huffman Decoder for macro_block_type in bidirectionally-coded
- *      pictures;locations in which the decoded results: macroblock_quant,
- *      macroblock_motion_forward, macro_block_motion_backward,
- *      macroblock_pattern, macro_block_intra, will be placed are
- *      being passed as argument. The decoded values are obtained by
- *      doing a table lookup on mb_type_B.
- *
- * Results:
- *      The various decoded values for macro_block_type in
- *      bidirectionally-coded pictures or ERROR for unbound values will
- *      be placed in the locations specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-#define DecodeMBTypeB(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-									\
-  show_bits6(index);							\
-									\
-  quant = mb_type_B[index].mb_quant;					\
-  motion_fwd = mb_type_B[index].mb_motion_forward;			\
-  motion_bwd = mb_type_B[index].mb_motion_backward;			\
-  pat = mb_type_B[index].mb_pattern;					\
-  intra = mb_type_B[index].mb_intra;					\
-  flush_bits(mb_type_B[index].num_bits);				\
-}
-/*
- *--------------------------------------------------------------
- *
- * DecodeMBTypeI --
- *
- *      Huffman Decoder for macro_block_type in intra-coded pictures;
- *      locations in which the decoded results: macroblock_quant,
- *      macroblock_motion_forward, macro_block_motion_backward,
- *      macroblock_pattern, macro_block_intra, will be placed are
- *      being passed as argument.
- *
- * Results:
- *      The various decoded values for macro_block_type in intra-coded
- *      pictures or ERROR for unbound values will be placed in the
- *      locations specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-#define DecodeMBTypeI(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-  static int quantTbl[4] = {ERROR, 1, 0, 0};				\
-									\
-  show_bits2(index);							\
-									\
-  motion_fwd = 0;							\
-  motion_bwd = 0;							\
-  pat = 0;								\
-  intra = 1;								\
-  quant = quantTbl[index];						\
-  if (index) {								\
-    flush_bits (1 + quant);						\
-  }									\
-}
-/*
- *--------------------------------------------------------------
- *
- * DecodeMBTypeP --
- *
- *      Huffman Decoder for macro_block_type in predictive-coded pictures;
- *      locations in which the decoded results: macroblock_quant,
- *      macroblock_motion_forward, macro_block_motion_backward,
- *      macroblock_pattern, macro_block_intra, will be placed are
- *      being passed as argument. The decoded values are obtained by
- *      doing a table lookup on mb_type_P.
- *
- * Results:
- *      The various decoded values for macro_block_type in
- *      predictive-coded pictures or ERROR for unbound values will be
- *      placed in the locations specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-#define DecodeMBTypeP(quant, motion_fwd, motion_bwd, pat, intra)	\
-{									\
-  unsigned int index;							\
-									\
-  show_bits6(index);							\
-									\
-  quant = mb_type_P[index].mb_quant;					\
-  motion_fwd = mb_type_P[index].mb_motion_forward;			\
-  motion_bwd = mb_type_P[index].mb_motion_backward;			\
-  pat = mb_type_P[index].mb_pattern;					\
-  intra = mb_type_P[index].mb_intra;					\
-									\
-  flush_bits(mb_type_P[index].num_bits);				\
-}
-/*
- *--------------------------------------------------------------
- *
- * DecodeCBP --
- *
- *      Huffman Decoder for coded_block_pattern; location in which the
- *      decoded result will be placed is being passed as argument. The
- *      decoded values are obtained by doing a table lookup on
- *      coded_block_pattern.
- *
- * Results:
- *      The decoded value for coded_block_pattern or ERROR for unbound
- *      values will be placed in the location specified.
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-#define DecodeCBP(coded_bp)						\
-{									\
-  unsigned int index;							\
-									\
-  show_bits9(index);							\
-  coded_bp = coded_block_pattern[index].cbp;				\
-  flush_bits(coded_block_pattern[index].num_bits);			\
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
deleted file mode 100644
index f11623f84a5..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-extern int LUM_RANGE;
-extern int CR_RANGE;
-extern int CB_RANGE;
-
-
-#define CB_BASE 1
-#define CR_BASE (CB_BASE*CB_RANGE)
-#define LUM_BASE (CR_BASE*CR_RANGE)
-
-extern unsigned char pixel[256];
-extern int *lum_values;
-extern int *cr_values;
-extern int *cb_values;
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
deleted file mode 100644
index 871741f239f..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "video.h"
-#include <X11/Intrinsic.h>
-#include <Xm/Xm.h>
-#include <Xm/Text.h>
-#include <Xm/FileSB.h>
-#include <Xm/DialogS.h>
-#if defined(sun) || defined(FreeBSD)
-#include <stdlib.h>
-#endif
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-
-#ifdef XmFONTLIST_DEFAULT_TAG
-#define XmStringTag XmFONTLIST_DEFAULT_TAG
-#else
-#define XmStringTag XmSTRING_DEFAULT_CHARSET
-#endif
-#define BUFSIZE	256
-
-static Widget       fileshell;
-
-void StartLocalServer(void)
-{
-  int res;
-  
-  static int startLocalServer = 1;
-  
-  if (startLocalServer) {
-    startLocalServer = 0;
-    if (access(VCR_UNIX_PORT, 0) == -1) { /* going to start a server */
-      fprintf(stderr, "Trying to fork a server on local host...\n");
-      res = system("vcrs -rt 2> /dev/null& exit");
-      if (shared->config.verbose && res == -1) {
-	perror("Error on fork server on local host");
-      }
-      usleep(1000000);
-    }
-  }
-}
-
-/* hostname == "" defaults to local host */
-static void StartFile(char *hostname, char *filename)
-{
-  char *title = (char *)malloc(strlen(hostname) + strlen(filename) + 10);
-  char buf[BUFSIZE];
-  int len;
-
-  if (*hostname == 0) StartLocalServer();
-
-  if (*hostname == 0) {
-    get_full_path(filename, buf, BUFSIZE);
-  }
-  else {
-    strncpy(buf, filename, BUFSIZE);
-    buf[BUFSIZE-1] = 0;
-  }
-  len = strlen(buf);
-
-  if (title == NULL) title = filename;
-  else sprintf(title, "%s:%s", hostname, filename);
-
-  if (!strcasecmp(".mpg", buf+len-4) || !strcasecmp(".mpeg", buf+len-5))
-    StartProgram(title, hostname, buf, "", "");
-  else if (!strcasecmp(".au", buf+len-3))
-    StartProgram(title, "", "", hostname, buf);
-  else
-    fprintf(stderr, "Error: type of file %s not known (know only .mpeg .mpg, .au).\n",
-	    filename);
-  if (title != filename) free(title);
-}
-
-static void dismissCB(Widget W, XtPointer closure, XtPointer call_data)
-{
-
-  XtUnmanageChild (fileshell);
-}
-
-static void playCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  char *filename = NULL;       /* String containing file name         */
-  XmStringCharSet charset = (XmStringCharSet) XmSTRING_DEFAULT_CHARSET;
-  XmFileSelectionBoxCallbackStruct *fcb =
-         (XmFileSelectionBoxCallbackStruct *) call_data;
-  
-  XmStringGetLtoR(fcb->value, charset, &filename);
-
-  if (filename == NULL)
-  {
-    fprintf(stderr, "Error: failed to get file name to play.\n");
-    return;
-  }
-  StartFile("", filename);
-  XmStringFree((XmString)filename);
-}
-
-Widget CreateFileWindow(Widget parent, int cmdSock, int * playflag, Widget frametext)
-{
-  Arg          args[10];    /*  arg list             */
-  register     int n;       /*  arg count            */
-  XmString okString, cancelString;
-
-/*  Create the file selection box */
-  okString = (XmString)XmStringCreateLtoR("Select", XmStringTag);
-  cancelString = (XmString)XmStringCreateLtoR("Dismiss", XmStringTag);
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR File Selection"); n++;
-  XtSetArg(args[n], XmNokLabelString, okString); n++;
-  XtSetArg(args[n], XmNcancelLabelString, cancelString); n++;
-  fileshell = XmCreateFileSelectionDialog(parent, "filebox", args, n);
-  XmStringFree(okString);
-  XmStringFree(cancelString);
-  XtAddCallback (fileshell, XmNokCallback, (XtCallbackProc)playCB, NULL);
-  XtAddCallback (fileshell, XmNcancelCallback, (XtCallbackProc)dismissCB, NULL);
-  
-  return fileshell;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp
deleted file mode 100644
index 583582ff3d2..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include <stdlib.h>
-#include <string.h>
-#include "video.h"
-#include "dither.h"
-#include "fs2.h"
-#include "proto.h"
-
-/* Structures for precomputed error propogation values. */
-
-static FS2DithVal lum_index[256];
-static FS2DithVal cr_index[256];
-static FS2DithVal cb_index[256];
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitFS2Dither --
- *
- *	Initializes structures for precomputed 2 error f-s dithering.
- *      The value field of the structure contains the pixel component 
- *      of the particular channel in question. Thus the addition of
- *      the value field of a structure in the luminance index, a 
- *      structure in the Cr index, and a structure in the Cb index will
- *      yeild a color number. This color number can then be transformed
- *      into a pixel value to be displayed. Each channel can then be
- *      processed (i.e. dithered) separately, with the results being
- *      added up and remapped to yield a final pixel value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void InitFS2Dither()
-{
-  int i;
-
-  /* For each possible pixel value, precompute propogated error and
-     store in array.
-  */
-  
-  for (i=0; i<256; i++) {
-    lum_index[i].value = (i * LUM_RANGE) / 256;
-
-    lum_index[i].e1 = (i-lum_values[lum_index[i].value]) / 2;
-    lum_index[i].e3 = (i - lum_values[lum_index[i].value]) - lum_index[i].e1;
-
-    lum_index[i].value *= LUM_BASE;
-
-    cr_index[i].value = (i * CR_RANGE) / 256; 
-
-    cr_index[i].e1 = (i - cr_values[cr_index[i].value]) / 2;
-    cr_index[i].e3 = (i - cr_values[cr_index[i].value]) - cr_index[i].e1 ;
-
-    cr_index[i].value *= CR_BASE;
-
-    cb_index[i].value = (i * CB_RANGE) / 256; 
-
-    cb_index[i].e1 = (i - cb_values[cb_index[i].value]) / 2;
-    cb_index[i].e3 = (i - cb_values[cb_index[i].value]) - cb_index[i].e1;
-
-    cb_index[i].value *= CB_BASE;
-
-  }
-
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * DitherImage --
- *
- *	Converts lum, cr, cb image planes into fixed colormap
- *      space.
- *
- * Results:
- *	the display plane is replaced by 8-bit colormap space
- *      image.
- *
- * Side effects:
- *      Hopefully, none.
- *
- *--------------------------------------------------------------
- */
-
-void FS2DitherImage(unsigned char *lum, unsigned char *cr,
-		    unsigned char *cb, unsigned char *disp,
-		    int rows, int cols)
-{
-  static char *cur_row_error, *next_row_error;
-  static int first = 1;
-  char  *cur_row_err_mark, *next_row_err_mark;
-  char *temp;
-  int i, j, pixsum, c_cols;
-  unsigned char *cur_row, *channel, *dest_row;
-  FS2DithVal *chan_index;
-
-  /* Allocate error arrays. */
-
-  if (first) {
-    cur_row_error = (char *) malloc(cols+2);
-    next_row_error = (char *) malloc(cols+2);
-    first = 0;
-  }
-
-  /* Initialize error arrays. */
-
-  memset(cur_row_error, 0, cols+2);
-  memset(next_row_error, 0, cols+2);
-
-  /* Use luminance values first. */
-
-  /* For each two rows, do... */
-
-  for(i=0; i<rows; i+=2) {
-
-    /* Establish pointer to current source and destination rows. */
-    cur_row = lum + (i*cols);
-    dest_row = disp + (i*cols);
-
-    /* Establish pointers to error arrays. */
-    cur_row_err_mark = cur_row_error + 1;
-    next_row_err_mark = next_row_error + 1;
-
-    
-    /* For each column within first row do... */
-
-    for (j=0; j<cols; j++) {
-
-      /* Calculate pixel value with error. */
-
-      pixsum = *cur_row + *cur_row_err_mark;
-
-      /* Bounds check. */
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-
-      /* Establish dest value, propogate errors. */
-
-      *dest_row = lum_index[pixsum].value;
-      *(cur_row_err_mark+1) += lum_index[pixsum].e1; 
-      *next_row_err_mark += lum_index[pixsum].e3; 
-
-      /* Advance pointers. */
-
-      cur_row++;
-      dest_row++;
-      cur_row_err_mark++;
-      next_row_err_mark++;
-    }
-
-    /* Switch error arrays, so next row errors are now current row errors, and
-       vice versa. 
-    */
-
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    /* Reset next row errors. */
-
-    memset(next_row_error, 0, cols+2); 
-
-    /* Establish pointers for second row. This one will be processed right to
-       left to establish serpantine motion.
-    */
-
-    cur_row += cols-1;
-    dest_row += cols-1;
-    cur_row_err_mark = cur_row_error + cols;
-    next_row_err_mark = next_row_error + cols;
-
-    /* Process each column... */
-
-    for (j=0; j<cols; j++) {
-
-      pixsum = *cur_row + *cur_row_err_mark;
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-      
-      *dest_row = lum_index[pixsum].value;
-      *(cur_row_err_mark-1) += lum_index[pixsum].e1; 
-      *next_row_err_mark += lum_index[pixsum].e3; 
-      
-      cur_row--;
-      dest_row--;
-      cur_row_err_mark--;
-      next_row_err_mark--;
-    }
-
-    /* Switch error arrays. */
-
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    /* Reset next row errors. */
-
-    memset(next_row_error, 0, cols+2); 
-  }
-
-  /* Reset error arrays. */
-
-  memset(cur_row_error, 0, cols+2); 
-  
-  /* Establish column length divided by two. */
-
-  c_cols = cols >> 1;
-
-  /* Set channel to Cr. Use Cr index. */
-
-  channel = cr;
-  chan_index = cr_index;
-  
- repeat:
-
-  /* Process each row of chrominance data... */
-
-  for (i=0; i < rows; i+=2) {
-
-    /* Establish pointers. */
-
-    cur_row = channel + ((i>>1)*c_cols);
-    dest_row = disp + (i*cols);
-
-    cur_row_err_mark = cur_row_error+1;
-    next_row_err_mark = next_row_error+1;
-
-    /* For each column in row... */
-
-    for (j=0; j<cols; j++) {
-      int p_val;
-
-      /* Get pixel value as twos bit complement. */
-
-      p_val = *cur_row;
-
-      /* Add error term. */
-
-      pixsum = *cur_row_err_mark + p_val;
-
-      /* Bounds check. */
-
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-
-      /* Increment dest value. */
-
-      *dest_row += chan_index[pixsum].value;
-
-      /* Propogate error values. */
-
-      *(cur_row_err_mark+1) += chan_index[pixsum].e1; 
-      *next_row_err_mark += chan_index[pixsum].e3; 
-
-
-      /* If count is odd, advance source pointer (Cr and Cb channels are 2:1 
-	 subsampled.
-      */
-
-      if (j&1) cur_row++;
-
-      /* Advance destination and error pointers. */
-
-      dest_row++;
-      cur_row_err_mark++;
-      next_row_err_mark++;
-    }
-
-    /* Switch error arrays. */
-
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    /* Reset next row errors. */
-
-    memset(next_row_error, 0, cols+2);
-
-    /* Re-establish pointers. */
-
-    cur_row += c_cols-1;
-    dest_row += cols-1;
-    cur_row_err_mark = cur_row_error+cols;
-    next_row_err_mark = next_row_error+cols;
-
-    /* Process second row right to left. */
-
-    for (j=0; j<cols; j++) {
-      int p_val;
-
-      /* Get source value as twos bit complement. */
-
-      p_val = *cur_row;
-
-      /* Add error. */
-
-      pixsum = *cur_row_err_mark + p_val;
-
-      /* Bounds check. */
-
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-
-      /* Increment dest value. */
-
-      *dest_row += chan_index[pixsum].value;
-
-      /* Propogate errors. */
-
-      *(cur_row_err_mark-1) += chan_index[pixsum].e1; 
-      *next_row_err_mark += chan_index[pixsum].e3; 
-
-      /* If column counters is odd, decrement source pointer. */
-
-      if (j&1) cur_row--;
-
-      /* Decrement dest and error pointers. */
-
-      dest_row--;
-      cur_row_err_mark--;
-      next_row_err_mark--;
-    }
-
-    /* Switch error arrays. */
-
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    /* Reinitialize next row errors. */
-
-    memset(next_row_error, 0, cols+2);
-  }
-
-  /* If Cr channel completed, set channel to Cb and Cb index and repeat. */
-
-  if (channel == cr) {
-    channel = cb;
-    chan_index = cb_index;
-    memset(cur_row_error, 0, cols+2);
-
-    goto repeat;
-  }
-
-  /* Establish pointer to start of display frame. */
-
-  dest_row = disp;
-
-  /* Transform all display values to pixel values. */
-
-  for (i=0; i<rows; i++) {
-    for (j=0; j<cols; j++) {
-      *dest_row =  pixel[*dest_row];
-      dest_row++;
-    }
-  }
-}
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h
deleted file mode 100644
index 3fa96c16e66..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-typedef struct {
-  unsigned char value;
-  int e1;
-  int e3;
-} FS2DithVal;
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp
deleted file mode 100644
index 949825b64bc..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include <stdlib.h>
-#include <string.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-/* Arrays containing error values for floyd-steinberg dithering. */
-
-static int deltay[256];
-static int deltau[256];
-static int deltav[256];
-static int deltay2[256];
-static int deltau2[256];
-static int deltav2[256];
-
-/* Definitions governing number of bits used for luminance, cr, and cb. */
-
-#define L_BITS 3
-#define CR_BITS 2
-#define CB_BITS 2
-
-/* Masks for proper quantization of lum, cr, and cb values. */
-
-#define L_MASK 0xe0
-#define CR_MASK 0xc0
-#define CB_MASK 0xc0
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitFS2FastDither --
- *
- *	Initializes structures and arrays neeeded for fast implementation
- *      of two error F-S dithering.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void InitFS2FastDither()
-{
-  int i;
-  int lum_num, cr_num, cb_num;
-
-  for (i=0; i<256; i++) {
-    lum_num = (i >> (8-L_BITS));
-    cr_num = (i >> (8-CR_BITS));
-    cb_num = (i >> (8-CB_BITS));
-
-    /* These arrays contain the error values propogated for each pixel value 
-       for each channel. 
-    */
-
-    deltay[i] = (i - ((int) lum_values[lum_num])) / 2;
-    deltau[i] = (i-((int) cr_values[cr_num])) / 2;
-    deltav[i] = (i-((int) cb_values[cb_num])) / 2;
-    deltay2[i] = (i - ((int) lum_values[lum_num])) - deltay[i];
-    deltau2[i] = (i - ((int) cr_values[cr_num])) - deltau[i];
-    deltav2[i] = (i - ((int) cb_values[cb_num])) - deltav[i];
-
-  }
-
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DitherImage --
- *
- *	Dithers an image using floyd-steinberg.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-FS2FastDitherImage (
-    unsigned char *lum,
-    unsigned char *cr,
-    unsigned char *cb,
-    unsigned char *out,
-    int w, int h)
-{
-    int i, j, idx, idx2;
-    int y, u, v;
-    int dy, du, dv;
-    int code;
-    static int *yerr1;
-    static int *yerr2;
-    static int *uerr1;
-    static int *uerr2;
-    static int *verr1;
-    static int *verr2;
-    int *ye1, *ue1, *ve1;
-    int *ye2, *ue2, *ve2;
-    unsigned char *o, *l, *r, *b;
-    static int first = 1;
-
-    /* If first time called, allocate error arrays. */
-
-    if (first) {
-      first = 0;
-      yerr1 = (int *) malloc((w+5)*sizeof(int));
-      yerr2 = (int *) malloc((w+5)*sizeof(int));
-      uerr1 = (int *) malloc((w+5)*sizeof(int));
-      uerr2 = (int *) malloc((w+5)*sizeof(int));
-      verr1 = (int *) malloc((w+5)*sizeof(int));
-      verr2 = (int *) malloc((w+5)*sizeof(int));
-    }
-
-    /*
-     * Init error arrays and variables.
-     */
-    memset ((char *)yerr1, 0, (w+5)*sizeof(int));
-    memset ((char *)yerr2, 0, (w+5)*sizeof(int));
-    memset ((char *)uerr1, 0, (w+5)*sizeof(int));
-    memset ((char *)uerr2, 0, (w+5)*sizeof(int));
-    memset ((char *)verr1, 0, (w+5)*sizeof(int));
-    memset ((char *)verr2, 0, (w+5)*sizeof(int));
-    du = dv = dy = 0;
-
-    for (j=0; j<h; j+=2) {
-	ye1 = yerr1;
-	ue1 = uerr1;
-	ve1 = verr1;
-	ye2 = yerr2;
-	ue2 = uerr2;
-	ve2 = verr2;
-	idx = j*w;
-	idx2 = idx/4;
-	o = out+idx;
-	l = lum+idx;
-	r = cr+idx2;
-	b = cb+idx2;
-	/* Do the top row in forward order. */
-	for (i=0; i<w; i+=2) {
-	    /* Do left side of this pair... */
-	    y = *l++ + dy + *ye1++;
-	    u = *r + du + *ue1++;
-	    v = *b + dv + *ve1++;
-
-	    if (y < 0) y = 0;
-	    else if (y > 255) y = 255;
-	    if (u < 0) u = 0;
-	    else if (u > 255) u = 255;
-	    if (v < 0) v = 0;
-	    else if (v > 255) v = 255;
-
-	    /*
-	     * Construct a code using:
-	     *	high order 3 bits of y, 
-	     *	high order 2 bits of u, 
-	     *	high order 2 bits of v
-	     */
-	    code = (((y & L_MASK) | ((u & CR_MASK) >> L_BITS) | (v >> (L_BITS+CR_BITS))) 
-		    >> (8-(L_BITS+CR_BITS+CB_BITS)));
-	    *o++ = pixel[code];
-	    *ye2++ = deltay[y];
-	    *ue2++ = deltau[u];
-	    *ve2++ = deltav[v];
-	    dy = deltay2[y];
-	    du = deltau2[u];
-	    dv = deltav2[v];
-
-	    /* Do right side of this pair... */
-	    y = *l++ + dy + *ye1++;
-	    u = *r++ + du + *ue1++;
-	    v = *b++ + dv + *ve1++;
-
-	    if (y < 0) y = 0;
-	    else if (y > 255) y = 255;
-	    if (u < 0) u = 0;
-	    else if (u > 255) u = 255;
-	    if (v < 0) v = 0;
-	    else if (v > 255) v = 255;
-
-	    code = (((y & L_MASK) | ((u & CR_MASK) >> L_BITS) | (v >> (L_BITS+CR_BITS))) 
-		    >> (8-(L_BITS+CR_BITS+CB_BITS)));
-	    *o++ = pixel[code];
-	    *ye2++ = deltay[y];
-	    *ue2++ = deltau[u];
-	    *ve2++ = deltav[v];
-	    dy = deltay2[y];
-	    du = deltau2[u];
-	    dv = deltav2[v];
-
-	}
-	
-	ye1 = yerr1+w-1;
-	ue1 = uerr1+w-1;
-	ve1 = verr1+w-1;
-	ye2 = yerr2+w-1;
-	ue2 = uerr2+w-1;
-	ve2 = verr2+w-1;
-	l += w-1;
-	o += w-1;
-	r--;
-	b--;
-	dy = du = dv = 0;
-
-	/* Do bottom part of row, in right to left order. */
-	for (i=w-1; i>0; i-=2) {
-	    /* Do right side of this pair... */
-	    y = *l-- + dy + *ye2--;
-	    u = *r + du + *ue2--;
-	    v = *b + dv + *ve2--;
-
-     	    if (y < 0) y = 0;
-	    else if (y > 255) y = 255;
-	    if (u < 0) u = 0;
-	    else if (u > 255) u = 255;
-	    if (v < 0) v = 0;
-	    else if (v > 255) v = 255;
-
-	    /*
-	     * Construct a code using:
-	     *	high order 3 bits of y, 
-	     *	high order 2 bits of u, 
-	     *	high order 2 bits of v
-	     */
-	    code = (((y & L_MASK) | ((u & CR_MASK) >> L_BITS) | (v >> (L_BITS+CR_BITS))) 
-		    >> (8-(L_BITS+CR_BITS+CB_BITS)));
-	    *o-- = pixel[code];
-	    *ye1-- = deltay[y];
-	    *ue1-- = deltau[u];
-	    *ve1-- = deltav[v];
-	    dy = deltay2[y];
-	    du = deltau2[u];
-	    dv = deltav2[v];
-
-	    /* Do left side of this pair... */
-	    y = *l-- + dy + *ye2--;
-	    u = *r-- + du + *ue2--;
-	    v = *b-- + dv + *ve2--;
-
-	    if (y < 0) y = 0;
-	    else if (y > 255) y = 255;
-	    if (u < 0) u = 0;
-	    else if (u > 255) u = 255;
-	    if (v < 0) v = 0;
-	    else if (v > 255) v = 255;
-
-	    code = (((y & L_MASK) | ((u & CR_MASK) >> L_BITS) | (v >> (L_BITS+CR_BITS))) 
-		    >> (8-(L_BITS+CR_BITS+CB_BITS)));
-	    *o-- = pixel[code];
-	    *ye1-- = deltay[y];
-	    *ue1-- = deltau[u];
-	    *ve1-- = deltav[v];
-	    dy = deltay2[y];
-	    du = deltau2[u];
-	    dv = deltav2[v];
-
-	}
-    }
-}
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp
deleted file mode 100644
index 0be89ba33e5..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to do YCrCb -> colormap space. */
-
-#include <stdlib.h>
-#include <string.h>
-#include "fs4.h"
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-/* Structures containing precomputed error terms. */
-
-static FS4Dither lum_index[256];
-static FS4Dither cr_index[256];
-static FS4Dither cb_index[256];
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitFS4Dither --
- *
- *	Initializes structures used for f-s dithering. Precomputes
- *      error terms.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitFS4Dither()
-{
-  int i;
-
-  for (i=0; i<256; i++) {
-    lum_index[i].value = (i * LUM_RANGE) / 256;
-
-    lum_index[i].e1 = (7 * (i-lum_values[lum_index[i].value])) / 16;
-    lum_index[i].e2 = (i-lum_values[lum_index[i].value])/16;
-    lum_index[i].e3 = (5 *  (i - lum_values[lum_index[i].value])) / 16;
-    lum_index[i].e4 = (i-lum_values[lum_index[i].value]) - lum_index[i].e1 -
-      lum_index[i].e2 - lum_index[i].e3;
-
-    lum_index[i].value *= LUM_BASE;
-
-    cr_index[i].value = (i * CR_RANGE) / 256; 
-
-    cr_index[i].e1 = (7 * (i-cr_values[cr_index[i].value])) / 16;
-    cr_index[i].e2 = (i-cr_values[cr_index[i].value])/16;
-    cr_index[i].e3 = (5 *  (i - cr_values[cr_index[i].value])) / 16;
-    cr_index[i].e4 = (i-cr_values[cr_index[i].value]) - cr_index[i].e1 -
-      cr_index[i].e2 - cr_index[i].e3;
-    cr_index[i].value *= CR_BASE;
-
-    cb_index[i].value = (i * CB_RANGE) / 256; 
-
-    cb_index[i].e1 = (7 * (i-cb_values[cb_index[i].value])) / 16;
-    cb_index[i].e2 = (i-cb_values[cb_index[i].value])/16;
-    cb_index[i].e3 = (5 *  (i - cb_values[cb_index[i].value])) / 16;
-    cb_index[i].e4 = (i-cb_values[cb_index[i].value]) - cb_index[i].e1 -
-      cb_index[i].e2 - cb_index[i].e3;
-    cb_index[i].value *= CB_BASE;
-
-  }
-
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * DitherImage --
- *
- *	Converts lum, cr, cb image planes into fixed colormap
- *      space. Uses Floyd-Steinberg dithering in serpentine
- *      pattern with standard 4 errors propogated.
- *
- * Results:
- *	The display plane is replaced by 8-bit colormap space
- *      image.
- *
- * Side effects:
- *      Hopefully, none.
- *
- *--------------------------------------------------------------
- */
-
-void 
-FS4DitherImage(unsigned char *lum, unsigned char *cr,
-	       unsigned char *cb, unsigned char *disp,
-	       int rows, int cols)
-{
-  static char *cur_row_error, *next_row_error;
-  static int first = 1;
-  char  *cur_row_err_mark, *next_row_err_mark;
-  char *temp;
-  int i, j, pixsum, c_cols;
-  unsigned char *cur_row, *channel, *dest_row;
-  FS4Dither *chan_index;
-
-  if (first) {
-    cur_row_error = (char *) malloc(cols+2);
-    next_row_error = (char *) malloc(cols+2);
-    first = 0;
-  }
-
-  memset(cur_row_error, 0, cols+2);
-  memset(next_row_error, 0, cols+2);
-
-  for(i=0; i<rows; i+=2) {
-     cur_row = lum + (i*cols);
-     dest_row = disp + (i*cols);
-
-     cur_row_err_mark = cur_row_error + 1;
-     next_row_err_mark = next_row_error + 1;
-
-     for (j=0; j<cols; j++) {
-
-       pixsum = *cur_row + *cur_row_err_mark;
-       if (pixsum < 0) pixsum = 0;
-       else if (pixsum > 255) pixsum = 255;
-
-       *dest_row = lum_index[pixsum].value;
-       *(cur_row_err_mark+1) += lum_index[pixsum].e1; 
-       *(next_row_err_mark+1) += lum_index[pixsum].e2;
-       *next_row_err_mark += lum_index[pixsum].e3; 
-       *(next_row_err_mark-1) += lum_index[pixsum].e4;
-
-       cur_row++;
-       dest_row++;
-       cur_row_err_mark++;
-       next_row_err_mark++;
-     }
-
-     temp = cur_row_error;
-     cur_row_error = next_row_error;
-     next_row_error = temp;
-
-     memset(next_row_error, 0, cols+2); 
-
-     cur_row += cols-1;
-     dest_row += cols-1;
-     cur_row_err_mark = cur_row_error + cols;
-     next_row_err_mark = next_row_error + cols;
-
-     for (j=0; j<cols; j++) {
-
-       pixsum = *cur_row + *cur_row_err_mark;
-       if (pixsum < 0) pixsum = 0;
-       else if (pixsum > 255) pixsum = 255;
-
-       *dest_row = lum_index[pixsum].value;
-       *(cur_row_err_mark-1) += lum_index[pixsum].e1; 
-       *(next_row_err_mark-1) += lum_index[pixsum].e2;
-       *next_row_err_mark += lum_index[pixsum].e3; 
-       *(next_row_err_mark+1) += lum_index[pixsum].e4;
-
-       cur_row--;
-       dest_row--;
-       cur_row_err_mark--;
-       next_row_err_mark--;
-     }
-
-     temp = cur_row_error;
-     cur_row_error = next_row_error;
-     next_row_error = temp;
-
-     memset(next_row_error, 0, cols+2); 
-   }
-
-  memset(cur_row_error, 0, cols+2); 
-
-  c_cols = cols >> 1;
-
-  channel = cr;
-  chan_index = cr_index;
-
- repeat:
-
-  for (i=0; i < rows; i+=2) {
-    cur_row = channel + ((i>>1)*c_cols);
-    dest_row = disp + (i*cols);
-
-    cur_row_err_mark = cur_row_error+1;
-    next_row_err_mark = next_row_error+1;
-    
-    for (j=0; j<cols; j++) {
-      int p_val;
-
-      p_val = *cur_row;
-
-      pixsum = *cur_row_err_mark + p_val;
-
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-
-      *dest_row += chan_index[pixsum].value;
-
-      *(cur_row_err_mark+1) += chan_index[pixsum].e1; 
-      *(next_row_err_mark+1) += chan_index[pixsum].e2;
-      *next_row_err_mark += chan_index[pixsum].e3; 
-      *(next_row_err_mark-1) += chan_index[pixsum].e4;
-
-
-      if (j&1) cur_row++;
-      dest_row++;
-      cur_row_err_mark++;
-      next_row_err_mark++;
-    }
-      
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    memset(next_row_error, 0, cols+2);
-
-    cur_row += c_cols-1;
-    dest_row += cols-1;
-    cur_row_err_mark = cur_row_error+cols;
-    next_row_err_mark = next_row_error+cols;
-
-    for (j=0; j<cols; j++) {
-      int p_val;
-
-      p_val = *cur_row;
-
-      pixsum = *cur_row_err_mark + p_val;
-
-      if (pixsum < 0) pixsum = 0;
-      else if (pixsum > 255) pixsum = 255;
-
-      *dest_row += chan_index[pixsum].value;
-
-      *(cur_row_err_mark-1) += chan_index[pixsum].e1; 
-      *(next_row_err_mark-1) += chan_index[pixsum].e2;
-      *next_row_err_mark += chan_index[pixsum].e3; 
-      *(next_row_err_mark+1) += chan_index[pixsum].e4;
-
-      if (j&1) cur_row--;
-      dest_row--;
-      cur_row_err_mark--;
-      next_row_err_mark--;
-    }
-
-    temp = cur_row_error;
-    cur_row_error = next_row_error;
-    next_row_error = temp;
-
-    memset(next_row_error, 0, cols+2);
-  }
-
-  if (channel == cr) {
-    channel = cb;
-    chan_index = cb_index;
-    memset(cur_row_error, 0, cols+2);
-
-    goto repeat;
-  }
-
-  dest_row = disp;
-
-
-  for (i=0; i<rows; i++) {
-    for (j=0; j<cols; j++) {
-      *dest_row =  pixel[*dest_row];
-      dest_row++;
-    }
-  }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h
deleted file mode 100644
index e63fcafa874..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-typedef struct {
-  unsigned char value;
-  int e1;
-  int e2; 
-  int e3;
-  int e4; 
-} FS4Dither;
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp
deleted file mode 100644
index b32855ec370..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <sys/types.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "include/common.h"
-
-/* Declaration of global variable to hold dither info. */
-
-int ditherType;
-
-/* Global file pointer to incoming data. */
-FILE *input;
-
-/* End of File flag. */
-int EOF_flag = 0;
-
-/* Loop flag. */
-int loopFlag = 0;
-
-/* Shared memory flag. */
-int shmemFlag = 0;
-
-/* Quiet flag. */
-int quietFlag = 0;
-
-/* Display image on screen? */
-int noDisplayFlag = 0;
-
-/* real time flag */
-int realTimeFlag = 0;
-
-/* shared version of command line argument */
-int argc_share;
-char **argv_share;
-
-/* for command line display name */
-char displayName[64];
-
-/* command line program list name */
-char proglistName[PATH_SIZE] = "";
-
-/* shared data structure */
-SharedData * shared = NULL;
-
-/* Range values for lum, cr, cb. */
-int LUM_RANGE;
-int CR_RANGE;
-int CB_RANGE;
-
-/* Array that remaps color numbers to actual pixel values used by X server. */
-
-unsigned char pixel[256];
-
-/* Arrays holding quantized value ranged for lum, cr, and cb. */
-
-int *lum_values = NULL;
-int *cr_values = NULL;
-int *cb_values = NULL;
-
-/* Structures used by the X server. */
-
-Display *display;
-Colormap cmap;
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h
deleted file mode 100644
index b7faf0b2827..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/* Declaration of global variable to hold dither info. */
-
-extern int ditherType;
-
-/* Global file pointer to incoming data. */
-extern FILE *input;
-
-/* End of File flag. */
-extern int EOF_flag;
-
-/* Loop flag. */
-extern int loopFlag;
-
-/* Shared memory flag. */
-extern int shmemFlag;
-
-/* Quiet flag. */
-extern int quietFlag;
-
-/* Display image on screen? */
-extern int noDisplayFlag;
-
-/* real time flag */
-extern int realTimeFlag;
-
-/* shared version of command line argument */
-extern int argc_share;
-extern char **argv_share;
-
-/* for command line display name */
-extern char displayName[];
-
-/* command line program list name */
-extern char proglistName[PATH_SIZE];
-
-/* shared data structure */
-extern SharedData * shared;
-
-/* Structures used by the X server. */
-
-extern Display *display;
-extern Colormap cmap;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp
deleted file mode 100644
index 1e0e82c4ba3..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/gray.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-
-/*
- *--------------------------------------------------------------
- *
- * GrayDitherImage --
- *
- *	Dithers image into 128 gray scales. Simply maps luminance
- *      value into 1 of 128 gray scale colors (divide by two, essentially).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-void
-GrayDitherImage(unsigned char *lum, unsigned char *cr,
-		unsigned char *cb, unsigned char *out,
-		int h, int w)
-{
-
-  int i, max = w*h/16;
-
-  for (i=0; i<max; i++) {
-    out[0] = pixel[lum[0]];
-    out[1] = pixel[lum[1]];
-    out[2] = pixel[lum[2]];
-    out[3] = pixel[lum[3]];
-    out[4] = pixel[lum[4]];
-    out[5] = pixel[lum[5]];
-    out[6] = pixel[lum[6]];
-    out[7] = pixel[lum[7]];
-    out[8] = pixel[lum[8]];
-    out[9] = pixel[lum[9]];
-    out[10] = pixel[lum[10]];
-    out[11] = pixel[lum[11]];
-    out[12] = pixel[lum[12]];
-    out[13] = pixel[lum[13]];
-    out[14] = pixel[lum[14]];
-    out[15] = pixel[lum[15]];
-    out += 16;
-    lum += 16;
-  }
-}
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp
deleted file mode 100644
index d94efcf5f56..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to implement an ordered dither. */
-#include <string.h>
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-#define DITH_SIZE 16
-
-
-/* Structures used to implement hybrid ordered dither/floyd-steinberg
-   dither algorithm.
-*/
-
-static unsigned char *l_darrays[DITH_SIZE];
-static unsigned char cr_fsarray[256][4];
-static unsigned char cb_fsarray[256][4];
-
-
-/*
- *--------------------------------------------------------------
- *
- *  InitHybridDither--
- *
- *	Structures intialized for hybrid dithering. Ordered dither
- *      patterns set for luminance channel, f-s errors precomputed
- *      for chrominance channels.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitHybridDither()
-{
-  int i, j, k, err_range, threshval;
-  unsigned char *lmark;
-
-  for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) malloc(256);
-
-    for (j=0; j<lum_values[0]; j++) {
-      *lmark++ = 0;
-    }
-
-    for (j=0; j<(LUM_RANGE-1); j++) {
-      err_range = lum_values[j+1] - lum_values[j];
-      threshval = ((i * err_range) / DITH_SIZE)+lum_values[j];
-
-      for (k=lum_values[j]; k<lum_values[j+1]; k++) {
-	if (k > threshval) *lmark++ = ((j+1) * (CR_RANGE * CB_RANGE));
-	else *lmark++ = (j * (CR_RANGE * CB_RANGE));
-      }
-    }
-
-    for (j=lum_values[LUM_RANGE-1]; j<256; j++) {
-      *lmark++ = (LUM_RANGE-1)*(CR_RANGE * CB_RANGE);
-    }
-
-  }
-  {
-    int cr1, cr2, cr3, cr4, err1, err2;
-    int cb1, cb2, cb3, cb4, val, nval;
-
-    for (i=0; i<256; i++) {
-
-      val = i;
-
-      cr1 = (val * CR_RANGE) / 256;
-      err1 = (val - cr_values[cr1])/2;
-      err2 = (val - cr_values[cr1]) - err1;
-
-      nval = val+err1;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cr2 = (nval * CR_RANGE) / 256;
-      err1 = (nval - cr_values[cr2])/2;
-
-      nval = val+err2;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cr3 = (nval * CR_RANGE) / 256;
-      err2 = (nval - cr_values[cr3])/2;
-
-      nval = val+err1+err2;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cr4 = (nval * CR_RANGE) / 256;
-
-      cr_fsarray[i][0] = cr1*CB_RANGE;
-      cr_fsarray[i][1] = cr2*CB_RANGE;
-      cr_fsarray[i][2] = cr3*CB_RANGE;
-      cr_fsarray[i][3] = cr4*CB_RANGE;
-    }
-    
-    for (i=0; i<256; i++) {
-
-      val = i;
-
-      cb1 = (val * CB_RANGE) / 256;
-      err1 = (val - cb_values[cb1])/2;
-      err2 = (val - cb_values[cb1]) - err1;
-
-      nval = val+err1;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cb2 = (nval * CB_RANGE) / 256;
-      err1 = (nval - cb_values[cb2])/2;
-
-      nval = val+err2;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cb3 = (nval * CB_RANGE) / 256;
-      err2 = (nval - cb_values[cb3])/2;
-
-      nval = val+err1+err2;
-      if (nval > 255) nval = 255;
-      else if (nval < 0) nval = 0;
-      cb4 = (nval * CB_RANGE) / 256;
-
-      cb_fsarray[i][0] = cb1;
-      cb_fsarray[i][1] = cb2;
-      cb_fsarray[i][2] = cb3;
-      cb_fsarray[i][3] = cb4;
-    }
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * HybridDitherImage --
- *
- *	Dithers an image using an ordered dither.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *      The luminance channel is dithered based on the standard
- *      ordered dither pattern for a 4x4 area. The Chrominance 
- *      channels are dithered based on precomputed f-s errors.
- *      Two errors are propogated per pixel. Errors are NOT propogated
- *      beyond a 2x2 pixel area. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-HybridDitherImage (unsigned char *lum, unsigned char *cr,
-		   unsigned char *cb, unsigned char *out,
-		   int w, int h)
-{
-  unsigned char *l, *r, *b, *o1, *o2;
-  unsigned char *l2;
-  int i, j;
-
-  l = lum;
-  l2 = lum+w;
-  r = cr;
-  b = cb;
-  o1 = out;
-  o2 = out+w;
-
-  for (i=0; i<h; i+=4) {
-
-    for (j=0; j<w; j+=4) {
-
-      *o1++ = pixel[(l_darrays[0][*l++] | cr_fsarray[*r][0] | cb_fsarray[*b][0])];
-      *o1++ = pixel[(l_darrays[8][*l++] | cr_fsarray[*r][1] | cb_fsarray[*b][1])];
-      *o2++ = pixel[(l_darrays[12][*l2++] | cr_fsarray[*r][2] | cb_fsarray[*b][2])];
-      *o2++ = pixel[(l_darrays[4][*l2++] | cr_fsarray[*r++][3] | cb_fsarray[*b++][3])];
-
-      *o1++ = pixel[(l_darrays[2][*l++] | cr_fsarray[*r][0] | cb_fsarray[*b][0])];
-      *o1++ = pixel[(l_darrays[10][*l++] | cr_fsarray[*r][1] | cb_fsarray[*b][1])];
-      *o2++ = pixel[(l_darrays[14][*l2++] | cr_fsarray[*r][2] | cb_fsarray[*b][2])];
-      *o2++ = pixel[(l_darrays[6][*l2++] | cr_fsarray[*r++][3] | cb_fsarray[*b++][3])];
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-
-    for (j=0; j<w; j+=4) {
-
-      *o1++ = pixel[(l_darrays[3][*l++] | cr_fsarray[*r][1] | cb_fsarray[*b][1])];
-      *o1++ = pixel[(l_darrays[11][*l++] | cr_fsarray[*r][0] | cb_fsarray[*b][0])];
-      *o2++ = pixel[(l_darrays[15][*l2++] | cr_fsarray[*r][3] | cb_fsarray[*b][3])];
-      *o2++ = pixel[(l_darrays[7][*l2++] | cr_fsarray[*r++][2] | cb_fsarray[*b++][2])];
-
-      *o1++ = pixel[(l_darrays[1][*l++] | cr_fsarray[*r][1] | cb_fsarray[*b][1])];
-      *o1++ = pixel[(l_darrays[9][*l++] | cr_fsarray[*r][0] | cb_fsarray[*b][0])];
-      *o2++ = pixel[(l_darrays[13][*l2++] | cr_fsarray[*r][3] | cb_fsarray[*b][3])];
-      *o2++ = pixel[(l_darrays[5][*l2++] | cr_fsarray[*r++][2] | cb_fsarray[*b++][2])];
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-  }
-}
-
-
-  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp
deleted file mode 100644
index 6386b2f08de..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to implement an ordered dither in the 
-   luminance channel and F-S error diffusion on chrominance.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-#define DITH_SIZE 16
-
-/* Structures used for hybrid dither with errors propogated. */
-
-static unsigned char *l_darrays[DITH_SIZE];
-static unsigned char *l_darrays0, *l_darrays1, *l_darrays2, *l_darrays3;
-static unsigned char *l_darrays4, *l_darrays5, *l_darrays6, *l_darrays7;
-static unsigned char *l_darrays8, *l_darrays9, *l_darrays10, *l_darrays11;
-static unsigned char *l_darrays12, *l_darrays13, *l_darrays14, *l_darrays15;
-static unsigned char cr_fsarray[256*256][4];
-static unsigned char cb_fsarray[256*256][4];
-static unsigned short  c_fserr[256*256][2];
-
-
-/*
- *--------------------------------------------------------------
- *
- *  InitHybridErrorDither--
- *
- *	Initializes structures used for hybrid dither algorithm
- *      with errors propogated on Cr and Cb. 
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitHybridErrorDither()
-{
-  int i, j, k, err_range, threshval;
-  unsigned char *lmark;
-
-
-  for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) malloc(256);
-
-    for (j=0; j<lum_values[0]; j++) {
-      *lmark++ = 0;
-    }
-
-    for (j=0; j<(LUM_RANGE-1); j++) {
-      err_range = lum_values[j+1] - lum_values[j];
-      threshval = ((i * err_range) / DITH_SIZE)+lum_values[j];
-
-      for (k=lum_values[j]; k<lum_values[j+1]; k++) {
-	if (k > threshval) *lmark++ = ((j+1) * (CR_RANGE * CB_RANGE));
-	else *lmark++ = (j * (CR_RANGE * CB_RANGE));
-      }
-    }
-
-    for (j=lum_values[LUM_RANGE-1]; j <256; j++) {
-      *lmark++ = (LUM_RANGE-1)*(CR_RANGE * CB_RANGE);
-    }
-  }
-  l_darrays0 = l_darrays[0]; l_darrays8 = l_darrays[8];
-  l_darrays1 = l_darrays[1]; l_darrays9 = l_darrays[9];
-  l_darrays2 = l_darrays[2]; l_darrays10 = l_darrays[10];
-  l_darrays3 = l_darrays[3]; l_darrays11 = l_darrays[11];
-  l_darrays4 = l_darrays[4]; l_darrays12 = l_darrays[12];
-  l_darrays5 = l_darrays[5]; l_darrays13 = l_darrays[13];
-  l_darrays6 = l_darrays[6]; l_darrays14 = l_darrays[14];
-  l_darrays7 = l_darrays[7]; l_darrays15 = l_darrays[15];
-  {
-    int cr1, cr2, cr3, cr4, err1, err2;
-    int cb1, cb2, cb3, cb4, val, nval;
-    int outerr1, outerr2, outerr3, outerr4;
-    int inerr1, inerr2, inerr3, inerr4;
-    unsigned short oe1, oe2, oe3, oe4;
-
-    for (j=0; j<65536; j+= 256) {
-
-      inerr1 = (((j & 0xc000) >> 14)*8) - 12;
-      inerr2 = (((j & 0x3000) >> 12)*8) - 12;
-      inerr3 = (((j & 0x0c00) >> 10)*8) - 12;
-      inerr4 = (((j & 0x0300) >> 8) *8) - 12;
-
-      for (i=0; i<256; i++) {
-	val = i;
-
-	nval = val+inerr1+inerr3;
-	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;
-	cr1 = ((nval) * CR_RANGE) / 256;
-	err1 = ((nval) - cr_values[cr1])/2;
-	err2 = ((nval) - cr_values[cr1]) - err1;
-
-	nval = val+err1+inerr2;
-	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;
-	cr2 = ((nval) * CR_RANGE) / 256;
-	err1 = ((nval) - cr_values[cr2])/2;
-	outerr3 = ((nval) - cr_values[cr2])-err1;
-
-	nval = val+err2+inerr4;
-	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;
-	cr3 = ((nval) * CR_RANGE) / 256;
-	err2 = ((nval) - cr_values[cr3])/2;
-	outerr1 = ((nval) - cr_values[cr3]) - err2;
-
-	nval = val+err1+err2;
-	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;
-	cr4 = ((nval) * CR_RANGE) / 256;
-	outerr2 = ((nval) - cr_values[cr4])/2;
-	outerr4 = ((nval) - cr_values[cr4])-outerr2;
-
-	cr_fsarray[i+j][0] = cr1*CB_RANGE;
-	cr_fsarray[i+j][1] = cr2*CB_RANGE;
-	cr_fsarray[i+j][2] = cr3*CB_RANGE;
-	cr_fsarray[i+j][3] = cr4*CB_RANGE;
-
-	if (outerr1 < -16) outerr1++;
-	else if (outerr1 > 15) outerr1--;
-	if (outerr2 < -16) outerr2++;
-	else if (outerr2 > 15) outerr2--;
-	if (outerr3 < -16) outerr3++;
-	else if (outerr3 > 15) outerr3--;
-	if (outerr4 < -16) outerr4++;
-	else if (outerr4 > 15) outerr4--;
-
-	oe1 = (outerr1 + 16) / 8;
-	oe2 = (outerr2 + 16) / 8;
-	oe3 = (outerr3 + 16) / 8;
-	oe4 = (outerr4 + 16) / 8;
-
-/* This is a debugging check and should be removed if not needed. */
-	if ((oe1 > 3) || (oe2 > 3) || (oe3 > 3) || (oe4 > 3))
-	  fprintf(stderr, "OE error!!!!\n");
-
-
-	c_fserr[i+j][0] = ((oe1 << 14) | (oe2 << 12));
-
-	c_fserr[i+j][1] = ((oe3 << 10) | (oe4 << 8));
-      }
-
-      for (i=0; i<256; i++) {
-	val = i;
-	nval = val+inerr1+inerr3;
-  	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;     
-	cb1 = ((nval) * CB_RANGE) / 256;
-	err1 = ((nval) - cb_values[cb1])/2;
-	err2 = ((nval) - cb_values[cb1]) - err1;
-
-	nval = val+err1+inerr2;
-  	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;     
-	cb2 = ((nval) * CB_RANGE) / 256;
-	err1 = ((nval) - cb_values[cb2])/2;
-
-	nval = val+err2+inerr4;
-  	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;     
-	cb3 = ((nval) * CB_RANGE) / 256;
-	err2 = ((nval) - cb_values[cb3])/2;
-
-	nval = val+err1+err2;
-  	if (nval < 0) nval = 0; else if (nval > 255) nval = 255;     
-	cb4 = ((nval) * CB_RANGE) / 256;
-
-	cb_fsarray[i+j][0] = cb1;
-	cb_fsarray[i+j][1] = cb2;
-	cb_fsarray[i+j][2] = cb3;
-	cb_fsarray[i+j][3] = cb4;
-      }
-    }
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * HybridErrorDitherImage --
- *
- *	Dithers an image using a hybrid ordered/floyd-steinberg dither.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *      This dither is almost exactly like the dither implemented in the
- *      file odith.c (i.e. hybrid dithering) except a quantized amount of
- *      error is propogated between 2x2 pixel areas in Cr and Cb.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-HybridErrorDitherImage (unsigned char *lum, unsigned char *cr,
-			unsigned char *cb, unsigned char *out,
-			int w, int h)
-{
-  unsigned char *l, *r, *b, *o1, *o2;
-  unsigned char *l2;
-  static int *cr_row_errs;
-  static int *cb_row_errs;
-  int *cr_r_err;
-  int *cb_r_err;
-  int cr_c_err;
-  int cb_c_err;
-  unsigned char *cr_fsptr;
-  unsigned char *cb_fsptr;
-  static int first = 1;
-  int cr_code, cb_code;
-
-  int i, j;
-  int row_advance, row_advance2;
-  int half_row_advance, half_row_advance2;
-
-  /* If first time called, allocate error arrays. */
-
-  if (first) {
-    cr_row_errs = (int *) malloc((w+5)*sizeof(int));
-    cb_row_errs = (int *) malloc((w+5)*sizeof(int));
-    first = 0;
-  }
-
-  row_advance = (w << 1) - 1;
-  row_advance2 = row_advance+2;
-  half_row_advance = (w>>1)-1;
-  half_row_advance2 = half_row_advance+2;
-
-  l = lum;
-  l2 = lum+w;
-  r = cr;
-  b = cb;
-  o1 = out;
-  o2 = out+w;
-
-  memset( (char *) cr_row_errs, 0, (w+5)*sizeof(int));
-  cr_r_err = cr_row_errs;
-  cr_c_err = 0;
-  memset( (char *) cb_row_errs, 0, (w+5)*sizeof(int));
-  cb_r_err = cb_row_errs;
-  cb_c_err = 0;
-
-  for (i=0; i<h; i+=4) {
-
-    for (j=w; j>0; j-=4) {
-
-      cr_code = (*cr_r_err | cr_c_err | *r++);
-      cb_code = (*cb_r_err | cb_c_err | *b++);
-
-      cr_fsptr = cr_fsarray[cr_code];
-      cb_fsptr = cb_fsarray[cb_code];
-
-      *o1++ = pixel[(l_darrays0[*l++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o1++ = pixel[(l_darrays8[*l++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2++ = pixel[(l_darrays12[*l2++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2++ = pixel[(l_darrays4[*l2++] | *cr_fsptr++ | *cb_fsptr++)];
-
-      cr_c_err = c_fserr[cr_code][1];
-      cb_c_err = c_fserr[cb_code][1];
-      *cr_r_err++ = c_fserr[cr_code][0];
-      *cb_r_err++ = c_fserr[cb_code][0];
-      cr_code = (*cr_r_err | cr_c_err | *r++);
-      cb_code = (*cb_r_err | cb_c_err | *b++);
-
-      cr_fsptr = cr_fsarray[cr_code];
-      cb_fsptr = cb_fsarray[cb_code];
-
-      *o1++ = pixel[(l_darrays2[*l++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o1++ = pixel[(l_darrays10[*l++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2++ = pixel[(l_darrays14[*l2++] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2++ = pixel[(l_darrays6[*l2++] | *cr_fsptr++ | *cb_fsptr++)];
-
-      cr_c_err = c_fserr[cr_code][1];
-      cb_c_err = c_fserr[cb_code][1];
-      *cr_r_err++ = c_fserr[cr_code][0];
-      *cb_r_err++ = c_fserr[cb_code][0];
-    }
-
-    l += row_advance; l2 += row_advance;
-    o1 += row_advance; o2 += row_advance;
-    cr_c_err = 0;
-    cb_c_err = 0;
-    cr_r_err--; cb_r_err--;
-    r += half_row_advance; b += half_row_advance;
-
-    for (j=w; j>0; j-=4) {
-
-      cr_code = (*cr_r_err | cr_c_err | *r--);
-      cb_code = (*cb_r_err | cb_c_err | *b--);
-      cr_fsptr = cr_fsarray[cr_code];
-      cb_fsptr = cb_fsarray[cb_code];
-
-      *o1-- = pixel[(l_darrays9[*l--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o1-- = pixel[(l_darrays1[*l--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2-- = pixel[(l_darrays5[*l2--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2-- = pixel[(l_darrays13[*l2--] | *cr_fsptr++ | *cb_fsptr++)];
-
-      cr_c_err = c_fserr[cr_code][1];
-      cb_c_err = c_fserr[cb_code][1];
-      *cr_r_err-- = c_fserr[cr_code][0];
-      *cb_r_err-- = c_fserr[cb_code][0];
-      cr_code = (*cr_r_err | cr_c_err | *r--);
-      cb_code = (*cb_r_err | cb_c_err | *b--);
-      cr_fsptr = cr_fsarray[cr_code];
-      cb_fsptr = cb_fsarray[cb_code];
-
-      *o1-- = pixel[(l_darrays11[*l--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o1-- = pixel[(l_darrays3[*l--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2-- = pixel[(l_darrays7[*l2--] | *cr_fsptr++ | *cb_fsptr++)];
-      *o2-- = pixel[(l_darrays15[*l2--] | *cr_fsptr++ | *cb_fsptr++)];
-
-      cr_c_err = c_fserr[cr_code][1];
-      cb_c_err = c_fserr[cb_code][1];
-      *cr_r_err-- = c_fserr[cr_code][0];
-      *cb_r_err-- = c_fserr[cb_code][0];
-
-    }
-
-    l += row_advance2; l2 += row_advance2;
-    o1 += row_advance2; o2 += row_advance2;
-    cr_c_err = 0; cb_c_err = 0;
-    cr_r_err++; cb_r_err++;
-    r += half_row_advance2; b += half_row_advance2;
-  }
-}
-
-
-  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/info.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/info.cpp
deleted file mode 100644
index ed77e72a442..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/info.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-char infomessage[] = "\
-\n\
-\n\
-      Distributed real-time MPEG video audio Player v2.0\n\
- \n\
-	  Distributed Systems Research Group\n\
-      Department of Computer Science and Engineering\n\
-    Oregon Graduate Institute of Science and Technology\n\
-                       October, 1995\n\
-\n\
-The player features common VCR functionalities like synchronized\n\
-video(MPEG) and audio(.au) play back, play speed set on the fly,\n\
-fast-forward, rewind, step forward, random Positioning, and more.\n\
-\n\
-The player is of server/client architecture. The server manages program\n\
-retrieval and distribution. The client decodes video frames, plays video\n\
-and audio streams, and provides a Motif style user interface.\n\
-\n\
-The MPEG decoder used by the client is originated from U.C.Berkeley\n\
-MPEG decoder 2.0, by Lawrence A. Rowe, Ketan Patel, and Brian Smith,\n\
-of Computer Science Division-EECS, Univ. of Calif. at Berkeley.\n\
-\n\
-The Motif user interface is based on an implementation by Daeron Meyer\n\
-of The Geometry Center, University of Minnesota.\n\
-\n\
-This software is covered by copyrights. It contains code contributed\n\
-by the author and several other parties. Please see the beginning of\n\
-source files and copyright file(s) in the root directory of the source\n\
-kit.\n\
-\n\
-Please forward your questions, comments and bug report to:\n\
-\n\
-                      scen@cse.ogi.edu\n\
-\n\
-";
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/Info.mib b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/Info.mib
deleted file mode 100644
index e42c3b7ec75..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/Info.mib
+++ /dev/null
@@ -1,78 +0,0 @@
-static char InfoMib[] = "\
-TotalWidgets: 4\n\
-Ref: 1\n\
-Widget: \"RootForm\"\n\
-Children: 2 3 4\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Root\"\n\
-Xmwidth: 562\n\
-Xmheight: 307\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 0\n\
-XmleftOffset: 0\n\
-XmrightOffset: 0\n\
-Private-\n\
-EndWidget.\n\
-Ref: 2\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Dismiss\"\n\
-Xmwidth: 62\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 270\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 506\n\
-XmrightOffset: 9\n\
-Private-\n\
-label: \"Dismiss\"\n\
-EndWidget.\n\
-Ref: 3\n\
-Widget: \"TextBig\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"TextBig\"\n\
-Xmwidth: 546\n\
-Xmheight: 256\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 8\n\
-XmbottomOffset: 43\n\
-XmleftOffset: 8\n\
-XmrightOffset: 8\n\
-Private-\n\
-EndWidget.\n\
-Ref: 4\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"OutFrame\"\n\
-Xmwidth: 561\n\
-Xmheight: 306\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 1\n\
-XmleftOffset: 1\n\
-XmrightOffset: 0\n\
-Private-\n\
-shadowtype: 1\n\
-EndWidget.\n\
-END.\n\
-";
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MW.mib b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MW.mib
deleted file mode 100644
index d1f432214bb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MW.mib
+++ /dev/null
@@ -1,229 +0,0 @@
-static char MainMib[] = "\
-TotalWidgets: 12\n\
-Ref: 1\n\
-Widget: \"RootForm\"\n\
-Children: 2 3 4 5 6 7 8 9 10 11 12\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Root\"\n\
-Xmwidth: 364\n\
-Xmheight: 216\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 0\n\
-XmleftOffset: 0\n\
-XmrightOffset: 0\n\
-Private-\n\
-EndWidget.\n\
-Ref: 2\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Info\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 200\n\
-XmrightOffset: 123\n\
-Private-\n\
-label: \"Info\"\n\
-EndWidget.\n\
-Ref: 3\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Loop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 140\n\
-XmrightOffset: 196\n\
-Private-\n\
-label: \"Loop\"\n\
-EndWidget.\n\
-Ref: 4\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Step\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 74\n\
-XmrightOffset: 262\n\
-Private-\n\
-label: \"Step\"\n\
-EndWidget.\n\
-Ref: 5\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Exit\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 314\n\
-XmrightOffset: 9\n\
-Private-\n\
-label: \"Exit\"\n\
-EndWidget.\n\
-Ref: 6\n\
-Widget: \"TextBox\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"FrameText\"\n\
-Xmwidth: 65\n\
-Xmheight: 29\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 8\n\
-XmleftOffset: 245\n\
-XmrightOffset: 54\n\
-Private-\n\
-EndWidget.\n\
-Ref: 7\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Rewind\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 8\n\
-XmrightOffset: 328\n\
-Private-\n\
-label: \"Rew\"\n\
-EndWidget.\n\
-Ref: 8\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Play\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 107\n\
-XmrightOffset: 229\n\
-Private-\n\
-label: \"Play\"\n\
-EndWidget.\n\
-Ref: 9\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Stop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 9\n\
-XmleftOffset: 41\n\
-XmrightOffset: 295\n\
-Private-\n\
-label: \"Stop\"\n\
-EndWidget.\n\
-Ref: 10\n\
-Widget: \"DrawingArea\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Monitor\"\n\
-Xmwidth: 336\n\
-Xmheight: 157\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 13\n\
-XmbottomOffset: 46\n\
-XmleftOffset: 13\n\
-XmrightOffset: 15\n\
-Private-\n\
-EndWidget.\n\
-Ref: 11\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"InFrame\"\n\
-Xmwidth: 347\n\
-Xmheight: 167\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 8\n\
-XmbottomOffset: 41\n\
-XmleftOffset: 8\n\
-XmrightOffset: 9\n\
-Private-\n\
-shadowtype: 0\n\
-EndWidget.\n\
-Ref: 12\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"OutFrame\"\n\
-Xmwidth: 362\n\
-Xmheight: 215\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 1\n\
-XmleftOffset: 1\n\
-XmrightOffset: 1\n\
-Private-\n\
-shadowtype: 1\n\
-EndWidget.\n\
-END.\n\
-";
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MainWindow.mib b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MainWindow.mib
deleted file mode 100644
index 1005fba75e8..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/MainWindow.mib
+++ /dev/null
@@ -1,324 +0,0 @@
-static char MainMib[] = "\
-TotalWidgets: 17\n\
-Ref: 1\n\
-Widget: \"RootForm\"\n\
-Children: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Root\"\n\
-Xmwidth: 364\n\
-Xmheight: 306\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 0\n\
-XmleftOffset: 0\n\
-XmrightOffset: 0\n\
-Private-\n\
-EndWidget.\n\
-Ref: 2\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Exit\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 8\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Exit\"\n\
-EndWidget.\n\
-Ref: 3\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Info\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 53\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Info\"\n\
-EndWidget.\n\
-Ref: 4\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Para\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 98\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Para\"\n\
-EndWidget.\n\
-Ref: 5\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Prog\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 143\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Prog\"\n\
-EndWidget.\n\
-Ref: 6\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"File\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 188\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"File\"\n\
-EndWidget.\n\
-Ref: 7\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Step\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 9\n\
-Private-\n\
-label: \"Step\"\n\
-EndWidget.\n\
-Ref: 8\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Play\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 42\n\
-Private-\n\
-label: \"Play\"\n\
-EndWidget.\n\
-Ref: 9\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"FF\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 75\n\
-Private-\n\
-label: \"FF\"\n\
-EndWidget.\n\
-Ref: 10\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Stop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 108\n\
-Private-\n\
-label: \"Stop\"\n\
-EndWidget.\n\
-Ref: 11\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Rewind\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 141\n\
-Private-\n\
-label: \"Rewind\"\n\
-EndWidget.\n\
-Ref: 12\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Normal\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 174\n\
-Private-\n\
-label: \"Norm\"\n\
-EndWidget.\n\
-Ref: 13\n\
-Widget: \"Toggle\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Loop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 219\n\
-Private-\n\
-label: \"Loop\"\n\
-EndWidget.\n\
-Ref: 14\n\
-Widget: \"DrawingArea\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Monitor\"\n\
-Xmwidth: 336\n\
-Xmheight: 157\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 43\n\
-XmbottomOffset: 106\n\
-XmleftOffset: 13\n\
-XmrightOffset: 15\n\
-Private-\n\
-EndWidget.\n\
-Ref: 15\n\
-Widget: \"TextBox\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"TitleText\"\n\
-Xmwidth: 336\n\
-Xmheight: 29\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 0\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 8\n\
-XmbottomOffset: 106\n\
-XmleftOffset: 8\n\
-XmrightOffset: 9\n\
-Private-\n\
-EndWidget.\n\
-Ref: 16\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"InFrame\"\n\
-Xmwidth: 347\n\
-Xmheight: 197\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 38\n\
-XmbottomOffset: 101\n\
-XmleftOffset: 8\n\
-XmrightOffset: 9\n\
-Private-\n\
-shadowtype: 0\n\
-EndWidget.\n\
-Ref: 17\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"OutFrame\"\n\
-Xmwidth: 362\n\
-Xmheight: 275\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 1\n\
-XmleftOffset: 1\n\
-XmrightOffset: 1\n\
-Private-\n\
-shadowtype: 1\n\
-EndWidget.\n\
-END.\n\
-";
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/fb.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/fb.xbm
deleted file mode 100644
index e20c1d81d6c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/fb.xbm
+++ /dev/null
@@ -1,9 +0,0 @@
-#define fb_width 20
-#define fb_height 20
-static unsigned char fb_bits[] = {
-0x00, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x8a, 0x02, 0x00, 
-0x4d, 0x03, 0x80, 0xaa, 0x02, 0x40, 0x5d, 0x03, 0xa0, 0x28, 
-0x02, 0x50, 0x1c, 0x03, 0x28, 0x00, 0x02, 0x1c, 0x00, 0x03, 
-0x38, 0x00, 0x02, 0x70, 0x1c, 0x03, 0xe0, 0x38, 0x02, 0xc0, 
-0x7d, 0x03, 0x80, 0xeb, 0x02, 0x00, 0xcf, 0x03, 0x00, 0x8e, 
-0x03, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/ff.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/ff.xbm
deleted file mode 100644
index 82b4c250417..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/ff.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define ff_width 20
-#define ff_height 20
-static unsigned char ff_bits[] = {
-   0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x14, 0x05, 0x00, 0x2c, 0x0b, 0x00,
-   0x54, 0x15, 0x00, 0xac, 0x2b, 0x00, 0x44, 0x51, 0x00, 0x8c, 0xa3, 0x00,
-   0x04, 0x40, 0x01, 0x0c, 0x80, 0x03, 0x04, 0xc0, 0x01, 0x8c, 0xe3, 0x00,
-   0xc4, 0x71, 0x00, 0xec, 0x3b, 0x00, 0x74, 0x1d, 0x00, 0x3c, 0x0f, 0x00,
-   0x1c, 0x07, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/loop.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/loop.xbm
deleted file mode 100644
index 9847623ba6a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/loop.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define loop_width 20
-#define loop_height 20
-static unsigned char loop_bits[] = {
-   0x00, 0x10, 0x00, 0x00, 0xf0, 0x00, 0xa0, 0xa0, 0x03, 0x50, 0x51, 0x05,
-   0xe8, 0xa0, 0x06, 0x74, 0x50, 0x03, 0x38, 0xe0, 0x02, 0x34, 0x70, 0x05,
-   0x1a, 0x80, 0x06, 0x14, 0x00, 0x05, 0x1a, 0x80, 0x06, 0x14, 0x00, 0x05,
-   0x2a, 0x80, 0x06, 0x54, 0x40, 0x03, 0xa8, 0xaa, 0x02, 0x50, 0x55, 0x01,
-   0xb0, 0xea, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/old.MainWindow.mib b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/old.MainWindow.mib
deleted file mode 100644
index b3cc211d9ad..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/old.MainWindow.mib
+++ /dev/null
@@ -1,305 +0,0 @@
-static char MainMib[] = "\
-TotalWidgets: 16\n\
-Ref: 1\n\
-Widget: \"RootForm\"\n\
-Children: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Root\"\n\
-Xmwidth: 364\n\
-Xmheight: 306\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 0\n\
-XmleftOffset: 0\n\
-XmrightOffset: 0\n\
-Private-\n\
-EndWidget.\n\
-Ref: 2\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Exit\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 8\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Exit\"\n\
-EndWidget.\n\
-Ref: 3\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Info\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 53\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Info\"\n\
-EndWidget.\n\
-Ref: 4\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Para\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 98\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Para\"\n\
-EndWidget.\n\
-Ref: 5\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Prog\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 0\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 143\n\
-XmrightOffset: 10\n\
-Private-\n\
-label: \"Prog\"\n\
-EndWidget.\n\
-Ref: 6\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Step\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 9\n\
-Private-\n\
-label: \"Step\"\n\
-EndWidget.\n\
-Ref: 7\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Play\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 42\n\
-Private-\n\
-label: \"Play\"\n\
-EndWidget.\n\
-Ref: 8\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"FF\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 75\n\
-Private-\n\
-label: \"FF\"\n\
-EndWidget.\n\
-Ref: 9\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Stop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 108\n\
-Private-\n\
-label: \"Stop\"\n\
-EndWidget.\n\
-Ref: 10\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Rewind\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 141\n\
-Private-\n\
-label: \"Rewind\"\n\
-EndWidget.\n\
-Ref: 11\n\
-Widget: \"Button\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Normal\"\n\
-Xmwidth: 41\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 174\n\
-Private-\n\
-label: \"Norm\"\n\
-EndWidget.\n\
-Ref: 12\n\
-Widget: \"Toggle\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Loop\"\n\
-Xmwidth: 28\n\
-Xmheight: 28\n\
-XmtopAttachment: 0\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 0\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 179\n\
-XmbottomOffset: 69\n\
-XmleftOffset: 100\n\
-XmrightOffset: 219\n\
-Private-\n\
-label: \"Loop\"\n\
-EndWidget.\n\
-Ref: 13\n\
-Widget: \"DrawingArea\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"Monitor\"\n\
-Xmwidth: 336\n\
-Xmheight: 157\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 43\n\
-XmbottomOffset: 106\n\
-XmleftOffset: 13\n\
-XmrightOffset: 15\n\
-Private-\n\
-EndWidget.\n\
-Ref: 14\n\
-Widget: \"TextBox\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"TitleText\"\n\
-Xmwidth: 336\n\
-Xmheight: 29\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 0\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 8\n\
-XmbottomOffset: 106\n\
-XmleftOffset: 8\n\
-XmrightOffset: 9\n\
-Private-\n\
-EndWidget.\n\
-Ref: 15\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"InFrame\"\n\
-Xmwidth: 347\n\
-Xmheight: 197\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 38\n\
-XmbottomOffset: 101\n\
-XmleftOffset: 8\n\
-XmrightOffset: 9\n\
-Private-\n\
-shadowtype: 0\n\
-EndWidget.\n\
-Ref: 16\n\
-Widget: \"Frame\"\n\
-Children: X\n\
-Parent: 1\n\
-Public-\n\
-Name: \"OutFrame\"\n\
-Xmwidth: 362\n\
-Xmheight: 275\n\
-XmtopAttachment: 1\n\
-XmbottomAttachment: 1\n\
-XmleftAttachment: 1\n\
-XmrightAttachment: 1\n\
-XmtopOffset: 0\n\
-XmbottomOffset: 1\n\
-XmleftOffset: 1\n\
-XmrightOffset: 1\n\
-Private-\n\
-shadowtype: 1\n\
-EndWidget.\n\
-END.\n\
-";
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/play.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/play.xbm
deleted file mode 100644
index 91955e5117c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/play.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define play_width 20
-#define play_height 20
-static unsigned char play_bits[] = {
-   0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x40, 0x01, 0x00, 0xc0, 0x02, 0x00,
-   0x40, 0x05, 0x00, 0xc0, 0x0a, 0x00, 0x40, 0x14, 0x00, 0xc0, 0x28, 0x00,
-   0x40, 0x50, 0x00, 0xc0, 0xe0, 0x00, 0x40, 0x70, 0x00, 0xc0, 0x38, 0x00,
-   0x40, 0x1c, 0x00, 0xc0, 0x0e, 0x00, 0x40, 0x07, 0x00, 0xc0, 0x03, 0x00,
-   0xc0, 0x01, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/rewind.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/rewind.xbm
deleted file mode 100644
index 402643dcd25..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/rewind.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define rewind_width 20
-#define rewind_height 20
-static unsigned char rewind_bits[] = {
-   0x00, 0x00, 0x00, 0x30, 0x80, 0x01, 0x28, 0x40, 0x01, 0x30, 0xa0, 0x01,
-   0x28, 0x50, 0x01, 0x30, 0xa8, 0x01, 0x28, 0x14, 0x01, 0x30, 0x8a, 0x01,
-   0x28, 0x05, 0x01, 0xb0, 0x83, 0x01, 0x28, 0x03, 0x01, 0x30, 0x8e, 0x01,
-   0x28, 0x1c, 0x01, 0x30, 0xb8, 0x01, 0x28, 0x70, 0x01, 0x30, 0xe0, 0x01,
-   0x28, 0xc0, 0x01, 0x38, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/step.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/step.xbm
deleted file mode 100644
index 3ac996cbdb7..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/step.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define step_width 20
-#define step_height 20
-static unsigned char step_bits[] = {
-   0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x14, 0x05, 0x00, 0x18, 0x0b, 0x00,
-   0x14, 0x15, 0x00, 0x18, 0x2b, 0x00, 0x14, 0x51, 0x00, 0x18, 0xa3, 0x00,
-   0x14, 0x41, 0x01, 0x18, 0x83, 0x03, 0x14, 0xc1, 0x01, 0x18, 0xe3, 0x00,
-   0x14, 0x71, 0x00, 0x18, 0x3b, 0x00, 0x14, 0x1d, 0x00, 0x18, 0x0f, 0x00,
-   0x14, 0x07, 0x00, 0x1c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/stop.xbm b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/stop.xbm
deleted file mode 100644
index 490ee392761..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/interface/stop.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define stop_width 20
-#define stop_height 20
-static unsigned char stop_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x03, 0x54, 0x55, 0x01,
-   0xac, 0xaa, 0x02, 0x14, 0x80, 0x01, 0x0c, 0x80, 0x02, 0x14, 0x80, 0x01,
-   0x0c, 0x80, 0x02, 0x14, 0x80, 0x01, 0x0c, 0x80, 0x02, 0x14, 0x80, 0x01,
-   0x0c, 0x80, 0x02, 0x14, 0x80, 0x01, 0x0c, 0x80, 0x02, 0xf4, 0xff, 0x01,
-   0xac, 0xaa, 0x02, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp
deleted file mode 100644
index b59adbd847b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/jrevdct.cpp
+++ /dev/null
@@ -1,1457 +0,0 @@
-/* $Id$ */
-/*
- * jrevdct.c
- *
- * Copyright (C) 1991, 1992, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the basic inverse-DCT transformation subroutine.
- *
- * This implementation is based on an algorithm described in
- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
- * The primary algorithm described there uses 11 multiplies and 29 adds.
- * We use their alternate method with 12 multiplies and 32 adds.
- * The advantage of this method is that no data path contains more than one
- * multiplication; this allows a very simple and accurate implementation in
- * scaled fixed-point arithmetic, with a minimal number of shifts.
- * 
- * I've made lots of modifications to attempt to take advantage of the
- * sparse nature of the DCT matrices we're getting.  Although the logic
- * is cumbersome, it's straightforward and the resulting code is much
- * faster.
- *
- * A better way to do this would be to pass in the DCT block as a sparse
- * matrix, perhaps with the difference cases encoded.
- */
-
-#include <string.h>
-#include "video.h"
-#include "proto.h"
-
-#define GLOBAL			/* a function referenced thru EXTERNs */
-  
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-  
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-/*
- * This routine is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * A 2-D IDCT can be done by 1-D IDCT on each row followed by 1-D IDCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * The poop on this scaling stuff is as follows:
- *
- * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)
- * larger than the true IDCT outputs.  The final outputs are therefore
- * a factor of N larger than desired; since N=8 this can be cured by
- * a simple right shift at the end of the algorithm.  The advantage of
- * this arrangement is that we save two multiplications per 1-D IDCT,
- * because the y0 and y4 inputs need not be divided by sqrt(N).
- *
- * We have to do addition and subtraction of the integer inputs, which
- * is no problem, and multiplication by fractional constants, which is
- * a problem to do in integer arithmetic.  We multiply all the constants
- * by CONST_SCALE and convert them to integer constants (thus retaining
- * CONST_BITS bits of precision in the constants).  After doing a
- * multiplication we have to divide the product by CONST_SCALE, with proper
- * rounding, to produce the correct output.  This division can be done
- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
- * as long as possible so that partial sums can be added together with
- * full fractional precision.
- *
- * The outputs of the first pass are scaled up by PASS1_BITS bits so that
- * they are represented to better-than-integral precision.  These outputs
- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
- * with the recommended scaling.  (To scale up 12-bit sample data further, an
- * intermediate INT32 array would be needed.)
- *
- * To avoid overflow of the 32-bit intermediate results in pass 2, we must
- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
- * shows that the values given below are the most effective.
- */
-
-#ifdef EIGHT_BIT_SAMPLES
-#define PASS1_BITS  2
-#else
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-#define ONE	((INT32) 1)
-
-#define CONST_SCALE (ONE << CONST_BITS)
-
-/* Convert a positive real constant to an integer scaled by CONST_SCALE.
- * IMPORTANT: if your compiler doesn't do this arithmetic at compile time,
- * you will pay a significant penalty in run time.  In that case, figure
- * the correct integer constant values and insert them by hand.
- */
-
-#define FIX(x)	((INT32) ((x) * CONST_SCALE + 0.5))
-
-/* Descale and correctly round an INT32 value that's scaled by N bits.
- * We assume RIGHT_SHIFT rounds towards minus infinity, so adding
- * the fudge factor is correct for either sign of X.
- */
-
-#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply;
- * this provides a useful speedup on many machines.
- * There is no way to specify a 16x16->32 multiply in portable C, but
- * some C compilers will do the right thing if you provide the correct
- * combination of casts.
- * NB: for 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#ifdef EIGHT_BIT_SAMPLES
-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
-#define MULTIPLY(var,const)  (((INT16) (var)) * ((INT16) (const)))
-#endif
-#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */
-#define MULTIPLY(var,const)  (((INT16) (var)) * ((INT32) (const)))
-#endif
-#endif
-
-#ifndef MULTIPLY		/* default definition */
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-/* Precomputed idct value arrays. */
-
-static DCTELEM PreIDCT[64][64];
-
-void j_rev_dct (DCTBLOCK data);
-
-/* Pre compute singleton coefficient IDCT values. */
-void
-init_pre_idct() {
-  int i;
-
-  for (i=0; i<64; i++) {
-    memset((char *) PreIDCT[i], 0, 64*sizeof(DCTELEM));
-    PreIDCT[i][i] = 2048;
-    j_rev_dct(PreIDCT[i]);
-  }
-}
-
-#ifndef ORIG_DCT
-  
-
-/*
- * Perform the inverse DCT on one block of coefficients.
- */
-
-void
-j_rev_dct_sparse (DCTBLOCK data, int pos)
-{
-  register DCTELEM *dataptr;
-  short int val;
-  DCTELEM *ndataptr;
-  int scale, coeff, rr;
-  register int *dp;
-  register int v;
-
-  /* If DC Coefficient. */
-  
-  if (pos == 0) {
-    dp = (int *)data;
-    v = *data;
-    /* Compute 32 bit value to assign.  This speeds things up a bit */
-    if (v < 0) val = (v-3)>>3;
-    else val = (v+4)>>3;
-    v = val | (val << 16);
-    dp[0] = v;      dp[1] = v;      dp[2] = v;      dp[3] = v;
-    dp[4] = v;      dp[5] = v;      dp[6] = v;      dp[7] = v;
-    dp[8] = v;      dp[9] = v;      dp[10] = v;      dp[11] = v;
-    dp[12] = v;      dp[13] = v;      dp[14] = v;      dp[15] = v;
-    dp[16] = v;      dp[17] = v;      dp[18] = v;      dp[19] = v;
-    dp[20] = v;      dp[21] = v;      dp[22] = v;      dp[23] = v;
-    dp[24] = v;      dp[25] = v;      dp[26] = v;      dp[27] = v;
-    dp[28] = v;      dp[29] = v;      dp[30] = v;      dp[31] = v;
-    return;
-  }
-  
-  /* Some other coefficient. */
-  dataptr = (DCTELEM *)data;
-  coeff = dataptr[pos];
-  ndataptr = PreIDCT[pos];
-
-  for (rr=0; rr<4; rr++) {
-    dataptr[0] = (ndataptr[0] * coeff) >> (CONST_BITS-2);
-    dataptr[1] = (ndataptr[1] * coeff) >> (CONST_BITS-2);
-    dataptr[2] = (ndataptr[2] * coeff) >> (CONST_BITS-2);
-    dataptr[3] = (ndataptr[3] * coeff) >> (CONST_BITS-2);
-    dataptr[4] = (ndataptr[4] * coeff) >> (CONST_BITS-2);
-    dataptr[5] = (ndataptr[5] * coeff) >> (CONST_BITS-2);
-    dataptr[6] = (ndataptr[6] * coeff) >> (CONST_BITS-2);
-    dataptr[7] = (ndataptr[7] * coeff) >> (CONST_BITS-2);
-    dataptr[8] = (ndataptr[8] * coeff) >> (CONST_BITS-2);
-    dataptr[9] = (ndataptr[9] * coeff) >> (CONST_BITS-2);
-    dataptr[10] = (ndataptr[10] * coeff) >> (CONST_BITS-2);
-    dataptr[11] = (ndataptr[11] * coeff) >> (CONST_BITS-2);
-    dataptr[12] = (ndataptr[12] * coeff) >> (CONST_BITS-2);
-    dataptr[13] = (ndataptr[13] * coeff) >> (CONST_BITS-2);
-    dataptr[14] = (ndataptr[14] * coeff) >> (CONST_BITS-2);
-    dataptr[15] = (ndataptr[15] * coeff) >> (CONST_BITS-2);
-    dataptr += 16;
-    ndataptr += 16;
-  }
-  return;
-}
-
-
-void
-j_rev_dct (DCTBLOCK data)
-{
-  INT32 tmp0, tmp1, tmp2, tmp3;
-  INT32 tmp10, tmp11, tmp12, tmp13;
-  INT32 z1, z2, z3, z4, z5;
-  INT32 d0, d1, d2, d3, d4, d5, d6, d7;
-  register DCTELEM *dataptr;
-  int rowctr;
-  SHIFT_TEMPS
-   
-  /* Pass 1: process rows. */
-  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  dataptr = data;
-
-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any row in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * row DCT calculations can be simplified this way.
-     */
-
-    register int *idataptr = (int*)dataptr;
-    d0 = dataptr[0];
-    d1 = dataptr[1];
-    if ((d1 == 0) && (idataptr[1] | idataptr[2] | idataptr[3]) == 0) {
-      /* AC terms all zero */
-      if (d0) {
-	  /* Compute a 32 bit value to assign. */
-	  DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS);
-	  register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000);
-	  
-	  idataptr[0] = v;
-	  idataptr[1] = v;
-	  idataptr[2] = v;
-	  idataptr[3] = v;
-      }
-      
-      dataptr += DCTSIZE;	/* advance pointer to next row */
-      continue;
-    }
-    d2 = dataptr[2];
-    d3 = dataptr[3];
-    d4 = dataptr[4];
-    d5 = dataptr[5];
-    d6 = dataptr[6];
-    d7 = dataptr[7];
-
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    if (d6) {
-	if (d4) {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 != 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 != 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 != 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 != 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, -FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    }
-	} else {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 == 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 == 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 == 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 == 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    }
-	}
-    } else {
-	if (d4) {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 != 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 != 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
-		    tmp10 = tmp13 = (d0 + d4) << CONST_BITS;
-		    tmp11 = tmp12 = (d0 - d4) << CONST_BITS;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 != 0, d6 == 0 */
-		    tmp10 = tmp13 = d4 << CONST_BITS;
-		    tmp11 = tmp12 = -tmp10;
-		}
-	    }
-	} else {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 == 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 == 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 == 0, d6 == 0 */
-		    tmp10 = tmp13 = tmp11 = tmp12 = d0 << CONST_BITS;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 == 0, d6 == 0 */
-		    tmp10 = tmp13 = tmp11 = tmp12 = 0;
-		}
-	    }
-	}
-    }
-
-
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-
-    if (d7) {
-	if (d5) {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 != 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z2 = d5 + d3;
-		    z3 = d7 + d3;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(z3 + z4, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 != 0, d7 != 0 */
-		    z1 = d7;
-		    z2 = d5 + d3;
-		    z3 = d7 + d3;
-		    z5 = MULTIPLY(z3 + d5, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 = z1 + z4;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 != 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z2 = d5;
-		    z3 = d7;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(z3 + z4, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 = z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 != 0, d7 != 0 */
-		    tmp0 = MULTIPLY(d7, - FIX(0.601344887)); 
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    tmp1 = MULTIPLY(d5, - FIX(0.509795578));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    z5 = MULTIPLY(d5 + d7, FIX(1.175875602));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z3;
-		    tmp1 += z4;
-		    tmp2 = z2 + z3;
-		    tmp3 = z1 + z4;
-		}
-	    }
-	} else {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 == 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z3 = d7 + d3;
-		    z5 = MULTIPLY(z3 + d1, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(d3, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(d1, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 = z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 == 0, d7 != 0 */
-		    z3 = d7 + d3;
-		    
-		    tmp0 = MULTIPLY(d7, - FIX(0.601344887)); 
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    tmp2 = MULTIPLY(d3, FIX(0.509795579));
-		    z2 = MULTIPLY(d3, - FIX(2.562915447));
-		    z5 = MULTIPLY(z3, FIX(1.175875602));
-		    z3 = MULTIPLY(z3, - FIX(0.785694958));
-		    
-		    tmp0 += z3;
-		    tmp1 = z2 + z5;
-		    tmp2 += z3;
-		    tmp3 = z1 + z5;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 == 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z5 = MULTIPLY(z1, FIX(1.175875602));
-
-		    z1 = MULTIPLY(z1, FIX(0.275899379));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    tmp0 = MULTIPLY(d7, - FIX(1.662939224)); 
-		    z4 = MULTIPLY(d1, - FIX(0.390180644));
-		    tmp3 = MULTIPLY(d1, FIX(1.111140466));
-
-		    tmp0 += z1;
-		    tmp1 = z4 + z5;
-		    tmp2 = z3 + z5;
-		    tmp3 += z1;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 == 0, d7 != 0 */
-		    tmp0 = MULTIPLY(d7, - FIX(1.387039845));
-		    tmp1 = MULTIPLY(d7, FIX(1.175875602));
-		    tmp2 = MULTIPLY(d7, - FIX(0.785694958));
-		    tmp3 = MULTIPLY(d7, FIX(0.275899379));
-		}
-	    }
-	}
-    } else {
-	if (d5) {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 != 0, d7 == 0 */
-		    z2 = d5 + d3;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(d3 + z4, FIX(1.175875602));
-		    
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(d1, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(d3, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 = z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 != 0, d7 == 0 */
-		    z2 = d5 + d3;
-		    
-		    z5 = MULTIPLY(z2, FIX(1.175875602));
-		    tmp1 = MULTIPLY(d5, FIX(1.662939225));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    z2 = MULTIPLY(z2, - FIX(1.387039845));
-		    tmp2 = MULTIPLY(d3, FIX(1.111140466));
-		    z3 = MULTIPLY(d3, - FIX(1.961570560));
-		    
-		    tmp0 = z3 + z5;
-		    tmp1 += z2;
-		    tmp2 += z2;
-		    tmp3 = z4 + z5;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 != 0, d7 == 0 */
-		    z4 = d5 + d1;
-		    
-		    z5 = MULTIPLY(z4, FIX(1.175875602));
-		    z1 = MULTIPLY(d1, - FIX(0.899976223));
-		    tmp3 = MULTIPLY(d1, FIX(0.601344887));
-		    tmp1 = MULTIPLY(d5, - FIX(0.509795578));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z4 = MULTIPLY(z4, FIX(0.785694958));
-		    
-		    tmp0 = z1 + z5;
-		    tmp1 += z4;
-		    tmp2 = z2 + z5;
-		    tmp3 += z4;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 != 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d5, FIX(1.175875602));
-		    tmp1 = MULTIPLY(d5, FIX(0.275899380));
-		    tmp2 = MULTIPLY(d5, - FIX(1.387039845));
-		    tmp3 = MULTIPLY(d5, FIX(0.785694958));
-		}
-	    }
-	} else {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 == 0, d7 == 0 */
-		    z5 = d1 + d3;
-		    tmp3 = MULTIPLY(d1, FIX(0.211164243));
-		    tmp2 = MULTIPLY(d3, - FIX(1.451774981));
-		    z1 = MULTIPLY(d1, FIX(1.061594337));
-		    z2 = MULTIPLY(d3, - FIX(2.172734803));
-		    z4 = MULTIPLY(z5, FIX(0.785694958));
-		    z5 = MULTIPLY(z5, FIX(1.175875602));
-		    
-		    tmp0 = z1 - z4;
-		    tmp1 = z2 + z4;
-		    tmp2 += z5;
-		    tmp3 += z5;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 == 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d3, - FIX(0.785694958));
-		    tmp1 = MULTIPLY(d3, - FIX(1.387039845));
-		    tmp2 = MULTIPLY(d3, - FIX(0.275899379));
-		    tmp3 = MULTIPLY(d3, FIX(1.175875602));
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 == 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d1, FIX(0.275899379));
-		    tmp1 = MULTIPLY(d1, FIX(0.785694958));
-		    tmp2 = MULTIPLY(d1, FIX(1.175875602));
-		    tmp3 = MULTIPLY(d1, FIX(1.387039845));
-		} else {
-		    /* d1 == 0, d3 == 0, d5 == 0, d7 == 0 */
-		    tmp0 = tmp1 = tmp2 = tmp3 = 0;
-		}
-	    }
-	}
-    }
-
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-
-    dataptr[0] = (DCTELEM) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
-    dataptr[7] = (DCTELEM) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
-    dataptr[1] = (DCTELEM) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
-    dataptr[6] = (DCTELEM) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
-    dataptr[2] = (DCTELEM) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
-    dataptr[5] = (DCTELEM) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
-    dataptr[3] = (DCTELEM) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
-    dataptr[4] = (DCTELEM) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  dataptr = data;
-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {
-    /* Columns of zeroes can be exploited in the same way as we did with rows.
-     * However, the row calculation has created many nonzero AC terms, so the
-     * simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-
-    d0 = dataptr[DCTSIZE*0];
-    d1 = dataptr[DCTSIZE*1];
-    d2 = dataptr[DCTSIZE*2];
-    d3 = dataptr[DCTSIZE*3];
-    d4 = dataptr[DCTSIZE*4];
-    d5 = dataptr[DCTSIZE*5];
-    d6 = dataptr[DCTSIZE*6];
-    d7 = dataptr[DCTSIZE*7];
-
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    if (d6) {
-	if (d4) {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 != 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 != 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 != 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 != 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, -FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    }
-	} else {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 == 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 == 0, d6 != 0 */
-		    z1 = MULTIPLY(d2 + d6, FIX(0.541196100));
-		    tmp2 = z1 + MULTIPLY(d6, - FIX(1.847759065));
-		    tmp3 = z1 + MULTIPLY(d2, FIX(0.765366865));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 == 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 == 0, d6 != 0 */
-		    tmp2 = MULTIPLY(d6, - FIX(1.306562965));
-		    tmp3 = MULTIPLY(d6, FIX(0.541196100));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    }
-	}
-    } else {
-	if (d4) {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 != 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = (d0 + d4) << CONST_BITS;
-		    tmp1 = (d0 - d4) << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp1 + tmp2;
-		    tmp12 = tmp1 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 != 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = d4 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp2 - tmp0;
-		    tmp12 = -(tmp0 + tmp2);
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
-		    tmp10 = tmp13 = (d0 + d4) << CONST_BITS;
-		    tmp11 = tmp12 = (d0 - d4) << CONST_BITS;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 != 0, d6 == 0 */
-		    tmp10 = tmp13 = d4 << CONST_BITS;
-		    tmp11 = tmp12 = -tmp10;
-		}
-	    }
-	} else {
-	    if (d2) {
-		if (d0) {
-		    /* d0 != 0, d2 != 0, d4 == 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp0 = d0 << CONST_BITS;
-
-		    tmp10 = tmp0 + tmp3;
-		    tmp13 = tmp0 - tmp3;
-		    tmp11 = tmp0 + tmp2;
-		    tmp12 = tmp0 - tmp2;
-		} else {
-		    /* d0 == 0, d2 != 0, d4 == 0, d6 == 0 */
-		    tmp2 = MULTIPLY(d2, FIX(0.541196100));
-		    tmp3 = MULTIPLY(d2, FIX(1.306562965));
-
-		    tmp10 = tmp3;
-		    tmp13 = -tmp3;
-		    tmp11 = tmp2;
-		    tmp12 = -tmp2;
-		}
-	    } else {
-		if (d0) {
-		    /* d0 != 0, d2 == 0, d4 == 0, d6 == 0 */
-		    tmp10 = tmp13 = tmp11 = tmp12 = d0 << CONST_BITS;
-		} else {
-		    /* d0 == 0, d2 == 0, d4 == 0, d6 == 0 */
-		    tmp10 = tmp13 = tmp11 = tmp12 = 0;
-		}
-	    }
-	}
-    }
-
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-    if (d7) {
-	if (d5) {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 != 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z2 = d5 + d3;
-		    z3 = d7 + d3;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(z3 + z4, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 != 0, d7 != 0 */
-		    z1 = d7;
-		    z2 = d5 + d3;
-		    z3 = d7 + d3;
-		    z5 = MULTIPLY(z3 + d5, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 = z1 + z4;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 != 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z2 = d5;
-		    z3 = d7;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(z3 + z4, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 = z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 != 0, d7 != 0 */
-		    tmp0 = MULTIPLY(d7, - FIX(0.601344887)); 
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    tmp1 = MULTIPLY(d5, - FIX(0.509795578));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    z5 = MULTIPLY(d5 + d7, FIX(1.175875602));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z3;
-		    tmp1 += z4;
-		    tmp2 = z2 + z3;
-		    tmp3 = z1 + z4;
-		}
-	    }
-	} else {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 == 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z3 = d7 + d3;
-		    z5 = MULTIPLY(z3 + d1, FIX(1.175875602));
-		    
-		    tmp0 = MULTIPLY(d7, FIX(0.298631336)); 
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(z1, - FIX(0.899976223));
-		    z2 = MULTIPLY(d3, - FIX(2.562915447));
-		    z3 = MULTIPLY(z3, - FIX(1.961570560));
-		    z4 = MULTIPLY(d1, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 += z1 + z3;
-		    tmp1 = z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 == 0, d7 != 0 */
-		    z3 = d7 + d3;
-		    
-		    tmp0 = MULTIPLY(d7, - FIX(0.601344887)); 
-		    z1 = MULTIPLY(d7, - FIX(0.899976223));
-		    tmp2 = MULTIPLY(d3, FIX(0.509795579));
-		    z2 = MULTIPLY(d3, - FIX(2.562915447));
-		    z5 = MULTIPLY(z3, FIX(1.175875602));
-		    z3 = MULTIPLY(z3, - FIX(0.785694958));
-		    
-		    tmp0 += z3;
-		    tmp1 = z2 + z5;
-		    tmp2 += z3;
-		    tmp3 = z1 + z5;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 == 0, d7 != 0 */
-		    z1 = d7 + d1;
-		    z5 = MULTIPLY(z1, FIX(1.175875602));
-
-		    z1 = MULTIPLY(z1, FIX(0.275899379));
-		    z3 = MULTIPLY(d7, - FIX(1.961570560));
-		    tmp0 = MULTIPLY(d7, - FIX(1.662939224)); 
-		    z4 = MULTIPLY(d1, - FIX(0.390180644));
-		    tmp3 = MULTIPLY(d1, FIX(1.111140466));
-
-		    tmp0 += z1;
-		    tmp1 = z4 + z5;
-		    tmp2 = z3 + z5;
-		    tmp3 += z1;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 == 0, d7 != 0 */
-		    tmp0 = MULTIPLY(d7, - FIX(1.387039845));
-		    tmp1 = MULTIPLY(d7, FIX(1.175875602));
-		    tmp2 = MULTIPLY(d7, - FIX(0.785694958));
-		    tmp3 = MULTIPLY(d7, FIX(0.275899379));
-		}
-	    }
-	}
-    } else {
-	if (d5) {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 != 0, d7 == 0 */
-		    z2 = d5 + d3;
-		    z4 = d5 + d1;
-		    z5 = MULTIPLY(d3 + z4, FIX(1.175875602));
-		    
-		    tmp1 = MULTIPLY(d5, FIX(2.053119869));
-		    tmp2 = MULTIPLY(d3, FIX(3.072711026));
-		    tmp3 = MULTIPLY(d1, FIX(1.501321110));
-		    z1 = MULTIPLY(d1, - FIX(0.899976223));
-		    z2 = MULTIPLY(z2, - FIX(2.562915447));
-		    z3 = MULTIPLY(d3, - FIX(1.961570560));
-		    z4 = MULTIPLY(z4, - FIX(0.390180644));
-		    
-		    z3 += z5;
-		    z4 += z5;
-		    
-		    tmp0 = z1 + z3;
-		    tmp1 += z2 + z4;
-		    tmp2 += z2 + z3;
-		    tmp3 += z1 + z4;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 != 0, d7 == 0 */
-		    z2 = d5 + d3;
-		    
-		    z5 = MULTIPLY(z2, FIX(1.175875602));
-		    tmp1 = MULTIPLY(d5, FIX(1.662939225));
-		    z4 = MULTIPLY(d5, - FIX(0.390180644));
-		    z2 = MULTIPLY(z2, - FIX(1.387039845));
-		    tmp2 = MULTIPLY(d3, FIX(1.111140466));
-		    z3 = MULTIPLY(d3, - FIX(1.961570560));
-		    
-		    tmp0 = z3 + z5;
-		    tmp1 += z2;
-		    tmp2 += z2;
-		    tmp3 = z4 + z5;
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 != 0, d7 == 0 */
-		    z4 = d5 + d1;
-		    
-		    z5 = MULTIPLY(z4, FIX(1.175875602));
-		    z1 = MULTIPLY(d1, - FIX(0.899976223));
-		    tmp3 = MULTIPLY(d1, FIX(0.601344887));
-		    tmp1 = MULTIPLY(d5, - FIX(0.509795578));
-		    z2 = MULTIPLY(d5, - FIX(2.562915447));
-		    z4 = MULTIPLY(z4, FIX(0.785694958));
-		    
-		    tmp0 = z1 + z5;
-		    tmp1 += z4;
-		    tmp2 = z2 + z5;
-		    tmp3 += z4;
-		} else {
-		    /* d1 == 0, d3 == 0, d5 != 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d5, FIX(1.175875602));
-		    tmp1 = MULTIPLY(d5, FIX(0.275899380));
-		    tmp2 = MULTIPLY(d5, - FIX(1.387039845));
-		    tmp3 = MULTIPLY(d5, FIX(0.785694958));
-		}
-	    }
-	} else {
-	    if (d3) {
-		if (d1) {
-		    /* d1 != 0, d3 != 0, d5 == 0, d7 == 0 */
-		    z5 = d1 + d3;
-		    tmp3 = MULTIPLY(d1, FIX(0.211164243));
-		    tmp2 = MULTIPLY(d3, - FIX(1.451774981));
-		    z1 = MULTIPLY(d1, FIX(1.061594337));
-		    z2 = MULTIPLY(d3, - FIX(2.172734803));
-		    z4 = MULTIPLY(z5, FIX(0.785694958));
-		    z5 = MULTIPLY(z5, FIX(1.175875602));
-		    
-		    tmp0 = z1 - z4;
-		    tmp1 = z2 + z4;
-		    tmp2 += z5;
-		    tmp3 += z5;
-		} else {
-		    /* d1 == 0, d3 != 0, d5 == 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d3, - FIX(0.785694958));
-		    tmp1 = MULTIPLY(d3, - FIX(1.387039845));
-		    tmp2 = MULTIPLY(d3, - FIX(0.275899379));
-		    tmp3 = MULTIPLY(d3, FIX(1.175875602));
-		}
-	    } else {
-		if (d1) {
-		    /* d1 != 0, d3 == 0, d5 == 0, d7 == 0 */
-		    tmp0 = MULTIPLY(d1, FIX(0.275899379));
-		    tmp1 = MULTIPLY(d1, FIX(0.785694958));
-		    tmp2 = MULTIPLY(d1, FIX(1.175875602));
-		    tmp3 = MULTIPLY(d1, FIX(1.387039845));
-		} else {
-		    /* d1 == 0, d3 == 0, d5 == 0, d7 == 0 */
-		    tmp0 = tmp1 = tmp2 = tmp3 = 0;
-		}
-	    }
-	}
-    }
-
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-
-    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp3,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp10 - tmp3,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp11 + tmp2,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(tmp11 - tmp2,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(tmp12 + tmp1,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12 - tmp1,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp13 + tmp0,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp13 - tmp0,
-					   CONST_BITS+PASS1_BITS+3);
-    
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#else
-
-
-void
-j_rev_dct_sparse (DCTBLOCK data, int pos)
-{
-  j_rev_dct(data);
-}
-
-void
-j_rev_dct (DCTBLOCK data)
-{
-  INT32 tmp0, tmp1, tmp2, tmp3;
-  INT32 tmp10, tmp11, tmp12, tmp13;
-  INT32 z1, z2, z3, z4, z5;
-  register DCTELEM *dataptr;
-  int rowctr;
-  SHIFT_TEMPS
-
-  /* Pass 1: process rows. */
-  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  dataptr = data;
-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any row in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * row DCT calculations can be simplified this way.
-     */
-
-    if ((dataptr[1] | dataptr[2] | dataptr[3] | dataptr[4] |
-	 dataptr[5] | dataptr[6] | dataptr[7]) == 0) {
-      /* AC terms all zero */
-      DCTELEM dcval = (DCTELEM) (dataptr[0] << PASS1_BITS);
-      
-      dataptr[0] = dcval;
-      dataptr[1] = dcval;
-      dataptr[2] = dcval;
-      dataptr[3] = dcval;
-      dataptr[4] = dcval;
-      dataptr[5] = dcval;
-      dataptr[6] = dcval;
-      dataptr[7] = dcval;
-      
-      dataptr += DCTSIZE;	/* advance pointer to next row */
-      continue;
-    }
-
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-
-    z2 = (INT32) dataptr[2];
-    z3 = (INT32) dataptr[6];
-
-    z1 = MULTIPLY(z2 + z3, FIX(0.541196100));
-    tmp2 = z1 + MULTIPLY(z3, - FIX(1.847759065));
-    tmp3 = z1 + MULTIPLY(z2, FIX(0.765366865));
-
-    tmp0 = ((INT32) dataptr[0] + (INT32) dataptr[4]) << CONST_BITS;
-    tmp1 = ((INT32) dataptr[0] - (INT32) dataptr[4]) << CONST_BITS;
-
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-
-    tmp0 = (INT32) dataptr[7];
-    tmp1 = (INT32) dataptr[5];
-    tmp2 = (INT32) dataptr[3];
-    tmp3 = (INT32) dataptr[1];
-
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX(1.175875602)); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX(0.298631336)); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX(2.053119869)); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX(3.072711026)); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX(1.501321110)); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX(0.899976223)); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX(2.562915447)); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX(1.961570560)); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX(0.390180644)); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-
-    dataptr[0] = (DCTELEM) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
-    dataptr[7] = (DCTELEM) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
-    dataptr[1] = (DCTELEM) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
-    dataptr[6] = (DCTELEM) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
-    dataptr[2] = (DCTELEM) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
-    dataptr[5] = (DCTELEM) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
-    dataptr[3] = (DCTELEM) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
-    dataptr[4] = (DCTELEM) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  dataptr = data;
-  for (rowctr = DCTSIZE-1; rowctr >= 0; rowctr--) {
-    /* Columns of zeroes can be exploited in the same way as we did with rows.
-     * However, the row calculation has created many nonzero AC terms, so the
-     * simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-
-#ifndef NO_ZERO_COLUMN_TEST
-    if ((dataptr[DCTSIZE*1] | dataptr[DCTSIZE*2] | dataptr[DCTSIZE*3] |
-	 dataptr[DCTSIZE*4] | dataptr[DCTSIZE*5] | dataptr[DCTSIZE*6] |
-	 dataptr[DCTSIZE*7]) == 0) {
-      /* AC terms all zero */
-      DCTELEM dcval = (DCTELEM) DESCALE((INT32) dataptr[0], PASS1_BITS+3);
-      
-      dataptr[DCTSIZE*0] = dcval;
-      dataptr[DCTSIZE*1] = dcval;
-      dataptr[DCTSIZE*2] = dcval;
-      dataptr[DCTSIZE*3] = dcval;
-      dataptr[DCTSIZE*4] = dcval;
-      dataptr[DCTSIZE*5] = dcval;
-      dataptr[DCTSIZE*6] = dcval;
-      dataptr[DCTSIZE*7] = dcval;
-      
-      dataptr++;		/* advance pointer to next column */
-      continue;
-    }
-#endif
-
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-
-    z2 = (INT32) dataptr[DCTSIZE*2];
-    z3 = (INT32) dataptr[DCTSIZE*6];
-
-    z1 = MULTIPLY(z2 + z3, FIX(0.541196100));
-    tmp2 = z1 + MULTIPLY(z3, - FIX(1.847759065));
-    tmp3 = z1 + MULTIPLY(z2, FIX(0.765366865));
-
-    tmp0 = ((INT32) dataptr[DCTSIZE*0] + (INT32) dataptr[DCTSIZE*4]) << CONST_BITS;
-    tmp1 = ((INT32) dataptr[DCTSIZE*0] - (INT32) dataptr[DCTSIZE*4]) << CONST_BITS;
-
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-
-    tmp0 = (INT32) dataptr[DCTSIZE*7];
-    tmp1 = (INT32) dataptr[DCTSIZE*5];
-    tmp2 = (INT32) dataptr[DCTSIZE*3];
-    tmp3 = (INT32) dataptr[DCTSIZE*1];
-
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX(1.175875602)); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX(0.298631336)); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX(2.053119869)); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX(3.072711026)); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX(1.501321110)); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX(0.899976223)); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX(2.562915447)); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX(1.961570560)); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX(0.390180644)); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-
-    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp3,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp10 - tmp3,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp11 + tmp2,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(tmp11 - tmp2,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(tmp12 + tmp1,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12 - tmp1,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp13 + tmp0,
-					   CONST_BITS+PASS1_BITS+3);
-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp13 - tmp0,
-					   CONST_BITS+PASS1_BITS+3);
-    
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-
-#endif
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp
deleted file mode 100644
index 997a14c21e7..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/* $Id$ */
-/*  
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to implement an ordered dither. */
-
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-#define DITH_SIZE 16
-
-
-/* Structures used to implement macroblock ordered
-   dither algorithm.
-*/
-
-static unsigned char ***ditherPtr[DITH_SIZE];
-
-
-/*
- *--------------------------------------------------------------
- *
- *  InitMBOrderedDither--
- *
- *	Structures intialized for ordered dithering. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitMBOrderedDither()
-{
-  unsigned char ****pos_2_cb;
-  unsigned char ***cb_2_cr;
-  unsigned char **cr_2_l;
-  int cb_val, cb_rval, cr_val, cr_rval, l_val, l_rval;
-  int i, j, pos;
-  int err_range, threshval;
-
-  pos_2_cb = (unsigned char ****) malloc (DITH_SIZE*sizeof(unsigned char ***));
-  cb_2_cr = (unsigned char ***) malloc(CB_RANGE*sizeof(unsigned char **));
-  cr_2_l = (unsigned char **) malloc(CR_RANGE*sizeof(unsigned char *));
-
-  for (pos=0; pos<DITH_SIZE; pos++) {
-    
-    pos_2_cb[pos] = (unsigned char ***) malloc(256*(sizeof(unsigned char **)));
-
-    for (j=0; j<CB_RANGE; j++) {
-      cb_2_cr[j] = (unsigned char **) malloc(256*(sizeof(unsigned char *)));
-    }
-
-    for (cb_val=0; cb_val<cb_values[0]; cb_val++) {
-      (pos_2_cb[pos])[cb_val] = cb_2_cr[0];
-    }
-
-    for (cb_rval=0; cb_rval<(CB_RANGE-1); cb_rval++) {
-      err_range = cb_values[cb_rval+1] - cb_values[cb_rval];
-      threshval = ((pos*err_range)/DITH_SIZE)+cb_values[cb_rval];
-
-      for (cb_val=cb_values[cb_rval]; cb_val<cb_values[cb_rval+1]; cb_val++) {
-	if (cb_val>threshval) (pos_2_cb[pos])[cb_val] = cb_2_cr[cb_rval+1];
-	else (pos_2_cb[pos])[cb_val] = cb_2_cr[cb_rval];
-      }
-    }
-
-    for (cb_val=cb_values[CB_RANGE-1]; cb_val<256; cb_val++) {
-      (pos_2_cb[pos])[cb_val] = cb_2_cr[CB_RANGE-1];
-    }
-
-    for (cb_rval=0; cb_rval<CB_RANGE; cb_rval++) {
-      
-      for (j=0; j<CR_RANGE; j++) {
-	cr_2_l[j] = (unsigned char *) malloc(256*(sizeof(unsigned char)));
-      }
-
-      for (cr_val=0; cr_val < cr_values[0]; cr_val++) {
-	(cb_2_cr[cb_rval])[cr_val] = cr_2_l[0];
-      }
-
-      for (cr_rval=0; cr_rval<(CR_RANGE-1); cr_rval++) {
-	err_range = cr_values[cr_rval+1] - cr_values[cr_rval];
-	threshval = ((pos*err_range)/DITH_SIZE)+cr_values[cr_rval];
-	
-	for (cr_val=cr_values[cr_rval]; cr_val<cr_values[cr_rval+1]; cr_val++) {
-	  if (cr_val>threshval) (cb_2_cr[cb_rval])[cr_val] = cr_2_l[cr_rval+1];
-	  else (cb_2_cr[cb_rval])[cr_val] = cr_2_l[cr_rval];
-	}
-      }
-      
-      for (cr_val=cr_values[CR_RANGE-1]; cr_val<256; cr_val++) {
-	(cb_2_cr[cb_rval])[cr_val] = cr_2_l[CR_RANGE-1];
-      }
-      
-      for (cr_rval=0; cr_rval<CR_RANGE; cr_rval++) {
-	
-	for (l_val = 0; l_val < lum_values[0]; l_val++) {
-	  (cr_2_l[cr_rval])[l_val] = pixel[cb_rval+(cr_rval*CB_RANGE)+
-					    (0*CR_RANGE*CB_RANGE)];
-	}
-
-	for (l_rval=0; l_rval<(LUM_RANGE-1); l_rval++) {
-	  err_range = lum_values[l_rval+1] - lum_values[l_rval];
-	  threshval = ((pos*err_range) /DITH_SIZE) + lum_values[l_rval];
-
-	  for (l_val = lum_values[l_rval]; l_val < lum_values[l_rval+1]; l_val++) {
-	    if (l_val>threshval) (cr_2_l[cr_rval])[l_val] = 
-	      pixel[cb_rval+(cr_rval*CB_RANGE)+((l_rval+1)*CR_RANGE*CB_RANGE)];
-	    else (cr_2_l[cr_rval])[l_val] =
-	      pixel[cb_rval+(cr_rval*CB_RANGE)+(l_rval*CR_RANGE*CB_RANGE)];
-	  }
-	}
-
-	for (l_val = lum_values[LUM_RANGE-1]; l_val < 256; l_val++) {
-	  (cr_2_l[cr_rval])[l_val] = 
-	    pixel[cb_rval+(cr_rval*CB_RANGE)+((LUM_RANGE-1)*CR_RANGE*CB_RANGE)];
-	}
-      }
-    }
-  }
-
-  for (i=0; i<DITH_SIZE; i++) {
-    ditherPtr[i] = pos_2_cb[i];
-  }
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * MBOrderedDitherImage --
- *
- *	Dithers an image using an ordered dither at macroblock level.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *      The channels are dithered based on the standard
- *      ordered dither pattern for a 4x4 area. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-MBOrderedDitherImage (unsigned char *lum, unsigned char *cr,
-		      unsigned char *cb, unsigned char *out,
-		      int h, int w)
-{
-  unsigned char *l, *r, *b, *o1, *o2;
-  unsigned char *l2;
-  unsigned char L, R, B;
-  int i, j, mbaddr, mbwidth;
-  unsigned char ***dp0 = ditherPtr[0];
-  unsigned char ***dp2 = ditherPtr[2];
-  unsigned char ***dp4 = ditherPtr[4];
-  unsigned char ***dp6 = ditherPtr[6];
-  unsigned char ***dp8 = ditherPtr[8];
-  unsigned char ***dp10 = ditherPtr[10];
-  unsigned char ***dp12 = ditherPtr[12];
-  unsigned char ***dp14 = ditherPtr[14];
-  unsigned char ***dp1 = ditherPtr[1];
-  unsigned char ***dp3 = ditherPtr[3];
-  unsigned char ***dp5 = ditherPtr[5];
-  unsigned char ***dp7 = ditherPtr[7];
-  unsigned char ***dp9 = ditherPtr[9];
-  unsigned char ***dp11 = ditherPtr[11];
-  unsigned char ***dp13 = ditherPtr[13];
-  unsigned char ***dp15 = ditherPtr[15];
-
-  l = lum;
-  l2 = lum + w;
-  r = cr;
-  b = cb;
-  o1 = out;
-  o2 = out+w;
-  mbwidth = w / 16;
-
-  for (i=0; i<h; i+=4) {
-
-    mbaddr = (i / 16) * mbwidth ;
-
-    for (j=0; j<w; j+=8) {
-
-      if (ditherFlags[mbaddr+(j/16)]) {
-	R = r[0]; B = b[0];
-	
-	L = l[0];
-	o1[0] = ((dp0[B])[R])[L];
-	L = l[1];
-	o1[1] = ((dp8[B])[R])[L];
-	L = l2[0];
-	o2[0] = ((dp12[B])[R])[L];
-	L = l2[1];
-	o2[1] = ((dp4[B])[R])[L];
-	
-	R = r[1]; B = b[1];
-	
-	L = l[2];
-	o1[2] = ((dp2[B])[R])[L];
-	L = l[3];
-	o1[3] = ((dp10[B])[R])[L];
-	L = l2[2];
-	o2[2] = ((dp14[B])[R])[L];
-	L = l2[3];
-	o2[3] = ((dp6[B])[R])[L];
-	
-	R = r[2]; B = b[2];
-	
-	L = l[4];
-	o1[4] = ((dp0[B])[R])[L];
-	L = l[5];
-	o1[5] = ((dp8[B])[R])[L];
-	L = l2[4];
-	o2[4] = ((dp12[B])[R])[L];
-	L = l2[5];
-	o2[5] = ((dp4[B])[R])[L];
-	
-	R = r[3]; B = b[3];
-	
-	L = l[6];
-	o1[6] = ((dp2[B])[R])[L];
-	L = l[7];
-	o1[7] = ((dp10[B])[R])[L];
-	L = l2[6];
-	o2[6] = ((dp14[B])[R])[L];
-	L = l2[7];
-	o2[7] = ((dp6[B])[R])[L];
-      }
-      
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-    
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-
-    for (j=0; j<w; j+=8) {
-
-      if (ditherFlags[mbaddr+(j/16)]) {
-
-	R = r[0]; B = b[0];
-	
-	L = l[0];
-	o1[0] = ((dp3[B])[R])[L];
-	L = l[1];
-	o1[1] = ((dp11[B])[R])[L];
-	L = l2[0];
-	o2[0] = ((dp15[B])[R])[L];
-	L = l2[1];
-	o2[1] = ((dp7[B])[R])[L];
-	
-	R = r[1]; B = b[1];
-	
-	L = l[2];
-	o1[2] = ((dp1[B])[R])[L];
-	L = l[3];
-	o1[3] = ((dp9[B])[R])[L];
-	L = l2[2];
-	o2[2] = ((dp13[B])[R])[L];
-	L = l2[3];
-	o2[3] = ((dp5[B])[R])[L];
-	
-	R = r[2]; B = b[2];
-	
-	L = l[4];
-	o1[4] = ((dp3[B])[R])[L];
-	L = l[5];
-	o1[5] = ((dp11[B])[R])[L];
-	L = l2[4];
-	o2[4] = ((dp15[B])[R])[L];
-	L = l2[5];
-	o2[5] = ((dp7[B])[R])[L];
-	
-	R = r[3]; B = b[3];
-	
-	L = l[6];
-	o1[6] = ((dp1[B])[R])[L];
-	L = l[7];
-	o1[7] = ((dp9[B])[R])[L];
-	L = l2[6];
-	o2[6] = ((dp13[B])[R])[L];
-	L = l2[7];
-	o2[7] = ((dp5[B])[R])[L];
-      }
-
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-    
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-  }
-}
-
-void
-MBOrderedDitherDisplayCopy(VidStream *vid_stream, int mb_addr,
-    int motion_forw, int r_right_forw, int r_down_forw,
-    int motion_back, int r_right_back, int r_down_back,
-    unsigned char *past, unsigned char *future)
-{
-  int right_back, right_forw, down_back, down_forw;
-  unsigned char *dest = NULL;
-  unsigned char *src1, *src2;
-  int row, col, row_size, rr;
-  int mc, mr;
-
-  row = (mb_addr / vid_stream->mb_width) << 4;
-  col = (mb_addr % vid_stream->mb_width) << 4;
-  row_size = vid_stream->mb_width << 4;
-/*
-  dest = vid_stream->current->display + (row * row_size) + col;
-*/
-  if (motion_forw) {
-    right_forw = r_right_forw >> 1;
-    down_forw = r_down_forw >> 1;
-    src1 = past + ((row + down_forw) * row_size) + (col + right_forw);
-  }
-
-  if (motion_back) {
-    right_back = r_right_back >> 1;
-    down_back = r_down_back >> 1;
-    src2 = future + ((row + down_back) * row_size) + (col + right_back);
-  }
-   
-  if (motion_forw) {
-    if (motion_back) {
-      for (rr = 0; rr<16; rr++) {
-	dest[0] = src1[0];	dest[1] = src2[1];
-	dest[2] = src1[2];	dest[3] = src2[3];
-	dest[4] = src1[4];	dest[5] = src2[5];
-	dest[6] = src1[6];	dest[7] = src2[7];
-	dest[8] = src1[8];	dest[9] = src2[9];
-	dest[10] = src1[10];	dest[11] = src2[11];
-	dest[12] = src1[12];	dest[13] = src2[13];
-	dest[14] = src1[14];	dest[15] = src2[15];
-
-	dest += row_size;
-	src1 += row_size;
-	src2 += row_size;
-      }
-    }
-    else {
-      mc = col & 0x3;
-      mr = right_forw & 0x3;
-      if (!mc && !mr) {
-	/* Use 32 bit copy */
-	int *d, *s;
-
-	d = (int *) dest;
-	s = (int *) src1;
-	row_size /= 4;
-	
-	for (rr = 0; rr < 16; rr++) {
-	  d[0] = s[0];
-	  d[1] = s[1];
-	  d[2] = s[2];
-	  d[3] = s[3]; 
-	  d += row_size;
-	  s += row_size;
-	}
-      } else if ((!mc || (mc == 2)) &&
-		 (!mr || (mr == 2))) {
-	/* Use 16 bit copy */
-	short int *d, * s;
-	
-	d = (short int *) dest;
-	s = (short int *) src1;
-	row_size /= 2;
-	
-	for (rr = 0; rr < 16; rr++) {
-	  d[0] = s[0];
-	  d[1] = s[1];
-	  d[2] = s[2];
-	  d[3] = s[3]; 
-	  d[4] = s[4];
-	  d[5] = s[5];
-	  d[6] = s[6];
-	  d[7] = s[7]; 
-	  d += row_size;
-	  s += row_size;
-	}
-      }
-      else {
-	for (rr = 0; rr < 16; rr++) {
-	  dest[0] = src1[0];
-	  dest[1] = src1[1];
-	  dest[2] = src1[2];
-	  dest[3] = src1[3];
-	  dest[4] = src1[4];
-	  dest[5] = src1[5];
-	  dest[6] = src1[6];
-	  dest[7] = src1[7];
-	  dest[8] = src1[8];
-	  dest[9] = src1[9];
-	  dest[10] = src1[10];
-	  dest[11] = src1[11];
-	  dest[12] = src1[12];
-	  dest[13] = src1[13];
-	  dest[14] = src1[14];
-	  dest[15] = src1[15];
-	  
-	  dest += row_size;
-	  src1 += row_size;
-	}
-      }
-    }
-  }
-  else if (motion_back) {
-    mc = col & 0x3;
-    mr = right_back & 0x3;
-    if (!mc && !mr) {
-      /* Use 32 bit copy */
-      int *d, *s;
-      
-      d = (int *) dest;
-      s = (int *) src2;
-      row_size /= 4;
-      
-      for (rr = 0; rr < 16; rr++) {
-	d[0] = s[0];
-	d[1] = s[1];
-	d[2] = s[2];
-	d[3] = s[3]; 
-	d += row_size;
-	s += row_size;
-      }
-    }
-    else if ((!mc || mc == 2) &&
-	     (!mr || mr == 2)) {
-      /* Use 8 bit copy */
-      short int *d, *s;
-      
-      d = (short int *) dest;
-      s = (short int *) src2;
-      row_size /= 2;
-      
-      for (rr = 0; rr < 16; rr++) {
-	d[0] = s[0];
-	d[1] = s[1];
-	d[2] = s[2];
-	d[3] = s[3]; 
-	d[4] = s[4];
-	d[5] = s[5];
-	d[6] = s[6];
-	d[7] = s[7]; 
-	d += row_size;
-	s += row_size;
-      }
-    }
-    else {
-      for (rr = 0; rr < 16; rr++) {
-	/* Use 8 bit copy */
-	dest[0] = src2[0];
-	dest[1] = src2[1];
-	dest[2] = src2[2];
-	dest[3] = src2[3];
-	dest[4] = src2[4];
-	dest[5] = src2[5];
-	dest[6] = src2[6];
-	dest[7] = src2[7];
-	dest[8] = src2[8];
-	dest[9] = src2[9];
-	dest[10] = src2[10];
-	dest[11] = src2[11];
-	dest[12] = src2[12];
-	dest[13] = src2[13];
-	dest[14] = src2[14];
-	dest[15] = src2[15];
-	
-	dest += row_size;
-	src2 += row_size;
-      }
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h
deleted file mode 100644
index c421a53f167..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mibload.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with this file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include <stdio.h>
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-#include <Xm/Xm.h>
-#include <Xm/Text.h>
-#include <Xm/TextF.h>
-#include <Xm/RowColumn.h>
-#include <Xm/MainW.h>
-#include <Xm/Label.h>
-#include <Xm/PushB.h>
-#include <Xm/PushBG.h>
-#include <Xm/ToggleB.h>
-#include <Xm/ToggleBG.h>
-#include <Xm/DrawingA.h>
-#include <Xm/CascadeBG.h>
-#include <Xm/SeparatoG.h>
-#include <Xm/Frame.h>
-#include <Xm/BulletinB.h>
-#include <Xm/Scale.h>
-#include <Xm/ScrollBar.h>
-#include <Xm/Form.h>
-#include <Xm/List.h>
-#include <Xm/FileSB.h>
-#include <Xm/AtomMgr.h>
-#include <Xm/Protocols.h>
-#include <Xm/MwmUtil.h>
-
-
-/* Structure of mib_Widget */
-/*****************************************************************************/
-
-typedef struct _mib_Widget {
-  char		*mib_class;	/* name of mib class (Button, TextBox, etc..)*/
-  int		 mib_class_num; /* class number for ez reference :) */
-  int		 mib_mynum;	/* numbering for storage format */
-  Widget	 me;		/* Xt widget */
-  int		 mib_selected;	/* is selected */
-  int		 mib_resizing;  /* is resizing 1, or being moved 0 */
-  int		 mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
-  int		 mib_allowresize; /* can this widget be resized ? */
-
-  int		 clkx, clky;	/* where user clicked */
-
-  void		*myres;		/* my resources (different for each widget) */
-
-  char		*name;		/* reference name of this widget */
-  int		 width, height;	/* width and height */
-
-  int   topAttachment, bottomAttachment, leftAttachment, rightAttachment;
-				/* attachments 1=attached 0=not-attached */
-
-  int   topOffset, bottomOffset, leftOffset, rightOffset;
-				/* offsets if attached */
-
-  struct _mib_Widget *parent;   /* pointer to parent */
-  struct _mib_Widget *sibling;  /* remaining linked list of sibling widgets */
-  struct _mib_Widget *prev;	/* previous sibling or parent */
-  struct _mib_Widget *child;	/* linked list of children widgets */
-} mib_Widget;
-
-/* mib_Buffer structure */
-/*****************************************************************************/
-
-typedef struct _mib_Buffer {
-  void  *buffer;	/* pointer to either a file or a char string */
-  int	 buf_type;	/* type of buffer (defined above) */
-  int	 point;		/* pointer for string */
-  int    buflen;	/* length of string buffer */
-} mib_Buffer;
-
-/* mib_Widget functions */
-/*****************************************************************************/
-
-void mib_add_mib_Widget(mib_Widget *, mib_Widget *);
-void mib_add_backward_Widget(mib_Widget *, mib_Widget *);
-void mib_remove_mib_Widget(mib_Widget *);
-void mib_clear_myres(mib_Widget *);
-mib_Widget *mib_new_mib_Widget();
-mib_Widget *mib_find_name(mib_Widget *, char *);
-mib_Widget *mib_load_interface(Widget, char *, int);
-int mib_count_all(mib_Widget *, int);
-int mib_load_Root(Widget, mib_Widget **, mib_Buffer *);
-mib_Widget *mib_load_public(mib_Widget *, mib_Widget *, mib_Buffer *);
-int mib_load_mib_class(mib_Widget **, mib_Widget *, char *, char *,
-		mib_Buffer *);
-int mib_load_private(mib_Widget *, mib_Buffer *);
-void mib_reset_size(mib_Widget *);
-int mib_read_line(mib_Buffer *, char *, char *);
-void mib_set_eventhandlers(void *, void *, void *);
-void mib_apply_eventhandlers(Widget, mib_Widget *);
-
-/* supporting functions and structures */
-/*****************************************************************************/
-
-typedef struct _menu_item {
-  char        *label;
-  WidgetClass *class;
-  char         mnemonic;
-  char        *accelerator;
-  char        *accel_text;
-  void        (*callback)();
-  XtPointer   callback_data;
-  struct _menu_item *subitems;
-} MenuItem;
-
-Widget BuildMenu(Widget, int, char *, char, MenuItem *);
-
-/* mib class numbers */
-
-#define MIB_NULL		0
-#define MIB_TEXTBOX		1
-#define MIB_BUTTON		2
-#define MIB_TOGGLE		3
-#define MIB_RADIOBOX		4
-#define MIB_DRAWINGAREA		5
-#define MIB_LABEL		6
-#define MIB_FRAME		7
-#define MIB_SCROLLBAR		8
-#define MIB_TEXTBIG		9
-#define MIB_LIST		10
-#define MIB_SCALE		11
-#define MIB_MENU		12
-
-/* number of classes */
-#define MI_NUMCLASSES		12
-
-/* for specifying creation of a widget with
-   default private values, no values at all (empty),
-   or no values and editable */
-
-#define WDEFAULT		1
-#define WEMPTY			2
-#define WEDIT			3
-
-/* for specifing whether we are loading an
-   interface from a file or from a string and whether it
-   is editable :) */
-
-#define MI_FROMFILE		1
-#define MI_EDITFROMFILE		2
-#define MI_FROMSTRING		3
-#define MI_EDITFROMSTRING	4
-
-#define MI_MAXSTRLEN		200   /* maximum string length */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp
deleted file mode 100644
index 2a155f4f116..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/* $Id$ */
-/*
- * Author:	Yoichiro Ueno (ueno@cs.titech.ac.jp)
- *
- * Copyright (C) 1991, 1992, Yoichiro Ueno.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose is hereby granted by the Author without
- * fee, provided that the above copyright notice appear in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation, and that the name of the Author not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  The Author makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-#include <string.h>
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-
-/*
- *--------------------------------------------------------------
- *
- * MonoDitherImage --
- *
- *	Dithers image into monochrome.
- *	Dither algorithm is based on dither.c in xli.1.11.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-#define MaxGrey		65280
-#define Threshold	(MaxGrey/2)
-#define MinGrey		0
-
-#if ultrix && mips
-#	define SEED_BIT 0x01
-#	define OPP_SEED_BIT 0x80
-#	define SHIFT_SEED_BIT(b) (b <<= 1)
-#	define OPP_SHIFT_SEED_BIT(b) (b >>= 1)
-#else
-#	define SEED_BIT 0x80
-#	define OPP_SEED_BIT 0x01
-#	define SHIFT_SEED_BIT(b) (b >>= 1)
-#	define OPP_SHIFT_SEED_BIT(b) (b <<= 1)
-#endif
-
-static int	*curr = NULL;
-static int	*next = NULL;
-
-#if 0
-void
-MonoDitherImage(register unsigned char *lum, unsigned char *cr,
-		unsigned char *cb, unsigned char *out,
-		int h, int w)
-{
-  int bit_r2l;
-  register unsigned int bit;
-  register unsigned int data;
-  int i;
-  register int j;
-  int *swap;
-  register int out_err;
-  register int next1;
-  register int next2;
-
-  if(curr == NULL) {
-    curr = (int *)malloc(sizeof(int) * (w + 2));
-    curr += 1;
-  }
-  if(next == NULL) {
-    next = (int *)malloc(sizeof(int) * (w + 2));
-    next += 1;
-  }
-
-  bzero ((char *)curr, w * sizeof(*curr));
-
-  bit_r2l = SEED_BIT << (w - 1 & 7);
-  for(i = 0; i < h; i ++) {
-    if(i & 0x01) {				/* Right to Left */
-      bit = bit_r2l;
-      data = 0;
-      out_err = curr[w-1];
-      next1 = 0;
-      next2 = 0;
-      for (j=(w-1); j>=0; j--)
-      {
-	out_err = (out_err >> 4) + (lum[j] << 8);
-	if(out_err > Threshold) {
-	  data |= bit;
-	  out_err -= MaxGrey;
-	}
-	else
-	  out_err -= MinGrey;
-
-	next[j+1] = next1 +     (out_err * 3);
-	next1     = next2 +     (out_err * 5);
-	next2     =             (out_err * 1);
-	out_err   = curr[j-1] + (out_err * 7);
-
-	OPP_SHIFT_SEED_BIT(bit);
-#if ultrix && mips
-	if(bit == 0)
-#else
-	if(bit > 0x80)
-#endif
-	{
-	  out[j >> 3] = data;
-	  bit = OPP_SEED_BIT;
-	  data = 0;
-	}
-      }
-      next[0] = next1;
-    }
-    else {					/* Left to Right */
-      bit = SEED_BIT;
-      data = 0;
-      out_err = curr[0];
-      next1 = 0;
-      next2 = 0;
-      for (j=0; j<w; j++)
-      {
-	out_err = (out_err >> 4) + (lum[j] << 8);
-	if(out_err > Threshold) {
-	  data |= bit;
-	  out_err = out_err - MaxGrey;
-	}
-	else
-	  out_err = out_err - MinGrey;
-
-	next[j-1] = next1 +     (out_err * 3);
-	next1     = next2 +     (out_err * 5);
-	next2     =             (out_err * 1);
-	out_err   = curr[j+1] + (out_err * 7);
-
-	SHIFT_SEED_BIT(bit);
-#if ultrix && mips
-	if(bit > 0x80)
-#else
-	if(bit == 0)
-#endif
-	{
-	  out[j >> 3] = data;
-	  bit = SEED_BIT;
-	  data = 0;
-	}
-      }
-      next[w-1] = next1;
-    }
-    
-    lum += w;
-    out += w >> 3;
-    swap = curr;
-    curr = next;
-    next = swap;
-  }
-}
-#endif    
-
-void
-MonoDitherImage(register unsigned char *lum, unsigned char *cr,
-		unsigned char *cb, unsigned char *out,
-		int h, int w)
-{
-  register unsigned int bit;
-  register unsigned int data;
-  register int j;
-  int i;
-  static unsigned char d[4][4] = {{0, 8, 2, 10},
-			  {12, 4, 14, 6},
-			  {3, 11, 1, 9},
-			  {15, 7, 13, 5}};
-  
-  for(i = 0; i < h; i ++) {
-    bit = SEED_BIT;
-    data = 0;
-    for (j=0; j<w; j++) {
-      if((lum[j] >> 4) > d[i % 4][j % 4]) {
-	data |= bit;
-      }
-      SHIFT_SEED_BIT(bit);
-#if ultrix && mips
-      if(bit > 0x80)
-#else
-      if(bit == 0)
-#endif
-      {
-	out[j >> 3] = data;
-	bit = SEED_BIT;
-	data = 0;
-      }
-    }
-    lum += w;
-    out += (w + 7) >> 3;
-  }
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * MonoThresholdImage --
- *
- *	convert image into monochrome with threshold.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-MonoThresholdImage(unsigned char *lum, unsigned char *cr,
-		   unsigned char *cb, unsigned char *out,
-		   int h, int w)
-{
-  unsigned char	bit;
-  unsigned char	data;
-
-  bit = SEED_BIT;
-  data = 0;
-  for (w*=h; w>0; w--) {
-    if(*lum++>128)
-      data |= bit;
-
-    SHIFT_SEED_BIT(bit);
-    if(bit == 0) {
-      *out ++ = data;
-      bit = SEED_BIT;
-      data = 0;
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp
deleted file mode 100644
index 7525a3ee802..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/motionvector.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include "video.h"
-#include "proto.h"
-#include "util.h"
-
-
-/*
- *--------------------------------------------------------------
- *
- * ComputeVector --
- *
- *	Computes motion vector given parameters previously parsed
- *      and reconstructed.
- *
- * Results:
- *      Reconstructed motion vector info is put into recon_* parameters
- *      passed to this function. Also updated previous motion vector
- *      information.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-#define ComputeVector(recon_right_ptr, recon_down_ptr, recon_right_prev, recon_down_prev, f, full_pel_vector, motion_h_code, motion_v_code, motion_h_r, motion_v_r)				\
-									\
-{									\
-  int comp_h_r, comp_v_r;						\
-  int right_little, right_big, down_little, down_big;			\
-  int max, min, new_vector;						\
-									\
-  /* The following procedure for the reconstruction of motion vectors 	\
-     is a direct and simple implementation of the instructions given	\
-     in the mpeg December 1991 standard draft. 				\
-  */									\
-									\
-  if (f == 1 || motion_h_code == 0)					\
-    comp_h_r = 0;							\
-  else 									\
-    comp_h_r = f - 1 - motion_h_r;					\
-									\
-  if (f == 1 || motion_v_code == 0)					\
-    comp_v_r = 0;							\
-  else 									\
-    comp_v_r = f - 1 - motion_v_r;					\
-									\
-  right_little = motion_h_code * f;					\
-  if (right_little == 0)						\
-    right_big = 0;							\
-  else {								\
-    if (right_little > 0) {						\
-      right_little = right_little - comp_h_r;				\
-      right_big = right_little - 32 * f;				\
-    }									\
-    else {								\
-      right_little = right_little + comp_h_r;				\
-      right_big = right_little + 32 * f;				\
-    }									\
-  }									\
-									\
-  down_little = motion_v_code * f;					\
-  if (down_little == 0)							\
-    down_big = 0;							\
-  else {								\
-    if (down_little > 0) {						\
-      down_little = down_little - comp_v_r;				\
-      down_big = down_little - 32 * f;					\
-    }									\
-    else {								\
-      down_little = down_little + comp_v_r;				\
-      down_big = down_little + 32 * f;					\
-    }									\
-  }									\
-  									\
-  max = 16 * f - 1;							\
-  min = -16 * f;							\
-									\
-  new_vector = recon_right_prev + right_little;				\
-									\
-  if (new_vector <= max && new_vector >= min)				\
-    *recon_right_ptr = recon_right_prev + right_little;			\
-                      /* just new_vector */				\
-  else									\
-    *recon_right_ptr = recon_right_prev + right_big;			\
-  recon_right_prev = *recon_right_ptr;					\
-  if (full_pel_vector)							\
-    *recon_right_ptr = *recon_right_ptr << 1;				\
-									\
-  new_vector = recon_down_prev + down_little;				\
-  if (new_vector <= max && new_vector >= min)				\
-    *recon_down_ptr = recon_down_prev + down_little;			\
-                      /* just new_vector */				\
-  else									\
-    *recon_down_ptr = recon_down_prev + down_big;			\
-  recon_down_prev = *recon_down_ptr;					\
-  if (full_pel_vector)							\
-    *recon_down_ptr = *recon_down_ptr << 1;				\
-}
-
-/*
- *--------------------------------------------------------------
- *
- * ComputeForwVector --
- *
- *	Computes forward motion vector by calling ComputeVector
- *      with appropriate parameters.
- *
- * Results:
- *	Reconstructed motion vector placed in recon_right_for_ptr and
- *      recon_down_for_ptr.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void 
-ComputeForwVector(int *recon_right_for_ptr, int *recon_down_for_ptr)
-{
-
-  Pict *picture;
-  Macroblock *mblock;
-
-  picture = &(curVidStream->picture);
-  mblock = &(curVidStream->mblock);
-
-  ComputeVector(recon_right_for_ptr, recon_down_for_ptr,
-		mblock->recon_right_for_prev, 
-		mblock->recon_down_for_prev,
-		picture->forw_f, picture->full_pel_forw_vector,
-		mblock->motion_h_forw_code, mblock->motion_v_forw_code,
-		mblock->motion_h_forw_r, mblock->motion_v_forw_r); 
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ComputeBackVector --
- *
- *	Computes backward motion vector by calling ComputeVector
- *      with appropriate parameters.
- *
- * Results:
- *	Reconstructed motion vector placed in recon_right_back_ptr and
- *      recon_down_back_ptr.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void 
-ComputeBackVector(int *recon_right_back_ptr, int *recon_down_back_ptr)
-{
-  Pict *picture;
-  Macroblock *mblock;
-
-  picture = &(curVidStream->picture);
-  mblock = &(curVidStream->mblock);
-
-  ComputeVector(recon_right_back_ptr, recon_down_back_ptr,
-		mblock->recon_right_back_prev, 
-		mblock->recon_down_back_prev,
-		picture->back_f, picture->full_pel_back_vector,
-		mblock->motion_h_back_code, mblock->motion_v_back_code,
-		mblock->motion_h_back_r, mblock->motion_v_back_r); 
-
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h
deleted file mode 100644
index 365745476ce..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/newproto.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/* ui.c */
-void UIprocess(int cmdSocket);
-
-#include "mpeg_shared/routine.h"
-
-/* ctr.c */
-int CTRmain(void);
-
-/* ab.c */
-void ABinitBuf(int size);
-void ABflushBuf(int nextSample);
-int ABcheckSamples(void);  /* returns # of samples in ABbuf */
-int ABgetSamples(char * buf, int samples);
-    /* read at most given number of samples from AB to buf, returns
-       number of sample actually read */
-int ABskipSamples(int samples);
-/* if samples < 0; then stuff |samples| silient samples to ABgetSamples(),
-   otherwise wipe out this number of samples from AB */
-void ABdeleteBuf(void);
-void ABdeleteSem(void);
-
-void ABprocess(int dataSocket);
-
-/* vb.c */
-void VBinitBuf(int size);
-char * VBgetBuf(int size);  /* block version */
-int VBcheckBuf(int size); /* non-block check, return True/False*/
-void VBputMsg(char * msgPtr);
-char * VBgetMsg();          /* block version */
-int  VBcheckMsg();        /* non-block check, return Number of Msgs in buffer */
-int VBbufEmpty(void);
-void VBreclaimMsg(char * msgPtr);
-void VBdeleteBuf(void);
-void VBdeleteSem(void);
-
-void VBprocess(int initSocket, int dataSocket);
-
-/* vd.c */
-void VDprocess(int CTRpid);
-void VDinitBuf(int size);
-void VDresizeBuf(int height, int width);
-FrameBlock * VDgetBuf(void);     /* block version, return with interrupt */
-int   VDcheckBuf(void);    /* non-block check, return True/False */
-void VDputMsg(FrameBlock * msgPtr);
-FrameBlock * VDgetMsg(void);     /* block version, return with interrupt */
-FrameBlock * VDpeekMsg(void);    /* returns a msg for checking only, no modification allowed */
-int VDcheckMsg(void);      /* non-block check, return Number of Msg in buffer */
-int VDbufEmpty(void);
-void VDreferMsg(FrameBlock * msgPtr);
-void VDreclaimMsg(FrameBlock * msgPtr);
-void VDdeleteBuf(void);
-void VDdeleteSem(void);
-
-/* vp.c */
-
-void VPinitWindow(Widget shell, Window monitorWindow, int cmdSocket);
-void VPresizeWindow(int height, int width);
-
-/* -- in gdith.c -- */
-void VPcommand(int cmd, char * position);
-void VPexpose(void);
-
-/* audio.c */
-int InitAudioDevice(void);
-void SetAudioParameter(AudioParameter * para);
-unsigned int GetAudioTime(void);
-unsigned int PlayAudioSamples(unsigned int time, char * buf, int size);
-void StartAudioPlaySession(void);
-void SetAudioGain(void);
-void AudioInterpolate(char *rawBuf, int len, char * convBuf, int convLen);
-
-/* prog.c */
-
-void StartProgram(char * title, char * vh, char * vf, char * ah, char * af);
-Widget CreateProgramWindow(Widget parent, int cmdSoket, int * playflag, Widget frametext);
-
-/* file.c */
-
-void StartLocalServer(void);
-Widget CreateFileWindow(Widget parent, int cmdSoket, int * playflag, Widget frametext);
-
-
-/* para.c */
-
-Widget CreateParameterWindow(Widget parent);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp
deleted file mode 100644
index 89c76bf6aba..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to implement an ordered dither. */
-
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-#define DITH_SIZE 16
-
-
-/* Structures used to implement hybrid ordered dither/floyd-steinberg
-   dither algorithm.
-*/
-
-static unsigned char *l_darrays[DITH_SIZE];
-static unsigned char *cr_darrays[DITH_SIZE];
-static unsigned char *cb_darrays[DITH_SIZE];
-
-/*
- *--------------------------------------------------------------
- *
- *  InitOrderedDither--
- *
- *	Structures intialized for ordered dithering. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitOrderedDither()
-{
-  int i, j, k, err_range, threshval;
-  unsigned char *lmark, *cmark;
-
-  for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) malloc(256);
-
-    for (j=0; j<lum_values[0]; j++) {
-      *lmark++ = 0;
-    }
-
-    for (j=0; j<(LUM_RANGE-1); j++) {
-      err_range = lum_values[j+1] - lum_values[j];
-      threshval = ((i * err_range) / DITH_SIZE)+lum_values[j];
-
-      for (k=lum_values[j]; k<lum_values[j+1]; k++) {
-	if (k > threshval) *lmark++ = ((j+1) * (CR_RANGE * CB_RANGE));
-	else *lmark++ = (j * (CR_RANGE * CB_RANGE));
-      }
-    }
-
-    for (j=lum_values[LUM_RANGE-1]; j<256; j++) {
-      *lmark++ = (LUM_RANGE-1)*(CR_RANGE * CB_RANGE);
-    }
-  }
-
-  for (i=0; i<DITH_SIZE; i++) {
-    cmark = cr_darrays[i] = (unsigned char *) malloc(256);
-
-    for (j=0; j<cr_values[0]; j++) {
-      *cmark++ = 0;
-    }
-
-    for (j=0; j<(CR_RANGE-1); j++) {
-      err_range = cr_values[j+1] - cr_values[j];
-      threshval = ((i * err_range) / DITH_SIZE)+cr_values[j];
-
-      for (k=cr_values[j]; k<cr_values[j+1]; k++) {
-	if (k > threshval) *cmark++ = ((j+1) * CB_RANGE);
-	else *cmark++ = (j * CB_RANGE);
-      }
-    }
-
-    for (j=cr_values[CR_RANGE-1]; j<256; j++) {
-      *cmark++ = (CR_RANGE-1)*(CB_RANGE);
-    }
-  }
-
-  for (i=0; i<DITH_SIZE; i++) {
-    cmark = cb_darrays[i] = (unsigned char *) malloc(256);
-
-    for (j=0; j<cb_values[0]; j++) {
-      *cmark++ = 0;
-    }
-
-    for (j=0; j<(CB_RANGE-1); j++) {
-      err_range = cb_values[j+1] - cb_values[j];
-      threshval = ((i * err_range) / DITH_SIZE)+cb_values[j];
-
-      for (k=cb_values[j]; k<cb_values[j+1]; k++) {
-	if (k > threshval) *cmark++ = j+1;
-	else *cmark++ = j;
-      }
-    }
-
-    for (j=cb_values[CB_RANGE-1]; j<256; j++) {
-      *cmark++ = CB_RANGE-1;
-    }
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * OrderedDitherImage --
- *
- *	Dithers an image using an ordered dither.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *      The channels are dithered based on the standard
- *      ordered dither pattern for a 4x4 area. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-OrderedDitherImage (unsigned char *lum, unsigned char *cr,
-		    unsigned char *cb, unsigned char *out,
-		    int h, int w)
-{
-  unsigned char *l, *r, *b, *o1, *o2;
-  unsigned char *l2;
-  unsigned char L, R, B;
-  int i, j;
-
-  l = lum;
-  l2 = lum+w;
-  r = cr;
-  b = cb;
-  o1 = out;
-  o2 = out+w;
-
-  for (i=0; i<h; i+=4) {
-
-    for (j=0; j<w; j+=8) {
-
-      R = r[0]; B = b[0];
-
-      L = l[0];
-      o1[0] = pixel[(l_darrays[0][L] + cr_darrays[0][R] + cb_darrays[0][B])];
-      L = l[1];
-      o1[1] = pixel[(l_darrays[8][L] + cr_darrays[8][R] + cb_darrays[8][B])];
-      L = l2[0];
-      o2[0] = pixel[(l_darrays[12][L] + cr_darrays[12][R] + cb_darrays[12][B])];
-      L = l2[1];
-      o2[1] = pixel[(l_darrays[4][L] + cr_darrays[4][R] + cb_darrays[4][B])];
-
-      R = r[1]; B = b[1];
-
-      L = l[2];
-      o1[2] = pixel[(l_darrays[2][L] + cr_darrays[2][R] + cb_darrays[2][B])];
-      L = l[3];
-      o1[3] = pixel[(l_darrays[10][L] + cr_darrays[10][R] + cb_darrays[10][B])];
-      L = l2[2];
-      o2[2] = pixel[(l_darrays[14][L] + cr_darrays[14][R] + cb_darrays[14][B])];
-      L = l2[3];
-      o2[3] = pixel[(l_darrays[6][L] + cr_darrays[6][R] + cb_darrays[6][B])];
-
-      R = r[2]; B = b[2];
-
-      L = l[4];
-      o1[4] = pixel[(l_darrays[0][L] + cr_darrays[0][R] + cb_darrays[0][B])];
-      L = l[5];
-      o1[5] = pixel[(l_darrays[8][L] + cr_darrays[8][R] + cb_darrays[8][B])];
-      L = l2[4];
-      o2[4] = pixel[(l_darrays[12][L] + cr_darrays[12][R] + cb_darrays[12][B])];
-      L = l2[5];
-      o2[5] = pixel[(l_darrays[4][L] + cr_darrays[4][R] + cb_darrays[4][B])];
-
-      R = r[3]; B = b[3];
-
-      L = l[6];
-      o1[6] = pixel[(l_darrays[2][L] + cr_darrays[2][R] + cb_darrays[2][B])];
-      L = l[7];
-      o1[7] = pixel[(l_darrays[10][L] + cr_darrays[10][R] + cb_darrays[10][B])];
-      L = l2[6];
-      o2[6] = pixel[(l_darrays[14][L] + cr_darrays[14][R] + cb_darrays[14][B])];
-      L = l2[7];
-      o2[7] = pixel[(l_darrays[6][L] + cr_darrays[6][R] + cb_darrays[6][B])];
-
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-
-    for (j=0; j<w; j+=8) {
-
-      R = r[0]; B = b[0];
-
-      L = l[0];
-      o1[0] = pixel[(l_darrays[3][L] + cr_darrays[3][R] + cb_darrays[3][B])];
-      L = l[1];
-      o1[1] = pixel[(l_darrays[11][L] + cr_darrays[11][R] + cb_darrays[11][B])];
-      L = l2[0];
-      o2[0] = pixel[(l_darrays[15][L] + cr_darrays[15][R] + cb_darrays[15][B])];
-      L = l2[1];
-      o2[1] = pixel[(l_darrays[7][L] + cr_darrays[7][R] + cb_darrays[7][B])];
-
-      R = r[1]; B = b[1];
-
-      L = l[2];
-      o1[2] = pixel[(l_darrays[1][L] + cr_darrays[1][R] + cb_darrays[1][B])];
-      L = l[3];
-      o1[3] = pixel[(l_darrays[9][L] + cr_darrays[9][R] + cb_darrays[9][B])];
-      L = l2[2];
-      o2[2] = pixel[(l_darrays[13][L] + cr_darrays[13][R] + cb_darrays[13][B])];
-      L = l2[3];
-      o2[3] = pixel[(l_darrays[5][L] + cr_darrays[5][R] + cb_darrays[5][B])];
-
-      R = r[2]; B = b[2];
-
-      L = l[4];
-      o1[4] = pixel[(l_darrays[3][L] + cr_darrays[3][R] + cb_darrays[3][B])];
-      L = l[5];
-      o1[5] = pixel[(l_darrays[11][L] + cr_darrays[11][R] + cb_darrays[11][B])];
-      L = l2[4];
-      o2[4] = pixel[(l_darrays[15][L] + cr_darrays[15][R] + cb_darrays[15][B])];
-      L = l2[5];
-      o2[5] = pixel[(l_darrays[7][L] + cr_darrays[7][R] + cb_darrays[7][B])];
-
-      R = r[3]; B = b[3];
-
-      L = l[6];
-      o1[6] = pixel[(l_darrays[1][L] + cr_darrays[1][R] + cb_darrays[1][B])];
-      L = l[7];
-      o1[7] = pixel[(l_darrays[9][L] + cr_darrays[9][R] + cb_darrays[9][B])];
-      L = l2[6];
-      o2[6] = pixel[(l_darrays[13][L] + cr_darrays[13][R] + cb_darrays[13][B])];
-      L = l2[7];
-      o2[7] = pixel[(l_darrays[5][L] + cr_darrays[5][R] + cb_darrays[5][B])];
-
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-  }
-}
-
-
-  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp
deleted file mode 100644
index eab1505b642..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/* $Id$ */
-/*  
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code to implement an ordered dither. */
-
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "dither.h"
-
-#define DITH_SIZE 16
-
-
-/* Structures used to implement hybrid ordered dither/floyd-steinberg
-   dither algorithm.
-*/
-
-static unsigned char ***ditherPtr[DITH_SIZE];
-
-
-/*
- *--------------------------------------------------------------
- *
- *  InitOrderedDither--
- *
- *	Structures intialized for ordered dithering. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitOrdered2Dither()
-{
-  unsigned char ****pos_2_cb;
-  unsigned char ***cb_2_cr;
-  unsigned char **cr_2_l;
-  int cb_val, cb_rval, cr_val, cr_rval, l_val, l_rval;
-  int i, j, pos;
-  int err_range, threshval;
-
-  pos_2_cb = (unsigned char ****) malloc (DITH_SIZE*sizeof(unsigned char ***));
-  cb_2_cr = (unsigned char ***) malloc(CB_RANGE*sizeof(unsigned char **));
-  cr_2_l = (unsigned char **) malloc(CR_RANGE*sizeof(unsigned char *));
-
-  for (pos=0; pos<DITH_SIZE; pos++) {
-    
-    pos_2_cb[pos] = (unsigned char ***) malloc(256*(sizeof(unsigned char **)));
-
-    for (j=0; j<CB_RANGE; j++) {
-      cb_2_cr[j] = (unsigned char **) malloc(256*(sizeof(unsigned char *)));
-    }
-
-    for (cb_val=0; cb_val<cb_values[0]; cb_val++) {
-      (pos_2_cb[pos])[cb_val] = cb_2_cr[0];
-    }
-
-    for (cb_rval=0; cb_rval<(CB_RANGE-1); cb_rval++) {
-      err_range = cb_values[cb_rval+1] - cb_values[cb_rval];
-      threshval = ((pos*err_range)/DITH_SIZE)+cb_values[cb_rval];
-
-      for (cb_val=cb_values[cb_rval]; cb_val<cb_values[cb_rval+1]; cb_val++) {
-	if (cb_val>threshval) (pos_2_cb[pos])[cb_val] = cb_2_cr[cb_rval+1];
-	else (pos_2_cb[pos])[cb_val] = cb_2_cr[cb_rval];
-      }
-    }
-
-    for (cb_val=cb_values[CB_RANGE-1]; cb_val<256; cb_val++) {
-      (pos_2_cb[pos])[cb_val] = cb_2_cr[CB_RANGE-1];
-    }
-
-    for (cb_rval=0; cb_rval<CB_RANGE; cb_rval++) {
-      
-      for (j=0; j<CR_RANGE; j++) {
-	cr_2_l[j] = (unsigned char *) malloc(256*(sizeof(unsigned char)));
-      }
-
-      for (cr_val=0; cr_val < cr_values[0]; cr_val++) {
-	(cb_2_cr[cb_rval])[cr_val] = cr_2_l[0];
-      }
-
-      for (cr_rval=0; cr_rval<(CR_RANGE-1); cr_rval++) {
-	err_range = cr_values[cr_rval+1] - cr_values[cr_rval];
-	threshval = ((pos*err_range)/DITH_SIZE)+cr_values[cr_rval];
-	
-	for (cr_val=cr_values[cr_rval]; cr_val<cr_values[cr_rval+1]; cr_val++) {
-	  if (cr_val>threshval) (cb_2_cr[cb_rval])[cr_val] = cr_2_l[cr_rval+1];
-	  else (cb_2_cr[cb_rval])[cr_val] = cr_2_l[cr_rval];
-	}
-      }
-      
-      for (cr_val=cr_values[CR_RANGE-1]; cr_val<256; cr_val++) {
-	(cb_2_cr[cb_rval])[cr_val] = cr_2_l[CR_RANGE-1];
-      }
-      
-      for (cr_rval=0; cr_rval<CR_RANGE; cr_rval++) {
-	
-	for (l_val = 0; l_val < lum_values[0]; l_val++) {
-	  (cr_2_l[cr_rval])[l_val] = pixel[cb_rval+(cr_rval*CB_RANGE)+
-					    (0*CR_RANGE*CB_RANGE)];
-	}
-
-	for (l_rval=0; l_rval<(LUM_RANGE-1); l_rval++) {
-	  err_range = lum_values[l_rval+1] - lum_values[l_rval];
-	  threshval = ((pos*err_range) /DITH_SIZE) + lum_values[l_rval];
-
-	  for (l_val = lum_values[l_rval]; l_val < lum_values[l_rval+1]; l_val++) {
-	    if (l_val>threshval) (cr_2_l[cr_rval])[l_val] = 
-	      pixel[cb_rval+(cr_rval*CB_RANGE)+((l_rval+1)*CR_RANGE*CB_RANGE)];
-	    else (cr_2_l[cr_rval])[l_val] =
-	      pixel[cb_rval+(cr_rval*CB_RANGE)+(l_rval*CR_RANGE*CB_RANGE)];
-	  }
-	}
-
-	for (l_val = lum_values[LUM_RANGE-1]; l_val < 256; l_val++) {
-	  (cr_2_l[cr_rval])[l_val] = 
-	    pixel[cb_rval+(cr_rval*CB_RANGE)+((LUM_RANGE-1)*CR_RANGE*CB_RANGE)];
-	}
-      }
-    }
-  }
-
-  for (i=0; i<DITH_SIZE; i++) {
-    ditherPtr[i] = pos_2_cb[i];
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Ordered2DitherImage --
- *
- *	Dithers an image using an ordered dither.
- *	Assumptions made:
- *	  1) The color space is allocated y:cr:cb = 8:4:4
- *	  2) The spatial resolution of y:cr:cb is 4:1:1
- *      The channels are dithered based on the standard
- *      ordered dither pattern for a 4x4 area. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-Ordered2DitherImage (unsigned char *lum, unsigned char *cr,
-		     unsigned char *cb, unsigned char *out,
-		     int h, int w)
-{
-  unsigned char *l, *r, *b, *o1, *o2;
-  unsigned char *l2;
-  unsigned char L, R, B;
-  int i, j;
-  unsigned char ***dp0 = ditherPtr[0];
-  unsigned char ***dp2 = ditherPtr[2];
-  unsigned char ***dp4 = ditherPtr[4];
-  unsigned char ***dp6 = ditherPtr[6];
-  unsigned char ***dp8 = ditherPtr[8];
-  unsigned char ***dp10 = ditherPtr[10];
-  unsigned char ***dp12 = ditherPtr[12];
-  unsigned char ***dp14 = ditherPtr[14];
-  unsigned char ***dp1 = ditherPtr[1];
-  unsigned char ***dp3 = ditherPtr[3];
-  unsigned char ***dp5 = ditherPtr[5];
-  unsigned char ***dp7 = ditherPtr[7];
-  unsigned char ***dp9 = ditherPtr[9];
-  unsigned char ***dp11 = ditherPtr[11];
-  unsigned char ***dp13 = ditherPtr[13];
-  unsigned char ***dp15 = ditherPtr[15];
-
-  l = lum;
-  l2 = lum+w;
-  r = cr;
-  b = cb;
-  o1 = out;
-  o2 = out+w;
-
-  for (i=0; i<h; i+=4) {
-
-    for (j=0; j<w; j+=8) {
-
-      R = r[0]; B = b[0];
-
-      L = l[0];
-      o1[0] = ((dp0[B])[R])[L];
-      L = l[1];
-      o1[1] = ((dp8[B])[R])[L];
-      L = l2[0];
-      o2[0] = ((dp12[B])[R])[L];
-      L = l2[1];
-      o2[1] = ((dp4[B])[R])[L];
-
-      R = r[1]; B = b[1];
-
-      L = l[2];
-      o1[2] = ((dp2[B])[R])[L];
-      L = l[3];
-      o1[3] = ((dp10[B])[R])[L];
-      L = l2[2];
-      o2[2] = ((dp14[B])[R])[L];
-      L = l2[3];
-      o2[3] = ((dp6[B])[R])[L];
-
-      R = r[2]; B = b[2];
-
-      L = l[4];
-      o1[4] = ((dp0[B])[R])[L];
-      L = l[5];
-      o1[5] = ((dp8[B])[R])[L];
-      L = l2[4];
-      o2[4] = ((dp12[B])[R])[L];
-      L = l2[5];
-      o2[5] = ((dp4[B])[R])[L];
-
-      R = r[3]; B = b[3];
-
-      L = l[6];
-      o1[6] = ((dp2[B])[R])[L];
-      L = l[7];
-      o1[7] = ((dp10[B])[R])[L];
-      L = l2[6];
-      o2[6] = ((dp14[B])[R])[L];
-      L = l2[7];
-      o2[7] = ((dp6[B])[R])[L];
-
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-
-    for (j=0; j<w; j+=8) {
-
-      R = r[0]; B = b[0];
-
-      L = l[0];
-      o1[0] = ((dp3[B])[R])[L];
-      L = l[1];
-      o1[1] = ((dp11[B])[R])[L];
-      L = l2[0];
-      o2[0] = ((dp15[B])[R])[L];
-      L = l2[1];
-      o2[1] = ((dp7[B])[R])[L];
-
-      R = r[1]; B = b[1];
-
-      L = l[2];
-      o1[2] = ((dp1[B])[R])[L];
-      L = l[3];
-      o1[3] = ((dp9[B])[R])[L];
-      L = l2[2];
-      o2[2] = ((dp13[B])[R])[L];
-      L = l2[3];
-      o2[3] = ((dp5[B])[R])[L];
-
-      R = r[2]; B = b[2];
-
-      L = l[4];
-      o1[4] = ((dp3[B])[R])[L];
-      L = l[5];
-      o1[5] = ((dp11[B])[R])[L];
-      L = l2[4];
-      o2[4] = ((dp15[B])[R])[L];
-      L = l2[5];
-      o2[5] = ((dp7[B])[R])[L];
-
-      R = r[3]; B = b[3];
-
-      L = l[6];
-      o1[6] = ((dp1[B])[R])[L];
-      L = l[7];
-      o1[7] = ((dp9[B])[R])[L];
-      L = l2[6];
-      o2[6] = ((dp13[B])[R])[L];
-      L = l2[7];
-      o2[7] = ((dp5[B])[R])[L];
-
-      l += 8;
-      l2 += 8;
-      r += 4;
-      b += 4;
-      o1 += 8;
-      o2 += 8;
-    }
-
-    l += w; l2 += w;
-    o1 += w; o2 += w;
-  }
-}
-
-
-  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp
deleted file mode 100644
index 8715d47f63f..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "video.h"
-#include <X11/Intrinsic.h>
-#include <Xm/DialogS.h>
-#include <Xm/List.h>
-#include <Xm/Frame.h>
-#include <Xm/PushB.h>
-#include <Xm/Form.h>
-#include <Xm/Text.h>
-#include <Xm/TextF.h>
-#include <Xm/Label.h>
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-
-#define NUM_LIST_ITEMS 25
-#define PARAMETER_FILE "~/.vcr/vcrParameters"
-#define BANNER "Virtual VCR Parameter File, version 2.0  ** Do not Edit **"
-#ifdef XmFONTLIST_DEFAULT_TAG
-#define XmStringTag XmFONTLIST_DEFAULT_TAG
-#else
-#define XmStringTag XmSTRING_DEFAULT_CHARSET
-#endif
-#define STRING_SIZE 64
-#define ITEMS sizeof(shared->config)/4
-
-static Widget parashell, wparalist, wparafield;
-
-static int * config;
-static float *fconfig;
-
-static struct
-{
-  char * title;
-  int float_tag;  /* 0 - integer, 1 - floating point */
-}
-para[] =
-{
-  {"Real time (audio on)(tag)", 0},
-  {"Video max frames-per-second", 0},
-  {"Audio max sampels-per-second", 0},
-  {"FF frames-per-second", 0},
-  {"Rewind frames-per-second", 0},
-  {"Feedback delay (msec)", 0},
-  {"Audio output mask", 0},
-  {"Audio_para.encodeType", 0},
-  {"Audio_para.channels", 0},
-  {"Audio_para.samplesPerSecond", 0},
-  {"Audio_para.bytesPerSamples", 0},
-  {"Audio timer interval (millisec)", 0},
-  {"Audio buffered intervals", 0},
-  {"Frames per audio play", 0},
-  {"Audio forward (samples)", 0},
-  {"VS work-ahead (milliseconds)", 0},
-  {"frame rate limit (fps, float)", 1},
-  {"collect statistics(tag)", 0},
-  {"collect video structure info(tag)", 0},
-  {"Sync effective(tag)", 0},
-  {"QoS effective(tag)", 0},
-  {"Audio offset(samples)", 0},
-  {"Filter parameter(1/R or nsamples)", 0},
-  {"Max send pattern frames", 0},
-  {"Reliable byte-stream audio (tag)", 0},
-  {"Reliable byte-stream video (tag)", 0},
-  {"Verbose message(tag)", 0},
-  {"", 0} /* this empty string is needed for testing the size of para */
-};
-
-#define Fgets(s) {if (feof(fp) || fgets(s, STRING_SIZE, fp) == NULL) break;  s[strlen(s)-1] = 0; }
-
-#define Fputs(s) {fputs(s, fp); fputc('\n', fp);}
-
-static void InitBuf(void)
-{
-  FILE * fp;
-  char buf[256];
-  int i;
-
-  config = (int *)&(shared->config);
-  fconfig = (float *)&(shared->config);
-
-  get_full_path(PARAMETER_FILE, buf, 256);
-  fp = fopen(buf, "r");
-  if (fp == NULL)
-  {
-    fprintf(stderr, "Warning: %s not found, use default parameter value\n",
-	    PARAMETER_FILE);
-  InitBuf_exit1:
-    return;
-  }
-  if (fgets(buf, 100, fp) == NULL)
-  {
-    fclose(fp);
-    goto InitBuf_exit1;
-  }
-  buf[strlen(buf)-1] = 0;
-  if (strcmp(buf, BANNER))
-  {
-    fprintf(stderr, "BANNER in %s not expected, use default parameter value\n",
-	    PARAMETER_FILE);
-    fclose(fp);
-    goto InitBuf_exit1;
-  }
-  for(i = 0; i < ITEMS; i++)
-  {
-    Fgets(buf);
-    if (para[i].float_tag)
-      sscanf(buf, "%f", &fconfig[i]);
-    else
-      sscanf(buf, "%d", &config[i]);
-  }
-  fclose(fp);
-}
-
-static void SaveBuf(void)
-{
-  int i;
-  FILE * fp;
-  char buf[256];
-  get_full_path(PARAMETER_FILE, buf, 256);
-  fp = fopen(buf, "w");
-  if (fp == NULL)
-  {
-    fprintf(stderr, "Fail to open %s for saving para", buf);
-    perror("");
-    return;
-  }
-  Fputs(BANNER);
-  for (i = 0; i < ITEMS; i++)
-    if (para[i].float_tag)
-      fprintf(fp, "%f\n", fconfig[i]);
-    else
-      fprintf(fp, "%d\n", config[i]);
-  fclose(fp);
-}
-
-
-static int curListPos(void)
-{
-  int * poses, count;
-  
-  if (XmListGetSelectedPos(wparalist, &poses, &count))
-  {
-    count = poses[0];
-    XtFree((char*)poses);
-    /*
-    fprintf(stderr, "curListPos: current pos = %d\n", count);
-    */
-    return count - 1;
-  }
-  return -1;
-}
-
-static void modifyCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  int i, value;
-  XmString item;
-  char buf[100], * valptr;
-  i = curListPos();
-  if (i == -1) { beep(); return;}
-  valptr = XmTextGetString(wparafield);
-  if (para[i].float_tag)
-    sscanf(valptr, "%f", &fconfig[i]);
-  else
-    sscanf(valptr, "%d", &config[i]);
-  XtFree(valptr);
-  if (para[i].float_tag)
-    sprintf(buf, "%s: %f", para[i].title, fconfig[i]);
-  else
-    sprintf(buf, "%s: %d", para[i].title, config[i]);
-  item = (XmString)XmStringCreateLtoR(buf, XmStringTag);
-  XmListReplaceItemsPos(wparalist, &item, 1, i+1);
-  XmListSelectPos(wparalist, i+1, 0);
-  XmStringFree(item);
-  SaveBuf();
-  /*
-  XtManageChild(parashell);
-  */
-  return;
-}
-
-static void dismissCB(Widget W, XtPointer closure, XtPointer call_data)
-{
-  
-  XtUnrealizeWidget(parashell);
-  /*
-  XtUnmanageChild(parashell);
-  */
-}
-
-Widget CreateParameterWindow(Widget parent)
-{
-  Arg   	args[20];
-  int		n;
-  Widget 	wform, frame1, frame2, wlabel,
-                wmodify, wdismiss;
-  XmFontList fontlist;
-  XFontStruct * font;
-  XmStringCharSet cset = XmSTRING_DEFAULT_CHARSET;
-
-  InitBuf();
-
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR Parameter List"); n++;
-  XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING);n++;
-  XtSetArg(args[n], XmNkeyboardFocusPolicy, XmPOINTER); n++;
-  XtSetArg(args[n], XmNwidth, 350); n++;
-  XtSetArg(args[n], XmNheight, 400); n++;
-  XtSetArg(args[n], XmNminWidth, 250); n++;
-  XtSetArg(args[n], XmNminHeight, 150); n++;
-  
-  parashell = XtAppCreateShell("Parameter List", "virtual_vcr",
-			       topLevelShellWidgetClass, display, args, n);
-  /*
-  parashell = XmCreateDialogShell(parent, "virtual_vcr", args, n);
-  */
-
-  font = XLoadQueryFont (XtDisplay (parashell), "courB14");
-  fontlist = XmStringCreateFontList (font, cset);
-
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual Parameter List"); n++;
-  wform  = XmCreateForm(parashell, "Parameters", args, n);
-  XtManageChild(wform);
-  /*
-  parashell = wform  = XmCreateForm(parashell, "Parameters", args, n);
-  */
-  
-  n = 0;
-  wmodify = XmCreatePushButton (wform, "Update", args, n);
-  XtManageChild(wmodify);
-  XtAddCallback (wmodify, XmNactivateCallback, (XtCallbackProc)modifyCB, NULL);
-  wdismiss = XmCreatePushButton (wform, "Dismiss", args, n);
-  XtManageChild(wdismiss);
-  XtAddCallback (wdismiss, XmNactivateCallback, (XtCallbackProc)dismissCB, NULL);
-
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 20); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wmodify, args, n);
-
-  n = 0;
-  XtSetArg(args[n], XmNcolumns, 10); n++;
-  XtSetArg (args[n], XmNleftOffset, 90); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  wparafield = XmCreateTextField(wform, "updata_text", args, n);
-  XtManageChild(wparafield);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNrightOffset, 20); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wdismiss, args, n);
-
-  n = 0;
-  XtSetArg (args[n], XmNtopOffset, 5); n++;
-  XtSetArg (args[n], XmNleftOffset, 5); n++;
-  XtSetArg (args[n], XmNbottomOffset, 45); n++;
-  XtSetArg (args[n], XmNrightOffset, 5); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  XtSetArg(args[n], XmNfontList,  fontlist); n++;
-  XtSetArg(args[n], XmNvisibleItemCount,  NUM_LIST_ITEMS); n++;
-
-  {
-    int items;
-    XmString * item;
-    int i;
-    /*
-    fprintf(stderr, "Total parameter items: %d\n", items);
-    */
-    for (items = 0; para[items].title[0] != 0; items ++);
-    if (items > ITEMS)
-      items = ITEMS;
-    else if (items < ITEMS)
-    {
-      fprintf(stderr, "Error in para.c: fewer titles than parameters, %d out of %d.\n",
-	      items, ITEMS);
-      exit(1);
-    }
-    item = (XmString *)malloc(sizeof(*item) * items);
-    if (item == NULL)
-    {
-      perror("UI allocate parameter list item(XmString)");
-      exit(1);
-    }
-    for (i = 0; i < items; i ++)
-    {
-      char buf[100];
-      if (para[i].float_tag)
-        sprintf(buf, "%s: %f", para[i].title, fconfig[i]);
-      else
-        sprintf(buf, "%s: %d", para[i].title, config[i]);
-      item[i] = (XmString)XmStringCreateLtoR(buf, XmStringTag);
-    }
-    XtSetArg(args[n], XmNitems, item); n++;
-    XtSetArg(args[n], XmNitemCount, items); n++;
-    XtSetArg(args[n], XmNselectedItems,  item); n++;
-    XtSetArg(args[n], XmNselectedItemCount,  1); n++;
-    wparalist = XmCreateScrolledList(wform, "ParameterList", args, n);
-    XtManageChild(wparalist);
-    for (i = 0; i < items; i++)
-      XmStringFree(item[i]);
-    free(item);
-  }
-  XmFontListFree(fontlist);
-
-  n=0;
-  XtSetArg (args[n], XmNtopOffset, 5); n++;
-  XtSetArg (args[n], XmNleftOffset, 5); n++;
-  XtSetArg (args[n], XmNbottomOffset, 45); n++;
-  XtSetArg (args[n], XmNrightOffset, 5); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  frame2 = XmCreateFrame (wform, "frame", args, n);
-  XtManageChild(frame2);
-
-  n=0;
-  XtSetArg (args[n], XmNtopOffset, 0); n++;
-  XtSetArg (args[n], XmNleftOffset, 0); n++;
-  XtSetArg (args[n], XmNbottomOffset, 0); n++;
-  XtSetArg (args[n], XmNrightOffset, 0); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  frame1 = XmCreateFrame (wform, "frame", args, n);
-  XtManageChild(frame1);
-  
-  return parashell;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp
deleted file mode 100644
index 4a2b152ca6c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/parseblock.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#define NO_SANITY_CHECKS
-#include <assert.h>
-#include "video.h"
-#include "proto.h"
-#include "decoders.h"
-
-/* External declarations. */
-
-extern int zigzag_direct[];
-
-/* Macro for returning 1 if num is positive, -1 if negative, 0 if 0. */
-
-#define Sign(num) ((num > 0) ? 1 : ((num == 0) ? 0 : -1))
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParseReconBlock --
- *
- *	Parse values for block structure from bitstream.
- *      n is an indication of the position of the block within
- *      the macroblock (i.e. 0-5) and indicates the type of 
- *      block (i.e. luminance or chrominance). Reconstructs
- *      coefficients from values parsed and puts in 
- *      block.dct_recon array in vid stream structure.
- *      sparseFlag is set when the block contains only one
- *      coeffictient and is used by the IDCT.
- *
- * Results:
- *	
- *
- * Side effects:
- *      Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-#define DCT_recon blockPtr->dct_recon
-#define DCT_dc_y_past blockPtr->dct_dc_y_past
-#define DCT_dc_cr_past blockPtr->dct_dc_cr_past
-#define DCT_dc_cb_past blockPtr->dct_dc_cb_past
-
-#define DECODE_DCT_COEFF_FIRST DecodeDCTCoeffFirst
-#define DECODE_DCT_COEFF_NEXT DecodeDCTCoeffNext
-
-void
-ParseReconBlock(int n)
-{
-#ifdef RISC
-  unsigned int temp_curBits;
-  int temp_bitOffset;
-  int temp_bufLength;
-  unsigned int *temp_bitBuffer;
-#endif
-
-  Block *blockPtr = &curVidStream->block;
-  int coeffCount;
-  
-  if (bufLength < 2)
-    correct_underflow();
-
-#ifdef RISC
-  temp_curBits = curBits;
-  temp_bitOffset = bitOffset;
-  temp_bufLength = bufLength;
-  temp_bitBuffer = bitBuffer;
-#endif
-
-  {
-    /*
-     * Copy the globals curBits, bitOffset, bufLength, and bitBuffer
-     * into local variables with the same names, so the macros use the
-     * local variables instead.  This allows register allocation and
-     * can provide 1-2 fps speedup.  On machines with not so many registers,
-     * don't do this.
-     */
-#ifdef RISC
-    register unsigned int curBits = temp_curBits;
-    register int bitOffset = temp_bitOffset;
-    register int bufLength = temp_bufLength;
-    register unsigned int *bitBuffer = temp_bitBuffer;
-#endif
-
-    int diff;
-    int size, level, i, run, pos, coeff;
-    short int *reconptr;
-    unsigned char *iqmatrixptr, *niqmatrixptr;
-    int qscale;
-
-    reconptr = DCT_recon[0];
-
-    /* 
-     * Hand coded version of memset that's a little faster...
-     * Old call:
-     *	memset((char *) DCT_recon, 0, 64*sizeof(short int));
-     */
-    {
-      INT32 *p;
-      p = (INT32 *) reconptr;
-
-      p[0] = p[1] = p[2] = p[3] = p[4] = p[5] = p[6] = p[7] = p[8] = p[9] = 
-      p[10] = p[11] = p[12] = p[13] = p[14] = p[15] = p[16] = p[17] = p[18] =
-      p[19] = p[20] = p[21] = p[22] = p[23] = p[24] = p[25] = p[26] = p[27] =
-      p[28] = p[29] = p[30] = p[31] = 0;
-
-    }
-
-    if (curVidStream->mblock.mb_intra) {
-
-      if (n < 4) {
-
-	/*
-	 * Get the luminance bits.  This code has been hand optimized to
-	 * get by the normal bit parsing routines.  We get some speedup
-	 * by grabbing the next 16 bits and parsing things locally.
-	 * Thus, calls are translated as:
-	 *
-	 *	show_bitsX  <-->   next16bits >> (16-X)
-	 *	get_bitsX   <-->   val = next16bits >> (16-flushed-X);
-	 *			   flushed += X;
-	 *			   next16bits &= bitMask[flushed];
-	 *	flush_bitsX <-->   flushed += X;
-	 *			   next16bits &= bitMask[flushed];
-	 *
-	 * I've streamlined the code a lot, so that we don't have to mask
-	 * out the low order bits and a few of the extra adds are removed.
-	 *	bsmith
-	 */
-	unsigned int next16bits, index, flushed;
-
-	show_bits16(next16bits);
-	index = next16bits >> (16-7);
-	size = dct_dc_size_luminance[index].value;
-	flushed = dct_dc_size_luminance[index].num_bits;
-	next16bits &= bitMask[16+flushed];
-
-	if (size != 0) {
-	  flushed += size;
-	  diff = next16bits >> (16-flushed);
-          if (!(diff & bitTest[32-size])) {
-	    diff = rBitMask[size] | (diff + 1);
-	  }
-	} else {
-	  diff = 0;
-	}
-	flush_bits(flushed);
-
-	if (n == 0) {
-	  coeff = diff << 3;
-	  if (curVidStream->mblock.mb_address -
-	      curVidStream->mblock.past_intra_addr > 1) 
-	    coeff += 1024;
-	  else coeff += DCT_dc_y_past;
-	  DCT_dc_y_past = coeff;
-	} else {
-	  coeff = DCT_dc_y_past + (diff << 3);
-	  DCT_dc_y_past = coeff;
-	}
-      } else {
-	
-	/*
-	 * Get the chrominance bits.  This code has been hand optimized to
-	 * as described above
-	 */
-	unsigned int next16bits, index, flushed;
-
-	show_bits16(next16bits);
-	index = next16bits >> (16-8);
-	size = dct_dc_size_chrominance[index].value;
-	flushed = dct_dc_size_chrominance[index].num_bits;
-	next16bits &= bitMask[16+flushed];
-	
-	if (size != 0) {
-	  flushed += size;
-	  diff = next16bits >> (16-flushed);
-          if (!(diff & bitTest[32-size])) {
-	    diff = rBitMask[size] | (diff + 1);
-	  }
-	} else {
-	  diff = 0;
-	}
-	flush_bits(flushed);
-	
-	if (n == 4) {
-	  coeff = diff << 3;
-	  if (curVidStream->mblock.mb_address -
-	      curVidStream->mblock.past_intra_addr > 1) 
-	    coeff += 1024;
-	  else coeff += DCT_dc_cr_past;
-	  DCT_dc_cr_past = coeff;
-
-	} else {
-	  coeff = diff << 3;
-	  if (curVidStream->mblock.mb_address -
-	      curVidStream->mblock.past_intra_addr > 1) 
-	    coeff += 1024;
-	  else coeff += DCT_dc_cb_past;
-	  DCT_dc_cb_past = coeff;
-	}
-      }
-      
-      *reconptr = coeff;
-      i = 0; pos = 0;
-      coeffCount = (coeff != 0);
-    
-      if (curVidStream->picture.code_type != 4) {
-	
-	qscale = curVidStream->slice.quant_scale;
-	iqmatrixptr = curVidStream->intra_quant_matrix[0];
-	
-	while(1) {
-	  
-	  DECODE_DCT_COEFF_NEXT(run, level);
-
-	  if (run == END_OF_BLOCK) break;
-
-	  i = i + run + 1;
-	  pos = zigzag_direct[i];
-	  coeff = (level * qscale * ((int) iqmatrixptr[pos])) >> 3;
-	  if (level < 0) {
-	      coeff += (coeff & 1);
-	  } else {
-	      coeff -= (coeff & 1);
-	  }
-
-	  reconptr[pos] = coeff;
-	  if (coeff) {
-	    coeffCount++;
-	  }
-
-	}
-
-#ifdef ANALYSIS 
-
-	{
-	  extern unsigned int *mbCoeffPtr;
-	  mbCoeffPtr[pos]++;
-	}
-#endif
-
-	flush_bits(2);
-
-	goto end;
-      }
-    }
-    
-    else {
-      
-      niqmatrixptr = curVidStream->non_intra_quant_matrix[0];
-      qscale = curVidStream->slice.quant_scale;
-      
-      DECODE_DCT_COEFF_FIRST(run, level);
-      i = run;
-
-      pos = zigzag_direct[i];
-      if (level < 0) {
-	  coeff = (((level<<1) - 1) * qscale * 
-		   ((int) (niqmatrixptr[pos]))) >> 4; 
-	  coeff += (coeff & 1);
-      } else {
-	  coeff = (((level<<1) + 1) * qscale * 
-		   ((int) (*(niqmatrixptr+pos)))) >> 4; 
-	  coeff -= (coeff & 1);
-      }
-      reconptr[pos] = coeff;
-      if (coeff) {
-	coeffCount = 1;
-      }
-
-      if (curVidStream->picture.code_type != 4) {
-	
-	while(1) {
-	  
-	  DECODE_DCT_COEFF_NEXT(run, level);
-
-	  if (run == END_OF_BLOCK) break;
-
-	  i = i+run+1;
-	  pos = zigzag_direct[i];
-	  if (level < 0) {
-	      coeff = (((level<<1) - 1) * qscale * 
-		       ((int) (niqmatrixptr[pos]))) >> 4; 
-	      coeff += (coeff & 1);
-	  } else {
-	      coeff = (((level<<1) + 1) * qscale * 
-		       ((int) (*(niqmatrixptr+pos)))) >> 4; 
-	      coeff -= (coeff & 1);
-	  }
-	  reconptr[pos] = coeff;
-	  if (coeff) {
-	    coeffCount++;
-	  }
-	}
-
-#ifdef ANALYSIS
-	{
-	  extern unsigned int *mbCoeffPtr;
-	  mbCoeffPtr[pos]++;
-	}
-#endif
-
-	flush_bits(2);
-
-	goto end;
-      }
-    }
-    
-  end:
-
-    if (coeffCount == 1) j_rev_dct_sparse (reconptr, pos);
-    else j_rev_dct(reconptr);
-
-#ifdef RISC
-    temp_curBits = curBits;
-    temp_bitOffset = bitOffset;
-    temp_bufLength = bufLength;
-    temp_bitBuffer = bitBuffer;
-#endif
-
-  }
-
-#ifdef RISC
-  curBits = temp_curBits;
-  bitOffset = temp_bitOffset;
-  bufLength = temp_bufLength;
-  bitBuffer = temp_bitBuffer;
-#endif
-}
-	
-#undef DCT_recon 
-#undef DCT_dc_y_past 
-#undef DCT_dc_cr_past 
-#undef DCT_dc_cb_past 
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParseAwayBlock --
- *
- *	Parses off block values, throwing them away.
- *      Used with grayscale dithering.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-ParseAwayBlock(int n)
-{
-  unsigned int diff;
-  unsigned int size, run;
-  int level;
-
-  if (bufLength < 2)
-    correct_underflow();
-
-  if (curVidStream->mblock.mb_intra) {
-
-    /* If the block is a luminance block... */
-
-    if (n < 4) {
-
-      /* Parse and decode size of first coefficient. */
-
-      DecodeDCTDCSizeLum(size);
-
-      /* Parse first coefficient. */
-
-      if (size != 0) {
-	get_bitsn(size, diff);
-      }
-    }
-
-    /* Otherwise, block is chrominance block... */
-
-    else {
-
-      /* Parse and decode size of first coefficient. */
-
-      DecodeDCTDCSizeChrom(size);
-
-      /* Parse first coefficient. */
-
-      if (size != 0) {
-	get_bitsn(size, diff);
-      }
-    }
-  }
-
-  /* Otherwise, block is not intracoded... */
-
-  else {
-
-    /* Decode and set first coefficient. */
-
-    DECODE_DCT_COEFF_FIRST(run, level);
-  }
-
-  /* If picture is not D type (i.e. I, P, or B)... */
-
-  if (curVidStream->picture.code_type != 4) {
-
-    /* While end of macroblock has not been reached... */
-
-    while (1) {
-
-      /* Get the dct_coeff_next */
-
-      DECODE_DCT_COEFF_NEXT(run, level);
-
-      if (run == END_OF_BLOCK) break;
-    }
-
-    /* End_of_block */
-
-    flush_bits(2);
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp
deleted file mode 100644
index 60fb1c13e6b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp
+++ /dev/null
@@ -1,916 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "video.h"
-#include <X11/Intrinsic.h>
-#include <Xm/List.h>
-#include <Xm/Frame.h>
-#include <Xm/PushB.h>
-#include <Xm/Form.h>
-#include <Xm/Text.h>
-#include <Xm/TextF.h>
-#include <Xm/DialogS.h>
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-
-#define NUM_LIST_ITEMS 20
-#define STRING_SIZE 100
-#define ITEMS 100
-#define PROGRAM_FILE "~/.vcr/vcrPrograms"
-#define BANNER "Virtual VCR Program DataBase. version 2.0 **DO NOT edit**"
-#ifdef XmFONTLIST_DEFAULT_TAG
-#define XmStringTag XmFONTLIST_DEFAULT_TAG
-#else
-#define XmStringTag XmSTRING_DEFAULT_CHARSET
-#endif
-
-static int cmdSocket;
-static int *playtag;
-static Widget titlewidget, progshell, progmodifyshell;
-static Widget wproglist, wprogmodify;
-
-static int items = 0;
-static XmString * item;
-static struct ProgramList
-{
-  char title[STRING_SIZE];
-  char vh[STRING_SIZE];
-  char vf[STRING_SIZE];
-  char ah[STRING_SIZE];
-  char af[STRING_SIZE];
-} * prog;
-
-static int progcmd, progid;  /* progcmd == 0 - insert, 1 - modify*/
-static struct ProgramList deletedprog;
-
-#define LINE1 "  Program Title: "
-#define LINE2 "Video file host: "
-#define LINE3 "Video file path: "
-#define LINE4 "Audio file host: "
-#define LINE5 "Audio file path: "
-#define MarginHeight 10
-#define MarginWidth  10
-static int charHeight, charWidth;
-static int titleSize;
-
-#define Fgets(s) {if (feof(fp) || fgets(s, STRING_SIZE, fp) == NULL) break;  s[strlen(s)-1] = 0; }
-
-#define Fputs(s) {fputs(s, fp); fputc('\n', fp);}
-
-static void SaveBuf(void);
-
-static void InitBuf(void)
-{
-  FILE * fp;
-  char *fname;
-  char buf[256];
-  int copyTag = 0;
-
-  deletedprog.title[0] = 0;
-  
-  item = (XmString *)malloc(sizeof(*item) * ITEMS);
-  if (item == NULL)
-  {
-    perror("UI allocate proglist item(XmString)");
-    exit(1);
-  }
-  prog = (struct ProgramList *) malloc(sizeof(*prog) * ITEMS);
-  if (prog == NULL)
-  {
-    perror("UI allocate prog");
-    exit(1);
-  }
-  fp = NULL;
-  if (proglistName[0] != 0) { /* file name given in command line */
-    get_full_path(proglistName, buf, 256);
-    fname = proglistName;
-    fp = fopen(buf, "r");
-    if (fp == NULL) {
-      fprintf(stderr,"PROG.C error opening %s:", proglistName);
-      perror("");
-    }
-  }
-  if (fp == NULL) {
-    get_full_path(PROGRAM_FILE, buf, 256);
-    fname = PROGRAM_FILE;
-    fp = fopen(buf, "r");
-  }
-  if (fp == NULL) {
-    {
-      
-    InitBuf_exit1:
-      
-      get_full_path(PROGRAM_FILE, buf, 256);
-      if (access(buf, 0) != 0) { /* PROGRAM_FILE does not exist, create it */
-	if (strchr(fname, '/') != NULL) { /* create the default directory */
-	  char *ptr = strrchr(buf, '/');
-	  *ptr = 0;
-	  mkdir(buf, 0755);
-	  *ptr = '/';
-	}
-	fname = PROGRAM_FILE;
-	fp = fopen(buf, "w+");
-      }
-      else {  /* Exist, create a temp file in /tmp */
-	char *ptr = tempnam("/tmp/", "vcr");
-	fname = tmpnam(NULL);
-	if (ptr != NULL) {
-	  strncpy(fname, ptr, L_tmpnam);
-	  free(ptr);
-	}
-	strcpy(buf, fname);
-	fp = tmpfile();
-      }
-      if (fp != NULL) {
-	if (strncmp(fname, "/tmp/", 5) != 0) {
-	  fprintf(stderr,
-		  "Warning: created file %s with default movie list.\n",
-		  fname);
-	}
-	else fprintf(stderr, "Warning: using default movie list.\n");
-	fprintf(fp, "%s\n", BANNER);
-	fprintf(fp, "\
-lemond: (va) Blazers Game 1 (128)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.128.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.au\n\
-lemond: (va) Blazers Game 1 (256)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.256.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.au\n\
-lemond: (va) Blazers Game 1 (320)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.320.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/c1.0.300.au\n\
-lemond: (va) Blazers Game 2 (128)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.128.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.au\n\
-lemond: (va) Blazers Game 2 (256)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.256.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.au\n\
-lemond: (va) Blazers Game 2 (320)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.320.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/h1.0.300.au\n\
-lemond: (va) Blazers Game 3 (128)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/s1.0.300.128.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/s1.0.300.au\n\
-lemond: (va) Blazers Game 3 (256)\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/s1.0.300.256.mpg\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/s1.0.300.au\n\
-lemond: (vo) Skiing on Mt. Rainer\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/skiRainer.mpeg\n\
-\n\
-\n\
-lemond: (ao) Following the sense (Chinese song)\n\
-\n\
-\n\
-lemond.cse.ogi.edu\n\
-/projects/dsrg/L/multimedia3/sense.au\n\
-");
-	fseek(fp, (long)0, 0);
-	fgets(buf, 100, fp);
-	goto InitBuf_continue;
-	/*
-	fclose(fp);
-	fp = fopen(buf, "r");
-	if (fp != NULL) {
-	  fgets(buf, 100, fp);
-	  goto InitBuf_continue;
-	}
-	else {
-	  fprintf(stderr, "Warning: failed to read newly created %s:", buf);
-	  perror("");
-	}
-	*/
-      }
-      else {
-	fprintf(stderr, "Warning: failed to create %s:", buf);
-	perror("");
-      }
-      items = 0;
-      return;
-    }
-  }
-  if (fgets(buf, 100, fp) == NULL)
-  {
-    fclose(fp);
-    goto InitBuf_exit1;
-  }
-  buf[strlen(buf)-1] = 0;
-  if (strncmp(buf, BANNER, strlen(BANNER)))
-  {
-    fprintf(stderr, "BANNER in %s not expected\n", fname);
-    fprintf(stderr, "    Expected: %s\n", BANNER);
-    fprintf(stderr, "    Actual  : %s\n", buf);
-    fclose(fp);
-    goto InitBuf_exit1;
-  }
-  
- InitBuf_continue:
-  
-  items = 0;
-  for(;;)
-  {
-    /*
-    fprintf(stderr, "Reading next program.\n");
-    */
-    Fgets(prog[items].title);
-    Fgets(prog[items].vh);
-    Fgets(prog[items].vf);
-    Fgets(prog[items].ah);
-    Fgets(prog[items].af);
-    item[items] = (XmString)XmStringCreateLtoR(prog[items].title, XmStringTag);
-    if ((++items) >= ITEMS) break;
-  }
-  /*
-  fprintf(stderr, "Total programs %d\n", items);
-  */
-  fclose(fp);
-  if (copyTag) {
-    SaveBuf();
-  }
-}
-
-static void SaveBuf(void)
-{
-  int i;
-  FILE * fp;
-  char buf[256];
-  get_full_path(PROGRAM_FILE, buf, 256);
-  fp = fopen(buf, "w");
-  if (fp == NULL)
-  {
-    fprintf(stderr, "Fail to open %s for saving programs", buf);
-    perror("");
-    return;
-  }
-  Fputs(BANNER);
-  for (i = 0; i < items; i++)
-  {
-    Fputs(prog[i].title);
-    Fputs(prog[i].vh);
-    Fputs(prog[i].vf);
-    Fputs(prog[i].ah);
-    Fputs(prog[i].af);
-  }
-  fclose(fp);
-}
-
-static void CmdWrite(char * buf, int size)
-{
-  if (size == 0) return;
-  while (write(cmdSocket, (buf), (size)) == -1)
-  {
-    if (errno == EINTR) continue;
-    perror("UI write to cmdSocket");
-    exit(1);
-  }
-}
-
-void StartProgram(char * title, char * vh, char * vf, char * ah, char * af)
-{
-  extern int cmdBusy;
-  char tmp = CmdINIT;
-  int len;
-  if (!cmdBusy) {
-    char *str = title;
-    len = strlen(str);
-    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
-    str = vh;
-    len = strlen(str);
-    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
-    str = vf;
-    len = strlen(str);
-    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
-    str = ah;
-    len = strlen(str);
-    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
-    str = af;
-    len = strlen(str);
-    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
-    XmTextFieldSetString(titlewidget, title);
-    cmdBusy = 1;
-    CmdWrite(&tmp, 1);
-    len = strlen(vh);
-    CmdWrite((char *)&len, 4);
-    CmdWrite(vh, len);
-    len = strlen(vf);
-    CmdWrite((char *)&len, 4);
-    CmdWrite(vf, len);
-    len = strlen(ah);
-    CmdWrite((char *)&len, 4);
-    CmdWrite(ah, len);
-    len = strlen(af);
-    CmdWrite((char *)&len, 4);
-    CmdWrite(af, len);
-  }
-  else {
-    beep();
-  }
-}
-
-static int curListPos(void)
-{
-  int * poses, count;
-  
-  if (XmListGetSelectedPos(wproglist, &poses, &count))
-  {
-    count = poses[0];
-    XtFree((char*)poses);
-    /*
-    fprintf(stderr, "curListPos: current pos = %d\n", count);
-    */
-    return count - 1;
-  }
-  return -1;
-}
-
-
-static void modifyprog(struct ProgramList *p)
-{
-  XmString item;
-  
-  if (items <0 || progid >= items || progid < 0)
-  { beep();  return; }
-  item = (XmString)XmStringCreateLtoR(p->title, XmStringTag);
-  XmListReplaceItemsPos(wproglist, &item, 1, progid+1);
-  XmListSelectPos(wproglist, progid+1, 0);
-  XmStringFree(item);
-  memcpy(&(prog[progid]), p, sizeof(*p));
-  SaveBuf();
-}
-
-static void insertprog(struct ProgramList *p)
-{
-  XmString item;
-  
-  if (items <= 0 || items >= ITEMS) return;
-  memcpy((char*)&(prog[items]), (char *)p, sizeof(*p));
-  item = (XmString)XmStringCreateLtoR(p->title, XmStringTag);
-  XmListAddItemUnselected(wproglist, item, items+1);
-  XmStringFree(item);
-  if (items == 0)
-    XmListSelectPos(wproglist, 0, False);
-  items ++;
-  SaveBuf();
-}
-
-static void verifyCB(Widget w, XtPointer closure, XmTextVerifyCallbackStruct * cd);
-
-static void deleteCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  int i, j;
-
-  return;
-  
-  /*
-  if (items <= 0) { beep(); return; }
-  j = curListPos();
-  if (j == -1) return;
-  memcpy(&deletedprog, &prog[j], sizeof(deletedprog));
-  for (i = j+1; i < items; i++)
-    memcpy(&prog[i-1], &prog[i], sizeof(*prog));
-  XmListDeletePos(wproglist, j+1);
-  items --;
-  SaveBuf();
-  */
-}
-
-static void undoCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  return;
-  /*
-  if (deletedprog.title[0] != 0)
-  {
-    insertprog(&deletedprog);
-    deletedprog.title[0] = 0;
-  }
-  else
-    beep();
-  */
-}
-
-static void setposition(Widget w, int x, int y);
-
-static void insertCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  char buf[1000];
-
-  return;
-
-#if 0
-  if (items >= ITEMS -1)
-  {
-    beep();
-    return;
-  }
-  XtRemoveAllCallbacks(wprogmodify, XmNmodifyVerifyCallback);
-  XtRemoveAllCallbacks(wprogmodify, XmNmotionVerifyCallback);
-  progcmd = 0;
-  sprintf(buf, "    *** append a program ***\n");
-  strcat(buf, LINE1);
-  strcat(buf, "\n");
-  strcat(buf, LINE2);
-  strcat(buf, "\n");
-  strcat(buf, LINE3);
-  strcat(buf, "\n");
-  strcat(buf, LINE4);
-  strcat(buf, "\n");
-  strcat(buf, LINE5);
-  strcat(buf, "\n\n");
-  XmTextSetString(wprogmodify, buf);
-
-  setposition(wprogmodify, titleSize, 1);
-  XtAddCallback (wprogmodify, XmNmodifyVerifyCallback, (XtCallbackProc)verifyCB, NULL);
-  XtAddCallback (wprogmodify, XmNmotionVerifyCallback, (XtCallbackProc)verifyCB, NULL);
-  /*
-  XtManageChild(progmodifyshell);
-  */
-  XtRealizeWidget(progmodifyshell);
-#endif
-}
-
-static void modifyCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  int i;
-  char buf[1000];
-  if (items == 0)
-  {
-    beep();
-    return;
-  }
-  XtRemoveAllCallbacks(wprogmodify, XmNmodifyVerifyCallback);
-  XtRemoveAllCallbacks(wprogmodify, XmNmotionVerifyCallback);
-  progid = i = curListPos();
-  progcmd = 1;
-  sprintf(buf, "    *** modify program: %s ***\n", prog[i].title);
-  strcat(buf, LINE1);
-  strcat(buf, prog[i].title);
-  strcat(buf, "\n");
-  strcat(buf, LINE2);
-  strcat(buf, prog[i].vh);
-  strcat(buf, "\n");
-  strcat(buf, LINE3);
-  strcat(buf, prog[i].vf);
-  strcat(buf, "\n");
-  strcat(buf, LINE4);
-  strcat(buf, prog[i].ah);
-  strcat(buf, "\n");
-  strcat(buf, LINE5);
-  strcat(buf, prog[i].af);
-  strcat(buf, "\n\n");
-  XmTextSetString(wprogmodify, buf);
-
-  setposition(wprogmodify, titleSize, 1);
-  XtAddCallback (wprogmodify, XmNmodifyVerifyCallback, (XtCallbackProc)verifyCB, NULL);
-  XtAddCallback (wprogmodify, XmNmotionVerifyCallback, (XtCallbackProc)verifyCB, NULL);
-  /*
-  XtManageChild(progmodifyshell);
-  */
-  XtRealizeWidget(progmodifyshell);
-}
-
-static void playCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  /*
-  fprintf(stderr, "play");
-  */
-  if (items > 0)
-  {
-    int i = curListPos();
-    if (i >= items || i < 0)
-      return;
-    StartProgram(prog[i].title, prog[i].vh, prog[i].vf, prog[i].ah, prog[i].af);
-  }
-}
-
-static void dismissCB(Widget W, XtPointer closure, XtPointer call_data)
-{
-  
-  XtUnrealizeWidget(progshell);
-  /*
-  XtUnmanageChild(progshell);
-  */
-}
-
-static void setposition(Widget w, int x, int y)
-{
-  Position x1, y1;
-  x1 = charWidth * x + (MarginWidth+4);
-  y1 = charHeight * y + (charHeight+MarginHeight+1);
-  XmTextSetInsertionPosition(w, XmTextXYToPos(w, x1, y1));
-}
-
-static int getposition(Widget w, XmTextVerifyCallbackStruct * cd,
-		       int * x, int *y)
-{
-  Position x1, y1;
-  if (!XmTextPosToXY(w, cd->newInsert, &x1, &y1))
-    return 0;
-  *x = (x1-(MarginWidth+4))/charWidth;
-  *y = (y1-(charHeight+MarginHeight+1))/charHeight;
-  if ((*x)*charWidth != x1-(MarginWidth+4) || (*y)*charHeight != y1-(charHeight+MarginHeight+1))
-  {
-    /*
-    fprintf(stderr, "error: TextCursorConversion failed. \007\n");
-    fprintf(stderr, "x-%d, x1-%d, y-%d, y1-%d\n", *x, (int)x1, *y, (int)y1);
-    */
-    return 1;
-  }
-  return 1;
-  
-}
-
-static void modifydismissCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  
-  XtUnrealizeWidget(progmodifyshell);
-  /*
-  XtUnmanageChild(progmodifyshell);
-  */
-}
-
-static void modifysaveCB(Widget w, XtPointer closure, XtPointer call_data)
-{
-  return;
-
-#if 0
-  if (progcmd == 1 && items <= progid)
-  {
-    beep();
-  }
-  else if (progcmd == 1 || progcmd == 0)
-  {
-    char * buf, * ptr, *ptr1;
-    struct ProgramList p;
-    buf = XmTextGetString(wprogmodify);
-    ptr = buf;
-    fprintf(stderr, "Buf: %s\n", buf);
-    while (*ptr != '\n') ptr ++;
-    ptr ++;
-    
-    ptr1 = ptr + titleSize;
-    while (*ptr != '\n') ptr ++;
-    (*ptr) = 0; ptr ++;
-    strncpy(p.title, ptr1, STRING_SIZE);
-    p.title[STRING_SIZE-1] = 0;
-
-    ptr1 = ptr + titleSize;
-    while (*ptr != '\n') ptr ++;
-    (*ptr) = 0; ptr ++;
-    strncpy(p.vh, ptr1, STRING_SIZE);
-    p.vh[STRING_SIZE-1] = 0;
-    
-    ptr1 = ptr + titleSize;
-    while (*ptr != '\n') ptr ++;
-    (*ptr) = 0; ptr ++;
-    strncpy(p.vf, ptr1, STRING_SIZE);
-    p.vf[STRING_SIZE-1] = 0;
-    
-    ptr1 = ptr + titleSize;
-    while (*ptr != '\n') ptr ++;
-    (*ptr) = 0; ptr ++;
-    strncpy(p.ah, ptr1, STRING_SIZE);
-    p.ah[STRING_SIZE-1] = 0;
-    
-    ptr1 = ptr + titleSize;
-    while (*ptr != '\n') ptr ++;
-    (*ptr) = 0;
-    strncpy(p.af, ptr1, STRING_SIZE);
-    p.af[STRING_SIZE-1] = 0;
-    /*
-    fprintf(stderr, "*|%s||%s||%s||%s||%s||*\n", p.title, p.vh, p.vf, p.ah, p.af);
-    */
-    XtFree((char *)buf);
-    if (progcmd == 1)
-      modifyprog(&p);
-    else
-      insertprog(&p);
-  }
-#endif
-}
-
-static void verifyCB(Widget w, XtPointer closure, XmTextVerifyCallbackStruct * cd)
-{
-  int x = 0, y = 0;
-
-  if (!getposition(w, cd, &x, &y))
-  {
-    fprintf(stderr, "error on conversion to x/y\n");
-    return;
-  }
-/*  
-  fprintf(stderr, "verifyCB: %d (x-%d, y-%d)\n",cd->newInsert, x, y);
-*/
-  if (x < titleSize || x > titleSize+STRING_SIZE || y < 1 || y > 5)
-  {
-    beep();
-    cd->doit = False;
-    return;
-  }
-  else
-    return;
-}
-
-static void CreateModifyWindow(Widget parent)
-{
-  Arg   	args[20];
-  int		n;
-  Widget 	wform, wtext, wdone, wcancel;
-  XmFontList fontlist;
-  XFontStruct * font;
-  XmStringCharSet cset = XmSTRING_DEFAULT_CHARSET;
-  
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR Program List Edit"); n++;
-  XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING);n++;
-  XtSetArg(args[n], XmNkeyboardFocusPolicy, XmPOINTER); n++;
-  XtSetArg(args[n], XmNwidth, 700); n++;
-  XtSetArg(args[n], XmNheight, 160); n++;
-  XtSetArg(args[n], XmNallowShellResize, False); n++;
-  
-  progmodifyshell = XtAppCreateShell("Program List", "virtual_vcr",
-			       topLevelShellWidgetClass, display, args, n);
-  /*
-  progmodifyshell = XmCreateDialogShell(parent, "virtual_vcr", args, n);
-  */
-  n = 0;
-
-  /* Create form widget */
-  n = 0;
-  XtSetArg (args[n], XmNallowShellResize, False); n++;
-  /*
-  XtSetArg (args[n], XmNheight, 300); n++;
-  XtSetArg (args[n], XmNwidth, 800); n++;
-  */
-  wform = XmCreateForm(progmodifyshell, "Programs", args, n);
-  
-  XtManageChild(wform);
-  
-  font = XLoadQueryFont (XtDisplay (progmodifyshell), "8x13");
-  charHeight = 13;
-  charWidth = 8;
-  fontlist = XmStringCreateFontList (font, cset);
-
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 20); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  wdone = XmCreatePushButton (wform, "Save", args, n);
-  XtManageChild(wdone);
-  XtAddCallback (wdone, XmNactivateCallback, (XtCallbackProc)modifysaveCB, NULL);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNrightOffset, 20); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  wcancel = XmCreatePushButton (wform, "Dismiss", args, n);
-  XtManageChild(wcancel);
-  XtAddCallback (wcancel, XmNactivateCallback, (XtCallbackProc)modifydismissCB, NULL);
-
-  titleSize = strlen(LINE1);
-  
-  n=0;
-  XtSetArg (args[n], XmNleftOffset, 5); n++;
-  XtSetArg (args[n], XmNtopOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg(args[n], XmNcolumns, titleSize + STRING_SIZE+1); n++;
-  XtSetArg(args[n], XmNrows, 7); n++;
-/*
-  XtSetArg(args[n], XmNeditable, True); n++;
-*/
-  XtSetArg(args[n], XmNeditable, False); n++;
-
-  XtSetArg(args[n], XmNmarginHeight, MarginHeight); n++;
-  XtSetArg(args[n], XmNmarginWidth, MarginWidth); n++;
-  XtSetArg(args[n], XmNborderWidth, 0); n++;
-  XtSetArg(args[n], XmNeditMode, XmMULTI_LINE_EDIT); n++;
-  /*
-  XtSetArg(args[n], XmNvalue, new_string1); n++;
-  */
-  XtSetArg(args[n], XmNfontList, fontlist); n++;
-  wtext = XmCreateText(wform, "Virtual VCR program list modify text", args, n);
-  
-  XtManageChild(wtext);
-  
-  XmFontListFree (fontlist);
-  wprogmodify = wtext;
-}
-
-Widget CreateProgramWindow(Widget parent, int cmdSock, int * playflag, Widget frametext)
-{
-  Arg   	args[20];
-  int		n;
-  Widget 	wform, frame1, frame2, wlist,
-                wdelete, wundo, winsert, wmodify, wplay, wdismiss;
-  XmFontList fontlist;
-  XFontStruct * font;
-  XmStringCharSet cset = XmSTRING_DEFAULT_CHARSET;
-  
-  cmdSocket = cmdSock;
-  playtag = playflag;
-  titlewidget = frametext;
-
-  InitBuf();
-  
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR Program List"); n++;
-  XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING);n++;
-  XtSetArg(args[n], XmNkeyboardFocusPolicy, XmPOINTER); n++;
-  XtSetArg(args[n], XmNwidth, 396); n++;
-  XtSetArg(args[n], XmNheight, 300); n++;
-  XtSetArg(args[n], XmNminWidth, 396); n++;
-  XtSetArg(args[n], XmNminHeight, 150); n++;
-  
-  progshell = XtAppCreateShell("Program List", "virtual_vcr",
-			       topLevelShellWidgetClass, display, args, n);
-  /*
-  progshell = XmCreateDialogShell(parent, "virtual_vcr", args, n);
-  */
-  font = XLoadQueryFont (XtDisplay (progshell), "courB14");
-  fontlist = XmStringCreateFontList (font, cset);
-  
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Program List"); n++;
-  wform  = XmCreateForm(progshell, "Programs", args, n);
-  
-  XtManageChild(wform);
-  
-  n = 0;
-  wdelete = XmCreatePushButton (wform, "Delete", args, n);
-  XtManageChild(wdelete);
-  XtAddCallback (wdelete, XmNactivateCallback, (XtCallbackProc)deleteCB, NULL);
-  wundo   = XmCreatePushButton (wform, "Undo", args, n);
-  XtManageChild(wundo);
-  XtAddCallback (wundo, XmNactivateCallback, (XtCallbackProc)undoCB, NULL);
-  winsert = XmCreatePushButton (wform, "Insert", args, n);
-  XtManageChild(winsert);
-  XtAddCallback (winsert, XmNactivateCallback, (XtCallbackProc)insertCB, NULL);
-  wmodify = XmCreatePushButton (wform, "Modify", args, n);
-  XtManageChild(wmodify);
-  XtAddCallback (wmodify, XmNactivateCallback, (XtCallbackProc)modifyCB, NULL);
-  wplay   = XmCreatePushButton (wform, "Select", args, n);
-  XtManageChild(wplay);
-  XtAddCallback (wplay, XmNactivateCallback, (XtCallbackProc)playCB, NULL);
-  wdismiss = XmCreatePushButton (wform, "Dismiss", args, n);
-  XtManageChild(wdismiss);
-  XtAddCallback (wdismiss, XmNactivateCallback, (XtCallbackProc)dismissCB, NULL);
-
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 5); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wdelete, args, n);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 70); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wundo, args, n);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 135); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (winsert, args, n);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 200); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wmodify, args, n);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 265); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wplay, args, n);
-  
-  n=0;
-  XtSetArg (args[n], XmNwidth, 60); n++;
-  XtSetArg (args[n], XmNheight, 28); n++;
-  XtSetArg (args[n], XmNleftOffset, 330); n++;
-  XtSetArg (args[n], XmNbottomOffset, 5); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetValues (wdismiss, args, n);
-
-  n = 0;
-  XtSetArg (args[n], XmNtopOffset, 2); n++;
-  XtSetArg (args[n], XmNleftOffset, 2); n++;
-  XtSetArg (args[n], XmNbottomOffset, 38); n++;
-  XtSetArg (args[n], XmNrightOffset, 2); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  XtSetArg(args[n], XmNfontList,  fontlist); n++;
-  XtSetArg(args[n], XmNvisibleItemCount,  NUM_LIST_ITEMS); n++;
-  if (items > 0)
-  {
-    XtSetArg(args[n], XmNitems, item); n++;
-    XtSetArg(args[n], XmNitemCount, items); n++;
-    XtSetArg(args[n], XmNselectedItems,  item); n++;
-    XtSetArg(args[n], XmNselectedItemCount,  1); n++;
-  }
-  wlist = XmCreateScrolledList(wform, "ProgramList", args, n);
-  XtManageChild(wlist);
-  XmFontListFree(fontlist);
-  wproglist = wlist;
-  for (n = 0; n < items; n++)
-    XmStringFree(item[n]);
-  free(item);
-  
-  n=0;
-  XtSetArg (args[n], XmNtopOffset, 2); n++;
-  XtSetArg (args[n], XmNleftOffset, 2); n++;
-  XtSetArg (args[n], XmNbottomOffset, 38); n++;
-  XtSetArg (args[n], XmNrightOffset, 2); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  frame2 = XmCreateFrame (wform, "frame", args, n);
-  XtManageChild(frame2);
-
-  n=0;
-  XtSetArg (args[n], XmNtopOffset, 0); n++;
-  XtSetArg (args[n], XmNleftOffset, 0); n++;
-  XtSetArg (args[n], XmNbottomOffset, 0); n++;
-  XtSetArg (args[n], XmNrightOffset, 0); n++;
-  XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-  XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-  frame1 = XmCreateFrame (wform, "frame", args, n);
-  XtManageChild(frame1);
-  
-  CreateModifyWindow(parent);
-
-  return progshell;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h
deleted file mode 100644
index 762a66d184d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $Id$ */
-
-
-#ifdef __STDC__
-# define	P(s) s
-#else
-# define P(s) ()
-#endif
-
-
-/* util.c */
-void correct_underflow P((void ));
-int next_bits P((int num , unsigned int mask ));
-char *get_ext_data P((void ));
-int next_start_code P((void ));
-char *get_extra_bit_info P((void ));
-
-/* video.c */
-void init_stats P((void ));
-void PrintAllStats P((void ));
-double ReadSysClock P((void ));
-void PrintTimeInfo P((void ));
-VidStream *NewVidStream P((void ));
-void DestroyVidStream P((VidStream *astream ));
-PictImage *NewPictImage P((unsigned int width , unsigned int height ));
-void DestroyPictImage P((PictImage *apictimage ));
-int mpegVidRsrc P((char *p ));
-void ToggleBFlag P((void ));
-void TogglePFlag P((void ));
-
-/* parseblock.c */
-void ParseReconBlock P((int n ));
-void ParseAwayBlock P((int n ));
-
-/* motionvector.c */
-void ComputeForwVector P((int *recon_right_for_ptr , int *recon_down_for_ptr ));
-void ComputeBackVector P((int *recon_right_back_ptr , int *recon_down_back_ptr ));
-
-/* decoders.c */
-void init_tables P((void ));
-void decodeDCTDCSizeLum P((unsigned int *value ));
-void decodeDCTDCSizeChrom P((unsigned int *value ));
-void decodeDCTCoeffFirst P((unsigned int *run , int *level ));
-void decodeDCTCoeffNext P((unsigned int *run , int *level ));
-
-/* main.c */
-int get_more_data P((unsigned int *buf_start , int max_length , int *length_ptr , unsigned int **buf_ptr ));
-int main P((int argc , char **argv ));
-void usage P((char *s ));
-
-/* gdith.c */
-void InitColor P((void ));
-int HandleXError P((Display *dpy , XErrorEvent *event ));
-void InstallXErrorHandler P((void ));
-void DeInstallXErrorHandler P((void ));
-void ResizeDisplay P((int w , int h ));
-void InitDisplay P((char *name ));
-void InitGrayDisplay P((char *name ));
-void InitMonoDisplay P((char *name ));
-void InitColorDisplay P((char *name ));
-void ExecuteDisplay P((VidStream *vid_stream ));
-
-/* fs2.c */
-void InitFS2Dither P((void ));
-void FS2DitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *disp , int rows , int cols ));
-
-/* fs2fast.c */
-void InitFS2FastDither P((void ));
-void FS2FastDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* fs4.c */
-void InitFS4Dither P((void ));
-void FS4DitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *disp , int rows , int cols ));
-
-/* hybrid.c */
-void InitHybridDither P((void ));
-void HybridDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* hybriderr.c */
-void InitHybridErrorDither P((void ));
-void HybridErrorDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* 2x2.c */
-void Init2x2Dither P((void ));
-void RandInit P((int h , int w ));
-void PostInit2x2Dither P((void ));
-void Twox2DitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* gray.c */
-void GrayDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* mono.c */
-void MonoDitherImage(register unsigned char *lum, unsigned char *cr,
-		     unsigned char *cb, unsigned char *out,
-		     int h, int w);
-void MonoThresholdImage(unsigned char *lum, unsigned char *cr,
-			unsigned char *cb, unsigned char *out,
-			int h, int w);
-
-/* jrevdct.c */
-void init_pre_idct P((void ));
-void j_rev_dct_sparse P((DCTBLOCK data , int pos ));
-void j_rev_dct P((DCTBLOCK data ));
-void j_rev_dct_sparse P((DCTBLOCK data , int pos ));
-void j_rev_dct P((DCTBLOCK data ));
-
-/* 24bit.c */
-void InitColorDither P((void ));
-void ColorDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int rows , int cols ));
-
-/* util32.c */
-Visual *FindFullColorVisual P((Display *dpy , int *depth ));
-Window CreateFullColorWindow P((Display *dpy , int x , int y , int w , int h ));
-
-/* ordered.c */
-void InitOrderedDither P((void ));
-void OrderedDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* ordered2.c */
-void InitOrdered2Dither P((void ));
-void Ordered2DitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-
-/* mb_ordered.c */
-void InitMBOrderedDither P((void ));
-void MBOrderedDitherImage P((unsigned char *lum , unsigned char *cr , unsigned char *cb , unsigned char *out , int h , int w ));
-void MBOrderedDitherDisplayCopy P((VidStream *vid_stream , int mb_addr , int motion_forw , int r_right_forw , int r_down_forw , int motion_back , int r_right_back , int r_down_back , unsigned char *past , unsigned char *future ));
-
-#undef P
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp
deleted file mode 100644
index 66ae9219437..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp
+++ /dev/null
@@ -1,989 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with this file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-/* This software is modified on January 15, 1995 by:
- *
- *         Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <X11/IntrinsicP.h>
-#include <Xm/DialogS.h>
-#include "mpeg_mib/mibload.h"
-#include "interface/fb.xbm"
-#include "interface/play.xbm"
-#include "interface/step.xbm"
-#include "interface/stop.xbm"
-#include "interface/loop.xbm"
-#include "interface/ff.xbm"
-#include "interface/MainWindow.mib"
-#include "interface/Info.mib"
-#include "video.h"
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-
-int			cmdBusy = 0;
-
-extern char infomessage[];
-
-/*****************************************************************************/
-
-/* Private Variables and Methods */
-
-static int playtag = 0;
-static int cmdSocket = -1;
-
-/* Intrinsics Application Context */
-static  XtAppContext		App;
-static  Window			monitorwindow = (int)NULL;
-static  mib_Widget		*mainload, *infoload;
-static  Widget			shell = (int)NULL, infoshell = (int)NULL,
-                                parashell = (int)NULL, progshell = (int)NULL,
-                                fileshell = (int)NULL;
-static  Widget			frametext= (int)NULL;
-static  Widget			volumescale = (int)NULL, balancescale = (int)NULL,
-                                speedscale = (int)NULL, positionscale = (int)NULL;
-static  int			frameshown = 0;
-
-#define MINX 500
-#define MINY 360
-
-static  Window displaywin       = (int)NULL;
-static  int privcolormap	= 0;
-
-static void exit_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void info_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void para_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void prog_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void file_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-
-static void loopchange_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void normal_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void fb_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void stop_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void ff_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void step_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void play_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-
-static void volume_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void balance_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void speed_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-static void position_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-
-static void cmdSocket_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-
-static void monitor_expose(Widget, XtPointer, XmDrawingAreaCallbackStruct *);
-
-static void infoclose_callback(Widget, XtPointer, XmAnyCallbackStruct *);
-
-static void CmdWrite(char * buf, int size)
-{
-  while (write(cmdSocket, (buf), (size)) == -1)
-  {
-    if (errno == EINTR) continue;
-    perror("UI write to cmdSocket");
-    exit(1);
-  }
-}
-
-/*****************************************************************************
-
-  UICreate: Create/load in a motif interface.
-
- *****************************************************************************/
-
-static void UICreate()
-{
-
-  Widget		toplevel;
-
-  Widget 		mainwindow,
-			temp;
-
-  Pixel			fg, bg;
-  Pixmap		button_pix;
-
-  XmFontList fontlist;
-  XFontStruct * font;
-
-  Arg			args[20];
-  int			n, depth;
-
-  static String		fallbacks[] = {
-   "*Foreground:  gray20",
-  "*BorderWidth: 0",
-  "*Background:  gray70",
-  "*XmToggleButton.selectColor:         yellow",
-  "*XmToggleButton.indicatorSize:       16",
-  "*XmToggleButtonGadget.selectColor:   yellow",
-  "*XmToggleButtonGadget.indicatorSize: 16",
-  "*fontList: -adobe-helvetica-medium-r-normal--14-*-*-*-p-*-iso8859-1",
-  "*XmText*fontList: -adobe-courier-medium-r-normal--12-*-*-*-m-70-iso8859-1",
-  NULL
-  };
-
-/*****************************************************************************/
-
-  n = 0;
-
-  toplevel = XtAppInitialize(&App, "virtual_vcr", NULL, 0, &argc_share,
-				argv_share, fallbacks, args, n);
-
-  display = XtDisplay(toplevel);
-
-/******************************************************************************/
-
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR"); n++;
-  XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING);n++;
-  XtSetArg(args[n], XmNkeyboardFocusPolicy, XmPOINTER); n++;
-  XtSetArg(args[n], XmNwidth, MINX); n++;
-  XtSetArg(args[n], XmNminWidth, MINX); n++;
-  XtSetArg(args[n], XmNheight, MINY); n++;
-  XtSetArg(args[n], XmNminHeight, MINY); n++;
-
-  shell = XtAppCreateShell("Virtual VCR", "virtual_vcr",
-				topLevelShellWidgetClass, display, args, n);
-
-/*****************************************************************************/
-
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR"); n++;
-
-  mainwindow = XmCreateForm(shell, "MainForm", args, n);
-  XtManageChild(mainwindow);
-  {
-   XmStringCharSet cset = XmSTRING_DEFAULT_CHARSET;
-   XmString titleString;
-
-   font = XLoadQueryFont (XtDisplay (shell), "courB14");
-   fontlist = XmStringCreateFontList (font, cset);
-
-
-   titleString = XmStringCreateLtoR ("Balance", cset);
-   n = 0;
-   XtSetArg (args[n], XmNfontList, fontlist);	n++; 
-   XtSetArg (args[n], XmNshowValue, True);	n++;
-   XtSetArg (args[n], XmNtitleString, titleString); n++;
-   XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-   XtSetArg (args[n], XmNmaximum, 100); n++;
-   XtSetArg (args[n], XmNvalue, 50); n++;
-   XtSetArg (args[n], XmNprocessingDirection, XmMAX_ON_RIGHT); n++;
-   XtSetArg (args[n], XmNscaleHeight, 17);n++;
-   XtSetArg (args[n], XmNscaleWidth, 100);n++;
-   XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNbottomOffset, 4);n++;
-   XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNleftOffset, 8);n++;
-   balancescale = XmCreateScale(mainwindow, "scale", args, n); 
-   XmStringFree (titleString);
-   XtManageChild (balancescale);
-   XtAddCallback (balancescale, XmNvalueChangedCallback, (XtCallbackProc)balance_callback, NULL);
-   XtAddCallback (balancescale, XmNdragCallback,         (XtCallbackProc)balance_callback, NULL);
-
-
-   titleString = XmStringCreateLtoR ("Volume", cset);
-   n = 0;
-   XtSetArg (args[n], XmNfontList, fontlist);	n++; 
-   XtSetArg (args[n], XmNshowValue, True);	n++;
-   XtSetArg (args[n], XmNtitleString, titleString); n++;
-   XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-   XtSetArg (args[n], XmNmaximum, 100); n++;
-   XtSetArg (args[n], XmNvalue, DEFAULT_volume); n++;
-   XtSetArg (args[n], XmNprocessingDirection, XmMAX_ON_RIGHT); n++;
-   XtSetArg (args[n], XmNscaleHeight, 17);n++;
-   XtSetArg (args[n], XmNscaleWidth, 100);n++;
-   XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNbottomOffset, 4);n++;
-   XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNleftOffset, 128);n++;
-   volumescale = XmCreateScale(mainwindow, "scale", args, n); 
-   XmStringFree (titleString);
-   XtManageChild (volumescale);
-   XtAddCallback (volumescale, XmNvalueChangedCallback, (XtCallbackProc)volume_callback, NULL);
-   XtAddCallback (volumescale, XmNdragCallback,         (XtCallbackProc)volume_callback, NULL);
-
-
-   titleString = XmStringCreateLtoR ("Play Speed", cset);
-   n = 0;
-   XtSetArg (args[n], XmNfontList, fontlist);	n++; 
-   XtSetArg (args[n], XmNshowValue, True);	n++;
-   XtSetArg (args[n], XmNtitleString, titleString); n++;
-   XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-   XtSetArg (args[n], XmNmaximum, 100); n++;
-   XtSetArg (args[n], XmNvalue, 50); n++;
-   XtSetArg (args[n], XmNprocessingDirection, XmMAX_ON_RIGHT); n++;
-   XtSetArg (args[n], XmNscaleHeight, 17);n++;
-   XtSetArg (args[n], XmNscaleWidth, 100);n++;
-   XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNbottomOffset, 4);n++;
-   XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNleftOffset, 248);n++;
-   speedscale = XmCreateScale(mainwindow, "scale", args, n); 
-   XmStringFree (titleString);
-   XtManageChild (speedscale);
-   XtAddCallback (speedscale, XmNvalueChangedCallback, (XtCallbackProc)speed_callback, NULL);
-   XtAddCallback (speedscale, XmNdragCallback,         (XtCallbackProc)speed_callback, NULL);
-
-
-   titleString = XmStringCreateLtoR ("Position", cset);
-   n = 0;
-   XtSetArg (args[n], XmNfontList, fontlist);	n++; 
-   XtSetArg (args[n], XmNshowValue, True);	n++;
-   XtSetArg (args[n], XmNtitleString, titleString); n++;
-   XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-   XtSetArg (args[n], XmNmaximum, POSITION_RANGE); n++;
-   XtSetArg (args[n], XmNprocessingDirection, XmMAX_ON_RIGHT); n++;
-   XtSetArg (args[n], XmNscaleHeight, 17);n++;
-   XtSetArg (args[n], XmNscaleWidth, 100);n++;
-   XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNbottomOffset, 4);n++;
-   XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-   XtSetArg (args[n], XmNleftOffset, 368);n++;
-   positionscale = XmCreateScale(mainwindow, "scale", args, n); 
-   XmStringFree (titleString);
-   XtManageChild (positionscale);
-   XtAddCallback (positionscale, XmNvalueChangedCallback, (XtCallbackProc)position_callback, NULL);
-   XtAddCallback (positionscale, XmNdragCallback,         (XtCallbackProc)position_callback, NULL);
-
-  }
-
-  mainload = mib_load_interface(mainwindow, MainMib, MI_FROMSTRING);
-  XtSetMappedWhenManaged(shell, False);
-  XtRealizeWidget(shell);
-
-  frametext = mib_find_name(mainload, "TitleText")->me;
-  XtVaSetValues(frametext,
-		XmNfontList, fontlist,
-		XmNcursorPositionVisible, False,
-		XmNeditable, False,
-		NULL);
-
-  temp = mib_find_name(mainload, "Monitor")->me;
-  XtAddCallback(temp, XmNexposeCallback,
-			(XtCallbackProc) monitor_expose, (XtPointer) NULL);
-  XtVaSetValues(temp,   XmNforeground,
-			BlackPixel(display, DefaultScreen(display)),
-			XmNbackground,
-			BlackPixel(display, DefaultScreen(display)),
-                        NULL);
-  monitorwindow = XtWindow(temp);
-
-  temp = mib_find_name(mainload, "Info")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) info_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Para")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) para_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Prog")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) prog_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "File")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) file_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Exit")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) exit_callback,
-			(XtPointer) NULL);
-  
-  temp = mib_find_name(mainload, "Loop")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                (char *)loop_bits, loop_width, loop_height, fg, bg, depth);
-  /*
-  {
-    int i;
-    for (i = 0; i < sizeof(loop_bits); i++)
-      loop_bits[i] = ~loop_bits[i];
-  }
-  */
-  XtVaSetValues(temp,
-		XmNshadowThickness, 2,
-
-                XmNwidth, 45,
-		XmNheight, 28,
-		
-		XmNindicatorType, XmN_OF_MANY,
-		
-		XmNindicatorOn, False,
-		
-		XmNfillOnSelect, True,
-		XmNlabelType, XmPIXMAP,
-		XmNhighlightThickness, 0,
-		XmNrubberPositioning, False,
-                XmNlabelPixmap, button_pix,
-		XmNselectPixmap, button_pix,
-/*
-  XmNselectPixmap, (XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                               (char *)loop_bits, loop_width, loop_height, fg, bg, depth)),
-*/
-		NULL);
-  XtAddCallback(temp, XmNvalueChangedCallback, (XtCallbackProc) loopchange_callback,
-			(XtPointer) NULL);
-/*
-   XtAddCallback(temp, XmNarmCallback, (XtCallbackProc) looparm_callback,
-			(XtPointer) NULL);
-  XtAddCallback(temp, XmNdisarmCallback, (XtCallbackProc) loopdisarm_callback,
-			(XtPointer) NULL);
-*/
-  temp = mib_find_name(mainload, "Normal")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) normal_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Rewind")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                (char *)fb_bits, fb_width, fb_height, fg, bg, depth);
-  XtVaSetValues(temp, XmNlabelType, XmPIXMAP,
-                        XmNlabelPixmap, button_pix, NULL);
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) fb_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Stop")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                (char *)stop_bits, stop_width, stop_height, fg, bg, depth);
-  XtVaSetValues(temp, XmNlabelType, XmPIXMAP,
-                        XmNlabelPixmap, button_pix, NULL);
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) stop_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "FF")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                (char *)ff_bits, ff_width, ff_height, fg, bg, depth);
-  XtVaSetValues(temp, XmNlabelType, XmPIXMAP,
-                        XmNlabelPixmap, button_pix, NULL);
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) ff_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Step")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                 (char *)step_bits, step_width, step_height, fg, bg, depth);
-  XtVaSetValues(temp, XmNlabelType, XmPIXMAP,
-                        XmNlabelPixmap, button_pix, NULL);
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) step_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(mainload, "Play")->me;
-  XtVaGetValues(temp, XmNforeground, &fg,
-                        XmNbackground, &bg, XmNdepth, &depth, NULL);
-  button_pix = XCreatePixmapFromBitmapData(display, DefaultRootWindow(display),
-                (char *)play_bits, play_width, play_height, fg, bg, depth);
-  XtVaSetValues(temp, XmNlabelType, XmPIXMAP,
-                        XmNlabelPixmap, button_pix, NULL);
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) play_callback,
-			(XtPointer) NULL);
-
-/*****************************************************************************/
-
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR Infomation"); n++;
-  XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING);n++;
-  XtSetArg(args[n], XmNkeyboardFocusPolicy, XmPOINTER); n++;
-  XtSetArg(args[n], XmNwidth, MINX); n++;
-  XtSetArg(args[n], XmNheight, MINY); n++;
-  /*
-  infoshell = XtAppCreateShell("Info", "virtual_vcr",
-			       topLevelShellWidgetClass, display, args, n);
-  */
-  temp = XmCreateDialogShell(shell, "virtual_vcr", args, n);
-  n = 0;
-  XtSetArg(args[n], XmNtitle, "Virtual VCR Infomation"); n++;
-
-  infoshell = XmCreateForm(temp, "virtual_vcr", args, n);
-  infoload = mib_load_interface(infoshell, InfoMib,
-                                MI_FROMSTRING);
-
-  temp = mib_find_name(infoload, "Dismiss")->me;
-  XtAddCallback(temp, XmNactivateCallback, (XtCallbackProc) infoclose_callback,
-			(XtPointer) NULL);
-
-  temp = mib_find_name(infoload, "TextBig")->me;
-  XtVaSetValues(temp, XmNcursorPositionVisible, False,
-			   XmNeditable, False, NULL);
-  XmTextSetString(temp, infomessage);
-
-  XmFontListFree (fontlist);
-
-  parashell = CreateParameterWindow(shell);
-
-  progshell = CreateProgramWindow(shell, cmdSocket, &playtag, frametext);
-  
-  fileshell = CreateFileWindow(shell, cmdSocket, &playtag, frametext);
-
-}
-
-/*****************************************************************************/
-
-Window MonitorWindow()
-{
-  return monitorwindow;
-}
-
-/*****************************************************************************/
-
-void UISetColormap()
-{
-  privcolormap = 1;
-}
-
-/*****************************************************************************/
-
-void UISetwin(Window win)
-{
-  displaywin = win;
-}
-
-/*****************************************************************************/
-
-void UISetFrame()
-{
-  char framestr[100];
-    
-  sprintf(framestr, "%d of %d", shared->currentDisplay, shared->totalFrames);
-  XmTextFieldSetString(frametext, framestr);
-}
-
-/*****************************************************************************/
-
-void UIMinsize(int x, int y)
-{
-  int minx;
-  int miny;
-  int winx;
-  int winy;
-  
-  winx = x;
-  winy = y;
-
-  x += 30;
-  y += 180;
-
-  if (x < 450) x = MINX;
-  if (y < 350) y = MINY;
-  
-  minx = x; miny = y;
-
-  if (privcolormap)
-  {
-    XtVaSetValues(shell, XmNcolormap, cmap, NULL);
-  }
-  if (shell)
-  {
-    XtResizeWidget(shell, (Dimension)minx, (Dimension)miny, (Dimension)0);
-    XtVaSetValues(shell,
-		  XmNminWidth, MINX,
-		  XmNminHeight, MINY,
-                  XmNmaxWidth, minx,
-		  XmNmaxHeight, miny,
-		  NULL);
-
-    XtMapWidget(shell); /* Map the shell now to avoid disappearing buttons! */
-    if (displaywin)
-    {
-      x = winx; y = winy;
-      winx = minx - 30; winy = miny - 180;
-      XMoveWindow(display, displaywin, (winx - x)/2, (winy - y)/2+12);
-    }
-  }
-}
-
-/*****************************************************************************
-
-  From here on we have private methods:
-
- *****************************************************************************/
-
-static void exit_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  exit(0);
-}
-
-
-static void info_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  /*
-  XtRealizeWidget(infoshell);
-  */
-  XtManageChild(infoshell);
-}
-
-static void infoclose_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  /*
-  XtUnrealizeWidget(infoshell);
-  */
-  XtUnmanageChild(infoshell);
-}
-
-static void para_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  
-  XtRealizeWidget(parashell);
-  /*
-  XtManageChild(parashell);
-  */
-}
-
-static void prog_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  
-  XtRealizeWidget(progshell);
-  /*
-  XtManageChild(progshell);
-  */
-}
-
-static void file_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  /*
-  XtRealizeWidget(fileshell);
-  */
-  XtManageChild (fileshell);
-}
-
-/*****************************************************************************/
-
-static void loopchange_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  static int loop = 0;
-  loop = !loop;
-  if (playtag)
-  {
-    char cmd = loop ? CmdLOOPenable : CmdLOOPdisable;
-    CmdWrite(&cmd, 1);
-  }
-  else
-    beep();
-}
-
-static void normal_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-/* set speed bar, suppose speed_callback should be called automatically */
-{
-  char cmd = CmdSPEED;
-  int value = 50;
-  CmdWrite(&cmd, 1);
-  CmdWrite((char *)&value, 4);
-  XmScaleSetValue(speedscale, 50);
-}
-
-static void fb_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  if (playtag && !cmdBusy)
-  {
-    char cmd = CmdFB;
-    cmdBusy = 1;
-    CmdWrite(&cmd, 1);
-  }
-  else
-    beep();
-}
-
-static void stop_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  if (playtag && !cmdBusy)
-  {
-    char cmd = CmdSTOP;
-    cmdBusy = 1;
-    CmdWrite(&cmd, 1);
-  }
-  else
-    beep();
-}
-
-static void ff_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  if (playtag && !cmdBusy)
-  {
-    char cmd = CmdFF;
-    cmdBusy = 1;
-    CmdWrite(&cmd, 1);
-  }
-  else
-    beep();
-}
-
-
-static void step_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  if (playtag && !cmdBusy)
-  {
-    char cmd = CmdSTEP;
-    cmdBusy = 1;
-    CmdWrite(&cmd, 1);
-  }
-  else {
-    /*
-    beep();
-    */
-  }
-}
-
-static void play_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  if (playtag && !cmdBusy)
-  {
-    char cmd = CmdPLAY;
-    cmdBusy = 1;
-    CmdWrite(&cmd, 1);
-  }
-  else
-    beep();
-}
-
-static void volume_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  char cmd;
-  XmScaleCallbackStruct * call_value = (XmScaleCallbackStruct *) cbs;
-  int value = call_value ->value;
-  
-  switch (call_value->reason)
-  {
-  case XmCR_VALUE_CHANGED:
-  case XmCR_DRAG:
-    cmd = CmdVOLUME;
-    CmdWrite(&cmd, 1);
-    CmdWrite((char *)&value, 4);
-    break;
-  default:
-    fprintf(stderr, "Hit the default, incorrect reason sent for scale!!\n");
-    break;
- }
-}
-
-static void speed_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  char cmd;
-  XmScaleCallbackStruct * call_value = (XmScaleCallbackStruct *) cbs;
-  int value = call_value ->value;
-  
-  switch (call_value->reason)
-  {
-  case XmCR_VALUE_CHANGED:
-  case XmCR_DRAG:
-    cmd = CmdSPEED;
-    CmdWrite(&cmd, 1);
-    CmdWrite((char *)&value, 4);
-    break;
-  default:
-    fprintf(stderr, "Hit the default, incorrect reason sent for scale!!\n");
-    break;
- }
-}
-
-static void balance_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  char cmd;
-  XmScaleCallbackStruct * call_value = (XmScaleCallbackStruct *) cbs;
-  int value = call_value ->value;
-  
-  switch (call_value->reason)
-  {
-  case XmCR_VALUE_CHANGED:
-  case XmCR_DRAG:
-    cmd = CmdBALANCE;
-    CmdWrite(&cmd, 1);
-    CmdWrite((char *)&value, 4);
-    break;
-  default:
-    fprintf(stderr, "Hit the default, incorrect reason sent for scale!!\n");
-    break;
- }
-}
-
-static void position_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  char cmd;
-  XmScaleCallbackStruct * call_value = (XmScaleCallbackStruct *) cbs;
-  int value = call_value ->value;
-  
-  switch (call_value->reason)
-  {
-  case XmCR_VALUE_CHANGED:
-    if (playtag && !cmdBusy)
-    {
-      cmdBusy = 1;
-      cmd = CmdPOSITIONrelease;
-      CmdWrite(&cmd, 1);
-      CmdWrite((char *)&value, 4);
-    }
-    else
-    {
-      XmScaleSetValue(positionscale, shared->locationPosition);
-      /*
-      fprintf(stderr, "UI: shared->cmd = %d\n", shared->cmd);
-      if (shared->cmd != CmdPOSITION)
-        beep();
-      */
-    }
-      
-    break;
-  case XmCR_DRAG:
-    if (playtag && !cmdBusy)
-    {
-      cmdBusy = 1;
-      cmd = CmdPOSITION;
-      CmdWrite(&cmd, 1);
-      CmdWrite((char *)&value, 4);
-    }
-    break;
-  default:
-    fprintf(stderr, "Hit the default, incorrect reason sent for scale!!\n");
-    break;
- }
-}
-
-static void cmdSocket_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
-{
-  char cmd;
-/*
-   fprintf(stderr, "UI in CmdSocket_callback.\n");
-*/
-  while (read(cmdSocket, &cmd, 1) <= 0) 
-  {
-    if (errno == EINTR) return;
-    perror("UI by callback read from CmdSocket");
-    exit(1);
-  }
-  if (cmd == CmdDONE || cmd == CmdFAIL)
-  {
-    cmdBusy --;
-    if (shared->cmd == CmdINIT)
-    {
-      if (cmd == CmdDONE)
-      {
-	char cmd = CmdSPEED;
-	int value = 50;
-	XmScaleSetValue(speedscale, 50);
-	XmScaleSetValue(positionscale, 0);
-	CmdWrite(&cmd, 1);
-	CmdWrite((char *)&value, 4);
-	/*
-	fprintf(stderr, "UI: VCR program successfully initialized.\n");
-	*/
-	playtag = 1;
-      }
-      else
-      {
-	fprintf(stderr, "UI: VCR program initialization failed.\n");
-	playtag = 0;
-      }
-    }
-    else {
-      /*
-      fprintf(stderr, "UI: cmd-%d finished successfully.\n", shared->cmd);
-      */
-    }
-    /*
-    UISetFrame();
-    */
-  }
-  else
-  {
-    static int prepos = 0;
-    int curpos;
-    char * ptr;
-
-    if (cmd == CmdVPdisplayFrame) {
-      read(cmdSocket, (char *)&ptr, sizeof(char *));
-    }
-    VPcommand((int)cmd, ptr);
-
-    if (cmd == CmdVPaudioPosition)
-    {
-      curpos = (shared->nextSample * 100) / shared->totalSamples;
-      if (shared->cmd == CmdPLAY &&
-	  (curpos <= prepos - 1 || curpos >= prepos + 1))
-      {
-	XmScaleSetValue(positionscale, curpos);
-	prepos = curpos;
-      }
-    }
-    else if (cmd == CmdVPdisplayFrame && shared->totalFrames)
-    {
-      curpos = (shared->currentDisplay * 100) / shared->totalFrames;
-      if ((shared->cmd == CmdSTEP || shared->cmd == CmdPLAY ||
-	   shared->cmd == CmdFF || shared->cmd == CmdFB) &&
-	  (curpos <= prepos - 1 || curpos >= prepos + 1))
-      {
-	XmScaleSetValue(positionscale, curpos);
-	prepos = curpos;
-      }
-    }
-  }
-}
-
-static void monitor_expose(Widget w, XtPointer data,
-				XmDrawingAreaCallbackStruct *cbs)
-{
-  VPexpose();
-}
-
-#define BUFSIZE 256
-
-void UIprocess(int cmdSock)
-{
-  char *title, *vh, *vf, *vb, *ah, *af, *ab;
-  int i;
-  cmdSocket = cmdSock;
-  UICreate();
-  
-  VPinitWindow(shell, monitorwindow, cmdSock);
-  XtAppAddInput(App, cmdSock, (XtPointer)XtInputReadMask,
-		(XtInputCallbackProc)cmdSocket_callback, NULL);
-
-  title = vh = vf = vb = ah = af = ab = NULL;
-
-  for (i = 1; i < argc_share; i++) {
-    if (strcmp(argv_share[i], "-v") == 0) {
-      if (argc_share > i + 1) {
-	i ++;
-	vh = argv_share[i];
-      }
-      else break;
-    }
-    else if (strcmp(argv_share[i], "-a") == 0) {
-      if (argc_share > i + 1) {
-	i ++;
-	ah = argv_share[i];
-      }
-      else break;
-    }
-    else if (strcmp(argv_share[i], "-p") == 0) {
-      if (argc_share > i + 1) {
-	i ++;
-	title = argv_share[i];
-      }
-    }
-  }
-
-  if (title != NULL) { /* the init program is supplied by -l */
-    FILE * fp;
-    char buf[PATH_SIZE];
-    char vh[PATH_SIZE];
-    char vf[PATH_SIZE];
-    char ah[PATH_SIZE];
-    char af[PATH_SIZE];
-    
-    get_full_path(title, buf, 256);
-    fp = fopen(buf, "r");
-    if (fp != NULL) {
-      if ((!feof(fp)) && fgets(buf, PATH_SIZE, fp) != NULL) {
-	buf[strlen(buf)-1] = 0;
-      }
-      else buf[0] = 0;
-      if ((!feof(fp)) && fgets(vh, PATH_SIZE, fp) != NULL) {
-	vh[strlen(vh)-1] = 0;
-      }
-      else vh[0] = 0;
-      if ((!feof(fp)) && fgets(vf, PATH_SIZE, fp) != NULL) {
-	vf[strlen(vf)-1] = 0;
-      }
-      else vf[0] = 0;
-      if ((!feof(fp)) && fgets(ah, PATH_SIZE, fp) != NULL) {
-	ah[strlen(ah)-1] = 0;
-      }
-      else ah[0] = 0;
-      if ((!feof(fp)) && fgets(af, PATH_SIZE, fp) != NULL) {
-	af[strlen(af)-1] = 0;
-      }
-      else af[0] = 0;
-
-      fclose(fp);
-      Fprintf(stderr, "Init program: title %s, vh %s, vf %s, ah %s, af %s\n",
-	      buf, vh, vf, ah, af);
-      StartProgram(buf, vh, vf, ah, af);
-    }
-  }
-  else if (vh != NULL || ah != NULL) {/* init program supplied by -v and -a */
-    char *ptr;
-
-    /* form the title */
-    if (vh != NULL) {
-      title = (char *)malloc(strlen(vh) + 1);
-      if (title != NULL) {
-	strcpy(title, vh);
-      }
-    }
-    else {
-      title = (char *)malloc(strlen(ah) + 1);
-      if (title != NULL) {
-	strcpy(title, ah);
-      }
-    }
-    if (title == NULL) {
-      title = "The program from the command line";
-    }
-
-    /* generate vh and vf */
-    if (vh != NULL) {
-      if ((ptr = strchr(vh, ':')) != NULL) {
-	* ptr = 0;
-	vf = ptr + 1;
-      }
-      else {
-	vf = vh;
-	vh = "";
-	vb = (char *)malloc(BUFSIZE);
-	if (vb != NULL) {
-	  get_full_path(vf, vb, BUFSIZE);
-	  vf = vb;
-	}
-      }
-    }
-    else vh = vf = "";
-
-    /* generate ah and af */
-    if (ah != NULL) {
-      if ((ptr = strchr(ah, ':')) != NULL) {
-	* ptr = 0;
-	af = ptr + 1;
-      }
-      else {
-	af = ah;
-	ah = "";
-	ab = (char *)malloc(BUFSIZE);
-	if (ab != NULL) {
-	  get_full_path(af, ab, BUFSIZE);
-	  af = ab;
-	}
-      }
-    }
-    else ah = af = "";
-
-    Fprintf(stderr, "Init program: title %s, vh %s, vf %s, ah %s, af %s\n",
-	    title, vh, vf, ah, af);
-    StartProgram(title, vh, vf, ah, af);
-    free(title);
-    if (ab != NULL) free(ab);
-    if (vb != NULL) free(vb);
-  }
-  
-  XtAppMainLoop(App);
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h
deleted file mode 100644
index b1ce065cc10..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with this file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-void	UICreate();
-void	UIEnd();
-Window	MonitorWindow();
-void    UISetwin(Window);
-void    UIMinsize(int, int);
-void    UISetFrame();
-void    UISetColormap();
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
deleted file mode 100644
index b29b2b3b796..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-#include <stdlib.h>
-#include "video.h"
-#include "proto.h"
-#include "util.h"
-
-#define TRUE 1
-#define FALSE 0
-
-/* Declarations of global variables used. */
-
-unsigned int curBits;
-int bitOffset;
-int bufLength;
-unsigned int *bitBuffer;
-
-/* Bit masks used by bit i/o operations. */
-
-unsigned int nBitMask[] = { 0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 
-			    0xf0000000, 0xf8000000, 0xfc000000, 0xfe000000, 
-			    0xff000000, 0xff800000, 0xffc00000, 0xffe00000, 
-			    0xfff00000, 0xfff80000, 0xfffc0000, 0xfffe0000, 
-			    0xffff0000, 0xffff8000, 0xffffc000, 0xffffe000, 
-			    0xfffff000, 0xfffff800, 0xfffffc00, 0xfffffe00, 
-			    0xffffff00, 0xffffff80, 0xffffffc0, 0xffffffe0, 
-			    0xfffffff0, 0xfffffff8, 0xfffffffc, 0xfffffffe};
-
-unsigned int bitMask[] = {  0xffffffff, 0x7fffffff, 0x3fffffff, 0x1fffffff, 
-			    0x0fffffff, 0x07ffffff, 0x03ffffff, 0x01ffffff,
-			    0x00ffffff, 0x007fffff, 0x003fffff, 0x001fffff,
-			    0x000fffff, 0x0007ffff, 0x0003ffff, 0x0001ffff,
-			    0x0000ffff, 0x00007fff, 0x00003fff, 0x00001fff,
-			    0x00000fff, 0x000007ff, 0x000003ff, 0x000001ff,
-			    0x000000ff, 0x0000007f, 0x0000003f, 0x0000001f,
-			    0x0000000f, 0x00000007, 0x00000003, 0x00000001};
-
-unsigned int rBitMask[] = { 0xffffffff, 0xfffffffe, 0xfffffffc, 0xfffffff8, 
-			    0xfffffff0, 0xffffffe0, 0xffffffc0, 0xffffff80, 
-			    0xffffff00, 0xfffffe00, 0xfffffc00, 0xfffff800, 
-			    0xfffff000, 0xffffe000, 0xffffc000, 0xffff8000, 
-			    0xffff0000, 0xfffe0000, 0xfffc0000, 0xfff80000, 
-			    0xfff00000, 0xffe00000, 0xffc00000, 0xff800000, 
-			    0xff000000, 0xfe000000, 0xfc000000, 0xf8000000, 
-			    0xf0000000, 0xe0000000, 0xc0000000, 0x80000000};
-
-unsigned int bitTest[] = {  0x80000000, 0x40000000, 0x20000000, 0x10000000, 
-			    0x08000000, 0x04000000, 0x02000000, 0x01000000,
-			    0x00800000, 0x00400000, 0x00200000, 0x00100000,
-			    0x00080000, 0x00040000, 0x00020000, 0x00010000,
-			    0x00008000, 0x00004000, 0x00002000, 0x00001000,
-			    0x00000800, 0x00000400, 0x00000200, 0x00000100,
-			    0x00000080, 0x00000040, 0x00000020, 0x00000010,
-			    0x00000008, 0x00000004, 0x00000002, 0x00000001};
-
-
-/*
- *--------------------------------------------------------------
- *
- * correct_underflow --
- *
- *	Called when buffer does not have sufficient data to 
- *      satisfy request for bits.
- *      Calls get_more_data, an application specific routine
- *      required to fill the buffer with more data.
- *
- * Results:
- *      None really.
- *  
- * Side effects:
- *	buf_length and buffer fields in curVidStream structure
- *      may be changed.
- *
- *--------------------------------------------------------------
- */
-
-void 
-correct_underflow() {
-
-  int status;
-
-  status = get_more_data(curVidStream->buf_start,
-			 curVidStream->max_buf_length,
-			 &bufLength, &bitBuffer);
-
-  if (status  < 0) {
-    if (!quietFlag) {
-      fprintf (stderr, "\n");
-      perror("Unexpected read error.");
-    }
-    exit(1);
-  }
-  else if ((status == 0) && (bufLength < 1)) {
-    if (!quietFlag) {
-      fprintf(stderr, "\nImproper or missing sequence end code.\n");
-    }
-#ifdef ANALYSIS
-    PrintAllStats();
-#endif
-    if (!quietFlag) {
-      PrintTimeInfo();
-    }
-/*
-    if (loopFlag) longjmp(env, 1);
-    DestroyVidStream(curVidStream);
-*/
-    exit(0);
-  }
-#ifdef UTIL2
-  curBits = *bitBuffer << bitOffset;
-#else
-  curBits = *bitBuffer;
-#endif
-
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * next_bits --
- *
- *	Compares next num bits to low order position in mask.
- *      Buffer pointer is NOT advanced.
- *
- * Results:
- *	TRUE, FALSE, or error code.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-int next_bits(int num, unsigned int mask)
-{
-  unsigned int stream;
-  int ret_value;
-
-  /* If no current stream, return error. */
-
-  if (curVidStream == NULL)
-    return NO_VID_STREAM;
-
-  /* Get next num bits, no buffer pointer advance. */
-
-  show_bitsn(num, stream);
-
-  /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if
-     differs. 
-  */
-
-  if (mask == stream) {
-    ret_value = TRUE;
-  } else ret_value = FALSE;
-
-  /* Return return value. */
-
-  return ret_value;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * get_ext_data --
- *
- *	Assumes that bit stream is at begining of extension
- *      data. Parses off extension data into dynamically 
- *      allocated space until start code is hit. 
- *
- * Results:
- *	Pointer to dynamically allocated memory containing
- *      extension data.
- *
- * Side effects:
- *	Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-char *get_ext_data ()
-{
-  int size, marker;
-  char *dataPtr;
-  unsigned int data;
-
-  /* Set initial ext data buffer size. */
-
-  size = EXT_BUF_SIZE;
-
-  /* Allocate ext data buffer. */
-
-  dataPtr = (char *) malloc(size);
-
-  /* Initialize marker to keep place in ext data buffer. */
-
-  marker = 0;
-
-  /* While next data is not start code... */
-  while (!next_bits(24, 0x000001)) {
-
-    /* Get next byte of ext data. */
-
-    get_bits8(data);
-
-    /* Put ext data into ext data buffer. Advance marker. */
-
-    dataPtr[marker] = (char) data;
-    marker++;
-
-    /* If end of ext data buffer reached, resize data buffer. */
-
-    if (marker == size) {
-      size += EXT_BUF_SIZE;
-      dataPtr = (char *) realloc(dataPtr, size);
-    }
-  }
-
-  /* Realloc data buffer to free any extra space. */
-
-  dataPtr = (char *) realloc(dataPtr, marker);
-
-  /* Return pointer to ext data buffer. */
-
-  return dataPtr;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * next_start_code --
- *
- *	Parses off bitstream until start code reached. When done
- *      next 4 bytes of bitstream will be start code. Bit offset
- *      reset to 0.
- *
- * Results:
- *	Status code.
- *
- * Side effects:
- *	Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-int next_start_code()
-{
-  int state;
-  int byteoff;
-  unsigned int data;
-
-  /* If no current stream, return error. */
-
-  if (curVidStream == NULL)
-    return NO_VID_STREAM;
-
-  /* If insufficient buffer length, correct underflow. */
-/*
-  if (bufLength < 2) {
-    correct_underflow();
-  }
-  */
-
-  /* If bit offset not zero, reset and advance buffer pointer. */
-
-  byteoff = bitOffset % 8;
-
-  if (byteoff != 0) {
-    flush_bits((8-byteoff));
-  }
-
-  /* Set state = 0. */
-
-  state = 0;
-
-  /* While buffer has data ... */
-
-  while(bufLength > 0) {
-
-    /* If insufficient data exists, correct underflow. */
-/*
-    if (bufLength < 2) {
-      correct_underflow();
-    }
-*/
-    /* If next byte is zero... */
-
-    get_bits8(data);
-
-    if (data == 0) {
-
-      /* If state < 2, advance state. */
-
-      if (state < 2) state++;
-    }
-
-    /* If next byte is one... */
-
-    else if (data == 1) {
-
-      /* If state == 2, advance state (i.e. start code found). */
-
-      if (state == 2) state++;
-
-      /* Otherwise, reset state to zero. */
-
-      else state = 0;
-    }
-
-    /* Otherwise byte is neither 1 or 0, reset state to 0. */
-
-    else {
-      state = 0;
-    }
-
-    /* If state == 3 (i.e. start code found)... */
-
-    if (state == 3) {
-
-      /* Set buffer pointer back and reset length & bit offsets so
-	 next bytes will be beginning of start code. 
-      */
-
-      bitOffset = bitOffset - 24;
-
-#ifdef ANALYSIS
-      bitCount -= 24;
-#endif
-
-      if (bitOffset < 0) {
-	bitOffset = 32 + bitOffset;
-	bufLength++;
-	bitBuffer--;
-#ifdef UTIL2
-	curBits = *bitBuffer << bitOffset;
-#else
-	curBits = *bitBuffer;
-#endif
-      }
-      else {
-#ifdef UTIL2
-	curBits = *bitBuffer << bitOffset;
-#else
-	curBits = *bitBuffer;
-#endif
-      }
-
-      /* Return success. */
-
-      return OK;
-    }
-  }
-
-  /* Return underflow error. */
-
-  return UNDERFLOW;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * get_extra_bit_info --
- *
- *	Parses off extra bit info stream into dynamically 
- *      allocated memory. Extra bit info is indicated by
- *      a flag bit set to 1, followed by 8 bits of data.
- *      This continues until the flag bit is zero. Assumes
- *      that bit stream set to first flag bit in extra
- *      bit info stream.
- *
- * Results:
- *	Pointer to dynamically allocated memory with extra
- *      bit info in it. Flag bits are NOT included.
- *
- * Side effects:
- *	Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-char *get_extra_bit_info ()
-{
-  int size, marker;
-  char *dataPtr;
-  unsigned int data;
-
-  /* Get first flag bit. */
-  get_bits1(data);
-
-  /* If flag is false, return NULL pointer (i.e. no extra bit info). */
-
-  if (!data) return NULL;
-
-  /* Initialize size of extra bit info buffer and allocate. */
-
-  size = EXT_BUF_SIZE;
-  dataPtr = (char *) malloc(size);
-
-  /* Reset marker to hold place in buffer. */
-
-  marker = 0;
-
-  /* While flag bit is true. */
-
-  while (data) {
-
-    /* Get next 8 bits of data. */
-    get_bits8(data);
-
-    /* Place in extra bit info buffer. */
-
-    dataPtr[marker] = (char) data;
-    marker++;
-
-    /* If buffer is full, reallocate. */
-
-    if (marker == size) {
-      size += EXT_BUF_SIZE;
-      dataPtr = (char *) realloc(dataPtr, size);
-    }
-
-    /* Get next flag bit. */
-    get_bits1(data);
-  }
-
-  /* Reallocate buffer to free extra space. */
-
-  dataPtr = (char *) realloc(dataPtr, marker);
-
-  /* Return pointer to extra bit info buffer. */
-
-  return dataPtr;
-}
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
deleted file mode 100644
index 272e0add31d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
-/* Status codes for bit stream i/o operations. */
-
-#if !defined (AV_UTIL_H)
-#define AV_UTIL_H
-
-#define NO_VID_STREAM -1
-#define UNDERFLOW -2
-#define OK 1
-/* Size increment of extension data buffers. */
-
-#define EXT_BUF_SIZE 1024
-
-/* External declarations for bitstream i/o operations. */
-extern unsigned int bitMask[];
-extern unsigned int nBitMask[];
-extern unsigned int rBitMask[];
-extern unsigned int bitTest[];
-
-/* External declarations of bitstream global variables. */
-extern unsigned int curBits;
-extern int bitOffset;
-extern int bufLength;
-extern unsigned int *bitBuffer;
-
-/* Macro for updating bit counter if analysis tool is on. */
-#ifdef ANALYSIS
-#define UPDATE_COUNT(numbits) bitCount += numbits
-#else
-#define UPDATE_COUNT(numbits)
-#endif
-
-#ifdef NO_SANITY_CHECKS
-#define get_bits1(result)                                                 \
-{                                                                         \
-  UPDATE_COUNT(1);                                                        \
-  result = ((curBits & 0x80000000) != 0);                              \
-  curBits <<= 1;                                                          \
-  bitOffset++;                                                            \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset = 0;                                                        \
-    bitBuffer++;                                                          \
-    curBits = *bitBuffer;                                                 \
-    bufLength--;                                                          \
-  }                                                                       \
-}
-
-#define get_bits2(result)                                                 \
-{                                                                         \
-  UPDATE_COUNT(2);                                                        \
-  bitOffset += 2;                                                         \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset -= 32;                                                      \
-    bitBuffer++;                                                          \
-    bufLength--;                                                          \
-    if (bitOffset) {                                                      \
-      curBits |= (*bitBuffer >> (2 - bitOffset));                         \
-    }                                                                     \
-    result = ((curBits & 0xc0000000) >> 30);                           \
-    curBits = *bitBuffer << bitOffset;                                    \
-  }                                                                       \
-                                                                          \
-  result = ((curBits & 0xc0000000) >> 30);                             \
-  curBits <<= 2;                                                          \
-}
-
-#define get_bitsX(num, mask, shift,  result)                              \
-{                                                                         \
-  UPDATE_COUNT(num);                                                      \
-  bitOffset += num;                                                       \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset -= 32;                                                      \
-    bitBuffer++;                                                          \
-    bufLength--;                                                          \
-    if (bitOffset) {                                                      \
-      curBits |= (*bitBuffer >> (num - bitOffset));                       \
-    }                                                                     \
-    result = ((curBits & mask) >> shift);                              \
-    curBits = *bitBuffer << bitOffset;                                    \
-  }                                                                       \
-  else {                                                                  \
-    result = ((curBits & mask) >> shift);                              \
-    curBits <<= num;                                                      \
-  }                                                                       \
-}
-#else
-
-#define get_bits1(result)                                                 \
-{                                                                         \
-  /* Check for underflow. */                                              \
-  /*                                                                      \
-  if (bufLength < 2) {                                                    \
-    correct_underflow();                                                  \
-  } */                                                                    \
-  UPDATE_COUNT(1);                                                        \
-  result = ((curBits & 0x80000000) != 0);                              \
-  curBits <<= 1;                                                          \
-  bitOffset++;                                                            \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset = 0;                                                        \
-    bitBuffer++;                                                          \
-    curBits = *bitBuffer;                                                 \
-    bufLength--;                                                          \
-  }                                                                       \
-}
-
-#define get_bits2(result)                                                 \
-{                                                                         \
-  /* Check for underflow. */                                              \
-  /*                                                                      \
-  if (bufLength < 2) {                                                    \
-    correct_underflow();                                                  \
-  } */                                                                    \
-  UPDATE_COUNT(2);                                                        \
-  bitOffset += 2;                                                         \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset -= 32;                                                      \
-    bitBuffer++;                                                          \
-    bufLength--;                                                          \
-    if (bitOffset) {                                                      \
-      curBits |= (*bitBuffer >> (2 - bitOffset));                         \
-    }                                                                     \
-    result = ((curBits & 0xc0000000) >> 30);                           \
-    curBits = *bitBuffer << bitOffset;                                    \
-  }                                                                       \
-                                                                          \
-  result = ((curBits & 0xc0000000) >> 30);                             \
-  curBits <<= 2;                                                          \
-}
-
-#define get_bitsX(num, mask, shift,  result)                              \
-{                                                                         \
-  /* Check for underflow. */                                              \
-  /*                                                                      \
-  if (bufLength < 2) {                                                    \
-    correct_underflow();                                                  \
-  } */                                                                    \
-  UPDATE_COUNT(num);                                                      \
-  bitOffset += num;                                                       \
-                                                                          \
-  if (bitOffset & 0x20) {                                                 \
-    bitOffset -= 32;                                                      \
-    bitBuffer++;                                                          \
-    bufLength--;                                                          \
-    if (bitOffset) {                                                      \
-      curBits |= (*bitBuffer >> (num - bitOffset));                       \
-    }                                                                     \
-    result = ((curBits & mask) >> shift);                              \
-    curBits = *bitBuffer << bitOffset;                                    \
-  }                                                                       \
-  else {                                                                  \
-   result = ((curBits & mask) >> shift);                               \
-   curBits <<= num;                                                       \
-  }                                                                       \
-}
-#endif
-
-#define get_bits3(result) get_bitsX(3,   0xe0000000, 29, result)
-#define get_bits4(result) get_bitsX(4,   0xf0000000, 28, result)
-#define get_bits5(result) get_bitsX(5,   0xf8000000, 27, result)
-#define get_bits6(result) get_bitsX(6,   0xfc000000, 26, result)
-#define get_bits7(result) get_bitsX(7,   0xfe000000, 25, result)
-#define get_bits8(result) get_bitsX(8,   0xff000000, 24, result)
-#define get_bits9(result) get_bitsX(9,   0xff800000, 23, result)
-#define get_bits10(result) get_bitsX(10, 0xffc00000, 22, result)
-#define get_bits11(result) get_bitsX(11, 0xffe00000, 21, result)
-#define get_bits12(result) get_bitsX(12, 0xfff00000, 20, result)
-#define get_bits14(result) get_bitsX(14, 0xfffc0000, 18, result)
-#define get_bits16(result) get_bitsX(16, 0xffff0000, 16, result)
-#define get_bits18(result) get_bitsX(18, 0xffffc000, 14, result)
-#define get_bits32(result) get_bitsX(32, 0xffffffff,  0, result)
-
-#define get_bitsn(num, result) get_bitsX((num), nBitMask[num], (32-(num)), result)
-
-#ifdef NO_SANITY_CHECKS
-#define show_bits32(result)                              		\
-{                                                                       \
-  if (bitOffset) {							\
-    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));		\
-  }                                                                     \
-  else {                                                                \
-    result = curBits;							\
-  }                                                                     \
-}
-
-#define show_bitsX(num, mask, shift,  result)                           \
-{                                                                       \
-  int bO;                                                               \
-  bO = bitOffset + num;                                                 \
-  if (bO > 32) {                                                        \
-    bO -= 32;                                                           \
-    result = ((curBits & mask) >> shift) |                              \
-                (*(bitBuffer+1) >> (shift + (num - bO)));               \
-  }                                                                     \
-  else {                                                                \
-    result = ((curBits & mask) >> shift);                               \
-  }                                                                     \
-}
-
-#else
-#define show_bits32(result)                               		\
-{                                                                       \
-  /* Check for underflow. */                                            \
-  /* if (bufLength < 2) {                                               \
-    correct_underflow();                                                \
-  }  */                                                                 \
-  if (bitOffset) {							\
-    result = curBits | (*(bitBuffer+1) >> (32 - bitOffset));		\
-  }                                                                     \
-  else {                                                                \
-    result = curBits;							\
-  }                                                                     \
-}
-
-#define show_bitsX(num, mask, shift, result)                            \
-{                                                                       \
-  int bO;                                                               \
-                                                                        \
-  /* Check for underflow. */                                            \
-  /* if (bufLength < 2) {                                               \
-    correct_underflow();                                                \
-  }  */                                                                 \
-  bO = bitOffset + num;                                                 \
-  if (bO > 32) {                                                        \
-    bO -= 32;                                                           \
-    result = ((curBits & mask) >> shift) |                              \
-                (*(bitBuffer+1) >> (shift + (num - bO)));               \
-  }                                                                     \
-  else {                                                                \
-    result = ((curBits & mask) >> shift);                               \
-  }                                                                     \
-}
-#endif
-
-#define show_bits1(result)  show_bitsX(1,  0x80000000, 31, result)
-#define show_bits2(result)  show_bitsX(2,  0xc0000000, 30, result)
-#define show_bits3(result)  show_bitsX(3,  0xe0000000, 29, result)
-#define show_bits4(result)  show_bitsX(4,  0xf0000000, 28, result)
-#define show_bits5(result)  show_bitsX(5,  0xf8000000, 27, result)
-#define show_bits6(result)  show_bitsX(6,  0xfc000000, 26, result)
-#define show_bits7(result)  show_bitsX(7,  0xfe000000, 25, result)
-#define show_bits8(result)  show_bitsX(8,  0xff000000, 24, result)
-#define show_bits9(result)  show_bitsX(9,  0xff800000, 23, result)
-#define show_bits10(result) show_bitsX(10, 0xffc00000, 22, result)
-#define show_bits11(result) show_bitsX(11, 0xffe00000, 21, result)
-#define show_bits12(result) show_bitsX(12, 0xfff00000, 20, result)
-#define show_bits13(result) show_bitsX(13, 0xfff80000, 19, result)
-#define show_bits14(result) show_bitsX(14, 0xfffc0000, 18, result)
-#define show_bits15(result) show_bitsX(15, 0xfffe0000, 17, result)
-#define show_bits16(result) show_bitsX(16, 0xffff0000, 16, result)
-#define show_bits17(result) show_bitsX(17, 0xffff8000, 15, result)
-#define show_bits18(result) show_bitsX(18, 0xffffc000, 14, result)
-#define show_bits19(result) show_bitsX(19, 0xffffe000, 13, result)
-#define show_bits20(result) show_bitsX(20, 0xfffff000, 12, result)
-#define show_bits21(result) show_bitsX(21, 0xfffff800, 11, result)
-#define show_bits22(result) show_bitsX(22, 0xfffffc00, 10, result)
-#define show_bits23(result) show_bitsX(23, 0xfffffe00,  9, result)
-#define show_bits24(result) show_bitsX(24, 0xffffff00,  8, result)
-#define show_bits25(result) show_bitsX(25, 0xffffff80,  7, result)
-#define show_bits26(result) show_bitsX(26, 0xffffffc0,  6, result)
-#define show_bits27(result) show_bitsX(27, 0xffffffe0,  5, result)
-#define show_bits28(result) show_bitsX(28, 0xfffffff0,  4, result)
-#define show_bits29(result) show_bitsX(29, 0xfffffff8,  3, result)
-#define show_bits30(result) show_bitsX(30, 0xfffffffc,  2, result)
-#define show_bits31(result) show_bitsX(31, 0xfffffffe,  1, result)
-
-#define show_bitsn(num,result) show_bitsX((num), (0xffffffff << (32-(num))), (32-(num)), result)
-
-#ifdef NO_SANITY_CHECKS
-#define flush_bits32                                                  \
-{                                                                     \
-  UPDATE_COUNT(32);                                                   \
-                                                                      \
-  bitBuffer++;                                                        \
-  bufLength--;                                                        \
-  curBits = *bitBuffer  << bitOffset;                                 \
-}
-
-#define flush_bits(num)                                               \
-{                                                                     \
-  bitOffset += num;                                                   \
-                                                                      \
-  UPDATE_COUNT(num);                                                  \
-                                                                      \
-  if (bitOffset & 0x20) {                                             \
-    bitOffset -= 32;                                                  \
-    bitBuffer++;                                                      \
-    bufLength--;                                                      \
-    curBits = *bitBuffer  << bitOffset;                               \
-  }                                                                   \
-  else {                                                              \
-    curBits <<= num;                                                  \
-  }                                                                   \
-}
-#else
-#define flush_bits32                                                  \
-{                                                                     \
-  if (curVidStream == NULL) {                                         \
-    /* Deal with no vid stream here. */                               \
-  }                                                                   \
-  /*                                                                  \
-  if (bufLength < 2) {                                                \
-    correct_underflow();                                              \
-  }                                                                   \
-  */                                                                  \
-  UPDATE_COUNT(32);                                                   \
-                                                                      \
-  bitBuffer++;                                                        \
-  bufLength--;                                                        \
-  curBits = *bitBuffer  << bitOffset;                                 \
-}
-
-#define flush_bits(num)                                               \
-{                                                                     \
-  if (curVidStream == NULL) {                                         \
-    /* Deal with no vid stream here. */                               \
-  }                                                                   \
-  /*                                                                  \
-  if (bufLength < 2) {                                                \
-    correct_underflow();                                              \
-  }                                                                   \
-  */                                                                  \
-  UPDATE_COUNT(num);                                                  \
-                                                                      \
-  bitOffset += num;                                                   \
-                                                                      \
-  if (bitOffset & 0x20) {                                             \
-    bufLength--;                                                      \
-    bitOffset -= 32;                                                  \
-    bitBuffer++;                                                      \
-    curBits = *bitBuffer << bitOffset;                                \
-  }                                                                   \
-  else {                                                              \
-    curBits <<= num;                                                  \
-  }                                                                   \
-}
-#endif
-
-#define UTIL2
-
-#endif /* if !defined (AV_UTIL_H) */
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp
deleted file mode 100644
index d94f63f8069..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util32.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $Id$ */
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include "video.h"
-#include "proto.h"
-#include "ui.h"                         /* include user interface */
-
-/*
- * Return a pointer to a full color bit visual on the dpy
- */
-Visual *
-FindFullColorVisual (Display *dpy, int *depth)
-{
-  XVisualInfo vinfo;
-  XVisualInfo *vinfo_ret;
-  int numitems, maxdepth;
-
-#ifdef __cplusplus
-  vinfo.c_class = TrueColor;
-#else
-  vinfo.class = TrueColor;
-#endif
-  vinfo_ret = XGetVisualInfo(dpy, VisualClassMask, &vinfo, &numitems);
-  
-  if (numitems == 0) return NULL;
-
-  maxdepth = 0;
-  while(numitems > 0) {
-    if (vinfo_ret[numitems-1].depth > maxdepth) {
-      maxdepth = vinfo_ret[numitems-1 ].depth;
-    }
-    numitems--;
-  }
-  XFree(vinfo_ret);
-
-  if (maxdepth < 24) return NULL;
-
-  if (XMatchVisualInfo(dpy, DefaultScreen(dpy), maxdepth, 
-		       TrueColor, &vinfo)) {
-    *depth = maxdepth;
-    return vinfo.visual;
-  }
-  
-  return NULL;
-}
-
-Window
-CreateFullColorWindow (Display *dpy, int x, int y, int w, int h)
-{
-    int depth;
-    Visual *visual;
-    XSetWindowAttributes xswa;
-    Window temp;
-    unsigned int mask;
-    unsigned int valclass;
-    int screen;
-
-    screen = XDefaultScreen(dpy);
-    valclass = InputOutput;	/* Could be InputOnly */
-    visual = FindFullColorVisual (dpy, &depth);
-    if (visual == NULL) {
-	return 0;
-    }
-    mask = CWBackPixel | CWColormap | CWBorderPixel;
-    xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen),
-		    visual, AllocNone);
-    xswa.background_pixel = BlackPixel(dpy, DefaultScreen(dpy));
-    xswa.border_pixel = WhitePixel(dpy, DefaultScreen(dpy));
-
-    temp = XCreateWindow(dpy, MonitorWindow(), x, y, w, h,
-	1, depth, valclass, visual, mask, &xswa);
-
-    UISetwin(temp);
-
-    return temp;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
deleted file mode 100644
index 3969df96cca..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
+++ /dev/null
@@ -1,1797 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-#if defined(__svr4__) || defined(IRIX)
-#include <stropts.h>
-#include <sys/conf.h>
-#endif
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "mpeg_shared/filters.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"
-
-/* magic number -- deviation is considered
-   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
-   */
-#define MAX_CLOCK_DRIFT 50
-
-#define SHCODE 0x000001b3
-
-#define max(a,b) ((a)>(b) ? (a) : (b))
-
-static struct block
-{
-  unsigned shcode;
-  struct block * next;
-  int full;
-} ** head, ** tail;
-
-struct header
-{
-  struct block *h, *t;
-};
-
-static char * buf;
-static int bufsize;
-static int sid, countid;
-static exit_tag = 0;
-static int conn_tag;
-static int savedSocket;
-
-void VBinitBuf(int size)
-/* size in byte */
-{
-  bufsize = size - sizeof(struct header);
-  buf = creat_shared_mem(size);
-  head = &((struct header *)buf)->h;
-  tail = &((struct header *)buf)->t;
-  buf += sizeof(struct header);
-  sid = creat_semaphore();
-  countid = creat_semaphore();
-  enter_cs(countid);
-  *head = *tail = (struct block *)buf;
-  (*tail)->full = 0;
-  (*tail)->next = NULL;
-  (*tail)->shcode = SHCODE;
-}
-
-char * VBgetBuf(int size)  /* block version */
-{
-  return 0;
-}
-
-int VBcheckBuf(int size) /* non-block check, return True/False*/
-{
-  return 0;
-}
-
-void VBputMsg(char * msgPtr)
-{
-}
-
-char * VBgetMsg()          /* block version */
-{
-  char *ptr;
-
-#ifdef STAT
-  if (shared->collectStat && *head == *tail)
-    shared->stat.VBemptyTimes ++;
-#endif
-  
-  enter_cs(countid);
-  enter_cs(sid);
-  while (*tail != *head && (*tail)->full == 0)
-    *tail = (*tail)->next;
-  leave_cs(sid);
-  if (*head == *tail)
-  {
-    fprintf(stderr, "VB: getMsg run out of msg unexpectedly.\n");
-    exit(1);
-  }
-  ptr = ((char*)*tail)+sizeof(**tail)+sizeof(VideoMessage);
-  /*
-  fprintf(stderr,"VBgetMsg: buf:%x, msg:%x\n", (int)buf, (int)ptr);
-  */
-  return ptr;
-}
-
-int  VBcheckMsg()        /* non-block check, return Number of Msgs in buffer */
-{
-  return get_semval(countid);
-}
-
-int VBbufEmpty(void)
-{
-  /*
-  Fprintf(stderr, "VB countid %d\n", get_semval(countid));
-  */
-  return get_semval(countid) <= 0;
-}
-
-void VBreclaimMsg(char * msgPtr)
-{
-  enter_cs(sid);
-  *tail = (*tail)->next;
-  leave_cs(sid);
-}
-
-void VBdeleteBuf(void)
-{
-  remove_shared_mem(buf - sizeof(struct header));
-}
-void VBdeleteSem(void)
-{
-  remove_semaphore(sid);
-  remove_semaphore(countid);
-}
-  
-/* SIGUSR1 from CTR is for killing this process, without affecting any other ones. */
-
-static void usr1_handler(int sig)
-{
-  exit_tag = 1;
-}
-
-static void exit_on_kill(void)
-{
-  extern void set_exit_routine_tag(int tag);
-  set_exit_routine_tag(0);
-  ComCloseConn(savedSocket);
-  VBdeleteBuf();
-  exit(0);
-}
-
-static void usr2_handler(int sig)
-{
-  /*
-  fprintf(stderr, "VB void usr2_handler (supposed for stat).\n");
-  */
-}
-
-static int send_feedback(int sock, int addupf, int addf, int advance)
-{
-  int res;
-  VideoFeedBackPara para;
-  para.cmdsn = htonl(shared->cmdsn);
-  para.addUsecPerFrame = htonl(addupf);
-  para.addFrames = htonl(addf);
-  para.needHeader = htonl(shared->needHeader);
-  shared->needHeader = 0;
-  para.frameRateLimit1000 =
-      htonl((long)(shared->frameRateLimit * 1000.0));
-  para.sendPatternGops = htonl(shared->sendPatternGops);
-  memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
-  /*
-  fprintf(stderr, "VB to send a fb packet...");
-  */
-  if (conn_tag != 0) { /* packet stream */
-    while ((res = write(sock, (char *)&para, sizeof(para))) == -1) {
-      if (errno == EINTR)
-	continue;
-      if (errno == ENOBUFS) {
-	perror("VB Warning, fb packet discarded for");
-	return -1;
-      }
-      perror("VB error, fb packet sending failed");
-      exit(1);
-    }
-  }
-  else {
-    res = write(sock, (char *)&para, sizeof(para));
-    if (res == -1) {
-      perror("VB error, fb packet sending failed");
-      exit(1);
-    }
-  }
-  if (res < sizeof(para)) {
-    fprintf(stderr, "VB send_feedback() warn: res %dB < sizeof(para) %dB\n",
-	    res, sizeof(para));
-  }
-#ifdef STAT
-  {
-    int i;
-    if ((i = shared->stat.fbPacketNumber) < MAX_FB_PACKETS) {
-      shared->stat.fbPackets[i].frameId = shared->nextFrame;
-      shared->stat.fbPackets[i].addUsecPerFrame = addupf;
-      shared->stat.fbPackets[i].addFrames = addf;
-      shared->stat.fbPackets[i].frames = shared->sendPatternGops *
-                                         shared->patternSize;
-      shared->stat.fbPackets[i].framesDropped = shared->framesDropped;
-      shared->stat.fbPackets[i].frameRateLimit = shared->frameRateLimit;
-      shared->stat.fbPackets[i].advance = advance;
-    }
-    shared->stat.fbPacketNumber ++;
-  }
-#endif
-  Fprintf(stderr, "VB sent fb pkt frame%d gop%d addf%d addupf%d frate%5.2f.\n",
-	  shared->nextFrame, shared->nextGroup,
-	  addf, addupf, shared->frameRateLimit);
-  return 0;
-}
-
-static void skip_message(int fd, VideoMessage * msg)
-{
-  char buf[1024];
-  if (conn_tag >= 0) {
-    int size = msg->msgSize;
-    while (size > 0) {
-      int res;
-      int bytes = size > 1024 ? 1024 : size;
-      read_bytes(fd, buf, bytes);
-      /*
-      if ((res = read(fd, buf, bytes)) < bytes) {
-	fprintf(stderr, "VB Error skip_message: try read %dB, got %dB\n",
-		bytes, res);
-      }
-      */
-      size -= bytes;
-    }
-  }
-  else { /* discard mode packet stream packet has been read */
-  }
-  if (exit_tag) exit_on_kill();
-}
-
-void VBprocess(int initSocket, int normalSocket)
-{
-  VideoMessage * msg, msghd;
-  VideoPacket * packet;
-  int len, bsize, msgsn = -1;
-  int psize, poffset;
-  char * ptr, *ptr1;
-  char *tmp_buf = NULL;
-  int dataSocket = initSocket;
-
-  /* INIT frame is received from CTR through initSocket */
-
-#ifdef STAT
-  int to_count = 1;
-  int gap_msgsn = -1;
-#endif
-  
-  /* following variables are for feedback */
-  int pcmdsn, pcmd;  /* to store the cmdsn and cmd of previous frame,
-			to detect new commands */
-  int pfid, pgop;    /* frame-id of gopid of previous frame */
-  int cmdsn = -1;    /* cmdsn of previous command */
-  int state = 0;     /* state of the control law/regulator */
-  int startpos;      /* gopid or frameid when the regulator is in 'start' state 1 */
-  int delay;	     /* #frames to delay after 'start' */
-  int qosRecomputes = 0; /* indicate if qos has been recomputed recently */
-  int action_delay;	/* microseconds to delay after feedback action */
-  int action_time;     /* the time when feedback action is taken, used to enforce
-			  action_delay */
-  int upf, cupf;	/* upf -- currentUPF as carried in all frames,
-			   cupf -- real current UPF, being adjusted by FB */
-  double fv;		/* current buffer fill level in term of #frames */	
-  double init_fv;	/* init_fv and init_pos record the fv value and position
-			   (frameid or gopid) when fv is very close to med */
-  double init_pos;
-  int high, low, med;	/* median, high and low water marks, in term of #frames */
-  int period;		/* interms of #frames, (high-med, period) defined the max
-			   buffer fill drift which can be assumed as caused by
-			   clock drift */
-  Filter * f = NULL;	/* buffer fill level filter */
-
-  int advance, min_advance; /* in microseconds, advance holds the
-			       current target buffer-fill-level as
-			       determined by jitter level
-			       estimate. min_advance sets a absolute
-			       minimun level, no matter how low jitter
-			       level is.
-			       'advance' does not change when
-			       play-speed changes, but med/high/low
-			       will be updated upon speed change */
-  double fav;		/* #frames, jitter level output by the filter */
-  Filter * fa = NULL;	/* jitter filter */
-  int reach_limit = 0;	/* indicate that the target 'advance' has reached client VB
-			   buffer limit, and can not further increase, even if
-			   jitter increases */
-  int not_action = 1;	/* indicates entering state=3 is not caused by
-			   feedback action. If not_action = 1 entering state=3
-			   is caused either by 'start' or speed change, and
-			   the jitter filter needs to be reset */
-
-  exit_tag = 0;
-  conn_tag = shared->videoMaxPktSize;
-
-  savedSocket = normalSocket;
-#if 0  
-#ifdef __svr4__
-  
-  /* On solaris 2.x for i86pc, a datagram socket may not discard the
-     remaining of a message if recv() fails to read the whole
-     thing. Following systems are tried but seems doesn't work. So for
-     this platform, This causes problem with skip_message() defined
-     above, which tries to discard whole packets by reading only a few
-     bytes. An alternative here is to allocate a big enough buffer,
-     read and discard the whole packet, this is less efficient because
-     of more data copy.
-
-     But if we call read(2) instead of recv(), then it works.
-     */
-  if (!conn_tag) {
-    len = ioctl(dataSocket, I_SRDOPT, RMSGD);  /* discard unread part of the message */
-    if (len) perror("error message");
-  }
-#endif
-#endif
-  
-  setsignal(SIGUSR1, usr1_handler);
-  setsignal(SIGUSR2, usr2_handler);
-
-  if (conn_tag < 0) {  /* buffer big enough for discard mode packet stream */
-    tmp_buf = (char *)malloc(-conn_tag);
-    if (tmp_buf == NULL) {
-      fprintf(stderr, "AB failed to allocate %d bytes");
-      perror("of tmp_buf");
-      exit(1);
-    }
-  }
-
-  for (;;)
-  {
-    //    fprintf(stderr, "VB wait for a new packet.\n");
-    if (conn_tag >= 0) {
-      len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
-    }
-    else {  /* discard mode packet stream, read all bytes */
-      len = read(dataSocket, tmp_buf, -conn_tag);
-      memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
-    }
-    if (exit_tag) exit_on_kill();
-    if (len == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-	perror("VB sleep for 10ms");
-	usleep(10000);
-	if (exit_tag) exit_on_kill();
-	continue;
-      }
-      perror("VB read() data");
-      exit(1);
-    }
-    if (len == 0) {  /* EOF, connection closed by peer */
-      fprintf(stderr, "Error: VB found dataSocket broken\n");
-      for (;;) {
-	usleep(1000000);
-	if (exit_tag) exit_on_kill();
-      }
-    }
-    if (len < sizeof(msghd)) {
-      fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
-	      len, sizeof(msghd));
-      continue;
-    }
-#ifdef NeedByteOrderConversion
-    msghd.packetsn = ntohl(msghd.packetsn);
-    msghd.packetSize = ntohl(msghd.packetSize);
-    msghd.msgsn = ntohl(msghd.msgsn);
-    msghd.msgOffset = ntohl(msghd.msgOffset);
-    msghd.msgSize = ntohl(msghd.msgSize);
-#endif
-    /*
-    fprintf(stderr, "VB PEEK1 a msg sn-%d, size-%d, pkt-%d, pktsize-%d\n",
-	    msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
-    */
-
-    
-  start_new_packet:
-
-    
-#ifdef STAT
-    if (to_count) {
-      int gap = msghd.msgsn - gap_msgsn;
-      gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-      shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-      if (gap >0) gap_msgsn = msghd.msgsn;
-    }
-    to_count = 1;
-#endif
-    if (msghd.msgsn <= msgsn)  /* outdated msg */
-    {
-      /*
-      fprintf(stderr, "VB discard outdated msgsn %d, pktsn %d when expecting first\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    else if (msghd.msgOffset != 0)  /* not first msg of a packet */
-    {
-      /*
-      Fprintf(stderr, "VB discard non-first msg msgsn %d, pktsn %d\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    else
-      msgsn = msghd.msgsn;
-    
-    /* allocate packet for the incoming msg */
-    bsize =  msghd.packetSize + sizeof(**head)*2 + sizeof(msghd);
-    bsize = ((bsize+3)>>2)<<2;
-    enter_cs(sid);
-    if (*head >= *tail)
-    {
-      if (bufsize - (int)((char*)*head - buf) >= bsize )
-        msg =(VideoMessage *)((char*)*head + sizeof(**head));
-      else if ((int)((char*)*tail - buf) >= bsize)
-      {
-	(*head)->next = (struct block *)buf;
-	(*head)->full = 0;
-	*head = (struct block *)buf;
-	msg = (VideoMessage *)(buf + sizeof(**head));
-	*head = (struct block *)buf;
-	(*head)->shcode = SHCODE;
-      }
-      else /* not enough buffer, discard current message */
-      {
-	leave_cs(sid);
-#ifdef STAT
-	if (shared->collectStat)
-  	  shared->stat.VBdroppedFrames ++;
-#endif
-	/*
-	Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-		msghd.msgsn, msghd.packetsn);
-	*/
-        skip_message(dataSocket, &msghd);
-	continue;
-      }
-    }
-    else /* *head < *tail */
-    if ((char*)*tail - (char*)*head >= bsize)
-      msg = (VideoMessage *)((char*)*head + sizeof(**head));
-    else   /* not enough buffer, abandon current message */
-    {
-      leave_cs(sid);
-#ifdef STAT
-      if (shared->collectStat)
-	shared->stat.VBdroppedFrames ++;
-#endif
-      /*
-      Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    leave_cs(sid);
-    /*
-    fprintf(stderr, "VB allocated a buffer for comming packet.\n");
-    */
-    psize = msghd.packetSize;
-    poffset = 0;
-    packet = (VideoPacket *)((char*)msg + sizeof(msghd));
-    *(((int*)packet)+(msghd.packetSize>>2)) = 0;
-                             /* clear the last no more than three bytes, for
-				proper detecting the end of packet by VD */
-    ptr = (char*)msg;
-    for (;;)
-    {
-      int bytes;
-      bytes = sizeof(msghd) + msghd.msgSize;
-      if (conn_tag >= 0) {
-	len = bytes;
-	read_bytes(dataSocket, ptr + sizeof(msghd), bytes - sizeof(msghd));
-      }
-      else {
-	len = bytes;
-	memcpy(ptr + sizeof(msghd), tmp_buf + sizeof(msghd), bytes - sizeof(msghd));
-      }
-      if (exit_tag) exit_on_kill();
-      if (len == -1) {
-	perror("VB fails to recv data");
-	exit(1);
-      }
-      if (len < bytes) {
-	fprintf(stderr, "VB warn: recv() len %dB < bytes %dB\n", len, bytes);
-      }
-      /* because message header is already PEEKed to msghd before recv(), so we can
-	 use info in msghd instead of *(VideoMessage*)ptr   */
-      if (len != sizeof(msghd)+msghd.msgSize)
-        /* some of msg contents not successfully received, abandon current packet */
-      {
-	/*
-	fprintf(stderr, "VB got corrupted msg, len=%d, supposed len=%d\n",
-		len, sizeof(msghd)+msghd.msgSize);
-	 */
-        break;
-      }
-      poffset += msghd.msgSize;
-      psize -= msghd.msgSize;
-      ptr += msghd.msgSize;
-      /*
-      fprintf(stderr, "VB packet remain size %d\n", psize);
-      */
-      if (psize == 0)
-      {
-	/* finished receiving the current packet */
-#ifdef NeedByteOrderConversion
-	packet->cmd = ntohl(packet->cmd);
-	packet->cmdsn = ntohl(packet->cmdsn);
-	packet->sh = ntohl(packet->sh);
-	packet->gop = ntohl(packet->gop);
-	packet->frame = ntohl(packet->frame);
-	packet->display = ntohl(packet->display);
-	packet->future = ntohl(packet->future);
-	packet->past = ntohl(packet->past);
-	packet->currentUPF = ntohl(packet->currentUPF);
-	packet->dataBytes = ntohl(packet->dataBytes);
-#endif
-	pcmdsn = packet->cmdsn;
-	pcmd = packet->cmd;
-	pfid = packet->frame;
-	pgop = packet->gop;
-	shared->VBheadFrame = (pcmd == CmdPLAY) ? pfid : pgop;
-	
-	shared->currentUPF = packet->currentUPF;
-	enter_cs(sid);
-	(*head)->full = 1;
-	psize = sizeof(**head) + sizeof(*msg) + msghd.packetSize;
-	psize = ((psize+3)>>2)<<2;
-	ptr = (char*)*head + psize;
-	(*head)->next = (struct block *) ptr;
-	(*head) = (struct block *)ptr;
-	(*head)->shcode = SHCODE;
-	leave_cs(countid);
-	leave_cs(sid);
-
-	/* VB receives all frame except for the INIT one through normalSocket */
-	if (dataSocket != normalSocket) {
-	  /*
-	  Fprintf(stderr, "VB got INIT frame.\n");
-	  */
-	  write(initSocket, (char *)&initSocket, 1);  /* write a garbage byte */
-	  close(initSocket);
-	  dataSocket = normalSocket;
-	}
-	
-	/* following is synchronization feedback algorithm */
-	
-	if (shared->config.syncEffective) {
-	  if (state > 1 && state != 4 && (len = shared->qosRecomputes) != qosRecomputes) {
-	    /* QoS feedback packet is sent if at any time send pattern is
-	       recomputed, and sync feedback is not in active state*/
-	    send_feedback(dataSocket, 0, 0, advance);
-	    qosRecomputes = len;
-	  }
-	  switch (state) {
-	  case 4:  /* active */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
-	      /* jump to state 5 if speed changes */
-	      state = 5;
-	      break;
-	    }
-	    {
-	      int interval = shared->usecPerFrame;
-	      double val = (double)(pcmd == CmdPLAY ?
-			           pfid - shared->nextFrame :
-			           (pcmd == CmdFF ?
-			            pgop - shared->nextGroup :
-			            shared->nextGroup - pgop));
-	      fv = DoFilter(f, val); /* get average #frames in the whole client
-					pipeline, including all stages */
-	      val = val - fv;
-	      fav = DoFilter(fa, val >= 0.0 ? val : -val);
-	      /* get average #frames jitter in the whole client pipeline */
-							      
-	      val = fav * interval * 6;
-	      /* convert deviation in frame into microseconds, 6 is a magic number */
-
-	      /* tries to recompute advance (in microseconds), and med/high/low
-		 in adaptation to current jitter level */
-	      if ((val > advance && !reach_limit) ||
-		  (advance > min_advance && val < advance >> 3)) {
-		advance = (int) max(2 * val, min_advance);
-		med = advance / interval;
-		/*
-		if (pcmd == CmdPLAY) {
-		  if (med < shared->VDframeNumber) {
-		    med = shared->VDframeNumber;
-		  }
-		}
-		else
-		*/
-		if (med < 2 ) { /* but keep minimum buffer fill level */
-		  med = 2;
-		}
-		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-		  reach_limit = 1;
-		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-		  Fprintf(stderr,
-			  "VB VSadvance control: VBbuf limit reached, med %d.\n", med);
-		}
-		else reach_limit = 0;
-		high = med + med / 2;
-		low = med - med / 2;
-		period = med * MAX_CLOCK_DRIFT;
-		Fprintf(stderr,
-		  "VB: VS advance control: fav %5.2f, med %d, advance %d at nextFrame %d\n",
-			fav, med, advance, shared->nextFrame);
-	      }
-	    }
-	    /* record the current time (fid or gopid) if buffer fill level drift
-	       only very little */
-	    if ((int)fv == med) {
-	      init_fv = fv;
-	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
-	      break;
-	    }
-	    /*
-	    fprintf(stderr, "VB fb: fv %lf\n", fv);
-	    */
-	    /* try send action if low/high water mark is passed, or qos recomputed */
-	    /* There is problem here, the deltas of upf are sent, instead of upf
-	       and frame themself. This scheme is not robust in case case feedback
-	       packets are lost, and get resent */
-	    len = shared->qosRecomputes;
-	    if (fv >= high || fv <= low || len != qosRecomputes) {
-	      int addupf, addf;
-	      int pos = pcmd == CmdPLAY ? pfid : pgop;
-	      int dist = (int)(pcmd == CmdFB ? init_pos - pos : pos - init_pos);
-	      if (fv >= high || fv <= low) {
-		if (dist < period) { /* try skip or stall */
-		  addf =  (int)(med - fv);
-		  addupf = 0;
-		}
-		else { /* try adjust VS clock rate */
-		  int added = (int)((double)cupf * (fv - (double)med) / (double) dist);
-		  addf = (int)(med - fv);
-		  addupf = added;
-		  cupf += added;
-		}
-		state = 6;
-	      }
-	      else {  /* fb only recomputed sendpattern, no state change */
-		addupf = 0;
-		addf = 0;
-	      }
-
-	      /* tries to send a feedback packet. */
-	      if (shared->live) {  /* no sync feedback with live video */
-		qosRecomputes = len;
-	      }
-	      else if (send_feedback(dataSocket, addupf, addf, advance) == -1) {
-		/* Keep trying action repeatedly if failed to send the action
-		   packet (by keeping in state 4).
-		   An action packet can also be lost in the network */
-		state = 4;
-	      }
-	      else {
-		qosRecomputes = len;
-	      }
-	      if (state == 6) { /* record the time if an action packet is
-				   successfully send, and indicate that an
-				   feedback action leads to state 6, which after
-				   delay sometime leads to state 3.
-				   The action_delay should have been related
-				   to round-trip time. */
-		action_time = get_usec();
-		action_delay = shared->usecPerFrame * 100;
-		not_action = 0;
-	      }
-	    }
-	    break;
-	  case 6:  /* reset after action */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
-	      state = 5;
-	      break;
-	    }
-	    /* Jump to transition state 3 only after delay for some
-	       time, when feedback action has been taken, and the
-	       effect has been propogated back to the client */
-	    if (get_duration(action_time, get_usec()) >= action_delay) {
-	      state = 3;
-	    }
-	    break;
-	  case 5:  /* reset after speed change, feedback stays in this
-		      state as long as play speed is changing */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    /* Jump to transition state 3, indicating that the transition
-	       is not caused by feedback action */
-	    if (shared->currentUPF == shared->usecPerFrame) {
-	      not_action = 1;
-	      state = 3;
-	    }
-	    break;
-	  case 2:  /* delay after start, this delay is for avoiding feedback
-		      action during server fast start-up. */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY) {
-	      if (pfid - startpos >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    else if (pcmd == CmdFF) {
-	      if (pgop - startpos >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    else {  /* CmdFB */
-	      if (startpos - pgop >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    break;
-	  case 3:  /* transient state, entered after start-up delay,
-		      action-delay, or play-speed change */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    /* Initialize both buffer-fill-level and jitter filters */
-	    if (f == NULL) {
-	      f = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-			    shared->config.filterPara : 100);
-	    }
-	    else {
-	      f = ResetFilter(f, shared->config.filterPara >= 1 ?
-			      shared->config.filterPara : 100);
-	    }
-	    if (fa == NULL) {
-	      fa = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-			    shared->config.filterPara : 100);
-	      DoFilter(fa, 0.0);
-	    }
-	    else if (not_action) { /* reset jitter level filter only
-				      if entering this state is not
-				      cause by feedback action */
-	      fa = ResetFilter(fa, shared->config.filterPara >= 1 ?
-			      shared->config.filterPara : 100);
-	    }
-	    if (f == NULL || fa == NULL) {
-	      perror("VB failed to allocate space for filters");
-	      state = 0;
-	    }
-	    else {
-	      init_fv =
-	        DoFilter(f, (double)(pcmd == CmdPLAY ?
-			    pfid - shared->nextFrame :
-			    (pcmd == CmdFF ?
-			     pgop - shared->nextGroup :
-			     shared->nextGroup - pgop)));
-	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
-	      upf = shared->currentUPF;
-	      cupf = upf;
-	      {
-		int interval = shared->usecPerFrame;
-
-		/* upon speed change, 'advance', in microseconds, will
-                   not change, but med/high/low will be updated. This
-                   may suggest that in the new toolkit version of the
-                   same feedback systems, the buffer-fill level and
-                   jitter is measured directly in microseconds, not in
-                   #frames then converting to microseconds. */
-		med = advance / interval;
-		/*
-		if (pcmd == CmdPLAY) {
-		  if (med < shared->VDframeNumber) {
-		    med = shared->VDframeNumber;
-		    min_advance = advance = med * interval;
-		  }
-		}
-		else
-		*/
-		if (med < 2 ) {
-		  med = 2;
-		  advance = med * interval;
-		  min_advance = max(advance, shared->VStimeAdvance);
-		}
-		else min_advance = shared->VStimeAdvance;
-		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-		  reach_limit = 1;
-		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-		  if (not_action) {
-		    Fprintf(stderr,
-		       "VB start/speed-change: VBbuf limit reached, med %d.\n", med);
-		  }
-		}
-		else reach_limit = 0;
-	      }
-	      high = med + med / 2;
-	      low = med - med / 2;
-	      delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-							feedback when VS is in
-							fast-start period */
-	      period = med * MAX_CLOCK_DRIFT;
-	      if (not_action) {
-		Fprintf(stderr,
-			"VB start/speed-change: med %d, advance %d at nextFrame %d\n",
-			med, advance, shared->nextFrame);
-	      }
-	      state = 4;
-	    }
-	    break;
-	  case 0:  /* idle */
-	    if (pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB) {
-	      cmdsn = pcmdsn;
-	      state = 1;
-	    }
-	    break;
-	  case 1:  /* start */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      break;
-	    }
-	    startpos = pcmd == CmdPLAY ? pfid : pgop;
-	    advance = shared->VStimeAdvance;
-
-	    /*  following from vs.c:
-		timerAdjust = (VStimeAdvance * SPEEDUP_INV_SCALE) / currentUPF;
-	        */
-	    med = advance / shared->usecPerFrame;
-	    /*
-	    if (pcmd != CmdPLAY) med /= shared->patternSize;
-	    */
-	    delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-						      feedback when VS is in
-						      fast-start period */
-	    not_action = 1;
-	    state = 2;
-	    break;
-	  default:
-	    fprintf(stderr, "VB: unknown Feedback state %d reached.\n", state);
-	    state = 0;
-	    break;
-	  }
-	}   /* end if (shared->config.syncEffective) */
-	else {
-	  state = 0;
-	}
-#ifdef STAT
-	if (shared->collectStat && packet->cmd != CmdREF)
-	{
-	  char * val, * val1;
-	  int size;
-	  size = packet->frame;
-	  shared->stat.VBframesReceived[size >>3] |= 1 << (size % 8);
-	  val = (char *)*head;
-	  val1 = (char *)*tail;
-	  if (val >= val1)  /* *head >= *tail */
-	    size = val - val1;
-	  else
-	    size = bufsize - (val1 - val);
-	  shared->stat.VBmaxBytes = max(shared->stat.VBmaxBytes, size);
-	}
-#endif
-	/*
-        fprintf(stderr, "VB: Packet(%x, buf:%x)=cmd-%d, cmdsn-%d sh-%d, gop-%d\n",
-	        (int)packet, (int)buf, packet->cmd, packet->cmdsn, packet->sh, packet->gop);
-        fprintf(stderr, "           frame-%d, display-%d, future-%d, past-%d, bytes-%d\n",
-	        packet->frame, packet->display, packet->future,
-		packet->past, packet->dataBytes);
-	*/
-	break;  /* got the whole packet, break to the out-most loop for next packet */
-      }  /* end if (psize == 0) */
-      else if (psize < 0)
-      {
-	fprintf(stderr, "VB error: received too many msgs for a packet.\n");
-	exit(1);
-      }
-
-      /* try get another message for current packet */
-      for (;;)
-      {
-	if (conn_tag >= 0) {
-	  len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
-	}
-	else {
-	  len = read(dataSocket, tmp_buf, -conn_tag);
-	  memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
-	}
-	if (exit_tag) exit_on_kill();
-	if (len <= 0)
-	{
-	  if (errno == EWOULDBLOCK || errno == EAGAIN) {
-	    perror("VB sleep2 for 10ms");
-	    usleep(10000);
-	    if (exit_tag) exit_on_kill();
-	    continue;
-	  }
-          perror("VB recv data(MSG_PEEK)");
-          exit(1);
-	}
-	if (len < sizeof(msghd)) {
-	  fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
-		  len, sizeof(msghd));
-	  continue;
-	}
-#ifdef NeedByteOrderConversion
-	msghd.packetsn = ntohl(msghd.packetsn);
-	msghd.packetSize = ntohl(msghd.packetSize);
-	msghd.msgsn = ntohl(msghd.msgsn);
-	msghd.msgOffset = ntohl(msghd.msgOffset);
-	msghd.msgSize = ntohl(msghd.msgSize);
-#endif
-	/*
-        fprintf(stderr, "VB PEEK2 a msg: sn-%d, size-%d, pkt-%d, pktsize-%d\n",
-	        msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
-	*/
-#ifdef STAT
-	{
-	  int gap = msghd.msgsn - gap_msgsn;
-	  gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-	  shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-	  if (gap >0) gap_msgsn = msghd.msgsn;
-	}
-#endif
-	if (msghd.msgsn <= msgsn) { /* outdated message, wait for next one */
-	  /*
-	  fprintf(stderr, "VB discard outdated or dup msgsn %d, pktsn %d\n",
-		  msghd.msgsn, msghd.packetsn);
-	  */
-	  skip_message(dataSocket, &msghd);
-	  continue;
-	}
-	break;  /* got a message for current packet */
-      }  /* end for (;;) */
-      
-      if (msghd.msgsn > msgsn + 1 || msghd.msgOffset == 0)
-      {
-        /* message out of order, abandon current packet */
-	/*
-	fprintf(stderr, "VB msg out of order for current packet, discard it.\n");
-	*/
-#ifdef STAT
-	to_count = 0;
-#endif
-        goto start_new_packet;
-      }
-      else {
-        msgsn = msghd.msgsn;
-      }
-    }
-  }
-}
-
-
-void MyVBprocess(int initSocket, int normalSocket)
-{
-  VideoMessage * msg, msghd;
-  VideoPacket * packet;
-  int len, bsize, msgsn = -1;
-  int psize, poffset;
-  char * ptr, *ptr1;
-  char *tmp_buf = NULL;
-  int dataSocket = initSocket;
-
-  /* INIT frame is received from CTR through initSocket */
-
-#ifdef STAT
-  int to_count = 1;
-  int gap_msgsn = -1;
-#endif
-  
-  /* following variables are for feedback */
-  int pcmdsn, pcmd;  /* to store the cmdsn and cmd of previous frame,
-			to detect new commands */
-  int pfid, pgop;    /* frame-id of gopid of previous frame */
-  int cmdsn = -1;    /* cmdsn of previous command */
-  int state = 0;     /* state of the control law/regulator */
-  int startpos;      /* gopid or frameid when the regulator is in 'start' state 1 */
-  int delay;	     /* #frames to delay after 'start' */
-  int qosRecomputes = 0; /* indicate if qos has been recomputed recently */
-  int action_delay;	/* microseconds to delay after feedback action */
-  int action_time;     /* the time when feedback action is taken, used to enforce
-			  action_delay */
-  int upf, cupf;	/* upf -- currentUPF as carried in all frames,
-			   cupf -- real current UPF, being adjusted by FB */
-  double fv;		/* current buffer fill level in term of #frames */	
-  double init_fv;	/* init_fv and init_pos record the fv value and position
-			   (frameid or gopid) when fv is very close to med */
-  double init_pos;
-  int high, low, med;	/* median, high and low water marks, in term of #frames */
-  int period;		/* interms of #frames, (high-med, period) defined the max
-			   buffer fill drift which can be assumed as caused by
-			   clock drift */
-  Filter * f = NULL;	/* buffer fill level filter */
-
-  int advance, min_advance; /* in microseconds, advance holds the
-			       current target buffer-fill-level as
-			       determined by jitter level
-			       estimate. min_advance sets a absolute
-			       minimun level, no matter how low jitter
-			       level is.
-			       'advance' does not change when
-			       play-speed changes, but med/high/low
-			       will be updated upon speed change */
-  double fav;		/* #frames, jitter level output by the filter */
-  Filter * fa = NULL;	/* jitter filter */
-  int reach_limit = 0;	/* indicate that the target 'advance' has reached client VB
-			   buffer limit, and can not further increase, even if
-			   jitter increases */
-  int not_action = 1;	/* indicates entering state=3 is not caused by
-			   feedback action. If not_action = 1 entering state=3
-			   is caused either by 'start' or speed change, and
-			   the jitter filter needs to be reset */
-
-  exit_tag = 0;
-  conn_tag = shared->videoMaxPktSize;
-
-  savedSocket = normalSocket;
-#if 0  
-#ifdef __svr4__
-  
-  /* On solaris 2.x for i86pc, a datagram socket may not discard the
-     remaining of a message if recv() fails to read the whole
-     thing. Following systems are tried but seems doesn't work. So for
-     this platform, This causes problem with skip_message() defined
-     above, which tries to discard whole packets by reading only a few
-     bytes. An alternative here is to allocate a big enough buffer,
-     read and discard the whole packet, this is less efficient because
-     of more data copy.
-
-     But if we call read(2) instead of recv(), then it works.
-     */
-  if (!conn_tag) {
-    len = ioctl(dataSocket, I_SRDOPT, RMSGD);  /* discard unread part of the message */
-    if (len) perror("error message");
-  }
-#endif
-#endif
-  
-  setsignal(SIGUSR1, usr1_handler);
-  setsignal(SIGUSR2, usr2_handler);
-
-  if (conn_tag < 0) {  /* buffer big enough for discard mode packet stream */
-    tmp_buf = (char *)malloc(-conn_tag);
-    if (tmp_buf == NULL) {
-      fprintf(stderr, "AB failed to allocate %d bytes");
-      perror("of tmp_buf");
-      exit(1);
-    }
-  }
-
-  for (;;)
-  {
-    //    fprintf(stderr, "VB wait for a new packet.\n");
-    if (conn_tag >= 0) {
-      len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
-    }
-    else {  /* discard mode packet stream, read all bytes */
-      len = read(dataSocket, tmp_buf, -conn_tag);
-      memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
-    }
-    if (exit_tag) exit_on_kill();
-    if (len == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-	perror("VB sleep for 10ms");
-	usleep(10000);
-	if (exit_tag) exit_on_kill();
-	continue;
-      }
-      perror("VB read() data");
-      exit(1);
-    }
-    if (len == 0) {  /* EOF, connection closed by peer */
-      fprintf(stderr, "Error: VB found dataSocket broken\n");
-      for (;;) {
-	usleep(1000000);
-	if (exit_tag) exit_on_kill();
-      }
-    }
-    if (len < sizeof(msghd)) {
-      fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
-	      len, sizeof(msghd));
-      continue;
-    }
-#ifdef NeedByteOrderConversion
-    msghd.packetsn = ntohl(msghd.packetsn);
-    msghd.packetSize = ntohl(msghd.packetSize);
-    msghd.msgsn = ntohl(msghd.msgsn);
-    msghd.msgOffset = ntohl(msghd.msgOffset);
-    msghd.msgSize = ntohl(msghd.msgSize);
-#endif
-    /*
-    fprintf(stderr, "VB PEEK1 a msg sn-%d, size-%d, pkt-%d, pktsize-%d\n",
-	    msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
-    */
-
-    
-  start_new_packet:
-
-    
-#ifdef STAT
-    if (to_count) {
-      int gap = msghd.msgsn - gap_msgsn;
-      gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-      shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-      if (gap >0) gap_msgsn = msghd.msgsn;
-    }
-    to_count = 1;
-#endif
-    if (msghd.msgsn <= msgsn)  /* outdated msg */
-    {
-      /*
-      fprintf(stderr, "VB discard outdated msgsn %d, pktsn %d when expecting first\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    else if (msghd.msgOffset != 0)  /* not first msg of a packet */
-    {
-      /*
-      Fprintf(stderr, "VB discard non-first msg msgsn %d, pktsn %d\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    else
-      msgsn = msghd.msgsn;
-    
-    /* allocate packet for the incoming msg */
-    bsize =  msghd.packetSize + sizeof(**head)*2 + sizeof(msghd);
-    bsize = ((bsize+3)>>2)<<2;
-    enter_cs(sid);
-    if (*head >= *tail)
-    {
-      if (bufsize - (int)((char*)*head - buf) >= bsize )
-        msg =(VideoMessage *)((char*)*head + sizeof(**head));
-      else if ((int)((char*)*tail - buf) >= bsize)
-      {
-	(*head)->next = (struct block *)buf;
-	(*head)->full = 0;
-	*head = (struct block *)buf;
-	msg = (VideoMessage *)(buf + sizeof(**head));
-	*head = (struct block *)buf;
-	(*head)->shcode = SHCODE;
-      }
-      else /* not enough buffer, discard current message */
-      {
-	leave_cs(sid);
-#ifdef STAT
-	if (shared->collectStat)
-  	  shared->stat.VBdroppedFrames ++;
-#endif
-	/*
-	Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-		msghd.msgsn, msghd.packetsn);
-	*/
-        skip_message(dataSocket, &msghd);
-	continue;
-      }
-    }
-    else /* *head < *tail */
-    if ((char*)*tail - (char*)*head >= bsize)
-      msg = (VideoMessage *)((char*)*head + sizeof(**head));
-    else   /* not enough buffer, abandon current message */
-    {
-      leave_cs(sid);
-#ifdef STAT
-      if (shared->collectStat)
-	shared->stat.VBdroppedFrames ++;
-#endif
-      /*
-      Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-	      msghd.msgsn, msghd.packetsn);
-      */
-      skip_message(dataSocket, &msghd);
-      continue;
-    }
-    leave_cs(sid);
-    /*
-    fprintf(stderr, "VB allocated a buffer for comming packet.\n");
-    */
-    psize = msghd.packetSize;
-    poffset = 0;
-    packet = (VideoPacket *)((char*)msg + sizeof(msghd));
-    *(((int*)packet)+(msghd.packetSize>>2)) = 0;
-                             /* clear the last no more than three bytes, for
-				proper detecting the end of packet by VD */
-    ptr = (char*)msg;
-    for (;;)
-    {
-      int bytes;
-      bytes = sizeof(msghd) + msghd.msgSize;
-      if (conn_tag >= 0) {
-	len = bytes;
-	read_bytes(dataSocket, ptr + sizeof(msghd), bytes - sizeof(msghd));
-      }
-      else {
-	len = bytes;
-	memcpy(ptr + sizeof(msghd), tmp_buf + sizeof(msghd), bytes - sizeof(msghd));
-      }
-      if (exit_tag) exit_on_kill();
-      if (len == -1) {
-	perror("VB fails to recv data");
-	exit(1);
-      }
-      if (len < bytes) {
-	fprintf(stderr, "VB warn: recv() len %dB < bytes %dB\n", len, bytes);
-      }
-      /* because message header is already PEEKed to msghd before recv(), so we can
-	 use info in msghd instead of *(VideoMessage*)ptr   */
-      if (len != sizeof(msghd)+msghd.msgSize)
-        /* some of msg contents not successfully received, abandon current packet */
-      {
-	/*
-	fprintf(stderr, "VB got corrupted msg, len=%d, supposed len=%d\n",
-		len, sizeof(msghd)+msghd.msgSize);
-	 */
-        break;
-      }
-      poffset += msghd.msgSize;
-      psize -= msghd.msgSize;
-      ptr += msghd.msgSize;
-      /*
-      fprintf(stderr, "VB packet remain size %d\n", psize);
-      */
-      if (psize == 0)
-      {
-	/* finished receiving the current packet */
-#ifdef NeedByteOrderConversion
-	packet->cmd = ntohl(packet->cmd);
-	packet->cmdsn = ntohl(packet->cmdsn);
-	packet->sh = ntohl(packet->sh);
-	packet->gop = ntohl(packet->gop);
-	packet->frame = ntohl(packet->frame);
-	packet->display = ntohl(packet->display);
-	packet->future = ntohl(packet->future);
-	packet->past = ntohl(packet->past);
-	packet->currentUPF = ntohl(packet->currentUPF);
-	packet->dataBytes = ntohl(packet->dataBytes);
-#endif
-	pcmdsn = packet->cmdsn;
-	pcmd = packet->cmd;
-	pfid = packet->frame;
-	pgop = packet->gop;
-	shared->VBheadFrame = (pcmd == CmdPLAY) ? pfid : pgop;
-	
-	shared->currentUPF = packet->currentUPF;
-	enter_cs(sid);
-	(*head)->full = 1;
-	psize = sizeof(**head) + sizeof(*msg) + msghd.packetSize;
-	psize = ((psize+3)>>2)<<2;
-	ptr = (char*)*head + psize;
-	(*head)->next = (struct block *) ptr;
-	(*head) = (struct block *)ptr;
-	(*head)->shcode = SHCODE;
-	leave_cs(countid);
-	leave_cs(sid);
-
-	/* VB receives all frame except for the INIT one through normalSocket */
-	if (dataSocket != normalSocket) {
-	  /*
-	  Fprintf(stderr, "VB got INIT frame.\n");
-	  */
-	  write(initSocket, (char *)&initSocket, 1);  /* write a garbage byte */
-	  close(initSocket);
-	  dataSocket = normalSocket;
-	}
-	
-	/* following is synchronization feedback algorithm */
-	
-	if (shared->config.syncEffective) {
-	  if (state > 1 && state != 4 && (len = shared->qosRecomputes) != qosRecomputes) {
-	    /* QoS feedback packet is sent if at any time send pattern is
-	       recomputed, and sync feedback is not in active state*/
-	    send_feedback(dataSocket, 0, 0, advance);
-	    qosRecomputes = len;
-	  }
-	  switch (state) {
-	  case 4:  /* active */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
-	      /* jump to state 5 if speed changes */
-	      state = 5;
-	      break;
-	    }
-	    {
-	      int interval = shared->usecPerFrame;
-	      double val = (double)(pcmd == CmdPLAY ?
-			           pfid - shared->nextFrame :
-			           (pcmd == CmdFF ?
-			            pgop - shared->nextGroup :
-			            shared->nextGroup - pgop));
-	      fv = DoFilter(f, val); /* get average #frames in the whole client
-					pipeline, including all stages */
-	      val = val - fv;
-	      fav = DoFilter(fa, val >= 0.0 ? val : -val);
-	      /* get average #frames jitter in the whole client pipeline */
-							      
-	      val = fav * interval * 6;
-	      /* convert deviation in frame into microseconds, 6 is a magic number */
-
-	      /* tries to recompute advance (in microseconds), and med/high/low
-		 in adaptation to current jitter level */
-	      if ((val > advance && !reach_limit) ||
-		  (advance > min_advance && val < advance >> 3)) {
-		advance = (int) max(2 * val, min_advance);
-		med = advance / interval;
-		/*
-		if (pcmd == CmdPLAY) {
-		  if (med < shared->VDframeNumber) {
-		    med = shared->VDframeNumber;
-		  }
-		}
-		else
-		*/
-		if (med < 2 ) { /* but keep minimum buffer fill level */
-		  med = 2;
-		}
-		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-		  reach_limit = 1;
-		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-		  Fprintf(stderr,
-			  "VB VSadvance control: VBbuf limit reached, med %d.\n", med);
-		}
-		else reach_limit = 0;
-		high = med + med / 2;
-		low = med - med / 2;
-		period = med * MAX_CLOCK_DRIFT;
-		Fprintf(stderr,
-		  "VB: VS advance control: fav %5.2f, med %d, advance %d at nextFrame %d\n",
-			fav, med, advance, shared->nextFrame);
-	      }
-	    }
-	    /* record the current time (fid or gopid) if buffer fill level drift
-	       only very little */
-	    if ((int)fv == med) {
-	      init_fv = fv;
-	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
-	      break;
-	    }
-	    /*
-	    fprintf(stderr, "VB fb: fv %lf\n", fv);
-	    */
-	    /* try send action if low/high water mark is passed, or qos recomputed */
-	    /* There is problem here, the deltas of upf are sent, instead of upf
-	       and frame themself. This scheme is not robust in case case feedback
-	       packets are lost, and get resent */
-	    len = shared->qosRecomputes;
-	    if (fv >= high || fv <= low || len != qosRecomputes) {
-	      int addupf, addf;
-	      int pos = pcmd == CmdPLAY ? pfid : pgop;
-	      int dist = (int)(pcmd == CmdFB ? init_pos - pos : pos - init_pos);
-	      if (fv >= high || fv <= low) {
-		if (dist < period) { /* try skip or stall */
-		  addf =  (int)(med - fv);
-		  addupf = 0;
-		}
-		else { /* try adjust VS clock rate */
-		  int added = (int)((double)cupf * (fv - (double)med) / (double) dist);
-		  addf = (int)(med - fv);
-		  addupf = added;
-		  cupf += added;
-		}
-		state = 6;
-	      }
-	      else {  /* fb only recomputed sendpattern, no state change */
-		addupf = 0;
-		addf = 0;
-	      }
-
-	      /* tries to send a feedback packet. */
-	      if (shared->live) {  /* no sync feedback with live video */
-		qosRecomputes = len;
-	      }
-	      else if (send_feedback(dataSocket, addupf, addf, advance) == -1) {
-		/* Keep trying action repeatedly if failed to send the action
-		   packet (by keeping in state 4).
-		   An action packet can also be lost in the network */
-		state = 4;
-	      }
-	      else {
-		qosRecomputes = len;
-	      }
-	      if (state == 6) { /* record the time if an action packet is
-				   successfully send, and indicate that an
-				   feedback action leads to state 6, which after
-				   delay sometime leads to state 3.
-				   The action_delay should have been related
-				   to round-trip time. */
-		action_time = get_usec();
-		action_delay = shared->usecPerFrame * 100;
-		not_action = 0;
-	      }
-	    }
-	    break;
-	  case 6:  /* reset after action */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
-	      state = 5;
-	      break;
-	    }
-	    /* Jump to transition state 3 only after delay for some
-	       time, when feedback action has been taken, and the
-	       effect has been propogated back to the client */
-	    if (get_duration(action_time, get_usec()) >= action_delay) {
-	      state = 3;
-	    }
-	    break;
-	  case 5:  /* reset after speed change, feedback stays in this
-		      state as long as play speed is changing */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    /* Jump to transition state 3, indicating that the transition
-	       is not caused by feedback action */
-	    if (shared->currentUPF == shared->usecPerFrame) {
-	      not_action = 1;
-	      state = 3;
-	    }
-	    break;
-	  case 2:  /* delay after start, this delay is for avoiding feedback
-		      action during server fast start-up. */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    if (pcmd == CmdPLAY) {
-	      if (pfid - startpos >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    else if (pcmd == CmdFF) {
-	      if (pgop - startpos >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    else {  /* CmdFB */
-	      if (startpos - pgop >= delay) {
-		advance = shared->VStimeAdvance;
-		state = 3;
-	      }
-	    }
-	    break;
-	  case 3:  /* transient state, entered after start-up delay,
-		      action-delay, or play-speed change */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      else {
-		state = 1;
-	      }
-	      break;
-	    }
-	    /* Initialize both buffer-fill-level and jitter filters */
-	    if (f == NULL) {
-	      f = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-			    shared->config.filterPara : 100);
-	    }
-	    else {
-	      f = ResetFilter(f, shared->config.filterPara >= 1 ?
-			      shared->config.filterPara : 100);
-	    }
-	    if (fa == NULL) {
-	      fa = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-			    shared->config.filterPara : 100);
-	      DoFilter(fa, 0.0);
-	    }
-	    else if (not_action) { /* reset jitter level filter only
-				      if entering this state is not
-				      cause by feedback action */
-	      fa = ResetFilter(fa, shared->config.filterPara >= 1 ?
-			      shared->config.filterPara : 100);
-	    }
-	    if (f == NULL || fa == NULL) {
-	      perror("VB failed to allocate space for filters");
-	      state = 0;
-	    }
-	    else {
-	      init_fv =
-	        DoFilter(f, (double)(pcmd == CmdPLAY ?
-			    pfid - shared->nextFrame :
-			    (pcmd == CmdFF ?
-			     pgop - shared->nextGroup :
-			     shared->nextGroup - pgop)));
-	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
-	      upf = shared->currentUPF;
-	      cupf = upf;
-	      {
-		int interval = shared->usecPerFrame;
-
-		/* upon speed change, 'advance', in microseconds, will
-                   not change, but med/high/low will be updated. This
-                   may suggest that in the new toolkit version of the
-                   same feedback systems, the buffer-fill level and
-                   jitter is measured directly in microseconds, not in
-                   #frames then converting to microseconds. */
-		med = advance / interval;
-		/*
-		if (pcmd == CmdPLAY) {
-		  if (med < shared->VDframeNumber) {
-		    med = shared->VDframeNumber;
-		    min_advance = advance = med * interval;
-		  }
-		}
-		else
-		*/
-		if (med < 2 ) {
-		  med = 2;
-		  advance = med * interval;
-		  min_advance = max(advance, shared->VStimeAdvance);
-		}
-		else min_advance = shared->VStimeAdvance;
-		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-		  reach_limit = 1;
-		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-		  if (not_action) {
-		    Fprintf(stderr,
-		       "VB start/speed-change: VBbuf limit reached, med %d.\n", med);
-		  }
-		}
-		else reach_limit = 0;
-	      }
-	      high = med + med / 2;
-	      low = med - med / 2;
-	      delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-							feedback when VS is in
-							fast-start period */
-	      period = med * MAX_CLOCK_DRIFT;
-	      if (not_action) {
-		Fprintf(stderr,
-			"VB start/speed-change: med %d, advance %d at nextFrame %d\n",
-			med, advance, shared->nextFrame);
-	      }
-	      state = 4;
-	    }
-	    break;
-	  case 0:  /* idle */
-	    if (pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB) {
-	      cmdsn = pcmdsn;
-	      state = 1;
-	    }
-	    break;
-	  case 1:  /* start */
-	    if (pcmdsn != cmdsn) {
-	      cmdsn = pcmdsn;
-	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-		state = 0;
-	      }
-	      break;
-	    }
-	    startpos = pcmd == CmdPLAY ? pfid : pgop;
-	    advance = shared->VStimeAdvance;
-
-	    /*  following from vs.c:
-		timerAdjust = (VStimeAdvance * SPEEDUP_INV_SCALE) / currentUPF;
-	        */
-	    med = advance / shared->usecPerFrame;
-	    /*
-	    if (pcmd != CmdPLAY) med /= shared->patternSize;
-	    */
-	    delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-						      feedback when VS is in
-						      fast-start period */
-	    not_action = 1;
-	    state = 2;
-	    break;
-	  default:
-	    fprintf(stderr, "VB: unknown Feedback state %d reached.\n", state);
-	    state = 0;
-	    break;
-	  }
-	}   /* end if (shared->config.syncEffective) */
-	else {
-	  state = 0;
-	}
-#ifdef STAT
-	if (shared->collectStat && packet->cmd != CmdREF)
-	{
-	  char * val, * val1;
-	  int size;
-	  size = packet->frame;
-	  shared->stat.VBframesReceived[size >>3] |= 1 << (size % 8);
-	  val = (char *)*head;
-	  val1 = (char *)*tail;
-	  if (val >= val1)  /* *head >= *tail */
-	    size = val - val1;
-	  else
-	    size = bufsize - (val1 - val);
-	  shared->stat.VBmaxBytes = max(shared->stat.VBmaxBytes, size);
-	}
-#endif
-	/*
-        fprintf(stderr, "VB: Packet(%x, buf:%x)=cmd-%d, cmdsn-%d sh-%d, gop-%d\n",
-	        (int)packet, (int)buf, packet->cmd, packet->cmdsn, packet->sh, packet->gop);
-        fprintf(stderr, "           frame-%d, display-%d, future-%d, past-%d, bytes-%d\n",
-	        packet->frame, packet->display, packet->future,
-		packet->past, packet->dataBytes);
-	*/
-	break;  /* got the whole packet, break to the out-most loop for next packet */
-      }  /* end if (psize == 0) */
-      else if (psize < 0)
-      {
-	fprintf(stderr, "VB error: received too many msgs for a packet.\n");
-	exit(1);
-      }
-
-      /* try get another message for current packet */
-      for (;;)
-      {
-	if (conn_tag >= 0) {
-	  len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
-	}
-	else {
-	  len = read(dataSocket, tmp_buf, -conn_tag);
-	  memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
-	}
-	if (exit_tag) exit_on_kill();
-	if (len <= 0)
-	{
-	  if (errno == EWOULDBLOCK || errno == EAGAIN) {
-	    perror("VB sleep2 for 10ms");
-	    usleep(10000);
-	    if (exit_tag) exit_on_kill();
-	    continue;
-	  }
-          perror("VB recv data(MSG_PEEK)");
-          exit(1);
-	}
-	if (len < sizeof(msghd)) {
-	  fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
-		  len, sizeof(msghd));
-	  continue;
-	}
-#ifdef NeedByteOrderConversion
-	msghd.packetsn = ntohl(msghd.packetsn);
-	msghd.packetSize = ntohl(msghd.packetSize);
-	msghd.msgsn = ntohl(msghd.msgsn);
-	msghd.msgOffset = ntohl(msghd.msgOffset);
-	msghd.msgSize = ntohl(msghd.msgSize);
-#endif
-	/*
-        fprintf(stderr, "VB PEEK2 a msg: sn-%d, size-%d, pkt-%d, pktsize-%d\n",
-	        msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
-	*/
-#ifdef STAT
-	{
-	  int gap = msghd.msgsn - gap_msgsn;
-	  gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-	  shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-	  if (gap >0) gap_msgsn = msghd.msgsn;
-	}
-#endif
-	if (msghd.msgsn <= msgsn) { /* outdated message, wait for next one */
-	  /*
-	  fprintf(stderr, "VB discard outdated or dup msgsn %d, pktsn %d\n",
-		  msghd.msgsn, msghd.packetsn);
-	  */
-	  skip_message(dataSocket, &msghd);
-	  continue;
-	}
-	break;  /* got a message for current packet */
-      }  /* end for (;;) */
-      
-      if (msghd.msgsn > msgsn + 1 || msghd.msgOffset == 0)
-      {
-        /* message out of order, abandon current packet */
-	/*
-	fprintf(stderr, "VB msg out of order for current packet, discard it.\n");
-	*/
-#ifdef STAT
-	to_count = 0;
-#endif
-        goto start_new_packet;
-      }
-      else {
-        msgsn = msghd.msgsn;
-      }
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp
deleted file mode 100644
index b1e74191181..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp
+++ /dev/null
@@ -1,929 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-/*
-#include <sys/types.h>
-#include <sys/socket.h>
-*/
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "dither.h"
-#include "video.h"
-#include "proto.h"
-
-#define MAX_VDBLOCK_NUM 8
-#define CQUEUE_SIZE	MAX_VDBLOCK_NUM + 2
-#define ESTACK		0
-#define CQUEUE		1
-
-static int win_width, win_height;
-static int ecountid, ccountid;
-static int sid;
-
-extern VidStream * curVidStream;
-
-static struct shared_mem_block
-{
-  int size;
-  int block_num;
-  int width, height;
-  int sptr, qhead, qtail;
-  FrameBlock *estack[MAX_VDBLOCK_NUM];
-  FrameBlock *cqueue[CQUEUE_SIZE]; /* cqueue will never get full */
-} * shm = NULL;
-
-static void InitDitherEnv(void);
-static void DitherFrame(PictImage * pict, FrameBlock * frame);
-static void DoDitherImage(unsigned char *l, unsigned char *Cr, unsigned char *Cb,
-			  unsigned char *disp, int h, int w);
-
-void VDinitBuf(int size)
-/* size in bytes */
-{
-  shm = (struct shared_mem_block *)creat_shared_mem_id(size, &shared->VDbufId);
-  shared->VDbufAddr = (char *)shm;
-  
-  shm->width = shm->height = 0;
-  shm->size = size - sizeof(*shm);
-  sid = creat_semaphore();
-  ecountid = creat_semaphore();
-  ccountid = creat_semaphore();
-  enter_cs(ccountid);
-  enter_cs(ecountid);
-}
-
-static void put_block(FrameBlock * bptr, int tag)
-{
-  if (tag == ESTACK)
-  {
-    shm->estack[shm->sptr] = bptr;
-    shm->sptr ++;
-    if (shm->sptr > MAX_VDBLOCK_NUM)
-    {
-      fprintf(stderr, "VD weird error: ESTACK full.\n");
-      exit(1);
-    }
-  }
-  else
-  {
-    if (shm->qtail == shm->qhead)  /* empty queue */
-    {
-      shm->qtail = 0;
-      shm->qhead = 1;
-      shm->cqueue[0] = bptr;
-    }
-    else
-    {
-      int val = CQUEUE_SIZE;
-      int pos = (shm->qhead - 1 + val) % val; /* pos = shm->qhead - 1 */
-      if (shared->cmd == CmdPLAY)
-      while ((pos + 1) % val != shm->qtail)
-      {
-	if (shm->cqueue[pos]->display > bptr->display)
-	{
-	  shm->cqueue[(pos + 1) % val] = shm->cqueue[pos];
-	  pos = (pos - 1 + val) % val;  /* pos -= 1 */
-	}
-	else
-	  break;
-      }
-      shm->cqueue[(pos + 1) % val] = bptr;
-      shm->qhead = (shm->qhead + 1) % val;
-    }
-  }
-}
-
-static FrameBlock * get_block(int tag)
-{
-  FrameBlock * ptr;
-
-  if (tag == ESTACK)
-  {
-    if (shm->sptr <= 0)
-    {
-      fprintf(stderr, "VD get_block error: ESTACK empty.\n");
-      return NULL;
-    }
-    shm->sptr --;
-    ptr = shm->estack[shm->sptr];
-  }
-  else
-  {
-    if (shm->qtail == shm->qhead)
-    {
-      fprintf(stderr, "VD get_block error: CQUEUE empty.\n");
-      return NULL;
-    }
-    ptr = shm->cqueue[shm->qtail];
-    shm->qtail = (shm->qtail + 1) % (CQUEUE_SIZE);
-  }
-  return ptr;
-}
-
-void VDresizeBuf(int height, int width)
-{
-  char * ptr = (char*)shm + sizeof(*shm);
-  int imagesize;
-  int i;
-
-  enter_cs(sid);
-
-  if (get_semval(ecountid) < 0) {
-    fprintf(stderr, "Error<weird>: pid %d get (ecountid) = %d < 0\n",
-	    getpid(), get_semval(ecountid));
-    exit(1);
-  }
-  /*
-  fprintf(stderr, "VD before resizeBuf(): get_semval(ecountid) = %d\n",
-	  get_semval(ecountid));
-  */
-  while (get_semval(ecountid) > 0) enter_cs(ecountid);
-  
-  shm->width = width;
-  shm->height = height;
-  width = ((width+15)>>4) << 4;
-  height = ((height+15)>>4) << 4;
-  imagesize = (((height * width)+3)>>2)<<2;
-  if ((ditherType == Twox2_DITHER) || (ditherType == FULL_COLOR_DITHER))
-    imagesize <<= 2;
-  
-  shm->block_num = (shm->size)/(sizeof(FrameBlock) + imagesize);
-  if (shm->block_num > MAX_VDBLOCK_NUM)
-    shm->block_num = MAX_VDBLOCK_NUM;
-  
-  Fprintf(stderr, "VD resizeBuf: got %d(max %d) blocks of size %d.\n",
-	  shm->block_num,
-	  (shm->size)/(sizeof(FrameBlock) + imagesize),
-	  (sizeof(FrameBlock) + imagesize));
-  
-  if (shm->block_num < 3)
-  {
-    fprintf(stderr,
-	    "VD error: VDbuf fails to hold at least 3(three) block.\n");
-    exit(1);
-  }
-  shm->sptr = 0;  /* empty stack */
-  shm->qhead = shm->qtail = 0;  /* empty cqueue */
-  for (i=0; i<shm->block_num; i++)
-  {
-    put_block((FrameBlock *)ptr, ESTACK);
-    ((FrameBlock *)ptr)->data = (unsigned char *)(ptr + sizeof(FrameBlock));
-    ptr += sizeof(FrameBlock) + imagesize;
-    leave_cs(ecountid);
-  }
-  leave_cs(sid);
-  
-  shared->VDframeNumber = shm->block_num;
-  /*
-  fprintf(stderr, "VD after resizeBuf(): get_semval(ecountid) = %d\n",
-	  get_semval(ecountid));
-  */
-}
-
-FrameBlock * VDgetBuf(void)     /* block version, return with interrupt */
-{
-  FrameBlock * ptr;
-  enter_cs(ecountid);
-  enter_cs(sid);
-  ptr = get_block(ESTACK);
-  if (ptr != NULL)
-    ptr->refcount = 1;
-  leave_cs(sid);
-  if (ptr == NULL)
-    fprintf(stderr, "VD error: VDgetBuf should not return NULL.\n");
-  /*
-  fprintf(stderr, "pid %d VDgetBuf() %u, ref %d, ecount %d\n",
-	  getpid(), (unsigned)ptr, ptr->refcount, get_semval(ecountid));
-  */
-  return ptr;
-}
-
-int   VDcheckBuf(void)    /* non-block check, return True/False */
-{
-  if (get_semval(ecountid) > 0)
-    return 1;
-  else
-    return 0;
-}
-
-void VDputMsg(FrameBlock * msgPtr)
-{
-  enter_cs(sid);
-  put_block(msgPtr, CQUEUE);
-  leave_cs(ccountid);
-  leave_cs(sid);
-  /*
-  fprintf(stderr, "pid %d VDputMsg() %u, ref %d, ccount %d\n",
-	  getpid(), (unsigned)msgPtr, msgPtr->refcount, get_semval(ccountid));
-  */
-}
-
-FrameBlock * VDgetMsg(void)     /* block version, return with interrupt */
-{
-  FrameBlock * ptr;
-  enter_cs(ccountid);
-  enter_cs(sid);
-  ptr = get_block(CQUEUE);
-  leave_cs(sid);
-  if (ptr == NULL)
-    fprintf(stderr, "VD error: VDgetMsg should not return NULL.\n");
-  /*
-  fprintf(stderr, "pid %d VDgetMsg() %u, ref %d, ccount %d\n",
-	  getpid(), (unsigned)ptr, ptr->refcount, get_semval(ccountid));
-  */
-  return ptr;
-}
-
-int VDcheckMsg(void)      /* non-block check, return Number of Msg in buffer */
-{
-  return get_semval(ccountid);
-}
-
-int VDbufEmpty(void)
-{
-  /*
-  Fprintf(stderr, "VD ecountid %d, shm-block_num %d\n",
-	  get_semval(ecountid), shm->block_num);
-  */
-  return (get_semval(ecountid) == shm->block_num);
-}
-
-FrameBlock * VDpeekMsg(void)
-{
-  FrameBlock * ptr;
-
-  enter_cs(sid);
-  
-  if (shm->qhead == shm->qtail)
-    ptr = NULL;
-  else
-    ptr = shm->cqueue[shm->qtail];
-  leave_cs(sid);
-  /*
-  if (ptr != NULL) {
-    fprintf(stderr, "pid %d VDpeekMsg() = %u, ref=%d\n",
-	    getpid(), (unsigned)ptr, ptr->refcount);
-  }
-  */
-  return ptr;
-}
-
-void VDreferMsg(FrameBlock * msgPtr)
-{
-  enter_cs(sid);
-  msgPtr->refcount ++;
-  leave_cs(sid);
-  /*
-  fprintf(stderr, "pid %d VDreferMsg() %u, ccount %d\n",
-	  getpid(), (unsigned)msgPtr, get_semval(ccountid));
-  */
-}
-
-void VDreclaimMsg(FrameBlock * msgPtr)
-{
-  int ref;
-  enter_cs(sid);
-  ref = msgPtr->refcount;
-  if (msgPtr->refcount <= 1)
-  {
-    put_block(msgPtr, ESTACK);
-    leave_cs(ecountid);
-  }
-  else
-    msgPtr->refcount --;
-  leave_cs(sid);
-  /*
-  fprintf(stderr, "pid %d VDreclaimMsg() %u, ref %d, ecount %d\n",
-	  getpid(), (unsigned)msgPtr, ref, get_semval(ecountid));
-  */
-  if (ref <= 0) {
-    Fprintf(stderr, "pid %d VDreclaimMsg() %u WEIRD, :ref %d:, ecount %d\n",
-	    getpid(), (unsigned)msgPtr, ref, get_semval(ecountid));
-  }
-}
-
-void VDdeleteBuf(void)
-{
-  remove_shared_mem((char*)shm);
-}
-
-void VDdeleteSem(void)
-{
-  remove_semaphore(ecountid);
-  remove_semaphore(ccountid);
-  remove_semaphore(sid);
-}
-
-int 
-get_more_data(unsigned int *buf_start, int max_length, 
-	      int *length_ptr, unsigned int **buf_ptr)
-{
-  fprintf(stderr,
-	  "Fatel error: vd.c get_more_data() should not be called, bufLength = %d.!\n",
-	  *length_ptr);
-  fprintf(stderr, "  **** Please report this bug. ****\n");
-  exit(1);
-  return 0;
-}
-
-static void printPacket(VideoPacket *p)
-{
-  fprintf(stderr, "VD: Packet(%x)=cmd-%d, cmdsn-%d sh-%d, gop-%d\n",
-          (int)p, p->cmd, p->cmdsn, p->sh, p->gop);
-  fprintf(stderr, "           frame-%d, display-%d, future-%d, past-%d, bytes-%d\n",
-	  p->frame, p->display, p->future,
-          p->past, p->dataBytes);
-}
-
-static void usr1_handler(int sig)
-{
-  fprintf(stderr, "VD void usr1_handler.\n");
-}
-
-static void usr2_handler(int sig)
-{
-  fprintf(stderr, "VD void usr2_handler\n");
-}
-
-void VDprocess(int CTRpid)
-{
-  FrameBlock * curBlk = NULL;
-  PictImage * curPict = NULL;
-
-  InitDitherEnv();
-  
-  curVidStream = NewVidStream();
-  if (curVidStream == NULL)
-  {
-    fprintf(stderr, "VD: unable to allocat curVidStream.\n");
-    exit(1);
-  }
-  setsignal(SIGUSR1, usr1_handler);
-  setsignal(SIGUSR2, usr2_handler);
-  
-  for(;;)
-  {
-    int curcmd, curcmdsn;
-    int i;
-    int single_tag;
-    VideoPacket *p;
-
-    if (curBlk != NULL) {
-      VDreclaimMsg(curBlk);
-      curBlk = NULL;
-    }
-    p = (VideoPacket*)VBgetMsg();   /* guarranteed to get a Packet */
-    /*
-    printPacket(p);
-    */
-    /*
-    Fprintf(stderr, "VD: got frame %d\n", p->frame);
-    */
-    curcmd = shared->cmd;
-    curcmdsn = shared->cmdsn;
-    if (p->cmdsn != shared->cmdsn || p->cmdsn != curcmdsn)
-    {
-      
-      /*
-      fprintf(stderr, "VD: frame not for current Cmd, discard it\n");
-      
-      printPacket(p);
-      */
-      VBreclaimMsg((char*)p);
-      continue;
-    }
-    if (curcmd == CmdINIT)
-    {
-      /* free/allocate all PictImages, resize VDbuffer */
-      curVidStream->future = curVidStream->past = curVidStream->current = NULL;
-      win_width = ((shared->horizontalSize + 15)>>4)<<4;
-      win_height = ((shared->verticalSize + 15)>>4)<<4;
-      for (i = 0; i < RING_BUF_SIZE; i++)
-      {
-	if (curVidStream->ring[i] != NULL)
-	  DestroyPictImage(curVidStream->ring[i]);
-        curVidStream->ring[i] =
-	  NewPictImage(win_width, win_height);
-      }
-      for (i = 0; i < 500; i ++) {
-	if (!VDbufEmpty()) usleep(1000);
-	else break;
-      }
-      if (!VDbufEmpty()) {
-	fprintf(stderr, "VD error<weired>: VDbuf can't become empty.\n");
-	exit(1);
-      }
-      VDresizeBuf(shared->verticalSize, shared->horizontalSize);
-    }
-    else if (curcmd == CmdPLAY || curcmd == CmdSTEP)
-    {
-      /* to check if the packet can be decoded or not */
-      if (p->future == -1)
-      { /* swap because the existing VD decoding algorithm refer to 'future' frame
-	   to decode a P frame */
-	int tmp = p->past;
-	p->past = p->future;
-	/* following is the bug found on 2-14-96, this may be the cause of decoding
-	   P frames incorrectly, and showing corrupted messages, when previous I/P
-	   frames are dropped. This happens frequently when the server is a remote one.
-	   
-	p->future = p->past;
-
-	*/
-	p->future = tmp;
-	
-      }
-      if ((p->future >= 0 &&
-	   (curVidStream->future == NULL || curVidStream->future->frame != p->future)) ||
-          (p->past >= 0 &&
-	   (curVidStream->past == NULL || curVidStream->past->frame != p->past)))
-      {
-	/*
-	fprintf(stderr,
-	        "VD: unable to decode packet -- future and/or past frame no available.\n");
-	printPacket(p);
-	*/
-	if (curcmd == CmdSTEP && curcmdsn == shared->cmdsn) {
-	  /*
-	  Fprintf(stderr, "VD failed to decode f%d, USR1 to CTR for STEP\n", p->frame);
-	  */
-	  kill(getppid(), SIGUSR1);  /* notify CTR anyway if STEP */
-	}
-#ifdef STAT
-	else if (shared->collectStat && curcmd == CmdPLAY)
-	  shared->stat.VDnoRef ++;
-#endif
-	VBreclaimMsg((char*)p);
-	continue;
-      }
-    }
-    curBlk = VDgetBuf();
-
-    single_tag = 0;
-    /* to check if it's in time for PLAY, FF and FB */
-    if (curcmd == CmdPLAY)
-    {
-
-#if 0
-      /* checking against sendPattern seems irreasonable, because send-pattern of a less
-	 frame-rate is not necessarily a  subset of the one of a bigger frame-rate.
-	 */
-      /* check against sendPattern */
-      if (p->frame - shared->firstGopFrames > 0)
-      {
-	int i = (p->frame - shared->firstGopFrames) %
-	        (shared->patternSize * shared->sendPatternGops);
-	if (shared->sendPattern[i] == 0)
-	{
-	  VBreclaimMsg((char*)p);
-#ifdef STAT
-	  if (shared->collectStat)
-	    shared->stat.VDagainstSendPattern ++;
-#endif
-	  continue;
-	}
-      }
-#endif
-
-      if (VBcheckMsg() > 0) { /* a frame is to be dropped only if
-				 there are more frames in VB */
-	if (p->past >= 0) { /* 'B' */
-	  if (p->display <= shared->nextFrame) {
-#ifdef STAT
-	    if (shared->collectStat)
-	    shared->stat.VDtooLateB ++;
-#endif
-	    goto frameTooLate;
-	  }
-	}
-	else if (p->future >= 0) { /* 'P' */
-	  if (shared->lastIframeDecoded + shared->IframeGap <= shared->nextFrame) {
-#ifdef STAT
-	    if (shared->collectStat)
-	    shared->stat.VDtooLateP ++;
-#endif
-	    goto frameTooLate;
-	  }
-	}
-	else { /* 'I' */
-	  if (!shared->live)
-	  {
-	    if (p->display + shared->IframeGap <= shared->nextFrame) {
-#ifdef STAT
-	      if (shared->collectStat)
-	      shared->stat.VDtooLateI ++;
-#endif
-	    frameTooLate:
-	      if (shared->rtplay)  /* too late, drop the frame */
-	      {
-		VBreclaimMsg((char*)p);
-		/*
-		Fprintf(stderr, "VD: frame %d too late, shared->nextFrame %d.\n",
-			p->frame, shared->nextFrame);
-		*/
-		continue;
-	      }
-	    }
-	  }
-	  else {  /* live video */
-	    if (p->display < shared->nextFrame) {
-	      VBreclaimMsg((char*)p);
-	      /*
-	      Fprintf(stderr, "VD live video frame %d too late, nextFrame=%d\n",
-		      p->frame, shared->nextFrame);
-	      */
-	      continue;
-	    }
-	  }
-	}
-      }
-    }
-    else if (curcmd == CmdFF)
-    {
-      if (p->gop < shared->nextGroup && VDcheckMsg() > 0)
-      {
-	/*
-	fprintf(stderr, "VD: a frame too late and dropped when FF.\n");
-	printPacket(p);
-	*/
-	VBreclaimMsg((char*)p);
-	continue;
-      }
-    }
-    else if (curcmd == CmdFB)
-    {
-      if (p->gop > shared->nextGroup && VDcheckMsg() > 0)
-      {
-	/*
-	fprintf(stderr, "VD: a frame too late and dropped when FB.\n");
-	printPacket(p);
-	*/
-	VBreclaimMsg((char*)p);
-	continue;
-      }
-    }
-    else
-      single_tag = 1;
-    
-    if (shared->videoFormat == VIDEO_JPEG || shared->videoFormat == VIDEO_SIF) {
-      int picsize = win_width * win_height;
-      unsigned char * l, *cr, *cb;
-
-      if (shared->videoFormat == VIDEO_SIF) {
-	l = (unsigned char*)p + sizeof(*p);
-	cr = l + picsize;
-	cb = l + picsize + (picsize >> 2);
-      }
-      else {   /* decode the JPEG frame */
-	l = cr = cb = (unsigned char *)curBlk->data;
-	memcpy(l, (unsigned char*)p + sizeof(*p), p->dataBytes);
-      }
-      DoDitherImage(l, cr, cb,
-		(unsigned char *)curBlk->data, win_height, win_width);
-      curBlk->sh = p->sh;
-      curBlk->gop = p->gop;
-      curBlk->frame = p->frame;
-      curBlk->display = p->display;
-      curBlk->future = p->future;
-      curBlk->past = p->past;
-      VDputMsg(curBlk);
-      curBlk = NULL;
-      /*
-      Fprintf(stderr, "VD: SIF frame %d decoded.\n", p->frame);
-      */
-      goto end_decode_loop;
-    }
-#ifdef NeedByteOrderConversion
-    else {
-      unsigned int * ptr = (unsigned int *)((char*)p + sizeof(*p));
-      /* the added two extra words to max_buf_length: one is for SHCODE, already
-	 in right byte order, the second is for prevent calling of get_more_data().
-	 (which seem required for the UCB decoder used here ), this second word
-	 contains value used by VB algorithm, and can't be changed elsewhere.
-	 So they should not be swapped byte order. */
-      for (i=0; i<((p->dataBytes + 11)>>2) - 2; i++)
-      {
-	*ptr = ntohl(*ptr);
-	ptr++;
-      }
-    }
-#endif
-
-    if (!mpegVidRsrc((char*)p))  /* successfully decoded */
-    {
-      curPict = curVidStream->current;
-      /*
-      fprintf(stderr, "VD successfully decodes a frame.\n");
-      printPacket(p);
-      */
-      if (curcmd == CmdPLAY && shared->rtplay)
-      {
-	if ((curVidStream->picture.code_type == I_TYPE) ||
-	    (curVidStream->picture.code_type == P_TYPE))
-	{
-	  if (curVidStream->future == NULL)
-	  {
-	    curVidStream->future = curVidStream->current;
-	    curVidStream->future->locked |= FUTURE_LOCK;
-	  }
-	  else
-	  {
-	    if (curVidStream->past != NULL)
-	    {
-	      curVidStream->past->locked &= ~PAST_LOCK;
-	    }
-	    else if (curcmd == CmdPLAY) {
-	      /* this case should happen only at the begining of PLAY */
-	      DitherFrame(curVidStream->future, VDgetBuf());
-	    }
-	    curVidStream->past = curVidStream->future;
-	    curVidStream->past->locked &= ~FUTURE_LOCK;
-	    curVidStream->past->locked |= PAST_LOCK;
-	    curVidStream->future = curVidStream->current;
-	    curVidStream->future->locked |= FUTURE_LOCK;
-	  }
-	}
-      }
-      else if (curcmd == CmdSTEP || curcmd == CmdPLAY)  /* !shared->rtplay */
-      {
-	if ((curVidStream->picture.code_type == I_TYPE) ||
-	    (curVidStream->picture.code_type == P_TYPE))
-	{
-	  if (curVidStream->future == NULL)
-	  {
-	    curVidStream->future = curVidStream->current;
-	    curVidStream->future->locked |= FUTURE_LOCK;
-	  }
-	  else
-	  {
-	    if (curVidStream->past != NULL)
-	    {
-	      curVidStream->past->locked &= ~PAST_LOCK;
-	    }
-	    curVidStream->past = curVidStream->future;
-	    curVidStream->past->locked &= ~FUTURE_LOCK;
-	    curVidStream->past->locked |= PAST_LOCK;
-	    curVidStream->future = curVidStream->current;
-	    curVidStream->future->locked |= FUTURE_LOCK;
-	    curPict = curVidStream->past;
-	  }
-	}
-      }
-      else /* only I-frame for all other Cmds */
-      {
-	if (curVidStream->future != NULL) {
-	  curVidStream->future->locked &= ~FUTURE_LOCK;
-	  curVidStream->future = NULL;
-	}
-	if (curVidStream->past != NULL)
-	{
-	  curVidStream->past->locked &= ~PAST_LOCK;
-	  curVidStream->past = NULL;
-	}
-	/*
-	curVidStream->future = curVidStream->current;
-	curVidStream->future->locked |= FUTURE_LOCK;
-	*/
-      }
-      
-      if (p->past == -1 && p->future == -1)
-        shared->lastIframeDecoded = p->frame;
-
-#ifdef STAT
-      if (shared->collectStat && p->cmd != CmdREF)
-      {
-	int val = curPict->frame;
-	shared->stat.VDframesDecoded[val>>3] |= 1 << (val % 8);
-	shared->stat.VDlastFrameDecoded = val;
-      }
-#endif
-      /*
-      if (single_tag && p->cmd != CmdREF)
-      {
-        fprintf(stderr, "VD: display %d for single.\n", curPict->display);
-      }
-      */
-      /*
-      Fprintf(stderr, "p->cmd %d, p->cmdsn %d, shared->cmdsn %d\n",
-	      p->cmd, p->cmdsn, shared->cmdsn);
-      */
-      if (p->cmd != CmdREF && curcmdsn == shared->cmdsn) {
-	DitherFrame(curPict, curBlk);
-	curBlk = NULL;
-      }
-    }
-    else  /* decoding failed */
-    {
-      /*
-      fprintf(stderr, "VD error -- tried but failed decoding the packet.\n");
-      printPacket(p);
-      */
-    }
-
-  end_decode_loop:
-    
-    /* signal CTR for singlular operation: STEP, POSITION, INIT */
-    if (single_tag && p->cmd != CmdREF && curcmdsn == shared->cmdsn)
-    {
-      /*
-      Fprintf(stderr, "VD decoded f%d, USR1 to CTR\n", p->frame);
-      */
-      kill(getppid(), SIGUSR1);
-    }
-    VBreclaimMsg((char*)p);
-  }
-}
-
-
-static void InitDitherEnv(void)
-{
-  lum_values = (int *) malloc(LUM_RANGE*sizeof(int));
-  cr_values = (int *) malloc(CR_RANGE*sizeof(int));
-  cb_values = (int *) malloc(CB_RANGE*sizeof(int));
-  init_tables();
-
-  while (!shared->pixelValid) {
-    usleep(10000);
-  }
-  memcpy(pixel, shared->pixel, 256);
-
-  switch (ditherType) {
-    
-  case HYBRID_DITHER:
-    
-    InitColor();
-    InitHybridDither();
-    break;
-    
-    case HYBRID2_DITHER:
-    InitColor();
-    InitHybridErrorDither();
-    break;
-    
-  case FS4_DITHER:
-    InitColor();
-    InitFS4Dither();
-    break;
-    
-  case FS2_DITHER:
-    InitColor();
-    InitFS2Dither();
-    break;
-    
-  case FS2FAST_DITHER:
-    InitColor();
-    InitFS2FastDither();
-    break;
-    
-  case Twox2_DITHER:
-    InitColor();
-    Init2x2Dither();
-    PostInit2x2Dither();
-    break;
-
-  case GRAY_DITHER:
-    break;
-
-  case FULL_COLOR_DITHER:
-    InitColorDither();
-    break;
-
-  case ORDERED_DITHER:
-    InitColor();
-    InitOrderedDither();
-    break;
-
-  case MONO_DITHER:
-  case MONO_THRESHOLD:
-    break;
-
-  case ORDERED2_DITHER:
-    InitColor();
-    InitOrdered2Dither();
-    break;
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DoDitherImage --
- *
- *	Called when image needs to be dithered. Selects correct
- *      dither routine based on info in ditherType.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-static void DoDitherImage(unsigned char *l, unsigned char *Cr, unsigned char *Cb,
-			  unsigned char *disp, int h, int w) 
-{
-
-  switch(ditherType) {
-  case HYBRID_DITHER:
-    HybridDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case HYBRID2_DITHER:
-    HybridErrorDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case FS2FAST_DITHER:
-    FS2FastDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case FS2_DITHER:
-    FS2DitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case FS4_DITHER:
-    FS4DitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case Twox2_DITHER:
-    Twox2DitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case FULL_COLOR_DITHER:
-    ColorDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case GRAY_DITHER:
-    GrayDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case NO_DITHER:
-    break;
-
-  case ORDERED_DITHER:
-    OrderedDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case MONO_DITHER:
-    MonoDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case MONO_THRESHOLD:
-    MonoThresholdImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case ORDERED2_DITHER:
-    Ordered2DitherImage(l, Cr, Cb, disp, h, w);
-    break;
-
-  case MBORDERED_DITHER:
-    MBOrderedDitherImage(l, Cr, Cb, disp, h, w);
-    break;
-  }
-}
-
-static void DitherFrame(PictImage * pict, FrameBlock *frame)
-{
-  DoDitherImage((unsigned char *)pict->luminance,
-		(unsigned char *)pict->Cr, (unsigned char *)pict->Cb,
-		(unsigned char *)frame->data, win_height, win_width);
-  frame->sh = pict->sh;
-  frame->gop = pict->gop;
-  frame->frame = pict->frame;
-  frame->display = pict->display;
-  frame->future = pict->future;
-  frame->past = pict->past;
-  VDputMsg(frame);
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp
deleted file mode 100644
index 06549db8205..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp
+++ /dev/null
@@ -1,3756 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.  
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- *
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* This file contains C code that implements
- * the video decoder model.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#ifndef MIPS
-#include <sys/time.h>
-#else
-#include <sys/types.h>
-#include <sys/system.h>
-#endif
-
-#include "include/common.h"
-#include "decoders.h"
-#include "video.h"
-#include "util.h"
-#include "proto.h"
-#include "global.h"
-#include "ui.h"
-
-/* Declarations of functions. */
-static void ReconIMBlock(VidStream *vid_stream, int bnum);
-static void ReconPMBlock(VidStream *vid_stream, int bnum,
-			 int recon_right_for, int recon_down_for, int zflag);
-static void ReconBMBlock(VidStream *vid_stream,
-			 int bnum, int recon_right_back,
-			 int recon_down_back, int zflag);
-static void ReconBiMBlock(VidStream *vid_stream, int bnum, int recon_right_for,
-			  int recon_down_for, int recon_right_back,
-			  int recon_down_back, int zflag);
-static void ReconSkippedBlock(unsigned char *source, unsigned char *dest,
-			      int row, int col, int row_size, int right, int down,
-			      int right_half, int down_half, int width);
-static int ParseSeqHead(VidStream *vid_stream);
-static int ParseGOP(VidStream *vid_stream);
-static int ParsePicture(VidStream *vid_stream,TimeStamp time_stamp);
-static int ParseSlice(VidStream *vid_stream);
-static int ParseMacroBlock(VidStream *vid_stream);
-static void ProcessSkippedPFrameMBlocks(VidStream *vid_stream);
-static void ProcessSkippedBFrameMBlocks(VidStream *vid_stream);
-
-extern int ditherType;
-char *ditherFlags;
-
-/* Macro for returning 1 if num is positive, -1 if negative, 0 if 0. */
-
-#define Sign(num) ((num > 0) ? 1 : ((num == 0) ? 0 : -1))
-
-/* Declare global pointer to vid stream used for current decoding. */
-
-VidStream *curVidStream = NULL;
-
-/* Set up array for fast conversion from zig zag order to row/column
-   coordinates.
-*/
-
-int zigzag[64][2] = {
-  0, 0, 1, 0, 0, 1, 0, 2, 1, 1, 2, 0, 3, 0, 2, 1, 1, 2, 0, 3, 0, 4, 1, 3,
-  2, 2, 3, 1, 4, 0, 5, 0, 4, 1, 3, 2, 2, 3, 1, 4, 0, 5, 0, 6, 1, 5, 2, 4,
-  3, 3, 4, 2, 5, 1, 6, 0, 7, 0, 6, 1, 5, 2, 4, 3, 3, 4, 2, 5, 1, 6, 0, 7,
-  1, 7, 2, 6, 3, 5, 4, 4, 5, 3, 6, 2, 7, 1, 7, 2, 6, 3, 5, 4, 4, 5, 3, 6,
-  2, 7, 3, 7, 4, 6, 5, 5, 6, 4, 7, 3, 7, 4, 6, 5, 5, 6, 4, 7, 5, 7, 6, 6,
-7, 5, 7, 6, 6, 7, 7, 7};
-/* Array mapping zigzag to array pointer offset. */
-
-int zigzag_direct[64] = {
-  0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12,
-  19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35,
-  42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
-58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63};
-/* Set up array for fast conversion from row/column coordinates to
-   zig zag order.
-*/
-
-int scan[8][8] = {
-  {0, 1, 5, 6, 14, 15, 27, 28},
-  {2, 4, 7, 13, 16, 26, 29, 42},
-  {3, 8, 12, 17, 25, 30, 41, 43},
-  {9, 11, 18, 24, 31, 40, 44, 53},
-  {10, 19, 23, 32, 39, 45, 52, 54},
-  {20, 22, 33, 38, 46, 51, 55, 60},
-  {21, 34, 37, 47, 50, 56, 59, 61},
-{35, 36, 48, 49, 57, 58, 62, 63}};
-/* Initialize P and B skip flags. */
-
-static int No_P_Flag = 0;
-static int No_B_Flag = 0;
-
-/* Max lum, chrom indices for illegal block checking. */
-
-static int lmaxx;
-static int lmaxy;
-static int cmaxx;
-static int cmaxy;
-
-/*
- * We use a lookup table to make sure values stay in the 0..255 range.
- * Since this is cropping (ie, x = (x < 0)?0:(x>255)?255:x; ), wee call this
- * table the "crop table".
- * MAX_NEG_CROP is the maximum neg/pos value we can handle.
- */
-
-#define MAX_NEG_CROP 384
-#define NUM_CROP_ENTRIES (256+2*MAX_NEG_CROP)
-#define assertCrop(x)	assert(((x) >= -MAX_NEG_CROP) && \
-			       ((x) <= 256+MAX_NEG_CROP))
-static unsigned char cropTbl[NUM_CROP_ENTRIES];
-
-/*
-  The following accounts for time and size  spent in various parsing acitivites
-  if ANALYSIS has been defined.
-*/
-
-#ifdef ANALYSIS
-
-
-unsigned int bitCount = 0;
-
-int showmb_flag = 0;
-int showEachFlag = 0;
-
-typedef struct {
-  int frametype;
-  unsigned int totsize;
-  unsigned int number;
-  unsigned int i_mbsize;
-  unsigned int p_mbsize;
-  unsigned int b_mbsize;
-  unsigned int bi_mbsize;
-  unsigned int i_mbnum;
-  unsigned int p_mbnum;
-  unsigned int b_mbnum;
-  unsigned int bi_mbnum;
-  unsigned int i_mbcbp[64];
-  unsigned int p_mbcbp[64];
-  unsigned int b_mbcbp[64];
-  unsigned int bi_mbcbp[64];
-  unsigned int i_mbcoeff[64];
-  unsigned int p_mbcoeff[64];
-  unsigned int b_mbcoeff[64];
-  unsigned int bi_mbcoeff[64];
-  double tottime;
-} Statval;
-
-Statval stat_a[4];
-unsigned int pictureSizeCount;
-unsigned int mbSizeCount;
-unsigned int *mbCBPPtr, *mbCoeffPtr, *mbSizePtr;
-unsigned int cacheHit[8][8];
-unsigned int cacheMiss[8][8];
-
-static void
-init_stat_struct(astat)
-  Statval *astat;
-{
-  int j;
-
-  astat->frametype = 0;
-  astat->totsize = 0;
-  astat->number = 0;
-  astat->i_mbsize = 0;
-  astat->p_mbsize = 0;
-  astat->b_mbsize = 0;
-  astat->bi_mbsize = 0;
-  astat->i_mbnum = 0;
-  astat->p_mbnum = 0;
-  astat->b_mbnum = 0;
-  astat->bi_mbnum = 0;
-
-  for (j = 0; j < 64; j++) {
-
-    astat->i_mbcbp[j] = 0;
-    astat->p_mbcbp[j] = 0;
-    astat->b_mbcbp[j] = 0;
-    astat->bi_mbcbp[j] = 0;
-    astat->i_mbcoeff[j] = 0;
-    astat->p_mbcoeff[j] = 0;
-    astat->b_mbcoeff[j] = 0;
-    astat->bi_mbcoeff[j] = 0;
-  }
-  astat->tottime = 0.0;
-}
-
-void
-init_stats()
-{
-  int i, j;
-
-  for (i = 0; i < 4; i++) {
-    init_stat_struct(&(stat_a[i]));
-    stat_a[i].frametype = i;
-  }
-
-  for (i = 0; i < 8; i++) {
-    for (j = 0; j < 8; j++) {
-      cacheHit[i][j] = 0;
-      cacheMiss[i][j] = 0;
-    }
-  }
-
-  bitCount = 0;
-}
-
-static void
-PrintOneStat()
-{
-  int i;
-
-  printf("\n");
-  switch (stat_a[0].frametype) {
-  case I_TYPE:
-    printf("I FRAME\n");
-    break;
-  case P_TYPE:
-    printf("P FRAME\n");
-    break;
-  case B_TYPE:
-    printf("B FRAME\n");
-    break;
-  }
-
-  printf("Size: %d bytes + %d bits\n", stat_a[0].totsize / 8, stat_a[0].totsize % 8);
-  if (stat_a[0].i_mbnum > 0) {
-    printf("\tI Macro Block Stats:\n");
-    printf("\t%d I Macroblocks\n", stat_a[0].i_mbnum);
-    printf("\tAvg. Size: %d bytes + %d bits\n",
-	   stat_a[0].i_mbsize / (8 * stat_a[0].i_mbnum),
-	   (stat_a[0].i_mbsize * stat_a[0].i_mbnum) % 8);
-    printf("\t\tCoded Block Pattern Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].i_mbcbp[i],
-	     stat_a[0].i_mbcbp[i + 1], stat_a[0].i_mbcbp[i + 2], stat_a[0].i_mbcbp[i + 3],
-	     stat_a[0].i_mbcbp[i + 4], stat_a[0].i_mbcbp[i + 5], stat_a[0].i_mbcbp[i + 6],
-	     stat_a[0].i_mbcbp[i + 7]);
-    }
-    printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].i_mbcoeff[i],
-	     stat_a[0].i_mbcoeff[i + 1], stat_a[0].i_mbcoeff[i + 2],
-	     stat_a[0].i_mbcoeff[i + 3], stat_a[0].i_mbcoeff[i + 4],
-	     stat_a[0].i_mbcoeff[i + 5], stat_a[0].i_mbcoeff[i + 6],
-	     stat_a[0].i_mbcoeff[i + 7]);
-    }
-  }
-  if (stat_a[0].p_mbnum > 0) {
-    printf("\tP Macro Block Stats:\n");
-    printf("\t%d P Macroblocks\n", stat_a[0].p_mbnum);
-    printf("\tAvg. Size: %d bytes + %d bits\n",
-	   stat_a[0].p_mbsize / (8 * stat_a[0].p_mbnum),
-	   (stat_a[0].p_mbsize / stat_a[0].p_mbnum) % 8);
-    printf("\t\tCoded Block Pattern Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].p_mbcbp[i],
-	     stat_a[0].p_mbcbp[i + 1], stat_a[0].p_mbcbp[i + 2], stat_a[0].p_mbcbp[i + 3],
-	     stat_a[0].p_mbcbp[i + 4], stat_a[0].p_mbcbp[i + 5], stat_a[0].p_mbcbp[i + 6],
-	     stat_a[0].p_mbcbp[i + 7]);
-    }
-    printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].p_mbcoeff[i],
-	     stat_a[0].p_mbcoeff[i + 1], stat_a[0].p_mbcoeff[i + 2],
-	     stat_a[0].p_mbcoeff[i + 3], stat_a[0].p_mbcoeff[i + 4],
-	     stat_a[0].p_mbcoeff[i + 5], stat_a[0].p_mbcoeff[i + 6],
-	     stat_a[0].p_mbcoeff[i + 7]);
-    }
-  }
-  if (stat_a[0].b_mbnum > 0) {
-    printf("\tB Macro Block Stats:\n");
-    printf("\t%d B Macroblocks\n", stat_a[0].b_mbnum);
-    printf("\tAvg. Size: %d bytes + %d bits\n",
-	   stat_a[0].b_mbsize / (8 * stat_a[0].b_mbnum),
-	   (stat_a[0].b_mbsize / stat_a[0].b_mbnum) % 8);
-    printf("\t\tCoded Block Pattern Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].b_mbcbp[i],
-	     stat_a[0].b_mbcbp[i + 1], stat_a[0].b_mbcbp[i + 2], stat_a[0].b_mbcbp[i + 3],
-	     stat_a[0].b_mbcbp[i + 4], stat_a[0].b_mbcbp[i + 5], stat_a[0].b_mbcbp[i + 6],
-	     stat_a[0].b_mbcbp[i + 7]);
-    }
-    printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].b_mbcoeff[i],
-	     stat_a[0].b_mbcoeff[i + 1], stat_a[0].b_mbcoeff[i + 2],
-	     stat_a[0].b_mbcoeff[i + 3], stat_a[0].b_mbcoeff[i + 4],
-	     stat_a[0].b_mbcoeff[i + 5], stat_a[0].b_mbcoeff[i + 6],
-	     stat_a[0].b_mbcoeff[i + 7]);
-    }
-  }
-  if (stat_a[0].bi_mbnum > 0) {
-    printf("\tBi Macro Block Stats:\n");
-    printf("\t%d Bi Macroblocks\n", stat_a[0].bi_mbnum);
-    printf("\tAvg. Size: %d bytes + %d bits\n",
-	   stat_a[0].bi_mbsize / (8 * stat_a[0].bi_mbnum),
-	   (stat_a[0].bi_mbsize * stat_a[0].bi_mbnum) % 8);
-    printf("\t\tCoded Block Pattern Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].bi_mbcbp[i],
-	     stat_a[0].bi_mbcbp[i + 1], stat_a[0].bi_mbcbp[i + 2], stat_a[0].bi_mbcbp[i + 3],
-	     stat_a[0].bi_mbcbp[i + 4], stat_a[0].bi_mbcbp[i + 5], stat_a[0].bi_mbcbp[i + 6],
-	     stat_a[0].bi_mbcbp[i + 7]);
-    }
-    printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-    for (i = 0; i < 64; i += 8) {
-      printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[0].bi_mbcoeff[i],
-	     stat_a[0].bi_mbcoeff[i + 1], stat_a[0].bi_mbcoeff[i + 2],
-	     stat_a[0].bi_mbcoeff[i + 3], stat_a[0].bi_mbcoeff[i + 4],
-	     stat_a[0].bi_mbcoeff[i + 5], stat_a[0].bi_mbcoeff[i + 6],
-	     stat_a[0].bi_mbcoeff[i + 7]);
-    }
-  }
-  printf("\nTime to Decode: %g secs.\n", stat_a[0].tottime);
-  printf("****************\n");
-}
-
-void
-PrintAllStats()
-{
-  int i, j;
-  unsigned int supertot, supernum;
-  double supertime;
-
-  printf("\n");
-  printf("General Info: \n");
-  printf("Width: %d\nHeight: %d\n", curVidStream->mb_width * 16, curVidStream->mb_height * 16);
-
-  for (i = 1; i < 4; i++) {
-
-    if (stat_a[i].number == 0)
-      continue;
-
-    switch (i) {
-    case 1:
-      printf("I FRAMES\n");
-      break;
-    case 2:
-      printf("P FRAMES\n");
-      break;
-    case 3:
-      printf("B FRAMES\n");
-      break;
-    }
-
-    printf("Number: %d\n", stat_a[i].number);
-    printf("Avg. Size: %d bytes + %d bits\n",
-	   stat_a[i].totsize / (8 * stat_a[i].number), (stat_a[i].totsize / stat_a[i].number) % 8);
-    if (stat_a[i].i_mbnum > 0) {
-      printf("\tI Macro Block Stats:\n");
-      printf("\t%d I Macroblocks\n", stat_a[i].i_mbnum);
-      printf("\tAvg. Size: %d bytes + %d bits\n",
-	     stat_a[i].i_mbsize / (8 * stat_a[i].i_mbnum),
-	     (stat_a[i].i_mbsize / stat_a[i].i_mbnum) % 8);
-      printf("\t\tCoded Block Pattern Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].i_mbcbp[j],
-	       stat_a[i].i_mbcbp[j + 1], stat_a[i].i_mbcbp[j + 2], stat_a[i].i_mbcbp[j + 3],
-	       stat_a[i].i_mbcbp[j + 4], stat_a[i].i_mbcbp[j + 5], stat_a[i].i_mbcbp[j + 6],
-	       stat_a[i].i_mbcbp[j + 7]);
-      }
-      printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].i_mbcoeff[j],
-	       stat_a[i].i_mbcoeff[j + 1], stat_a[i].i_mbcoeff[j + 2],
-	       stat_a[i].i_mbcoeff[j + 3], stat_a[i].i_mbcoeff[j + 4],
-	       stat_a[i].i_mbcoeff[j + 5], stat_a[i].i_mbcoeff[j + 6],
-	       stat_a[i].i_mbcoeff[j + 7]);
-      }
-    }
-    if (stat_a[i].p_mbnum > 0) {
-      printf("\tP Macro Block Stats:\n");
-      printf("\t%d P Macroblocks\n", stat_a[i].p_mbnum);
-      printf("\tAvg. Size: %d bytes + %d bits\n",
-	     stat_a[i].p_mbsize / (8 * stat_a[i].p_mbnum),
-	     (stat_a[i].p_mbsize / stat_a[i].p_mbnum) % 8);
-      printf("\t\tCoded Block Pattern Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].p_mbcbp[j],
-	       stat_a[i].p_mbcbp[j + 1], stat_a[i].p_mbcbp[j + 2], stat_a[i].p_mbcbp[j + 3],
-	       stat_a[i].p_mbcbp[j + 4], stat_a[i].p_mbcbp[j + 5], stat_a[i].p_mbcbp[j + 6],
-	       stat_a[i].p_mbcbp[j + 7]);
-      }
-      printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].p_mbcoeff[j],
-	       stat_a[i].p_mbcoeff[j + 1], stat_a[i].p_mbcoeff[j + 2],
-	       stat_a[i].p_mbcoeff[j + 3], stat_a[i].p_mbcoeff[j + 4],
-	       stat_a[i].p_mbcoeff[j + 5], stat_a[i].p_mbcoeff[j + 6],
-	       stat_a[i].p_mbcoeff[j + 7]);
-      }
-    }
-    if (stat_a[i].b_mbnum > 0) {
-      printf("\tB Macro Block Stats:\n");
-      printf("\t%d B Macroblocks\n", stat_a[i].b_mbnum);
-      printf("\tAvg. Size: %d bytes + %d bits\n",
-	     stat_a[i].b_mbsize / (8 * stat_a[i].b_mbnum),
-	     (stat_a[i].b_mbsize * stat_a[i].b_mbnum) % 8);
-      printf("\t\tCoded Block Pattern Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].b_mbcbp[j],
-	       stat_a[i].b_mbcbp[j + 1], stat_a[i].b_mbcbp[j + 2], stat_a[i].b_mbcbp[j + 3],
-	       stat_a[i].b_mbcbp[j + 4], stat_a[i].b_mbcbp[j + 5], stat_a[i].b_mbcbp[j + 6],
-	       stat_a[i].b_mbcbp[j + 7]);
-      }
-      printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].b_mbcoeff[j],
-	       stat_a[i].b_mbcoeff[j + 1], stat_a[i].b_mbcoeff[j + 2],
-	       stat_a[i].b_mbcoeff[j + 3], stat_a[i].b_mbcoeff[j + 4],
-	       stat_a[i].b_mbcoeff[j + 5], stat_a[i].b_mbcoeff[j + 6],
-	       stat_a[i].b_mbcoeff[j + 7]);
-      }
-    }
-    if (stat_a[i].bi_mbnum > 0) {
-      printf("\tBi Macro Block Stats:\n");
-      printf("\t%d Bi Macroblocks\n", stat_a[i].bi_mbnum);
-      printf("\tAvg. Size: %d bytes + %d bits\n",
-	     stat_a[i].bi_mbsize / (8 * stat_a[i].bi_mbnum),
-	     (stat_a[i].bi_mbsize * stat_a[i].bi_mbnum) % 8);
-      printf("\t\tCoded Block Pattern Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].bi_mbcbp[j],
-	       stat_a[i].bi_mbcbp[j + 1], stat_a[i].bi_mbcbp[j + 2], stat_a[i].bi_mbcbp[j + 3],
-	       stat_a[i].bi_mbcbp[j + 4], stat_a[i].bi_mbcbp[j + 5], stat_a[i].bi_mbcbp[j + 6],
-	       stat_a[i].bi_mbcbp[j + 7]);
-      }
-      printf("\n\t\tNumber of Coefficients/Block Histogram:\n");
-      for (j = 0; j < 64; j += 8) {
-	printf("\t%.6d %.6d %.6d %.6d %.6d %.6d %.6d %.6d\n", stat_a[i].bi_mbcoeff[j],
-	       stat_a[i].bi_mbcoeff[j + 1], stat_a[i].bi_mbcoeff[j + 2],
-	       stat_a[i].bi_mbcoeff[j + 3], stat_a[i].bi_mbcoeff[j + 4],
-	       stat_a[i].bi_mbcoeff[j + 5], stat_a[i].bi_mbcoeff[j + 6],
-	       stat_a[i].bi_mbcoeff[j + 7]);
-      }
-    }
-    printf("\nAvg. Time to Decode: %f secs.\n",
-	   (stat_a[i].tottime / ((double) stat_a[i].number)));
-    printf("\n");
-    printf("*************************\n\n");
-  }
-
-  supertot = stat_a[1].totsize + stat_a[2].totsize + stat_a[3].totsize;
-  supernum = stat_a[1].number + stat_a[2].number + stat_a[3].number;
-  supertime = stat_a[1].tottime + stat_a[2].tottime + stat_a[3].tottime;
-
-  printf("Total Number of Frames: %d\n", supernum);
-  printf("Avg Frame Size: %d bytes %d bits\n",
-	 supertot / (8 * supernum), (supertot / supernum) % 8);
-  printf("Total Time Decoding: %g secs.\n", supertime);
-  printf("Avg Decoding Time/Frame: %g secs.\n", supertime / ((double) supernum));
-  printf("Avg Decoding Frames/Sec: %g secs.\n", ((double) supernum) / supertime);
-  printf("\n");
-
-  printf("Cache Hits/Miss\n");
-  for (i = 0; i < 8; i++) {
-    printf("%.6d/%.6d\t%.6d/%.6d\t%.6d/%.6d\t%.6d/%.6d\n",
-	   cacheHit[i][0], cacheMiss[i][0], cacheHit[i][1], cacheMiss[i][1],
-	   cacheHit[i][2], cacheMiss[i][2], cacheHit[i][3], cacheMiss[i][3]);
-    printf("%.6d/%.6d\t%.6d/%.6d\t%.6d/%.6d\t%.6d/%.6d\n",
-	   cacheHit[i][4], cacheMiss[i][4], cacheHit[i][5], cacheMiss[i][5],
-	   cacheHit[i][6], cacheMiss[i][6], cacheHit[i][7], cacheMiss[i][7]);
-  }
-
-}
-
-static void
-CollectStats()
-{
-  int i, j;
-
-  i = stat_a[0].frametype;
-
-  stat_a[i].totsize += stat_a[0].totsize;
-  stat_a[i].number += stat_a[0].number;
-  stat_a[i].i_mbsize += stat_a[0].i_mbsize;
-  stat_a[i].p_mbsize += stat_a[0].p_mbsize;
-  stat_a[i].b_mbsize += stat_a[0].b_mbsize;
-  stat_a[i].bi_mbsize += stat_a[0].bi_mbsize;
-  stat_a[i].i_mbnum += stat_a[0].i_mbnum;
-  stat_a[i].p_mbnum += stat_a[0].p_mbnum;
-  stat_a[i].b_mbnum += stat_a[0].b_mbnum;
-  stat_a[i].bi_mbnum += stat_a[0].bi_mbnum;
-
-  for (j = 0; j < 64; j++) {
-
-    stat_a[i].i_mbcbp[j] += stat_a[0].i_mbcbp[j];
-    stat_a[i].p_mbcbp[j] += stat_a[0].p_mbcbp[j];
-    stat_a[i].b_mbcbp[j] += stat_a[0].b_mbcbp[j];
-    stat_a[i].bi_mbcbp[j] += stat_a[0].bi_mbcbp[j];
-    stat_a[i].i_mbcoeff[j] += stat_a[0].i_mbcoeff[j];
-    stat_a[i].p_mbcoeff[j] += stat_a[0].p_mbcoeff[j];
-    stat_a[i].b_mbcoeff[j] += stat_a[0].b_mbcoeff[j];
-    stat_a[i].bi_mbcoeff[j] += stat_a[0].bi_mbcoeff[j];
-  }
-
-  stat_a[i].tottime += stat_a[0].tottime;
-
-  init_stat_struct(&(stat_a[0]));
-}
-
-static unsigned int
-bitCountRead()
-{
-  return bitCount;
-}
-
-static void
-StartTime()
-{
-  stat_a[0].tottime = ReadSysClock();
-}
-
-static void
-EndTime()
-{
-  stat_a[0].tottime = ReadSysClock() - stat_a[0].tottime;
-}
-#endif
-
-double realTimeStart;
-int totNumFrames = 0;
-
-double
-ReadSysClock()
-{
-  struct timeval tv;
-  (void) gettimeofday(&tv, (struct timezone *)NULL);
-  return (tv.tv_sec + tv.tv_usec / 1000000.0);
-}
-
-void
-PrintTimeInfo()
-{
-  double spent;
-
-  spent = ReadSysClock() - realTimeStart;
-
-  if (!quietFlag) {
-    printf("\nReal Time Spent (After Initializations): %f secs.\n", spent);
-    printf("Avg. Frames/Sec: %f\n", ((double) totNumFrames) / spent);
-/*
-   print_delta();
-*/
-  }
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * NewVidStream --
- *
- *	Allocates and initializes a VidStream structure. Takes
- *      as parameter requested size for buffer length.
- *
- * Results:
- *	A pointer to the new VidStream structure.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-VidStream * NewVidStream(void)
-{
-  int i, j;
-  VidStream *new_stream;
-  static unsigned char default_intra_matrix[64] = {
-    8, 16, 19, 22, 26, 27, 29, 34,
-    16, 16, 22, 24, 27, 29, 34, 37,
-    19, 22, 26, 27, 29, 34, 34, 38,
-    22, 22, 26, 27, 29, 34, 37, 40,
-    22, 26, 27, 29, 32, 35, 40, 48,
-    26, 27, 29, 32, 35, 40, 48, 58,
-    26, 27, 29, 34, 38, 46, 56, 69,
-  27, 29, 35, 38, 46, 56, 69, 83};
-  
-  /* Allocate memory for new structure. */
-
-  new_stream = (VidStream *) malloc(sizeof(VidStream));
-
-  /* Initialize pointers to extension and user data. */
-
-  new_stream->group.ext_data = new_stream->group.user_data =
-    new_stream->picture.extra_info = new_stream->picture.user_data =
-    new_stream->picture.ext_data = new_stream->slice.extra_info =
-    new_stream->ext_data = new_stream->user_data = NULL;
-
-  /* Copy default intra matrix. */
-
-  for (i = 0; i < 8; i++) {
-    for (j = 0; j < 8; j++) {
-      new_stream->intra_quant_matrix[j][i] = default_intra_matrix[i * 8 + j];
-    }
-  }
-
-  /* Initialize crop table. */
-
-  for (i = (-MAX_NEG_CROP); i < NUM_CROP_ENTRIES - MAX_NEG_CROP; i++) {
-    if (i <= 0) {
-      cropTbl[i + MAX_NEG_CROP] = 0;
-    } else if (i >= 255) {
-      cropTbl[i + MAX_NEG_CROP] = 255;
-    } else {
-      cropTbl[i + MAX_NEG_CROP] = i;
-    }
-  }
-
-  /* Initialize non intra quantization matrix. */
-
-  for (i = 0; i < 8; i++) {
-    for (j = 0; j < 8; j++) {
-      new_stream->non_intra_quant_matrix[j][i] = 16;
-    }
-  }
-
-  /* Initialize pointers to image spaces. */
-
-  new_stream->current = new_stream->past = new_stream->future = NULL;
-  for (i = 0; i < RING_BUF_SIZE; i++) {
-    new_stream->ring[i] = NULL;
-  }
-
-
-  /* Initialize bitstream i/o fields. */
-
-  new_stream->max_buf_length = 0;
-  new_stream->bit_offset = 0;
-  new_stream->buf_length = 0;
-  new_stream->buffer = new_stream->buf_start = NULL;
-
-
-  /* Return structure. */
-
-  return new_stream;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * DestroyVidStream --
- *
- *	Deallocates a VidStream structure.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-DestroyVidStream(VidStream *astream)
-{
-  int i;
-
-  if (astream->ext_data != NULL)
-    free(astream->ext_data);
-
-  if (astream->user_data != NULL)
-    free(astream->user_data);
-
-  if (astream->group.ext_data != NULL)
-    free(astream->group.ext_data);
-
-  if (astream->group.user_data != NULL)
-    free(astream->group.user_data);
-
-  if (astream->picture.extra_info != NULL)
-    free(astream->picture.extra_info);
-
-  if (astream->picture.ext_data != NULL)
-    free(astream->picture.ext_data);
-
-  if (astream->picture.user_data != NULL)
-    free(astream->picture.user_data);
-
-  if (astream->slice.extra_info != NULL)
-    free(astream->slice.extra_info);
-
-  if (astream->buf_start != NULL)
-    free(astream->buf_start);
-
-  for (i = 0; i < RING_BUF_SIZE; i++) {
-    if (astream->ring[i] != NULL) {
-      DestroyPictImage(astream->ring[i]);
-      astream->ring[i] = NULL;
-    }
-  }
-
-  free((char *) astream);
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * NewPictImage --
- *
- *	Allocates and initializes a PictImage structure.
- *      The width and height of the image space are passed in
- *      as parameters.
- *
- * Results:
- *	A pointer to the new PictImage structure.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-PictImage *
-NewPictImage(unsigned int width, unsigned int height)
-{
-  PictImage *new_pi;
-
-  /* Allocate memory space for new structure. */
-
-  new_pi = (PictImage *) malloc(sizeof(PictImage));
-  new_pi->luminance = (unsigned char *) malloc(width * height);
-  new_pi->Cr = (unsigned char *) malloc(width * height / 4);
-  new_pi->Cb = (unsigned char *) malloc(width * height / 4);
-  
-  /* Reset locked flag. */
-
-  new_pi->locked = 0;
-
-  /* Return pointer to new structure. */
-
-  return new_pi;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * DestroyPictImage --
- *
- *	Deallocates a PictImage structure.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-void
-DestroyPictImage(PictImage *apictimage)
-{
-  if (apictimage->luminance != NULL) {
-    free(apictimage->luminance);
-  }
-  if (apictimage->Cr != NULL) {
-    free(apictimage->Cr);
-  }
-  if (apictimage->Cb != NULL) {
-    free(apictimage->Cb);
-  }
-  free(apictimage);
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * mpegVidRsrc --
- *
- *      Parses bit stream until a picture is decoded
- *
- * Results:
- *    	0 - successfully decoded a frame, -1 - failed
- *
- * Side effects:
- *      Bit stream is irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-int mpegVidRsrc(char *packet)
-{
-  TimeStamp time_stamp = 0;
-  VidStream *vid_stream = curVidStream;
-  unsigned int data;
-  int i, status;
-  VideoPacket *p = (VideoPacket *) packet;
-  
-  /* initialize buffer info and allocate ring item for current frame */
-  (curVidStream->buf_start) = (curVidStream->buffer) =
-                              (unsigned int *)(packet + sizeof(*p));
-  curVidStream->max_buf_length = curVidStream->buf_length =
-                           (p->dataBytes + 11)>>2;
-  curVidStream->bit_offset = 0;
-  
-  i = 0;
-  while (curVidStream->ring[i]->locked != 0)
-  if (++i >= RING_BUF_SIZE) {
-    perror("VD fatal error. Ring buffer full.");
-    exit(1);
-  }
-  curVidStream->current = curVidStream->ring[i];
-  curVidStream->current->sh = p->sh;
-  curVidStream->current->gop = p->gop;
-  curVidStream->current->frame = p->frame;
-  curVidStream->current->display = p->display;
-  curVidStream->current->future = p->future;
-  curVidStream->current->past = p->past;
-  
-  bitOffset = curVidStream->bit_offset;
-#ifdef UTIL2
-  curBits = *curVidStream->buffer << bitOffset;
-#else
-  curBits = *curVidStream->buffer;
-#endif
-  bufLength = curVidStream->buf_length;
-  bitBuffer = curVidStream->buffer;
-
-  /*
-   * If called for the INIT command, find start code, make sure it is a
-   * sequence start code.
-   */
-
-  if (shared->cmd == CmdINIT) {
-    next_start_code();
-    show_bits32(data);
-    if (data != SEQ_START_CODE) {
-      fprintf(stderr, "VD error: This is not first packet of the an MPEG stream, data %u.", data);
-      DestroyVidStream(curVidStream);
-      exit(1);
-    }
-  }
-  /* Get next 32 bits (size of start codes). */
-
-  show_bits32(data);
-
-  /* Process according to start code   */
-
-  switch (data)
-  {
-  case SEQ_END_CODE:
-
-    /* Display last frame. */
-    /*
-    fprintf(stderr, "VD: SEQ_END_CODE decoded.\n");
-    */
-    if (vid_stream->future != NULL)
-    {
-      vid_stream->current = vid_stream->future;
-      return 0;
-    }
-    else
-    {
-      fprintf(stderr, "VD error: no more picture for SEQ_END_CODE\n");
-      return -1;
-    }
-
-  case SEQ_START_CODE:
-
-    /* Sequence start code. Parse sequence header. */
-
-    if (ParseSeqHead(vid_stream) != PARSE_OK)
-    {
-      fprintf(stderr, "VD error on decoding SequenceHeader.\n");
-      return -1;
-    }
-
-    /*
-     * modify vid_stream after sequence start code so that application above can use
-     * info in header.
-     */
-
-    vid_stream->buffer = bitBuffer;
-    vid_stream->buf_length = bufLength;
-    vid_stream->bit_offset = bitOffset;
-    vid_stream->shid = ((VideoPacket *)packet)->sh;
-
-  case GOP_START_CODE:
-
-    /* Group of Pictures start code. Parse gop header. */
-
-    if (ParseGOP(vid_stream) != PARSE_OK)
-    {
-      fprintf(stderr, "VD error on decoding GOP\n");
-      return -1;
-    }
-    
-    vid_stream->gopid = ((VideoPacket *)packet)->gop;
-
-  case PICTURE_START_CODE:
-
-    /* Picture start code. Parse picture header and first slice header. */
-
-    if (vid_stream->gopid != ((VideoPacket *)packet)->gop ||
-	vid_stream->shid != ((VideoPacket *)packet)->sh)
-    {
-      shared->needHeader = 1;
-      /*
-      fprintf(stderr, "VD error: SeqHeader and/or GOP not available for the picture");
-      */
-      return -1;
-    }
-
-    if (ParsePicture(vid_stream, time_stamp) != PARSE_OK)
-    {
-      /*
-      fprintf(stderr, "VD error on parsing Picture header\n");
-      */
-      return -1;
-    }
-    /* parse all the following slices */
-    for (;;)
-    {
-      if (ParseSlice(vid_stream) != PARSE_OK)
-      {
-        fprintf(stderr, "VD error on decoding a Slice header.\n");
-        return -1;
-      }
-      /* Parse all following macroblocks. */
-      for (;;)
-      {
-	int res;
-        /* Check to see if actually a startcode and not a macroblock. */
-        if (!next_bits(23, 0x00000000))
-	{
-          /* Not start code. Parse Macroblock. */
-          if ((res = ParseMacroBlock(vid_stream)) != PARSE_OK)
-	  {
-	    fprintf(stderr, "VD error on parsing a MacroBlock, res = %d\n", res);
-	    return -1;
-	  }
-        }
-	else
-	{
-          /* Not macroblock, actually start code. Get start code. */
-          next_start_code();
-          show_bits32(data);
-
-	  /* If start code is outside range of slice start codes, frame is
-             complete, display frame, otherwise another slice */
-          if ((data < SLICE_MIN_START_CODE) || (data > SLICE_MAX_START_CODE))
-	    return 0;
-	  else
-	    break;
-	}
-      }
-    }
-    break;
-  default:
-    fprintf(stderr, "VD error: fail to clasify the packet.\n");
-    return -1;
-  }
-  fprintf(stderr, "VD get wired.\n");
-  return -1;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParseSeqHead --
- *
- *      Assumes bit stream is at the begining of the sequence
- *      header start code. Parses off the sequence header.
- *
- * Results:
- *      Fills the vid_stream structure with values derived and
- *      decoded from the sequence header. Allocates the pict image
- *      structures based on the dimensions of the image space
- *      found in the sequence header.
- *
- * Side effects:
- *      Bit stream irreversibly parsed off.
- *
- *--------------------------------------------------------------
- */
-
-static int
-ParseSeqHead(VidStream *vid_stream)
-{
-
-  unsigned int data;
-  int i;
-
-  /* Flush off sequence start code. */
-
-  flush_bits32;
-
-  /* Get horizontal size of image space. */
-
-  get_bits12(data);
-  vid_stream->h_size = data;
-
-  /* Get vertical size of image space. */
-
-  get_bits12(data);
-  vid_stream->v_size = data;
-
-  /* Calculate macroblock width and height of image space. */
-
-  vid_stream->mb_width = (vid_stream->h_size + 15) / 16;
-  vid_stream->mb_height = (vid_stream->v_size + 15) / 16;
-
-  /* If dither type is MBORDERED allocate ditherFlags. */
-
-  if (ditherType == MBORDERED_DITHER) {
-    ditherFlags = (char *) malloc(vid_stream->mb_width*vid_stream->mb_height);
-  }
-
-  /* Initialize lmaxx, lmaxy, cmaxx, cmaxy. */
-
-  lmaxx = vid_stream->mb_width*16-1;
-  lmaxy = vid_stream->mb_height*16-1;
-  cmaxx = vid_stream->mb_width*8-1;
-  cmaxy = vid_stream->mb_height*8-1;
-
-  /* Parse of aspect ratio code. */
-
-  get_bits4(data);
-  vid_stream->aspect_ratio = (unsigned char) data;
-
-  /* Parse off picture rate code. */
-
-  get_bits4(data);
-  vid_stream->picture_rate = (unsigned char) data;
-
-  /* Parse off bit rate. */
-
-  get_bits18(data);
-  vid_stream->bit_rate = data;
-
-  /* Flush marker bit. */
-
-  flush_bits(1);
-
-  /* Parse off vbv buffer size. */
-
-  get_bits10(data);
-  vid_stream->vbv_buffer_size = data;
-
-  /* Parse off contrained parameter flag. */
-
-  get_bits1(data);
-  if (data) {
-    vid_stream->const_param_flag = TRUE;
-  } else
-    vid_stream->const_param_flag = FALSE;
-
-  /*
-   * If intra_quant_matrix_flag set, parse off intra quant matrix values.
-   */
-
-  get_bits1(data);
-  if (data) {
-    for (i = 0; i < 64; i++) {
-      get_bits8(data);
-
-      vid_stream->intra_quant_matrix[zigzag[i][1]][zigzag[i][0]] =
-	(unsigned char) data;
-    }
-  }
-  /*
-   * If non intra quant matrix flag set, parse off non intra quant matrix
-   * values.
-   */
-
-  get_bits1(data);
-  if (data) {
-    for (i = 0; i < 64; i++) {
-      get_bits8(data);
-
-      vid_stream->non_intra_quant_matrix[zigzag[i][1]][zigzag[i][0]] =
-	(unsigned char) data;
-    }
-  }
-  /* Go to next start code. */
-
-  next_start_code();
-
-  /*
-   * If next start code is extension start code, parse off extension data.
-   */
-
-  if (next_bits(32, EXT_START_CODE)) {
-    flush_bits32;
-    if (vid_stream->ext_data != NULL) {
-      free(vid_stream->ext_data);
-      vid_stream->ext_data = NULL;
-    }
-    vid_stream->ext_data = get_ext_data();
-  }
-  /* If next start code is user start code, parse off user data. */
-
-  if (next_bits(32, USER_START_CODE)) {
-    flush_bits32;
-    if (vid_stream->user_data != NULL) {
-      free(vid_stream->user_data);
-      vid_stream->user_data = NULL;
-    }
-    vid_stream->user_data = get_ext_data();
-  }
-  return PARSE_OK;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParseGOP --
- *
- *      Parses of group of pictures header from bit stream
- *      associated with vid_stream.
- *
- * Results:
- *      Values in gop header placed into video stream structure.
- *
- * Side effects:
- *      Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-static int
-ParseGOP(VidStream *vid_stream)
-{
-  unsigned int data;
-
-  /* Flush group of pictures start code. WWWWWWOOOOOOOSSSSSSHHHHH!!! */
-
-  flush_bits32;
-
-  /* Parse off drop frame flag. */
-
-  get_bits1(data);
-  if (data) {
-    vid_stream->group.drop_flag = TRUE;
-  } else
-    vid_stream->group.drop_flag = FALSE;
-
-  /* Parse off hour component of time code. */
-
-  get_bits5(data);
-  vid_stream->group.tc_hours = data;
-
-  /* Parse off minute component of time code. */
-
-  get_bits6(data);
-  vid_stream->group.tc_minutes = data;
-
-  /* Flush marker bit. */
-
-  flush_bits(1);
-
-  /* Parse off second component of time code. */
-
-  get_bits6(data);
-  vid_stream->group.tc_seconds = data;
-
-  /* Parse off picture count component of time code. */
-
-  get_bits6(data);
-  vid_stream->group.tc_pictures = data;
-  /*
-  Fprintf(stderr, "GOP time_code:%d:%02d:%02d-%02d\n",
-	  vid_stream->group.tc_hours,
-	  vid_stream->group.tc_minutes,
-	  vid_stream->group.tc_seconds,
-	  vid_stream->group.tc_pictures);
-  */
-  /* Parse off closed gop and broken link flags. */
-
-  get_bits2(data);
-  if (data > 1) {
-    vid_stream->group.closed_gop = TRUE;
-    if (data > 2) {
-      vid_stream->group.broken_link = TRUE;
-    } else
-      vid_stream->group.broken_link = FALSE;
-  } else {
-    vid_stream->group.closed_gop = FALSE;
-    if (data) {
-      vid_stream->group.broken_link = TRUE;
-    } else
-      vid_stream->group.broken_link = FALSE;
-  }
-
-  /* Goto next start code. */
-
-  next_start_code();
-
-  /* If next start code is extension data, parse off extension data. */
-
-  if (next_bits(32, EXT_START_CODE)) {
-    flush_bits32;
-    if (vid_stream->group.ext_data != NULL) {
-      free(vid_stream->group.ext_data);
-      vid_stream->group.ext_data = NULL;
-    }
-    vid_stream->group.ext_data = get_ext_data();
-  }
-  /* If next start code is user data, parse off user data. */
-
-  if (next_bits(32, USER_START_CODE)) {
-    flush_bits32;
-    if (vid_stream->group.user_data != NULL) {
-      free(vid_stream->group.user_data);
-      vid_stream->group.user_data = NULL;
-    }
-    vid_stream->group.user_data = get_ext_data();
-  }
-  return PARSE_OK;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParsePicture --
- *
- *      Parses picture header. Marks picture to be presented
- *      at particular time given a time stamp.
- *
- * Results:
- *      Values from picture header put into video stream structure.
- *
- * Side effects:
- *      Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-static int
-ParsePicture(VidStream *vid_stream,TimeStamp time_stamp)
-{
-  unsigned int data;
-  int i;
-
-  /* Flush header start code. */
-  flush_bits32;
-
-  /* Parse off temporal reference. */
-  get_bits10(data);
-  vid_stream->picture.temp_ref = data;
-  /*
-  Fprintf(stderr, "Pic temp_ref %d\n", vid_stream->picture.temp_ref);
-  */
-  /* Parse of picture type. */
-  get_bits3(data);
-  vid_stream->picture.code_type = data;
-
-  if ((vid_stream->picture.code_type == B_TYPE) &&
-      (No_B_Flag ||
-	   (vid_stream->past == NULL) ||
-	   (vid_stream->future == NULL)))
-    return SKIP_PICTURE;
-
-  if ((vid_stream->picture.code_type == P_TYPE) &&
-      (No_P_Flag || (vid_stream->future == NULL)))
-    return SKIP_PICTURE;
-  
-  /* Parse off vbv buffer delay value. */
-  get_bits16(data);
-  vid_stream->picture.vbv_delay = data;
-
-  /* If P or B type frame... */
-
-  if ((vid_stream->picture.code_type == 2) || (vid_stream->picture.code_type == 3)) {
-
-    /* Parse off forward vector full pixel flag. */
-    get_bits1(data);
-    if (data)
-      vid_stream->picture.full_pel_forw_vector = TRUE;
-    else
-      vid_stream->picture.full_pel_forw_vector = FALSE;
-
-    /* Parse of forw_r_code. */
-    get_bits3(data);
-
-    /* Decode forw_r_code into forw_r_size and forw_f. */
-
-    vid_stream->picture.forw_r_size = data - 1;
-    vid_stream->picture.forw_f = (1 << vid_stream->picture.forw_r_size);
-  }
-  /* If B type frame... */
-
-  if (vid_stream->picture.code_type == 3) {
-
-    /* Parse off back vector full pixel flag. */
-    get_bits1(data);
-    if (data)
-      vid_stream->picture.full_pel_back_vector = TRUE;
-    else
-      vid_stream->picture.full_pel_back_vector = FALSE;
-
-    /* Parse off back_r_code. */
-    get_bits3(data);
-
-    /* Decode back_r_code into back_r_size and back_f. */
-
-    vid_stream->picture.back_r_size = data - 1;
-    vid_stream->picture.back_f = (1 << vid_stream->picture.back_r_size);
-  }
-  /* Get extra bit picture info. */
-
-  if (vid_stream->picture.extra_info != NULL) {
-    free(vid_stream->picture.extra_info);
-    vid_stream->picture.extra_info = NULL;
-  }
-  vid_stream->picture.extra_info = get_extra_bit_info();
-
-  /* Goto next start code. */
-  next_start_code();
-
-  /* If start code is extension start code, parse off extension data. */
-
-  if (next_bits(32, EXT_START_CODE)) {
-    flush_bits32;
-
-    if (vid_stream->picture.ext_data != NULL) {
-      free(vid_stream->picture.ext_data);
-      vid_stream->picture.ext_data = NULL;
-    }
-    vid_stream->picture.ext_data = get_ext_data();
-  }
-  /* If start code is user start code, parse off user data. */
-
-  if (next_bits(32, USER_START_CODE)) {
-    flush_bits32;
-
-    if (vid_stream->picture.user_data != NULL) {
-      free(vid_stream->picture.user_data);
-      vid_stream->picture.user_data = NULL;
-    }
-    vid_stream->picture.user_data = get_ext_data();
-  }
-  
-  /* Reset past macroblock address field. */
-
-  vid_stream->mblock.past_mb_addr = -1;
-
-  return PARSE_OK;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * ParseSlice --
- *
- *      Parses off slice header.
- *
- * Results:
- *      Values found in slice header put into video stream structure.
- *
- * Side effects:
- *      Bit stream irreversibly parsed.
- *
- *--------------------------------------------------------------
- */
-
-static int
-ParseSlice(VidStream *vid_stream)
-{
-  unsigned int data;
-
-  /* Flush slice start code. */
-
-  flush_bits(24);
-
-  /* Parse off slice vertical position. */
-
-  get_bits8(data);
-  vid_stream->slice.vert_pos = data;
-
-  /* Parse off quantization scale. */
-
-  get_bits5(data);
-  vid_stream->slice.quant_scale = data;
-
-  /* Parse off extra bit slice info. */
-
-  if (vid_stream->slice.extra_info != NULL) {
-    free(vid_stream->slice.extra_info);
-    vid_stream->slice.extra_info = NULL;
-  }
-  vid_stream->slice.extra_info = get_extra_bit_info();
-
-  /* Reset past intrablock address. */
-
-  vid_stream->mblock.past_intra_addr = -2;
-
-  /* Reset previous recon motion vectors. */
-
-  vid_stream->mblock.recon_right_for_prev = 0;
-  vid_stream->mblock.recon_down_for_prev = 0;
-  vid_stream->mblock.recon_right_back_prev = 0;
-  vid_stream->mblock.recon_down_back_prev = 0;
-
-  /* Reset macroblock address. */
-
-  vid_stream->mblock.mb_address = ((vid_stream->slice.vert_pos - 1) *
-				   vid_stream->mb_width) - 1;
-
-  /* Reset past dct dc y, cr, and cb values. */
-
-  vid_stream->block.dct_dc_y_past = 1024;
-  vid_stream->block.dct_dc_cr_past = 1024;
-  vid_stream->block.dct_dc_cb_past = 1024;
-
-  return PARSE_OK;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ParseMacroBlock --
- *
- *      Parseoff macroblock. Reconstructs DCT values. Applies
- *      inverse DCT, reconstructs motion vectors, calculates and
- *      set pixel values for macroblock in current pict image
- *      structure.
- *
- * Results:
- *      Here's where everything really happens. Welcome to the
- *      heart of darkness.
- *
- * Side effects:
- *      Bit stream irreversibly parsed off.
- *
- *--------------------------------------------------------------
- */
-
-static int
-ParseMacroBlock(VidStream *vid_stream)
-{
-  int addr_incr;
-  unsigned int data;
-  int mask, i, recon_right_for, recon_down_for, recon_right_back,
-      recon_down_back;
-  int zero_block_flag;
-  BOOLEAN mb_quant, mb_motion_forw, mb_motion_back, mb_pattern;
-  int no_dith_flag = 0;
-
-#ifdef ANALYSIS
-  mbSizeCount = bitCountRead();
-#endif
-
-  /*
-   * Parse off macroblock address increment and add to macroblock address.
-   */
-  do {
-    DecodeMBAddrInc(addr_incr);
-    if (addr_incr == MB_ESCAPE) {
-      vid_stream->mblock.mb_address += 33;
-      addr_incr = MB_STUFFING;
-    }
-  } while (addr_incr == MB_STUFFING);
-  vid_stream->mblock.mb_address += addr_incr;
-
-  if (vid_stream->mblock.mb_address > ((vid_stream->mb_height) * (vid_stream->mb_width) - 1))
-  {
-    fprintf(stderr, "mblock.mb_address-%d, mb_height-%d, mb_width-%d, addr_incr-%d\n",
-	    vid_stream->mblock.mb_address, vid_stream->mb_height, vid_stream->mb_width, addr_incr);
-    return SKIP_TO_START_CODE;
-  }
-
-  /*
-   * If macroblocks have been skipped, process skipped macroblocks.
-   */
-
-  if (vid_stream->mblock.mb_address - vid_stream->mblock.past_mb_addr > 1) {
-    if (vid_stream->picture.code_type == P_TYPE)
-      ProcessSkippedPFrameMBlocks(vid_stream);
-    else if (vid_stream->picture.code_type == B_TYPE)
-      ProcessSkippedBFrameMBlocks(vid_stream);
-  }
-  /* Set past macroblock address to current macroblock address. */
-  vid_stream->mblock.past_mb_addr = vid_stream->mblock.mb_address;
-
-  /* Based on picture type decode macroblock type. */
-  switch (vid_stream->picture.code_type) {
-  case I_TYPE:
-    DecodeMBTypeI(mb_quant, mb_motion_forw, mb_motion_back, mb_pattern,
-		  vid_stream->mblock.mb_intra);
-    break;
-
-  case P_TYPE:
-    DecodeMBTypeP(mb_quant, mb_motion_forw, mb_motion_back, mb_pattern,
-		  vid_stream->mblock.mb_intra);
-    break;
-
-  case B_TYPE:
-    DecodeMBTypeB(mb_quant, mb_motion_forw, mb_motion_back, mb_pattern,
-		  vid_stream->mblock.mb_intra);
-    break;
-  }
-
-  /* If quantization flag set, parse off new quantization scale. */
-
-  if (mb_quant == TRUE) {
-    get_bits5(data);
-    vid_stream->slice.quant_scale = data;
-  }
-  /* If forward motion vectors exist... */
-  if (mb_motion_forw == TRUE) {
-
-    /* Parse off and decode horizontal forward motion vector. */
-    DecodeMotionVectors(vid_stream->mblock.motion_h_forw_code);
-
-    /* If horiz. forward r data exists, parse off. */
-
-    if ((vid_stream->picture.forw_f != 1) &&
-	(vid_stream->mblock.motion_h_forw_code != 0)) {
-      get_bitsn(vid_stream->picture.forw_r_size, data);
-      vid_stream->mblock.motion_h_forw_r = data;
-    }
-    /* Parse off and decode vertical forward motion vector. */
-    DecodeMotionVectors(vid_stream->mblock.motion_v_forw_code);
-
-    /* If vert. forw. r data exists, parse off. */
-
-    if ((vid_stream->picture.forw_f != 1) &&
-	(vid_stream->mblock.motion_v_forw_code != 0)) {
-      get_bitsn(vid_stream->picture.forw_r_size, data);
-      vid_stream->mblock.motion_v_forw_r = data;
-    }
-  }
-  /* If back motion vectors exist... */
-  if (mb_motion_back == TRUE) {
-
-    /* Parse off and decode horiz. back motion vector. */
-    DecodeMotionVectors(vid_stream->mblock.motion_h_back_code);
-
-    /* If horiz. back r data exists, parse off. */
-
-    if ((vid_stream->picture.back_f != 1) &&
-	(vid_stream->mblock.motion_h_back_code != 0)) {
-      get_bitsn(vid_stream->picture.back_r_size, data);
-      vid_stream->mblock.motion_h_back_r = data;
-    }
-    /* Parse off and decode vert. back motion vector. */
-    DecodeMotionVectors(vid_stream->mblock.motion_v_back_code);
-
-    /* If vert. back r data exists, parse off. */
-
-    if ((vid_stream->picture.back_f != 1) &&
-	(vid_stream->mblock.motion_v_back_code != 0)) {
-      get_bitsn(vid_stream->picture.back_r_size, data);
-      vid_stream->mblock.motion_v_back_r = data;
-    }
-  }
-#ifdef ANALYSIS
-  if (vid_stream->mblock.mb_intra) {
-    stat_a[0].i_mbnum++;
-    mbCBPPtr = stat_a[0].i_mbcbp;
-    mbCoeffPtr = stat_a[0].i_mbcoeff;
-    mbSizePtr = &(stat_a[0].i_mbsize);
-  } else if (mb_motion_back && mb_motion_forw) {
-    stat_a[0].bi_mbnum++;
-    mbCBPPtr = stat_a[0].bi_mbcbp;
-    mbCoeffPtr = stat_a[0].bi_mbcoeff;
-    mbSizePtr = &(stat_a[0].bi_mbsize);
-  } else if (mb_motion_back) {
-    stat_a[0].b_mbnum++;
-    mbCBPPtr = stat_a[0].b_mbcbp;
-    mbCoeffPtr = stat_a[0].b_mbcoeff;
-    mbSizePtr = &(stat_a[0].b_mbsize);
-  } else {
-    stat_a[0].p_mbnum++;
-    mbCBPPtr = stat_a[0].p_mbcbp;
-    mbCoeffPtr = stat_a[0].p_mbcoeff;
-    mbSizePtr = &(stat_a[0].p_mbsize);
-  }
-#endif
-
-  /* If mblock pattern flag set, parse and decode CBP (code block pattern). */
-  if (mb_pattern == TRUE) {
-    DecodeCBP(vid_stream->mblock.cbp);
-  }
-  /* Otherwise, set CBP to zero. */
-  else
-    vid_stream->mblock.cbp = 0;
-
-
-#ifdef ANALYSIS
-  mbCBPPtr[vid_stream->mblock.cbp]++;
-#endif
-
-  /* Reconstruct motion vectors depending on picture type. */
-  if (vid_stream->picture.code_type == P_TYPE) {
-
-    /*
-     * If no forw motion vectors, reset previous and current vectors to 0.
-     */
-
-    if (!mb_motion_forw) {
-      recon_right_for = 0;
-      recon_down_for = 0;
-      vid_stream->mblock.recon_right_for_prev = 0;
-      vid_stream->mblock.recon_down_for_prev = 0;
-    }
-    /*
-     * Otherwise, compute new forw motion vectors. Reset previous vectors to
-     * current vectors.
-     */
-
-    else {
-      ComputeForwVector(&recon_right_for, &recon_down_for);
-    }
-  }
-  if (vid_stream->picture.code_type == B_TYPE) {
-
-    /* Reset prev. and current vectors to zero if mblock is intracoded. */
-
-    if (vid_stream->mblock.mb_intra) {
-      vid_stream->mblock.recon_right_for_prev = 0;
-      vid_stream->mblock.recon_down_for_prev = 0;
-      vid_stream->mblock.recon_right_back_prev = 0;
-      vid_stream->mblock.recon_down_back_prev = 0;
-    } else {
-
-      /* If no forw vectors, current vectors equal prev. vectors. */
-
-      if (!mb_motion_forw) {
-	recon_right_for = vid_stream->mblock.recon_right_for_prev;
-	recon_down_for = vid_stream->mblock.recon_down_for_prev;
-      }
-      /*
-       * Otherwise compute forw. vectors. Reset prev vectors to new values.
-       */
-
-      else {
-        ComputeForwVector(&recon_right_for, &recon_down_for);
-      }
-
-      /* If no back vectors, set back vectors to prev back vectors. */
-
-      if (!mb_motion_back) {
-	recon_right_back = vid_stream->mblock.recon_right_back_prev;
-	recon_down_back = vid_stream->mblock.recon_down_back_prev;
-      }
-      /* Otherwise compute new vectors and reset prev. back vectors. */
-
-      else {
-	ComputeBackVector(&recon_right_back, &recon_down_back);
-      }
-
-      /*
-       * Store vector existance flags in structure for possible skipped
-       * macroblocks to follow.
-       */
-
-      vid_stream->mblock.bpict_past_forw = mb_motion_forw;
-      vid_stream->mblock.bpict_past_back = mb_motion_back;
-    }
-  }
-
-  /* For each possible block in macroblock. */
-  if (ditherType == GRAY_DITHER ||
-      ditherType == MONO_DITHER ||
-      ditherType == MONO_THRESHOLD) {
-    for (mask = 32, i = 0; i < 4; mask >>= 1, i++) {
-
-      /* If block exists... */
-      if ((vid_stream->mblock.mb_intra) || (vid_stream->mblock.cbp & mask)) {
-	zero_block_flag = 0;
-	ParseReconBlock(i);
-      } else {
-	zero_block_flag = 1;
-      }
-
-      /* If macroblock is intra coded... */
-      if (vid_stream->mblock.mb_intra) {
-	ReconIMBlock(vid_stream, i);
-      } else if (mb_motion_forw && mb_motion_back) {
-	ReconBiMBlock(vid_stream, i, recon_right_for, recon_down_for,
-		      recon_right_back, recon_down_back, zero_block_flag);
-      } else if (mb_motion_forw || (vid_stream->picture.code_type == P_TYPE)) {
-	ReconPMBlock(vid_stream, i, recon_right_for, recon_down_for,
-		     zero_block_flag);
-      } else if (mb_motion_back) {
-	ReconBMBlock(vid_stream, i, recon_right_back, recon_down_back,
-		     zero_block_flag);
-      }
-    }
-    /* Kill the Chrominace blocks... */
-    if ((vid_stream->mblock.mb_intra) || (vid_stream->mblock.cbp & 0x2)) {
-        ParseAwayBlock(4);
-    }
-    if ((vid_stream->mblock.mb_intra) || (vid_stream->mblock.cbp & 0x1)) {
-        ParseAwayBlock(5);
-    }
-  } else {
-    if ((ditherType == MBORDERED_DITHER) &&
-	(vid_stream->mblock.cbp == 0) &&
-	(vid_stream->picture.code_type == 3) &&
-	(!vid_stream->mblock.mb_intra) &&
-	(!(mb_motion_forw && mb_motion_back))) {
-      /*
-      MBOrderedDitherDisplayCopy(vid_stream, vid_stream->mblock.mb_address, 
-		     mb_motion_forw, recon_right_for, recon_down_for, 
-		     mb_motion_back, recon_right_back, recon_down_back,
-		     vid_stream->past->display, vid_stream->future->display);
-      ditherFlags[vid_stream->mblock.mb_address] = 0;
-      no_dith_flag = 1;
-      */
-    }
-    else {
-      for (mask = 32, i = 0; i < 6; mask >>= 1, i++) {
-	
-	/* If block exists... */
-	if ((vid_stream->mblock.mb_intra) || (vid_stream->mblock.cbp & mask)) {
-	  zero_block_flag = 0;
-	  ParseReconBlock(i);
-	} else {
-	  zero_block_flag = 1;
-	}
-	
-	/* If macroblock is intra coded... */
-	if (vid_stream->mblock.mb_intra) {
-	  ReconIMBlock(vid_stream, i);
-	} else if (mb_motion_forw && mb_motion_back) {
-	  ReconBiMBlock(vid_stream, i, recon_right_for, recon_down_for,
-			recon_right_back, recon_down_back, zero_block_flag);
-	} else if (mb_motion_forw || (vid_stream->picture.code_type == P_TYPE)) {
-	  ReconPMBlock(vid_stream, i, recon_right_for, recon_down_for,
-		       zero_block_flag);
-	} else if (mb_motion_back) {
-	  ReconBMBlock(vid_stream, i, recon_right_back, recon_down_back,
-		       zero_block_flag);
-	}
-      }
-    }
-  }
-
-  if ((ditherType == MBORDERED_DITHER) && (!no_dith_flag)) {
-    if ((vid_stream->picture.code_type == 2) &&
-	(vid_stream->mblock.cbp == 0) &&
-	(!vid_stream->mblock.mb_intra)) {
-      /*
-      MBOrderedDitherDisplayCopy(vid_stream, vid_stream->mblock.mb_address,
-				 1, recon_right_for, recon_down_for,
-				 0, 0, 0,
-				 vid_stream->future->display,
-				 (unsigned char *) NULL);
-      ditherFlags[vid_stream->mblock.mb_address] = 0;
-      */
-    }
-    else {
-      ditherFlags[vid_stream->mblock.mb_address] = 1;
-    }
-  }
-
-
-  /* If D Type picture, flush marker bit. */
-  if (vid_stream->picture.code_type == 4)
-    flush_bits(1);
-
-  /* If macroblock was intracoded, set macroblock past intra address. */
-  if (vid_stream->mblock.mb_intra)
-    vid_stream->mblock.past_intra_addr =
-      vid_stream->mblock.mb_address;
-
-#ifdef ANALYSIS
-  *mbSizePtr += bitCountRead() - mbSizeCount;
-#endif
-  return PARSE_OK;
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ReconIMBlock --
- *
- *	Reconstructs intra coded macroblock.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ReconIMBlock(VidStream *vid_stream, int bnum)
-{
-  int mb_row, mb_col, row, col, row_size, rr;
-  unsigned char *dest;
-
-  /* Calculate macroblock row and column from address. */
-
-  mb_row = vid_stream->mblock.mb_address / vid_stream->mb_width;
-  mb_col = vid_stream->mblock.mb_address % vid_stream->mb_width;
-
-
-  /* If block is luminance block... */
-
-  if (bnum < 4) {
-
-    /* Calculate row and col values for upper left pixel of block. */
-
-    row = mb_row * 16;
-    col = mb_col * 16;
-    if (bnum > 1)
-      row += 8;
-    if (bnum % 2)
-      col += 8;
-
-    /* Set dest to luminance plane of current pict image. */
-
-    dest = vid_stream->current->luminance;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width * 16;
-  }
-  /* Otherwise if block is Cr block... */
-
-  else if (bnum == 4) {
-
-    /* Set dest to Cr plane of current pict image. */
-
-    dest = vid_stream->current->Cr;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width * 8;
-
-    /* Calculate row,col for upper left pixel of block. */
-
-    row = mb_row * 8;
-    col = mb_col * 8;
-  }
-  /* Otherwise block is Cb block, and ... */
-
-  else {
-
-    /* Set dest to Cb plane of current pict image. */
-
-    dest = vid_stream->current->Cb;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width * 8;
-
-    /* Calculate row,col for upper left pixel value of block. */
-
-    row = mb_row * 8;
-    col = mb_col * 8;
-  }
-
-  /*
-   * For each pixel in block, set to cropped reconstructed value from inverse
-   * dct.
-   */
-  {
-    short *sp = &vid_stream->block.dct_recon[0][0];
-    unsigned char *cm = cropTbl + MAX_NEG_CROP;
-    dest += row * row_size + col;
-    for (rr = 0; rr < 4; rr++, sp += 16, dest += row_size) {
-      dest[0] = cm[sp[0]];
-      assertCrop(sp[0]);
-      dest[1] = cm[sp[1]];
-      assertCrop(sp[1]);
-      dest[2] = cm[sp[2]];
-      assertCrop(sp[2]);
-      dest[3] = cm[sp[3]];
-      assertCrop(sp[3]);
-      dest[4] = cm[sp[4]];
-      assertCrop(sp[4]);
-      dest[5] = cm[sp[5]];
-      assertCrop(sp[5]);
-      dest[6] = cm[sp[6]];
-      assertCrop(sp[6]);
-      dest[7] = cm[sp[7]];
-      assertCrop(sp[7]);
-
-      dest += row_size;
-      dest[0] = cm[sp[8]];
-      assertCrop(sp[8]);
-      dest[1] = cm[sp[9]];
-      assertCrop(sp[9]);
-      dest[2] = cm[sp[10]];
-      assertCrop(sp[10]);
-      dest[3] = cm[sp[11]];
-      assertCrop(sp[11]);
-      dest[4] = cm[sp[12]];
-      assertCrop(sp[12]);
-      dest[5] = cm[sp[13]];
-      assertCrop(sp[13]);
-      dest[6] = cm[sp[14]];
-      assertCrop(sp[14]);
-      dest[7] = cm[sp[15]];
-      assertCrop(sp[15]);
-    }
-  }
-}
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ReconPMBlock --
- *
- *	Reconstructs forward predicted macroblocks.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ReconPMBlock(VidStream *vid_stream, int bnum,
-	     int recon_right_for, int recon_down_for, int zflag)
-{
-  int mb_row, mb_col, row, col, row_size, rr;
-  unsigned char *dest, *past;
-  static int right_for, down_for, right_half_for, down_half_for;
-  unsigned char *rindex1, *rindex2;
-  unsigned char *index;
-  short int *blockvals;
-
-#ifdef LOOSE_MPEG
-  int maxx, maxy;
-  int illegalBlock = 0;
-  int row_start, row_end, rfirst, rlast, col_start, col_end, cfirst, clast;
-#endif
-
-  /* Calculate macroblock row and column from address. */
-
-  mb_row = vid_stream->mblock.mb_address / vid_stream->mb_width;
-  mb_col = vid_stream->mblock.mb_address % vid_stream->mb_width;
-
-  if (bnum < 4) {
-
-    /* Calculate right_for, down_for motion vectors. */
-
-    right_for = recon_right_for >> 1;
-    down_for = recon_down_for >> 1;
-    right_half_for = recon_right_for & 0x1;
-    down_half_for = recon_down_for & 0x1;
-
-    /* Set dest to luminance plane of current pict image. */
-
-    dest = vid_stream->current->luminance;
-
-    if (vid_stream->picture.code_type == B_TYPE) {
-      if (vid_stream->past != NULL)
-	past = vid_stream->past->luminance;
-    } else {
-
-      /* Set predicitive frame to current future frame. */
-
-      if (vid_stream->future != NULL)
-	past = vid_stream->future->luminance;
-    }
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width << 4;
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = mb_row << 4;
-    col = mb_col << 4;
-    if (bnum > 1)
-      row += 8;
-    if (bnum % 2)
-      col += 8;
-
-#ifdef LOOSE_MPEG
-    /* Check for block illegality. */
-
-    maxx = lmaxx; maxy = lmaxy;
-
-    if (row + down_for + 7 > maxy) illegalBlock |= 0x4;
-    else if (row + down_for < 0)  illegalBlock |= 0x1;
-    
-    if (col + right_for + 7 > maxx) illegalBlock |= 0x2;
-    else if (col + right_for < 0) illegalBlock |= 0x8;
-
-#endif
-  }
-  /* Otherwise, block is NOT luminance block, ... */
-
-  else {
-
-    /* Construct motion vectors. */
-
-    recon_right_for /= 2;
-    recon_down_for /= 2;
-    right_for = recon_right_for >> 1;
-    down_for = recon_down_for >> 1;
-    right_half_for = recon_right_for & 0x1;
-    down_half_for = recon_down_for & 0x1;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width << 3;
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = mb_row << 3;
-    col = mb_col << 3;
-
-#ifdef LOOSE_MPEG
-    /* Check for block illegality. */
-
-    maxx = cmaxx; maxy = cmaxy;
-
-    if (row + down_for  + 7 > maxy) illegalBlock |= 0x4;
-    else if (row + down_for < 0) illegalBlock |= 0x1;
-
-    if (col + right_for  + 7 > maxx) illegalBlock  |= 0x2;
-    else if (col + right_for < 0) illegalBlock |= 0x8;
-
-#endif
-
-    /* If block is Cr block... */
-
-    if (bnum == 4) {
-
-      /* Set dest to Cr plane of current pict image. */
-
-      dest = vid_stream->current->Cr;
-
-      if (vid_stream->picture.code_type == B_TYPE) {
-
-	if (vid_stream->past != NULL)
-	  past = vid_stream->past->Cr;
-      } else {
-	if (vid_stream->future != NULL)
-	  past = vid_stream->future->Cr;
-      }
-    }
-    /* Otherwise, block is Cb block... */
-
-    else {
-
-      /* Set dest to Cb plane of current pict image. */
-
-      dest = vid_stream->current->Cb;
-
-      if (vid_stream->picture.code_type == B_TYPE) {
-	if (vid_stream->past != NULL)
-	  past = vid_stream->past->Cb;
-      } else {
-	if (vid_stream->future != NULL)
-	  past = vid_stream->future->Cb;
-      }
-    }
-  }
-
-  /* For each pixel in block... */
-
-#ifdef LOOSE_MPEG
-
-  if (illegalBlock) {
-    if (illegalBlock & 0x1) {
-      row_start = 0;
-      row_end = row+down_for+8;
-      rfirst = rlast = 8 - row_end;
-    }
-    else if (illegalBlock & 0x4) {
-      row_start = row + down_for;
-      row_end = maxy+1;
-      rlast = row_end - row_start - 1;
-      rfirst = 0;
-    }
-    else {
-      row_start = row+down_for;
-      row_end = row_start+8;
-      rfirst = 0;
-    }
-
-    if (illegalBlock & 0x8) {
-      col_start = 0;
-      col_end = col + right_for + 8;
-      cfirst = clast = 8 - col_end;
-    }
-    else if (illegalBlock & 0x2) {
-      col_start = col + right_for;
-      col_end = maxx + 1;
-      clast = col_end - col_start - 1;
-      cfirst = 0;
-    }
-    else {
-      col_start = col + right_for;
-      col_end = col_start + 8;
-      cfirst = 0;
-    }
-
-    for (rr = row_start; rr < row_end; rr++) {
-      rindex1 = past + (rr * row_size) + col_start;
-      index = dest + ((row + rfirst) * row_size) + col + cfirst;
-      for (cc = col_start; cc < col_end; cc++) {
-	*index++ = *rindex1++;
-      }
-    }
-
-    if (illegalBlock & 0x1) {
-      for (rr = rlast -1; rr >=0; rr--) {
-	index = dest + ((row + rr) * row_size) + col;
-	rindex1 = dest + ((row + rlast) * row_size) + col;
-	for (cc = 0; cc < 8; cc ++) {
-	  *index++ = *rindex1++;
-	}
-      }
-    }
-    else if (illegalBlock & 0x4) {
-      for (rr = rlast+1; rr < 8; rr++) {
-	index = dest + ((row + rr) * row_size) + col;
-	rindex1 = dest + ((row + rlast) * row_size) + col;
-	for (cc = 0; cc < 8; cc ++) {
-	  *index++ = *rindex1++;
-	}
-      }
-    }
-
-    if (illegalBlock & 0x2) {
-      for (cc = clast+1; cc < 8; cc++) {
-	index = dest + (row * row_size) + (col + cc);
-	rindex1 = dest + (row * row_size) + (col + clast);
-	for (rr = 0; rr < 8; rr++) {
-	  *index = *rindex1;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      }
-    }
-    else if (illegalBlock & 0x8) {
-      for (cc = clast-1; cc >= 0; cc--) {
-	index = dest + (row * row_size) + (col + cc);
-	rindex1 = dest + (row * row_size) + (col + clast);
-	for (rr = 0; rr < 8; rr++) {
-	  *index = *rindex1;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      }
-    }
-
-    if (!zflag) {
-      for (rr = 0; rr < 8; rr++) {
-	index = dest + (row*row_size) + col;
-	blockvals = &(vid_stream->block.dct_recon[rr][0]);
-	index[0] += blockvals[0];
-	index[1] += blockvals[1];
-	index[2] += blockvals[2];
-	index[3] += blockvals[3];
-	index[4] += blockvals[4];
-	index[5] += blockvals[5];
-	index[6] += blockvals[6];
-	index[7] += blockvals[7];
-      }
-    }
-  }
-  else {
-
-#endif
-
-    index = dest + (row * row_size) + col;
-    rindex1 = past + (row + down_for) * row_size + col + right_for;
-    
-    blockvals = &(vid_stream->block.dct_recon[0][0]);
-    
-    /*
-     * Calculate predictive pixel value based on motion vectors and copy to
-     * dest plane.
-     */
-    
-    if ((!down_half_for) && (!right_half_for)) {
-      unsigned char *cm = cropTbl + MAX_NEG_CROP;
-      if (!zflag)
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = cm[(int) rindex1[0] + (int) blockvals[0]];
-	  index[1] = cm[(int) rindex1[1] + (int) blockvals[1]];
-	  index[2] = cm[(int) rindex1[2] + (int) blockvals[2]];
-	  index[3] = cm[(int) rindex1[3] + (int) blockvals[3]];
-	  index[4] = cm[(int) rindex1[4] + (int) blockvals[4]];
-	  index[5] = cm[(int) rindex1[5] + (int) blockvals[5]];
-	  index[6] = cm[(int) rindex1[6] + (int) blockvals[6]];
-	  index[7] = cm[(int) rindex1[7] + (int) blockvals[7]];
-	  index += row_size;
-	  rindex1 += row_size;
-	  
-	  index[0] = cm[(int) rindex1[0] + (int) blockvals[8]];
-	  index[1] = cm[(int) rindex1[1] + (int) blockvals[9]];
-	  index[2] = cm[(int) rindex1[2] + (int) blockvals[10]];
-	  index[3] = cm[(int) rindex1[3] + (int) blockvals[11]];
-	  index[4] = cm[(int) rindex1[4] + (int) blockvals[12]];
-	  index[5] = cm[(int) rindex1[5] + (int) blockvals[13]];
-	  index[6] = cm[(int) rindex1[6] + (int) blockvals[14]];
-	  index[7] = cm[(int) rindex1[7] + (int) blockvals[15]];
-	  blockvals += 16;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      else {
-	if (right_for & 0x1) {
-	  /* No alignment, use bye copy */
-	  for (rr = 0; rr < 4; rr++) {
-	    index[0] = rindex1[0];
-	    index[1] = rindex1[1];
-	    index[2] = rindex1[2];
-	    index[3] = rindex1[3];
-	    index[4] = rindex1[4];
-	    index[5] = rindex1[5];
-	    index[6] = rindex1[6];
-	    index[7] = rindex1[7];
-	    index += row_size;
-	    rindex1 += row_size;
-	    
-	    index[0] = rindex1[0];
-	    index[1] = rindex1[1];
-	    index[2] = rindex1[2];
-	    index[3] = rindex1[3];
-	    index[4] = rindex1[4];
-	    index[5] = rindex1[5];
-	    index[6] = rindex1[6];
-	    index[7] = rindex1[7];
-	    index += row_size;
-	    rindex1 += row_size;
-	  }
-	} else if (right_for & 0x2) {
-	  /* Half-word bit aligned, use 16 bit copy */
-	  short *src = (short *)rindex1;
-	  short *dest = (short *)index;
-	  row_size >>= 1;
-	  for (rr = 0; rr < 4; rr++) {
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest[2] = src[2];
-	    dest[3] = src[3];
-	    dest += row_size;
-	    src += row_size;
-	    
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest[2] = src[2];
-	    dest[3] = src[3];
-	    dest += row_size;
-	    src += row_size;
-	  }
-	} else {
-	  /* Word aligned, use 32 bit copy */
-	  int *src = (int *)rindex1;
-	  int *dest = (int *)index;
-	  row_size >>= 2;
-	  for (rr = 0; rr < 4; rr++) {
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest += row_size;
-	    src += row_size;
-	    
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest += row_size;
-	    src += row_size;
-	  }
-	}
-      }
-    } else {
-      unsigned char *cm = cropTbl + MAX_NEG_CROP;
-      rindex2 = rindex1 + right_half_for + (down_half_for * row_size);
-      if (!zflag)
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = cm[((int) (rindex1[0] + rindex2[0]) >> 1) + blockvals[0]];
-	  index[1] = cm[((int) (rindex1[1] + rindex2[1]) >> 1) + blockvals[1]];
-	  index[2] = cm[((int) (rindex1[2] + rindex2[2]) >> 1) + blockvals[2]];
-	  index[3] = cm[((int) (rindex1[3] + rindex2[3]) >> 1) + blockvals[3]];
-	  index[4] = cm[((int) (rindex1[4] + rindex2[4]) >> 1) + blockvals[4]];
-	  index[5] = cm[((int) (rindex1[5] + rindex2[5]) >> 1) + blockvals[5]];
-	  index[6] = cm[((int) (rindex1[6] + rindex2[6]) >> 1) + blockvals[6]];
-	  index[7] = cm[((int) (rindex1[7] + rindex2[7]) >> 1) + blockvals[7]];
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	  
-	  index[0] = cm[((int) (rindex1[0] + rindex2[0]) >> 1) + blockvals[8]];
-	  index[1] = cm[((int) (rindex1[1] + rindex2[1]) >> 1) + blockvals[9]];
-	  index[2] = cm[((int) (rindex1[2] + rindex2[2]) >> 1) + blockvals[10]];
-	  index[3] = cm[((int) (rindex1[3] + rindex2[3]) >> 1) + blockvals[11]];
-	  index[4] = cm[((int) (rindex1[4] + rindex2[4]) >> 1) + blockvals[12]];
-	  index[5] = cm[((int) (rindex1[5] + rindex2[5]) >> 1) + blockvals[13]];
-	  index[6] = cm[((int) (rindex1[6] + rindex2[6]) >> 1) + blockvals[14]];
-	  index[7] = cm[((int) (rindex1[7] + rindex2[7]) >> 1) + blockvals[15]];
-	  blockvals += 16;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	}
-      else
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = (int) (rindex1[0] + rindex2[0]) >> 1;
-	  index[1] = (int) (rindex1[1] + rindex2[1]) >> 1;
-	  index[2] = (int) (rindex1[2] + rindex2[2]) >> 1;
-	  index[3] = (int) (rindex1[3] + rindex2[3]) >> 1;
-	  index[4] = (int) (rindex1[4] + rindex2[4]) >> 1;
-	  index[5] = (int) (rindex1[5] + rindex2[5]) >> 1;
-	  index[6] = (int) (rindex1[6] + rindex2[6]) >> 1;
-	  index[7] = (int) (rindex1[7] + rindex2[7]) >> 1;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	  
-	  index[0] = (int) (rindex1[0] + rindex2[0]) >> 1;
-	  index[1] = (int) (rindex1[1] + rindex2[1]) >> 1;
-	  index[2] = (int) (rindex1[2] + rindex2[2]) >> 1;
-	  index[3] = (int) (rindex1[3] + rindex2[3]) >> 1;
-	  index[4] = (int) (rindex1[4] + rindex2[4]) >> 1;
-	  index[5] = (int) (rindex1[5] + rindex2[5]) >> 1;
-	  index[6] = (int) (rindex1[6] + rindex2[6]) >> 1;
-	  index[7] = (int) (rindex1[7] + rindex2[7]) >> 1;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	}
-    }
-
-#ifdef LOOSE_MPEG
-  }
-#endif
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ReconBMBlock --
- *
- *	Reconstructs back predicted macroblocks.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ReconBMBlock(VidStream *vid_stream,
-  int bnum, int recon_right_back, int recon_down_back, int zflag)
-{
-  int mb_row, mb_col, row, col, row_size, rr;
-  unsigned char *dest, *future;
-  int right_back, down_back, right_half_back, down_half_back;
-  unsigned char *rindex1, *rindex2;
-  unsigned char *index;
-  short int *blockvals;
-
-#ifdef LOOSE_MPEG
-  int illegalBlock = 0;
-  int maxx, maxy;
-  int row_start, row_end, rlast, rfirst, col_start, col_end, clast, cfirst;
-#endif
-
-  /* Calculate macroblock row and column from address. */
-
-  mb_row = vid_stream->mblock.mb_address / vid_stream->mb_width;
-  mb_col = vid_stream->mblock.mb_address % vid_stream->mb_width;
-
-  /* If block is luminance block... */
-
-  if (bnum < 4) {
-
-    /* Calculate right_back, down_bakc motion vectors. */
-
-    right_back = recon_right_back >> 1;
-    down_back = recon_down_back >> 1;
-    right_half_back = recon_right_back & 0x1;
-    down_half_back = recon_down_back & 0x1;
-
-    /* Set dest to luminance plane of current pict image. */
-
-    dest = vid_stream->current->luminance;
-
-    /*
-     * If future frame exists, set future to luminance plane of future frame.
-     */
-
-    if (vid_stream->future != NULL)
-      future = vid_stream->future->luminance;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width << 4;
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = mb_row << 4;
-    col = mb_col << 4;
-    if (bnum > 1)
-      row += 8;
-    if (bnum % 2)
-      col += 8;
-
-#ifdef LOOSE_MPEG
-
-    /* Check for block illegality. */
-
-    maxx = lmaxx; maxy = lmaxy;
-
-    if (row + down_back + 7 > maxy) illegalBlock |= 0x4;
-    else if (row + down_back < 0)  illegalBlock |= 0x1;
-    
-    if (col + right_back + 7 > maxx) illegalBlock |= 0x2;
-    else if (col + right_back < 0) illegalBlock |= 0x8;
-
-#endif
-
-  }
-  /* Otherwise, block is NOT luminance block, ... */
-
-  else {
-
-    /* Construct motion vectors. */
-
-    recon_right_back /= 2;
-    recon_down_back /= 2;
-    right_back = recon_right_back >> 1;
-    down_back = recon_down_back >> 1;
-    right_half_back = recon_right_back & 0x1;
-    down_half_back = recon_down_back & 0x1;
-
-    /* Establish row size. */
-
-    row_size = vid_stream->mb_width << 3;
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = mb_row << 3;
-    col = mb_col << 3;
-
-#ifdef LOOSE_MPEG
-
-    /* Check for block illegality. */
-
-    maxx = cmaxx; maxy = cmaxy;
-
-    if (row + down_back + 7 > maxy) illegalBlock |= 0x4;
-    else if (row + down_back < 0) illegalBlock |= 0x1;
-
-    if (col + right_back + 7 > maxx) illegalBlock  |= 0x2;
-    else if (col + right_back < 0) illegalBlock |= 0x8;
-
-#endif
-
-    /* If block is Cr block... */
-
-    if (bnum == 4) {
-
-      /* Set dest to Cr plane of current pict image. */
-
-      dest = vid_stream->current->Cr;
-
-      /*
-       * If future frame exists, set future to Cr plane of future image.
-       */
-
-      if (vid_stream->future != NULL)
-	future = vid_stream->future->Cr;
-    }
-    /* Otherwise, block is Cb block... */
-
-    else {
-
-      /* Set dest to Cb plane of current pict image. */
-
-      dest = vid_stream->current->Cb;
-
-      /*
-       * If future frame exists, set future to Cb plane of future frame.
-       */
-
-      if (vid_stream->future != NULL)
-	future = vid_stream->future->Cb;
-    }
-  }
-
-  /* For each pixel in block do... */
-
-#ifdef LOOSE_MPEG
-
-  if (illegalBlock) {
-    if (illegalBlock & 0x1) {
-      row_start = 0;
-      row_end = row+down_back+8;
-      rfirst = rlast = 8 - row_end;
-    }
-    else if (illegalBlock & 0x4) {
-      row_start = row + down_back;
-      row_end = maxy+1;
-      rlast = row_end - row_start - 1;
-      rfirst = 0;
-    }
-    else {
-      row_start = row+down_back;
-      row_end = row_start+8;
-      rfirst = 0;
-    }
-
-    if (illegalBlock & 0x8) {
-      col_start = 0;
-      col_end = col + right_back + 8;
-      cfirst = clast = 8 - col_end;
-    }
-    else if (illegalBlock & 0x2) {
-      col_start = col + right_back;
-      col_end = maxx + 1;
-      clast = col_end - col_start - 1;
-      cfirst = 0;
-    }
-    else {
-      col_start = col + right_back;
-      col_end = col_start + 8;
-      cfirst = 0;
-    }
-
-    for (rr = row_start; rr < row_end; rr++) {
-      rindex1 = future + (rr * row_size) + col_start;
-      index = dest + ((row + rfirst) * row_size) + col + cfirst;
-      for (cc = col_start; cc < col_end; cc++) {
-	*index++ = *rindex1++;
-      }
-    }
-
-    if (illegalBlock & 0x1) {
-      for (rr = rlast -1; rr >=0; rr--) {
-	index = dest + ((row + rr) * row_size) + col;
-	rindex1 = dest + ((row + rlast) * row_size) + col;
-	for (cc = 0; cc < 8; cc ++) {
-	  *index++ = *rindex1++;
-	}
-      }
-    }
-    else if (illegalBlock & 0x4) {
-      for (rr = rlast+1; rr < 8; rr++) {
-	index = dest + ((row + rr) * row_size) + col;
-	rindex1 = dest + ((row + rlast) * row_size) + col;
-	for (cc = 0; cc < 8; cc ++) {
-	  *index++ = *rindex1++;
-	}
-      }
-    }
-
-    if (illegalBlock & 0x2) {
-      for (cc = clast+1; cc < 8; cc++) {
-	index = dest + (row * row_size) + (col + cc);
-	rindex1 = dest + (row * row_size) + (col + clast);
-	for (rr = 0; rr < 8; rr++) {
-	  *index = *rindex1;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      }
-    }
-    else if (illegalBlock & 0x8) {
-      for (cc = clast-1; cc >= 0; cc--) {
-	index = dest + (row * row_size) + (col + cc);
-	rindex1 = dest + (row * row_size) + (col + clast);
-	for (rr = 0; rr < 8; rr++) {
-	  *index = *rindex1;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      }
-    }
-
-    if (!zflag) {
-      for (rr = 0; rr < 8; rr++) {
-	index = dest + (row*row_size) + col;
-	blockvals = &(vid_stream->block.dct_recon[rr][0]);
-	index[0] += blockvals[0];
-	index[1] += blockvals[1];
-	index[2] += blockvals[2];
-	index[3] += blockvals[3];
-	index[4] += blockvals[4];
-	index[5] += blockvals[5];
-	index[6] += blockvals[6];
-	index[7] += blockvals[7];
-      }
-    }
-  }
-  else {
-
-#endif
-    
-    index = dest + (row * row_size) + col;
-    rindex1 = future + (row + down_back) * row_size + col + right_back;
-
-    blockvals = &(vid_stream->block.dct_recon[0][0]);
-
-    if ((!right_half_back) && (!down_half_back)) {
-      unsigned char *cm = cropTbl + MAX_NEG_CROP;
-      if (!zflag)
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = cm[(int) rindex1[0] + (int) blockvals[0]];
-	  index[1] = cm[(int) rindex1[1] + (int) blockvals[1]];
-	  index[2] = cm[(int) rindex1[2] + (int) blockvals[2]];
-	  index[3] = cm[(int) rindex1[3] + (int) blockvals[3]];
-	  index[4] = cm[(int) rindex1[4] + (int) blockvals[4]];
-	  index[5] = cm[(int) rindex1[5] + (int) blockvals[5]];
-	  index[6] = cm[(int) rindex1[6] + (int) blockvals[6]];
-	  index[7] = cm[(int) rindex1[7] + (int) blockvals[7]];
-	  index += row_size;
-	  rindex1 += row_size;
-	  
-	  index[0] = cm[(int) rindex1[0] + (int) blockvals[8]];
-	  index[1] = cm[(int) rindex1[1] + (int) blockvals[9]];
-	  index[2] = cm[(int) rindex1[2] + (int) blockvals[10]];
-	  index[3] = cm[(int) rindex1[3] + (int) blockvals[11]];
-	  index[4] = cm[(int) rindex1[4] + (int) blockvals[12]];
-	  index[5] = cm[(int) rindex1[5] + (int) blockvals[13]];
-	  index[6] = cm[(int) rindex1[6] + (int) blockvals[14]];
-	  index[7] = cm[(int) rindex1[7] + (int) blockvals[15]];
-	  blockvals += 16;
-	  index += row_size;
-	  rindex1 += row_size;
-	}
-      else {
-	if (right_back & 0x1) {
-	  /* No alignment, use bye copy */
-	  for (rr = 0; rr < 4; rr++) {
-	    index[0] = rindex1[0];
-	    index[1] = rindex1[1];
-	    index[2] = rindex1[2];
-	    index[3] = rindex1[3];
-	    index[4] = rindex1[4];
-	    index[5] = rindex1[5];
-	    index[6] = rindex1[6];
-	    index[7] = rindex1[7];
-	    index += row_size;
-	    rindex1 += row_size;
-	    
-	    index[0] = rindex1[0];
-	    index[1] = rindex1[1];
-	    index[2] = rindex1[2];
-	    index[3] = rindex1[3];
-	    index[4] = rindex1[4];
-	    index[5] = rindex1[5];
-	    index[6] = rindex1[6];
-	    index[7] = rindex1[7];
-	    index += row_size;
-	    rindex1 += row_size;
-	  }
-	} else if (right_back & 0x2) {
-	  /* Half-word bit aligned, use 16 bit copy */
-	  short *src = (short *)rindex1;
-	  short *dest = (short *)index;
-	  row_size >>= 1;
-	  for (rr = 0; rr < 4; rr++) {
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest[2] = src[2];
-	    dest[3] = src[3];
-	    dest += row_size;
-	    src += row_size;
-	    
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest[2] = src[2];
-	    dest[3] = src[3];
-	    dest += row_size;
-	    src += row_size;
-	  }
-	} else {
-	  /* Word aligned, use 32 bit copy */
-	  int *src = (int *)rindex1;
-	  int *dest = (int *)index;
-	  row_size >>= 2;
-	  for (rr = 0; rr < 4; rr++) {
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest += row_size;
-	    src += row_size;
-	    
-	    dest[0] = src[0];
-	    dest[1] = src[1];
-	    dest += row_size;
-	    src += row_size;
-	  }
-	}
-      }
-    } else {
-      unsigned char *cm = cropTbl + MAX_NEG_CROP;
-      rindex2 = rindex1 + right_half_back + (down_half_back * row_size);
-      if (!zflag)
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = cm[((int) (rindex1[0] + rindex2[0]) >> 1) + blockvals[0]];
-	  index[1] = cm[((int) (rindex1[1] + rindex2[1]) >> 1) + blockvals[1]];
-	  index[2] = cm[((int) (rindex1[2] + rindex2[2]) >> 1) + blockvals[2]];
-	  index[3] = cm[((int) (rindex1[3] + rindex2[3]) >> 1) + blockvals[3]];
-	  index[4] = cm[((int) (rindex1[4] + rindex2[4]) >> 1) + blockvals[4]];
-	  index[5] = cm[((int) (rindex1[5] + rindex2[5]) >> 1) + blockvals[5]];
-	  index[6] = cm[((int) (rindex1[6] + rindex2[6]) >> 1) + blockvals[6]];
-	  index[7] = cm[((int) (rindex1[7] + rindex2[7]) >> 1) + blockvals[7]];
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	  
-	  index[0] = cm[((int) (rindex1[0] + rindex2[0]) >> 1) + blockvals[8]];
-	  index[1] = cm[((int) (rindex1[1] + rindex2[1]) >> 1) + blockvals[9]];
-	  index[2] = cm[((int) (rindex1[2] + rindex2[2]) >> 1) + blockvals[10]];
-	  index[3] = cm[((int) (rindex1[3] + rindex2[3]) >> 1) + blockvals[11]];
-	  index[4] = cm[((int) (rindex1[4] + rindex2[4]) >> 1) + blockvals[12]];
-	  index[5] = cm[((int) (rindex1[5] + rindex2[5]) >> 1) + blockvals[13]];
-	  index[6] = cm[((int) (rindex1[6] + rindex2[6]) >> 1) + blockvals[14]];
-	  index[7] = cm[((int) (rindex1[7] + rindex2[7]) >> 1) + blockvals[15]];
-	  blockvals += 16;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	}
-      else
-	for (rr = 0; rr < 4; rr++) {
-	  index[0] = (int) (rindex1[0] + rindex2[0]) >> 1;
-	  index[1] = (int) (rindex1[1] + rindex2[1]) >> 1;
-	  index[2] = (int) (rindex1[2] + rindex2[2]) >> 1;
-	  index[3] = (int) (rindex1[3] + rindex2[3]) >> 1;
-	  index[4] = (int) (rindex1[4] + rindex2[4]) >> 1;
-	  index[5] = (int) (rindex1[5] + rindex2[5]) >> 1;
-	  index[6] = (int) (rindex1[6] + rindex2[6]) >> 1;
-	  index[7] = (int) (rindex1[7] + rindex2[7]) >> 1;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	  
-	  index[0] = (int) (rindex1[0] + rindex2[0]) >> 1;
-	  index[1] = (int) (rindex1[1] + rindex2[1]) >> 1;
-	  index[2] = (int) (rindex1[2] + rindex2[2]) >> 1;
-	  index[3] = (int) (rindex1[3] + rindex2[3]) >> 1;
-	  index[4] = (int) (rindex1[4] + rindex2[4]) >> 1;
-	  index[5] = (int) (rindex1[5] + rindex2[5]) >> 1;
-	  index[6] = (int) (rindex1[6] + rindex2[6]) >> 1;
-	  index[7] = (int) (rindex1[7] + rindex2[7]) >> 1;
-	  index += row_size;
-	  rindex1 += row_size;
-	  rindex2 += row_size;
-	}
-    }
-
-#ifdef LOOSE_MPEG
-  }
-#endif
-
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ReconBiMBlock --
- *
- *	Reconstructs bidirectionally predicted macroblocks.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ReconBiMBlock(VidStream *vid_stream, int bnum, int recon_right_for,
-	      int recon_down_for, int recon_right_back,
-	      int recon_down_back, int zflag)
-{
-  int mb_row, mb_col, row, col, row_size, rr;
-  unsigned char *dest, *past, *future;
-  int right_for, down_for, right_half_for, down_half_for;
-  int right_back, down_back, right_half_back, down_half_back;
-  unsigned char *index, *rindex1, *bindex1;
-  short int *blockvals;
-  int forw_row_start, back_row_start, forw_col_start, back_col_start;
-
-#ifdef LOOSE_MPEG
-  int illegal_forw = 0;
-  int illegal_back = 0;
-#endif
-
-  /* Calculate macroblock row and column from address. */
-
-  mb_row = vid_stream->mblock.mb_address / vid_stream->mb_width;
-  mb_col = vid_stream->mblock.mb_address % vid_stream->mb_width;
-
-  /* If block is luminance block... */
-
-  if (bnum < 4) {
-
-    /*
-     * Calculate right_for, down_for, right_half_for, down_half_for,
-     * right_back, down_bakc, right_half_back, and down_half_back, motion
-     * vectors.
-     */
-
-    right_for = recon_right_for >> 1;
-    down_for = recon_down_for >> 1;
-    right_half_for = recon_right_for & 0x1;
-    down_half_for = recon_down_for & 0x1;
-
-    right_back = recon_right_back >> 1;
-    down_back = recon_down_back >> 1;
-    right_half_back = recon_right_back & 0x1;
-    down_half_back = recon_down_back & 0x1;
-
-    /* Set dest to luminance plane of current pict image. */
-
-    dest = vid_stream->current->luminance;
-
-    /* If past frame exists, set past to luminance plane of past frame. */
-
-    if (vid_stream->past != NULL)
-      past = vid_stream->past->luminance;
-
-    /*
-     * If future frame exists, set future to luminance plane of future frame.
-     */
-
-    if (vid_stream->future != NULL)
-      future = vid_stream->future->luminance;
-
-    /* Establish row size. */
-
-    row_size = (vid_stream->mb_width << 4);
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = (mb_row << 4);
-    col = (mb_col << 4);
-    if (bnum > 1)
-      row += 8;
-    if (bnum & 0x01)
-      col += 8;
-
-    forw_col_start = col + right_for;
-    forw_row_start = row + down_for;
-
-    back_col_start = col + right_back;
-    back_row_start = row + down_back;
-
-#ifdef LOOSE_MPEG
-
-    /* Check for illegal pred. blocks. */
-
-
-    if (forw_col_start+8 > lmaxx) illegal_forw = 1;
-    else if (forw_col_start < 0) illegal_forw = 1;
-
-    if (forw_row_start+8 > lmaxy) illegal_forw = 1;
-    else if (forw_row_start < 0) illegal_forw = 1;
-
-    if (back_col_start+8 > lmaxx) illegal_back = 1;
-    else if (back_col_start < 0) illegal_back = 1;
-
-    if (back_row_start+8 > lmaxy) illegal_back = 1;
-    else if (back_row_start < 0) illegal_back = 1;
-
-#endif
-
-  }
-  /* Otherwise, block is NOT luminance block, ... */
-
-  else {
-
-    /* Construct motion vectors. */
-
-    recon_right_for /= 2;
-    recon_down_for /= 2;
-    right_for = recon_right_for >> 1;
-    down_for = recon_down_for >> 1;
-    right_half_for = recon_right_for & 0x1;
-    down_half_for = recon_down_for & 0x1;
-
-    recon_right_back /= 2;
-    recon_down_back /= 2;
-    right_back = recon_right_back >> 1;
-    down_back = recon_down_back >> 1;
-    right_half_back = recon_right_back & 0x1;
-    down_half_back = recon_down_back & 0x1;
-
-    /* Establish row size. */
-
-    row_size = (vid_stream->mb_width << 3);
-
-    /* Calculate row,col of upper left pixel in block. */
-
-    row = (mb_row << 3);
-    col = (mb_col << 3);
-
-    forw_col_start = col + right_for;
-    forw_row_start = row + down_for;
-
-    back_col_start = col + right_back;
-    back_row_start = row + down_back;
-
-#ifdef LOOSE_MPEG
-
-    /* Check for illegal pred. blocks. */
-
-    if (forw_col_start+8 > cmaxx) illegal_forw = 1;
-    else if (forw_col_start < 0) illegal_forw = 1;
-
-    if (forw_row_start+8 > cmaxy) illegal_forw = 1;
-    else if (forw_row_start < 0) illegal_forw = 1;
-
-    if (back_col_start+8 > cmaxx) illegal_back = 1;
-    else if (back_col_start < 0) illegal_back = 1;
-    
-    if (back_row_start+8 > cmaxy) illegal_back = 1;
-    else if (back_row_start < 0) illegal_back = 1;
-
-#endif
-    
-    /* If block is Cr block... */
-
-    if (bnum == 4) {
-
-      /* Set dest to Cr plane of current pict image. */
-
-      dest = vid_stream->current->Cr;
-
-      /* If past frame exists, set past to Cr plane of past image. */
-
-      if (vid_stream->past != NULL)
-	past = vid_stream->past->Cr;
-
-      /*
-       * If future frame exists, set future to Cr plane of future image.
-       */
-
-      if (vid_stream->future != NULL)
-	future = vid_stream->future->Cr;
-    }
-    /* Otherwise, block is Cb block... */
-
-    else {
-
-      /* Set dest to Cb plane of current pict image. */
-
-      dest = vid_stream->current->Cb;
-
-      /* If past frame exists, set past to Cb plane of past frame. */
-
-      if (vid_stream->past != NULL)
-	past = vid_stream->past->Cb;
-
-      /*
-       * If future frame exists, set future to Cb plane of future frame.
-       */
-
-      if (vid_stream->future != NULL)
-	future = vid_stream->future->Cb;
-    }
-  }
-
-  /* For each pixel in block... */
-
-  index = dest + (row * row_size) + col;
-
-#ifdef LOOSE_MPEG
-  if (illegal_forw) 
-    rindex1 = future + back_row_start * row_size + back_col_start;
-  else 
-#endif
-    rindex1 = past + forw_row_start  * row_size + forw_col_start;
-
-#ifdef LOOSE_MPEG
-  if (illegal_back) 
-    bindex1 = past + forw_row_start * row_size + forw_col_start;
-  else 
-#endif
-    bindex1 = future + back_row_start * row_size + back_col_start;
-
-  blockvals = (short int *) &(vid_stream->block.dct_recon[0][0]);
-
-  {
-  unsigned char *cm = cropTbl + MAX_NEG_CROP;
-  if (!zflag)
-    for (rr = 0; rr < 4; rr++) {
-      index[0] = cm[((int) (rindex1[0] + bindex1[0]) >> 1) + blockvals[0]];
-      index[1] = cm[((int) (rindex1[1] + bindex1[1]) >> 1) + blockvals[1]];
-      index[2] = cm[((int) (rindex1[2] + bindex1[2]) >> 1) + blockvals[2]];
-      index[3] = cm[((int) (rindex1[3] + bindex1[3]) >> 1) + blockvals[3]];
-      index[4] = cm[((int) (rindex1[4] + bindex1[4]) >> 1) + blockvals[4]];
-      index[5] = cm[((int) (rindex1[5] + bindex1[5]) >> 1) + blockvals[5]];
-      index[6] = cm[((int) (rindex1[6] + bindex1[6]) >> 1) + blockvals[6]];
-      index[7] = cm[((int) (rindex1[7] + bindex1[7]) >> 1) + blockvals[7]];
-      index += row_size;
-      rindex1 += row_size;
-      bindex1 += row_size;
-
-      index[0] = cm[((int) (rindex1[0] + bindex1[0]) >> 1) + blockvals[8]];
-      index[1] = cm[((int) (rindex1[1] + bindex1[1]) >> 1) + blockvals[9]];
-      index[2] = cm[((int) (rindex1[2] + bindex1[2]) >> 1) + blockvals[10]];
-      index[3] = cm[((int) (rindex1[3] + bindex1[3]) >> 1) + blockvals[11]];
-      index[4] = cm[((int) (rindex1[4] + bindex1[4]) >> 1) + blockvals[12]];
-      index[5] = cm[((int) (rindex1[5] + bindex1[5]) >> 1) + blockvals[13]];
-      index[6] = cm[((int) (rindex1[6] + bindex1[6]) >> 1) + blockvals[14]];
-      index[7] = cm[((int) (rindex1[7] + bindex1[7]) >> 1) + blockvals[15]];
-      blockvals += 16;
-      index += row_size;
-      rindex1 += row_size;
-      bindex1 += row_size;
-    }
-
-  else
-    for (rr = 0; rr < 4; rr++) {
-      index[0] = (int) (rindex1[0] + bindex1[0]) >> 1;
-      index[1] = (int) (rindex1[1] + bindex1[1]) >> 1;
-      index[2] = (int) (rindex1[2] + bindex1[2]) >> 1;
-      index[3] = (int) (rindex1[3] + bindex1[3]) >> 1;
-      index[4] = (int) (rindex1[4] + bindex1[4]) >> 1;
-      index[5] = (int) (rindex1[5] + bindex1[5]) >> 1;
-      index[6] = (int) (rindex1[6] + bindex1[6]) >> 1;
-      index[7] = (int) (rindex1[7] + bindex1[7]) >> 1;
-      index += row_size;
-      rindex1 += row_size;
-      bindex1 += row_size;
-
-      index[0] = (int) (rindex1[0] + bindex1[0]) >> 1;
-      index[1] = (int) (rindex1[1] + bindex1[1]) >> 1;
-      index[2] = (int) (rindex1[2] + bindex1[2]) >> 1;
-      index[3] = (int) (rindex1[3] + bindex1[3]) >> 1;
-      index[4] = (int) (rindex1[4] + bindex1[4]) >> 1;
-      index[5] = (int) (rindex1[5] + bindex1[5]) >> 1;
-      index[6] = (int) (rindex1[6] + bindex1[6]) >> 1;
-      index[7] = (int) (rindex1[7] + bindex1[7]) >> 1;
-      index += row_size;
-      rindex1 += row_size;
-      bindex1 += row_size;
-    }
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * ProcessSkippedPFrameMBlocks --
- *
- *	Processes skipped macroblocks in P frames.
- *
- * Results:
- *	Calculates pixel values for luminance, Cr, and Cb planes
- *      in current pict image for skipped macroblocks.
- *
- * Side effects:
- *	Pixel values in pict image changed.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ProcessSkippedPFrameMBlocks(VidStream *vid_stream)
-{
-  int row_size, half_row, mb_row, mb_col, row, col, rr;
-  int addr, row_incr, half_row_incr, crow, ccol;
-  int *dest, *src, *dest1, *src1;
-
-  /* Calculate row sizes for luminance and Cr/Cb macroblock areas. */
-
-  row_size = vid_stream->mb_width << 4;
-  half_row = (row_size >> 1);
-  row_incr = row_size >> 2;
-  half_row_incr = half_row >> 2;
-
-  /* For each skipped macroblock, do... */
-
-  for (addr = vid_stream->mblock.past_mb_addr + 1;
-       addr < vid_stream->mblock.mb_address; addr++) {
-
-    /* Calculate macroblock row and col. */
-
-    mb_row = addr / vid_stream->mb_width;
-    mb_col = addr % vid_stream->mb_width;
-
-    /* Calculate upper left pixel row,col for luminance plane. */
-
-    row = mb_row << 4;
-    col = mb_col << 4;
-
-
-    /* For each row in macroblock luminance plane... */
-
-    dest = (int *)(vid_stream->current->luminance + (row * row_size) + col);
-    src = (int *)(vid_stream->future->luminance + (row * row_size) + col);
-
-    for (rr = 0; rr < 8; rr++) {
-
-      /* Copy pixel values from last I or P picture. */
-
-      dest[0] = src[0];
-      dest[1] = src[1];
-      dest[2] = src[2];
-      dest[3] = src[3];
-      dest += row_incr;
-      src += row_incr;
-
-      dest[0] = src[0];
-      dest[1] = src[1];
-      dest[2] = src[2];
-      dest[3] = src[3];
-      dest += row_incr;
-      src += row_incr;
-    }
-
-    /*
-     * Divide row,col to get upper left pixel of macroblock in Cr and Cb
-     * planes.
-     */
-
-    crow = row >> 1;
-    ccol = col >> 1;
-
-    /* For each row in Cr, and Cb planes... */
-
-    dest = (int *)(vid_stream->current->Cr + (crow * half_row) + ccol);
-    src = (int *)(vid_stream->future->Cr + (crow * half_row) + ccol);
-    dest1 = (int *)(vid_stream->current->Cb + (crow * half_row) + ccol);
-    src1 = (int *)(vid_stream->future->Cb + (crow * half_row) + ccol);
-
-    for (rr = 0; rr < 4; rr++) {
-
-      /* Copy pixel values from last I or P picture. */
-
-      dest[0] = src[0];
-      dest[1] = src[1];
-
-      dest1[0] = src1[0];
-      dest1[1] = src1[1];
-
-      dest += half_row_incr;
-      src += half_row_incr;
-      dest1 += half_row_incr;
-      src1 += half_row_incr;
-
-      dest[0] = src[0];
-      dest[1] = src[1];
-
-      dest1[0] = src1[0];
-      dest1[1] = src1[1];
-
-      dest += half_row_incr;
-      src += half_row_incr;
-      dest1 += half_row_incr;
-      src1 += half_row_incr;
-    }
-
-    if (ditherType == MBORDERED_DITHER) {
-      /*
-      MBOrderedDitherDisplayCopy(vid_stream, addr,
-				 1, 0, 0, 0, 0, 0,
-				 vid_stream->future->display,
-				 (unsigned char *) NULL);
-      ditherFlags[addr] = 0;
-      */
-    }
-  }
-
-  vid_stream->mblock.recon_right_for_prev = 0;
-  vid_stream->mblock.recon_down_for_prev = 0;
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ProcessSkippedBFrameMBlocks --
- *
- *	Processes skipped macroblocks in B frames.
- *
- * Results:
- *	Calculates pixel values for luminance, Cr, and Cb planes
- *      in current pict image for skipped macroblocks.
- *
- * Side effects:
- *	Pixel values in pict image changed.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ProcessSkippedBFrameMBlocks(VidStream *vid_stream)
-{
-  int row_size, half_row, mb_row, mb_col, row, col, rr;
-  int right_half_for, down_half_for, c_right_half_for, c_down_half_for;
-  int right_half_back, down_half_back, c_right_half_back, c_down_half_back;
-  int addr, right_for, down_for;
-  int recon_right_for, recon_down_for;
-  int recon_right_back, recon_down_back;
-  int right_back, down_back;
-  int c_right_for, c_down_for;
-  int c_right_back, c_down_back;
-  unsigned char forw_lum[256];
-  unsigned char forw_cr[64], forw_cb[64];
-  unsigned char back_lum[256], back_cr[64], back_cb[64];
-  int row_incr, half_row_incr;
-  int ccol, crow;
-
-  /* Calculate row sizes for luminance and Cr/Cb macroblock areas. */
-
-  row_size = vid_stream->mb_width << 4;
-  half_row = (row_size >> 1);
-  row_incr = row_size >> 2;
-  half_row_incr =  half_row >> 2;
-
-  /* Establish motion vector codes based on full pixel flag. */
-
-  if (vid_stream->picture.full_pel_forw_vector) {
-    recon_right_for = vid_stream->mblock.recon_right_for_prev << 1;
-    recon_down_for = vid_stream->mblock.recon_down_for_prev << 1;
-  } else {
-    recon_right_for = vid_stream->mblock.recon_right_for_prev;
-    recon_down_for = vid_stream->mblock.recon_down_for_prev;
-  }
-
-  if (vid_stream->picture.full_pel_back_vector) {
-    recon_right_back = vid_stream->mblock.recon_right_back_prev << 1;
-    recon_down_back = vid_stream->mblock.recon_down_back_prev << 1;
-  } else {
-    recon_right_back = vid_stream->mblock.recon_right_back_prev;
-    recon_down_back = vid_stream->mblock.recon_down_back_prev;
-  }
-
-
-  /* If only one motion vector, do display copy, else do full
-     calculation. 
-  */
-
-  if (ditherType == MBORDERED_DITHER) {
-    if (vid_stream->mblock.bpict_past_forw &&
-	!vid_stream->mblock.bpict_past_back) {
-      for (addr = vid_stream->mblock.past_mb_addr+1;
-	   addr < vid_stream->mblock.mb_address; addr++) {
-	/*
-	MBOrderedDitherDisplayCopy(vid_stream, addr,
-				   1, recon_right_for, recon_down_for,
-				 0, 0, 0, vid_stream->past->display,
-				   vid_stream->future->display);
-	ditherFlags[addr] = 0;
-	*/
-      }
-      return;
-    }
-    if (vid_stream->mblock.bpict_past_back && 
-	!vid_stream->mblock.bpict_past_forw) {
-      for (addr = vid_stream->mblock.past_mb_addr+1;
-	   addr < vid_stream->mblock.mb_address; addr++) {
-	/*
-	MBOrderedDitherDisplayCopy(vid_stream, addr,
-				   0, 0, 0,
-				   1, recon_right_back, recon_down_back,
-				   vid_stream->past->display, vid_stream->future->display);
-	ditherFlags[addr] = 0;
-	*/
-      }
-      return;
-    }
-  }
-
-  /* Calculate motion vectors. */
-  
-  if (vid_stream->mblock.bpict_past_forw) {
-    right_for = recon_right_for >> 1;
-    down_for = recon_down_for >> 1;
-    right_half_for = recon_right_for & 0x1;
-    down_half_for = recon_down_for & 0x1;
-    
-    recon_right_for /= 2;
-    recon_down_for /= 2;
-    c_right_for = recon_right_for >> 1;
-    c_down_for = recon_down_for >> 1;
-    c_right_half_for = recon_right_for & 0x1;
-    c_down_half_for = recon_down_for & 0x1;
-    
-  }
-  if (vid_stream->mblock.bpict_past_back) {
-    right_back = recon_right_back >> 1;
-    down_back = recon_down_back >> 1;
-    right_half_back = recon_right_back & 0x1;
-    down_half_back = recon_down_back & 0x1;
-    
-    recon_right_back /= 2;
-    recon_down_back /= 2;
-    c_right_back = recon_right_back >> 1;
-    c_down_back = recon_down_back >> 1;
-    c_right_half_back = recon_right_back & 0x1;
-    c_down_half_back = recon_down_back & 0x1;
-    
-  }
-  /* For each skipped macroblock, do... */
-  
-  for (addr = vid_stream->mblock.past_mb_addr + 1;
-       addr < vid_stream->mblock.mb_address; addr++) {
-    
-    /* Calculate macroblock row and col. */
-    
-    mb_row = addr / vid_stream->mb_width;
-    mb_col = addr % vid_stream->mb_width;
-    
-    /* Calculate upper left pixel row,col for luminance plane. */
-    
-    row = mb_row << 4;
-    col = mb_col << 4;
-    crow = row / 2;
-    ccol = col / 2;
-    
-    /* If forward predicted, calculate prediction values. */
-    
-    if (vid_stream->mblock.bpict_past_forw) {
-      
-      ReconSkippedBlock(vid_stream->past->luminance, forw_lum,
-			row, col, row_size, right_for, down_for,
-			right_half_for, down_half_for, 16);
-      ReconSkippedBlock(vid_stream->past->Cr, forw_cr, crow,
-			ccol, half_row,
-			c_right_for, c_down_for, c_right_half_for, c_down_half_for, 8);
-      ReconSkippedBlock(vid_stream->past->Cb, forw_cb, crow,
-			ccol, half_row,
-			c_right_for, c_down_for, c_right_half_for, c_down_half_for, 8);
-    }
-    /* If back predicted, calculate prediction values. */
-    
-    if (vid_stream->mblock.bpict_past_back) {
-      ReconSkippedBlock(vid_stream->future->luminance, back_lum,
-			row, col, row_size, right_back, down_back,
-			right_half_back, down_half_back, 16);
-      ReconSkippedBlock(vid_stream->future->Cr, back_cr, crow,
-			ccol, half_row,
-			c_right_back, c_down_back,
-			c_right_half_back, c_down_half_back, 8);
-      ReconSkippedBlock(vid_stream->future->Cb, back_cb, crow,
-			ccol, half_row,
-			c_right_back, c_down_back,
-			c_right_half_back, c_down_half_back, 8);
-    }
-    if (vid_stream->mblock.bpict_past_forw &&
-	!vid_stream->mblock.bpict_past_back) {
-      
-      int *dest, *dest1;
-      int *src, *src1;
-      dest = (int *)(vid_stream->current->luminance + (row * row_size) + col);
-      src = (int *)forw_lum;
-      
-      for (rr = 0; rr < 16; rr++) {
-	
-	/* memcpy(dest, forw_lum+(rr<<4), 16);  */
-	dest[0] = src[0];
-	dest[1] = src[1];
-	dest[2] = src[2];
-	dest[3] = src[3];
-	dest += row_incr;
-	src += 4;
-      }
-      
-      dest = (int *)(vid_stream->current->Cr + (crow * half_row) + ccol);
-      dest1 = (int *)(vid_stream->current->Cb + (crow * half_row) + ccol);
-      src = (int *)forw_cr;
-      src1 = (int *)forw_cb;
-      
-      for (rr = 0; rr < 8; rr++) {
-	/*
-	 * memcpy(dest, forw_cr+(rr<<3), 8); memcpy(dest1, forw_cb+(rr<<3),
-	 * 8);
-	 */
-	
-	dest[0] = src[0];
-	dest[1] = src[1];
-	
-	dest1[0] = src1[0];
-	dest1[1] = src1[1];
-	
-	dest += half_row_incr;
-	dest1 += half_row_incr;
-	src += 2;
-	src1 += 2;
-      }
-    } else if (vid_stream->mblock.bpict_past_back &&
-	       !vid_stream->mblock.bpict_past_forw) {
-      
-      int *src, *src1;
-      int *dest, *dest1;
-      dest = (int *)(vid_stream->current->luminance + (row * row_size) + col);
-      src = (int *)back_lum;
-      
-      for (rr = 0; rr < 16; rr++) {
-	dest[0] = src[0];
-	dest[1] = src[1];
-	dest[2] = src[2];
-	dest[3] = src[3];
-	dest += row_incr;
-	src += 4;
-      }
-      
-      
-      dest = (int *)(vid_stream->current->Cr + (crow * half_row) + ccol);
-      dest1 = (int *)(vid_stream->current->Cb + (crow * half_row) + ccol);
-      src = (int *)back_cr;
-      src1 = (int *)back_cb;
-      
-      for (rr = 0; rr < 8; rr++) {
-	/*
-	 * memcpy(dest, back_cr+(rr<<3), 8); memcpy(dest1, back_cb+(rr<<3),
-	 * 8);
-	 */
-	
-	dest[0] = src[0];
-	dest[1] = src[1];
-	
-	dest1[0] = src1[0];
-	dest1[1] = src1[1];
-	
-	dest += half_row_incr;
-	dest1 += half_row_incr;
-	src += 2;
-	src1 += 2;
-      }
-    } else {
-      
-      unsigned char *src1, *src2, *src1a, *src2a;
-      unsigned char *dest, *dest1;
-      dest = vid_stream->current->luminance + (row * row_size) + col;
-      src1 = forw_lum;
-      src2 = back_lum;
-      
-      for (rr = 0; rr < 16; rr++) {
-	dest[0] = (int) (src1[0] + src2[0]) >> 1;
-	dest[1] = (int) (src1[1] + src2[1]) >> 1;
-	dest[2] = (int) (src1[2] + src2[2]) >> 1;
-	dest[3] = (int) (src1[3] + src2[3]) >> 1;
-	dest[4] = (int) (src1[4] + src2[4]) >> 1;
-	dest[5] = (int) (src1[5] + src2[5]) >> 1;
-	dest[6] = (int) (src1[6] + src2[6]) >> 1;
-	dest[7] = (int) (src1[7] + src2[7]) >> 1;
-	dest[8] = (int) (src1[8] + src2[8]) >> 1;
-	dest[9] = (int) (src1[9] + src2[9]) >> 1;
-	dest[10] = (int) (src1[10] + src2[10]) >> 1;
-	dest[11] = (int) (src1[11] + src2[11]) >> 1;
-	dest[12] = (int) (src1[12] + src2[12]) >> 1;
-	dest[13] = (int) (src1[13] + src2[13]) >> 1;
-	dest[14] = (int) (src1[14] + src2[14]) >> 1;
-	dest[15] = (int) (src1[15] + src2[15]) >> 1;
-	dest += row_size;
-	src1 += 16;
-	src2 += 16;
-      }
-      
-      
-      dest = vid_stream->current->Cr + (crow * half_row) + ccol;
-      dest1 = vid_stream->current->Cb + (crow * half_row) + ccol;
-      src1 = forw_cr;
-      src2 = back_cr;
-      src1a = forw_cb;
-      src2a = back_cb;
-      
-      for (rr = 0; rr < 8; rr++) {
-	dest[0] = (int) (src1[0] + src2[0]) >> 1;
-	dest[1] = (int) (src1[1] + src2[1]) >> 1;
-	dest[2] = (int) (src1[2] + src2[2]) >> 1;
-	dest[3] = (int) (src1[3] + src2[3]) >> 1;
-	dest[4] = (int) (src1[4] + src2[4]) >> 1;
-	dest[5] = (int) (src1[5] + src2[5]) >> 1;
-	dest[6] = (int) (src1[6] + src2[6]) >> 1;
-	dest[7] = (int) (src1[7] + src2[7]) >> 1;
-	dest += half_row;
-	src1 += 8;
-	src2 += 8;
-	
-	dest1[0] = (int) (src1a[0] + src2a[0]) >> 1;
-	dest1[1] = (int) (src1a[1] + src2a[1]) >> 1;
-	dest1[2] = (int) (src1a[2] + src2a[2]) >> 1;
-	dest1[3] = (int) (src1a[3] + src2a[3]) >> 1;
-	dest1[4] = (int) (src1a[4] + src2a[4]) >> 1;
-	dest1[5] = (int) (src1a[5] + src2a[5]) >> 1;
-	dest1[6] = (int) (src1a[6] + src2a[6]) >> 1;
-	dest1[7] = (int) (src1a[7] + src2a[7]) >> 1;
-	dest1 += half_row;
-	src1a += 8;
-	src2a += 8;
-      }
-    }
-    
-    if (ditherType == MBORDERED_DITHER) {
-      ditherFlags[addr] = 1;
-    }
-  }
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * ReconSkippedBlock --
- *
- *	Reconstructs predictive block for skipped macroblocks
- *      in B Frames.
- *
- * Results:
- *	No return values.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ReconSkippedBlock(unsigned char *source, unsigned char *dest,
-		  int row, int col, int row_size, int right, int down,
-		  int right_half, int down_half, int width)
-{
-  int rr;
-  unsigned char *source2;
-
-  source += ((row + down) * row_size) + col + right;
-
-  if (width == 16) {
-    if ((!right_half) && (!down_half)) {
-	if (right & 0x1) {
-	  /* No alignment, use bye copy */
-	  for (rr = 0; rr < 16; rr++) {
-	    dest[0] = source[0];
-	    dest[1] = source[1];
-	    dest[2] = source[2];
-	    dest[3] = source[3];
-	    dest[4] = source[4];
-	    dest[5] = source[5];
-	    dest[6] = source[6];
-	    dest[7] = source[7];
-	    dest[8] = source[8];
-	    dest[9] = source[9];
-	    dest[10] = source[10];
-	    dest[11] = source[11];
-	    dest[12] = source[12];
-	    dest[13] = source[13];
-	    dest[14] = source[14];
-	    dest[15] = source[15];
-	    dest += 16;
-	    source += row_size;
-	  }
-	} else if (right & 0x2) {
-	  /* Half-word bit aligned, use 16 bit copy */
-	  short *src = (short *)source;
-	  short *d = (short *)dest;
-	  row_size >>= 1;
-	  for (rr = 0; rr < 16; rr++) {
-	    d[0] = src[0];
-	    d[1] = src[1];
-	    d[2] = src[2];
-	    d[3] = src[3];
-	    d[4] = src[4];
-	    d[5] = src[5];
-	    d[6] = src[6];
-	    d[7] = src[7];
-	    d += 8;
-	    src += row_size;
-	  }
-	} else {
-	  /* Word aligned, use 32 bit copy */
-	  int *src = (int *)source;
-	  int *d = (int *)dest;
-	  row_size >>= 2;
-	  for (rr = 0; rr < 16; rr++) {
-	    d[0] = src[0];
-	    d[1] = src[1];
-	    d[2] = src[2];
-	    d[3] = src[3];
-	    d += 4;
-	    src += row_size;
-	  }
-	}
-    } else {
-      source2 = source + right_half + (row_size * down_half);
-      for (rr = 0; rr < width; rr++) {
-	dest[0] = (int) (source[0] + source2[0]) >> 1;
-	dest[1] = (int) (source[1] + source2[1]) >> 1;
-	dest[2] = (int) (source[2] + source2[2]) >> 1;
-	dest[3] = (int) (source[3] + source2[3]) >> 1;
-	dest[4] = (int) (source[4] + source2[4]) >> 1;
-	dest[5] = (int) (source[5] + source2[5]) >> 1;
-	dest[6] = (int) (source[6] + source2[6]) >> 1;
-	dest[7] = (int) (source[7] + source2[7]) >> 1;
-	dest[8] = (int) (source[8] + source2[8]) >> 1;
-	dest[9] = (int) (source[9] + source2[9]) >> 1;
-	dest[10] = (int) (source[10] + source2[10]) >> 1;
-	dest[11] = (int) (source[11] + source2[11]) >> 1;
-	dest[12] = (int) (source[12] + source2[12]) >> 1;
-	dest[13] = (int) (source[13] + source2[13]) >> 1;
-	dest[14] = (int) (source[14] + source2[14]) >> 1;
-	dest[15] = (int) (source[15] + source2[15]) >> 1;
-	dest += width;
-	source += row_size;
-	source2 += row_size;
-      }
-    }
-  } else {			/* (width == 8) */
-    assert(width == 8);
-    if ((!right_half) && (!down_half)) {
-      if (right & 0x1) {
-	for (rr = 0; rr < width; rr++) {
-	  dest[0] = source[0];
-	  dest[1] = source[1];
-	  dest[2] = source[2];
-	  dest[3] = source[3];
-	  dest[4] = source[4];
-	  dest[5] = source[5];
-	  dest[6] = source[6];
-	  dest[7] = source[7];
-	  dest += 8;
-	  source += row_size;
-	}
-      } else if (right & 0x02) {
-	short *d = (short *)dest;
-	short *src = (short *)source;
-	row_size >>= 1;
-	for (rr = 0; rr < width; rr++) {
-	  d[0] = src[0];
-	  d[1] = src[1];
-	  d[2] = src[2];
-	  d[3] = src[3];
-	  d += 4;
-	  src += row_size;
-	}
-      } else {
-	int *d = (int *)dest;
-	int *src = (int *)source;
-	row_size >>= 2;
-	for (rr = 0; rr < width; rr++) {
-	  d[0] = src[0];
-	  d[1] = src[1];
-	  d += 2;
-	  src += row_size;
-	}
-      }
-    } else {
-      source2 = source + right_half + (row_size * down_half);
-      for (rr = 0; rr < width; rr++) {
-	dest[0] = (int) (source[0] + source2[0]) >> 1;
-	dest[1] = (int) (source[1] + source2[1]) >> 1;
-	dest[2] = (int) (source[2] + source2[2]) >> 1;
-	dest[3] = (int) (source[3] + source2[3]) >> 1;
-	dest[4] = (int) (source[4] + source2[4]) >> 1;
-	dest[5] = (int) (source[5] + source2[5]) >> 1;
-	dest[6] = (int) (source[6] + source2[6]) >> 1;
-	dest[7] = (int) (source[7] + source2[7]) >> 1;
-	dest += width;
-	source += row_size;
-	source2 += row_size;
-      }
-    }
-  }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * ToggleBFlag --
- *
- *	Called to set no b frame processing flag.
- *
- * Results:
- *      No_B_Flag flag is toggled from present value to opposite value.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-ToggleBFlag()
-{
-  if (No_B_Flag) {
-    No_B_Flag = 0;
-  } else
-    No_B_Flag = 1;
-}
-
-
-
-
-/*
- *--------------------------------------------------------------
- *
- * TogglePFlag --
- *
- *	Called to set no p frame processing flag.
- *
- * Results:
- *      No_P_Flag flag is toggled from present value to opposite value.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-TogglePFlag()
-{
-  if (No_P_Flag) {
-    No_P_Flag = 0;
-  } else
-    No_P_Flag = 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
deleted file mode 100644
index 13096759702..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-#include <stdio.h>
-#include <setjmp.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef SH_MEM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-#endif
-
-/* X11/xmd.h correctly defines INT32, etc */
-#ifndef XMD_H
-typedef int INT32;
-typedef short INT16;
-typedef char INT8;
-#endif
-typedef unsigned int UINT32;
-typedef unsigned short UINT16;
-typedef unsigned char UINT8;
- 
-/* Define Parsing error codes. */
-
-#define SKIP_PICTURE -10
-#define SKIP_TO_START_CODE -1
-#define PARSE_OK 1
-
-/* Define BOOLEAN, TRUE, and FALSE. */
-
-#define BOOLEAN int
-/*#define TRUE 1
-
-  #define FALSE 0*/
-
-/* Set ring buffer size. */
-
-#define RING_BUF_SIZE 5
-
-/* Macros for picture code type. */
-
-#define I_TYPE 1
-#define P_TYPE 2
-#define B_TYPE 3
-
-/* Start codes. */
-
-#define SEQ_END_CODE 0x000001b7
-#define SEQ_START_CODE 0x000001b3
-#define GOP_START_CODE 0x000001b8
-#define PICTURE_START_CODE 0x00000100
-#define SLICE_MIN_START_CODE 0x00000101
-#define SLICE_MAX_START_CODE 0x000001af
-#define EXT_START_CODE 0x000001b5
-#define USER_START_CODE 0x000001b2
-
-/* Number of macroblocks to process in one call to mpegVidRsrc. */
-
-#define MB_QUANTUM 100
-
-/* Macros used with macroblock address decoding. */
-
-#define MB_STUFFING 34
-#define MB_ESCAPE 35
-
-/* Lock flags for pict images. */
-
-#define DISPLAY_LOCK 0x01
-#define PAST_LOCK 0x02
-#define FUTURE_LOCK 0x04
-
-#define HYBRID_DITHER 0
-#define HYBRID2_DITHER 1
-#define FS4_DITHER 2
-#define FS2_DITHER 3
-#define FS2FAST_DITHER 4
-#define Twox2_DITHER 5
-#define GRAY_DITHER 6
-#define FULL_COLOR_DITHER 7
-#define NO_DITHER 8
-#define ORDERED_DITHER 9
-#define MONO_DITHER 10
-#define MONO_THRESHOLD 11
-#define ORDERED2_DITHER 12
-#define MBORDERED_DITHER 13
-
-/* External declaration of row,col to zig zag conversion matrix. */
-
-extern int scan[][8];
-
-/* Temporary definition of time stamp structure. */
-
-typedef int TimeStamp;
-
-/* Structure with reconstructed pixel values. */
-
-typedef struct pict_image {
-  int sh, gop, frame, display, future, past;
-  int locked;                            /* lock flag.   */
-  unsigned char *luminance;              /* Luminance plane.   */
-  unsigned char *Cr;                     /* Cr plane.          */
-  unsigned char *Cb;                     /* Cb plane.          */
-} PictImage;
-
-/* Group of pictures structure. */
-
-typedef struct GoP {
-  BOOLEAN drop_flag;                     /* Flag indicating dropped frame. */
-  unsigned int tc_hours;                 /* Hour component of time code.   */
-  unsigned int tc_minutes;               /* Minute component of time code. */
-  unsigned int tc_seconds;               /* Second component of time code. */
-  unsigned int tc_pictures;              /* Picture counter of time code.  */
-  BOOLEAN closed_gop;                    /* Indicates no pred. vectors to
-					    previous group of pictures.    */
-  BOOLEAN broken_link;                   /* B frame unable to be decoded.  */
-  char *ext_data;                        /* Extension data.                */
-  char *user_data;                       /* User data.                     */
-} GoP;
-
-/* Picture structure. */
-
-typedef struct pict {
-  unsigned int temp_ref;                 /* Temporal reference.             */
-  unsigned int code_type;                /* Frame type: P, B, I             */
-  unsigned int vbv_delay;                /* Buffer delay.                   */
-  BOOLEAN full_pel_forw_vector;          /* Forw. vectors specified in full
-					    pixel values flag.              */
-  unsigned int forw_r_size;              /* Used for vector decoding.       */
-  unsigned int forw_f;                   /* Used for vector decoding.       */
-  BOOLEAN full_pel_back_vector;          /* Back vectors specified in full 
-					    pixel values flag.              */
-  unsigned int back_r_size;              /* Used in decoding.               */
-  unsigned int back_f;                   /* Used in decoding.               */
-  char *extra_info;                      /* Extra bit picture info.         */
-  char *ext_data;                        /* Extension data.                 */
-  char *user_data;                       /* User data.                      */
-} Pict;
-
-/* Slice structure. */
-
-typedef struct slice {
-  unsigned int vert_pos;                 /* Vertical position of slice. */
-  unsigned int quant_scale;              /* Quantization scale.         */
-  char *extra_info;                      /* Extra bit slice info.       */
-} Slice;
-
-/* Macroblock structure. */
-
-typedef struct macroblock {
-  int mb_address;                        /* Macroblock address.              */
-  int past_mb_addr;                      /* Previous mblock address.         */
-  int motion_h_forw_code;                /* Forw. horiz. motion vector code. */
-  unsigned int motion_h_forw_r;          /* Used in decoding vectors.        */
-  int motion_v_forw_code;                /* Forw. vert. motion vector code.  */
-  unsigned int motion_v_forw_r;          /* Used in decdoinge vectors.       */
-  int motion_h_back_code;                /* Back horiz. motion vector code.  */
-  unsigned int motion_h_back_r;          /* Used in decoding vectors.        */
-  int motion_v_back_code;                /* Back vert. motion vector code.   */
-  unsigned int motion_v_back_r;          /* Used in decoding vectors.        */
-  unsigned int cbp;                      /* Coded block pattern.             */
-  BOOLEAN mb_intra;                      /* Intracoded mblock flag.          */
-  BOOLEAN bpict_past_forw;               /* Past B frame forw. vector flag.  */
-  BOOLEAN bpict_past_back;               /* Past B frame back vector flag.   */
-  int past_intra_addr;                   /* Addr of last intracoded mblock.  */
-  int recon_right_for_prev;              /* Past right forw. vector.         */
-  int recon_down_for_prev;               /* Past down forw. vector.          */
-  int recon_right_back_prev;             /* Past right back vector.          */
-  int recon_down_back_prev;              /* Past down back vector.           */
-} Macroblock;
-
-/* Block structure. */
-
-typedef struct block {
-  short int dct_recon[8][8];             /* Reconstructed dct coeff matrix. */
-  short int dct_dc_y_past;               /* Past lum. dc dct coefficient.   */
-  short int dct_dc_cr_past;              /* Past cr dc dct coefficient.     */
-  short int dct_dc_cb_past;              /* Past cb dc dct coefficient.     */
-} Block;
-
-/* Video stream structure. */
-
-typedef struct vid_stream {
-  int shid;                                    /* id of latest sequence header */
-  unsigned int h_size;                         /* Horiz. size in pixels.     */
-  unsigned int v_size;                         /* Vert. size in pixels.      */
-  unsigned int mb_height;                      /* Vert. size in mblocks.     */
-  unsigned int mb_width;                       /* Horiz. size in mblocks.    */
-  unsigned char aspect_ratio;                  /* Code for aspect ratio.     */
-  unsigned char picture_rate;                  /* Code for picture rate.     */
-  unsigned int bit_rate;                       /* Bit rate.                  */
-  unsigned int vbv_buffer_size;                /* Minimum buffer size.       */
-  BOOLEAN const_param_flag;                    /* Contrained parameter flag. */
-  unsigned char intra_quant_matrix[8][8];      /* Quantization matrix for
-						  intracoded frames.         */
-  unsigned char non_intra_quant_matrix[8][8];  /* Quanitization matrix for 
-						  non intracoded frames.     */
-  char *ext_data;                              /* Extension data.            */
-  char *user_data;                             /* User data.                 */
-  int gopid;             		       /* id of latest group id      */
-  GoP group;                                   /* Current group of pict.     */
-  Pict picture;                                /* Current picture.           */
-  Slice slice;                                 /* Current slice.             */
-  Macroblock mblock;                           /* Current macroblock.        */
-  Block block;                                 /* Current block.             */
-  int state;                                   /* State of decoding.         */
-  int bit_offset;                              /* Bit offset in stream.      */
-  unsigned int *buffer;                        /* Pointer to next byte in
-						  buffer.                    */
-  int buf_length;                              /* Length of remaining buffer.*/
-  unsigned int *buf_start;                     /* Pointer to buffer start.   */
-  int max_buf_length;                          /* Max lenght of buffer.      */
-  PictImage *past;                             /* Past predictive frame.     */
-  PictImage *future;                           /* Future predictive frame.   */
-  PictImage *current;                          /* Current frame.             */
-  PictImage *ring[RING_BUF_SIZE];              /* Ring buffer of frames.     */
-} VidStream;   
-
-/* Declaration of global pointer to current video stream. */
-
-extern VidStream *curVidStream;
-
-/* Declarataion of global display pointer. */
-extern Display *display;
-
-/* Shared memory flag. */
-extern int shmemFlag;
-
-/* Quiet mode flag. */
-extern int quietFlag;
-
-/* Dither flags external declaration. */
-extern char *ditherFlags;
-
-/* Definition of Contant integer scale factor. */
-
-#define CONST_BITS 13
-
-/* Misc DCT definitions */
-#define DCTSIZE		8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	64	/* DCTSIZE squared; # of elements in a block */
-
-#define GLOBAL			/* a function referenced thru EXTERNs */
-  
-typedef short DCTELEM;
-typedef DCTELEM DCTBLOCK[DCTSIZE2];
- 
-
-#ifdef SH_MEM
-extern int gXErrorFlag;
-#endif
-
-extern double realTimeStart;
-extern int totNumFrames;
-extern int loopFlag;
-extern int noDisplayFlag;
-extern jmp_buf env;
-
-#ifdef ANALYSIS
-extern unsigned int bitCount;
-extern int showEachFlag;
-extern unsigned int cacheHit[8][8];
-extern unsigned int cacheMiss[8][8];
-#endif
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp
deleted file mode 100644
index 2248bb52ce3..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp
+++ /dev/null
@@ -1,916 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- *
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-/*
-#include <sys/types.h>
-#include <sys/socket.h>
-*/
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#ifdef SH_MEM  /* this is already defined in video.h  */
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-#endif
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "dither.h"
-#include "video.h"
-
-#include <math.h>
-#include "proto.h"
-#include "ui.h"
-
-/* Declaration of global variable to hold dither info. */
-
-extern int ditherType;
-
-/* Structures used by the X server. */
-
-extern Display *display;
-extern Colormap cmap;
-
-static int cmdSocket = -1;
-static int win_width, win_height;
-static Window window;
-static GC gc;
-
-static int usingShm = 0;
-#ifdef SH_MEM
-static XShmSegmentInfo shminfo;               /* Segment info.  */
-#endif
-static XImage *ximage = NULL;
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitColor --
- *
- *	Initialized lum, cr, and cb quantized range value arrays.
- *
- * Results: 
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void
-InitColor()
-{
-  int i;
-
-  for (i=0; i<LUM_RANGE; i++) {
-    lum_values[i] = ((i * 256) / (LUM_RANGE)) + (256/(LUM_RANGE*2));
-  }
-
-  for (i=0; i<CR_RANGE; i++) {
-    cr_values[i] = ((i * 256) / (CR_RANGE)) + (256/(CR_RANGE*2));
-  }
-
-  for (i=0; i<CB_RANGE; i++) {
-    cb_values[i] = ((i * 256) / (CB_RANGE)) + (256/(CB_RANGE*2));
-  }
-
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * ConvertColor --
- *
- *	Given a l, cr, cb tuple, converts it to r,g,b.
- *
- * Results:
- *	r,g,b values returned in pointers passed as parameters.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-static void
-ConvertColor(unsigned char l, unsigned char cr, unsigned char cb,
-	     unsigned char *r, unsigned char *g, unsigned char *b)
-{
-  double fl, fcr, fcb, fr, fg, fb;
-
-  fl = (double) l;
-  fcr =  ((double) cr) - 128.0;
-  fcb =  ((double) cb) - 128.0;
-
-
-  fr = fl + (1.40200 * fcb);
-  fg = fl - (0.71414 * fcb) - (0.34414 * fcr);
-  fb = fl + (1.77200 * fcr);
-
-  if (fr < 0.0) fr = 0.0;
-  else if (fr > 255.0) fr = 255.0;
-
-  if (fg < 0.0) fg = 0.0;
-  else if (fg > 255.0) fg = 255.0;
-
-  if (fb < 0.0) fb = 0.0;
-  else if (fb > 255.0) fb = 255.0;
-
-  *r = (unsigned char) fr;
-  *g = (unsigned char) fg;
-  *b = (unsigned char) fb;
-
-}
-
-#ifdef SH_MEM
-
-int gXErrorFlag = 0;
-
-int HandleXError(Display * dpy, XErrorEvent * event)
-{
-  gXErrorFlag = 1;
-  return 0;
-}
-
-void InstallXErrorHandler()
-{
-  int HandleXError(Display *,XErrorEvent *);
-
-  XSetErrorHandler(HandleXError);
-  XFlush(display);
-}
-
-void DeInstallXErrorHandler()
-{
-  XSetErrorHandler(NULL);
-  XFlush(display);
-}
-#endif
-
-/*
- *--------------------------------------------------------------
- *
- * MakeWindow --
- *
- *	Create X Window for image display
- *
- * Results:
- *	Read the code.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-#ifdef SH_MEM
-int CompletionType = -1;
-#endif
-
-// int XShmGetEventBase (Display*);
-
-static void 
-MakeWindow(void) 
-{
-  
-  XSizeHints hint;
-  unsigned int fg, bg;
-  char *hello = "MPEG Play";
-  int screen;
-
-  if (ditherType == NO_DITHER) return;
-/*
-  UICreate();
-*/
-
-#ifdef SH_MEM
-  if (shmemFlag && display != NULL)
-  {
-    if (!XShmQueryExtension(display))
-    {
-      shmemFlag = 0;
-      fprintf(stderr, "VP: Shared memory not supported, Reverting to normal Xlib.\n");
-    }
-    else
-    {
-      shmemFlag = 1;
-      /*
-      fprintf(stderr, "VP: try using shared mem, but STOPPED temporarily.\n");
-      shmemFlag = 0;
-      */
-    }
-  }
-  else if (shmemFlag)
-  {
-    fprintf(stderr, "VP unexpected: display is NULL.\n");
-    exit(1);
-  }
-  if(shmemFlag)
-    CompletionType = /*XShmGetEventBase(display) +*/ ShmCompletion;
-#endif
-
-  screen = DefaultScreen (display);
-  
-  /* Fill in hint structure */
-
-  hint.x = 0;
-  hint.y = 0;
-  hint.width = 150;
-  hint.height = 150;
-  hint.flags = PPosition | PSize;
-  
-  /* Get some colors */
-  
-  bg = WhitePixel (display, screen);
-  fg = BlackPixel (display, screen);
-  
-  /* Make the window */
-  
-  if (ditherType == FULL_COLOR_DITHER) {
-    window = CreateFullColorWindow (display, hint.x, hint.y, hint.width, hint.height);
-    if (window == 0) {
-      fprintf (stderr, "-color option only valid on full color display\n");
-      exit (-1);
-    }
-  } else if (ditherType == MONO_DITHER || ditherType == MONO_THRESHOLD) {
-    window = XCreateSimpleWindow (display,
-				  MonitorWindow(),
-				  hint.x, hint.y,
-				  hint.width, hint.height,
-				  4, fg, bg);
-    UISetwin(window);
-  } else {
-    XVisualInfo vinfo;
-    
-    if (!XMatchVisualInfo (display, screen, 8, PseudoColor, 
-			   &vinfo)) {
-
-      if (!XMatchVisualInfo(display, screen, 8, GrayScale, 
-			    &vinfo)) {
-	fprintf(stderr, "It seems you have a true-color/mono monitor,\n");
-	fprintf(stderr, "please try 'vcr -dither color' or 'vcr -dither mono'\n");
-	exit(-1);
-      }
-    }
-
-    window = XCreateSimpleWindow (display,
-				 MonitorWindow(),
-				 hint.x, hint.y,
-				 hint.width, hint.height,
-				 4, fg, bg);
-    UISetwin(window);
-  }
-  
-  XSelectInput(display, window, StructureNotifyMask);
-
-  /* Tell other applications about this window */
-  
-  XSetStandardProperties (display, window, hello, hello, None, NULL, 0, &hint);
-  
-  /* Map window. */
-
-  XMapWindow(display, window);
-
-  /* Wait for map. */
-  while(1) {
-    XEvent	xev;
-
-    XNextEvent(display, &xev);
-    if(xev.type == MapNotify && xev.xmap.event == window)
-      break;
-  }
-  XSelectInput(display, window, NoEventMask);
-}
-  
-
-/*
- *--------------------------------------------------------------
- *
- * InitDisplay --
- *
- *	Initialized display, sets up colormap, etc.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-
-static char window_name[64];
-#include <string.h>
-
-void InitDisplay(char *name)
-{
-
-  int ncolors = LUM_RANGE*CB_RANGE*CR_RANGE;
-  XColor xcolor;
-  int i, lum_num, cr_num, cb_num;
-  unsigned char r, g, b;
-  Colormap dcmap;
-
-  if (ditherType == NO_DITHER) return;
-
-  strcpy(window_name, name);
-  
-  MakeWindow();
-
-  gc = XCreateGC(display, window, 0, 0);
-
-  dcmap = cmap = XDefaultColormap(display, DefaultScreen(display));
-
-  xcolor.flags = DoRed | DoGreen | DoBlue;
-
-  retry_alloc_colors:
-  for (i=0; i<ncolors; i++) {
-
-    lum_num = (i / (CR_RANGE*CB_RANGE))%LUM_RANGE;
-    cr_num = (i / CB_RANGE)%CR_RANGE;
-    cb_num = i % CB_RANGE;
-
-    ConvertColor(lum_values[lum_num], cr_values[cr_num], cb_values[cb_num], &r, &g, &b);
-
-    xcolor.red = r * 256;
-    xcolor.green = g * 256;
-    xcolor.blue = b * 256;
-
-    if(XAllocColor(display, cmap, &xcolor) == 0 && cmap == dcmap) {
-      int j;
-      unsigned long tmp_pixel;
-      XWindowAttributes xwa;
-
-      Fprintf(stderr, "Using private colormap.\n");
-
-      /* Free colors. */
-      for(j = 0; j < i; j ++) {
-	tmp_pixel = pixel[j];
-        XFreeColors(display, cmap, &tmp_pixel, 1, 0);
-      }
-
-      XGetWindowAttributes(display, window, &xwa);
-      cmap = XCreateColormap(display, window, xwa.visual, AllocNone);
-      XSetWindowColormap(display, window, cmap);
-      UISetColormap();
-
-      goto retry_alloc_colors;
-    }
-    pixel[i] = xcolor.pixel;
-  }
-
-  /*
-  Fprintf(stderr, "Pixel values allocated for colormap:");
-  for (i = 0; i < ncolors; i++) {
-    if (!(i % 20)) Fprintf(stderr, "\n");
-    Fprintf(stderr, "%3d ", pixel[i]);
-  }
-  */
-
-  ximage = NULL;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitGrayDisplay --
- *
- *	Initialized display for gray scale dither.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-#define NUM_COLORS 128
-
-void InitGrayDisplay(char *name)
-{
-  int ncolors = NUM_COLORS;
-  XColor xcolor;
-  int i;
-  Colormap dcmap;
-
-  MakeWindow();
-
-  gc = XCreateGC(display, window, 0, 0);
-
-  dcmap = cmap = XDefaultColormap(display, DefaultScreen(display));
-
-  xcolor.flags = DoRed | DoGreen | DoBlue;
-
-  retry_alloc_grays:
-  for (i=0; i<ncolors; i++) {
-
-    xcolor.red = (i*2) * 256;
-    xcolor.green = (i*2) * 256;
-    xcolor.blue = (i*2) * 256;
-
-    if(XAllocColor(display, cmap, &xcolor) == 0 && cmap == dcmap) {
-      int j;
-      unsigned long tmp_pixel;
-      XWindowAttributes xwa;
-
-      Fprintf(stderr, "Using private colormap.\n");
-
-      /* Free colors. */
-      for(j = 0; j < i; j ++) {
-	tmp_pixel = pixel[j*2];
-        XFreeColors(display, cmap, &tmp_pixel, 1, 0);
-      }
-
-      XGetWindowAttributes(display, window, &xwa);
-      cmap = XCreateColormap(display, window, xwa.visual, AllocNone);
-      XSetWindowColormap(display, window, cmap);
-      UISetColormap();
-
-      goto retry_alloc_grays;
-    }
-    pixel[(i*2)] = xcolor.pixel;
-    pixel[(i*2)+1] = xcolor.pixel;
-  }
-
-  ximage = NULL;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitMonoDisplay --
- *
- *	Initialized display for monochrome dither.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void InitMonoDisplay(char *name)
-{
-  XGCValues xgcv;
-
-  MakeWindow();
-
-  xgcv.background = BlackPixel(display, DefaultScreen(display));
-  xgcv.foreground = WhitePixel(display, DefaultScreen(display));
-
-  gc = XCreateGC(display, window, GCForeground | GCBackground, &xgcv);
-
-  ximage = NULL;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * InitColorDisplay --
- *
- *	Initialized display for full color output.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *--------------------------------------------------------------
- */
-
-void InitColorDisplay(char *name)
-{
-
-  MakeWindow();
-
-  gc = XCreateGC(display, window, 0, 0);
-  ximage = NULL;
-}
-
-
-static void ClearWindow(void)
-{
-  int size;
-  char * data;
-  if ((ditherType == Twox2_DITHER) || (ditherType == FULL_COLOR_DITHER))
-    size = win_width * win_height * 4;
-  else
-    size = win_width * win_height;
-  data = (char *)malloc(size);
-  if (data != NULL) {
-    memset(data, 0, size);
-    ximage->data = data;
-    XPutImage(display, window, gc, ximage, 0, 0, 0, 0,
-	      ximage->width, ximage->height);
-    XFlush(display);
-    ximage->data = NULL;
-    free(data);
-  }
-}
-
-
-void VPresizeWindow(int h, int w)
-{
-  int i;
-  char dummy;
-  Visual *fc_visual;
-  int depth;
-  static int ph = 0;
-  static int pw = 0;
-  
-  if (ph == h && pw == w) {
-    ClearWindow();
-    return;
-  }
-  ph = h;
-  pw = w;
-  
-  /* Excerpt from man page of XDestroyImage(3X11):
-     Note that when the image is created using XCreateImage(),
-     XGetImage(), or XSubImage(), the destroy procedure that the
-     XDestroyImage function call frees both the image structure
-     and the data pointed to by the image structure. */
-  if (ximage != NULL) ximage->data = NULL;
-  
-  if (ditherType == NO_DITHER) return;
-
-  win_width = ((w + 15)>>4)<<4;
-  win_height = ((h + 15)>>4)<<4;
-  
-  i = (ditherType == Twox2_DITHER) ? 2 : 1;
-  XResizeWindow(display, window, w*i, h*i);
-  UIMinsize(w*i, h*i);
-  
-  /* ximage allocate/resize */
-
-#ifdef SH_MEM
-  if (shmemFlag && display != NULL)
-  {
-    InstallXErrorHandler();
-  }
-#endif
-       
-  if (ximage != NULL)
-  {
-#ifdef SH_MEM
-    if (shmemFlag && usingShm == 1)
-    {
-      XDestroyImage(ximage);
-      ximage = NULL;
-    }
-    else
-#endif
-    {
-      XDestroyImage(ximage);
-      ximage = NULL;
-    }
-  }
-#ifdef SH_MEM
-  if (shmemFlag)
-  {
-    /*
-    Visual *fc_visual;
-    int depth;
-    Visual *FindFullColorVisual();
-    */
-    usingShm = 1;
-
-    if (ditherType == Twox2_DITHER)
-    {
-      ximage = XShmCreateImage(display, None, 8, ZPixmap, NULL,
-				    &(shminfo), win_width * 2, win_height * 2);
-    }
-    else if (ditherType == FULL_COLOR_DITHER)
-    {
-      fc_visual = FindFullColorVisual(display, &depth);
-      ximage = XShmCreateImage(display, fc_visual, depth, ZPixmap,
-				    NULL, &(shminfo), win_width, win_height);
-    }
-    else if (ditherType == MONO_DITHER || ditherType == MONO_THRESHOLD)
-    {
-      ximage = XShmCreateImage(display, None, 1, XYBitmap,
-				    NULL, &(shminfo), win_width, win_height);
-    }
-    else
-    {
-      ximage = XShmCreateImage(display, None, 8, ZPixmap, NULL,
-				    &(shminfo), win_width, win_height);
-    }
-    if (ximage == NULL)
-    {
-      fprintf(stderr, "Shared memory error, disabling.\n");
-      goto shmemerror;
-    }
-
-    if (gXErrorFlag)
-    {
-      XDestroyImage(ximage);
-      ximage = NULL;
-      fprintf(stderr, "Shared memory error, disabling.\n");
-      gXErrorFlag = 0;
-      goto shmemerror;
-    }
-  }
-  else
-#endif
-  {
-shmemerror:
-
-    usingShm = 0;
-  
-    if (ditherType == Twox2_DITHER)
-    {
-      ximage = XCreateImage(display, None, 8, ZPixmap, 0, &dummy,
-			    win_width * 2,
-			    win_height * 2, 8, 0);
-    }
-    else if (ditherType == FULL_COLOR_DITHER)
-    {
-      fc_visual = FindFullColorVisual(display, &depth);
-      ximage = XCreateImage (display, fc_visual, depth, ZPixmap,
-			     0, &dummy, win_width,
-			     win_height, 32, 0);
-    }
-    else if (ditherType == MONO_DITHER || ditherType == MONO_THRESHOLD)
-    {
-      ximage = XCreateImage (display, None, 1, XYBitmap, 0, &dummy,
-			     win_width,
-			     win_height, 8, 0);
-      ximage->byte_order = MSBFirst;
-      ximage->bitmap_bit_order = MSBFirst;
-    }
-    else
-    {
-      ximage = XCreateImage(display, None, 8, ZPixmap, 0, &dummy,
-			    win_width,
-			    win_height, 8, 0);
-    }
-    if (ximage == NULL)
-    {
-      perror("VP error: fails to XCreateImage ximage");
-      exit(1);
-    }
-  }
-#ifdef SH_MEM
-  if (shmemFlag && display != NULL)
-  {
-    DeInstallXErrorHandler();
-  }
-#endif
-  ximage->data = NULL;
-  /*
-  fprintf(stderr, "win_width %d, win_height %d, times %d\n",
-	  win_width, win_height, win_width * win_height);
-  */
-  ClearWindow();
-  /*
-  fprintf(stderr, "VP window resized as width-%d, height-%d.\n", w, h);
-  */
-}
-
-/* parameter 'position' is for VPcontinuous command only */
-void VPcommand(int cmd, char * ptr)
-{
-  FrameBlock *buf = (FrameBlock *)ptr;
-  /*
-  fprintf(stderr, "VP get cmd %d.\n", cmd);
-  */
-  switch (cmd)
-  {
-  case CmdVPdisplayFrame:
-    if (shared->cmd != CmdSTOP) {
-      shared->currentGroup = buf->gop;
-      shared->currentFrame = buf->frame;
-      shared->currentDisplay = buf->display;
-      ximage->data = (char *)buf->data;
-      VPexpose();
-    }
-    VDreclaimMsg(buf);
-    return;
-  
-  case CmdVPinitScreen:
-    
-    VPresizeWindow(shared->verticalSize, shared->horizontalSize);
-    return;
-    
-  case CmdVPclearScreen:
-    
-    ClearWindow();
-    /*
-    fprintf(stderr, "VP screen cleaned for audio-only case.\n");
-    */
-    break;
-    
-  default:  /* all unknown cmds shall be processed by UI */
-  
-    break;
-  }
-}
-
-void VPexpose(void)
-{
-  if (ximage == NULL) {
-    return;
-  }
-  else if (ximage->data == NULL) {
-    return;
-  }
-#ifdef SH_MEM
-  if (shmemFlag && usingShm)
-  {
-    XShmPutImage(display, window, gc, ximage, 0, 0, 0, 0,
-		 ximage->width, ximage->height, True);
-    XFlush(display);
-    while(1)
-    {
-      XEvent xev;
-      
-      XNextEvent(display, &xev);
-      if(xev.type == CompletionType)
-        break;
-    }
-  }
-  else 
-#endif
-  {
-    XPutImage(display, window, gc, ximage, 0, 0, 0, 0,
-	      ximage->width, ximage->height);
-    XFlush(display);
-  }
-}
-
-static void DisplayInitialization(void)
-{
-/*
-  printf("to initialize display.\n");
-*/  
-  switch (ditherType) {
-    
-  case HYBRID_DITHER:
-    
-    InitColor();
-    InitDisplay(displayName);
-    break;
-    
-    case HYBRID2_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-    
-  case FS4_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-    
-  case FS2_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-    
-  case FS2FAST_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-    
-  case Twox2_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-
-  case GRAY_DITHER:
-    InitGrayDisplay(displayName);
-    break;
-
-  case FULL_COLOR_DITHER:
-    InitColorDisplay(displayName);
-    break;
-
-  case NO_DITHER:
-    shmemFlag = 0;
-    break;
-
-  case ORDERED_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-
-  case MONO_DITHER:
-  case MONO_THRESHOLD:
-    InitMonoDisplay(displayName);
-    break;
-
-  case ORDERED2_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-
-  case MBORDERED_DITHER:
-    InitColor();
-    InitDisplay(displayName);
-    break;
-
-  }
-/*
-  printf("finished init display.\n");
-*/
-}
-
-void VPinitWindow(Widget shell, Window monitorWindow, int cmdSock)
-{
-  cmdSocket = cmdSock;
-  lum_values = (int *) malloc(LUM_RANGE*sizeof(int));
-  cr_values = (int *) malloc(CR_RANGE*sizeof(int));
-  cb_values = (int *) malloc(CB_RANGE*sizeof(int));
-
-  DisplayInitialization();
-  memcpy(shared->pixel, pixel, 256);
-  shared->pixelValid = 1;
-  
-  free(lum_values);
-  free(cr_values);
-  free(cb_values);
-#ifdef SH_MEM
-  if (shmemFlag && display != NULL)
-  {
-    InstallXErrorHandler();
-    
-    shminfo.shmid = shared->VDbufId;
-    shminfo.shmaddr = shared->VDbufAddr;
-    shminfo.readOnly = False;
-    XShmAttach(display, &(shminfo));
-    XSync(display, False);
-    
-    if (gXErrorFlag)
-    {
-      Fprintf(stderr, "Shared memory error, disabling.\n");
-      gXErrorFlag = 0;
-      shmemFlag = 0;
-    }
-    DeInstallXErrorHandler();
-  }
-#endif
-  
-  remove_shmem_id(shared->VDbufId);
-  VPresizeWindow(150, 200);
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
deleted file mode 100644
index 20d9de633e9..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
+++ /dev/null
@@ -1,271 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libmpeg_mib
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES= mibButton \
-       mibDrawArea \
-       mibFrame \
-       mibLabel \
-       mibList \
-       mibMenu \
-       mibRadioBox \
-       mibScale \
-       mibScrollBar \
-       mibTextBig \
-       mibTextBox \
-       mibToggle \
-       mibload \
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-##LIBS 	+= -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
-CPPFLAGS += -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/mibButton.o .obj/mibButton.so .shobj/mibButton.o .shobj/mibButton.so: mibButton.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibDrawArea.o .obj/mibDrawArea.so .shobj/mibDrawArea.o .shobj/mibDrawArea.so: mibDrawArea.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibFrame.o .obj/mibFrame.so .shobj/mibFrame.o .shobj/mibFrame.so: mibFrame.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibLabel.o .obj/mibLabel.so .shobj/mibLabel.o .shobj/mibLabel.so: mibLabel.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibList.o .obj/mibList.so .shobj/mibList.o .shobj/mibList.so: mibList.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibMenu.o .obj/mibMenu.so .shobj/mibMenu.o .shobj/mibMenu.so: mibMenu.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibRadioBox.o .obj/mibRadioBox.so .shobj/mibRadioBox.o .shobj/mibRadioBox.so: mibRadioBox.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibScale.o .obj/mibScale.so .shobj/mibScale.o .shobj/mibScale.so: mibScale.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibScrollBar.o .obj/mibScrollBar.so .shobj/mibScrollBar.o .shobj/mibScrollBar.so: mibScrollBar.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibTextBig.o .obj/mibTextBig.so .shobj/mibTextBig.o .shobj/mibTextBig.so: mibTextBig.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibTextBox.o .obj/mibTextBox.so .shobj/mibTextBox.o .shobj/mibTextBox.so: mibTextBox.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibToggle.o .obj/mibToggle.so .shobj/mibToggle.o .shobj/mibToggle.so: mibToggle.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-.obj/mibload.o .obj/mibload.so .shobj/mibload.o .shobj/mibload.so: mibload.cpp mibload.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i mibwidgets.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp
deleted file mode 100644
index 27fb20ab24a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display		*dpy;
-extern GC		 mib_gc;
-
-/* Code for Button */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Button(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget *temp;
-  mib_Button *myres;
-  unsigned char *label_text;
-  Arg     args[20];
-  int     n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-  myres = (mib_Button *)ACE_OS::malloc(sizeof(mib_Button));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(7);
-  sprintf(temp->mib_class,"Button");
-  temp->mib_class_num = MIB_BUTTON;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-
-  if (mib_fill == WDEFAULT)
-  {
-    myres->label = (char *)ACE_OS::malloc(strlen(label)+1);
-    strcpy(myres->label,label);
-  }
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    label_text = XmStringCreateLtoR(label, XmSTRING_DEFAULT_CHARSET);
-
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmPushButtonWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WDEFAULT)
-  {
-    XmStringFree(label_text);
-  }
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_Button(mib_Widget *thisw)
-{
-  mib_Button *temp = (mib_Button *)thisw->myres;
-
-  ACE_OS::free(temp->label);
-  ACE_OS::free(temp);
-}
-
-void mib_save_Button(mib_Widget *thisw, FILE *fout)
-{
-  mib_Button *temp = (mib_Button *)thisw->myres;
-
-  fprintf(fout,"label: \\\"%s\\\"\\n\\\n", temp->label);
-}
-
-void mib_code_gen_Button(mib_Widget *thisw, FILE *fout)
-{
-}
-
-int mib_load_Button(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_Button	*myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg		args[20];
-  int		n, got_line, vallen;
-
-  myres = (mib_Button *)thisw->myres;
-
-  got_line = mib_read_line(fin, res, val);
-  if (!got_line)
-    return 0;
-
-  if (!strcmp(res,"label"))
-  {
-    vallen = strlen(val);
-    if (vallen < 2)
-      return 0;
-    val[vallen-1] = '\0';
-    myres->label = (char *)ACE_OS::malloc(vallen-1);
-    sprintf(myres->label,"%s",&(val[1]));
-
-    label_text = XmStringCreateLtoR(myres->label, XmSTRING_DEFAULT_CHARSET);
-
-    n = 0;
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    XtSetValues(thisw->me, args, n);
-
-    XmStringFree(label_text);
-
-  }
-  else
-    return 0;
-
-  got_line = mib_read_line(fin, res, val);
-  if (!got_line)
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp
deleted file mode 100644
index d293ca412bc..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for DrawingArea */
-/*****************************************************************************/
-
-mib_Widget *mib_create_DrawingArea(mib_Widget *parent, char *name, char *label,
-	int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget		*temp;
-  mib_DrawingArea	*myres;
-  Widget		 wtemp;
-  Arg			 args[20];
-  int			 n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-  myres = (mib_DrawingArea *)ACE_OS::malloc(sizeof(mib_DrawingArea));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(12);
-  sprintf(temp->mib_class,"DrawingArea");
-  temp->mib_class_num = MIB_DRAWINGAREA;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->nothing = 0;
-
-  /* create Xt widget */
-
-
-  n = 0;
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNbackground, WhitePixel(dpy, DefaultScreen(dpy))); n++;
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmDrawingAreaWidgetClass,
-                temp->parent->me, args, n);
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_DrawingArea(mib_Widget *thisw)
-{
-  mib_DrawingArea *temp = (mib_DrawingArea *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_DrawingArea(mib_Widget *thisw, FILE *fout)
-{
-}
-
-int mib_load_DrawingArea(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp
deleted file mode 100644
index 0a6c9f16fb6..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for Frames */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Frame(mib_Widget *parent, char *name, char *frame_type,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget *temp;
-  mib_Frame *myres;
-  Arg     args[20];
-  int     n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_Frame *)ACE_OS::malloc(sizeof(mib_Frame));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(6);
-  sprintf(temp->mib_class,"Frame");
-  temp->mib_class_num = MIB_FRAME;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->shadowtype = 0;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-
-  if (mib_fill == WDEFAULT)
-    if (!strcmp("InFrame",frame_type))
-    {
-      XtSetArg (args[n], XmNshadowType, XmSHADOW_IN); n++;
-    }
-    else
-    if (!strcmp("OutFrame",frame_type))
-    {
-      XtSetArg (args[n], XmNshadowType, XmSHADOW_OUT); n++;
-      myres->shadowtype = 1;
-    }
-    else
-    if (!strcmp("EtchedInFrame",frame_type))
-    {
-      XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_IN); n++;
-      myres->shadowtype = 2;
-    }
-    else
-    if (!strcmp("EtchedOutFrame",frame_type))
-    {
-       XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_OUT); n++;
-       myres->shadowtype = 3;
-    }
-
-  temp->me = XtCreateManagedWidget(name, xmFrameWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_Frame(mib_Widget *thisw)
-{
-  mib_Frame *temp = (mib_Frame *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_Frame(mib_Widget *thisw, FILE *fout)
-{
-  mib_Frame *temp = (mib_Frame *)thisw->myres;
-
-  fprintf(fout,"shadowtype: %d\\n\\\n", temp->shadowtype);
-}
-
-int mib_load_Frame(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_Frame    *myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg           args[5];
-  int           n;
-
-  myres = (mib_Frame *)thisw->myres;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"shadowtype"))
-  {
-    sscanf(val,"%d",&(myres->shadowtype));
-
-    n = 0;
-    switch (myres->shadowtype) {
-	case 0:
-        XtSetArg (args[n], XmNshadowType, XmSHADOW_IN); n++;
-	break;
-	case 1:
-	XtSetArg (args[n], XmNshadowType, XmSHADOW_OUT); n++;
-	break;
-	case 2:
-	XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_IN); n++;
-	break;
-	case 3:
-	XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_OUT); n++;
-	break;
-	default:
-	break;
-    }
-    XtSetValues(thisw->me, args, n);
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp
deleted file mode 100644
index 9ee5cf87b3e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for Label */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Label(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget *temp;
-  mib_Label *myres;
-  unsigned char *label_text;
-  Arg     args[20];
-  int     n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_Label *)ACE_OS::malloc(sizeof(mib_Label));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(6);
-  sprintf(temp->mib_class,"Label");
-  temp->mib_class_num = MIB_LABEL;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-
-  if (mib_fill == WDEFAULT)
-  {
-    myres->label = (char *)ACE_OS::malloc(strlen(label)+1);
-    strcpy(myres->label,label);
-  }
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    label_text = XmStringCreateLtoR(label, XmSTRING_DEFAULT_CHARSET);
-
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmLabelWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WDEFAULT)
-    XmStringFree(label_text);
-  
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_Label(mib_Widget *thisw)
-{
-  mib_Label *temp = (mib_Label *)thisw->myres;
-
-  ACE_OS::free(temp->label);
-  ACE_OS::free(temp);
-}
-
-void mib_save_Label(mib_Widget *thisw, FILE *fout)
-{
-  mib_Label *temp = (mib_Label *)thisw->myres;
-
-  fprintf(fout,"label: \\\"%s\\\"\\n\\\n", temp->label);
-}
-
-int mib_load_Label(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_Label    *myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg           args[5];
-  int           n, vallen;
-
-  myres = (mib_Label *)thisw->myres;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"label"))
-  {
-    vallen = strlen(val);
-    if (vallen < 2)
-      return 0;
-    val[vallen-1] = '\0';
-    myres->label = (char *)ACE_OS::malloc(vallen-1);
-    sprintf(myres->label,"%s",&(val[1]));
-    label_text = XmStringCreateLtoR(myres->label, XmSTRING_DEFAULT_CHARSET);
-
-    n = 0;
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    XtSetValues(thisw->me, args, n);
-
-    XmStringFree(label_text);
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp
deleted file mode 100644
index 5fd19422b39..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-static Widget    real_list;
-
-/* Code for Lists */
-/*****************************************************************************/
-
-mib_Widget *mib_create_List(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget	*temp;
-  mib_List	*myres;
-  Widget	 wtemp;
-  unsigned char *label_text;
-  char		 ttext[30];
-  Arg		 args[20];
-  String	 myname;
-  int		 n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_List *)ACE_OS::malloc(sizeof(mib_List));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(5);
-  sprintf(temp->mib_class,"List");
-  temp->mib_class_num = MIB_LIST;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx); n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy); n++;
-  }
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_IN); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmFrameWidgetClass,
-                temp->parent->me, args, n);
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNorientation, XmVERTICAL); n++;
-
-  if (mib_fill == WEMPTY)
-  {
-    XtSetArg (args[n], XmNlistSizePolicy, XmCONSTANT); n++;
-  }
-
-  wtemp = XmCreateScrolledList(temp->me, name, args, n);
-  myres->real_list = wtemp;
-  real_list = wtemp;
-
-  XtManageChild(wtemp);
-
-  if (mib_fill != WEMPTY)
-    real_list = NULL;
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    label_text = XmStringCreateLtoR("Simple", XmSTRING_DEFAULT_CHARSET);
-    XmListAddItem(wtemp, label_text, 0);
-    XmStringFree(label_text);
-    label_text = XmStringCreateLtoR("List", XmSTRING_DEFAULT_CHARSET);
-    XmListAddItem(wtemp, label_text, 0);
-    XmStringFree(label_text);
-    for (n=0;n<200;n++)
-    {
-      sprintf(ttext,"Item %d   ",n);
-      label_text = XmStringCreateLtoR(ttext, XmSTRING_DEFAULT_CHARSET);
-      XmListAddItem(wtemp, label_text, 0);
-      XmStringFree(label_text);
-    }
-
-    mib_apply_eventhandlers(temp->me, temp);
-    mib_apply_eventhandlers(wtemp, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_List(mib_Widget *thisw)
-{
-  mib_List *temp = (mib_List *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_List(mib_Widget *thisw, FILE *fout)
-{
-}
-
-int mib_load_List(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char		res[MI_MAXSTRLEN];
-  char		val[MI_MAXSTRLEN];
-
-
-  if (real_list)
-   thisw->me = real_list;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp
deleted file mode 100644
index aa1c96b5546..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	mib_gc;
-static int	delhandler; /* delay adding event handler until menu
-					is actually created */
-
-/* Code for Menu */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Menu(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget	*temp;
-  mib_Menu	*myres;
-  Widget	 wtemp;
-  char		 label_temp[50];
-  Arg		 args[20];
-  int		 n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_Menu *)ACE_OS::malloc(sizeof(mib_Menu));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(8);
-  sprintf(temp->mib_class,"Menu");
-  temp->mib_class_num = MIB_MENU;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 0;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->numitems = 0;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-  }
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmRowColumnWidgetClass,
-                temp->parent->me, args, n);
-
-  n = 0;
-
-  delhandler = 1;
-  if (mib_fill == WDEFAULT)
-  {
-    delhandler = 0;
-    myres->numitems = 3;
-    myres->my_menu = (MenuItem *)ACE_OS::malloc(sizeof(MenuItem) * (myres->numitems+1));
-    myres->items = (Widget *)ACE_OS::malloc(sizeof(Widget) * myres->numitems);
-    sprintf(label_temp, "Item 1");
-    myres->my_menu[0].label = (char *)ACE_OS::malloc(strlen(label_temp)+1);
-    strcpy(myres->my_menu[0].label,label_temp);
-    myres->my_menu[0].wclass = &xmPushButtonGadgetClass;
-    myres->my_menu[0].mnemonic = '1';
-    myres->my_menu[0].accelerator = NULL;
-    myres->my_menu[0].accel_text = NULL;
-    myres->my_menu[0].accel_text = NULL;
-    myres->my_menu[0].callback = NULL;
-    myres->my_menu[0].callback_data = NULL;
-    myres->my_menu[0].subitems = (struct _menu_item *)1;
-
-    sprintf(label_temp, "Item 2");
-    myres->my_menu[1].label = (char *)ACE_OS::malloc(strlen(label_temp)+1);
-    strcpy(myres->my_menu[1].label,label_temp);
-    myres->my_menu[1].wclass = &xmPushButtonGadgetClass;
-    myres->my_menu[1].mnemonic = '2';
-    myres->my_menu[1].accelerator = NULL;
-    myres->my_menu[1].accel_text = NULL;
-    myres->my_menu[1].accel_text = NULL;
-    myres->my_menu[1].callback = NULL;
-    myres->my_menu[1].callback_data = NULL;
-    myres->my_menu[1].subitems = (struct _menu_item *)1;
-
-    sprintf(label_temp, "Item 3");
-    myres->my_menu[2].label = (char *)ACE_OS::malloc(strlen(label_temp)+1);
-    strcpy(myres->my_menu[2].label,label_temp);
-    myres->my_menu[2].wclass = &xmPushButtonGadgetClass;
-    myres->my_menu[2].mnemonic = '2';
-    myres->my_menu[2].accelerator = NULL;
-    myres->my_menu[2].accel_text = NULL;
-    myres->my_menu[2].accel_text = NULL;
-    myres->my_menu[2].callback = NULL;
-    myres->my_menu[2].callback_data = NULL;
-    myres->my_menu[2].subitems = (struct _menu_item *)1;
-
-    myres->my_menu[3].label = NULL;
-
-    wtemp = BuildMenu(temp->me, XmMENU_OPTION, NULL, 'M', myres->my_menu);
-    XtManageChild(wtemp);
-  }
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-
-    /* default menu */
-
-    if (!delhandler)
-    {
-      mib_apply_eventhandlers(wtemp, temp);
-      mib_apply_eventhandlers(temp->me, temp);
-    }
-  }
-
-  if (mib_fill == WEMPTY)
-    delhandler = 0;
-
-  return temp;
-}
-
-void mib_delete_Menu(mib_Widget *thisw)
-{
-  mib_Menu *temp = (mib_Menu *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_Menu(mib_Widget *thisw, FILE *fout)
-{
-  mib_Menu *temp = (mib_Menu *)thisw->myres;
-  int count;
-
-  fprintf(fout, "numitems: %d\\n\\\n", temp->numitems);
-
-  for (count=0; count < temp->numitems; count++)
-  {
-    fprintf(fout, "item: \\\"%s\\\"\\n\\\n", temp->my_menu[count].label);
-  }
-
-}
-
-int mib_load_Menu(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  int		count, vallen;
-  Widget	wtemp;
-  mib_Menu     *myres = (mib_Menu *)thisw->myres;
-  
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res, "numitems"))
-  {
-    myres->numitems = 0;
-    sscanf(val, "%d", &(myres->numitems));
-    if (!(myres->numitems))
-      return 0;
-
-    myres->my_menu = (MenuItem *)ACE_OS::malloc(sizeof(MenuItem) * (myres->numitems+1));
-    myres->items = (Widget *)ACE_OS::malloc(sizeof(Widget) * myres->numitems);
-    for (count = 0; count < myres->numitems; count++)
-    {
-      if (!mib_read_line(fin, res, val))
-	return 0;
-      vallen = strlen(val);
-      if (vallen < 2)
-	return 0;
-      val[vallen-1] = '\0';
-      myres->my_menu[count].label = (char *)ACE_OS::malloc(vallen-1);
-      sprintf(myres->my_menu[count].label, "%s", &(val[1]));
-      myres->my_menu[count].wclass = &xmPushButtonGadgetClass;
-      myres->my_menu[count].mnemonic = NULL;
-      myres->my_menu[count].accelerator = NULL;
-      myres->my_menu[count].accel_text = NULL;
-      myres->my_menu[count].accel_text = NULL;
-      myres->my_menu[count].callback = NULL;
-      myres->my_menu[count].callback_data = NULL;
-      myres->my_menu[count].subitems = (struct _menu_item *)1;
-    }
-    myres->my_menu[myres->numitems].label = NULL;
-
-    wtemp = BuildMenu(thisw->me, XmMENU_OPTION, NULL, NULL, myres->my_menu);
-    XtManageChild(wtemp);
-
-    if (delhandler)
-    {
-      mib_apply_eventhandlers(wtemp, thisw);
-      mib_apply_eventhandlers(thisw->me, thisw);
-    }
-    else
-      thisw->me = wtemp;
-
-    for (count = 0; count < myres->numitems; count++)
-    {
-      /* thisw hack extracts the widget for each item in the menu
-	 for possible use by the programmer */
-      myres->items[count] = (Widget)(myres->my_menu[count].subitems);
-    }
-      
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp
deleted file mode 100644
index c76992b8e96..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for RadioBox */
-/*****************************************************************************/
-
-mib_Widget *mib_create_RadioBox(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget    *temp;
-  mib_RadioBox  *myres;
-  Widget	wtemp;
-  unsigned char *label_text;
-  char		label_temp[50];
-  Arg		args[20];
-  int		n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_RadioBox *)ACE_OS::malloc(sizeof(mib_RadioBox));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(9);
-  sprintf(temp->mib_class,"RadioBox");
-  temp->mib_class_num = MIB_RADIOBOX;
-
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 0;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-
-  myres->numlabel = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    myres->numlabel = 2;
-    myres->labels = (char **)ACE_OS::malloc(10);
-    myres->buttons = (Widget *)ACE_OS::malloc(sizeof(Widget) * myres->numlabel);
-    sprintf(label_temp, "Radio 1");
-    myres->labels[0] = (char *)ACE_OS::malloc(strlen(label_temp)+1);
-    strcpy(myres->labels[0],label_temp);
-    sprintf(label_temp, "Radio 2");
-    myres->labels[1] = (char *)ACE_OS::malloc(strlen(label_temp)+1);
-    strcpy(myres->labels[1],label_temp);
-  }
-
-
-  /* create Xt widget */
-
-  n = 0;
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  temp->me = XmCreateRadioBox(temp->parent->me, "Radio", args, n);
-  wtemp = temp->me;
-
-
-  if (mib_fill == WDEFAULT)
-  {
-    n = 0;
-    XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-    XtCreateManagedWidget("Radio 1", xmToggleButtonGadgetClass,
-		wtemp, args, n);
-
-    n = 0;
-    XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-    XtCreateManagedWidget("Radio 2", xmToggleButtonGadgetClass,
-		wtemp, args, n);
-  }
-
-
-  XtManageChild(wtemp);
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_RadioBox(mib_Widget *thisw)
-{
-  mib_RadioBox *temp = (mib_RadioBox *)thisw->myres;
-  int		count;
-
-  for (count=0; count < temp->numlabel; count++)
-    ACE_OS::free(temp->labels[count]);
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_RadioBox(mib_Widget *thisw, FILE *fout)
-{
-  mib_RadioBox *temp = (mib_RadioBox *)thisw->myres;
-  int count;
-
-  fprintf(fout,"numlabel: %d\\n\\\n", temp->numlabel);
-
-  for (count=0; count < temp->numlabel; count++)
-  {
-    fprintf(fout,"label: \\\"%s\\\"\\n\\\n", temp->labels[count]);
-  }
-}
-
-int mib_load_RadioBox(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char		res[MI_MAXSTRLEN];
-  char		val[MI_MAXSTRLEN];
-  int		count, vallen, n;
-  Arg		args[5];
-  mib_RadioBox *myres;
-
-  myres = (mib_RadioBox *)thisw->myres;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"numlabel"))
-  {
-    myres->numlabel = 0;
-    sscanf(val,"%d",&(myres->numlabel));
-    if (!(myres->numlabel))
-      return 0;
-
-    myres->labels = (char **)ACE_OS::malloc((myres->numlabel+1)*4);
-    myres->buttons = (Widget *)ACE_OS::malloc(sizeof(Widget)*(myres->numlabel));
-    for (count=0; count < myres->numlabel; count++)
-    {
-      if (!mib_read_line(fin, res, val))
-	return 0;
-      vallen = strlen(val);
-      if (vallen < 2)
-	return 0;
-      val[vallen-1] = '\0';
-      myres->labels[count] = (char *)ACE_OS::malloc(vallen-1);
-      sprintf(myres->labels[count],"%s",&(val[1]));
-
-      n = 0;
-      XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-      myres->buttons[count] = XtCreateManagedWidget(myres->labels[count],
-		xmToggleButtonGadgetClass, thisw->me, args, n);
-
-    }
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp
deleted file mode 100644
index eb58f655481..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-static int       scaleflag;
-
-/* Code for Scale */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Scale(mib_Widget *parent, char *name, char *orient,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget	*temp;
-  mib_Scale	*myres;
-  Arg		 args[20];
-  int		 n;
-
-
-  scaleflag = 0;
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_Scale *)ACE_OS::malloc(sizeof(mib_Scale));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(10);
-  sprintf(temp->mib_class,"Scale");
-  temp->mib_class_num = MIB_SCALE;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->orientation = 0;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-
-
-  if (mib_fill == WDEFAULT)
-    if (!strcmp("VertScale",orient))
-    {
-      XtSetArg (args[n], XmNorientation, XmVERTICAL); n++;
-    }
-    else
-    if (!strcmp("HorzScale",orient))
-    {
-      XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-      myres->orientation = 1;
-    }
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNshowArrows, False); n++;
-    XtSetArg (args[n], XmNsliderSize, 30); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-    temp->me = XtCreateManagedWidget(name, xmScrollBarWidgetClass,
-                temp->parent->me, args, n);
-  else
-    temp->me = XtCreateManagedWidget(name, xmScaleWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WEMPTY)
-    scaleflag = 1;
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_Scale(mib_Widget *thisw)
-{
-  mib_Scale *temp = (mib_Scale *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_Scale(mib_Widget *thisw, FILE *fout)
-{
-  mib_Scale *temp = (mib_Scale *)thisw->myres;
-
-  fprintf(fout,"orientation: %d\\n\\\n", temp->orientation);
-}
-
-int mib_load_Scale(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_Scale *myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg           args[5];
-  int		n;
-  Dimension	myht,mywd;
-
-
-  myres = (mib_Scale *)thisw->myres;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"orientation"))
-  {
-    sscanf(val,"%d",&(myres->orientation));
-
-    n = 0;
-    if (scaleflag)
-    {
-      if (!myres->orientation)
-      {
-        XtSetArg (args[n], XmNscaleWidth, thisw->width); n++;
-      }
-      else
-      {
-        XtSetArg (args[n], XmNscaleWidth, thisw->height); n++;
-      }
-
-      XtSetValues(thisw->me, args, n);
-
-    }
-
-    n = 0;
-    switch (myres->orientation) {
-        case 0:
-        XtSetArg (args[n], XmNorientation, XmVERTICAL); n++;
-        break;
-        case 1:
-        XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-        break;
-        default:
-        break;
-    }
-    XtSetValues(thisw->me, args, n);
-
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp
deleted file mode 100644
index f8123d8a139..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for ScrollBars */
-/*****************************************************************************/
-
-mib_Widget *mib_create_ScrollBar(mib_Widget *parent, char *name, char *orient,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget	*temp;
-  mib_ScrollBar *myres;
-  Arg		 args[20];
-  int		 n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_ScrollBar *)ACE_OS::malloc(sizeof(mib_ScrollBar));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(10);
-  sprintf(temp->mib_class,"ScrollBar");
-  temp->mib_class_num = MIB_SCROLLBAR;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->orientation = 0;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-
-  if (mib_fill == WDEFAULT)
-    if (!strcmp("VertScrollBar",orient))
-    {
-      XtSetArg (args[n], XmNorientation, XmVERTICAL); n++;
-    }
-    else
-    if (!strcmp("HorzScrollBar",orient))
-    {
-      XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-      myres->orientation = 1;
-    }
-
-  temp->me = XtCreateManagedWidget(name, xmScrollBarWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_ScrollBar(mib_Widget *thisw)
-{
-  mib_ScrollBar *temp = (mib_ScrollBar *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_ScrollBar(mib_Widget *thisw, FILE *fout)
-{
-  mib_ScrollBar *temp = (mib_ScrollBar *)thisw->myres;
-
-  fprintf(fout,"orientation: %d\\n\\\n", temp->orientation);
-}
-
-int mib_load_ScrollBar(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_ScrollBar *myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg           args[5];
-  int           n;
-
-  myres = (mib_ScrollBar *)thisw->myres;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"orientation"))
-  {
-    sscanf(val,"%d",&(myres->orientation));
-
-    n = 0;
-    switch (myres->orientation) {
-        case 0:
-        XtSetArg (args[n], XmNorientation, XmVERTICAL); n++;
-        break;
-        case 1:
-        XtSetArg (args[n], XmNorientation, XmHORIZONTAL); n++;
-        break;
-        default:
-        break;
-    }
-    XtSetValues(thisw->me, args, n);
-  }
-  else
-    return 0;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp
deleted file mode 100644
index af814a39fb4..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	mib_gc;
-static Widget   real_text;
-
-/* Code of TextBig */
-/*****************************************************************************/
-
-mib_Widget *mib_create_TextBig(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget	*temp;
-  mib_TextBig	*myres;
-  Widget	 wtemp;
-  Arg		 args[20];
-  int		 n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_TextBig *)ACE_OS::malloc(sizeof(mib_TextBig));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(8);
-  sprintf(temp->mib_class,"TextBig");
-  temp->mib_class_num = MIB_TEXTBIG;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->nothing = 0;
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-  }
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNshadowType, XmSHADOW_ETCHED_IN); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmFrameWidgetClass,
-                temp->parent->me, args, n);
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-    XtSetArg (args[n], XmNrows, 200); n++;
-    XtSetArg (args[n], XmNcolumns, 200); n++;
-  }
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNeditMode, XmMULTI_LINE_EDIT); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  wtemp = XmCreateScrolledText(temp->me, name, args, n);
-  real_text = wtemp;
-
-  XtManageChild(wtemp);
-
-  if (mib_fill != WEMPTY)
-    real_text = NULL;
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    XmTextSetString(wtemp,"Big Text Field\nwith Scrollbars\n\n\n\n\n\n\n ");
-
-    mib_apply_eventhandlers(wtemp, temp);
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_TextBig(mib_Widget *thisw)
-{
-  mib_TextBig *temp = (mib_TextBig *)thisw->myres;
-
-  ACE_OS::free(temp);
-}
-
-void mib_save_TextBig(mib_Widget *thisw, FILE *fout)
-{
-}
-
-int mib_load_TextBig(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-
-  if (real_text)
-    thisw->me = real_text;
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBox.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBox.cpp
deleted file mode 100644
index 6e537539e40..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBox.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for TextBox */
-/*****************************************************************************/
-
-mib_Widget *mib_create_TextBox(mib_Widget *parent, char *name, char *contents,
-	int posx, int posy, int width, int height,
-	int mib_fill)
-{
-  mib_Widget *temp;
-  mib_TextBox *myres;
-  Arg     args[20];
-  int     n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-  myres = (mib_TextBox *)ACE_OS::malloc(sizeof(mib_TextBox));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(8);
-  sprintf(temp->mib_class,"TextBox");
-  temp->mib_class_num = MIB_TEXTBOX;
-  temp->width = width;
-  temp->height = height;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 1;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-  myres->init_contents = NULL;
-
-  if (mib_fill == WDEFAULT)
-  {
-    if (contents != NULL)
-    {
-      myres->init_contents = (char *)ACE_OS::malloc(strlen(contents)+1);
-      strcpy(myres->init_contents, contents);
-    }
-  }
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;
-  }
-
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-
-  temp->me = XtCreateManagedWidget(name, xmTextFieldWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-    XmTextFieldSetString(temp->me, "Text Field");
-
-  }
-
-  return temp;
-}
-
-void mib_delete_TextBox(mib_Widget *thisw)
-{
-  mib_TextBox *temp = (mib_TextBox *)thisw->myres;
-
-  if (temp->init_contents != NULL)
-    ACE_OS::free(temp->init_contents);
-}
-
-void mib_save_TextBox(mib_Widget *thisw, FILE *fout)
-{
-}
-
-int mib_load_TextBox(mib_Widget *thisw, mib_Buffer *fin)
-{
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-
-  if (!mib_read_line(fin, res, val))
-    return 0;
-
-  if (!strcmp(res,"EndWidget."))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp
deleted file mode 100644
index 95338eb76ab..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-
-/* Author: Daeron Meyer */
-
-#include "mibload.h"
-#include "mibwidgets.h"
-
-extern Display	*dpy;
-extern GC	 mib_gc;
-
-/* Code for Toggle */
-/*****************************************************************************/
-
-mib_Widget *mib_create_Toggle(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill)
-{
-  mib_Widget *temp;
-  mib_Toggle *myres;
-  unsigned char *label_text;
-  Arg     args[20];
-  int     n;
-
-  /* create the new widget and add it to the tree */
-
-  temp = mib_new_mib_Widget();
-  if (mib_fill == WDEFAULT)
-    mib_add_backward(temp, parent);
-  else
-    mib_add_mib_Widget(temp, parent);
-
-  myres = (mib_Toggle *)ACE_OS::malloc(sizeof(mib_Toggle));
-
-  /* initialize public resources */
-
-  if (mib_fill == WDEFAULT)
-  {
-    temp->name = (char *)ACE_OS::malloc(strlen(name)+1);
-    strcpy(temp->name,name);
-  }
-  temp->mib_class = (char *)ACE_OS::malloc(7);
-  sprintf(temp->mib_class,"Toggle");
-  temp->mib_class_num = MIB_TOGGLE;
-  temp->width = 0 /*width*/;
-  temp->height = 0 /*height*/;
-  temp->topOffset = posy;
-  temp->leftOffset = posx;
-  temp->bottomOffset = 0;
-  temp->rightOffset = 0;
-  temp->topAttachment = 1;
-  temp->leftAttachment = 1;
-  temp->bottomAttachment = 0;
-  temp->rightAttachment = 0;
-
-  temp->mib_allowresize = 0;
-
-  /* initialize private resources */
-
-  temp->myres = (void *)myres;
-
-  myres->isize = 0;
-  if (mib_fill == WDEFAULT)
-  {
-    myres->label = (char *)ACE_OS::malloc(strlen(label)+1);
-    strcpy(myres->label,label);
-  }
-
-  /* create Xt widget */
-
-  n = 0;
-
-  if (mib_fill == WDEFAULT)
-  {
-    label_text = XmStringCreateLtoR(label, XmSTRING_DEFAULT_CHARSET);
-
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, posx);n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, posy);n++;
-/*    XtSetArg (args[n], XmNwidth, width); n++;
-    XtSetArg (args[n], XmNheight, height); n++;*/
-  }
-
-  XtSetArg (args[n], XmNwidth, width); n++;
-  XtSetArg (args[n], XmNheight, height); n++;
-  XtSetArg (args[n], XmNspacing, 4); n++;
-  XtSetArg (args[n], XmNhighlightThickness, 0); n++;
-  XtSetArg (args[n], XmNrubberPositioning, False); n++;
-  XtSetArg (args[n], XmNindicatorType, XmN_OF_MANY);
-
-  temp->me = XtCreateManagedWidget(name, xmToggleButtonWidgetClass,
-                temp->parent->me, args, n);
-
-  if (mib_fill == WDEFAULT)
-  {
-    XmStringFree(label_text);
-  }
-
-  if (mib_fill == WEDIT || mib_fill == WDEFAULT)
-  {
-    mib_apply_eventhandlers(temp->me, temp);
-  }
-
-  return temp;
-}
-
-void mib_delete_Toggle(mib_Widget *thisw)
-{
-  mib_Toggle *temp = (mib_Toggle *)thisw->myres;
-
-  ACE_OS::free(temp->label);
-  ACE_OS::free(temp);
-}
-
-void mib_save_Toggle(mib_Widget *thisw, FILE *fout)
-{
-  mib_Toggle *temp = (mib_Toggle *)thisw->myres;
-
-  fprintf(fout,"label: \\\"%s\\\"\\n\\\n", temp->label);
-  fprintf(fout,"indicatorSize: %d\\n\\\n", temp->isize);
-}
-
-int mib_load_Toggle(mib_Widget *thisw, mib_Buffer *fin)
-{
-  mib_Toggle    *myres;
-  unsigned char *label_text;
-  char          res[MI_MAXSTRLEN];
-  char          val[MI_MAXSTRLEN];
-  Arg           args[20];
-  int           n, got_line, vallen;
-
-  myres = (mib_Toggle *)thisw->myres;
-
-  got_line = mib_read_line(fin, res, val);
-  if (!got_line)
-    return 0;
-
-  if (!strcmp(res,"label"))
-  {
-    vallen = strlen(val);
-    if (vallen < 2)
-      return 0;
-    val[vallen-1] = '\0';
-    myres->label = (char *)ACE_OS::malloc(vallen-1);
-    sprintf(myres->label,"%s",&(val[1]));
-
-    label_text = XmStringCreateLtoR(myres->label, XmSTRING_DEFAULT_CHARSET);
-
-    n = 0;
-    XtSetArg (args[n], XmNlabelString, label_text); n++;
-    thisw->width = 0;
-    thisw->height = 0;
-    XtSetArg (args[n], XmNwidth, thisw->width); n++;
-    XtSetArg (args[n], XmNheight, thisw->height); n++;
-    XtSetValues(thisw->me, args, n);
-    XmStringFree(label_text);
-
-  }
-  else
-    return 0;
-
-  got_line = mib_read_line(fin, res, val);
-  if (!got_line)
-    return 0;
-
-  if (!strcmp(res, "indicatorSize"))
-  {
-    sscanf(val, "%d", &(myres->isize));
-    if (myres->isize)
-      XtVaSetValues(thisw->me, XmNindicatorSize, (Dimension)myres->isize,
-		  XmNmarginBottom, 0, XmNmarginTop, 0, XmNmarginLeft, 0,
-		  XmNmarginRight, 0, XmNspacing, 0, NULL);
-    got_line = mib_read_line(fin, res, val);
-    if (!got_line)
-      return 0;
-  }
-
-  if (strcmp(res,"EndWidget"))
-    return 0;
-
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp
deleted file mode 100644
index c71bc031b67..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp
+++ /dev/null
@@ -1,801 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with thisw file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include <stdlib.h>
-#include "mibload.h"
-#include "mibwidgets.h"
-
-mib_Widget	*mib_root_Widget;
-Display		*dpy;
-GC		 mib_gc;
-static struct _mib_event_handle_funcs {
-#ifdef __cplusplus
-  void		(*mib_pick_mib_Widget)( Widget, XtPointer,
-			XEvent *, Boolean * );
-  void		(*mib_move_mib_Widget)( Widget, XtPointer,
-			XEvent *, Boolean *);
-  void		(*mib_unpick_mib_Widget)( Widget, XtPointer,
-			XEvent *, Boolean * );
-#else
-  void		(*mib_pick_mib_Widget)(/* Widget, XtPointer,
-			XButtonPressedEvent *, Boolean * */);
-  void		(*mib_move_mib_Widget)(/* Widget, XtPointer,
-			XPointerMovedEvent *, Boolean * */);
-  void		(*mib_unpick_mib_Widget)(/* Widget, XtPointer,
-			XButtonReleasedEvent *, Boolean * */);
-#endif
-} mib_events;
-
-mib_widget_funcs mwfuncs[] =
-{
-  { NULL, NULL, NULL, NULL, NULL },
-  { "TextBox", mib_create_TextBox, mib_delete_TextBox,
-	mib_save_TextBox, mib_load_TextBox},
-  { "Button", mib_create_Button, mib_delete_Button,
-	mib_save_Button, mib_load_Button},
-  { "Toggle", mib_create_Toggle, mib_delete_Toggle,
-	mib_save_Toggle, mib_load_Toggle},
-  { "RadioBox", mib_create_RadioBox, mib_delete_RadioBox,
-	mib_save_RadioBox, mib_load_RadioBox},
-  { "DrawingArea", mib_create_DrawingArea, mib_delete_DrawingArea,
-	mib_save_DrawingArea, mib_load_DrawingArea},
-  { "Label", mib_create_Label, mib_delete_Label,
-	mib_save_Label, mib_load_Label},
-  { "Frame", mib_create_Frame, mib_delete_Frame,
-	mib_save_Frame, mib_load_Frame},
-  { "ScrollBar", mib_create_ScrollBar, mib_delete_ScrollBar,
-	mib_save_ScrollBar, mib_load_ScrollBar},
-  { "TextBig", mib_create_TextBig, mib_delete_TextBig,
-	mib_save_TextBig, mib_load_TextBig},
-  { "List", mib_create_List, mib_delete_List,
-	mib_save_List, mib_load_List},
-  { "Scale", mib_create_Scale, mib_delete_Scale,
-	mib_save_Scale, mib_load_Scale},
-  { "Menu", mib_create_Menu, mib_delete_Menu,
-	mib_save_Menu, mib_load_Menu},
-  { NULL, NULL, NULL, NULL, NULL },
-};
-
-/*****************************************************************************/
-
-void mib_add_mib_Widget(mib_Widget *thisw, mib_Widget *parent)
-{
-  mib_Widget *tmp;
-
-  if (parent->child == NULL)
-  {
-    parent->child = thisw;
-    thisw->prev = parent;
-    thisw->parent = parent;
-    thisw->sibling = NULL;
-    thisw->child = NULL;
-  }
-  else
-    {
-      tmp = parent->child;
-      while (tmp->sibling != NULL)
-        tmp = tmp->sibling;
-      tmp->sibling = thisw;
-      thisw->prev = tmp;
-      thisw->parent = parent;
-      thisw->sibling = NULL;
-      thisw->child = NULL;
-    }
-}
-
-/*****************************************************************************/
-
-void mib_add_backward(mib_Widget *thisw, mib_Widget *parent)
-{
-  mib_Widget *tmp;
-
-  if (parent->child == NULL)
-  {
-    parent->child = thisw;
-    thisw->prev = parent;
-    thisw->parent = parent;
-    thisw->sibling = NULL;
-    thisw->child = NULL;
-  }
-  else
-    {
-      tmp = parent->child;
-      parent->child = thisw;
-      thisw->prev = parent;
-      thisw->parent = parent;
-      thisw->sibling = tmp;
-      thisw->child = NULL;
-      tmp->prev = thisw;
-    }
-}
-
-/*****************************************************************************/
-
-void mib_remove_mib_Widget(mib_Widget *thisw)
-{
-  int		 count;
-  mib_Widget	*pnt;
-
-  XtVaSetValues(mib_root_Widget->me, XmNresizePolicy, XmRESIZE_NONE, NULL);
-  XtDestroyWidget(thisw->me);
-
-  while (thisw->child != NULL)
-    mib_remove_mib_Widget(thisw->child);
-
-  if (thisw->parent == thisw)
-  {
-    mib_clear_myres(thisw);
-    return;
-  }
-
-  if (thisw->prev == thisw->parent)
-  {
-    thisw->parent->child = thisw->sibling;
-    if (thisw->sibling != NULL)
-      thisw->sibling->prev = thisw->parent;
-  }
-  else
-    {
-      thisw->prev->sibling = thisw->sibling;
-      if (thisw->sibling != NULL)
-	thisw->sibling->prev = thisw->prev;
-    }
-
-  mib_clear_myres(thisw);
-}
-
-/*****************************************************************************/
-
-void mib_clear_myres(mib_Widget *thisw)
-{
-  ACE_OS::free(thisw->mib_class);
-  ACE_OS::free(thisw->name);
-
-  if ((thisw->mib_class_num < 1) || (thisw->mib_class_num > MI_NUMCLASSES))
-    return;
-
-  mwfuncs[thisw->mib_class_num].mib_delete(thisw);
-  ACE_OS::free(thisw);
-}
-
-/*****************************************************************************/
-
-mib_Widget *mib_new_mib_Widget()
-{
-  mib_Widget *thisw;
-  thisw = (mib_Widget *)ACE_OS::malloc(sizeof(mib_Widget));
-  thisw->me = NULL;
-  thisw->mib_class_num = MIB_NULL;
-  thisw->mib_selected = 0;
-  thisw->mib_resizing = 0;
-  thisw->myres = NULL;
-  thisw->parent = NULL;
-  thisw->sibling = NULL;
-  thisw->prev = NULL;
-  thisw->child = NULL;
-  thisw->width = 0;
-  thisw->height = 0;
-  thisw->topAttachment = 0;
-  thisw->bottomAttachment = 0;
-  thisw->leftAttachment = 0;
-  thisw->rightAttachment = 0;
-  thisw->topOffset = 0;
-  thisw->bottomOffset = 0;
-  thisw->leftOffset = 0;
-  thisw->rightOffset = 0;
-
-  return thisw;
-}
-
-/*****************************************************************************/
-
-mib_Widget *mib_find_name(mib_Widget *temp, char *name)
-{
-  mib_Widget *child = temp->child;
-  mib_Widget *ret = NULL;
-
-  if (!strcmp(temp->name, name))
-    return temp;
-
-  if (child != NULL)
-    if (ret = mib_find_name(child, name))
-	return ret;
-
-  child = temp->sibling;
-  if (child != NULL)
-    if (ret = mib_find_name(child, name))
-	return ret;
-
-  return NULL;
-}
-
-/*****************************************************************************/
-
-Widget
-BuildMenu(Widget parent, int menu_type, char *menu_title, char menu_mnemonic,
-		 MenuItem *items)
-{
-    Widget menu, cascade, widget;
-    int i;
-    XmString str;
-
-    if (menu_type == XmMENU_PULLDOWN || menu_type == XmMENU_OPTION)
-        menu = XmCreatePulldownMenu(parent, "_pulldown", NULL, 0);
-    else if (menu_type == XmMENU_POPUP)
-        menu = XmCreatePopupMenu(parent, "_popup", NULL, 0);
-    else {
-        XtWarning("Invalid menu type passed to BuildMenu()");
-        return NULL;
-    }
-
-    /* Pulldown menus require a cascade button to be made */
-    if (menu_type == XmMENU_PULLDOWN) {
-        str = XmStringCreateSimple(menu_title);
-        cascade = XtVaCreateManagedWidget(menu_title,
-            xmCascadeButtonGadgetClass, parent,
-            XmNsubMenuId,   menu,
-            XmNlabelString, str,
-            XmNmnemonic,    menu_mnemonic,
-            NULL);
-        XmStringFree(str);
-    } else if (menu_type == XmMENU_OPTION) {
-        /* Option menus are a special case, but not hard to handle */
-        Arg args[2];
-        str = XmStringCreateSimple(menu_title);
-        XtSetArg(args[0], XmNsubMenuId, menu);
-        XtSetArg(args[1], XmNlabelString, str);
-        /* This really isn't a cascade, but thisw is the widget handle
-         * we're going to return at the end of the function.
-         */
-        cascade = XmCreateOptionMenu(parent, menu_title, args, 2);
-        XmStringFree(str);
-    }
-
-    /* Now add the menu items */
-    for (i = 0; items[i].label != NULL; i++) {
-        /* If subitems exist, create the pull-right menu by calling thisw
-         * function recursively.  Since the function returns a cascade
-         * button, the widget returned is used..
-         */
-        if (items[i].subitems)
-            if (menu_type == XmMENU_OPTION) {
-            widget = XtVaCreateManagedWidget(items[i].label,
-                *items[i].wclass, menu, NULL);
-		items[i].subitems = (struct _menu_item *) widget;
-	     /* daeron mod (tm) :-) ... we now use thisw to pass back each
-		widget we create to the mibMenu functions so that it can
-		be stored as part of the mibMenu structure */
-
-             /* XtWarning("You can't have submenus from option menu items.");
-                continue;*/
-            } else
-                widget = BuildMenu(menu, XmMENU_PULLDOWN,
-                    items[i].label, items[i].mnemonic, items[i].subitems);
-        else
-	  {
-            widget = XtVaCreateManagedWidget(items[i].label,
-                *items[i].wclass, menu,
-                NULL);
-	    /* ditto here from above ... - Daeron mod (tm) */
-	    items[i].subitems = (struct _menu_item *) widget;
-	  }
-
-        /* Whether the item is a real item or a cascade button with a
-         * menu, it can still have a mnemonic.
-         */
-        if (items[i].mnemonic)
-            XtVaSetValues(widget, XmNmnemonic, items[i].mnemonic, NULL);
-
-        /* any item can have an accelerator, except cascade menus. But,
-         * we don't worry about that; we know better in our declarations.
-         */
-        if (items[i].accelerator) {
-            str = XmStringCreateSimple(items[i].accel_text);
-            XtVaSetValues(widget,
-                XmNaccelerator, items[i].accelerator,
-                XmNacceleratorText, str,
-                NULL);
-            XmStringFree(str);
-        }
-
-        if (items[i].callback)
-            XtAddCallback(widget,
-                (items[i].wclass == &xmToggleButtonWidgetClass ||
-                 items[i].wclass == &xmToggleButtonGadgetClass)?
-                    XmNvalueChangedCallback : /* ToggleButton class */
-                    XmNactivateCallback,      /* PushButton class */
-                items[i].callback, items[i].callback_data);
-    }
-
-    /* for popup menus, just return the menu; pulldown menus, return
-     * the cascade button; option menus, return the thing returned
-     * from XmCreateOptionMenu().  This isn't a menu, or a cascade button!
-     */
-    return menu_type == XmMENU_POPUP? menu : cascade;
-}
-
-/*****************************************************************************/
-
-mib_Widget *mib_load_interface(Widget parent, char *from, int file_type)
-{
-  mib_Buffer  thiswfile;
-  mib_Widget *thisw;
-  FILE	     *infile;
-  char	     *instring;
-  char	      ch;
-
-  thiswfile.buf_type = file_type;
-
-  dpy = XtDisplay(parent);
-
-  if ((file_type == MI_FROMFILE) || (file_type == MI_EDITFROMFILE))
-  {
-    if (!(infile = fopen(from,"r")))
-      return NULL;
-
-    ch = '\0';
-    while ((ch != '\n')&&(!feof(infile)))  /* throw away first line */
-      ch = (char)fgetc(infile);
-
-    thiswfile.buffer = (void *)infile;
-    thiswfile.point = 0;
-
-    if (!mib_load_Root(parent, &thisw, &thiswfile))
-    {
-      /* delete thisw */
-      return NULL;
-    }
-    else
-    {
-      fclose(infile);
-      return thisw;
-    }
-  }
-  else
-  if ((file_type == MI_FROMSTRING) || (file_type == MI_EDITFROMSTRING))
-  {
-    instring = from;
-    if (instring == NULL)
-      return NULL;
-
-    thiswfile.buffer = (void *)instring;
-    thiswfile.buflen = strlen(instring);
-    thiswfile.point = 0;
-
-    if (!mib_load_Root(parent, &thisw, &thiswfile))
-    {
-      /* delete thisw */
-      return NULL;
-    }
-    else
-      return thisw;
-  }
-  else
-    return NULL;
-
-}
-
-/*****************************************************************************/
-
-int mib_load_mib_class(mib_Widget **thisw, mib_Widget *parent, char *name,
-		char *iname, mib_Buffer *fin )
-{
-  int namelen, editstate, count, set;
-
-  if ((fin->buf_type == MI_EDITFROMFILE) ||
-	(fin->buf_type == MI_EDITFROMSTRING))
-    editstate = WEDIT;
-  else
-    editstate = WEMPTY;
-
-  namelen = strlen(name);
-  if (namelen < 2)
-    return 0;
-
-  name[namelen-1] = '\0';
-  name[0] = ' ';
-
-  count = 1;
-
-  while (mwfuncs[count].name)
-  {
-    if (!strcmp(&(name[1]), mwfuncs[count].name))
-    {
-      *thisw = mwfuncs[count].mib_create(parent, iname, NULL, 0, 0, 0, 0,
-		editstate);
-      return 1;
-    }
-    count++;
-  }
-
-  (*thisw)->parent = (*thisw);
-  return 1;
-}
-
-/*****************************************************************************/
-
-mib_Widget *mib_load_public(mib_Widget *root, mib_Widget *thisw, mib_Buffer *fin)
-{
-  int	got_line, done;
-  char	res[MI_MAXSTRLEN];
-  char	val[MI_MAXSTRLEN];
-  char	valcp[MI_MAXSTRLEN];
-  Arg	args[20];
-  int	mynum, n;
- 
-  got_line = 1;
-  done = 0;
-
-  /* thisw loop reads basic info about Widget */
-  while (got_line && (!done))
-  {
-    got_line = mib_read_line(fin, res, val);
-    if (!strcmp(res,"Ref"))
-      sscanf(val, "%d", &mynum);
-    else
-    if (!strcmp(res,"Widget"))
-    {
-      strcpy(valcp,val);
-      done = 1;
-    }
-  }
-
-  done = 0;
-
-  while (got_line && (!done))
-  {
-    got_line = mib_read_line(fin, res, val);
-    if (!strcmp(res, "Children"))
-      n = 0;
-    else
-    if (!strcmp(res, "Parent")) /* don't support complete widget tree yet */
-      n = 0;
-    else
-    if (!strcmp(res,"Public-"))
-      n = 0;
-    else
-    if (!strcmp(res,"Name"))
-    {
-      val[strlen(val)-1] = '\0';
-      mib_load_mib_class(&thisw, root, valcp, &(val[1]), fin);
-      thisw->name = (char *)ACE_OS::malloc(strlen(val));
-      sprintf(thisw->name,"%s",&(val[1]));
-      thisw->mib_mynum = mynum;
-      done = 1;
-    }
-    else
-       return 0;
-  }
-
-  if (!got_line)
-    return NULL;
-
-  done = 0;
-
-  /* second loop reads public info */
-  while (got_line && (!done))
-  {
-    got_line = mib_read_line(fin, res, val);
-    if (!strcmp(res,"Xmwidth"))
-      sscanf(val,"%d",&(thisw->width));
-    else
-    if (!strcmp(res,"Xmheight"))
-      sscanf(val,"%d",&(thisw->height));
-    else
-    if (!strcmp(res,"XmtopAttachment"))
-      sscanf(val,"%d",&(thisw->topAttachment));
-    else
-    if (!strcmp(res,"XmbottomAttachment"))
-      sscanf(val,"%d",&(thisw->bottomAttachment));
-    else
-    if (!strcmp(res,"XmleftAttachment"))
-      sscanf(val,"%d",&(thisw->leftAttachment));
-    else
-    if (!strcmp(res,"XmrightAttachment"))
-      sscanf(val,"%d",&(thisw->rightAttachment));
-    else
-    if (!strcmp(res,"XmtopOffset"))
-      sscanf(val,"%d",&(thisw->topOffset));
-    else
-    if (!strcmp(res,"XmbottomOffset"))
-      sscanf(val,"%d",&(thisw->bottomOffset));
-    else
-    if (!strcmp(res,"XmleftOffset"))
-      sscanf(val,"%d",&(thisw->leftOffset));
-    else
-    if (!strcmp(res,"XmrightOffset"))
-      sscanf(val,"%d",&(thisw->rightOffset));
-    else
-    if (!strcmp(res,"Private-"))
-      done = 1;
-  }
-
-  n = 0;
-  if ((fin->buf_type == MI_EDITFROMFILE) ||
-	(fin->buf_type == MI_EDITFROMSTRING))
-  {
-    XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNleftOffset, thisw->leftOffset); n++;
-    XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-    XtSetArg (args[n], XmNtopOffset, thisw->topOffset); n++;
-    if (thisw == root)
-    {
-      XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNrightOffset, thisw->rightOffset); n++;
-      XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNbottomOffset, thisw->bottomOffset); n++;
-    }
-  }
-  else
-  {
-    if (thisw->leftAttachment)
-    {
-      XtSetArg (args[n], XmNleftAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNleftOffset, thisw->leftOffset);n++;
-    }
-    if (thisw->topAttachment)
-    {
-      XtSetArg (args[n], XmNtopAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNtopOffset, thisw->topOffset);n++;
-    }
-    if (thisw->bottomAttachment)
-    {
-      XtSetArg (args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNbottomOffset, thisw->bottomOffset);n++;
-    }
-    if (thisw->rightAttachment)
-    {
-      XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
-      XtSetArg (args[n], XmNrightOffset, thisw->rightOffset);n++;
-    }
-  }
-
-  XtSetArg (args[n], XmNwidth, thisw->width); n++;
-  XtSetArg (args[n], XmNheight, thisw->height); n++;
-
-  XtSetValues(thisw->me, args, n);
-
-  return thisw;
-}
-
-/*****************************************************************************/
-
-int mib_load_private(mib_Widget *thisw, mib_Buffer *fin)
-{
-
-  if (thisw->mib_class_num == MIB_NULL)
-    return 1;
-
-  if ((thisw->mib_class_num < 1) || (thisw->mib_class_num > MI_NUMCLASSES))
-    return 0;
-
-  mwfuncs[thisw->mib_class_num].mib_load(thisw, fin);
-
-  return 1;
-}
-
-/*****************************************************************************/
-
-int mib_load_Root(Widget parent, mib_Widget **thisw, mib_Buffer *fin)
-{
-
-  char		res[MI_MAXSTRLEN];
-  char		val[MI_MAXSTRLEN];
-  char		name[MI_MAXSTRLEN];
-  int		num_widgets, count, n, got_line;
-  Arg		args[20];
-  XGCValues     gcvals;
-  XtGCMask      val_mask;
-  mib_Widget   *temp;
-
-  got_line = mib_read_line(fin, res, val);
-  if (!strcmp(res,"TotalWidgets"))
-    sscanf(val, "%d", &num_widgets);
-  else
-    return 0;
-
-  (*thisw) = mib_new_mib_Widget();
-  (*thisw)->mib_class = (char*)ACE_OS::malloc(9);
-  sprintf((*thisw)->mib_class,"RootForm");
-
-/*  (*thisw)->me = XmCreateForm(parent, "MainForm", args, 0); */
-  
-  (*thisw)->me = parent;
-
-  if (!mib_load_public((*thisw), (*thisw), fin))
-    return 0;
-
-  /* we don't expect any private resources for the root widget */
-
-  got_line = mib_read_line(fin, res, val);
-  if (strcmp(res,"EndWidget."))
-    return 0;
-
-/*   XtManageChild((*thisw)->me);
-*/
-  XtVaSetValues((*thisw)->me, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-  count = num_widgets - 1;
-  while (count > 0)
-  {
-
-    if (!(temp = mib_load_public((*thisw), temp, fin)))
-    {
-      /* delete temp */
-      return 0;
-    }
-
-    if (!mib_load_private(temp,fin))
-    {
-      /* delete temp */
-      return 0;
-    }
-    count--;
-
-  }
-
-  mib_reset_size((*thisw));
-
-  XtVaSetValues((*thisw)->me, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
-  val_mask = (long)0;
-  mib_gc = XtGetGC((*thisw)->me, val_mask, &gcvals);
-
-  return 1;
-}
-
-/*****************************************************************************/
-
-int mib_read_line(mib_Buffer *bufin, char *res, char *val)
-{
-  FILE *fin;
-  char *strin;
-  char  ch;
-  int   count, mark;
-  char  inbuf[MI_MAXSTRLEN];
-
-  if ((bufin->buf_type == MI_FROMFILE) || (bufin->buf_type == MI_EDITFROMFILE))
-  {
-    fin = (FILE *)bufin->buffer;
-    ch = '\0';
-    count = 0;
-    mark = 0;
-    while ((ch != '\n')&&(!feof(fin))&&(count<MI_MAXSTRLEN))
-    {
-      ch = (char)fgetc(fin);
-      if ((mark == 0) && (ch == ':'))
-	mark = count;
-      if ((ch != '\\')&&(ch != '\n'))
-      {
-	inbuf[count] = ch;
-	count++;
-      }
-    }
-    if (feof(fin))
-      return 0;
-    inbuf[count] = '\0';
-    if (count > 0)
-    {
-      if (inbuf[count-1] == 'n')
-        inbuf[count-1] = '\0';
-    }
-    else
-      return 0;
-
-  }
-  else
-  if ((bufin->buf_type == MI_FROMSTRING) ||
-	(bufin->buf_type == MI_EDITFROMSTRING))
-  {
-    strin = (char *)bufin->buffer;
-    count = bufin->point;
-    mark = 0;
-
-    if (count >= bufin->buflen)
-      return 0;
-
-    while ((strin[count] != '\n') && (count < bufin->buflen))
-    {
-      if ((mark == 0) && (strin[count] == ':'))
-	mark = count;
-      count++;
-    }
-
-    strin[count] = '\0';
-    if (count >= bufin->buflen)
-      return 0;
-    sprintf(inbuf,"%s",&(strin[bufin->point]));
-    strin[count] = '\n';
-    if (mark != 0)
-      mark -= bufin->point;
-    bufin->point = count+1;
-  }
-  else
-    return 0;
-
-  if (mark == 0)
-  {
-    sprintf(res,"%s",inbuf);
-    sprintf(val,"\0");
-  }
-  else
-  {
-    inbuf[mark] = '\0';
-    sprintf(res,"%s",inbuf);
-    inbuf[mark] = ' ';
-    if ((int)(strlen(inbuf)-mark) > 1)
-      sprintf(val,"%s",&(inbuf[mark+2]));
-    else
-      sprintf(val,"\0");
-  }
-
-  return 1;
-}
-
-/*****************************************************************************/
-
-void mib_reset_size(mib_Widget *temp)
-{
-  Arg	args[5];
-  int	n;
-
-  mib_Widget *child = temp->child;
-
-  if (temp->mib_class_num != MIB_NULL)
-  {
-    n = 0;
-    XtSetArg (args[n], XmNwidth, temp->width); n++;
-    XtSetArg (args[n], XmNheight, temp->height); n++;
-
-    XtSetValues(temp->me, args, n);
-  }
-
-  if (child != NULL)
-    mib_reset_size(child);
-
-  child = temp->sibling;
-  if (child != NULL)
-    mib_reset_size(child);
-}
-
-/*****************************************************************************/
-
-#ifdef __cplusplus
-void mib_set_eventhandlers(void a(Widget, XtPointer,
-			XEvent *, Boolean * ),
-                           void b( Widget, XtPointer,
-			XEvent *, Boolean* ),
-                           void c(Widget, XtPointer,
-			XEvent *, Boolean *)
-                           )
-#else
-void mib_set_eventhandlers(void * a, void * b, void * c)
-#endif
-{
-  mib_events.mib_pick_mib_Widget =  a;
-  mib_events.mib_move_mib_Widget =  b;
-  mib_events.mib_unpick_mib_Widget = c;
-}
-
-/*****************************************************************************/
-
-void mib_apply_eventhandlers(Widget thisw, mib_Widget *actual)
-{
-  XtAddEventHandler(thisw, ButtonPressMask, FALSE,
-	mib_events.mib_pick_mib_Widget, (XtPointer)actual);
-  XtAddEventHandler(thisw, Button3MotionMask, FALSE,
-	mib_events.mib_move_mib_Widget, (XtPointer)actual);
-  XtAddEventHandler(thisw, ButtonReleaseMask, FALSE,
-	mib_events.mib_unpick_mib_Widget, (XtPointer)actual);
-
-}
-
-/*****************************************************************************/
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h
deleted file mode 100644
index 3b20908a333..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with this file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-#include <stdio.h>
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-#include <Xm/Xm.h>
-#include <Xm/Text.h>
-#include <Xm/TextF.h>
-#include <Xm/RowColumn.h>
-#include <Xm/MainW.h>
-#include <Xm/Label.h>
-#include <Xm/PushB.h>
-#include <Xm/PushBG.h>
-#include <Xm/ToggleB.h>
-#include <Xm/ToggleBG.h>
-#include <Xm/DrawingA.h>
-#include <Xm/CascadeBG.h>
-#include <Xm/SeparatoG.h>
-#include <Xm/Frame.h>
-#include <Xm/BulletinB.h>
-#include <Xm/Scale.h>
-#include <Xm/ScrollBar.h>
-#include <Xm/Form.h>
-#include <Xm/List.h>
-#include <Xm/FileSB.h>
-#include <Xm/AtomMgr.h>
-#include <Xm/Protocols.h>
-#include <Xm/MwmUtil.h>
-#include "ace/OS.h"
-
-
-/* Structure of mib_Widget */
-/*****************************************************************************/
-
-typedef struct _mib_Widget {
-  char		*mib_class;	/* name of mib class (Button, TextBox, etc..)*/
-  int		 mib_class_num; /* class number for ez reference :) */
-  int		 mib_mynum;	/* numbering for storage format */
-  Widget	 me;		/* Xt widget */
-  int		 mib_selected;	/* is selected */
-  int		 mib_resizing;  /* is resizing 1, or being moved 0 */
-  int		 mib_resizetype;/* 1  = upper left, 2 = upper, 3 = ... */
-  int		 mib_allowresize; /* can this widget be resized ? */
-
-  int		 clkx, clky;	/* where user clicked */
-
-  void		*myres;		/* my resources (different for each widget) */
-
-  char		*name;		/* reference name of this widget */
-  int		 width, height;	/* width and height */
-
-  int   topAttachment, bottomAttachment, leftAttachment, rightAttachment;
-				/* attachments 1=attached 0=not-attached */
-
-  int   topOffset, bottomOffset, leftOffset, rightOffset;
-				/* offsets if attached */
-
-  struct _mib_Widget *parent;   /* pointer to parent */
-  struct _mib_Widget *sibling;  /* remaining linked list of sibling widgets */
-  struct _mib_Widget *prev;	/* previous sibling or parent */
-  struct _mib_Widget *child;	/* linked list of children widgets */
-} mib_Widget;
-
-/* mib_Buffer structure */
-/*****************************************************************************/
-
-typedef struct _mib_Buffer {
-  void  *buffer;	/* pointer to either a file or a char string */
-  int	 buf_type;	/* type of buffer (defined above) */
-  int	 point;		/* pointer for string */
-  int    buflen;	/* length of string buffer */
-} mib_Buffer;
-
-/* mib_Widget functions */
-/*****************************************************************************/
-
-void mib_add_mib_Widget(mib_Widget *, mib_Widget *);
-void mib_add_backward(mib_Widget *, mib_Widget *);
-void mib_remove_mib_Widget(mib_Widget *);
-void mib_clear_myres(mib_Widget *);
-#ifdef __cplusplus
-mib_Widget *mib_new_mib_Widget();
-#else
-mib_Widget *mib_new_mib_Widget();
-#endif
-mib_Widget *mib_find_name(mib_Widget *, char *);
-mib_Widget *mib_load_interface(Widget, char *, int);
-int mib_count_all(mib_Widget *, int);
-int mib_load_Root(Widget, mib_Widget **, mib_Buffer *);
-mib_Widget *mib_load_public(mib_Widget *, mib_Widget *, mib_Buffer *);
-int mib_load_mib_class(mib_Widget **, mib_Widget *, char *, char *,
-		mib_Buffer *);
-int mib_load_private(mib_Widget *, mib_Buffer *);
-void mib_reset_size(mib_Widget *);
-int mib_read_line(mib_Buffer *, char *, char *);
-#ifdef __cplusplus
-void mib_set_eventhandlers(void (a)(...), void (b)(...), void (c)(...));
-#else
-void mib_set_eventhandlers(void *, void *, void *);
-#endif
-void mib_apply_eventhandlers(Widget, mib_Widget *);
-
-/* supporting functions and structures */
-/*****************************************************************************/
-
-typedef struct _menu_item {
-  char        *label;
-  WidgetClass *wclass;
-  char         mnemonic;
-  char        *accelerator;
-  char        *accel_text;
-#ifdef __cplusplus
-  void        (*callback)(Widget,void*,void*);
-#else
-  void        (*callback)();
-#endif
-  XtPointer   callback_data;
-  struct _menu_item *subitems;
-} MenuItem;
-
-Widget BuildMenu(Widget, int, char *, char, MenuItem *);
-
-/* mib class numbers */
-
-#define MIB_NULL		0
-#define MIB_TEXTBOX		1
-#define MIB_BUTTON		2
-#define MIB_TOGGLE		3
-#define MIB_RADIOBOX		4
-#define MIB_DRAWINGAREA		5
-#define MIB_LABEL		6
-#define MIB_FRAME		7
-#define MIB_SCROLLBAR		8
-#define MIB_TEXTBIG		9
-#define MIB_LIST		10
-#define MIB_SCALE		11
-#define MIB_MENU		12
-
-/* number of classes */
-#define MI_NUMCLASSES		12
-
-/* for specifying creation of a widget with
-   default private values, no values at all (empty),
-   or no values and editable */
-
-#define WDEFAULT		1
-#define WEMPTY			2
-#define WEDIT			3
-
-/* for specifing whether we are loading an
-   interface from a file or from a string and whether it
-   is editable :) */
-
-#define MI_FROMFILE		1
-#define MI_EDITFROMFILE		2
-#define MI_FROMSTRING		3
-#define MI_EDITFROMSTRING	4
-
-#define MI_MAXSTRLEN		200   /* maximum string length */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h
deleted file mode 100644
index 778e2338682..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibwidgets.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1994 The Geometry Center; University of Minnesota
-   1300 South Second Street;  Minneapolis, MN  55454, USA;
-
-This file is free software; you can redistribute it and/or modify it only
-under the the terms of the GNU GENERAL PUBLIC LICENSE which should be
-included along with this file.  This software may be obtained via anonymous
-ftp from geom.umn.edu; email: software@geom.umn.edu. */
-
-/* Author: Daeron Meyer */
-
-/* Structure of mib_TextBox */
-/*****************************************************************************/
-
-typedef struct _mib_TextBox {
-  char  *init_contents;		/* initial text contents */
-
-} mib_TextBox;
-
-/* mib_TextBox functions */
-/*****************************************************************************/
-mib_Widget *mib_create_TextBox(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_TextBox(mib_Widget *);
-void mib_save_TextBox(mib_Widget *, FILE *);
-int mib_load_TextBox(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_Button */
-/*****************************************************************************/
-
-typedef struct _mib_Button {
-  char *label;			/* label on button */
-
-} mib_Button;
-
-/* mib_Button functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Button(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_Button(mib_Widget *);
-void mib_save_Button(mib_Widget *, FILE *);
-int mib_load_Button(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_Toggle */
-/*****************************************************************************/
-
-typedef struct _mib_Toggle {
-  char *label;			/* label on toggle */
-  int   isize;
-
-} mib_Toggle;
-
-/* mib_Toggle functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Toggle(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_Toggle(mib_Widget *);
-void mib_save_Toggle(mib_Widget *, FILE *);
-int mib_load_Toggle(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_RadioBox */
-/*****************************************************************************/
-typedef struct _mib_RadioBox {
-  char **labels;		/* array of labels */
-  int    numlabel;		/* number of labels */
-  Widget *buttons;		/* pointers to each button */
-
-} mib_RadioBox;
-
-/* mib_RadioBox functions */
-
-/*****************************************************************************/
-mib_Widget *mib_create_RadioBox(mib_Widget *, char *, char*, int, int, int,
-					int, int);
-void mib_delete_RadioBox(mib_Widget *);
-void mib_save_RadioBox(mib_Widget *, FILE *);
-int mib_load_RadioBox(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_DrawingArea */
-/*****************************************************************************/
-typedef struct _mib_DrawingArea {
-  int   nothing;	/* couldn't think of anything yet */
-
-} mib_DrawingArea;
-
-/* mib_DrawingArea functions */
-/*****************************************************************************/
-mib_Widget *mib_create_DrawingArea(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_DrawingArea(mib_Widget *);
-void mib_save_DrawingArea(mib_Widget *, FILE *);
-int mib_load_DrawingArea(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_Label */
-/*****************************************************************************/
-typedef struct _mib_Label {
-  char *label;		/* text in label */
-
-} mib_Label;
-
-/* mib_Label functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Label(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_Label(mib_Widget *);
-void mib_save_Label(mib_Widget *, FILE *);
-int mib_load_Label(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_Frame */
-/*****************************************************************************/
-typedef struct _mib_Frame {
-  int   shadowtype;	/* 0 = in, 1 = out, 2 = etched_in, 3 = etched_out  */
-
-} mib_Frame;
-
-/* mib_Frame functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Frame(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_Frame(mib_Widget *);
-void mib_save_Frame(mib_Widget *, FILE *);
-int mib_load_Frame(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_ScrollBar */
-/*****************************************************************************/
-typedef struct _mib_ScrollBar {
-  int	orientation;
-
-} mib_ScrollBar;
-
-/* mib_ScrollBar functions */
-/*****************************************************************************/
-mib_Widget *mib_create_ScrollBar(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_ScrollBar(mib_Widget *);
-void mib_save_ScrollBar(mib_Widget *, FILE *);
-int mib_load_ScrollBar(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_TextBig */
-/*****************************************************************************/
-typedef struct _mib_TextBig {
-  int	nothing;	/* couldn't think of anything yet */
-
-} mib_TextBig;
-
-/* mib_TextBig functions */
-/*****************************************************************************/
-mib_Widget *mib_create_TextBig(mib_Widget *, char *, char *, int, int, int, int, int);
-void mib_delete_TextBig(mib_Widget *);
-void mib_save_TextBig(mib_Widget *, FILE *);
-int mib_load_TextBig(mib_Widget *, mib_Buffer *);
-
-
-/* Structure of mib_List */
-/*****************************************************************************/
-typedef struct _mib_List {
-  Widget real_list;
-
-} mib_List;
-
-/* mib_List functions */
-/*****************************************************************************/
-mib_Widget *mib_create_List(mib_Widget *, char *, char *, int, int, int,
-				int, int);
-void mib_delete_List(mib_Widget *);
-void mib_save_List(mib_Widget *, FILE *);
-int mib_load_List(mib_Widget *, mib_Buffer *);
-
-/* Structure of mib_Scale */
-/*****************************************************************************/
-typedef struct _mib_Scale {
-  int   orientation;
-
-} mib_Scale;
-
-/* mib_Scale functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Scale(mib_Widget *, char *, char *, int, int, int,
-                int, int);
-void mib_delete_Scale(mib_Widget *);
-void mib_save_Scale(mib_Widget *, FILE *);
-int mib_load_Scale(mib_Widget *, mib_Buffer *);
-
-/* Structure of mib_Menu */
-/*****************************************************************************/
-typedef struct _mib_Menu {
-  int       numitems;		/* number of items in menu*/
-  MenuItem *my_menu;		/* array of menu items */
-  Widget   *items;		/* pointers to each item */
-
-} mib_Menu;
-
-/* mib_Menu functions */
-/*****************************************************************************/
-mib_Widget *mib_create_Menu(mib_Widget *, char *, char *, int, int, int,
-		int, int);
-void mib_delete_Menu(mib_Widget *);
-void mib_save_Menu(mib_Widget *, FILE *);
-int mib_load_Menu(mib_Widget *, mib_Buffer *);
-
-/*****************************************************************************/
-
-typedef struct _mib_widget_funcs {
-  char		*name;
-#ifdef __cplusplus
-  mib_Widget	*(*mib_create)(mib_Widget *parent, char *name, char *label,
-		int posx, int posy, int width, int height, int mib_fill);
-  void		 (*mib_delete)(mib_Widget *thisw);
-  void		 (*mib_save)(mib_Widget *thisw, FILE *fout);
-  int		 (*mib_load)(mib_Widget *thisw, mib_Buffer *fin);
-#else
-  mib_Widget	*(*mib_create)();
-  void		 (*mib_delete)();
-  void		 (*mib_save)();
-  int		 (*mib_load)();
-#endif
-} mib_widget_funcs;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp
deleted file mode 100644
index 4df0a7e095d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-// $Id$
-#include "Audio_Server.h"
-
-Audio_Global::Audio_Global (void)
-  :bytes_sent (0),
-   start_time (0),
-   conn_tag (0),
-   serviceSocket (-1),
-   audioSocket (-1),
-   fd (0),
-   totalSamples (0),
-   fileSize (0),
-   cmd (0),
-   live_source (0),
-   databuf_size (0),
-   cmdsn (0),
-   nextsample (0),
-   sps (0),
-   spslimit (0),
-   spp (0),
-   pktbuf (0),
-   fbpara (0)
-{
-}
-
-int 
-Audio_Global::CmdRead(char *buf, int psize)
-{
-  int res = wait_read_bytes(serviceSocket, buf, psize);
-  if (res == 0) return (1);
-  if (res == -1) {
-    fprintf(stderr, "AS error on read cmdSocket, size %d", psize);
-    perror("");
-    return (-1);
-  }
-  return 0;
-}
-
-void
-Audio_Global::CmdWrite(char *buf, int size)
-{
-  int res = wait_write_bytes(serviceSocket, buf, size);
-  if (res == -1) {
-    if (errno != EPIPE) perror("AS writes to serviceSocket");
-    exit(errno != EPIPE);
-  }
-}
-
-int 
-Audio_Global::INITaudio(void)
-{
-  int result;
-  int failureType; /* 0 - can't open file, 1 - can't open live source */
-  INITaudioPara para;
-
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.version = ntohl(para.version);
-  para.nameLength = ntohl(para.nameLength);
-  para.para.encodeType = ntohl(para.para.encodeType);
-  para.para.channels = ntohl(para.para.channels);
-  para.para.samplesPerSecond = ntohl(para.para.samplesPerSecond);
-  para.para.bytesPerSample = ntohl(para.para.bytesPerSample);
-#endif
-  if (para.nameLength>0)
-    result = CmdRead(audioFile, para.nameLength);
-  if (result != 0)
-    return result;
-  if (Mpeg_Global::session_num > Mpeg_Global::session_limit || para.version != VERSION) {
-    char errmsg[128];
-    cmd = CmdFAIL;
-    CmdWrite((char *)&cmd, 1);
-    if (Mpeg_Global::session_num > Mpeg_Global::session_limit) {
-      sprintf(errmsg,
-	      "Too many sessions being serviced, please try again later.\n");
-    }
-    else {
-      sprintf(errmsg, "Version # not match, AS %d.%02d, Client %d.%02d",
-	      VERSION / 100, VERSION % 100,
-	      para.version / 100, para.version % 100);
-    }
-    write_string(serviceSocket, errmsg);
-    return(1);
-  }
-  memcpy(&audioPara, &para.para, sizeof(audioPara));
-  /*
-  fprintf(stderr, "Client Audio para: encode %d, ch %d, sps %d, bps %d.\n",
-	  para.para.encodeType, para.para.channels,
-	  para.para.samplesPerSecond, para.para.bytesPerSample);
-   */
-  audioFile[para.nameLength] = 0;
-  {
-    int len = strlen(audioFile);
-    if (strncasecmp("LiveAudio", audioFile, 9) &&
-	strcasecmp(".au", audioFile+len-3)) {
-      char errmsg[128];
-      cmd = CmdFAIL;
-      CmdWrite((char *)&cmd, 1);
-      sprintf(errmsg, "%s without suffix .au", audioFile);
-      write_string(serviceSocket, errmsg);
-      return(1);
-    }
-  }
-  /*
-  fprintf(stderr, "Audio file %s got.\n", audioFile);
-  */
-
-  if (!strncasecmp("LiveAudio", audioFile, 9)) {
-    fd = OpenLiveAudio(&(para.para));
-    if (fd == -1) {
-      failureType = 1;
-      goto failure;
-    }
-    fileSize =0x7fffffff;
-    totalSamples = fileSize / audioPara.bytesPerSample;
-    live_source = 1;
-  }
-  else {
-    LeaveLiveAudio();
-    fd = open(audioFile, O_RDONLY);
-    if (fd == -1)
-    {
-      fprintf(stderr, "AS error on opening audio file %s", audioFile);
-      perror("");
-      failureType = 0;
-      goto failure;
-    }
-
-    /* Try to get audioFile format audioPara here */
-
-    /* figure out totalsamples */
-    fileSize = lseek(fd, 0L, SEEK_END);
-    lseek(fd, 0L, SEEK_SET);
-    totalSamples = fileSize / audioPara.bytesPerSample;
-    /*
-    fprintf(stderr, "Total Samples=%d in audio file %ss.\n", totalSamples, audioFile);
-    */
-  }
-  {
-    INITaudioReply reply;
-    
-    reply.para.encodeType = htonl(audioPara.encodeType);
-    reply.para.channels = htonl(audioPara.channels);
-    reply.para.samplesPerSecond = htonl(audioPara.samplesPerSecond);
-    reply.para.bytesPerSample = htonl(audioPara.bytesPerSample);
-    reply.totalSamples = htonl(totalSamples);
-
-    reply.live = htonl(live_source);
-    reply.format = htonl(AUDIO_RAW);
-    
-    CmdWrite((char *)&cmd, 1);
-    CmdWrite((char *)&reply, sizeof(reply));
-  }
-  return 0;
-  
- failure:
-  {
-    /*
-    fprintf(stderr, "AS error: failed initializing audio file.\n");
-    */
-    cmd = CmdFAIL;
-    CmdWrite((char *)&cmd, 1);
-    write_string(serviceSocket,
-		 failureType == 0 ? "Failed to open audio file for read." :
-		 "Failed to connect to live audio source.");
-    return(1);
-  }
-}
-
-/* send a packet of audio samples to audioSocket
-   returns: 0 - no more data from audio file: EOF reached;
-            1 - More data is available from the audio file */
-int
-Audio_Global::send_packet(int firstSample, int samples)
-{
-  long offset = firstSample * audioPara.bytesPerSample;
-  int size = samples * audioPara.bytesPerSample;
-  char * buf = (char *)pktbuf + sizeof(*pktbuf);
-  int len;
-  int resent = 0;
-  int segsize, sentsize;
-
-  if (live_source) {
-    len = ReadLiveAudioSamples(buf, samples);
-    len *= audioPara.bytesPerSample;
-  }
-  else {
-    lseek(fd, offset, SEEK_SET);
-    while ((len = read(fd, buf, size)) == -1) {
-      if (errno == EINTR)
-	continue;   /* interrupted */
-      perror("AS error on read audio file");
-      return(-1);
-    }
-    if (len < audioPara.bytesPerSample) {
-      return 0;
-    }
-  }
-  
-  samples = len / audioPara.bytesPerSample;
-  len = samples * audioPara.bytesPerSample;
-  bytes_sent += len;
-  pktbuf->firstSample = htonl(firstSample);
-  pktbuf->samples = htonl(samples);
-  pktbuf->actualSamples = htonl(samples);
-  pktbuf->dataBytes = htonl(len);
-  if (spslimit < sps) { /* interpolation needed */
-    SFprintf(stderr, "AS audio sample interpolation not available yet.\n");
-  }
-  segsize = sizeof(*pktbuf) + len;
-  if (conn_tag != 0) {
-    while ((sentsize = write(audioSocket, (char *)pktbuf, segsize)) == -1) {
-      if (errno == EINTR) /* interrupted */
-	continue;
-      if (errno == ENOBUFS) {
-	if (resent) {
-	  perror("AS Warning, pkt discarded because");
-	  break;
-	}
-	else {
-	  resent = 1;
-	  usleep(5000);
-	  continue;
-	}
-      }
-      if (errno != EPIPE) {
-	fprintf(stderr, "AS error on send audio packet %d(%d):",
-		firstSample, samples);
-	perror("");
-      }
-      exit((errno != EPIPE));
-    }
-  }
-  else {
-    sentsize = wait_write_bytes(audioSocket, (char *)pktbuf, segsize);
-    if (sentsize == -1) {
-      if (errno != EPIPE) {
-	fprintf(stderr, "AS error on send audio packet %d(%d):",
-		firstSample, samples);
-	perror("");
-      }
-      exit((errno != EPIPE));
-     }
-  }
-  if (sentsize < segsize) {
-    SFprintf(stderr, "AS warning: message size %dB, sent only %dB\n",
-	    segsize, sentsize);
-  }
-  /*
-  SFprintf(stderr, "AS sent audio packet %d(%d).\n",
-	  firstSample, samples);
-  */
-  return (len < size ? 0 : 1);
-}
-
-/* send a packet of audio samples to audioSocket
-   returns: 0 - no more data from audio file: EOF reached;
-            1 - More data is available from the audio file */
-int
-Audio_Global::SendPacket(void)
-{
-  int moredata;
-  pktbuf->cmdsn = htonl(cmdsn);
-  pktbuf->resend = htonl(0);
-  pktbuf->samplesPerSecond = htonl(sps);
-  moredata = send_packet(nextsample, spp);
-  if (moredata) {
-    nextsample += spp;
-  }
-  return moredata;
-}
-
-void
-Audio_Global::ResendPacket(int firstsample, int samples)
-{
-  pktbuf->cmdsn = htonl(cmdsn);
-  pktbuf->resend = htonl(1);
-  pktbuf->samplesPerSecond = htonl(sps);
-  while (samples > 0) {
-    int size = samples < spp ? samples : spp;
-    send_packet(firstsample, size);
-    firstsample += size;
-    samples -= size;
-    if (samples > 0) {
-      usleep(10000);
-    }
-  }
-}
-
-int
-Audio_Global::PLAYaudio(void)
-{
-  int hasdata = 1;
-  int addSamples;
-  int packets = 0;
-  unsigned nextTime;
-  int upp;  /* micro-seconds per packet */
-  int delta_sps = 0;  /* compensation for sps from feedback msgs */
-  int nfds = (serviceSocket > audioSocket ? serviceSocket : audioSocket) + 1;
-  int result;
-  /*
-  fprintf(stderr, "PLAY . . .\n");
-  */
-  {
-    PLAYaudioPara para;
-    result = CmdRead((char *)&para, sizeof(para));
-    if (result != 0)
-      return result;
-#ifdef NeedByteOrderConversion
-    para.sn = ntohl(para.sn);
-    para.nextSample = ntohl(para.nextSample);
-    para.samplesPerSecond = ntohl(para.samplesPerSecond);
-    para.samplesPerPacket = ntohl(para.samplesPerPacket);
-    para.ABsamples = ntohl(para.ABsamples);
-    para.spslimit = ntohl(para.spslimit);
-#endif
-    nextsample = para.nextSample;
-    cmdsn = para.sn;
-    sps = para.samplesPerSecond;
-    spslimit = para.spslimit;
-    spp = para.samplesPerPacket;
-    addSamples = para.ABsamples / 2;
-    if (spp * audioPara.bytesPerSample > databuf_size) {
-      spp = databuf_size / audioPara.bytesPerSample;
-    }
-    /*
-    SFprintf(stderr, "AS got CmdPLAY: sps %d\n", sps);
-    */
-  }
-  /*
-  fprintf(stderr, "AS: nextSampe=%d for PLAY.\n", para.nextSample);
-  */
-
-  upp = (int)(1000000.0 / ((double)sps / (double)spp));
-  nextTime = get_usec();
-  
-  CmdWrite((char *)&nextTime, sizeof(int));
-
-  if (live_source) {
-    StartPlayLiveAudio();
-  }
-  
-  for (;;)
-  {
-    struct fd_set read_mask, write_mask;
-    struct timeval tval;
-    unsigned curTime = get_usec();
-    
-    if (hasdata) {
-      if (addSamples < - spp) {  /* slow down by not sending packets */
-	nextTime += upp;
-	addSamples += spp;
-      }
-      else {
-	int need_sleep = 0;
-	while (nextTime <= curTime && hasdata) {
-	  if (need_sleep) usleep(5000);
-	  hasdata = SendPacket();
-	  need_sleep = 1;
-	  packets ++;
-	  nextTime += upp;
-	  if (addSamples > 0 && packets % SPEEDUP_SCALE == 0) {
-	    addSamples -= spp;
-	    usleep(5000);
-	    hasdata = SendPacket();
-	    packets ++;
-	  }
-	}
-      }
-    }
-    curTime = nextTime - curTime;
-    if (curTime > 5000000) curTime = 5000000; /* limit on 5 second weit time
-						 in case error happens */
-    tval.tv_sec = curTime / 1000000;
-    tval.tv_usec = curTime % 1000000;
-    FD_ZERO(&read_mask);
-    FD_SET(serviceSocket, &read_mask);
-    FD_SET(audioSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(nfds, (int *)&read_mask, NULL, NULL, hasdata ? &tval : NULL) == -1)
-#else
-    if (select(nfds, &read_mask, NULL, NULL, hasdata ? &tval : NULL) == -1)
-#endif
-    {
-      if (errno == EINTR)
-        continue;
-      perror("AS error on select reading or writing");
-      return(-1);
-    }
-    if (FD_ISSET(serviceSocket, &read_mask)){  /* STOP, SPEED, or CLOSE*/
-      unsigned char tmp;
-      result = CmdRead((char *)&tmp, 1);
-      if (result != 0)
-        return result;
-      switch (tmp)
-      {
-      case CmdSPEED:
-	{
-	  SPEEDaudioPara para;
-	  result = CmdRead((char *)&para, sizeof(para));
-          if (result != 0)
-            return result;
-#ifdef NeedByteOrderConversion
-	  para.sn = ntohl(para.sn);
-	  para.samplesPerSecond = ntohl(para.samplesPerSecond);
-	  para.samplesPerPacket = ntohl(para.samplesPerPacket);
-	  para.spslimit = ntohl(para.spslimit);
-#endif
-	  sps  = para.samplesPerSecond;
-	  spslimit = para.spslimit;
-	  spp = para.samplesPerPacket;
-	  if (spp * audioPara.bytesPerSample > databuf_size) {
-	    spp = databuf_size / audioPara.bytesPerSample;
-	  }
-	  delta_sps = 0;  /* reset compensation value */
-	  upp = (int)(1000000.0 / ((double)sps / (double)spp));
-	  /*
-	  SFprintf(stderr, "AS got CmdSPEED: sps %d\n", sps);
-	  */
-	}
-	break;
-      case CmdSTOP:
-	{
-	  int val;
-	  cmd = tmp;
-	  /*
-	     fprintf(stderr, "AS: CmdSTOP. . .\n");
-	     */
-	  result = CmdRead((char *)&val, sizeof(int));
-          if (result != 0)
-            return result;
-	  /*
-	  CmdWrite(AUDIO_STOP_PATTERN, strlen(AUDIO_STOP_PATTERN));
-	  */
-	  if (live_source) {
-	    StopPlayLiveAudio();
-	  }
-	  return 0;  /* return from PLAYaudio() */
-	}
-      case CmdCLOSE:
-	if (live_source) {
-	  StopPlayLiveAudio();
-	}
-	return(1);  /* The whole AS session terminates */
-      default:
-	if (live_source) {
-	  StopPlayLiveAudio();
-	}
-	fprintf(stderr, "AS error: cmd=%d while expects STOP/SPEED/CLOSE.\n", tmp);
-	return(-1);
-      }
-    }
-    
-    if (FD_ISSET(audioSocket, &read_mask)){  /* Feedback packet */
-      int bytes, len;
-      for (;;) {
-	if (conn_tag >= 0) {
-	  len = wait_read_bytes(audioSocket, (char *)fbpara, sizeof(*fbpara));
-	  if (len == 0) return(1); /* connection broken */
-	  else if (len < 0) { /* unexpected error */
-	    perror("AS read1 FB");
-	    return(-1);
-	  }
-	}
-	else { /* discard mode packet stream, read the whole packet */
-	  len = read(audioSocket, (char *)fbpara,  FBBUF_SIZE);
-	}
-	if (len == -1) {
-	  if (errno == EINTR) continue; /* interrupt */
-	  else {
-	    if (errno != EPIPE && errno != ECONNRESET) perror("AS failed to read() fbmsg header");
-	    break;
-	  }
-	}
-	break;
-      }
-      if (len < sizeof(*fbpara)) {
-	if (len > 0) fprintf(stderr,
-			 "AS warn read() len %dB < sizeof(*fbpara) %dB\n",
-			 len, sizeof(*fbpara));
-	continue;
-      }
-#ifdef NeedByteOrderConversion
-      fbpara->type = ntohl(fbpara->type);
-#endif
-      bytes = (fbpara->type > 0) ?
-              sizeof(APdescriptor) * (fbpara->type - 1) :
-              0;
-      if (bytes > 0) {
-	if (conn_tag >= 0) { /* not discard mode packet stream,
-				read the rest of packet */
-	  len = wait_read_bytes(audioSocket,
-				((char *)fbpara) + sizeof(*fbpara),
-				bytes);
-	  if (len == 0) return(1); /* connection broken */
-	  else if (len < 0) { /* unexpected error */
-	    perror("AS read2 FB");
-	    return(-1);
-	  }
-	  len += sizeof(*fbpara);
-	}
-      }
-      bytes += sizeof(*fbpara);
-      if (len < bytes) {
-	if (len > 0) fprintf(stderr,
-			     "AS only read partial FBpacket, %dB out of %dB.\n",
-			     len, bytes);
-	continue;
-      }
-      if (live_source) {  /* ignore all feedback messags for live source */
-	continue;
-      }
-      
-#ifdef NeedByteOrderConversion
-      fbpara->cmdsn = ntohl(fbpara->cmdsn);
-#endif
-      if (len != sizeof(*fbpara) +
-	  (fbpara->type ? (fbpara->type -1) * sizeof(APdescriptor) : 0)) {
-	/* unknown message, discard */
-	SFprintf(stderr, "AS Unkown fb msg: len = %d, type = %d\n",
-		len, fbpara->type);
-	continue;
-      }
-      if (fbpara->cmdsn != cmdsn) {  /* discard the outdated message */
-	continue;
-      }
-#ifdef NeedByteOrderConversion
-      {
-	int i, * ptr = (int *)fbpara + 2;
-	for (i = 0; i < (len >> 2) - 2; i++) *ptr = ntohl(*ptr);
-      }
-#endif
-      if (fbpara->type == 0) { /* feedback message */
-	/*
-	SFprintf(stderr, "AS got fbmsg: addsamples %d, addsps %d\n",
-		fbpara->data.fb.addSamples, fbpara->data.fb.addsps);
-	*/
-	addSamples += fbpara->data.fb.addSamples;
-	if (fbpara->data.fb.addsps) {
-	  delta_sps += fbpara->data.fb.addsps;
-	  upp = (int)(1000000.0 / ((double)(sps + delta_sps) / (double)spp));
-	}
-      }
-      else { /* resend requests */
-	APdescriptor * req = &(fbpara->data.ap);
-	int i;
-	/*
-	SFprintf(stderr, "AS got %d resend reqs\n", fbpara->type);
-	*/
-	for (i = 0; i < fbpara->type; i ++) {
-	  ResendPacket(req->firstSample, req->samples);
-	  req ++;
-	}
-      }
-    }
-  }
-}
-
-void 
-Audio_Global::on_exit_routine(void)
-{
-  struct sockaddr_in peeraddr_in;
-  int size = sizeof(peeraddr_in);
-  
-  /*
-  fprintf(stderr, "An AS session terminated\n");
-  */
-  if (getpeername(serviceSocket,
-		  (struct sockaddr *)&peeraddr_in, &size) == 0 &&
-      peeraddr_in.sin_family == AF_INET) {
-    if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
-      struct hostent *hp;
-      time_t val = time(NULL);
-      char * buf = ctime(&start_time);
-
-      hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
-      buf[strlen(buf)-1] = 0;
-      printf("%s: %s %3dm%02ds %dB %s\n",
-	     buf,
-	     hp == NULL ? inet_ntoa(peeraddr_in.sin_addr) : hp->h_name,
-	     (val - start_time) / 60, (val - start_time) % 60,
-	     bytes_sent, audioFile);
-    }
-  }
-  ComCloseConn(serviceSocket);
-  ComCloseConn(audioSocket);
-}
-
-Audio_Server::Audio_Server (void)
-{
-}
-
-Audio_Server::Audio_Server (ACE_SOCK_Stream& control,
-                          int rttag,
-                          int max_pkt_size)
-{
-  this->init (control,
-              rttag,
-              max_pkt_size);
-}
-
-int
-Audio_Server::init (ACE_SOCK_Stream& control,
-                   int rttag,
-                   int max_pkt_size)
-{
-  int result;
-  int junk;
-  u_short port;
-  ACE_UINT32 ip;
-
-  ACE_INET_Addr server_data_addr;
-  ACE_INET_Addr client_data_addr;
-
-  // do the handshaking.
-  // Client is sending us JUNK
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  control.recv_n (&junk, sizeof junk);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d,received %d\n",__FILE__,__LINE__,junk));  
-  // Client is sending us it's port number
-  control.recv_n (&port, sizeof port);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d,received %u\n",__FILE__,__LINE__,port));
-  // Client is sending us it's IP addr
-  control.recv_n (&ip, sizeof ip);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d,received %d\n",__FILE__,__LINE__,ip));
-
-  client_data_addr.set (port,
-                        ip,
-                        0);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Client IP == %s, "
-              "Client Port == %d\n",
-              client_data_addr.get_host_name (),
-              client_data_addr.get_port_number ()));
-
-  server_data_addr.set ((unsigned short)0);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  // "Connect" our dgram to the client endpoint.
-  if (this->dgram_.open (client_data_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "(%P|%t) UDP open failed: %p\n"),
-                      -1);
-    ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  if (this->dgram_.get_local_addr (server_data_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "(%P|%t) UDP get_local_addr failed: %p\n",
-                       "address:"),
-                      -1);
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  port = server_data_addr.get_port_number ();
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  // %% we need to fix this ?
-  // XXX this is a hack to get my IP address set correctly! By default,
-  // get_ip_address is returning 0.0.0.0, even after calling
-  // get_local_addr () !!
-  server_data_addr.set (port,
-                        server_data_addr.get_host_name ());
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) UDP IP address is %s, and the port number is %d\n",
-              server_data_addr.get_host_addr (),
-              server_data_addr.get_port_number ()));
-
-  ip = server_data_addr.get_ip_address ();
-
-  port = htons (port);
-  ip = htonl (ip);
-  // Client wants us to send the port number first
-  control.send_n (&port,
-                  (int) sizeof (u_short));
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-  // Client wants us to send it the IP address
-  control.send_n (&ip,
-                  (int) sizeof (ACE_UINT32));
-  ACE_DEBUG ((LM_DEBUG,"%s,%d\n",__FILE__,__LINE__));
-//   // Client is sending us a command
-//   u_char cmd;
-//   if (control.recv_n (&cmd,
-//                       1) == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "%P|%t, Command recieve failed: %p"),
-//                       -1);
-
-  // end of handshaking.
-  this->audio_global_.serviceSocket = control.get_handle ();
-  this->audio_global_.audioSocket = this->dgram_.get_handle ();
-  this->audio_global_.conn_tag = max_pkt_size;
-
-  if (max_pkt_size < 0) max_pkt_size = -max_pkt_size;
-  else if (max_pkt_size == 0) max_pkt_size = 1024 * 1024;
-  
-  this->audio_global_.start_time = time(NULL);
-  
-  //  atexit(on_exit_routine);
-
-  result = this->audio_global_.INITaudio ();
-
-  if (result != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Audio_Server: "),
-                      result);
-
-  this->audio_global_.fbpara = (AudioFeedBackPara *)malloc(FBBUF_SIZE);
-  if (this->audio_global_.fbpara == NULL) {
-    perror("AS failed to allocate mem for fbpara");
-    return (-1);
-  }
-
-  this->audio_global_.databuf_size = max_pkt_size - sizeof(AudioPacket);
-  if (this->audio_global_.databuf_size > DATABUF_SIZE)
-    this->audio_global_.databuf_size = DATABUF_SIZE;
-  
-  this->audio_global_.pktbuf = (AudioPacket *)malloc(sizeof(AudioPacket) + 
-                                                     this->audio_global_.databuf_size);
-  if (this->audio_global_.pktbuf == NULL) {
-    perror("AS failed to allocate mem for pktbuf");
-    return(-1);
-  }
-  return 0;
-}
-
-int 
-Audio_Server::set_peer (void)
-{
-  return 0;
-}
-int
-Audio_Server::run (void)
-{
-  int result;
-  for (;;)
-    {
-      /*
-        fprintf(stderr, "AS: waiting for a new command...\n");
-      */
-      result = this->audio_global_.CmdRead((char *)&(this->audio_global_.cmd), 1);
-      if (result != 0)
-        return result;
-      switch (this->audio_global_.cmd)
-        {
-        case CmdPLAY:
-          result = this->audio_global_.PLAYaudio();
-          if (result != 0)
-            return result;
-          break;
-        case CmdCLOSE:
-          /*
-            fprintf(stderr, "a session closed.\n");
-          */
-          return(0);
-          break;
-        default:
-          fprintf(stderr, "audio channel command %d not recoganizeable\n", 
-                  this->audio_global_.cmd);
-          break;
-        }
-    }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h
deleted file mode 100644
index b8fb4c6e1fd..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-#if !defined (_AUDIO_SERVER_H)
-#define _AUDIO_SERVER_H
-
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include "include/common.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/com.h"
-#include "server_proto.h"
-
-#include "ace/SOCK_CODgram.h"
-#include "ace/SOCK_Stream.h"
-
-#define DATABUF_SIZE 500
-
-#define SPEEDUP_SCALE 5
-#define MAX_RESEND_REQS 10
-#define FBBUF_SIZE (sizeof(AudioFeedBackPara) + \
-                    (MAX_RESEND_REQS - 1) * sizeof(APdescriptor))
-
-
-  class Audio_Global
-  {
-  public:
-    Audio_Global (void);
-    // Default constructor.
-    int CmdRead(char *buf, int psize);
-    void CmdWrite(char *buf, int size);
-    int INITaudio(void);
-    int send_packet(int firstSample, int samples);
-    int SendPacket(void);
-    void ResendPacket(int firstsample, int samples);
-    int PLAYaudio(void);
-    void on_exit_routine(void);
-
-  public:
-    int bytes_sent ;
-    time_t start_time;
-
-    int conn_tag;
-
-    int serviceSocket;
-    int audioSocket ;
-
-    char audioFile[PATH_SIZE];
-    int fd;
-    AudioParameter audioPara;
-    int totalSamples;
-    int fileSize;
-    unsigned char cmd;
-    int live_source ;
-
-    int databuf_size;
-    int cmdsn;
-    int nextsample;
-    int sps; /* audio play speed given by the client: samples per second */
-    int spslimit;
-    int spp; /* samples per packet */
-    AudioPacket * pktbuf ;
-    AudioFeedBackPara * fbpara ;
-  };
-
-class Audio_Server
-{
-public:
-  Audio_Server (void);
-  // Default constructor
-  Audio_Server (ACE_SOCK_Stream& control,
-               int rttag,
-               int max_pkt_size);
-  // Taking the control,data fd's and rttag.
-  int init (ACE_SOCK_Stream& control,
-            int rttag,
-            int max_pkt_size);
-  // inits the Audio_Server
-  int run (void);
-  // runs the loop.
-  int set_peer (void);
-  // sets the peer endpoint.
-private:
-  Audio_Global audio_global_;
-  ACE_SOCK_CODgram dgram_;
-};
-#endif
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
deleted file mode 100644
index 94aa88dbd77..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
+++ /dev/null
@@ -1,2230 +0,0 @@
-// $Id$
-
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission. O.G.I. makes no representations about the 
- * suitability of this software for any purpose. It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *     Department of Computer Science and Engineering
- *     email: scen@cse.ogi.edu
- */
-
-#include "Globals.h"
-
-int Mpeg_Global::parentpid = -1;
-int Mpeg_Global::listenSocketIn = -1;
-int Mpeg_Global::listenSocketUn = -1;
-struct linger Mpeg_Global::linger = {1,1};
-int Mpeg_Global::live_audio = 0;
-int Mpeg_Global::live_video = 0; /* 0 - no, 1 - to open, 2 - opened */
-int Mpeg_Global::drift_ppm = 0; /* clock drift in ppm */
-int Mpeg_Global::session_limit = SESSION_NUM;
-int Mpeg_Global::session_num = 0;
-int Mpeg_Global::rttag = 0;
-
-int Video_Timer_Global::timerHeader = 0;
-int Video_Timer_Global::timerGroup = 0;
-int Video_Timer_Global::timerFrame = 0;
-int Video_Timer_Global::timerOn = 0;
-int Video_Timer_Global::timerAdjust = 0;
-int Video_Timer_Global::preTimerVal = 0;
-
-// Initialize the nasty int's, doubles and their friends.
-
-Video_Global::Video_Global (void)
-{
-  live_source = 0;
-  video_format = 0;
- 
-  pkts_sent = 0;
-  start_time = 0;
- 
-  conn_tag = -1;
-
-  normalExit = 1;
-
-  serviceSocket = 0;
-  videoSocket = -1;
-
-  ACE_OS::memset (videoFile, 
-                  0,
-                  PATH_SIZE);
-  fp = 0;
-
-  needHeader = 0;
-
-  lastRef [0] = lastRef [1] = 0;
-
-  lastRefPtr = 0;
-  currentUPF = 0;
-  addedUPF = 0;
-  addedSignals = 0;
-  VStimeAdvance = 0;
-  fps = 0; /* current frames-per-second: playback speed */
-  frameRateLimit = 0;
-
-  packet = 0;
-  packetBufSize = 0;
-  msgsn = 0;
-  packetsn = 0;
-  msgsize = 0;
-
-  precmd = 0;
-  cmd = 0;
-  cmdsn = 0;
-  nextFrame = 0;
-  nextGroup = 0;
-  firstPatternSize = 0;
-  firstSendPattern = 0;
-  sendPatternGops = 0;
-  ACE_OS::memset (sendPattern,
-                  0,
-                  PATTERN_SIZE);
-
-#ifdef STAT
-  framesSent = 0;
-#endif /* STAT */
-
-  fileSize = 0;
-  maxS = 0;
-  maxG = 0; 
-  maxI = 0;
-  maxP = 0;
-  maxB = 0;
-  minS = 0x7fffffff;
-  minG = 0x7fffffff;
-  minI = 0x7fffffff;
-  minP = 0x7fffffff;
-  minB = 0x7fffffff;
-
-  numS = 0;
-  numG = 0;
-  numF = 0;
-  numI = 0;
-  numP = 0;
-  numB = 0;
-
-  averageFrameSize = 0;
-  horizontalSize = 0;
-  verticalSize = 0;
-  pelAspectRatio = 0;
-  pictureRate = 0;
-  vbvBufferSize = 0;
-  firstGopFrames = 0;
-  patternSize = 0;
-
-  ACE_OS::memset (pattern,
-                  0,
-                  PATTERN_SIZE);
-
-  // struct pointers
-  systemHeader = 0;
-
-  gopTable = 0;
-
-  frameTable = 0;
-
-  // playvideo local vars
-
-  preGroup = -1;
-  preHeader = -1;
-  preFrame = -1;
-
-  fast_preGroup = -1;
-  fast_preHeader= -1;
-}
-
-int
-Video_Global::FBread (char *buf, int size)
-{
-  int res;
-
-  while ((res = (this->conn_tag >= 0 ? wait_read_bytes (this->videoSocket, buf, size) :
-                 read (this->videoSocket, buf, size))) == -1)
-    {
-      if (errno == EINTR) {errno = 0; continue; }
-      if (errno == EPIPE || errno == ECONNRESET) exit (0);
-      perror ("VS reads Feedback this->packet");
-      return -1;
-    }
-
-  if (res < size) 
-    {
-      if (res)
-        // @@ Can you please convert the printfs() and perrors to use
-        // the appropriate ACE_DEBUG and ACE_ERROR macros? 
-        fprintf (stderr, "VS warn: FBread () res %dB < size %dB\n", res, size);
-      return -1;
-    }
-  return 0;
-}
-
-// send a given this->packet pointed by 'this->packet' to the network.
-
-int
-Video_Global::first_packet_send_to_network (int timeToUse)
-{
-  int count = 0;
-  VideoMessage * msghd = (VideoMessage *) (((char *) this->packet) - sizeof (VideoMessage));
-  int sent = 0;
-  int packetSize = ntohl (this->packet->dataBytes);
-
-  msghd->packetsn = htonl (this->packetsn ++);
-  msghd->packetSize = htonl (packetSize + sizeof (* this->packet));
-  
-  //  fprintf (stderr, "VS to send FIRST pkt %d of size %d.\n",
-  //       ntohl (msghd->packetsn), ntohl (msghd->packetSize));
-  
-
-  {
-    VideoMessage * msg = NULL;
-    int size = packetSize + sizeof (* this->packet); /* msghd->this->packetSize */
-    int offset = 0;
-    int targetTime;
-  
-    if (size > this->msgsize)
-      {
-        if (!timeToUse)
-          {
-            timeToUse = (this->msgsize + sizeof (*msg) + 28) * 2;
-            /*
-              set the max network as 500KB.
-              28 - UDP header size
-            */
-            /*
-              fprintf (stderr, "computed timeToUse %d. ", timeToUse);
-            */
-          }
-        else
-          {
-            timeToUse = (timeToUse * 7) >> 3;
-            /*
-              fprintf (stderr, "preset timeToUse %d.", timeToUse);
-            */
-            timeToUse /= (size + this->msgsize - 1) / this->msgsize;
-            timeToUse = min (timeToUse, (this->msgsize + sizeof (*msg) + 28) * 100);
-            /* limit min network bandwidth = 10K */
-          }
-
-      }
-    while (size > 0)
-      {
-        int segsize, sentsize;
-        int resent = 0;
-   
-        if (msg == NULL) 
-          { /* first message for current this->packet
-             */
-            count = 0;
-            msg = msghd;
-            targetTime = get_usec ();
-          }
-        else {
-#if 0
-          /* the select () is not precise enough for being used here*/
-          int sleepTime;
-          targetTime += timeToUse;
-          sleepTime = get_duration (get_usec (), targetTime);
-          if (sleepTime >= 5000) { /* resolution of timer is 10,000 usec */
-            usleep (sleepTime); /* not first message, wait for a while */
-          }
-#endif
-          /*
-            count ++;
-            if (! (count % 10)) usleep (10000);
-          */
-          msg = (VideoMessage *) ((char *)msg + this->msgsize);
-          memcpy ((char *)msg, (char *)msghd, sizeof (* msg));
-        }
-
-        msg->msgsn = htonl (this->msgsn++);
-        msg->msgOffset = htonl (offset);
-        msg->msgSize = htonl (min (size, this->msgsize));
-        // send the header seperately first
-        segsize = sizeof (*msg);
-        //        ACE_DEBUG ((LM_DEBUG,
-        //          "(%P|%t) Sending the header, of size %d\n",
-        //          segsize));
-          
-        while (write (this->videoSocket, 
-                      (char *)msg,
-                      segsize) == -1)
-          {
-            if (errno == EINTR)
-              continue;
-            if (errno == ENOBUFS) {
-              if (resent) {
-                perror ("Warning, pkt discarded because");
-                sent = -1;
-                break;
-              }
-              else {
-                resent = 1;
-                perror ("VS to sleep 5ms");
-                usleep (5000);
-                continue;
-              }
-            }
-            if (errno != EPIPE) {
-              fprintf (stderr, "VS error on send this->packet %d of size %d ",
-                       this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-              perror ("");
-            }
-            exit (errno != EPIPE);
-          }
-
-
-        //        segsize = min (size, this->msgsize)+sizeof (*msg);
-        segsize = min (size, this->msgsize);
-
-        if (this->conn_tag != 0) { /* this->packet stream */
-          cerr << "sending " << segsize  << " on fd = " << this->videoSocket << endl;
-          while ((sentsize = write (this->videoSocket, 
-                                    (char *)msg + sizeof (*msg), 
-                                    segsize)) == -1) {
-            if (errno == EINTR)
-              continue;
-            if (errno == ENOBUFS) {
-              if (resent) {
-                perror ("Warning, pkt discarded because");
-                sent = -1;
-                break;
-              }
-              else {
-                resent = 1;
-                perror ("VS to sleep 5ms");
-                usleep (5000);
-                continue;
-              }
-            }
-            if (errno != EPIPE) {
-              fprintf (stderr, "VS error on send this->packet %d of size %d ",
-                       this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-              perror ("");
-            }
-            exit (errno != EPIPE);
-          }
-        }
-        else {
-          sentsize = wait_write_bytes (this->videoSocket, (char *)msg, segsize);
-          if (sentsize == -1) {
-            if (errno != EPIPE) {
-              fprintf (stderr, "VS error on send this->packet %d of size %d ",
-                       this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-              perror ("");
-            }
-            exit (errno != EPIPE);
-          }
-        }
-        if (sentsize < segsize) {
-          SFprintf (stderr, "VS warning: message size %dB, sent only %dB\n",
-                    segsize, sentsize);
-        }
-        if (sent == -1)
-          break;
-        /*
-          fprintf (stderr, "VS: message %d of size %d sent.\n",
-          this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-        */
-        size -= this->msgsize;
-        offset += this->msgsize;
-      }
-  }
-  /*
-    fprintf (stderr, "sent = %d\n", sent);
-  */
-  if (!sent) this->pkts_sent ++;
-  return sent;
-}
-
-/*
-  * send a this->packet with given this->systemHeader (optional), gop (optional) and frame.
-  *
-  * sh - system header id, if -1, then no system header will be sent.
-  *   otherwise, only when frame == 0, the given system header will be sent.
-  * gop - group of pictures, gop header will be sent when frame == 0
-  *    (first I frame );
-  * frame - frame to be sent, offset internal to given gop.
-  */
-
-/* returns: 0 - this->packet sent, -1 - this->packet not sent (failed) */
-
-int
-Video_Global::SendPacket (int shtag, 
-                          int gop, 
-                          int frame, 
-                          int timeToUse, 
-                          int first_time)
-/* frame maybe out of range (PLAY, STEP), in this case, END_SEQ is sent
-  to force display of last frame in VD */
-{
-  char * buf = ((char *) this->packet) + sizeof (VideoPacket);
-  int f = this->gopTable[gop].previousFrames + frame;
-  int sh = this->gopTable[gop].systemHeader;
-  /*
-    SFprintf (stderr, "VS to send this->packet gop-%d, frame-%d.\n", gop, frame);
-    */
-
-  this->packet->currentUPF = ntohl (this->currentUPF);
-
-  if (frame >= this->gopTable[gop].totalFrames)
-    {
-      this->packet->cmd = htonl (this->cmd);
-      this->packet->cmdsn = htonl (this->cmdsn);
-      this->packet->sh = htonl (sh);
-      this->packet->gop = htonl (gop);
-      this->packet->frame = htonl (this->numF);
-      this->packet->display = htonl (this->numF-1);
-      this->packet->future = htonl ((unsigned)-1);
-      this->packet->past = htonl ((unsigned)-1);
-      this->packet->dataBytes = htonl (4);
-      * (int*) ((char*)this->packet + sizeof (*this->packet)) = htonl (SEQ_END_CODE);
-
-      return send_to_network (timeToUse);
-    }
-
-  if (frame)
-    shtag = 0;
-  else if (this->needHeader)
-    {
-      shtag = 1;
-      this->needHeader = 0;
-    }
- 
-  this->packet->cmd = htonl (this->cmd);
-  this->packet->cmdsn = htonl (this->cmdsn);
-  this->packet->sh = htonl (sh);
-  this->packet->gop = htonl (gop);
-  this->packet->frame = htonl (f);
-  if (this->frameTable[f].type == 'B')
-    {
-      int pre1 = -1, pre2 = -1, i = f;
-      while (i>0)
-        if (this->frameTable[--i].type != 'B')
-          {
-            pre1 = i;
-            break;
-          }
-      while (i>0)
-        if (this->frameTable[--i].type != 'B')
-          {
-            pre2 = i;
-            break;
-          }
-      if (pre2 == -1)
-        {
-          /*
-            fprintf (stderr,
-            "frame %d-%d (%d) is a B without past ref, no to be sent.\n",
-            gop, frame, f);
-            */
-          return -1;
-        }
-      if (pre1 != this->lastRef[this->lastRefPtr] ||
-          pre2 != this->lastRef[1 - this->lastRefPtr])
-        {
-          /*
-            fprintf (stderr,
-            "send of B frame %d gaveup for past %d/future %d ref not sent.\n",
-            f, pre2, pre1);
-            */
-          return -1;
-        }
-      this->packet->display = htonl (f);
-      this->packet->future = htonl (pre1);
-      this->packet->past = htonl (pre2);
-    }
-  else
-    {
-      int next = f;
-      int pre = f;
-
-      while (next < this->numF && this->frameTable[++next].type == 'B');
-      while (pre > 0 && this->frameTable[--pre].type == 'B');
-      if (this->frameTable[f].type == 'P' && pre != this->lastRef[this->lastRefPtr])
-        {
-          /*
-            fprintf (stderr,
-            "send of P frame %d gaveup for past ref %d not sent.\n",
-            f, pre);
-            fprintf (stderr, "ref0=%d, ref1=%d, ptr=%d.\n",
-            this->lastRef[0], this->lastRef[1], this->lastRefPtr);
-            */
-          return -1;
-        }
-      this->packet->display = htonl (next);
-      this->packet->future = htonl ((unsigned)-1);
-      this->packet->past = htonl (this->frameTable[f].type == 'P' ? pre : (unsigned)-1);
-    }
-  {
-    char * ptr = buf;
-    int size = 0, offset = 0, i;
-    if (shtag)  /* send system header */
-      {
-        size = this->systemHeader[sh].size;
-        FileRead (this->systemHeader[sh].offset, ptr, size);
-        ptr += size;
-      }
-    if (!frame)  /* send gop header */
-      {
-        size = this->gopTable[gop].headerSize;
-        FileRead (this->gopTable[gop].offset, ptr, size);
-        ptr += size;
-      }
-    size = this->frameTable[f].size;
-    for (i=this->gopTable[gop].previousFrames; i<f; i++)
-      offset += this->frameTable[i].size;
-    FileRead ((this->gopTable[gop].firstIoffset + offset), ptr, size);
-    ptr += size;
-    this->packet->dataBytes = htonl (ptr - buf);
-  }
-
-  {
-    int sent;
-    if (first_time == 1)
-      {
-        ACE_DEBUG ((LM_DEBUG, 
-                    "(%P|%t) Sending first frame to client\n"));
-        sent = first_packet_send_to_network (timeToUse);
-      }
-    else
-      sent = send_to_network (timeToUse);
-    if (!sent)
-      {
-        /*
-          fprintf (stderr, "%c%d\n", this->frameTable[f].type, f);
-          fprintf (stderr, "%c frame %d sent.\n", this->frameTable[f].type, f);
-          */
-        if (this->frameTable[f].type != 'B')
-          {
-            this->lastRefPtr = 1 - this->lastRefPtr;
-            this->lastRef[this->lastRefPtr] = f;
-          }
-      }
-    return sent;
-  }
-}
-
-int
-Video_Global::CmdRead (char *buf, int psize)
-{
-  int res = wait_read_bytes (this->serviceSocket, 
-                             buf, 
-                             psize);
-  if (res == 0) return (1);
-  if (res == -1) {
-    fprintf (stderr, "VS error on read this->cmdSocket, size %d", psize);
-    perror ("");
-    return (-1);
-  }
-  return 0;
-}
-
-int
-Video_Global::CmdWrite (char *buf, int size)
-{
-  int res = wait_write_bytes (this->serviceSocket, buf, size);
-  if (res == -1) {
-    if (errno != EPIPE) perror ("VS writes to this->serviceSocket");
-    return (-1);
-  }
-  return 0;
-}
-
-int
-Video_Global::PLAYliveVideo (PLAYpara * para)
-{
-  int doscale;
-  int count;
-  int first_frame;
-  int frame = para->nextFrame;
-  int nfds = (this->serviceSocket > this->videoSocket ? this->serviceSocket : this->videoSocket) + 1;
-  struct fd_set read_mask;
-  struct timeval tval = {0, 0};
-  double ratio;
-  int result;
- 
-  this->currentUPF = (int) (1000000.0 / this->fps); /* ignore para.usecPerFrame */
-  if (this->frameRateLimit < this->fps) {
-    doscale = 1;
-    ratio = min (this->frameRateLimit, this->fps) / this->fps;
-    first_frame = frame;
-    count = 0;
-    /*
-      fprintf (stderr, "doscale %d, this->frameRateLimit %5.2f, this->fps %5.2f, ratio %5.2f\n",
-      doscale, this->frameRateLimit, this->fps, ratio);
-      */
-  }
-  else doscale = 0;
-  StartPlayLiveVideo ();
-
-  for (;;) {
-
-    if (doscale) {
-      for (;;) {
-	if ((int) ((frame - first_frame) * ratio + 0.5) < count) frame ++;
-	else break;
-      }
-      count ++;
-    }
-    SendPicture (&frame);
-    frame ++;
-  
-    FD_ZERO (&read_mask);
-    FD_SET (this->serviceSocket, &read_mask);
-    FD_SET (this->videoSocket, &read_mask);
-
-    // @@ Is this code actually used anymore, i.e., do we need to
-    // ACE-ify it?
-
-#ifdef _HPUX_SOURCE
-    if (select (nfds, (int *)&read_mask, NULL, NULL, &tval) == -1)
-#else
-      if (select (nfds, &read_mask, NULL, NULL, &tval) == -1)
-#endif
-        {
-          if (errno == EINTR)
-            continue;
-          perror ("Error - VS select between service and video sockets");
-          StopPlayLiveVideo ();
-          exit (1);
-   
-        }
-    if (FD_ISSET (this->serviceSocket, &read_mask))  /* stop */
-      {
-        u_char tmp;
-        result = CmdRead ((char *)&tmp, 1);
-        if (result != 0)
-          return result;
-        if (tmp == CmdCLOSE) {
-          StopPlayLiveVideo ();
-          exit (0);
-        }
-        else if (tmp == CmdSTOP) {
-          this->cmd = tmp;
-          /*
-            fprintf (stderr, "VS: this->CmdSTOP. . .\n");
-            */
-          result = CmdRead ((char *)&this->cmdsn, sizeof (int));
-          if (result != 0)
-            return result;
-#ifdef NeedByteOrderConversion
-          this->cmdsn = ntohl (this->cmdsn);
-#endif
-          StopPlayLiveVideo ();
-          break;
-        }
-        else if (tmp == CmdSPEED)
-          {
-            SPEEDpara speed_para;
-            /*
-              fprintf (stderr, "VS: this->CmdSPEED. . .\n");
-              */
-            result = CmdRead ((char *)&speed_para, sizeof (speed_para));
-            if (result != 0)
-              return result;
-            /* ignore this thing for live video */
-          }
-        else
-          {
-            fprintf (stderr, "VS error (live): this->cmd=%d while expect STOP/SPEED.\n", tmp);
-            this->normalExit = 0;
-            StopPlayLiveVideo ();
-            exit (1);
-          }
-      }
-    if (FD_ISSET (this->videoSocket, &read_mask)) /* feedback, only for frame rate
-                                                     adjustment */
-      {
-        VideoFeedBackPara fb_para;
-        if (FBread ((char *)&fb_para, sizeof (fb_para)) == -1 ||
-            ntohl (fb_para.cmdsn) != this->cmdsn) {
-          /*
-            SFprintf (stderr, "VS warning: a FB this->packet discarded.\n");
-            */
-          return 0;
-        }
-#ifdef NeedByteOrderConversion
-        fb_para.this->frameRateLimit1000 = ntohl (fb_para.this->frameRateLimit1000);
-#endif
-        this->frameRateLimit = fb_para.frameRateLimit1000 / 1000.0;
-        if (this->frameRateLimit < this->fps) {
-          doscale = 1;
-          ratio = min (this->frameRateLimit, this->fps) / this->fps;
-          first_frame = frame;
-          count = 0;
-          /*
-            fprintf (stderr, "doscale %d, this->frameRateLimit %5.2f, this->fps %5.2f, ratio %5.2f\n",
-            doscale, this->frameRateLimit, this->fps, ratio);
-            */
-        }
-        else doscale = 0;
-      }
-  }
-  return 0;
-}
-
-void
-Video_Global::ComputeFirstSendPattern (float limit)
-{
-  char * buf = this->firstSendPattern;
-  int len = this->firstPatternSize;
-  char * pat = (char *)malloc (len);
-  int f;
-
-  if (pat == NULL) {
-    fprintf (stderr, "VS error on allocating %d bytes for computing first SP", len);
-    perror ("");
-    exit (1);
-  }
-  for (f = 0; f < len; f ++) {
-    pat[f] = this->frameTable[f].type;
-  }
-  memset (buf, 0, len);
- 
-  if (limit <= 0)
-    limit = 1.0;
- 
-  f = (int) ((double)len *
-             ((double)limit / (1000000.0 / (double)this->currentUPF)) + 0.5);
-  /* rounded to integer, instead of truncated */
-  if (f >= len)
-    f = len;
-  else if (f <= 1)
-    f = 1;
-
-  ComputeSendPattern (pat, buf, len, f);
-
-  /*
-    f = len - f;
-    fprintf (stderr, "this->Firstthis->Sendthis->Pattern (%d frames dropped): ", f);
-    {
-    int i;
-    for (i = 0; i < len; i ++)
-    fputc (buf[i] ? pat[i] : '-', stderr);
-    }
-    fputc ('\n', stderr);
-    */
-  free (pat);
-}
-
-int
-Video_Global::FrameToGroup (int * frame)
-{
-  int f = * frame;
-  int i = 0;
-  while (i < this->numG && this->gopTable[i].previousFrames <= f) i++;
-  i --;
-  * frame = f - this->gopTable[i].previousFrames;
-  return i;
-}
-
-int 
-Video_Global::SendReferences (int group, int frame)
-{
-  u_char orgcmd;
-  int i, base;
-  int pregroup;
-  int result;
- 
-  if (group < 0 || group >= this->numG) return 0;
-  if (frame <= 0 || frame >= this->gopTable[group].totalFrames) return 0;
- 
-  orgcmd = this->cmd;
-  this->cmd = CmdREF;
- 
-  if (group > 0) {
-    pregroup = 1;
-    base = this->gopTable[group].previousFrames;
-    for (i = 0; i <= frame; i ++) {
-      if (this->frameTable[i + base].type == 'P') {
-	pregroup = 0;
-	break;
-      }
-    }
-  }
-  else pregroup = 0;
-
-  if (pregroup) { /* reference frame can be in previous group */
-    pregroup = group -1;
-    base = this->gopTable[pregroup].previousFrames;
-    for (i = 0; i < this->gopTable[pregroup].totalFrames; i ++) {
-      if (this->frameTable[i + base].type != 'B') {
-	/*
-          SFprintf (stderr, "REF group%d, frame%d\n", pregroup, i);
-          */
-	result = SendPacket (i == 0, pregroup, i, 0);
-        if (result != 0)
-          return result;
-      }
-    }
-  }
-
-  base = this->gopTable[group].previousFrames;
-  for (i = 0; i < frame; i ++) {
-    if (this->frameTable[i + base].type != 'B') {
-      /*
-        SFprintf (stderr, "REF group%d, frame%d\n", group, i);
-        */
-      SendPacket (i == 0, group, i, 0);
-    }
-  }
-  this->cmd = orgcmd;
-}
-
-int
-Video_Global::GetFeedBack ()
-{
-  VideoFeedBackPara para;
-  struct itimerval val;
-  int timerUsec;
- 
-  if (FBread ((char *)&para, sizeof (para)) == -1 ||
-      ntohl (para.cmdsn) != this->cmdsn) {
-    /*
-      SFprintf (stderr, "VS warning: a FB this->packet discarded.\n");
-      */
-    return -1;
-  }
-#ifdef NeedByteOrderConversion
-  para.this->needHeader = ntohl (para.this->needHeader);
-  para.addUsecPerFrame = ntohl (para.addUsecPerFrame);
-  para.addFrames = ntohl (para.addFrames);
-  para.this->sendthis->PatternGops = ntohl (para.this->sendthis->PatternGops);
-  para.this->frameRateLimit1000 = ntohl (para.this->frameRateLimit1000);
-#endif
-  this->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-  this->sendPatternGops = para.sendPatternGops;
- 
-  if (!Video_Timer_Global::timerOn) return 0;
-
-  this->needHeader = para.needHeader;
-  memcpy (this->sendPattern, para.sendPattern, PATTERN_SIZE);
-  if (para.addFrames <= 0 || Video_Timer_Global::timerAdjust < MAX_TIMER_ADJUST)
-    {
-      Video_Timer_Global::timerAdjust += para.addFrames * SPEEDUP_INV_SCALE;
-      Video_Timer_Global::TimerSpeed ();
-    }
-  else /* drastic compensation for big gap */
-    this->addedSignals += para.addFrames;
-  if (para.addUsecPerFrame) {
-    this->addedUPF += para.addUsecPerFrame;
-    Video_Timer_Global::TimerSpeed ();
-  }
-  /*
-    SFprintf (stderr, "VS fb: addf %d, addupf %d\n",
-    para.addFrames, para.addUsecPerFrame);
-    */
-
-  return 0;
-}
-
-int
-Video_Global::SendPicture (int * frame)
-{
-  int size;
-  char * buf = ((char *) this->packet) + sizeof (VideoPacket);
-  /*
-    SFprintf (stderr, "VS to send picture %d.\n", *frame);
-    */
-
-  size = ReadLiveVideoPicture (frame, buf, this->packetBufSize);
- 
-  this->packet->currentUPF = ntohl (this->currentUPF);
-  this->packet->cmd = htonl (this->cmd);
-  this->packet->cmdsn = htonl (this->cmdsn);
-  this->packet->sh = this->packet->gop = this->packet->frame = this->packet->display = htonl (*frame);
-  this->packet->future = htonl ((unsigned)-1);
-  this->packet->past = htonl ((unsigned)-1);
-
-  this->packet->dataBytes = htonl (size);
-
-  return send_to_network (this->currentUPF);
-}
-
-int
-Video_Global::ReadInfoFromFile (void)
-{
-  int fd = -1, i;
-  int fnlen = strlen (this->videoFile);
-
-  strcpy (&this->videoFile[fnlen], ".Info");
-  fd = open (this->videoFile, O_RDONLY);
-  if (fd == -1)
-    {
-      fprintf (stderr, "Reminder: VS fails to open %s for read, ", this->videoFile);
-      perror ("try create one");
-      goto fail_ReadInfoFromFile;
-    }
-  read_int (fd, &i);
-  if (i != this->fileSize)
-    {
-      fprintf (stderr, "Warning: this->fileSize in Info: %d not the same as actual %d.\n",
-               i, this->fileSize);
-      goto fail_ReadInfoFromFile;
-    }
-
-  read_int (fd, &this->maxS);
-  read_int (fd, &this->maxG);
-  read_int (fd, &this->maxI);
-  read_int (fd, &this->maxP);
-  read_int (fd, &this->maxB);
-  read_int (fd, &this->minS);
-  read_int (fd, &this->minG);
-  read_int (fd, &this->minI);
-  read_int (fd, &this->minP);
-  read_int (fd, &this->minB);
-  read_int (fd, &this->numS);
-  read_int (fd, &this->numG);
-  read_int (fd, &this->numF);
-  read_int (fd, &this->numI);
-  read_int (fd, &this->numP);
-  read_int (fd, &this->numB);
-  read_int (fd, &this->averageFrameSize);
-  read_int (fd, &this->horizontalSize);
-  read_int (fd, &this->verticalSize);
-  read_int (fd, &this->pelAspectRatio);
-  read_int (fd, &this->pictureRate);
-  read_int (fd, &this->vbvBufferSize);
-  read_int (fd, &this->patternSize);
-
-  memset (this->pattern, 0, PATTERN_SIZE);
-  read_bytes (fd, this->pattern, this->patternSize);
-#ifdef STAT
-  this->framesSent = (char *)malloc ((this->numF + 7)>>3);
-  if (this->framesSent == NULL)
-    {
-      fprintf (stderr, "Error: VS fails to alloc mem for this->framesSent for %d frames", this->numF);
-      perror ("");
-      exit (1);
-    }
-#endif
-  this->systemHeader = (struct Video_Global::SystemHeader *)malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
-  if (this->systemHeader == NULL)
-    {
-      perror ("Error: VS error on malloc this->SystemHeader");
-      exit (1);
-    }
-  this->gopTable = (struct Video_Global::GopTable *)malloc (sizeof (struct Video_Global::GopTable) * this->numG);
-  if (this->gopTable == NULL)
-    {
-      perror ("Error: VS error on malloc GopHeader");
-      exit (1);
-    }
-  this->frameTable = (struct Video_Global::FrameTable *)malloc (sizeof (Video_Global::FrameTable) * this->numF);
-  if (this->frameTable == NULL)
-    {
-      perror ("Error: VS error on malloc this->frameTable");
-      exit (1);
-    }
-  this->packetBufSize = this->maxS + this->maxG + max (this->maxI, max (this->maxP, this->maxB));
-  this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
-                                        this->packetBufSize);
-  if (this->packet == NULL)	
-    {	
-      perror ("Error: VS error on malloc this->packet buffer");
-      exit (1);
-    }
-  this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
-
-  for (i = 0; i < this->numS; i ++)
-    {
-      read_int (fd, (int *)&this->systemHeader[i].offset);
-      read_int (fd, &this->systemHeader[i].size);
-    }
-  for (i = 0; i < this->numG; i ++)
-    {
-      read_int (fd, &this->gopTable[i].systemHeader);
-      read_int (fd, (int *)&this->gopTable[i].offset);
-      read_int (fd, &this->gopTable[i].headerSize);
-      read_int (fd, &this->gopTable[i].size);
-      read_int (fd, &this->gopTable[i].totalFrames);
-      read_int (fd, &this->gopTable[i].previousFrames);
-      read_int (fd, (int *)&this->gopTable[i].firstIoffset);
-    }
-  for (i = 0; i < this->numF; i ++)
-    {
-      read_byte (fd, &this->frameTable[i].type);
-      read_short (fd, (short *)&this->frameTable[i].size);
-    }
-
-  close (fd);
-  /*
-    fprintf (stderr, "Read Info from %s\n", this->videoFile);
-    */
-  this->videoFile[fnlen] = 0;
-  return 0;
-fail_ReadInfoFromFile:
-  if (fd >= 0)
-    close (fd);
-  this->videoFile[fnlen] = 0;
-  /*
-    fprintf (stderr, "To scan Info from %s\n", this->videoFile);
-    */
-  return -1;
-}
-
-void
-Video_Global::WriteInfoToFile (void)
-{
-  int fd = -1, i;
-  int fnlen = strlen (this->videoFile);
-
-  strcpy (&this->videoFile[fnlen], ".Info");
-  fd = open (this->videoFile, O_WRONLY | O_CREAT, 0444);
-  if (fd == -1)
-    {
-      fprintf (stderr, "VS fails to open %s for write", this->videoFile);
-      perror ("");
-      goto fail_WriteInfoToFile;
-    }
-  write_int (fd, this->fileSize);
-  write_int (fd, this->maxS);
-  write_int (fd, this->maxG);
-  write_int (fd, this->maxI);
-  write_int (fd, this->maxP);
-  write_int (fd, this->maxB);
-  write_int (fd, this->minS);
-  write_int (fd, this->minG);
-  write_int (fd, this->minI);
-  write_int (fd, this->minP);
-  write_int (fd, this->minB);
-  write_int (fd, this->numS);
-  write_int (fd, this->numG);
-  write_int (fd, this->numF);
-  write_int (fd, this->numI);
-  write_int (fd, this->numP);
-  write_int (fd, this->numB);
-  write_int (fd, this->averageFrameSize);
-  write_int (fd, this->horizontalSize);
-  write_int (fd, this->verticalSize);
-  write_int (fd, this->pelAspectRatio);
-  write_int (fd, this->pictureRate);
-  write_int (fd, this->vbvBufferSize);
-  write_int (fd, this->patternSize);
-
-  write_bytes (fd, this->pattern, this->patternSize);
- 
-  for (i = 0; i < this->numS; i ++)
-    {
-      write_int (fd, this->systemHeader[i].offset);
-      write_int (fd, this->systemHeader[i].size);
-    }
-  for (i = 0; i < this->numG; i ++)
-    {
-      write_int (fd, this->gopTable[i].systemHeader);
-      write_int (fd, this->gopTable[i].offset);
-      write_int (fd, this->gopTable[i].headerSize);
-      write_int (fd, this->gopTable[i].size);
-      write_int (fd, this->gopTable[i].totalFrames);
-      write_int (fd, this->gopTable[i].previousFrames);
-      write_int (fd, this->gopTable[i].firstIoffset);
-    }
-  for (i = 0; i < this->numF; i ++)
-    {
-      write_byte (fd, this->frameTable[i].type);
-      write_short (fd, this->frameTable[i].size);
-    }
-
-  close (fd);
-  this->videoFile[fnlen] = 0;
-  return;
-fail_WriteInfoToFile:
-  if (fd >= 0)
-    close (fd);
-  this->videoFile[fnlen] = 0;
-  return;
-}
-
-int
-Video_Global::init_MPEG1_video_file (void)
-{
-  u_char nb;
-  int state = 0;
-  u_long fileptr = 0;
-  u_long i, j, k;
-  int shptr, gopptr, ftptr;
-  int inpic = 0;
-  u_long picptr = 0;
-  int pictype = 0;
-  int first = 0;
-  int failureType = 0;
- 
-  this->fp = fopen (this->videoFile, "r");
-  if (this->fp == NULL)
-    {
-      fprintf (stderr, "error on opening video file %s", this->videoFile);
-      perror ("");
-      return 2;
-    }
-  if (fseek (this->fp, 0, 2) == -1)
-    {
-      fprintf (stderr, "File %s not seekable", this->videoFile);
-      perror ("");
-      return 3;
-    }
-  this->fileSize = ftell (this->fp);
- 
-  fseek (this->fp, 0, 0);
-
-  if (ReadInfoFromFile ())
-    {
-      for (;;)
-        {
-          nextByte;
-          if (state >= 0 && nb == 0x00)
-            state ++;
-          else if (state >= 2 && nb == 0x01)
-            state = -1;
-          else if (state == -1)
-            {
-              if (!first) first ++;
-              else if (first == 1) first ++;
-
-              switch (nb)
-                {
-                case 0xb7:	/* seq_end_code */
-                  goto exit_phase1;
-                  break;
-                case 0xb3:	/* seq_start_code */
-                  if (first == 1) first = 3;
-                  if (first != 3)
-                    {
-                      fprintf (stderr, "VS error: given file is not in MPEG format.\n");
-                      return 4;
-                    }
-                  this->numS ++;
-                  break;
-                case 0xb8:	/* gop_start_code */
-                  this->numG ++;
-                  break;
-                case 0x00:	/* picture_start_code */
-                  nextByte;
-                  nextByte;
-                  nb &= 0x38;
-                  if (nb == 0x08)
-                    {
-                      this->numI ++;
-                      if (this->numG == 2)
-                        this->pattern[this->patternSize++] = 'I';
-                    }
-                  else if (nb == 0x10)
-                    {
-                      this->numP ++;
-                      if (this->numG == 2)
-                        this->pattern[this->patternSize++] = 'P';
-                    }
-                  else if (nb == 0x18)
-                    {
-                      this->numB ++;
-                      if (this->numG == 2)
-                        this->pattern[this->patternSize++] = 'B';
-                    }
-                  /*
-                    else
-                    fprintf (stderr, "VS error: unkonw picture type %d\n", nb);
-                    */
-                  break;
-                default:
-                  break;
-                }
-              state = 0;
-            }
-          else
-            state = 0;
-        }
-    exit_phase1:
-
-      if (first != 3)
-        {
-          fprintf (stderr, "VS error: given file \"%s\" is not of MPEG format.\n", this->videoFile);
-          return 4;
-        }
-
-      this->pattern[this->patternSize] = 0;
-      memset (this->sendPattern, 1, PATTERN_SIZE);
-
-      this->numF = this->numI + this->numP + this->numB;
-      this->averageFrameSize = fileptr / (unsigned)this->numF;
-      /*
-        fprintf (stderr, "Pass one finished, total bytes read: %u, average frame size %d\n",
-        fileptr, this->averageFrameSize);
-        fprintf (stderr, "this->numS-%d, this->numG-%d, this->numF-%d, this->numI-%d, this->numP-%d, this->numB-%d\n",
-        this->numS, this->numG, this->numI, this->numI, this->numP, this->numB);
-        fprintf (stderr, "this->Pattern detected: %s\n", this->pattern);
-        */
-      if (this->numF > MAX_FRAMES)
-        {
-          fprintf (stderr, "VS error: this->Number of frames (%d) is bigger than MAX_FRAMES (%d).\n\
-you need to update the constant definition in common.h and recompile.\n",
-                   this->numF, MAX_FRAMES);
-          return 5;
-        }
-
-#ifdef STAT
-      this->framesSent = (char *)malloc ((this->numF + 7)>>3);
-      if (this->framesSent == NULL)
-        {
-          fprintf (stderr, "VS fails to alloc mem for this->framesSent for %d frames", this->numF);
-          perror ("");
-          return 6;
-        }
-#endif
-
-      this->systemHeader = (struct Video_Global::SystemHeader *)malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
-      if (this->systemHeader == NULL)
-        {
-          perror ("VS error on malloc this->SystemHeader");
-          return 7;
-        }
-      this->gopTable = (struct Video_Global::GopTable *)malloc (sizeof (struct Video_Global::GopTable) * this->numG);
-      if (this->gopTable == NULL)
-        {
-          perror ("VS error on malloc GopHeader");
-          return 8;
-        }
-      this->frameTable = (struct Video_Global::FrameTable *)malloc (sizeof (Video_Global::FrameTable) * this->numF);
-      if (this->frameTable == NULL)
-        {
-          perror ("VS error on malloc this->frameTable");
-          return 9;
-        }
-
-      rewind (this->fp);
-      fileptr = 0;
-      state = 0;
-      inpic = 0;
-      shptr = -1;
-      gopptr = -1;
-      ftptr = 0;
-
-      for (;;)
-        {
-          nextByte;
-          if (state >= 0 && nb == 0x00)
-            state ++;
-          else if (state >= 2 && nb == 0x01)
-            state = -1;
-          else if (state == -1)
-            {
-              switch (nb)
-                {
-                case 0xb7:	/* seq_end_code */
-                  if (gopptr >= 0 && this->gopTable[gopptr].size == 0)
-                    this->gopTable[gopptr].size = fileptr - this->gopTable[gopptr].offset - 4;
-                  computePicSize;
-                  goto exit_phase2;
-                  break;
-                case 0xb3:	/* seq_start_code */
-                  if (gopptr >= 0 && this->gopTable[gopptr].size == 0)
-                    this->gopTable[gopptr].size = fileptr - this->gopTable[gopptr].offset - 4;
-                  computePicSize;
-                  shptr ++;
-                  this->systemHeader[shptr].offset = fileptr - 4;
-                  this->systemHeader[shptr].size = 0;
-                  break;
-                case 0xb8:	/* gop_start_code */
-                  if (this->systemHeader[shptr].size == 0)
-                    this->systemHeader[shptr].size =fileptr - this->systemHeader[shptr].offset - 4;
-                  if (gopptr >= 0 && this->gopTable[gopptr].size == 0)
-                    this->gopTable[gopptr].size = fileptr - this->gopTable[gopptr].offset - 4;
-                  computePicSize;
-                  gopptr ++;
-                  this->gopTable[gopptr].systemHeader = shptr;
-                  this->gopTable[gopptr].offset = fileptr - 4;
-                  this->gopTable[gopptr].headerSize = 0;
-                  this->gopTable[gopptr].size = 0;
-                  this->gopTable[gopptr].totalFrames = 0;
-                  this->gopTable[gopptr].previousFrames = gopptr ?
-                    (this->gopTable[gopptr - 1].totalFrames + this->gopTable[gopptr - 1].previousFrames) : 0;
-
-                  break;
-                case 0x00:	/* picture_start_code */
-                  if (this->gopTable[gopptr].headerSize == 0)
-                    {
-                      this->gopTable[gopptr].headerSize = fileptr - this->gopTable[gopptr].offset - 4;
-                      this->gopTable[gopptr].firstIoffset = fileptr - 4;
-                    }
-                  this->gopTable[gopptr].totalFrames ++;
-                  computePicSize;
-                  picptr = fileptr - 4;
-                  nextByte;
-                  nextByte;
-                  nb &= 0x38;
-                  if (nb == 0x08)
-                    {
-                      pictype = 'I';
-                      inpic = 1;
-                    }
-                  else if (nb == 0x10)
-                    {
-                      pictype = 'P';
-                      inpic = 1;
-                    }
-                  else if (nb == 0x18)
-                    {
-                      pictype = 'B';
-                      inpic = 1;
-                    }
-                  break;
-                default:
-
-                  break;
-                }
-              state = 0;
-            }
-          else
-            state = 0;
-        }
-
-    exit_phase2:
-      for (shptr = 0; shptr<this->numS; shptr++)
-        {
-          this->maxS = max (this->maxS, this->systemHeader[shptr].size);
-          this->minS = min (this->minS, this->systemHeader[shptr].size);
-        }
-      for (gopptr = 0; gopptr<this->numG; gopptr++)
-        {
-          this->maxG = max (this->maxG, this->gopTable[gopptr].headerSize);
-          this->minG = min (this->minG, this->gopTable[gopptr].headerSize);
-        }
-      this->packetBufSize = this->maxS + this->maxG + max (this->maxI, max (this->maxP, this->maxB));
-      this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
-                                            this->packetBufSize);
-      if (this->packet == NULL)
-        {
-          perror ("VS error on malloc this->packet buffer");
-          return 10;
-        }
-      this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
-      /*
-        fprintf (stderr, "Pass 2 finished.\n");
-        fprintf (stderr, "this->maxS-%d, this->maxG-%d, this->maxI-%d, this->maxP-%d, this->maxB-%d.\n", this->maxS, this->maxG, this->maxI, this->maxP, this->maxB);
-        fprintf (stderr, "this->minS-%d, this->minG-%d, this->minI-%d, this->minP-%d, this->minB-%d.\n", this->minS, this->minG, this->minI, this->minP, this->minB);
-        */
-      /*
-        {
-        int i;
-
-        fprintf (stderr, "id: offset  size -- system header table:\n");
-        for (i=0; i<this->numS; i++)
-	fprintf (stderr, "%-3d %-9u %d\n", i, this->systemHeader[i].offset, this->systemHeader[i].size);
-        fprintf (stderr,
-        "id: header  offset  hdsize  totSize frames  preframs Ioffset Isize -- GOP\n");
-        for (i=0; i<this->numG; i++)
-        {
-	fprintf (stderr, "%-4d %-8d %-8u %-8d %-8d %-8d %-8d %-8u %d\n",
-        i,
-        this->gopTable[i].this->systemHeader,
-        this->gopTable[i].offset,
-        this->gopTable[i].headerSize,
-        this->gopTable[i].size,
-        this->gopTable[i].totalFrames,
-        this->gopTable[i].previousFrames,
-        this->gopTable[i].firstIoffset,
-        this->frameTable[this->gopTable[i].previousFrames].size
-        );
-        }
-
-        fprintf (stderr, "\nframe information:");
-        for (i=0; i<this->numF; i++)
-	fprintf (stderr, "%c%c%-8d", (i%10 ? '\0' : '\n'), this->frameTable[i].type, this->frameTable[i].size);
-        fprintf (stderr, "\n");
-
-        }
-        */
-      fseek (this->fp, this->systemHeader[0].offset+4, 0);
-      nextByte;
-      this->horizontalSize = ((int)nb <<4) & 0xff0;
-      nextByte;
-      this->horizontalSize |= (nb >>4) & 0x0f;
-      this->verticalSize = ((int)nb <<8) & 0xf00;
-      nextByte;
-      this->verticalSize |= (int)nb & 0xff;
-      nextByte;
-      this->pelAspectRatio = ((int)nb >> 4) & 0x0f;
-      this->pictureRate = (int)nb & 0x0f;
-      nextByte;
-      nextByte;
-      nextByte;
-      this->vbvBufferSize = ((int)nb << 5) & 0x3e0;
-      nextByte;
-      this->vbvBufferSize |= ((int)nb >>3) & 0x1f;
-      /*
-        fprintf (stderr, "SysHeader info: hsize-%d, vsize-%d, pelAspect-%d, rate-%d, vbv-%d.\n",
-        this->horizontalSize, this->verticalSize, this->pelAspectRatio, this->pictureRate, this->vbvBufferSize);
-        */
-      WriteInfoToFile ();
-    }
-#if 0
-  {
-    int i, j = 20;
-  
-    for (i = this->numG - 1;; i --) {
-      if (this->gopTable[i].offset < 4235260) {
-	fprintf (stderr, "group %d: offset %ld\n", i, this->gopTable[i].offset);
-	if (j -- == 0) break;
-      }
-    }
-    /*
-      for (i = 0; i < this->numG; i ++) {
-      if (this->gopTable[i].previousFrames > 1800) {
-      fprintf (stderr, "group %d: offset %ld pre-frames %d\n",
-      i, this->gopTable[i].offset, this->gopTable[i].previousFrames);
-      break;
-      }
-      }
-      */
-  }
-#endif
-  {
-    this->firstPatternSize = this->gopTable[0].totalFrames;
-    this->firstSendPattern = (char *)malloc (this->firstPatternSize);
-    if (this->firstSendPattern == NULL)
-      {
-        fprintf (stderr, "VS failed to allocate this->firstthis->Sendthis->Pattern for %d frames",
-                 this->firstPatternSize);
-        perror ("");
-        return 11;
-      }
-  }
-  this->firstGopFrames = this->gopTable[0].totalFrames;
-  return 0;
-}
-int
-Video_Global::play_send (int debug)
-{
-  // ACE_DEBUG ((LM_DEBUG,"play_send: sending the frame \n"));
-  int curGroup = Video_Timer_Global::timerGroup;
-  int curFrame = Video_Timer_Global::timerFrame;
-  int curHeader = Video_Timer_Global::timerHeader;
-  char * sp;
-  
-  if (this->preGroup != curGroup || 
-      curFrame != this->preFrame)
-    {
-      int sendStatus = -1;
-      int frameStep = 1;
-      if (debug)
-        cerr << " curgroup = " << curGroup << endl ;
-      if (curGroup == 0)
-        {
-   
-          int i = curFrame + 1;
-          while (i < this->firstPatternSize && 
-                 !this->firstSendPattern[i])
-            {
-              frameStep ++;
-              i++;
-            }
-        }
-      else /* (curGroup > 0) */
-        {
-          int i = curFrame + 1;
-          sp = this->sendPattern + ((curGroup - 1) % this->sendPatternGops) * this->patternSize;
-          while (i < this->patternSize && !sp[i])
-            {
-              frameStep ++;
-              i++;
-            }
-        }
-      if (curGroup == 0)
-        {
-          if (debug)
-            cerr << "first : " <<
-              this->firstSendPattern[curFrame] << endl;
-          if (this->firstSendPattern[curFrame])
-            sendStatus = 0;
-          else /*  (!this->firstthis->Sendthis->Pattern[curFrame]) */
-            {
-              int i = curFrame - 1;
-              while (i > 0 && !this->firstSendPattern[i])
-                i--;
-              if (i > this->preFrame)
-                /* the frame (curGroup, i) hasn't been sent yet */
-                {
-                  sendStatus = 0;
-                  curFrame = i;
-                }
-              else
-                sendStatus = -1;
-              if (debug)
-                cerr << "SendStatus = " << sendStatus << endl;
-            }
-        }
-      else if (sp[curFrame]) /* curGroup > 0 */
-	sendStatus = 0;
-      else /*  (!sp[curFrame]) */
-        {
-          int i = curFrame - 1;
-          while (i > 0 && !sp[i])
-            i--;
-          if (curGroup == this->preGroup && i > this->preFrame)
-            /* the frame (curGroup, i) hasn't been sent yet */
-            {
-              sendStatus = 0;
-              curFrame = i;
-            }
-          else
-            sendStatus = -1;
-        }
-      if (!sendStatus)
-        {
-          // Send the current video frame, calls send_to_network which
-          // fragments and sends via blocking write .
-          sendStatus = this->SendPacket (this->preHeader != curHeader,
-                                         curGroup, curFrame,
-                                         (this->currentUPF + this->addedUPF) * frameStep);
-          if (!sendStatus)
-            {
-              this->preHeader = curHeader;
-              this->preGroup = curGroup;
-              this->preFrame = curFrame;
-#ifdef STAT
-              if (this->play_para.collectStat)
-                {
-                  int f = this->gopTable[curGroup].previousFrames + curFrame;
-                  this->framesSent[f>>3] |= (1 << (f % 8));
-                }
-#endif
-            }
-        }
-    }
-  return 0;
-}
-
-int
-Video_Global::fast_play_send (void)
-{
- if (this->fast_preGroup != Video_Timer_Global::timerGroup)
-  {
-   this->SendPacket (this->fast_preHeader != Video_Timer_Global::timerHeader, Video_Timer_Global::timerGroup, 0,
-		 this->fast_para.usecPerFrame * this->patternSize >> 2);
-   this->fast_preHeader = Video_Timer_Global::timerHeader;
-   this->fast_preGroup = Video_Timer_Global::timerGroup;
-  }
- return 0;
-}
-
-int
-Video_Global::position (void)
-{
-  int result;
-  POSITIONpara pos_para;
-  /*
-    fprintf (stderr, "POSITION . . .\n");
-    */
-  result = CmdRead ((char *)&pos_para, sizeof (pos_para));
-  if (result != 0)
-    return result;
-
-  if (this->live_source) return 0;
- 
-#ifdef NeedByteOrderConversion
-  pos_para.nextGroup = ntohl (pos_para.nextGroup);
-  pos_para.sn = ntohl (pos_para.sn);
-#endif
- 
-  CheckGroupRange (pos_para.nextGroup);
-  this->cmdsn = pos_para.sn;
-  result = SendPacket (this->numS>1 || pos_para.nextGroup == 0, pos_para.nextGroup, 0, 0);
-  return result;
-}
-
-int
-Video_Global::step_video ()
-{
-  int group;
-  STEPpara step_para;
-  int tag = 0;
-  int result;
-
-  result = CmdRead ((char *)&step_para, sizeof (step_para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  step_para.sn = ntohl (step_para.sn);
-  step_para.this->nextFrame = ntohl (step_para.this->nextFrame);
-#endif
-
-  this->cmdsn = step_para.sn;
-
-  if (!this->live_source) {
-    if (step_para.nextFrame >= this->numF) /* send SEQ_END */
-      {
-        tag = 1;
-        step_para.nextFrame --;
-      }
-    /*
-      fprintf (stderr, "STEP . . .frame-%d\n", step_para.this->nextFrame);
-      */
-    CheckFrameRange (step_para.nextFrame);
-    group = FrameToGroup (&step_para.nextFrame);
-    if (this->precmd != CmdSTEP && !tag ) {
-      result = SendReferences (group, step_para.nextFrame);
-      if (result < 0 )
-        return result;
-    }
-  }
-  if (this->live_source) StartPlayLiveVideo ();
- 
-  if (this->live_source) {
-    SendPicture (&step_para.nextFrame);
-  }
-  else if (this->video_format == VIDEO_MPEG1) {
-    SendPacket (this->numS>1, group, tag ? this->numF : step_para.nextFrame, 0);
-  }
-  else {
-    fprintf (stderr, "VS: wierd1\n");
-  }
- 
-  if (this->live_source) StopPlayLiveVideo ();
-  return 0;
-}
-
-int
-Video_Global::fast_forward (void)
-{
-  //  return this->init_fast_play ()
-  return 0;
-}
-
-int
-Video_Global::fast_backward (void)
-{
-//  return this->init_fast_play ();
-  return 0;
-}
-
-int
-Video_Global::stat_stream (void)
-{
-  int i, j = 0;
-  for (i = 0; i < this->numF; i++)
-    {
-      short size = htons (this->frameTable[i].size);
-      char type = this->frameTable[i].type;
-      if (i == this->gopTable[j].previousFrames)
-        {
-          type = tolower (type);
-          j ++;
-        }
-      CmdWrite ((char *)&type, 1);
-      CmdWrite ((char *)&size, 2);
-    }
-  return 0;
-}
-
-int
-Video_Global::stat_sent (void)
-{
-#ifdef STAT
-  CmdWrite ((char *)this->framesSent, (this->numF + 7) / 8);
-#else
-  int i;
-  char zeroByte = 0;
-  for (i = 0; i < (this->numF + 7) / 8; i++)
-    CmdWrite ((char *)&zeroByte, 1);
-#endif
-  return 0;
-}
-
-int
-Video_Global::init_play (Video_Control::PLAYpara para,
-                         CORBA::Long_out vts)
-{
-  // ~~ why do we need the play_para in Video_Global , why can't just use
-  // the para that's passed.
-  int result;
-
-  ACE_DEBUG ((LM_DEBUG,
-              " (%P|%t) Video_Global::init_play ()"));
-
-  // this gets the parameters for the play command
-  //  result = this->CmdRead ((char *)&this->play_para, sizeof (this->play_para));
-  //  if (result != 0)
-  //    return result;
-
-  // Assign the passed play 
-  this->play_para = para ;
-#ifdef NeedByteOrderConversion
-  this->play_para.sn = ntohl (this->play_para.sn);
-  this->play_para.nextFrame = ntohl (this->play_para.nextFrame);
-  this->play_para.usecPerFrame = ntohl (this->play_para.usecPerFrame);
-  this->play_para.framesPerSecond = ntohl (this->play_para.framesPerSecond);
-  this->play_para.frameRateLimit1000 = ntohl (this->play_para.frameRateLimit1000);
-  this->play_para.collectStat = ntohl (this->play_para.collectStat);
-  this->play_para.sendPatternGops = ntohl (this->play_para.sendPatternGops);
-  this->play_para.VStimeAdvance = ntohl (this->play_para.VStimeAdvance);
-#endif
-
-  this->frameRateLimit = this->play_para.frameRateLimit1000 / 1000.0;
-  this->cmdsn = this->play_para.sn;
-  this->currentUPF = this->play_para.usecPerFrame;
-  this->VStimeAdvance = this->play_para.VStimeAdvance;
-
-  vts = get_usec ();
-  cerr << "vts is " << vts << endl;
-  // begin evil code
-  //  {
-    //    int vts = get_usec ();
-    //    this->CmdWrite ((char *)&ts, sizeof (int));
-  //  }
-  // end evil code
- 
-  if (this->live_source || this->video_format != VIDEO_MPEG1) {
-    PLAYpara live_play_para; // xxx hack to compile the code
-    if (this->live_source) 
-      this->PLAYliveVideo (&live_play_para);
-    return 0;
-  }
- 
-  fprintf (stderr, "this->VStimeAdvance from client: %d\n", this->VStimeAdvance);
- 
-  this->sendPatternGops = this->play_para.sendPatternGops;
-  ComputeFirstSendPattern (this->frameRateLimit);
-#ifdef STAT
-  if (this->play_para.collectStat)
-    memset (this->framesSent, 0, (this->numF + 7)>>3);
-#endif
-  CheckFrameRange (this->play_para.nextFrame);
-  Video_Timer_Global::timerFrame = this->play_para.nextFrame;
-  Video_Timer_Global::timerGroup = FrameToGroup (&Video_Timer_Global::timerFrame);
-  Video_Timer_Global::timerHeader = this->gopTable[Video_Timer_Global::timerGroup].systemHeader;
-  //  memcpy (this->sendPattern, this->play_para.sendPattern, PATTERN_SIZE);
-  // Do a sequence copy..
-
-  for (int i=0; i<PATTERN_SIZE ; i++)
-    this->sendPattern[i] = this->play_para.sendPattern[i];
-  result = SendReferences (Video_Timer_Global::timerGroup, Video_Timer_Global::timerFrame);
-  if (result < 0)
-    return result;
-  Video_Timer_Global::StartTimer ();
-
-  // Sends the first frame of the video...
-  result = play_send (0);
-  return 0;
-}
-
-CORBA::Boolean
-Video_Global::init_fast_play (const Video_Control::FFpara &ff_para )
-{
-  // save the parameters for future reference
-  this->fast_para = ff_para;
-  int result;
- 
-  //  result = CmdRead ((char *)&this->ff_para, sizeof (this->ff_para));
-  // if (result != 0)
-  //  return result;
-
-  if (this->live_source) return 0;
- 
-  this->VStimeAdvance = ff_para.VStimeAdvance;
-  /*
-    fprintf (stderr, "this->VStimeAdvance from client: %d\n", this->VStimeAdvance);
-    */
-  CheckGroupRange (ff_para.nextGroup);
-  this->cmdsn = ff_para.sn;
-  Video_Timer_Global::timerGroup = ff_para.nextGroup;
-  Video_Timer_Global::timerFrame = 0;
-  Video_Timer_Global::timerHeader = this->gopTable[Video_Timer_Global::timerGroup].systemHeader;
-  this->currentUPF = ff_para.usecPerFrame;
-  Video_Timer_Global::StartTimer ();
-
-  fast_play_send ();
-  return 0;
-}
-
-int
-Video_Global::init_video (void)
-{
-  INITvideoPara para;
-  int failureType = 0;
-  int result;
-  /*
-    fprintf (stderr, "VS about to read Para.\n");
-    */
-  result = CmdRead ((char *)&para, sizeof (para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl (para.sn);
-  para.version = ntohl (para.version);
-  para.nameLength = ntohl (para.nameLength);
-#endif
-  if (para.nameLength>0)
-    {
-      result = CmdRead (this->videoFile, para.nameLength);
-      if (result != 0)
-        return result;
-    }
-  if (Mpeg_Global::session_num > Mpeg_Global::session_limit || para.version != VERSION) {
-    char errmsg[128];
-    this->cmd = CmdFAIL;
-    CmdWrite ((char *)&this->cmd, 1);
-    if (Mpeg_Global::session_num > Mpeg_Global::session_limit) {
-      sprintf (errmsg,
-               "Too many sessions being serviced, please try again later.\n");
-    }
-    else {
-      sprintf (errmsg, "Version # not match, VS %d.%02d, Client %d.%02d",
-               VERSION / 100, VERSION % 100,
-               para.version / 100, para.version % 100);
-    }
-    write_string (this->serviceSocket, errmsg);
-    exit (0);
-  }
-  this->cmdsn = para.sn;
-  /*
-    fprintf (stderr, "MPEG file %s got.\n", this->videoFile);
-    */
-  this->videoFile[para.nameLength] = 0;
-
-  if (!strncasecmp ("LiveVideo", this->videoFile, 9)) {
-    if (OpenLiveVideo (&this->video_format, &this->horizontalSize,
-                       &this->verticalSize, &this->averageFrameSize,
-                       &this->fps, &this->pelAspectRatio) == -1) {
-      failureType = 100;
-      goto failure;
-    }
-    if (this->video_format == VIDEO_MPEG2) {
-      failureType = 101;
-      goto failure;
-    }
-    this->live_source = 1;
-
-    this->fileSize =0x7fffffff;
-    this->maxS = this->maxG = this->maxI = this->maxP = this->maxB = this->minS = this->minG = this->minI = this->minP = this->minB = 1;
-    this->numS = this->numG = this->numF = this->numI = 0x7fffffff;
-    this->numP = this->numB = 0;
-    this->vbvBufferSize = 1;
-    this->firstGopFrames = 1;
-    this->patternSize = 1;
-    this->pattern[0] = 'I';
-    this->pattern[1] = 0;
-    this->packetBufSize = this->verticalSize * this->horizontalSize * 3;
-    this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
-                                          this->packetBufSize);
-    if (this->packet == NULL)	
-      {
-        perror ("Error: VS error on malloc this->packet buffer");
-        exit (1);
-      }
-    this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
-
-  }
-  else {
-    static double pictureRateTable[] = {23.976, 24, 25, 29.97, 30, 50, 59.94, 60};
-
-    this->video_format = VIDEO_MPEG1;
-    failureType = init_MPEG1_video_file ();
-    if (failureType) goto failure;
-    this->fps = pictureRateTable[this->pictureRate - 1];
-  }
- 
-  {
-    INITvideoReply reply;
-
-    reply.totalHeaders = htonl (this->numS);
-    reply.totalGroups = htonl (this->numG);
-    reply.totalFrames = htonl (this->numF);
-    reply.sizeIFrame = htonl (this->maxI);
-    reply.sizePFrame = htonl (this->maxP);
-    reply.sizeBFrame = htonl (this->maxB);
-    reply.sizeSystemHeader = htonl (this->maxS);
-    reply.sizeGop = htonl (this->maxG);
-    reply.averageFrameSize = htonl (this->averageFrameSize);
-    reply.verticalSize = htonl (this->verticalSize);
-    reply.horizontalSize = htonl (this->horizontalSize);
-    reply.pelAspectRatio = htonl (this->pelAspectRatio);
-    reply.pictureRate1000 = htonl ((int) (this->fps * 1000));
-    reply.vbvBufferSize = htonl (this->vbvBufferSize);
-    reply.firstGopFrames = htonl (this->firstGopFrames);
-    reply.patternSize = htonl (this->patternSize);
-    strncpy (reply.pattern, this->pattern, PATTERN_SIZE);
-  
-    reply.live = htonl (this->live_source);
-    reply.format = htonl (this->video_format);
-  
-    CmdWrite ((char *)&this->cmd, 1);
-  
-    CmdWrite ((char *)&reply, sizeof (reply));
-
-    /* write the first SH, GOP and IFrame to this->serviceSocket (TCP),
-       using code for SendPacket () */
-    {
-      int tmpSocket = this->videoSocket;
-   
-      if (this->live_source) StartPlayLiveVideo ();
-   
-      this->videoSocket = this->serviceSocket;
-   
-      if (this->live_source) {
-	int frame = 0;
-	SendPicture (&frame);
-      }
-      else if (this->video_format == VIDEO_MPEG1) {
-	SendPacket (1, 0, 0, 0);
-      }
-      else {
-	fprintf (stderr, "VS: this->video_format %d not supported.\n",
-                 this->video_format);
-      }
-      this->videoSocket = tmpSocket;
-   
-      if (this->live_source) StopPlayLiveVideo ();
-    }
-
-    return 0;
-  
-  }
-failure:
-  {
-    char * msg;
-    char errmsg[64];
-    this->cmd = CmdFAIL;
-    sprintf (errmsg, "VS failed to alloc internal buf (type %d)", failureType);
-    CmdWrite ((char *)&this->cmd, 1);
-    msg = failureType == 1 ? "not a complete MPEG stream" :
-      failureType == 2 ? "can't open MPEG file" :
-      failureType == 3 ? "MPEG file is not seekable" :
-      failureType == 4 ? "not an MPEG stream" :
-      failureType == 5 ?
-      "too many frames in MPEG file, need change MAX_FRAMES and recompile VS" :
-      failureType == 100 ? "failed to connect to live video source" :
-      failureType == 101 ? "live MPEG2 not supported" :
-      errmsg;
-    write_string (this->serviceSocket, msg);
-    exit (0);
-  }
-}
-
-//--------------------------------------------------------
-// Video_Timer_Global methods
-void
-Video_Timer_Global::StartTimer (void)
-{
-  VIDEO_SINGLETON::instance ()->addedUPF = 0;
-  VIDEO_SINGLETON::instance ()->addedSignals = 0;
-  timerAdjust = (VIDEO_SINGLETON::instance ()->VStimeAdvance * SPEEDUP_INV_SCALE) / VIDEO_SINGLETON::instance ()->currentUPF;
-  /*
-    SFprintf (stderr, "VS StartTimer (): fast-start frames %d\n",
-    timerAdjust / SPEEDUP_INV_SCALE);
-    */
-  TimerSpeed ();
-  // setsignal (SIGALRM, timerHandler);
-  timerOn = 1;
-  preTimerVal = get_usec ();
-  /*
-    fprintf (stderr, "VS: timer started at %d upf.\n", VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF);
-    */
-}
-
-void
-Video_Timer_Global::StopTimer (void)
-{
-  struct itimerval val;
-  // ## I have to incorporate this logic into the changed code 
-  // setsignal (SIGALRM, SIG_IGN);
-  val.it_interval.tv_sec = val.it_value.tv_sec = 0;
-  val.it_interval.tv_usec = val.it_value.tv_usec = 0;
-  setitimer (ITIMER_REAL, &val, NULL);
-  timerOn = 0;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Timer_Global::StopTimer: timer stopped\n"));
-}
-
-void
-Video_Timer_Global::TimerSpeed (void)
-{
-  struct itimerval val;
-  int usec = VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF;
-  if (Mpeg_Global::drift_ppm) {
-    /*
-      int drift = (double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0;
-      SFprintf (stderr, "Mpeg_Global::drift_ppm %d, usec %d, drift %d, new usec %d\n",
-      Mpeg_Global::drift_ppm, usec, drift, usec - drift);
-      */
-    usec -= (int) ((double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0);
-  }
-  if (timerAdjust > 1)
-    usec = (int) (((double)usec * (double) (SPEEDUP_INV_SCALE - 1)) /
-                  (double)SPEEDUP_INV_SCALE);
-  val.it_interval.tv_sec = val.it_value.tv_sec = usec / 1000000;
-  val.it_interval.tv_usec = val.it_value.tv_usec = usec % 1000000;
-  setitimer (ITIMER_REAL, &val, NULL);
-  /*
-    SFprintf (stderr,
-    "VS TimerSpeed () at %s speed, timerAdjust %d VIDEO_SINGLETON::instance ()->addedSignals %d.\n",
-    (timerAdjust > 1) ? "higher" : "normal", timerAdjust, VIDEO_SINGLETON::instance ()->addedSignals);
-    */
-
-}
-
-void
-Video_Timer_Global::TimerProcessing (void)
-{
-  /* 
-     fprintf (stderr, "VS: timerHandler...\n");
-     */
-  if (!timerOn) {
-    return;
-  }
-  if (timerAdjust < 0)
-    {
-      timerAdjust += SPEEDUP_INV_SCALE;
-      return;
-    }
-  if (timerAdjust >0)
-    {
-      if ((--timerAdjust) == 0)
-        TimerSpeed ();
-    }
-  if (VIDEO_SINGLETON::instance ()->cmd == CmdPLAY)
-    {
-      if (timerGroup == VIDEO_SINGLETON::instance ()->numG - 1 && timerFrame >= VIDEO_SINGLETON::instance ()->gopTable[timerGroup].totalFrames - 1)
-        {
-          timerFrame ++; /* force sending of END_SEQ when PLAY VIDEO_SINGLETON::instance ()->cmd */
-          StopTimer ();
-          return;
-        }
-      else
-        {
-          timerFrame ++;
-          if (timerFrame >= VIDEO_SINGLETON::instance ()->gopTable[timerGroup].totalFrames)
-            {
-              timerGroup ++;
-              timerFrame = 0;
-              timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-            }
-        }
-    }
-  else {
-    if (VIDEO_SINGLETON::instance ()->cmd == CmdFF) {
-      if (timerGroup == VIDEO_SINGLETON::instance ()->numG - 1) {
-	StopTimer ();
-	return;
-      }
-      timerGroup ++;
-      timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-    }
-    else {
-      if (timerGroup == 0) {
-	StopTimer ();
-	return;
-      }
-      timerGroup --;
-      timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-    }
-  }
-
-}
-
-void
-Video_Timer_Global::timerHandler (int sig)
-{
-  // ACE_DEBUG ((LM_DEBUG,
-  //       "Video_Timer_Global::timerHandler\n"));
-
-  int val2, val3;
-  int usec = VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF;
- 
-  if (Mpeg_Global::drift_ppm) {
-    usec -= (int) ((double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0);
-  }
- 
-  if (timerAdjust > 1)
-    usec = (int) (((double)usec * (double) (SPEEDUP_INV_SCALE - 1)) /
-                  (double)SPEEDUP_INV_SCALE);
-  val3 = get_duration (preTimerVal, (val2 = get_usec ()));
-  /*
-    if (val3 >= usec<< 1))
-    fprintf (stderr, "Slower: %d out of VIDEO_SINGLETON::instance ()->currentUPF %d.\n",
-    val3, usec);
-    else
-    fprintf (stderr, "+\n");
-    */
-  preTimerVal = val2;
-  if (val3 < 0 || val3 > 100000000)
-    val3 = usec;
-  val2 = (val3 + (usec>>1)) / usec;
-  if (val2 < 0) val2 = 0;
-  if (val2) {
-    TimerProcessing ();
-    val2 --;
-  }
-  VIDEO_SINGLETON::instance ()->addedSignals += val2;
- 
-  if (VIDEO_SINGLETON::instance ()->addedSignals) {
-    val2 = timerAdjust;
-    if (timerAdjust < MAX_TIMER_ADJUST) {
-      timerAdjust += VIDEO_SINGLETON::instance ()->addedSignals * SPEEDUP_INV_SCALE;
-      if (val2 < SPEEDUP_INV_SCALE) {
-	TimerSpeed ();
-      }
-    }
-    else {
-      /*
-        fprintf (stderr, "VS timerAdjust %d, VIDEO_SINGLETON::instance ()->addedSignals %d, timerFrame %d\n",
-        timerAdjust, VIDEO_SINGLETON::instance ()->addedSignals, timerFrame);
-        */
-      for (val3 = 0; val3 < VIDEO_SINGLETON::instance ()->addedSignals; val3 ++)
-        TimerProcessing ();
-    }
-    VIDEO_SINGLETON::instance ()->addedSignals = 0;
-  }
-}
-
-// send the first packet, given by packet pointed by
-// 'this->packet' to the network.
-int
-Video_Global::send_to_network (int timeToUse)
-{
-  int count = 0;
-  VideoMessage * msghd = (VideoMessage *) (((char *) this->packet) - sizeof (VideoMessage));
-  int sent = 0;
-  int packetSize = ntohl (this->packet->dataBytes);
-
-  msghd->packetsn = htonl (this->packetsn ++);
-  msghd->packetSize = htonl (packetSize + sizeof (* this->packet));
-  
-  //  fprintf (stderr, "VS to send pkt %d of size %d.\n",
-  //           ntohl (msghd->packetsn), ntohl (msghd->packetSize));
-  
-
-  {
-    VideoMessage * msg = NULL;
-    int size = packetSize + sizeof (* this->packet); /* msghd->this->packetSize */
-    int offset = 0;
-    int targetTime;
-  
-    if (size > this->msgsize)
-      {
-        if (!timeToUse)
-          {
-            timeToUse = (this->msgsize + sizeof (*msg) + 28) * 2;
-            /*
-              set the max network as 500KB.
-              28 - UDP header size
-              */
-            /*
-              fprintf (stderr, "computed timeToUse %d. ", timeToUse);
-              */
-          }
-        else
-          {
-            timeToUse = (timeToUse * 7) >> 3;
-            /*
-              fprintf (stderr, "preset timeToUse %d.", timeToUse);
-              */
-            timeToUse /= (size + this->msgsize - 1) / this->msgsize;
-            timeToUse = min (timeToUse, (this->msgsize + sizeof (*msg) + 28) * 100);
-            /* limit min network bandwidth = 10K */
-          }
-
-      }
-    while (size > 0)
-      {
-        int segsize, sentsize;
-        int resent = 0;
-   
-        if (msg == NULL) { /* first message for current this->packet */
-          count = 0;
-          msg = msghd;
-          targetTime = get_usec ();
-        }
-        else {
-#if 0
-          /* the select () is not precise enough for being used here*/
-          int sleepTime;
-          targetTime += timeToUse;
-          sleepTime = get_duration (get_usec (), targetTime);
-          if (sleepTime >= 5000) { /* resolution of timer is 10,000 usec */
-            usleep (sleepTime); /* not first message, wait for a while */
-          }
-#endif
-          /*
-            count ++;
-            if (! (count % 10)) usleep (10000);
-            */
-          msg = (VideoMessage *) ((char *)msg + this->msgsize);
-          memcpy ((char *)msg, (char *)msghd, sizeof (* msg));
-        }
-        msg->msgsn = htonl (this->msgsn++);
-        msg->msgOffset = htonl (offset);
-        msg->msgSize = htonl (min (size, this->msgsize));
-
-        segsize = min (size, this->msgsize)+sizeof (*msg);
-        if (this->conn_tag != 0) { /* this->packet stream */
-          //          cerr << "sending " << segsize  << " on fd = " << this->videoSocket << endl;
-          while ((sentsize = write (this->videoSocket, (char *)msg, segsize)) == -1) {
-            if (errno == EINTR)
-              continue;
-            if (errno == ENOBUFS) {
-              if (resent) {
-                perror ("Warning, pkt discarded because");
-                sent = -1;
-                break;
-              }
-              else {
-                resent = 1;
-                perror ("VS to sleep 5ms");
-                usleep (5000);
-                continue;
-              }
-            }
-            if (errno != EPIPE) {
-              fprintf (stderr, "VS error on send this->packet %d of size %d ",
-                       this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-              perror ("");
-            }
-            exit (errno != EPIPE);
-          }
-        }
-        else {
-          sentsize = wait_write_bytes (this->videoSocket, (char *)msg, segsize);
-          if (sentsize == -1) {
-            if (errno != EPIPE) {
-              fprintf (stderr, "VS error on send this->packet %d of size %d ",
-                       this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-              perror ("");
-            }
-            exit (errno != EPIPE);
-          }
-        }
-        if (sentsize < segsize) {
-          SFprintf (stderr, "VS warning: message size %dB, sent only %dB\n",
-                    segsize, sentsize);
-        }
-        if (sent == -1)
-          break;
-        /*
-          fprintf (stderr, "VS: message %d of size %d sent.\n",
-          this->msgsn-1, min (size, this->msgsize)+sizeof (*msg));
-          */
-        size -= this->msgsize;
-        offset += this->msgsize;
-      }
-  }
-  /*
-    fprintf (stderr, "sent = %d\n", sent);
-    */
-  if (!sent) this->pkts_sent ++;
-  return sent;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h
deleted file mode 100644
index 5c62c74936a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#if !defined (MPEG_GLOBAL_H)
-#define MPEG_GLOBAL_H
-
-#include "ace/SOCK_CODgram.h"
-// Global symbols, these need to become enums eventually.
-
-#define SESSION_NUM     4
-#define CONN_INET	1
-#define CONN_UNIX	2
-#define CONN_ATM	3
-
-#define SERVER_FDTABLE_SIZE	50
-#define CLIENT_FDTABLE_SIZE	10
-
-#define STATE_PENDING	1
-#define STATE_CONTROL	2
-#define STATE_DATA	3
-#define STATE_SINGLE	4
-
-#define min(a, b) ((a) > (b) ? (b) : (a))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
-/* Start codes. */
-
-#define READ_BLOCK_SIZE 512
-#define MAX_TIMER_ADJUST (100 * SPEEDUP_INV_SCALE)
-
-#define SEQ_END_CODE 0x000001b7
-#define SEQ_START_CODE 0x000001b3
-#define GOP_START_CODE 0x000001b8
-#define PICTURE_START_CODE 0x00000100
-#define SLICE_MIN_START_CODE 0x00000101
-#define SLICE_MAX_START_CODE 0x000001af
-#define EXT_START_CODE 0x000001b5
-#define USER_START_CODE 0x000001b2
-
-// Global definitions
-#define nextByte  {int val; fileptr ++; \
-		   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
-		   {\
-		     perror("Crossed EOF or error while scanning"); \
-		     return 1; \
-		   } nb = val;}
-
-#define computePicSize \
-	if (inpic) \
-	{ \
-	  if (pictype == 'I') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxI = max(VIDEO_SINGLETON::instance ()->maxI, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minI = min(VIDEO_SINGLETON::instance ()->minI, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else if (pictype == 'P') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxP = max(VIDEO_SINGLETON::instance ()->maxP, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minP = min(VIDEO_SINGLETON::instance ()->minP, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxB = max(VIDEO_SINGLETON::instance ()->maxB, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minB = min(VIDEO_SINGLETON::instance ()->minB, (int)(fileptr - picptr - 4)); \
-	  } \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr].type = pictype; \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr++].size = (int)(fileptr - picptr - 4); \
-	  inpic = 0; \
-	}
-
-
-#define FileRead(position, buf, size) \
-	{ \
-	  if (fseek(VIDEO_SINGLETON::instance ()->fp, (position), 0) == -1) \
-	  { \
-	    perror("VS error on fseek VideoFile"); \
-	    return (-1); \
-	  } \
-	  while (fread((buf), (size), 1, VIDEO_SINGLETON::instance ()->fp) == 0) \
-	  { if (errno == EINTR) { errno = 0; continue;}\
-             perror("VS error on fread VideoFile"); \
-             return (-1); \
-	  } \
-	}
-
-#define CheckFrameRange(pnextFrame) \
-{ if ((pnextFrame) < 0 || (pnextFrame) >= VIDEO_SINGLETON::instance ()->numF) \
-  { fprintf(stderr, "VS: %d.VIDEO_SINGLETON::instance ()->nextFrame(%d) out of range (%d).\n", VIDEO_SINGLETON::instance ()->cmd, (pnextFrame), VIDEO_SINGLETON::instance ()->numF); \
-    return 0; } }
-
-#define CheckGroupRange(pnextGroup) \
-{ if ((pnextGroup) < 0 || (pnextGroup) >= VIDEO_SINGLETON::instance ()->numG) \
-  { fprintf(stderr, "VS: %d.VIDEO_SINGLETON::instance ()->nextGroup(%d) out of range (%d).\n", VIDEO_SINGLETON::instance ()->cmd, (pnextGroup), VIDEO_SINGLETON::instance ()->numG); \
-    return 0; } }
-
-#include "ace/Singleton.h"
-#include "include/common.h"
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"   
-#include "mpeg_shared/sendpt.h"
-#include "mpeg_server/server_proto.h"
-#include "mpeg_server/Video_Server.h"
-#include "mpeg_shared/Video_ControlS.h"
-
-class Mpeg_Global
-{
-public:
-  static int parentpid;
-
-  static int listenSocketIn;
-  static int listenSocketUn;
-
-  static struct linger linger;
-
-  static int live_audio;
-  static int live_video;  /* 0 - no,  1 - to open,  2 - opened */
-
-  static int drift_ppm;  /* clock drift in ppm */
-
-  static int session_limit;
-  static int session_num;
-  static int rttag;
-};
-
-class Video_Global
-{
-public:
-  Video_Global ();
-
-  ACE_SOCK_CODgram dgram;
-  // the UDP data socket
-
-  int live_source;
-  int video_format;
-
-  int pkts_sent;
-  time_t start_time;
-
-  int conn_tag;
-
-  int normalExit;
-
-  int serviceSocket;
-  int videoSocket;
-
-  char videoFile[PATH_SIZE];
-  FILE *fp;
-  int needHeader;
-  int lastRef[2];
-  int lastRefPtr;
-  int currentUPF;
-  int addedUPF;
-  int addedSignals;
-  int VStimeAdvance;
-  double fps;  /* current frames-per-second: playback speed */
-  double frameRateLimit;
-
-  VideoPacket * packet;
-  int packetBufSize;
-  int msgsn;
-  int packetsn;
-  int msgsize;
-
-  unsigned char precmd;
-  unsigned char cmd;
-  int cmdsn;
-  int nextFrame;
-  int nextGroup;
-  int firstPatternSize;
-  char *firstSendPattern;
-  int sendPatternGops;
-  char sendPattern [PATTERN_SIZE];
-
-#ifdef STAT
-  char * framesSent;
-#endif
-
-  int fileSize;
-  int maxS;
-  int maxG;  
-  int maxI;
-  int maxP;
-  int maxB;
-  int minS;
-  int minG;
-  int minI;
-  int minP;
-  int minB;
-  int numS;
-  int numG;
-  int numF;
-  int numI;
-  int numP;
-  int numB;
-  int averageFrameSize;
-  int horizontalSize;
-  int verticalSize;
-  int pelAspectRatio;
-  int pictureRate;
-  int vbvBufferSize;
-  int firstGopFrames;
-  int patternSize;
-  char pattern [PATTERN_SIZE];
-
-  struct SystemHeader
-  {
-    long offset;
-    int size;
-  } * systemHeader;
-
-  struct GopTable
-  {
-    int systemHeader;
-    long offset;
-    int headerSize;
-    int size;
-    int totalFrames;
-    int previousFrames;
-    long firstIoffset;
-  } * gopTable;
-
-  struct FrameTable
-  {
-    char type;
-    unsigned short size;
-  } * frameTable;
- 
-  int preGroup;
-  int preHeader;
-  int preFrame;
-
-  // fast video play locals
-  Video_Control::FFpara fast_para;
-  Video_Control::PLAYpara play_para;
-  int fast_preGroup;
-  int fast_preHeader;
-
-  // globals functions
-  int CmdRead (char *buf, int psize);
-  int CmdWrite (char *buf, int size);
-  int SendPacket (int shtag, 
-                  int gop, 
-                  int frame, 
-                  int timeToUse, 
-                  int first_time = 0);
-  int FBread (char *buf, int size);
-  int PLAYliveVideo (PLAYpara * para);
-  void ComputeFirstSendPattern (float limit);
-  int FrameToGroup (int * frame);
-  int SendReferences (int group, int frame);
-  int send_to_network (int timeToUse);
-  int first_packet_send_to_network (int timeToUse);
-  int GetFeedBack (void);
-  int SendPicture (int *frame);
-  int ReadInfoFromFile (void);
-  void WriteInfoToFile (void);
-  int init_MPEG1_video_file (void);
-  int play_send (int debug=0);
-  int fast_play_send (void);
-  int position (void);
-  int step_video (void);
-  int fast_forward (void);
-  int fast_backward (void);
-  int stat_stream (void);
-  int stat_sent (void);
-  int init_play (Video_Control::PLAYpara para,
-                 CORBA::Long_out vts);
-  CORBA::Boolean init_fast_play (const Video_Control::FFpara &para);
-  int init_video (void);
-};
-
-typedef ACE_Singleton <Video_Global, ACE_SYNCH_MUTEX> VIDEO_SINGLETON;
-
-class Video_Timer_Global
-// A class that holds the static timer variables defined in the middle
-// of vs.cpp
-{
-public:
-  static int timerHeader;
-  static int timerGroup;
-  static int timerFrame;
-  static int timerOn ;
-  static int timerAdjust ;
-  static int preTimerVal ;
-  static void StartTimer (void);
-  static void StopTimer(void);
-  static void TimerSpeed(void);
-  static void TimerProcessing(void);
-  static void timerHandler (int sig);
-};
-  
-#endif /* define MPEG_GLOBAL_H */
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
deleted file mode 100644
index 49a803517ea..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
+++ /dev/null
@@ -1,1802 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libmpeg_server
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES= as las lvs vs Globals Video_Server Video_Control_State Video_Control_i Audio_Server
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-
-LIBS 	+= -lTAO -lACE -lorbsvcs
-MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
-CPPFLAGS += -I$(MPEG_ROOT)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-#LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
-LDFLAGS +=  -lsocket -lnsl -ldl
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
-CPPFLAGS += -DSH_MEM  -I/project/doc/pkg/X11/include
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/as.o .obj/as.so .shobj/as.o .shobj/as.so: as.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- server_proto.h Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/las.o .obj/las.so .shobj/las.o .shobj/las.so: las.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- server_proto.h Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/lvs.o .obj/lvs.so .shobj/lvs.o .shobj/lvs.so: lvs.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- server_proto.h Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/vs.o .obj/vs.so .shobj/vs.o .shobj/vs.so: vs.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- server_proto.h Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/Globals.o .obj/Globals.so .shobj/Globals.o .shobj/Globals.so: Globals.cpp Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/Video_Server.o .obj/Video_Server.so .shobj/Video_Server.o .shobj/Video_Server.so: Video_Server.cpp Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
-.obj/Video_Control_State.o .obj/Video_Control_State.so .shobj/Video_Control_State.o .shobj/Video_Control_State.so: Video_Control_State.cpp Video_Control_State.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- Video_Server.h
-.obj/Video_Control_i.o .obj/Video_Control_i.so .shobj/Video_Control_i.o .shobj/Video_Control_i.so: Video_Control_i.cpp Video_Control_i.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- Video_Server.h $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-.obj/Audio_Server.o .obj/Audio_Server.so .shobj/Audio_Server.o .shobj/Audio_Server.so: Audio_Server.cpp Audio_Server.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- server_proto.h Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
deleted file mode 100644
index 8850a72decf..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-// $Id$
-
-#include "Video_Control_State.h"
-#include "Video_Server.h"
-
-Video_Control_State::Video_Control_State ()
-  : vci_ (VIDEO_CONTROL_I::instance ())
-{
-}
-
-Video_Control_State::Video_States
-Video_Control_State::get_state (void)
-{
-  return this->state_;
-}
-
-CORBA::Boolean 
-Video_Control_State::init_video (const Video_Control::INITvideoPara &init_para,
-                                 Video_Control::INITvideoReply_out reply)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Video_Control_State::init_video called\n"));
-  int failureType = 0;
-  // This is independent of the state and hence we implement it here
-  
-  // video file string
-  for (int i=0;i<init_para.videofile.length (); i++)
-    VIDEO_SINGLETON::instance ()->videoFile[i] = init_para.videofile[i];
-  
-  VIDEO_SINGLETON::instance ()->videoFile [init_para.videofile.length ()] = 0;
-
-  if (Mpeg_Global::session_num > Mpeg_Global::session_limit || init_para.version != VERSION) {
-    return CORBA::B_FALSE;
-    // ~~ We should be throwing exceptions here.
-  }
-  VIDEO_SINGLETON::instance ()->cmdsn = init_para.sn;
-  /*
-    fprintf (stderr, "MPEG file %s got.\n", VIDEO_SINGLETON::instance ()->videoFile);
-    */
-  if (!strncasecmp ("LiveVideo", VIDEO_SINGLETON::instance ()->videoFile, 9)) {
-    if (OpenLiveVideo (&VIDEO_SINGLETON::instance ()->video_format, &VIDEO_SINGLETON::instance ()->horizontalSize,
-                       &VIDEO_SINGLETON::instance ()->verticalSize, &VIDEO_SINGLETON::instance ()->averageFrameSize,
-                       &VIDEO_SINGLETON::instance ()->fps, &VIDEO_SINGLETON::instance ()->pelAspectRatio) == -1) {
-      failureType = 100;
-      return CORBA::B_FALSE;
-    }
-    if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG2) {
-      failureType = 101;
-      return CORBA::B_FALSE;
-    }
-    VIDEO_SINGLETON::instance ()->live_source = 1;
-
-    VIDEO_SINGLETON::instance ()->fileSize =0x7fffffff;
-    VIDEO_SINGLETON::instance ()->maxS = VIDEO_SINGLETON::instance ()->maxG = VIDEO_SINGLETON::instance ()->maxI = VIDEO_SINGLETON::instance ()->maxP = VIDEO_SINGLETON::instance ()->maxB = VIDEO_SINGLETON::instance ()->minS = VIDEO_SINGLETON::instance ()->minG = VIDEO_SINGLETON::instance ()->minI = VIDEO_SINGLETON::instance ()->minP = VIDEO_SINGLETON::instance ()->minB = 1;
-    VIDEO_SINGLETON::instance ()->numS = VIDEO_SINGLETON::instance ()->numG = VIDEO_SINGLETON::instance ()->numF = VIDEO_SINGLETON::instance ()->numI = 0x7fffffff;
-    VIDEO_SINGLETON::instance ()->numP = VIDEO_SINGLETON::instance ()->numB = 0;
-    VIDEO_SINGLETON::instance ()->vbvBufferSize = 1;
-    VIDEO_SINGLETON::instance ()->firstGopFrames = 1;
-    VIDEO_SINGLETON::instance ()->patternSize = 1;
-    VIDEO_SINGLETON::instance ()->pattern[0] = 'I';
-    VIDEO_SINGLETON::instance ()->pattern[1] = 0;
-    VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->verticalSize * VIDEO_SINGLETON::instance ()->horizontalSize * 3;
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
-                                          VIDEO_SINGLETON::instance ()->packetBufSize);
-    if (VIDEO_SINGLETON::instance ()->packet == NULL)	
-      {
-        perror ("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
-        exit (1);
-      }
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *) ((char *)VIDEO_SINGLETON::instance ()->packet + sizeof (VideoMessage));
-
-  }
-  else {
-    static double pictureRateTable[] = {23.976, 24, 25, 29.97, 30, 50, 59.94, 60};
-
-    VIDEO_SINGLETON::instance ()->video_format = VIDEO_MPEG1;
-    failureType = VIDEO_SINGLETON::instance ()->init_MPEG1_video_file ();
-    if (failureType) 
-      return CORBA::B_FALSE;
-    VIDEO_SINGLETON::instance ()->fps = pictureRateTable[VIDEO_SINGLETON::instance ()->pictureRate - 1];
-  }
-
-  // Set the Reply parameter values
-  ACE_NEW_RETURN (reply,
-                  Video_Control::INITvideoReply,
-                  CORBA::B_FALSE);
- 
-  reply->totalHeaders = VIDEO_SINGLETON::instance ()->numS;
-  reply->totalGroups = VIDEO_SINGLETON::instance ()->numG;
-  reply->totalFrames = VIDEO_SINGLETON::instance ()->numF;
-  reply->sizeIFrame = VIDEO_SINGLETON::instance ()->maxI;
-  reply->sizePFrame = VIDEO_SINGLETON::instance ()->maxP;
-  reply->sizeBFrame = VIDEO_SINGLETON::instance ()->maxB;
-  reply->sizeSystemHeader = VIDEO_SINGLETON::instance ()->maxS;
-  reply->sizeGop = VIDEO_SINGLETON::instance ()->maxG;
-  reply->averageFrameSize = VIDEO_SINGLETON::instance ()->averageFrameSize;
-  reply->verticalSize = VIDEO_SINGLETON::instance ()->verticalSize;
-  reply->horizontalSize = VIDEO_SINGLETON::instance ()->horizontalSize;
-  reply->pelAspectRatio = VIDEO_SINGLETON::instance ()->pelAspectRatio;
-  reply->pictureRate1000 = (int) (VIDEO_SINGLETON::instance ()->fps * 1000);
-  reply->vbvBufferSize = VIDEO_SINGLETON::instance ()->vbvBufferSize;
-  reply->firstGopFrames = VIDEO_SINGLETON::instance ()->firstGopFrames;
-
-  reply->pattern.length (VIDEO_SINGLETON::instance ()->patternSize);
-
-  // copy the sequence of char..
-  for ( i = 0; i < VIDEO_SINGLETON::instance ()->patternSize; i++)
-    reply->pattern [i] = VIDEO_SINGLETON::instance ()->pattern [i];
-  
-  reply->live = VIDEO_SINGLETON::instance ()->live_source;
-  reply->format = VIDEO_SINGLETON::instance ()->video_format;
-  
-    /* write the first SH, GOP and IFrame to VIDEO_SINGLETON::instance ()->serviceSocket (TCP),
-       using code for SendPacket () */
-  {
-   
-    //    ~~ He sends the first frame thru the connected TCP socket,
-    // we replace it to send thru the UDP data socket instead!!
-    if (VIDEO_SINGLETON::instance ()->live_source) StartPlayLiveVideo ();
-      
-    if (VIDEO_SINGLETON::instance ()->live_source) {
-      int frame = 0;
-      VIDEO_SINGLETON::instance ()->SendPicture (&frame);
-    }
-    else if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG1) {
-      VIDEO_SINGLETON::instance ()->SendPacket (1, 0, 0, 0, 1); //
-      // make the first_time flag = 1, so that the packet gets sent
-      // correctly using UDP
-    }
-    else {
-      fprintf (stderr, "VS: VIDEO_SINGLETON::instance ()->video_format %d not supported.\n",
-               VIDEO_SINGLETON::instance ()->video_format);
-    }
-    if (VIDEO_SINGLETON::instance ()->live_source) StopPlayLiveVideo ();
-  }
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::stat_stream (CORBA::Char_out ch,
-                              CORBA::Long_out size)
-                              
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::close (void)
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::stat_sent (void)
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::fast_forward (const Video_Control::FFpara &para)
-                               
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::fast_backward (const Video_Control::FFpara &para)
-                                
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::step (const Video_Control::STEPpara &para)
-                       
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::play (const Video_Control::PLAYpara &para,
-                       CORBA::Long_out vts)
-                       
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::position (const Video_Control::POSITIONpara &para)
-                           
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::speed (const Video_Control::SPEEDpara &para)
-                        
-{
-  return CORBA::B_FALSE;
-}
-
-
-CORBA::Boolean 
-Video_Control_State::stop (CORBA::Long cmdsn)
-                       
-{
-  return CORBA::B_FALSE;
-}
-
-// ----------------------------------------------------------------------
-
-Video_Control_Waiting_State::Video_Control_Waiting_State (void)
-{
-  //%%
-  this->state_ = VIDEO_WAITING;
-}
-
-CORBA::Boolean 
-Video_Control_Waiting_State::stat_stream (CORBA::Char_out ch,
-                              CORBA::Long_out size)
-                              
-{
-  return 0;
-}
-
-CORBA::Boolean 
-Video_Control_Waiting_State::close (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Waiting_State::close \n"));
-  VIDEO_SINGLETON::instance ()->normalExit = 1;
-  TAO_ORB_Core_instance ()->reactor ()->end_event_loop ();
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::stat_sent (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Waiting_State::stat_sent \n"));
-  return 0;
-}
-
-// We are in the waiting state - and the client sent us
-// the command fast-forward. 
-CORBA::Boolean 
-Video_Control_Waiting_State::fast_forward (const Video_Control::FFpara &para)
-                               
-{
-  // Many guys in legacy code depend on this variable.
-  VIDEO_SINGLETON::instance ()-> cmd = CmdFF;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_Waiting_State::fast_forward () called\n"));
-  VIDEO_SINGLETON::instance ()->init_fast_play (para);
-  this->vci_->change_state (VIDEO_CONTROL_FAST_FORWARD_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-
-// We are in the waiting state - and the client sent us
-// the command fast-backward. 
-CORBA::Boolean 
-Video_Control_Waiting_State::fast_backward (const Video_Control::FFpara &para)
-                                
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_Waiting_State::fast_backward () called\n"));
-  // Many guys in legacy code depend on this variable.
-  VIDEO_SINGLETON::instance ()-> cmd = CmdFB;
-  VIDEO_SINGLETON::instance ()->init_fast_play (para);
-  this->vci_->change_state (VIDEO_CONTROL_FAST_BACKWARD_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::step (const Video_Control::STEPpara &para)
-                       
-{
-  Video_Control::STEPpara step_para = para;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_Waiting_State::step () called\n"));
-
-  int group;
-  int tag = 0;
-  int result;
-
-  VIDEO_SINGLETON::instance ()->cmdsn = step_para.sn;
-
-  if (!VIDEO_SINGLETON::instance ()-> live_source) {
-    if (step_para.nextFrame >= VIDEO_SINGLETON::instance ()->numF) /* send SEQ_END */
-      {
-        tag = 1;
-        step_para.nextFrame --;
-      }
-    /*
-      fprintf (stderr, "STEP . . .frame-%d\n", step_para.this->nextFrame);
-    */
-    CheckFrameRange (step_para.nextFrame);
-    group = VIDEO_SINGLETON::instance ()->FrameToGroup (&step_para.nextFrame);
-    if (VIDEO_SINGLETON::instance ()-> precmd != CmdSTEP && !tag ) {
-      result = VIDEO_SINGLETON::instance ()->SendReferences (group, step_para.nextFrame);
-      if (result < 0 )
-        return CORBA::B_FALSE;
-    }
-  }
-  if (VIDEO_SINGLETON::instance ()->live_source) 
-    StartPlayLiveVideo ();
- 
-  if (VIDEO_SINGLETON::instance ()->live_source) {
-    VIDEO_SINGLETON::instance ()->SendPicture (&step_para.nextFrame);
-  }
-  else if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG1) {
-    VIDEO_SINGLETON::instance ()->SendPacket (VIDEO_SINGLETON::instance ()->numS>1, group, tag ? VIDEO_SINGLETON::instance ()->numF : step_para.nextFrame, 0);
-  }
-  else {
-    fprintf (stderr, "VS: wierd1\n");
-  }
- 
-  if (VIDEO_SINGLETON::instance ()->live_source) StopPlayLiveVideo ();
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::play (const Video_Control::PLAYpara &para,
-                                   CORBA::Long_out vts)
-                       
-{
-  // Many guys in legacy code depend on this variable.
-  VIDEO_SINGLETON::instance ()-> cmd = CmdPLAY;
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "(%P|%t)Video_Control_Waiting_State::play () called \n"));
-  VIDEO_SINGLETON::instance ()->init_play (para,
-                                           vts);
-  cerr << "vts is " << vts << endl;
-  this->vci_->change_state (VIDEO_CONTROL_PLAY_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::position (const Video_Control::POSITIONpara &pos_para)
-                           
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_Waiting_State::position () called \n"));
-
-  if (VIDEO_SINGLETON::instance ()->live_source) 
-    return CORBA::B_TRUE;
-
-  CheckGroupRange (pos_para.nextGroup);
-  VIDEO_SINGLETON::instance ()-> cmd = CmdPOSITION;
-  VIDEO_SINGLETON::instance ()-> cmdsn = pos_para.sn;
-
-  int result = VIDEO_SINGLETON::instance ()->SendPacket 
-    (VIDEO_SINGLETON::instance () ->numS > 1 
-     || pos_para.nextGroup == 0, 
-     pos_para.nextGroup, 0, 0);
-  
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::speed (const Video_Control::SPEEDpara &para)
-                        
-{
-  return 0;
-}
-
-
-CORBA::Boolean 
-Video_Control_Waiting_State::stop (CORBA::Long cmdsn)
-                       
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Waiting_State::stop ()\n"));
-  VIDEO_SINGLETON::instance ()->cmd = CmdSTOP;
-  VIDEO_SINGLETON::instance ()->cmdsn = cmdsn;
-  Video_Timer_Global::StopTimer();
-  this->vci_->change_state (VIDEO_CONTROL_WAITING_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-// Video_Control_Play_State methods
-
-Video_Control_Play_State::Video_Control_Play_State (void)
-{
-  this->state_ = VIDEO_PLAY;
-}
-
-CORBA::Boolean
-Video_Control_Play_State::stop (CORBA::Long cmdsn)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Play_State::stop ()\n"));
-  VIDEO_SINGLETON::instance ()->cmd = CmdSTOP;
-  VIDEO_SINGLETON::instance ()->cmdsn = cmdsn;
-  Video_Timer_Global::StopTimer();
-  this->vci_->change_state (VIDEO_CONTROL_WAITING_STATE::instance ());
-  return 0;
-}
-
-
-CORBA::Boolean
-Video_Control_Play_State::speed (const Video_Control::SPEEDpara &para)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Play_State::speed ()\n"));
-  VIDEO_SINGLETON::instance ()->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-  VIDEO_SINGLETON::instance ()->sendPatternGops = para.sendPatternGops;
-  VIDEO_SINGLETON::instance ()->currentUPF = para.usecPerFrame;
-  VIDEO_SINGLETON::instance ()->addedUPF = 0;
-
-  for (int i=0; i<para.sendPattern.length (); i++)
-    VIDEO_SINGLETON::instance ()->sendPattern [i] = para.sendPattern [i];
-  //  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
-
-  Video_Timer_Global::TimerSpeed ();
-  VIDEO_SINGLETON::instance ()->play_send ();
-  return CORBA::B_TRUE;
-}
-
-
-Video_Control_Fast_Forward_State::Video_Control_Fast_Forward_State (void)
-{
-  this->state_ = VIDEO_FAST_FORWARD;
-}
-
-CORBA::Boolean
-Video_Control_Fast_Forward_State::stop (CORBA::Long cmdsn)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Fast_Forward_State::stop ()\n"));
-  VIDEO_SINGLETON::instance ()->cmd = CmdSTOP;
-  VIDEO_SINGLETON::instance ()->cmdsn = cmdsn;
-  Video_Timer_Global::StopTimer();
-  this->vci_->change_state (VIDEO_CONTROL_WAITING_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-CORBA::Boolean
-Video_Control_Fast_Forward_State::close (void)
-{
-  return CORBA::B_TRUE;
-}
-
-// ----------------------------------------------------------------------
-
-Video_Control_Fast_Backward_State::Video_Control_Fast_Backward_State (void)
-{
-  this->state_ = VIDEO_FAST_BACKWARD;
-}
-
-CORBA::Boolean
-Video_Control_Fast_Backward_State::stop (CORBA::Long cmdsn)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Video_Control_Fast_Backward_State::stop ()\n"));
-  VIDEO_SINGLETON::instance ()->cmd = CmdSTOP;
-  VIDEO_SINGLETON::instance ()->cmdsn = cmdsn;
-  Video_Timer_Global::StopTimer();
-  this->vci_->change_state (VIDEO_CONTROL_WAITING_STATE::instance ());
-  return CORBA::B_TRUE;
-}
-
-CORBA::Boolean
-Video_Control_Fast_Backward_State::close (void)
-{
-  return CORBA::B_TRUE;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h
deleted file mode 100644
index c68c074b56b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- C++ -*- */
-
-/* $Id$  */
-
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#if !defined (MPEG_VIDEO_CONTROL_STATE_H)
-#define MPEG_VIDEO_CONTROL_STATE_H
-
-#include "ace/Singleton.h"
-#include "mpeg_shared/Video_ControlS.h"
-#include "mpeg_server/Video_Control_i.h"
-
-class Video_Control_i;
-
-class Video_Control_State
-{
-  // = TITLE
-  //   Defines an abstract class that is used to implement the state
-  //   pattern for the video control.
-  //
-  // = DESCRIPTION
-  //   The various states of the video control are defined by the
-  //   Video_States enum. They can be implemented by subclassing from
-  //   this class and overriding the handle_input method.
-public:
-  Video_Control_State (void);
-  // constructor
-
-  enum Video_States 
-  {
-    VIDEO_WAITING,
-    VIDEO_PLAY = 1,
-    VIDEO_FAST_FORWARD = 2,
-    VIDEO_FAST_BACKWARD = 3
-  };
-
-  Video_States get_state (void);
-  // returns the current state
-
-  void set_state (Video_States state);
-  // sets the state
-
-  virtual CORBA::Boolean init_video (const Video_Control::INITvideoPara &para,
-                                     Video_Control::INITvideoReply_out reply) ;
-  
-  virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
-                                      CORBA::Long_out size);
-
-  virtual CORBA::Boolean close (void);
-  
-  virtual CORBA::Boolean stat_sent (void);
-
-  virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para) ;
-
-  virtual CORBA::Boolean fast_backward (const Video_Control::FFpara &para) ;
-
-  virtual CORBA::Boolean step (const Video_Control::STEPpara &para) ;
-  
-  virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
-                               CORBA::Long_out vts) ;
-
-  virtual CORBA::Boolean position (const Video_Control::POSITIONpara &para) ;
-
-  virtual CORBA::Boolean speed (const Video_Control::SPEEDpara &para) ;
-
-  virtual CORBA::Boolean stop (CORBA::Long cmdsn) ;
- 
-protected:
-  Video_States state_;
-  // State of this object
-
-  Video_Control_i *vci_;
- 
-};
-
-class Video_Control_Waiting_State : public virtual Video_Control_State
-{
-  // = TITLE
-  //   Defines a class that implements the waiting state of the video
-  //   control state pattern.
-public:
-  Video_Control_Waiting_State (void);
-  // Default constructor, sets the state to WAITING
-  
-  virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
-                                      CORBA::Long_out size);
-  
-  virtual CORBA::Boolean close (void);
-  
-  virtual CORBA::Boolean stat_sent (void);
-  
-  virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para);
-  
-  virtual CORBA::Boolean fast_backward (const Video_Control::FFpara &para);
-
-  virtual CORBA::Boolean step (const Video_Control::STEPpara &para);
-  
-
-  virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
-                               CORBA::Long_out vts);
-
-  virtual CORBA::Boolean position (const Video_Control::POSITIONpara &para);
-
-  virtual CORBA::Boolean speed (const Video_Control::SPEEDpara &para);
-
-  virtual CORBA::Boolean stop (CORBA::Long cmdsn);
-};
-
-class Video_Control_Play_State : public virtual Video_Control_State
-{
-  // = TITLE
-  //   Defines a class that implements the playing state of the video
-  //   control state pattern.
-public:
-  Video_Control_Play_State (void);
-  // Default constructor, sets the state to VIDEO_PLAY
-
-  virtual CORBA::Boolean stop (CORBA::Long cmdsn);
-
-  virtual CORBA::Boolean speed (const Video_Control::SPEEDpara &para);
-};
-
-class Video_Control_Fast_Forward_State : public virtual Video_Control_State
-{
-  // = TITLE
-  //   Defines a class that implements the fast_forward state of the video
-  //   control state pattern.
-public:
-  Video_Control_Fast_Forward_State (void);
-  // Default constructor, sets the state to VIDEO_FAST_FORWARD
-
-  CORBA::Boolean close (void);
-
-  CORBA::Boolean stop (CORBA::Long cmdsn);
-};
-
-class Video_Control_Fast_Backward_State : public virtual Video_Control_State
-{
-  // = TITLE
-  //   Defines a class that implements the fast_backward state of the video
-  //   control state pattern.
-public:
-  Video_Control_Fast_Backward_State (void);
-  // Default constructor, sets the state to VIDEO_FAST_BACKWARD
-
-  CORBA::Boolean close (void);
-
-  CORBA::Boolean stop (CORBA::Long cmdsn);
-};
-
-typedef ACE_Singleton <Video_Control_Waiting_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_WAITING_STATE;     
-typedef ACE_Singleton <Video_Control_Play_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_PLAY_STATE;        
-typedef ACE_Singleton <Video_Control_Fast_Forward_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_FAST_FORWARD_STATE;
-typedef ACE_Singleton <Video_Control_Fast_Backward_State, ACE_SYNCH_MUTEX>
-        VIDEO_CONTROL_FAST_BACKWARD_STATE;
-
-#endif /* MPEG_VIDEO_SERVER_STATE_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
deleted file mode 100644
index 79f5438fe58..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-
-#include "Video_Control_i.h"
-#include "mpeg_server/Video_Server.h"
-
-Video_Control_i::Video_Control_i ()
-  : reactor_ (TAO_ORB_Core_instance ()->reactor ())
-{
-  
-}
-
-int
-Video_Control_i::create_handlers (void)
-{
-  ACE_NEW_RETURN (this->data_handler_,
-                  Video_Data_Handler,
-                  -1);
-
-  ACE_NEW_RETURN (this->sig_handler_, 
-                  Video_Sig_Handler,
-                  -1);
-  return 0;
-}
-CORBA::Boolean 
-Video_Control_i::init_video (const Video_Control::INITvideoPara &para,
-                             Video_Control::INITvideoReply_out reply,
-                             CORBA::Environment& env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_i::init_video () called\n"));
-  
-  CORBA::Boolean result = this->state_->init_video (para,
-                                                    reply);
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Video_Control_State::init_video returned %d\n", result));
-  return result;
-
-}
-
-
-CORBA::Boolean 
-Video_Control_i::stat_stream (CORBA::Char_out ch,
-                              CORBA::Long_out size,
-                              CORBA::Environment& env)
-{
-  return 0;
-}
-
-
-CORBA::Boolean 
-Video_Control_i::close (CORBA::Environment& env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Control_i::close:"
-              "shutting down the ORB\n"));
-
-  TAO_ORB_Core_instance ()-> orb ()-> shutdown ();
-  return CORBA::B_TRUE;
-}
-
-
-CORBA::Boolean 
-Video_Control_i::stat_sent (CORBA::Environment& env)
-{
-  return 0;
-}
-
-
-CORBA::Boolean 
-Video_Control_i::fast_forward (const Video_Control::FFpara &para,
-                               CORBA::Environment& env)
-{
-  return this->state_->fast_forward (para);
-}
-
-
-CORBA::Boolean 
-Video_Control_i::fast_backward (const Video_Control::FFpara &para,
-                                CORBA::Environment& env)
-{
-  return this->state_->fast_backward (para);
-}
-
-
-CORBA::Boolean 
-Video_Control_i::step (const Video_Control::STEPpara &para,
-                       CORBA::Environment& env)
-{
-  return this->state_->step (para);
-}
-
-
-// this gets called by the client, when it wants
-// to start playback
-CORBA::Boolean 
-Video_Control_i::play (const Video_Control::PLAYpara &para,
-                       CORBA::Long_out vts,
-                       CORBA::Environment& env)
-{
-  return this->state_->play (para,
-                             vts);
-}
-
-
-CORBA::Boolean 
-Video_Control_i::position (const Video_Control::POSITIONpara &para,
-                           CORBA::Environment& env)
-{
-  return this->state_->position (para);
-}
-
-
-CORBA::Boolean 
-Video_Control_i::speed (const Video_Control::SPEEDpara &para,
-                        CORBA::Environment& env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_i::speed () called\n"));
-  return this->state_->speed (para);
-}
-
-
-CORBA::Boolean 
-Video_Control_i::stop (CORBA::Long cmdsn,
-                       CORBA::Environment& env)
-{
-  return this->state_->stop (cmdsn);
-}
-
-CORBA::UShort
-Video_Control_i::set_peer (const char *peer,
-                           CORBA::Environment &_tao_environment)
-{
-   ACE_INET_Addr client_data_addr (peer);
-  // Data (UDP) Address of the client.
-
-   ACE_DEBUG ((LM_DEBUG,
-               "(%P|%t) set_peer called: %s,%s,%d\n",
-               peer,
-               client_data_addr.get_host_addr (),
-               client_data_addr.get_port_number ()));
-
- 
-  if (VIDEO_SINGLETON::instance ()->dgram.open (client_data_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "(%P|%t) UDP open failed: %p\n"),
-                      -1);
-
-  ACE_INET_Addr server_data_addr;
-  // Data (UDP) Address of this server.
-  
-  if (VIDEO_SINGLETON::instance ()-> dgram.get_local_addr 
-      (server_data_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "(%P|%t) UDP get_local_addr failed: %p\n"),
-                      -1);
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) Video_Server: My UDP port number is %d\n",
-              server_data_addr.get_port_number ()));
-
-  if (this->register_handlers () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Video_Control_i::set_peer: register_handlers failed\n"),
-                      -1);
-
-  VIDEO_SINGLETON::instance ()->videoSocket = VIDEO_SINGLETON::instance ()->dgram.get_handle ();
-
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) set_peer: server port = %d\n",server_data_addr.get_port_number ()));
-  return server_data_addr.get_port_number ();
-
-}
-
-int
-Video_Control_i::register_handlers (void)
-{
-  int result;
-
-  // Register the event handlers with the Reactor
-
-  // first the data handler, i.e. UDP
-  result = this->reactor_->register_handler (this->data_handler_, 
-                                             ACE_Event_Handler::READ_MASK);
-  if (result < 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) register_handler for data_handler failed\n"),
-                        -1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) registered fd for data handler = (%d)\n",
-              this->data_handler_->get_handle ()));
-  
-  // finally, the signal handler, for periodic transmission
-  // of packets
-  result = this->sig_handler_->register_handler ();
-  
-  if (result < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) register_handler for sig_handler"
-                       "failed!\n"),
-                      -1);
-
-  return 0;
-}
-
-// Changes the state of the video control handler from the current
-// state to the state represented by the argument.
-void
-Video_Control_i::change_state (Video_Control_State *state)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Video_Control_i::Changing to state %d\n",
-              state->get_state ()));
-  this->state_ = state;
-}
-
-// Returns the current state object .
-Video_Control_State *
-Video_Control_i::get_state (void)
-{
-  return this->state_;
-}
-
-
-Video_Control_i::~Video_Control_i ()
-{
-  delete this->data_handler_;
-  delete this->sig_handler_;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
deleted file mode 100644
index b7cc53ebaaf..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (AV_VIDEO_CONTROL_H)
-#define AV_VIDEO_CONTROL_H
-
-#include "mpeg_shared/Video_ControlS.h"
-#include "Video_Server.h"
-
-class Video_Data_Handler;
-class Video_Sig_Handler;
-class Video_Control_State;
-
-class Video_Control_i
-  : public virtual POA_Video_Control
-{
-public:
-  Video_Control_i ();
-  // constructor
-
-  int create_handlers (void);
-  // creates the data and signal handlers
-
-  virtual CORBA::Boolean init_video (const Video_Control::INITvideoPara &para,
-                                     Video_Control::INITvideoReply_out reply,
-                                     CORBA::Environment &_tao_environment);
-  
-  virtual CORBA::Boolean stat_stream (CORBA::Char_out ch,
-                                      CORBA::Long_out size,
-                                      CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean close (CORBA::Environment &_tao_environment);
-  
-  virtual CORBA::Boolean stat_sent (CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean fast_forward (const Video_Control::FFpara &para,
-                                       CORBA::Environment &_tao_environment
-                                       );
-
-  virtual CORBA::Boolean fast_backward (const Video_Control::FFpara &para,
-                                        CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean step (const Video_Control::STEPpara &para,
-                               CORBA::Environment &_tao_environment);
-  
-  virtual CORBA::Boolean play (const Video_Control::PLAYpara &para,
-                               CORBA::Long_out vts,
-                               CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean position (const Video_Control::POSITIONpara &para,
-                                   CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean speed (const Video_Control::SPEEDpara &para,
-                                CORBA::Environment &_tao_environment);
-
-  virtual CORBA::Boolean stop (CORBA::Long cmdsn,
-                               CORBA::Environment &_tao_environment);
-
-  virtual CORBA::UShort set_peer (const char *peer,
-                                 CORBA::Environment &_tao_environment);
-  // called by the client to inform us about it's ip and 
-  // udp address.
-
-  void change_state (Video_Control_State *state);
-  // Used to change the state
-
-  Video_Control_State *get_state (void);
-  // Accessor for the state_ 
-
-  virtual ~Video_Control_i (void);
-  // Destructor
-
-protected:
-  int register_handlers (void);
-  // called by set_peer to install the data_handler and
-  // the sig_handler
-
-  ACE_Reactor *reactor_;
-  // The Reactor
-
-  TAO_ORB_Manager *orb_manager_;
-  // The ORB manager
-
-  Video_Control_State *state_;
-  // State pattern - pointer to abstract State object
-
-  Video_Data_Handler *data_handler_;
-  // Data Socket Event Handler
-
-  Video_Sig_Handler *sig_handler_;
-  // signal handler for SIGALRM to periodically send the video frames
-  // to the client
-
-};
-
-// Video_Control_i instance singleton.
-// %%
-typedef ACE_Singleton <Video_Control_i, ACE_Null_Mutex> VIDEO_CONTROL_I;
-
-#endif /* if !defined (AV_VIDEO_CONTROL_H) */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp
deleted file mode 100644
index 3f8c83f889e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/* $Id$  */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#include "Video_Server.h"
-#include "orbsvcs/CosNamingC.h"
-
-// Video_Sig_Handler methods
-// handles the timeout SIGALRM signal
-Video_Sig_Handler::Video_Sig_Handler ()
-  : vci_ (VIDEO_CONTROL_I::instance ())
-{
-}
-
-int
-Video_Sig_Handler::register_handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "register_handler"),
-                      -1);
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-  ACE_Sig_Set sig_set;
-
-  //  sig_set.sig_add (SIGINT);
-  // sig_set.sig_add (SIGQUIT);
-  sig_set.sig_add (SIGALRM);  
-
-  // Register the signal handler object to catch the signals.
-  if (TAO_ORB_Core_instance ()->reactor ()->register_handler (sig_set, 
-                                                  this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "register_handler"),
-                      -1);
-  return 0;
-}
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Video_Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-int 
-Video_Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
-  return 0;
-}
-
-int 
-Video_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Video_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  //  ACE_DEBUG ((LM_DEBUG, "(%t) received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Handle the timeout
-      Video_Timer_Global::timerHandler (SIGALRM);
-      // send the frame
-      //      cerr << "current state = " << this->vci_->get_state ()->get_state ();
-      switch (this->vci_->get_state ()->get_state ())
-        {
-        case Video_Control_State::VIDEO_PLAY:
-          VIDEO_SINGLETON::instance ()->play_send   ();
-          break;
-        case Video_Control_State::VIDEO_FAST_FORWARD:
-          // this handles the forward play case!
-          VIDEO_SINGLETON::instance ()->fast_play_send   ();
-          break;
-        case Video_Control_State::VIDEO_FAST_BACKWARD:
-          // this handles the backward play case!
-          VIDEO_SINGLETON::instance ()->fast_play_send   ();
-          break;
-        default:
-          break;
-        }
-      break;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) %S: not handled, returning to program\n", 
-                  signum));
-      break;
-    }
-  //  ACE_DEBUG ((LM_DEBUG,"returning from handle_signal"));
-  return 0;
-}
-
-// Video_Data_Handler methods
-
-Video_Data_Handler::Video_Data_Handler ()
-  : vci_ (VIDEO_CONTROL_I::instance ())
-{
-}
-
-ACE_HANDLE
-Video_Data_Handler::get_handle (void) const
-{
-  return VIDEO_SINGLETON::instance ()->dgram.get_handle ();
-}
-
-int
-Video_Data_Handler::handle_input (ACE_HANDLE handle)
-{
-  //  fprintf (stderr,"Video_Data_Handler::handle_input ()\n");
-  
-  switch (this->vci_->get_state ()->get_state ())
-    {
-    case Video_Control_State::VIDEO_PLAY:
-      if (VIDEO_SINGLETON::instance ()->GetFeedBack () == -1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) Error reading feedback. Ending the reactor event loop\n"));
-          TAO_ORB_Core_instance ()-> orb ()->shutdown ();
-          return -1;
-        }
-        
-      VIDEO_SINGLETON::instance ()->play_send   (); // simulating the for loop in playvideo () in vs.cpp
-      break;
-    case Video_Control_State::VIDEO_FAST_FORWARD:
-    case Video_Control_State::VIDEO_FAST_BACKWARD:
-      VIDEO_SINGLETON::instance ()->GetFeedBack ();
-      VIDEO_SINGLETON::instance ()->fast_play_send   (); // simulating the for loop in fast_play
-      break;
-    }
-  return 0;
-}  
-
-// Video_Control_Handler methods
-
-
-
-// ----------------------------------------------------------------------
-// Video_Server methods
-
-// Do-nothing default constructor.
-Video_Server::Video_Server ()
-{
-}
-
-int
-Video_Server::init (int argc,
-                    char **argv,
-                    CORBA::Environment &env)
-{
-  int result;
-
-  if (this->initialize_orb (argc,
-                            argv,
-                            env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Video_Server: orb initialization failed!"),
-                      -1);
-  
-  //  ACE_DEBUG ((LM_DEBUG,
-  //          "(%P|%t) Video_Server::init () ORB init success \n"));
-
-  // @@ Can you please change the use of "fd" to "handle" globally?
-  // Set the global socket fd's from the arguments.
-  int max_pkt_size = -INET_SOCKET_BUFFER_SIZE;
-  VIDEO_SINGLETON::instance ()->serviceSocket = -1;
-
-  VIDEO_SINGLETON::instance ()->conn_tag = max_pkt_size;
-  
-  if (max_pkt_size > 0) 
-    VIDEO_SINGLETON::instance ()->msgsize 
-      = max_pkt_size;
-  else 
-    if (max_pkt_size < 0) 
-      VIDEO_SINGLETON::instance ()->msgsize 
-        = - max_pkt_size;
-    else 
-      VIDEO_SINGLETON::instance ()->msgsize 
-        = 1024 * 1024;
-  /*
-    SFprintf(stderr, "VS VIDEO_SINGLETON::instance ()->msgsize = %d\n", VIDEO_SINGLETON::instance ()->msgsize);
-  */
-  VIDEO_SINGLETON::instance ()->msgsize -= sizeof(VideoMessage);
-  
-  VIDEO_SINGLETON::instance ()->start_time = time(NULL);
-
-  // Set the atexit routine
-  atexit (on_exit_routine);
-
-  VIDEO_SINGLETON::instance ()->lastRef [0] 
-    = VIDEO_SINGLETON::instance ()->lastRef[1] 
-    = -1;
-
-  VIDEO_SINGLETON::instance ()->lastRefPtr = 0;
-
-  return 0;
-}
-
-int
-Video_Server::run (CORBA::Environment &env)
-{
-  return this->orb_manager_.run (env);
-}
-
-int
-Video_Server::initialize_orb (int argc,
-                              char **argv,
-                              CORBA::Environment &env)
-{
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  int result;
-
-
-
-
-  // Initialize the orb_manager
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-  TAO_CHECK_ENV_RETURN (env,
-                        -1);
-
-
-  // %% hack to make the ORB manager pick its own port
-  // we create an Ace_Time_Value of time out zero,
-  // and then call a dummy orb run
-  ACE_Time_Value tv (0);
-  if (this->orb_manager_.orb ()-> run (tv) == -1)
-    ACE_ERROR_RETURN ( (LM_ERROR,
-                        "(%P|%t) ORB_run %p\n",
-                        "run"),
-                       -1);
-
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-
-  VIDEO_CONTROL_I::instance ()-> create_handlers ();
-
-  this->orb_manager_.activate_under_child_poa ("Video_Control",
-                                               VIDEO_CONTROL_I::instance (),
-                                               env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  CORBA::Object_var naming_obj =
-    this->orb_manager_.orb ()->resolve_initial_references ("NameService");
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to resolve the Name Service.\n"),
-                      -1);
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  CosNaming::NamingContext_var naming_context =
-    CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                       env);
-  TAO_CHECK_ENV_RETURN (env,
-                        -1);
-  
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  // Create a name for the video control object
-  CosNaming::Name video_control_name (1);
-  video_control_name.length (1);
-  video_control_name [0].id = CORBA::string_dup ("Video_Control");
-  
-  // Register the video control object with the naming server.
-  naming_context->bind (video_control_name,
-                        VIDEO_CONTROL_I::instance ()->_this (env),
-                        env);
-
-  if (env.exception () != 0)
-    {
-      env.clear ();
-      naming_context->rebind (video_control_name,
-                              VIDEO_CONTROL_I::instance ()->_this (env),
-                              env);
-      TAO_CHECK_ENV_RETURN (env,
-                            -1);
-    }
-
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  VIDEO_CONTROL_I::instance ()->change_state (VIDEO_CONTROL_WAITING_STATE::instance ());
-  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  return 0;
-}
-
-void
-Video_Server::on_exit_routine(void)
-{
-  struct sockaddr_in peeraddr_in;
-  int size = sizeof(peeraddr_in);
-  /*
-  if (!VIDEO_SINGLETON::instance ()->normalExit) {
-    fprintf(stderr, "VS exitting abnormally, dump core...\n");
-    kill(getpid(), SIGSEGV);
-    usleep(2000000);
-  }
-  */
-  /*
-  fprintf(stderr, "A VS session terminated.\n");
-  */
-  if (getpeername(VIDEO_SINGLETON::instance ()->serviceSocket,
-		  (struct sockaddr *)&peeraddr_in, &size) == 0 &&
-      peeraddr_in.sin_family == AF_INET) {
-    if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
-      struct hostent *hp;
-      time_t val = time(NULL);
-      char * buf = ctime(&VIDEO_SINGLETON::instance ()->start_time);
-      
-      hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
-      buf[strlen(buf)-1] = 0;
-      printf("%s: %s %3dm%02ds %dP %s\n",
-	     buf,
-	     hp == NULL ? inet_ntoa(peeraddr_in.sin_addr) : hp->h_name,
-	     (val - VIDEO_SINGLETON::instance ()->start_time) / 60, (val - VIDEO_SINGLETON::instance ()->start_time) % 60,
-	     VIDEO_SINGLETON::instance ()->pkts_sent, VIDEO_SINGLETON::instance ()->videoFile);
-    }
-  }
-  /*
-  ComCloseConn(VIDEO_SINGLETON::instance ()->serviceSocket);
-  ComCloseConn(VIDEO_SINGLETON::instance ()->videoSocket);*/
-}
-
-// Destructor
-Video_Server::~Video_Server ()
-{
-}
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h
deleted file mode 100644
index de50b83adcf..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- C++ -*- */
-/* $Id$  */
-
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#if !defined (MPEG_VIDEO_SERVER_H)
-#define MPEG_VIDEO_SERVER_H
-
-#include "ace/Reactor.h"
-#include "ace/Event_Handler.h"
-
-#include "tao/TAO.h"
-#include "include/common.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"   
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/sendpt.h"
-#include "mpeg_shared/Video_ControlS.h"
-#include "mpeg_server/server_proto.h"
-#include "mpeg_server/Video_Control_State.h"
-#include "mpeg_server/Globals.h"
-#include "mpeg_server/Video_Control_i.h"
-
-class Video_Control_i;
-
-class Video_Sig_Handler 
-  : public virtual ACE_Event_Handler
-{
-  // = TITLE
-  //   Defines a video signal handler class which registers itself with the
-  //   default ACE_Reactor::instance () . Handles the
-  //   SIGALRM signal.
-  //
-  // = DESCRIPTION
-  //   This class contains a pointer to a Video_Control_Handler
-  //   instance and decides the signal action depending on its state.
-  //   An object of this class is used to periodically send the video
-  //   frames to the client using the Video_Timer_Global class.
-public:
-  Video_Sig_Handler ();
-
-  virtual ACE_HANDLE get_handle (void) const;
-
-  int register_handler (void);
-  // this will register this sig_handler
-  // with the reactor for SIGALRM
-
-  virtual int shutdown (ACE_HANDLE, 
-                        ACE_Reactor_Mask);
-
-  virtual int handle_input (ACE_HANDLE);
-
-  virtual int handle_signal (ACE_HANDLE signum,
-                             siginfo_t * = 0,
-                             ucontext_t* = 0);
-private:
-  ACE_HANDLE handle_;
-  // my handle
-
-  Video_Control_i *vci_;
-  // Pointer to the Video_Control_i for accessing
-  // the current state of the server.
-};
-
-class Video_Data_Handler : public virtual ACE_Event_Handler
-{
-
-  // = TITLE
-  //   Defines a event handler for video data using a datagram i.e UDP
-  //   socket.
-  //
-  // = DESCRIPTION
-  //   This takes a pointer to a Video_Control_Handler instance and
-  //   reacts differently to the events based on the
-  //   video_control_handler's state.
-public:
-  Video_Data_Handler ();
-  // Constructor
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // Called when data shows up.
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // Get the handle used by this event handler
-
-private:
-  Video_Control_i *vci_;
-  
-};
-
-class Video_Server
-{
-  // = TITLE
-  //   Defines a class that abstracts the functionality of a
-  //   video_server.
-  //
-  // = DESCRIPTION
-  //   This registers 3 event handlers with the <ACE_Reactor::instance>,
-  //   namely a control,data and signal handlers.
-public:
-  Video_Server (void);
-  // Default constructor
-
-  ~Video_Server ();
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment &env);
-  // initialize the Video Server.
-
-
-  int run (CORBA::Environment &env);
-  // Runs the ORB event loop       
-
-  static void on_exit_routine(void);
-
-private:
-  
-  int initialize_orb (int argc,
-                      char **argv,
-                      CORBA::Environment &env);
-  // Initialize the orb using the orb_manager_
-  // Also registers the video_control_ object in the poa
-  // and in the naming service
-  TAO_ORB_Manager orb_manager_;
-  // the TAO ORB manager.
-
-};
-
-#endif /* MPEG_VIDEO_SERVER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp
deleted file mode 100644
index 560ab606b87..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp
+++ /dev/null
@@ -1,705 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include "include/common.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/com.h"
-#include "server_proto.h"
-
-//extern int Mpeg_Global::session_limit, Mpeg_Global::session_num;
-
-static bytes_sent = 0;
-static time_t start_time;
-
-static int conn_tag;
-
-static int serviceSocket;
-static int audioSocket = -1;
-
-static char audioFile[PATH_SIZE];
-static int fd;
-static AudioParameter audioPara;
-static int totalSamples;
-static int fileSize;
-static unsigned char cmd;
-static live_source = 0;
-
-static int CmdRead(char *buf, int psize)
-{
-  int res = wait_read_bytes(serviceSocket, buf, psize);
-  if (res == 0) return (1);
-  if (res == -1) {
-    fprintf(stderr, "AS error on read cmdSocket, size %d", psize);
-    perror("");
-    return (-1);
-  }
-  return 0;
-}
-
-static void CmdWrite(char *buf, int size)
-{
-  int res = wait_write_bytes(serviceSocket, buf, size);
-  if (res == -1) {
-    if (errno != EPIPE) perror("AS writes to serviceSocket");
-    exit(errno != EPIPE);
-  }
-}
-
-static int INITaudio(void)
-{
-  int result;
-  int failureType; /* 0 - can't open file, 1 - can't open live source */
-  INITaudioPara para;
-
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.version = ntohl(para.version);
-  para.nameLength = ntohl(para.nameLength);
-  para.para.encodeType = ntohl(para.para.encodeType);
-  para.para.channels = ntohl(para.para.channels);
-  para.para.samplesPerSecond = ntohl(para.para.samplesPerSecond);
-  para.para.bytesPerSample = ntohl(para.para.bytesPerSample);
-#endif
-  if (para.nameLength>0)
-    result = CmdRead(audioFile, para.nameLength);
-  if (result != 0)
-    return result;
-  if (Mpeg_Global::session_num > Mpeg_Global::session_limit || para.version != VERSION) {
-    char errmsg[128];
-    cmd = CmdFAIL;
-    CmdWrite((char *)&cmd, 1);
-    if (Mpeg_Global::session_num > Mpeg_Global::session_limit) {
-      sprintf(errmsg,
-	      "Too many sessions being serviced, please try again later.\n");
-    }
-    else {
-      sprintf(errmsg, "Version # not match, AS %d.%02d, Client %d.%02d",
-	      VERSION / 100, VERSION % 100,
-	      para.version / 100, para.version % 100);
-    }
-    write_string(serviceSocket, errmsg);
-    return(1);
-  }
-  memcpy(&audioPara, &para.para, sizeof(audioPara));
-  /*
-  fprintf(stderr, "Client Audio para: encode %d, ch %d, sps %d, bps %d.\n",
-	  para.para.encodeType, para.para.channels,
-	  para.para.samplesPerSecond, para.para.bytesPerSample);
-   */
-  audioFile[para.nameLength] = 0;
-  {
-    int len = strlen(audioFile);
-    if (strncasecmp("LiveAudio", audioFile, 9) &&
-	strcasecmp(".au", audioFile+len-3)) {
-      char errmsg[128];
-      cmd = CmdFAIL;
-      CmdWrite((char *)&cmd, 1);
-      sprintf(errmsg, "%s without suffix .au", audioFile);
-      write_string(serviceSocket, errmsg);
-      return(1);
-    }
-  }
-  /*
-  fprintf(stderr, "Audio file %s got.\n", audioFile);
-  */
-
-  if (!strncasecmp("LiveAudio", audioFile, 9)) {
-    fd = OpenLiveAudio(&(para.para));
-    if (fd == -1) {
-      failureType = 1;
-      goto failure;
-    }
-    fileSize =0x7fffffff;
-    totalSamples = fileSize / audioPara.bytesPerSample;
-    live_source = 1;
-  }
-  else {
-    LeaveLiveAudio();
-    fd = open(audioFile, O_RDONLY);
-    if (fd == -1)
-    {
-      fprintf(stderr, "AS error on opening audio file %s", audioFile);
-      perror("");
-      failureType = 0;
-      goto failure;
-    }
-
-    /* Try to get audioFile format audioPara here */
-
-    /* figure out totalsamples */
-    fileSize = lseek(fd, 0L, SEEK_END);
-    lseek(fd, 0L, SEEK_SET);
-    totalSamples = fileSize / audioPara.bytesPerSample;
-    /*
-    fprintf(stderr, "Total Samples=%d in audio file %ss.\n", totalSamples, audioFile);
-    */
-  }
-  {
-    INITaudioReply reply;
-    
-    reply.para.encodeType = htonl(audioPara.encodeType);
-    reply.para.channels = htonl(audioPara.channels);
-    reply.para.samplesPerSecond = htonl(audioPara.samplesPerSecond);
-    reply.para.bytesPerSample = htonl(audioPara.bytesPerSample);
-    reply.totalSamples = htonl(totalSamples);
-
-    reply.live = htonl(live_source);
-    reply.format = htonl(AUDIO_RAW);
-    
-    CmdWrite((char *)&cmd, 1);
-    CmdWrite((char *)&reply, sizeof(reply));
-  }
-  return 0;
-  
- failure:
-  {
-    /*
-    fprintf(stderr, "AS error: failed initializing audio file.\n");
-    */
-    cmd = CmdFAIL;
-    CmdWrite((char *)&cmd, 1);
-    write_string(serviceSocket,
-		 failureType == 0 ? "Failed to open audio file for read." :
-		 "Failed to connect to live audio source.");
-    return(1);
-  }
-}
-
-#define DATABUF_SIZE 500
-
-static int databuf_size;
-static int cmdsn;
-static int nextsample;
-static int sps; /* audio play speed given by the client: samples per second */
-static int spslimit;
-static int spp; /* samples per packet */
-static AudioPacket * pktbuf = NULL;
-
-/* send a packet of audio samples to audioSocket
-   returns: 0 - no more data from audio file: EOF reached;
-            1 - More data is available from the audio file */
-static int send_packet(int firstSample, int samples)
-{
-  long offset = firstSample * audioPara.bytesPerSample;
-  int size = samples * audioPara.bytesPerSample;
-  char * buf = (char *)pktbuf + sizeof(*pktbuf);
-  int len;
-  int resent = 0;
-  int segsize, sentsize;
-
-  if (live_source) {
-    len = ReadLiveAudioSamples(buf, samples);
-    len *= audioPara.bytesPerSample;
-  }
-  else {
-    lseek(fd, offset, SEEK_SET);
-    while ((len = read(fd, buf, size)) == -1) {
-      if (errno == EINTR)
-	continue;   /* interrupted */
-      perror("AS error on read audio file");
-      return(-1);
-    }
-    if (len < audioPara.bytesPerSample) {
-      return 0;
-    }
-  }
-  
-  samples = len / audioPara.bytesPerSample;
-  len = samples * audioPara.bytesPerSample;
-  bytes_sent += len;
-  pktbuf->firstSample = htonl(firstSample);
-  pktbuf->samples = htonl(samples);
-  pktbuf->actualSamples = htonl(samples);
-  pktbuf->dataBytes = htonl(len);
-  if (spslimit < sps) { /* interpolation needed */
-    SFprintf(stderr, "AS audio sample interpolation not available yet.\n");
-  }
-  segsize = sizeof(*pktbuf) + len;
-  if (conn_tag != 0) {
-    while ((sentsize = write(audioSocket, (char *)pktbuf, segsize)) == -1) {
-      if (errno == EINTR) /* interrupted */
-	continue;
-      if (errno == ENOBUFS) {
-	if (resent) {
-	  perror("AS Warning, pkt discarded because");
-	  break;
-	}
-	else {
-	  resent = 1;
-	  usleep(5000);
-	  continue;
-	}
-      }
-      if (errno != EPIPE) {
-	fprintf(stderr, "AS error on send audio packet %d(%d):",
-		firstSample, samples);
-	perror("");
-      }
-      exit((errno != EPIPE));
-    }
-  }
-  else {
-    sentsize = wait_write_bytes(audioSocket, (char *)pktbuf, segsize);
-    if (sentsize == -1) {
-      if (errno != EPIPE) {
-	fprintf(stderr, "AS error on send audio packet %d(%d):",
-		firstSample, samples);
-	perror("");
-      }
-      exit((errno != EPIPE));
-     }
-  }
-  if (sentsize < segsize) {
-    SFprintf(stderr, "AS warning: message size %dB, sent only %dB\n",
-	    segsize, sentsize);
-  }
-  /*
-  SFprintf(stderr, "AS sent audio packet %d(%d).\n",
-	  firstSample, samples);
-  */
-  return (len < size ? 0 : 1);
-}
-
-/* send a packet of audio samples to audioSocket
-   returns: 0 - no more data from audio file: EOF reached;
-            1 - More data is available from the audio file */
-static int SendPacket(void)
-{
-  int moredata;
-  pktbuf->cmdsn = htonl(cmdsn);
-  pktbuf->resend = htonl(0);
-  pktbuf->samplesPerSecond = htonl(sps);
-  moredata = send_packet(nextsample, spp);
-  if (moredata) {
-    nextsample += spp;
-  }
-  return moredata;
-}
-
-static void ResendPacket(int firstsample, int samples)
-{
-  pktbuf->cmdsn = htonl(cmdsn);
-  pktbuf->resend = htonl(1);
-  pktbuf->samplesPerSecond = htonl(sps);
-  while (samples > 0) {
-    int size = samples < spp ? samples : spp;
-    send_packet(firstsample, size);
-    firstsample += size;
-    samples -= size;
-    if (samples > 0) {
-      usleep(10000);
-    }
-  }
-}
-
-#define SPEEDUP_SCALE 5
-#define MAX_RESEND_REQS 10
-#define FBBUF_SIZE (sizeof(AudioFeedBackPara) + \
-                       (MAX_RESEND_REQS - 1) * sizeof(APdescriptor))
-
-static AudioFeedBackPara * fbpara = NULL;
-
-static int PLAYaudio(void)
-{
-  int hasdata = 1;
-  int addSamples;
-  int packets = 0;
-  unsigned nextTime;
-  int upp;  /* micro-seconds per packet */
-  int delta_sps = 0;  /* compensation for sps from feedback msgs */
-  int nfds = (serviceSocket > audioSocket ? serviceSocket : audioSocket) + 1;
-  int result;
-  /*
-  fprintf(stderr, "PLAY . . .\n");
-  */
-  {
-    PLAYaudioPara para;
-    result = CmdRead((char *)&para, sizeof(para));
-    if (result != 0)
-      return result;
-#ifdef NeedByteOrderConversion
-    para.sn = ntohl(para.sn);
-    para.nextSample = ntohl(para.nextSample);
-    para.samplesPerSecond = ntohl(para.samplesPerSecond);
-    para.samplesPerPacket = ntohl(para.samplesPerPacket);
-    para.ABsamples = ntohl(para.ABsamples);
-    para.spslimit = ntohl(para.spslimit);
-#endif
-    nextsample = para.nextSample;
-    cmdsn = para.sn;
-    sps = para.samplesPerSecond;
-    spslimit = para.spslimit;
-    spp = para.samplesPerPacket;
-    addSamples = para.ABsamples / 2;
-    if (spp * audioPara.bytesPerSample > databuf_size) {
-      spp = databuf_size / audioPara.bytesPerSample;
-    }
-    /*
-    SFprintf(stderr, "AS got CmdPLAY: sps %d\n", sps);
-    */
-  }
-  /*
-  fprintf(stderr, "AS: nextSampe=%d for PLAY.\n", para.nextSample);
-  */
-
-  upp = (int)(1000000.0 / ((double)sps / (double)spp));
-  nextTime = get_usec();
-  
-  CmdWrite((char *)&nextTime, sizeof(int));
-
-  if (live_source) {
-    StartPlayLiveAudio();
-  }
-  
-  for (;;)
-  {
-    struct fd_set read_mask, write_mask;
-    struct timeval tval;
-    unsigned curTime = get_usec();
-    
-    if (hasdata) {
-      if (addSamples < - spp) {  /* slow down by not sending packets */
-	nextTime += upp;
-	addSamples += spp;
-      }
-      else {
-	int need_sleep = 0;
-	while (nextTime <= curTime && hasdata) {
-	  if (need_sleep) usleep(5000);
-	  hasdata = SendPacket();
-	  need_sleep = 1;
-	  packets ++;
-	  nextTime += upp;
-	  if (addSamples > 0 && packets % SPEEDUP_SCALE == 0) {
-	    addSamples -= spp;
-	    usleep(5000);
-	    hasdata = SendPacket();
-	    packets ++;
-	  }
-	}
-      }
-    }
-    curTime = nextTime - curTime;
-    if (curTime > 5000000) curTime = 5000000; /* limit on 5 second weit time
-						 in case error happens */
-    tval.tv_sec = curTime / 1000000;
-    tval.tv_usec = curTime % 1000000;
-    FD_ZERO(&read_mask);
-    FD_SET(serviceSocket, &read_mask);
-    FD_SET(audioSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(nfds, (int *)&read_mask, NULL, NULL, hasdata ? &tval : NULL) == -1)
-#else
-    if (select(nfds, &read_mask, NULL, NULL, hasdata ? &tval : NULL) == -1)
-#endif
-    {
-      if (errno == EINTR)
-        continue;
-      perror("AS error on select reading or writing");
-      return(-1);
-    }
-    if (FD_ISSET(serviceSocket, &read_mask)){  /* STOP, SPEED, or CLOSE*/
-      unsigned char tmp;
-      result = CmdRead((char *)&tmp, 1);
-      if (result != 0)
-        return result;
-      switch (tmp)
-      {
-      case CmdSPEED:
-	{
-	  SPEEDaudioPara para;
-	  result = CmdRead((char *)&para, sizeof(para));
-          if (result != 0)
-            return result;
-#ifdef NeedByteOrderConversion
-	  para.sn = ntohl(para.sn);
-	  para.samplesPerSecond = ntohl(para.samplesPerSecond);
-	  para.samplesPerPacket = ntohl(para.samplesPerPacket);
-	  para.spslimit = ntohl(para.spslimit);
-#endif
-	  sps  = para.samplesPerSecond;
-	  spslimit = para.spslimit;
-	  spp = para.samplesPerPacket;
-	  if (spp * audioPara.bytesPerSample > databuf_size) {
-	    spp = databuf_size / audioPara.bytesPerSample;
-	  }
-	  delta_sps = 0;  /* reset compensation value */
-	  upp = (int)(1000000.0 / ((double)sps / (double)spp));
-	  /*
-	  SFprintf(stderr, "AS got CmdSPEED: sps %d\n", sps);
-	  */
-	}
-	break;
-      case CmdSTOP:
-	{
-	  int val;
-	  cmd = tmp;
-	  /*
-	     fprintf(stderr, "AS: CmdSTOP. . .\n");
-	     */
-	  result = CmdRead((char *)&val, sizeof(int));
-          if (result != 0)
-            return result;
-	  /*
-	  CmdWrite(AUDIO_STOP_PATTERN, strlen(AUDIO_STOP_PATTERN));
-	  */
-	  if (live_source) {
-	    StopPlayLiveAudio();
-	  }
-	  return 0;  /* return from PLAYaudio() */
-	}
-      case CmdCLOSE:
-	if (live_source) {
-	  StopPlayLiveAudio();
-	}
-	return(1);  /* The whole AS session terminates */
-      default:
-	if (live_source) {
-	  StopPlayLiveAudio();
-	}
-	fprintf(stderr, "AS error: cmd=%d while expects STOP/SPEED/CLOSE.\n", tmp);
-	return(-1);
-      }
-    }
-    
-    if (FD_ISSET(audioSocket, &read_mask)){  /* Feedback packet */
-      int bytes, len;
-      for (;;) {
-	if (conn_tag >= 0) {
-	  len = wait_read_bytes(audioSocket, (char *)fbpara, sizeof(*fbpara));
-	  if (len == 0) return(1); /* connection broken */
-	  else if (len < 0) { /* unexpected error */
-	    perror("AS read1 FB");
-	    return(-1);
-	  }
-	}
-	else { /* discard mode packet stream, read the whole packet */
-	  len = read(audioSocket, (char *)fbpara,  FBBUF_SIZE);
-	}
-	if (len == -1) {
-	  if (errno == EINTR) continue; /* interrupt */
-	  else {
-	    if (errno != EPIPE && errno != ECONNRESET) perror("AS failed to read() fbmsg header");
-	    break;
-	  }
-	}
-	break;
-      }
-      if (len < sizeof(*fbpara)) {
-	if (len > 0) fprintf(stderr,
-			 "AS warn read() len %dB < sizeof(*fbpara) %dB\n",
-			 len, sizeof(*fbpara));
-	continue;
-      }
-#ifdef NeedByteOrderConversion
-      fbpara->type = ntohl(fbpara->type);
-#endif
-      bytes = (fbpara->type > 0) ?
-              sizeof(APdescriptor) * (fbpara->type - 1) :
-              0;
-      if (bytes > 0) {
-	if (conn_tag >= 0) { /* not discard mode packet stream,
-				read the rest of packet */
-	  len = wait_read_bytes(audioSocket,
-				((char *)fbpara) + sizeof(*fbpara),
-				bytes);
-	  if (len == 0) return(1); /* connection broken */
-	  else if (len < 0) { /* unexpected error */
-	    perror("AS read2 FB");
-	    return(-1);
-	  }
-	  len += sizeof(*fbpara);
-	}
-      }
-      bytes += sizeof(*fbpara);
-      if (len < bytes) {
-	if (len > 0) fprintf(stderr,
-			     "AS only read partial FBpacket, %dB out of %dB.\n",
-			     len, bytes);
-	continue;
-      }
-      if (live_source) {  /* ignore all feedback messags for live source */
-	continue;
-      }
-      
-#ifdef NeedByteOrderConversion
-      fbpara->cmdsn = ntohl(fbpara->cmdsn);
-#endif
-      if (len != sizeof(*fbpara) +
-	  (fbpara->type ? (fbpara->type -1) * sizeof(APdescriptor) : 0)) {
-	/* unknown message, discard */
-	SFprintf(stderr, "AS Unkown fb msg: len = %d, type = %d\n",
-		len, fbpara->type);
-	continue;
-      }
-      if (fbpara->cmdsn != cmdsn) {  /* discard the outdated message */
-	continue;
-      }
-#ifdef NeedByteOrderConversion
-      {
-	int i, * ptr = (int *)fbpara + 2;
-	for (i = 0; i < (len >> 2) - 2; i++) *ptr = ntohl(*ptr);
-      }
-#endif
-      if (fbpara->type == 0) { /* feedback message */
-	/*
-	SFprintf(stderr, "AS got fbmsg: addsamples %d, addsps %d\n",
-		fbpara->data.fb.addSamples, fbpara->data.fb.addsps);
-	*/
-	addSamples += fbpara->data.fb.addSamples;
-	if (fbpara->data.fb.addsps) {
-	  delta_sps += fbpara->data.fb.addsps;
-	  upp = (int)(1000000.0 / ((double)(sps + delta_sps) / (double)spp));
-	}
-      }
-      else { /* resend requests */
-	APdescriptor * req = &(fbpara->data.ap);
-	int i;
-	/*
-	SFprintf(stderr, "AS got %d resend reqs\n", fbpara->type);
-	*/
-	for (i = 0; i < fbpara->type; i ++) {
-	  ResendPacket(req->firstSample, req->samples);
-	  req ++;
-	}
-      }
-    }
-  }
-}
-
-static void on_exit_routine(void)
-{
-  struct sockaddr_in peeraddr_in;
-  int size = sizeof(peeraddr_in);
-  
-  /*
-  fprintf(stderr, "An AS session terminated\n");
-  */
-  if (getpeername(serviceSocket,
-		  (struct sockaddr *)&peeraddr_in, &size) == 0 &&
-      peeraddr_in.sin_family == AF_INET) {
-    if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
-      struct hostent *hp;
-      time_t val = time(NULL);
-      char * buf = ctime(&start_time);
-
-      hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
-      buf[strlen(buf)-1] = 0;
-      printf("%s: %s %3dm%02ds %dB %s\n",
-	     buf,
-	     hp == NULL ? inet_ntoa(peeraddr_in.sin_addr) : hp->h_name,
-	     (val - start_time) / 60, (val - start_time) % 60,
-	     bytes_sent, audioFile);
-    }
-  }
-  ComCloseConn(serviceSocket);
-  ComCloseConn(audioSocket);
-}
-
-int AudioServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
-{
-  int result;
-  
-  serviceSocket = ctr_fd;
-  audioSocket = data_fd;
-  conn_tag = max_pkt_size;
-
-  if (max_pkt_size < 0) max_pkt_size = -max_pkt_size;
-  else if (max_pkt_size == 0) max_pkt_size = 1024 * 1024;
-  
-  start_time = time(NULL);
-  
-  atexit(on_exit_routine);
-
-  result = INITaudio();
-
-  if (result != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) AudioServer: "),
-                      result);
-
-  fbpara = (AudioFeedBackPara *)malloc(FBBUF_SIZE);
-  if (fbpara == NULL) {
-    perror("AS failed to allocate mem for fbpara");
-    return (-1);
-  }
-
-  databuf_size = max_pkt_size - sizeof(*pktbuf);
-  if (databuf_size > DATABUF_SIZE) databuf_size = DATABUF_SIZE;
-  
-  pktbuf = (AudioPacket *)malloc(sizeof(*pktbuf) + databuf_size);
-  if (pktbuf == NULL) {
-    perror("AS failed to allocate mem for pktbuf");
-    return(-1);
-  }
-
-  for (;;)
-  {
-    /*
-    fprintf(stderr, "AS: waiting for a new command...\n");
-    */
-    result = CmdRead((char *)&cmd, 1);
-    if (result != 0)
-      return result;
-    switch (cmd)
-    {
-    case CmdPLAY:
-      result = PLAYaudio();
-      if (result != 0)
-        return result;
-      break;
-    case CmdCLOSE:
-      /*
-      fprintf(stderr, "a session closed.\n");
-      */
-      return(0);
-      break;
-    default:
-      fprintf(stderr, "audio channel command %d not recoganizeable\n", cmd);
-      break;
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp
deleted file mode 100644
index 3460aa34a3c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#if 1
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <time.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "include/common.h"
-#include "server_proto.h"
-
-#ifdef LIVE_AUDIO
-
-#include <AF/AFlib.h>
-#include <AF/AFUtils.h>
-
-static AFAudioConn *aud;
-static AC ac;
-static AFSetACAttributes attributes;
-static int bps;
-static int nextSample;
-static audioActive = 0;
-
-/*
- * Find a suitable default device
- * Returns -1 if no suitable device can be found.
- */
-static int FindDefaultDevice(AFAudioConn *aud)
-{
-  AFDeviceDescriptor *audioDevice;
-  int i;
-  for(i=0; i<ANumberOfAudioDevices(aud); i++)
-  {
-    audioDevice = AAudioDeviceDescriptor(aud, i);
-    if(audioDevice->inputsFromPhone == 0 && audioDevice->outputsToPhone == 0)
-    return i;
-  }
-  return -1;
-}
-#endif
-
-
-int OpenLiveAudio(AudioParameter * ap)
-{
-#ifndef LIVE_AUDIO
-  return -1;
-#else
-  int device;
-  int gain;
-  unsigned int channels;
-  int endianflag = 0;
-
-  if (!audioActive) return -1;
-  
-  device = -1;
-  attributes.rec_gain =  0;
-  attributes.type = UNKNOWN_ENCODETYPE;
-
-  if ( (aud = AFOpenAudioConn(NULL)) == NULL)
-  {
-    fprintf(stderr, "SA error: fails to open default AF connection.\n");
-    return -1;
-  }
-  
-  /* set up audio context, find sample size and sample rate
-     At this time, we only support default setings */
-  device = FindDefaultDevice(aud);
-  attributes.type = aud->devices[device].playBufType;
-  ac = AFCreateAC(aud, device,
-		  ACRecordGain | ACEncodingType | endianflag, 
-		  &attributes);
-  if (ac == NULL)
-  {
-    perror("AS error: failed to create ac");
-    AFCloseAudioConn(aud);
-    return -1;
-  }
-  if (attributes.type == ap->encodeType) {
-    bps = ap->bytesPerSample;
-    return 0;
-  }
-  else {
-    fprintf(stderr, "AS error: encodeType %d, client encodeType %d\n",
-	    attributes.type, ap->encodeType);
-    return -1;
-  }
-#endif
-}
-
-void StartPlayLiveAudio(void)
-{
-#ifndef LIVE_AUDIO
-  return;
-#else
-  nextSample = AFGetTime(ac);
-  SFprintf(stderr, "LAS nextSample %d\n", nextSample);
-  return;
-#endif
-}
-
-void StopPlayLiveAudio(void)
-{
-#ifndef LIVE_AUDIO
-  return;
-#else
-  return;
-#endif
-}
-
-int ReadLiveAudioSamples(char * buf, int samples)
-{
-#ifndef LIVE_AUDIO
-  return 0;
-#else
-  /*
-  SFprintf(stderr, "LAS to read %d bytes\n", samples * bps);
-  */
-  AFRecordSamples(ac, nextSample, samples * bps, (unsigned char *)buf, ABlock);
-  nextSample += samples;
-  /*
-  SFprintf(stderr, "LAS read live %d samples\n", samples);
-  */
-  return samples;
-#endif
-}
-
-#endif
-
-#if 0
-
-/* Following is a version using /dev/audio directly, since /dev/audio can't be
-   shared by different sessions, at most one session can be served. */
-
-#include <stdio.h>
-#include <errno.h>
-/*
-#include <sys/types.h>
-#include <sys/socket.h>
-*/
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/filio.h>
-#include <sys/stropts.h>
-
-#include <time.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-static int sunfd1;
-static int bps;
-static int nextSample;
-
-
-int OpenLiveAudio(AudioParameter * ap)
-{
-  if (!audioActive) return -1;
-  
-  if ((sunfd1 = open("/dev/audio", O_RDONLY, 0)) < 0) {
-    fprintf(stderr, "dda can't open /dev/audio, errno message \" %d \"\n", 
-	   errno);
-    return -1;
-  }
-  bps = ap->bytesPerSample;
-  ioctl(sunfd1, I_FLUSH, FLUSHR);
-  return 0;
-}
-
-void StartPlayLiveAudio(void)
-{
-  ioctl(sunfd1, I_FLUSH, FLUSHR);
-}
-
-void StopPlayLiveAudio(void)
-{
-}
-
-int ReadLiveAudioSamples(char * buf, int samples)
-{
-  int bytes = samples * bps;
-  int len = read(sunfd1, buf, bytes);
-  if (len != bytes) {
-    fprintf(stderr, "ReadLive: need %d samples (%dB), read %dB\n",
-	    samples, bytes, len);
-    return len / bps;
-  }
-  return samples;
-}
-
-#endif
-
-int InitLiveAudio(int argc, char ** argv)
-{
-#ifndef LIVE_AUDIO
-  return -1;
-#else
-  
-  audioActive = 1;
-  
-  fprintf(stderr, "LAS initialized.\n");
-  return 0;
-#endif
-}
-
-void ExitLiveAudio(void)
-{
-  return;
-}
-
-void LeaveLiveAudio(void)
-{
-  return;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp
deleted file mode 100644
index 96390dbc218..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#include <stdio.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <time.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-
-#include "include/common.h" 
-#include "mpeg_shared/routine.h"
-#include "server_proto.h"
-
-#ifdef LIVE_VIDEO
-#include "lvs_shared.h"
-
-LvsSharedData * shared = NULL;
-static int lvspid = -1;  /* -1: no lvs, 0 - lvs child,  >0 - vs proc */
-static int prefid = -1, first_fid, first_frame;
-static int curbuf;
-
-#define PID_FILE "~/.vcr/lvsPid"
-#define QUALITY_FILE "~/.vcr/lvsQuality"
-
-static int count = 0;
-static unsigned session_time;
-
-static int curpid = 0;
-
-static void on_exit_routine(void)
-{
-  char buf[256];
-  if (getpid() != curpid) return;
-  get_full_path(PID_FILE, buf, 256);
-  unlink(buf);
-}
-
-static void register_pid(void)
-{
-  char buf[256];
-  FILE *fp;
-  get_full_path(PID_FILE, buf, 256);
-  fp = fopen(buf, "w");
-  fprintf(fp, "%d -- pid of current VS process\n", getpid());
-  fclose(fp);
-}
-
-static void set_quality_level(void)
-{
-  char buf[256];
-  FILE *fp;
-  int qos = -1;
-  get_full_path(QUALITY_FILE, buf, 256);
-  fp = fopen(buf, "r");
-  if (fp == NULL) return;
-  
-  fscanf(fp, "%d", &qos);
-  fclose(fp);
-  if (qos >= 0 && qos <= 100) {
-    shared->qos_val = qos;
-  }
-}
-
-static void hup_handler(int status)
-{
-  setsignal(SIGHUP, SIG_IGN);
-  if (getpid() != curpid) return;
-  set_quality_level();
-  setsignal(SIGHUP, hup_handler);
-}
-
-#endif
-
-int InitLiveVideo(int argc, char ** argv)  /* -1 -- failed, 0 - succ */
-{
-#ifndef LIVE_VIDEO
-  return -1;
-#else
-/*
-#define BUFSIZE 768 * 576 * 3 / 8
-#define BUFSIZE 640 * 480 * 3 / 2
-*/
-#define BUFSIZE 1024 * 1024
-  
-  char * buf = creat_shared_mem(BUFSIZE);
-  int sid = creat_semaphore();
-  int susid = creat_semaphore();
-
-  enter_cs(susid);
-  
-  shared = (LvsSharedData *)buf;
-  shared->sid = sid;
-  shared->susid = susid;
-  shared->initState = 0;
-  shared->bufDataBytes = BUFSIZE - sizeof(*shared);
-  shared->buf = (LvsBuffer *)((char *)shared + sizeof(*shared));
-
-  register_pid();
-  set_quality_level();
-  
-  /* all other fields to be initialized by LVS process */
-
-  while ((lvspid = fork()) == -1);
-
-  if (lvspid == 0) { /* child process, reading from camera */
-    LiveVideoProcess(argc, argv);
-    exit(1);
-  }
-
-  while (shared->initState == 0) usleep(100000);  /* wait for SunVideo to init */
-
-  if (shared->initState == -1) {
-    fprintf(stderr, "LVS error: init of child process failed\n");
-    kill(lvspid, SIGINT);
-    remove_shared_mem(buf);
-    remove_semaphore(sid);
-    remove_semaphore(susid);
-    lvspid = -1;
-    return -1;
-  }
-  else {
-    
-    fprintf(stderr, "LVS initialized.\n");
-
-    curpid = getpid();
-    
-    atexit(on_exit_routine);
-
-    setsignal(SIGHUP, hup_handler);
-  
-    return 0;
-  }
-#endif
-}
-
-void LeaveLiveVideo(void)
-{
-#ifndef LIVE_VIDEO
-  return;
-#else
-  if (lvspid == -1) return;
-  remove_shared_mem((char *)shared);
-  shared = NULL;
-#endif
-}
-
-void ExitLiveVideo(void)
-{
-#ifndef LIVE_VIDEO
-  return;
-#else
-  if (lvspid == -1) return;
-  kill(lvspid, SIGINT);
-  remove_semaphore(shared->sid);
-  remove_semaphore(shared->susid);
-  remove_shared_mem((char *)shared);
-  lvspid = -1;
-  shared = NULL;
-#endif
-}
-
-int OpenLiveVideo(int * format,
-		  int * width, int * height,
-		  int * averageFrameSize,
-		  double * fps,
-		  int * pelAspectRatio  /* MPEG1 encoding used here */
-		  )                     /* -1 -- failed, 0 - succ */
-{
-#ifndef LIVE_VIDEO
-  return -1;
-#else
-  if (lvspid == -1) return -1;
-  *format = shared->format;
-  *width = shared->width;
-  *height = shared->height;
-  *averageFrameSize = shared->averageFrameSize;
-  *fps = shared->fps;
-  *pelAspectRatio = shared->pelAspectRatio;
-  
-  fprintf(stderr, "LVS session %d opened.\n", getpid());
-  
-  return 0;
-#endif
-}
-
-void StartPlayLiveVideo(void)
-{
-#ifndef LIVE_VIDEO
-  return;
-#else
-  if (lvspid == -1) return;
-
-  count = 0;
-  session_time = get_msec();
-  
-  enter_cs(shared->sid);
-  
-  prefid = -1;
-  first_fid = -1;
-  first_frame = -1;
-  
-  if (shared->activeSessions <= 0) shared->activeSessions = 1;
-  else shared->activeSessions ++;
-  
-  leave_cs(shared->sid);
-
-  while (shared->curbuf <= shared->wait_curbuf) {
-    /*
-    fprintf(stderr, "curbuf %d, wait_curbuf %d\n",
-	    shared->curbuf, shared->wait_curbuf);
-    */
-    usleep(10000);
-  }
-  
-  fprintf(stderr, "LVS session %d started\n", getpid());
-  
-  return;
-#endif
-}
-
-void StopPlayLiveVideo(void)
-{
-#ifndef LIVE_VIDEO
-  return;
-#else
-  if (lvspid == -1) return;
-  enter_cs(shared->sid);
-  shared->activeSessions --;
-  leave_cs(shared->sid);
-  
-  fprintf(stderr, "LVS session %d stopped, at %5.2f fps.\n", getpid(),
-	  ((double)count * 1000.0) / get_duration(session_time, get_msec()));
-  
-  return;
-#endif
-}
-
-#if 1
-int ReadLiveVideoPicture(int * frame, char * buf, int size) /* ret # bytes */
-{
-#ifndef LIVE_VIDEO
-  return 0;
-#else
-  int pframe = * frame;
-  int ssize;
-  int bufptr;
-  
-  if (lvspid == -1) return 0;
-
-  if (first_frame == -1) {  /* first frame in current session */
-    curbuf = shared->curbuf - 1;
-    bufptr = curbuf % shared->bufnum;
-    enter_cs(shared->sid);
-  }
-  else {
-    int bufnum = shared->bufnum < 3 ? shared->bufnum : 3;
-    do {
-      curbuf ++;
-      if (curbuf <= shared->curbuf - bufnum) {
-	/*
-	fprintf(stderr, "LVS session %d skipped %d buffers\n",
-		getpid(), shared->curbuf - bufnum + 1 - curbuf);
-	*/
-	curbuf = shared->curbuf - bufnum + 1;
-      }
-      bufptr = curbuf % shared->bufnum;
-      while (shared->buf[bufptr].fid <= prefid) {
-	/*
-	fprintf(stderr,
-		"LVS session %d wait: curbuf %d, shared->curbuf %d, prefid %d, shared->fid %d\n",
-		getpid(), curbuf, shared->curbuf, prefid, shared->buf[bufptr].fid);
-	*/
-	enter_cs(shared->sid);
-	shared->suscount ++;
-	leave_cs(shared->sid);
-	enter_cs(shared->susid);
-      }
-    } while (pframe > first_frame + (shared->buf[bufptr].fid - first_fid));
-    
-    enter_cs(shared->sid);
-    /*
-    fprintf(stderr, "pframe %d, aframe %d\n",
-	    pframe, first_frame + (shared->buf[bufptr].fid - first_fid));
-    */
-  }
-  shared->buf[bufptr].refcnt ++;
-  leave_cs(shared->sid);
-  
-  ssize = shared->buf[bufptr].size;
-
-  ssize = (ssize < size ? ssize : size);
-  memcpy(buf, shared->buf[bufptr].data, ssize);
-
-  enter_cs(shared->sid);
-
-  shared->buf[bufptr].refcnt --;
-  prefid = shared->buf[bufptr].fid;
-  if (first_frame == -1) {
-    first_fid = prefid;
-    first_frame = * frame;
-  }
-  else {
-    * frame = first_frame + (prefid - first_fid);
-  }
-  leave_cs(shared->sid);
-  /*
-  fprintf(stderr,
-	  "LVS session %d read curbuf %d fid %d, frame %d size %d (ffid %d, fframe %d)\n",
-	  getpid(), curbuf, prefid, *frame, ssize, first_fid, first_frame);
-  */
-  /*
-  fprintf(stderr, "LVS read fid %d, frame %d\n", prefid, *frame);
-  */
-  count ++;
-  return ssize;
-#endif
-}
-#endif
-
-#if 0
-/* following version is for testing the speed of the vcr path, excluding the
-   xil stuff */
-
-static long start_time;
-
-int ReadLiveVideoPicture(int * frame, char * buf, int size) /* ret # bytes */
-{
-#ifndef LIVE_VIDEO
-  return 0;
-#else
-  int pframe = * frame;
-  int ssize;
-  char * sbuf;
-  if (lvspid == -1) return 0;
-
- loop_begin:
-  /*
-  enter_cs(shared->sid);
-  */
-  if (first_frame == -1) {
-    first_frame = *frame;
-    first_fid = shared->fid;
-    start_time = get_msec();
-  }
-  else {
-    int f = first_frame + ((double)get_duration(start_time, get_msec()) /
-			    ((double)1000.0 / (double)shared->fps));
-    if (f < *frame) {
-      
-      leave_cs(shared->sid);
-      /*
-      fprintf(stderr, "f=%d < *frame=%d\n", f, *frame);
-      */
-      usleep(10000);
-      goto loop_begin;
-    }
-    *frame = f;
-  }
-  
-  prefid = shared->fid;
-  sbuf = shared->buf[shared->curbuf].data;
-  ssize = shared->buf[shared->curbuf].size;
-
-  ssize = (ssize < size ? ssize : size);
-  memcpy(buf, sbuf, ssize);
-  /*
-  leave_cs(shared->sid);
-  */
-  /*
-  fprintf(stderr, "LVS read fid %d, frame %d size %d (ffid %d, fframe %d)\n",
-	  shared->fid, *frame, ssize, first_fid, first_frame);
-  */
-  count ++;
-  return ssize;
-#endif
-}
-#endif
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h
deleted file mode 100644
index 12aab8421c5..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-#include "Globals.h"
-
-/* las.c */
-int InitLiveAudio(int argc, char ** argv); /* -1 -- failed, 0 - succ */
-void LeaveLiveAudio(void);
-             /* each child forked not doing live audio should call this */
-void ExitLiveAudio(void);
-int OpenLiveAudio(AudioParameter * ap);  /* -1 -- failed, 0 - succ */
-void StartPlayLiveAudio(void);
-void StopPlayLiveAudio(void);
-int ReadLiveAudioSamples(char * buf, int samples); /* ret # samples */
-
-/* lvs.c */
-
-int InitLiveVideo(int argc, char ** argv);  /* -1 -- failed, 0 - succ */
-void LeaveLiveVideo(void);
-             /* each child forked not doing live video should call this */
-void ExitLiveVideo(void);
-int OpenLiveVideo(int * format,
-		  int * width, int * height,
-		  int * averageFrameSize,
-		  double * fps,
-		  int * pelAspactRatio  /* MPEG1 encoding used here */
-		  );   /* -1 -- failed, 0 - succ */
-void StartPlayLiveVideo(void);
-void StopPlayLiveVideo(void);
-int ReadLiveVideoPicture(int * frame, char * buf, int size); /* ret # bytes */
-
-/*from camera driver definitions */
-
-int LiveVideoProcess(int argc, char ** argv);
-
-/* as.c */
-int AudioServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size);
-
-/* vs.c */
-int VideoServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
deleted file mode 100644
index 69ae6898adb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
+++ /dev/null
@@ -1,2205 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-
-#include "include/common.h"
-#include "mpeg_shared/routine.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"   
-#include "mpeg_shared/sendpt.h"
-#include "server_proto.h"
-
-
-// %% Move all these functions to the VIDEO_SINGLETON class and remove
-// zombie code like VideoServer ()...
-static int CmdRead(char *buf, int psize)
-{
-  int res = wait_read_bytes (VIDEO_SINGLETON::instance ()->serviceSocket, 
-                             buf, 
-                             psize);
-  if (res == 0) return(1);
-  if (res == -1) {
-    fprintf(stderr, "VS error on read VIDEO_SINGLETON::instance ()->cmdSocket, size %d", psize);
-    perror("");
-    return(-1);
-  }
-  return 0;
-}
-
-static void CmdWrite(char *buf, int size)
-{
-  int res = wait_write_bytes(VIDEO_SINGLETON::instance ()->serviceSocket, buf, size);
-  if (res == -1) {
-    if (errno != EPIPE) perror("VS writes to VIDEO_SINGLETON::instance ()->serviceSocket");
-    exit(errno != EPIPE);
-  }
-}
-
-int FBread(char * buf, int size)
-{ int res;
-  while ((res = (VIDEO_SINGLETON::instance ()->conn_tag >= 0 ? wait_read_bytes(VIDEO_SINGLETON::instance ()->videoSocket, buf, size) :
-		 read(VIDEO_SINGLETON::instance ()->videoSocket, buf, size))) == -1)
-  {
-    if (errno == EINTR) {errno = 0; continue; }
-    if (errno == EPIPE || errno == ECONNRESET) exit(0);
-    perror("VS reads Feedback VIDEO_SINGLETON::instance ()->packet");
-    return -1;
-  }
-  if (res < size) {
-    if (res) fprintf(stderr, "VS warn: FBread() res %dB < size %dB\n", res, size);
-    return -1;
-  }
-  return 0;
-}
-
-
-/* send a given VIDEO_SINGLETON::instance ()->packet pointed by 'VIDEO_SINGLETON::instance ()->packet' to the network */
-
-int send_to_network(int timeToUse)
-{
-  int count = 0;
-  VideoMessage * msghd = (VideoMessage *)(((char *)VIDEO_SINGLETON::instance ()->packet) - sizeof(VideoMessage));
-  int sent = 0;
-  int packetSize = ntohl(VIDEO_SINGLETON::instance ()->packet->dataBytes);
-
-  msghd->packetsn = htonl(VIDEO_SINGLETON::instance ()->packetsn ++);
-  msghd->packetSize = htonl(packetSize + sizeof(* VIDEO_SINGLETON::instance ()->packet));
-  /*
-  fprintf(stderr, "VS to send pkt %d of size %d.\n",
-		  ntohl(msghd->VIDEO_SINGLETON::instance ()->packetsn), ntohl(msghd->VIDEO_SINGLETON::instance ()->packetSize));
-  */
-  {
-    VideoMessage * msg = NULL;
-    int size = packetSize + sizeof(* VIDEO_SINGLETON::instance ()->packet);  /* msghd->VIDEO_SINGLETON::instance ()->packetSize */
-    int offset = 0;
-    int targetTime;
-    
-    if (size > VIDEO_SINGLETON::instance ()->msgsize)
-    {
-
-      if (!timeToUse)
-      {
-	timeToUse = (VIDEO_SINGLETON::instance ()->msgsize + sizeof(*msg) + 28) * 2;
-	    /*
-	       set the max network as 500KB.
-	       28 - UDP header size
-	    */
-	/*
-	fprintf(stderr, "computed timeToUse %d. ", timeToUse);
-	*/
-      }
-      else
-      {
-	timeToUse = (timeToUse  * 7) >> 3;
-	/*
-	fprintf(stderr, "preset timeToUse %d.", timeToUse);
-	*/
-	timeToUse /= (size + VIDEO_SINGLETON::instance ()->msgsize - 1) / VIDEO_SINGLETON::instance ()->msgsize;
-	timeToUse = min(timeToUse, (VIDEO_SINGLETON::instance ()->msgsize + sizeof(*msg) + 28) * 100);
-	/* limit min network bandwidth = 10K */
-      }
-
-    }
-    while (size > 0)
-    {
-      int segsize, sentsize;
-      int resent = 0;
-      
-      if (msg == NULL) { /* first message for current VIDEO_SINGLETON::instance ()->packet */
-	count = 0;
-	msg = msghd;
-	targetTime =  get_usec();
-      }
-      else {
-#if 0
-	/* the select() is not precise enough for being used here*/
-	int sleepTime;
-	targetTime += timeToUse;
-	sleepTime = get_duration(get_usec(), targetTime);
-	if (sleepTime >= 5000) {  /* resolution of timer is 10,000 usec */
-	  usleep(sleepTime); /* not first message, wait for a while */
-	}
-#endif
-	/*
-	count ++;
-	if (!(count % 10)) usleep(10000);
-	*/
-	msg = (VideoMessage *)((char *)msg + VIDEO_SINGLETON::instance ()->msgsize);
-	memcpy((char *)msg, (char *)msghd, sizeof(* msg));
-      }
-      msg->msgsn = htonl(VIDEO_SINGLETON::instance ()->msgsn++);
-      msg->msgOffset = htonl(offset);
-      msg->msgSize = htonl(min(size, VIDEO_SINGLETON::instance ()->msgsize));
-
-      segsize = min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg);
-      if (VIDEO_SINGLETON::instance ()->conn_tag != 0) {  /* VIDEO_SINGLETON::instance ()->packet stream */
-	while ((sentsize = write(VIDEO_SINGLETON::instance ()->videoSocket, (char *)msg, segsize)) == -1) {
-	  if (errno == EINTR)
-	    continue;
-	  if (errno == ENOBUFS) {
-	    if (resent) {
-	      perror("Warning, pkt discarded because");
-	      sent = -1;
-	      break;
-	    }
-	    else {
-	      resent = 1;
-	      perror("VS to sleep 5ms");
-	      usleep(5000);
-	      continue;
-	    }
-	  }
-	  if (errno != EPIPE) {
-	    fprintf(stderr, "VS error on send VIDEO_SINGLETON::instance ()->packet %d of size %d ",
-		    VIDEO_SINGLETON::instance ()->msgsn-1, min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg));
-	    perror("");
-	  }
-	  exit(errno != EPIPE);
-	}
-      }
-      else {
-	sentsize = wait_write_bytes(VIDEO_SINGLETON::instance ()->videoSocket, (char *)msg, segsize);
-	if (sentsize == -1) {
-	  if (errno != EPIPE) {
-	    fprintf(stderr, "VS error on send VIDEO_SINGLETON::instance ()->packet %d of size %d ",
-		    VIDEO_SINGLETON::instance ()->msgsn-1, min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg));
-	    perror("");
-	  }
-	  exit(errno != EPIPE);
-	}
-      }
-      if (sentsize < segsize) {
-	SFprintf(stderr, "VS warning: message size %dB, sent only %dB\n",
-		segsize, sentsize);
-      }
-      if (sent == -1)
-	break;
-      /*
-      fprintf(stderr, "VS: message %d of size %d sent.\n",
-	      VIDEO_SINGLETON::instance ()->msgsn-1, min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg));
-      */
-      size -= VIDEO_SINGLETON::instance ()->msgsize;
-      offset += VIDEO_SINGLETON::instance ()->msgsize;
-    }
-  }
-  /*
-  fprintf(stderr, "sent = %d\n", sent);
-  */
-  if (!sent) VIDEO_SINGLETON::instance ()->pkts_sent ++;
-  return sent;
-}
-
-/*
-   * send a VIDEO_SINGLETON::instance ()->packet with given VIDEO_SINGLETON::instance ()->systemHeader (optional), gop (optional) and frame.
-   *
-   * sh - system header id, if -1, then no system header will be sent.
-   *      otherwise, only when frame == 0, the given system header will be sent.
-   * gop - group of pictures, gop header will be sent when frame == 0
-   *       (first I frame );
-   * frame - frame to be sent, offset internal to given gop.
-   */
-
-/* returns: 0 - VIDEO_SINGLETON::instance ()->packet sent, -1 - VIDEO_SINGLETON::instance ()->packet not sent (failed) */
-static int SendPacket(int shtag, int gop, int frame, int timeToUse)
-/* frame maybe out of range (PLAY, STEP), in this case, END_SEQ is sent
-   to force display of last frame in VD */
-{
-  char * buf = ((char *) VIDEO_SINGLETON::instance ()->packet) + sizeof(VideoPacket);
-  int f = VIDEO_SINGLETON::instance ()->gopTable[gop].previousFrames + frame;
-  int sh = VIDEO_SINGLETON::instance ()->gopTable[gop].systemHeader;
-  /*
-  SFprintf(stderr, "VS to send VIDEO_SINGLETON::instance ()->packet gop-%d, frame-%d.\n", gop, frame);
-  */
-
-  VIDEO_SINGLETON::instance ()->packet->currentUPF = ntohl(VIDEO_SINGLETON::instance ()->currentUPF);
-
-  if (frame >= VIDEO_SINGLETON::instance ()->gopTable[gop].totalFrames)
-  {
-    VIDEO_SINGLETON::instance ()->packet->cmd = htonl(VIDEO_SINGLETON::instance ()->cmd);
-    VIDEO_SINGLETON::instance ()->packet->cmdsn = htonl(VIDEO_SINGLETON::instance ()->cmdsn);
-    VIDEO_SINGLETON::instance ()->packet->sh = htonl(sh);
-    VIDEO_SINGLETON::instance ()->packet->gop = htonl(gop);
-    VIDEO_SINGLETON::instance ()->packet->frame = htonl(VIDEO_SINGLETON::instance ()->numF);
-    VIDEO_SINGLETON::instance ()->packet->display = htonl(VIDEO_SINGLETON::instance ()->numF-1);
-    VIDEO_SINGLETON::instance ()->packet->future = htonl((unsigned)-1);
-    VIDEO_SINGLETON::instance ()->packet->past = htonl((unsigned)-1);
-    VIDEO_SINGLETON::instance ()->packet->dataBytes = htonl(4);
-    *(int*)((char*)VIDEO_SINGLETON::instance ()->packet + sizeof(*VIDEO_SINGLETON::instance ()->packet)) = htonl(SEQ_END_CODE);
-
-    return send_to_network(timeToUse);
-  }
-
-  if (frame)
-    shtag = 0;
-  else if (VIDEO_SINGLETON::instance ()->needHeader)
-  {
-    shtag = 1;
-    VIDEO_SINGLETON::instance ()->needHeader = 0;
-  }
-  
-  VIDEO_SINGLETON::instance ()->packet->cmd = htonl(VIDEO_SINGLETON::instance ()->cmd);
-  VIDEO_SINGLETON::instance ()->packet->cmdsn = htonl(VIDEO_SINGLETON::instance ()->cmdsn);
-  VIDEO_SINGLETON::instance ()->packet->sh = htonl(sh);
-  VIDEO_SINGLETON::instance ()->packet->gop = htonl(gop);
-  VIDEO_SINGLETON::instance ()->packet->frame = htonl(f);
-  if (VIDEO_SINGLETON::instance ()->frameTable[f].type == 'B')
-  {
-    int pre1 = -1, pre2 = -1, i = f;
-    while (i>0)
-      if (VIDEO_SINGLETON::instance ()->frameTable[--i].type != 'B')
-      {
-	pre1 = i;
-	break;
-      }
-    while (i>0)
-      if (VIDEO_SINGLETON::instance ()->frameTable[--i].type != 'B')
-      {
-	pre2 = i;
-	break;
-      }
-    if (pre2 ==  -1)
-    {
-      /*
-      fprintf(stderr,
-	      "frame %d-%d (%d) is a B without past ref, no to be sent.\n",
-	      gop, frame, f);
-       */
-      return -1;
-    }
-    if (pre1 != VIDEO_SINGLETON::instance ()->lastRef[VIDEO_SINGLETON::instance ()->lastRefPtr] ||
-	pre2 != VIDEO_SINGLETON::instance ()->lastRef[1 - VIDEO_SINGLETON::instance ()->lastRefPtr])
-    {
-      /*
-      fprintf(stderr,
-	      "send of B frame %d gaveup for past %d/future %d ref not sent.\n",
-	      f, pre2, pre1);
-       */
-      return -1;
-    }
-    VIDEO_SINGLETON::instance ()->packet->display = htonl(f);
-    VIDEO_SINGLETON::instance ()->packet->future = htonl(pre1);
-    VIDEO_SINGLETON::instance ()->packet->past = htonl(pre2);
-  }
-  else
-  {
-    int next = f;
-    int pre = f;
-
-    while (next < VIDEO_SINGLETON::instance ()->numF && VIDEO_SINGLETON::instance ()->frameTable[++next].type == 'B');
-    while (pre > 0 && VIDEO_SINGLETON::instance ()->frameTable[--pre].type == 'B');
-    if (VIDEO_SINGLETON::instance ()->frameTable[f].type == 'P' && pre != VIDEO_SINGLETON::instance ()->lastRef[VIDEO_SINGLETON::instance ()->lastRefPtr])
-    {
-      /*
-      fprintf(stderr,
-	      "send of P frame %d gaveup for past ref %d not sent.\n",
-	      f, pre);
-      fprintf(stderr, "ref0=%d, ref1=%d, ptr=%d.\n",
-	      VIDEO_SINGLETON::instance ()->lastRef[0], VIDEO_SINGLETON::instance ()->lastRef[1], VIDEO_SINGLETON::instance ()->lastRefPtr);
-       */
-      return -1;
-    }
-    VIDEO_SINGLETON::instance ()->packet->display = htonl(next);
-    VIDEO_SINGLETON::instance ()->packet->future = htonl((unsigned)-1);
-    VIDEO_SINGLETON::instance ()->packet->past = htonl(VIDEO_SINGLETON::instance ()->frameTable[f].type == 'P' ? pre : (unsigned)-1);
-  }
-  {
-    char * ptr = buf;
-    int size = 0, offset = 0, i;
-    if (shtag)   /* send system header */
-    {
-      size = VIDEO_SINGLETON::instance ()->systemHeader[sh].size;
-      FileRead(VIDEO_SINGLETON::instance ()->systemHeader[sh].offset, ptr, size);
-      ptr += size;
-    }
-    if (!frame)   /* send gop header */
-    {
-      size = VIDEO_SINGLETON::instance ()->gopTable[gop].headerSize;
-      FileRead(VIDEO_SINGLETON::instance ()->gopTable[gop].offset, ptr, size);
-      ptr += size;
-    }
-    size = VIDEO_SINGLETON::instance ()->frameTable[f].size;
-    for (i=VIDEO_SINGLETON::instance ()->gopTable[gop].previousFrames; i<f; i++)
-      offset += VIDEO_SINGLETON::instance ()->frameTable[i].size;
-    FileRead((VIDEO_SINGLETON::instance ()->gopTable[gop].firstIoffset + offset), ptr, size);
-    ptr += size;
-    VIDEO_SINGLETON::instance ()->packet->dataBytes = htonl(ptr - buf);
-  }
-
-  {
-    int sent = send_to_network(timeToUse);
-    if (!sent)
-    {
-      /*
-      fprintf(stderr, "%c%d\n", VIDEO_SINGLETON::instance ()->frameTable[f].type, f);
-      fprintf(stderr, "%c frame %d sent.\n", VIDEO_SINGLETON::instance ()->frameTable[f].type, f);
-      */
-      if (VIDEO_SINGLETON::instance ()->frameTable[f].type != 'B')
-      {
-	VIDEO_SINGLETON::instance ()->lastRefPtr = 1 - VIDEO_SINGLETON::instance ()->lastRefPtr;
-	VIDEO_SINGLETON::instance ()->lastRef[VIDEO_SINGLETON::instance ()->lastRefPtr] = f;
-      }
-    }
-    return sent;
-  }
-}
-
-
-int SendReferences(int group, int frame)
-{
-  unsigned char orgcmd;
-  int i, base;
-  int pregroup;
-  int result;
-  
-  if (group < 0 || group >= VIDEO_SINGLETON::instance ()->numG) return 0;
-  if (frame <= 0 || frame >= VIDEO_SINGLETON::instance ()->gopTable[group].totalFrames) return 0;
-  
-  orgcmd = VIDEO_SINGLETON::instance ()->cmd;
-  VIDEO_SINGLETON::instance ()->cmd = CmdREF;
-  
-  if (group > 0) {
-    pregroup = 1;
-    base = VIDEO_SINGLETON::instance ()->gopTable[group].previousFrames;
-    for (i = 0; i <= frame; i ++) {
-      if (VIDEO_SINGLETON::instance ()->frameTable[i + base].type == 'P') {
-	pregroup = 0;
-	break;
-      }
-    }
-  }
-  else pregroup = 0;
-
-  if (pregroup) { /* reference frame can be in previous group */
-    pregroup = group -1;
-    base = VIDEO_SINGLETON::instance ()->gopTable[pregroup].previousFrames;
-    for (i = 0; i < VIDEO_SINGLETON::instance ()->gopTable[pregroup].totalFrames; i ++) {
-      if (VIDEO_SINGLETON::instance ()->frameTable[i + base].type != 'B') {
-	/*
-	SFprintf(stderr, "REF group%d, frame%d\n", pregroup, i);
-	*/
-	result = SendPacket(i == 0, pregroup, i, 0);
-        if (result != 0)
-          return result;
-      }
-    }
-  }
-
-  base = VIDEO_SINGLETON::instance ()->gopTable[group].previousFrames;
-  for (i = 0; i < frame; i ++) {
-    if (VIDEO_SINGLETON::instance ()->frameTable[i + base].type != 'B') {
-      /*
-      SFprintf(stderr, "REF group%d, frame%d\n", group, i);
-      */
-      SendPacket(i == 0, group, i, 0);
-    }
-  }
-  VIDEO_SINGLETON::instance ()->cmd = orgcmd;
-}
-
-int SendPicture(int * frame)
-{
-  int size;
-  char * buf = ((char *) VIDEO_SINGLETON::instance ()->packet) + sizeof(VideoPacket);
-  /*
-  SFprintf(stderr, "VS to send picture %d.\n", *frame);
-  */
-
-  size = ReadLiveVideoPicture(frame, buf, VIDEO_SINGLETON::instance ()->packetBufSize);
-  
-  VIDEO_SINGLETON::instance ()->packet->currentUPF = ntohl(VIDEO_SINGLETON::instance ()->currentUPF);
-  VIDEO_SINGLETON::instance ()->packet->cmd = htonl(VIDEO_SINGLETON::instance ()->cmd);
-  VIDEO_SINGLETON::instance ()->packet->cmdsn = htonl(VIDEO_SINGLETON::instance ()->cmdsn);
-  VIDEO_SINGLETON::instance ()->packet->sh = VIDEO_SINGLETON::instance ()->packet->gop = VIDEO_SINGLETON::instance ()->packet->frame = VIDEO_SINGLETON::instance ()->packet->display = htonl(*frame);
-  VIDEO_SINGLETON::instance ()->packet->future = htonl((unsigned)-1);
-  VIDEO_SINGLETON::instance ()->packet->past = htonl((unsigned)-1);
-
-  VIDEO_SINGLETON::instance ()->packet->dataBytes = htonl(size);
-
-  return send_to_network(VIDEO_SINGLETON::instance ()->currentUPF);
-}
-
-static int ReadInfoFromFile(void)
-{
-  int fd = -1, i;
-  int fnlen = strlen(VIDEO_SINGLETON::instance ()->videoFile);
-
-  strcpy(&VIDEO_SINGLETON::instance ()->videoFile[fnlen], ".Info");
-  fd = open(VIDEO_SINGLETON::instance ()->videoFile, O_RDONLY);
-  if (fd == -1)
-  {
-    fprintf(stderr, "Reminder: VS fails to open %s for read, ", VIDEO_SINGLETON::instance ()->videoFile);
-    perror("try create one");
-    goto fail_ReadInfoFromFile;
-  }
-  read_int(fd, &i);
-  if (i != VIDEO_SINGLETON::instance ()->fileSize)
-  {
-    fprintf(stderr, "Warning: VIDEO_SINGLETON::instance ()->fileSize in Info: %d not the same as actual %d.\n",
-	    i, VIDEO_SINGLETON::instance ()->fileSize);
-    goto fail_ReadInfoFromFile;
-  }
-
-  read_int(fd, &VIDEO_SINGLETON::instance ()->maxS);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->maxG);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->maxI);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->maxP);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->maxB);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->minS);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->minG);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->minI);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->minP);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->minB);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numS);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numG);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numF);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numI);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numP);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->numB);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->averageFrameSize);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->horizontalSize);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->verticalSize);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->pelAspectRatio);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->pictureRate);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->vbvBufferSize);
-  read_int(fd, &VIDEO_SINGLETON::instance ()->patternSize);
-
-  memset(VIDEO_SINGLETON::instance ()->pattern, 0, PATTERN_SIZE);
-  read_bytes(fd, VIDEO_SINGLETON::instance ()->pattern, VIDEO_SINGLETON::instance ()->patternSize);
-#ifdef STAT
-  VIDEO_SINGLETON::instance ()->framesSent = (char *)malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
-  if (VIDEO_SINGLETON::instance ()->framesSent == NULL)
-  {
-    fprintf(stderr, "Error: VS fails to alloc mem for VIDEO_SINGLETON::instance ()->framesSent for %d frames", VIDEO_SINGLETON::instance ()->numF);
-    perror("");
-    exit(1);
-  }
-#endif
-  VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
-  if (VIDEO_SINGLETON::instance ()->systemHeader == NULL)
-  {
-    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->SystemHeader");
-    exit(1);
-  }
-  VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
-  if (VIDEO_SINGLETON::instance ()->gopTable == NULL)
-  {
-    perror("Error: VS error on malloc GopHeader");
-    exit(1);
-  }
-  VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
-  if (VIDEO_SINGLETON::instance ()->frameTable == NULL)
-  {
-    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->frameTable");
-    exit(1);
-  }
-  VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->maxS + VIDEO_SINGLETON::instance ()->maxG + max(VIDEO_SINGLETON::instance ()->maxI, max(VIDEO_SINGLETON::instance ()->maxP, VIDEO_SINGLETON::instance ()->maxB));
-  VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
-				 VIDEO_SINGLETON::instance ()->packetBufSize);
-  if (VIDEO_SINGLETON::instance ()->packet == NULL)	
-  {	
-    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
-    exit(1);
-  }
-  VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
-
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numS; i ++)
-  {
-    read_int(fd, (int *)&VIDEO_SINGLETON::instance ()->systemHeader[i].offset);
-    read_int(fd, &VIDEO_SINGLETON::instance ()->systemHeader[i].size);
-  }
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numG; i ++)
-  {
-    read_int(fd, &VIDEO_SINGLETON::instance ()->gopTable[i].systemHeader);
-    read_int(fd, (int *)&VIDEO_SINGLETON::instance ()->gopTable[i].offset);
-    read_int(fd, &VIDEO_SINGLETON::instance ()->gopTable[i].headerSize);
-    read_int(fd, &VIDEO_SINGLETON::instance ()->gopTable[i].size);
-    read_int(fd, &VIDEO_SINGLETON::instance ()->gopTable[i].totalFrames);
-    read_int(fd, &VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames);
-    read_int(fd, (int *)&VIDEO_SINGLETON::instance ()->gopTable[i].firstIoffset);
-  }
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numF; i ++)
-  {
-    read_byte(fd, &VIDEO_SINGLETON::instance ()->frameTable[i].type);
-    read_short(fd, (short *)&VIDEO_SINGLETON::instance ()->frameTable[i].size);
-  }
-
-  close(fd);
-  /*
-  fprintf(stderr, "Read Info from %s\n", VIDEO_SINGLETON::instance ()->videoFile);
-  */
-  VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
-  return 0;
- fail_ReadInfoFromFile:
-  if (fd >= 0)
-    close(fd);
-  VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
-  /*
-  fprintf(stderr, "To scan Info from %s\n", VIDEO_SINGLETON::instance ()->videoFile);
-  */
-  return -1;
-}
-
-static void WriteInfoToFile(void)
-{
-  int fd = -1, i;
-  int fnlen = strlen(VIDEO_SINGLETON::instance ()->videoFile);
-
-  strcpy(&VIDEO_SINGLETON::instance ()->videoFile[fnlen], ".Info");
-  fd = open(VIDEO_SINGLETON::instance ()->videoFile, O_WRONLY | O_CREAT, 0444);
-  if (fd == -1)
-  {
-    fprintf(stderr, "VS fails to open %s for write", VIDEO_SINGLETON::instance ()->videoFile);
-    perror("");
-    goto fail_WriteInfoToFile;
-  }
-  write_int(fd, VIDEO_SINGLETON::instance ()->fileSize);
-  write_int(fd, VIDEO_SINGLETON::instance ()->maxS);
-  write_int(fd, VIDEO_SINGLETON::instance ()->maxG);
-  write_int(fd, VIDEO_SINGLETON::instance ()->maxI);
-  write_int(fd, VIDEO_SINGLETON::instance ()->maxP);
-  write_int(fd, VIDEO_SINGLETON::instance ()->maxB);
-  write_int(fd, VIDEO_SINGLETON::instance ()->minS);
-  write_int(fd, VIDEO_SINGLETON::instance ()->minG);
-  write_int(fd, VIDEO_SINGLETON::instance ()->minI);
-  write_int(fd, VIDEO_SINGLETON::instance ()->minP);
-  write_int(fd, VIDEO_SINGLETON::instance ()->minB);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numS);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numG);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numF);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numI);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numP);
-  write_int(fd, VIDEO_SINGLETON::instance ()->numB);
-  write_int(fd, VIDEO_SINGLETON::instance ()->averageFrameSize);
-  write_int(fd, VIDEO_SINGLETON::instance ()->horizontalSize);
-  write_int(fd, VIDEO_SINGLETON::instance ()->verticalSize);
-  write_int(fd, VIDEO_SINGLETON::instance ()->pelAspectRatio);
-  write_int(fd, VIDEO_SINGLETON::instance ()->pictureRate);
-  write_int(fd, VIDEO_SINGLETON::instance ()->vbvBufferSize);
-  write_int(fd, VIDEO_SINGLETON::instance ()->patternSize);
-
-  write_bytes(fd, VIDEO_SINGLETON::instance ()->pattern, VIDEO_SINGLETON::instance ()->patternSize);
-  
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numS; i ++)
-  {
-    write_int(fd, VIDEO_SINGLETON::instance ()->systemHeader[i].offset);
-    write_int(fd, VIDEO_SINGLETON::instance ()->systemHeader[i].size);
-  }
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numG; i ++)
-  {
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].systemHeader);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].offset);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].headerSize);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].size);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].totalFrames);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames);
-    write_int(fd, VIDEO_SINGLETON::instance ()->gopTable[i].firstIoffset);
-  }
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numF; i ++)
-  {
-    write_byte(fd, VIDEO_SINGLETON::instance ()->frameTable[i].type);
-    write_short(fd, VIDEO_SINGLETON::instance ()->frameTable[i].size);
-  }
-
-  close(fd);
-  VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
-  return;
- fail_WriteInfoToFile:
-  if (fd >= 0)
-    close(fd);
-  VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
-  return;
-}
-
-/*
-#define nextByte  {fileptr ++; \
-		   if (fread(&nb, 1, 1, fp) == 0) \
-		   { \
-		     perror("VS Crossed EOF or error while scanning"); \
-		     return 1; \
-		   } }
-
-*/
-
-#define nextByte  {int val; fileptr ++; \
-		   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
-		   {\
-		     perror("Crossed EOF or error while scanning"); \
-		     return 1; \
-		   } nb = val;}
-
-#define computePicSize \
-	if (inpic) \
-	{ \
-	  if (pictype == 'I') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxI = max(VIDEO_SINGLETON::instance ()->maxI, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minI = min(VIDEO_SINGLETON::instance ()->minI, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else if (pictype == 'P') \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxP = max(VIDEO_SINGLETON::instance ()->maxP, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minP = min(VIDEO_SINGLETON::instance ()->minP, (int)(fileptr - picptr - 4)); \
-	  } \
-	  else \
-	  { \
-	    VIDEO_SINGLETON::instance ()->maxB = max(VIDEO_SINGLETON::instance ()->maxB, (int)(fileptr - picptr - 4)); \
-	    VIDEO_SINGLETON::instance ()->minB = min(VIDEO_SINGLETON::instance ()->minB, (int)(fileptr - picptr - 4)); \
-	  } \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr].type = pictype; \
-	  VIDEO_SINGLETON::instance ()->frameTable[ftptr++].size = (int)(fileptr - picptr - 4); \
-	  inpic = 0; \
-	}
-
-static int init_MPEG1_video_file(void)
-{
-  unsigned char nb;
-  int state = 0;
-  unsigned long fileptr = 0;
-  unsigned long i, j, k;
-  int shptr, gopptr, ftptr;
-  int inpic = 0;
-  unsigned long picptr = 0;
-  int pictype = 0;
-  int first = 0;
-  int failureType = 0;
-  
-  VIDEO_SINGLETON::instance ()->fp = fopen(VIDEO_SINGLETON::instance ()->videoFile, "r");
-  if (VIDEO_SINGLETON::instance ()->fp == NULL)
-  {
-    fprintf(stderr, "error on opening video file %s", VIDEO_SINGLETON::instance ()->videoFile);
-    perror("");
-    return 2;
-  }
-  if (fseek(VIDEO_SINGLETON::instance ()->fp, 0, 2) == -1)
-  {
-    fprintf(stderr, "File %s not seekable", VIDEO_SINGLETON::instance ()->videoFile);
-    perror("");
-    return 3;
-  }
-  VIDEO_SINGLETON::instance ()->fileSize = ftell(VIDEO_SINGLETON::instance ()->fp);
-  
-  fseek(VIDEO_SINGLETON::instance ()->fp, 0, 0);
-
-  if (ReadInfoFromFile())
-  {
-    for (;;)
-    {
-      nextByte;
-      if (state >= 0 && nb == 0x00)
-	state ++;
-      else if (state >= 2 && nb == 0x01)
-	state = -1;
-      else if (state == -1)
-      {
-	if (!first) first ++;
-	else if (first == 1) first ++;
-
-	switch (nb)
-	{
-	case 0xb7:	/* seq_end_code */
-	  goto exit_phase1;
-	  break;
-	case 0xb3:	/* seq_start_code */
-	  if (first == 1) first = 3;
-	  if (first != 3)
-	  {
-	    fprintf(stderr, "VS error: given file is not in MPEG format.\n");
-	    return 4;
-	  }
-	  VIDEO_SINGLETON::instance ()->numS ++;
-	  break;
-	case 0xb8:	/* gop_start_code */
-	  VIDEO_SINGLETON::instance ()->numG ++;
-	  break;
-	case 0x00:	/* picture_start_code */
-	  nextByte;
-	  nextByte;
-	  nb &= 0x38;
-	  if (nb == 0x08)
-	  {
-	    VIDEO_SINGLETON::instance ()->numI ++;
-	    if (VIDEO_SINGLETON::instance ()->numG == 2)
-	      VIDEO_SINGLETON::instance ()->pattern[VIDEO_SINGLETON::instance ()->patternSize++] = 'I';
-	  }
-	  else if (nb == 0x10)
-	  {
-	    VIDEO_SINGLETON::instance ()->numP ++;
-	    if (VIDEO_SINGLETON::instance ()->numG == 2)
-	      VIDEO_SINGLETON::instance ()->pattern[VIDEO_SINGLETON::instance ()->patternSize++] = 'P';
-	  }
-	  else if (nb == 0x18)
-	  {
-	    VIDEO_SINGLETON::instance ()->numB ++;
-	    if (VIDEO_SINGLETON::instance ()->numG == 2)
-	      VIDEO_SINGLETON::instance ()->pattern[VIDEO_SINGLETON::instance ()->patternSize++] = 'B';
-	  }
-	  /*
-	  else
-	    fprintf(stderr, "VS error: unkonw picture type %d\n", nb);
-	  */
-	  break;
-	default:
-	  break;
-	}
-	state = 0;
-      }
-      else
-	state = 0;
-    }
-   exit_phase1:
-
-    if (first != 3)
-    {
-      fprintf(stderr, "VS error: given file \"%s\" is not of MPEG format.\n", VIDEO_SINGLETON::instance ()->videoFile);
-      return 4;
-    }
-
-    VIDEO_SINGLETON::instance ()->pattern[VIDEO_SINGLETON::instance ()->patternSize] = 0;
-    memset(VIDEO_SINGLETON::instance ()->sendPattern, 1, PATTERN_SIZE);
-
-    VIDEO_SINGLETON::instance ()->numF = VIDEO_SINGLETON::instance ()->numI + VIDEO_SINGLETON::instance ()->numP + VIDEO_SINGLETON::instance ()->numB;
-    VIDEO_SINGLETON::instance ()->averageFrameSize = fileptr / (unsigned)VIDEO_SINGLETON::instance ()->numF;
-    /*
-    fprintf(stderr, "Pass one finished, total bytes read: %u, average frame size %d\n",
-	    fileptr, VIDEO_SINGLETON::instance ()->averageFrameSize);
-    fprintf(stderr, "VIDEO_SINGLETON::instance ()->numS-%d, VIDEO_SINGLETON::instance ()->numG-%d, VIDEO_SINGLETON::instance ()->numF-%d, VIDEO_SINGLETON::instance ()->numI-%d, VIDEO_SINGLETON::instance ()->numP-%d, VIDEO_SINGLETON::instance ()->numB-%d\n",
-	    VIDEO_SINGLETON::instance ()->numS, VIDEO_SINGLETON::instance ()->numG, VIDEO_SINGLETON::instance ()->numI, VIDEO_SINGLETON::instance ()->numI, VIDEO_SINGLETON::instance ()->numP, VIDEO_SINGLETON::instance ()->numB);
-    fprintf(stderr, "VIDEO_SINGLETON::Instance ()->Pattern detected: %s\n", VIDEO_SINGLETON::instance ()->pattern);
-     */
-    if (VIDEO_SINGLETON::instance ()->numF > MAX_FRAMES)
-    {
-      fprintf(stderr, "VS error: VIDEO_SINGLETON::instance ()->Number of frames (%d) is bigger than MAX_FRAMES (%d).\n\
-  you need to update the constant definition in common.h and recompile.\n",
-	      VIDEO_SINGLETON::instance ()->numF, MAX_FRAMES);
-      return 5;
-    }
-
-#ifdef STAT
-    VIDEO_SINGLETON::instance ()->framesSent = (char *)malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
-    if (VIDEO_SINGLETON::instance ()->framesSent == NULL)
-    {
-      fprintf(stderr, "VS fails to alloc mem for VIDEO_SINGLETON::instance ()->framesSent for %d frames", VIDEO_SINGLETON::instance ()->numF);
-      perror("");
-      return 6;
-    }
-#endif
-
-    VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
-    if (VIDEO_SINGLETON::instance ()->systemHeader == NULL)
-    {
-      perror("VS error on malloc VIDEO_SINGLETON::instance ()->SystemHeader");
-      return 7;
-    }
-    VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
-    if (VIDEO_SINGLETON::instance ()->gopTable == NULL)
-    {
-      perror("VS error on malloc GopHeader");
-      return 8;
-    }
-    VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
-    if (VIDEO_SINGLETON::instance ()->frameTable == NULL)
-    {
-      perror("VS error on malloc VIDEO_SINGLETON::instance ()->frameTable");
-      return 9;
-    }
-
-    rewind(VIDEO_SINGLETON::instance ()->fp);
-    fileptr = 0;
-    state = 0;
-    inpic = 0;
-    shptr = -1;
-    gopptr = -1;
-    ftptr = 0;
-
-    for (;;)
-    {
-      nextByte;
-      if (state >= 0 && nb == 0x00)
-	state ++;
-      else if (state >= 2 && nb == 0x01)
-	state = -1;
-      else if (state == -1)
-      {
-	switch (nb)
-	{
-	case 0xb7:	/* seq_end_code */
-	  if (gopptr >= 0 && VIDEO_SINGLETON::instance ()->gopTable[gopptr].size == 0)
-	    VIDEO_SINGLETON::instance ()->gopTable[gopptr].size = fileptr - VIDEO_SINGLETON::instance ()->gopTable[gopptr].offset - 4;
-	  computePicSize;
-	  goto exit_phase2;
-	  break;
-	case 0xb3:	/* seq_start_code */
-	  if (gopptr >= 0 && VIDEO_SINGLETON::instance ()->gopTable[gopptr].size == 0)
-	    VIDEO_SINGLETON::instance ()->gopTable[gopptr].size = fileptr - VIDEO_SINGLETON::instance ()->gopTable[gopptr].offset - 4;
-	  computePicSize;
-	  shptr ++;
-	  VIDEO_SINGLETON::instance ()->systemHeader[shptr].offset = fileptr - 4;
-	  VIDEO_SINGLETON::instance ()->systemHeader[shptr].size = 0;
-	  break;
-	case 0xb8:	/* gop_start_code */
-	  if (VIDEO_SINGLETON::instance ()->systemHeader[shptr].size == 0)
-	     VIDEO_SINGLETON::instance ()->systemHeader[shptr].size =fileptr -  VIDEO_SINGLETON::instance ()->systemHeader[shptr].offset - 4;
-	  if (gopptr >= 0 && VIDEO_SINGLETON::instance ()->gopTable[gopptr].size == 0)
-	    VIDEO_SINGLETON::instance ()->gopTable[gopptr].size = fileptr - VIDEO_SINGLETON::instance ()->gopTable[gopptr].offset - 4;
-	  computePicSize;
-	  gopptr ++;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].systemHeader = shptr;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].offset = fileptr - 4;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize = 0;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].size = 0;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].totalFrames = 0;
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].previousFrames = gopptr ?
-	      (VIDEO_SINGLETON::instance ()->gopTable[gopptr - 1].totalFrames + VIDEO_SINGLETON::instance ()->gopTable[gopptr - 1].previousFrames) : 0;
-
-	  break;
-	case 0x00:	/* picture_start_code */
-	  if (VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize == 0)
-	  {
-	    VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize = fileptr - VIDEO_SINGLETON::instance ()->gopTable[gopptr].offset - 4;
-	    VIDEO_SINGLETON::instance ()->gopTable[gopptr].firstIoffset = fileptr - 4;
-	  }
-	  VIDEO_SINGLETON::instance ()->gopTable[gopptr].totalFrames ++;
-	  computePicSize;
-	  picptr = fileptr - 4;
-	  nextByte;
-	  nextByte;
-	  nb &= 0x38;
-	  if (nb == 0x08)
-	  {
-	    pictype = 'I';
-	    inpic = 1;
-	  }
-	  else if (nb == 0x10)
-	  {
-	    pictype = 'P';
-	    inpic = 1;
-	  }
-	  else if (nb == 0x18)
-	  {
-	    pictype = 'B';
-	    inpic = 1;
-	  }
-	  break;
-	default:
-
-	  break;
-	}
-	state = 0;
-      }
-      else
-	state = 0;
-    }
-
-  exit_phase2:
-    for (shptr = 0; shptr<VIDEO_SINGLETON::instance ()->numS; shptr++)
-    {
-      VIDEO_SINGLETON::instance ()->maxS = max(VIDEO_SINGLETON::instance ()->maxS, VIDEO_SINGLETON::instance ()->systemHeader[shptr].size);
-      VIDEO_SINGLETON::instance ()->minS = min(VIDEO_SINGLETON::instance ()->minS, VIDEO_SINGLETON::instance ()->systemHeader[shptr].size);
-    }
-    for (gopptr = 0; gopptr<VIDEO_SINGLETON::instance ()->numG; gopptr++)
-    {
-      VIDEO_SINGLETON::instance ()->maxG = max(VIDEO_SINGLETON::instance ()->maxG, VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize);
-      VIDEO_SINGLETON::instance ()->minG = min(VIDEO_SINGLETON::instance ()->minG, VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize);
-    }
-    VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->maxS + VIDEO_SINGLETON::instance ()->maxG + max(VIDEO_SINGLETON::instance ()->maxI, max(VIDEO_SINGLETON::instance ()->maxP, VIDEO_SINGLETON::instance ()->maxB));
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
-				   VIDEO_SINGLETON::instance ()->packetBufSize);
-    if (VIDEO_SINGLETON::instance ()->packet == NULL)
-    {
-      perror("VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
-      return 10;
-    }
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
-    /*
-    fprintf(stderr, "Pass 2 finished.\n");
-    fprintf(stderr, "VIDEO_SINGLETON::instance ()->maxS-%d, VIDEO_SINGLETON::instance ()->maxG-%d, VIDEO_SINGLETON::instance ()->maxI-%d, VIDEO_SINGLETON::instance ()->maxP-%d, VIDEO_SINGLETON::instance ()->maxB-%d.\n", VIDEO_SINGLETON::instance ()->maxS, VIDEO_SINGLETON::instance ()->maxG, VIDEO_SINGLETON::instance ()->maxI, VIDEO_SINGLETON::instance ()->maxP, VIDEO_SINGLETON::instance ()->maxB);
-    fprintf(stderr, "VIDEO_SINGLETON::instance ()->minS-%d, VIDEO_SINGLETON::instance ()->minG-%d, VIDEO_SINGLETON::instance ()->minI-%d, VIDEO_SINGLETON::instance ()->minP-%d, VIDEO_SINGLETON::instance ()->minB-%d.\n", VIDEO_SINGLETON::instance ()->minS, VIDEO_SINGLETON::instance ()->minG, VIDEO_SINGLETON::instance ()->minI, VIDEO_SINGLETON::instance ()->minP, VIDEO_SINGLETON::instance ()->minB);
-    */
-    /*
-    {
-      int i;
-
-      fprintf(stderr, "id: offset    size  -- system header table:\n");
-      for (i=0; i<VIDEO_SINGLETON::instance ()->numS; i++)
-	fprintf(stderr, "%-3d %-9u %d\n", i, VIDEO_SINGLETON::instance ()->systemHeader[i].offset, VIDEO_SINGLETON::instance ()->systemHeader[i].size);
-      fprintf(stderr,
-	      "id:  header   offset   hdsize   totSize  frames   preframs Ioffset  Isize -- GOP\n");
-      for (i=0; i<VIDEO_SINGLETON::instance ()->numG; i++)
-      {
-	fprintf(stderr, "%-4d %-8d %-8u %-8d %-8d %-8d %-8d %-8u %d\n",
-		i,
-		VIDEO_SINGLETON::instance ()->gopTable[i].VIDEO_SINGLETON::instance ()->systemHeader,
-		VIDEO_SINGLETON::instance ()->gopTable[i].offset,
-		VIDEO_SINGLETON::instance ()->gopTable[i].headerSize,
-		VIDEO_SINGLETON::instance ()->gopTable[i].size,
-		VIDEO_SINGLETON::instance ()->gopTable[i].totalFrames,
-		VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames,
-		VIDEO_SINGLETON::instance ()->gopTable[i].firstIoffset,
-		VIDEO_SINGLETON::instance ()->frameTable[VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames].size
-		);
-      }
-
-     fprintf(stderr, "\nframe information:");
-      for (i=0; i<VIDEO_SINGLETON::instance ()->numF; i++)
-	fprintf(stderr, "%c%c%-8d", (i%10 ? '\0' : '\n'), VIDEO_SINGLETON::instance ()->frameTable[i].type, VIDEO_SINGLETON::instance ()->frameTable[i].size);
-      fprintf(stderr, "\n");
-
-    }
-  */
-    fseek(VIDEO_SINGLETON::instance ()->fp, VIDEO_SINGLETON::instance ()->systemHeader[0].offset+4, 0);
-    nextByte;
-    VIDEO_SINGLETON::instance ()->horizontalSize = ((int)nb <<4) & 0xff0;
-    nextByte;
-    VIDEO_SINGLETON::instance ()->horizontalSize |= (nb >>4) & 0x0f;
-    VIDEO_SINGLETON::instance ()->verticalSize = ((int)nb <<8) & 0xf00;
-    nextByte;
-    VIDEO_SINGLETON::instance ()->verticalSize |= (int)nb & 0xff;
-    nextByte;
-    VIDEO_SINGLETON::instance ()->pelAspectRatio = ((int)nb >> 4) & 0x0f;
-    VIDEO_SINGLETON::instance ()->pictureRate = (int)nb & 0x0f;
-    nextByte;
-    nextByte;
-    nextByte;
-    VIDEO_SINGLETON::instance ()->vbvBufferSize = ((int)nb << 5) & 0x3e0;
-    nextByte;
-    VIDEO_SINGLETON::instance ()->vbvBufferSize |= ((int)nb >>3) & 0x1f;
-    /*
-    fprintf(stderr, "SysHeader info: hsize-%d, vsize-%d, pelAspect-%d, rate-%d, vbv-%d.\n",
-	    VIDEO_SINGLETON::instance ()->horizontalSize, VIDEO_SINGLETON::instance ()->verticalSize, VIDEO_SINGLETON::instance ()->pelAspectRatio, VIDEO_SINGLETON::instance ()->pictureRate, VIDEO_SINGLETON::instance ()->vbvBufferSize);
-     */
-    WriteInfoToFile();
-  }
-#if 0
-  {
-    int i, j = 20;
-    
-    for (i = VIDEO_SINGLETON::instance ()->numG - 1;; i --) {
-      if (VIDEO_SINGLETON::instance ()->gopTable[i].offset < 4235260) {
-	fprintf(stderr, "group %d: offset %ld\n", i, VIDEO_SINGLETON::instance ()->gopTable[i].offset);
-	if (j -- == 0) break;
-      }
-    }
-    /*
-    for (i = 0; i  < VIDEO_SINGLETON::instance ()->numG; i ++) {
-      if (VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames > 1800) {
-	fprintf(stderr, "group %d: offset %ld pre-frames %d\n",
-		i, VIDEO_SINGLETON::instance ()->gopTable[i].offset, VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames);
-	break;
-      }
-    }
-    */
-  }
-#endif
-  {
-    VIDEO_SINGLETON::instance ()->firstPatternSize = VIDEO_SINGLETON::instance ()->gopTable[0].totalFrames;
-    VIDEO_SINGLETON::instance ()->firstSendPattern = (char *)malloc(VIDEO_SINGLETON::instance ()->firstPatternSize);
-    if (VIDEO_SINGLETON::instance ()->firstSendPattern == NULL)
-    {
-      fprintf(stderr, "VS failed to allocate VIDEO_SINGLETON::instance ()->firstVIDEO_SINGLETON::instance ()->SendVIDEO_SINGLETON::Instance ()->Pattern for %d frames",
-	      VIDEO_SINGLETON::instance ()->firstPatternSize);
-      perror("");
-      return 11;
-    }
-  }
-  VIDEO_SINGLETON::instance ()->firstGopFrames = VIDEO_SINGLETON::instance ()->gopTable[0].totalFrames;
-  return 0;
-}
-
- int INITvideo(void)
-{
-  INITvideoPara para;
-  int failureType = 0;
-  int result;
-  /*
-  fprintf(stderr, "VS about to read Para.\n");
-  */
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.version = ntohl(para.version);
-  para.nameLength = ntohl(para.nameLength);
-#endif
-  if (para.nameLength>0)
-    {
-    result = CmdRead(VIDEO_SINGLETON::instance ()->videoFile, para.nameLength);
-    if (result != 0)
-      return result;
-    }
-  if (Mpeg_Global::session_num > Mpeg_Global::session_limit || para.version != VERSION) {
-    char errmsg[128];
-    VIDEO_SINGLETON::instance ()->cmd = CmdFAIL;
-    CmdWrite((char *)&VIDEO_SINGLETON::instance ()->cmd, 1);
-    if (Mpeg_Global::session_num > Mpeg_Global::session_limit) {
-      sprintf(errmsg,
-	      "Too many sessions being serviced, please try again later.\n");
-    }
-    else {
-      sprintf(errmsg, "Version # not match, VS %d.%02d, Client %d.%02d",
-	      VERSION / 100, VERSION % 100,
-	      para.version / 100, para.version % 100);
-    }
-    write_string(VIDEO_SINGLETON::instance ()->serviceSocket, errmsg);
-    exit(0);
-  }
-  VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
-  /*
-  fprintf(stderr, "MPEG file %s got.\n", VIDEO_SINGLETON::instance ()->videoFile);
-  */
-  VIDEO_SINGLETON::instance ()->videoFile[para.nameLength] = 0;
-
-  if (!strncasecmp("LiveVideo", VIDEO_SINGLETON::instance ()->videoFile, 9)) {
-    if (OpenLiveVideo(&VIDEO_SINGLETON::instance ()->video_format, &VIDEO_SINGLETON::instance ()->horizontalSize,
-		      &VIDEO_SINGLETON::instance ()->verticalSize, &VIDEO_SINGLETON::instance ()->averageFrameSize,
-		      &VIDEO_SINGLETON::instance ()->fps, &VIDEO_SINGLETON::instance ()->pelAspectRatio) == -1) {
-      failureType = 100;
-      goto failure;
-    }
-    if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG2) {
-      failureType = 101;
-      goto failure;
-    }
-    VIDEO_SINGLETON::instance ()->live_source = 1;
-
-    VIDEO_SINGLETON::instance ()->fileSize =0x7fffffff;
-    VIDEO_SINGLETON::instance ()->maxS = VIDEO_SINGLETON::instance ()->maxG = VIDEO_SINGLETON::instance ()->maxI = VIDEO_SINGLETON::instance ()->maxP = VIDEO_SINGLETON::instance ()->maxB = VIDEO_SINGLETON::instance ()->minS = VIDEO_SINGLETON::instance ()->minG = VIDEO_SINGLETON::instance ()->minI = VIDEO_SINGLETON::instance ()->minP = VIDEO_SINGLETON::instance ()->minB = 1;
-    VIDEO_SINGLETON::instance ()->numS = VIDEO_SINGLETON::instance ()->numG = VIDEO_SINGLETON::instance ()->numF = VIDEO_SINGLETON::instance ()->numI = 0x7fffffff;
-    VIDEO_SINGLETON::instance ()->numP = VIDEO_SINGLETON::instance ()->numB = 0;
-    VIDEO_SINGLETON::instance ()->vbvBufferSize = 1;
-    VIDEO_SINGLETON::instance ()->firstGopFrames = 1;
-    VIDEO_SINGLETON::instance ()->patternSize = 1;
-    VIDEO_SINGLETON::instance ()->pattern[0] = 'I';
-    VIDEO_SINGLETON::instance ()->pattern[1] = 0;
-    VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->verticalSize * VIDEO_SINGLETON::instance ()->horizontalSize * 3;
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
-				   VIDEO_SINGLETON::instance ()->packetBufSize);
-    if (VIDEO_SINGLETON::instance ()->packet == NULL)	
-    {
-      perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
-      exit(1);
-    }
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
-
-  }
-  else {
-    static double pictureRateTable[] = {23.976, 24, 25, 29.97, 30, 50, 59.94, 60};
-
-    VIDEO_SINGLETON::instance ()->video_format = VIDEO_MPEG1;
-    failureType = init_MPEG1_video_file();
-    if (failureType) goto failure;
-    VIDEO_SINGLETON::instance ()->fps = pictureRateTable[VIDEO_SINGLETON::instance ()->pictureRate - 1];
-  }
-  
-  {
-    INITvideoReply reply;
-
-    reply.totalHeaders = htonl(VIDEO_SINGLETON::instance ()->numS);
-    reply.totalGroups = htonl(VIDEO_SINGLETON::instance ()->numG);
-    reply.totalFrames = htonl(VIDEO_SINGLETON::instance ()->numF);
-    reply.sizeIFrame = htonl(VIDEO_SINGLETON::instance ()->maxI);
-    reply.sizePFrame = htonl(VIDEO_SINGLETON::instance ()->maxP);
-    reply.sizeBFrame = htonl(VIDEO_SINGLETON::instance ()->maxB);
-    reply.sizeSystemHeader = htonl(VIDEO_SINGLETON::instance ()->maxS);
-    reply.sizeGop = htonl(VIDEO_SINGLETON::instance ()->maxG);
-    reply.averageFrameSize = htonl(VIDEO_SINGLETON::instance ()->averageFrameSize);
-    reply.verticalSize = htonl(VIDEO_SINGLETON::instance ()->verticalSize);
-    reply.horizontalSize = htonl(VIDEO_SINGLETON::instance ()->horizontalSize);
-    reply.pelAspectRatio = htonl(VIDEO_SINGLETON::instance ()->pelAspectRatio);
-    reply.pictureRate1000 = htonl((int)(VIDEO_SINGLETON::instance ()->fps * 1000));
-    reply.vbvBufferSize = htonl(VIDEO_SINGLETON::instance ()->vbvBufferSize);
-    reply.firstGopFrames = htonl(VIDEO_SINGLETON::instance ()->firstGopFrames);
-    reply.patternSize = htonl(VIDEO_SINGLETON::instance ()->patternSize);
-    strncpy(reply.pattern, VIDEO_SINGLETON::instance ()->pattern, PATTERN_SIZE);
-    
-    reply.live = htonl(VIDEO_SINGLETON::instance ()->live_source);
-    reply.format = htonl(VIDEO_SINGLETON::instance ()->video_format);
-    
-    CmdWrite((char *)&VIDEO_SINGLETON::instance ()->cmd, 1);
-    
-    CmdWrite((char *)&reply, sizeof(reply));
-
-    /* write the first SH, GOP and IFrame to VIDEO_SINGLETON::instance ()->serviceSocket (TCP),
-       using code for SendPacket() */
-    {
-      int tmpSocket = VIDEO_SINGLETON::instance ()->videoSocket;
-      
-      if (VIDEO_SINGLETON::instance ()->live_source) StartPlayLiveVideo();
-      
-      VIDEO_SINGLETON::instance ()->videoSocket = VIDEO_SINGLETON::instance ()->serviceSocket;
-      
-      if (VIDEO_SINGLETON::instance ()->live_source) {
-	int frame = 0;
-	SendPicture(&frame);
-      }
-      else if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG1) {
-	SendPacket(1, 0, 0, 0);
-      }
-      else {
-	fprintf(stderr, "VS: VIDEO_SINGLETON::instance ()->video_format %d not supported.\n",
-		VIDEO_SINGLETON::instance ()->video_format);
-      }
-      VIDEO_SINGLETON::instance ()->videoSocket = tmpSocket;
-      
-      if (VIDEO_SINGLETON::instance ()->live_source) StopPlayLiveVideo();
-    }
-
-    return 0;
-    
-  }
- failure:
-  {
-    char * msg;
-    char errmsg[64];
-    VIDEO_SINGLETON::instance ()->cmd = CmdFAIL;
-    sprintf(errmsg, "VS failed to alloc internal buf (type %d)", failureType);
-    CmdWrite((char *)&VIDEO_SINGLETON::instance ()->cmd, 1);
-    msg = failureType == 1 ? "not a complete MPEG stream" :
-          failureType == 2 ? "can't open MPEG file" :
-          failureType == 3 ? "MPEG file is not seekable" :
-          failureType == 4 ? "not an MPEG stream" :
-          failureType == 5 ?
-	     "too many frames in MPEG file, need change MAX_FRAMES and recompile VS" :
-	  failureType == 100 ? "failed to connect to live video source" :
-	  failureType == 101 ? "live MPEG2 not supported" :
-          errmsg;
-    write_string(VIDEO_SINGLETON::instance ()->serviceSocket, msg);
-    exit(0);
-  }
-}
-
-#define CheckGroupRange(pnextGroup) \
-{ if ((pnextGroup) < 0 || (pnextGroup) >= VIDEO_SINGLETON::instance ()->numG) \
-  { fprintf(stderr, "VS: %d.VIDEO_SINGLETON::instance ()->nextGroup(%d) out of range (%d).\n", VIDEO_SINGLETON::instance ()->cmd, (pnextGroup), VIDEO_SINGLETON::instance ()->numG); \
-    return 0; } }
-
-#define CheckFrameRange(pnextFrame) \
-{ if ((pnextFrame) < 0 || (pnextFrame) >= VIDEO_SINGLETON::instance ()->numF) \
-  { fprintf(stderr, "VS: %d.VIDEO_SINGLETON::instance ()->nextFrame(%d) out of range (%d).\n", VIDEO_SINGLETON::instance ()->cmd, (pnextFrame), VIDEO_SINGLETON::instance ()->numF); \
-    return 0; } }
-
-int FrameToGroup(int * frame)
-{
-  int f = * frame;
-  int i = 0;
-  while (i < VIDEO_SINGLETON::instance ()->numG && VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames <= f) i++;
-  i --;
-  * frame = f - VIDEO_SINGLETON::instance ()->gopTable[i].previousFrames;
-  return i;
-}
-
-static int POSITIONvideo()
-{
-  int result;
-  POSITIONpara para;
-  /*
-  fprintf(stderr, "POSITION . . .\n");
-  */
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-
-  if (VIDEO_SINGLETON::instance ()->live_source) return 0;
-  
-#ifdef NeedByteOrderConversion
-  para.VIDEO_SINGLETON::instance ()->nextGroup = ntohl(para.VIDEO_SINGLETON::instance ()->nextGroup);
-  para.sn = ntohl(para.sn);
-#endif
-  
-  CheckGroupRange(para.nextGroup);
-  VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
-  result = SendPacket(VIDEO_SINGLETON::instance ()->numS>1 || para.nextGroup == 0, para.nextGroup, 0, 0);
-  return result;
-}
-
-static int STEPvideo()
-{
-  int group;
-  STEPpara para;
-  int tag = 0;
-  int result;
-
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.VIDEO_SINGLETON::instance ()->nextFrame = ntohl(para.VIDEO_SINGLETON::instance ()->nextFrame);
-#endif
-
-  VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
-
-  if (!VIDEO_SINGLETON::instance ()->live_source) {
-    if (para.nextFrame >= VIDEO_SINGLETON::instance ()->numF)  /* send SEQ_END */
-    {
-      tag = 1;
-      para.nextFrame --;
-    }
-    /*
-    fprintf(stderr, "STEP . . .frame-%d\n", para.VIDEO_SINGLETON::instance ()->nextFrame);
-    */
-    CheckFrameRange(para.nextFrame);
-    group = FrameToGroup(&para.nextFrame);
-    if (VIDEO_SINGLETON::instance ()->precmd != CmdSTEP && !tag ) {
-      result = SendReferences(group, para.nextFrame);
-      if (result < 0 )
-        return result;
-    }
-  }
-  if (VIDEO_SINGLETON::instance ()->live_source) StartPlayLiveVideo();
-  
-  if (VIDEO_SINGLETON::instance ()->live_source) {
-    SendPicture(&para.nextFrame);
-  }
-  else if (VIDEO_SINGLETON::instance ()->video_format == VIDEO_MPEG1) {
-    SendPacket(VIDEO_SINGLETON::instance ()->numS>1, group, tag ? VIDEO_SINGLETON::instance ()->numF : para.nextFrame, 0);
-  }
-  else {
-    fprintf(stderr, "VS: wierd1\n");
-  }
-  
-  if (VIDEO_SINGLETON::instance ()->live_source) StopPlayLiveVideo();
-  return 0;
-}
-
-static int timerHeader, timerGroup, timerFrame;
-static int timerOn = 0;
-static int timerAdjust = 0;
-static int preTimerVal = 0;
-static void StopTimer(void);
-static void TimerSpeed(void);
-static void TimerProcessing(void);
-
-static void timerHandler(int sig)
-{
-  int val2, val3;
-  int usec = VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF;
-  
-  if (Mpeg_Global::drift_ppm) {
-    usec -= (int)((double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0);
-  }
-  
-  if (timerAdjust > 1)
-    usec = (int)(((double)usec * (double)(SPEEDUP_INV_SCALE - 1)) /
-		 (double)SPEEDUP_INV_SCALE);
-  val3 = get_duration(preTimerVal, (val2 = get_usec()));
-  /*
-  if (val3 >= usec<< 1))
-    fprintf(stderr, "Slower: %d out of VIDEO_SINGLETON::instance ()->currentUPF %d.\n",
-            val3, usec);
-  else
-    fprintf(stderr, "+\n");
-  */
-  preTimerVal = val2;
-  if (val3 < 0 || val3 > 100000000)
-    val3 = usec;
-  val2 = (val3 + (usec>>1)) / usec;
-  if (val2 < 0) val2 = 0;
-  if (val2) {
-    TimerProcessing();
-    val2 --;
-  }
-  VIDEO_SINGLETON::instance ()->addedSignals += val2;
-  
-  if (VIDEO_SINGLETON::instance ()->addedSignals) {
-    val2 = timerAdjust;
-    if (timerAdjust < MAX_TIMER_ADJUST) {
-      timerAdjust += VIDEO_SINGLETON::instance ()->addedSignals * SPEEDUP_INV_SCALE;
-      if (val2 < SPEEDUP_INV_SCALE) {
-	TimerSpeed();
-      }
-    }
-    else {
-      /*
-      fprintf(stderr, "VS timerAdjust %d, VIDEO_SINGLETON::instance ()->addedSignals %d, timerFrame %d\n",
-	      timerAdjust, VIDEO_SINGLETON::instance ()->addedSignals, timerFrame);
-      */
-      for (val3 = 0; val3 < VIDEO_SINGLETON::instance ()->addedSignals; val3 ++)
-        TimerProcessing();
-    }
-    VIDEO_SINGLETON::instance ()->addedSignals = 0;
-  }
-}
-
-static void TimerProcessing(void)
-{
-/*  
-  fprintf(stderr, "VS: timerHandler...\n");
-*/
-  if (!timerOn) {
-    return;
-  }
-  if (timerAdjust < 0)
-  {
-    timerAdjust += SPEEDUP_INV_SCALE;
-    return;
-  }
-  if (timerAdjust >0)
-  {
-    if ((--timerAdjust) == 0)
-      TimerSpeed();
-  }
-  if (VIDEO_SINGLETON::instance ()->cmd == CmdPLAY)
-  {
-    if (timerGroup == VIDEO_SINGLETON::instance ()->numG - 1 && timerFrame >= VIDEO_SINGLETON::instance ()->gopTable[timerGroup].totalFrames - 1)
-    {
-      timerFrame ++;  /* force sending of END_SEQ when PLAY VIDEO_SINGLETON::instance ()->cmd */
-      StopTimer();
-      return;
-    }
-    else
-    {
-      timerFrame ++;
-      if (timerFrame >= VIDEO_SINGLETON::instance ()->gopTable[timerGroup].totalFrames)
-      {
-        timerGroup ++;
-        timerFrame = 0;
-        timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-      }
-    }
-  }
-  else {
-    if (VIDEO_SINGLETON::instance ()->cmd == CmdFF) {
-      if (timerGroup == VIDEO_SINGLETON::instance ()->numG - 1) {
-	StopTimer();
-	return;
-      }
-      timerGroup ++;
-      timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-    }
-    else {
-      if (timerGroup == 0) {
-	StopTimer();
-	return;
-      }
-      timerGroup --;
-      timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-    }
-  }
-}
-
-static void StartTimer(void)
-{
-  VIDEO_SINGLETON::instance ()->addedUPF = 0;
-  VIDEO_SINGLETON::instance ()->addedSignals = 0;
-  timerAdjust = (VIDEO_SINGLETON::instance ()->VStimeAdvance * SPEEDUP_INV_SCALE) / VIDEO_SINGLETON::instance ()->currentUPF;
-  /*
-  SFprintf(stderr, "VS StartTimer(): fast-start frames %d\n",
-	  timerAdjust / SPEEDUP_INV_SCALE);
-  */
-  TimerSpeed();
-  setsignal(SIGALRM, timerHandler);
-  timerOn = 1;
-  preTimerVal = get_usec();
-  /*
-  fprintf(stderr, "VS: timer started at %d upf.\n", VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF);
-  */
-}
-
-static void TimerSpeed(void)
-{
-  struct itimerval val;
-  int usec = VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF;
-  if (Mpeg_Global::drift_ppm) {
-    /*
-    int drift = (double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0;
-    SFprintf(stderr, "Mpeg_Global::drift_ppm %d, usec %d, drift %d, new usec %d\n",
-	    Mpeg_Global::drift_ppm, usec, drift, usec - drift);
-     */
-    usec -= (int)((double)usec * (double)Mpeg_Global::drift_ppm / 1000000.0);
-  }
-  if (timerAdjust > 1)
-    usec = (int)(((double)usec * (double)(SPEEDUP_INV_SCALE - 1)) /
-		 (double)SPEEDUP_INV_SCALE);
-  val.it_interval.tv_sec =  val.it_value.tv_sec = usec / 1000000;
-  val.it_interval.tv_usec = val.it_value.tv_usec = usec % 1000000;
-  setitimer(ITIMER_REAL, &val, NULL);
-  /*
-  SFprintf(stderr,
-	  "VS TimerSpeed() at %s speed, timerAdjust %d VIDEO_SINGLETON::instance ()->addedSignals %d.\n",
-	  (timerAdjust > 1) ? "higher" : "normal", timerAdjust, VIDEO_SINGLETON::instance ()->addedSignals);
-  */
-}
-
-static void StopTimer()
-{
-  struct itimerval val;
-  setsignal(SIGALRM, SIG_IGN);
-  val.it_interval.tv_sec =  val.it_value.tv_sec = 0;
-  val.it_interval.tv_usec = val.it_value.tv_usec = 0;
-  setitimer(ITIMER_REAL, &val, NULL);
-  timerOn = 0;
-  /*
-  fprintf(stderr, "VS: timer stopped.\n");
-  */
-}
-
-void GetFeedBack()
-{
-  VideoFeedBackPara para;
-  struct itimerval val;
-  int timerUsec;
-  
-  if (FBread((char *)&para, sizeof(para)) == -1 ||
-      ntohl(para.cmdsn) != VIDEO_SINGLETON::instance ()->cmdsn) {
-    /*
-    SFprintf(stderr, "VS warning: a FB VIDEO_SINGLETON::instance ()->packet discarded.\n");
-    */
-    return;
-  }
-#ifdef NeedByteOrderConversion
-  para.VIDEO_SINGLETON::instance ()->needHeader = ntohl(para.VIDEO_SINGLETON::instance ()->needHeader);
-  para.addUsecPerFrame = ntohl(para.addUsecPerFrame);
-  para.addFrames = ntohl(para.addFrames);
-  para.VIDEO_SINGLETON::instance ()->sendVIDEO_SINGLETON::Instance ()->PatternGops = ntohl(para.VIDEO_SINGLETON::instance ()->sendVIDEO_SINGLETON::Instance ()->PatternGops);
-  para.VIDEO_SINGLETON::instance ()->frameRateLimit1000 = ntohl(para.VIDEO_SINGLETON::instance ()->frameRateLimit1000);
-#endif
-  VIDEO_SINGLETON::instance ()->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-  VIDEO_SINGLETON::instance ()->sendPatternGops = para.sendPatternGops;
-  
-  if (!timerOn) return;
-
-  VIDEO_SINGLETON::instance ()->needHeader = para.needHeader;
-  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
-  if (para.addFrames <= 0 || timerAdjust < MAX_TIMER_ADJUST)
-  {
-    timerAdjust += para.addFrames * SPEEDUP_INV_SCALE;
-    TimerSpeed();
-  }
-  else /* drastic compensation for big gap */
-    VIDEO_SINGLETON::instance ()->addedSignals += para.addFrames;
-  if (para.addUsecPerFrame) {
-    VIDEO_SINGLETON::instance ()->addedUPF += para.addUsecPerFrame;
-    TimerSpeed();
-  }
-  /*
-  SFprintf(stderr, "VS fb: addf %d, addupf %d\n",
-	  para.addFrames, para.addUsecPerFrame);
-  */
-}
-
-static int FastVideoPlay(void)
-{
-  int result;
-  FFpara para;
-  int preGroup = -1;
-  int preHeader = -1;
-  int nfds = (VIDEO_SINGLETON::instance ()->serviceSocket > VIDEO_SINGLETON::instance ()->videoSocket ? VIDEO_SINGLETON::instance ()->serviceSocket : VIDEO_SINGLETON::instance ()->videoSocket) + 1;
-  
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.VIDEO_SINGLETON::instance ()->nextGroup = ntohl(para.VIDEO_SINGLETON::instance ()->nextGroup);
-  para.usecPerFrame = ntohl(para.usecPerFrame);
-  para.framesPerSecond = ntohl(para.framesPerSecond);
-  para.VIDEO_SINGLETON::instance ()->VStimeAdvance = ntohl(para.VIDEO_SINGLETON::instance ()->VStimeAdvance);
-#endif
-
-  if (VIDEO_SINGLETON::instance ()->live_source) return 0;
-  
-  VIDEO_SINGLETON::instance ()->VStimeAdvance = para.VStimeAdvance;
-  /*
-  fprintf(stderr, "VIDEO_SINGLETON::instance ()->VStimeAdvance from client: %d\n", VIDEO_SINGLETON::instance ()->VStimeAdvance);
-  */
-  CheckGroupRange(para.nextGroup);
-  VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
-  timerGroup = para.nextGroup;
-  timerFrame = 0;
-  timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-  VIDEO_SINGLETON::instance ()->currentUPF = para.usecPerFrame;
-  StartTimer();
-  
-  for (;;)
-  {
-    struct fd_set read_mask;
-/*
-    fprintf(stderr, "VS: FF/FB - a loop begines. . .\n");
-*/
-    if (preGroup != timerGroup)
-    {
-      SendPacket(preHeader != timerHeader, timerGroup, 0,
-		 para.usecPerFrame * VIDEO_SINGLETON::instance ()->patternSize >> 2);
-      preHeader = timerHeader;
-      preGroup = timerGroup;
-    }
-
-    FD_ZERO(&read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(nfds, (int *)&read_mask, NULL, NULL, NULL) == -1)
-#else
-    if (select(nfds, &read_mask, NULL, NULL, NULL) == -1)
-#endif
-    {
-      if (errno == EINTR)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "PLAYVIDEO:select EINTR signal \n"));
-          continue;
-        }
-      perror("Error - VS select between service and video sockets");
-      exit(1);
-      
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop */
-    {
-      result = CmdRead((char *)&VIDEO_SINGLETON::instance ()->cmd, 1);
-      if (result != 0)
-        return result;
-      if (VIDEO_SINGLETON::instance ()->cmd == CmdCLOSE) {
-	exit(0);
-      }
-      else if (VIDEO_SINGLETON::instance ()->cmd != CmdSTOP) {
-	fprintf(stderr, "VS error: VIDEO_SINGLETON::instance ()->cmd=%d while STOP is expected.\n", VIDEO_SINGLETON::instance ()->cmd);
-	VIDEO_SINGLETON::instance ()->normalExit = 0;
-	exit(1);
-      }
-      result = CmdRead((char *)&VIDEO_SINGLETON::instance ()->cmdsn, sizeof(int));
-      if (result != 0 )
-        return result;
-#ifdef NeedByteOrderConversion
-      VIDEO_SINGLETON::instance ()->cmdsn = ntohl(VIDEO_SINGLETON::instance ()->cmdsn);
-#endif
-      StopTimer();
-      break;
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask))  /* feedback, speed adjustment */
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "FastVideo Play:Data socket selected"));
-      GetFeedBack();
-    }
-    ACE_DEBUG((LM_DEBUG,
-               "none of the sockets selected \n"));
-  }
-  return 0;
-}
-
-static void FFvideo()
-{
-  /*
-  fprintf(stderr, "FF . . .\n");
-  */
-  FastVideoPlay();
-}
-
-static void FBvideo()
-{
-  /*
-  fprintf(stderr, "FB . . . \n");
-  */
-  FastVideoPlay();
-}
-
-void ComputeFirstSendPattern(float limit)
-{
-  char * buf = VIDEO_SINGLETON::instance ()->firstSendPattern;
-  int len = VIDEO_SINGLETON::instance ()->firstPatternSize;
-  char * pat = (char *)malloc(len);
-  int f;
-
-  if (pat == NULL) {
-    fprintf(stderr, "VS error on allocating %d bytes for computing first SP", len);
-    perror("");
-    exit(1);
-  }
-  for (f = 0; f < len; f ++) {
-    pat[f] = VIDEO_SINGLETON::instance ()->frameTable[f].type;
-  }
-  memset(buf, 0, len);
-  
-  if (limit <= 0)
-    limit = 1.0;
-  
-  f = (int)((double)len *
-	    ((double)limit / (1000000.0 / (double)VIDEO_SINGLETON::instance ()->currentUPF)) + 0.5);
-  /* rounded to integer, instead of truncated */
-  if (f >= len)
-    f = len;
-  else if (f <= 1)
-    f = 1;
-
-  ComputeSendPattern(pat, buf, len, f);
-
-  /*
-  f = len - f;
-  fprintf(stderr, "VIDEO_SINGLETON::instance ()->FirstVIDEO_SINGLETON::instance ()->SendVIDEO_SINGLETON::Instance ()->Pattern (%d frames dropped): ", f);
-  {
-    int i;
-    for (i = 0; i < len; i ++)
-      fputc(buf[i] ? pat[i] : '-', stderr);
-  }
-  fputc('\n', stderr);
-  */
-  free(pat);
-}
-
- int PLAYliveVideo(PLAYpara * para)
-{
-  int doscale;
-  int count;
-  int first_frame;
-  int frame = para->nextFrame;
-  int nfds = (VIDEO_SINGLETON::instance ()->serviceSocket > VIDEO_SINGLETON::instance ()->videoSocket ? VIDEO_SINGLETON::instance ()->serviceSocket : VIDEO_SINGLETON::instance ()->videoSocket) + 1;
-  struct fd_set read_mask;
-  struct timeval tval = {0, 0};
-  double ratio;
-  int result;
-  
-  VIDEO_SINGLETON::instance ()->currentUPF = (int)(1000000.0 / VIDEO_SINGLETON::instance ()->fps);  /* ignore para.usecPerFrame */
-  if (VIDEO_SINGLETON::instance ()->frameRateLimit < VIDEO_SINGLETON::instance ()->fps) {
-    doscale = 1;
-    ratio = min(VIDEO_SINGLETON::instance ()->frameRateLimit, VIDEO_SINGLETON::instance ()->fps) / VIDEO_SINGLETON::instance ()->fps;
-    first_frame = frame;
-    count = 0;
-    /*
-    fprintf(stderr, "doscale %d, VIDEO_SINGLETON::instance ()->frameRateLimit %5.2f, VIDEO_SINGLETON::instance ()->fps %5.2f, ratio %5.2f\n",
-	    doscale, VIDEO_SINGLETON::instance ()->frameRateLimit, VIDEO_SINGLETON::instance ()->fps, ratio);
-    */
-  }
-  else doscale = 0;
-  StartPlayLiveVideo();
-
-  for (;;) {
-
-    if (doscale) {
-      for (;;) {
-	if ((int)((frame - first_frame) * ratio + 0.5) < count) frame ++;
-	else break;
-      }
-      count ++;
-    }
-    SendPicture(&frame);
-    frame ++;
-    
-    FD_ZERO(&read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(nfds, (int *)&read_mask, NULL, NULL, &tval) == -1)
-#else
-    if (select(nfds, &read_mask, NULL, NULL, &tval) == -1)
-#endif
-    {
-      if (errno == EINTR)
-        continue;
-      perror("Error - VS select between service and video sockets");
-      StopPlayLiveVideo();
-      exit(1);
-      
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop */
-    {
-      unsigned char tmp;
-      result = CmdRead((char *)&tmp, 1);
-      if (result != 0)
-        return result;
-      if (tmp == CmdCLOSE) {
-	StopPlayLiveVideo();
-	exit(0);
-      }
-      else if (tmp == CmdSTOP) {
-	VIDEO_SINGLETON::instance ()->cmd = tmp;
-	/*
-	fprintf(stderr, "VS: VIDEO_SINGLETON::Instance ()->CmdSTOP. . .\n");
-	*/
-        result = CmdRead((char *)&VIDEO_SINGLETON::instance ()->cmdsn, sizeof(int));
-        if (result != 0)
-          return result;
-#ifdef NeedByteOrderConversion
-	VIDEO_SINGLETON::instance ()->cmdsn = ntohl(VIDEO_SINGLETON::instance ()->cmdsn);
-#endif
-	StopPlayLiveVideo();
-        break;
-      }
-      else if (tmp == CmdSPEED)
-      {
-	SPEEDpara para;
-	/*
-	fprintf(stderr, "VS: VIDEO_SINGLETON::Instance ()->CmdSPEED. . .\n");
-	*/
-	result = CmdRead((char *)&para, sizeof(para));
-        if (result != 0)
-          return result;
-	/* ignore this thing for live video */
-      }
-      else
-      {
-	fprintf(stderr, "VS error(live): VIDEO_SINGLETON::instance ()->cmd=%d while expect STOP/SPEED.\n", tmp);
-	VIDEO_SINGLETON::instance ()->normalExit = 0;
-	StopPlayLiveVideo();
-	exit(1);
-      }
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask))  /* feedback, only for frame rate
-					       adjustment */
-    {
-      VideoFeedBackPara para;
-      if (FBread((char *)&para, sizeof(para)) == -1 ||
-	  ntohl(para.cmdsn) != VIDEO_SINGLETON::instance ()->cmdsn) {
-	/*
-	   SFprintf(stderr, "VS warning: a FB VIDEO_SINGLETON::instance ()->packet discarded.\n");
-	   */
-	return 0;
-      }
-#ifdef NeedByteOrderConversion
-      para.VIDEO_SINGLETON::instance ()->frameRateLimit1000 = ntohl(para.VIDEO_SINGLETON::instance ()->frameRateLimit1000);
-#endif
-      VIDEO_SINGLETON::instance ()->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-      if (VIDEO_SINGLETON::instance ()->frameRateLimit < VIDEO_SINGLETON::instance ()->fps) {
-	doscale = 1;
-	ratio = min(VIDEO_SINGLETON::instance ()->frameRateLimit, VIDEO_SINGLETON::instance ()->fps) / VIDEO_SINGLETON::instance ()->fps;
-	first_frame = frame;
-	count = 0;
-	/*
-	fprintf(stderr, "doscale %d, VIDEO_SINGLETON::instance ()->frameRateLimit %5.2f, VIDEO_SINGLETON::instance ()->fps %5.2f, ratio %5.2f\n",
-		doscale, VIDEO_SINGLETON::instance ()->frameRateLimit, VIDEO_SINGLETON::instance ()->fps, ratio);
-	*/
-      }
-      else doscale = 0;
-    }
-  }
-  return 0;
-}
-
-static int PLAYvideo()
-{
-  PLAYpara para;
-  int preGroup = -1;
-  int preHeader = -1;
-  int preFrame = -1;
-  int result;
-  
-  fprintf(stderr, "PLAY . . .\n");
-  
-  result = CmdRead((char *)&para, sizeof(para));
-  if (result != 0)
-    return result;
-#ifdef NeedByteOrderConversion
-  para.sn = ntohl(para.sn);
-  para.VIDEO_SINGLETON::instance ()->nextFrame = ntohl(para.VIDEO_SINGLETON::instance ()->nextFrame);
-  para.usecPerFrame = ntohl(para.usecPerFrame);
-  para.framesPerSecond = ntohl(para.framesPerSecond);
-  para.VIDEO_SINGLETON::instance ()->frameRateLimit1000 = ntohl(para.VIDEO_SINGLETON::instance ()->frameRateLimit1000);
-  para.collectStat = ntohl(para.collectStat);
-  para.VIDEO_SINGLETON::instance ()->sendVIDEO_SINGLETON::Instance ()->PatternGops = ntohl(para.VIDEO_SINGLETON::instance ()->sendVIDEO_SINGLETON::Instance ()->PatternGops);
-  para.VIDEO_SINGLETON::instance ()->VStimeAdvance = ntohl(para.VIDEO_SINGLETON::instance ()->VStimeAdvance);
-#endif
-
-  VIDEO_SINGLETON::instance ()->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-  VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
-  VIDEO_SINGLETON::instance ()->currentUPF = para.usecPerFrame;
-  VIDEO_SINGLETON::instance ()->VStimeAdvance = para.VStimeAdvance;
-
-  {
-    int ts = htonl(get_usec());
-    CmdWrite((char *)&ts, sizeof(int));
-  }
-  
-  if (VIDEO_SINGLETON::instance ()->live_source || VIDEO_SINGLETON::instance ()->video_format != VIDEO_MPEG1) {
-    if (VIDEO_SINGLETON::instance ()->live_source) 
-      PLAYliveVideo (&para);
-    return 0;
-  }
-  
-  
-  fprintf(stderr, "VIDEO_SINGLETON::instance ()->VStimeAdvance from client: %d\n", VIDEO_SINGLETON::instance ()->VStimeAdvance);
-  
-  VIDEO_SINGLETON::instance ()->sendPatternGops = para.sendPatternGops;
-  ComputeFirstSendPattern(VIDEO_SINGLETON::instance ()->frameRateLimit);
-#ifdef STAT
-  if (para.collectStat)
-    memset(VIDEO_SINGLETON::instance ()->framesSent, 0, (VIDEO_SINGLETON::instance ()->numF + 7)>>3);
-#endif
-  CheckFrameRange(para.nextFrame);
-  timerFrame = para.nextFrame;
-  timerGroup = FrameToGroup(&timerFrame);
-  timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
-  result = SendReferences(timerGroup, timerFrame);
-  if (result < 0)
-    return result;
-  StartTimer();
-  
-  fprintf (stderr, "VS Going into the for loop\n");
-  for (;;)
-  {
-    int curGroup = timerGroup;
-    int curFrame = timerFrame;
-    int curHeader = timerHeader;
-    char * sp;
-    struct fd_set read_mask;
-    int nfds = (VIDEO_SINGLETON::instance ()->serviceSocket > VIDEO_SINGLETON::instance ()->videoSocket ? VIDEO_SINGLETON::instance ()->serviceSocket : VIDEO_SINGLETON::instance ()->videoSocket) + 1;
-    
-    if (preGroup != curGroup || curFrame != preFrame)
-    {
-      int sendStatus = -1;
-      int frameStep = 1;
-      if (curGroup == 0)
-      {
-	int i = curFrame + 1;
-	while (i < VIDEO_SINGLETON::instance ()->firstPatternSize && !VIDEO_SINGLETON::instance ()->firstSendPattern[i])
-	{
-	  frameStep ++;
-	  i++;
-	}
-      }
-      else  /* (curGroup > 0) */
-      {
-	int i = curFrame + 1;
-	sp = VIDEO_SINGLETON::instance ()->sendPattern + ((curGroup - 1) % VIDEO_SINGLETON::instance ()->sendPatternGops) * VIDEO_SINGLETON::instance ()->patternSize;
-	while (i < VIDEO_SINGLETON::instance ()->patternSize && !sp[i])
-	{
-	  frameStep ++;
-	  i++;
-	}
-      }
-      if (curGroup == 0)
-      {
-	if (VIDEO_SINGLETON::instance ()->firstSendPattern[curFrame])
-	  sendStatus = 0;
-	else /*  (!VIDEO_SINGLETON::instance ()->firstVIDEO_SINGLETON::instance ()->SendVIDEO_SINGLETON::Instance ()->Pattern[curFrame]) */
-	{
-	  int i = curFrame - 1;
-	  while (i > 0 && !VIDEO_SINGLETON::instance ()->firstSendPattern[i])
-	    i--;
-	  if (i > preFrame)
-	     /* the frame (curGroup, i) hasn't been sent yet */
-	  {
-	    sendStatus = 0;
-	    curFrame = i;
-	  }
-	  else
-	    sendStatus = -1;
-	}
-      }
-      else if (sp[curFrame]) /* curGroup > 0 */
-	sendStatus = 0;
-      else /*  (!sp[curFrame]) */
-      {
-	int i = curFrame - 1;
-	while (i > 0 && !sp[i])
-	  i--;
-	if (curGroup == preGroup && i > preFrame)
-	   /* the frame (curGroup, i) hasn't been sent yet */
-	{
-	  sendStatus = 0;
-	  curFrame = i;
-	}
-	else
-	  sendStatus = -1;
-      }
-      if (!sendStatus)
-      {
-        // Send the current video frame, calls send_to_network which
-        // fragments and sends via blocking write .
-	sendStatus = SendPacket(preHeader != curHeader,
-				curGroup, curFrame,
-				(VIDEO_SINGLETON::instance ()->currentUPF + VIDEO_SINGLETON::instance ()->addedUPF) * frameStep);
-	if (!sendStatus)
-	{
-	  preHeader = curHeader;
-	  preGroup = curGroup;
-	  preFrame = curFrame;
-#ifdef STAT
-	  if (para.collectStat)
-	  {
-	    int f = VIDEO_SINGLETON::instance ()->gopTable[curGroup].previousFrames + curFrame;
-	    VIDEO_SINGLETON::instance ()->framesSent[f>>3] |= (1 << (f % 8));
-	  }
-#endif
-	}
-      }
-    }
-
-    // Wait for a command on serviceSocket or Feedback on videoSocket (UDP)
-    FD_ZERO(&read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask);
-    FD_SET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(nfds, (int *)&read_mask, NULL, NULL, NULL) == -1)
-#else
-    if (select(nfds, &read_mask, NULL, NULL, NULL) == -1)
-#endif
-    {
-      if (errno == EINTR)  /* select() interrupted */
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "PLAYVideo:Select interrupted coninuing..\n"));
-          continue;
-        }
-      perror("Error - VS select between service and video sockets");
-      exit(1);
-      
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop, speed change, loop swap */
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "PLAYvideo:serviceSocket selected \n"));
-      unsigned char tmp;
-      result = CmdRead((char *)&tmp, 1);
-      if (result != 0)
-        return result;
-        
-      if (tmp == CmdCLOSE) {
-	exit(0);
-      }
-      else if (tmp == CmdSTOP) {
-	VIDEO_SINGLETON::instance ()->cmd = tmp;
-	/*
-	fprintf(stderr, "VS: VIDEO_SINGLETON::Instance ()->CmdSTOP. . .\n");
-	*/
-        result = CmdRead((char *)&VIDEO_SINGLETON::instance ()->cmdsn, sizeof(int));
-        if (result != 0)
-          return result;
-#ifdef NeedByteOrderConversion
-	VIDEO_SINGLETON::instance ()->cmdsn = ntohl(VIDEO_SINGLETON::instance ()->cmdsn);
-#endif
-        StopTimer();
-        break;
-      }
-      else if (tmp == CmdSPEED)
-      {
-	SPEEDpara para;
-	/*
-	fprintf(stderr, "VS: VIDEO_SINGLETON::Instance ()->CmdSPEED. . .\n");
-	*/
-	result = CmdRead((char *)&para, sizeof(para));
-        if (result != 0)
-          return result;
-#ifdef NeedByteOrderConversion
-	para.sn = ntohl(para.sn);
-	para.usecPerFrame = ntohl(para.usecPerFrame);
-	para.framesPerSecond = ntohl(para.framesPerSecond);
-	para.sendPatternGops = ntohl(para.sendPatternGops);
-	para.frameRateLimit1000 = ntohl(para.frameRateLimit1000);
-#endif
-	VIDEO_SINGLETON::instance ()->frameRateLimit = para.frameRateLimit1000 / 1000.0;
-	VIDEO_SINGLETON::instance ()->sendPatternGops = para.sendPatternGops;
-	VIDEO_SINGLETON::instance ()->currentUPF = para.usecPerFrame;
-	VIDEO_SINGLETON::instance ()->addedUPF = 0;
-	memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
-	TimerSpeed();
-      }
-      else
-      {
-	fprintf(stderr, "VS error: VIDEO_SINGLETON::instance ()->cmd=%d while expect STOP/SPEED.\n", tmp);
-	VIDEO_SINGLETON::instance ()->normalExit = 0;
-	exit(1);
-      }
-    }
-    if (FD_ISSET(VIDEO_SINGLETON::instance ()->videoSocket, &read_mask))  /* feedBack, speed adjustment */
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "PLAYVIDEO:Data SOCKET selected\n"));
-      GetFeedBack();
-    }
-    ACE_DEBUG ((LM_DEBUG,
-                "PLAYVIDEO:none selected\n"));
-  }
-  return 0;
-}
-
-#include <ctype.h>
-
-static void STATstream(void)
-{
-  int i, j = 0;
-  for (i = 0; i < VIDEO_SINGLETON::instance ()->numF; i++)
-  {
-    short size = htons(VIDEO_SINGLETON::instance ()->frameTable[i].size);
-    char type = VIDEO_SINGLETON::instance ()->frameTable[i].type;
-    if (i == VIDEO_SINGLETON::instance ()->gopTable[j].previousFrames)
-    {
-      type = tolower(type);
-      j ++;
-    }
-    CmdWrite((char *)&type, 1);
-    CmdWrite((char *)&size, 2);
-  }
-}
-
-static void STATsent(void)
-{
-#ifdef STAT
-  CmdWrite((char *)VIDEO_SINGLETON::instance ()->framesSent, (VIDEO_SINGLETON::instance ()->numF + 7) / 8);
-#else
-  int i;
-  char zeroByte = 0;
-  for (i = 0; i < (VIDEO_SINGLETON::instance ()->numF + 7) / 8; i++)
-    CmdWrite((char *)&zeroByte, 1);
-#endif
-}
-
-static void on_exit_routine(void)
-{
-  struct sockaddr_in peeraddr_in;
-  int size = sizeof(peeraddr_in);
-  /*
-  if (!VIDEO_SINGLETON::instance ()->normalExit) {
-    fprintf(stderr, "VS exitting abnormally, dump core...\n");
-    kill(getpid(), SIGSEGV);
-    usleep(2000000);
-  }
-  */
-  /*
-  fprintf(stderr, "A VS session terminated.\n");
-  */
-  if (getpeername(VIDEO_SINGLETON::instance ()->serviceSocket,
-		  (struct sockaddr *)&peeraddr_in, &size) == 0 &&
-      peeraddr_in.sin_family == AF_INET) {
-    if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
-      struct hostent *hp;
-      time_t val = time(NULL);
-      char * buf = ctime(&VIDEO_SINGLETON::instance ()->start_time);
-      
-      hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
-      buf[strlen(buf)-1] = 0;
-      printf("%s: %s %3dm%02ds %dP %s\n",
-	     buf,
-	     hp == NULL ? inet_ntoa(peeraddr_in.sin_addr) : hp->h_name,
-	     (val - VIDEO_SINGLETON::instance ()->start_time) / 60, (val - VIDEO_SINGLETON::instance ()->start_time) % 60,
-	     VIDEO_SINGLETON::instance ()->pkts_sent, VIDEO_SINGLETON::instance ()->videoFile);
-    }
-  }
-  ComCloseConn(VIDEO_SINGLETON::instance ()->serviceSocket);
-  ComCloseConn(VIDEO_SINGLETON::instance ()->videoSocket);
-}
-
-int VideoServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
-{
-  int result;
-
-  VIDEO_SINGLETON::instance ()->serviceSocket = ctr_fd;
-  VIDEO_SINGLETON::instance ()->videoSocket = data_fd;
-  VIDEO_SINGLETON::instance ()->conn_tag = max_pkt_size;
-  
-  if (max_pkt_size > 0) VIDEO_SINGLETON::instance ()->msgsize = max_pkt_size;
-  else if (max_pkt_size < 0) VIDEO_SINGLETON::instance ()->msgsize = - max_pkt_size;
-  else VIDEO_SINGLETON::instance ()->msgsize = 1024 * 1024;
-  /*
-  SFprintf(stderr, "VS VIDEO_SINGLETON::instance ()->msgsize = %d\n", VIDEO_SINGLETON::instance ()->msgsize);
-  */
-  VIDEO_SINGLETON::instance ()->msgsize -= sizeof(VideoMessage);
-  
-  VIDEO_SINGLETON::instance ()->start_time = time(NULL);
-
-  atexit(on_exit_routine);
-
-  VIDEO_SINGLETON::instance ()->lastRef[0] = VIDEO_SINGLETON::instance ()->lastRef[1] = -1;
-  VIDEO_SINGLETON::instance ()->lastRefPtr = 0;
-
-  result = INITvideo();
-
-  if (result != 0)
-    return result;
-
-  if (rttag) {
-    if (SetRTpriority("VS", 0) == -1) rttag = 0;
-  }
-  
-  for (;;)
-  {
-    
-    fprintf(stderr, "VS: waiting for a new command...\n");
-    
-    VIDEO_SINGLETON::instance ()->precmd = VIDEO_SINGLETON::instance ()->cmd;
-    result = CmdRead((char *)&VIDEO_SINGLETON::instance ()->cmd, 1);
-    if (result != 0)
-      {
-        cerr << result;
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) VideoServer "),
-                          result);
-      }
-    fprintf(stderr, "VS got VIDEO_SINGLETON::instance ()->cmd %d\n", VIDEO_SINGLETON::instance ()->cmd);
-    
-    switch (VIDEO_SINGLETON::instance ()->cmd)
-    {
-    case CmdPOSITION:
-    case CmdPOSITIONrelease:
-      result = POSITIONvideo();
-      if (result != 0)
-        return result;
-      break;
-    case CmdSTEP:
-      result = STEPvideo();
-      if (result != 0)
-        return result;
-      break;
-    case CmdFF:
-      FFvideo();
-      break;
-    case CmdFB:
-      FBvideo();
-      break;
-    case CmdPLAY:
-      result = PLAYvideo();
-      if (result != 0)
-        return result;
-      break;
-    case CmdCLOSE:
-      /*
-      fprintf(stderr, "a session closed.\n");
-      VIDEO_SINGLETON::instance ()->normalExit =1;
-      */
-      //      exit(0);
-      return 0;
-      break;
-    case CmdSTATstream:
-      STATstream();
-      break;
-    case CmdSTATsent:
-      STATsent();
-      break;
-    default:
-      fprintf(stderr,
-	      "VS error: video channel command %d not known.\n", VIDEO_SINGLETON::instance ()->cmd);
-      VIDEO_SINGLETON::instance ()->normalExit = 0;
-      return -1;
-      break;
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_Control.idl b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_Control.idl
deleted file mode 100644
index 1056fddbcfb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_Control.idl
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*- 
-
-// $Id$
-
-interface Audio_Control
-{
-
-  /* CmdINITaudio parameter of fixed structure of 3 integers and a AudioPara,
-     replys with CmdINITaudio followed by reply or CmdFAIL followed by a string */
-  struct INITaudioPara
-  {
-    int sn;
-    int version;
-    AudioParameter para;
-    int nameLength;
-    sequence <char> audiofile;
-    /* char audioFile[] */
-  };
-
-  struct INITaudioReply
-  {
-    int live;
-    int format;
-  
-    AudioParameter para;
-    int totalSamples;
-  };
-
-
-  /* CmdPLAY parameter */
-  struct PLAYPara
-  {
-    int sn;
-    int nextSample;
-    int samplesPerSecond; /* audio playback speed */
-    int samplesPerPacket; /* Number of samples in a packet */
-    int ABsamples; /* size of client VB buffer in samples */
-    int spslimit;  /* QoS parameter: sps supported by the audio channel */
-  };
-
-  /* STOP followed only by SN */
-
-  /* CmdSPEED parameter */
-  struct  SPEEDPara
-  {
-    int sn;
-    int samplesPerSecond;
-    int samplesPerPacket; /* Number of samples in a packet */
-    int spslimit;
-  };
-
-  boolean init_audio (in INITaudioPara para,
-                      out INITaudioReply reply_para);
-  boolean play (in PLAYPara para, out long ats);
-
-  boolean speed (in SPEEDPara para);
-
-  boolean stop (in long cmdsn);
-
-  unsigned short set_peer (in string peer);
-  // Initializes the server to communicate to the <peer>, which can be
-  // "ip-number:port-number" (e.g., "tango.cs.wustl.edu:1234" or
-  // "128.252.166.57:1234").  If there is no ':' in the <address> it
-  // is assumed to be a port number, with the IP address being
-  // INADDR_ANY.
-  // Server returns it's UDP data port number.
-};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
deleted file mode 100644
index e756c22337f..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
+++ /dev/null
@@ -1,492 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libmpeg_shared
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES = $(IDL_FILES)
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-
-#TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h
-
-IDL_FILES = Video_ControlS Video_ControlC
-
-FILES += com fileio filters routine sendpt 
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
-
-MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
-CPPFLAGS += -I$(MPEG_ROOT)
-
-LIBS 	+= -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-##LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
-CPPFLAGS += -DSH_MEM -DNDEBUG
-
-.PRECIOUS: Video_ControlS.cpp Video_ControlC.cpp
-
-idl_stubs: $(addsuffix .h, $(IDL_FILES))
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Video_ControlS.o .obj/Video_ControlS.so .shobj/Video_ControlS.o .shobj/Video_ControlS.so: Video_ControlS.cpp Video_ControlS.h Video_ControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- Video_ControlC.i Video_ControlS.i
-.obj/Video_ControlC.o .obj/Video_ControlC.so .shobj/Video_ControlC.o .shobj/Video_ControlC.so: Video_ControlC.cpp Video_ControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- Video_ControlC.i Video_ControlS.h Video_ControlS.i
-.obj/com.o .obj/com.so .shobj/com.o .shobj/com.so: com.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i fileio.h routine.h \
- com.h
-.obj/fileio.o .obj/fileio.so .shobj/fileio.o .shobj/fileio.so: fileio.cpp routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i fileio.h
-.obj/filters.o .obj/filters.so .shobj/filters.o .shobj/filters.so: filters.cpp filters.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/routine.o .obj/routine.so .shobj/routine.o .shobj/routine.so: routine.cpp routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/sendpt.o .obj/sendpt.so .shobj/sendpt.o .shobj/sendpt.so: sendpt.cpp sendpt.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_Control.idl b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_Control.idl
deleted file mode 100644
index 4440e8a7923..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_Control.idl
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*- 
-
-// $Id$
-
-interface Video_Control
-{
-
-  const long VIDEO_PATTERN_SIZE = 100;
-  struct INITvideoPara
-  {
-    long sn;
-    long version;
-    sequence <char> videofile;
-  };
-
-  struct INITvideoReply
-  {
-    long live;
-    long format;
-  
-    long totalHeaders;
-    long totalFrames;
-    long totalGroups;
-    long horizontalSize;
-    long verticalSize;
-    long pelAspectRatio;
-    long pictureRate1000;
-    long vbvBufferSize;
-    long sizeIFrame;
-    long sizePFrame;
-    long sizeBFrame;
-    long sizeSystemHeader;
-    long sizeGop;
-    long averageFrameSize;
-    long firstGopFrames;
-    sequence <char> pattern;
-  };
-
-  /* CmdPOSITION, CmdPOSITIONrelease: followed by following parameter */
-  struct POSITIONpara
-  {
-    long sn;
-    long nextGroup;
-  };
-
-  /* CmdSTEP: followed by following parameter */
-  struct STEPpara
-  {
-    long sn;
-    long nextFrame;
-  };
-
-  /* CmdFF, CmdFB: followed by following parameter */
-  struct FFpara
-  {
-    long sn;
-    long nextGroup;
-    long usecPerFrame;
-    long framesPerSecond;
-    long VStimeAdvance;
-  };
-  
-  typedef FFpara FBpara;
-
-  /*CmdPLAY: followed by following parameter */
-  struct PLAYpara
-  {
-    long sn;
-    long collectStat;
-    long nextFrame;
-    long usecPerFrame;
-    long framesPerSecond;
-    long frameRateLimit1000;
-    long VStimeAdvance;
-    long sendPatternGops;
-    sequence <char> sendPattern;
-  };
-
-  /* CmdSPEED: parameter */
-  struct SPEEDpara
-  {
-    long sn;
-    long usecPerFrame;
-    long framesPerSecond;
-    long frameRateLimit1000;
-    long sendPatternGops;
-    sequence <char> sendPattern;
-  };
-
-
-  boolean init_video (in INITvideoPara para,
-                      out INITvideoReply reply_para);
-  boolean stat_stream (out char ch, out long size);
-  boolean close ();
-  boolean stat_sent ();
-  boolean fast_forward (in FFpara para);
-  boolean fast_backward (in FFpara para);
-  boolean step (in STEPpara para);
-  boolean play (in PLAYpara para, out long vts);
-  boolean position (in POSITIONpara para);
-  boolean speed (in SPEEDpara para);
-  boolean stop (in long cmdsn);
-
-  unsigned short set_peer (in string peer);
-  // Initializes the server to communicate to the <peer>, which can be
-  // "ip-number:port-number" (e.g., "tango.cs.wustl.edu:1234" or
-  // "128.252.166.57:1234").  If there is no ':' in the <address> it
-  // is assumed to be a port number, with the IP address being
-  // INADDR_ANY.
-  // Server returns it's UDP data port number.
-};
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp
deleted file mode 100644
index 7c219eb1d1b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp
+++ /dev/null
@@ -1,2133 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-
-// #include <stdio.h>   
-// #include <errno.h>   
-// #include <stdlib.h>  
-// #include <sys/types.h>
-// #include <unistd.h>  
-// #include <string.h>  
-// #include <netdb.h>   
-// #include <ctype.h>   
-// #include <sys/select.h>
-// #include <sys/socket.h>
-// #include <netinet/in.h>
-// #include <netinet/tcp.h>
-// #include <arpa/inet.h>
-// #include <sys/un.h>  
-// #include <time.h>    
-// #include <sys/time.h>
-#include "include/common.h"
-#include "fileio.h"
-#include "routine.h"
-#include "com.h"
-#include "ace/OS.h"
-
-#ifdef NATIVE_ATM
-#include "atmcom.h"
-#endif
-
-#define CONN_INET	1
-#define CONN_UNIX	2
-#define CONN_ATM	3
-
-#define SERVER_FDTABLE_SIZE	50
-#define CLIENT_FDTABLE_SIZE	10
-
-#define STATE_PENDING	1
-#define STATE_CONTROL	2
-#define STATE_DATA	3
-#define STATE_SINGLE	4
-
-static int inet_port;
-static char * unix_port, * atm_port;
-
-static struct FdTable
-{
-  int fd;   /* -1 -- free item, >=0 -- fd value */
-  int type;
-  unsigned stime;  /* setup time, in seconds */
-  int state;
-} * fdTable = NULL;
-static int size = 0;
-
-int ComInitClient(int pinet_port, char * punix_port, char * patm_port)
-{
-  int i;
-  
-  inet_port = pinet_port;
-  unix_port = punix_port;
-  atm_port = patm_port;
-  if (size) {
-    fprintf(stderr,
-	    "Error ComInitClient: pid %d already done ComInitClient/Server\n",
-	    getpid());
-    return -1;
-  }
-  size = CLIENT_FDTABLE_SIZE;
-  fdTable = (struct FdTable *)ACE_OS::malloc(size * sizeof(*fdTable));
-  if (fdTable == NULL) {
-    fprintf(stderr,
-	    "Error ComInitClient: pid %d failed to allocated fdTable space:",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  for (i = 0; i < size; i ++) {
-    fdTable[i].fd = -1;
-  }
-#ifdef NATIVE_ATM
-  return ATMinitClient(atm_port);
-#else
-  return 0;
-#endif
-}
-
-void ComCloseClient(void)
-{
-  int i;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd >= 0) ComCloseConn(fdTable[i].fd);
-  }
-#ifdef NATIVE_ATM
-  ATMcloseClient();
-#endif
-  return;
-}
-
-int ComCloseFd(int fd)
-{
-  int i;
-  if (!size) {
-    fprintf(stderr,
-	    "Error ComCloseFd: pid %d not done ComInitClient/Server yet.\n",
-	    getpid());
-    return -1;
-  }
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == fd) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = -1;
-    if (fdTable[i].type == CONN_ATM) {
-#ifdef NATIVE_ATM
-      return ATMcloseFd(fd);
-#else
-      fprintf(stderr,
-	      "Error ComCloseFd: pid %d CONN_ATM not supported.\n",
-	      getpid());
-      return -1;
-#endif
-    }
-    else {
-      close(fd);
-    }
-    return 0;
-  }
-  else {
-    fprintf(stderr,
-	    "Error ComCloseFd: pid %d can't find fd %d in table\n",
-	    getpid(), fd);
-    return -1;
-  }
-}
-
-int ComCloseConn(int fd)
-{
-  int i;
-  if (!size) {
-    fprintf(stderr,
-	    "Error ComCloseConn: pid %d not done ComInitClient/Server yet.\n",
-	    getpid());
-    return -1;
-  }
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == fd) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = -1;
-    if (fdTable[i].type == CONN_ATM) {
-#ifdef NATIVE_ATM
-      return ATMcloseConn(fd);
-#else
-      fprintf(stderr,
-	      "Error ComCloseConn: pid %d CONN_ATM not supported.\n",
-	      getpid());
-      return -1;
-#endif
-    }
-    else {
-      close(fd);
-    }
-    return 0;
-  }
-  else {
-    fprintf(stderr,
-	    "Error ComCloseConn: pid %d can't find fd %d in table\n",
-	    getpid(), fd);
-    return -1;
-  }
-}
-
-int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size)
-{
-
-  // This is right now called only by the audio client.
-  // The protocol is slightly modified as after connecting we need to
-  // inform that we are a audio client so that it can fork a process.
-  int i;
-  int cfd, dfd, csocktype, dsocktype;
-  int conn_tag = !(*max_pkt_size);
-  struct sockaddr_in addressIn;
-  struct sockaddr_un addressUn;
-  
-  if (!size) {
-    fprintf(stderr,
-	    "Error ComOpenConnPair: pid %d not done ComInitClient/Server yet.\n",
-	    getpid());
-    return -1;
-  }
-
-  cfd = 0;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) cfd ++;
-  }
-  if (cfd < 2) {
-    fprintf(stderr,
-	    "Error ComOpenConnPair: pid %d no faTable entry for the pair",
-	    getpid());
-    return -1;
-  }
-  
-  /* tell the type of connections to establish:
-     If the server is on the same host, then UNIX socket is used */
-  if (address[0] == 0) {
-    csocktype = CONN_UNIX;
-    dsocktype = CONN_UNIX;
-  }
-  else if (!strncasecmp(address, "atm:", 4)) {
-    address += 4;
-    csocktype = CONN_ATM;
-    dsocktype = CONN_ATM;
-  }
-  else if (!strncasecmp(address, "datm:", 5)) {
-    address += 5;
-    csocktype = CONN_INET;
-    dsocktype = CONN_ATM;
-  }
-  else {
-    csocktype = CONN_INET;
-    dsocktype = CONN_INET;
-  }
-  if (csocktype == CONN_INET || dsocktype == CONN_INET) {
-    struct hostent *hp;
-    char hostname[100];
-    addressIn.sin_family = AF_INET;
-    if (!strncasecmp(address, "inet:", 5)) {
-      address += 5;
-    }
-    if (isascii(address[0]) && isdigit(address[0]))
-      addressIn.sin_addr.s_addr = inet_addr(address);
-    else {
-      if ((hp = gethostbyname(address)) == NULL) { /* No such host! */
-        fprintf(stderr,
-		"Error ComOpenConnPair: pid %d host %s can't be found:",
-		getpid(), address);
-	perror("");
-        return -1;
-      }
-      if (hp->h_addrtype != AF_INET) {
-        fprintf(stderr,
-		"Error ComOpenConnPair: pid %d host %s is not of INET type address.\n",
-		getpid(), address);
-        return -1;
-      }
-      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      /*
-      bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      */
-    }
-    if (get_hostname(hostname, 100)) {
-      fprintf(stderr, "Error ComOpenConnPair: pid %d failed to get_hostname:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if ((hp = gethostbyname(hostname)) == NULL) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to its own IP address:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if (hp->h_addrtype != AF_INET) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d own address is not INET type",
-	      getpid());
-      return -1;
-    }
-    
-    if (!memcmp((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	        sizeof(addressIn.sin_addr.s_addr))) {
-      if (csocktype == CONN_INET) csocktype = CONN_UNIX;
-      if (dsocktype == CONN_INET) dsocktype = CONN_UNIX;
-    }
-  }
-
-  /* build appropriate type of Connections to Server */
-  if (csocktype == CONN_UNIX && dsocktype == CONN_UNIX) {
-    /* build UNIX connection to server */
-    addressUn.sun_family = AF_UNIX;
-    strncpy(addressUn.sun_path, unix_port,
-	    sizeof(struct sockaddr_un) - sizeof(short));
-    cfd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (cfd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to open UNIX cfd:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    usleep(10000); /* this is for waiting for the uncaught signal mentioned
-		      below */
-    if (connect(cfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to conn UNIX cfd to server:",
-	      getpid());
-      perror("");
-      i = -3;  /* I don't understand why when connect() returns EINTR, the connection
-		  is still built, and the other end can still get what written at
-		  this end, 'i = -3' is a garbage to be written. */
-      write(cfd, &i, 4);
-      close(cfd);
-      return -1;
-    }
-    if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to write -1 to UNIX cfd:",
-	      getpid());
-      perror("");
-      close(cfd);
-      return -1;
-    }
-    
-    dfd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (dfd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to open UNIX dfd:",
-	      getpid());
-      perror("");
-      close(cfd);
-      return -1;
-    }
-    usleep(10000);
-    if (connect(dfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
-       fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to conn UNIX dfd to server:",
-	      getpid());
-      perror("");
-      i = -3;
-      write(dfd, &i, 4);
-      close(cfd);
-      close(dfd);
-      return -1;
-    }
-    if (time_write_int(dfd, i) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to write (cfd) to UNIX dfd:",
-	      getpid());
-      perror("");
-      close(cfd);
-      close(dfd);
-      return -1;
-    }
-    *max_pkt_size = 0;
-  }
-  else if (csocktype == CONN_INET && dsocktype == CONN_INET)  {
-    /* build TCP connection to server */
-    addressIn.sin_port = htons(inet_port);
-    cfd = socket(AF_INET, SOCK_STREAM, 0);
-    if (cfd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to open TCP cfd:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    usleep(10000);
-    if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-       fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to conn TCP cfd to server:",
-	      getpid());
-      perror("");
-      i = -3;
-      write(cfd, &i, 4);
-      close(cfd);
-      return -1;
-    }
-    if (conn_tag) { /* create a second connection with server */
-      if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write -1 to TCP cfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	return -1;
-      }
-      dfd = socket(AF_INET, SOCK_STREAM, 0);
-      if (dfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open TCP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	return -1;
-      }
-      usleep(10000);
-      if (connect(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
- 	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to conn TCP dfd to server:",
-		getpid());
-	perror("");
-	i = -3;
-	write(dfd, &i, 4);
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      if (time_write_int(dfd, i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write (cfd) to TCP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      *max_pkt_size = 0;
-    }
-    else {  /* create a UDP socket for data */
-      // Write a byte saying that we are a audio client.
-      
-      if (time_write_int(cfd,CmdINITaudio) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write -2 to TCP cfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-
-      dfd = socket(AF_INET, SOCK_DGRAM, 0);
-      if (dfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open UDP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	return -1;
-      }
-      memset((char *)&addressIn, 0, sizeof(addressIn));
-
-      i = sizeof(addressIn);
-      if (getsockname(cfd, (struct sockaddr *)&addressIn, &i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to getsocketname on TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      
-      addressIn.sin_family = AF_INET;
-      addressIn.sin_port = 0;
-      if (bind(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to bind UDP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      if (time_write_int(cfd, -2) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write -2 to TCP cfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      
-      i = sizeof(addressIn);
-      if (getsockname(dfd, (struct sockaddr *)&addressIn, &i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to getsocketname on UDP fd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      if (time_write_bytes(cfd, (char *)&addressIn.sin_port, sizeof(short)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write (port) to TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      
-      fprintf(stderr, "ComOpenConnPair local UDP socket: addr - %s,%d, port - %u.\n",
-	      inet_ntoa(addressIn.sin_addr), addressIn.sin_addr.s_addr,ntohs(addressIn.sin_port));
-      
-      
-      fprintf(stderr, "ComOpenConnPair UDP port %d (should be > 0)\n",
-	      ntohs(addressIn.sin_port));
-      
-      /*
-      i = sizeof(addressIn);
-      if (getsockname(cfd, (struct sockaddr *)&addressIn, &i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to getsocketname on TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      */
-      if (time_write_bytes(cfd, (char *)&addressIn.sin_addr.s_addr, sizeof(int)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write (IP addr) to TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      
-      fprintf(stderr, "ComOpenConnPair TCP cfd socket: addr - %s, port - %u.\n",
-	      inet_ntoa(addressIn.sin_addr), ntohs(addressIn.sin_port));
-      
-      if (time_read_bytes(cfd, (char *)&addressIn.sin_port, sizeof(short)) == -1 ||
-	  time_read_bytes(cfd, (char *)&addressIn.sin_addr.s_addr, sizeof(int)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to read (IP addr/port) from TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      usleep(10000);
-      if (connect(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed conn UDP dfd to peer:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      
-      fprintf(stderr, "ComOpenConnPair UDP dfd connects to host-%s (port %u)\n",
-  	      inet_ntoa(addressIn.sin_addr),
-	      ntohs(addressIn.sin_port));
-      
-#ifndef LINUX
-      /* adjust the dfd REVBUF size */
-      {
-	int len;
-	len = INET_SOCKET_BUFFER_SIZE + 100;
-	/*
-	if (setsockopt(dfd, SOL_SOCKET, SO_SNDBUF, (char *)&len, sizeof(len)) == -1) {
-	  fprintf(stderr,
-		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-snd to size %d:",
-		  getpid(), len);
-	  perror("");
-	  close(dfd);
-	  close(cfd);
-	  return -1;
-	}
-	*/
-	len = 65536;
-	while (setsockopt(dfd, SOL_SOCKET, SO_RCVBUF, (char *)&len, sizeof(len)) == -1) {
-	  len -= 1024;
-	  if (len < 8192) break;
-	  /*
-	  fprintf(stderr,
-		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-rcv to size %d:",
-		  getpid(), len);
-	  perror("");
-	  close(dfd);
-	  close(cfd);
-	  return -1;
-	  */
-	}
-	if (getuid() == DEVELOPER_UID)
-	fprintf(stderr,	"Set UDP dfd-rcv to %dB\n", len);
-      }
-#endif
-      *max_pkt_size = - INET_SOCKET_BUFFER_SIZE;
-                        /* UDP sockets on HP and SUN are discard mode */
-    }
-    if (setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY,
-		   (const char *)&i, sizeof(i)) == -1) {
-      fprintf(stderr,
-    "Error ComOpenConnPair: pid %d failed to setsockopt on TCP cfd with TCP_NODELAY:",
-	      getpid());
-      perror("");
-      close(dfd);
-      close(cfd);
-      return -1;
-    }
-  }
-  else if (dsocktype == CONN_ATM) { /* CONN_ATM */
-#ifdef NATIVE_ATM
-    if (csocktype == CONN_INET) {
-      /* build TCP connection to server */
-      addressIn.sin_port = htons(inet_port);
-      cfd = socket(AF_INET, SOCK_STREAM, 0);
-      if (cfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open TCP1 cfd:",
-		getpid());
-	perror("");
-	return -1;
-      }
-      usleep(10000);
-      if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-	 fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to conn TCP1 cfd to server:",
-		getpid());
-	perror("");
-	i = -3;
-	write(cfd, &i, 4);
-	close(cfd);
-	return -1;
-      }
-    }
-    else if (csocktype == CONN_UNIX) {
-      /* build UNIX connection to server */
-      addressUn.sun_family = AF_UNIX;
-      strncpy(addressUn.sun_path, unix_port,
-	      sizeof(struct sockaddr_un) - sizeof(short));
-      cfd = socket(AF_UNIX, SOCK_STREAM, 0);
-      if (cfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open UNIX1 cfd:",
-		getpid());
-	perror("");
-	return -1;
-      }
-      usleep(10000); /* this is for waiting for the uncaught signal mentioned
-			below */
-      if (connect(cfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to conn UNIX1 cfd to server:",
-		getpid());
-	perror("");
-	i = -3;  /* I don't understand why when select() returns EINTR, the connection
-		    is still built, and the other end can still get what written at
-		    this end, 'i = -3' is a garbage to be written. */
-	write(cfd, &i, 4);
-	close(cfd);
-	return -1;
-      }
-    }
-    else {  /* CONN_ATM */
-      cfd = ATMopenConn(address, max_pkt_size);
-      if (cfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open ATM cfd conn:",
-		getpid());
-	perror("");
-	return -1;
-      }
-      usleep(100000);  /* be nice to buggy ATM driver */
-    }
-    if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to write -1 to %s cfd:",
-	      getpid(),
-	      (csocktype == CONN_UNIX) ? "UNIX1" :
-	      (csocktype == CONN_INET) ? "INET1" : "ATM");
-      perror("");
-      if (csocktype == CONN_ATM) ATMcloseConn(cfd);
-      else close(cfd);
-      return -1;
-    }
-
-    dfd = ATMopenConn(address, max_pkt_size);
-    if (dfd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to open ATM dfd conn:",
-	      getpid());
-      perror("");
-      ATMcloseConn(cfd);
-      return -1;
-    }
-    usleep(100000); /* be nice to buggy ATM driver */
-    if (time_write_int(dfd, i) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to write (cfd) to ATM dfd:",
-	      getpid());
-      perror("");
-      ATMcloseConn(cfd);
-      ATMcloseConn(dfd);
-      return -1;
-    }
-#else
-    fprintf(stderr,
-	    "Error ComOpenConnPair: pid %d addresstype %d not supported\n",
-	    getpid(), dsocktype);
-    return -1;
-#endif
-  }
-  for (i = 0; i < size; i ++) {  /* guaranteed to succeed */
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = cfd;
-    fdTable[i].type = csocktype;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_CONTROL;
-  }
-  else {
-    fprintf(stderr, "<Weird>Error ComOpenConnPair: no entry for cfd %d\n", cfd);
-    return -1;
-  }
-  for (; i < size; i ++) {
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = dfd;
-    fdTable[i].type = dsocktype;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_DATA;
-  }
-  else {
-    fprintf(stderr, "<Wierd>Error ComOpenConnPair: no entry for dfd %d\n", dfd);
-    return -1;
-  }
-  *ctr_fd = cfd;
-  *data_fd = dfd;
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t)Returning from ComOpenConnpair\n"));
-  return 0;
-}
-
-/* address format: [ATM:|INET:]real_address | ""
-
-   "" -- UNIX socket, reliable byte stream
-   [INET:]real_address -- INET sockets, reliable control byte stream, and
-                          *max_pkt_size == 0 : reliable data byte stream, or
-			                != 0 : unreliable packet stream;
-   ATM:real_address -- ATM sockets, both data and control are
-                       unreliable packet streams;
-   DATM:real_address -- INET/UNIX control reliable byte stream
-                        and ATM unreliable byte stream;
-			
-   Communication between client and server:
-
-   ctr_fd:   client --> server	    server --> client
-             -2: conn-less INET	   Open udp sock, send addr in net byte order
-	         <port, addr>                     <port(short), addr(long)>
-	     -1: conn-orient	   Send value of fd, wait to be paired
-	     cfd>=0: data sock     Paired with cfd and return.
-   */
-
-#if 0
-int VideoComOpenConnPair (char * address, 
-                          int *ctr_fd, 
-                          int *data_fd, 
-                          int *max_pkt_size)
-{
-  int i;
-  int cfd, dfd, csocktype, dsocktype;
-  int conn_tag = !(*max_pkt_size);
-  struct sockaddr_in addressIn;
-  struct sockaddr_un addressUn;
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "%s %d\n",
-              __FILE__,__LINE__));
-
-  if (!size) {
-    fprintf(stderr,
-	    "Error ComOpenConnPair: pid %d not done ComInitClient/Server yet.\n",
-	    getpid());
-    return -1;
-  }
-
-  cfd = 0;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) cfd ++;
-  }
-  if (cfd < 2) {
-    fprintf(stderr,
-	    "Error ComOpenConnPair: pid %d no faTable entry for the pair",
-	    getpid());
-    return -1;
-  }
-  
-  /* tell the type of connections to establish:
-     If the server is on the same host, then UNIX socket is used */
-  if (address[0] == 0) {
-    csocktype = CONN_UNIX;
-    dsocktype = CONN_UNIX;
-  }
-  else if (!strncasecmp(address, "atm:", 4)) {
-    address += 4;
-    csocktype = CONN_ATM;
-    dsocktype = CONN_ATM;
-  }
-  else if (!strncasecmp(address, "datm:", 5)) {
-    address += 5;
-    csocktype = CONN_INET;
-    dsocktype = CONN_ATM;
-  }
-  else {
-    csocktype = CONN_INET;
-    dsocktype = CONN_INET;
-  }
-  if (csocktype == CONN_INET || dsocktype == CONN_INET) {
-    struct hostent *hp;
-    char hostname[100];
-    addressIn.sin_family = AF_INET;
-    if (!strncasecmp(address, "inet:", 5)) {
-      address += 5;
-    }
-    if (isascii(address[0]) && isdigit(address[0]))
-      addressIn.sin_addr.s_addr = inet_addr(address);
-    else {
-      if ((hp = gethostbyname(address)) == NULL) { /* No such host! */
-        fprintf(stderr,
-		"Error ComOpenConnPair: pid %d host %s can't be found:",
-		getpid(), address);
-	perror("");
-        return -1;
-      }
-      if (hp->h_addrtype != AF_INET) {
-        fprintf(stderr,
-		"Error ComOpenConnPair: pid %d host %s is not of INET type address.\n",
-		getpid(), address);
-        return -1;
-      }
-      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      /*
-      bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      */
-    }
-    if (get_hostname(hostname, 100)) {
-      fprintf(stderr, "Error ComOpenConnPair: pid %d failed to get_hostname:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if ((hp = gethostbyname(hostname)) == NULL) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to its own IP address:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if (hp->h_addrtype != AF_INET) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d own address is not INET type",
-	      getpid());
-      return -1;
-    }
-    
-    if (!memcmp((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	        sizeof(addressIn.sin_addr.s_addr))) {
-      if (csocktype == CONN_INET) csocktype = CONN_UNIX;
-      if (dsocktype == CONN_INET) dsocktype = CONN_UNIX;
-    }
-  }
-
-  /* build appropriate type of Connections to Server */
- 
-  if (csocktype == CONN_INET && dsocktype == CONN_INET)  {
-    /* build TCP connection to server */
-    addressIn.sin_port = htons(inet_port);
-    cfd = socket(AF_INET, SOCK_STREAM, 0);
-    if (cfd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to open TCP cfd:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    usleep(10000);
-    if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-       fprintf(stderr,
-	      "Error ComOpenConnPair: pid %d failed to conn TCP cfd to server:",
-	      getpid());
-      perror("");
-      i = -3;
-      write(cfd, &i, 4);
-      close(cfd);
-      return -1;
-    }
-//     if (conn_tag) { /* create a second connection with server */
-//       if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to write -1 to TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(cfd);
-// 	return -1;
-//       }
-      dfd = socket(AF_INET, SOCK_STREAM, 0);
-      if (dfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open TCP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	return -1;
-      }
-      usleep(10000);
-      if (connect(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
- 	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to conn TCP dfd to server:",
-		getpid());
-	perror("");
-	i = -3;
-	write(dfd, &i, 4);
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      if (time_write_int(dfd, i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to write (cfd) to TCP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	close(dfd);
-	return -1;
-      }
-      *max_pkt_size = 0;
-    }
-    else {  /* create a UDP socket for data */
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) ::VideoComOpenConnPair: making UDP connection\n"));
-      dfd = socket(AF_INET, SOCK_DGRAM, 0);
-      if (dfd == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to open UDP dfd:",
-		getpid());
-	perror("");
-	close(cfd);
-	return -1;
-      }
-      memset((char *)&addressIn, 0, sizeof(addressIn));
-
-      i = sizeof(addressIn);
-      if (getsockname(cfd, (struct sockaddr *)&addressIn, &i) == -1) {
-	fprintf(stderr,
-		"Error ComOpenConnPair: pid %d failed to getsocketname on TCP cfd:",
-		getpid());
-	perror("");
-	close(dfd);
-	close(cfd);
-	return -1;
-      }
-      
-//       addressIn.sin_family = AF_INET;
-//       addressIn.sin_port = 0;
-//       if (bind(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to bind UDP dfd:",
-// 		getpid());
-// 	perror("");
-// 	close(cfd);
-// 	close(dfd);
-// 	return -1;
-//       }
-//       if (time_write_int(cfd, -2) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to write -2 to TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(cfd);
-// 	close(dfd);
-// 	return -1;
-//       }
-      
-//       i = sizeof(addressIn);
-//       if (getsockname(dfd, (struct sockaddr *)&addressIn, &i) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to getsocketname on UDP fd:",
-// 		getpid());
-// 	perror("");
-// 	close(dfd);
-// 	close(cfd);
-// 	return -1;
-//       }
-//       if (time_write_bytes(cfd, (char *)&addressIn.sin_port, sizeof(short)) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to write (port) to TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(dfd);
-// 	close(cfd);
-// 	return -1;
-//       }
-      
-//       fprintf(stderr, "ComOpenConnPair local UDP socket: addr - %s, port - %u.\n",
-// 	      inet_ntoa(addressIn.sin_addr), ntohs(addressIn.sin_port));
-      
-      
-//       fprintf(stderr, "ComOpenConnPair UDP port %d (should be > 0)\n",
-// 	      ntohs(addressIn.sin_port));
-      
-//       /*
-//       i = sizeof(addressIn);
-//       if (getsockname(cfd, (struct sockaddr *)&addressIn, &i) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to getsocketname on TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(dfd);
-// 	close(cfd);
-// 	return -1;
-//       }
-//       */
-//       if (time_write_bytes(cfd, (char *)&addressIn.sin_addr.s_addr, sizeof(int)) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to write (IP addr) to TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(dfd);
-// 	close(cfd);
-// 	return -1;
-//       }
-      
-//       fprintf(stderr, "ComOpenConnPair TCP cfd socket: addr - %s, port - %u.\n",
-// 	      inet_ntoa(addressIn.sin_addr), ntohs(addressIn.sin_port));
-      
-//       if (time_read_bytes(cfd, (char *)&addressIn.sin_port, sizeof(short)) == -1 ||
-// 	  time_read_bytes(cfd, (char *)&addressIn.sin_addr.s_addr, sizeof(int)) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to read (IP addr/port) from TCP cfd:",
-// 		getpid());
-// 	perror("");
-// 	close(dfd);
-// 	close(cfd);
-      // 	return -1;
-      //       }
-      //      usleep(10000);
-      //            if (connect(dfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-      //	fprintf(stderr,
-      //		"Error ComOpenConnPair: pid %d failed conn UDP dfd to peer:",
-      //		getpid());
-      //	perror("");
-      //	close(cfd);
-      //	close(dfd);
-      //	return -1;
-      //      }
-      
-      fprintf(stderr, "ComOpenConnPair UDP dfd connects to host-%s (port %u)\n",
-  	      inet_ntoa(addressIn.sin_addr),
-	      ntohs(addressIn.sin_port));
-      
-#ifndef LINUX
-      /* adjust the dfd REVBUF size */
-      {
-	int len;
-	len = INET_SOCKET_BUFFER_SIZE + 100;
-	/*
-	if (setsockopt(dfd, SOL_SOCKET, SO_SNDBUF, (char *)&len, sizeof(len)) == -1) {
-	  fprintf(stderr,
-		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-snd to size %d:",
-		  getpid(), len);
-	  perror("");
-	  close(dfd);
-	  close(cfd);
-	  return -1;
-	}
-	*/
-	len = 65536;
-	while (setsockopt(dfd, SOL_SOCKET, SO_RCVBUF, (char *)&len, sizeof(len)) == -1) {
-	  len -= 1024;
-	  if (len < 8192) break;
-	  /*
-	  fprintf(stderr,
-		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-rcv to size %d:",
-		  getpid(), len);
-	  perror("");
-	  close(dfd);
-	  close(cfd);
-	  return -1;
-	  */
-	}
-	if (getuid() == DEVELOPER_UID)
-	fprintf(stderr,	"Set UDP dfd-rcv to %dB\n", len);
-      }
-#endif
-      *max_pkt_size = - INET_SOCKET_BUFFER_SIZE;
-                        /* UDP sockets on HP and SUN are discard mode */
-    }
-    if (setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY,
-		   (const char *)&i, sizeof(i)) == -1) {
-      fprintf(stderr,
-    "Error ComOpenConnPair: pid %d failed to setsockopt on TCP cfd with TCP_NODELAY:",
-	      getpid());
-      perror("");
-      close(dfd);
-      close(cfd);
-      return -1;
-    }
-    //  }
-//   else if (dsocktype == CONN_ATM) { /* CONN_ATM */
-// #ifdef NATIVE_ATM
-//     if (csocktype == CONN_INET) {
-//       /* build TCP connection to server */
-//       addressIn.sin_port = htons(inet_port);
-//       cfd = socket(AF_INET, SOCK_STREAM, 0);
-//       if (cfd == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to open TCP1 cfd:",
-// 		getpid());
-// 	perror("");
-// 	return -1;
-//       }
-//       usleep(10000);
-//       if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-// 	 fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to conn TCP1 cfd to server:",
-// 		getpid());
-// 	perror("");
-// 	i = -3;
-// 	write(cfd, &i, 4);
-// 	close(cfd);
-// 	return -1;
-//       }
-//     }
-//     else if (csocktype == CONN_UNIX) {
-//       /* build UNIX connection to server */
-//       addressUn.sun_family = AF_UNIX;
-//       strncpy(addressUn.sun_path, unix_port,
-// 	      sizeof(struct sockaddr_un) - sizeof(short));
-//       cfd = socket(AF_UNIX, SOCK_STREAM, 0);
-//       if (cfd == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to open UNIX1 cfd:",
-// 		getpid());
-// 	perror("");
-// 	return -1;
-//       }
-//       usleep(10000); /* this is for waiting for the uncaught signal mentioned
-// 			below */
-//       if (connect(cfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to conn UNIX1 cfd to server:",
-// 		getpid());
-// 	perror("");
-// 	i = -3;  /* I don't understand why when select() returns EINTR, the connection
-// 		    is still built, and the other end can still get what written at
-// 		    this end, 'i = -3' is a garbage to be written. */
-// 	write(cfd, &i, 4);
-// 	close(cfd);
-// 	return -1;
-//       }
-//     }
-//     else {  /* CONN_ATM */
-//       cfd = ATMopenConn(address, max_pkt_size);
-//       if (cfd == -1) {
-// 	fprintf(stderr,
-// 		"Error ComOpenConnPair: pid %d failed to open ATM cfd conn:",
-// 		getpid());
-// 	perror("");
-// 	return -1;
-//       }
-//       usleep(100000);  /* be nice to buggy ATM driver */
-//     }
-//     if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
-//       fprintf(stderr,
-// 	      "Error ComOpenConnPair: pid %d failed to write -1 to %s cfd:",
-// 	      getpid(),
-// 	      (csocktype == CONN_UNIX) ? "UNIX1" :
-// 	      (csocktype == CONN_INET) ? "INET1" : "ATM");
-//       perror("");
-//       if (csocktype == CONN_ATM) ATMcloseConn(cfd);
-//       else close(cfd);
-//       return -1;
-//     }
-
-//     dfd = ATMopenConn(address, max_pkt_size);
-//     if (dfd == -1) {
-//       fprintf(stderr,
-// 	      "Error ComOpenConnPair: pid %d failed to open ATM dfd conn:",
-// 	      getpid());
-//       perror("");
-//       ATMcloseConn(cfd);
-//       return -1;
-//     }
-//     usleep(100000); /* be nice to buggy ATM driver */
-//     if (time_write_int(dfd, i) == -1) {
-//       fprintf(stderr,
-// 	      "Error ComOpenConnPair: pid %d failed to write (cfd) to ATM dfd:",
-// 	      getpid());
-//       perror("");
-//       ATMcloseConn(cfd);
-//       ATMcloseConn(dfd);
-//       return -1;
-//     }
-// #else
-//     fprintf(stderr,
-// 	    "Error ComOpenConnPair: pid %d addresstype %d not supported\n",
-// 	    getpid(), dsocktype);
-//     return -1;
-// #endif
-//   }
-  for (i = 0; i < size; i ++) {  /* guaranteed to succeed */
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = cfd;
-    fdTable[i].type = csocktype;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_CONTROL;
-  }
-  else {
-    fprintf(stderr, "<Weird>Error ComOpenConnPair: no entry for cfd %d\n", cfd);
-    return -1;
-  }
-  for (; i < size; i ++) {
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = dfd;
-    fdTable[i].type = dsocktype;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_DATA;
-  }
-  else {
-    fprintf(stderr, "<Wierd>Error ComOpenConnPair: no entry for dfd %d\n", dfd);
-    return -1;
-  }
-  *ctr_fd = cfd;
-  *data_fd = dfd;
-  return 0;
-}
-#endif
-
-/* returns: -1 -- failed,  >=0 -- fd */
-int ComOpenConn(char * address, int *max_pkt_size)
-{
-  int i;
-  int fd, socktype;
-  struct sockaddr_in addressIn;
-  struct sockaddr_un addressUn;
-  
-  if (!size) {
-    fprintf(stderr,
-	    "Error ComOpenConn: pid %d not done ComInitClient/Server yet.\n",
-	    getpid());
-    return -1;
-  }
-
-  fd = 0;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) fd ++;
-  }
-  if (fd < 1) {
-    fprintf(stderr,
-	    "Error ComOpenConn: pid %d no faTable entry for the pair",
-	    getpid());
-    return -1;
-  }
-  
-  /* tell the type of connections to establish:
-     If the server is on the same host, then UNIX socket is used */
-  if (address[0] == 0) {
-    socktype = CONN_UNIX;
-  }
-  else if (!strncasecmp(address, "atm:", 4)) {
-    address += 4;
-    socktype = CONN_ATM;
-  }
-  else if (!strncasecmp(address, "datm:", 5)) {
-    address += 5;
-    socktype = CONN_ATM;
-  }
-  else {
-    socktype = CONN_INET;
-  }
-  if (socktype == CONN_INET) {
-    struct hostent *hp;
-    char hostname[100];
-    addressIn.sin_family = AF_INET;
-    if (!strncasecmp(address, "inet:", 5)) {
-      address += 5;
-    }
-    if (isascii(address[0]) && isdigit(address[0]))
-      addressIn.sin_addr.s_addr = inet_addr(address);
-    else {
-      if ((hp = gethostbyname(address)) == NULL) { /* No such host! */
-        fprintf(stderr,
-		"Error ComOpenConn: pid %d host %s can't be found:",
-		getpid(), address);
-	perror("");
-        return -1;
-      }
-      if (hp->h_addrtype != AF_INET) {
-        fprintf(stderr,
-		"Error ComOpenConn: pid %d host %s is not of INET type address.\n",
-		getpid(), address);
-        return -1;
-      }
-      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      /*
-      bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	    sizeof(addressIn.sin_addr.s_addr));
-      */
-    }
-    if (get_hostname(hostname, 100)) {
-      fprintf(stderr, "Error ComOpenConn: pid %d failed to get_hostname:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if ((hp = gethostbyname(hostname)) == NULL) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to its own IP address:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if (hp->h_addrtype != AF_INET) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d own address is not INET type",
-	      getpid());
-      return -1;
-    }
-    
-    if (!memcmp((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
-	        sizeof(addressIn.sin_addr.s_addr))) {
-      if (socktype == CONN_INET) socktype = CONN_UNIX;
-    }
-  }
-
-  /* build appropriate type of Connections to Server */
-  if (socktype == CONN_UNIX) {
-    /* build UNIX connection to server */
-    addressUn.sun_family = AF_UNIX;
-    strncpy(addressUn.sun_path, unix_port,
-	    sizeof(struct sockaddr_un) - sizeof(short));
-    fd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to open UNIX fd:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if (connect(fd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to conn UNIX fd to server:",
-	      getpid());
-      perror("");
-      close(fd);
-      return -1;
-    }
-    *max_pkt_size = 0;
-  }
-  else if (socktype == CONN_INET) {
-    /* build TCP connection to server */
-    addressIn.sin_port = htons(inet_port);
-    fd = socket(AF_INET, SOCK_STREAM, 0);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to open TCP fd:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-    if (connect(fd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
-       fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to conn TCP fd to server:",
-	      getpid());
-      perror("");
-      close(fd);
-      return -1;
-    }
-    if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
-		   (const char *)&i, sizeof(i)) == -1) {
-      fprintf(stderr,
-    "Error ComOpenConn: pid %d failed to setsockopt on TCP fd with TCP_NODELAY:",
-	      getpid());
-      perror("");
-      close(fd);
-      return -1;
-    }
-    *max_pkt_size = 0;
-  }
-  else if (socktype == CONN_ATM) { /* CONN_ATM */
-#ifdef NATIVE_ATM
-    /* CONN_ATM */
-    fd = ATMopenConn(address, max_pkt_size);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComOpenConn: pid %d failed to open ATM fd conn:",
-	      getpid());
-      perror("");
-      return -1;
-    }
-#else
-    fprintf(stderr,
-	    "Error ComOpenConn: pid %d addresstype %d not supported\n",
-	    getpid(), socktype);
-    return -1;
-#endif
-  }
-  for (i = 0; i < size; i ++) {  /* guaranteed to succeed */
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = fd;
-    fdTable[i].type = socktype;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_SINGLE;
-    return fd;
-  }
-  else {
-    fprintf(stderr, "<Weird>Error ComOpenConn: no entry for fd %d\n", fd);
-    return -1;
-  }
-}
-
-
-static int fd_unix, fd_inet, fd_atm;  /* for use in the server side */
-
-
-int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
-{
-  int i;
-  
-  struct sockaddr_in myaddr_in;
-  struct sockaddr_un myaddr_un;
-
-  inet_port = pinet_port;
-  unix_port = punix_port;
-  atm_port = patm_port;
-  
-  if (size) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d already done ComInitServer/Server\n",
-	    getpid());
-    return -1;
-  }
-  size = CLIENT_FDTABLE_SIZE;
-  // create and initialize the File Descriptor Table
-  fdTable = (struct FdTable *)ACE_OS::malloc(size * sizeof(*fdTable));
-  if (fdTable == NULL) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to allocated fdTable space:",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  for (i = 0; i < size; i ++) {
-    fdTable[i].fd = -1;
-  }
-  // Set all the file descriptor for atm ,inet and unix to be -1
-  fd_atm = fd_inet = fd_unix = -1;
-
-  memset((char *)&myaddr_in, 0, sizeof(struct sockaddr_in));
-  memset((char *)&myaddr_un, 0, sizeof(struct sockaddr_un));
-
-  myaddr_in.sin_family = AF_INET;
-  
-  myaddr_in.sin_addr.s_addr = htonl(INADDR_ANY);
-  myaddr_in.sin_port = htons((short)inet_port);
-
-  /* setup INET listen socket */
-  fd_inet = socket(AF_INET, SOCK_STREAM, 0);
-  if (fd_inet == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to open fd_inet:",
-	    getpid());
-    perror("");
-    goto open_fd_unix;
-  }
-  
-  i = 1;
-  if (setsockopt(fd_inet, SOL_SOCKET, SO_REUSEADDR,
-		 (const char *)&i, sizeof(i)) == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to setsockopt fd_inet with REUSEADDR:",
-	    getpid());
-    perror("");
-    close(fd_inet);
-    fd_inet = -1;
-    goto open_fd_unix;
-  }
-    
-  if (bind(fd_inet, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to bind fd_inet:",
-	    getpid());
-    perror("");
-    close(fd_inet);
-    fd_inet = -1;
-    goto open_fd_unix;
-  }
-  if (listen(fd_inet, 2) == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to listen on fd_inet:",
-	    getpid());
-    perror("");
-    close(fd_inet);
-    fd_inet = -1;
-    goto open_fd_unix;
-  }
-
- open_fd_unix:
-  
-  myaddr_un.sun_family = AF_UNIX;
-  strncpy(myaddr_un.sun_path, unix_port,
-	  (sizeof(struct sockaddr_un) - sizeof(short)));
-  fd_unix = socket(AF_UNIX, SOCK_STREAM, 0);
-  if (fd_unix == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to open fd_unix:",
-	    getpid());
-    perror("");
-    goto open_fd_atm;
-  }
-  if ((bind(fd_unix, (struct sockaddr *)&myaddr_un,
-	    sizeof(struct sockaddr_un))) == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to bind fd_unix:",
-	    getpid());
-    perror("");
-    close(fd_unix);
-    fd_unix = -1;
-    goto open_fd_atm;
-  }
-  if ((listen(fd_unix, 2)) == -1) {
-    fprintf(stderr,
-	    "Error ComInitServer: pid %d failed to liston on fd_unix:",
-	    getpid());
-    perror("");
-    close(fd_unix);
-    fd_unix = -1;
-    goto open_fd_atm;
-  }
-
- open_fd_atm:
-
-#ifdef NATIVE_ATM
-  fd_atm = ATMinitServer(atm_port);
-#endif
-  
-  if (fd_inet >= 0 || fd_unix >= 0 || fd_atm >= 0) return 0;
-  else return -1;
-}
-
-void ComCloseListen(void)
-{
-  if (fd_atm >= 0) {
-#ifdef NATIVE_ATM
-    /* fd_atm is not connected to a user_plane, ignore 
-    ATMcloseFd(fd_atm);
-    */
-    close(fd_atm);
-    fd_atm = -1;
-#else
-    fprintf(stderr, "Error ComCloseListen: CONN_ATM not supported.\n");
-#endif
-  }
-  if (fd_unix >= 0) {
-    close(fd_unix);
-    fd_unix = -1;
-  }
-  if (fd_inet >= 0) {
-    close(fd_inet);
-    fd_inet = -1;
-  }
-  return;
-}
-
-void ComCloseServer(void)
-{
-  int i;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd >= 0) ComCloseConn(fdTable[i].fd);
-  }
-  if (fd_atm >= 0) {
-#ifdef NATIVE_ATM
-    /* fd_atm not connected to a user-plane, igore it 
-    ATMcloseConn(fd_atm);
-    */
-    close(fd_atm);
-    fd_atm = -1;
-#else
-    fprintf(stderr, "Error ComCloseServer: CONN_ATM not supported.\n");
-#endif
-  }
-  if (fd_unix >= 0) {
-    close(fd_unix);
-    fd_unix = -1;
-    unlink(unix_port);
-  }
-  if (fd_inet >= 0) {
-    close(fd_inet);
-    fd_inet = -1;
-  }
-#ifdef NATIVE_ATM
-  ATMcloseServer();
-#endif
-  return;
-}
-
-static int change_option(int fd)
-{
-  struct linger linger = {1, 1};
-  int i = 1;
-  if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
-		 (const char *)&i, sizeof(i)) == -1) {
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d failed to setsockopt on fd_inet:",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  /* data socket also NODELAY */
-  if (setsockopt(fd, SOL_SOCKET, SO_LINGER, (const char *)&linger,
-		 sizeof(linger)) == -1) {
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d failed to linger on fd_inet:",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  return 0;
-}
-
-int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
-{
-  int i;
-  int fd, fdType;
-  int addrlen;
-  struct sockaddr_in peeraddr_in;
-  struct fd_set read_mask;
-  struct timeval tval;
-  int nfds;
-  
-  fd = 0;
-  addrlen = get_sec();
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) {
-      fd ++;
-    }
-    else if (fdTable[i].type == STATE_PENDING &&
-		     get_duration(fdTable[i].stime, addrlen) > 10) {
-      fprintf(stderr,
-	      "ComGetConnPair: pid %d closed fd %d (PENDING >= 10 sec)\n",
-	      getpid(), fdTable[i].fd);
-      ComCloseConn(fdTable[i].fd);
-      fdTable[i].fd = -1;
-      fd ++;
-    }
-  }
-  if (fd < 2) {
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d no faTable entry for the pair",
-	    getpid());
-    return -1;
-  }
-  
-  FD_ZERO(&read_mask);
-  if (fd_inet >= 0) FD_SET(fd_inet, &read_mask);
-  if (fd_unix >= 0) FD_SET(fd_unix, &read_mask);
-  if (fd_atm  >= 0) FD_SET(fd_atm,  &read_mask);
-
-  tval.tv_sec = 1;   /* wait at most 1 second */
-  tval.tv_usec = 0;
-
-
-  nfds = fd_inet;
-  if (fd_unix > nfds) nfds = fd_unix;
-  if (fd_atm > nfds) nfds = fd_atm;
-  // nfds now holds the highest numbered open file descriptor
-  nfds ++; // increment so that select can use o to nfds -1 no. of
-           // file descriptors.
-  errno = 0;
-  // fd is here used as the result of the select call
-#ifdef _HPUX_SOURCE
-  if ((fd = select(nfds, (int *)&read_mask, NULL, NULL, &tval)) == -1)
-#else
-  if ((fd = select(nfds, &read_mask, NULL, NULL, &tval)) == -1)
-#endif
-  {
-    
-    if (errno == EINTR) return -1;
-    
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d failed on select():",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  if (fd == 0) return -1; /* time expire */
-
-  fd = -1;
-  // fd will be reused inside this code as the accepted socket.
-  if (fd == -1 && fd_unix >= 0 && FD_ISSET(fd_unix, &read_mask)) {
-    struct sockaddr_un peeraddr_un;
-    
-    fprintf(stderr, "Server to accept a UNIX connection.\n");
-    
-    addrlen = sizeof(struct sockaddr_un);
-    fd = accept(fd_unix, (struct sockaddr *)&peeraddr_un, &addrlen);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComGetConnPair: pid %d failed to accpet on fd_unix:",
-	      getpid());
-      perror("");
-    }
-    else fdType = CONN_UNIX;
-    *max_pkt_size = 0;
-  }
-  // fd here is the result of the  accept for unix if fd_unix is valid
-  // Hence if fd_unix is present then this won't be called if the
-  // accept for the fd_unix succeeds.
-  if (fd == -1 && fd_inet >= 0 && FD_ISSET(fd_inet, &read_mask)) {
-    
-    fprintf(stderr, "Server to accept a INET connection.\n");
-    
-    addrlen = sizeof(struct sockaddr_in);
-    fd = accept(fd_inet, (struct sockaddr *)&peeraddr_in, &addrlen);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComGetConnPair: pid %d failed to accpet on fd_inet:",
-	      getpid());
-      perror("");
-    }
-    else fdType = CONN_INET;
-    *max_pkt_size = 0;
-  }
-  if (fd == -1 && fd_atm >= 0 && FD_ISSET(fd_atm, &read_mask)) {
-#ifdef NATIVE_ATM
-    fd = ATMaccept(fd_atm, max_pkt_size);
-    fdType = CONN_ATM;
-#else
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d CONN_ATM not supported.\n",
-	    getpid());
-#endif
-  }
-  // fd = -1 implies accept failed in any of the active connections
-  // which came out of the select call.
-  if (fd == -1) return -1;
-
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) break;
-  }
-  // Enter the accepted fd in the file descriptor Table
-  if (i < size) {
-    fdTable[i].fd = fd;
-    fdTable[i].type = fdType;
-    fdTable[i].stime = get_sec();
-  }
-  else {
-    fprintf(stderr, "Weird\n");
-  }
-
-  // read the port number for the UDP socket of the client
-  if (time_read_int(fd, &nfds) == -1) {
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d failed to read int from %s fd:",
-	    getpid(),
-	    fdType == CONN_ATM ? "ATM" :
-	    fdType == CONN_INET ? "INET" : "UNIX");
-    perror("");
-    ComCloseConn(fd);
-    return -1;
-  }
-  fprintf (stderr,
-           " Received int nfds = %d \n",
-           nfds);
-  // nfds holds the int read in time_read_int
-  // if nfds is -1 then read int error.
-  fprintf(stderr, "ComGetConnPair got %s fd = %d with value %d\n",
-	  fdType == CONN_ATM ? "ATM" :
-	  fdType == CONN_INET ? "INET" : "UNIX",
-	  fd, nfds);
-
-  if (nfds >= 0) { /* can be paired and return */
-    // This is the success case where you got a control fd and a data fd.
-    fdTable[i].state = STATE_DATA;
-    for (i = 0; i < size; i ++) {
-      if (fdTable[i].fd == nfds) break;
-    }
-    if (i < size && fdTable[i].state == STATE_PENDING) {
-      fdTable[i].state = STATE_CONTROL;
-    }
-    else {
-      if (i >= 0) fprintf(stderr, "<Weird> i %d\n", i);
-      ComCloseConn(fd);
-      return -1;
-    }
-    // ????
-    *ctr_fd = fdTable[i].fd;
-    *data_fd = fd;
-    return 0;
-  }
-  else if (nfds == -1) { /* wait to be paired */
-    fdTable[i].state = STATE_PENDING;
-    // fd is the inet or unix accepted socket.
-    // why is anyone writing the fd to the peer?
-    // looks like he is indicating an error to the client!!
-    // is this a hack ;-(
-    if (time_write_int(fd, fd) == -1) {
-      fprintf(stderr,
-	      "Error ComGetConnPair: pid %d failed to write (fd) to %s fd:",
-	      getpid(),
-	      fdType == CONN_ATM ? "ATM" :
-	      fdType == CONN_INET ? "INET" : "UNIX");
-      perror("");
-      ComCloseConn(fd);
-      return -1;
-    }
-    if (fdType == CONN_INET && change_option(fd) == -1) {
-      ComCloseConn(fd);
-    }
-    return -1;
-  }
-  else if (nfds == -2) {  /* inet case only, UDP data sock is requested */
-    int dfd;
-    struct sockaddr_in * in = &(peeraddr_in);
-    
-    fdTable[i].state = STATE_CONTROL;
-
-    if (fdType == CONN_INET && change_option(fd) == -1) {
-      fprintf(stderr,
-	      "Error ComGetConnPair: pid %d failed to change options of TCP cfd:",
-	      getpid());
-      ComCloseConn(fd);
-      return -1;
-    }
-    
-    dfd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (dfd == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to open dfd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      return -1;
-    }
-    memset((char *)in, 0, sizeof(* in));
-    
-    addrlen = sizeof(*in);
-    if (getsockname(fd, (struct sockaddr *)in, &addrlen) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to getsockname of fd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    
-    in->sin_family = AF_INET;
-    in->sin_port = 0;
-    /*
-    in->sin_addr.s_addr = htonl(INADDR_ANY);
-    */
-    if (bind(dfd, (struct sockaddr *)in, sizeof(* in)) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to bind dfd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    addrlen = sizeof(*in);
-    if (getsockname(dfd, (struct sockaddr *)in, &addrlen) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to getsockname of dfd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    if (time_write_bytes(fd, (char *)&in->sin_port, sizeof(short)) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to write (dfd.port) to fd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    /*
-    addrlen = sizeof(*in);
-    if (getsockname(fd, (struct sockaddr *)in, &addrlen) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to getsockname of fd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    */
-    if (time_write_bytes(fd, (char *)&in->sin_addr.s_addr, sizeof(int)) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to write (dfd.IPaddr) to fd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-
-    fprintf(stderr, "ComGetConnPair local UDP socket: addr - %s, port - %u.\n",
-            inet_ntoa(in->sin_addr), ntohs(in->sin_port));
-
-    if (time_read_bytes(fd, (char *)&in->sin_port, sizeof(short)) == -1 ||
-	time_read_bytes(fd, (char *)&in->sin_addr.s_addr, sizeof(int)) == -1) {
-      fprintf(stderr,
-	  "Error ComGetConnPair: pid %d failed to read (port, IPaddr) from fd:",
-	  getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-    usleep(10000);
-    if (connect(dfd, (struct sockaddr *)in, sizeof(*in)) == -1) {
-      fprintf(stderr,
-	      "Error ComGetConnPair: pid %d failed conn UDP dfd to peer:",
-	      getpid());
-      perror("");
-      ComCloseConn(fd);
-      close(dfd);
-      return -1;
-    }
-#if 0
-    {
-      int len;
-      len = 65536; /* INET_SOCKET_BUFFER_SIZE + 100; */
-      /*
-      if (setsockopt(dfd, SOL_SOCKET, SO_SNDBUF, (char *)&len, sizeof(len)) == -1) {
-	fprintf(stderr,
-		"Error ComGetConnPair: pid %d failed to set UDP dfd-snd to size %d:",
-		getpid(), len);
-	perror("");
-	ComCloseConn(fd);
-	close(dfd);
-	return -1;
-      }
-      */
-      len = 65536;
-      while (setsockopt(dfd, SOL_SOCKET, SO_RCVBUF, (char *)&len, sizeof(len)) == -1) {
-	len -= 1024;
-	if (len < 8192) break;
-	/*
-	fprintf(stderr,
-		"Warning ComGetConnPair: pid %d failed to set UDP dfd-rcv to size %d:",
-		getpid(), len);
-	perror("");
-	ComCloseConn(fd);
-	close(dfd);
-	return -1;
-	*/
-      }
-      if (getuid() == DEVELOPER_UID)
-      fprintf(stderr,"Set UDP dfd-rcv to %dB\n", len);
-    }
-#endif
-    // Most common return case where the server creates a UDP socket ,
-    // writes the port and ip addr and also gets the client's UDP
-    // endpoint .
-    *max_pkt_size = - INET_SOCKET_BUFFER_SIZE;  /* UDP sockets on HP and SUN
-						are known to be discard mode */
-
-    fprintf(stderr, "ComGetConnPair UDP dfd connects to host-%s (port %u)\n",
-	    inet_ntoa(in->sin_addr), ntohs(in->sin_port));
-
-    for (i = 0; i < size; i ++) {
-      if (fdTable[i].fd == -1) break;
-    }
-    if (i < size) {
-      fdTable[i].fd = dfd;
-      fdTable[i].type = CONN_INET;
-      fdTable[i].stime = get_sec();
-      fdTable[i].state = STATE_DATA;
-
-      *ctr_fd = fd;
-      *data_fd = dfd;
-      return 0;
-    }
-    else {
-      fprintf(stderr, "ComGetConnPair <Weird>: no space left\n");
-      return -1;
-    }
-  }
-  else {
-    fprintf(stderr,
-	    "Error ComGetConnPair: pid %d get invalid value %d from fd\n",
-	    getpid(), nfds);
-    ComCloseConn(fd);
-  }
-  return -1;
-}
-
-/* returns: -1 -- failed,  >= 0 -- fd */
-int ComGetConn(int *max_pkt_size)
-{
-  int i;
-  int fd, fdType;
-  int addrlen;
-  struct fd_set read_mask;
-  struct timeval tval;
-  int nfds;
-  
-  fd = 0;
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) {
-      fd ++;
-    }
-  }
-  if (fd < 1) {
-    fprintf(stderr,
-	    "Error ComGetConn: pid %d no faTable entry for the pair",
-	    getpid());
-    return -1;
-  }
-  
-  FD_ZERO(&read_mask);
-  if (fd_inet >= 0) FD_SET(fd_inet, &read_mask);
-  if (fd_unix >= 0) FD_SET(fd_unix, &read_mask);
-  if (fd_atm  >= 0) FD_SET(fd_atm,  &read_mask);
-
-  tval.tv_sec = 1;   /* wait at most 1 second */
-  tval.tv_usec = 0;
-
-  nfds = fd_inet;
-  if (fd_unix > nfds) nfds = fd_unix;
-  if (fd_atm > nfds) nfds = fd_atm;
-  nfds ++;
-  errno = 0;
-#ifdef _HPUX_SOURCE
-  if ((fd = select(nfds, (int *)&read_mask, NULL, NULL, &tval)) == -1)
-#else
-  if ((fd = select(nfds, &read_mask, NULL, NULL, &tval)) == -1)
-#endif
-  {
-    
-    if (errno == EINTR) return -1;
-    
-    fprintf(stderr,
-	    "Error ComGetConn: pid %d failed on select():",
-	    getpid());
-    perror("");
-    return -1;
-  }
-  if (fd == 0) return -1; /* time expire */
-
-  fd = -1;
-
-  if (fd == -1 && fd_unix >= 0 && FD_ISSET(fd_unix, &read_mask)) {
-    struct sockaddr_un peeraddr_un;
-
-    fprintf(stderr, "Server to accept a UNIX connection.\n");
-
-    addrlen = sizeof(struct sockaddr_un);
-    fd = accept(fd_unix, (struct sockaddr *)&peeraddr_un, &addrlen);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComGetConn: pid %d failed to accpet on fd_unix:",
-	      getpid());
-      perror("");
-    }
-    else fdType = CONN_UNIX;
-    *max_pkt_size = 0;
-  }
-  if (fd == -1 && fd_inet >= 0 && FD_ISSET(fd_inet, &read_mask)) {
-    struct sockaddr_in peeraddr_in;
-
-    fprintf(stderr, "Server to accept a INET connection.\n");
-
-    addrlen = sizeof(struct sockaddr_in);
-    fd = accept(fd_inet, (struct sockaddr *)&peeraddr_in, &addrlen);
-    if (fd == -1) {
-      fprintf(stderr,
-	      "Error ComGetConn: pid %d failed to accpet on fd_inet:",
-	      getpid());
-      perror("");
-    }
-    else fdType = CONN_INET;
-    *max_pkt_size = 0;
-  }
-  if (fd == -1 && fd_atm >= 0 && FD_ISSET(fd_atm, &read_mask)) {
-#ifdef NATIVE_ATM
-    fd = ATMaccept(fd_atm, max_pkt_size);
-    fdType = CONN_ATM;
-#else
-    fprintf(stderr,
-	    "Error ComGetConn: pid %d CONN_ATM not supported.\n",
-	    getpid());
-#endif
-  }
-  if (fd == -1) return -1;
-
-  for (i = 0; i < size; i ++) {
-    if (fdTable[i].fd == -1) break;
-  }
-  if (i < size) {
-    fdTable[i].fd = fd;
-    fdTable[i].type = fdType;
-    fdTable[i].stime = get_sec();
-    fdTable[i].state = STATE_SINGLE;
-    return fd;
-  }
-  else {
-    fprintf(stderr, "Weird\n");
-    ComCloseConn(fd);
-    return -1;
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
deleted file mode 100644
index 98e82aeb26c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/*
-Some assumptions about the streams created in this file:
-
-	PACKET STREAM:
-	
-		* send(), recv() may not work, we can only use
-		  read()/write().
-		
-		* write(): either send the whole packet, or send nothing
-
-		* read(): read() will read the minimun of the
-		  requested number of bytes and current packet size.
-		  read() can read part of a packet, but it
-		  will not read cross packet boundaris
-
-	    There are two modes: non-discard and dicard. If a packets is
-	          not read all its bytes, the remaining bytes will be
-		  or not be discarded.
-
-		  This is indicated by if (*max_pkt_size) is positive
-		  (non-discard) or negative (discard)
-
-	BYTE_STREAM: reliable
-
-		* write(): might write only part of requested bytes
-		  each time. (this is the case in SunOS4)
-
-		* read(): might read less than requested bytes.
-		  (this is the case in SunOS4).
-*/
-
-/* returns: -1 -- failed,  0 -- successful */
-int ComInitClient(int inet_port, char * unix_port, char * atm_port);
-
-void ComCloseClient(void);
-
-/* address format: [ATM:|INET:]real_address | ""
-
-   "" -- UNIX socket, reliable byte stream
-   [INET:]real_address -- INET sockets, reliable control byte stream, and
-                          *max_pkt_size == 0 : reliable data byte stream, or
-			                != 0 : unreliable packet stream;
-   ATM:real_address -- ATM sockets, both data and control are
-                       unreliable packet streams;
-   DATM:real_address -- INET/UNIX control reliable byte stream
-                        and ATM unreliable byte stream;
-
-   returns: -1 -- failed,  0 -- successful
-            *ctr_fd  -- control connection file descriptor
-            *data_fd  -- data connection file descriptor
-	    *max_pkt_size -- == 0 : reliable BYTE_STREAM
-	                     > 0  : unreliable non-discard PACKET STREAM
-			            with given maximum packet size (bytes);
-			     < 0  : unreliable discard PACKET STREAM
-			            with given maximum packet size (bytes);
-
-          It is suggested that if a BYTE_STREAM is not known to be discarded,
-	  than it is safer to indicate it as discard.
-   */
-int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size);
-int VideoComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size);
-
-
-/* returns: -1 -- failed,  >=0 -- fd */
-int ComOpenConn(char * address, int *max_pkt_size);
-
-/* returns: -1 -- failed,  0 -- successful */
-int ComCloseFd(int fd);
-
-/* returns: -1 -- failed,  0 -- successful */
-int ComCloseConn(int fd);
-
-/* returns: -1 -- failed,  0 -- successful */
-int ComInitServer(int inet_port, char * unix_port, char * atm_port);
-
-void ComCloseListen(void);
-
-void ComCloseServer(void);
-
-/* returns: -1 -- failed,  0 -- successful
-            *max_pkt_size is used only for returning value
-*/
-int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size);
-
-/* returns: -1 -- failed,  >= 0 -- fd */
-int ComGetConn(int *max_pkt_size);
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp
deleted file mode 100644
index b016ea5ff17..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <pwd.h>
-#include <grp.h>
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include "routine.h"
-#include "fileio.h"
-/*
-   Statfile(filename, sb)
-     input: filename - path name of a directory entry;
-     output: sb - StatBuf structure of the given directory entry;
-     returns: 0 - successful, -1 - failed, with errno indicating error
-     */
-int StatFile(char *filename, struct StatBuf * sb)
-{
-  struct stat statbuf;
-  struct passwd *pw;
-  struct group *grp;
-
-  if (stat(filename, &statbuf) == -1)
-    return -1;
-
-  sb->mode = statbuf.st_mode;
-  sb->size = statbuf.st_size;
-  
-  strcpy(sb->ctime, ctime(&(statbuf.st_ctime)));
-  sb->ctime[strlen(sb->ctime)-1] = 0;  /* remove CR */
-
-  if ((pw = getpwuid(statbuf.st_uid)) == NULL)
-    sprintf(sb->uid, "%-10d", statbuf.st_uid);
-  else
-    strncpy(sb->uid, pw->pw_name, 32);
-
-  if ((grp = getgrgid(statbuf.st_gid)) == NULL)
-    sprintf(sb->gid, "%-10d", statbuf.st_gid);
-  else
-    strncpy(sb->gid, grp->gr_name, 32);
-}
-
-/*
-   read_bytes(s, buf, size)
-     input: s - socket to read from
-            buf - address of a buffer for the read
-	    size - number of bytes to read
-     output: non
-     action: try read given number of bytes, all errors are reported, and
-             cause program to exit.
-*/
-void read_bytes(int s, char * buf, int size)
-{
-  int val, remain = size;
-  char * ptr = buf;
-
-  if (size == 0) return;
-  
-  for (;;)
-  {
-    val = read(s, ptr, remain);
-    
-    if (val == -1 && (errno == EINTR || errno == EAGAIN | errno == EWOULDBLOCK))
-    {   /* interrupted or need to wait, try again */
-      if (errno == EAGAIN | errno == EWOULDBLOCK) usleep(10000);
-      errno = 0;
-      continue;
-    }
-    if (val == -1)
-    {
-      perror("Error -- Read from socket");
-      exit(1);
-    }
-    if (val == 0) /* EOF encountered */
-    {
-      fprintf(stderr, "Error -- EOF reached while trying to read %d bytes.\n", size);
-      exit(1);
-    }
-    ptr += val;
-    remain -= val;
-    if (remain < 0)  /* weird thing is happening */
-    {
-      fprintf(stderr, "Error: read too much from socket, %d out of %d bytes.\n",
-	      size-remain, size);
-      exit(1);
-    }
-    if (remain == 0)
-      break;
-  }
-}
-
-int wait_read_bytes(int s, char *buf, int size)
-{
-  int val, remain = size;
-  char * ptr = buf;
-
-  if (size == 0) return 1;
-  
-  for (;;)
-  {
-    val = read(s, ptr, remain);
-    
-    if (val == -1 && (errno == EINTR || errno == EAGAIN | errno == EWOULDBLOCK))
-    {   /* interrupted or need to wait, try again */
-      if (errno == EAGAIN | errno == EWOULDBLOCK) usleep(10000);
-      errno = 0;
-      continue;
-    }
-    if (val == -1)
-    {
-      /*
-      perror("Error -- wait_read from socket");
-      */
-      return -1;
-    }
-    if (val == 0) /* EOF encountered */
-    {
-      /*
-      fprintf(stderr, "Warn pid %d -- EOF on wait_read %d bytes.\n",
-	      getpid(), size);
-      */
-      return 0;
-    }
-    ptr += val;
-    remain -= val;
-    if (remain < 0)  /* weird thing is happening */
-    {
-      fprintf(stderr,
-	      "Error: weird, read too much from socket, %d out of %d bytes.\n",
-	      size-remain, size);
-      return -1;
-    }
-    if (remain == 0)
-      break;
-  }
-  return size;
-}
-
-#define WAIT_DURATION 5000000
-
-int time_read_bytes(int s, char * buf, int size)
-{
-  int val, remain = size;
-  char * ptr = buf;
-  long start = get_usec();
-
-  int times = 0;
-  
-  if (size == 0) return 0;
-  
-  for (;;) {
-    struct fd_set read_mask;
-    struct timeval tval = {0, 0};
-
-    FD_ZERO(&read_mask);
-    FD_SET(s, &read_mask);
-#ifdef _HPUX_SOURCE
-    if (select(s+1, (int *)&read_mask, NULL, NULL, &tval) <= 0)
-#else
-    if (select(s+1, &read_mask, NULL, NULL, &tval) <= 0)
-#endif
-    {
-      /*
-      if (get_duration(start, get_usec()) < WAIT_DURATION) {
-	usleep(10000);
-	continue;
-      }
-      */
-      if (times < WAIT_DURATION / 10000) {
-	usleep(10000);
-        times ++;
-        continue;
-      }
-      else {
-	fprintf(stderr, "time_read_bytes() %d seconds expired\n",
-		WAIT_DURATION/1000000);
-	return -1;
-      }
-    }
-
-    if (!(FD_ISSET(s, &read_mask))) continue;
-    
-    val = read(s, ptr, 1);
-    
-    if (val == -1 && (errno == EINTR))
-    {   /* interrupted or need to wait, try again */
-      errno = 0;
-      continue;
-    }
-    if (val == -1)
-    {
-      perror("Error -- time_read_bytes() from socket");
-      return -1;
-    }
-    if (val == 0) /* EOF encountered */
-    {
-      /*
-      fprintf(stderr, "Error -- EOF reached while trying to read %d bytes.\n", size);
-      */
-      return -1;
-      /* 'continue' causes infinite loop if the pipe is closed by peer
-      continue;
-      */
-    }
-    ptr += val;
-    remain -= val;
-    if (remain == 0)
-      return 0;
-  }
-}
-
-/*
-   write_bytes(sock, data, len):
-     try write len byte of data to sock, report all errors by
-     warning message.
-*/
-void write_bytes(int sock, char * data, int len)
-{
-  while (len > 0) {
-    int res = write(sock, data, len);
-    if (res == -1) {
-      if (errno == EINTR || errno == EAGAIN) continue;
-      fprintf(stderr, "Error pid %d", getpid());
-      perror(" -- failed to write all bytes to socket");
-      exit(1);
-    }
-    len -= res;
-    data += res;
-  }
-}
-
-int time_write_bytes(int sock, char * data, int plen)
-{
-  int len = plen;
-  while (len > 0) {
-    int res = write(sock, data, len);
-    if (res == -1) {
-      if (errno == EINTR || errno == EAGAIN) continue;
-      fprintf(stderr, "Error pid %d", getpid());
-      perror(" -- failed to time_write all bytes to socket");
-      return -1;
-    }
-    len -= res;
-    data += res;
-  }
-  return plen;
-}
-
-int wait_write_bytes(int sock, char * data, int plen)
-{
-  int len = plen;
-  while (len > 0) {
-    int res = write(sock, data, len);
-    if (res == -1) {
-      if (errno == EINTR || errno == EAGAIN) continue;
-      /*
-      fprintf(stderr, "Error pid %d", getpid());
-      perror(" -- failed to wait_write all bytes to socket");
-      */
-      return -1;
-    }
-    len -= res;
-    data += res;
-  }
-  return plen;
-}
-
-/* read_byte:
-     read one byte from sock to buffer data */
-
-void read_byte(int sock, char * data)
-{
-  read_bytes(sock, data, 1);
-}
-
-/* read_short:
-     read a short integer from socket sock to buffer data,
-     byte order conversion is also done.
-*/
-void read_short(int sock, short * data)
-{
-  read_bytes(sock, (char *)data, sizeof(short));
-  *data = ntohs(*data);
-}
-
-/* read_int:
-     read a integer from socket sock to buffer data,
-     byte order conversion is also done */
-
-void read_int(int sock, int * data)
-{
-  read_bytes(sock, (char *)data, sizeof(int));
-  *data = ntohl(*data);
-}
-
-int time_read_int(int sock, int * data)
-{
-  if (time_read_bytes(sock, (char *)data, sizeof(int)) == -1) {
-    return -1;
-  }
-  *data = ntohl(*data);
-  return 0;
-}
-
-/* read a string. Returns the length of the string.
-   transfer through the socket.
-   but the string in buffer might have been truncated.
-   the returned string is '\0' terminated */
-
-int read_string(int sock, char *data, int maxlen)
-{
-  int len;
-  read_int(sock, &len);
-  if (len == 0)
-  {
-    data[0] = 0;
-    return 0;
-  }
-  if (len < maxlen)
-  {
-    read_bytes(sock, data, len);
-    data[len] = 0;
-  }
-  else
-  {
-    int i;
-    char tmp;
-    read_bytes(sock, data, maxlen-1);
-    data[maxlen-1] = 0;
-    for (i = 0; i < len - maxlen + 1; i ++)  /* discard extra data */
-      read_byte(sock, &tmp);
-  }
-  return len;
-}
-
-
-/* write_byte:
-     write a byte to socket sock */
-
-void write_byte(int sock, char data)
-{
-  write_bytes(sock, &data, 1);
-}
-
-/* write_short:
-     byte order convert the short integer in data and write to socket sock */
-
-void write_short(int sock, short data)
-{
-  short val = htons(data);
-  write_bytes(sock, (char *)&val, sizeof(short));
-}
-
-/* write_int:
-     byte order convert the integer in data and write to socket sock */
-void write_int(int sock, int data)
-{
-  int val = htonl(data);
-  write_bytes(sock, (char *)&val, sizeof(int));
-}
-
-int time_write_int(int sock, int data)
-{
-  int val = htonl(data);
-  return time_write_bytes(sock, (char *)&val, sizeof(int));
-}
-
-/* write a string in data to socket sock, the string is led by a length */
-
-void write_string(int sock, char *data)
-{
-  int len = strlen(data);
-  
-  write_int(sock, len);
-  write_bytes(sock, data, len);
-}
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h
deleted file mode 100644
index 46432a71797..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/* data structure used by StatFile() */
-
-#if !defined (_MPEG_FILE_IO_H)
-#define _MPEG_FILE_IO_H
-
-struct StatBuf
-{
-  unsigned short mode;
-  long size;
-  char uid[32];
-  char gid[32];
-  char ctime[32];
-};
-
-/* protocol of functions defined in shared.c */
-
-int StatFile(char *filename, struct StatBuf * sb);
-
-
-
-/* Following read...()'s would exit(1) if requested bytes can not be
-   read, and EOF or error other than EINTR, EAGAIN or EWOULDBLOCK is
-   encountered */
-
-void read_bytes(int s, char * buf, int size);
-
-void read_byte(int sock, char * data);
-
-void read_short(int sock, short * data);
-
-void read_int(int sock, int * data);
-
-int read_string(int sock, char *data, int maxlen);  /* returns the length of a stream */
-
-
-/* Following write...()'s would exit(1) if requested bytes can not
-   be written to socket because of error has happened*/
-
-void write_bytes(int sock, char * data, int len);
-
-void write_byte(int sock, char data);
-
-void write_short(int sock, short data);
-
-void write_int(int sock, int data);
-
-void write_string(int sock, char *data);
-
-
-/* following returns: 0 -- succ, -1 -- failed.
-   time_read*() will wait at most 5 seconds before they return */
-
-int time_read_bytes(int s, char * buf, int size);
-
-int time_read_int(int sock, int * data);
-
-int time_write_bytes(int sock, char * data, int len);
-
-int time_write_int(int sock, int data);
-
-
-/* Following read...()'s would return 0/-1 if requested bytes can not
-   be read, and EOF (return 0) or error (return -1) other than EINTR,
-   EAGAIN or EWOULDBLOCK is encountered */
-
-int wait_read_bytes(int s, char *buf, int size);
-
-
-/* Following write...()'s would return 0/-1 if requested bytes can not
-   be written and error (return -1) other than EINTR, EAGAIN or is
-   encountered */
-
-int wait_write_bytes(int s, char *buf, int size);
-
-#endif /* _MPEG_FILE_IO_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp
deleted file mode 100644
index 05361167127..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <limits.h>   /* INT_MIN, INT_MAX are defined here */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-/*
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
-*/
-#include "filters.h"
-#include "ace/OS.h"
-
-#define BUFSIZE 256
-#define maxval(a,b) ((a) > (b) ? (a) : (b))
-#define minval(a,b) ((a) < (b) ? (a) : (b))
-
-static float FLOAT_MIN = (float)INT_MIN;
-static float FLOAT_MAX = (float)INT_MAX;
-
-AverageFilter * NewAverageFilter(int nsamples)
-{
-  AverageFilter * f;
-  f = (AverageFilter *) ACE_OS::malloc(sizeof(*f));
-  if (f == NULL)
-    return NULL;
-  f->type = FILTER_AVERAGE;
-  f->nsamples = nsamples;
-  f->buf = (double *)ACE_OS::malloc(nsamples * sizeof(double));
-  if (f->buf == NULL) {
-   ACE_OS::free(f);
-    return NULL;
-  }
-  f->count = 0;
-  f->ptr = 0;
-  f->sum = 0;
-  return f;
-}
-
-AverageFilter * ResetAverageFilter(AverageFilter *f, int nsamples)
-{
-  if (f->nsamples != nsamples) {
-   ACE_OS::free(f->buf);
-    f->nsamples = nsamples;
-    f->buf = (double *)ACE_OS::malloc(nsamples * sizeof(double));
-    if (f->buf == NULL) {
-     ACE_OS::free(f);
-      return NULL;
-    }
-  }
-  f->count = 0;
-  f->ptr = 0;
-  f->sum = 0;
-  return f;
-}
-
-void FreeAverageFilter(AverageFilter * f)
-{
- ACE_OS::free(f->buf);
- ACE_OS::free(f);
-}
-
-double DoAverageFilter(AverageFilter *f, double value)
-{
-  int offset;
-  double oldval = f->buf[f->ptr];
-  f->buf[f->ptr] = value;
-  f->ptr = (f->ptr + 1) % f->nsamples;
-  f->sum += value;
-  if (f->count >= f->nsamples) {
-    f->sum -= oldval;
-  }
-  else {
-    f->count ++;
-  }
-  return (double)(f->sum) / (double)f->count;
-}
-
-
-LowPassFilter * NewLowPassFilter(double Rvalue)
-{
-  LowPassFilter * f;
-  f = (LowPassFilter *)ACE_OS::malloc(sizeof(*f));
-  if (f == NULL) {
-    return NULL;
-  }
-  if (Rvalue > 1.0) {
-    Rvalue = 1.0;
-  }
-  else if (Rvalue < 0.0) {
-    Rvalue = 0.0;
-  }
-  f->type = FILTER_LOWPASS;
-  f->count = 0;
-  f->maxcount = (int)(1.0 / maxval(Rvalue, 0.0001));
-  f->R = Rvalue;
-  f->result = FLOAT_MIN;
-  return f;
-}
-
-LowPassFilter * ResetLowPassFilter(LowPassFilter * f, double Rvalue)
-{
-  if (Rvalue > 1.0) {
-    Rvalue = 1.0;
-  }
-  else if (Rvalue < 0.0) {
-    Rvalue = 0.0;
-  }
-  f->count = 0;
-  f->maxcount = (int)(1.0 / maxval(Rvalue, 0.0001));
-  f->R = Rvalue;
-  f->result = FLOAT_MIN;
-  return f;
-}
-
-void FreeLowPassFilter(LowPassFilter * f)
-{
- ACE_OS::free(f);
-}
-
-double DoLowPassFilter(LowPassFilter * f, double value)
-{
-  if (f->count <= f->maxcount) {
-    if (!f->count) {
-      f->count ++;
-      return (f->result = value);
-    }
-    f->count ++;
-    return (f->result = (1.0 - (1.0/(double)f->count)) * f->result +
-			 (1.0/(double)f->count) * value);
-  }
-  return (f->result = (1.0 - f->R) * f->result + f->R * value);
-}
-
-MedianFilter * NewMedianFilter(int nsamples)
-{
-  int minv = 0, maxv = 1;
-  MedianFilter * f;
-  f = (MedianFilter *) ACE_OS::malloc(sizeof(*f));
-  if (f == NULL)
-    return NULL;
-  f->type = FILTER_MEDIAN;
-  f->nsamples = nsamples;
-  f->max = maxval(maxv, minv);
-  f->min = minval(maxv, minv);
-  f->statsize = f->max - f->min + 1;
-  f->buf = (int *)ACE_OS::malloc(nsamples * sizeof(int));
-  if (f->buf == NULL) {
-   ACE_OS::free(f);
-    return NULL;
-  }
-  f->stat = (int *)ACE_OS::malloc(f->statsize * sizeof(int));
-  if (f->stat == NULL) {
-   ACE_OS::free(f->buf);
-   ACE_OS::free(f);
-    return NULL;
-  }
-  f->count = 0;
-  f->ptr = 0;
-  f->med = 0;
-  f->below = 0;
-  memset(f->stat, 0, f->statsize * sizeof(int));
-  return f;
-}
-
-MedianFilter * ResetMedianFilter(MedianFilter * f, int nsamples)
-{
-  if (f->nsamples != nsamples) {
-   ACE_OS::free(f->buf);
-    f->nsamples = nsamples;
-    f->buf = (int *)ACE_OS::malloc(nsamples * sizeof(int));
-    if (f->buf == NULL) {
-     ACE_OS::free(f);
-      return NULL;
-    }
-  }
-  f->count = 0;
-  f->ptr = 0;
-  f->med = 0;
-  f->below = 0;
-  memset(f->stat, 0, f->statsize * sizeof(int));
-  return f;
-}
-
-void FreeMedianFilter(MedianFilter * f)
-{
- ACE_OS::free(f->buf);
- ACE_OS::free(f->stat);
- ACE_OS::free(f);
-}
-
-double DoMedianFilter(MedianFilter *f, double pvalue)
-{
-  int value = (int)pvalue;
-  int offset;
-  int oldval = f->buf[f->ptr];
-  if (value > f->max) {
-    int * oldstat = f->stat;
-    int oldsize = f->statsize;
-    f->max = value + 10;
-    f->statsize = f->max - f->min + 1;
-    f->stat = (int *)ACE_OS::malloc(f->statsize * sizeof(int));
-    if (f->stat == NULL) {
-      fprintf(stderr, "MedianFilter Failed to extend up stat to % items",
-	      f->statsize);
-      perror("");
-      exit(1);
-    }
-    memset((char *)(f->stat) + sizeof(int) * oldsize, 0,
-	   sizeof(int) * (f->statsize - oldsize));
-    memcpy(f->stat, oldstat, oldsize * sizeof(int));
-  }
-  else if (value < f->min) {
-    int * oldstat = f->stat;
-    int oldsize = f->statsize;
-    f->min = value - 10;
-    f->statsize = f->max - f->min + 1;
-    f->stat = (int *)ACE_OS::malloc(f->statsize * sizeof(int));
-    if (f->stat == NULL) {
-      fprintf(stderr, "MedianFilter Failed to extend down stat to % items",
-	      f->statsize);
-      perror("");
-      exit(1);
-    }
-    memset(f->stat, 0, sizeof(int) * (f->statsize - oldsize));
-    memcpy((char *)(f->stat) + sizeof(int) * (f->statsize - oldsize),
-	   oldstat, sizeof(int) * oldsize);
-    f->med += f->statsize - oldsize;
-  }
-  f->buf[f->ptr] = value;
-  f->ptr = (f->ptr + 1) % f->nsamples;
-  offset = value - f->min;
-  if (offset < 0) {
-    offset = 0;
-  }
-  else if (offset >= f->statsize) {
-    offset = f->statsize - 1;
-  }
-  f->stat[offset] ++;
-  if (offset < f->med) {
-    f->below ++;
-  }
-  if (f->count >= f->nsamples) {
-    offset = oldval - f->min;
-    if (offset < 0) {
-      offset = 0;
-    }
-    else if (offset >= f->statsize) {
-      offset = f->statsize - 1;
-    }
-    f->stat[offset] --;
-    if (offset < f->med) {
-      f->below --;
-    }
-  }
-  else {
-    f->count ++;
-  }
-  oldval = f->count >> 1;
-  if (f->below > oldval) {
-    offset = f->med - 1;
-    while (offset >= 0 && (f->below - f->stat[offset]) > oldval) {
-      f->below -= f->stat[offset];
-      offset --;
-    }
-    f->med = offset + 1;
-  }
-  else {
-    offset = f->med;
-    while (offset < f->statsize && (f->below + f->stat[offset]) <= oldval) {
-      f->below += f->stat[offset];
-      offset ++;
-    }
-    f->med = offset;
-  }
-  return (double)(f->med + f->min);
-}
-
-Filter * NewFilter(int type, int parameter)
-{
-  switch (type) {
-  case FILTER_LOWPASS:
-    return (Filter *)NewLowPassFilter(1.0/(double)parameter);
-  case FILTER_MEDIAN:
-    return (Filter *)NewMedianFilter(parameter);
-  case FILTER_AVERAGE:
-    return (Filter *)NewAverageFilter(parameter);
-  default:
-    break;
-  }
-  return NULL;
-}
-
-Filter * ResetFilter(Filter * f, int parameter)
-{
-  switch (f->type) {
-  case FILTER_LOWPASS:
-    return (Filter *)ResetLowPassFilter((LowPassFilter *)f, 1.0/(double)parameter);
-  case FILTER_MEDIAN:
-    return (Filter *)ResetMedianFilter((MedianFilter *)f, parameter);
-  case FILTER_AVERAGE:
-    return (Filter *)ResetAverageFilter((AverageFilter *)f, parameter);
-  default:
-    break;
-  }
-  return NULL;
-}
-
-void FreeFilter(Filter * f)
-{
-  switch (f->type) {
-  case FILTER_LOWPASS:
-     FreeLowPassFilter((LowPassFilter *)f);
-     break;
-  case FILTER_MEDIAN:
-     FreeMedianFilter((MedianFilter *)f);
-     break;
-  case FILTER_AVERAGE:
-     FreeAverageFilter((AverageFilter *)f);
-     break;
-  default:
-     break;
-  }
-}
-
-double DoFilter(Filter *f, double value)
-{
-  switch (f->type) {
-  case FILTER_LOWPASS:
-     return DoLowPassFilter((LowPassFilter *)f, value);
-     break;
-  case FILTER_MEDIAN:
-     return DoMedianFilter((MedianFilter *)f, value);
-     break;
-  case FILTER_AVERAGE:
-     return DoAverageFilter((AverageFilter *)f, value);
-     break;
-  default:
-     break;
-  }
-  return FLOAT_MIN;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
deleted file mode 100644
index 7befdfaa20d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#define FILTER_LOWPASS	0
-#define FILTER_MEDIAN	1
-#define FILTER_AVERAGE	2
-
-typedef struct MedianFilter {
-  int type;
-  int * buf;
-  int nsamples;
-  int count;
-  int ptr;
-  int * stat;
-  int statsize;
-  int max, min;
-  int med; /* median offset to stat */
-  int below; /* total points below the med entry */
-} MedianFilter;
-
-typedef struct LowPassFilter {
-  int type;
-  int count;
-  int maxcount;
-  double R;
-  double result;
-} LowPassFilter;
-
-typedef struct AverageFilter {
-  int type;
-  double * buf;
-  int nsamples;
-  int ptr;
-  double sum;
-  int count;
-} AverageFilter;
-
-typedef union Filter {
-  int type;
-  MedianFilter m;
-  AverageFilter a;
-  LowPassFilter l;
-} Filter;
-
-Filter * NewFilter(int type, int parameter);
-Filter * ResetFilter(Filter * f, int parameter);
-void FreeFilter(Filter * f);
-double DoFilter(Filter *f, double value);
-
-MedianFilter * NewMedianFilter(int nsamples);
-MedianFilter * ResetMedianFilter(MedianFilter * f, int nsamples);
-void FreeMedianFilter(MedianFilter * f);
-double DoMedianFilter(MedianFilter *f, double value);
-
-AverageFilter * NewAverageFilter(int nsamples);
-AverageFilter * ResetAverageFilter(AverageFilter * f, int nsamples);
-void FreeAverageFilter(AverageFilter * f);
-double DoAverageFilter(AverageFilter *f, double value);
-
-LowPassFilter * NewLowPassFilter(double R);
-LowPassFilter * ResetLowPassFilter(LowPassFilter * f, double R);
-void FreeLowPassFilter(LowPassFilter * f);
-double DoLowPassFilter(LowPassFilter *f, double value);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
deleted file mode 100644
index 812410eb1c3..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <limits.h>
-#ifdef __svr4__
-#include <sys/systeminfo.h>
-#endif
-#ifdef _HPUX_SOURCE
-#include <sys/rtprio.h>
-#elif  defined(__svr4__)
-#include <sys/priocntl.h>
-#include <sys/rtpriocntl.h>
-#include <sys/tspriocntl.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/sem.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/param.h>
-#include <string.h>
-#include "routine.h"
-
-#define TEST_TYPE 1
-#define SIGSETMASK 0
-#define stacksize 10000
-#define TIME_ROUND 4000
-#define BLOCK_NUM 5
-#define DELTA_MSEC 20
-
-int get_hostname(char *name, int len)
-{
-#ifdef __svr4__
-  if (sysinfo(SI_HOSTNAME, name, len) == -1) return -1;
-  else return 0;
-#else
-  return ACE_OS::hostname(name, len);
-#endif
-}
-
-long get_usec(void)
-{
-  struct timeval tp;
-  struct timezone tzp;
-  int err;
-  if (err=gettimeofday(&tp, &tzp))
-  {
-    return 0;
-  }
-  else {
-    /*
-    return ((long)1000000)*(tp.tv_sec%TIME_ROUND) + (tp.tv_usec);
-    */
-    return ((long)1000000)*(tp.tv_sec) + (tp.tv_usec);
-  }
-}
-
-long get_msec(void)
-{
-  struct timeval tp;
-  struct timezone tzp;
-  int err;
-  if (err=gettimeofday(&tp, &tzp))
-  {
-    return 0;
-  }
-  else
-  {
-    return ((long)1000)*(tp.tv_sec) + (tp.tv_usec / 1000);
-  }
-}
-
-long get_sec(void)
-{
-  struct timeval tp;
-  struct timezone tzp;
-  int err;
-  if (err=gettimeofday(&tp, &tzp))
-  {
-    return 0;
-  }
-  else
-  {
-    return tp.tv_sec;
-  }
-}
-
-/* returns the difference of the two usec time values */
-
-long get_duration(long val1, long val2)
-{
-  /*
-  return val2>=val1 ? val2-val1 : (val2+TIME_ROUND-val1);
-  */
-  return val2>=val1 ? val2-val1 : ((LONG_MAX - val1) + (val2 - LONG_MIN) + 1);
-}
-
-#ifdef LINUX
-#else
-void usleep(unsigned int usec)
-{
-  struct timeval val;
-
-  if (usec <= 0) return;
-  val.tv_sec = usec / 1000000;
-  val.tv_usec = usec % 1000000;
-  if (select(0, NULL, NULL, NULL, &val) == -1 && errno != 4)
-  {
-    perror("sleep with select");
-    exit(1);
-  }
-}
-#endif
-
-void beep(void)
-{
-  fprintf(stderr, "\007");
-}
-
-#ifndef FreeBSD
-#include <malloc.h>
-#endif
-#include <sys/shm.h>
-
-void remove_shmem_id(int id)
-{
-  shmctl(id, IPC_RMID, NULL);
-#if 0
-  /* weird also on some sunOs4 machines */
-  /* weird, HPUX always report error on this operation */
-  if (errno)
-  {
-    fprintf(stderr, "shmctl shm_id:%d to IPC_RMID error:", id);
-    perror("");
-  }
-#endif
-}
-
-char * creat_shared_mem_id(int size, int * id)
-{
-  char * shm;
-  int shm_id;
-  
-  shm_id = shmget(IPC_PRIVATE, size, IPC_CREAT | 0666);
-  if (shm_id == -1)
-  {
-    shm_id = shmget(IPC_PRIVATE, 0, IPC_CREAT | 0666);
-    if (shm_id == -1)
-    {
-      perror("Shared MEM shmget1 error");
-      exit(1);
-    }
-    else
-    {
-      if (shmctl(shm_id, IPC_RMID, NULL) == -1)
-      {
-        perror("Shared MEM shmctl error");
-        exit(1);
-      }
-      shm_id = shmget(IPC_PRIVATE, 0, IPC_CREAT | 0666);
-      if (shm_id == -1)
-      {
-        perror("Shared MEM shmget2 error");
-        exit(1);
-      }
-    }
-  }
-  shm = (char *)shmat(shm_id, (char *)0, 0);
-  if ((int)shm == -1)
-  {
-    perror("Shared MEM shmat error");
-    exit(1);
-  }
-  *id = shm_id;
-  return shm;
-}
-
-char * creat_shared_mem(int size)
-{
-  int shm_id;
-  char * shm = creat_shared_mem_id(size, &shm_id);
-  remove_shmem_id(shm_id);
-  return shm;
-}
-
-void remove_shared_mem(char *ptr)
-{
-  shmdt(ptr);
-}
-
-#define SEM_NUM 6
-static int semId = -1;
-static int masterPid = -1;
-static int nextSem = -1;
-
-void enter_cs(int semaphore_id)
-{
-  struct sembuf sop;
-  sop.sem_num = semaphore_id;
-  sop.sem_op = -1;
-  sop.sem_flg = 0;
-  while (semop(semId, &sop, 1) == -1)
-  {
-    if (errno == EINTR)
-      continue;
-    fprintf(stderr, "semop(enter_cs) error: pid=%d", getpid());
-    perror("");
-    exit(1);
-  }
-}
-
-void leave_cs(int semaphore_id)
-{
-  struct sembuf sop;
-  sop.sem_num = semaphore_id;
-  sop.sem_op = 1;
-  sop.sem_flg = 0;
-  while (semop(semId, &sop, 1) == -1)
-  {
-    if (errno == EINTR)
-      continue;
-    fprintf(stderr, "semop(leave_cs) error, pid=%d", getpid());
-    perror("");
-    exit(1);
-  }
-}
-
-int creat_semaphore(void)
-{
-  int i;
-  int sem_val;
-  int semaphore_id;
-  if (semId == -1) {
-    semId = semget(IPC_PRIVATE, SEM_NUM, IPC_CREAT | 0666);
-    if (semId == -1) {
-      perror("Semaphore semget error");
-      exit(1);
-    }
-    masterPid = getpid();
-    nextSem = 0;
-  }
-  else if (masterPid != getpid()) {
-    fprintf(stderr, "Error: this creat_semaphore() assumes semaphores are allocated\n");
-    fprintf(stderr, "  only in single process %d, while current pid=%d\n",
-	    masterPid, getpid());
-    exit(1);
-  }
-  semaphore_id = nextSem ++;
-  if (semaphore_id >= SEM_NUM) {
-    fprintf(stderr, "Error: all of %d semaphores used up.\n", SEM_NUM);
-    exit(1);
-  }
-  sem_val = semctl(semId, semaphore_id, GETVAL, 0);
-/*
-   fprintf(stderr, "Initial semaphore value: %d\n", sem_val);
-*/
-  if (sem_val == 0)
-    leave_cs(semaphore_id);
-  return semaphore_id;
-}
-
-void delete_semaphore()
-{
-  if (masterPid == getpid() && semId >= 0) {
-    semctl(semId, 0, IPC_RMID, 0);
-  } else {
-    if (masterPid != getpid())
-    fprintf(stderr, "Pid %d not supposed to remove semId created by pid %d\n",
-	    getpid(), masterPid);
-    else
-    fprintf(stderr, "The semaphore has been deleted.\n");
-  }
-  return;
-}
-
-void remove_semaphore(int sid)
-{
-  return;
-  /* semctl(semId, semaphore_id, IPC_RMID, 0); */
-}
-
-int get_semval(int sid)
-{
-  int val, val1 = 0;
-  errno = 0;
-  val = semctl(semId, sid, GETVAL, 0);
-  if (val == -1) {
-    perror("getting value of a semaphore");
-    exit(1);
-  }
-  /*
-  if (val == 0) {
-    fprintf(stderr, "pid %d to call semctl(%d, 0, GETZCNT)\n", getpid(), sid);
-    val = semctl(semId, 0, GETZCNT, 0);
-    if (val == -1) {
-      perror("getting semzcnt of a semaphore");
-      exit(1);
-    }
-    
-    fprintf(stderr, "pid %d to call semctl(%d, 0, GETNCNT)\n", getpid(), sid);
-    usleep(10000000);
-    val1 = semctl(semId, sid, GETNCNT, 0);
-    if (val1 == -1) {
-      perror("getting semncnt of a semaphore");
-    }
-    fprintf(stderr, "pid %d to called semctl(GETNCNT)\n", getpid());
-    
-    fprintf(stderr, "Semval val %d, val1 %d\n", val, val1);
-    return (0-(val + val1));
-  }
-  else
-  */
-  return val;
-}
-
-void get_full_path(char *filename, char * buffer, int bufsize)
-{
-  char path[MAXPATHLEN];
-
-  path[0] = 0;
-  
-  if (*filename == '/')
-    strncpy(path, filename, MAXPATHLEN);
-  else if (*filename == '~')
-  {
-    char * env = getenv("HOME");
-    if (env != NULL)
-    {
-      strncpy(path, env, MAXPATHLEN);
-      strncat(path, filename+1, MAXPATHLEN - strlen(path));
-    }
-    else
-      strncpy(path, filename, MAXPATHLEN);
-  }
-  else  /* from current dir */
-  {
-    getcwd(path, MAXPATHLEN);
-    if (errno)
-      strncpy(path, filename, MAXPATHLEN);
-    else
-    {
-      path[MAXPATHLEN-4] = 0;
-      strcat(path, "/");
-      strncat(path, filename, MAXPATHLEN - strlen(path));
-    }
-  }
-  path[MAXPATHLEN-1] = 0;
-  strncpy(buffer, path, bufsize);
-  buffer[bufsize-1] = 0;
-  /*
-  fprintf(stderr, "%s extended to %s\n", filename, buffer);
-  */
-}
-
-void setsignal(int sig, void (func)(int))
-{
-#ifdef _HPUX_SOURCE
-  struct sigvec sv;
-
-  sv.sv_handler = func;
-  sv.sv_mask    = 0;
-  sv.sv_flags   = 0;
-  if (sigvector (sig, &sv, (struct sigvec *) NULL) == -1) {
-    fprintf(stderr, "sigvector(%d) error", sig);
-    perror("");
-    exit(1);
-  }
-#elif defined(__svr4__) || defined(IRIX)
-  if (sigset(sig, func) == SIG_ERR)  {
-    fprintf(stderr, "sigset(%d,func) error", sig);
-    perror("");
-    exit(1);
-  }
-#elif defined(sun) || defined(FreeBSD) || defined(ULTRIX) || defined(LINUX)
-  {
-    struct sigaction act;
-    act.sa_handler = func;
-#ifdef FreeBSD
-    act.sa_flags = SV_INTERRUPT;
-#else
-    act.sa_flags =/* SA_INTERRUPT;*/ SA_RESTART;
-#endif
-    // @@ Naga commented this line.
-    //    act.sa_mask = 0;
-    if (!sigaction(sig, &act, NULL)) return;
-    fprintf(stderr, "sigaction(%d,...) error", sig);
-    perror("");
-    exit(1);
-  }
-  /*
-  if (signal(sig, func) == SIG_ERR) {
-    fprintf(stderr, "signal(%d,func) error", sig);
-    perror("");
-    exit(1);
-  }
-  */
-#else
-  fprintf(stderr,
-	  "Error: code for setsignal(%d,func) is missing in source/mpeg_shared/routine.cpp\n",
-	  sig);
-  exit(1);
-#endif
-}
-
-/* set to 'pri': 0 -lowest RT, higher value higher RT priority. -1 - Time Sharing.
-   For HPUX, 0 -> 127, 1 -> 127, ..., pri -> 127 - pri;
-   For Solaris, -> 0, 1 -> 1, pri -> pri;
-
-   The function returns 0 on success, -1 on failure
-   */
-int SetRTpriority(char *msg, int pri)
-{
-  if (pri >= 0) {
-#ifdef _HPUX_SOURCE
-    if (rtprio(0, 127 - pri) == -1)
-    {
-      fprintf(stderr, "%s fails to be set to RT priority %d", msg, 127 - pri);
-      perror("");
-      return -1;
-    }
-    return 0;
-#elif defined(__svr4__)
-    pcinfo_t pci;
-    pcparms_t pcp;
-    rtparms_t * rtp = (rtparms_t *)pcp.pc_clparms;
-    strcpy(pci.pc_clname, "RT");
-    if (priocntl(P_PID, P_MYID, PC_GETCID, (char *)&pci) == -1) {
-      fprintf(stderr, "%s priocntl(PC_GETCID) failed for RT pri %d", msg, pri);
-      perror("");
-      return -1;
-    }
-    pcp.pc_cid = pci.pc_cid;
-    rtp->rt_pri = pri;
-    rtp->rt_tqsecs = 0;
-    rtp->rt_tqnsecs = 10000000;  /* 10 (ten) milliseconds */
-    if (priocntl(P_PID, P_MYID, PC_SETPARMS, (char *)&pcp) == -1) {
-      fprintf(stderr, "%s priocntl(PC_SETPARMS) failed for RT pri %d", msg, pri);
-      perror("");
-      return -1;
-    }
-    return 0;
-#else
-    fprintf(stderr, "%s warning: RT priority not available on this arch.\n", msg);
-    return -1;
-#endif
-  }
-  else {  /* set to TS priority */
-#ifdef _HPUX_SOURCE
-    if (rtprio(0, RTPRIO_RTOFF) == -1) {
-      fprintf(stderr, "%s fails to be set to RTPRIO_RTOFF", msg);
-      perror("");
-      return -1;
-    }
-    return 0;
-#elif defined(__svr4__)
-    pcinfo_t pci;
-    pcparms_t pcp;
-    tsparms_t * tsp = (tsparms_t *)pcp.pc_clparms;
-    strcpy(pci.pc_clname, "TS");
-    if (priocntl(P_PID, P_MYID, PC_GETCID, (char *)&pci) == -1) {
-      fprintf(stderr, "%s priocntl(PC_GETCID) failed for TS priority", msg);
-      perror("");
-      return -1;
-    }
-    pcp.pc_cid = pci.pc_cid;
-    tsp->ts_uprilim = 0;
-    tsp->ts_upri = 0;
-    if (priocntl(P_PID, P_MYID, PC_SETPARMS, (char *)&pcp) == -1) {
-      fprintf(stderr, "%s priocntl(PC_SETPARMS) failed for TS priority", msg);
-      perror("");
-      return -1;
-    }
-    return 0;
-#endif
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
deleted file mode 100644
index 64ca7b138ee..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/* routine.c */
-#if !defined (_MPEG_ROUTINE_H)
-#define _MPEG_ROUTINE_H
-
-#include "include/common.h"
-#ifdef LINUX
-#else
-void usleep(unsigned int usec);
-#endif
-void beep(void);
-int get_hostname(char *name, int len);
-long get_usec(void);
-long get_msec(void);
-long get_sec(void);
-long get_duration(long valstart, long valstop);
-void remove_shmem_id(int id);
-char * creat_shared_mem_id(int size, int * id);
-char * creat_shared_mem(int size);
-void remove_shared_mem(char *ptr);
-void enter_cs(int semaphore_id);
-void leave_cs(int semaphore_id);
-int creat_semaphore(void);
-void remove_semaphore(int sid);
-int get_semval(int sid);
-void get_full_path(char *filename, char * buffer, int bufsize);
-void setsignal(int sig, void (func)(int));
-int SetRTpriority(char *msg, int pri);
-
-#endif /* _MPEG_ROUTINE_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.cpp
deleted file mode 100644
index e6e69f4228d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <string.h>
-#include "sendpt.h"
-
-/* parameters:
-   pat -- pattern
-   buf -- buffer for holding sendpattern computed;
-   len -- length of pattern and send pattern (number of frames);
-   f   -- number of frames to send (represented by result send pattern);
-*/
-void ComputeSendPattern(char * pat, char * buf, int len, int f)
-{
-  memset(buf, 0, len);
-  if (f >= len)
-  {
-    memset(buf, 1, len);
-  }
-  else if (f <= 1)
-  {
-    buf[0] = 1;
-  }
-  else
-  {
-    int i, is = 0, ps = 0, bs = 0;
-    
-    memset(buf, 1, len);
-    for (i = 0; i < len; i++)
-    {
-      if (pat[i] == 'I')
-        is ++;
-      else if (pat[i] == 'P')
-        ps ++;
-      else  /* B frame */
-        bs ++;
-    }
-    f = len - f;	/* number of frames to drop */
-    if (f < bs)  /* drops only B frames */
-    {
-      double scale = (double)bs / (double)f;
-      int ptr = 0, ptr1 = 0;
-      for (i = 0; i < len; i ++)
-      {
-	if (pat[i] == 'B')
-	{
-	  if ( ptr == (int) ((double)ptr1 * scale + 0.5))
-	  {
-	    buf[i] = 0;
-	    ptr1 ++;
-	  }
-	  ptr ++;
-	}
-      }
-      goto endOfCompute;
-    }
-    
-    /* drop all B frames */
-    for (i = 0; i < len; i ++)
-      if (pat[i] == 'B')
-        buf[i] = 0;
-
-    if (f == bs)
-      goto endOfCompute;
-    
-    if (f > bs && f < bs + ps)  /* drop also some P frames */
-    {
-      int ptr = len - 1;
-      for (i = 0; i < is; i ++)
-      {
-	int j;
-	for (j = 0; j < (f - bs) / is; j ++)
-	{
-	  while (pat[ptr] != 'P') ptr --;
-	  buf[ptr] = 0;
-	  ptr --;
-	}
-	while (pat[ptr] != 'I') ptr --;
-      }
-      ptr = len - 1;
-      for (i = 0; i < (f - bs) % is; i ++)
-      {
-	while (pat[ptr] != 'P' || buf[ptr] == 0) ptr --;
-	buf[ptr] = 0;
-	while (pat[ptr] != 'I') ptr --;
-      }
-      goto endOfCompute;
-    }
-    
-    /* drop all P frames */
-    for (i = 0; i < len; i ++)
-      if (pat[i] == 'P')
-        buf[i] = 0;
-
-    if (f > bs + ps)  /* needs to drop some I frames */
-    {
-      double scale = (double)is / (double)(f - bs - ps);
-      int ptr = 0, ptr1 = 0;
-      for (i = 0; i < len; i ++)
-      {
-	if (pat[i] == 'I')
-	{
-	  if ( ptr == (int) ((double)ptr1 * scale + 0.5))
-	  {
-	    buf[i] = 0;
-	    ptr1 ++;
-	  }
-	  ptr ++;
-	}
-      }
-      goto endOfCompute;
-    }
-  }
- endOfCompute:;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
deleted file mode 100644
index f6c011916ff..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-/* parameters:
-   pat -- pattern
-   buf -- buffer for holding sendpattern computed;
-   len -- length of pattern and send pattern (number of frames);
-   f   -- number of frames to send (represented by result send pattern);
-*/
-void ComputeSendPattern(char * pat, char * buf, int len, int f);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
deleted file mode 100644
index af4f35917ff..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ /dev/null
@@ -1,472 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-BIN =  server vs
-
-BUILD = $(BIN)
-
-AV_SERVER_OBJS = server.o
-AV_VS_OBJS = vs.o
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-FILES = server vs
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-
-LIBS 	+= -lTAO -lACE -lorbsvcs -lmpeg_server -lmpeg_shared
-
-MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
-CPPFLAGS += -I$(MPEG_ROOT)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -DSH_MEM -DNDEBUG 
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H
-
-server:$(addprefix $(VDIR),$(AV_SERVER_OBJS))
-	$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-vs:$(addprefix $(VDIR),$(AV_VS_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i
-.obj/vs.o .obj/vs.so .shobj/vs.o .shobj/vs.so: vs.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
deleted file mode 100644
index 28e90998eae..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-// $Id$
-
-#include "server.h"
-#include "ace/Process.h"
-
-// Initialize the svc_handler, and the acceptor. 
-
-AV_Svc_Handler::AV_Svc_Handler (ACE_Thread_Manager *t)
-{
-}
-
-// Client connected to our control port called by the reactor
-// (acceptor).
-
-int
-AV_Svc_Handler::open (void *)
-{
-  // Lets use threads at a later point. The current scheme works fine
-  // with fork..  this will activate a thread this->activate
-  // (THR_BOUND);
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) AV_Svc_Handler::open called\n"));
-  return this->svc ();
-  //  return 0;
-}
-
-// this will handle the connection
-int
-AV_Svc_Handler::svc (void)
-{
-  int result;
-  result = this->handle_connection ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) AV_Svc_Handler::svc exiting\n"));
-
-  return result;
-}
-
-// handles the connection
-
-int
-AV_Svc_Handler::handle_connection (ACE_HANDLE)
-{
-  // Client is sending us a command
-  int cmd;
-  if (this->peer ().recv_n (&cmd,
-                            sizeof (cmd)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Command recieve failed: %p\n"),
-                      -1);
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Command recieved is %d\n",
-              cmd));
-  // Change these CMD's to enums and put them in a "appropriate" namespace
-  switch (cmd)
-    {
-    case CmdINITvideo:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Spawning the video server process\n"));
-        
-        // %% what does this do ?!!
-        if (Mpeg_Global::live_audio) LeaveLiveAudio ();
-        /* result = VideoServer (this->peer ().get_handle (), 
-           this->dgram_.get_handle (), 
-           Mpeg_Global::rttag, 
-           -INET_SOCKET_BUFFER_SIZE); 
-        */
-
-        ACE_Process_Options video_process_options;
-        video_process_options.command_line ("./vs -ORBport 0");
-        // ORBport of 0 makes the video server pick a port for itself
-        
-        ACE_Process video_process;
-        pid_t child_pid;
-
-        if ((child_pid = video_process.spawn (video_process_options)) == -1)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) ACE_Process:: spawn failed: %p\n",
-                             "spawn"),
-                            -1);
-        // %% need to close down the orb fd's
-        // in the child process!!
-
-        char sem_str [BUFSIZ];
-
-        // create a unique semaphore name
-        ::sprintf (sem_str,
-                   "%s:%d",
-                   "Video_Server_Semaphore",
-                   child_pid);
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) semaphore is %s\n",
-                    sem_str));
-        // Create the semaphore
-        ACE_Process_Semaphore semaphore (0, // 0 means that the
-                                            // semaphore is locked initially
-                                         sem_str);
-
-        // %% wait until the child finishes booting
-        if (semaphore.acquire () == -1)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) semaphore acquire failed: %p\n",
-                             "acquire"),
-                            -1);
-        // Wait until a ACE_SV_Semaphore's value is greater than 0, the
-        // decrement it by 1 and return. Dijkstra's P operation, Tannenbaums
-        // DOWN operation.
-        //        ::sleep (5);
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-        int ack = 42;
-        if (this->peer ().send_n (&ack,
-                                  sizeof (ack)) == -1)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t), ACK send failed: %p",
-                             "AV_Svc_Handler::handle_connection"),
-                            -1);
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-      }
-      // close down the connected socket in the main process
-      this->destroy ();
-      break;
-    case CmdINITaudio:
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t) Received CmdINITaudio\n"));
-      // %% need to fork here
-      switch (ACE_OS::fork ("child"))
-        {
-        case 0:
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) New process forked \n"));
-          if (Mpeg_Global::live_audio)
-            LeaveLiveAudio ();
-          ACE_NEW_RETURN (this->as_,
-                          Audio_Server,
-                          -1);
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) AudioServer created\n"));
-          int result;
-          result = this->as_->init (this->peer (),
-                                    Mpeg_Global::rttag,
-                                    -INET_SOCKET_BUFFER_SIZE);
-          if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) Audio_Server init failed ()\n"),-1);
-          result = as_->run ();
-          //    ACE_Reactor::instance ()->end_event_loop ();
-          TAO_ORB_Core_instance ()->orb ()-> shutdown ();
-          if (result != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%P|%t) handle_connection : %d\n"),
-                              result);
-          return result;
-          break;
-        default:
-          this->destroy ();
-          return 0;
-        }
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)Unknown command received\n"),-1);
-      break;
-    }
-
-  return 0;
-}
-
-int
-AV_Svc_Handler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)AV_Svc_Handler::close called \n"));
-  return 0;
-}
-
-int
-AV_Svc_Handler::handle_timeout (const ACE_Time_Value &,
-                                  const void *arg)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)AV_Svc_Handler::handle_timeout called \n"));
-  return 0;
-}
-
-// AV_Server_Sig_Handler routines
-
-AV_Server_Sig_Handler::AV_Server_Sig_Handler (void)
-{
-}
-
-int
-AV_Server_Sig_Handler::register_handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) sig_handler == %d\n",
-              this->handle_));
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-
-   if (TAO_ORB_Core_instance ()->reactor ()->register_handler
-       (this, ACE_Event_Handler::NULL_MASK) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR, 
-                        "%p\n", 
-                        "register_handler"),
-                       -1);
-
-  // handles these signals.
-   //   this->sig_set.fill_set ();
-   this->sig_set.sig_add (SIGCHLD);  
-   this->sig_set.sig_add (SIGBUS); 
-   this->sig_set.sig_add (SIGINT); 
-   this->sig_set.sig_add (SIGTERM);
-
-  // Register the signal handler object to catch the signals.  if
-  if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
-      (this->sig_set, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "register_handler"),
-                      -1);
-  return 0;
-}
-
-// Called by the ACE_Reactor to extract the fd.
-ACE_HANDLE
-AV_Server_Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-int 
-AV_Server_Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
-  return 0;
-}
-
-int 
-AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-AV_Server_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGCHLD:
-      // Handle the death of child signal.
-      this->clear_child (SIGCHLD);
-      break;
-    case SIGBUS:
-      // Handle the Bus error signal
-    case SIGINT:
-      // Handle the interrupt signal
-    case SIGTERM:
-      // Handle the process termination signal.
-      this->int_handler (signum);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%P|%t) %S: not handled, returning to program\n", 
-                  signum));
-      break;
-    }
-  return 0;
-}
-
-// SIGCHLD handler
-void
-AV_Server_Sig_Handler::clear_child (int sig)
-{
-  int pid;
-  int status;
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) AV_Server: Reaping the children\n"));
-  // reap the children
-  while ((pid = ACE_OS::waitpid (-1, 
-                                 &status, 
-                                 WNOHANG)) > 0)
-  {
-    // decrement the count of number of active children
-    Mpeg_Global::session_num --;
-    
-    if (status == 0) 
-      continue;
-    
-    ACE_DEBUG ((LM_DEBUG, 
-                "(%P|%t) AV_Server: child %d (status %d)\n", 
-                pid, 
-                status));
-  }
-  return;
-}
-
-//  ctrl-c, Bus error, interrupt sig handler
-void
-AV_Server_Sig_Handler::int_handler (int sig)
-{
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%P|%t) AV server killed by signal %d\n",
-              sig));
-}
-
-AV_Server_Sig_Handler::~AV_Server_Sig_Handler (void)
-{
-  TAO_ORB_Core_instance ()->reactor ()->remove_handler (this->sig_set);
-}
-
-// AV_Server routines
-
-// Default Constructor
-AV_Server::AV_Server (void)
-{
-}
-
-// %% move to the destructor or sig handler
-void
-AV_Server::on_exit_routine (void)
-{
-  // %% what does the following do
-  if (Mpeg_Global::parentpid != ACE_OS::getpid ()) 
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "(%P|%t) Process is exiting\n"));
-      return;
-    }
-  
-  // %% what does the following do
-  if (Mpeg_Global::live_audio > 1)
-    ExitLiveAudio ();
-  if (Mpeg_Global::live_video > 1)
-    ExitLiveVideo ();
-  //  ComCloseServer();
-}
-
-
-// Parses the command line arguments
-int
-AV_Server::parse_args (int argc,
-                         char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "rd:s:vamh");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'r': // real time flag
-        Mpeg_Global::rttag = 1;
-        break;
-      case 'd': // clock drift in ppm
-        Mpeg_Global::drift_ppm = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 's':// limit on number of sessions
-        Mpeg_Global::session_limit = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'v':// live video flag
-        Mpeg_Global::live_video = 1;
-        break;
-      case 'a':// live audio flag
-        Mpeg_Global::live_audio = 1;
-        break;
-      case 'm':// remove flag
-        ACE_OS::unlink (VCR_UNIX_PORT);
-        break;
-      case '?':
-      case 'h':// help flag
-        ACE_DEBUG ((LM_DEBUG,
-                    "Usage: %s [-r ] [-m]\n"
-                    "          [-d#int(clock drift in ppm)]\n"
-                    "          [-s#int(limit on number of sessions)]\n"
-                    "          [-v] [-a] [-?] [-h]",
-                    argv [0]));
-        return -1;
-      }
-  return 0;
-}
-
-        
-// Initializes the mpeg server
-int
-AV_Server::init (int argc,
-                   char **argv,
-                 CORBA::Environment& env)
-{
-  int result;
-
-  // Initialize the orb_manager
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-  TAO_CHECK_ENV_RETURN (env,
-                        -1);
-  
-  CORBA::ORB_var orb = 
-    this->orb_manager_.orb ();
-
-  PortableServer::POA_var child_poa = 
-    this->orb_manager_.child_poa ();
-  // Initialize the Naming Server
-  //   this->naming_server_.init (orb,       
-  //                              child_poa);
-
-  result = this->parse_args (argc, argv);
-  if (result < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Error parsing arguments"),
-                      -1);
-  
-  // Register the various signal handlers with the reactor.
-  result = this->signal_handler_.register_handler ();
-
-  if (result < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Error registering signal handler"),
-                      -1);
-
-  ::atexit (on_exit_routine);
-  return 0;
-}
-
-// Runs the mpeg server
-int
-AV_Server::run (CORBA::Environment& env){
-  int result;
-  this->server_control_addr_.set (VCR_TCP_PORT);
-
-  // "listen" on the socket
-  if (this->acceptor_.open (this->server_control_addr_,
-                            TAO_ORB_Core_instance ()->reactor ()) == -1)
-                            //                            0,
-                            //                            0
-                            //                            &this->thread_strategy_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) acceptor_handler == %d\n",
-              this->acceptor_.get_handle ()));
-
-  // Run the ORB event loop
-  this->orb_manager_.run (env);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) AV_Server::run () "
-              "came out of the (acceptor) "
-              "event loop %p\n",
-              "run_event_loop"));
-  return 0;
-  
-}
-
-AV_Server::~AV_Server (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) AV_Server: Removing handlers from the Reactor\n"));
-  
-  if (TAO_ORB_Core_instance ()->reactor ()->remove_handler 
-      (this->acceptor_.get_handle (),
-       ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P|%t) remove_handler for acceptor failed\n"));
-
-  if (TAO_ORB_Core_instance ()->reactor ()->remove_handler
-      (&this->signal_handler_,
-       ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P|%t) remove_handler for sig_handler failed\n"));
-
-}
-
-int
-main (int argc, char **argv)
-{
-  AV_Server vcr_server; 
-
-  TAO_TRY
-    {
-      // Parses the arguments, and initializes the server.
-      if (vcr_server.init (argc, argv, TAO_TRY_ENV) == -1)
-        return 1;
-  
-      // Runs the reactor event loop.
-      vcr_server.run (TAO_TRY_ENV);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
deleted file mode 100644
index dca16183315..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- c++ -*- */
-/* $Id$ */
-
-// ============================================================================
-//
-// = LIBRARY
-//    server
-// 
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION
-//   @@ Please add a synopsis of this file.
-//
-// = AUTHORS
-//    Sumedh Mungee (sumedh@cs.wustl.edu)
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
-// ============================================================================
-
-#if !defined (TAO_AV_SERVER_H)
-#define TAO_AV_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_CODgram.h"
-#include "ace/Select_Reactor.h"
-
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
-#include "mpeg_server/Video_Control_i.h"
-#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
-
-#if defined (NATIVE_ATM)
-#include "atmcom.h"
-#endif /* NATIVE_ATM */
-
-#include "mpeg_server/Video_Server.h"
-#include "mpeg_server/Audio_Server.h"
-
-// Forward declaration.
-class AV_Svc_Handler;
-
-// @@ We should probably try to replace the ACE_Acceptor with the
-// ACE_Strategy_Acceptor using the ACE_Process_Strategy... 
-//   : public virtual ACE_Acceptor <AV_Svc_Handler, ACE_SOCK_ACCEPTOR>
-// {
-//   // = TITLE
-//   //   This defines a AV_Acceptor which is an Acceptor and
-//   //   overrides the make_svc_handler method of the Acceptor.
-//   //
-//   // = DESCRIPTION
-//   //   This class overrides the Acceptor's make_svc_handler so that a
-//   //   AV_Svc_Handler can be created with a non-default constructor.
-// public:  
-//   virtual int make_svc_handler (AV_Svc_Handler *&sh);
-//   // Create a new <AV_Svc_Handler> passing 'this' to the service
-//   // handler.
-// };
-
-class AV_Svc_Handler 
-  : public virtual ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //   This class defines the service handler for a new connection to
-  //   the AV_Server.
-  //
-  // = DESCRIPTION
-  //   This calls the handle_connection method for a new connection
-  //   which demuxes the connection to a video or audio server
-  //   depending on the connection request.
-public:
-  // = Initialization method.
-  AV_Svc_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual int open (void *);
-  // Perform the work of the SVC_HANDLER. Called by the acceptor
-  // when a new connection shows up
-  
-  virtual int handle_connection (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Handle one client connection.
-
-  virtual int svc (void);
-  // Thread method
-
-  virtual int close (u_long);
-  // Called if ACE_Svc_Handler is closed down unexpectedly.
-
-  int handle_timeout (const ACE_Time_Value &,
-                                  const void *arg);
-  // handle the timeout 
-
-private:
-
-  ACE_SOCK_CODgram dgram_;
-  // the UDP data socket
-
-  ACE_INET_Addr server_data_addr_;
-  // Data (UDP) Address of this server.
-  
-  ACE_INET_Addr client_data_addr_;
-  // Data (UDP) Address of the client.
-
-  Video_Server *vs_;
-  // @@ need a similar component for audio!
-  
-  Audio_Server *as_;
-  // the audio server.
-};
-
-class AV_Server_Sig_Handler 
-  : public virtual ACE_Event_Handler
-{
-public:
-  AV_Server_Sig_Handler (void);
-
-  virtual ACE_HANDLE get_handle (void) const;
-
-  int register_handler (void);
-  // this will register this sig_handler
-  // with the reactor for SIGCHLD,SIGTERM,SIGINT
-
-  virtual int shutdown (ACE_HANDLE, 
-                        ACE_Reactor_Mask);
-
-  virtual int handle_input (ACE_HANDLE);
-  // handle input on the dummy handle.
-
-  virtual int handle_signal (ACE_HANDLE signum,
-                             siginfo_t * = 0,
-                             ucontext_t* = 0);
-  // handles the SIGCHLD,SIGTERM,SIGINT for the parent process i.e
-  // the main thread..
-
-  void int_handler (int sig);
-  // Signal handler function for SIGTERM,SIGBUS,SIGINT
-
-  void clear_child (int sig);
-  // Signal handler function for SIGCHLD
-
-  ~AV_Server_Sig_Handler (void);
-  // Destructor
-
-private:
-  ACE_HANDLE handle_;
-  // dummy handle for the sig handler.
-  ACE_Sig_Set sig_set;
-};
-
-class AV_Server
-{
-  // = TITLE
-  //   Defines a class that abstracts the functionality of a 
-  //   video and audio server.
-  //
-  // = DESCRIPTION
-  //   Using the class is as simple as calling init () first and then
-  //   run. It uses an acceptor with the default ACE_Reactor::instance ().
-public:
-  AV_Server (void);
-  // constructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the AV_Server
-
-  int run (CORBA::Environment& env);
-  // Run the AV_Server
-
-  static void on_exit_routine (void);
-  // Routine called when this process exits.
-
-  ~AV_Server (void);
-  // Destructor
-private:
-
-  // @@ Why are some of these data members pointers and others
-  // objects?  Shouldn't we be consistent here?
-
-  // TAO_Naming_Server naming_server_;
-  // the TAO naming server
-
-  TAO_ORB_Manager orb_manager_;
-  // the TAO ORB manager.
-
-  // %% need to comment!!
-  //  typedef ACE_Strategy_Acceptor <AV_Svc_Handler, ACE_SOCK_ACCEPTOR> AV_ACCEPTOR;
-  //  typedef ACE_Thread_Strategy <AV_Svc_Handler> AV_THREAD_STRATEGY;
-  typedef ACE_Acceptor <AV_Svc_Handler, ACE_SOCK_ACCEPTOR> AV_ACCEPTOR;
-  //  AV_THREAD_STRATEGY thread_strategy_;
-  // the strategy
-  
-  AV_ACCEPTOR acceptor_;
-  // the acceptor
-
-  AV_Server_Sig_Handler signal_handler_;
-  // Signal handler for SIGCHLD,SIGINT,SIGTERM,SIGBUS
-
-  ACE_INET_Addr server_control_addr_;
-  // Control (TCP) Address of this server.
-
-  int parse_args (int argcs,
-                  char **argv);
-  // Parse the arguments.
-};
-
-#endif /* TAO_AV_SERVER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
deleted file mode 100644
index 0dc3a36726b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-###dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp
deleted file mode 100644
index fd232eb1a62..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 1995 Oregon Graduate Institute of Science and Technology
- * P.O.Box 91000-1000, Portland, OR 97291, USA;
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its 
- * documentation for any purpose is hereby granted without fee, provided that 
- * the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
- * documentation, and that the name of O.G.I. not be used in advertising or 
- * publicity pertaining to distribution of the software without specific, 
- * written prior permission.  O.G.I. makes no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
- * without express or implied warranty.
- * 
- * O.G.I. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 
- * O.G.I. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY 
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Shanwei Cen
- *         Department of Computer Science and Engineering
- *         email: scen@cse.ogi.edu
- */
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <sys/time.h>
-#include "../include/common.h"
-#include "../mpeg_shared/com.h"    
-#include "../mpeg_shared/routine.h"
-#include "../mpeg_server/proto.h"
-
-#define SESSION_NUM 4
-
-static int parentpid = -1;
-
-static int listenSocketIn = -1;
-static int listenSocketUn = -1;
-
-static struct linger linger = {1,1};
-
-static int live_audio = 0, live_video = 0;  /* 0 - no,  1 - to open,  2 - opened */
-
-int drift_ppm = 0;  /* clock drift in ppm */
-
-int session_limit = SESSION_NUM;
-int session_num = 0;
-
-static void int_handler(int sig)
-{
-  /*
-  fprintf(stderr, "process %d killed by sig %d\n", getpid(), sig);
-  */
-  exit(0);
-}
-
-static void on_exit_routine(void)
-{
-  if (parentpid != getpid()) {
-    /*
-    fprintf(stderr, "process %d exiting...\n", getpid());
-    */
-    return;
-  }
-  /*
-  fprintf(stderr, "deamon exiting . . .\n");
-  */
-  if (live_audio > 1) ExitLiveAudio();
-  if (live_video > 1) ExitLiveVideo();
-  ComCloseServer();
-}
-
-static void clear_child(int sig)
-{
-  int pid;
-  int status;
-  
-  while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
-  {
-    session_num --;
-    
-    if (status == 0) {
-      continue;
-    }
-    fprintf(stderr, "VCRS: child %d (status %d) ", pid, status);
-    if (WIFEXITED(status)) {
-      fprintf(stderr, "exited with status %d\n", WEXITSTATUS(status));
-    }
-    else if (WIFSIGNALED(status)) {
-#if defined(_HPUX_SOURCE) || defined(__svr4__) || defined(IRIX)
-      fprintf(stderr, "terminated at signal %d%s.\n", WTERMSIG(status),
-	      WCOREDUMP(status) ? ", core dumped" : "");
-#else
-      fprintf(stderr, "terminated at signal %d.\n", WTERMSIG(status));
-#endif
-    }
-    else if (WIFSTOPPED(status)) {
-      fprintf(stderr, "stopped at signal %d\n", WSTOPSIG(status));
-    }
-
-  }
-}
-
-main(int argc, char *argv[])
-{
-  int i, rttag = 0;
-  int addrlen;
-
-  for (i = 1; i < argc; i++) {
-    if (!strcmp(argv[i], "-rt")) {
-      rttag = 1;
-    }
-    else if (!strcmp(argv[i], "-nrt")) {
-      rttag = 0;
-    }
-    else if (!strncmp(argv[i], "-d", 2)) {
-      sscanf(&argv[i][2], "%d", &drift_ppm);
-    }
-    else if (!strncmp(argv[i], "-s", 2)) {
-      sscanf(&argv[i][2], "%d", &session_limit);
-      if (session_limit < 1)
-        session_limit = SESSION_NUM;
-    }
-    else if (!strcmp(argv[i], "-lv")) {
-      live_video = 1;
-    }
-    else if (!strcmp(argv[i], "-la")) {
-      live_audio = 1;
-    }
-    else if (!strcmp(argv[i], "-rm")) {
-      unlink(VCR_UNIX_PORT);
-    }
-    else if (!strncmp(argv[i], "-he", 3)) {
-      fprintf(stderr, "Usage: %s [-rt] [-nrt] [-rm]\n", argv[0]);
-      fprintf(stderr, "          [-d#int(clock drift in ppm)]\n");
-      fprintf(stderr, "          [-s#int(limit on number of sessions)]\n");
-      exit(1);
-    }
-  }
-  if (drift_ppm) {
-    fprintf(stderr, "Clock set to drift at %d ppm (positive is faster and neg. slower)\n",
-	    drift_ppm);
-  }
-  
-  setsignal(SIGCHLD, clear_child);
-  setsignal(SIGPIPE, SIG_IGN);
-  setsignal(SIGBUS, int_handler);
-  setsignal(SIGINT, int_handler);
-  setsignal(SIGTERM, int_handler);
-  setsignal(SIGALRM, SIG_IGN);
-  
-  parentpid = getpid();
-
-  atexit(on_exit_routine);
-
-  if (live_audio) {
-    if (InitLiveAudio(argc, argv) == -1)
-      live_audio = 0;
-    else
-      live_audio = 2;
-  }
-
-  if (live_video) {
-    if (InitLiveVideo(argc, argv) == -1)
-      live_video = 0;
-    else
-      live_video = 2;
-  }
-
-  ComInitServer(VCR_TCP_PORT, VCR_UNIX_PORT, VCR_ATM_PORT);
-  
-  /*
-  setpgrp();
-  */
-  {
-    char buf[100];
-    sprintf(buf, "%s%s", LOG_DIR, "vcrsSession.log");
-    if (freopen(buf, "a", stdout) == NULL) {
-      freopen("/dev/null", "w", stdout);
-    }
-  }
-
-  for (;;)
-  {
-    int val;
-    unsigned char cmd;
-    int serverpid = -1;
-    int cfd, dfd;
-    int max_pkt_size;
-
-    if (ComGetConnPair(&cfd, &dfd, &max_pkt_size) == -1) continue;
-    
-    if ((serverpid = fork()) == -1)
-    {
-      perror("VCRS error on creating service process");
-      exit(1);
-    }
-    session_num ++;
-    if (serverpid > 0)  /* parent process for forking servers */
-    {
-      ComCloseFd(cfd);
-      ComCloseFd(dfd);
-      continue;
-    }
-    else
-    {
-      if (session_num > session_limit) {
-	time_t t;
-	char *buf;
-	t = time(NULL);
-	buf = ctime(&t);
-	buf[strlen(buf) - 1] = 0;
-        fprintf(stderr, "VCRS: %s, session_limit %d, session_number %d\n",
-		buf, session_limit, session_num);
-      }
-      
-      if ((val = read(cfd, &cmd, 1)) < 0)
-      {
-        perror("VCRS fails to read command from service socket");
-        exit(1);
-      }
-      if (val == 0) {
-	fprintf(stderr, "Remote client has closed connection.\n");
-	ComCloseConn(cfd);
-	ComCloseConn(dfd);
-	/* continue; -- I don't know why I wrote this line? scen 5-12-96 */
-	exit(0);
-      }
-      ComCloseListen();
-      if (cmd == CmdINITvideo)
-      {
-	/*
-	fprintf(stderr, "Server forked a VideoServer process.\n");
-	*/
-	if (live_audio) LeaveLiveAudio();
-	VideoServer(cfd, dfd, rttag, max_pkt_size);
-	fprintf(stderr, "Weird: video server returned.\n");
-      }
-      else
-      {
-	/*
-	fprintf(stderr, "Server forked a AudioServer process.\n");
-	*/
-	if (live_video) LeaveLiveVideo();
-        AudioServer(cfd, dfd, rttag, max_pkt_size);
-	fprintf(stderr, "Weird: audio server returned.\n");
-      }
-      exit(1);
-    }
-  }
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp
deleted file mode 100644
index 697f680bdcb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-
-#include "mpeg_server/Video_Server.h"
-
-int
-main (int argc, char **argv)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-  Video_Server video_server; 
-  
-  TAO_TRY
-    {
-      // Parses the arguments, and initializes the server.
-      if (video_server.init (argc,
-                             argv,
-                             TAO_TRY_ENV) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Video_Server: init failed\n"),
-                          -1);
-      
-      char sem_str [BUFSIZ];
-      pid_t my_pid;
-      
-      if ((my_pid = ACE_OS::getpid ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to get my pid!\n"),
-                          -1);
-      
-
-      sprintf (sem_str,
-               "%s:%d",
-               "Video_Server_Semaphore",
-               my_pid);
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) semaphore is %s\n",
-                  sem_str));
-      // Release the lock on which the server is waiting
-      ACE_Process_Semaphore semaphore (0, // 0 means that the semaphore is
-                                          // initially locked
-                                       sem_str);
-                                       
-      if (semaphore.release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Error releasing semaphore %s: %p\n",
-                           sem_str,
-                           "semaphore.release ()"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG, 
-                  "(%P|%t) %s:%d\n", 
-                  __FILE__, 
-                  __LINE__));
-      // Increment ACE_SV_Semaphore by one. Dijkstra's V operation,
-      // Tannenbaums UP operation.
-
-      // %% potential race condition if the client
-      // sends a request before we enter the event loop
-      // Runs the reactor event loop.
-      video_server.run (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h
deleted file mode 100644
index a25d479af65..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- c++ -*- */
-/* $Id$ */
-
-// ============================================================================
-//
-// = LIBRARY
-//    server
-// 
-// = FILENAME
-//    vs.h
-//
-// = DESCRIPTION
-//   @@ Please add a synopsis of this file.
-//
-// = AUTHORS
-//    Sumedh Mungee (sumedh@cs.wustl.edu)
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-// 
-// ============================================================================
-
-#if !defined (TAO_AV_VS_H)
-#define TAO_AV_VS_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Acceptor.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_CODgram.h"
-#include "ace/Select_Reactor.h"
-
-#include "include/common.h"         
-#include "mpeg_server/server_proto.h"   
-#include "mpeg_shared/fileio.h"         
-#include "mpeg_shared/routine.h"        
-#include "mpeg_shared/com.h"            
-#include "mpeg_server/Video_Control_i.h"
-#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
-
-#if defined (NATIVE_ATM)
-#include "atmcom.h"
-#endif /* NATIVE_ATM */
-
-#include "mpeg_server/Video_Server.h"
-
-// Forward declaration.
-class AV_Svc_Handler;
-
-// @@ We should probably try to replace the ACE_Acceptor with the
-// ACE_Strategy_Acceptor using the ACE_Process_Strategy... 
-class AV_Acceptor 
-  : public virtual ACE_Acceptor <AV_Svc_Handler, ACE_SOCK_ACCEPTOR>
-{
-  // = TITLE
-  //   This defines a AV_Acceptor which is an Acceptor and
-  //   overrides the make_svc_handler method of the Acceptor.
-  //
-  // = DESCRIPTION
-  //   This class overrides the Acceptor's make_svc_handler so that a
-  //   AV_Svc_Handler can be created with a non-default constructor.
-public:  
-  virtual int make_svc_handler (AV_Svc_Handler *&sh);
-  // Create a new <AV_Svc_Handler> passing 'this' to the service
-  // handler.
-};
-
-class AV_Svc_Handler 
-  : public virtual ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //   This class defines the service handler for a new connection to
-  //   the AV_Server.
-  //
-  // = DESCRIPTION
-  //   This calls the handle_connection method for a new connection
-  //   which demuxes the connection to a video or audio server
-  //   depending on the connection request.
-public:
-  // = Initialization method.
-  AV_Svc_Handler (ACE_Reactor * = 0,
-                    AV_Acceptor * = 0);
-
-  virtual int open (void *);
-  // Perform the work of the SVC_HANDLER. Called by the acceptor
-  // when a new connection shows up
-  
-  virtual int handle_connection (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Handle one client connection.
-
-  virtual int svc (void);
-  // Thread method
-
-  virtual int close (u_long);
-  // Called if ACE_Svc_Handler is closed down unexpectedly.
-
-  int handle_timeout (const ACE_Time_Value &,
-                                  const void *arg);
-  // handle the timeout 
-
-private:
-
-  ACE_SOCK_CODgram dgram_;
-  // the UDP data socket
-
-  ACE_INET_Addr server_data_addr_;
-  // Data (UDP) Address of this server.
-  
-  ACE_INET_Addr client_data_addr_;
-  // Data (UDP) Address of the client.
-
-  AV_Acceptor *acceptor_;
-  // Pointer to the Acceptor that created us so that we can remove it
-  // from the <ACE_Reactor> when we <fork>.
-
-  // @@ need a similar component for audio!
-  Video_Server *vs_;
-};
-
-class AV_Server_Sig_Handler 
-  : public virtual ACE_Event_Handler
-{
-public:
-  AV_Server_Sig_Handler (void);
-
-  virtual ACE_HANDLE get_handle (void) const;
-
-  int register_handler (void);
-  // this will register this sig_handler
-  // with the reactor for SIGCHLD,SIGTERM,SIGINT
-
-  virtual int shutdown (ACE_HANDLE, 
-                        ACE_Reactor_Mask);
-
-  virtual int handle_input (ACE_HANDLE);
-  // handle input on the dummy handle.
-
-  virtual int handle_signal (ACE_HANDLE signum,
-                             siginfo_t * = 0,
-                             ucontext_t* = 0);
-  // handles the SIGCHLD,SIGTERM,SIGINT for the parent process i.e
-  // the main thread..
-
-  void int_handler (int sig);
-  // Signal handler function for SIGTERM,SIGBUS,SIGINT
-
-  void clear_child (int sig);
-  // Signal handler function for SIGCHLD
-
-  ~AV_Server_Sig_Handler (void);
-  // Destructor
-
-private:
-  ACE_HANDLE handle_;
-  // dummy handle for the sig handler.
-  ACE_Sig_Set sig_set;
-};
-
-class AV_Server
-{
-  // = TITLE
-  //   Defines a class that abstracts the functionality of a 
-  //   video and audio server.
-  //
-  // = DESCRIPTION
-  //   Using the class is as simple as calling init () first and then
-  //   run. It uses an acceptor with the default ACE_Reactor::instance ().
-public:
-  AV_Server (void);
-  // constructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the AV_Server
-
-  int run (CORBA::Environment& env);
-  // Run the AV_Server
-
-  static void on_exit_routine (void);
-  // Routine called when this process exits.
-
-  ~AV_Server (void);
-  // Destructor
-private:
-
-  // @@ Why are some of these data members pointers and others
-  // objects?  Shouldn't we be consistent here?
-
-  TAO_Naming_Server naming_server_;
-  // the TAO naming server
-
-  TAO_ORB_Manager orb_manager_;
-  // the TAO ORB manager.
-
-  Video_Control_i video_control_;
-  // The Video_Control implementation object.
-
-  AV_Acceptor acceptor_;
-  // the acceptor
-
-  AV_Server_Sig_Handler signal_handler_;
-  // Signal handler for SIGCHLD,SIGINT,SIGTERM,SIGBUS
-
-  ACE_INET_Addr server_control_addr_;
-  // Control (TCP) Address of this server.
-
-  int parse_args (int argcs,
-                  char **argv);
-  // Parse the arguments.
-};
-
-#endif /* TAO_AV_VS_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/vcr.1 b/TAO/orbsvcs/tests/AVStreams/mpeg/vcr.1
deleted file mode 100644
index 24e9688f674..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/vcr.1
+++ /dev/null
@@ -1,610 +0,0 @@
-.\" Copyright (c) 1995 Oregon Graduate Institute
-.TH vcr 1 "November 1995" "MPEG video audio player"
-
-.SH NAME
-.B vcr vcrs
-\- Distributed, real-time synchronized video audio player, version 2.0
-.SH SYNOPSIS
-
-.B vcrs
-[
-.B \-rt
-] [
-.B \-rm
-] [
-.B \-s\fIsession_limit\fP
-] [
-.B \-help
-]
-
-.B vcr
-[
-.B\-rt
-] [
-.B \-shmem
-] [
-.B \-rmsem
-]
-.ti +5n
-[
-.BR \-dither " ordered\||\|ordered2\||\|fs4\||\|fs2\||\|fs2fast\||\|hybrid\||\|
-.if n .ti +5n
-          hybrid2\||\|2x2\||\|gray\||\|color\||\|mono\||\|threshold
-]
-.if n .ti +5n
-[
-.I X-window options
-]
-.if n .ti +5n
-[
-.BR \-v " \fI[hostname:]video-filename\fP"
-]
-.if n .ti +5n
-[
-.BR \-a " \fI[hostname:]audio-filename\fP"
-]
-.if n .ti +5n
-[
-.BR \-p " \fImovie-file-name\fP"
-]
-.if n .ti +5n
-[
-.BR \-l " \fImovie-list-file-name\fP"
-]
-.if n .ti +5n
-[
-.BR \-quiet
-]
-.if n .ti +5n
-[
-.BR \-help
-]
-.SH DESCRIPTION
-
-The player plays \fBMPEG\-1\fP video and \fB8\-bit mu\-law (Sun
-Sparc)\fP audio. It supports
-following \fBfour types\fP of playback:
-.TP
-\ \ \ \(bu
-Plays both video and audio synchronously, in real-time mode. Video
-frames, or even audio samples are dropped if needed.
-.TP
-\ \ \ \(bu
-Plays video only, in real-time mode. Video frames are dropped if
-needed.
-.TP
-\ \ \ \(bu
-Plays video only, in best-effort mode, video frames are played as fast
-as possible.
-.TP
-\ \ \ \(bu
-Plays audio only, in real time mode.
-.PP
-
-When video/audio is played in \fBreal-time\fP mode, play speed (defined in
-terms of frames-per-second (fps) for video and samples-per-second (sps)
-for audio) can be specified through a speed scale. If audio is played at a
-speed other than the recording (normal) speed, samples are interpolated.
-
-When video is played in \fBbest-effort\fP mode, the player tries its
-best to play video frame by frame, and not to drop frames.  This mode
-is not supported very well. Now and then some frames may be
-dropped. Audio is disabled in this mode.
-
-As well as various types of playback, the player also supports other
-common VCR functions such as fast forward, rewind, step
-(forward), random positioning, etc..
-
-The player is of \fBdistributed architecture\fP, with servers and
-clients communicating across Internet. A \fBserver\fP resides on a
-host, and services coming audio/video retrieval requests from clients.
-A \fBclient\fP receives instructions from the user, makes connection
-to servers, buffers incoming streams, decodes video frames,
-interpolates audio samples, and outputs audio and video to
-corresponding devices in a timely manner. A client can connect to
-different servers for audio and video streams, and still plays them
-synchronously.
-
-
-.SH SERVER
-
-To start the server, type:
-
-.B vcrs
-[
-.B \-rt
-] [
-.B \-rm
-] [
-.B \-s\fIsession_limit\fP
-] [
-.B \-help
-]
-
-One host can have a SINGLE server running, which responds to
-connection requests from all clients to that host. Subsequent
-invocation is terminated with an error message.
-
-\fBOptions\fP
-
-.IP "\fB-rt\fP"
-On \fBhpux\fP, \fBsparc-sunos5.3\fP and \fBi86pc-solaris2.4\fP, if you
-have real-time execution privilege, you can start the server with
-the option \fB\-rt\fP to get better service.
-
-.IP "\fB-rm\fP"
-With option \fB\-rm\fP, the server will try to remove socket names
-left by previous crashed invocations before initialization.
-
-.IP "\fB-s\fIsession_limit\fP"
-
-With the option of \fB\-s\fP followed by a positive integer, e.g.
-\fB-s2\fP, \fB-s4\fP or \fB-s10\fP, the number of sessions
-serviced by the server at any time will be limited to be no more than
-the given number. Both audio and video sessions are counted. The
-default session number limit is \fB4\fI.
-
-.IP "\fB-help\fP"
-This option tells the server to print all available options and then
-quit.
-
-.PP
-
-In a video session, the server tries to find a
-corresponding \fB.Info\fP file describing the structure of the MPEG
-file of the session. If this fails, the server scans the MPEG file for
-structure information and tries to create the \fB.Info\fP file. For
-big MPEG files, this scanning process may take quite a few minutes
-(some times even tens of minutes). If the \fB.Info\fP file is found,
-the server simply reads structure information from it.
-
-.SH CLIENT
-
-The client program is available on \fBsun4\fP, \fBhpux\fP and
-\fBi86pc-solaris2.4\fP.  It needs a \fBMotif\fP environment, and
-outputs audio to the default \fBAudioFile\fP server. If the client
-fails to connect to the default AudioFile server, then the audio is
-disabled.
-
-To start the client, type:
-
-.B vcr
-[
-.B\-rt
-] [
-.B \-shmem
-] [
-.B \-rmsem
-]
-.ti +5n
-[
-.BR \-dither " ordered\||\|ordered2\||\|fs4\||\|fs2\||\|fs2fast\||\|hybrid\||\|
-.if n .ti +5n
-          hybrid2\||\|2x2\||\|gray\||\|color\||\|mono\||\|threshold
-]
-.if n .ti +5n
-[
-.I X-window options
-]
-.if n .ti +5n
-[
-.BR \-v " \fI[hostname:]video-filename\fP"
-]
-.if n .ti +5n
-[
-.BR \-a " \fI[hostname:]audio-filename\fP"
-]
-.if n .ti +5n
-[
-.BR \-p " \fImovie-file-name\fP"
-]
-.if n .ti +5n
-[
-.BR \-l " \fImovie-list-file-name\fP"
-]
-.if n .ti +5n
-[
-.BR \-quiet
-]
-.if n .ti +5n
-[
-.BR \-help
-]
-
-\fBOptions\fP
-
-.IP \fB-rt\fP
-On \fBhpux\fP, and \fBi86pc-solaris2.4\fP, if you have real-time
-execution privilege, with this option you may get better service.
-.IP \fB-shmem\fP
-With this option, the client tries to output video frames to the
-X-server via shared memory instead of sockets.
-.IP \fB-rmsem\fP
-With this option, prior to initialization, the client tries to remove
-\fBall\fP existing semaphore and shared memory ids you have access to.
-\fBBe careful\fP, with this option, you also face the danger of
-removing semaphores or shared memory ids being used by other programs,
-as well as all the ones created by failed invocation of the player.  See
-\fBSemaphore ids and shared memory ids used up\fP in \fBKNOWN PROBLEMS\fP
-section.
-.IP "\fB-dither\fP ordered|ordered2|fs4|fs2|fs2fast|hybrid|"
-   hybrid2|2x2|gray|color|mono|threshold
-
-This option specifies the type of dithering performed on video frames
-in order to be displayed on an X-window. The default is
-\fIordered\fP. \fIcolor\fP only works with full color (24-bit)
-displays. All others work with 8-bit color displays. \fImono\fP and
-\fIthreshold\fP also work with mono displays.  Different types of
-dithering have different computational complexity and offer different
-image quality.
-.IP "\fIX-window options\fP"
-All standard X-window Toolkit command line options are accepted
-(see \fBX\fP(1)).
-.IP "\fB-v\fP \fI[hostname:]video-filename\fP"
-The very first program for the player can be specified in command line
-with \fB-v\fP and/or \fB-a\fP options, for video and/or audio streams
-respectively.
-
-This option specifies a video stream. If the \fIhostname\fP part is
-given, the client tries to connect to a running server on the given
-host, and plays the given file. If the hostname part is missing, the
-client assumes there is a running server on the local host or tries to
-fork one.  and tries to connect to it.
-
-.IP "\fB-a\fP \fI[hostname:]audio-filename\fP"
-This option specifies an audio stream of the very first program.
-Only file names with suffix \fB.au\fP are accepted as audio files.
-.IP "\fB-p\fP \fImovie-file-name\fP"
-This option specifies a file specifying a movie to be played upon
-client startup. A movies file contains \fBfive lines\fP lines: title,
-video host name, video file path, audio host name, and audio file path.
-.IP "\fB-l\fP \fImovie-list-file-name\fP"
-This option specifies a movie list file to replace the default movie
-list file \fI$(HOME)/.vcr/vcrPrograms\fP. A movie list file contains a
-banner line, followed by a list of movies.
-.IP "\fB-quiet\fP"
-This option tells the client not to print any text message. This is
-useful when the player is invoked from within a web browser.
-.IP "\fB-help\fP"
-This option tells the client to print all available options and quit.
-
-.PP
-
-\fBOperations\fP
-
-There are \fBtwelve buttons\fP and \fBfour scales\fP defined in the top-level window.
-Buttons from left to right are:
-.PP
-.IP \fIExit\fP
-Exits the client right away.
-.IP \fIInfo\fP
-Pops up a window containing information about the player.
-.IP \fIPara\fP
-Pops up a window with a list of parameters. Parameter values
-can be viewed and modified through this window.
-.IP \fIProg\fP
-Pops up a window with a list of programs.  You
-can select a program from this list to play.
-.IP \fIFile\fP
-This is an alternative way to select programs. pressing this button
-pops up a standard Motif file selection window. You can select
-audio/video file on local host to play. The client assumes a running
-server on local host, or tries to fork one.
-
-File names with suffix \fB.au\fP are accepted as audio, and file
-names with suffices \fB.mpg\fP, or \fB.mpeg\fP (some or all letters in
-the suffices can be upper-case ones) as MPEG video. Other types of
-file names are rejected.
-
-Selection of a new program causes the current program to be discarded.
-.IP \fILoop\fP
-A toggle button. When pressed, the current program is played
-repeatedly until stopped explicitly by the user, otherwise, playback stops when
-program end is hit. This button has no effect on rewind and fast
-forward.
-.IP \fINorm\fP
-Restores play speed to the normal (recording) speed.
-.IP \fIRewind\fP
-For video programs. Plays backward from the current position at a
-speed given by the parameter \fI(Rewind frames-per-second)\fP.  Only first
-frames of MPEG picture groups (I-frames) are played. Audio is
-disabled.
-.IP \fIStop\fP
-Stops active playback, fast forward or rewind.
-.IP \fIFast-Forward\fP
-For video programs. Plays forward from the current position at a speed
-given by the parameter \fI(FF frames-per-second)\fP.  Only first frames of MPEG
-picture groups (I-frames) are played. Audio is disabled.
-.IP \fIPlay\fP
-Plays the program from the current position in one of the two modes,
-depending on if video is involved and the value of an parameter \fI(Real
-time(audio on)(tag))\fP:
-.RS
-.IP -
-Best-effort mode, if the parameter is off (0), and video is involved.
-.IP -
-Real-time mode, otherwise.
-.RE
-.IP \fIStep\fP
-Steps forward for one frame from the current position.
-.PP
-Clicking on buttons \fIRewind\fP, \fIFast-Forward\fP, \fIPlay\fP and
-\fIStep\fP and dragging the \fIPlay-Speed\fP scale all stop current
-active rewind, fast forward, or play.
-
-.B "Four scales \fP from left to right are:"
-
-.IP \fIBalance\fP
-Currently not functional, because only mono audio is
-supported.
-.IP \fIVolume\fP
-Audio volume.
-.IP \fIPlay-Speed\fP
-Specifies play speed for real-time mode playback. This scale is not
-completely linear, with a special middle point (\fB50\fP).
-.RS
-.IP \fB50\fP
-normal (recording) speed.
-.IP "\fB[1 - 50)\fP"
-linear speed value increase from zero to the normal speed.
-.IP "\fB(50 - 100]\fP"
-Linear speed value increase from the normal speed to the maximum
-speed given by the parameter \fI(Video max frames-per-second)\fP when
-video is involved in the current program, or \fI(Audio max
-samples-per-second)\fP when only audio is involved.
-.RE
-This scale also defines the upper-limit of the best-effort playback
-speed.
-.IP \fIPosition\fP
-This scale has multiple functionalities:
-.RS
-.IP -
-Indicates the beginning position for rewind, fast forward and
-playback.
-.IP -
-Shows the current position during rewind, fast forward, and playback.
-.IP -
-Random positioning: you can set the position by dragging the
-slider. when video is involved, the first frame of the picture group
-at the current position is displayed.
-.RE
-.PP
-.B "Program list"
-
-.B Program list
-is maintained through the \fBprogram list\fP window, which is popped up by
-clicking the \fIProg\fP button in the main window. Currently only \fISelect\fP
-and \fIDismiss\fP buttons are fully functional, and contents of a selected
-program can be viewed (but not modified) by pressing the \fIModify\fP
-button. To select a program, \fBhighlight\fP the desired item and
-click \fISelect\fP.  To modify the program list, edit the program file given
-below.
-
-.B "Parameters"
-
-.B Parameters
-are viewed and maintained through the parameter window, which is activated
-by clicking the \fIPara\fP button in the main window. To update a parameter,
-\fBhighlight\fP the item, enter the new value in the text window next
-to the \fIUpdate\fP button, and press \fIUpdate\fP. Following parameters
-are supported:
-
-.IP "\fIReal time (audio on)(tag)\fP"
-Best-effort play mode when this parameter is 0 and video is involved
-in the current program, otherwise real-time play mode. Default: 1,
-range: 0, non-0.
-.IP "\fIVideo max frames-per-second\fP"
-For video programs, real-time mode play speed when speed scale has a
-value of 100. Default: 60, range: > the normal speed.
-.IP "\fIAudio max samples-per-second\fP"
-For audio-only programs, play speed when speed scale has a value of
-100. Default: 16000, range: > the normal speed.
-.IP "\fIFF frames-per-second\fP"
-Fast forward speed. Default: 150, range: > 0.
-.IP "\fIRewind frames-per-second\fP"
-Rewind speed. Default: 150, range: > 0.
-.IP "\fIFeedback delay (msec)\fP"
-Currently not used.
-.IP "\fIAudio output mask\fP"
-Currently not used.
-.IP "\fIAudio_para.encodeType\fP"
-Currently not used.
-.IP "\fIAudio_para.channels\fP"
-Currently not used.
-.IP "\fIAudio_para.samplesPerSecond\fP"
-Currently not used.
-.IP "\fIAudio_para.bytesPerSamples\fP"
-Currently not used.
-.IP "\fIAudio timer interval (millisec)\fP"
-For audio-only programs. Playback
-timer interval in milliseconds. Playback of audio and video is
-driven by a timer in the client. Default: 500, range: > 0.
-.IP "\fIAudio buffered intervals\fP"
-For audio-only programs. This number of timer intervals of audio
-samples are to be buffered in the AudioFile server internal buffer. This
-parameter and the previous one determine how many milliseconds of
-audio samples are to be buffered in AudioFile. Buffering too
-many samples reduces responsiveness, too few may degrade playback
-quality.  Default: 2, range: > 0.
-.IP "\fIFrames per audio play\fP"
-For audio+video programs, this parameter determines the ratio of the
-audio timer interval over the video timer interval.  Default: 4,
-range: > 0.
-.IP "\fIAudio forward (samples)\fP"
-For audio+video programs, this number of samples of audio is
-played ahead of video stream. This is supposed to compensate the
-delay in AudioFile server. Default: 800, range: > 0.
-.IP "\fIVS work-ahead (milli-seconds)\fP"
-For video program, this number of milli-seconds the player tries to
-keep the video server ahead of the client during playback, rewind and
-fast forward.
-
-If the parameter \fISync effective\fP has a value of non-0, then this
-parameter gives the initial value of the VS work-ahead time, and the
-actual work ahead time is adjusted according to current network delay
-jitter level.  If a value less than the default is set, then the
-default instead of the given one is used by the player.
-
-Default: 100, range: >= Default.
-
-.IP "\fIFrame rate limit (fps, float)\fP"
-For video programs. In real-time play mode, if current play speed is
-higher than the value of this parameter, then this
-parameter defines the maximum frame rate the player tries to play.
-Default: 60.0, range: >0.
-.IP "\fICollect statistics(tag)\fP"
-For video programs. If both the server and the client programs are compiled
-with STAT defined, this tag indicates that, at the end of a playback
-session, when \fIStop\fP button is pressed (or in loop-back mode when the
-end of the program is reached) statistics is collected to file
-stat.\fIn\fP in current directory (from which the client is
-invoked). Default: 0, range: 0, non-0.
-.IP "\fICollect video structure info(tag)\fP"
-For video programs. If both the server and the client programs are compiled
-with STAT defined, this tag indicates that, upon successful
-initialization of a video stream, structure information of the MPEG
-stream is collected to a file named struct.\fIn\fP in
-current directory Default: 0, range: 0, non-0.
-.IP "\fISync effective(tag)\fP"
-For video programs, when set, server/client synchronization control is
-effective during playback, rewind and fast forward. Default: 1, range:
-0, non-0.
-.IP "\fIQoS effective(tag)\fP"
-For video programs, when set, automatic frame rate control is
-effective during playback. Default: 1, range: 0, non-0.
-.IP "\fIAudio offset(samples)\fP"
-For audio+video programs. The player assumes that in a program, audio
-and video are recorded strictly synchronously.  But it is usually not
-the case, and there is a certain amount of timing shift between audio
-and video. This parameter specifies audio forward offset against video
-in order to compensate the shift. Default: 0, range: integer
-.IP "\fIFilter parameter(1/R or n-samples)\fP"
-Parameter of the filters for client/server synchronization and frame rate
-control. Default: 50, range: > 0.
-.IP "\fIMax send pattern frames\fP"
-This parameter sets the granularity of the frame rate control
-algorithm. Default: 60, range: > 0.
-.IP "\fIReliable byte-stream audio (tag)\fP"
-In the case when the server is on a remote host, when this tag is set,
-the client establishes a TCP connection to the server for shipping
-audio samples, otherwise a UDP is used. The client always setup a TCP
-connection to the server for control messages, no matter what value
-the tag is.
-.IP "\fIReliable byte-stream video (tag)\fP"
-Similar effort as previous tag, but for video channel.
-.IP "\fIVerbose message(tag)\fP"
-If this tag is set, then verbose message is printed (provided that
-command line option \fB-quiet\fP is not specified. Otherwise the
-client will still print some, but less verbose message.
-.PP
-Parameter setting is for experienced user only. It is suggested that
-you leave values of most parameters as default. If you like to change
-some of them, be careful. It may make the player behave improperly. In
-case you made some change, the player fails to work, and you are
-unable to undo the change, delete the parameter file shown below and
-restart the client.
-
-.SH FILES
-
-.IP "\fI($HOME)/.vcr/vcrPrograms\fP"
-Program file. If this file is absent, it is created with a default
-movie list of several basketball game sample movies in it. The movies
-in the default movies list are maintained at CSE OGI. In a movie list
-file, the first line is a banner. Following this line, each contiguous
-four lines describe a movie: video host, MPEG file path, audio host,
-audio file path. You may edit the movie list fileto include any movies
-you like.
-
-.IP "\fI($HOME)/.vcr/vcrParameters\fP"
-Parameter file. When absent, the system default parameter values
-apply. Whenever you update a parameter, this parameter file is also
-created or updated.
-
-.SH KNOWN PROBLEMS
-
-.B "The player stalls"
-when or after playing audio program at very \fBlow speed\fP, or the
-product of \fI(Audio timer interval)\fP and \fI(Audio buffered intervals)\fP
-parameters \fBtoo large\fP, or \fI(Frames per audio play)\fP too
-large. This is because the client tries to put too many audio
-samples to AudioFile each time, blocking itself for output.
-
-In this version of the player, when an video+audio program is played,
-some conditions are checked and low speed limit is enforced. You
-are not able to set too low play speed (even if you set the speed
-slider to 0 position). But the conditions might not be sufficient.
-
-.B "Play at too high speed\fP,"
-or \fI(Audio timer interval)\fP too small, or \fI(Video max
-frames-per-second)\fP, \fI(FF frames-per-second)\fP, or \fI(Rewind
-frames-per-second)\fP too high, presentation quality may be worse than
-expected. This is because of the resolution limit of the UNIX interval
-timer, which is about 10 milliseconds.
-
-.B "When Play speed jump from high to very low\fP,"
-a few seconds of worse-than-expected video presentation quality may be
-experienced. Because at high speed, the video server usually drops
-frames, and play speed changes, the player does not flush the video
-pipeline.
-
-Various problems may be experienced if the \fBparameter\fP values are too
-far from their default. The parameter values are seldomly guarded.
-
-.B "Audio doesn't work when played across the Internet\fP."
-This is because audio is retrieved from the audio server to the
-client via TCP, and the Internet TCP connection fails to provide
-enough (e.g. 8KB/s) sustained bandwidth. In this case, all audio
-samples would be too late showing up at the client, and thus are
-dropped.
-
-.B "X shared memory problem\fP."
-Parts of the user interface may not work correctly when the player
-outputs to X-window via shared memory (with option \fB-shmem\fP).  For
-example, some of the buttons may not show up. Usually, the missing
-buttons will show up by iconifying the user interface.
-
-.B "Core dump."
-The player may core dump when playing a specific MPEG stream, at a
-specific position. This may be because the parameters in the MPEG
-stream is out of the ability of the decoder code. Upon core dump, you
-may want to reproduce the problem, and recompile the player with
-option -DNDEBUG, run the player again to see if any assertions fails.
-
-.B "Semaphore or shared memory ids used up\fP."
-When this happens, an error shmget() or semget() is reported by the
-player.  This may happen if previous invocation(s) of the player have
-exit abnormally causing core dump, and you try to run the player
-again. Because semaphores and shared memory segments might not be
-reclaimed when the player exits abnormally.  You may run the client
-with option \fB\-rmsem\fP to remove all existing semaphores and shared
-memory ids accessable by you. See description of \fB\-rmsem\fP.  If
-\fB-rmsem\fP does not work, you may need to use tools like
-\fBipcrm(1)\fP.
-
-.B "Undeleted UNIX socket pathes /tmp/vcrs*\fP"
-Some UNIX socket names may remain in /tmp directory as "vcrs*", if the
-server or the client has terminated abnormally.
-
-.SH BUG REPORT
-
-If you experience problems, look at the above KNOWN PROBLEM section
-first. If the problem is not described, try to reproduce the problem, and
-\fBreport bug\fP to \fBscen@cse.ogi.edu\fP.  Thanks.
-
-.SH COPYRIGHT
-
-This software is covered by copyrights. It contains code contributed
-by the author and several other parties. Please see the beginning of
-source files and copyright file(s) in the root directory of the source
-kit.
-
-.SH SEE ALSO
-
-.B "AF\fP(1), \fBX\fP(1)"
-
-.SH AUTHOR
-
- Shanwei Cen
- Department of Computer Science and Engineering
- Oregon Graduate Institute of Science and Technology
- scen@cse.ogi.edu
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/vcrs.1 b/TAO/orbsvcs/tests/AVStreams/mpeg/vcrs.1
deleted file mode 100644
index a9769fc8944..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/vcrs.1
+++ /dev/null
@@ -1 +0,0 @@
-.so vcr.1
diff --git a/TAO/orbsvcs/tests/AVStreams/server.cpp b/TAO/orbsvcs/tests/AVStreams/server.cpp
deleted file mode 100644
index 849a7182826..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/server.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION 
-//    Test server for the AVStreams demo
-//   
-// = AUTHORS
-//   Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "server.h"
-
-// Callbacks made by the AVStreams library into the application.
-
-Video_Server_StreamEndPoint::Video_Server_StreamEndPoint (void)
-{
-}
-
-void 
-Video_Server_StreamEndPoint::handle_stop (const AVStreams::flowSpec &the_spec,
-                                          CORBA::Environment &env)
-{
-}
-
-void 
-Video_Server_StreamEndPoint::handle_start (const AVStreams::flowSpec &the_spec,  
-                                           CORBA::Environment &env)
-{
-}
-
-void 
-Video_Server_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &the_spec,  
-                                             CORBA::Environment &env)
-{
-}
-
-CORBA::Boolean 
-Video_Server_StreamEndPoint::handle_connection_requested (AVStreams::StreamEndPoint_ptr initiator, 
-                                                          CORBA::Boolean is_mcast, 
-                                                          AVStreams::streamQoS &qos, 
-                                                          AVStreams::flowSpec &the_spec,  
-                                                          CORBA::Environment &env)
-{
-  return 1;
-} 
-
-// Main program.
-
-int
-main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      TAO_ORB_Manager orb_manager;
-
-      // Initialize the ORB.
-      orb_manager.init (argc, 
-                        argv,
-                        TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Create server-side MMDevice.
-      TAO_Server_MMDevice <Video_Server_StreamEndPoint> *mmdevice_impl;
-      ACE_NEW_RETURN (mmdevice_impl,
-                      TAO_Server_MMDevice <Video_Server_StreamEndPoint>,
-                      -1);
-      TAO_CHECK_ENV;
-
-      // Activate the MMDevice, i.e., register with POA.
-      CORBA::String_var s = orb_manager.activate (mmdevice_impl,
-                                                  TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Print the IOR.
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nThe IOR is: <%s>\n", 
-                  s.in ()));
-
-      // Run the ORB Event loop.
-      orb_manager.run (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  ACE_DEBUG ((LM_DEBUG,
-              "\nServer is terminating"));
-  return 0;
-}
-
diff --git a/TAO/orbsvcs/tests/AVStreams/server.h b/TAO/orbsvcs/tests/AVStreams/server.h
deleted file mode 100644
index a8222dea9c9..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/server.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams
-//
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION 
-//    Test server for the AVStreams demo
-//   
-// = AUTHORS
-//   Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (AVSTREAMS_SERVER_H)
-#define AVSTREAMS_SERVER_H
-
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "tao/tao_util.h"
-
-class Video_Server_StreamEndPoint : public virtual TAO_Server_StreamEndPoint
-{
-  // = TITLE
-  //    Server Stream Endpoint for A/V Streams demo.
-  //
-  // = DESCRIPTION
-  //    Encapsulates server side transport functionality.
-public:
-  Video_Server_StreamEndPoint (void);
-  // Constructor.
-  
-  virtual void handle_stop (const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &env);
-  // Handles stream stoppage.
-  
-  virtual void handle_start (const AVStreams::flowSpec &the_spec,  
-                             CORBA::Environment &env);
-  // Handles stream start. Starts the flow of data.
-  
-  virtual void handle_destroy (const AVStreams::flowSpec &the_spec,  
-                               CORBA::Environment &env);
-  // Handles the destruction of the stream, tears down the transport.
-
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::StreamEndPoint_ptr initiator, 
-                                                      CORBA::Boolean is_mcast, 
-                                                      AVStreams::streamQoS &qos, 
-                                                      AVStreams::flowSpec &the_spec,  
-                                                      CORBA::Environment &env);
-  // Handles stream bind, establishes the transport.
-};
-
-#endif /* AVSTREAMS_SERVER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
deleted file mode 100644
index 9a73f45dc64..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the AVStreams demo of the TAO ORB
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lorbsvcs -lTAO
-
-PROG_SRCS =  main.cpp
-
-LSRC = $(PROG_SRCS)
-
-AVStreams_SERVER_OBJS = server.o
-AVStreams_CLIENT_OBJS = client.o
-
-COSPROPERTY_OBJS = main.o
-
-BIN = client
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
-	$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS)
-
-client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-#main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))	
-#	$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS) 
-
-
-realclean: clean
-	-/bin/rm -rf 
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp b/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
deleted file mode 100644
index 487b644b8ba..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-#include "ace/Message_Block.h"
-#include "orbsvcs/AV/sfp.h"
-
-const char *buf = "Hello Worldasdasda sda sdasd adasdaddd\n";
-
-main ()
-{
-  
-  // ----------------------------------------------------------------------
-  // start message
-
-  SFP_Encoder encoder;
-
-  ACE_Message_Block *start_message =
-    encoder.encode_start_message ();
-
-  SFP_Decoder decoder;
-
-  decoder.decode_start_message (start_message);
-  
-  // ----------------------------------------------------------------------
-  // start reply
-
-  ACE_Message_Block *start_reply_message =
-    encoder.encode_start_reply_message ();
-
-  decoder.decode_start_reply_message (start_reply_message);
-  
-
-  // ----------------------------------------------------------------------
-  // simple frame
-
-  ACE_Message_Block *message;
-
-  ACE_NEW_RETURN (message,
-                  ACE_Message_Block (buf),
-                  -1);
-
-  message->length (::strlen (buf));
-
-  ACE_Message_Block *mb = encoder.encode_simple_frame (message);
-
-  decoder.decode_simple_frame (mb);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/svc.conf b/TAO/orbsvcs/tests/AVStreams/sfp/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/svc.conf b/TAO/orbsvcs/tests/AVStreams/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/CosPropertyService/Makefile b/TAO/orbsvcs/tests/CosPropertyService/Makefile
deleted file mode 100644
index 277a9044d52..00000000000
--- a/TAO/orbsvcs/tests/CosPropertyService/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lorbsvcs -lTAO
-
-PROG_SRCS =  main.cpp
-
-LSRC = $(PROG_SRCS)
-
-#AVStreams_SERVER_OBJS = server.o
-#AVStreams_CLIENT_OBJS = client.o
-
-COSPROPERTY_OBJS = main.o
-
-#BIN = server client
-BIN = main
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-#server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
-#$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
-#$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))	
-	$(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS)  $(POSTLINK)
-
-
-realclean: clean
-	-/bin/rm -rf 
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
diff --git a/TAO/orbsvcs/tests/CosPropertyService/main.cpp b/TAO/orbsvcs/tests/CosPropertyService/main.cpp
deleted file mode 100644
index bf7341b1d7a..00000000000
--- a/TAO/orbsvcs/tests/CosPropertyService/main.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-// $Id$
-
-// =========================================================================================================
-//
-// = FILE  
-//     Program to test the property services.
-//
-// = DESCRIPTION
-//     - Instantiates TAO_PropertySet
-//     - Uses the fns implemented
-//     - Shows the results
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ========================================================================================================= 
-
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "tao/any.h"      
-#include "tao/corbacom.h" 
-#include "tao/tao_util.h"
-
-class TAO_PropertySet_Tester
-{
-  // = TITLE
-  //     The testing code for the PropertySet interface are grouped
-  //     under the functions of this class.
-  //
-  // = DESCRIPTION
-  //     Go thru the functions to understand the usage of the various
-  //     methods of the PropertySet interaface.
-public:
-  friend class TAO_PropertyNamesIterator_Tester;
-  // He has to instantiate TAO_NamesIterator class using the instance
-  // of TAO_PropertySet.
-
-  TAO_PropertySet_Tester (void);
-  // Constructor.
-  
-  ~TAO_PropertySet_Tester (void);
-  // Destructor.
-  
-  int test_define_property (CORBA::Environment &env);
-  // Defines a char,a short, a long, a float and a string property.
-  
-  int test_get_number_of_properties (CORBA::Environment &env);
-  // Gets the number of properties currently defined in the PropertySet.
-  
-  int test_delete_property (const char *property_name,
-                            CORBA::Environment &env);
-  // Delete a given property.
-  
-  int test_is_property_defined (CORBA::Environment &env);
-  // Check the following properties are defined or
-  // no. "char_property", "short_property" and a "string_property".
-  
-  int test_get_property_value (CORBA::Environment &env);
-  // Get the "float_property" and "string_property" and print them
-  // out.
-  
-  int test_delete_properties (CORBA::Environment &env);
-  // Delete char, short,long, and string properties.
-  
-  int test_delete_all_properties (CORBA::Environment &env);
-  // Delete all the properties.
-  
-  int test_define_properties (CORBA::Environment &env);
-  // Define a sequence of properties. a char, a short, a long, a float
-  // and a string.
-
-private:
-  TAO_PropertySet property_set_;
-  // The PropertySet.
-};
-
-class TAO_PropertyNamesIterator_Tester 
-{
-  // = TITLE
-  //     The testing code for the PropertyNamesIterator interface are grouped
-  //     under the functions of this class.
-  //
-  // = DESCRIPTION
-  //     Go thru the functions to understand the usage of the various
-  //     methods of the PropertyNamesIterator interaface.
-public:
-  TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester);
-  // Constructor. To make names iterator from the property set object.
-  
-  ~TAO_PropertyNamesIterator_Tester (void);
-  // Destructor.
-
-  int test_next_one (CORBA::Environment &env);
-  // Test next one method. Iterate thru all the names in the
-  // PropertySet and print them out.
-  
-  int test_reset (CORBA::Environment &env);
-  // Test the reset method.
-  
-  int test_next_n (size_t n, CORBA::Environment &env);
-  // Test the next_n method.
-private:
-  TAO_PropertyNamesIterator iterator_;
-  // Our names iterator.
-};
-
-
-// Constructor.
-TAO_PropertySet_Tester::TAO_PropertySet_Tester (void)
-{
-}
-
-// Destructor.
-TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
-{
-}
-
-// Defines a char, a short, a long, a float and a string.
-int
-TAO_PropertySet_Tester::test_define_property (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking define_property\n"));
-  
-  CORBA::Any anyval;
-  
-  // Prepare a char and "define" that in the PropertySet.
-  CORBA::Char ch = '#';
-  anyval <<= from_char (ch);
-  ch = '*';
-  anyval >>= to_char (ch);
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Char ch = %c\n",
-              ch));
-  property_set_.define_property ("char_property",
-                                 anyval,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a Short and "define" that in the PropertySet.
-  CORBA::Short s = 3;
-  anyval <<= s; 
-  s = 7; 
-  anyval >>= s;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Short s = %d\n",
-              s));
-  property_set_.define_property ("short_property",
-                                 anyval,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  
-  // Prepare a Long and "define" that in the PropertySet.
-  CORBA::Long l = 931232;
-  anyval <<= l;
-  l = 931233;
-  anyval >>= l;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Long l = %d\n",
-              l));
-  CORBA::Any newany(anyval);
-  
-  property_set_.define_property ("long_property",
-                                 anyval,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a Float and "define" that in the PropertySet.
-  CORBA::Float f = 3.14;
-  anyval <<= f;
-  f = 4.14;
-  anyval >>= f;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main : Float f = %f\n",
-              f));
-  property_set_.define_property ("float_property", 
-                                 anyval, 
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Prepare a String and "define" that in the PropertySet.
-  ACE_DEBUG ((LM_DEBUG,
-              "Main: Any holding String\n"));
-  CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
-  anyval <<= strvar.in ();
-  CORBA::String newstr;
-  anyval >>= newstr;
-  ACE_DEBUG ((LM_DEBUG,
-              "Main: String :  %s, From any :  %s\n",
-              strvar.in (),
-              newstr));
-  property_set_.define_property ("string_property",
-                                 anyval,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Testing, get_number_of_properties.
-int
-TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-              "Main : Number of props : %d\n",
-              property_set_.get_number_of_properties (env)));
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Testing the delete_property. Delets property, with the given name,
-// if that exsists.
-int
-TAO_PropertySet_Tester::test_delete_property (const char *property_name,
-                                              CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
-  property_set_.delete_property (property_name,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Gets the value of "short_property" and "string_property".
-
-int
-TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking get_property_value\n"));
-  
-  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property",
-                                                            env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  
-  // Get the short value.
-  if (anyptr != 0)
-    {
-      CORBA::Short s;
-      *anyptr >>= s;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Short %d\n",
-                  s));
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "Short property not found\n"));
-  // Get the string.
-  anyptr = property_set_.get_property_value ("string_property",
-                                             env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  if (anyptr != 0)
-    {
-      CORBA::String str;
-      *anyptr >>= str;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Str %s\n", str));
-    }
-  else 
-    ACE_DEBUG ((LM_DEBUG,
-                "string_property not found\n"));
-  return 0;
-}
-
-// Check the following properties are defined or no. "short_property",
-// "string_property" and "char_property".
-
-int
-TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking is_property_defined ()\n"));
-  if (property_set_.is_property_defined ("short_property",
-                                         env) == CORBA::B_FALSE)
-    ACE_DEBUG ((LM_DEBUG,
-                "short_property not defined\n"));
-  else 
-    ACE_DEBUG ((LM_DEBUG,
-                "short_property defined\n"));
-  TAO_CHECK_ENV_RETURN (env, 1);
-  if (property_set_.is_property_defined ("string_property",
-                                         env) == CORBA::B_FALSE)
-    ACE_DEBUG ((LM_DEBUG,
-                "string_property not defined\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "string_property defined\n"));
-  TAO_CHECK_ENV_RETURN (env, 1);
-  if (property_set_.is_property_defined ("char_property",
-                                         env) == CORBA::B_FALSE)
-    ACE_DEBUG ((LM_DEBUG,
-                "char_property not defined\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "char_property defined\n"));
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Make a sequence of property names and delete them from the
-// PropertySet.  Deleting char, short, long, float and string
-// properties.
-int
-TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking delete_properties == Deleting a sequence of Properties\n"));
-  CosPropertyService::PropertyNames prop_names;
-  prop_names.length (4);
-  prop_names [0] = CORBA::string_dup ("char_property");
-  prop_names [1] = CORBA::string_dup ("short_property");
-  prop_names [2] = CORBA::string_dup ("long_property");
-  prop_names [3] = CORBA::string_dup ("float_property");
-  ACE_DEBUG ((LM_DEBUG,
-              "Length of sequence %d, Maxlength : %d\n",
-              prop_names.length (),
-              prop_names.maximum ()));
-  property_set_.delete_properties (prop_names,
-                                   env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-  
-  return 0;
-}
-
-// Defines a sequnce of properties containing, char, short, long,
-// float and string property in the property set.
-int
-TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &env)
-{  
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking define_properties == Defining sequence of properties\n"));
-  //  TAO_TRY
-  //  {
-  CosPropertyService::Properties nproperties;
-  nproperties.length (5);
-  CORBA::Any anyval;
-  // Prepare a char and "define" that in the PropertySet.
-  CORBA::Char ch = '#';
-  anyval <<= from_char (ch);
-  ch = '*';
-  anyval >>= to_char (ch);  
-  nproperties[0].property_name  = CORBA::string_copy ("char_property");
-  nproperties[0].property_value <<= from_char (ch);
- 
-  // Prepare a Short and "define" that in the PropertySet.
-  CORBA::Short s = 3;
-  anyval <<= s; 
-  s = 7; 
-  anyval >>= s;
-  nproperties[1].property_name  = CORBA::string_copy ("short_property");
-  nproperties[1].property_value <<= s;
-  
-  // Prepare a Long and "define" that in the PropertySet.
-  CORBA::Long l = 931232;
-  anyval <<= l;
-  l = 931233;
-  anyval >>= l;
-  nproperties[2].property_name  = CORBA::string_copy ("long_property");
-  nproperties[2].property_value <<= l;
-  
-  // Prepare a Float and "define" that in the PropertySet.
-  CORBA::Float f = 3.14;
-  anyval <<= f;
-  f = 4.14;
-  anyval >>= f;
-  nproperties[3].property_name  = CORBA::string_copy ("float_property");
-  nproperties[3].property_value <<= f;
-  
-  // Prepare a String and "define" that in the PropertySet.
-  CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
-  anyval <<= strvar.in ();
-  nproperties[4].property_name  = CORBA::string_copy ("string_property");
-  nproperties[4].property_value <<= strvar.in ();
-  
-  // Define this sequence of properties now.
-  property_set_.define_properties (nproperties, env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-
-  return 0;
-}
-
-// Delete all the properties.
-int
-TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &env)
-{
-  // Deleting all the properties 
-  ACE_DEBUG ((LM_DEBUG,
-              "\nChecking delete_all_properties\n"));
-  if (property_set_.delete_all_properties (env) == CORBA::B_TRUE)
-    ACE_DEBUG ((LM_DEBUG,
-                "All properties deleted, I guess\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "delete_all_properties failed\n"));
-  return 0;
-}
-
-// Constructor. To make names iterator from the property set object.
-TAO_PropertyNamesIterator_Tester::TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester)
-  : iterator_ (propertyset_tester.property_set_)
-{
-}  
-
-// Destructor.
-TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
-{
-}
-
-// Test next one method. Iterate thru all the names in the
-// PropertySet and print them out.
-int 
-TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &env)
-{
-  CORBA::String_var strvar;
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
-  // Let us iterate, now.
-  while (iterator_.next_one (strvar.out (), env) != CORBA::B_FALSE)
-    { 
-      TAO_CHECK_ENV_RETURN (env, 1);
-      ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
-    }
-  return 0;
-}
-
-// Reset the names iterator.
-int
-TAO_PropertyNamesIterator_Tester::test_reset (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Resetting (reset ()) the NamesIterator."));
-  iterator_.reset (env);
-  TAO_CHECK_ENV_RETURN (env, 1);
-  return 0;
-}
-
-// Test the next_n method. Get the next n names and print them all.
-int
-TAO_PropertyNamesIterator_Tester::test_next_n (size_t n,
-                                               CORBA::Environment &env)
-{
-  CosPropertyService::PropertyNames_var pnames_var;
-  ACE_DEBUG ((LM_DEBUG,
-              "Checking next_n (), next %d\n", 
-              n));
-  if (iterator_.next_n (n, pnames_var.out (), env) == CORBA::B_FALSE)
-    {
-      // Return if no more items in the iterator.
-      TAO_CHECK_ENV_RETURN (env, 1);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Iterator has no more items\n"));
-      return 0;
-    }
-  TAO_CHECK_ENV_RETURN (env, 1);
-  for (size_t i = 0; i < pnames_var.in ().length (); i++)
-    ACE_DEBUG ((LM_DEBUG,
-                "str %s \n",
-                (const char *) pnames_var[i]));
-  return 0;
-}
-
-int 
-main (int argc, char *argv []) 
-{
-  TAO_TRY
-    {
-      CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
-                                                argv,
-                                                "internet",
-                                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // = Checking PropertySet interface.
-      
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO_PropertySet Testing\n"));
-      TAO_PropertySet_Tester propertyset_tester;
-      
-      // Checking define_property. define a char, a short,a long, a float
-      // and a string.
-      propertyset_tester.test_define_property (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-  
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Test delete_properties. Delete char, short, long and float.
-      propertyset_tester.test_delete_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Define a sequence of properties. char, short, long, float and
-      // string.
-      propertyset_tester.test_define_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Checking get_property_value. get the value of short and string.
-      propertyset_tester.test_get_property_value (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Checking delete_all_properties.
-      propertyset_tester.test_delete_all_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Define a sequence of properties. char, short, long, float and
-      // string.
-      propertyset_tester.test_define_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // = Checking the PropertyNamesIterator interface.
-      
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO_PropertyNamesIterator Testing\n"));
-  
-      // Construct the names iterator from the PropertySet object.
-      TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
-      
-      // Checking next_one. Iterate thru the property names.
-      names_iterator_tester.test_next_one (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Checking the reset () method.
-      names_iterator_tester.test_reset (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-  
-      // Iterating again thru the property names.
-      names_iterator_tester.test_next_one (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Reset again.
-      names_iterator_tester.test_reset (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}  
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
deleted file mode 100644
index 07e3c0b8f2a..00000000000
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ /dev/null
@@ -1,714 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Get_Opt.h"
-
-#include "tao/Timeprobe.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "EC_Multiple.h"
-
-// ************************************************************
-
-EC_Proxy::EC_Proxy (void)
-  :  consumer_ (this),
-     supplier_ (this)
-{
-}
-
-EC_Proxy::~EC_Proxy (void)
-{
-}
-
-int
-EC_Proxy::open (RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                const RtecEventChannelAdmin::ConsumerQOS& subscriptions,
-                const RtecEventChannelAdmin::SupplierQOS& publications,
-                CORBA::Environment &_env)
-{
-  ACE_UNUSED_ARG (_env);
-
-  TAO_TRY
-    {
-      // = Connect as a supplier to the local EC
-      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        local_ec->for_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                    publications,
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        remote_ec->for_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushConsumer_var consumer_ref =
-        this->consumer_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                    subscriptions,
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("EC_Proxy::open");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-EC_Proxy::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier-consumer received disconnect from channel.\n"));
-}
-
-void
-EC_Proxy::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier received disconnect from channel.\n"));
-}
-
-void
-EC_Proxy::push (const RtecEventComm::EventSet &events,
-                CORBA::Environment & _env)
-{
-  // ACE_DEBUG ((LM_DEBUG, "EC_Proxy::push - "));
-
-  if (events.length () == 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-
-  // ACE_DEBUG ((LM_DEBUG, "ECP: %d event(s)\n", events.length ()));
-
-  // @@ TODO, there is an extra data copy here, we should do the event
-  // modification without it and only compact the necessary events.
-  int count = 0;
-  RtecEventComm::EventSet out (events.length ());
-  for (u_int i = 0; i < events.length (); ++i)
-    {
-      if (events[i].ttl_ > 0)
-        {
-          count++;
-          out.length (count);
-          out[count - 1] = events[i];
-          out[count - 1].ttl_--;
-        }
-    }
-
-  if (count > 0)
-    {
-      this->consumer_proxy_->push (out, _env);
-    }
-}
-
-int
-EC_Proxy::shutdown (CORBA::Environment& _env)
-{
-  TAO_TRY
-    {
-      this->consumer_proxy_->disconnect_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Disconnect from the push supplier.
-      this->supplier_proxy_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_RETHROW_RETURN(-1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Test_ECP::Test_ECP (void)
-  : consumer_ (this),
-    supplier_ (this),
-    event_a_ (0),
-    event_b_ (0),
-    event_c_ (0),
-    interval_ (250),
-    message_count_ (100)
-{
-}
-
-int
-Test_ECP::run (int argc, char* argv[])
-{
-  TAO_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (this->parse_args (argc, argv))
-        return 1;
-
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get the Naming Service.\n"),
-                          1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      // Register Event_Service with Naming Service.
-      ACE_EventChannel ec_impl;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-	ec_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-	orb->object_to_string (ec.in (), TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup (this->lcl_ec_name_);
-      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
-      ACE_Time_Value tv (15, 0);
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (orb->run (&tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), 1);
-
-      ACE_DEBUG ((LM_DEBUG, "starting....\n"));
-
-      RtecEventChannelAdmin::EventChannel_var remote_ec =
-        this->get_ec (naming_context.in (),
-                      this->rmt_ec_name_,
-                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
-
-      RtecEventChannelAdmin::EventChannel_var local_ec =
-        this->get_ec (naming_context.in (),
-                      this->lcl_ec_name_,
-                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
-
-      if (this->connect_supplier (local_ec.in (),
-                                  TAO_TRY_ENV) == -1)
-        return 1;
-
-      ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
-
-      if (this->connect_consumer (local_ec.in (),
-                                  TAO_TRY_ENV) == -1)
-        return 1;
-
-      ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
-
-      if (this->connect_ecp (local_ec.in (),
-                             remote_ec.in (),
-                             TAO_TRY_ENV) == -1)
-        return 1;
-
-      ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "running multiple EC test\n"));
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), 1);
-    }
-  TAO_CATCH (CORBA::SystemException, sys_ex)
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-RtecEventChannelAdmin::EventChannel_ptr
-Test_ECP::get_ec (CosNaming::NamingContext_ptr naming_context,
-                  const char* ec_name,
-                  CORBA::Environment &_env)
-{
-  CosNaming::Name channel_name (1);
-  channel_name.length (1);
-  channel_name[0].id = CORBA::string_dup (ec_name);
-
-  CORBA::Object_ptr ec_ptr =
-    naming_context->resolve (channel_name, _env);
-  if (_env.exception () != 0 || CORBA::is_nil (ec_ptr))
-    return RtecEventChannelAdmin::EventChannel::_nil ();
-
-  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr, _env);
-}
-
-int
-Test_ECP::connect_supplier (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                            CORBA::Environment &_env)
-{
-  TAO_TRY
-    {
-      char buf[BUFSIZ];
-      ACE_OS::strcpy (buf, "supplier@");
-      ACE_OS::strcat (buf, this->lcl_ec_name_);
-
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      RtecScheduler::handle_t rt_info =
-        server->create (buf, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      server->set (rt_info,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-                   this->interval_ * 10000, // @@ Make it parametric
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-		   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->supplier_id_ = ACE::crc32 (buf);
-
-      ACE_SupplierQOS_Factory qos;
-      qos.insert (this->supplier_id_,
-		  this->event_a_,
-                  rt_info, 1);
-      qos.insert (this->supplier_id_,
-                  this->event_b_,
-                  rt_info, 1);
-      qos.insert (this->supplier_id_,
-                  ACE_ES_EVENT_SHUTDOWN,
-                  rt_info, 1);
-
-      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        local_ec->for_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushSupplier_var objref =
-        this->supplier_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                    qos.get_SupplierQOS (),
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_RETHROW_RETURN (-1);
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-Test_ECP::connect_consumer (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                            CORBA::Environment &_env)
-{
-  TAO_TRY
-    {
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      char buf[BUFSIZ];
-      ACE_OS::strcpy (buf, "consumer@");
-      ACE_OS::strcat (buf, this->lcl_ec_name_);
-
-      RtecScheduler::handle_t rt_info =
-        server->create (buf, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      server->set (rt_info,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-                   this->interval_ * 10000, // @@ Make it parametric
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-		   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Time_Value tv_timeout (0, this->interval_ * 1000);
-      TimeBase::TimeT timeout;
-      ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
-
-      ACE_ConsumerQOS_Factory qos;
-      qos.start_disjunction_group ();
-      qos.insert_type (ACE_ES_EVENT_SHUTDOWN,
-                       rt_info);
-      qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-                       timeout,
-                       rt_info);
-      qos.insert_type (this->event_a_, rt_info);
-      qos.insert_type (this->event_c_, rt_info);
-
-      // = Connect as a consumer.
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        local_ec->for_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushConsumer_var objref =
-        this->consumer_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                    qos.get_ConsumerQOS (),
-                                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_RETHROW_RETURN (-1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-Test_ECP::connect_ecp (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                       RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                       CORBA::Environment &_env)
-{
-  TAO_TRY
-    {
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      // Generate its ConsumerQOS
-      char rmt[BUFSIZ];
-      ACE_OS::strcpy (rmt, "ecp@");
-      ACE_OS::strcat (rmt, this->rmt_ec_name_);
-
-      RtecScheduler::handle_t rmt_info =
-        server->create (rmt, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      server->set (rmt_info,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-                   this->interval_ * 10000,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-		   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_ConsumerQOS_Factory consumer_qos;
-      consumer_qos.start_disjunction_group ();
-      consumer_qos.insert_type (this->event_a_, rmt_info);
-      consumer_qos.insert_type (this->event_c_, rmt_info);
-      consumer_qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rmt_info);
-
-      // Generate its SupplierQOS
-      char lcl[BUFSIZ];
-      ACE_OS::strcpy (lcl, "ecp@");
-      ACE_OS::strcat (lcl, this->lcl_ec_name_);
-
-      RtecScheduler::handle_t lcl_info =
-        server->create (lcl, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      server->set (lcl_info,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-		   ORBSVCS_Time::zero,
-                   this->interval_ * 10000,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-		   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::ULong supplier_id = ACE::crc32 (lcl);
-
-      ACE_SupplierQOS_Factory supplier_qos;
-      supplier_qos.insert (supplier_id,
-                           this->event_a_,
-                           lcl_info, 1);
-      supplier_qos.insert (supplier_id,
-                           this->event_c_,
-                           lcl_info, 1);
-      supplier_qos.insert (supplier_id,
-			   ACE_ES_EVENT_SHUTDOWN,
-			   lcl_info, 1);
-
-      this->ecp_.open (remote_ec, local_ec,
-                       consumer_qos.get_ConsumerQOS (),
-                       supplier_qos.get_SupplierQOS (),
-                       TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_RETHROW_RETURN (-1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Test_ECP::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier-consumer received disconnect from channel.\n"));
-}
-
-void
-Test_ECP::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier received disconnect from channel.\n"));
-}
-
-void
-Test_ECP::push (const RtecEventComm::EventSet &events,
-                CORBA::Environment & _env)
-{
-  // ACE_DEBUG ((LM_DEBUG, "EC_Proxy::push - "));
-
-  if (events.length () == 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-
-  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
-
-  for (u_int i = 0; i < events.length (); ++i)
-    {
-      const RtecEventComm::Event& e = events[i];
-      if (e.type_ == ACE_ES_EVENT_INTERVAL_TIMEOUT)
-        {
-	  this->message_count_--;
-
-          RtecEventComm::EventSet sent (1);
-	  sent.length (1);
-
-	  RtecEventComm::Event& s = sent[0];
-	  s.source_ = this->supplier_id_;
-	  s.ttl_ = 1;
-
-	  ACE_hrtime_t t = ACE_OS::gethrtime ();
-	  ORBSVCS_Time::hrtime_to_TimeT (s.creation_time_, t);
-	  s.ec_recv_time_ = ORBSVCS_Time::zero;
-	  s.ec_send_time_ = ORBSVCS_Time::zero;
-
-	  s.data_.x = 0;
-	  s.data_.y = 0;
-
-	  if (this->message_count_ == 0)
-	    {
-	      s.type_ = ACE_ES_EVENT_SHUTDOWN;
-	    }
-	  else if (this->message_count_ % 2 == 0)
-	    {
-	      // Generate an A event...
-	      s.type_ = this->event_a_;
-	    }
-	  else
-	    {
-	      s.type_ = this->event_b_;
-	    }
-
-	  this->consumer_proxy_->push (sent, _env);
-          //ACE_DEBUG ((LM_DEBUG, "Sent %d events\n", n));
-        }
-      else if (e.type_ == ACE_ES_EVENT_SHUTDOWN)
-        {
-          this->shutdown (_env);
-        }
-      else
-        {
-          // Print out the events received...
-          // ACE_DEBUG ((LM_DEBUG, "Received event %d from %04.4x\n",
-	  // e.type_, e.source_));
-
-	  // @@ TODO Keep statistics....
-	  ACE_hrtime_t r = ACE_OS::gethrtime ();
-	  ACE_hrtime_t s;
-	  ORBSVCS_Time::TimeT_to_hrtime (s, e.creation_time_);
-	  int nsec = r - s;
-	  ACE_DEBUG ((LM_DEBUG, "Latency[%d]: %d (from %d)\n",
-		      this->supplier_id_, nsec, e.source_));
-        }
-    }
-}
-
-int
-Test_ECP::shutdown (CORBA::Environment& _env)
-{
-  this->consumer_proxy_->disconnect_push_consumer (_env);
-  if (_env.exception () != 0) return -1;
-
-  this->supplier_proxy_->disconnect_push_supplier (_env);
-  if (_env.exception () != 0) return -1;
-
-  this->ecp_.shutdown (_env);
-  if (_env.exception () != 0) return -1;
-
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-  return 0;
-}
-
-int
-Test_ECP::parse_args (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "l:r:a:b:c:t:m:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-        {
-        case 'l':
-          this->lcl_ec_name_ = get_opt.optarg;
-          break;
-        case 'r':
-          this->rmt_ec_name_ = get_opt.optarg;
-          break;
-        case 'a':
-          this->event_a_ =
-	    ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'b':
-          this->event_b_ =
-	    ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'c':
-          this->event_c_ =
-	    ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 't':
-          this->interval_ = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'm':
-          this->message_count_ = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case '?':
-        default:
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "-l local_ec_name "
-                      "-r remote_ec_name "
-                      "<-a event_type_a> "
-                      "<-b event_type_b> "
-                      "<-c event_type_c> "
-                      "-t event_interval "
-                      "-m message_count "
-                      "\n",
-                      argv[0]));
-          return -1;
-        }
-    }
-
-  if (this->event_a_ <= 0
-      || this->event_b_ <= 0
-      || this->event_c_ <= 0 )
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s: you must specify the event types\n",
-                  argv[0]));
-      return -1;
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-int
-main (int argc, char *argv [])
-{
-  Test_ECP test;
-  return test.run (argc, argv);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_PushConsumer_Adapter<Test_ECP>;
-template class ACE_PushSupplier_Adapter<Test_ECP>;
-template class ACE_PushConsumer_Adapter<EC_Proxy>;
-template class ACE_PushSupplier_Adapter<EC_Proxy>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_PushConsumer_Adapter<Test_ECP>
-#pragma instantiate ACE_PushSupplier_Adapter<Test_ECP>
-#pragma instantiate ACE_PushConsumer_Adapter<EC_Proxy>
-#pragma instantiate ACE_PushSupplier_Adapter<EC_Proxy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
deleted file mode 100644
index de3a58139ef..00000000000
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = DESCRIPTION
-//   This test attempts to communicate several Event Channels.
-//   The test hardcodes all the objects involved (consumers,
-//   suppliers, proxies, etc.); the objective is to gain understanding
-//   on the architecture needed to exploit locality in the Event
-//   cycle, not to provide a definite solution.
-//
-// ============================================================================
-
-#if !defined (EC_MULTIPLE_H)
-#define EC_MULTIPLE_H
-
-#include "ace/SString.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients_T.h"
-
-
-class EC_Proxy
-// = TITLE
-//   Event Channel Proxy.
-//
-// = DESCRIPTION
-//   This class mediates among two event channels, it connects as a
-//   consumer of events with a remote event channel, and as a supplier
-//   of events with the local EC.
-//   As a consumer it gives a QoS designed to only accept the events
-//   in which *local* consumers are interested.
-//   Eventually the local EC should create this object and compute its
-//   QoS in an automated manner; but this requires some way to filter
-//   out the peers registered as consumers, otherwise we will get
-//   loops in the QoS graph.
-//   It uses exactly the same set of events in the publications list
-//   when connected as a supplier.
-//
-// = NOTES
-//   An alternative implementation would be to register with the
-//   remote EC as a supplier, and then filter on the remote EC, but
-//   one of the objectives is to minimize network traffic.
-//   On the other hand the events will be pushed to remote consumers,
-//   event though they will be dropped upon receipt (due to the TTL
-//   field); IMHO this is another suggestion that the EC needs to know
-//   (somehow) which consumers are truly its peers in disguise.
-//
-// = ALTERNATIVES
-//   Check http://www.cs.wustl.edu/~coryan/Multiple_EC.html for a
-//   discussion on that topic.
-//
-{
-public:
-  EC_Proxy (void);
-  ~EC_Proxy (void);
-
-  int open (RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-	    RtecEventChannelAdmin::EventChannel_ptr local_ec,
-	    const RtecEventChannelAdmin::ConsumerQOS& subscriptions,
-	    const RtecEventChannelAdmin::SupplierQOS& publications,
-	    CORBA::Environment &_env);
-  // Establish the connections.
-  
-  void disconnect_push_supplier (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-  // This is the Consumer side behavior, it pushes the events to the
-  // local event channel.
-
-  int shutdown (CORBA::Environment&);
-
-private:
-  ACE_PushConsumer_Adapter<EC_Proxy> consumer_;
-  // Our consumer personality....
-
-  ACE_PushSupplier_Adapter<EC_Proxy> supplier_;
-  // Our supplier personality....
-
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // We talk to the EC (as a supplier) using this proxy.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // We talk to the EC (as a consumer) using this proxy.
-};
-
-class Test_ECP
-//
-// = TITLE
-//   A simple test for the EC_Proxy class.
-//
-// = DESCRIPTION
-//   This class is design to exercise several features of the EC_Proxy
-//   class and the multiple EC architecture.
-//   We want to create two EC, each one having a single supplier and a
-//   single consumer.
-//    + To test the remote facilities the consumer register for both a
-//    local event and a remote one.
-//    + To test the remote filtering features the remote consumer only
-//    wants one of the local events, and this event is generated less
-//    frequently.
-//
-//   This class creates the local ECP a consumer and a supplier, it
-//   uses the command line to figure the 
-//
-{
-public:
-  Test_ECP (void);
-
-  int run (int argc, char* argv[]);
-  // Execute the test.
-
-  void disconnect_push_supplier (CORBA::Environment &);
-  void disconnect_push_consumer (CORBA::Environment &);
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-  // Implement the consumer and supplier upcalls.
-
-
-private:
-  int parse_args (int argc, char* argv[]);
-
-  RtecEventChannelAdmin::EventChannel_ptr
-    get_ec (CosNaming::NamingContext_ptr naming_context,
-	    const char* ec_name,
-	    CORBA::Environment &_env);
-
-  int connect_supplier (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			CORBA::Environment &_env);
-  int connect_consumer (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-			CORBA::Environment &_env);
-  int connect_ecp (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-		   RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-		   CORBA::Environment &_env);
-
-  int shutdown (CORBA::Environment&);
-
-private:
-  ACE_PushConsumer_Adapter<Test_ECP> consumer_; 
-  // Our consumer personality....
-
-  ACE_PushSupplier_Adapter<Test_ECP> supplier_;
-  // Our supplier personality....
-
-  EC_Proxy ecp_;
-  // The proxy used to connect both event channels.
-
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; 
-  // We talk to the EC (as a supplier) using this proxy.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // We talk to the EC (as a consumer) using this proxy.
-
-  RtecEventComm::EventSourceID supplier_id_;
-  // Our ID as a supplier.
-
-  char* rmt_ec_name_;
-  // The name of the "remote" EC.
-
-  char* lcl_ec_name_;
-  // The name of the "local" EC.
-  
-  int event_a_;
-  int event_b_;
-  int event_c_;
-  // We generate events <a> and <b> and receive events <a> and <c>,
-  // this allows for a lot of configurations (making a == c or
-  // different, etc.)
-
-  int interval_;
-  // The interval between the messages.
-
-  int message_count_;
-  // How many messages will we send...
-};
-
-
-#endif /* EC_MULTIPLE_H */
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
deleted file mode 100644
index b112de5963b..00000000000
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-
-BIN = EC_Multiple
-
-BUILD = $(BIN)
-
-EC_MULTIPLE_SRCS= \
-	EC_Multiple.cpp
-
-LSRC= \
-	$(EC_MULTIPLE_SRCS) \
-
-EC_MULTIPLE_OBJS = $(EC_MULTIPLE_SRCS:.cpp=.o)
-
-LDLIBS= -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifdef quantify
-  CCFLAGS += -Dquantify
-  CPPFLAGS += -I/pkg/purify/quantify-2.1-solaris2
-endif # quantify
-
-#### Local rules and variables...
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# Leave the scheduler output out if this is a config run.
-ifeq ($(runtime),1)
-EC_MULTIPLE_CONFIG_OBJS=EC_Multiple_Scheduler_Runtime.o
-endif # runtime
-
-ifeq ($(probe),1)
-    CCFLAGS += -DACE_ENABLE_TIMEPROBES
-endif # probe
-
-EC_Multiple: $(addprefix $(VDIR),$(EC_MULTIPLE_OBJS) $(EC_MULTIPLE_CONFIG_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/EC_Multiple/README b/TAO/orbsvcs/tests/EC_Multiple/README
deleted file mode 100644
index c0c8d301852..00000000000
--- a/TAO/orbsvcs/tests/EC_Multiple/README
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-	This test ilustrates how to connect multiple ECs.
-
-	The test requires the several other processes are running, the
-user must remember to assign a different port to each one:
-
-$ Naming_Service
-$ Scheduling_Service -ORBport 10030
-
-	then we run two instances of the test, configuring the events
-that are local, only remote, remote and local:
-
-$ EC_Multiple -ORBport 10060 -l EC1 -r EC2 -a 1 -b 2 -c 3
-$ EC_Multiple -ORBport 10070 -l EC2 -r EC1 -a 4 -b 3 -c 2
-
-	In this examples the first test treats EC1 as a local EC, and
-EC2 as remote, it generates events <1> and <2> and listens to events
-<1> and <3>.  The second instance treats EC2 as local an EC1 as
-remote, generates events <4> and <3> but listens to <4> and <2>.
-
-	Note how this configuration will have pure local events, some
-events that are both local and remote.  Right now you have to examine
-the output carefully to notice what is happening.
-
-	Another configuration of interest is:
-
-$ EC_Multiple -ORBport 10060 -l EC1 -r EC2 -a 1 -b 2 -c 2
-$ EC_Multiple -ORBport 10070 -l EC2 -r EC1 -a 4 -b 2 -c 2
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
deleted file mode 100644
index 9644c6cfe7c..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ /dev/null
@@ -1,930 +0,0 @@
-// $Id$
-
-#include <limits.h>
-#if defined (quantify)
-  #include <quantify.h>
-#endif /* quantify */
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/Profile_Timer.h"
-
-#include "tao/Timeprobe.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "Event_Latency.h"
-
-static const char usage [] = "[-? |\n"
-"            [-c <consumers> [4]]\n"
-"            [-d directly connect all consumers/suppliers\n"
-"            [-j to collect jitter statistics]\n"
-"            [-m <count> of messages to send [10]]\n"
-"            [-s <suppliers>, [1]]\n"
-"            [-t <timeout interval>, msec [250]]]";
-
-// Configuration parameters.
-static u_int consumers = 1;
-static u_int suppliers = 1;
-static u_int total_messages = 10;
-static int measure_jitter = 0;
-static u_int timeout_interval = 250; // msec
-
-static int short_circuit_EC = 0;
-static int shutting_down = 0;
-
-// This is global to allow the Supplier to short ciruit the EC
-// and talk directly to consumers.  For testing only :-)
-static Latency_Consumer **consumer;
-
-// ************************************************************
-
-Latency_Consumer::Latency_Consumer (const int measure_jitter)
-  : measure_jitter_ (measure_jitter),
-    min_latency_ (INT_MAX),
-    max_latency_ (INT_MIN),
-    total_latency_ (0),
-    total_pushes_ (0),
-    min_to_ec_ (INT_MAX),
-    max_to_ec_ (INT_MIN),
-    sum_to_ec_ (0),
-    min_in_ec_ (INT_MAX),
-    max_in_ec_ (INT_MIN),
-    sum_in_ec_ (0),
-    min_from_ec_ (INT_MAX),
-    max_from_ec_ (INT_MIN),
-    sum_from_ec_ (0)
-{
-}
-
-int
-Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                 const char *my_name)
-{
-  entry_point (my_name);
-  TAO_TRY
-    {
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      rt_info_ =
-        server->create (my_name, TAO_TRY_ENV);
-      server->set (rt_info_,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   0,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-
-      // Create the event that we're registering for.
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert_type (ACE_ES_EVENT_NOTIFICATION, rt_info_);
-      dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      this->channel_admin_ = ec;
-
-      // = Connect as a consumer.
-      this->consumer_admin_ =
-        channel_admin_->for_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushConsumer_var objref =
-        this->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Consumer::open: "
-                         "subscribe failed.\n"), -1);
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Consumer::open: "
-                         "unexpected exception.\n"), -1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
-}
-
-void
-Latency_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &)
-{
-  // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
-  ACE_TIMEPROBE ("push event to consumer");
-
-  if (events.length () == 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
-
-#if defined (quantify)
-  // If measuring jitter, just Quantify the supplier-consumer path.
-  if (measure_jitter)
-    {
-      quantify_stop_recording_data ();
-    }
-#endif /* quantify */
-
-  for (CORBA::ULong i = 0; i < events.length (); ++i)
-    {
-      if (events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Latency Consumer: received shutdown event\n"));
-          this->shutdown ();
-        }
-      else
-        {
-          if (measure_jitter_)
-            {
-              ACE_hrtime_t creation;
-              ORBSVCS_Time::TimeT_to_hrtime (creation,
-                                             events[i].creation_time_);
-
-              ACE_hrtime_t ec_recv;
-              ORBSVCS_Time::TimeT_to_hrtime (ec_recv,
-                                             events[i].ec_recv_time_);
-
-              ACE_hrtime_t ec_send;
-              ORBSVCS_Time::TimeT_to_hrtime (ec_send,
-                                             events[i].ec_send_time_);
-
-              const ACE_hrtime_t now = ACE_OS::gethrtime ();
-              const ACE_hrtime_t elapsed = now - creation;
-              // Note: the division by 1 provides transparent support of
-              // ACE_U_LongLong.
-              ACE_Time_Value latency (elapsed / ACE_ONE_SECOND_IN_NSECS,
-                                      (elapsed / 1 % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-              const ACE_hrtime_t to_ec_nsecs = ec_recv - creation;
-              ACE_Time_Value to_ec (to_ec_nsecs / ACE_ONE_SECOND_IN_NSECS,
-                                    (to_ec_nsecs / 1 % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-              const ACE_hrtime_t in_ec_nsecs = ec_send - ec_recv;
-              ACE_Time_Value in_ec (in_ec_nsecs / ACE_ONE_SECOND_IN_NSECS,
-                                    (in_ec_nsecs / 1 % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-              const ACE_hrtime_t from_ec_nsecs = now - ec_send;
-              ACE_Time_Value from_ec (from_ec_nsecs / ACE_ONE_SECOND_IN_NSECS,
-                                      (from_ec_nsecs / 1 % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-              if (! shutting_down)
-                {
-                  ++total_pushes_;
-                  if (min_latency_ > latency) min_latency_ = latency;
-                  if (max_latency_ < latency) max_latency_ = latency;
-                  total_latency_ += latency;
-                  if (min_to_ec_ > to_ec) min_to_ec_ = to_ec;
-                  if (max_to_ec_ < to_ec) max_to_ec_ = to_ec;
-                  sum_to_ec_ += to_ec;
-                  if (min_in_ec_ > in_ec) min_in_ec_ = in_ec;
-                  if (max_in_ec_ < in_ec) max_in_ec_ = in_ec;
-                  sum_in_ec_ += in_ec;
-                  if (min_from_ec_ > from_ec) min_from_ec_ = from_ec;
-                  if (max_from_ec_ < from_ec) max_from_ec_ = from_ec;
-                  sum_from_ec_ += from_ec;
-                }
-            }
-        }
-
-    }
-}
-
-void
-Latency_Consumer::shutdown (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %s shutting down.\n", entry_point ()));
-
-  TAO_TRY
-    {
-      // Disconnect from the push supplier.
-      this->suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "(%t) %s Latency_Consumer::shutdown: unexpected exception.\n",
-                  entry_point ()));
-    }
-  TAO_ENDTRY;
-}
-
-
-void
-Latency_Consumer::print_stats () /* const */
-{
-  if (measure_jitter_)
-    {
-      double lat_min =
-        (min_latency_.sec () * 1000000.0 + min_latency_.usec ()) / 1000.0;
-      double lat_max =
-        (max_latency_.sec () * 1000000.0 + max_latency_.usec ()) / 1000.0;
-      double lat_avg =
-        (total_latency_.sec () * 1000000.0 +total_latency_.usec ()) / total_pushes_ / 1000.0;
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: Latency in msec (min/max/avg): "
-                    "%5.3f/%5.3f/%5.3f\n",
-                  entry_point (), lat_min, lat_max, lat_avg));
-
-      double to_ec_min =
-        (min_to_ec_.sec () * 1000000.0 + min_to_ec_.usec ()) / 1000.0;
-      double to_ec_max =
-        (max_to_ec_.sec () * 1000000.0 + max_to_ec_.usec ()) / 1000.0;
-      double to_ec_avg =
-        (sum_to_ec_.sec () * 1000000.0 + sum_to_ec_.usec ()) / total_pushes_ / 1000.0;
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: From test to EC (min/max/avg): "
-                  "%5.3f/%5.3f/%5.3f\n",
-                  entry_point (), to_ec_min, to_ec_max, to_ec_avg));
-
-      double in_ec_min =
-        (min_in_ec_.sec () * 1000000.0 + min_in_ec_.usec ()) / 1000.0;
-      double in_ec_max =
-        (max_in_ec_.sec () * 1000000.0 + max_in_ec_.usec ()) / 1000.0;
-      double in_ec_avg =
-        (sum_in_ec_.sec () * 1000000.0 + sum_in_ec_.usec ()) / total_pushes_ / 1000.0;
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: In the EC (min/max/avg): "
-                  "%5.3f/%5.3f/%5.3f\n",
-                  entry_point (), in_ec_min, in_ec_max, in_ec_avg));
-
-      double from_ec_min =
-        (min_from_ec_.sec () * 1000000.0 + min_from_ec_.usec ()) / 1000.0;
-      double from_ec_max =
-        (max_from_ec_.sec () * 1000000.0 + max_from_ec_.usec ()) / 1000.0;
-      double from_ec_avg =
-        (sum_from_ec_.sec () * 1000000.0 + sum_from_ec_.usec ()) / total_pushes_ / 1000.0;
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: From EC to test (min/max/avg): "
-                  "%5.3f/%5.3f/%5.3f\n",
-                  entry_point (), from_ec_min, from_ec_max, from_ec_avg));
-
-    }
-}
-
-
-// ************************************************************
-
-Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
-  :  impl_ (impl)
-{
-}
-
-void Latency_Supplier::Supplier::disconnect_push_supplier
-  (CORBA::Environment &_env)
-{
-  this->impl_->disconnect_push_supplier (_env);
-}
-
-Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
-  :  impl_ (impl)
-{
-}
-
-void Latency_Supplier::Consumer::disconnect_push_consumer
-  (CORBA::Environment &_env)
-{
-  this->impl_->disconnect_push_consumer (_env);
-}
-
-void Latency_Supplier::Consumer::push
-  (const RtecEventComm::EventSet &events,
-   CORBA::Environment &_env)
-{
-  this->impl_->push (events, _env);
-}
-
-// ************************************************************
-
-Latency_Supplier::Latency_Supplier (const u_int total_messages,
-                                    CORBA::Long supplier_id,
-                                    const int timestamp)
-  : total_messages_ (total_messages),
-    supplier_id_ (supplier_id),
-    timestamp_ (timestamp),
-    total_sent_ (0),
-    master_ (0),
-    supplier_ (new Supplier (this)),
-    consumer_ (new Consumer (this))
-{
-}
-
-Latency_Supplier::~Latency_Supplier (void)
-{
-  delete this->consumer_;
-  delete this->supplier_;
-}
-
-int
-Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                 const char *name, int master)
-{
-  this->entry_point (name);
-  master_ = master;
-  TAO_TRY
-    {
-      this->channel_admin_ = ec;
-
-      RtecScheduler::Scheduler_ptr server =
-        ACE_Scheduler_Factory::server ();
-
-      this->rt_info_ =
-        server->create (name, TAO_TRY_ENV);
-
-      server->set (rt_info_,
-                   RtecScheduler::VERY_HIGH_CRITICALITY,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   ORBSVCS_Time::zero,
-                   timeout_interval * 10000,
-                   RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero,
-                   1,
-                   RtecScheduler::OPERATION,
-                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_SupplierQOS_Factory publications;
-      publications.insert (supplier_id_,
-                           ACE_ES_EVENT_NOTIFICATION,
-                           rt_info_, 1);
-      publications.insert (supplier_id_,
-                           ACE_ES_EVENT_SHUTDOWN,
-                           rt_info_, 1);
-
-      // = Connect as a supplier.
-      this->supplier_admin_ =
-        channel_admin_->for_suppliers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->consumers_ =
-        supplier_admin_->obtain_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushSupplier_var objref =
-        this->supplier_->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      consumers_->connect_push_supplier (objref.in (),
-                                         publications.get_SupplierQOS (),
-                                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Latency_Supplier::open");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Latency_Supplier::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier-consumer received disconnect from channel.\n"));
-}
-
-void
-Latency_Supplier::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier received disconnect from channel.\n"));
-}
-
-int
-Latency_Supplier::start_generating_events (void)
-{
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_start_time_.set (now / 1000000000, (now / 1 % 1000000000) / 1000);
-
-  TAO_TRY
-    {
-      ACE_Time_Value tv_timeout (0, timeout_interval * 1000);
-      TimeBase::TimeT timeout;
-      ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "start generating events: "
-                  "timeout.low = %d "
-                  "timeout.high = %d "
-                  "interval = %d "
-                  "tv.msec () = %d\n",
-                  timeout.low,
-                  timeout.high,
-                  timeout_interval,
-                  tv_timeout.msec ()));
-
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-                                timeout,
-                                rt_info_);
-      if (!master_)
-        dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      // = Connect as a consumer.
-      consumer_admin_ =
-        channel_admin_->for_consumers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      suppliers_ =
-        consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventComm::PushConsumer_var objref =
-        this->consumer_->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Supplier::generate_events:"
-                         " unexpected exception.\n"), -1);
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-void
-Latency_Supplier::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment & _env)
-{
-  // ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - "));
-  ACE_UNUSED_ARG (_env);
-
-  if (events.length () == 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-
-  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
-
-  for (CORBA::ULong i = 0; i < events.length (); ++i)
-    {
-      if (!master_ && events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Latency Supplier: received shutdown event\n"));
-          this->shutdown ();
-        }
-      else if (events[i].type_ == ACE_ES_EVENT_INTERVAL_TIMEOUT)
-        {
-          // Create the event to send.
-          RtecEventComm::Event event;
-          event.source_ = supplier_id_;
-          event.type_ = ACE_ES_EVENT_NOTIFICATION;
-          ++total_sent_;
-
-          if (timestamp_)
-            {
-              // @@ David, event.time_ is now a long.  I'm not sure if
-              // this calculation is correct now. For the moment beign
-              // I use a global variable instead.
-              // const ACE_hrtime_t now = ACE_OS::gethrtime ();
-              // event.time_.set (now / ACE_ONE_SECOND_IN_NSECS,
-              // (now % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-              ACE_hrtime_t t = ACE_OS::gethrtime ();
-              ORBSVCS_Time::hrtime_to_TimeT (event.creation_time_, t);
-            }
-
-          // @@ ACE_TIMEPROBE_RESET;
-          // @@ ACE_TIMEPROBE ("start with new event in Supplier");
-
-          TAO_TRY
-            {
-              if (short_circuit_EC)
-                {
-                  for (u_int cons = 0; cons < consumers; ++cons)
-                    {
-                      // This constructor is fast.
-                      const RtecEventComm::EventSet es (1, 1, &event);
-                      consumer [cons]->push (es, TAO_TRY_ENV);
-                    }
-                }
-              else
-                {
-#if defined (quantify)
-                  // If measuring jitter, just Quantify the supplier-consumer path.
-                  if (measure_jitter)
-                    {
-                      quantify_start_recording_data ();
-                    }
-#endif /* quantify */
-
-                  ACE_TIMEPROBE ("  supplier starts pushing event");
-
-                  RtecEventComm::EventSet events (1);
-                  events.length (1);
-                  events[0] = event;
-                  consumers_->push (events, TAO_TRY_ENV);
-
-                  ACE_TIMEPROBE ("  supplier ends pushing event");
-                }
-              TAO_CHECK_ENV;
-            }
-          TAO_CATCHANY
-            {
-              ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::push:"
-                          " unexpected exception.\n",
-                          entry_point ()));
-            }
-          TAO_ENDTRY;
-
-          // Check if we're done.
-          if (master_ && (total_sent_ >= total_messages_))
-            this->shutdown ();
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "(%t) %s received unexpected events: ",
-                      entry_point ()));
-          // ::dump_sequence (events);
-          return;
-        }
-    }
-}
-
-void
-Latency_Supplier::shutdown (void)
-{
-  shutting_down = 1;
-
-  #if defined (quantify)
-    // Need to stop recording here even if testing for jitter, because
-    // recording is still probably enabled.
-    quantify_stop_recording_data ();
-    if (! measure_jitter)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) stopped Quantify recording\n"));
-      }
-  #endif /* quantify */
-
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_stop_time_.set (now / ACE_ONE_SECOND_IN_NSECS,
-                       (now / 1 % ACE_ONE_SECOND_IN_NSECS) / 1000);
-
-  static int total_iterations = 1;
-  if (--total_iterations > 0)
-    {
-      total_sent_ = 0;
-      return;
-    }
-
-  TAO_TRY
-    {
-      if (master_)
-        {
-          // Create the shutdown message.
-          RtecEventComm::Event event;
-          event.source_ = supplier_id_;
-          event.type_ = ACE_ES_EVENT_SHUTDOWN;
-
-          // Push the shutdown event.
-          RtecEventComm::EventSet events (1);
-          events.length (1);
-          events[0] = event;
-          consumers_->push (events, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-
-      // Disconnect from the channel.
-      consumers_->disconnect_push_consumer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (master_)
-        {
-          // @@ TODO: Do this portably (keeping the ORB_ptr returned from
-          // ORB_init)
-          channel_admin_->destroy (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          TAO_ORB_Core_instance ()->orb ()->shutdown ();
-        }
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::shutdown:"
-                  " unexpected exception.\n",
-                  entry_point ()));
-      TAO_TRY_ENV.print_exception ("Latency_Supplier::shutdown");
-    }
-  TAO_ENDTRY;
-}
-
-
-void
-Latency_Supplier::print_stats () /* const */
-{
-  ACE_Time_Value test_elapsed_time (test_stop_time_ - test_start_time_);
-  const u_int elapsed = test_elapsed_time.sec () * 1000000 +
-                        test_elapsed_time.usec ();  // usec
-
-  ACE_DEBUG ((LM_TRACE,
-              "%s: delivered %u events to %u consumer(s) in %u msec;\n"
-                "        per-event average was %8.3f msec.\n",
-              entry_point (),
-              total_sent_,
-              consumers / suppliers + consumers % suppliers,
-              elapsed / 1000,
-              (double) elapsed / total_sent_ / 1000.0));
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// function get_options
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-static
-unsigned int
-get_options (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?");
-  int opt;
-  int temp;
-
-  while ((opt = get_opt ()) != EOF)
-  {
-    switch (opt) {
-    case 'c':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          consumers = (u_int) temp;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: number of consumers must be > 0",
-                             argv[0]), 1);
-        }
-      break;
-    case 'd':
-      short_circuit_EC = 1;
-      break;
-    case 'j':
-      measure_jitter = 1;
-      break;
-    case 'm':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          total_messages = (u_int) temp;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: count must be > 0",
-                             argv[0]), 1);
-        }
-      break;
-    case 's':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          suppliers = (u_int) temp;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: number of suppliers must be > 0",
-                             argv[0]), 1);
-        }
-      break;
-    case 't':
-      if (ACE_OS::atoi (get_opt.optarg) >= 0)
-        {
-          timeout_interval = ACE_OS::atoi (get_opt.optarg);
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s: timeout must be >= 0",
-                             argv[0]), 1);
-        }
-      break;
-    case '?':
-      ACE_DEBUG ((LM_DEBUG,
-                  "Usage: %s %s\n",
-                  argv[0], usage));
-      ACE_OS::exit (0);
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%s: unknown arg, -%c\n"
-                         "Usage: %s %s\n",
-                         argv[0], char(opt),
-                         argv[0], usage), 1);
-    }
-  }
-
-  if (argc != get_opt.optind)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%s: too many arguments\n"
-                         "Usage: %s %s\n",
-                         argv[0], argv[0], usage), 1);
-    }
-
-  return 0;
-}
-
-//
-// function main
-//
-int
-main (int argc, char *argv [])
-{
-  if (ACE_OS::sched_params (
-        ACE_Sched_Params (
-          ACE_SCHED_FIFO,
-          ACE_Sched_Params::priority_min (ACE_SCHED_FIFO),
-          ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_MAX, "Latency: user is not superuser, "
-                              "so remain in time-sharing class\n"));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_ERROR, "%p\n", "Latency"));
-        }
-    }
-
-  u_int i;
-
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get the Naming Service.\n"),
-                          1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      if (get_options (argc, argv))
-        ACE_OS::exit (-1);
-
-      // Allocate the timeprobe instance now, so we don't measure
-      // the cost of doing it later.
-      ACE_TIMEPROBE_RESET;
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup ("EventService");
-
-      CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Create supplier(s).
-      Latency_Supplier **supplier;
-      ACE_NEW_RETURN (supplier, Latency_Supplier *[suppliers], -1);
-      for (i = 0; i < suppliers; ++i)
-        {
-          int supplier_timestamps = (i==0);
-          ACE_NEW_RETURN (supplier [i],
-                          Latency_Supplier (total_messages,
-                                            measure_jitter,
-                                            supplier_timestamps),
-                          -1);
-          char supplier_name [BUFSIZ];
-          sprintf (supplier_name, "supplier-%d", i+1);
-          // Only the first supplier timestamps its messages.
-          int master = (i==0);
-          if (supplier [i]->open_supplier (ec.ptr (),
-                                           supplier_name,
-                                           master) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "Supplier open failed.\n"), -1);
-        }
-
-      // Create consumers.
-      ACE_NEW_RETURN (consumer, Latency_Consumer *[consumers], -1);
-      for (i = 0; i < consumers; ++i)
-        {
-          ACE_NEW_RETURN (consumer [i], Latency_Consumer (measure_jitter), -1);
-          char buf [BUFSIZ];
-          sprintf (buf, "consumer-%d", i+1);
-
-          if (consumer [i]->open_consumer (ec.ptr (), buf) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "Someone was feeling introverted.\n"),
-                              -1);
-        }
-
-  #if defined (quantify)
-      if (! measure_jitter)
-        {
-          ACE_DEBUG ((LM_DEBUG, "(%t) start Quantify recording\n"));
-          quantify_start_recording_data ();
-        }
-  #endif /* quantify */
-
-      // Tell supplier(s) to generate events.
-      for (i = 0; i < suppliers; ++i)
-        {
-          if (supplier [i]->start_generating_events () == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "generate_events failed.\n"), -1);
-        }
-
-      orb->run ();
-
-      for (i = 0; i < suppliers; ++i)
-        {
-          supplier [i]->print_stats ();
-          delete supplier[i];
-          TAO_CHECK_ENV;
-        }
-      delete [] supplier;
-
-      for (i = 0; i < consumers; ++i)
-        {
-          consumer [i]->print_stats ();
-          delete consumer [i];
-          TAO_CHECK_ENV;
-        }
-      delete [] consumer;
-
-      ACE_TIMEPROBE_PRINT;
-      ACE_TIMEPROBE_FINI;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
deleted file mode 100644
index 4c6e04cfa4f..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Event_Latency" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Event_Latency - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Latency.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Latency.mak" CFG="Event_Latency - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Event_Latency - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Latency - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Event_Latency - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "Event_Latency - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /I "..\..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Event_Latency - Win32 Release"

-# Name "Event_Latency - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event_Latency.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event_Latency.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsw b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsw
deleted file mode 100644
index 97233be6dbc..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Event_Latency"=.\Event_Latency.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
deleted file mode 100644
index 45efe67da1c..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ACE Event Service Benchmarks
-// 
-// = FILENAME
-//    Latency.h
-//
-// = AUTHOR
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//
-// ============================================================================
-
-#if !defined (EVENT_LATENCY_H)
-#define EVENT_LATENCY_H
-
-#include "ace/SString.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-
-class Latency_Consumer : public POA_RtecEventComm::PushConsumer
-// = TITLE
-//    Latency Consumer
-//
-// = DESCRIPTION
-//    Simple example of a consumer that registers for supplier
-//    notifications.
-{
-public:
-  Latency_Consumer (const int measure_jitter = 0);
-  // Construction.  The default of not measuring jitter provides
-  // a "null" push routine, for measuring aggregate timing.
-
-  int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void entry_point (const char*);
-  const char *entry_point () const;
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-// (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
-
-protected:
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var suppliers_;
-
-private:
-  RtecScheduler::handle_t rt_info_;
-
-  int measure_jitter_;
-
-  ACE_Time_Value min_latency_;
-  ACE_Time_Value max_latency_;
-  ACE_Time_Value total_latency_;
-  u_long total_pushes_;
-  // Registers and counters for keeping track of latency statistics.
-
-  ACE_Time_Value min_to_ec_;
-  ACE_Time_Value max_to_ec_;
-  ACE_Time_Value sum_to_ec_;
-  // Statitics on time to get to the EC.
-
-  ACE_Time_Value min_in_ec_;
-  ACE_Time_Value max_in_ec_;
-  ACE_Time_Value sum_in_ec_;
-  // Statitics on time spent in the EC.
-
-  ACE_Time_Value min_from_ec_;
-  ACE_Time_Value max_from_ec_;
-  ACE_Time_Value sum_from_ec_;
-  // Statitics on time spent since the EC put the event on the wire
-  // and it gets here.
-
-  ACE_CString entry_point_;
-};
-
-// ************************************************************
-
-class Latency_Supplier
-// = TITLE
-//    Latency Supplier
-//
-// = DESCRIPTION
-//    Generates event nofications and a shutdown message.
-{
-public:
-
-  //
-  // This class provides IS-A Consumer and Supplier of events. But
-  // inheritance from two skeleton classes is non-complaint (or at
-  // least won't work with TAO). We use smaller implementation classes
-  // that delegate on Latency_Supplier to do the job.
-  //
-  class Supplier : public POA_RtecEventComm::PushSupplier {
-  public:
-    virtual void disconnect_push_supplier (CORBA::Environment &);
-    // The channel is disconnecting.
-
-  private:
-    Supplier (Latency_Supplier* impl);
-    friend class Latency_Supplier;
-
-  private:
-    Latency_Supplier* impl_;
-  };
-
-  class Consumer : public POA_RtecEventComm::PushConsumer {
-  public:
-    virtual void push (const RtecEventComm::EventSet &events,
-		       CORBA::Environment &);
-    // The channel pushed some events to us.
-
-    virtual void disconnect_push_consumer (CORBA::Environment &);
-    // The channel is disconnecting.
-
-  private:
-    Consumer (Latency_Supplier* impl);
-    friend class Latency_Supplier;
-
-  private:
-    Latency_Supplier* impl_;
-  };
-
-  Latency_Supplier (const u_int total_messages,
-		    CORBA::Long supplier_id,
-                    const int timestamp = 0);
-  // Construction.  Requires the total number of messages to be
-  // sent.  If the timestamp flag is enabled, then events are
-  // timestamped, e.g., for use in measuring jitter.
-
-  ~Latency_Supplier (void);
-  
-  int open_supplier (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		     const char *name, int master);
-  // Registers with the name server under the given <name>.  Also
-  // connects to the Event Channel as a supplier of notifications and
-  // shutdown messages.  If <master> != 0, then the supplier will
-  // destroy the channel upon shutting down. Returns 0 on success, -1
-  // on failure.
-
-  void disconnect_push_supplier (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-  // Takes a timestamp and then pushes event_ to all consumers, either
-  // directly, or via a channel.
-
-  int start_generating_events (void);
-  // Called when the supplier should start generating events.
-  // Registers with the Event Channel to receive timeouts every .25
-  // seconds.  Will generate some number of events and then send a
-  // shutdown message.  Returns 0 on success, -1 on failure.
-
-  void entry_point (const char *);
-  const char *entry_point () const;
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-protected:
-
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event Channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumers_;
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var suppliers_;
-
-private:
-  RtecScheduler::handle_t rt_info_;
-
-  u_int total_messages_;
-  // How many events to push before ending the test.
-
-  CORBA::Long supplier_id_;
-  // Our supplier ID.
-
-  int timestamp_;
-  // Flag indicating whether or not to timestamp outgoing events.
-
-  u_int total_sent_;
-  // How many events we've pushed.
-
-  ACE_Time_Value test_start_time_;
-  ACE_Time_Value test_stop_time_;
-  // Start/stop times, marking the time period when events are
-  // sent to consumers.
-
-  int master_;
-
-  ACE_CString entry_point_;
-
-  Supplier* supplier_;
-  Consumer* consumer_;
-};
-
-void Latency_Consumer::entry_point(const char* s)
-{
-  entry_point_ = s;
-}
-
-const char* Latency_Consumer::entry_point (void) const
-{
-  return entry_point_.fast_rep ();
-}
-
-void Latency_Supplier::entry_point(const char* s)
-{
-  entry_point_ = s;
-}
-
-const char* Latency_Supplier::entry_point (void) const
-{
-  return entry_point_.fast_rep ();
-}
-
-#endif /* EVENT_LATENCY_H */
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
deleted file mode 100644
index 799bed545fa..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-
-BIN = Event_Latency
-
-BUILD = $(BIN)
-
-EVENT_LATENCY_SRCS= \
-	Event_Latency.cpp
-
-LSRC= \
-	$(EVENT_LATENCY_SRCS) \
-
-EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o)
-
-LDLIBS= -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifdef quantify
-  CCFLAGS += -Dquantify
-  CPPFLAGS += -I/pkg/purify/quantify-2.1-solaris2
-endif # quantify
-
-#### Local rules and variables...
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# Leave the scheduler output out if this is a config run.
-ifeq ($(runtime),1)
-EVENT_LATENCY_CONFIG_OBJS=Event_Latency_Scheduler_Runtime.o
-endif # runtime
-
-ifeq ($(probe),1)
-    CCFLAGS += -DACE_ENABLE_TIMEPROBES
-endif # probe
-
-Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Event_Latency/svc.conf b/TAO/orbsvcs/tests/Event_Latency/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/Event_Latency/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Logger/Logger.dsw b/TAO/orbsvcs/tests/Logger/Logger.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/orbsvcs/tests/Logger/Logger.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
deleted file mode 100644
index 08899ff4848..00000000000
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Logger Service of the TAO ORB
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     =  -lorbsvcs -lTAO
-
-PROG_SRCS = logger_i.cpp 
-
-LSRC = $(PROG_SRCS)
-
-logger_SVR_OBJS = svr.o logger_i.o 
-logger_CLT_OBJS = clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-svr:	$(addprefix $(VDIR),$(logger_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clnt:	$(addprefix $(VDIR),$(logger_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf loggerC.* loggerS.* 
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Logger/client.dsp b/TAO/orbsvcs/tests/Logger/client.dsp
deleted file mode 100644
index b09e5bbd7ae..00000000000
--- a/TAO/orbsvcs/tests/Logger/client.dsp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Logger/clnt.cpp b/TAO/orbsvcs/tests/Logger/clnt.cpp
deleted file mode 100644
index 76bffe1ae75..00000000000
--- a/TAO/orbsvcs/tests/Logger/clnt.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Logger
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//    This program tests an implementation of a logger service.  It uses the
-//    Logger_Factory server to create a number of logger objects.  It then
-//    uses their object references to test functions supported by the
-//    logger server.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/LoggerC.h"
-#include "clnt.h"
-
-// constructor
-
-Logger_Client::Logger_Client (void)
-  : test_nesting_ (0)
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Logger_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'n':
-        this->test_nesting_++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n]"
-                           "\n"
-                           "    -d: increase debug level\n"
-                           "    -n: test nesting in Naming Service\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-
-int
-Logger_Client::run (void)
-{
-  TAO_TRY
-    {
-      CORBA::String_var msg1 =
-        CORBA::string_copy ("Logging at logger 1");
-      this->logger_1_->log (msg1.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var msg2 =
-        CORBA::string_copy ("Logging at logger 2");
-      this->logger_2_->log (msg2.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("run");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-Logger_Client::~Logger_Client (void)
-{
-}
-
-int
-Logger_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  TAO_TRY
-    {
-      // Initialize ORB.
-      this->orb_ =
-        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          -1);
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "Obtained naming_context\n"));
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      CosNaming::Name factory_name(1);
-      factory_name.length (1);
-      factory_name[0].id = CORBA::string_dup ("logger_factory");
-
-      CORBA::Object_var factory_ref =
-        naming_context->resolve (factory_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      /// The following resolve() must fail with an exception.
-
-      CosNaming::Name factory_name2(1);
-      factory_name2.length (1);
-      factory_name2[0].id = CORBA::string_dup ("logger_factory2");
-
-      CORBA::Object_var factory_ref2 =
-        naming_context->resolve (factory_name2, TAO_TRY_ENV);
-
-      if (TAO_TRY_ENV.exception ())
-        {
-          CosNaming::NamingContext::NotFound_ptr ex;
-          ex = CosNaming::NamingContext::NotFound::_narrow (TAO_TRY_ENV.exception ());
-          if (ex != 0)
-            TAO_TRY_ENV.print_exception ("Negative test case for name not found, succeeded\n");
-          else
-            TAO_TRY_ENV.print_exception ("Negative test case for name not found, FAILED!\n");
-        }
-
-      if (CORBA::is_nil (factory_ref.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "resolved to nil object"), -1);
-
-      ACE_DEBUG ((LM_DEBUG, "Logger_Factory resolved\n"));
-
-      Logger_Factory_var factory =
-        Logger_Factory::_narrow (factory_ref.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (factory.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "narrow returned nil"), -1);
-
-      ACE_DEBUG ((LM_DEBUG, "Logger_Factory narrowed\n"));
-
-      CORBA::String_var str =
-        this->orb_->object_to_string (factory.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "The factory IOR is <%s>\n", str.in ()));
-
-      // Now retrieve the Logger obj ref corresponding to key1 and key2
-      this->logger_1_ = factory->make_logger ("key1", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      this->logger_2_ = factory->make_logger ("key2", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "Created two loggers"));
-
-      if (CORBA::is_nil (this->logger_1_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "nil logger1"), -1);
-
-      if (CORBA::is_nil (this->logger_2_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "nil logger2"), -1);
-
-      ACE_DEBUG ((LM_DEBUG, "Created two loggers\n"));
-
-      if (this->test_nesting_)
-        {
-          CosNaming::Name nested(1);
-          nested.length (1);
-          nested[0].id = CORBA::string_dup ("my_naming_context_1");
-
-          CosNaming::NamingContext_var nc1 =
-            naming_context->bind_new_context (nested, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          if (CORBA::is_nil (nc1.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR, "nil nested context"), -1);
-
-          ACE_DEBUG ((LM_DEBUG, "Nested naming context created\n"));
-
-          CosNaming::Name logger1_name (1);
-          logger1_name.length (1);
-          logger1_name[0].id = CORBA::string_dup ("logger_1_");
-          nc1->bind (logger1_name, this->logger_1_.in (), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          ACE_DEBUG ((LM_DEBUG, "Bind in nested context succeded\n"));
-
-          nc1->unbind (logger1_name, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          ACE_DEBUG ((LM_DEBUG, "Unbind in nested context succeded\n"));
-
-          // destroy the naming context created above.
-          nc1->destroy (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          ACE_DEBUG ((LM_DEBUG, "destroy of nested context succeded\n"));
-        }
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Logger_Client logger_client;
-
-  if (logger_client.init (argc, argv) != 0)
-    return 1;
-
-  return logger_client.run ();
-}
diff --git a/TAO/orbsvcs/tests/Logger/clnt.h b/TAO/orbsvcs/tests/Logger/clnt.h
deleted file mode 100644
index f7acdf7ef5b..00000000000
--- a/TAO/orbsvcs/tests/Logger/clnt.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Logger
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//    This program tests an implementation of a logger service.  It uses the
-//    Logger_Factory server to create a number of logger objects.  It then
-//    uses their object references to test functions supported by the
-//    logger server. 
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/LoggerC.h"
-
-class Logger_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Logger client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Logger CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Logger_Client (void);
-  ~Logger_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  int test_nesting_;
-  // Test nested naming context or not.
-
-  CORBA::ORB_var orb_;
-  // Keep a pointer to the orb, to avoid accidental deletes.
-
-  Logger_var logger_1_;
-  // Logger obj ref
-
-  Logger_var logger_2_;
-  // Logger obj ref
-};
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.cpp b/TAO/orbsvcs/tests/Logger/logger_i.cpp
deleted file mode 100644
index 8d3892b2648..00000000000
--- a/TAO/orbsvcs/tests/Logger/logger_i.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#include "ace/ACE.h"
-#include "orbsvcs/LoggerC.h"
-#include "logger_i.h"
-
-Logger_ptr
-Logger_Factory_i::make_logger (const char* name,
-                               CORBA::Environment &_env)
-{
-  Logger_i *l = new Logger_i (name);
-  return l->_this (_env);
-}
-
-Logger_Factory_i::Logger_Factory_i (void)
-{
-}
-
-Logger_i::Logger_i (const char* name)
-  :  name_ (ACE_OS::strdup (name))
-{
-}
-
-Logger_i::~Logger_i (void)
-{
-  ACE_OS::free (this->name_);
-}
-
-void
-Logger_i::log (const char* message, CORBA::Environment &_env)
-{
-}
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.h b/TAO/orbsvcs/tests/Logger/logger_i.h
deleted file mode 100644
index 91e00f59683..00000000000
--- a/TAO/orbsvcs/tests/Logger/logger_i.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-#if !defined (LOGGER_I_H)
-#define LOGGER_I_H
-
-#include "orbsvcs/LoggerS.h"
-
-class Logger_Factory_i : public virtual POA_Logger_Factory
-{
-public:
-  Logger_Factory_i (void);
-  // constructor.
-
-  virtual Logger_ptr make_logger (const char *name,
-                                  CORBA::Environment &_env);
-  // This function creates and returns a logger with the given name.
-};
-
-class Logger_i : public virtual POA_Logger
-{
-public:
-  Logger_i (const char* name);
-  // constructor
-
-  virtual ~Logger_i (void);
-  // destructor
-
-  virtual void log (const char *message,
-                    CORBA::Environment &_env);
-
-private:
-  char *name_;
-  // logger identification
-};
-
-#endif /* LOGGER_I_H */
diff --git a/TAO/orbsvcs/tests/Logger/server.dsp b/TAO/orbsvcs/tests/Logger/server.dsp
deleted file mode 100644
index df4499cf819..00000000000
--- a/TAO/orbsvcs/tests/Logger/server.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\logger_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svr.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Logger/svc.conf b/TAO/orbsvcs/tests/Logger/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/Logger/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Logger/svr.cpp b/TAO/orbsvcs/tests/Logger/svr.cpp
deleted file mode 100644
index 54aab944dee..00000000000
--- a/TAO/orbsvcs/tests/Logger/svr.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Logger
-//
-// = FILENAME
-//    svr.cpp
-//
-// = DESCRIPTION
-//    This program is an implementation of a simple logger service.
-//    Whatever is sent to it through its interface is displayed on stdout.
-//    It uses the Logger_Factory server to create logger objects.
-//
-// = AUTHORS
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/LoggerS.h"
-#include "logger_i.h"
-
-int
-main (int argc, char ** argv)
-{
-  TAO_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the Object Adapter
-      CORBA::Object_var poa_object =
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil(poa_object.in()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to resolve the Name Service.\n"),
-			  1);
-
-      ACE_DEBUG ((LM_DEBUG, "Naming Service resolved.\n"));
-
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "CosNaming::NamingContext::_narrow()  ok.\n"));
-
-      // create a factory implementation
-      Logger_Factory_i factory_impl;
-
-      Logger_Factory_var factory =
-	factory_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-	orb->object_to_string (factory.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "The factory IOR is <%s>\n", str.in ()));
-
-      // Register the servant with the Naming Context....
-      CosNaming::Name factory_name (1);
-      factory_name.length (1);
-      factory_name[0].id = CORBA::string_dup ("logger_factory");
-      naming_context->bind (factory_name, factory.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-//      naming_context->bind (factory_name, factory.in (), TAO_TRY_ENV);
-//      if (TAO_TRY_ENV.exception () != 0)
-//	{ TAO_TRY_ENV.print_exception ("bind: name already bound\n");
-//	return -1;
-//	}
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "running logging service\n"));
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-
-
-      // unbind the logger factory name
-      naming_context->unbind (factory_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("logger_service");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
deleted file mode 100644
index 32984bb6e7b..00000000000
--- a/TAO/orbsvcs/tests/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Simple_Naming \
-	Logger \
-	Event_Latency \
-	EC_Multiple \
-
-ifdef av
-## Add the implementation files 
-DIRS += AVStreams\
-	CosPropertyService
-endif
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
deleted file mode 100644
index e91dd0c7d73..00000000000
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-// $Id$
-
-#include "Strategy_Scheduler.h"
-
-// period times, in 100 nanoseconds
-#define ONE_HZ    10000000
-#define FIVE_HZ    2000000
-#define TEN_HZ     1000000
-#define TWENTY_HZ   500000
-
-typedef RtecScheduler::handle_t handle_t;
-typedef RtecScheduler::Dependency_Info Dependency_Info;
-typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-typedef RtecScheduler::OS_Priority OS_Priority;
-typedef RtecScheduler::Sub_Priority Sub_Priority;
-typedef RtecScheduler::RT_Info RT_Info;
-typedef RtecScheduler::Time Time;
-typedef RtecScheduler::Period Period;
-typedef RtecScheduler::Info_Type Info_Type;
-typedef RtecScheduler::Dependency_Type Dependency_Type;
-
-
-static
-void
-setup_rt_info (RT_Info &info, const char *entry_point, u_long period,
-               u_long execution, RtecScheduler::Criticality criticality,
-               RtecScheduler::Importance importance, u_long threads)
-{
-  // copy the passed entry point string into the RT_Info
-  info.entry_point = CORBA::string_dup (entry_point);
-
-  const TimeBase::ulonglong execution_time = {execution, 0};
-  const TimeBase::ulonglong zero = {0, 0};
-
-  // initialize other values
-  info.handle = 0;
-  info.worst_case_execution_time = execution_time;
-  info.typical_execution_time = execution_time;
-  info.cached_execution_time = zero;
-  info.period = period;
-  info.criticality = criticality;
-  info.importance = importance;
-  info.quantum = zero;
-  info.threads = threads;
-  info.priority = 0;
-  info.dynamic_subpriority = 0;
-  info.static_subpriority = 0;
-  info.preemption_priority = 0;
-  info.info_type = RtecScheduler::OPERATION;
-  info.volatile_token = 0;
-}
-
-static
-int
-register_rt_info (ACE_DynScheduler &scheduler,
-                  RtecScheduler::RT_Info &info)
-{
-  int result = 0;
-
-  if (scheduler.register_task (&info, info.handle) !=
-      ACE_DynScheduler::SUCCEEDED)
-  {
-     result = 1;
-     printf ("Could not register info for \"%s\"\n", info.entry_point.in ());
-  }
-
-  return result;
-}
-
-#if 0 /* not currently used */
-static
-void
-setup_conjunction (RT_Info &info, const char *entry_point)
-{
-  // copy the passed entry point string into the RT_Info
-  info.entry_point = CORBA::string_dup (entry_point);
-
-  const TimeBase::ulonglong zero = {0, 0};
-
-  // initialize other values
-  info.handle = 0;
-  info.worst_case_execution_time = zero;
-  info.typical_execution_time = zero;
-  info.cached_execution_time = zero;
-  info.period = 0;
-  info.criticality = RtecScheduler::VERY_LOW_CRITICALITY;
-  info.importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  info.quantum = zero;
-  info.threads = 0;
-  info.priority = 0;
-  info.dynamic_subpriority = 0;
-  info.static_subpriority = 0;
-  info.preemption_priority = 0;
-  info.info_type = RtecScheduler::CONJUNCTION;
-  info.volatile_token = 0;
-}
-
-static
-void
-setup_disjunction (RT_Info &info, const char *entry_point)
-{
-  // copy the passed entry point string into the RT_Info
-  info.entry_point = CORBA::string_dup (entry_point);
-
-  const TimeBase::ulonglong zero = {0, 0};
-
-  // initialize other values
-  info.handle = 0;
-  info.worst_case_execution_time = zero;
-  info.typical_execution_time = zero;
-  info.cached_execution_time = zero;
-  info.period = 0;
-  info.criticality = RtecScheduler::VERY_LOW_CRITICALITY;
-  info.importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  info.quantum = zero;
-  info.threads = 0;
-  info.priority = 0;
-  info.dynamic_subpriority = 0;
-  info.static_subpriority = 0;
-  info.preemption_priority = 0;
-  info.info_type = RtecScheduler::DISJUNCTION;
-  info.volatile_token = 0;
-}
-#endif /* not currently used */
-
-
-static
-int
-run_schedule (ACE_Scheduler_Strategy &strategy,
-              const char *output_filename, const char *heading)
-{
-//  RtecScheduler::RT_Info low_10, low_20, high_10, high_20;
-  RtecScheduler::RT_Info low_1, low_5, low_10, low_20;
-  RtecScheduler::RT_Info high_1, high_5, high_10, high_20;
-
-  ACE_Strategy_Scheduler scheduler (strategy);
-
-  setup_rt_info (low_1,   "low_1",   ONE_HZ,    180000,
-                 RtecScheduler::LOW_CRITICALITY,
-                 RtecScheduler::HIGH_IMPORTANCE, 1);
-  setup_rt_info (low_5,   "low_5",   FIVE_HZ,   180000,
-                 RtecScheduler::LOW_CRITICALITY,
-                 RtecScheduler::HIGH_IMPORTANCE, 1);
-  setup_rt_info (low_10,  "low_10",  TEN_HZ,    180000,
-                 RtecScheduler::LOW_CRITICALITY,
-                 RtecScheduler::HIGH_IMPORTANCE, 1);
-  setup_rt_info (low_20,  "low_20",  TWENTY_HZ, 180000,
-                 RtecScheduler::LOW_CRITICALITY,
-                 RtecScheduler::HIGH_IMPORTANCE, 1);
-  setup_rt_info (high_1,  "high_1",  ONE_HZ,    180000,
-                 RtecScheduler::HIGH_CRITICALITY,
-                 RtecScheduler::LOW_IMPORTANCE,  1);
-  setup_rt_info (high_5,  "high_5",  FIVE_HZ,   180000,
-                 RtecScheduler::HIGH_CRITICALITY,
-                 RtecScheduler::LOW_IMPORTANCE,  1);
-  setup_rt_info (high_10, "high_10", TEN_HZ,    180000,
-                 RtecScheduler::HIGH_CRITICALITY,
-                 RtecScheduler::LOW_IMPORTANCE,  1);
-  setup_rt_info (high_20, "high_20", TWENTY_HZ, 180000,
-                 RtecScheduler::HIGH_CRITICALITY,
-                 RtecScheduler::LOW_IMPORTANCE,  1);
-
-  if (
-      register_rt_info (scheduler, low_1)   ||
-      register_rt_info (scheduler, low_5)   ||
-      register_rt_info (scheduler, low_10)  ||
-      register_rt_info (scheduler, low_20)  ||
-      register_rt_info (scheduler, high_1)  ||
-      register_rt_info (scheduler, high_5)  ||
-      register_rt_info (scheduler, high_10) ||
-      register_rt_info (scheduler, high_20))
-  {
-    return -1;
-  }
-
-  ACE_DynScheduler::status_t status = scheduler.schedule ();
-  switch (status)
-  {
-    case ACE_DynScheduler::SUCCEEDED:
-    case ACE_DynScheduler::ST_UTILIZATION_BOUND_EXCEEDED:
-
-      status = scheduler.output_timeline (output_filename, heading);
-      switch (status)
-      {
-        case ACE_DynScheduler::SUCCEEDED:
-        case ACE_DynScheduler::ST_UTILIZATION_BOUND_EXCEEDED:
-          break;
-
-        default :
-          printf ("scheduler.output_timeline (\"%s\") failed: returned %d\n",
-                  output_filename, status);
-         return -1;
-      }
-
-      break;
-
-    default :
-
-      printf ("scheduler.schedule () failed: returned %d\n", status);
-      return -1;
-  }
-
-  return 0;
-}
-
-int
-main (int, char *[])
-{
-  int result = 0;
-
-  // create a bunch of different strategies, indicating the minimum critical
-  // priority level (number of priority levels in critical set - 1) for each.
-
-  ACE_RMS_Scheduler_Strategy rms_strategy (3);
-//  ACE_RMS_Scheduler_Strategy rms_strategy (1);
-
-  ACE_MLF_Scheduler_Strategy mlf_strategy (0);
-  ACE_EDF_Scheduler_Strategy edf_strategy (0);
-
-  ACE_RMS_Dyn_Scheduler_Strategy rms_dyn_strategy (3);
-//  ACE_RMS_Dyn_Scheduler_Strategy rms_dyn_strategy (1);
-
-  ACE_MUF_Scheduler_Strategy muf_strategy (0);
-
-  result = run_schedule (rms_strategy, "RMS_Timelines",
-                         "RMS Scheduling Strategy");
-  if (result < 0)
-  {
-    printf ("run_schedule (rms_strategy, \"RMS_Timelines\", "
-            "\"RMS Scheduling Strategy\") returned %d\n",
-            result);
-    return 1;
-  }
-
-  result = run_schedule (mlf_strategy, "MLF_Timelines",
-                         "MLF Scheduling Strategy");
-  if (result < 0)
-  {
-    printf ("run_schedule (mlf_strategy, \"MLF_Timelines\", "
-            "\"MLF Scheduling Strategy\") returned %d\n",
-            result);
-    return 1;
-  }
-
-  result = run_schedule (edf_strategy, "EDF_Timelines",
-                         "EDF Scheduling Strategy");
-  if (result < 0)
-  {
-    printf ("run_schedule (edf_strategy, \"EDF_Timelines\", "
-            "\"EDF Scheduling Strategy\") returned %d\n",
-            result);
-    return 1;
-  }
-
-  result = run_schedule (rms_dyn_strategy, "RMS_Dyn_Timelines",
-                         "RMS-Dynamic Scheduling Strategy");
-  if (result < 0)
-  {
-    printf ("run_schedule (rms_dyn_strategy, \"RMS_Dyn_Timelines\", "
-            "\"RMS-Dynamic Scheduling Strategy\") returned %d\n",
-            result);
-    return 1;
-  }
-
-  result = run_schedule (muf_strategy, "MUF_Timelines",
-                         "MUF Scheduling Strategy");
-  if (result < 0)
-  {
-    printf ("run_schedule (muf_strategy, \"MUF_Timelines\", "
-            "\"MUF Scheduling Strategy\") returned %d\n",
-            result);
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
deleted file mode 100644
index af7496c2ea5..00000000000
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ /dev/null
@@ -1,255 +0,0 @@
-# $Id$
-
-BIN = DynSched_Test
-BUILD = $(BIN)
-SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lorbsvcs -lTAO
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \
-            -I$(TAO_ROOT)/orbsvcs \
-	    -I$(TAO_ROOT)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/DynSched_Test.o .obj/DynSched_Test.so .shobj/DynSched_Test.o .shobj/DynSched_Test.so: DynSched_Test.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/DynSched.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/SchedEntry.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/SchedEntry.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/DynSched.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
deleted file mode 100644
index 60e33c1b563..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS =  -lorbsvcs -lTAO
-
-CLNT_SRCS = clnt.cpp
-
-LSRC = $(CLNT_SRCS)
-
-CLNT_OBJS = $(CLNT_SRCS:.cpp=.o)
-
-BIN = clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.dsw b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.dsw
deleted file mode 100644
index 015f303d8bd..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
deleted file mode 100644
index a492a626e12..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp b/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp
deleted file mode 100644
index 67a6e64ffaf..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Naming_Service/TAO
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the CosNaming 
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "clnt.h"
-
-// constructor
-
-CosNaming_Client::CosNaming_Client (void)
-  : argc_ (0),
-    argv_ (0),
-    exit_later_ (0)
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-CosNaming_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dx");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'x':
-	this->exit_later_++;
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-			   " [-x]"
-			   "\n",
-                           this->argv_ [0]), 
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;  
-}
-
-// Execute client example code.
-
-int
-CosNaming_Client::run (void)
-{
-  // @@ TODO, add some interesting test here, maybe creating some
-  // nested naming contexts and registering a number of objreferences
-  // in there.
-  // We could even use the iterators.
-  return 0;
-}
-
-CosNaming_Client::~CosNaming_Client (void)
-{
-}
-
-int
-CosNaming_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  -1);
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-	return -1;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  CosNaming_Client cosnaming_client;
-  
-  if (cosnaming_client.init (argc, argv) == -1)
-    return 1;
-
-  return cosnaming_client.run ();
-}
diff --git a/TAO/orbsvcs/tests/Simple_Naming/clnt.h b/TAO/orbsvcs/tests/Simple_Naming/clnt.h
deleted file mode 100644
index 213daf2be6e..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/clnt.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
-
-class CosNaming_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the CosNaming client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  CosNaming_Client (void);
-  ~CosNaming_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately.
-};
diff --git a/TAO/orbsvcs/tests/Simple_Naming/svc.conf b/TAO/orbsvcs/tests/Simple_Naming/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Trading_Service/Makefile b/TAO/orbsvcs/tests/Trading_Service/Makefile
deleted file mode 100644
index 5603270251d..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Makefile
+++ /dev/null
@@ -1,1186 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#---------------
-#   STL (start)
-#---------------
-
-include $(STL_ROOT)/config/local.cfg
-
-CC_INCLUDES += -I$(STD)
-CC_INCLUDES += -pta
-
-CPPFLAGS += \
-        -I$(TOOLKIT) \
-        $(CC_INCLUDES) \
-        $(CC_FLAGS) \
-        $(CC_DEFINES) \
-        $(CC_EH) \
-        $(CC_MT)
-
-ifndef exceptions
-CPPFLAGS += -DOS_NO_EXCEPTION_SPECIFIER
-else
-CPPFLAGS += -DOS_STL_ASSERT
-endif
-
-LDFLAGS += -L$(STL_ROOT)/lib
-
-#---------------
-#   STL (end)
-#---------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-shared_libs_only=1
-BIN     = export_test import_test
-
-MAKEFILE = Makefile
-LIBNAME  = libTTest
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-IDL_FILES = TTestC \
-	    TTestS \
-
-FILES   = $(IDL_FILES) \
-	  TT_Info \
-	  Service_Type_Exporter \
-	  Offer_Exporter \
-	  Offer_Importer 
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(STL_ROOT)/lib
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-LSRC    = $(addsuffix .cpp,$(FILES))
-LDLIBS  = -lTTest -lorbsvcs -lospace -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-
-INSTALL=
-
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-.PRECIOUS: TTestS.cpp TTestS.h TTestC.cpp TTestC.h
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/TTestC.o .obj/TTestC.so .shobj/TTestC.o .shobj/TTestC.so: TTestC.cpp TTestC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.h TTestS.i
-.obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.i
-.obj/TT_Info.o .obj/TT_Info.so .shobj/TT_Info.o .shobj/TT_Info.so: TT_Info.cpp TT_Info.h TTestS.h TTestC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
-.obj/Service_Type_Exporter.o .obj/Service_Type_Exporter.so .shobj/Service_Type_Exporter.o .shobj/Service_Type_Exporter.so: Service_Type_Exporter.cpp \
- Service_Type_Exporter.h TT_Info.h TTestS.h TTestC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i
-.obj/Offer_Exporter.o .obj/Offer_Exporter.so .shobj/Offer_Exporter.o .shobj/Offer_Exporter.so: Offer_Exporter.cpp Offer_Exporter.h TT_Info.h \
- TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Dynamic_Property.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
-.obj/Offer_Importer.o .obj/Offer_Importer.so .shobj/Offer_Importer.o .shobj/Offer_Importer.so: Offer_Importer.cpp Offer_Importer.h TT_Info.h \
- TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/singletons.h TTestC.i \
- TTestS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Policy_Manager.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Policies.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Attributes.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp
deleted file mode 100644
index 78253463e77..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-// $Id$
-#include "Offer_Exporter.h"
-
-template<class T>
-class Simple_DP_Evaluation_Handler
-  : public TAO_DP_Evaluation_Handler
-{
-public:
-  Simple_DP_Evaluation_Handler (T dp);
-  
-  virtual CORBA::Any* evalDP (const CORBA::Any& extra_info,
-			      CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
-
-private:
-
-  T dp_;
-};
-
-
-template <class T>
-Simple_DP_Evaluation_Handler<T>::Simple_DP_Evaluation_Handler (T dp)
-  : dp_ (dp)
-{  
-}
-
-template <class T> CORBA::Any*
-Simple_DP_Evaluation_Handler<T>::evalDP (const CORBA::Any& extra_info,
-					 CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
-{
-  CORBA::Any* return_value = 0;
-
-  ACE_NEW_RETURN (return_value, CORBA::Any, return_value);
-
-  (*return_value) <<= this->dp_;
-  return return_value;
-}
-
-TAO_Offer_Exporter::
-TAO_Offer_Exporter (CosTrading::Register_ptr register_if,
-		    CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-  : register_ (register_if)
-{
-  this->create_offers ();
-  this->admin_ = register_if->admin_if (_env);
-  TAO_CHECK_ENV_RETURN (_env,);
-}
-
-TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
-{
-  for (int i = 0; i < NUM_OFFERS; i++)
-    {
-      /*
-      delete dp_plotters_[i].remove_handler
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE]);
-      delete dp_plotters_[i].remove_handler
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING]);
-      delete dp_printers_[i].remove_handler
-	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE]);
-      delete dp_printers_[i].remove_handler
-	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING]);
-      delete dp_fs_[i].remove_handler
-	(TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING]);
-	*/
-    }
-}
-
-void
-TAO_Offer_Exporter::export_offers (CORBA::Environment& _env)
-{
-  ACE_DEBUG ((LM_DEBUG, "Exporting offers.\n"));
-  
-  TAO_TRY
-    {
-      for (int i = 0; i < NUM_OFFERS; i++)
-	{
-	  this->register_->export (this->plotter_[i]._this (TAO_TRY_ENV),
-				   TT_Info::INTERFACE_NAMES[1],
-				   this->props_plotters_[i],
-				   TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  this->register_->export (this->printer_[i]._this (TAO_TRY_ENV),
-				   TT_Info::INTERFACE_NAMES[2],
-				   this->props_printers_[i],
-				   TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	  
-	  this->register_->export (this->fs_[i]._this (TAO_TRY_ENV),
-				   TT_Info::INTERFACE_NAMES[3],
-				   this->props_fs_[i],
-				   TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::export_offers");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::IllegalOfferId, 
-		   CosTrading::UnknownOfferId, 
-		   CosTrading::Register::ProxyOfferId))
-{
-  ACE_DEBUG ((LM_DEBUG, "Withdrawing all offers.\n"));
-  
-  TAO_TRY
-    {
-      CORBA::ULong length;
-      CORBA::ULong amount = NUM_OFFERS;
-
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (_env);
-      TAO_CHECK_ENV;
-      
-      if (offer_id_seq.ptr () != 0)
-	{
-	  length = offer_id_seq->length ();
-	  for (int i = 0; i < length; i++)
-	    {
-	      this->register_->withdraw (offer_id_seq[i], TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-	    }
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::export_offers");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Offer_Exporter::describe_offers (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::IllegalOfferId, 
-		   CosTrading::UnknownOfferId, 
-		   CosTrading::Register::ProxyOfferId))
-{
-  ACE_DEBUG ((LM_DEBUG, "Describing all offers.\n"));
-  
-  TAO_TRY
-    {
-      CORBA::ULong length;
-      CORBA::ULong amount = NUM_OFFERS;
-
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (_env);
-      TAO_CHECK_ENV;
-
-      if (offer_id_seq.ptr () != 0)
-	{
-	  length = offer_id_seq->length ();
-	  for (int i = 0; i < length; i++)
-	    {
-	      CosTrading::Register::OfferInfo_var offer_info =
-		this->register_->describe (offer_id_seq[i], TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-
-	      ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
-	      ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));	      
-	      TT_Info::dump_properties (offer_info->properties);
-	      ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
-	    }
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::export_offers");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Offer_Exporter::modify_offers (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::NotImplemented, 
-		   CosTrading::IllegalOfferId, 
-		   CosTrading::UnknownOfferId, 
-		   CosTrading::Register::ProxyOfferId, 
-		   CosTrading::IllegalPropertyName, 
-		   CosTrading::Register::UnknownPropertyName, 
-		   CosTrading::PropertyTypeMismatch, 
-		   CosTrading::ReadonlyDynamicProperty, 
-		   CosTrading::Register::MandatoryProperty, 
-		   CosTrading::Register::ReadonlyProperty, 
-		   CosTrading::DuplicatePropertyName))
-
-{
-}
-
-void
-TAO_Offer_Exporter::
-withdraw_offers_using_constraints (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException, 
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType, 
-		   CosTrading::IllegalConstraint, 
-		   CosTrading::Register::NoMatchingOffers))
-{
-}
-
-CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::NotImplemented))
-{
-  ACE_DEBUG ((LM_DEBUG, "Grabbing all offer ids.\n"));
-
-  CosTrading::OfferIdSeq_ptr offer_id_seq;
-  TAO_TRY
-    {
-      CORBA::ULong length = NUM_OFFERS;
-      CosTrading::OfferIdIterator_ptr offer_id_iter;
-
-      this->admin_->list_offers (NUM_OFFERS,
-				 CosTrading::OfferIdSeq_out (offer_id_seq),
-				 CosTrading::OfferIdIterator_out (offer_id_iter),
-				 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
-	{
-	  CORBA::Boolean any_left = CORBA::B_FALSE;
-	  CosTrading::OfferIdSeq_ptr id_seq;
-	  CosTrading::OfferIdIterator_var offer_id_iter_var (offer_id_iter);
-	  
-	  do
-	    {
-	      any_left =
-		offer_id_iter->next_n (length,
-				       CosTrading::OfferIdSeq_out (id_seq),
-				       TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-
-	      int offers = id_seq->length ();
-	      int old_length = offer_id_seq->length ();
-	      offer_id_seq->length (old_length + offers);
-
-	      for (int i = 0; i < offers; i++)
-		(*offer_id_seq)[i + old_length] = (*id_seq)[i];
-
-	      delete id_seq;
-	    } while (any_left);	      
-	}
-
-      ACE_DEBUG ((LM_DEBUG, "The following offer ids are registered:\n"));
-      for (int len = offer_id_seq->length (), j = 0; j < len; j++)
-	ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *)(*offer_id_seq)[j]));
-      
-      return offer_id_seq;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Exporter::grab_offerids");
-      TAO_RETHROW_RETURN (offer_id_seq);
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Offer_Exporter::create_offers (void)
-{
-  int counter = 0;
-  char name[BUFSIZ];
-  char description[BUFSIZ];
-  CORBA::Any extra_info;
-  TAO_Sequences::StringSeq string_seq (4);
-  TAO_Sequences::ULongSeq ulong_seq (4);
-  CosTradingDynamic::DynamicProp_var dp_user_queue;
-  CosTradingDynamic::DynamicProp_var dp_file_queue;
-
-  // Initialize plotters
-  for (int i = 0; i < NUM_OFFERS; i++)
-    {      
-      ACE_OS::sprintf (name, "Plotter #%d", i);
-      ACE_OS::sprintf (description,
-		       "%s is a plotter. It plots stuff. Like charts.",
-		       name);
-
-      for (int j = 0; j < 4; j++, counter = (counter + 1) % NUM_OFFERS)
-	{
-	  string_seq[j] = TT_Info::USERS [counter];
-	  ulong_seq[j] = counter * 10000;
-	}
-      /*
-      dp_user_queue =
-	this->dp_plotters_[i].register_handler
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE],
-	TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_USER_QUEUE],
-	 extra_info,
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::StringSeq> (string_seq));
-
-      dp_file_queue =
-	this->dp_plotters_[i].register_handler
-	(TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_FILE_SIZES_PENDING],
-	 extra_info,
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq));
-      */      
-      this->props_plotters_[i].length (7);
-      this->props_plotters_[i][0].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]);
-      this->props_plotters_[i][0].value <<= CORBA::string_dup (name);
-      this->props_plotters_[i][1].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]);
-      this->props_plotters_[i][1].value <<= TT_Info::LOCATIONS[i];
-      this->props_plotters_[i][2].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::DESCRIPTION]);
-      this->props_plotters_[i][2].value <<= CORBA::string_dup (description);
-      this->props_plotters_[i][3].name = CORBA::string_dup (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_NUM_COLORS]);
-      this->props_plotters_[i][3].value <<= (i * 2);
-      this->props_plotters_[i][4].name = CORBA::string_dup (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_AUTO_LOADING]);
-      this->props_plotters_[i][4].value <<= CORBA::Any::from_boolean ((CORBA::Boolean) (i % 2));
-      this->props_plotters_[i][5].name = CORBA::string_dup (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_COST_PER_PAGE]);
-      this->props_plotters_[i][5].value <<= (CORBA::Float) i;
-      this->props_plotters_[i][6].name = CORBA::string_dup (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_MODEL_NUMBER]);
-      this->props_plotters_[i][6].value <<= CORBA::string_dup (TT_Info::MODEL_NUMBERS[i]);
-      //      this->props_plotters_[i][7].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE];
-      //      this->props_plotters_[i][7].value <<= dp_user_queue.in ();
-      //      this->props_plotters_[i][8].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING];
-      //      this->props_plotters_[i][8].value <<= dp_file_queue.in ();
-    }
-
-  // Initialize printers
-  for (i = 0; i < NUM_OFFERS; i++)
-    {
-      ACE_OS::sprintf (name, "Printer #%d", i);
-      ACE_OS::sprintf (description,
-		       "%s is a printer. It prints stuff. Like reports.",
-		       name);
-
-      for (int j = 0; j < 4; j++, counter = (counter + 1) % NUM_OFFERS)
-	{
-	  string_seq[j] = TT_Info::USERS [counter];
-	  ulong_seq[j] = counter * 10000;
-	}
-      /*
-      dp_user_queue =
-	this->dp_printers_[i].register_handler
-	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE],
-	 TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_USER_QUEUE],
-	 extra_info,
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::StringSeq> (string_seq));
-
-      dp_file_queue =
-	this->dp_printers_[i].register_handler
-	(TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING],
-	 TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_FILE_SIZES_PENDING],
-	 extra_info,
-	 new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq));
-	 */      
-      this->props_printers_[i].length (8);
-      this->props_printers_[i][0].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]);
-      this->props_printers_[i][0].value <<= CORBA::string_dup (name);
-      this->props_printers_[i][1].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]);
-      this->props_printers_[i][1].value <<= TT_Info::LOCATIONS[i];
-      this->props_printers_[i][2].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::DESCRIPTION]);
-      this->props_printers_[i][2].value <<= CORBA::string_dup (description);
-      this->props_printers_[i][3].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_COLOR]);
-      this->props_printers_[i][3].value <<= CORBA::Any::from_boolean ((CORBA::Boolean) (i % 2));
-      this->props_printers_[i][4].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_DOUBLE_SIDED]);
-      this->props_printers_[i][4].value <<= CORBA::Any::from_boolean ((CORBA::Boolean) ((i + 1) % 2));
-      this->props_printers_[i][5].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_COST_PER_PAGE]);
-      this->props_printers_[i][5].value <<= (CORBA::Float) i;
-      this->props_printers_[i][6].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_MODEL_NUMBER]);
-      this->props_printers_[i][6].value <<= CORBA::string_dup (TT_Info::MODEL_NUMBERS[i]);
-      this->props_printers_[i][7].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_PAGES_PER_SEC]);
-      this->props_printers_[i][7].value <<= (CORBA::UShort) i;
-      //      this->props_printers_[i][8].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE];
-      //      this->props_printers_[i][8].value <<= dp_user_queue.in ();
-      //      this->props_printers_[i][9].name = CORBA::string_dup (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING];
-      //      this->props_printers_[i][9].value <<= dp_file_queue.in ();
-    }
-
-  // Initialize FileSystem
-  for (i = 0; i < NUM_OFFERS; i++)
-    {
-      CosTradingDynamic::DynamicProp_var dp_space_left;
-      
-      ACE_OS::sprintf (name, "File System #%d", i);
-      ACE_OS::sprintf (description,
-		       "%s is a File System. It stores stuff. Like files.",
-		       name);
-      /*
-      dp_space_left =
-	this->dp_fs_[i].register_handler
-	(TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING],
-	 TT_Info::FILESYSTEM_PROPERTY_TYPES[TT_Info::SPACE_REMAINING],
-	 extra_info,
-	 new Simple_DP_Evaluation_Handler<CORBA::ULong> (i * 4434343));
-	 */      
-      this->props_fs_[i].length (5);
-      this->props_fs_[i][0].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]);
-      this->props_fs_[i][0].value <<= CORBA::string_dup (name);
-      this->props_fs_[i][1].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]);
-      this->props_fs_[i][1].value <<= CORBA::string_dup (TT_Info::LOCATIONS[i]);
-      this->props_fs_[i][2].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::DESCRIPTION]);
-      this->props_fs_[i][2].value <<= CORBA::string_dup (description);
-      this->props_fs_[i][3].name = CORBA::string_dup (TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::DISK_SIZE]);
-      this->props_fs_[i][3].value <<= (CORBA::ULong) (i * 2000000);
-      this->props_fs_[i][4].name = CORBA::string_dup (TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::PERMISSION_LEVEL]);
-      this->props_fs_[i][4].value <<= (CORBA::UShort) (i + 1);
-      //      this->props_fs_[i][6].name = TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING];
-      //      this->props_fs_[i][6].value <<= dp_space_left.in ();
-    }
-}
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h
deleted file mode 100644
index ad16221c3cf..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// $Id$
-
-// ========================================================================
-//
-// = FILE  
-//     Offer_Exporter.h
-//
-// = DESCRIPTION
-//    Class that tests the Trading Service's Register Interface
-//
-// = AUTHOR
-//     Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ======================================================================= 
-
-#ifndef TAO_OFFER_EXPORTER_H
-#define TAO_OFFER_EXPORTER_H
-
-#include "TT_Info.h"
-#include "orbsvcs/Trader/Dynamic_Property.h"
-
-class TAO_Offer_Exporter
-{
-public:
-
-  TAO_Offer_Exporter (CosTrading::Register_ptr register_if,
-		      CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  ~TAO_Offer_Exporter (void);
-  
-  void export_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::Register::InvalidObjectRef, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::Register::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::MissingMandatoryProperty, 
-		     CosTrading::DuplicatePropertyName));
-
-  void withdraw_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
-
-  void describe_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId));
-
-  void modify_offers (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::NotImplemented, 
-		     CosTrading::IllegalOfferId, 
-		     CosTrading::UnknownOfferId, 
-		     CosTrading::Register::ProxyOfferId, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::Register::UnknownPropertyName, 
-		     CosTrading::PropertyTypeMismatch, 
-		     CosTrading::ReadonlyDynamicProperty, 
-		     CosTrading::Register::MandatoryProperty, 
-		     CosTrading::Register::ReadonlyProperty, 
-		     CosTrading::DuplicatePropertyName));
-
-  void withdraw_offers_using_constraints (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     CosTrading::IllegalConstraint, 
-		     CosTrading::Register::NoMatchingOffers));  
-  
-private:
-
-  CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::NotImplemented));
-
-  void create_offers (void);
-  
-  CosTrading::Register_var register_;
-  CosTrading::Admin_var admin_;
-  
-  TT_Info::Printer printer_[NUM_OFFERS];
-  TT_Info::Plotter plotter_[NUM_OFFERS];
-  TT_Info::File_System fs_[NUM_OFFERS];
-  
-  TAO_Dynamic_Property dp_plotters_[NUM_OFFERS];
-  TAO_Dynamic_Property dp_printers_[NUM_OFFERS];
-  TAO_Dynamic_Property dp_fs_[NUM_OFFERS];
-  
-  CosTrading::PropertySeq props_plotters_[NUM_OFFERS];
-  CosTrading::PropertySeq props_printers_[NUM_OFFERS];
-  CosTrading::PropertySeq props_fs_[NUM_OFFERS];
-};
-
-#endif /* TAO_OFFER_EXPORTER_H */
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp
deleted file mode 100644
index 4b0d5643297..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-#include "Offer_Importer.h"
-#include "orbsvcs/Trader/Policy_Manager.h"
-
-TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if)
-  : lookup_ (lookup_if)
-{
-}
-
-void
-TAO_Offer_Importer::perform_queries (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType,
-		   CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::IllegalPolicyName,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::DuplicatePolicyName))
-{
-  TAO_TRY
-    {
-      TAO_Policy_Manager policies;
-      CosTrading::Lookup::SpecifiedProps desired_props;
-
-      policies.exact_type_match (CORBA::B_FALSE);
-      policies.search_card (4*NUM_OFFERS);
-      policies.match_card (4*NUM_OFFERS);
-      policies.return_card (4*NUM_OFFERS);
-      for (int i = 0; i < TT_Info::NUM_QUERIES; i++)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Performing query for %s.\n", TT_Info::QUERIES[i][0]));
-	  ACE_DEBUG ((LM_DEBUG, "Query: %s\n", TT_Info::QUERIES[i][1]));
-	  ACE_DEBUG ((LM_DEBUG, "Preferences: %s\n", TT_Info::QUERIES[i][2]));     
-
-	  CosTrading::OfferSeq_ptr offer_seq_out = 0;
-	  CosTrading::OfferIterator_ptr offer_iterator_out = 0;
-	  CosTrading::PolicyNameSeq_ptr limits_applied_out = 0;
-	  
-	  this->lookup_->query (TT_Info::QUERIES[i][0],
-				TT_Info::QUERIES[i][1],
-				TT_Info::QUERIES[i][2],
-				policies.policy_seq (),
-				desired_props,
-				8,				
-				CosTrading::OfferSeq_out (offer_seq_out),
-				CosTrading::OfferIterator_out (offer_iterator_out),
-				CosTrading::PolicyNameSeq_out (limits_applied_out),
-				TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  //CosTrading::OfferSeq_var offer_seq (offer_seq_out);
-	  //CosTrading::OfferIterator_var offer_iterator (offer_iterator_out);
-	  //CosTrading::PolicyNameSeq_var limits_applied (limits_applied_out);
-	  ACE_DEBUG ((LM_DEBUG, "Results:\n\n"));
-	  
-	  this->display_results (*offer_seq_out,
-				 offer_iterator_out,
-				 TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  ACE_DEBUG ((LM_DEBUG, "Limits Applied:\n\n"));
-	  for (int length = limits_applied_out->length (), j = 0; j < length; j++)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "%s\n", (const char *)(*limits_applied_out)[j]));
-	    }
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Importer::perform_queries");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;    
-}
-
-void
-TAO_Offer_Importer::perform_federated_queries (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType,
-		   CosTrading::UnknownServiceType,
-		   CosTrading::IllegalConstraint,
-		   CosTrading::Lookup::IllegalPreference,
-		   CosTrading::Lookup::IllegalPolicyName,
-		   CosTrading::Lookup::PolicyTypeMismatch,
-		   CosTrading::Lookup::InvalidPolicyValue,
-		   CosTrading::IllegalPropertyName,
-		   CosTrading::DuplicatePropertyName,
-		   CosTrading::DuplicatePolicyName))
-{
-}
-
-void
-TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
-				     CosTrading::OfferIterator_ptr offer_iterator,
-				     CORBA::Environment& _env) const
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  for (int length = offer_seq.length (), i = 0; i < length; i++)
-    {
-      TT_Info::dump_properties (offer_seq[i].properties);
-      ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
-    }
-
-  TAO_TRY
-    {  
-      if (! CORBA::is_nil (offer_iterator))
-	{
-	  CORBA::Boolean any_left = CORBA::B_FALSE;
-
-	  do
-	    {
-	      CosTrading::OfferSeq_ptr iter_offers_out;
-	      any_left =
-		offer_iterator->next_n (length,
-					CosTrading::OfferSeq_out (iter_offers_out),
-					TAO_TRY_ENV);
-	      TAO_CHECK_ENV;
-
-	      CosTrading::OfferSeq_var iter_offers (iter_offers_out);
-	      for (length = iter_offers->length (), i = 0; i < length; i++)
-		{
-		  CosTrading::PropertySeq& props = iter_offers[i].properties;
-		  TT_Info::dump_properties (props);
-		  ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
-		}
-	      
-	    } while (any_left); 	
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Offer_Importer::display_results");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h
deleted file mode 100644
index 2ef86269d40..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-// ========================================================================
-//
-// = FILE  
-//     Offer_Importer.h
-//
-// = DESCRIPTION
-//    Class that tests the Trading Service's Lookup Interface
-//
-// = AUTHOR
-//     Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ======================================================================= 
-
-#ifndef TAO_OFFER_IMPORTER
-#define TAO_OFFER_IMPORTER
-
-#include "TT_Info.h"
-
-class TAO_Offer_Importer
-{
-public:
-
-  TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if);
-
-  void perform_queries (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
-
-  void perform_federated_queries (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType,
-		     CosTrading::UnknownServiceType,
-		     CosTrading::IllegalConstraint,
-		     CosTrading::Lookup::IllegalPreference,
-		     CosTrading::Lookup::IllegalPolicyName,
-		     CosTrading::Lookup::PolicyTypeMismatch,
-		     CosTrading::Lookup::InvalidPolicyValue,
-		     CosTrading::IllegalPropertyName,
-		     CosTrading::DuplicatePropertyName,
-		     CosTrading::DuplicatePolicyName));
-private:
-
-  void display_results (const CosTrading::OfferSeq& offer_seq,
-			CosTrading::OfferIterator_ptr offer_iterator,
-			CORBA::Environment& _env) const
-    TAO_THROW_SPEC ((CORBA::SystemException));
-  
-  CosTrading::Lookup_var lookup_;
-  
-};
-
-#endif /* TAO_OFFER_IMPORTER */
diff --git a/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.cpp
deleted file mode 100644
index 9bf6ac953cd..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-// $Id$
-#include "Service_Type_Exporter.h"
-
-TAO_Service_Type_Exporter::
-TAO_Service_Type_Exporter (CosTradingRepos::ServiceTypeRepository_ptr str)
-  : repos_ (str)
-{
-  this->create_types ();
-}
-
-void
-TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType, 
-		   SERVICE_TYPE_REPOS::HasSubTypes))
-{
-  ACE_DEBUG ((LM_DEBUG, "removing all types from the Repository.\n"));
-
-  for (int i = 0; i < NUM_TYPES; i++)
-    {
-      TAO_TRY
-	{
-	  this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i], TAO_TRY_ENV);
-	  TAO_CHECK_ENV;  
-	}
-      TAO_CATCH (CosTrading::UnknownServiceType, excp)
-	{
-	}
-      TAO_CATCHANY
-	{
-	  TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::remove_all_types");
-	  continue;
-	  //	  TAO_RETHROW;
-	}
-      TAO_ENDTRY;
-    }
-  
-}
-
-void
-TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   SERVICE_TYPE_REPOS::ServiceTypeExists, 
-		   SERVICE_TYPE_REPOS::InterfaceTypeMismatch, 
-		   CosTrading::IllegalPropertyName, 
-		   CosTrading::DuplicatePropertyName, 
-		   SERVICE_TYPE_REPOS::ValueTypeRedefinition, 
-		   CosTrading::UnknownServiceType, 
-		   SERVICE_TYPE_REPOS::DuplicateServiceTypeName))
-{
-  TAO_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG, "adding all types to the Repository.\n"));
-
-      for (int i = 0; i < NUM_TYPES; i++)
-	{
-	  this->repos_->add_type (TT_Info::INTERFACE_NAMES[i],
-				  this->type_structs_[i].if_name,
-				  this->type_structs_[i].props,
-				  this->type_structs_[i].super_types,
-				  TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-	}
-    }
-  TAO_CATCH (CosTrading::IllegalPropertyName, excp)
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
-
-      if (excp.name.in () != 0)	
-	ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", excp.name.in ()));
-      
-      TAO_RETHROW;
-    }
-  TAO_CATCH (SERVICE_TYPE_REPOS::ValueTypeRedefinition, vtr)
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
-
-      if (vtr.type_1.in () != 0)	
-	ACE_DEBUG ((LM_DEBUG, "Type One: %s\n", vtr.type_2.in ()));
-      if (vtr.type_2.in () != 0)	
-	ACE_DEBUG ((LM_DEBUG, "Type Two: %s\n", vtr.type_2.in ()));
-      
-      TAO_RETHROW;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::add_all_types");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TRY
-    {
-      SERVICE_TYPE_REPOS::SpecifiedServiceTypes sst;
-      ACE_DEBUG ((LM_DEBUG, "listing all types in the Repository.\n"));
-      
-      sst._d (SERVICE_TYPE_REPOS::all);
-      SERVICE_TYPE_REPOS::ServiceTypeNameSeq_var type_names =
-	this->repos_->list_types (sst, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      for (int length = type_names->length (), i = 0; i < length; i++)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "type name: %s\n", (const char *)type_names[i]));
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::remove_all_types");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType))
-{
-  TAO_TRY
-    {      
-      ACE_DEBUG ((LM_DEBUG, "describing all types in the Repository.\n"));
-
-      for (int i = 0; i < NUM_TYPES; i++)
-	{
-	  SERVICE_TYPE_REPOS::TypeStruct_var type_struct = 
-	    this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i],
-					 TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::remove_all_types");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType))
-{
-  TAO_TRY
-    {      
-      ACE_DEBUG ((LM_DEBUG, "fully describing all types in the Repository.\n"));
-
-      for (int i = 0; i < NUM_TYPES; i++)
-	{
-	  SERVICE_TYPE_REPOS::TypeStruct_var type_struct = 
-	    this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i],
-					       TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TAO_Service_Type_Exporter::remove_all_types");
-      TAO_RETHROW;
-    }
-  TAO_ENDTRY;
-}
-
-void
-TAO_Service_Type_Exporter::
-dump_typestruct (const char* typename,
-		 const SERVICE_TYPE_REPOS::TypeStruct& type_struct) const
-{
-  const char* mode_str[] = 
-    {
-      "Normal",
-      "Read only",
-      "Mandatory",
-      "Mandatory and Readonly"
-    };
-  
-  CORBA::Environment env;
-  ACE_DEBUG ((LM_DEBUG, "Type Name: %s\n", typename));
-  ACE_DEBUG ((LM_DEBUG, "Interface Name: %s\n", type_struct.if_name.in ()));
-
-  for (int length = type_struct.super_types.length (), i = 0; i < length; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Super Type: %s\n",
-		  (const char *) type_struct.super_types[i]));
-    }
-
-  for (length = type_struct.props.length (), i = 0; i < length; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Property: %-30s Mode: %-24s\n",
-		  type_struct.props[i].name.in (),
-		  mode_str[type_struct.props[i].mode]));
-      //		  type_struct.props[i].value_type->name (env)));
-    }
-}
-
-void
-TAO_Service_Type_Exporter::create_types (void)
-{
-  Remote_Output ro;
-  this->type_structs_[TT_Info::REMOTE_IO].props.length (3);
-  this->type_structs_[TT_Info::REMOTE_IO].props[0].name       =
-    TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME];
-  this->type_structs_[TT_Info::REMOTE_IO].props[0].value_type =
-    TT_Info::REMOTE_IO_PROPERTY_TYPES[TT_Info::NAME];
-  this->type_structs_[TT_Info::REMOTE_IO].props[0].mode       =
-    TT_Info::REMOTE_IO_PROPERTY_MODES[TT_Info::NAME];
-  this->type_structs_[TT_Info::REMOTE_IO].props[1].name       =
-    TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION];
-  this->type_structs_[TT_Info::REMOTE_IO].props[1].value_type =
-    TT_Info::REMOTE_IO_PROPERTY_TYPES[TT_Info::LOCATION];
-  this->type_structs_[TT_Info::REMOTE_IO].props[1].mode       =
-    TT_Info::REMOTE_IO_PROPERTY_MODES[TT_Info::LOCATION];
-  this->type_structs_[TT_Info::REMOTE_IO].props[2].name       =
-    TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::DESCRIPTION];
-  this->type_structs_[TT_Info::REMOTE_IO].props[2].value_type =
-    TT_Info::REMOTE_IO_PROPERTY_TYPES[TT_Info::DESCRIPTION];
-  this->type_structs_[TT_Info::REMOTE_IO].props[2].mode       =
-    TT_Info::REMOTE_IO_PROPERTY_MODES[TT_Info::DESCRIPTION];
-  this->type_structs_[TT_Info::REMOTE_IO].if_name =
-    ro._interface_repository_id ();
-
-  Plotter pl;
-  this->type_structs_[TT_Info::PLOTTER].props.length (6);
-  this->type_structs_[TT_Info::PLOTTER].super_types.length (1);
-  this->type_structs_[TT_Info::PLOTTER].super_types[0] = TT_Info::INTERFACE_NAMES[TT_Info::REMOTE_IO];
-  this->type_structs_[TT_Info::PLOTTER].props[0].name       =
-    TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_NUM_COLORS];
-  this->type_structs_[TT_Info::PLOTTER].props[0].value_type =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_NUM_COLORS];
-  this->type_structs_[TT_Info::PLOTTER].props[0].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_NUM_COLORS];
-  this->type_structs_[TT_Info::PLOTTER].props[1].name       =
-    TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_AUTO_LOADING];
-  this->type_structs_[TT_Info::PLOTTER].props[1].value_type =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_AUTO_LOADING];
-  this->type_structs_[TT_Info::PLOTTER].props[1].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_AUTO_LOADING];
-  this->type_structs_[TT_Info::PLOTTER].props[2].name       =
-    TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PLOTTER].props[2].value_type =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PLOTTER].props[2].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PLOTTER].props[3].name       =
-    TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_MODEL_NUMBER];
-  this->type_structs_[TT_Info::PLOTTER].props[3].value_type =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_MODEL_NUMBER];
-  this->type_structs_[TT_Info::PLOTTER].props[3].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_MODEL_NUMBER];
-  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 =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_USER_QUEUE];
-  this->type_structs_[TT_Info::PLOTTER].props[4].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_USER_QUEUE];
-  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 =
-    TT_Info::PLOTTER_PROPERTY_TYPES[TT_Info::PLOTTER_FILE_SIZES_PENDING];
-  this->type_structs_[TT_Info::PLOTTER].props[5].mode       =
-    TT_Info::PLOTTER_PROPERTY_MODES[TT_Info::PLOTTER_FILE_SIZES_PENDING];
-  this->type_structs_[TT_Info::PLOTTER].if_name =
-    pl._interface_repository_id ();
-
-  Printer pr;
-  this->type_structs_[TT_Info::PRINTER].props.length (7);
-  this->type_structs_[TT_Info::PRINTER].super_types.length (1);
-  this->type_structs_[TT_Info::PRINTER].super_types[0] = TT_Info::INTERFACE_NAMES[TT_Info::REMOTE_IO];
-  this->type_structs_[TT_Info::PRINTER].props[0].name       =
-    TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_COLOR];
-  this->type_structs_[TT_Info::PRINTER].props[0].value_type =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_COLOR];
-  this->type_structs_[TT_Info::PRINTER].props[0].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_COLOR];
-  this->type_structs_[TT_Info::PRINTER].props[1].name       =
-    TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_DOUBLE_SIDED];
-  this->type_structs_[TT_Info::PRINTER].props[1].value_type =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_DOUBLE_SIDED];
-  this->type_structs_[TT_Info::PRINTER].props[1].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_DOUBLE_SIDED];
-  this->type_structs_[TT_Info::PRINTER].props[2].name       =
-    TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PRINTER].props[2].value_type =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PRINTER].props[2].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_COST_PER_PAGE];
-  this->type_structs_[TT_Info::PRINTER].props[3].name       =
-    TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_MODEL_NUMBER];
-  this->type_structs_[TT_Info::PRINTER].props[3].value_type =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_MODEL_NUMBER];
-  this->type_structs_[TT_Info::PRINTER].props[3].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_MODEL_NUMBER];
-  this->type_structs_[TT_Info::PRINTER].props[4].name       =
-    TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_PAGES_PER_SEC];
-  this->type_structs_[TT_Info::PRINTER].props[4].value_type =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_PAGES_PER_SEC];
-  this->type_structs_[TT_Info::PRINTER].props[4].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_PAGES_PER_SEC];
-  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 =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_USER_QUEUE];
-  this->type_structs_[TT_Info::PRINTER].props[5].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_USER_QUEUE];
-  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 =
-    TT_Info::PRINTER_PROPERTY_TYPES[TT_Info::PRINTER_FILE_SIZES_PENDING];
-  this->type_structs_[TT_Info::PRINTER].props[6].mode       =
-    TT_Info::PRINTER_PROPERTY_MODES[TT_Info::PRINTER_FILE_SIZES_PENDING];
-  this->type_structs_[TT_Info::PRINTER].if_name =
-    pr._interface_repository_id ();
-
-  File_System fs;
-  this->type_structs_[TT_Info::FILESYSTEM].props.length (3);
-  this->type_structs_[TT_Info::FILESYSTEM].super_types.length (1);
-  this->type_structs_[TT_Info::FILESYSTEM].super_types[0] = TT_Info::INTERFACE_NAMES[TT_Info::REMOTE_IO];
-  this->type_structs_[TT_Info::FILESYSTEM].props[0].name       =
-    TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::DISK_SIZE];
-  this->type_structs_[TT_Info::FILESYSTEM].props[0].value_type =
-    TT_Info::FILESYSTEM_PROPERTY_TYPES[TT_Info::DISK_SIZE];
-  this->type_structs_[TT_Info::FILESYSTEM].props[0].mode       =
-    TT_Info::FILESYSTEM_PROPERTY_MODES[TT_Info::DISK_SIZE];
-  this->type_structs_[TT_Info::FILESYSTEM].props[1].name       =
-    TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING];
-  this->type_structs_[TT_Info::FILESYSTEM].props[1].value_type =
-    TT_Info::FILESYSTEM_PROPERTY_TYPES[TT_Info::SPACE_REMAINING];
-  this->type_structs_[TT_Info::FILESYSTEM].props[1].mode       =
-    TT_Info::FILESYSTEM_PROPERTY_MODES[TT_Info::SPACE_REMAINING];
-  this->type_structs_[TT_Info::FILESYSTEM].props[2].name       =
-    TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::PERMISSION_LEVEL];
-  this->type_structs_[TT_Info::FILESYSTEM].props[2].value_type =
-    TT_Info::FILESYSTEM_PROPERTY_TYPES[TT_Info::PERMISSION_LEVEL];
-  this->type_structs_[TT_Info::FILESYSTEM].props[2].mode       =
-    TT_Info::FILESYSTEM_PROPERTY_MODES[TT_Info::PERMISSION_LEVEL];
-  this->type_structs_[TT_Info::FILESYSTEM].if_name =
-    fs._interface_repository_id ();  
-
-  PostScript_Printer ps;
-  this->type_structs_[TT_Info::PS_PRINTER].props.length (1);
-  this->type_structs_[TT_Info::PS_PRINTER].super_types.length (1);
-  this->type_structs_[TT_Info::PS_PRINTER].super_types[0] =
-    TT_Info::INTERFACE_NAMES[TT_Info::PRINTER];
-  this->type_structs_[TT_Info::PS_PRINTER].props[0].name       =
-    TT_Info::PS_PRINTER_PROPERTY_NAMES[TT_Info::VERSION];
-  this->type_structs_[TT_Info::PS_PRINTER].props[0].value_type =
-    TT_Info::PS_PRINTER_PROPERTY_TYPES[TT_Info::VERSION];
-  this->type_structs_[TT_Info::PS_PRINTER].props[0].mode       =
-    TT_Info::PS_PRINTER_PROPERTY_MODES[TT_Info::VERSION];
-  this->type_structs_[TT_Info::PS_PRINTER].if_name =
-    ps._interface_repository_id ();  
-}
diff --git a/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.h
deleted file mode 100644
index 6a9fd615794..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/Service_Type_Exporter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-// ========================================================================
-//
-// = FILE  
-//     Offer_Exporter.h
-//
-// = DESCRIPTION
-//    Class that tests the Trading Service's Service Type Repository
-//
-// = AUTHOR
-//     Seth Widoff <sbw1@cs.wustl.edu>
-//
-// ======================================================================= 
-
-#ifndef TAO_SERVICE_TYPE_EXPORTER_H
-#define TAO_SERVICE_TYPE_EXPORTER_H
-
-#include "TT_Info.h"
-
-class TAO_Service_Type_Exporter
-{
-public:
-
-  typedef CosTradingRepos::ServiceTypeRepository SERVICE_TYPE_REPOS;
-  
-  TAO_Service_Type_Exporter (CosTradingRepos::ServiceTypeRepository_ptr str);
-
-  void remove_all_types (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType, 
-		     SERVICE_TYPE_REPOS::HasSubTypes));
-  
-  void add_all_types (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-		     CosTrading::IllegalServiceType, 
-		     SERVICE_TYPE_REPOS::ServiceTypeExists, 
-		     SERVICE_TYPE_REPOS::InterfaceTypeMismatch, 
-		     CosTrading::IllegalPropertyName, 
-		     CosTrading::DuplicatePropertyName, 
-		     SERVICE_TYPE_REPOS::ValueTypeRedefinition, 
-		     CosTrading::UnknownServiceType, 
-		     SERVICE_TYPE_REPOS::DuplicateServiceTypeName));
-
-  void list_all_types (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException));
-
-  void describe_all_types (CORBA::Environment& _env)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-		   CosTrading::IllegalServiceType, 
-		   CosTrading::UnknownServiceType));
-
-  void fully_describe_all_types (CORBA::Environment& _env)
-    TAO_THROW_SPEC ((CORBA::SystemException, 
-		     CosTrading::IllegalServiceType, 
-		     CosTrading::UnknownServiceType));
-  
-private:
-
-  void create_types (void);
-
-  void dump_typestruct (const char* typename,
-			const SERVICE_TYPE_REPOS::TypeStruct& type_struct) const;
-  
-  CosTradingRepos::ServiceTypeRepository_var repos_;
-  SERVICE_TYPE_REPOS::TypeStruct type_structs_[NUM_TYPES];
-};
-
-#endif /* TAO_SERVICE_TYPE_EXPORTER_H */
diff --git a/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp b/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp
deleted file mode 100644
index 2dd92883eaa..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/TT_Info.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-// $Id$
-#include "TT_Info.h"
-#include "orbsvcs/Trader/Property_Evaluator.h"
-
-const char* TT_Info::INTERFACE_NAMES[] = 
-{
-  "Remote_IO",
-  "Plotter",
-  "Printer",
-  "File_System",
-  "PostScript_Printer"
-};
-
-const char* TT_Info::REMOTE_IO_NAME = "Remote_IO";
-
-const char* TT_Info::REMOTE_IO_PROPERTY_NAMES[] = 
-{
-  "Name",
-  "Location",
-  "Description"
-};
-
-CORBA::TypeCode_ptr TT_Info::REMOTE_IO_PROPERTY_TYPES[] =
-{
-  CORBA::_tc_string,
-  CORBA::_tc_string,
-  CORBA::_tc_string
-};
-
-CosTradingRepos::ServiceTypeRepository::PropertyMode
-TT_Info::REMOTE_IO_PROPERTY_MODES[] =
-{
-  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-};
-
-const char* TT_Info::PLOTTER_NAME = "Plotter";
-
-const char* TT_Info::PLOTTER_PROPERTY_NAMES[] = 
-{
-  "Num_Colors",
-  "Auto_Loading",
-  "Cost_Per_Page",
-  "Model_Number",
-  "User_Queue",
-  "File_Sizes_Pending"
-};
-
-CORBA::TypeCode_ptr TT_Info::PLOTTER_PROPERTY_TYPES[] =
-{
-  CORBA::_tc_long,
-  CORBA::_tc_boolean,
-  CORBA::_tc_float,
-  CORBA::_tc_string,
-  TAO_Sequences::_tc_StringSeq,
-  TAO_Sequences::_tc_ULongSeq
-};
-
-CosTradingRepos::ServiceTypeRepository::PropertyMode
-TT_Info::PLOTTER_PROPERTY_MODES[] =
-{
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL
-};
-
-const char* TT_Info::PRINTER_NAME = "Printer";
-
-const char* TT_Info::PRINTER_PROPERTY_NAMES[] = 
-{
-  "Color",
-  "Double_Sided",
-  "Cost_Per_Page",
-  "Model_Number",
-  "Pages_Per_Sec",
-  "User_Queue",
-  "File_Sizes_Pending"
-};
-
-CORBA::TypeCode_ptr TT_Info::PRINTER_PROPERTY_TYPES[] =
-{
-  CORBA::_tc_boolean,
-  CORBA::_tc_boolean,
-  CORBA::_tc_float,
-  CORBA::_tc_string,
-  CORBA::_tc_ushort,
-  TAO_Sequences::_tc_StringSeq,
-  TAO_Sequences::_tc_ULongSeq
-};
-
-CosTradingRepos::ServiceTypeRepository::PropertyMode
-TT_Info::PRINTER_PROPERTY_MODES[] =
-{
-  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL
-};
-
-const char* TT_Info::FILESYSTEM_NAME = "File_System";
-
-const char* TT_Info::FILESYSTEM_PROPERTY_NAMES[] =
-{
-  "Disk_Space",
-  "Space_Remaining",
-  "Permission_Level"
-};
-
-CORBA::TypeCode_ptr TT_Info::FILESYSTEM_PROPERTY_TYPES[] =
-{
-  CORBA::_tc_ulong,
-  CORBA::_tc_ulong,
-  CORBA::_tc_ushort
-};
-
-CosTradingRepos::ServiceTypeRepository::PropertyMode
-TT_Info::FILESYSTEM_PROPERTY_MODES[] =
-{
-  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL,
-  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL
-};
-
-const char* TT_Info::PS_PRINTER_PROPERTY_NAMES[] = 
-{
-  "Version"
-};
-
-
-const char* TT_Info::PS_PRINTER_NAME = "PostScript_Printer";
-
-CORBA::TypeCode_ptr TT_Info::PS_PRINTER_PROPERTY_TYPES[] =
-{
-  CORBA::_tc_ushort
-};
-
-CosTradingRepos::ServiceTypeRepository::PropertyMode
-TT_Info::PS_PRINTER_PROPERTY_MODES[] =
-{
-  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY
-};
-
-const char* TT_Info::LOCATIONS[] =
-{
-  "Bryan 509",
-  "Bryan 503",
-  "Dunker 102",
-  "Jolley 408",
-  "Lopata 401",
-  "January 110",
-  "Cupples I 30",
-  "Cupples II 201",
-  "Urbauer 321",
-  "Umrath 302",
-  "Wilson 110",
-  "Olin 239",
-  "Simon 238",
-  "Rebstock 232",
-  "McMillan 123"
-};
-
-const char* TT_Info::USERS[] = 
-{
-  "sbw1",
-  "schmidt",
-  "naga",
-  "alex",
-  "mk1",
-  "marina",
-  "sumedh",
-  "sergio",
-  "coryan",
-  "cdgill",
-  "levine",
-  "jxh",
-  "irfan",
-  "nanbor",
-  "eea1",
-  "brunsch"
-};
-
-const char* TT_Info::MODEL_NUMBERS[] =
-{
-  "HP238293892bn2398",
-  "PK92839nkse092309",
-  "8328323n293kljs98",
-  "29309sjdkq34jksd2",
-  "09q834efjhqw834q3",
-  "q9834fdkjwq0934kf",
-  "q834jfda09q834djk",
-  "kajsd09q384kjda90",
-  "9p83q4jklsdj098q3",
-  "09a834ojfda09wu3r",
-  "09234kejdfq934jed",
-  "0q83kjefd09384jda",
-  "asdfj0283jkdf0923",
-  "kladfp72wu34j230f",
-  "9q834jidlj234ujof"
-};
-
-const int TT_Info::NUM_QUERIES = 1;
-const char* TT_Info::QUERIES[][3] =
-{
-  {INTERFACE_NAMES[REMOTE_IO], "", ""}
-};
-
-
-void
-TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq)
-{
-  CORBA::Environment env;
-  TAO_Property_Evaluator prop_eval (prop_seq);
-  
-  for (int length = prop_seq.length (), k = 0; k < length; k++)
-    {
-      CORBA::Any* value = 0;
-      CORBA::TypeCode_ptr tc = 0;
-      ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
-      TAO_TRY
-	{
-	  value = prop_eval.property_value(k, env);
-	  TAO_CHECK_ENV;
-
-	  tc = value->type ();
-	}
-      TAO_CATCHANY
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n"));	  
-	}
-      TAO_ENDTRY;
-
-      if (tc == 0)
-	continue;
-      else if (tc->equal (CORBA::_tc_float, env))
-	{
-	  CORBA::Float f;
-	  (*value) >>= f;
-	  ACE_DEBUG ((LM_DEBUG, "%f\n", f));
-	}
-      else if (tc->equal (CORBA::_tc_double, env))
-	{
-	  CORBA::Double d;
-	  (*value) >>= d;
-	  ACE_DEBUG ((LM_DEBUG, "%f\n", d));
-	}
-      else if (tc->equal (CORBA::_tc_boolean, env))
-	{
-	  CORBA::Boolean b = 0;
-	  (*value) >>= CORBA::Any::to_boolean(b);
-	  ACE_DEBUG ((LM_DEBUG, "%s\n", b ? "TRUE" : "FALSE"));
-	}
-      else if (tc->equal (CORBA::_tc_short, env))
-	{
-	  CORBA::Short s;
-	  (*value) >>= s;
-	  ACE_DEBUG ((LM_DEBUG, "%d\n", s));
-	}
-      else if (tc->equal (CORBA::_tc_ushort, env))
-	{
-	  CORBA::UShort u;
-	  (*value) >>= u;
-	  ACE_DEBUG ((LM_DEBUG, "%d\n", u));
-	}
-      else if (tc->equal (CORBA::_tc_ulong, env))
-	{
-	  CORBA::ULong ulong;
-	  (*value) >>= ulong;
-	  ACE_DEBUG ((LM_DEBUG, "%d\n", ulong));
-	}
-      else if (tc->equal (CORBA::_tc_long, env))
-	{
-	  CORBA::Long clong;
-	  (*value) >>= clong;
-	  ACE_DEBUG ((LM_DEBUG, "%d\n", clong));
-	}      
-      else if (tc->equal (CORBA::_tc_string, env))
-	{
-	  CORBA::String_var s;
-	  (*value) >>= s.out ();
-	  ACE_DEBUG ((LM_DEBUG, "%s\n", s.in ()));
-	}      
-      else if (tc->equal (TAO_Sequences::_tc_StringSeq, env))
-	{
-	  TAO_Sequences::StringSeq str_seq;
-	  //(*value) >>= str_seq;
-
-	  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))
-	{
-	  TAO_Sequences::ULongSeq ulong_seq;
-	  //	  (*value) >>= ulong_seq;
-
-	  for (int length = ulong_seq.length (), i = 0; i < length; i++)
-	    ACE_DEBUG ((LM_DEBUG, "%d ", ulong_seq[i]));
-
-	  ACE_DEBUG ((LM_DEBUG, "\n"));
-	}
-    }
-}
-
diff --git a/TAO/orbsvcs/tests/Trading_Service/TT_Info.h b/TAO/orbsvcs/tests/Trading_Service/TT_Info.h
deleted file mode 100644
index 736fe4f0093..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/TT_Info.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef TAO_TRADER_TEST_UTILS_H
-#define TAO_TRADER_TEST_UTILS_H
-
-#include "TTestS.h"
-#include "orbsvcs/SequencesC.h"
-#include "orbsvcs/CosTradingC.h"
-
-class TT_Info
-{
-public:
-  
-  static void dump_properties (const CosTrading::PropertySeq& prop_seq);
-  // Dump the contents of this property sequence.
-
-  enum INTERFACES
-  {
-    REMOTE_IO,
-    PLOTTER,
-    PRINTER,
-    FILESYSTEM,
-    PS_PRINTER
-  };
-  
-  class Remote_Output : public POA_TAO_Trader_Test::Remote_Output
-  {
-  public:
-    Remote_Output (void) {}
-  };
-  
-  class Printer : public POA_TAO_Trader_Test::Printer
-  {
-  public:
-    Printer (void) {}
-  };
-  
-  class Plotter : public POA_TAO_Trader_Test::Plotter
-  {
-  public:
-    Plotter (void) {}
-  };
-  
-  class File_System : public POA_TAO_Trader_Test::File_System
-  {
-  public:  
-    File_System (void) {}
-  };
-  
-  class PostScript_Printer : public POA_TAO_Trader_Test::PostScript_Printer
-  {
-  public:
-    PostScript_Printer (void) {}
-  };
-
-#define NUM_TYPES 5
-  static const char* INTERFACE_NAMES[];
-  
-  // = Remote IO property descriptions
-  
-  enum REMOTE_IO_PROPERTIES
-  {
-    NAME,
-    LOCATION,
-    DESCRIPTION
-  };
-
-  static const char* REMOTE_IO_NAME;
-  static const char* REMOTE_IO_PROPERTY_NAMES[];
-  static CORBA::TypeCode_ptr REMOTE_IO_PROPERTY_TYPES[];
-  static CosTradingRepos::ServiceTypeRepository::PropertyMode REMOTE_IO_PROPERTY_MODES[];
-
-  
-  // = Plotter property descriptions 
-  
-  enum PLOTTER_PROPERTIES
-  {
-    PLOTTER_NUM_COLORS,
-    PLOTTER_AUTO_LOADING,
-    PLOTTER_COST_PER_PAGE,
-    PLOTTER_MODEL_NUMBER,
-    PLOTTER_USER_QUEUE,
-    PLOTTER_FILE_SIZES_PENDING
-  };
-
-  static const char* PLOTTER_NAME;
-  static const char* PLOTTER_PROPERTY_NAMES[]; 
-  static CORBA::TypeCode_ptr PLOTTER_PROPERTY_TYPES[];
-  static CosTradingRepos::ServiceTypeRepository::PropertyMode PLOTTER_PROPERTY_MODES[];
-  
-  // = Printer property descriptions
-  
-  enum PRINTER_PROPERTIES
-  {
-    PRINTER_COLOR,
-    PRINTER_DOUBLE_SIDED,
-    PRINTER_COST_PER_PAGE,
-    PRINTER_MODEL_NUMBER,
-    PRINTER_PAGES_PER_SEC,
-    PRINTER_USER_QUEUE,
-    PRINTER_FILE_SIZES_PENDING
-  };
-
-  static const char* PRINTER_NAME;
-  static const char* PRINTER_PROPERTY_NAMES[];
-  static CORBA::TypeCode_ptr PRINTER_PROPERTY_TYPES[];
-  static CosTradingRepos::ServiceTypeRepository::PropertyMode PRINTER_PROPERTY_MODES[];
-  
-  // = File System Property Descriptions
-  
-  enum FILESYSTEM_PROPERTIES
-  {
-    DISK_SIZE,
-    SPACE_REMAINING,
-    PERMISSION_LEVEL
-  };
-
-  static const char* FILESYSTEM_NAME;
-  static const char* FILESYSTEM_PROPERTY_NAMES[];
-  static CORBA::TypeCode_ptr FILESYSTEM_PROPERTY_TYPES[];  
-  static CosTradingRepos::ServiceTypeRepository::PropertyMode FILESYSTEM_PROPERTY_MODES[];
-
-  
-  // = PostScript Printer property descriptions.  
-  
-  enum PS_PRINTER_PROPERTIES
-  {
-    VERSION
-  };
-
-  static const char* PS_PRINTER_NAME;
-  static const char* PS_PRINTER_PROPERTY_NAMES[];
-  static CORBA::TypeCode_ptr PS_PRINTER_PROPERTY_TYPES[];
-  static CosTradingRepos::ServiceTypeRepository::PropertyMode PS_PRINTER_PROPERTY_MODES[];
-  
-  // = Offer Info
-
-#define NUM_OFFERS 15
-  static const char* LOCATIONS[];
-  static const char* USERS[];
-  static const char* MODEL_NUMBERS[];
-
-  // = Query info
-  
-  static const int NUM_QUERIES;
-  static const char* QUERIES[][3];  
-};
-
-#endif /* TAO_TRADER_TEST_UTILS_H */
diff --git a/TAO/orbsvcs/tests/Trading_Service/TTest.idl b/TAO/orbsvcs/tests/Trading_Service/TTest.idl
deleted file mode 100644
index 59145c58dc3..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/TTest.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-module TAO_Trader_Test
-{
-  
-interface Remote_Output
-{
-};
-
-interface Plotter : Remote_Output
-{
-};
-
-interface Printer : Remote_Output
-{
-};
-
-interface File_System : Remote_Output
-{
-};
-
-interface PostScript_Printer : Remote_Output
-{
-};
-
-};
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Trading_Service/export_test.cpp b/TAO/orbsvcs/tests/Trading_Service/export_test.cpp
deleted file mode 100644
index 5394d411990..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/export_test.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// $Id$
-
-#include "Offer_Exporter.h"
-#include "Offer_Importer.h"
-#include "Service_Type_Exporter.h"
-#include "ace/Auto_Ptr.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-
-int
-main (int argc, char** argv)
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Bootstrap to the Lookup interface.
-      ACE_DEBUG ((LM_ERROR, "Bootstrap to the Lookup interface.\n"));
-      CORBA::Object_var trading_obj =
-	orb->resolve_initial_references ("TradingService");
-      
-      if (CORBA::is_nil (trading_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  -1);
-      
-      // Narrow the lookup interface.
-      ACE_DEBUG ((LM_DEBUG, "Narrowing the lookup interface.\n"));
-      CosTrading::Lookup_var lookup_if = 
-	CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Obtain the register interface
-      ACE_DEBUG ((LM_DEBUG, "Obtaining the register interface.\n"));
-      CosTrading::Register_var register_if =
-	lookup_if->register_if (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // 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_Support_Attributes_Impl& sup_attr = trader->support_attributes ();
-      TAO_Trading_Components_Impl& trd_comp = trader->trading_components ();
-
-      // Set the service type repository
-      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 ());
-
-      type_exporter.remove_all_types (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      type_exporter.add_all_types (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      type_exporter.list_all_types (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      type_exporter.describe_all_types (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      type_exporter.fully_describe_all_types (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the Offer Exporter tests
-      ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (register_if.in (), TAO_TRY_ENV);
-      //      TAO_Offer_Exporter offer_exporter
-      //	(CosTrading::Register::_duplicate (trd_comp.register_if ()),
-      //	 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-	    
-      offer_exporter.withdraw_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      offer_exporter.export_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      offer_exporter.describe_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      //      offer_exporter.modify_offers (TAO_TRY_ENV);
-      //TAO_CHECK_ENV;
-
-      //offer_exporter.describe_offers (TAO_TRY_ENV);
-      //TAO_CHECK_ENV;
-
-      //offer_exporter.withdraw_offers_using_constraints (TAO_TRY_ENV);
-      //TAO_CHECK_ENV;
-
-      //offer_exporter.describe_offers (TAO_TRY_ENV);
-      //TAO_CHECK_ENV;      
-
-      offer_exporter.withdraw_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;      
-
-      offer_exporter.export_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;      
-
-      offer_exporter.describe_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;      
-      
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the Offer Importer tests
-      //ACE_DEBUG ((LM_DEBUG, "Running the Offer Exporter tests.\n"));
-      //      TAO_Offer_Exporter offer_exporter (register_if.in (), TAO_TRY_ENV);
-      //TAO_Offer_Importer offer_importer
-      //	(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()));
-      //      TAO_CHECK_ENV;
-
-      //      offer_importer.perform_queries (TAO_TRY_ENV);
-      //      TAO_CHECK_ENV;
-      
-      // Begin trading! 
-      if (orb->run () == -1)
-      	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1);
-    }
-  TAO_ENDTRY;
-}
diff --git a/TAO/orbsvcs/tests/Trading_Service/import_test.cpp b/TAO/orbsvcs/tests/Trading_Service/import_test.cpp
deleted file mode 100644
index 9398d052c1e..00000000000
--- a/TAO/orbsvcs/tests/Trading_Service/import_test.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "Offer_Importer.h"
-
-int
-main (int argc, char** argv)
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-
-      // Bootstrap to the Lookup interface.
-      ACE_DEBUG ((LM_ERROR, "Bootstrap to the Lookup interface.\n"));
-      CORBA::Object_var trading_obj =
-	orb->resolve_initial_references ("TradingService");
-      
-      if (CORBA::is_nil (trading_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  -1);
-      
-      // Narrow the lookup interface.
-      ACE_DEBUG ((LM_DEBUG, "Narrowing the lookup interface.\n"));
-      CosTrading::Lookup_var lookup_if = 
-	CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      
-      // Run the Offer Importer tests
-      ACE_DEBUG ((LM_DEBUG, "Running the Offer Importer tests.\n"));
-      TAO_Offer_Importer offer_importer (lookup_if.in ());
-      
-      offer_importer.perform_queries (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      offer_importer.perform_federated_queries (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Import Tests Failed."), -1);
-    }
-  TAO_ENDTRY;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
deleted file mode 100644
index 2db17eadaee..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     =  -lTAO -lorbsvcs $(MATHLIB)
-
-IDL_SRC	= cubitC.cpp cubitS.cpp
-PROG_SRCS = server.cpp \
-	cubit_i.cpp \
-	Task_Client.cpp \
-	client.cpp \
-	Util_Thread.cpp \
-	tmplinst.cpp
-
-LSRC = $(IDL_SRC) $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = \
-	cubitC.o \
-	cubitS.o \
-	server.o \
-	cubit_i.o \
-	tmplinst.o
-CUBIT_CLIENT_OBJS = \
-	cubitC.o \
-	cubitS.o \
-	Task_Client.o \
-	client.o \
-	Util_Thread.o \
-	tmplinst.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-#CPPFLAGS += -DACE_NLOGGING
-
-#CXX := purify $(CXX)
-
-LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/tao/compat
-##POSTLINK += -lnk="-n -T $(VME_ROOT)/src/act/slots/act_s2.ld" 
-.PRECIOUS: cubitC.h cubitC.i cubitC.cpp cubitS.h cubitS.i cubitS.cpp
-
-server:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)  $(POSTLINK)
-## -lnk="-n -T $(VME_ROOT)/src/act/slots/act_s2.ld"
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
deleted file mode 100644
index b6c463e94ca..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
+++ /dev/null
@@ -1,75 +0,0 @@
-The MT-Cubit example
---------------------
-
-Compiling
----------
-
-Makefile is provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./server -p <port_num> -h <my_hostname> -t <number_of_servants>
-
-port_num is the port number at which the server will start the first
-(and highest priority) servant. Successive servants (with successively
-lower priorities) will be created starting at (port_num+1). The -n
-parameter specifies the total number of servants.
-
-The server will print the IOR of the servants, but it is not required
-by the client.
-
-client:
--------
-
-./client [-ORBobjrefstyle url] 
-	 [-p <port_num>]
- 	 [-h <server_hostname>]
-         [-d <datatype>]
-	 [-n <num_calls>]
- 	 [-t <num_of_clients>]
-	 [-r]
-
-[-ORBobjrefstyle url]  Makes the IOR appear in URL format instead 
-   of that ugly number sequence format.
-
-<port_num> is the port number of the highest priority servant and
-   should be the same as the port_num supplied to the server, as
-   described earlier. The lower priority servant is assumed to be at
-   (port_num+1).
-
-<server_hostname> is the hostname of the server.
-
-   Based on the server_hostname and the port_num, the client
-   automatically constructs the IOR's for the servants
-
-<datatype> is one of the following:
-
-   0 Octet
-   1 Short
-   2 Long
-   3 Struct of the above 3 types
-
-<num_calls> is the number of CORBA twoway calls to be made
-
-<num_of_clients> is the total number of concurrent clients to be
-   created. The clients will have successively decreasing
-   priorities. 
-
-[-r] this option can be used to turn on the thread-per-rate tests.
-
-[-o] enables oneway calls instead of two-way calls.  The oneway call 
-   is a noop call (for now).
-
-[-x] makes the client call the shutdown() method on the servant which 
-   invokes the shutdown() method on the ORB and causes it to exit.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority clients. Jitter
-(standard deviation of the latency) is also printed by the client.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
deleted file mode 100644
index bb7ce38b643..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ /dev/null
@@ -1,847 +0,0 @@
-// $Id$
-
-#include "Task_Client.h"
-
-Task_State::Task_State (int argc, char **argv)
-  : key_ ("Cubit"),
-    start_count_ (0),
-    loop_count_ (5),
-    thread_count_ (5),
-    datatype_ (CB_OCTET),
-    argc_ (argc),
-    argv_ (argv),
-    thread_per_rate_ (0),
-    global_jitter_array_ (0),
-    factory_ior_ (0),
-    shutdown_ (0),
-    oneway_ (0),
-    use_name_service_ (1),
-    ior_file_ (0),
-    use_sysbench_ (0)
-{
-  ACE_Get_Opt opts (argc, argv, "sn:t:d:rk:xof:y");
-  int c;
-  int datatype;
-
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'y':
-      use_sysbench_ = 1;
-      break;
-    case 's':
-      use_name_service_ = 0;
-      break;
-    case 'k':
-      factory_ior_ = ACE_OS::strdup (opts.optarg);
-      break;
-    case 'f':
-      ior_file_ = ACE_OS::strdup (opts.optarg);
-      break;
-    case 'o':
-      oneway_ = 1;
-      break;
-    case 'x':
-      shutdown_ = 1;
-      break;
-    case 'r':
-      thread_per_rate_ = 1;
-      break;
-    case 'd':
-      datatype = ACE_OS::atoi (opts.optarg);
-      switch (datatype)
-        {
-        case CB_OCTET:
-          ACE_DEBUG ((LM_DEBUG, "Testing Octets\n"));
-          datatype_ = CB_OCTET;
-          break;
-        case CB_LONG:
-          ACE_DEBUG ((LM_DEBUG, "Testing Longs\n"));
-          datatype_ = CB_LONG;
-          break;
-        case CB_STRUCT:
-          ACE_DEBUG ((LM_DEBUG, "Testing Structs\n"));
-          datatype_ = CB_STRUCT;
-          break;
-        case CB_SHORT:
-        default:
-          ACE_DEBUG ((LM_DEBUG, "Testing Shorts\n"));
-          datatype_ = CB_SHORT;
-          break;
-        }
-      continue;
-    case 'n':                   // loop count
-      loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case 't':
-      thread_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case '?':
-    default:
-      ACE_DEBUG ((LM_DEBUG, "usage:  %s"
-                  "[-d datatype Octet=0, Short=1, Long=2, Struct=3]"
-                  " [-n num_calls]"
-                  " [-t num_threads]"
-                  " [-k factory_ior_key]"
-                  " [-f ior_file]"
-                  " [-x] // makes a call to servant to shutdown"
-                  " [-o] // makes client use oneway calls instead"
-                  " [-s] // makes client *NOT* use the name service"
-                  "\n", argv [0]));
-    }
-
-  // allocate the array of character pointers.
-  ACE_NEW (iors_,
-           char *[thread_count_]);
-
-  if (ior_file_ != 0)
-    {
-      FILE *ior_file = ACE_OS::fopen (ior_file_, "r");
-      char buf[BUFSIZ];
-      int i = 0;
-      int j = 0;
-
-      while (ACE_OS::fgets (buf, BUFSIZ, ior_file) != 0)
-        {
-          j = ACE_OS::strlen (buf);
-          buf[j - 1] = 0;  // this is to delete the "\n" that was read from the file.
-          iors_[i] = ACE_OS::strdup (buf);
-          i++;
-        }
-
-      ACE_OS::fclose (ior_file);
-    }
-
-  // thread_count_ + 1 because there is one utilization thread also
-  // wanting to begin at the same time the clients begin..
-  ACE_NEW (barrier_,
-           ACE_Barrier (thread_count_ + 1));
-  ACE_NEW (latency_,
-           double [thread_count_]);
-  ACE_NEW (global_jitter_array_,
-           double *[thread_count_]);
-}
-
-Client::Client (Task_State *ts)
-  : ACE_MT (ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())),
-    ts_ (ts)
-{
-}
-
-void
-Client::put_latency (double *jitter,
-                     double latency,
-                     u_int thread_id)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, ts_->lock_));
-
-  ts_->latency_[thread_id] = latency;
-  ts_->global_jitter_array_[thread_id] = jitter;
-
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) My latency was %u\n",
-              latency));
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) My latency was %f\n",
-              latency));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-}
-
-double
-Client::get_high_priority_latency (void)
-{
-  return (double) ts_->latency_ [0];
-}
-
-double
-Client::get_low_priority_latency (void)
-{
-  double l = 0;
-
-  for (u_int i = 1; i < ts_->start_count_; i++)
-    l += (double) ts_->latency_[i];
-
-  return ts_->start_count_ > 1? l / (double) (ts_->start_count_ - 1) : 0;
-}
-
-int
-Client::get_latency (u_int thread_id)
-{
-  return ts_->latency_ [thread_id];
-}
-
-double
-Client::get_high_priority_jitter (void)
-{
-  double jitter = 0;
-  double average = get_high_priority_latency ();
-
-  // Compute the standard deviation (i.e. jitter) from the values
-  // stored in the global_jitter_array_.
-
-  // we first compute the sum of the squares of the differences
-  // each latency has from the average
-  for (u_int i = 0; i < ts_->loop_count_; i ++)
-    {
-      double difference =
-        ts_->global_jitter_array_ [0][i] - average;
-      jitter += difference * difference;
-    }
-
-  // Return the square root of the sum of the differences computed
-  // above, i.e. jitter.
-  return sqrt (jitter);
-}
-
-double
-Client::get_low_priority_jitter (void)
-{
-  double jitter = 0;
-  double average = get_low_priority_latency ();
-
-  // Compute the standard deviation (i.e. jitter) from the values
-  // stored in the global_jitter_array_.
-
-  // We first compute the sum of the squares of the differences each
-  // latency has from the average.
-  for (u_int j = 1; j < ts_->start_count_; j ++)
-    for (u_int i = 0; i < ts_->loop_count_; i ++)
-      {
-        double difference = ts_->global_jitter_array_[j][i] - average;
-        jitter += difference * difference;
-      }
-
-  // Return the square root of the sum of the differences computed
-  // above, i.e. jitter.
-  return sqrt (jitter);
-}
-
-int
-Client::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Thread created\n"));
-
-  u_int thread_id;
-  Cubit_ptr cb = 0;
-  CORBA::ORB_var orb;
-  CORBA::Object_var objref (0);
-  CORBA::Object_var naming_obj (0);
-  CORBA::Environment env;
-
-  double frequency = 0.0;
-
-  /// Add "-ORBobjrefstyle url" argument to the argv vector for the
-  //orb to / use a URL style to represent the ior.
-
-  // Convert the argv vector into a string.
-  ACE_ARGV tmp_args (ts_->argv_);
-  char tmp_buf[BUFSIZ];
-
-  ACE_OS::strcpy (tmp_buf,
-                  tmp_args.buf ());
-
-  // Add the argument.
-  ACE_OS::strcat (tmp_buf,
-                  " -ORBobjrefstyle url ");
-
-  // Convert back to argv vector style.
-  ACE_ARGV tmp_args2 (tmp_buf);
-  int argc = tmp_args2.argc ();
-
-  char *const *argv = tmp_args2.argv ();
-
-  u_int naming_success = CORBA::B_FALSE;
-
-  orb = CORBA::ORB_init (argc,
-                         argv,
-                         "internet",
-                         env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB_init()\n");
-      return -1;
-    }
-
-  if (ts_->use_name_service_ != 0)
-    {
-      naming_obj =
-        orb->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR ((LM_ERROR,
-                    " (%P|%t) Unable to resolve the Name Service.\n"));
-      else
-        this->naming_context_ =
-          CosNaming::NamingContext::_narrow (naming_obj.in (), env);
-    }
-
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, ts_->lock_, -1));
-
-    thread_id = ts_->start_count_;
-    ts_->start_count_++;
-
-    if (ts_->thread_per_rate_ == 0)
-      {
-        if (thread_id == 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im the high priority client, my id is %d.\n",
-                        thread_id));
-            frequency = CB_HIGH_PRIORITY_RATE;
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im a low priority client, my id is %d\n",
-                        thread_id));
-            frequency = CB_LOW_PRIORITY_RATE;
-          }
-      }
-    else
-      switch (thread_id)
-        {
-        case CB_40HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_40HZ_CONSUMER_RATE;
-          break;
-        case CB_20HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_20HZ_CONSUMER_RATE;
-          break;
-        case CB_10HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_10HZ_CONSUMER_RATE;
-          break;
-        case CB_5HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_5HZ_CONSUMER_RATE;
-          break;
-        case CB_1HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_1HZ_CONSUMER_RATE;
-          break;
-        default:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Invalid Thread ID.\n", thread_id));
-        }
-
-    TAO_TRY
-      {
-        // if the naming service was resolved successsfully ...
-        if (!CORBA::is_nil (this->naming_context_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        " (%t) ----- Using the NameService resolve() method to get cubit objects -----\n"));
-
-            // Construct the key for the name service lookup.
-            CosNaming::Name mt_cubit_context_name (1);
-            mt_cubit_context_name.length (1);
-            mt_cubit_context_name[0].id = CORBA::string_dup ("MT_Cubit");
-
-            objref =
-              this->naming_context_->resolve (mt_cubit_context_name,
-                                              TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            this->mt_cubit_context_ =
-              CosNaming::NamingContext::_narrow (objref.in (),
-                                                 TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            char *buffer;
-            int l = ACE_OS::strlen (ts_->key_) + 3;
-            ACE_NEW_RETURN (buffer,
-                            char[l],
-                            -1);
-
-            ACE_OS::sprintf (buffer,
-                             "%s%02d",
-                             (char *) ts_->key_,
-                             thread_id);
-
-            // Construct the key for the name service lookup.
-            CosNaming::Name cubit_name (1);
-            cubit_name.length (1);
-            cubit_name[0].id = CORBA::string_dup (buffer);
-
-            objref = this->mt_cubit_context_->resolve (cubit_name,
-                                                       TAO_TRY_ENV);
-
-            if (TAO_TRY_ENV.exception () != 0
-                || CORBA::is_nil (objref.in ()))
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) resolve() returned nil\n"));
-                TAO_TRY_ENV.print_exception ("Attempt to resolve() a cubit object using the name service Failed!\n");
-              }
-            else
-              {
-                naming_success = CORBA::B_TRUE;
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) Cubit object resolved to the name \"%s\".\n",
-                            buffer));
-              }
-          }
-
-        if (naming_success == CORBA::B_FALSE && ts_->factory_ior_ != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        " (%t) ----- Using the factory IOR method to get cubit objects -----\n"));
-
-            objref =
-              orb->string_to_object (ts_->factory_ior_, TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (CORBA::is_nil (objref.in ()))
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%s:  must identify non-null target objref\n",
-                                 ts_->argv_ [0]),
-                                1);
-
-            // Narrow the CORBA::Object reference to the stub object,
-            // checking the type along the way using _is_a.
-            Cubit_Factory_var cb_factory =
-              Cubit_Factory::_narrow (objref.in (),
-                                      TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (CORBA::is_nil (cb_factory.in ()))
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Create cubit factory failed\n"),
-                                1);
-
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) >>> Factory binding succeeded\n"));
-
-
-            char * tmp_ior = cb_factory->create_cubit (thread_id,
-                                                       TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (tmp_ior == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "create_cubit() returned a null pointer!\n"),
-                                 -1);
-
-            char *my_ior = ACE_OS::strdup (tmp_ior);
-
-            TAO_CHECK_ENV;
-
-            objref = orb->string_to_object (my_ior,
-                                            TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-          }
-        else
-          {
-            char *my_ior = ts_->iors_[thread_id];
-
-            if (my_ior == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Must specify valid factory ior key with -k option,"
-                                 " naming service, or ior filename\n"),
-                                -1);
-
-            objref = orb->string_to_object (my_ior,
-                                            TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-          }
-
-        if (CORBA::is_nil (objref.in ()))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             " (%t) string_to_object or NameService->resolve() Failed!\n"),
-                            -1);
-
-        // Narrow the CORBA::Object reference to the stub object,
-        // checking the type along the way using _is_a.
-        cb = Cubit::_narrow (objref.in (),
-                             TAO_TRY_ENV);
-        TAO_CHECK_ENV;
-
-        if (CORBA::is_nil (cb))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Create cubit failed\n"),
-                            1);
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) Binding succeeded\n"));
-
-        CORBA::String_var str =
-          orb->object_to_string (cb, TAO_TRY_ENV);
-        TAO_CHECK_ENV;
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) CUBIT OBJECT connected <%s>\n",
-                    str.in ()));
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) Waiting for other threads to "
-                    "finish binding..\n"));
-      }
-    TAO_CATCHANY
-      {
-        TAO_TRY_ENV.print_exception ("get_object");
-        return 1;
-      }
-    TAO_ENDTRY;
-  }
-
-  // Wait for all the client threads to be initialized before going
-  // any further.
-  ts_->barrier_->wait ();
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Everyone's done, here I go!!\n"));
-
-  if (ts_->oneway_ == 1)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%t) **** USING ONEWAY CALLS ****\n"));
-
-  // Perform the tests.
-  int result = this->run_tests (cb,
-                                ts_->loop_count_,
-                                thread_id,
-                                ts_->datatype_,
-                                frequency);
-
-  if (result == -1)
-    return -1;
-
-  if (ts_->shutdown_)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-      cb->shutdown (env);
-      if (env.exception () != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Shutdown of the server failed!\n"));
-          env.print_exception ("shutdown() call failed.\n");
-        }
-    }
-  return 0;
-}
-
-int
-Client::run_tests (Cubit_ptr cb,
-                   u_int loop_count,
-                   u_int thread_id,
-                   Cubit_Datatypes datatype,
-                   double frequency)
-{
-  CORBA::Environment env;
-  u_int i = 0;
-  u_int call_count = 0;
-  u_int error_count = 0;
-  double *my_jitter_array;
-
-  ACE_NEW_RETURN (my_jitter_array,
-                  double [loop_count],
-                  -1);
-
-  double latency = 0;
-  double sleep_time = (1 / frequency) * (1000 * 1000);
-  double delta = 0;
-
-#if defined (USE_QUANTIFY)
-  quantify_stop_recording_data();
-  quantify_clear_data ();
-#endif /* USE_QUANTIFY */
-
-  // Make the calls in a loop.
-
-  for (i = 0; i < loop_count; i++)
-    {
-      ACE_High_Res_Timer timer_;
-      ACE_Time_Value tv (0, (long int) (sleep_time - delta));
-      ACE_OS::sleep (tv);
-
-      // Elapsed time will be in microseconds.
-      ACE_Time_Value delta_t;
-
-      // use sysBench when CHORUS defined and option specified on command line
-#if defined (CHORUS)      
-      if (ts_->use_sysbench_ == 1)
-	timer_.start (ACE_OS::ACE_HRTIMER_START); 
-      else 
-#endif /* CHORUS */
-	timer_.start ();
-
-      if (ts_->oneway_ == 0)
-        {
-          switch (datatype)
-            {
-            case CB_OCTET:
-              {
-                // Cube an octet.
-                CORBA::Octet arg_octet = func (i), ret_octet = 0;
-
-#if defined (USE_QUANTIFY)
-                /* start recording quantify data from here */
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-                ret_octet = cb->cube_octet (arg_octet, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_octet()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-                arg_octet = arg_octet * arg_octet * arg_octet;
-
-                if (arg_octet != ret_octet)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_octet(%d)  (--> %d)\n",
-                                arg_octet,
-                                ret_octet));
-                    error_count++;
-                  }
-                call_count++;
-                break;
-              }
-            case CB_SHORT:
-              // Cube a short.
-              {
-                call_count++;
-
-                CORBA::Short arg_short = func (i), ret_short;
-
-#if defined (USE_QUANTIFY)
-                // start recording quantify data from here.
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_short = cb->cube_short (arg_short, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_short()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-
-                arg_short = arg_short * arg_short * arg_short;
-
-                if (arg_short != ret_short)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_short(%d)  (--> %d)\n",
-                                arg_short ,
-                                ret_short));
-                    error_count++;
-                  }
-                break;
-              }
-            // Cube a long.
-
-            case CB_LONG:
-              {
-                call_count++;
-
-                CORBA::Long arg_long = func (i);
-                CORBA::Long ret_long;
-
-#if defined (USE_QUANTIFY)
-                /* start recording quantify data from here */
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_long = cb->cube_long (arg_long, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_long()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-
-                arg_long = arg_long * arg_long * arg_long;
-
-                if (arg_long != ret_long)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_long(%d)  (--> %d)\n",
-                                arg_long,
-                                ret_long));
-                    error_count++;
-                  }
-                break;
-              }
-
-            case CB_STRUCT:
-              // Cube a "struct" ...
-              {
-                Cubit::Many arg_struct, ret_struct;
-
-                call_count++;
-
-                arg_struct.l = func (i);
-                arg_struct.s = func (i);
-                arg_struct.o = func (i);
-
-#if defined (USE_QUANTIFY)
-                // start recording quantify data from here.
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_struct = cb->cube_struct (arg_struct, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_struct()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-                  }
-
-                arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-                arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-                arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-
-                if (arg_struct.l  != ret_struct.l
-                    || arg_struct.s  != ret_struct.s
-                    || arg_struct.o  != ret_struct.o )
-                  {
-                    ACE_DEBUG ((LM_DEBUG, "**cube_struct error!\n"));
-                    error_count++;
-                  }
-
-                break;
-              }
-            default:
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%P|%t); %s:%d; unexpected datatype: %d\n",
-                                 datatype), -1);
-            }
-        }
-      else
-        {
-          call_count++;
-#if defined (USE_QUANTIFY)
-          // start recording quantify data from here.
-          quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-          cb->noop (env);
-#if defined (USE_QUANTIFY)
-          quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-          if (env.exception () != 0)
-            {
-              env.print_exception ("oneway call noop()\n");
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%t) noop() call failed\n"),
-                                2);
-            }
-        }
-
-      // use sysBench when CHORUS defined and option specified on command line
-#if defined (CHORUS)      
-      if (ts_->use_sysbench_ == 1)
-	timer_.stop (ACE_OS::ACE_HRTIMER_STOP); 
-      else 
-#endif /* CHORUS */
-      // if CHORUS is not defined just use plain timer_.stop ().
-      timer_.stop (); 
-
-      timer_.elapsed_time (delta_t);
-
-      double real_time = 0.0;
-
-#if !defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE) && defined (ACE_LACKS_FLOATING_POINT)
-      // Store the time in usecs.
-      real_time = delta_t.sec () * ACE_ONE_SECOND_IN_USECS  +
-        delta_t.usec ();
-
-      delta = ((40 * fabs (real_time) / 100) + (60 * delta / 100)); // pow(10,6)
-      latency += real_time;
-      my_jitter_array [i] = real_time; // in units of microseconds.
-#else
-      // Store the time in secs.
-      real_time = delta_t.sec () + (double)delta_t.usec () / ACE_ONE_SECOND_IN_USECS;
-
-      delta = ((40 * fabs (real_time * (1000 * 1000)) / 100) + (60 * delta / 100)); // pow(10,6)
-      latency += real_time;
-      my_jitter_array [i] = real_time * 1000;
-#endif /* !defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE) && defined (ACE_LACKS_FLOATING_POINT) */
-    }
-
-  if (call_count > 0)
-    {
-      if (error_count == 0)
-        {
-#if defined (ACE_LACKS_FLOATING_POINT)
-          double calls_per_second = (call_count * ACE_ONE_SECOND_IN_USECS) / latency;
-#endif /* ACE_LACKS_FLOATING_POINT */
-
-          latency /= call_count; // calc average latency
-
-          if (latency > 0)
-            {
-#if defined (ACE_LACKS_FLOATING_POINT)
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) cube average call ACE_OS::time\t= %u usec, \t"
-                          "%u calls/second\n",
-                          latency,
-                          calls_per_second));
-
-              this->put_latency (my_jitter_array, latency, thread_id);
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) cube average call ACE_OS::time\t= %f msec, \t"
-                          "%f calls/second\n",
-                          latency * 1000,
-                          1 / latency));
-              this->put_latency (my_jitter_array,
-                                 latency * 1000,
-                                 thread_id);
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-            }
-          else
-            {
-              // still we have to call this function to store a valid array pointer.
-              this->put_latency (my_jitter_array,
-                                 0,
-                                 thread_id);
-              ACE_DEBUG ((LM_DEBUG,
-                          "*** Warning: Latency is less than or equal to zero."
-                          "  Precision may have been lost.\n"));
-            }
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d calls, %d errors\n",
-                  call_count,
-                  error_count));
-    }
-
-  // cb->please_exit (env);
-  return 0;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
deleted file mode 100644
index b7ef4352b82..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Task_Client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (TASK_CLIENT_H)
-#define TASK_CLIENT_H
-
-#include <math.h>
-
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include "ace/ARGV.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "cubitC.h"
-
-// @@ Should we put this into a more general file, e.g., OS.h?
-//
-// I will integrate this, together with the sqrt() function when
-// the implementation is complete.  --Sergio.
-#if defined (ACE_LACKS_FLOATING_POINT)
-#define double ACE_UINT32
-#define fabs(X) ((X) >= 0 ? (X) : -(X))
-// the following is just temporary, until we finish the sqrt()
-// implementation.
-#define sqrt(X) (1)
-#endif /* ACE_LACKS_FLOATING_POINT */
-
-#if !defined (ACE_HAS_THREADS)
-class NOOP_ACE_Barrier
-{
-public:
-  NOOP_ACE_Barrier (int) {}
-  void wait (void) {}
-};
-#define ACE_Barrier NOOP_ACE_Barrier
-#endif /* ACE_HAS_THREADS */
-
-// Arbitrary generator used by the client to create the numbers to be
-// cubed.
-static inline int 
-func (u_int i) 
-{ 
-  return i - 117; 
-}
-
-enum Cubit_Datatypes
-{
-  // = The various datatypes the client and the server can exchange.
-  CB_OCTET,
-  CB_SHORT,
-  CB_LONG,
-  CB_STRUCT,
-
-  // = Rate constants.
-  CB_40HZ_CONSUMER = 0,
-  CB_20HZ_CONSUMER = 1,
-  CB_10HZ_CONSUMER = 2,
-  CB_5HZ_CONSUMER = 3,
-  CB_1HZ_CONSUMER = 4,
-
-  CB_40HZ_CONSUMER_RATE = 40,
-  CB_20HZ_CONSUMER_RATE = 20,
-  CB_10HZ_CONSUMER_RATE = 10,
-  CB_5HZ_CONSUMER_RATE = 5,
-  CB_1HZ_CONSUMER_RATE = 1,
-
-  CB_HIGH_PRIORITY_RATE = 20,
-  CB_LOW_PRIORITY_RATE = 10
-};
-
-class Task_State
-{
-  // = TITLE
-  //     Maintains state common to multiple Cubit clients.
-  //
-  // = DESCRIPTION
-  //     This class maintains state which is common to the potentially
-  //     multiple concurrent clients.
-public:
-  ACE_Barrier *barrier_;
-  // Barrier for the multiple clients to synchronize after binding to
-  // the servants.
-
-  Task_State (int argc, char **argv);
-  // Constructor. Takes the command line arguments, which are later
-  // passed into ORB_init.
-
-  CORBA::String key_;
-  // All cubit objects will have this as prefix to its key.
-
-  u_int start_count_;
-  // Keeps a count of the number of clients started.  This count also
-  // serves as a thread-id.  The first thread created gets an ID of 0,
-  // then 1, and so on.
-
-  u_int loop_count_;
-  // Number of times to loop, making calls.
-
-  u_int thread_count_;
-  // Number of concurrent clients to create.
-
-  double *latency_;
-  // Array to store the latency for every client, indexed by
-  // thread-id.
-
-  int *ave_latency_;
-  // Int array to store the latencies.
-
-  Cubit_Datatypes datatype_;
-  // Which datatype to use to make the calls.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Lock to protect access to this object.
-
-  // = Command line arguments.
-  int argc_;
-  char **argv_;
-
-  u_int thread_per_rate_;
-  // Flag for the thread_per_rate test.
-
-  double **global_jitter_array_;
-  // This array stores the latency seen by each client for each
-  // request, to be used later to compute jitter.
-
-  char *factory_ior_;
-  // Object reference string for the cubit factory.
-
-  u_int shutdown_;
-  // Flag that indicates if we are going to call the shutdown methos
-  // for the servant.
-
-  u_int oneway_;
-  // Flag that indicates if we are going to use oneway calls instead
-  // of two-way.
-
-  u_int use_name_service_;
-  // Flag that say if we are using the or not the name service.
-
-  char **iors_;
-  // Array of pointers used to hold the ior strings read from the ior file
-  // that the server created.
-
-  char *ior_file_;
-  // Name of the filename that the server used to store the iors.
-
-  u_int use_sysbench_;
-  // flag that  indicates that we are going to use the sysBench() call
-  // to time calls.  This only applies to the CHORUS ClassiX OS.
-};
-
-class Client : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //     The Cubit client.
-  // 
-  // = DESCRIPTION
-  //     This class implements the Cubit Client, which is an active object.
-  //     `n' threads execute svc, and make 2way CORBA calls on the server
-public:
-  Client (Task_State *ts);
-  // constructor, with a pointer to the common task state.
-
-  virtual int svc (void);
-  // The thread function.
-
-  double get_high_priority_latency (void);
-  double get_low_priority_latency (void);
-  double get_high_priority_jitter (void);
-  double get_low_priority_jitter (void);
-  int get_latency (u_int thread_id);
-  // Accessors to get the various measured quantities.
-
-private:
-  int run_tests (Cubit_ptr,
-                 u_int,
-                 u_int,
-                 Cubit_Datatypes,
-                 double frequency);
-  // Makes the calls to the servant.
-
-  void put_latency (double *jitter,
-                    double latency,
-                    u_int);
-  // Records the latencies in the <Task_State>.
-
-  int parse_args (int, char **);
-  // Parses the arguments.
-
-  Task_State *ts_;
-  // Pointer to shared state.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Object reference to the naming service.
-
-  CosNaming::NamingContext_var mt_cubit_context_;
-  // Object reference to the cubit context "MT_Cubit".
-};
-
-#endif /* !defined (TASK_CLIENT_H) */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
deleted file mode 100644
index 409bfaa8d9c..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "Util_Thread.h"
-
-Util_Thread::Util_Thread (Task_State *ts,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_MT (ACE_Task<ACE_MT_SYNCH> (thr_mgr)),
-    done_ (0),
-    number_of_computations_ (0),
-    ts_ (ts)
-{
-}
-
-int
-Util_Thread::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Utilization Thread created, "
-              "waiting for threads to finish binding\n"));
-
-  // this barrier synchronizes the utilization thread with 
-  // the client threads
-  // i.e., the Util_thread should wait until all the 
-  // clients have finished binding, and only then
-  // start measuring the utilization. 
-  this->ts_->barrier_->wait ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Threads have bound, "
-              "utilization test started\n"));
-
-  this->run_computations ();
-  return 0;
-}
-
-double
-Util_Thread::get_number_of_computations (void)
-{
-  return this->number_of_computations_;
-}
-
-// Perform repeated prime factor computations on an arbitrary number.
-// And you thought your life was boring... :-)
-
-int
-Util_Thread::run_computations (void)
-{
-  while (this->done_ == 0)
-    {
-      // See if this number is prime. 2 and CUBIT_ARBIT_NUMBER / 2 are
-      // the recommended values for min_factor and max_factor, as
-      // explained in ACE.h (is_prime).
-      ACE::is_prime (CUBIT_ARBIT_NUMBER,
-                     2,
-                     CUBIT_ARBIT_NUMBER / 2);
-      this->number_of_computations_ ++;
-    }
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
deleted file mode 100644
index e1de9332dd5..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Util_Thread.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (UTIL_THREAD_H)
-#define UTIL_THREAD_H
-
-#include "Task_Client.h"
-
-// This is the arbitrary number that the Util_Thread uses to check for
-// primality.
-const int CUBIT_ARBIT_NUMBER = 10000019;
-
-class Util_Thread : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //     The thread that computes utilization.
-public:
-  Util_Thread (Task_State *,
-               ACE_Thread_Manager *thr_mgr);
-  // Constructor.
-
-  virtual int svc (void);
-  // The thread entry point function.
-
-  double get_number_of_computations (void);
-  // Gets the number of computations the thread was able to perform.
-
-  int done_;
-  // Indicates whether we're done.
-
-private:
-  int run_computations (void);
-  // Run the computations.
-
-  double number_of_computations_;
-  // This stores the number of computations performed
-  // by the Util_Thread so far
-
-  Task_State *ts_;
-  // Pointer to the Task state. Stores the state
-  // common to the multiple client threads
-};
-
-#endif /* !defined (UTIL_THREAD_H) */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
deleted file mode 100644
index c01677c54a2..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "client.h"
-
-int
-initialize (void)
-{
-#if defined (VXWORKS)
-#if defined (VME_DRIVER)
-  STATUS status = vmeDrv ();
-  if (status != OK)
-    printf ("ERROR on call to vmeDrv()\n");
-  status = vmeDevCreate ("/vme");
-  if (status != OK)
-    printf ("ERROR on call to vmeDevCreate()\n");
-#endif /* defined (VME_DRIVER) */
-#endif /* defined (VXWORKS) */
-
-  // Make sure we've got plenty of socket handles.  This call will
-  // use the default maximum.
-  ACE::set_handle_limit ();
-
-  return 0;
-}
-
-int
-do_priority_inversion_test (Task_State &ts)
-{
-  // Create the clients.
-  Client high_priority_client (&ts);
-  Client low_priority_client (&ts);
-
-  // Create the daemon thread in its own <ACE_Thread_Manager>.
-  ACE_Thread_Manager thr_mgr;
-
-  Util_Thread util_thread (&ts, &thr_mgr);
-
-  // The minimum priority thread is the utilization thread.
-  ACE_Sched_Priority priority =
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                    ACE_SCOPE_THREAD);
-
-  // First activate the Utilization thread.  It will wait until all
-  // threads have finished binding.
-  util_thread.activate (THR_BOUND,
-                        1,
-                        0,
-                        priority);
-
-  // Now activate the high priority client.
-  priority = ACE_THR_PRI_FIFO_DEF;
-
-  if (high_priority_client.activate (THR_BOUND | ACE_SCHED_FIFO,
-                                     1,
-                                     0,
-                                     priority) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%p; priority is %d\n",
-                "activate failed",
-                priority));
-
-  u_int i;
-
-  // Drop the priority, so that the priority of clients will increase
-  // with increasing client number.
-  for (i = 0; i < ts.thread_count_; i++)
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating %d clients with low priority of %d\n",
-              ts.thread_count_ - 1,
-              priority));
-
-  for (i = 0; i < ts.thread_count_ - 1; i++)
-    {
-      // The first thread starts at the lowest priority of all the low
-      // priority clients.
-      if (low_priority_client.activate (THR_BOUND,
-                                        1,
-                                        1,
-                                        priority) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p; priority is %d\n",
-                    "activate failed",
-                    priority));
-
-      // Get the next higher priority.
-      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-						  priority,
-						  ACE_SCOPE_THREAD);
-    }
-
-  // Wait for all the threads to exit (except the utilization thread).
-  ACE_Thread_Manager::instance ()->wait ();
-#if defined (VXWORKS)
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %d usec\n"
-                  "Low priority client latency : %d usec\n",
-                  high_priority_client.get_high_priority_latency (),
-                  low_priority_client.get_low_priority_latency ());
-#elif defined (CHORUS)
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %u usec\n"
-                  "Low priority client latency : %u usec\n",
-                  high_priority_client.get_high_priority_latency (),
-                  low_priority_client.get_low_priority_latency ());
-
-  // output the latency values to a file, tab separated, to import it
-  // to Excel to calculate jitter, in the mean time we come up with
-  // the sqrt() function.
-  FILE *latency_file_handle = 0;
-  char latency_file[BUFSIZ];
-  char buffer[BUFSIZ];
-
-  sprintf (latency_file,
-	   "cb%d%s%d.txt",
-	   ACE_OS::getpid (),
-	   ts.use_sysbench_ == 1? "SB": "__",
-	   ts.thread_count_);
-  ACE_DEBUG ((LM_DEBUG,
-              "--->Output file for latency data is \"%s\"\n",
-              latency_file));
-
-  latency_file_handle = ACE_OS::fopen (latency_file, "w");
-
-  // @@ What does this loop do?
-  for (u_int j = 0; j < ts.start_count_; j ++)
-    {
-      sprintf (buffer,
-               "%s #%d",
-               j == 0 ? "High Priority": "Low Priority",
-               j);
-
-      for (u_int i = 0; i < ts.loop_count_; i ++)
-	{
-	  sprintf (buffer + ACE_OS::strlen (buffer),
-                   "\t%u\n", ts.global_jitter_array_[j][i]);
-	  ACE_OS::fputs (buffer,
-                         latency_file_handle);
-	  buffer[0] = 0;
-	}
-    }
-
-  ACE_OS::fclose (latency_file_handle);
-
-#else /* !defined (CHORUS) */
-  ACE_DEBUG ((LM_DEBUG, "Test done.\n"
-              "High priority client latency : %f msec, jitter: %f msec\n"
-              "Low priority client latency : %f msec, jitter: %f msec\n",
-              high_priority_client.get_high_priority_latency (),
-              high_priority_client.get_high_priority_jitter (),
-              low_priority_client.get_low_priority_latency (),
-              low_priority_client.get_low_priority_jitter ()));
-#endif /* !defined (VXWORKS) && !defined (CHORUS) */
-
-  // signal the utilization thread to finish with its work..
-  util_thread.done_ = 1;
-
-  // This will wait for the utilization thread to finish.
-  thr_mgr.wait ();
-
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) utilization task performed %u computations\n",
-              util_thread.get_number_of_computations ()));
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) utilization task performed %g computations\n",
-              util_thread.get_number_of_computations ()));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-
-  return 0;
-}
-
-int
-do_thread_per_rate_test (Task_State &ts)
-{
-  // First activate the high priority client.
-    Client CB_40Hz_client (&ts);
-    Client CB_20Hz_client (&ts);
-    Client CB_10Hz_client (&ts);
-    Client CB_5Hz_client (&ts);
-    Client CB_1Hz_client (&ts);
-
-    ACE_Sched_Priority priority = ACE_THR_PRI_FIFO_DEF;
-
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 40 Hz client with priority %d\n",
-                priority));
-    if (CB_40Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 20 Hz client with priority %d\n",
-                priority));
-    if (CB_20Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 10 Hz client with priority %d\n",
-                priority));
-    if (CB_10Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 5 Hz client with priority %d\n",
-                priority));
-    if (CB_5Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 1 Hz client with priority %d\n",
-                priority));
-    if (CB_1Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    // Wait for all the threads to exit.
-    ACE_Thread_Manager::instance ()->wait ();
-
-    ACE_DEBUG ((LM_DEBUG,
-                "Test done.\n"
-                "40Hz client latency : %d usec\n"
-                "20Hz client latency : %d usec\n"
-                "10Hz client latency : %d usec\n"
-                "5Hz client latency : %d usec\n"
-                "1Hz client latency : %d usec\n",
-                CB_40Hz_client.get_latency (0),
-                CB_20Hz_client.get_latency (1),
-                CB_10Hz_client.get_latency (2),
-                CB_5Hz_client.get_latency (3),
-                CB_1Hz_client.get_latency (4)));
-    return 0;
-}
-
-// This is the main routine of the client, where we create a high
-// priority and a low priority client. we then activate the clients
-// with the appropriate priority threads, and wait for them to
-// finish. After they aer done, we compute the latency and jitter
-// metrics and print them.
-
-int
-main (int argc, char *argv [])
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (FORCE_ARGS)
-  int argc = 7;
-  char *argv[] = {"main",
-                  "-d",
-                  "3",   // Data Type
-                  "-t",
-                  "10",   // Thread Count
-                  "-h",
-                  "mv2604d"};  // Host name
-#endif   /* defined (FORCE_ARGS) */
-  initialize ();
-
-  Task_State ts (argc, argv);
-  if (ts.thread_per_rate_ == 0)
-    do_priority_inversion_test (ts);
-  else
-    do_thread_per_rate_test (ts);
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "Test not run.  This platform doesn't seem to have threads.\n"));
-#endif /* ACE_HAS_THREADS */
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
deleted file mode 100644
index 064382899b4..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "cubitC.h"
-#include "Task_Client.h"
-#include "Util_Thread.h"
-
-#if defined (VME_DRIVER)
-#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
-extern "C" STATUS vmeDevCreate (char *);
-#endif /* defined (VME_DRIVER) */
-
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
deleted file mode 100644
index 5bdf1645870..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-interface Cubit
-{
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-
-  struct Many
-  {
-    octet o;            // + 3 bytes padding (normally) ...
-    long l;
-    short s;            // + 2 bytes padding (normally) ...
-  };
-
-  octet cube_octet (in octet o);
-  // cube an octet
-
-  short cube_short (in short s);
-  // cube a short
-
-  long cube_long (in long l);
-  // cube a long
-
-  Many cube_struct (in Many values);
-  // cube each of the members of a struct
-
-  oneway void noop ();
-  // null operation
-
-  oneway void shutdown ();
-  // shut down the application
-};
-
-interface Cubit_Factory
-{
-  // = TITLE
-  //    Creates Cubit objects.
-
-  string create_cubit (in unsigned short index);
-  // Factory method that creates an string containing the IOR of the
-  // designated Cubit object.
-};
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
deleted file mode 100644
index 573e4fe2fd6..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "cubit_i.h"
-
-Cubit_i::Cubit_i (void)
-{
-}
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &)
-{
-  return (CORBA::Octet) (o * o * o);
-}
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &)
-{
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &)
-{
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many 
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &)
-{
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-
-  return out_values;
-}
-
-void 
-Cubit_i::noop (CORBA::Environment &)
-{
-  // does nothing.
-}
-
-void Cubit_i::shutdown (CORBA::Environment &)
-{
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (CORBA::String *cubits,
-                                  u_int num_of_objs)
-  : num_of_objs_ (num_of_objs)
-{
-  ACE_NEW (my_cubit_,
-           CORBA::String[num_of_objs_]);
-
-  for (u_int i = 0; 
-       i < num_of_objs_;
-       ++i)
-      my_cubit_[i] = ACE_OS::strdup (cubits[i]);
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-}
-
-CORBA::String 
-Cubit_Factory_i::create_cubit (CORBA::UShort orb_index, 
-			       CORBA::Environment &env)
-{
-  // if out of range, return a nil string.
-  if (orb_index >= num_of_objs_)
-    {
-      env.clear ();
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%P|%t) ior returned is [%d]:<%s>\n", 
-	      orb_index, 
-	      my_cubit_[orb_index]));
-
-  return ACE_OS::strdup (my_cubit_[orb_index]);
-}
-
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
deleted file mode 100644
index 96bbd22d62d..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (_CUBIT_I_HH)
-#define _CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i : public POA_Cubit
-{
-  // = TITLE
-  //   Cubit implementation class.
-public:
-  Cubit_i (void);
-  ~Cubit_i (void);
-   
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  
-  virtual void noop (CORBA::Environment &env);
-
-  virtual void shutdown (CORBA::Environment &env);
-};
-
-class Cubit_Factory_i : public POA_Cubit_Factory
-{
-  // = TITLE
-  //   Cubit Factory implementation class.
-public:
-  Cubit_Factory_i (CORBA::String *cubits,
-                   u_int num_of_objs);
-  // Constructor.
-
-  ~Cubit_Factory_i (void);
-  // Destructor.
-  
-  virtual CORBA::String create_cubit (CORBA::UShort index, 
-				      CORBA::Environment &env); 
-  // Make the cubit object whose priority is "priority".
-
-private:
-  CORBA::String * my_cubit_;
-  // Array of cubit iors.
-
-  u_int num_of_objs_;
-  // Number of cubit objects we have ior's for.
-};
-
-#endif /* _CUBIT_I_HH */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
deleted file mode 100644
index ad072424ee9..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ /dev/null
@@ -1,822 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "server.h"
-
-// Global options used to configure various parameters.
-static char hostname[BUFSIZ];
-static char *ior_file = 0;
-static int base_port = ACE_DEFAULT_SERVER_PORT;
-static int num_of_objs = 1;
-static u_int use_name_service = 1;
-
-Cubit_Task::Cubit_Task (void)
-{
-  // No-op.
-}
-
-Cubit_Task::Cubit_Task (const char *args,
-                        const char *orbname,
-                        u_int num_of_objs,
-                        ACE_Barrier *barrier,
-                        u_int task_id)
-  : key_ ("Cubit"),
-    orbname_ ((char *) orbname),
-    orbargs_ ((char *) args),
-    num_of_objs_ (num_of_objs),
-    servants_ (0),
-    barrier_ (barrier),
-    servants_iors_ (0),
-    task_id_ (task_id)
-{
-}
-
-int
-Cubit_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Beginning Cubit task with args = '%s'\n",
-              orbargs_));
-  int rc = this->initialize_orb ();
-  if (rc == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ORB initialization failed.\n"),
-                      -1);
-
-  rc = this->create_servants ();
-  if (rc == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Create Servants failed.\n"),
-                      -1);
-
-  TAO_TRY
-    {
-      this->poa_manager_->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->barrier_->wait ();
-
-      // Handle requests for this object until we're killed, or one of
-      // the methods asks us to exit.
-      if (this->orb_->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "run"),
-                          -1);
-
-      // Shut down the OA.
-      this->poa_->destroy (CORBA::B_TRUE,
-                           CORBA::B_TRUE,
-                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("poa->destroy()");
-    }
-  TAO_ENDTRY;
-
-  // Need to clean up and do a CORBA::release on everything we've
-  // created!
-
-  for (u_int i = 0; i < num_of_objs_; i++)
-    delete servants_ [i];
-
-  return 0;
-}
-
-int
-Cubit_Task::initialize_orb (void)
-{
-  TAO_TRY
-    {
-      ACE_ARGV args (this->orbargs_);
-
-      int argc = args.argc ();
-      char **argv = args.argv ();
-
-      // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    this->orbname_,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the Object Adapter.
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in(),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->poa_manager_ =
-        this->root_poa_->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
-      policies.length (2);
-
-      // Id Assignment policy
-      policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Lifespan policy
-      policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      this->poa_ =
-        this->root_poa_->create_POA ("Persistent_POA",
-                                     this->poa_manager_.in (),
-                                     policies,
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && TAO_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_TRY_ENV);
-        }
-      TAO_CHECK_ENV;
-
-      if (use_name_service == 0)
-        return 0;
-
-      CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the Name Service.\n"),
-                          1);
-
-      this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-
-      // Check the environment and return 1 if exception occurred or
-      // nil pointer.
-      if (TAO_TRY_ENV.exception () != 0 ||
-          CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
-        return 1;
-
-      // Register the servant with the Naming Context....
-      CosNaming::Name cubit_context_name (1);
-      cubit_context_name.length (1);
-      cubit_context_name[0].id =
-        CORBA::string_dup ("MT_Cubit");
-
-      TAO_TRY_ENV.clear ();
-      CORBA::Object_var objref =
-        this->naming_context_->bind_new_context (cubit_context_name,
-                                                 TAO_TRY_ENV);
-
-      if (TAO_TRY_ENV.exception() != 0)
-        {
-          CosNaming::NamingContext::AlreadyBound_ptr ex =
-            CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
-          if (ex != 0)
-            {
-              TAO_TRY_ENV.clear ();
-              objref = this->naming_context_->resolve (cubit_context_name,
-                                                       TAO_TRY_ENV);
-              printf("NamingContext::AlreadyBound\n");
-            }
-          else
-            TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
-        }
-      TAO_CHECK_ENV;
-
-      this->mt_cubit_context_ =
-        CosNaming::NamingContext::_narrow (objref.in (),
-                                           TAO_TRY_ENV);
-
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("orb_init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-CORBA::String
-Cubit_Task::get_servant_ior (u_int index)
-{
-  if (index >= num_of_objs_)
-    return 0;
-
-  return ACE_OS::strdup (this->servants_iors_[index]);
-}
-
-int
-Cubit_Task::create_servants ()
-{
-  TAO_TRY
-    {
-      // Create the array of cubit implementations.
-      ACE_NEW_RETURN (this->servants_,
-                      Cubit_i *[this->num_of_objs_],
-                      -1);
-
-      // Create the array of strings.
-      ACE_NEW_RETURN (this->servants_iors_,
-                      CORBA::String [this->num_of_objs_],
-                      -1);
-
-      char *buffer;
-      int l = ACE_OS::strlen (this->key_) + 3;
-
-      ACE_NEW_RETURN (buffer,
-                      char[l],
-                      -1);
-
-      // This loop creates multiple servants, and prints out their
-      // IORs.
-      for (u_int i = 0;
-           i < this->num_of_objs_;
-           i++)
-        {
-          ACE_OS::sprintf (buffer,
-                           "%s%02d",
-                           (char *) this->key_,
-                           this->task_id_);
-
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId (buffer);
-
-          ACE_NEW_RETURN (this->servants_[i],
-                          Cubit_i,
-                          -1);
-
-          if (this->servants_[i] == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               " (%P|%t) Unable to create "
-                               "implementation object #%d\n",
-                               i),
-                              2);
-
-          this->poa_->activate_object_with_id (id.in (),
-                                               this->servants_[i],
-                                               TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          // Stringify the objref we'll be implementing, and print it
-          // to stdout.  Someone will take that string and give it to
-          // some client.  Then release the object.
-
-          Cubit_var cubit =
-            this->servants_[i]->_this (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          CORBA::String_var str =
-            this->orb_->object_to_string (cubit.in (),
-                                          TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          this->servants_iors_[i] = ACE_OS::strdup (str.in ());
-
-          // Register the servant with the Naming Context....
-          CosNaming::Name cubit_name (1);
-          cubit_name.length (1);
-          cubit_name[0].id =
-            CORBA::string_dup (buffer);
-
-          if (CORBA::is_nil (this->mt_cubit_context_.in ()) == CORBA::B_FALSE)
-            {
-              this->mt_cubit_context_->bind (cubit_name,
-                                             cubit.in (),
-                                             TAO_TRY_ENV);
-              if (TAO_TRY_ENV.exception () != 0)
-                TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
-              else
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) Cubit object bound to the name \"%s\".\n",
-                            buffer));
-            }
-
-          ACE_DEBUG ((LM_DEBUG,
-                      " (%t) Object <%s> created\n",
-                      this->servants_iors_[i]));
-        }
-      delete [] buffer;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("print IOR");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-Cubit_Factory_Task::Cubit_Factory_Task (void)
-{
-  // No-op.
-}
-
-Cubit_Factory_Task::Cubit_Factory_Task (const char *args,
-                                        const char *orbname,
-                                        CORBA::String * cubits,
-                                        u_int num_of_objs)
-  : orbname_ ((char *) orbname),
-    orbargs_ ((char *) args),
-    cubits_ (cubits),
-    cubit_factory_ (0),
-    num_of_objs_ (num_of_objs)
-{
-}
-
-int
-Cubit_Factory_Task::create_factory (void)
-{
-  TAO_TRY
-    {
-      // Create implementation object with user specified key.
-      ACE_NEW_RETURN (this->cubit_factory_,
-                      Cubit_Factory_i (cubits_, num_of_objs_),
-                      -1);
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("Cubit_Factory");
-
-      this->poa_->activate_object_with_id (id.in (),
-                                           this->cubit_factory_,
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-          // Stringify the objref we'll be implementing, and print it
-          // to stdout.  Someone will take that string and give it to
-          // some client.  Then release the object.
-
-      Cubit_Factory_var cubit_factory =
-        this->cubit_factory_->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        this->orb_->object_to_string (cubit_factory.in (),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
-                  str.in ()));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("print IOR");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-Cubit_Factory_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ">>> (%P|%t) Beginning Cubit Factory task with args = '%s'\n",
-              orbargs_));
-
-  // @@ This should be replaced with the TAO_ORB_Manager...
-  this->initialize_orb ();
-  this->create_factory ();
-
-  TAO_TRY
-    {
-      this->poa_manager_->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Handle requests for this object until we're killed, or one of
-      // the methods asks us to exit.
-      if (this->orb_->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "run"),
-                          -1);
-
-      // Shut down the OA.
-      this->poa_->destroy (CORBA::B_TRUE,
-                           CORBA::B_TRUE,
-                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("poa->destroy()");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-Cubit_Factory_Task::initialize_orb (void)
-{
-  TAO_TRY
-    {
-      ACE_ARGV args (this->orbargs_);
-
-      int argc = args.argc ();
-      char **argv = args.argv ();
-
-      // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    this->orbname_,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the Object Adapter
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in(),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->poa_manager_ =
-        this->root_poa_->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
-      policies.length (2);
-
-      // Id Assignment policy
-      policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Lifespan policy
-      policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      this->poa_ =
-        this->root_poa_->create_POA ("Persistent_POA",
-                                     this->poa_manager_.in (),
-                                     policies,
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && TAO_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_TRY_ENV);
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("orb_init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-// @@ This method should be integrated into one of the classes
-// (preferably into an Options singleton) rather than kept as a
-// stand-alone function.
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt opts (argc, argv, "sh:p:t:f:");
-  int c;
-
-  if (ACE_OS::hostname (hostname, BUFSIZ) != 0)
-    {
-      perror ("gethostname");
-      return -1;
-    }
-
-  while ((c = opts ()) != -1)
-    switch (c)
-      {
-      case 's':
-        use_name_service = 0;
-        break;
-      case 'f':
-        ior_file = opts.optarg;
-        break;
-      case 'h':
-        ACE_OS::strcpy (hostname, opts.optarg);
-        ACE_DEBUG ((LM_DEBUG, "h\n"));
-        break;
-      case 'p':
-        base_port = ACE_OS::atoi (opts.optarg);
-        ACE_DEBUG ((LM_DEBUG, "p\n"));
-        break;
-      case 't':
-        num_of_objs = ACE_OS::atoi (opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-s Means NOT to use the name service] "
-                           " [-p <port>]"
-                           " [-h <my_hostname>]"
-                           " [-t <num_objects>]"
-                           " [-f <ior_file>]"
-                           "\n", argv [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line
-  return 0;
-}
-
-// @@ This method should be integrated into one of the classes rather
-// than kept as a stand-alone function.
-
-static int
-initialize (int argc, char **argv)
-{
-#if defined (VXWORKS)
-   hostAdd ("mv2604e", "130.38.183.178");
-#if defined (VME_DRIVER)
-   STATUS status = vmeDrv ();
-
-   if (status != OK)
-     printf ("ERROR on call to vmeDrv()\n");
-
-   status = vmeDevCreate ("/vme");
-
-   if (status != OK)
-     printf ("ERROR on call to vmeDevCreate()\n");
-#endif /* defined (VME_DRIVER) */
-
-#if defined (FORCE_ARGS)
-   int argc = 5;
-   char *argv[] = { "main",
-                    "-p",
-                    "10014",
-                    "-h",
-                    "130.38.183.132" };
-
-#endif /* defined (FORCE_ARGS) */
-#endif /* defined (VXWORKS) */
-
-   // Standard command line parsing utilities used.
-   if (parse_args (argc, argv) != 0) return 1;
-
-   if (hostname == 0 || base_port == 0)
-     ACE_ERROR_RETURN ((LM_ERROR,
-                        "usage:  %s"
-                        " [-s Means NOT to use the name service] "
-                        " [-p port]"
-                        " [-h my_hostname]"
-                        " [-t num_objects]"
-                        " [-f <ior_file>]"
-                        "\n", argv [0]),
-                       1);
-
-   // Make sure we've got plenty of socket handles.  This call will use
-   // the default maximum.
-   ACE::set_handle_limit ();
-
-   return 0;
-}
-
-// Starts up the servants
-
-// @@ This method should be integrated into one of the classes rather
-// than kept as a stand-alone function.
-
-static int
-start_servants (void)
-{
-  char *args1;
-
-  ACE_NEW_RETURN (args1,
-                  char[BUFSIZ],
-                  -1);
-  int i;
-
-  // Barrier for the multiple clients to synchronize after binding to
-  // the servants.
-  ACE_Barrier barrier_ (num_of_objs + 1);
-
-  // Create an array to hold pointers to the Cubit objects.
-  CORBA::String *cubits;
-
-  ACE_NEW_RETURN (cubits,
-                  CORBA::String [num_of_objs],
-                  -1);
-
-  ACE_OS::sprintf (args1,
-                   "rate20 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port,
-                   hostname);
-
-  Cubit_Task *high_priority_task;
-
-  ACE_NEW_RETURN (high_priority_task,
-                  Cubit_Task (args1,
-                              "internet",
-                              1,
-                              &barrier_,
-                              0), //task id 0.
-                  -1);
-
-  ACE_Sched_Priority priority = ACE_THR_PRI_FIFO_DEF;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating servant with high priority %d\n", priority));
-
-  // Make the high priority task an active object.
-  if (high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO,
-                                    1,
-                                    0,
-                                    priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                  "high_priority_task->activate"));
-    }
-
-  // Create an array to hold pointers to the low priority tasks.
-  Cubit_Task **low_priority_task;
-
-  ACE_NEW_RETURN (low_priority_task,
-                  Cubit_Task *[num_of_objs],
-                  -1);
-
-  // Drop the priority, so that the priority of clients will increase
-  // with increasing client number.
-  for (i = 0; i < num_of_objs; i++)
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating %d servants with low priority\n",
-              num_of_objs - 1));
-
-  // Create the low priority servants.
-
-  for (i = 0; i < num_of_objs - 1; i++)
-    {
-      char *args;
-
-      ACE_NEW_RETURN (args,
-                      char [BUFSIZ],
-                      -1);
-
-      ACE_OS::sprintf (args,
-                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                       base_port + 1 + i,
-                       hostname);
-
-      ACE_NEW_RETURN (low_priority_task [i],
-                      Cubit_Task (args, "internet", 1, &barrier_, i+1),
-                      -1);
-
-      // Make the low priority task an active object.
-    if (low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO,
-                                       1,
-                                       0,
-                                       priority) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                    "low_priority_task[i]->activate"));
-      }
-
-      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority,
-                                                  ACE_SCOPE_THREAD);
-    }
-
-  char *args;
-
-  ACE_NEW_RETURN (args,
-                  char [BUFSIZ],
-                  -1);
-
-  ACE_OS::sprintf (args,
-                   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port + num_of_objs,
-                   hostname);
-
-  Cubit_Factory_Task * factory_task;
-
-  barrier_.wait ();
-
-  cubits[0] = high_priority_task->get_servant_ior (0);
-
-  for (i = 0; i < num_of_objs-1; ++i)
-    cubits[i + 1] = low_priority_task[i]->get_servant_ior (0);
-
-  FILE *ior_f = 0;
-
-  if (ior_file != 0)
-    ior_f = ACE_OS::fopen (ior_file, "w");
-
-  for (i = 0; i < num_of_objs; ++i)
-    {
-      if (ior_f != 0)
-        {
-          ACE_OS::fprintf (ior_f, "%s\n", cubits[i]);
-        }
-      ACE_OS::printf ("cubits[%d] ior = %s\n",
-                      i,
-                      cubits[i]);
-    }
-
-  if (ior_f != 0)
-    ACE_OS::fclose (ior_f);
-
-  ACE_NEW_RETURN (factory_task,
-                  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
-                  -1);
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_THREAD);
-
-  //  Make the factory low priority task an active object.
-  if (factory_task->activate (THR_BOUND | ACE_SCHED_FIFO,
-                          1,
-                          0,
-                          priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                  "factory_task->activate"));
-    }
-
-  return 0;
-}
-
-// main routine.
-
-int
-main (int argc, char *argv[])
-{
-#if defined (ACE_HAS_THREADS)
-  if (initialize (argc, argv) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error in Initialization\n"),
-                      1);
-  if (start_servants () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error creating the servants\n"),
-                      1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Wait for all the threads to exit\n"));
-
-  // Wait for all the threads to exit.
-  ACE_Thread_Manager::instance ()->wait ();
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "Test not run.  This platform doesn't seem to have threads.\n"));
-#endif /* ACE_HAS_THREADS */
-  return 0;
-}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
deleted file mode 100644
index 0c5f0b29f28..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-// ACE includes.
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "ace/ARGV.h"
-#include "ace/Sched_Params.h"
-#include "orbsvcs/CosNamingC.h"
-
-// TAO includes.
-#include "tao/corba.h"
-
-// MT Cubit application includes.
-#include "cubit_i.h"
-
-#if defined (VME_DRIVER)
-#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
-extern "C" STATUS vmeDevCreate (char *);
-#endif /* VME_DRIVER */
-
-#if !defined (ACE_HAS_THREADS)
-class NOOP_ACE_Barrier
-{
-public:
-  NOOP_ACE_Barrier (int ) {}
-  void wait (void) {}
-};
-#define ACE_Barrier NOOP_ACE_Barrier
-#endif /* ACE_HAS_THREADS */
-
-class Cubit_Task : public ACE_Task<ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //    Encapsulates an ORB for the Cubit application.
- public:
-  Cubit_Task (const char *args,
-              const char* orbname,
-              u_int num_of_objs,
-	      ACE_Barrier *barrier,
-	      u_int task_id);
-  // Constructor.
-  
-  virtual int svc (void);
-  // Active Object entry point.
-
-  CORBA::String get_servant_ior (u_int index);
-  
-protected:
-  Cubit_Task (void);
-  // No-op constructor.
-
-private:
-  int initialize_orb (void);
-  // Initialize the ORB, and POA.
-
-  int create_servants (void);
-  // Create the servants
-
-  CORBA::String key_;
-  // All cubit objects will have this as prefix to its key.
-
-  char *orbname_;
-  // Name of the ORB.
-
-  char *orbargs_;
-  // ORB arguments.
-
-  u_int num_of_objs_;
-  // Number of objects we're managing.
-
-  CORBA::ORB_var orb_;
-  // Pointer to the ORB
-
-  PortableServer::POA_var root_poa_;
-  // Pointer to the Root POA
-
-  PortableServer::POA_var poa_;
-  // Pointer to the child POA used on the application.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA Manager for both the root POA and the child POA.
-
-  Cubit_i **servants_;
-  // Array to hold the servants
-
-  ACE_Barrier *barrier_;
-  // Barrier for the multiple servants to synchronize after
-  // binding to the orb.
-
-  CORBA::String *servants_iors_;
-  // ior strings of the servants
-
-  CosNaming::NamingContext_var naming_context_;
-  // Object reference to the naming service
-
-  u_int task_id_;
-  // id used for naming service object name.
-
-  CosNaming::NamingContext_var mt_cubit_context_;
-  // context where all MT Cubit objects will be created.
-};
-
-class Cubit_Factory_Task : public ACE_Task<ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //    Encapsulates an ORB for the Cubit Factory application.
-public:
-  Cubit_Factory_Task (const char *args,
-		      const char* orbname,
-		      CORBA::String * cubits,
-		      u_int num_of_objs);
-  // Constructor.
-
-  virtual int svc (void);
-  // Active Object entry point.
-
-protected:
-  Cubit_Factory_Task (void);
-  // No-op constructor.
-
-private:
-  int initialize_orb (void);
-  // Initialize the ORB, and POA.
-
-  int create_factory (void);
-  // activates the factory in the poa.
-
-  char *orbname_;
-  // Name of the ORB.
-
-  char *orbargs_;
-  // ORB arguments.
-
-  CORBA::ORB_var orb_;
-  // Pointer to the ORB
-
-  PortableServer::POA_var root_poa_;
-  // Pointer to the Root POA
-
-  PortableServer::POA_var poa_;
-  // Pointer to the child POA used on the application.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA Manager for both the root POA and the child POA.
-
-  CORBA::String *cubits_;
-  // Array of cubit ior strings
-  
-  Cubit_Factory_i *cubit_factory_;
-  // cubit factory object
-
-  u_int num_of_objs_;
-  // number of cubit objects we have ior's for.
-};
-
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
deleted file mode 100644
index 284c327aa0a..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() ""
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
-
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/tmplinst.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/tmplinst.cpp
deleted file mode 100644
index dcd4f235cb4..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/tmplinst.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "cubitC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/release.chk b/TAO/release.chk
deleted file mode 100644
index 86692ef176e..00000000000
--- a/TAO/release.chk
+++ /dev/null
@@ -1,124 +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 = Other (Linux/egcs, Solaris/egcs, etc.)
-
-        The state is indicated as a tri-state value, e.g.,
-
-        0 = doesn't work
-        1 = works
-        x = not attempted or unknown
-
-
-[11111 ] libTAO and TAO_IDL compile.
-
-[1111x ] IDL_Cubit compiles
-[1111x ] 	svr runs
-[1111x ]	clnt runs
-     
-[1111x ] POA/RootPOA compiles
-[1111x ] 	POA/RootPOA runs
-[1111x ] POA/FindPOA compiles
-[1111x ] 	POA/FindPOA runs
-[1111x ] POA/NewPOA compiles
-[1111x ] 	POA/NewPOA runs
-[1111x ] POA/Generic_Servant compiles
-[1111x ] 	POA/Generic_Servant runs
-[1111x ] POA/On_Demand_Activation compiles
-[1111x ] 	POA/On_Demand_Activation runs
-[1111x ] POA/Explicit_Activation compiles
-[1111x ] 	POA/Explicit_Activation runs
-[1111x ] POA/Default_Servant compiles
-[x0xxx ] 	POA/Default_Servant runs
-    
-[1111x ] Param_Test compiles
-[1111x ] 	SII short
-[1111x ] 	SII ubstring
-[1111x ] 	SII fixed_struct
-[1111x ] 	SII strseq
-[0111x ] 	SII var_struct
-[0111x ] 	SII nested_struct
-[0000x ] 	SII struct_seq
-[0000x ] 	SII objref
-    
-[1111x ] 	DII short
-[1111x ] 	DII ubstring
-[1111x ] 	DII fixed_struct
-[0000x ] 	DII strseq
-[0000x ] 	DII var_struct
-[0000x ] 	DII nested_struct
-[0000x ] 	DII struct_seq
-[0000x ] 	DII objref
-    
-[0x0x0 ] Thruput/TAO compiles
-   
-[1111x ] liborbsvcs compiles
-[1111x ] Naming_Service compiles
-[1111x ] Simple_Naming compiles
-[1x10x ] 	Simple_Naming runs
-[1x11x ] Logger compiles
-[1x10x ] 	Logger runs
-[11111 ] Scheduling_Service compiles
-[1110x ]        Scheduling_Service runs
-[11110 ] Event_Service compiles
-[1110x ]        Event_Service runs
-[11110 ] Dump_Schedule compiles
-[xxxxx ]        Dump_Schedule runs
-[11111 ] Event_Latency compiles
-[1110x ]        Event_Latency runs
-    
-[110100] MT_Cubit compiles
-[xxx0xx] 	runs for Octet
-[xxx0xx] 	runs for Short
-[xxx0xx] 	runs for Long
-[xxx0xx] 	runs for Struct
-
-NOTES
-* Solaris/CC
-
-** Thruput/TAO/server.cpp -same errors as Logger/svr.cpp
-** ParamTest/var_struct,nested_struct,struct_seq - seg. fault , but
-   able to fix manually the tao_idl compiler generated files, works
-   fine then.
-
-* NT
-** Warnings on libTAO and tao_idl compilation.
-** Param_Test with struct_seq segfaults server.
-** MT_Cubit client segfaults after transactions made.
-
-* Solaris/g++
-** Warnings during tao_idl compilation.
-** MT Cubit fails to link due to missing -lposix4 library
-
-* IRIX
-** Event Latency won't work because unproper detection of failures for
-   priority change.
-** MT_Cubit does not compile
-   An extra library (-lposix4) is only present in Solaris; IMHO that
-   should go into the platform file for Solaris/CC
-** Param_Test does not connect on the first attempt, even for simple
-   types like <short>
-
-* Linux/g++
-** IDL Cubit clnt works, but generates a SEGV on shutdown
-** IDL Cubit svr executes, but returns object references across the
-   wire with host of 127.0.0.1 The remote client gets a MARSHAL
-   exception.
-
-* Other (Linux/egcs, Solaris/egcs, etc.)
-
-# eval:(overwrite-mode nil)
-# Local Variables:
-# mode:indented-text
-# End:
diff --git a/TAO/release.pl b/TAO/release.pl
deleted file mode 100755
index 28c741f69e1..00000000000
--- a/TAO/release.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id$
-#
-# Takes over some of the release work rather than having it all
-# inline in the Makefile.
-
-$date = `/usr/bin/date +"%a %b %d %T %Y"`;
-chop $date;
-$VERSION = "VERSION";
-$CHANGELOG = "ChangeLog";
-$TAO_VERSION = '';
-$MODNAME = 'TAO';
-
-# Range of values on this is "alpha", "beta", or "major",
-# in which case the 3rd, 2nd, or 1st digit.
-$BUMP_WHICH = $ENV{'RELEASE_TYPE'};
-
-sub inplace {
-    my($ext, @files) = @_;
-    my(@nfiles) = ();
-    my($nfile);
-    $ext = '~' if ($ext eq '');
-    foreach $file (@files) {
-        $nfile = $file . $ext;
-        if (rename ($file, $nfile)) {
-            push(@nfiles, $nfile);
-        }
-        else {
-            warn "Unable to rename $files[$i] for in-place editing: $!\n";
-        }
-    }
-    @nfiles;
-}
-
-@inplace = inplace('.del', $VERSION, $CHANGELOG);
-
-open (VERSION, $inplace[0])
-    || die "Unable to open file $inplace[0] for inplace edit: $!\n";
-open (VERSIONOUT, ">$VERSION")
-    || die "Unable to open file $VERSION for writing: $!\n";
-
-undef $version_number;
-while (<VERSION>) {
-    if ($BUMP_WHICH =~ m/major/i) {
-        $bump_expr = 'sprintf("$1%d.0.0", $2+1)';
-    }
-    elsif ($BUMP_WHICH =~ m/beta/i) {
-        $bump_expr = 'sprintf("$1$2.%d.0", $3+1)';
-    }
-    else {
-        $bump_expr = 'sprintf("$1$2.$3.%d", $4+1)';
-    }
-    $subst = 's/(TAO version )(\d+)\.(\d+)\.(\d+)/' . $bump_expr . '/e';
-    eval $subst;
-    ($version_number = $_) =~ s/.*(\d+\.\d+\.\d+).*/$1/ if (!defined($version_number));
-    if (s/(, released ).*/$1$date./) {
-        ($TAO_VERSION = $_) =~ s/^This is //;
-    }
-    print VERSIONOUT $_;
-}
-
-close (VERSIONOUT);
-close (VERSION);
-chmod 0644, $VERSION;
-
-$message = $date."  ".$ENV{"SIGNATURE"}."  <".$ENV{"LOGNAME"}."\@cs.wustl.edu>\n\n\t* ".$TAO_VERSION."\n";
-$message_printed = 0;
-
-open (CHANGELOG, $inplace[1])
-    || die "Unable to open file $inplace[1] for inplace edit: $!\n";
-open (CHANGELOGOUT, ">$CHANGELOG")
-    || die "Unable to open file $CHANGELOG for writing: $!\n";
-
-while (<CHANGELOG>) {
-    print CHANGELOGOUT "$message" if ( ! $message_printed++ );
-    print CHANGELOGOUT $_;
-}
-
-close (CHANGELOG);
-close (CHANGELOGOUT);
-chmod 0644, $CHANGELOG;
-
-# Morph the version number
-chop $version_number;
-($version_tag = $MODNAME."-".$version_number) =~ s/\./_/g;
-
-$CVSCOM = 'cvs';
-$COM = qq/$CVSCOM commit -m'$TAO_VERSION' $VERSION $CHANGELOG && $CVSCOM rtag $version_tag $MODNAME && $CVSCOM rtag -F Current $MODNAME/;
-print $COM;
-system $COM;
-
-unlink @inplace;
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
deleted file mode 100644
index 95b3103c85c..00000000000
--- a/TAO/rules.tao.GNU
+++ /dev/null
@@ -1,20 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Common rules for all of TAO
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_IDL
-TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
-endif
-
-.SUFFIXES:	S.h C.h S.i C.i S.cpp C.cpp
-
-%S.h %C.h %S.i %C.i %S.cpp %C.cpp:	%.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) $?
-
-ifeq ($(findstring g++,$(CXX)),g++)
-  CCFLAGS += -Wno-unused
-endif # g++
diff --git a/TAO/tao/Align.h b/TAO/tao/Align.h
deleted file mode 100644
index eb6d3fbbb6e..00000000000
--- a/TAO/tao/Align.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// @(#) $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Align.h
-//
-// = DESCRIPTION
-//    Pointer alignment utilities
-//
-//    A "ptr_arith_t" type is defined for doing numerical operations
-//    on pointers, such as aligning them.  Pointer sizes vary from 2
-//    to 8 bytes in today's environments; a portable data type is much
-//    needed.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_ALIGN_H)
-#define TAO_ALIGN_H
-
-// Type for doing arithmetic on pointers ... as elsewhere, we assume
-// that "unsigned" versions of a type are the same size as the
-// "signed" version of the same type.
-
-#if     ACE_SIZEOF_VOID_P == ACE_SIZEOF_INT
-typedef u_int ptr_arith_t;
-
-#elif   ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG
-typedef u_long ptr_arith_t;
-
-#elif   ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
-typedef u_long long ptr_arith_t;
-
-#else
-#       error "Can't find a suitable type for doing pointer arithmetic."
-#endif /* error */
-
-// Efficiently align "value" up to "alignment", knowing that all such
-// boundaries are binary powers and that we're using two's complement
-// arithmetic.
-
-// Since the alignment is a power of two its binary representation is:
-//    alignment      = 0...010...0
-//
-// hence 
-//
-//    alignment - 1  = 0...001...1 = T1
-//
-// so the completent is:
-//
-//  ~(alignment - 1) = 1...110...0 = T2
-//
-// Notice that there is a multiple of <alignment> in the range 
-// [<value>,<value> + T1], also notice that if
-//
-// X = ( <value> + T1 ) & T2
-//
-// then
-//
-// <value> <= X <= <value> + T1
-//
-// because the & operator only changes the last bits, and since X is a
-// multiple of <alignment> (its last bits are zero) we have found the
-// multiple we wanted.
-// 
-
-#define align_binary(ptr, alignment) \
-    ((ptr + ((ptr_arith_t)((alignment)-1))) & (~((ptr_arith_t)((alignment)-1))))
-
-// Efficiently round "ptr" up to an "alignment" boundary, knowing that
-// all such boundaries are binary powers and that we're using two's
-// complement arithmetic.
-//
-#define ptr_align_binary(ptr, alignment) \
-        ((char *) align_binary (((ptr_arith_t) (ptr)), (alignment)))
-
-#endif /* TAO_ALIGN_H */
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
deleted file mode 100644
index 215a18e486b..00000000000
--- a/TAO/tao/Any.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-// @ (#) $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Implementation of CORBA_Any
-//
-// This includes three constructors, a destructor, and a "replace"
-// method for the "Any" data type.  "Any" values pair a pointer to a
-// data structure in the native binary representation (e.g. C struct)
-// with a TypeCode that describes that data structure.
-//
-// The copy constructor and the destructor each use the TypeCode
-// interpreter with specialized "visit" callback routines.  The
-// "visit" routines are used respectively to make "deep copies" and
-// perform "deep frees" of the aritrary values as described by the
-// "Any" value's typecode.
-//
-// Note that these "visit" routines are called directly, and they
-// choose whether or not to use the TypeCode interpreter to examine
-// constituents.  In the simple cases, the "visit" routines can do
-// their work without any further calls; only for constructed types is
-// the interpreter's knowledge really required.
-//
-// THREADING NOTE: "Any" is a data structure which must be protected
-// by external critical sections.  Like simpler numeric types, "Any"
-// instances are accessed and modified atomically.  This
-// implementation is reentrant, so that independent "Any" values may
-// be manipulated concurrently when the underlying programming
-// environment is itself reentrant.
-//
-// COM NOTE: Yes, this is a utility data type whose implementation is
-// fully exposed.  Factories for these are not normally used in C++.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA::TypeCode_ptr
-CORBA_Any::type (void) const
-{
-  return this->type_;
-}
-
-const void *
-CORBA_Any::value (void) const
-{
-  return this->value_;
-}
-
-// Default "Any" constructor -- initializes to nulls per the
-// OMG C++ mapping.
-
-// NOTE: null (zero) typecode pointers are also treated as the null
-// typecode ...
-
-CORBA_Any::CORBA_Any (void)
-  : type_ (CORBA::_tc_null),
-    value_ (0),
-    any_owns_data_ (CORBA::B_FALSE),
-    refcount_ (1)
-{
-}
-
-// The more common "Any" constructor has its own copy of a typecode,
-// and either holds or "consumes" an arbitrary data value satisfying
-// the normal binary interface rules.
-
-CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
-                      void *value,
-                      CORBA::Boolean any_owns_data)
-  : type_ (tc),
-    value_ (value),
-    any_owns_data_ (any_owns_data),
-    refcount_ (1)
-{
-  tc->AddRef ();
-}
-
-// Copy constructor for "Any".
-CORBA_Any::CORBA_Any (const CORBA_Any &src)
-  : type_ (src.type_ != 0 ? src.type_ : CORBA::_tc_null),
-    any_owns_data_ (CORBA::B_TRUE),
-    refcount_ (1)
-{
-  CORBA::Environment env;
-  size_t size;
-
-  this->type_->AddRef ();
-
-  size = this->type_->size (env);
-
-  // allocate sufficient memory and deep copy the data
-  // @@ - the following allocation to be addressed by our memory management
-  // scheme
-  this->value_ = (char *) ACE_OS::calloc (1, size);
-  (void) DEEP_COPY (this->type_, src.value_, this->value_, env);
-}
-
-// assignment operator
-CORBA_Any &
-CORBA_Any::operator= (const CORBA_Any &src)
-{
-  CORBA::Environment env;
-  size_t size;
-
-  // check if it is a self assignment
-  if (this == &src)
-    {
-      this->AddRef ();
-      return *this;
-    }
-
-  // if we own any previous data, deallocate it
-  if (this->any_owns_data_)
-    {
-      DEEP_FREE (this->type_, this->value_, 0, env);
-      // @@: The following needs to be addressed properly. We need to make
-      // sure if we use "delete" or "free"
-      //      delete this->value_;
-    }
-
-  // Now copy the contents of the source to ourselves.
-  this->type_ = (src.type_) != 0 ? src.type_ : CORBA::_tc_null;
-
-  this->any_owns_data_ = CORBA::B_TRUE;
-  this->refcount_ = 1;
-
-  this->type_->AddRef ();
-
-  size = this->type_->size (env);
-
-  // allocate sufficient storage and deep copy the data
-  // @@ - address the following
-  this->value_ = (char *) ACE_OS::calloc (1, size);
-  (void) DEEP_COPY (this->type_, src.value_, this->value_, env);
-  return *this;
-}
-
-// Destructor for an "Any" deep-frees memory if needed.
-//
-// NOTE that the assertion below will fire on application programmer
-// errors, such as using AddRef/Release out of sync with the true
-// lifetime of an Any value allocated on the stack.  BUT it involves
-// changing the refcounting policy so that it's initialized to zero,
-// not one ... which policy affects the whole source base, and not
-// just this data type.  Get to this later.
-
-CORBA_Any::~CORBA_Any (void)
-{
-  CORBA::Environment env;
-
-  // assert (this->refcount_ == 0);
-
-  if (this->any_owns_data_)
-    {
-      // we own the data. So first do a deep free and then deallocate it.
-      DEEP_FREE (this->type_, this->value_, 0, env);
-      // @@ - address the following
-      // delete this->value_;
-    }
-
-  if (this->type_)
-    this->type_->Release ();
-}
-
-// All-at-once replacement of the contents of an "Any."
-
-void
-CORBA_Any::replace (CORBA::TypeCode_ptr tc,
-                    const void *v,
-                    CORBA::Boolean any_owns_data,
-                    CORBA::Environment &env)
-{
-  if (this->any_owns_data_)
-    {
-      if (this->value_)
-        {
-          DEEP_FREE (this->type_, this->value_, 0, env);
-          // @@ - to be addressed
-          //          delete this->value_;
-        }
-    }
-
-  if (env.exception ())
-    return;
-
-  if (this->type_ != 0)
-    this->type_->Release ();
-
-  this->type_ = tc;
-  tc->AddRef ();
-  this->value_ = (void *) v;
-  this->any_owns_data_ = any_owns_data;
-}
-
-// insertion of from_string
-void
-CORBA_Any::operator<<= (from_string s)
-{
-  // If the inserted string is bounded, we create a typecode.
-  static CORBA::Long _oc_string [] =
-  {     // CDR typecode octets
-    TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
-    0                       // ... unbounded string to start with
-  };
-
-  CORBA::TypeCode_ptr tc = 0;
-  if (s.bound_ > 0)
-    {
-      // Bounded string.
-      _oc_string [1] = s.bound_;
-      ACE_NEW (tc, CORBA::TypeCode (CORBA::tk_string,
-                                    sizeof _oc_string,
-                                    (char *) &_oc_string,
-                                    CORBA::B_TRUE));
-    }
-  else
-    tc = CORBA::_tc_string; // unbounded.
-
-  CORBA::Environment env;
-  if (s.nocopy_)
-      this->replace (tc, new char* (s.val_), CORBA::B_TRUE, env);
-  else // copying
-    this->replace (tc, new char* (CORBA::string_dup (s.val_)),
-                   CORBA::B_TRUE, env);
-}
-
-// Extraction: these are safe and hence we have to check that the
-// typecode of the Any is equal to the one we are trying to extract
-// into
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Short &s) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_short, env))
-    {
-      s = *(CORBA::Short *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::UShort &s) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_ushort, env))
-    {
-      s = *(CORBA::UShort *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Long &l) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_long, env))
-    {
-      l = *(CORBA::Long *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::ULong &l) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_ulong, env))
-    {
-      l = *(CORBA::ULong *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Float &f) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_float, env))
-    {
-      f = *(CORBA::Float *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Double &d) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_double, env))
-    {
-      d = *(CORBA::Double *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Any &a) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_any, env))
-    {
-      a = *(CORBA::Any *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (char *&s) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_string, env))
-    {
-      s = *(char **) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-// = extraction into the special types
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_boolean b) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_boolean, env))
-    {
-      b.ref_ = *(CORBA::Boolean *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_octet o) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_octet, env))
-    {
-      o.ref_ = *(CORBA::Octet *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_char c) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_char, env))
-    {
-      c.ref_ = *(CORBA::Char *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_string s) const
-{
-  CORBA::Environment env;
-
-  // The typecode must be equal. Since we do not readily have access
-  // to the typecode of the string into which we want to retrieve, we
-  // emulate the behavior of "equal"
-  if (this->type_->kind (env) == CORBA::tk_string)
-    {
-      CORBA::ULong bound = this->type_->length (env);
-      if (s.bound_ == bound) // bounds are same
-        {
-          s.val_ = *(char **) this->value_;
-          return CORBA::B_TRUE;
-        }
-    }
-
-  // Otherwise.
-  return CORBA::B_FALSE;
-}
-
-CORBA::Boolean
-CORBA_Any::operator>>= (to_object obj) const
-{
-  CORBA::Environment env;
-
-  if (this->type_->equal (CORBA::_tc_Object, env))
-    {
-      obj.ref_ = *(CORBA::Object_ptr *) this->value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-CORBA::ULong
-CORBA_Any::AddRef (void)
-{
-  return ++refcount_;
-}
-
-CORBA::ULong
-CORBA_Any::Release (void)
-{
-  {
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// ----------------------------------------------------------------------
-// Any_var type
-// ----------------------------------------------------------------------
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        delete (this->ptr_);
-
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (const CORBA::Any_var& r)
-{
-  if (this->ptr_ != 0)
-    delete (this->ptr_);
-
-  this->ptr_ = new CORBA::Any (*r.ptr_);
-  return *this;
-}
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
deleted file mode 100644
index 85601218be0..00000000000
--- a/TAO/tao/Any.h
+++ /dev/null
@@ -1,390 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Any.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     and Aniruddha Gokhale.
-//
-// ============================================================================
-
-#if !defined (TAO_ANY_H)
-#define TAO_ANY_H
-
-class TAO_Export CORBA_Any
-{
-  // = TITLE
-  //   Class "Any" can wrap values of any type, with the assistance
-  //   of a TypeCode to describe that type.
-  //
-  // = DESCRIPTION
-  //   This includes three constructors, a destructor, and a "replace"
-  //   method for the "Any" data type.  "Any" values pair a pointer to
-  //   a data structure in the native binary representation (e.g. C
-  //   struct) with a TypeCode that describes that data structure.
-  //
-  //   The copy constructor and the destructor each use the TypeCode
-  //   interpreter with specialized "visit" callback routines.  The
-  //   "visit" routines are used respectively to make "deep copies"
-  //   and perform "deep frees" of the aritrary values as described by
-  //   the "Any" value's typecode.
-  //
-  //   Note that these "visit" routines are called directly, and they
-  //   choose whether or not to use the TypeCode interpreter to
-  //   examine constituents.  In the simple cases, the "visit"
-  //   routines can do their work without any further calls; only for
-  //   constructed types is the interpreter's knowledge really
-  //   required.
-  //
-  //   THREADING NOTE: "Any" is a data structure which must be
-  //   protected by external critical sections.  Like simpler numeric
-  //   types, "Any" instances are accessed and modified atomically.
-  //   This implementation is reentrant, so that independent "Any"
-  //   values may be manipulated concurrently when the underlying
-  //   programming environment is itself reentrant.
-public:
-
-  // = Minor codes for exceptional returns
-  enum
-  {
-    UNINITIALIZED_type = 0xf000,
-    VALUE_WITHOUT_TYPE,
-    UNSUPPORTED_OPERATION
-  };
-
-  // = Initialization and termination operations.
-
-  CORBA_Any (void);
-  // Default constructor.
-
-  CORBA_Any (CORBA::TypeCode_ptr type,
-             void *value = 0,
-             CORBA::Boolean any_owns_data = CORBA::B_FALSE);
-  // Constructor. The any_owns_data flag determines if the Any owns the value
-
-  CORBA_Any (const CORBA_Any &a);
-  // Copy constructor.
-
-  ~CORBA_Any (void);
-  // Destructor.
-
-  CORBA_Any &operator= (const CORBA_Any &);
-  // assignment operator
-
-  // = NOTE: 94-9-14 has assignment operator plus many insertion, as
-  // specified below.
-
-  // =type safe insertion
-
-  void operator<<= (CORBA::Short);
-  // insert a short
-
-  void operator<<= (CORBA::UShort);
-  // insert an unsigned short
-
-  void operator<<= (CORBA::Long);
-  // insert a long
-
-  void operator<<= (CORBA::ULong);
-  // insert an unsigned long
-
-  void operator<<= (CORBA::Float);
-  // insert a float
-
-  void operator<<= (CORBA::Double);
-  // insert a double
-
-  void operator<<= (const CORBA_Any&);
-  // insert an Any
-
-  void operator<<= (const char*);
-  // insert unbounded strings
-
-  // =type safe extraction
-
-  CORBA::Boolean operator>>= (CORBA::Short&) const;
-  // extract a short
-
-  CORBA::Boolean operator>>= (CORBA::UShort&) const;
-  // extract an unsigned short
-
-  CORBA::Boolean operator>>= (CORBA::Long&) const;
-  // extract a long
-
-  CORBA::Boolean operator>>= (CORBA::ULong&) const;
-  // extract an unsigned long
-
-  CORBA::Boolean operator>>= (CORBA::Float&) const;
-  // extract a float
-
-  CORBA::Boolean operator>>= (CORBA::Double&) const;
-  // extract a double
-
-  CORBA::Boolean operator>>= (CORBA_Any&) const;
-  // extract an Any
-
-  CORBA::Boolean operator>>= (char*&) const;
-  // extract an unbounded string
-
-  // = Special types.
-
-  // These are needed for insertion and extraction of booleans,
-  // octets, chars, and bounded strings.
-
-  struct from_boolean
-  {
-    from_boolean (CORBA::Boolean b);
-    CORBA::Boolean val_;
-  };
-
-  struct from_octet
-  {
-    from_octet (CORBA::Octet o);
-    CORBA::Octet val_;
-  };
-
-  struct from_char
-  {
-    from_char (CORBA::Char c);
-    CORBA::Char val_;
-  };
-
-  struct from_string
-  {
-    from_string (char* s,
-                 CORBA::ULong b,
-                 CORBA::Boolean nocopy = CORBA::B_FALSE);
-    char *val_;
-    CORBA::ULong bound_;
-    CORBA::Boolean nocopy_;
-  };
-
-  void operator<<= (from_boolean);
-  // insert a boolean
-
-  void operator<<= (from_char);
-  // insert a char
-
-  void operator<<= (from_octet);
-  // insert an octet
-
-  void operator<<= (from_string);
-  // insert a bounded string
-
-  // = Special types.
-
-  // These extract octets, chars, booleans, bounded strings, and
-  // object references
-
-  struct to_boolean
-  {
-    to_boolean (CORBA::Boolean &b);
-    CORBA::Boolean &ref_;
-  };
-
-  struct to_char
-  {
-    to_char (CORBA::Char &c);
-    CORBA::Char &ref_;
-  };
-
-  struct to_octet
-  {
-    to_octet (CORBA::Octet &o);
-    CORBA::Octet &ref_;
-  };
-
-  struct to_string
-  {
-    to_string (char *&s, CORBA::ULong b);
-    char *&val_;
-    CORBA::ULong bound_;
-  };
-
-  struct to_object
-  {
-    to_object (CORBA::Object_ptr &obj);
-    CORBA::Object_ptr &ref_;
-  };
-
-  // extraction of the special types
-
-  CORBA::Boolean operator>>= (to_boolean) const;
-  // extract a boolean
-
-  CORBA::Boolean operator>>= (to_octet) const;
-  // extract an octet
-
-  CORBA::Boolean operator>>= (to_char) const;
-  // extract a char
-
-  CORBA::Boolean operator>>= (to_string) const;
-  // extract a bounded string
-
-  CORBA::Boolean operator>>= (to_object) const;
-  // extract an object reference
-
-  // = ALLOCATION
-
-  void *operator new (size_t, const void *p);
-  // Placement new.
-
-  void *operator new (size_t s);
-  // Default new.
-
-  void operator delete (void *p);
-  // Default delete
-
-  // the following are unsafe operations
-  // ORBOS/90-01-11, pg 672: For C++ mapping using the CORBA::Environment
-  // parameter, two forms of the replace method are provided.
-
-  void replace (CORBA::TypeCode_ptr type,
-                const void *value,
-                CORBA::Boolean any_owns_data,
-                CORBA::Environment &env);
-  // Replace the current typecode and data with the specified one -
-  // unsafe.
-
-  void replace (CORBA::TypeCode_ptr type,
-                const void *value,
-                CORBA::Environment &env);
-  // Replace the current typecode and data with the specified one -
-  // unsafe. This uses a default value for the "any_owns_data" parameter
-
-  CORBA::TypeCode_ptr type (void) const;
-  // Return TypeCode of the element stored in the Any.
-
-  const void *value (void) const;
-  // Returns 0 if the Any has not been assigned a value, following the
-  // CORBA spec (ORBOS/98-01-11) it returns a non-zero value
-  // otherwise. TAO does *not* guarantee that this value may be casted
-  // to the contained type safely.
-
-  // = Memory management methods.
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-private:
-  CORBA::TypeCode_ptr type_;
-  // Typecode for the <Any>.
-
-  void *value_;
-  // Value for the <Any>.
-
-  CORBA::Boolean any_owns_data_;
-  // Flag that indicates the ORB is responsible for deleting the data.
-
-  CORBA::ULong refcount_;
-  // Reference count the <Any> to reduce copying costs.
-
-  // 94-9-14 hides unsigned char insert/extract
-  void operator<<= (unsigned char);
-  CORBA::Boolean operator>>= (unsigned char&) const;
-};
-
-class TAO_Export CORBA_Any_var
-{
-  // = TITLE
-  //   Provide for automatic storage deallocation on going out of
-  //   scope.
-public:
-  CORBA_Any_var (void);
-  // default constructor
-
-  CORBA_Any_var (CORBA_Any *a);
-  // construct from an Any pointer
-
-  CORBA_Any_var (const CORBA_Any_var &a);
-  // copy constructor
-
-  ~CORBA_Any_var (void);
-  // destructor
-
-  CORBA_Any_var &operator= (CORBA_Any *a);
-  // assignment from a pointer to Any
-
-  CORBA_Any_var &operator= (const CORBA_Any_var &a);
-  // assignment from an Any_var
-
-  CORBA_Any *operator-> (void);
-  // arrow operator (smart pointer)
-
-  operator const CORBA_Any *() const;
-  // cast
-
-  operator CORBA_Any *&();
-  // cast
-
-  const CORBA_Any &in (void) const;
-  // for in Any parameter
-
-  CORBA_Any &inout (void);
-  // for inout Any parameter
-
-  CORBA_Any *&out (void);
-  // for out Any parameter
-
-  CORBA_Any *_retn (void);
-  // for Any return types
-
-private:
-  CORBA_Any *ptr_;
-  // Holds the Any.
-};
-
-class TAO_Export CORBA_Any_out
-{
-  // = TITLE
-  //   CORBA_Any_out
-  //
-  // = DESCRIPTION
-  //   The _out class for CORBA_Any. This is used to help in managing the out
-  //   parameters.
-public:
-  // = operations.
-
-  CORBA_Any_out (CORBA_Any *&p);
-  // construction from a reference to a CORBA_Any
-
-  CORBA_Any_out (CORBA_Any_var &p);
-  // construction from a var
-
-  CORBA_Any_out (CORBA_Any_out &s);
-  // copy constructor
-
-  CORBA_Any_out &operator= (CORBA_Any_out &s);
-  // assignment from a CORBA_Any_out
-
-  CORBA_Any_out &operator= (CORBA_Any *p);
-  // assignment from a CORBA_Any
-
-  CORBA_Any_out &operator= (const CORBA_Any *p);
-  // assignment from a const CORBA_Any
-
-  operator CORBA_Any *&();
-  // cast
-
-  CORBA_Any *& ptr (void);
-  // return underlying instance
-
-private:
-  CORBA_Any *&ptr_;
-  // Instance
-
-  void operator= (const CORBA_Any_var &);
-  // assignment from _var disallowed
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
deleted file mode 100644
index 55c740cf42a..00000000000
--- a/TAO/tao/Any.i
+++ /dev/null
@@ -1,306 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-ACE_INLINE void *
-CORBA_Any::operator new (size_t, const void *p)
-{
-  return (void *) p;
-}
-
-ACE_INLINE void *
-CORBA_Any::operator new (size_t s)
-{
-  return ::operator new (s);
-}
-
-ACE_INLINE void
-CORBA_Any::operator delete (void *p)
-{
-  ::operator delete (p);
-}
-
-// Insertion from special types.
-
-ACE_INLINE void
-CORBA_Any::replace (CORBA::TypeCode_ptr type,
-                    const void *value,
-                    CORBA::Environment &env)
-{
-  // invoke the first form of the replace method and pass the default value
-  // (FALSE) for the "any_owns_data" parameter
-  this->replace (type, value, CORBA::B_FALSE, env);
-}
-
-// insertion operators
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Short s)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_short, new CORBA::Short (s), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::UShort s)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_ushort, new CORBA::UShort (s), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Long l)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_long, new CORBA::Long (l), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::ULong l)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_ulong, new CORBA::ULong (l), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Float f)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_float, new CORBA::Float (f), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Double d)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_double, new CORBA::Double (d), CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (const CORBA_Any& a)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_any, new CORBA_Any (a), CORBA::B_TRUE, env);
-}
-
-// this is a copying version for unbounded strings
-ACE_INLINE void
-CORBA_Any::operator<<= (const char* s)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_string, new char* (CORBA::string_dup (s)),
-                 CORBA::B_TRUE, env);
-}
-
-// implementing the special types
-ACE_INLINE
-CORBA_Any::from_boolean::from_boolean (CORBA::Boolean b)
-  : val_ (b)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_boolean::to_boolean (CORBA::Boolean &b)
-  : ref_ (b)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_octet::from_octet (CORBA::Octet o)
-  : val_ (o)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_octet::to_octet (CORBA::Octet &o)
-  : ref_ (o)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_char::from_char (CORBA::Char c)
-  : val_ (c)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_char::to_char (CORBA::Char &c)
-  : ref_ (c)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_string::from_string (char *s,
-                                     CORBA::ULong b,
-                                     CORBA::Boolean nocopy)
-  : val_ (s),
-    bound_ (b),
-    nocopy_ (nocopy)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_string::to_string (char *&s,
-                                 CORBA::ULong b)
-  : val_ (s),
-    bound_ (b)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_object::to_object (CORBA::Object_ptr &obj)
-  : ref_ (obj)
-{
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_boolean b)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_),
-                 CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_octet o)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_octet, new CORBA::Octet (o.val_),
-                 CORBA::B_TRUE, env);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_char c)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_char, new CORBA::Char (c.val_),
-                 CORBA::B_TRUE, env);
-}
-
-// ----------------------------------------------------------------------
-// CORBA_Any_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (CORBA_Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r)
-  : ptr_ (new CORBA::Any (*r.ptr_))
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::~CORBA_Any_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Any_var::operator CORBA_Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Any_var::operator const CORBA_Any *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA_Any_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA_Any &
-CORBA_Any_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Any_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *&
-CORBA_Any_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *
-CORBA_Any_var::_retn (void)
-{
-  CORBA_Any *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------------------------
-// CORBA_Any_out type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (CORBA_Any_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (CORBA_Any *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (const CORBA_Any *s)
-{
-  this->ptr_ = new CORBA::Any (*s);
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Any_out::operator CORBA_Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *&
-CORBA_Any_out::ptr (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Arg_Shifter.cpp b/TAO/tao/Arg_Shifter.cpp
deleted file mode 100644
index 8e8dc51aa34..00000000000
--- a/TAO/tao/Arg_Shifter.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "Arg_Shifter.h"
-
-Arg_Shifter::Arg_Shifter (int &argc, char **argv, char **temp)
-  : argc_ (argc),
-    total_size_ (argc),
-    temp_ (temp),
-    argv_ (argv),
-    current_index_ (0),
-    back_ (argc - 1),
-    front_ (0)
-{
-  // If not provided with one, allocate a temporary array.
-  if (this->temp_ == 0)
-    this->temp_ = new char *[this->total_size_];
-  
-  if (this->temp_ != 0)
-    {
-      // Fill the temporary array.
-      this->argc_ = 0;
-      for (int i = 0; i < this->total_size_; i++)
-	{
-	  this->temp_[i] = this->argv_[i];
-	  this->argv_[i] = 0;
-	}
-    }
-  else
-    {
-      // Allocation failed, prohibit iteration.
-      this->current_index_ = this->argc_;
-      this->front_ = this->argc_;
-    }
-}
-
-Arg_Shifter::~Arg_Shifter (void)
-{
-  // Delete the temporary vector.
-  delete [] temp_;
-}
-
-char * 
-Arg_Shifter::get_current (void) const
-{
-  char *return_value = 0;
-  
-  if (this->is_anything_left ())
-    return_value =  this->temp_[current_index_];
-
-  return return_value;
-}
-
-int
-Arg_Shifter::consume_arg (int number)
-{
-  int return_value = 0;
-
-  // Stick knowns at the end of the vector (consumed).
-  if (this->is_anything_left() >= number)
-    {
-      for (int i = 0, j = this->back_ - (number - 1);
-	   i < number;
-	   i++, j++, this->current_index_++)
-	this->argv_[j] = this->temp_[this->current_index_];
-      
-      this->back_ -= number;
-      return_value = 1;
-    }
-
-  return return_value;
-}
-
-int
-Arg_Shifter::ignore_arg (int number)
-{
-  int return_value = 0;
-
-  // Keep unknowns at the head of the vector.
-  if (this->is_anything_left () >= number)
-    {
-      for (int i = 0;
-	   i < number;
-	   i++, this->current_index_++, this->front_++)
-	this->argv_[this->front_] = this->temp_[this->current_index_];
-
-      return_value = 1;
-      this->argc_ += number;
-    }
-
-  return return_value;
-}
-
-int
-Arg_Shifter::is_anything_left (void) const
-{
-  return this->total_size_ - this->current_index_;
-}
-
-int
-Arg_Shifter::is_option_next (void) const
-{
-  return this->is_anything_left () &&
-    this->temp_[this->current_index_][0] == '-';
-}
-
-int
-Arg_Shifter::is_parameter_next (void) const
-{
-  return this->is_anything_left () 
-    && this->temp_[this->current_index_][0] != '-';
-}
-
-int
-Arg_Shifter::num_ignored_args (void) const
-{
-  return this->front_;
-}
diff --git a/TAO/tao/Arg_Shifter.h b/TAO/tao/Arg_Shifter.h
deleted file mode 100644
index d0952b48e01..00000000000
--- a/TAO/tao/Arg_Shifter.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY 
-//     TAO 
-//  
-// = FILENAME 
-//     Arg_Shifter.h
-// 
-// = AUTHOR 
-//     Seth Widoff 
-// 
-// ========================================================================
-
-#if !defined (TAO_ARG_SHIFTER_H)
-#define TAO_ARG_SHIFTER_H
-
-class Arg_Shifter
-{
-  // = TITLE
-  //    This ADT shifts known args to the back of the argv vector, so
-  //    deeper levels of argument parsing can locate the yet
-  //    unprocessed arguments at the beginning of the vector.
-  //
-  // = DESCRIPTION
-  //    The Arg_Shifter copies the pointers of the argv vector into a
-  //    temporary array. As the Arg_Shifter iterates over the temp, is
-  //    places known arguments in the rear of the argv and unknown
-  //    ones in the beginning. So, after having visited all the
-  //    arguments in the temp vector, Arg_Shifter has placed all the
-  //    unknown arguments in their original order at the front of
-  //    argv.
-public:
-  Arg_Shifter (int &argc, char **argv, char **temp = 0);
-  // Initialize the Arg_Shifter to the vector over which to iterate,
-  // also providing the temporary array if the client doesn't want the
-  // arg_shifter to dynamically allocate its own. If internal dynamic
-  // allocation fails, the Arg_Shifter will set all the indices to the
-  // end of the vector, forbidding iteration. Following iteration over
-  // argv, the argc value will contain the number of unconsumed
-  // arguments.
-  
-  ~Arg_Shifter (void);
-  
-  char *get_current (void) const;
-  // Get the current head of the vector.
-
-  int consume_arg (int number = 1);
-  // Consume <number> argument(s) by sticking them/it on the end of
-  // the vector.
-
-  int ignore_arg (int number = 1);
-  // Place <number> arguments in the same relative order ahead of the
-  // known arguemnts in the vector.
-
-  int is_anything_left (void) const;
-  // Returns the number of args left to see in the vector.
-
-  int is_option_next (void) const;
-  // Returns 1 if there's a next item in the vector and it begins with
-  // '-'.
-  
-  int is_parameter_next (void) const;
-  // Returns 1 if there's a next item in the vector and it doesn't
-  // begin with '-'.
-  
-  int num_ignored_args (void) const;
-  // Returns the number of irrelevant args seen.
-  
-private:
-  int &argc_;
-  // The size of the argument vector.
-
-  int total_size_;
-  // The size of argv_.
-  
-  char **temp_;
-  // The temporary array over which we traverse.
-  
-  char **argv_;
-  // The array in which the arguments are reordered.
-
-  int current_index_;
-  // The element in <temp_> we're currently examining.
-
-  int back_;
-  // The index of <argv_> in which we'll stick the next unknown
-  // argument.
-  
-  int front_;
-  // The index of <argv_> in which we'll stick the next known
-  // argument. 
-};
-
-#endif /* TAO_ARG_SHIFTER_H */
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
deleted file mode 100644
index 2fe36da874d..00000000000
--- a/TAO/tao/CDR.cpp
+++ /dev/null
@@ -1,828 +0,0 @@
-// $Id$
-
-//
-// Portions of this file are:
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-// CDR:         Encode/Decode basic machine data types
-//
-// Implementation of OMG "Common Data Representation" (CDR) ... there
-// are one routine each for byte/halfword/word/doubleword put/get,
-// which adjust to establish "natural" alignment (the bulk of the
-// code) and then put or get with byteswapping as needed.
-//
-// The implementation knows that native data formats are conformant
-// with OMG-IDL's (and hence CDR's) size requirements, and relies on
-// the fact that (for example) CORBA_Long is always four bytes long
-// even if the environment's "int" is a different size.
-//
-//      char, octet                       8 bits (1 byte)
-//      short, unsigned short            16 bits (2 bytes)
-//      long, unsigned long, float       32 bits (4 bytes)
-//      double, (unsigned) long long     64 bits (8 bytes)
-//      long double                     128 bits (16 bytes)
-//
-// Moreover, this "knows" that the native 'char' represents ISO
-// Latin/1 characters (an ASCII superset addressing Western European
-// characters) and that "double" and "float" comply with the IEEE
-// standards. (The "long double" may not be a native data type,
-// though.)
-//
-// THREADING NOTE: "CDR" is a data structure which must be protected
-// by external critical sections.  Like simpler numeric types, "CDR"
-// instances are accessed and modified atomically.  This
-// implementation is reentrant, so that independent "CDR" values may
-// be manipulated concurrently when the underlying programming
-// environment is itself reentrant.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CDR.i"
-#endif /* ! __ACE_INLINE__ */
-
-// This functions are private, so it is safe to declare them inline in
-// the .cpp file, we still use the ACE_INLINE macro to support
-// compilations without any inline code.
-
-ACE_INLINE
-void CDR::swap_2 (const char *orig, char* target)
-{
-  target[1] = *orig++;
-  target[0] = *orig++;
-}
-
-ACE_INLINE
-void CDR::swap_4 (const char *orig, char* target)
-{
-  target [3] = *orig++;
-  target [2] = *orig++;
-  target [1] = *orig++;
-  target [0] = *orig++;
-}
-
-ACE_INLINE
-void CDR::swap_8 (const char *orig, char* target)
-{
-  target [7] = *orig++;
-  target [6] = *orig++;
-  target [5] = *orig++;
-  target [4] = *orig++;
-  target [3] = *orig++;
-  target [2] = *orig++;
-  target [1] = *orig++;
-  target [0] = *orig++;
-}
-
-ACE_INLINE
-void CDR::swap_16 (const char *orig, char* target)
-{
-  target [15] = *orig++;
-  target [14] = *orig++;
-  target [13] = *orig++;
-  target [12] = *orig++;
-  target [11] = *orig++;
-  target [10] = *orig++;
-  target [9] = *orig++;
-  target [8] = *orig++;
-  target [7] = *orig++;
-  target [6] = *orig++;
-  target [5] = *orig++;
-  target [4] = *orig++;
-  target [3] = *orig++;
-  target [2] = *orig++;
-  target [1] = *orig++;
-  target [0] = *orig++;
-}
-
-int
-CDR::grow (ACE_Message_Block*& mb, size_t minsize)
-{
-  // Calculate the new buffer's length; if growing for encode, we
-  // don't grow in "small" chunks because of the cost.
-
-  size_t size = mb->size();
-  size_t newsize = size;
-
-  if (minsize == 0)
-    {
-      // TODO We should the growth strategy should be controlled using
-      // the ORB parameters....
-      if (size < CDR::EXP_GROWTH_MAX)
-        newsize *= 2;
-      else
-        newsize += CDR::LINEAR_GROWTH_CHUNK;
-    }
-  else if (minsize <= size)
-    return 0;
-  else
-    {
-      while (newsize < minsize)
-        {
-          if (newsize < CDR::EXP_GROWTH_MAX)
-            newsize *= 2;
-          else
-            newsize += CDR::LINEAR_GROWTH_CHUNK;
-        }
-    }
-
-  ACE_Message_Block* tmp;
-  ACE_NEW_RETURN (tmp, ACE_Message_Block (newsize), -1);
-
-  CDR::mb_align (tmp);
-
-  tmp->copy (mb->rd_ptr (), mb->length());
-  ACE_Message_Block::release (mb);
-  mb = tmp;
-
-  return 0;
-}
-
-// ****************************************************************
-// ****************************************************************
-// ****************************************************************
-
-TAO_OutputCDR::TAO_OutputCDR (size_t size,
-                              int byte_order,
-                              TAO_Marshal_Factory *factory)
-  :  factory_ (factory),
-     do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER),
-     good_bit_ (1)
-{
-  if (size == 0)
-    {
-      size = CDR::DEFAULT_BUFSIZE + CDR::MAX_ALIGNMENT;
-    }
-  ACE_NEW (this->start_, ACE_Message_Block (size));
-  CDR::mb_align (this->start_);
-}
-
-TAO_OutputCDR::TAO_OutputCDR (char *data, size_t size,
-                              int byte_order,
-                              TAO_Marshal_Factory *factory)
-  :  factory_ (factory),
-     do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER),
-     good_bit_ (1)
-{
-  ACE_NEW (this->start_, ACE_Message_Block (data, size));
-  // We cannot trust the buffer to be properly aligned
-  CDR::mb_align (this->start_);
-}
-
-TAO_OutputCDR::~TAO_OutputCDR (void)
-{
-  ACE_Message_Block::release (this->start_);
-  this->start_ = 0;
-}
-
-void
-TAO_OutputCDR::reset (void)
-{
-  CDR::mb_align (this->start_);
-}
-
-ACE_INLINE char*
-TAO_OutputCDR::wr_ptr (void) const
-{
-  return this->start_->wr_ptr ();
-}
-
-ACE_INLINE char*
-TAO_OutputCDR::end (void) const
-{
-  return this->start_->end ();
-}
-
-ACE_INLINE int
-TAO_OutputCDR::adjust (size_t size, size_t align, char*& buf)
-{
-  buf = ptr_align_binary (this->wr_ptr(), align);
-  char *end = buf + size;
-
-  if (end <= this->end ())
-    {
-      this->start_->wr_ptr (end);
-      return 0;
-    }
-  else if (CDR::grow (this->start_,
-                      this->start_->size() + (end - this->end () )) == 0)
-    {
-      // grow(0) may change the value of wr_ptr() so we have to
-      // recompute the position....
-      buf = ptr_align_binary (this->wr_ptr(), align);
-      this->start_->wr_ptr (buf + size);
-      return 0;
-    }
-  this->good_bit_ = 0;
-  return -1;
-}
-
-ACE_INLINE int
-TAO_OutputCDR::adjust (size_t size, char*& buf)
-{
-  return this->adjust (size, size, buf);
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_1 (const CORBA::Octet* x)
-{
-  if (this->wr_ptr () < this->end() || CDR::grow(this->start_, 0) == 0)
-    {
-      *ACE_reinterpret_cast(CORBA::Octet*,this->wr_ptr()) = *x;
-      this->start_->wr_ptr (1);
-      return CORBA::B_TRUE;
-    }
-
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_2 (const CORBA::UShort* x)
-{
-  char* buf;
-  if (this->adjust (CDR::SHORT_SIZE, buf) == 0)
-    {
-#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(CORBA::UShort*,buf) = *x;
-      return CORBA::B_TRUE;
-#else
-      if (!this->do_byte_swap_)
-	{
-	  *ACE_reinterpret_cast(CORBA::UShort*,buf) = *x;
-	  return CORBA::B_TRUE;
-	}
-      else
-	{
-	  CDR::swap_2 (ACE_reinterpret_cast(char*,x), buf);
-	  return CORBA::B_TRUE;
-	}
-#endif /* TAO_ENABLE_SWAP_ON_WRITE */
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_4 (const CORBA::ULong* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONG_SIZE, buf) == 0)
-    {
-#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(CORBA::ULong*,buf) = *x;
-      return CORBA::B_TRUE;
-#else
-      if (!this->do_byte_swap_)
-	{
-	  *ACE_reinterpret_cast(CORBA::ULong*,buf) = *x;
-	  return CORBA::B_TRUE;
-	}
-      else
-	{
-	  CDR::swap_4 (ACE_reinterpret_cast(char*,x), buf);
-	  return CORBA::B_TRUE;
-	}
-#endif /* TAO_ENABLE_SWAP_ON_WRITE */
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_8 (const CORBA::ULongLong* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONGLONG_SIZE, buf) == 0)
-    {
-#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(CORBA::ULongLong*,buf) = *x;
-      return CORBA::B_TRUE;
-#else
-      if (!this->do_byte_swap_)
-	{
-	  *ACE_reinterpret_cast(CORBA::ULongLong*,buf) = *x;
-	  return CORBA::B_TRUE;
-	}
-      else
-	{
-	  CDR::swap_8 (ACE_reinterpret_cast(char*,x), buf);
-	  return CORBA::B_TRUE;
-	}
-#endif /* TAO_ENABLE_SWAP_ON_WRITE */
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_16 (const CORBA::LongDouble* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONGDOUBLE_SIZE, CDR::LONGDOUBLE_ALIGN, buf) == 0)
-    {
-#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(CORBA::LongDouble*,buf) = *x;
-      return CORBA::B_TRUE;
-#else
-      if (!this->do_byte_swap_)
-	{
-	  *ACE_reinterpret_cast(CORBA::LongDouble*,buf) = *x;
-	  return CORBA::B_TRUE;
-	}
-      else
-	{
-	  CDR::swap_16 (ACE_reinterpret_cast(char*,x), buf);
-	  return CORBA::B_TRUE;
-	}
-#endif /* TAO_ENABLE_SWAP_ON_WRITE */
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_array (const void* x,
-                            size_t size,
-                            size_t align,
-                            CORBA::ULong length)
-{
-  char* buf;
-  if (this->adjust (size * length, align, buf) == 0)
-    {
-#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
-      ACE_OS::memcpy (buf, x, size*length);
-      return CORBA::B_TRUE;
-#else
-      if (!this->do_byte_swap_)
-	{
-	  ACE_OS::memcpy (buf, x, size*length);
-	  return CORBA::B_TRUE;
-	}
-      else
-	{
-          // I cannot see any fast way out of this....
-          typedef void (*SWAPPER)(const char*, char*);
-          SWAPPER swapper;
-          switch (size)
-            {
-            case 2:
-              swapper = CDR::swap_2;
-              break;
-            case 4:
-              swapper = CDR::swap_4;
-              break;
-            case 8:
-              swapper = CDR::swap_8;
-              break;
-            case 16:
-              swapper = CDR::swap_16;
-              break;
-            default:
-              // TODO: print something?
-              this->good_bit_ = 0;
-              return CORBA::B_FALSE;
-            }
-          char *source = ACE_reinterpret_cast(char*,x);
-          char *end = target + size*length;
-          for (; source != end; source += size, buf += size)
-            {
-              (*swapper)(source, buf);
-            }
-	}
-#endif /* TAO_ENABLE_SWAP_ON_WRITE */
-    }
-  this->good_bit_ = 0;
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_string (const CORBA::Char *x)
-{
-  if (x != 0)
-    {
-      CORBA::ULong len = ACE_OS::strlen (x) + 1;
-      if (this->write_ulong (len))
-	{
-	  return this->write_char_array (x, len);
-	}
-    }
-  else
-    {
-      // Be nice to programmers: treat nulls as empty strings not
-      // errors. (OMG-IDL supports languages that don't use the C/C++
-      // notion of null v. empty strings; nulls aren't part of the OMG-IDL
-      // string model.)
-      if (this->write_ulong (1))
-	{
-	  return this->write_char (0);
-	}
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_wstring (const CORBA::WChar *x)
-{
-  if (x != 0)
-    {
-      CORBA::ULong len = ACE_OS::wslen (x) + 1;
-      if (this->write_ulong (len))
-	{
-	  return this->write_wchar_array (x, len);
-	}
-    }
-  else
-    {
-      if (this->write_ulong (1))
-	{
-	  return this->write_wchar (0);
-	}
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_OutputCDR::write_boolean_array (const CORBA::Boolean* x,
-                                    CORBA::ULong length)
-{
-  // It is hard to optimize this, the spec requires that on the wire
-  // booleans be represented as a byte with value 0 or 1, but in
-  // memoery it is possible (though very unlikely) that a boolean has
-  // a non-zero value (different from 1).
-  // We resort to a simple loop.
-  const CORBA::Boolean* end = x + length;
-  for (const CORBA::Boolean* i = x; i != end && this->good_bit(); ++i)
-    {
-      this->write_boolean (*i);
-    }
-  return this->good_bit ();
-}
-
-// ****************************************************************
-
-TAO_InputCDR::TAO_InputCDR (const char *buf, size_t bufsiz,
-                            int byte_order,
-                            TAO_Marshal_Factory *factory)
-  : factory_ (factory),
-    do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER),
-    good_bit_ (1)
-{
-  ACE_NEW (this->start_, ACE_Message_Block (buf, bufsiz));
-  this->start_->wr_ptr (bufsiz);
-}
-
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size,
-                            CORBA::Long offset)
-  : start_ (ACE_Message_Block::duplicate (rhs.start_)),
-    factory_ (rhs.factory_),
-    do_byte_swap_ (rhs.do_byte_swap_),
-    good_bit_ (1)
-{
-  char* newpos = this->start_->rd_ptr() + offset;
-  if (this->start_->base () <= newpos
-      && newpos <= this->start_->end ()
-      && newpos + size <= this->start_->end ())
-    {
-      this->start_->rd_ptr (newpos);
-      this->start_->wr_ptr (newpos + size);
-    }
-  else
-    {
-      this->good_bit_ = 0;
-    }
-}
-
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size)
-  : start_ (ACE_Message_Block::duplicate (rhs.start_)),
-    factory_ (rhs.factory_),
-    do_byte_swap_ (rhs.do_byte_swap_),
-    good_bit_ (1)
-{
-  char* newpos = this->start_->rd_ptr();
-  if (this->start_->base () <= newpos
-      && newpos <= this->start_->end ()
-      && newpos + size <= this->start_->end ())
-    {
-      // Notice that ACE_Message_Block::duplicate may leave the
-      // wr_ptr() with a higher value that what we actually want.
-      this->start_->wr_ptr (newpos + size);
-
-      CORBA::Octet byte_order;
-      this->read_octet (byte_order);
-      this->do_byte_swap_ = (byte_order != TAO_ENCAP_BYTE_ORDER);
-    }
-  else
-    {
-      this->good_bit_ = 0;
-    }
-}
-
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs)
-  : start_ (ACE_Message_Block::duplicate (rhs.start_)),
-    factory_ (rhs.factory_),
-    do_byte_swap_ (rhs.do_byte_swap_),
-    good_bit_ (1)
-{
-}
-
-TAO_InputCDR&
-TAO_InputCDR::operator= (const TAO_InputCDR& rhs)
-{
-  if (this != &rhs)
-    {
-      ACE_Message_Block::release (this->start_);
-      this->start_ = ACE_Message_Block::duplicate (rhs.start_);
-      this->factory_ = rhs.factory_;
-      this->do_byte_swap_ = rhs.do_byte_swap_;
-      this->good_bit_ = 1;
-    }
-  return *this;
-}
-
-TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs)
-  : start_ (ACE_Message_Block::duplicate (rhs.start_)),
-    factory_ (rhs.factory_),
-    do_byte_swap_ (rhs.do_byte_swap_),
-    good_bit_ (1)
-{
-}
-
-TAO_InputCDR::~TAO_InputCDR (void)
-{
-  ACE_Message_Block::release (this->start_);
-  this->start_ = 0;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_string (CORBA::Char*& x)
-{
-  CORBA::ULong len;
-  this->read_ulong (len);
-  if (this->good_bit() && len > 0)
-    {
-      x = CORBA::string_alloc (len);
-      if (this->read_char_array (x, len))
-        return CORBA::B_TRUE;
-      CORBA::string_free (x);
-    }
-  x = 0;
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_wstring (CORBA::WChar*& x)
-{
-  CORBA::ULong len;
-  this->read_ulong (len);
-  if (this->good_bit())
-    {
-      x = CORBA::wstring_alloc (len);
-      if (this->read_wchar_array (x, len))
-        return CORBA::B_TRUE;
-
-      CORBA::wstring_free (x);
-    }
-  x = 0;
-  return CORBA::B_FALSE;
-}
-
-ACE_INLINE char*
-TAO_InputCDR::end (void)
-{
-  return this->start_->end ();
-}
-
-ACE_INLINE void
-TAO_InputCDR::rd_ptr (size_t offset)
-{
-  this->start_->rd_ptr (offset);
-}
-
-ACE_INLINE int
-TAO_InputCDR::adjust (size_t size,
-                      size_t align,
-                      char*& buf)
-{
-  buf = ptr_align_binary (this->rd_ptr(), align);
-  char *end = buf + size;
-  if (end <= this->end ())
-    {
-      this->start_->rd_ptr (end);
-      return 0;
-    }
-
-  this->good_bit_ = 0;
-  return -1;
-}
-
-ACE_INLINE int
-TAO_InputCDR::adjust (size_t size,
-                      char*& buf)
-{
-  return this->adjust (size, size, buf);
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_1 (CORBA::Octet* x)
-{
-  if (this->rd_ptr () < this->end())
-    {
-      *x = *ACE_reinterpret_cast(CORBA::Octet*,this->rd_ptr());
-      this->start_->rd_ptr (1);
-      return CORBA::B_TRUE;
-    }
-
-  this->good_bit_ = 0;
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_2 (CORBA::UShort* x)
-{
-  char* buf;
-  if (this->adjust (CDR::SHORT_SIZE, buf) == 0)
-    {
-#if !defined (TAO_DISABLE_SWAP_ON_READ)
-      if (!this->do_byte_swap_)
-        {
-          *x = *ACE_reinterpret_cast(CORBA::UShort*,buf);
-        }
-      else
-        {
-          CDR::swap_2 (buf, ACE_reinterpret_cast(char*,x));
-        }
-#else
-      *x = *ACE_reinterpret_cast(CORBA::UShort*,buf);
-#endif /* TAO_DISABLE_SWAP_ON_READ */
-      return CORBA::B_TRUE;
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_4 (CORBA::ULong* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONG_SIZE, buf) == 0)
-    {
-#if !defined (TAO_DISABLE_SWAP_ON_READ)
-      if (!this->do_byte_swap_)
-        {
-          *x = *ACE_reinterpret_cast(CORBA::ULong*,buf);
-        }
-      else
-        {
-          CDR::swap_4 (buf, ACE_reinterpret_cast(char*,x));
-        }
-#else
-      *x = *ACE_reinterpret_cast(CORBA::ULong*,buf);
-#endif /* TAO_DISABLE_SWAP_ON_READ */
-      return CORBA::B_TRUE;
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_8 (CORBA::ULongLong* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONGLONG_SIZE, buf) == 0)
-    {
-#if !defined (TAO_DISABLE_SWAP_ON_READ)
-      if (!this->do_byte_swap_)
-        {
-          *x = *ACE_reinterpret_cast(CORBA::ULongLong*,buf);
-        }
-      else
-        {
-          CDR::swap_8 (buf, ACE_reinterpret_cast(char*,x));
-        }
-#else
-      *x = *ACE_reinterpret_cast(CORBA::ULongLong*,buf);
-#endif /* TAO_DISABLE_SWAP_ON_READ */
-      return CORBA::B_TRUE;
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_16 (CORBA::LongDouble* x)
-{
-  char* buf;
-  if (this->adjust (CDR::LONGDOUBLE_SIZE,
-                    CDR::LONGDOUBLE_ALIGN,
-                    buf) == 0)
-    {
-#if !defined (TAO_DISABLE_SWAP_ON_READ)
-      if (!this->do_byte_swap_)
-        {
-          *x = *ACE_reinterpret_cast(CORBA::LongDouble*,buf);
-        }
-      else
-        {
-          CDR::swap_16 (buf, ACE_reinterpret_cast(char*,x));
-        }
-#else
-      *x = *ACE_reinterpret_cast(CORBA::LongDouble*,buf);
-#endif /* TAO_DISABLE_SWAP_ON_READ */
-      return CORBA::B_TRUE;
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_array (void* x,
-                          size_t size,
-                          size_t align,
-                          CORBA::ULong length)
-{
-  char* buf;
-  if (this->adjust (size * length, align, buf) == 0)
-    {
-#if !defined (TAO_DISABLE_SWAP_ON_READ)
-      if (!this->do_byte_swap_ || size == 1)
-        {
-          ACE_OS::memcpy (x, buf, size*length);
-        }
-      else
-        {
-          // I cannot see any fast way out of this....
-          typedef void (*SWAPPER)(const char*, char*);
-          SWAPPER swapper;
-          switch (size)
-            {
-            case 2:
-              swapper = CDR::swap_2;
-              break;
-            case 4:
-              swapper = CDR::swap_4;
-              break;
-            case 8:
-              swapper = CDR::swap_8;
-              break;
-            case 16:
-              swapper = CDR::swap_16;
-              break;
-            default:
-              // TODO: print something?
-              this->good_bit_ = 0;
-              return CORBA::B_FALSE;
-            }
-          char *target = ACE_reinterpret_cast(char*,x);
-          char *end = target + size*length;
-          for (; target != end; target += size, buf += size)
-            {
-              (*swapper)(buf, target);
-            }
-        }
-#else
-      ACE_OS::memcpy (x, buf, size*length);
-#endif /* TAO_DISABLE_SWAP_ON_READ */
-      return this->good_bit_;
-    }
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::read_boolean_array (CORBA::Boolean* x,
-                                  CORBA::ULong length)
-{
-  // It is hard to optimize this, the spec requires that on the wire
-  // booleans be represented as a byte with value 0 or 1, but in
-  // memoery it is possible (though very unlikely) that a boolean has
-  // a non-zero value (different from 1).
-  // We resort to a simple loop.
-  for (CORBA::ULong i = 0; i != length && this->good_bit_; ++i)
-    {
-      this->read_boolean (x[i]);
-    }
-  return this->good_bit_;
-}
-
-CORBA_Boolean
-TAO_InputCDR::skip_string (void)
-{
-  CORBA::ULong len;
-  if (this->read_ulong (len))
-    {
-      if (this->rd_ptr () + len <= this->end ())
-        {
-          this->rd_ptr (len);
-          return CORBA::B_TRUE;
-        }
-      this->good_bit_ = 0;
-    }
-
-  return CORBA::B_FALSE;
-}
-
-CORBA_Boolean
-TAO_InputCDR::skip_bytes (size_t len)
-{
-  if (this->rd_ptr () + len <= this->end ())
-    {
-      this->rd_ptr (len);
-      return CORBA::B_TRUE;
-    }
-  this->good_bit_ = 0;
-  return CORBA::B_FALSE;
-}
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
deleted file mode 100644
index ca62b832890..00000000000
--- a/TAO/tao/CDR.h
+++ /dev/null
@@ -1,520 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    CDR.h
-//
-// = DESCRIPTION
-//     Common Data Representation (CDR) marshaling streams.
-//
-//     This implementation assumes that the native numeric
-//     representation is two's complement for integers, IEEE
-//     single/double for floats.  Also that characters are in ISO
-//     Latin/1.
-//
-//     Note that CDR itself makes no such assumptions, but this
-//     implementation makes such assumptions for reasons of
-//     efficiency.  Careful enhancements could preserve that
-//     efficiency where the assumptions are true, yet still allow the
-//     code to work when they aren't true.
-//
-//     The implementation expects that buffers are aligned according
-//     to the strongest CDR alignment restriction.
-//
-//     NOTE: this does everything "CDR 1.1" does ... that is, it
-//     supports the five extended OMG-IDL data types in UNO Appendix
-//     A, which provide richer arithmetic types (64 bit integers,
-//     "quad precision" FP) and UNICODE-based characters and strings.
-//     Those types are not standard parts of OMG-IDL at this time.
-//
-//     THREADING NOTE: CDR data structures must be protected against
-//     concurrent access by their owning thread.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Many enhancements added by Aniruddha Gokhale and Carlos O'Ryan.
-//
-// ============================================================================
-
-#if !defined (TAO_CDR_H)
-#define TAO_CDR_H
-
-class TAO_Export CDR
-{
-  // = TITLE
-  //   Keep constants and some routines common to both Output and
-  //   Input CDR streams.
-  //
-public:
-  // = Constants defined by the CDR protocol.
-
-  // By defining these constants as enums we ensure they get inlined
-  // and avoid pointless static memory allocations.
-
-  enum
-  {
-    // Note that some of these get reused as part of the standard
-    // binary format: unsigned is the same size as its signed cousin,
-    // float is CDR_LONG_SIZE, and double is CDR_LONGLONG_SIZE.
-
-    OCTET_SIZE = 1,
-    SHORT_SIZE = 2,
-    LONG_SIZE = 4,
-    LONGLONG_SIZE = 8,
-    LONGDOUBLE_SIZE = 16,
-
-    OCTET_ALIGN = 1,
-    SHORT_ALIGN = 2,
-    LONG_ALIGN = 4,
-    LONGLONG_ALIGN = 8,
-    LONGDOUBLE_ALIGN = 8,
-    // Note how the CORBA::LongDouble alignment requirements do not
-    // match its size...
-
-    MAX_ALIGNMENT = 8,
-    // Maximal CDR 1.1 alignment: "quad precision" FP (i.e. "long
-    // double", size as above).
-
-    DEFAULT_BUFSIZE = 512,
-    // The default buffer size.
-    // @@ TODO We want to add options to the ORB to control this
-    // default value, so this constant should be read as the, default
-    // default value ;-)
-
-    EXP_GROWTH_MAX = 4096,
-    // The buffer size grows exponentially until it reaches this size;
-    // afterwards it grows linearly using the next constant
-
-    LINEAR_GROWTH_CHUNK = 4096
-    // Once exponential growth is ruled out the buffer size increases
-    // in chunks of this size, note that this constants have the same
-    // value right now, but it does not need to be so.
-  };
-
-  static void swap_2 (const char *orig, char *target);
-  static void swap_4 (const char *orig, char *target);
-  static void swap_8 (const char *orig, char *target);
-  static void swap_16 (const char *orig, char *target);
-  // Do byte swapping for each basic IDL type size.
-  // There exist only routines to put byte, halfword (2 bytes), word
-  // (4 bytes), doubleword (8 bytes) and quadword (16 byte); because
-  // those are the IDL basic type sizes.
-
-  static void mb_align (ACE_Message_Block* mb);
-
-  static int grow (ACE_Message_Block*& mb, size_t minsize);
-  // Increase the capacity of mb to contain at least <minsize> bytes. 
-  // If <minsze> is zero the size is increased by an amount at least
-  // large enough to contain any of the basic IDL types.
-  // Return -1 on failure, 0 on success.
-};
-
-class TAO_Export TAO_OutputCDR
-{
-  //
-  // = TITLE
-  //   A CDR stream for writing, i.e. for marshalling.
-  //
-  // = DESCRIPTION
-  //   This class is based on the the CORBA spec for Java (98-02-29),
-  //   java class omg.org.CORBA.portable.OutputStream.
-  //   It diverts in a few ways:
-  //     + Operations taking arrays don't have offsets, because in C++
-  //     it is easier to describe an array starting from x+offset.
-  //     + Operations return an error status, because exceptions are
-  //     not widely available in C++ (yet).
-  //
-  //   A particularly useful static member function for this buffer is
-  //   an interpretive encoding routine, usable as a typecode
-  //   interpreter callback.  Ditto for decoding.  These are used to
-  //   support all OMG-IDL datatypes, even those not supported
-  //   directly by put/get primitives.
-  //
-public:
-  friend class TAO_InputCDR;
-  // For reading from a output CDR stream.
-
-  TAO_OutputCDR (size_t size = 0,
-		 int byte_order = TAO_ENCAP_BYTE_ORDER,
-		 TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
-  // Default constructor, allocates <size> bytes in the internal
-  // buffer, if <size> == 0 it allocates the default size.
-
-  TAO_OutputCDR (char *data, size_t size,
-		 int byte_order = TAO_ENCAP_BYTE_ORDER,
-		 TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
-  // Build a CDR stream with an initial buffer, it will *not* remove
-  // <data>, since it did not allocated it.
-
-  ~TAO_OutputCDR (void);
-  // destructor
-
-  // = We have one method per basic IDL type....
-  CORBA_Boolean write_boolean (CORBA::Boolean x);
-  CORBA_Boolean write_char (CORBA::Char x);
-  CORBA_Boolean write_wchar (CORBA::WChar x);
-  CORBA_Boolean write_octet (CORBA::Octet x);
-  CORBA_Boolean write_short (CORBA::Short x);
-  CORBA_Boolean write_ushort (CORBA::UShort x);
-  CORBA_Boolean write_long (CORBA::Long x);
-  CORBA_Boolean write_ulong (CORBA::ULong x);
-  CORBA_Boolean write_longlong (const CORBA::LongLong &x);
-  CORBA_Boolean write_ulonglong (const CORBA::ULongLong &x);
-  CORBA_Boolean write_float (CORBA::Float x);
-  CORBA_Boolean write_double (const CORBA::Double &x);
-  CORBA_Boolean write_longdouble (const CORBA::LongDouble &x);
-  CORBA_Boolean write_string (const CORBA::Char *x);
-  CORBA_Boolean write_wstring (const CORBA::WChar *x);
-
-  // = We add one method to write arrays of basic IDL types.
-  // Note: the portion written starts at <x> and ends at <x + length>.
-  // The length is *NOT* stored into the CDR stream.
-  CORBA_Boolean write_boolean_array (const CORBA::Boolean* x,
-				     CORBA::ULong length);
-  CORBA_Boolean write_char_array (const CORBA::Char* x,
-				  CORBA::ULong length);
-  CORBA_Boolean write_wchar_array (const CORBA::WChar* x,
-				   CORBA::ULong length);
-  CORBA_Boolean write_octet_array (const CORBA::Octet* x,
-				   CORBA::ULong length);
-  CORBA_Boolean write_short_array (const CORBA::Short* x,
-				   CORBA::ULong length);
-  CORBA_Boolean write_ushort_array (const CORBA::UShort* x,
-				    CORBA::ULong length);
-  CORBA_Boolean write_long_array (const CORBA::Long* x,
-				  CORBA::ULong length);
-  CORBA_Boolean write_ulong_array (const CORBA::ULong* x,
-				   CORBA::ULong length);
-  CORBA_Boolean write_longlong_array (const CORBA::LongLong* x,
-				      CORBA::ULong length);
-  CORBA_Boolean write_ulonglong_array (const CORBA::ULongLong* x,
-				       CORBA::ULong length);
-  CORBA_Boolean write_float_array (const CORBA::Float* x,
-				   CORBA::ULong length);
-  CORBA_Boolean write_double_array (const CORBA::Double* x,
-				    CORBA::ULong length);
-  CORBA_Boolean write_longdouble_array (const CORBA::LongDouble* x,
-					CORBA::ULong length);
-
-  // @@ TODO: do we want a special method to write an array of
-  // strings and wstrings?
-
-  // = TAO specific methods.
-
-  void reset (void);
-  // Reuse the CDR stream to write on the old buffer.
-
-  int good_bit (void) const;
-  // Returns 0 if an error has ocurred, the only expected error is to
-  // run out of memory.
-
-  const ACE_Message_Block* start (void) const;
-  // Return the start of the message block chain for this CDR stream.
-  // NOTE: In the current implementation the chain has length 1, but
-  // we are planning to change that.
-
-  const char* buffer (void) const;
-  size_t length (void) const;
-  // Return the start and size of the internal buffer.
-  // NOTE: In future implementations these methods may be removed.
-
-  CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                           const void *data,
-                                           const void *,
-                                           CORBA::Environment &env);
-  // Marshalls the contents of <data> as described by the TypeCode in
-  // <tc>. Any errors are reported though the <env> parameter.
-
-private:
-  TAO_OutputCDR (const TAO_OutputCDR& rhs);
-  TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
-  // disallow copying...
-
-  char* wr_ptr (void) const;
-  char* end (void) const;
-  // The write pointer and end of the current message block.
-
-  int adjust (size_t size, char*& buf);
-  // Returns (in <buf>) the next position in the buffer aligned to
-  // <size>, it advances the Message_Block wr_ptr past the data
-  // (i.e. <buf> + <size>). If necessary it grows the Message_Block
-  // buffer.
-  // Sets the good_bit to 0 and returns a -1 on failure.
-
-  int adjust (size_t size, size_t align, char*& buf);
-  // As above, but now the size and alignment requirements may be
-  // different.
-
-  CORBA_Boolean write_1 (const CORBA::Octet* x);
-  CORBA_Boolean write_2 (const CORBA::UShort* x);
-  CORBA_Boolean write_4 (const CORBA::ULong* x);
-  CORBA_Boolean write_8 (const CORBA::ULongLong* x);
-  CORBA_Boolean write_16 (const CORBA::LongDouble* x);
-  // Several types can be written using the same routines, since TAO
-  // tries to use native types with known size for each CORBA type.
-  // We could use void* or char* to make the interface more
-  // consistent, but using native types let us exploit the strict
-  // alignment requirements of CDR streams and implement the
-  // operations using asignment.
-
-  CORBA_Boolean write_array (const void* x, size_t size, size_t align,
-			     CORBA::ULong length);
-  // write an array of <length> elements, each of <size> bytes and
-  // the start aligned at a multiple of <align>. The elements are
-  // assumed to be packed with the right alignment restrictions.
-  // It is mostly designed for buffers of the basic types.
-  //
-  // This operation uses memcpy(); as explained above it is expected
-  // that using assignment is faster that memcpy() for one element,
-  // but for several elements memcpy() should be more efficient, it
-  // could be interesting to find the break even point and optimize
-  // for that case, but that would be too platform dependent.
-
-private:
-  ACE_Message_Block* start_;
-  // The start of the chain of message blocks, even though in the
-  // current version the chain always has length 1.
-
-  TAO_Marshal_Factory *factory_;
-  // maintain a factory that can make specialized marshaling objects
-
-  int do_byte_swap_;
-  // If not zero swap bytes at writing so the created CDR stream byte
-  // order does *not* match the machine byte order.
-  // The motivation for such a beast is that in some setting a few
-  // (fast) machines can be serving hundreds of slow machines with the
-  // opposite byte order, so it makes sense (as a load balancing
-  // device) to put the responsability in the writers.
-  // THIS IS NOT A STANDARD IN CORBA, USE AT YOUR OWN RISK (btw, isn't
-  // that true for everything in ACE/TAO and your OS vendor?)
-
-  int good_bit_;
-  // Set to 0 when an error ocurrs.
-};
-
-class TAO_Export TAO_InputCDR
-{
-  //
-  // = TITLE
-  //   A CDR stream for reading, i.e. for demarshalling.
-  //
-  // = DESCRIPTION
-  //   This class is based on the the CORBA spec for Java (98-02-29),
-  //   java class omg.org.CORBA.portable.InputStream.
-  //   It diverts in a few ways:
-  //     + Operations to retrieve basic types take parameters by
-  //     reference.
-  //     + Operations taking arrays don't have offsets, because in C++
-  //     it is easier to describe an array starting from x+offset.
-  //     + Operations return an error status, because exceptions are
-  //     not widely available in C++ (yet).
-  //
-  //   A particularly useful static member function for this buffer is
-  //   an interpretive encoding routine, usable as a typecode
-  //   interpreter callback.  Ditto for decoding.  These are used to
-  //   support all OMG-IDL datatypes, even those not supported
-  //   directly by put/get primitives.
-public:
-  friend class TAO_GIOP;
-  // This class is able to "read" an InputCDR from a socket.
-
-  TAO_InputCDR (const char* buf, size_t bufsiz,
-		int byte_order = TAO_ENCAP_BYTE_ORDER,
-		TAO_Marshal_Factory *f =
-		     TAO_Marshal::DEFAULT_MARSHAL_FACTORY);
-  // Create an input stream from an arbitrary buffer, care must be
-  // exercised wrt alignment, because this contructor will *not* work
-  // if the buffer is unproperly aligned.
-
-  TAO_InputCDR (const TAO_InputCDR& rhs);
-  TAO_InputCDR& operator= (const TAO_InputCDR& rhs);
-  // Make a copy of the current stream state, but does not copy the
-  // internal buffer; so the same stream can be read multiple times
-  // efficiently.
-
-  TAO_InputCDR (const TAO_InputCDR& rhs,
-		size_t size,
-		CORBA::Long offset);
-  // When interpreting indirected TypeCodes it is useful to make a
-  // "copy" of the stream starting in the new position.
-
-  TAO_InputCDR (const TAO_InputCDR& rhs, size_t size);
-  // This creates an encapsulated stream, the first byte must be (per
-  // the spec) the byte order of the encapsulation.
-
-  TAO_InputCDR (const TAO_OutputCDR& rhs);
-  // Create an input CDR from an output CDR.
-
-  ~TAO_InputCDR (void);
-  // destructor
-
-  // = We have one method per basic IDL type....
-  // They return CORBA::B_FALSE on failure and CORBA::B_TRUE on success.
-  CORBA_Boolean read_boolean (CORBA::Boolean& x);
-  CORBA_Boolean read_char (CORBA::Char& x);
-  CORBA_Boolean read_wchar (CORBA::WChar& x);
-  CORBA_Boolean read_octet (CORBA::Octet& x);
-  CORBA_Boolean read_short (CORBA::Short& x);
-  CORBA_Boolean read_ushort (CORBA::UShort& x);
-  CORBA_Boolean read_long (CORBA::Long& x);
-  CORBA_Boolean read_ulong (CORBA::ULong& x);
-  CORBA_Boolean read_longlong (CORBA::LongLong& x);
-  CORBA_Boolean read_ulonglong (CORBA::ULongLong& x);
-  CORBA_Boolean read_float (CORBA::Float& x);
-  CORBA_Boolean read_double (CORBA::Double& x);
-  CORBA_Boolean read_longdouble (CORBA::LongDouble& x);
-  CORBA_Boolean read_string (CORBA::Char*& x);
-  CORBA_Boolean read_wstring (CORBA::WChar*& x);
-
-  // = One method for each basic IDL type...
-  // The buffer <x> must be large enough to contain <length>
-  // elements.
-  // They return CORBA::B_FALSE on failure and CORBA::B_TRUE on success.
-  CORBA_Boolean read_boolean_array (CORBA::Boolean* x,
-				    CORBA::ULong length);
-  CORBA_Boolean read_char_array (CORBA::Char* x,
-				 CORBA::ULong length);
-  CORBA_Boolean read_wchar_array (CORBA::WChar* x,
-				  CORBA::ULong length);
-  CORBA_Boolean read_octet_array (CORBA::Octet* x,
-				  CORBA::ULong length);
-  CORBA_Boolean read_short_array (CORBA::Short* x,
-				  CORBA::ULong length);
-  CORBA_Boolean read_ushort_array (CORBA::UShort* x,
-				   CORBA::ULong length);
-  CORBA_Boolean read_long_array (CORBA::Long* x,
-				 CORBA::ULong length);
-  CORBA_Boolean read_ulong_array (CORBA::ULong* x,
-				  CORBA::ULong length);
-  CORBA_Boolean read_longlong_array (CORBA::LongLong* x,
-				     CORBA::ULong length);
-  CORBA_Boolean read_ulonglong_array (CORBA::ULongLong* x,
-				      CORBA::ULong length);
-  CORBA_Boolean read_float_array (CORBA::Float* x,
-				  CORBA::ULong length);
-  CORBA_Boolean read_double_array (CORBA::Double* x,
-				   CORBA::ULong length);
-  CORBA_Boolean read_longdouble_array (CORBA::LongDouble* x,
-				       CORBA::ULong length);
-
-  // = TAO specific methods.
-  
-  CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                           const void *data,
-                                           const void *,
-                                           CORBA::Environment &env);
-  // Demarshall the contents of the CDR stream into <data> as
-  // described by <tc>; returning any errors in <env>.
-
-  CORBA_Boolean skip_string (void);
-  // The next field must be a string, this method skips it. It is
-  // useful in parsing a TypeCode.
-  // Return CORBA::B_FALSE on failure and CORBA::B_TRUE on success.
-
-  CORBA_Boolean skip_bytes (size_t n);
-  // Skip <n> bytes in the CDR stream.
-  // Return CORBA::B_FALSE on failure and CORBA::B_TRUE on success.
-
-  int good_bit (void) const;
-  // returns zero if a problem has been detected.
-
-  char* rd_ptr (void);
-  // Returns the current position for the rd_ptr....
-
-  size_t length (void) const;
-  // Return how many bytes are left in the stream.
-
-private:
-  void rd_ptr (size_t offset);
-  char* end (void);
-  // short cuts for the underlying message block.
-  
-  int adjust (size_t size, char*& buf);
-  // Returns (in <buf>) the next position in the buffer aligned to
-  // <size>, it advances the Message_Block rd_ptr past the data
-  // (i.e. <buf> + <size>).
-  // Sets the good_bit to 0 and returns a -1 on failure.
-
-  int adjust (size_t size, size_t align, char*& buf);
-  // As above, but now the size and alignment requirements may be
-  // different.
-
-  CORBA_Boolean read_1 (CORBA::Octet* x);
-  CORBA_Boolean read_2 (CORBA::UShort* x);
-  CORBA_Boolean read_4 (CORBA::ULong* x);
-  CORBA_Boolean read_8 (CORBA::ULongLong* x);
-  CORBA_Boolean read_16 (CORBA::LongDouble* x);
-  // Several types can be read using the same routines, since TAO
-  // tries to use native types with known size for each CORBA type.
-  // We could use void* or char* to make the interface more
-  // consistent, but using native types let us exploit the strict
-  // alignment requirements of CDR streams and implement the
-  // operations using asignment.
-
-  CORBA_Boolean read_array (void* x, size_t size, size_t align,
-			    CORBA::ULong length);
-  // read an array of <length> elements, each of <size> bytes and
-  // the start aligned at a multiple of <align>. The elements are
-  // assumed to be packed with the right alignment restrictions.
-  // It is mostly designed for buffers of the basic types.
-  //
-  // This operation uses memcpy(); as explained above it is expected
-  // that using assignment is faster that memcpy() for one element,
-  // but for several elements memcpy() should be more efficient, it
-  // could be interesting to find the break even point and optimize
-  // for that case, but that would be too platform dependent.
-
-private:
-  ACE_Message_Block* start_;
-  // The start of the chain of message blocks, even though in the
-  // current version the chain always has length 1.
-
-  TAO_Marshal_Factory *factory_;
-  // Maintain a factory that can make specialized marshaling objects.
-
-  int do_byte_swap_;
-  // The CDR stream byte order does not match the one on the machine,
-  // swapping is needed while reading.
-
-  int good_bit_;
-  // set to 0 when an error occurs.
-};
-
-#if defined(__ACE_INLINE__)
-# include "tao/CDR.i"
-#else
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Boolean x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Octet x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Short x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::UShort x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Long x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::ULong x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::LongLong x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::ULongLong x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Float x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Double x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::Char x);
-extern TAO_OutputCDR& operator<< (TAO_OutputCDR& cdr, CORBA::WChar x);
-
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Boolean &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Octet &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Short &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::UShort &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Long &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::ULong &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::LongLong &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::ULongLong &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Float &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Double &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::Char &x);
-extern TAO_InputCDR& operator>> (TAO_InputCDR& cdr, CORBA::WChar &x);
-#endif /* __ACE_INLINE */
-
-#endif /* TAO_CDR_H */
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
deleted file mode 100644
index d327f829004..00000000000
--- a/TAO/tao/CDR.i
+++ /dev/null
@@ -1,660 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ****************************************************************
-
-ACE_INLINE void
-CDR::mb_align (ACE_Message_Block* mb)
-{
-  char* start = ptr_align_binary (mb->base (), CDR::MAX_ALIGNMENT);
-  mb->rd_ptr (start);
-  mb->wr_ptr (start);
-
-#if defined(ACE_PURIFY)
-  // This is a good place to zero the buffer; this is not needed
-  // by IIOP, but makes Purify happy.
-  if (mb->base () != 0)
-    {
-      (void) ACE_OS::memset (mb->base(), 0, mb->size());
-    }
-#endif
-}
-
-// ****************************************************************
-
-// Decode the CDR stream.
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_char (CORBA::Char x)
-{
-  return this->write_1 (ACE_reinterpret_cast(const CORBA::Octet*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_wchar (CORBA::WChar x)
-{
-  return this->write_2 (ACE_reinterpret_cast(const CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_octet (CORBA::Octet x)
-{
-  return this->write_1 (ACE_reinterpret_cast(const CORBA::Octet*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_boolean (CORBA::Boolean x)
-{
-  return this->write_octet (x?1:0);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_short (CORBA::Short x)
-{
-  return this->write_2 (ACE_reinterpret_cast(const CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ushort (CORBA::UShort x)
-{
-  return this->write_2 (ACE_reinterpret_cast(const CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_long (CORBA::Long x)
-{
-  return this->write_4 (ACE_reinterpret_cast(const CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ulong (CORBA::ULong x)
-{
-  return this->write_4 (ACE_reinterpret_cast(const CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_longlong (const CORBA::LongLong &x)
-{
-  return this->write_8 (ACE_reinterpret_cast(const CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ulonglong (const CORBA::ULongLong &x)
-{
-  return this->write_8 (ACE_reinterpret_cast(const CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_float (CORBA::Float x)
-{
-  return this->write_4 (ACE_reinterpret_cast(const CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_double (const CORBA::Double &x)
-{
-  return this->write_8 (ACE_reinterpret_cast(const CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_longdouble (const CORBA::LongDouble &x)
-{
-  return this->write_16 (ACE_reinterpret_cast(const CORBA::LongDouble*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_char_array (const CORBA::Char* x,
-				 CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::OCTET_SIZE,
-			    CDR::OCTET_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_wchar_array (const CORBA::WChar* x,
-				  CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::SHORT_SIZE,
-			    CDR::SHORT_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_octet_array (const CORBA::Octet* x,
-				  CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::OCTET_SIZE,
-			    CDR::OCTET_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_short_array (const CORBA::Short* x,
-				  CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::SHORT_SIZE,
-			    CDR::SHORT_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ushort_array (const CORBA::UShort* x,
-				   CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::SHORT_SIZE,
-			    CDR::SHORT_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_long_array (const CORBA::Long* x,
-				 CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONG_SIZE,
-			    CDR::LONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ulong_array (const CORBA::ULong* x,
-				  CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONG_SIZE,
-			    CDR::LONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_longlong_array (const CORBA::LongLong* x,
-				     CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONGLONG_SIZE,
-			    CDR::LONGLONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_ulonglong_array (const CORBA::ULongLong* x,
-				      CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONGLONG_SIZE,
-			    CDR::LONGLONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_float_array (const CORBA::Float* x,
-				  CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONG_SIZE,
-			    CDR::LONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_double_array (const CORBA::Double* x,
-				   CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONGLONG_SIZE,
-			    CDR::LONGLONG_ALIGN,
-			    length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_OutputCDR::write_longdouble_array (const CORBA::LongDouble* x,
-				       CORBA::ULong length)
-{
-  return this->write_array (x,
-			    CDR::LONGDOUBLE_SIZE,
-			    CDR::LONGDOUBLE_ALIGN,
-			    length);
-}
-
-ACE_INLINE int
-TAO_OutputCDR::good_bit (void) const
-{
-  return this->good_bit_;
-}
-
-ACE_INLINE const ACE_Message_Block*
-TAO_OutputCDR::start (void) const
-{
-  return this->start_;
-}
-
-ACE_INLINE const char*
-TAO_OutputCDR::buffer (void) const
-{
-  return this->start_->rd_ptr ();
-}
-
-ACE_INLINE size_t
-TAO_OutputCDR::length (void) const
-{
-  return this->start_->length ();
-}
-
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc,
-		       const void *data,
-		       const void *data2,
-		       CORBA::Environment &env)
-{
-  TAO_Marshal_Object *mobj =
-    this->factory_->make_marshal_object (tc, env);
-
-  if (env.exception() == 0 && mobj != 0)
-    return mobj->encode (tc, data, data2, this, env);
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_char (CORBA::Char& x)
-{
-  return this->read_1 (ACE_reinterpret_cast(CORBA::Octet*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_wchar (CORBA::WChar& x)
-{
-  return this->read_2 (ACE_reinterpret_cast(CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_octet (CORBA::Octet& x)
-{
-  return this->read_1 (&x);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_boolean (CORBA::Boolean& x)
-{
-  CORBA::Octet tmp;
-  this->read_octet (tmp);
-  x =  tmp ? CORBA::B_TRUE : CORBA::B_FALSE;
-  return this->good_bit_;
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_short (CORBA::Short& x)
-{
-  return this->read_2 (ACE_reinterpret_cast(CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ushort (CORBA::UShort& x)
-{
-  return this->read_2 (ACE_reinterpret_cast(CORBA::UShort*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_long (CORBA::Long& x)
-{
-  return this->read_4 (ACE_reinterpret_cast(CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ulong (CORBA::ULong& x)
-{
-  return this->read_4 (ACE_reinterpret_cast(CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_longlong (CORBA::LongLong& x)
-{
-  return this->read_8 (ACE_reinterpret_cast(CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ulonglong (CORBA::ULongLong& x)
-{
-  return this->read_8 (ACE_reinterpret_cast(CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_float (CORBA::Float& x)
-{
-  return this->read_4 (ACE_reinterpret_cast(CORBA::ULong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_double (CORBA::Double& x)
-{
-  return this->read_8 (ACE_reinterpret_cast(CORBA::ULongLong*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_longdouble (CORBA::LongDouble& x)
-{
-  return this->read_16 (ACE_reinterpret_cast(CORBA::LongDouble*,&x));
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_char_array (CORBA::Char* x,
-			       CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::OCTET_SIZE,
-			   CDR::OCTET_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_wchar_array (CORBA::WChar* x,
-				CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::SHORT_SIZE,
-			   CDR::SHORT_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_octet_array (CORBA::Octet* x,
-				CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::OCTET_SIZE,
-			   CDR::OCTET_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_short_array (CORBA::Short* x,
-				CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::SHORT_SIZE,
-			   CDR::SHORT_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ushort_array (CORBA::UShort* x,
-				 CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::SHORT_SIZE,
-			   CDR::SHORT_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_long_array (CORBA::Long* x,
-			       CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONG_SIZE,
-			   CDR::LONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ulong_array (CORBA::ULong* x,
-				CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONG_SIZE,
-			   CDR::LONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_longlong_array (CORBA::LongLong* x,
-				   CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONGLONG_SIZE,
-			   CDR::LONGLONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_ulonglong_array (CORBA::ULongLong* x,
-				    CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONGLONG_SIZE,
-			   CDR::LONGLONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_float_array (CORBA::Float* x,
-				CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONG_SIZE,
-			   CDR::LONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_double_array (CORBA::Double* x,
-				 CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONGLONG_SIZE,
-			   CDR::LONGLONG_ALIGN,
-			   length);
-}
-
-ACE_INLINE CORBA_Boolean
-TAO_InputCDR::read_longdouble_array (CORBA::LongDouble* x,
-				     CORBA::ULong length)
-{
-  return this->read_array (x,
-			   CDR::LONGDOUBLE_SIZE,
-			   CDR::LONGDOUBLE_ALIGN,
-			   length);
-}
-
-ACE_INLINE int
-TAO_InputCDR::good_bit (void) const
-{
-  return this->good_bit_;
-}
-
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_InputCDR::decode (CORBA::TypeCode_ptr tc,
-		       const void *data,
-		       const void *data2,
-		       CORBA::Environment &env)
-{
-  TAO_Marshal_Object *mobj =
-    this->factory_->make_marshal_object (tc, env);
-
-  if (env.exception() == 0 && mobj != 0)
-    return mobj->decode (tc, data, data2, this, env);
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-ACE_INLINE size_t
-TAO_InputCDR::length (void) const
-{
-  return this->start_->length ();
-}
-
-ACE_INLINE char*
-TAO_InputCDR::rd_ptr (void)
-{
-  return this->start_->rd_ptr ();
-}
-
-// ****************************************************************
-// TODO: Use the CORBA_* types when they become available.
-
-#if 0
-#if defined (ACE_HAS_BOOL)
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Boolean x)
-{
-  cdr.write_boolean (x);
-  return cdr;
-}
-#endif /* ACE_HAS_BOOL */
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Octet x)
-{
-  cdr.write_octet (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Short x)
-{
-  cdr.write_short (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::UShort x)
-{
-  cdr.write_short (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Long x)
-{
-  cdr.write_long (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::ULong x)
-{
-  cdr.write_long (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::LongLong x)
-{
-  cdr.write_longlong (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::ULongLong x)
-{
-  cdr.write_ulonglong (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Float x)
-{
-  cdr.write_float (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Double x)
-{
-  cdr.write_double (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_OutputCDR&
-operator<< (TAO_OutputCDR& cdr, CORBA::Char x)
-{
-  cdr.write_char (x);
-  return cdr;
-}
-
-#if defined (ACE_HAS_BOOL)
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Boolean &x)
-{
-  cdr.read_boolean (x);
-  return cdr;
-}
-#endif /* ACE_HAS_BOOL */
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Octet &x)
-{
-  cdr.read_octet (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Short &x)
-{
-  cdr.read_short (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::UShort &x)
-{
-  cdr.read_ushort (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Long &x)
-{
-  cdr.read_long (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::ULong &x)
-{
-  cdr.read_ulong (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::LongLong &x)
-{
-  cdr.read_longlong (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::ULongLong &x)
-{
-  cdr.read_ulonglong (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Float &x)
-{
-  cdr.read_float (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Double &x)
-{
-  cdr.read_double (x);
-  return cdr;
-}
-
-ACE_INLINE TAO_InputCDR&
-operator>> (TAO_InputCDR& cdr, CORBA::Char &x)
-{
-  cdr.read_char (x);
-  return cdr;
-}
-#endif /* 0 */
-
diff --git a/TAO/tao/CORBA.cpp b/TAO/tao/CORBA.cpp
deleted file mode 100644
index 46ccc7c2033..00000000000
--- a/TAO/tao/CORBA.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-// String utility support; this can need to be integrated with the
-// ORB's own memory allocation subsystem.
-
-CORBA::String
-CORBA::string_copy (const CORBA::Char *str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::String retval =
-    CORBA::string_alloc (ACE_OS::strlen (str));
-
-  // clear the contents of the allocated string
-  ACE_OS::memset(retval, '\0', ACE_OS::strlen (str));
-
-  return ACE_OS::strcpy (retval, str);
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const char *p)
-{
-  if (this->ptr_ != 0)
-    CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const CORBA::String_var& r)
-{
-  if (this != &r)
-    {
-      if (this->ptr_ != 0)
-        CORBA::string_free (this->ptr_);
-      this->ptr_ = CORBA::string_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// Wide Character string utility support; this can need to be
-// integrated with the ORB's own memory allocation subsystem.
-
-CORBA::WString
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-static
-inline
-CORBA::WChar *
-wscpy (CORBA::WChar *dest,
-       const CORBA::WChar *src)
-{
-  CORBA::WChar  *retval = dest;
-
-  while ((*dest++ = *src++) != 0)
-    continue;
-  return retval;
-}
-
-CORBA::WString
-CORBA::wstring_copy (const CORBA::WChar *const str)
-{
-  if (*str)
-    return 0;
-
-  CORBA::WString retval = CORBA::wstring_alloc (ACE_WString::wstrlen (str));
-  return wscpy (retval, str);
-}
-
-void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-// ORB initialisation, per OMG document 94-9-46.
-//
-// XXX in addition to the "built in" Internet ORB, there will be ORBs
-// which are added separately, e.g. through a DLL listed in the
-// registry.  Registry will be used to assign orb names and to
-// establish which is the default.
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *const *argv,
-                 const char * /* orb_name */,
-                 CORBA::Environment &env)
-{
-  // Using ACE_Static_Object_Lock::instance() precludes ORB_init from
-  // being called within a static object CTOR.
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), 0));
-
-  env.clear ();
-
-  // @@ We need to make sure it's ok for the following 3
-  // initialization routines to be called multiple times.  Or better
-  // yet, ensure that we just call them the first time, e.g., by
-  // putting them in some type of TAO_Object_Manager, along with the
-  // Typecode_Constants...
-
-  // Put these initializations here so that exceptions are enabled
-  // immediately.
-  TAO_Marshal::initialize ();
-  TAO_Exceptions::init_standard_exceptions (env);
-  TAO_IIOP_Interpreter::init_table ();
-
-  if (env.exception () != 0)
-    return 0;
-
-  // Verify some of the basic implementation requirements.  This test
-  // gets optimized away by a decent compiler (or else the rest of the
-  // routine does).
-  //
-  // NOTE:  we still "just" assume that native floating point is IEEE.
-
-  if (sizeof (CORBA::Short) != 2
-      || sizeof (CORBA::Long) != 4
-      || sizeof (CORBA::LongLong) != 8
-      || sizeof (CORBA::Float) != 4
-      || sizeof (CORBA::Double) != 8
-      || sizeof (CORBA::LongDouble) != 16
-      || sizeof (CORBA::WChar) < 2
-      || sizeof (void *) != ACE_SIZEOF_VOID_P)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s; ERROR: unexpected basic type size; "
-                            "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n",
-                  sizeof (CORBA::Short),
-                  sizeof (CORBA::Long),
-                  sizeof (CORBA::LongLong),
-                  sizeof (CORBA::Float),
-                  sizeof (CORBA::Double),
-                  sizeof (CORBA::LongDouble),
-                  sizeof (CORBA::WChar),
-                  sizeof (void *)));
-
-      env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Initialize the ORB Core instance.
-  int result = TAO_ORB_Core_instance ()->init (argc, (char **)argv);
- 
-  // check for errors and return 0 if error.
-  if (result == -1)
-    {
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
- 
-  return TAO_ORB_Core_instance()->orb ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Octet>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
deleted file mode 100644
index e0d1e534498..00000000000
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "tao/corba.h"
-
-TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
-{
-}
-
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
deleted file mode 100644
index f446ed34899..00000000000
--- a/TAO/tao/Client_Strategy_Factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     Client_Strategy_Factory.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_CLIENT_STRATEGY_FACTORY_H)
-#  define TAO_CLIENT_STRATEGY_FACTORY_H
-
-class TAO_Client_Strategy_Factory : public ACE_Service_Object
-  // = TITLE
-  //    Abstract factory used by the client to manufacture various
-  //    strategies used on the client-side.
-{
-public:
-  // = Intialization and termination methods.
-  TAO_Client_Strategy_Factory (void);
-  // Constructor.
-  
-  virtual ~TAO_Client_Strategy_Factory (void);
-  // Destructor
-};
-
-#endif /* TAO_CLIENT_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
deleted file mode 100644
index 5981bba8f77..00000000000
--- a/TAO/tao/Connect.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "tao/Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Connect.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (ACE_Thread_Manager* t)
-  : TAO_SVC_HANDLER (t, 0, 0)
-{
-  // Grab the singleton...at some later point in time we can provide
-  // an argumented CTOR to have per-instance parameters.
-
-  this->params_ = TAO_ORB_Core_instance ()->oa_params ();
-  ACE_ASSERT (params_ != 0);
-}
-
-int
-TAO_Server_Connection_Handler::open (void*)
-{
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_INET_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                (void *) &sndbufsize,
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     (void *) &rcvbufsize,
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
-
-#if defined (TCP_NODELAY)
-  int nodelay = 1;
-  if (this->peer ().set_option (IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &nodelay,
-                                sizeof (nodelay)) == -1)
-    return -1;
-#endif /* TCP_NODELAY */
-
-  char client[MAXHOSTNAMELEN + 1];
-
-  if (addr.get_host_name (client, MAXHOSTNAMELEN) == -1)
-    {
-      addr.addr_to_string (client, sizeof (client));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) connection from client %s\n",
-              client));
-  return 0;
-}
-
-int
-TAO_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                             ACE_Reactor_Mask rm)
-{
-  ACE_DEBUG  ((LM_DEBUG,
-               "(%P|%t) TAO_Server_Connection_Handler::handle_close (%d, %d)\n",
-               handle,
-               rm));
-
-  return TAO_SVC_HANDLER::handle_close (handle, rm);
-}
-
-int
-TAO_Server_Connection_Handler::svc (void)
-{
-  // This method is called when an instance is "activated", i.e.,
-  // turned into an active object.  Presumably, activation spawns a
-  // thread with this method as the "worker function".
-  int result = 0;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) TAO_Server_Connection_Handler::svc begin\n"));
-
-  // Here we simply synthesize the "typical" event loop one might find
-  // in a reactive handler, except that this can simply block waiting
-  // for input.
-
-  while ((result = handle_input ()) >= 0)
-    continue;
-
-  ACE_DEBUG  ((LM_DEBUG,
-               "(%P|%t) TAO_Server_Connection_Handler::svc end\n"));
-
-  return result;
-}
-
-// Extract a message from the stream associated with <peer()> and
-// place it into <msg>.  Return 0 if success, -1 with <errno> and
-// <env> set if problems.
-
-TAO_Server_Connection_Handler::RequestStatus
-TAO_Server_Connection_Handler::recv_request (TAO_InputCDR &msg,
-                                             CORBA::Environment &env)
-{
-  RequestStatus which = Error;
-
-  TAO_SVC_HANDLER *this_ptr = this;
-
-  switch (TAO_GIOP::recv_request (this_ptr, msg, env))
-    {
-    case TAO_GIOP::Request:
-      // Received a request...just exit for further processing!
-      which = Request;
-      break;
-
-    case TAO_GIOP::LocateRequest:
-      // Received a request...just exit for further processing!
-      which = LocateRequest;
-      break;
-
-      // These messages should never be sent to the server; it's an
-      // error if the peer tries.  Set the environment accordingly, as
-      // it's not yet been reported as an error.
-    case TAO_GIOP::Reply:
-    case TAO_GIOP::LocateReply:
-    case TAO_GIOP::CloseConnection:
-    default:                                    // Unknown message
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Illegal message received by server\n"));
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      // FALLTHROUGH
-
-    case TAO_GIOP::EndOfFile:
-      errno = EPIPE;
-      // FALLTHROUGH
-
-      // recv_request () has already set some error in the environment
-      // for all "MessageError" cases, so don't clobber it.
-      //
-      // General error recovery is to send MessageError to the peer
-      // just in case (it'll fail on EOF) and then close the
-      // connection.
-    case TAO_GIOP::MessageError:
-      break;
-    }
-
-  return which;
-}
-
-// Handle processing of the request residing in <msg>, setting
-// <response_required> to zero if the request is for a oneway or
-// non-zero if for a two-way and <response> to any necessary response
-// (including errors).  In case of errors, -1 is returned and
-// additional information carried in <env>.
-
-int
-TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &msg,
-                                               int &response_required,
-                                               TAO_OutputCDR &response,
-                                               CORBA::Environment &env)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_RequestHeader req;
-
-  env.clear ();
-  if (! req.init (msg, env))
-    {
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      return -1;
-    }
-
-  response_required = req.response_expected;
-
-  // So, we read a request, now handle it using something more
-  // primitive than a CORBA2 ServerRequest pseudo-object.
-
-  // @@ (CJC) We need to create a TAO-specific request which will hold
-  // context for a request such as the connection handler ("this") over
-  // which the request was received so that the servicer of the request
-  // has sufficient context to send a response on its own.
-  //
-  // One thing which me must be careful of is that responses are sent
-  // with a single write so that they're not accidentally interleaved
-  // over the transport (as could happen using TCP).
-
-  this->handle_request (req, msg, response, 0, env);
-
-  CORBA::string_free (req.operation);
-  req.operation = 0;
-
-  // Need to check for any errors present in <env> and set the return
-  // code appropriately.
-  return 0;
-}
-
-int
-TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &msg,
-                                              int &response_required,
-                                              TAO_OutputCDR &response,
-                                              CORBA::Environment &env)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_LocateRequestHeader req;
-
-  env.clear ();
-  if (! req.init (msg, env))
-    {
-      // @@ FIXME! Need to set <env>.
-      response_required = 0;
-      return -1;
-    }
-
-  response_required = 1; // Be optimistic
-
-  // So, we read a request, now handle it using something more
-  // primitive than a CORBA2 ServerRequest pseudo-object.
-  TAO_POA *the_poa = TAO_ORB_Core_instance ()->root_poa ();
-  TAO_GIOP_LocateStatusType status;
-
-  if ((the_poa->locate_servant (req.object_key, env) == 0)
-      && (env.exception() == 0))
-    // We found it!
-    status = TAO_GIOP_OBJECT_HERE;
-  else
-    {
-      // not found, report unknown
-      status = TAO_GIOP_UNKNOWN_OBJECT;
-
-      // Remove the exception
-      env.clear ();
-    }
-
-  // Create the response.
-  TAO_GIOP::start_message (TAO_GIOP::LocateReply, response);
-  response.write_ulong (req.request_id);
-  response.write_ulong (status);
-
-  // Need to check for any errors present in <env> and set the return
-  // code appropriately.
-  return 0;
-}
-
-void
-TAO_Server_Connection_Handler::handle_request (const TAO_GIOP_RequestHeader &hdr,
-                                               TAO_InputCDR &request_body,
-                                               TAO_OutputCDR &response,
-                                               TAO_Dispatch_Context *some_info,
-                                               CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (some_info);
-
-  TAO_POA *the_poa =
-    TAO_ORB_Core_instance ()->root_poa ();
-
-  IIOP_ServerRequest svr_req (hdr,
-                              &request_body,
-                              &response,
-                              TAO_ORB_Core_instance ()->orb (),
-                              the_poa);
-
-  the_poa->dispatch_servant (hdr.object_key,
-                             svr_req,
-                             0, // this is SunSoft IIOP residue
-                             env);
-
-#if 0
-  // @@ (ASG) - this commented out code must remain here since the DSI will use
-  // it. Please keep it here until I have figured out the best way out 03/22/98.
-
-  // If no reply is necessary (i.e., oneway), then return!
-  if (hdr.response_expected == 0)
-    return;
-
-  // Otherwise check for correct parameter handling, and reply as
-  // appropriate.
-  //
-  // NOTE: if "env" is set, it takes precedence over exceptions
-  // reported using the mechanism of the ServerRequest.  Only system
-  // exceptions are reported that way ...
-  //
-  // XXX Exception reporting is ambiguous; it can be cleaner than
-  // this.  With both language-mapped and dynamic/explicit reporting
-  // mechanisms, one of must be tested "first" ... so an exception
-  // reported using the other mechanism could be "lost".  Perhaps only
-  // the language mapped one should be used for system exceptions.
-
-  TAO_GIOP::start_message (TAO_GIOP_Reply, response);
-  TAO_GIOP_ServiceContextList resp_ctx;
-  resp_ctx.length (0);
-  response.encode (&TC_ServiceContextList,
-                   &resp_ctx,
-                   0,
-                   env);
-  response.write_ulong (hdr.request_id);
-
-  CORBA::TypeCode_ptr tc;
-  const void *value;
-
-  if (!svr_req.params_ && env.exception () == 0)
-    {
-      dmsg ("DSI user error, didn't supply params");
-      env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-    }
-
-  // Standard exceptions only.
-  if (env.exception () != 0)
-    {
-      CORBA::Environment env2;
-      CORBA::Exception *x = env.exception ();
-      CORBA::TypeCode_ptr except_tc = x->type ();
-
-      response.write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      (void) response.encode (except_tc, x, 0, env2);
-    }
-
-  // Any exception at all.
-  else if (svr_req.exception_)
-    {
-      CORBA::Exception *x;
-      CORBA::TypeCode_ptr except_tc;
-
-      x = (CORBA::Exception *) svr_req.exception_->value ();
-      except_tc = svr_req.exception_->type ();
-
-      // Finish the GIOP Reply header, then marshal the exception.
-      //
-      // XXX x->type () someday ...
-      if (svr_req.ex_type_ == CORBA::SYSTEM_EXCEPTION)
-        response.write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      else
-        response.write_ulong (TAO_GIOP_USER_EXCEPTION);
-
-      (void) response.encode (except_tc, x, 0, env);
-    }
-
-  // Normal reply.
-  else
-    {
-      // First finish the GIOP header ...
-      response.write_ulong (TAO_GIOP_NO_EXCEPTION);
-
-      // ... then send any return value ...
-      if (svr_req.retval_)
-        {
-          tc = svr_req.retval_->type ();
-          value = svr_req.retval_->value ();
-          (void) response.encode (tc, value, 0, env);
-        }
-
-      // ... Followed by "inout" and "out" parameters, left to right
-      for (u_int i = 0;
-           i < svr_req.params_->count ();
-           i++)
-        {
-          CORBA::NamedValue_ptr nv = svr_req.params_->item (i, env);
-          CORBA::Any_ptr any;
-
-          if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
-            continue;
-
-          any = nv->value ();
-          tc = any->type ();
-          value = any->value ();
-          (void) response.encode (tc, value, 0, env);
-        }
-    }
-#endif /* 0 */
-}
-
-void
-TAO_Server_Connection_Handler::send_response (TAO_OutputCDR &msg)
-{
-  TAO_SVC_HANDLER *this_ptr = this;
-
-  ACE_TIMEPROBE ("  -> Connection_Handler::send_response - start");
-  TAO_GIOP::send_request (this_ptr, msg);
-  ACE_TIMEPROBE ("  -> Connection_Handler::send_response - end");
-}
-
-int
-TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // CJCXXX The tasks of this method should change to something like
-  // the following:
-  // 1. call into GIOP to pull off the header
-  // 2. construct a complete request
-  // 3. dispatch that request and return any required reply and errors
-
-  ACE_TIMEPROBE ("  -> Connection_Handler::handle_input");
-
-  char reqbuf[CDR::DEFAULT_BUFSIZE];
-  TAO_InputCDR msg (reqbuf, sizeof(reqbuf));
-
-  char repbuf[CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_PURIFY)
-  (void) ACE_OS::memset (repbuf, '\0', sizeof (repbuf));
-#endif /* ACE_PURIFY */
-  TAO_OutputCDR reply (repbuf, sizeof(repbuf));
-
-  int result = 0;
-  int error_encountered = 0;
-  int response_required;
-  CORBA::Environment env;
-
-  switch (this->recv_request (msg, env))
-    {
-    case Request:
-      // Message was successfully read, so handle it.  If we encounter
-      // any errors, <reply> will be set appropriately by the called
-      // code, and -1 will be returned.
-      if (this->handle_message (msg, response_required, reply, env) == -1)
-        error_encountered = 1;
-      break;
-
-    case LocateRequest:
-      if (this->handle_locate (msg, response_required, reply, env) == -1)
-        error_encountered = 1;
-      break;
-
-    case -1:
-      // Check errno and/or env for details
-      if (env.exception ())
-        {
-          TAO_GIOP::make_error (reply /* ...other information... */ );
-          error_encountered = 1;
-          // Of course, we must be careful to properly process
-          // end-of-file and other communications-related conditions
-          // here so that handle_input() returns the correct value.
-        }
-      else if (errno == EPIPE)
-        {
-          // Got a EOF
-          response_required = error_encountered = 0;
-          result = -1;
-        }
-      break;
-    }
-
-  // Message was successfully read, so handle it.  If we encounter
-  // any errors, <reply> will be set appropriately by the called
-  // code, and -1 will be returned.
-
-  if (response_required || error_encountered)
-    this->send_response (reply);
-
-  ACE_TIMEPROBE ("  -> Connection_Handler::handle_input done");
-  return result;
-}
-
-TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_SVC_HANDLER (t, 0, 0),
-    input_available_ (0)
-{
-}
-
-int
-TAO_Client_Connection_Handler::open (void *)
-{
-  // Here is where we could enable all sorts of things such as
-  // nonblock I/O, sock buf sizes, TCP no-delay, etc.
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                (void *) &sndbufsize,
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                     (void *) &rcvbufsize,
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* ACE_LACKS_SOCKET_BUFSIZ */
-
-  int nodelay = 1;
-  if (this->peer ().set_option (IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &nodelay,
-                                sizeof (nodelay)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "NODELAY failed\n"), -1);
-
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  r->register_handler (this, ACE_Event_Handler::READ_MASK);
-
-  // For now, we just return success
-  return 0;
-}
-
-int
-TAO_Client_Connection_Handler::close (u_long flags)
-{
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  r->remove_handler (this, ACE_Event_Handler::DONT_CALL);
-
-  return BASECLASS::close (flags);
-}
-
-int
-TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &stream,
-					     int is_twoway)
-{
-  ACE_TIMEPROBE ("  -> Client_Connection_Handler::send_request - start");
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-  //
-  // We could call a template method to do all this stuff, and if the
-  // connection handler were obtained from a factory, then this could
-  // be dynamically linked in (wouldn't that be cool/freaky?)
-
-  // Set the state so that we know we're looking for a response.
-  if (is_twoway)
-    this->expecting_response_ = 1;
-
-  int success  = (int) TAO_GIOP::send_request (this, stream);
-
-  if (!success)
-    return -1;
-
-  if (is_twoway)
-    {
-      // Go into a loop, waiting until it's safe to try to read
-      // something on the soket.  The handle_input() method doesn't
-      // actualy do the read, though, proper behavior based on what is
-      // read may be different if we're not using GIOP above here.
-      // So, we leave the reading of the response to the caller of
-      // this method, and simply insure that this method doesn't
-      // return until such time as doing a recv() on the socket would
-      // actually produce fruit.
-      ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-      int ret = 0;
-
-      while (ret != -1 && ! this->input_available_)
-        ret = r->handle_events ();
-
-      this->input_available_ = 0;
-      // We can get events now, b/c we want them!
-      r->resume_handler (this);
-      // We're no longer expecting a response!
-      this->expecting_response_ = 0;
-    }
-
-  ACE_TIMEPROBE ("  -> Client_Connection_Handler::send_request - done");
-  return 0;
-}
-
-int
-TAO_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  int retval = 0;
-
-  if (this->expecting_response_)
-    {
-      this->input_available_ = 1;
-      // Temporarily remove ourself from notification so that if
-      // another sub event loop is in effect still waiting for its
-      // response, it doesn't spin tightly gobbling up CPU.
-      TAO_ORB_Core_instance ()->reactor ()->suspend_handler (this);
-    }
-  else
-    {
-      // We're a client, so we're not expecting to see input.  Still
-      // we better check what it is!
-      char ignored;
-      ssize_t ret = this->peer().recv (&ignored, sizeof ignored, MSG_PEEK);
-
-      // We're not expecting input at this time, so we'll always
-      // return -1 for now.
-      retval = -1;
-      switch (ret)
-        {
-        case -1:
-          // Error...but we weren't expecting input, either...what
-          // should we do?
-          ACE_ERROR ((LM_WARNING,
-                      "Client_Connection_Handler::handle_input received "
-                      "error while reading unexpected input; closing connection on fd %d\n",
-                      this->peer().get_handle ()));
-          break;
-
-        case 1:
-          // We weren't expecting input, so what should we do with it?
-          // Log an error, and close the connection.
-          ACE_ERROR ((LM_WARNING,
-                      "Client_Connection_Handler::handle_input received "
-                      "input while not expecting a response; closing connection on fd %d\n",
-                      this->peer().get_handle ()));
-          break;
-
-        case 0:
-          // This is an EOF, so we will return -1 and let
-          // handle_close() take over.  As long as handle_close()
-          // calls the Svc_Handler<>::handle_close(), the socket will
-          // be shutdown properly.
-          break;
-        }
-    }
-
-  return retval;
-}
-
-int
-TAO_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                             ACE_Reactor_Mask rm)
-{
-  ACE_DEBUG  ((LM_DEBUG,
-               "(%P|%t) TAO_Client_Connection_Handler::handle_close (%d, %d)\n",
-               handle,
-               rm));
-
-  return BASECLASS::handle_close (handle, rm);
-}
-
-#define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_Client_Connection_Handler>
-#define TAO_HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr>
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class TAO_HASH_ADDR;
-template class TAO_SVC_TUPLE;
-template class ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int, TAO_SVC_TUPLE*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate TAO_HASH_ADDR
-#pragma instantiate TAO_SVC_TUPLE
-#pragma instantiate ACE_Map_Manager<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int, TAO_SVC_TUPLE*, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int, TAO_SVC_TUPLE*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
deleted file mode 100644
index efd1a5e8418..00000000000
--- a/TAO/tao/Connect.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#if !defined (TAO_CONNECT_H)
-#  define TAO_CONNECT_H
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Connect.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#  include "ace/Reactor.h"
-#  include "ace/Acceptor.h"
-#  include "ace/SOCK_Acceptor.h"
-#  include "ace/Synch.h"
-#  include "ace/Svc_Handler.h"
-
-// Forward Decls
-class TAO_OA_Parameters;
-class TAO_GIOP_RequestHeader;
-
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_SVC_HANDLER;
-
-class TAO_Client_Connection_Handler : public TAO_SVC_HANDLER
-{
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned by the
-  //      <TAO_CONNECTOR>.
-public:
-  // = Intialization method.
-  TAO_Client_Connection_Handler (ACE_Thread_Manager * = 0);
-  // Do-nothing constructor.
-
-  // = <Connector> hook.
-  virtual int open (void *);
-  // Activation template method.
-
-  virtual int close (u_long flags = 0);
-  // Termination template method.
-
-  int send_request (TAO_OutputCDR &stream, int is_twoway);
-  // Send the request in <stream>.  If it is a twoway invocation, then
-  // this re-enters the reactor event loop so that incoming requests
-  // can continue to be serviced.  This insures that a nested upcall,
-  // i.e., an invocation coming back from the remote during this
-  // invocation, will still be handled and deadlock averted.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  // Perform appropriate closing of the connection.
-
-private:
-  typedef TAO_SVC_HANDLER BASECLASS;
-  // Trait indicating the base class.
-
-  u_char expecting_response_;
-  // State flag which, if non-zero, indicates that this handler is
-  // looking to get input.  Otherwise, any input received is
-  // unexpected.
-
-  u_char input_available_;
-  // Flag indicating whether or not input is available.  Only valid
-  // when <expecting_response_> is non-zero.
-};
-
-class TAO_Server_Connection_Handler : public TAO_SVC_HANDLER
-{
-  // = TITLE
-  //   Handles requests on a single connection in a server.
-
-public:
-  TAO_Server_Connection_Handler (ACE_Thread_Manager *t = ACE_Thread_Manager::instance ());
-  // Constructor.
-
-  virtual int open (void *);
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.  Argument is unused.
-
-  virtual int svc (void);
-  // Only used when the handler is turned into an active object by
-  // calling <activate>.  This serves as the event loop in such cases.
-
-  TAO_OA_Parameters *params (void);
-  void params (TAO_OA_Parameters *p);
-
-  // = Template Methods Called by <handle_input>
-
-  enum RequestStatus
-  {
-    Error = -1,
-    Request,      // A CORBA Request was received
-    LocateRequest // A CORBA LocateRequest was received
-  };
-
-  virtual RequestStatus recv_request (TAO_InputCDR &msg,
-				      CORBA::Environment &env);
-  // Extract a message from the stream associated with <peer()> and
-  // place it into <msg>.  Return either <Request> or <LocateRequest>
-  // if success, <Error> with <errno> and <env> set if problems.
-
-  virtual int handle_message (TAO_InputCDR &msg,
-			      int &response_required,
-                              TAO_OutputCDR &response,
-			      CORBA::Environment &env);
-  // Handle processing of the request residing in <msg>, setting
-  // <response_required> to zero if the request is for a oneway or
-  // non-zero if for a two-way and <response> to any necessary
-  // response (including errors).  In case of errors, -1 is returned
-  // and additional information carried in <env>.
-
-protected:
-  virtual int handle_locate (TAO_InputCDR &msg,
-			     int &response_required,
-                             TAO_OutputCDR &response,
-			     CORBA::Environment &env);
-  // Handle processing of the location request residing in <msg>,
-  // setting <response_required> to one if no errors are encountered.
-  // The LocateRequestReply is placed into <response>.  In case of
-  // errors, -1 is returned and additional information carried in
-  // <env>.
-
-  virtual void handle_request (const TAO_GIOP_RequestHeader &hdr,
-                               TAO_InputCDR &request_body,
-                               TAO_OutputCDR &response,
-                               TAO_Dispatch_Context *some_info,
-                               CORBA::Environment &env);
-  // Once a request is found in a message, this finds the appropriate
-  // POA and dispatches it, then takes care to properly format any
-  // response.
-
-  virtual void send_response (TAO_OutputCDR &response);
-  // Send <response> to the client on the other end.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Reads a message from the <peer()>, dispatching and servicing it
-  // appropriately.
-
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask);
-  // Perform appropriate closing of the connection.
-
-  TAO_OA_Parameters *params_;
-  // Pointer to the object adapter parameters.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Connect.i"
-#endif /* __ACE_INLINE__ */
-
-typedef ACE_Strategy_Acceptor<TAO_Server_Connection_Handler,
-                              ACE_SOCK_ACCEPTOR>
-        TAO_ACCEPTOR;
-
-#endif /* TAO_CONNECT_H */
diff --git a/TAO/tao/Connect.i b/TAO/tao/Connect.i
deleted file mode 100644
index b745a5f13f9..00000000000
--- a/TAO/tao/Connect.i
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_OA_Parameters *
-TAO_Server_Connection_Handler::params (void)
-{
-  return this->params_;
-}
-
-ACE_INLINE void
-TAO_Server_Connection_Handler::params (TAO_OA_Parameters *p)
-{
-  this->params_ = p;
-}
-
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
deleted file mode 100644
index b0cd0eeadc4..00000000000
--- a/TAO/tao/Exception.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-// $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Exception handling support
-//
-// THREADING NOTE:  calling thread handles mutual exclusion policy
-// on all of these data structures.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-// Static initializers.
-CORBA::TypeCode_ptr TAO_Exceptions::sys_exceptions[TAO_Exceptions::NUM_SYS_EXCEPTIONS];
-
-CORBA::ExceptionList TAO_Exceptions::system_exceptions;
-
-void
-CORBA_Environment::exception (CORBA::Exception *ex)
-{
-  if (ex != this->exception_)
-    {
-      this->clear ();
-      this->exception_ = ex;
-      this->exception_->AddRef ();
-    }
-}
-
-CORBA_Environment::~CORBA_Environment (void)
-{
-  this->clear ();
-}
-
-void
-CORBA_Environment::clear (void)
-{
-  if (this->exception_)
-    this->exception_->Release ();
-
-  this->exception_ = 0;
-}
-
-void
-CORBA_Exception::operator delete (void *p)
-{
-  ::operator delete (p);
-}
-
-CORBA_Environment::CORBA_Environment (void)
-  : exception_ (0)
-{
-}
-
-void *
-CORBA_Exception::operator new (size_t s)
-{
-  return ::operator new (s);
-}
-
-CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc)
-  : type_ (tc),
-    refcount_ (0)
-{
-  if (this->type_)
-    this->type_->AddRef ();
-  assert (this->type_ != 0);
-}
-
-CORBA_Exception::CORBA_Exception (const CORBA_Exception &src)
-  : type_ (src.type_),
-    refcount_ (0)
-{
-  if (this->type_)
-    this->type_->AddRef ();
-  assert (this->type_ != 0);
-}
-
-// NOTE:  It's this code, not anything defined in a subclass, which
-// is responsible for releasing any storage owned by the exception.
-// It can do this because it's got the typecode.
-
-CORBA_Exception::~CORBA_Exception (void)
-{
-  assert (this->refcount_ == 0);
-  assert (this->type_ != 0);
-
-  assert (1 == 2);
-}
-
-CORBA_Exception &
-CORBA_Exception::operator = (const CORBA_Exception &src)
-{
-  if (this->type_)
-    this->type_->Release ();
-  this->type_ = src.type_;
-  if (this->type_)
-    this->type_->AddRef ();
-  assert (this->type_ != 0);
-
-  return *this;
-}
-
-const char *
-CORBA_Exception::_id (void) const
-{
-  CORBA::Environment env;
-
-  if (this->type_)
-    return this->type_->id (env);
-  else
-    return 0;
-}
-
-TAO_CONST CORBA::TypeCode_ptr
-CORBA_Exception::_type (void) const
-{
-  return this->type_;
-}
-
-int
-CORBA_Exception::_is_a (const char* repository_id) const
-{
-  return (ACE_OS::strcmp (repository_id, "IDL:CORBA/Exception:1.0")==0);
-}
-
-CORBA::ULong
-CORBA_Exception::AddRef (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA_Exception::Release (void)
-{
-  this->refcount_--;
-  if (this->refcount_ != 0)
-    return this->refcount_;
-
-  // CORBA::TypeCode_ptr                tc = type_->_duplicate ();
-
-  CORBA::Any free_it_all (this->type_, this, CORBA::B_TRUE);
-
-  // tc->Release ();
-
-  return 0;
-}
-
-// Avoid zillions of not-quite-inlined copies of utilities.
-
-CORBA_UserException::CORBA_UserException (CORBA::TypeCode_ptr tc)
-  : CORBA_Exception (tc)
-{
-}
-
-CORBA_UserException::~CORBA_UserException (void)
-{
-}
-
-CORBA_UserException &
-CORBA_UserException::operator = (const CORBA_UserException &src)
-{
-  if (this->type_)
-    this->type_->Release ();
-  this->type_ = src.type_;
-  if (this->type_)
-    this->type_->AddRef ();
-  assert (this->type_ != 0);
-
-  return *this;
-}
-
-int
-CORBA_UserException::_is_a (const char* interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:CORBA/UserException:1.0") == 0
-    || CORBA_Exception::_is_a (interface_id);
-}
-
-CORBA_UserException*
-CORBA_UserException::_narrow (CORBA_Exception* exception)
-{
-  if (exception->_is_a ("IDL:CORBA/UserException:1.0"))
-    return ACE_dynamic_cast (CORBA_UserException *, exception);
-  return 0;
-}
-
-CORBA_SystemException::CORBA_SystemException (CORBA::TypeCode_ptr tc,
-                                              CORBA::ULong code,
-                                              CORBA::CompletionStatus completed)
-  : CORBA_Exception (tc),
-    minor_ (code),
-    completed_ (completed)
-{
-}
-
-CORBA_SystemException::CORBA_SystemException (const CORBA_SystemException &src)
-  : CORBA_Exception (src),
-    minor_ (src.minor_),
-    completed_ (src.completed_)
-{
-}
-
-CORBA_SystemException::~CORBA_SystemException (void)
-{
-}
-
-CORBA_SystemException &
-CORBA_SystemException::operator = (const CORBA_SystemException &src)
-{
-  if (this->type_)
-    this->type_->Release ();
-  this->type_ = src.type_;
-  if (this->type_)
-    this->type_->AddRef ();
-
-  this->minor_ = src.minor_;
-  this->completed_ = src.completed_;
-
-  assert (this->type_ != 0);
-
-  return *this;
-}
-
-int
-CORBA_SystemException::_is_a (const char* interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:CORBA/SystemException:1.0") == 0
-    || CORBA_Exception::_is_a (interface_id);
-}
-
-CORBA_SystemException*
-CORBA_SystemException::_narrow (CORBA_Exception* exception)
-{
-  if (exception->_is_a ("IDL:CORBA/SystemException:1.0"))
-    return ACE_dynamic_cast (CORBA_SystemException*,exception);
-  return 0;
-}
-
-// Note that "buffer" holds the (unscoped) name originally, and is
-// then overwritten.
-
-void
-TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr tcp,
-                                       const char *name,
-                                       char *buffer,
-                                       size_t buflen,
-                                       CORBA::Environment &env)
-{
-  static const char *minor = "minor";
-  static const char *completion = "completion";
-
-  static const CORBA::ULong oc_completion_status [] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order flag, tricky
-    0, 0,                 // type ID omitted
-    3,                    // three members
-    0, 0,                 // ... whose names are all omitted
-    0, 0,
-    0, 0
-  };
-  static CORBA::TypeCode
-    tc_completion_status (CORBA::tk_enum,
-                          sizeof oc_completion_status,
-                          (char *) &oc_completion_status,
-                          CORBA::B_FALSE);
-
-  static const CORBA::TypeCode_ptr completion_status =
-    &tc_completion_status;
-
-  // Create a CDR stream ... juggle the alignment here a bit, we know
-  // it's good enough for the typecode.
-
-  TAO_OutputCDR stream (buffer, buflen);
-
-  // into CDR stream, stuff (in order):
-  //    - byte order flag [4 bytes]
-  //    - exception ID [27 + N bytes]
-  //    - exception name [4 + N bytes ]
-  //    - number of members (2) [4 bytes ]
-  //    - foreach member, { name string, typecode } [~40 bytes]
-
-  char full_id[100];
-  char *strptr = full_id;
-
-  (void) ACE_OS::sprintf (full_id,
-                         "IDL:omg.org/CORBA/%s:1.0",
-                         name);
-  // @@ Should this really be an assert or should we deal with it via
-  // exceptions?
-  assert (ACE_OS::strlen (full_id) <= sizeof full_id);
-
-  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) != CORBA::B_TRUE
-      || stream.encode (CORBA::_tc_string,
-                       &strptr, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_string,
-                       &name, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.write_ulong (2L) != CORBA::B_TRUE
-      || stream.encode (CORBA::_tc_string,
-                       &minor, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_TypeCode,
-                       &CORBA::_tc_ulong, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_string,
-                       &completion, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_TypeCode,
-                       &completion_status, 0,
-                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE) {
-    env.exception (new CORBA_INITIALIZE (CORBA::COMPLETED_NO));
-    return;
-  }
-
-  // OK, we stuffed the buffer we were given (or grew a bigger one;
-  // hope to avoid that during initialization).  Now build and return
-  // a TypeCode, saving it away in the list of ones that the ORB will
-  // always accept as part of any operation response!
-
-  sys_exceptions [TAO_Exceptions::system_exceptions.length++] =
-    new (tcp) CORBA::TypeCode (CORBA::tk_except,
-                               stream.length (),
-                               stream.buffer (),
-                               CORBA::B_FALSE);
-
-  assert (tcp->length_ <= TAO_Exceptions::TC_BUFLEN);
-  return;
-}
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes, then later to initialize that storage
-// using the routine above. (It's just too painful to init these
-// typecodes statically in all cases!)
-
-#define STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION)
-
-// Declare static storage for these ... the buffer is "naturally"
-// aligned and overwritten.
-//
-// @@ this actually doesn't guarantee "natural" alignment, but
-// it works that way in most systems.
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-    static CORBA::Long tc_buf_ ## name [TAO_Exceptions::TC_BUFLEN / sizeof (long)]; \
-    static CORBA::TypeCode tc_std_ ## name (CORBA::tk_except); \
-    CORBA::TypeCode_ptr CORBA::_tc_ ## name = &tc_std_ ## name;
-STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-void
-TAO_Exceptions::init_standard_exceptions (CORBA::Environment &env)
-{
-  // Initialize the list of system exceptions, used when
-  // unmarshaling.
-  TAO_Exceptions::system_exceptions.length = 0;
-  TAO_Exceptions::system_exceptions.maximum =
-    TAO_Exceptions::NUM_SYS_EXCEPTIONS;
-  TAO_Exceptions::system_exceptions.buffer =
-    &TAO_Exceptions::sys_exceptions [0];
-
-  // Initialize the typecodes.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  if (env.exception () == 0) \
-    TAO_Exceptions::make_standard_typecode (&tc_std_ ## name, #name, \
-                                           (char *) tc_buf_ ## name, \
-                                           sizeof tc_buf_ ## name, env);
-  STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-    }
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-int \
-CORBA_##name ::_is_a (const char* interface_id) const \
-{ \
-  return ((ACE_OS::strcmp (interface_id, "IDL:CORBA/" #name "1.0")==0) \
-          || CORBA_SystemException::_is_a (interface_id)); \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA_##name * \
-CORBA_##name ::_narrow (CORBA_Exception* exception) \
-{ \
-  if (exception->_is_a ("IDL:CORBA/" #name "1.0")) \
-    return ACE_dynamic_cast (CORBA_##name *, exception); \
-  return 0; \
-}
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#undef  STANDARD_EXCEPTION_LIST
-
-// Static initialization of the two user-defined exceptions that
-// are part of the ORB.
-
-static char tc_buf_Bounds [] =
-{
-  0, 0, 0, 0,           // big endian, padded
-  0, 0, 0, 38,  // strlen (id) + 1
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'T', 'y',
-  'p', 'e', 'C', 'o',
-  'd', 'e', '/', 'B',
-  'o', 'u', 'n', 'd',
-  's', ':', '1', '.',
-  '0', '\0', 0, 0,
-  0, 0, 0, 0            // no members to this typecode
-};
-
-static CORBA::TypeCode tc_std_Bounds (CORBA::tk_except,
-                                      sizeof tc_buf_Bounds,
-                                      tc_buf_Bounds,
-                                      CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr CORBA::_tc_Bounds = &tc_std_Bounds;
-
-static char tc_buf_BadKind [] =
-{
-  0, 0, 0, 0,           // big endian, padded
-  0, 0, 0, 39,  // strlen (id) + 1
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'T', 'y',
-  'p', 'e', 'C', 'o',
-  'd', 'e', '/', 'B',
-  'a', 'd', 'K', 'i',
-  'n', 'd', ':', '1',
-  '.', '0', '\0', 0,
-  0, 0, 0, 0            // no members to this typecode
-};
-
-static CORBA::TypeCode tc_std_BadKind (CORBA::tk_except,
-                                       sizeof tc_buf_BadKind,
-                                       tc_buf_BadKind,
-                                       CORBA::B_FALSE);
-CORBA::TypeCode_ptr CORBA::_tc_BadKind = &tc_std_BadKind;
-
-// Convenience -- say if the exception is a system exception or not.
-
-CORBA::ExceptionType
-CORBA::Environment::exception_type (void) const
-{
-  static char sysex_prefix [] = "IDL:omg.org/CORBA/";
-  static char typecode_extra [] = "TypeCode/";
-
-  if (!this->exception_)
-    return CORBA::NO_EXCEPTION;
-
-  // All exceptions currently (CORBA 2.0) defined in the CORBA
-  // scope are system exceptions ... except for a couple that
-  // are related to TypeCodes.
-
-  const char *id = this->exception_->_id ();
-
-  if (ACE_OS::strncmp (id, sysex_prefix, sizeof sysex_prefix - 1) == 0
-      && ACE_OS::strncmp (id + sizeof sysex_prefix - 1,
-                          typecode_extra, sizeof typecode_extra - 1) != 0)
-    return CORBA::SYSTEM_EXCEPTION;
-
-  return CORBA::USER_EXCEPTION;
-}
-
-// Diagnostic utility routine: describe the exception onto the
-// standard I/O stream passed as a parameter.
-
-void
-CORBA::Environment::print_exception (const char *info,
-                                     FILE *) const
-{
-  const char *id = this->exception_->_id ();
-
-  ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info));
-
-  // @@ get rid of this logic, and rely on some member function on
-  // Exception to say if it's user or system exception.
-
-  if (ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/", 10) == 0
-      && ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/TypeCode/", 19) != 0)
-    {
-      // @@ this should be a QueryInterface call instead.
-      CORBA::SystemException *x2 =
-        (CORBA::SystemException *) this->exception_;
-
-      // @@ there are a other few "user exceptions" in the CORBA
-      // scope, they're not all standard/system exceptions ... really
-      // need to either compare exhaustively against all those IDs
-      // (yeech) or (preferably) to represent the exception type
-      // directly in the exception value so it can be queried.
-
-      ACE_DEBUG ((LM_ERROR,
-                  "(%P|%t) system exception, ID '%s'\n",
-                  id));
-      ACE_DEBUG ((LM_ERROR,
-                  "(%P|%t) minor code = %x, completed = %s\n",
-                  x2->minor (),
-                  (x2->completion () == CORBA::COMPLETED_YES) ? "YES" :
-                  (x2->completion () == CORBA::COMPLETED_NO) ? "NO" :
-                  (x2->completion () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                  "garbage"));
-    }
-  else
-    // @@ we can use the exception's typecode to dump all the data
-    // held within it ...
-
-    ACE_DEBUG ((LM_ERROR,
-                "(%P|%t) user exception, ID '%s'\n",
-                id));
-}
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
deleted file mode 100644
index d665ca10f31..00000000000
--- a/TAO/tao/Exception.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    except.h
-//
-// = DESCRIPTION
-//     This file defines way in which CORBA exceptions are reported.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_EXCEPTION_H)
-#  define TAO_EXCEPTION_H
-
-class TAO_Export CORBA_Exception
-{
-  // = TITLE
-  //   CORBA_Exception
-  //
-  // = DESCRIPTION
-  //   CORBA2-specified exception hierarchy.
-  //   All exceptions have a type (represented by a TypeCode) and a
-  //   widely scoped type ID (in the TypeCode) that generated by any
-  //   OMG-IDL compiler and available through the Interface
-  //   Repositories.  Think of it as a "globally scoped" name
-  //   distinguishing each exception.
-public:
-  CORBA_Exception (const CORBA_Exception &src);
-  // copy constructor
-
-  CORBA_Exception &operator = (const CORBA_Exception &src);
-  // assignment operator
-
-  virtual ~CORBA_Exception (void);
-  // destructor
-
-  // = Memory allocators.
-  void *operator new (size_t, const void *p);
-  void *operator new (size_t s);
-  void operator delete (void *p);
-
-  // these are extensions
-
-  CORBA_Exception (CORBA::TypeCode_ptr type);
-  // constructor from a TypeCode
-
-  const char *_id (void) const;
-  // return the repository ID of the Exception
-
-  TAO_CONST CORBA::TypeCode_ptr _type (void) const;
-  // return the TypeCode corresponding to the currently stored
-
-  // = To implement the narrow method.
-  virtual int _is_a (const char* repository_id) const;
-
-  // = Methods required for memory management support.
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-protected:
-  CORBA_Exception (void);
-  // default constructor is protected
-
-  CORBA::TypeCode_ptr type_;
-  // Type of the Exception.
-
-private:
-  CORBA::ULong refcount_;
-  // Reference count to avoid copying overhead.
-};
-
-class TAO_Export CORBA_UserException : public CORBA_Exception
-{
-  // = TITLE
-  //   User exceptions are those defined by application developers
-  //   using OMG-IDL.
-public:
-  CORBA_UserException (void);
-  // default constructor
-
-  CORBA_UserException (const CORBA_UserException &src);
-  // copy ctor
-
-  CORBA_UserException (CORBA::TypeCode_ptr tc);
-  // constructor from a TypeCode
-
-  ~CORBA_UserException (void);
-  // destructor
-
-  CORBA_UserException &operator= (const CORBA_UserException &src);
-  // assignment operator
-
-  static CORBA_UserException *_narrow (CORBA_Exception *exception);
-  // the narrow operation
-
-  // extension
-
-  virtual int _is_a (const char *interface_id) const;
-  // used for narrowing
-};
-
-class TAO_Export CORBA_SystemException : public CORBA_Exception
-{
-  // = TITLE
-  //   CORBA_SystemException
-  //
-  // = DESCRIPTION
-  //   System exceptions are those defined in the CORBA spec; OMG-IDL
-  //   defines these.
-public:
-
-  CORBA_SystemException (void);
-  // default ctor
-
-  CORBA_SystemException (const CORBA_SystemException &src);
-  // copy ctor
-
-  ~CORBA_SystemException (void);
-  // destructor
-
-  CORBA_SystemException &operator= (const CORBA_SystemException &src);
-  // assignment operator
-
-  CORBA::ULong minor (void) const;
-  // get the minor status
-
-  void minor (CORBA::ULong m);
-  // set the minor status
-
-  CORBA::CompletionStatus completion (void) const;
-  // get the completion status
-
-  void completion (CORBA::CompletionStatus c);
-  // set the operation completion status
-
-  static CORBA_SystemException *_narrow (CORBA_Exception* exception);
-  // narrow to a SystemException
-
-  // extension
-
-  CORBA_SystemException (CORBA::TypeCode_ptr tc,
-                         CORBA::ULong code,
-                         CORBA::CompletionStatus completed);
-  // ctor using a TypeCode
-
-  virtual int _is_a (const char *type_id) const;
-  // helper for the _narrow operation
-private:
-  CORBA::ULong minor_;
-  // minor code
-
-  CORBA::CompletionStatus completed_;
-  // completion status
-
-};
-
-// Declarations for all of the CORBA standard exceptions.
-//
-// @@ - shouldn't have a default minor code, at least for code that's
-// inside the ORB.  All minor codes should be symbolically catalogued.
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-class TAO_Export CORBA_ ## name : public CORBA_SystemException { \
-public: \
-  CORBA_ ## name (CORBA::CompletionStatus completed, \
-                  CORBA::ULong code = 0xffff0000L) \
-    : CORBA_SystemException (CORBA::_tc_ ## name, code, completed) \
-    { } \
-  virtual int _is_a (const char* type_id) const; \
-  static CORBA_##name * _narrow (CORBA_Exception* exception); \
-}
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-TAO_SYSTEM_EXCEPTION(INTERNAL);
-TAO_SYSTEM_EXCEPTION(MARSHAL);
-TAO_SYSTEM_EXCEPTION(INITIALIZE);
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-TAO_SYSTEM_EXCEPTION(TRANSIENT);
-TAO_SYSTEM_EXCEPTION(FREE_MEM);
-TAO_SYSTEM_EXCEPTION(INV_IDENT);
-TAO_SYSTEM_EXCEPTION(INV_FLAG);
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-
-#undef TAO_SYSTEM_EXCEPTION
-
-class TAO_Export CORBA_Environment
-{
-  // = TITLE
-  //   CORBA_Environment
-  //
-  // = DESCRIPTION
-  // A CORBA_Environment is a way to automagically ensure that
-  // exception data is freed -- the "var" class for Exceptions.  It
-  // adds just a bit of convenience function support, helping classify
-  // exceptions as well as reducing memory leakage.
-public:
-  // = Initialization and termination methods.
-  CORBA_Environment (void);
-  // ctor
-
-  ~CORBA_Environment (void);
-  // dtor
-
-  CORBA::Exception_ptr exception (void) const;
-  // Return the exception.  Caller must call AddRef() in order to keep
-  // the ptr.
-
-  void exception (CORBA::Exception *ex);
-  // Set the exception to <ex>, taking a reference on it.
-
-  CORBA::ExceptionType exception_type (void) const;
-  // return the typecode for the exception
-
-  TAO_CONST CORBA::String exception_id (void) const;
-  // return the repository ID for the exception
-
-  void clear (void);
-  // Clear the exception.
-
-  void print_exception (const char *info,
-                        FILE *f=stdout) const;
-  // print the exception to output determined by f
-
-private:
-  CORBA::Exception_ptr exception_;
-  // Pointer to the exception object contained in the environment.
-
-  // = These are not provided.
-  CORBA_Environment (const CORBA_Environment &src);
-  CORBA_Environment &operator = (const CORBA_Environment &src);
-};
-
-class TAO_Export TAO_Exceptions
-{
-  // = TITLE
-  //   This class is a namespace for exception-related static data and
-  //   methods.
-public:
-
-  static void make_standard_typecode (CORBA::TypeCode_ptr tcp,
-                                      const char *name,
-                                      char *buffer,
-                                      size_t buflen,
-                                      CORBA::Environment &env);
-  // Make the TypeCode for a standard exception.  When used
-  // correctly, initializing system exceptions is only an exercise
-  // in CPU time; it allocates no new memory.
-
-  static void init_standard_exceptions (CORBA::Environment &env);
-  // Runtime initialization of all standard exception typecodes.
-  // Called from CORBA::ORB::init ().
-
-  enum
-  {
-    NUM_SYS_EXCEPTIONS = 26,
-    // Number of exceptions (make sure to update correctly).
-
-    TC_BUFLEN = 160
-    // Preallocated tc buffer.
-  };
-
-  static CORBA::TypeCode_ptr sys_exceptions[NUM_SYS_EXCEPTIONS];
-
-  static CORBA::ExceptionList system_exceptions;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EXCEPTION_H */
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
deleted file mode 100644
index a629b7b13d2..00000000000
--- a/TAO/tao/Exception.i
+++ /dev/null
@@ -1,45 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE void *
-CORBA_Exception::operator new (size_t,
-                               const void *p)
-{
-  return (void *) p;
-}
-
-ACE_INLINE
-CORBA_UserException::CORBA_UserException (const CORBA_UserException &src)
-  : CORBA_Exception (src)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_SystemException::minor (void) const
-{
-  return this->minor_;
-}
-
-ACE_INLINE void
-CORBA_SystemException::minor (CORBA::ULong m)
-{
-  this->minor_ = m;
-}
-
-ACE_INLINE CORBA::CompletionStatus
-CORBA_SystemException::completion (void) const
-{
-  return this->completed_;
-}
-
-ACE_INLINE void
-CORBA_SystemException::completion (CORBA::CompletionStatus c)
-{
-  this->completed_ = c;
-}
-
-ACE_INLINE
-CORBA::Exception_ptr CORBA_Environment::exception (void) const
-{
-  return this->exception_;
-}
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
deleted file mode 100644
index 348ab0aea7f..00000000000
--- a/TAO/tao/GIOP.cpp
+++ /dev/null
@@ -1,1254 +0,0 @@
-// $Id$
-
-// @(#)giop.cpp 1.10 95/09/21
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// GIOP:        Utility routines for sending, receiving GIOP messages
-//
-// Note that the Internet IOP is just the TCP-specific mapping of the
-// General IOP.  Areas where other protocols may map differently
-// include use of record streams (TCP has none), orderly disconnect
-// (TCP has it), endpoint addressing (TCP uses host + port), security
-// (Internet security should be leveraged by IIOP) and more.
-//
-// NOTE: There are a few places where this code knows that it's really
-// talking IIOP instead of GIOP.  No rush to fix this so long as we
-// are really not running atop multiple connection protocols.
-//
-// THREADING NOTE: currently, the connection manager eliminates tricky
-// threading issues by providing this code with the same programming
-// model both in threaded and unthreaded environments.  Since the GIOP
-// APIs were all designed to be reentrant, this makes threading rather
-// simple!
-//
-// That threading model is that the thread making (or handling) a call
-// is given exclusive access to a connection for the duration of a
-// call, so that no multiplexing or demultiplexing is needed.  That
-// is, locking is at the "connection level" rather than "message
-// level".
-//
-// The down side of this simple threading model is that utilization of
-// system resources (mostly connections, but to some extent network
-// I/O) in some kinds of environments can be inefficient.  However,
-// simpler threading models are much easier to get properly debugged,
-// and often perform better.  Also, such environments haven't been
-// seen to be any kind of problem; the model can be changed later if
-// needed, it's just an internal implementation detail.  Any portable
-// ORB client is not allowed to rely on semantic implications of such
-// a model.
-//
-// @@ there is lots of unverified I/O here.  In all cases, if an
-// error is detected when marshaling or unmarshaling, it should be
-// reported.
-
-#include "tao/corba.h"
-#include "tao/Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP.i"
-#endif /* ! __ACE_INLINE__ */
-
-static const char digits [] = "0123456789ABCD";
-static const char *names [] =
-{
-  "Request",
-  "Reply",
-  "CancelRequest",
-  "LocateRequest",
-  "LocateReply",
-  "CloseConnection",
-  "MessageError",
-  "EndOfFile"
-};
-
-void
-TAO_GIOP::dump_msg (const char *label,
-                    const u_char *ptr,
-                    size_t len)
-{
-  if (TAO_debug_level >= 2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s GIOP v%c.%c msg, %d data bytes, %s endian, %s\n",
-                  label,
-                  digits[ptr[4]],
-                  digits[ptr[5]],
-                  len - TAO_GIOP_HEADER_LEN,
-                  (ptr[6] == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
-                  (ptr[7] <= TAO_GIOP::MessageError) ? names [ptr[7]] : "UNKNOWN TYPE"));
-
-      if (TAO_debug_level >= 4)
-        ACE_HEX_DUMP ((LM_DEBUG, (const char*)ptr, len, "(%P|%t) data bytes\n"));
-    }
-}
-
-CORBA::Boolean
-TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
-                        TAO_OutputCDR &stream)
-{
-  ACE_TIMEPROBE ("  -> GIOP::send_request - start");
-
-  char *buf = (char *) stream.buffer ();
-  size_t buflen = stream.length ();
-
-  // assert (buflen == (stream.length - stream.remaining));
-
-  // Patch the message length in the GIOP header; it's always at the
-  // same eight byte offset into the message.
-  //
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-
-  *(CORBA::Long *) (buf + 8) =
-    (CORBA::Long) (buflen - TAO_GIOP_HEADER_LEN);
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  TAO_GIOP::dump_msg ("send",
-                      ACE_reinterpret_cast (u_char *, buf),
-                      buflen);
-
-  ACE_SOCK_Stream &peer = handler->peer ();
-
-  while (buflen > 0)
-    {
-      if (buflen > stream.length ())
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) ?? writebuf, buflen %u > length %u\n",
-                      buflen, stream.length ()));
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
-          return CORBA::B_FALSE;
-        }
-
-      ssize_t writelen = peer.send_n (buf, buflen);
-
-#if defined (DEBUG)
-      //      dmsg_filter (6, "wrote %d bytes to connection %d",
-      //           writelen, connection);
-      dmsg_filter (6, "wrote %d bytes", writelen);
-#endif  /* DEBUG */
-
-      assert ((writelen >= 0
-               && ((size_t)writelen) <= buflen) || writelen == -1);
-
-      // On error or EOF, report the fault, close the connection, and
-      // mark it as unusable/defunct.
-      //
-      // @@ on client side write errors, we may hit the case that the
-      // server did a clean shutdown but we've not yet read the
-      // GIOP::CloseConnection message.  If we get an error, we need
-      // to see if there is such a message waiting for us, and if so
-      // we should cause (full) rebinding to take place.
-
-      if (writelen == -1)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) %p\n", "OutgoingMessage::writebuf ()"));
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) closing conn %d after fault\n", peer.get_handle ()));
-          handler->close ();
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
-          return CORBA::B_FALSE;
-        }
-      else if (writelen == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) OutgoingMessage::writebuf () ... EOF, closing conn %d\n",
-                      peer.get_handle ()));
-          handler->close ();
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
-          return CORBA::B_FALSE;
-        }
-      if ((buflen -= writelen) != 0)
-        buf += writelen;
-
-#if defined (DEBUG)
-      //
-      // NOTE:  this should never be seen.  However, on Linux
-      // it's been seen with UNIX domain sockets.
-      //
-      if (buflen)
-        dmsg_filter (8, "%u more bytes to write...\n", buflen);
-#endif /* DEBUG */
-    }
-  ACE_TIMEPROBE ("  -> GIOP::send_request - done");
-  return CORBA::B_TRUE;
-}
-
-// Server sends an "I'm shutting down now, any requests you've sent me
-// can be retried" message to the server.  The message is prefab, for
-// simplicity.
-//
-// NOTE: this is IIOP-specific though it doesn't look like it is.  It
-// relies on a TCP-ism: orderly disconnect, which doesn't exist in all
-// transport protocols.  Versions of GIOP atop some transport that's
-// lacking orderly disconnect must define some transport-specific
-// handshaking (e.g. the XNS/SPP handshake convention) in order to
-// know that the same transport semantics are provided when shutdown
-// is begun with messages "in flight". (IIOP doesn't report false
-// errors in the case of "clean shutdown", because it relies on
-// orderly disconnect as provided by TCP.  This quality of service is
-// required to write robust distributed systems.)
-
-static const char
-close_message [TAO_GIOP_HEADER_LEN] =
-{
-  'G', 'I', 'O', 'P',
-  TAO_GIOP_MessageHeader::MY_MAJOR,
-  TAO_GIOP_MessageHeader::MY_MINOR,
-  TAO_ENCAP_BYTE_ORDER,
-  TAO_GIOP::CloseConnection,
-  0, 0, 0, 0
-};
-
-void
-TAO_GIOP::close_connection (TAO_Client_Connection_Handler *&handler,
-                            void *)
-{
-  // It's important that we use a reliable shutdown after we send this
-  // message, so we know it's received.
-  //
-  // @@ should recv and discard queued data for portability; note
-  // that this won't block (long) since we never set SO_LINGER
-
-  TAO_GIOP::dump_msg ("send",
-                      (const u_char *) close_message,
-                      TAO_GIOP_HEADER_LEN);
-
-  handler->peer ().send (close_message, TAO_GIOP_HEADER_LEN);
-  ACE_HANDLE which = handler->peer ().get_handle ();
-  handler->close ();
-  handler = 0;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shut down socket %d\n", which));
-}
-
-
-// Send an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive disconnect (at
-// the application level, if not at the level of TCP).
-//
-// NOTE that IIOP will still benefit from TCP's orderly disconnect.
-
-static const char
-error_message [TAO_GIOP_HEADER_LEN] =
-{
-  'G', 'I', 'O', 'P',
-  TAO_GIOP_MessageHeader::MY_MAJOR,
-  TAO_GIOP_MessageHeader::MY_MINOR,
-  TAO_ENCAP_BYTE_ORDER,
-  TAO_GIOP::MessageError,
-  0, 0, 0, 0
-};
-
-void
-TAO_GIOP::send_error (TAO_Client_Connection_Handler *&handler)
-{
-  TAO_GIOP::dump_msg ("send",
-                      (const u_char *) error_message,
-                      TAO_GIOP_HEADER_LEN);
-  handler->peer ().send_n (error_message, TAO_GIOP_HEADER_LEN);
-  ACE_HANDLE which = handler->peer ().get_handle ();
-  handler->close ();
-  handler = 0;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) aborted socket %d\n", which));
-}
-
-ssize_t
-TAO_GIOP::read_buffer (ACE_SOCK_Stream &peer,
-                       char *buf,
-                       size_t len)
-{
-  ssize_t bytes_read = bytes_read = peer.recv_n (buf, len);
-
-  if (bytes_read == -1 && errno == ECONNRESET)
-    {
-      // We got a connection reset (TCP RSET) from the other side,
-      // i.e., they didn't initiate a proper shutdown.
-      //
-      // Make it look like things are OK to the upper layer.
-      bytes_read = 0;
-      errno = 0;
-    }
-
-  return bytes_read;
-}
-
-// Read the message header, plus any data part of the message, setting
-// stuff up so that CDR byteswaps data as appropriate.  Errors are
-// reported to be MessageError messages.
-//
-// NOTE: this code is structured to issue two read () calls for each
-// incoming message.  Alternative structures (e.g. with a user-space
-// buffer per connection, or networking code handing off entire GIOP
-// messages) can reduce the overhead of these calls to the networking
-// code; correctness and simplicity drove this implementation more
-// than efficiency.
-//
-// NOTE: as always, counting system calls associated with I/O gives
-// you a good basic understanding of the tuning issues.  On the server
-// side, there is normally select/read/read/write per invocation.  The
-// call to select () can be omitted by allocating a thread to each
-// connection; in some cases, that alone has almost doubled
-// performance.  The two read () calls can be made into one by fancy
-// buffering.  How fast could it be with both optimizations applied?
-
-TAO_GIOP::Message_Type
-TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
-                        TAO_InputCDR &msg,
-                        CORBA::Environment &env)
-{
-  ACE_TIMEPROBE ("  -> GIOP::recv_request - start");
-  TAO_GIOP::Message_Type      retval;
-  CORBA::ULong message_size;
-  ACE_SOCK_Stream &connection = handler->peer ();
-
-  // Read the message header off the wire.
-  //
-  // THREADING NOTE: the connection manager handed us this connection
-  // for exclusive use, so we need not worry about having two threads
-  // interleave reads of partial messages.  This model is excellent
-  // for "lightly threaded" systems (as will be the majority in the
-  // near future) but makes less effective use of connection resources
-  // as the "duty factor" goes down because of either long calls or
-  // bursty contention during numerous short calls to the same server.
-
-  CDR::mb_align (msg.start_);
-  if (CDR::grow (msg.start_, TAO_GIOP_HEADER_LEN) == -1)
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
-      return TAO_GIOP::MessageError;
-    }
-
-  char *header = msg.start_->rd_ptr ();
-  ssize_t len = TAO_GIOP::read_buffer (connection,
-                                       header,
-                                       TAO_GIOP_HEADER_LEN);
-  // Read the header into the buffer.
-
-  if (len != TAO_GIOP_HEADER_LEN)
-    {
-      switch (len)
-        {
-        case 0:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Header EOF ... peer probably aborted connection %d\n",
-                      connection.get_handle ()));
-          ACE_TIMEPROBE ("  -> GIOP::recv_request - EOF");
-          return TAO_GIOP::EndOfFile;
-          // @@ should probably find some way to report this without
-          // an exception, since for most servers it's not an error.
-          // Is it _never_ an error?  Not sure ...
-          /* NOTREACHED */
-        case -1: // error
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) GIOP::recv_request header socket error %p\n",
-                      "read_buffer"));
-          break;
-          /* NOTREACHED */
-        default:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) GIOP::recv_request header read failed, only %d of %d bytes\n",
-                      len, TAO_GIOP_HEADER_LEN));
-          break;
-          /* NOTREACHED */
-        }
-
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
-      return TAO_GIOP::MessageError;
-    }
-
-  // NOTE: if message headers, or whome messages, get encrypted in
-  // application software (rather than by the network infrastructure)
-  // they should be decrypted here ...
-
-  // First make sure it's a GIOP message of any version.
-
-  if (!(header [0] == 'G'
-        && header [1] == 'I'
-        && header [2] == 'O'
-        && header [3] == 'P'))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));      // header
-      ACE_DEBUG ((LM_DEBUG, "bad header, magic word\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
-      return TAO_GIOP::MessageError;
-    }
-
-  // Then make sure the major version is ours, and the minor version
-  // is one that we understand.
-
-  if (!(header [4] == TAO_GIOP_MessageHeader::MY_MAJOR
-        && header [5] <= TAO_GIOP_MessageHeader::MY_MINOR))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));      // header
-      ACE_DEBUG ((LM_DEBUG, "bad header, version\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
-      return TAO_GIOP::MessageError;
-    }
-
-  // Get the message type out and adjust the buffer's records to record
-  // that we've read everything except the length.
-
-  retval = (TAO_GIOP::Message_Type) header[7];
-
-  msg.do_byte_swap_ = (header [6] != TAO_ENCAP_BYTE_ORDER);
-
-  // Make sure byteswapping is done if needed, and then read the
-  // message size (appropriately byteswapped).
-
-  msg.start_->rd_ptr (8);
-  msg.read_ulong (message_size);
-
-  // Make sure we have the full length in memory, growing the buffer
-  // if needed.
-  //
-  // NOTE: We could overwrite these few bytes of header... they're
-  // left around for now as a debugging aid.
-
-  assert (message_size <= UINT_MAX);
-
-  if (CDR::grow (msg.start_, TAO_GIOP_HEADER_LEN + message_size) == -1)
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE));
-      return TAO_GIOP::MessageError;
-    }
-
-  // Growing the buffer may have reset the rd_ptr(), but we want to
-  // leave it just after the GIOP header (that was parsed already);
-  CDR::mb_align (msg.start_);
-  msg.start_->wr_ptr (TAO_GIOP_HEADER_LEN);
-  msg.start_->wr_ptr (message_size);
-  msg.start_->rd_ptr (TAO_GIOP_HEADER_LEN);
-
-  char* payload = msg.start_->rd_ptr ();
-
-  // Read the rest of this message into the buffer.
-
-  len = TAO_GIOP::read_buffer (connection,
-                               payload,
-                               (size_t) message_size);
-
-  if (len != (ssize_t) message_size)
-    {
-      switch (len)
-        {
-        case 0:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) TAO_GIOP::recv_request body, EOF on handle %d\n",
-                      connection.get_handle ()));
-          break;
-          /* NOTREACHED */
-        case -1:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) TAO_GIOP::recv_request () body %p\n",
-                      "read_buffer"));
-          break;
-          /* NOTREACHED */
-        default:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) short read, only %d of %d bytes\n", len, message_size));
-          break;
-          /* NOTREACHED */
-        }
-
-      // clean up, and ...
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE)); // body
-      ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
-      return TAO_GIOP::MessageError;
-    }
-
-  TAO_GIOP::dump_msg ("recv",
-                      ACE_reinterpret_cast (u_char *, header),
-                      message_size + TAO_GIOP_HEADER_LEN);
-  ACE_TIMEPROBE ("  -> GIOP::recv_request - done");
-  return retval;
-}
-
-// Normal invocations don't involve any heap allocation; messages are
-// constructed into stack-based buffers and are read into those
-// buffers too.  Larger buffers are heap-allocated as needed.
-//
-// The constraint on request IDs is that no two requests from the same
-// client with the same ID are outstanding at the same time.  In
-// single threaded environments, this is met by any number whatever.
-// When multiple threads are used, we eliminate the need for any
-// locked state by using the thread ID as the request ID, since any
-// given thread has at most one request outstanding at a time.
-//
-// NOTE: this means that if "deferred synchronous" calls get
-// supported, it's done by creating a thread internally to make the
-// call.  That is less disruptive (and error prone) in general than
-// restructuring an ORB core in terms of asynchrony.
-
-TAO_GIOP_Invocation::TAO_GIOP_Invocation (IIOP_Object *data,
-                                          const char *operation,
-                                          CORBA::Boolean is_roundtrip)
-  : data_ (data),
-    opname_ (operation),
-    do_rsvp_ (is_roundtrip),
-    my_request_id_ (0),
-    out_stream_ (buffer, sizeof buffer),
-    inp_stream_ (buffer, sizeof buffer),
-    handler_ (0)
-{
-  // @@ TODO The comments here are scary, can someone please give me a
-  // warm fuzzy feeling about this (coryan).
-
-  // The assumption that thread ids are ints is false and horribly
-  // implementation-dependent, so this code just sucks.  But, at least
-  // it will compile on multiple platforms through the magic of ACE
-  // :-/
-
-  //assert (sizeof (CORBA::ULong) == sizeof (ACE_thread_t));
-  ACE_thread_t me = ACE_OS::thr_self ();
-
-  // Copy in only as many bytes are valid, or only as many as we have
-  // room for, whichever is less.  -------> What a friggin' HACK!?!?!
-  ACE_OS::memcpy (&this->my_request_id_,
-                  &me,
-                  ACE_MIN (sizeof (me), sizeof (this->my_request_id_)));
-}
-
-TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
-{
-  if (this->handler_ != 0)
-    this->handler_->idle ();
-}
-
-// Octet codes for the parameters of the "Opaque" (sequence of octet)
-// data type used various places internally ... a CDR encapsulation
-// holding two parameters (like all sequence TypeCodes).
-//
-// NOTE: this **MUST** be longword aligned, which is why it's coded as
-// a longword array not an octet array.  Just sticking a long in for
-// padding won't work with compilers that optimize unused data out of
-// existence.
-
-// CDR typecode octets.
-
-static const CORBA::Long _oc_opaque [] =
-{
-
-  TAO_ENCAP_BYTE_ORDER,    // native endian + padding; "tricky"
-  10,                      // ... (sequence of) octets
-  0                        // ... unbounded
-};
-
-CORBA::TypeCode
-TC_opaque (CORBA::tk_sequence,
-           sizeof _oc_opaque,
-           (char *) &_oc_opaque,
-           CORBA::B_FALSE);
-
-// Octet codes for the parameters of the ServiceContextList TypeCode
-// ...  this is a CDR encapsulation holding two parameters (like all
-// sequences): a TypeCode, and the bounds of the sequence (zero in
-// this case).
-//
-// This is complicated since the Typecode for the data type for the
-// sequence members is complex, a structure that nests two further
-// typecodes (one is a sequence).
-//
-// NOTE:  this must be longword aligned!
-
-static const CORBA::Long _oc_svc_ctx_list [] =
-{
-  // START bytes of encapsulation 0
-  TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
-
-  //
-  // FIRST sequence param:  typecode for struct is complex,
-  // and so uses a nested encapsulation.
-  //
-  CORBA::tk_struct,
-  72, // length of encapsulation 1
-
-  // START bytes of encapsulation 1 (struct params)
-  1, // native endian + padding; "tricky"
-  1, 0, // type ID omitted:  null string
-  1, 0, // name omitted "ServiceContext"
-
-  2, // two struct elements
-
-  // First structure element:  name, typecode for ULong
-  //
-  // NOTE:  to be more strictly correct this could be a CORBA::tk_alias
-  // typecode ...
-
-  1, 0, // name omitted:  "context_id"
-  CORBA::tk_long,
-
-  // Second structure element: name, typecode for sequence of octet;
-  // the typecode for sequence of octet is complex, there's a second
-  // level of nested encapuslation here.
-
-  1, 0, // name omitted:  "context_data"
-  CORBA::tk_sequence,   // sequence typecode
-  16, // length of encapsulation 2
-
-  // START bytes of encapsulation 2 (sequence params)
-  1, // native endian + padding; "tricky"
-  1, 0, // type ID omitted:  null string
-  CORBA::tk_octet, // (sequence of) octet
-  0, // ... unbounded length
-  // END bytes of encapsulation 2 (sequence params)
-
-  // END bytes of encapsulation 1 (struct params)
-
-  // SECOND sequence param:  bound of sequence (none)
-  0 // unbounded seq of ServiceContext
-  // END bytes of encapsulation 0 (sequence params)
-};
-
-CORBA::TypeCode
-TC_ServiceContextList (CORBA::tk_sequence,
-                       sizeof _oc_svc_ctx_list,
-                       (char *) &_oc_svc_ctx_list,
-                       CORBA::B_FALSE);
-
-// The public API involves creating an invocation, starting it, filling
-// in request parameters, actually performing the invocation, getting
-// response parameters, and then cleaning up.  Sometimes they must be
-// restarted (e.g. request forwarding).  This is the start/restart entry.
-
-void
-TAO_GIOP_Invocation::start (CORBA::Environment &env)
-{
-  const TAO_opaque *key;
-
-  // First try to bind to the appropriate address.  We do that here
-  // since we may get forwarded to a different objref in the course of
-  // any given call, with new start () call each time.  It's not
-  // cached in the objref data since the connections change
-  // asynchronously from objref invocations and this simplifies
-  // connection management.
-  //
-  // THREADING NOTE: this connection is reserved to this call.  Also,
-  // starting at this point in the call, new forwarding information
-  // will not be used until/unless the call is reissued.  Correctness
-  // is not affected, the call will just be forwarded later than it
-  // might be in a more complex implementation.
-
-  assert (data_ != 0);
-
-  // Get a pointer to the connector, which might be in thread-specific
-  // storage, depending on the concurrency model.
-  TAO_CONNECTOR *con = TAO_ORB_Core_instance ()->connector ();
-
-  // Determine the object key and the address to which we'll need a
-  // connection.
-  ACE_INET_Addr *server_addr_p = 0;
-
-  {
-    // Begin a new scope so we keep this lock only as long as
-    // necessary
-#if 0 /* Keep this around for when forwarding might be implemented (if ever) */
-    ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock ()));
-#endif
-    if (data_->fwd_profile_i () != 0)
-      {
-        key = &data_->fwd_profile_i ()->object_key;
-        server_addr_p = &data_->fwd_profile_i ()->object_addr ();
-      }
-    else
-      {
-        key = &data_->profile.object_key;
-        server_addr_p = &data_->profile.object_addr ();
-      }
-  }
-
-  if (server_addr_p == 0)
-    {
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  this->handler_ = 0;
-  // Must reset handler, otherwise, <ACE_Cached_Connect_Strategy> will
-  // complain.
-
-  // Establish the connection and get back a
-  // <Client_Connection_Handler>.
-  if (con->connect (this->handler_,
-                    *server_addr_p) == -1)
-    {
-      // Give users a clue to the problem.
-      ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                            "%s (%s):%hu failed (%p)\n",
-                  __FILE__,
-                  __LINE__,
-                  server_addr_p->get_host_name (),
-                  server_addr_p->get_host_addr (),
-                  server_addr_p->get_port_number (),
-                  "errno"));
-
-      // There might be a better exception to set, but it's unclear
-      // which one should be used.  This one applies, even if it's
-      // vague.
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  // Use the ACE_SOCK_Stream from the Client_Connection_Handler for
-  // communication inplace of the endpoint used below.
-
-  // POLICY DECISION: If the client expects most agents to forward,
-  // then it could try to make sure that it's been forwarded at least
-  // once by eliciting it with a LocateRequest message. (Further
-  // hinting in the IIOP::ProfileData could help!)
-  //
-  // That scenario does not match an "Inter" ORB Protocol well, since
-  // bridges chain calls rather than forwarding them.  It does match
-  // some kinds of "Intra" ORB scenarios well, with many agents that
-  // spawn new processes talking to their clients across the net.
-  //
-  // At this time, the policy noted above is followed in the sense
-  // that this software does NOT expect most agents to forward, so it
-  // doesn't bother to probe.  Correctness is not affected; this is
-  // only a quality-of-service policy.  It affects mostly performance,
-  // but the "best efforts" semantics for "oneway" messages would also
-  // be impacted in that some (by definition, buggy!) code which used
-  // only "oneway" messages might not work at all.
-
-  // Build the outgoing message, starting with generic GIOP header.
-
-  CORBA::Boolean bt = TAO_GIOP::start_message (TAO_GIOP::Request,
-					       this->out_stream_);
-
-  if (bt != CORBA::B_TRUE)
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-
-  static CORBA::Principal_ptr anybody = 0;
-  static TAO_GIOP_ServiceContextList svc_ctx;   // all zeroes
-
-  if (this->out_stream_.encode (&TC_ServiceContextList, 0, &svc_ctx, env)
-      != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return;
-
-  if (!this->out_stream_.write_ulong (this->my_request_id_)
-      || !this->out_stream_.write_boolean (this->do_rsvp_))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  if (this->out_stream_.encode (&TC_opaque,
-				key,
-				0,
-				env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || this->out_stream_.encode (CORBA::_tc_string,
-				   &opname_,
-				   0,
-				   env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || this->out_stream_.encode (CORBA::_tc_Principal,
-				   &anybody,
-				   0,
-				   env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return; // right after fault
-  else
-    return; // no fault reported
-}
-
-const char *
-TAO_GIOP::message_name (TAO_GIOP::Message_Type which)
-{
-  static const char *msgnames[] =
-  {
-    "EndOfFile (nonstd)",
-    "Request (client)",
-    "Reply (server)",
-    "CancelRequest (client)",
-    "LocateRequest (client)",
-    "LocateReply (server)",
-    "CloseConnection (server)",
-    "MessageError (either)"
-  };
-
-  int i = (int) which + 1;
-  // Add one since EndOfFile is -1.
-
-  if (i > (int) (sizeof (msgnames) / sizeof (msgnames[0])))
-    return "<Bad Value!>";
-  else
-    return msgnames[i];
-}
-
-// Send request, block until any reply comes back, and unmarshal reply
-// parameters as appropriate.
-
-TAO_GIOP_ReplyStatusType
-TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
-                             CORBA::Environment &env)
-{
-  // Send Request, return on error or if we're done
-
-  if (this->handler_->send_request (this->out_stream_,
-                                    this->do_rsvp_) == -1)
-    {
-      // send_request () closed the connection; we just set the
-      // handler to 0 here.
-      this->handler_ = 0;
-
-      //
-      // @@ highly desirable to know whether we wrote _any_ data; if
-      // we wrote none, then there's no chance the call completed and
-      // applications don't have to deal with those nasty
-      // indeterminate states where they can't immediatly tell if
-      // what's safe to do.
-      //
-      // @@ also, there might have been a GIOP::CloseConnection
-      // message in the input queue.  If so, this request should be
-      // treated as a (full) "rebind" case.  Can't do that from this
-      // point in the code however!  Some minor restructuring needs to
-      // happen.
-      //
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-  if (!this->do_rsvp_)
-    return TAO_GIOP_NO_EXCEPTION;
-
-  // This blocks until the response is read.  In the current version,
-  // there is only one client thread that ever uses this connection,
-  // so most response messages are illegal.
-  //
-  // THREADING NOTE: to make more efficient use of connection
-  // resources, we'd multiplex I/O on connections.  For example, one
-  // thread would write its GIOP::Request (or GIOP::LocateRequest etc)
-  // message and block for the response, then another would do the
-  // same thing.  When a response came back, it would be handed to the
-  // thread which requested it.
-  //
-  // Currently the connection manager doesn't support such fine
-  // grained connection locking, and also this server implementation
-  // wouldn't take advantage of that potential concurrency in requests
-  // either.  There are often performance losses coming from
-  // fine-grained locks being used inappropriately; there's some
-  // evidence that locking at the level of requests loses on at least
-  // some platforms.
-  //
-  // @@ In all MT environments, there's a cancellation point lurking
-  // here; need to investigate.  Client threads would frequently be
-  // canceled sometime during recv_request ... the correct action to
-  // take on being canceled is to issue a CancelRequest message to the
-  // server and then imediately let other client-side cancellation
-  // handlers do their jobs.
-  //
-  // In C++, that basically means to unwind the stack using almost
-  // normal procedures: all destructors should fire, and some "catch"
-  // blocks should probably be able to handle things like releasing
-  // pointers. (Without unwinding the C++ stack, resources that must
-  // be freed by thread cancellation won't be freed, and the process
-  // won't continue to function correctly.)  The tricky part is that
-  // according to POSIX, all C stack frames must also have their
-  // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
-  // environment.
-
-  TAO_SVC_HANDLER *handler = this->handler_;
-  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (handler,
-						     this->inp_stream_,
-						     env);
-  switch (m)
-    {
-    case TAO_GIOP::Reply:
-      // handle reply ... must be right one etc
-      break;
-
-    case TAO_GIOP::CloseConnection:
-      // Special case of forwarding -- server was closing the
-      // connection, which just indicates resource constraints, not an
-      // error.  The client is effectively "forwarded" to the same
-      // server!
-      //
-      // However, we must reinitialize the forwarding chain, since the
-      // resource being reclaimed might also have been the process,
-      // not just the connection.  Without reinitializing, we'd give
-      // false error reports to applications.
-      {
-#if 0 /* Keep this around in case forwarding is ever implemented */
-        ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock (), TAO_GIOP_SYSTEM_EXCEPTION));
-#endif
-
-        IIOP::Profile *old = data_->fwd_profile_i (0);
-        delete old;
-
-        this->handler_->close ();
-        this->handler_ = 0;
-        return TAO_GIOP_LOCATION_FORWARD;
-      }
-
-    case TAO_GIOP::Request:
-    case TAO_GIOP::CancelRequest:
-    case TAO_GIOP::LocateRequest:
-    case TAO_GIOP::LocateReply:
-    default:
-      // These are all illegal messages to find.  If found, they could
-      // be indicative of client bugs (lost track of input stream) or
-      // server bugs; maybe the request was acted on, maybe not, we
-      // can't tell.
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) illegal GIOP message (%s) in response to my Request!\n",
-                  TAO_GIOP::message_name (m)));
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      // FALLTHROUGH ...
-
-    case TAO_GIOP::MessageError:
-      // Couldn't read it for some reason ... exception's set already,
-      // so just tell the other end about the trouble (closing the
-      // connection) and return.
-      TAO_GIOP::send_error (this->handler_);
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  // Process reply message.  Again, due to the single threading in
-  // this code, only the reply to this request is allowed to be coming
-  // back.
-  //
-  // NOTE: if the response really _isn't_ for this thread, it's now
-  // treated as an error in which synchronization can't be recovered.
-  // There might be cases where it _could_ be recovered ... e.g. maybe
-  // for some reason the previous call couldn't pick up its response.
-  // It'd be worth investigating (and handling) any such cases.
-  //
-  // NOTE: since this implementation supports no ORB services
-  // (notably, the transaction service, which is the only one that's
-  // currently defined), the reply context is discarded.  Normally
-  // it'd be fed, component at a time, to the relevant services.
-  //
-  // NOTE: As security support kicks in, this is the right place to
-  // verify a digital signature, if that is required in this
-  // particular runtime security environment.  How to know if that's
-  // the case?  It's likely that standard Internet IPSEC
-  // infrastructure (RFC 1825 through 1827, and successors) will be
-  // used to enforce many security policies; integrity and privacy
-  // guarantees may be provided by the network, and need no support
-  // here.
-
-  TAO_GIOP_ServiceContextList reply_ctx;
-  CORBA::ULong request_id;
-  CORBA::ULong reply_status;            // TAO_GIOP_ReplyStatusType
-
-  if (this->inp_stream_.decode (&TC_ServiceContextList, &reply_ctx, 0, env)
-      != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      TAO_GIOP::send_error (this->handler_);
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  if (!this->inp_stream_.read_ulong (request_id)
-      || request_id != this->my_request_id_
-      || !this->inp_stream_.read_ulong (reply_status)
-      || reply_status > TAO_GIOP_LOCATION_FORWARD)
-    {
-      TAO_GIOP::send_error (this->handler_);
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  // If there was no exception, let the caller parse the normal
-  // response.  Otherwise parse and handle the response; we always
-  // know how to deal with the standard exceptions, and the caller
-  // provides a list of allowed user-defined exceptions so that we
-  // know how to unmarshal those too (without IFR consultation).
-  //
-  // When requests are forwarded, we just store the revised profile
-  // data in this objref structure.  The expectation is that the call
-  // will be reissued until someone gives up on a forwarding chain,
-  // and that other calls will reap the benefit of the forwarding work
-  // by this thread.
-  //
-  // NOTE: should ensure that from here on, all system exceptions
-  // return COMPLETED_YES status ... even ones reported by code which
-  // we call.
-
-  switch (reply_status)
-    {
-    case TAO_GIOP_NO_EXCEPTION:
-      break;
-
-    case TAO_GIOP_USER_EXCEPTION:
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-      {
-        char* buf;
-
-        // Pull the exception ID out of the marshaling buffer.
-        {
-	  if (this->inp_stream_.read_string (buf) == CORBA::B_FALSE)
-            {
-              TAO_GIOP::send_error (this->handler_);
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_YES));
-              return TAO_GIOP_SYSTEM_EXCEPTION;
-            }
-        }
-        // User and system exceptions differ only in what table of
-        // exception typecodes is searched.
-        CORBA::ExceptionList *xlist;
-
-        if (reply_status == TAO_GIOP_USER_EXCEPTION)
-          xlist = &exceptions;
-        else
-          xlist = &TAO_Exceptions::system_exceptions;
-
-        // Find it in the operation description and then use that to
-        // get the typecode.  Use it to unmarshal the exception's
-        // value; if that exception is not allowed by this operation,
-        // fail (next).
-
-        u_int i;
-        CORBA::TypeCode_ptr *tcp;
-
-        for (i = 0, tcp = xlist->buffer;
-             i < xlist->length;
-             i++, tcp++)
-          {
-            const char *xid;
-
-            xid = (*tcp)->id (env);
-            if (env.exception () != 0)
-              {
-                dexc (env, "invoke (), get exception ID");
-                TAO_GIOP::send_error (this->handler_);
-                return TAO_GIOP_SYSTEM_EXCEPTION;
-              }
-
-            if (ACE_OS::strcmp (buf, (char *)xid) == 0)
-              {
-                size_t size;
-                CORBA::Exception *exception;
-
-                size = (*tcp)->size (env);
-                if (env.exception () != 0)
-                  {
-                    dexc (env, "invoke (), get exception size");
-                    TAO_GIOP::send_error (this->handler_);
-                    return TAO_GIOP_SYSTEM_EXCEPTION;
-                  }
-
-                // Create the exception, fill in the generic parts
-                // such as vtable, typecode ptr, refcount ... we need
-                // to clean them all up together, in case of errors
-                // unmarshaling.
-
-                exception = new (new char [size]) CORBA::Exception (*tcp);
-
-                if (this->inp_stream_.decode (*tcp, exception, 0, env)
-                    != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  {
-                    delete exception;
-                    ACE_DEBUG ((LM_ERROR, "(%P|%t) invoke, unmarshal %s exception %s\n",
-                                (reply_status == TAO_GIOP_USER_EXCEPTION) ? "user" : "system",
-                                buf));
-                    TAO_GIOP::send_error (this->handler_);
-                    return TAO_GIOP_SYSTEM_EXCEPTION;
-                  }
-                env.exception (exception);
-                return (TAO_GIOP_ReplyStatusType) reply_status;
-              }
-          }
-
-        // If we couldn't find this exception's typecode, report it as
-        // an OA error since the skeleton passed an exception that was
-        // not allowed by the operation's IDL definition.  In the case
-        // of a dynamic skeleton it's actually an implementation bug.
-        //
-        // It's known to be _very_ misleading to try reporting this as
-        // any kind of marshaling error (unless minor codes are made
-        // to be _very_ useful) ... folk try to find/fix ORB bugs that
-        // don't exist, not bugs in/near the implementation code.
-
-        if (reply_status == TAO_GIOP_USER_EXCEPTION)
-          env.exception (new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_YES));
-        else
-          env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-        return TAO_GIOP_SYSTEM_EXCEPTION;
-      }
-    // NOTREACHED
-
-    case TAO_GIOP_LOCATION_FORWARD:
-      {
-        CORBA::Object_ptr obj;
-        IIOP_Object *obj2;
-
-        // Unmarshal the object we _should_ be calling.  We know that
-        // one of the facets of this object will be an IIOP invocation
-        // profile.
-
-        if (this->inp_stream_.decode (CORBA::_tc_Object,
-				      &obj, 0,
-				      env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-            || obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &obj2) != TAO_NOERROR)
-          {
-            dexc (env, "invoke, location forward");
-            TAO_GIOP::send_error (this->handler_);
-            return TAO_GIOP_SYSTEM_EXCEPTION;
-          }
-        CORBA::release (obj);
-
-        // Make a copy of the IIOP profile in the forwarded objref,
-        // reusing memory where practical.  Then delete the forwarded
-        // objref, retaining only its profile.
-        //
-        // @@ add and use a "forward count", to prevent loss of data
-        // in forwarding chains during concurrent calls -- only a
-        // forward that's a response to the current fwd_profile should
-        // be recorded here. (This is just an optimization, and is not
-        // related to correctness.)
-
-#if 0 /* Keep this around in case forwarding is ever implemented. */
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock (), TAO_GIOP_SYSTEM_EXCEPTION);
-#endif
-
-        IIOP::Profile *old = data_->fwd_profile_i (new IIOP::Profile (obj2->profile));
-        delete old;
-
-        obj2->Release ();
-
-        env.clear ();
-
-        // Make sure a new connection is used next time.
-        this->handler_->close ();
-        this->handler_ = 0;
-        // We may not need to do this since TAO_GIOP_Invocations
-        // get created on a per-call basis. For now we'll play it safe.
-      }
-    break;
-    }
-
-  // All standard exceptions from here on in the call path know for
-  // certain that the call "completed" ... except in the case of
-  // system exceptions which say otherwise, and for
-  // TAO_GIOP_LOCATION_FORWARD responses.
-
-  return (TAO_GIOP_ReplyStatusType) reply_status;
-}
-
-void
-TAO_GIOP::make_error (TAO_OutputCDR &msg, ...)
-{
-  ACE_UNUSED_ARG (msg);  // just for now
-
-  // This [static] method will be somewhat like send_error() except
-  // that it won't actaully do any sending of data...it'll just stuff
-  // things into the <msg> instance.
-}
-
-CORBA::Boolean
-TAO_GIOP_LocateRequestHeader::init (TAO_InputCDR &msg,
-                                    CORBA::Environment &env)
-{
-  return (msg.read_ulong (this->request_id)
-          && msg.decode (&TC_opaque,
-                         &this->object_key,
-                         0,
-                         env));
-}
-
-// Initialize the request header from <msg>, setting <env> for errors.
-
-CORBA::Boolean
-TAO_GIOP_RequestHeader::init (TAO_InputCDR &msg,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean hdr_status;
-
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-
-  hdr_status = msg.decode (&TC_ServiceContextList,
-                           &this->service_info,
-                           0,
-                           env);
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && msg.read_ulong (this->request_id);
-  hdr_status = hdr_status && msg.read_boolean (this->response_expected);
-  hdr_status = hdr_status && msg.decode (&TC_opaque,
-                                         &this->object_key,
-                                         0,
-                                         env);
-  hdr_status = hdr_status && msg.decode (CORBA::_tc_string,
-                                         &this->operation,
-                                         0,
-                                         env);
-  hdr_status = hdr_status && msg.decode (CORBA::_tc_Principal,
-                                         &this->requesting_principal,
-                                         0,
-                                         env);
-  return hdr_status;
-}
-
-CORBA::Boolean
-TAO_GIOP::start_message (TAO_GIOP::Message_Type type,
-			 TAO_OutputCDR &msg)
-{
-  msg.reset ();
-
-  // if (msg.size () < TAO_GIOP_HEADER_LEN)
-  // return CORBA::B_FALSE;
-
-  msg.write_octet ('G');
-  msg.write_octet ('I');
-  msg.write_octet ('O');
-  msg.write_octet ('P');
-
-  msg.write_octet (TAO_GIOP_MessageHeader::MY_MAJOR);
-  msg.write_octet (TAO_GIOP_MessageHeader::MY_MINOR);
-
-  msg.write_octet (TAO_ENCAP_BYTE_ORDER);
-  msg.write_octet (type);
-
-  // Write a dummy <size> later it is set to the right value...
-  // @@ TODO Maybe we should store the OutputCDR status in 
-  CORBA::ULong size = 0;
-  msg.write_ulong (size);
-
-  return CORBA::B_TRUE;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>;
-template class TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>;
-template class CORBA_SEQUENCE<CORBA::Octet>;
-template class CORBA_SEQUENCE<CORBA::TypeCode*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>
-#pragma instantiate TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
-#pragma instantiate CORBA_SEQUENCE<CORBA::Octet>
-#pragma instantiate CORBA_SEQUENCE<CORBA::TypeCode*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
deleted file mode 100644
index d2039b133c3..00000000000
--- a/TAO/tao/GIOP.h
+++ /dev/null
@@ -1,430 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Giop.h
-//
-// = DESCRIPTION
-//     GIOP data structures and support routines
-//
-//     Note that some symbols in this module are part of the
-//     "Internet" Inter-ORB Protocol (IIOP), not the General IOP.
-//     Only addressing information and certain details of connection
-//     usage are specific to IIOP; all other protocol details can be
-//     reused by ORB protocols that are built atop connection
-//     protocols other than TCP.
-//
-//     THREADING NOTE: Threads should never manipulate another
-//     thread's invocations.  In this implementation, all data
-//     structures used to represent invocations (and parts of them)
-//     are owned by the thread which created them.  Multiple threads
-//     may make of course concurrent invocations safely, since the
-//     GIOP code is reentrant.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.,
-//     Chris Cleeland <cleeland@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (TAO_GIOP_H)
-#  define TAO_GIOP_H
-
-// namespace TAO_IOP
-
-// Assigned Protocol/Profile tag values.  ORB protcols may be uniquely
-// identified by tags such as these.  This allows each ORB's own
-// objref profiles to be interchanged using IORs.
-//
-// Email to tag-request@omg.org to allocate tags.
-typedef CORBA::ULong TAO_IOP_Profile_ID;
-
-enum
-{
-  TAO_IOP_TAG_INTERNET_IOP = 0,        // IIOP
-  TAO_IOP_TAG_MULTIPLE_COMPONENTS = 1, // DCE-CIOP
-  // = This is a subset of the list of other profile tags.
-  TAO_IOP_TAG_ONC_IOP = 0x4f4e4300     // ONC IOP
-};
-
-class TAO_IOP_Tagged_Profile
-{
-  // = TITLE
-  //   One per protocol.
-public:
-  TAO_IOP_Profile_ID tag;
-  TAO_opaque profile_data;
-};
-
-typedef TAO_Unbounded_Sequence<TAO_IOP_Tagged_Profile>
-        TAO_IOP_Tagged_Profile_Sequence;
-
-class TAO_IOP_IOR
-{
-  // = TITLE
-  //   InteroperableObjectReference
-  //
-  // = DESCRIPTION
-  //   ... a set of protocol-specific protocol profiles, plus a type
-  //   ID.  Only one object is denoted by all of this information.
-  //   It's OK to delete all profiles except the one for the single
-  //   protocol actually being used.
-
-public:
-  char *type_id;
-  TAO_IOP_Tagged_Profile_Sequence profiles;
-};
-
-// Some protocols can be factored into a set of optional components.
-// Use of such components is defined by the protocol's specification.
-//
-// Email to tag-request@omg.org to allocate tags.
-
-typedef CORBA::ULong TAO_IOP_ComponentId;
-
-enum
-{
-  // = DESCRIPTION
-  //   These are all defined by DCE-CIOP in OMG TC document 95-3-10.
-
-  TAO_IOP_TAG_DCE_STRING_BINDING = 100,// string binding handle
-  TAO_IOP_TAG_DCE_BINDING_NAME = 101, // CDS/GDS/... name
-  TAO_IOP_TAG_DCE_NO_PIPES = 102, // no component data
-  TAO_IOP_TAG_OBJECT_KEY = 10,  // opaque
-  TAO_IOP_TAG_ENDPOINT_ID = 11, // uuid
-  TAO_IOP_TAG_LOCATION_POLICY = 12 // octet/enum
-};
-
-class TAO_IOP_TaggedComponent
-{
-  // = DESCRIPTION
-  //   One way to represent multicomponent profiles, e.g. as done by
-  //   the DCE-CIOP protocol.  One of these gets encapsulated in
-  //   Tagged_Profile::profile_data.  TAG_MULTIPLE_COMPONENTS may be
-  //   used to represent protocol profiles structured in that way, but
-  //   protocol-specific tags facilitate simpler scanning of IORs
-  //   since you can be assured that each profile only has data used
-  //   within a single ORB protocol.
-public:
-
-  TAO_IOP_ComponentId tag;
-  TAO_opaque component_data;
-};
-
-typedef TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
-        TAO_IOP_MultipleComponentProfile;
-
-// namespace TAO_GIOP
-
-struct TAO_Version
-{
-  CORBA::Octet major;
-  CORBA::Octet minor;
-};
-
-class TAO_GIOP_MessageHeader
-{
-  // = TITLE
-  //   This is the header sent with ever GIOP request!
-
-public:
-  // version numbers
-  enum
-  {
-    // = DESCRIPTION
-    //   GIOP protocol version 1.0 information.
-
-    MY_MAJOR = 1,
-    MY_MINOR = 0
-  };
-
-  CORBA::Char magic [4]; // "GIOP"
-  TAO_Version giop_version;
-  CORBA::Octet byte_order; // 0 = big, 1 = little
-  CORBA::Octet message_type; // MsgType above
-  CORBA::ULong message_size; // in byte_order!
-};
-
-// defined by GIOP 1.0 protocol @@ Is this portable? The structure
-// above could have some padding on machines with absurd padding
-// requirements (like 8 byte boundaries); hence the size of it may not
-// match the size of the header on the wire.
-//#define       TAO_GIOP_HEADER_LEN sizeof (TAO_GIOP_MessageHeader)
-// @@ - I made this explicitly 12 (ASG)
-#define TAO_GIOP_HEADER_LEN 12
-
-// Support for Implicit ORB Service Context.
-typedef CORBA::ULong TAO_GIOP_ServiceID;
-
-enum
-{
-  // = TITLE
-  //   Values for TAO_GIOP_ServiceID.
-
-  TAO_GIOP_TransactionService = 0
-
-  // More service IDs may be defined by OMG.
-  // This is where our RIOP service ID will be defined...
-};
-
-class TAO_GIOP_ServiceContext
-{
-  // = TITLE
-  //   Sent for service context entries in the GIOP request header.
-public:
-  TAO_GIOP_ServiceID context_id;
-  TAO_opaque context_data;
-};
-
-typedef TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>
-        TAO_GIOP_ServiceContextList;
-
-extern CORBA::TypeCode TC_ServiceContextList;
-
-// = Request, Reply headers
-
-class TAO_Export TAO_GIOP_RequestHeader
-{
-  // = TITLE
-  //   This class embodies the header of a GIOP request.
-public:
-  TAO_GIOP_RequestHeader (void);
-  // Constructor.
-
-  CORBA::Boolean init (TAO_InputCDR &msg,
-                       CORBA::Environment& env);
-  // Initialize the header from the values found in <msg>.
-
-  //private:
-  TAO_GIOP_ServiceContextList service_info;
-  // The service context for the request (CORBA Reference?)
-
-  CORBA::ULong request_id;
-  // Unique identifier for a request
-
-  CORBA::Boolean response_expected;
-  // true if this request requires a response
-
-  TAO_opaque object_key;
-  // The object key of the destination object.
-
-  CORBA::String operation;
-  // Name of the operation being performed
-
-  CORBA::Principal_ptr requesting_principal;
-  // Identifies the requester
-};
-
-enum TAO_GIOP_ReplyStatusType
-{
-  TAO_GIOP_NO_EXCEPTION,
-  // Request completed successfully
-
-  TAO_GIOP_USER_EXCEPTION,
-  // Request terminated with user exception
-
-  TAO_GIOP_SYSTEM_EXCEPTION,
-  // Request terminated with system exception
-
-  TAO_GIOP_LOCATION_FORWARD
-  // Reply is a location forward type
-};
-
-class TAO_GIOP_ReplyHeader
-{
-  // = TITLE
-  //   This class embodies the header of a GIOP reply.
-public:
-  TAO_GIOP_ServiceContextList service_info;
-  // Information
-
-  CORBA::ULong request_id;
-  // Unique identifier of the request for which this is a reply.
-
-  TAO_GIOP_ReplyStatusType reply_status;
-  // Status of the reply (see above enum).
-};
-
-class TAO_GIOP_CancelRequestHeader
-{
-  // = TITLE
-  //   Cancellation -- applies both to Requests and LocateRequests.
-public:
-  CORBA::ULong request_id;
-  // Unique identifier of the request being cancelled
-};
-
-class TAO_GIOP_LocateRequestHeader
-{
-  // = TITLE
-  //   Location service support
-public:
-  TAO_GIOP_LocateRequestHeader (void);
-  // Constructor
-
-  CORBA::Boolean init (TAO_InputCDR &msg,
-                       CORBA::Environment& env);
-  // Initialize the header from the values found in <msg>.
-
-  CORBA::ULong request_id;
-  TAO_opaque object_key;
-};
-
-enum TAO_GIOP_LocateStatusType
-{
-  TAO_GIOP_UNKNOWN_OBJECT,
-  TAO_GIOP_OBJECT_HERE,
-  TAO_GIOP_OBJECT_FORWARD
-};
-
-class TAO_GIOP_LocateReplyHeader
-{
-  // = TITLE
-  //   Location reply.
-public:
-  CORBA::ULong request_id;
-  TAO_GIOP_LocateStatusType locate_status;
-};
-
-class TAO_Export TAO_GIOP_Invocation
-{
-  // = TITLE
-  //   Invocation: Sends a Request, optionally reads associated Reply.
-  //   Uses transport info passed in, doesn't locate anything.
-  //
-  // = NOTES
-  //   This should maybe be moved into its own file (invoke.h?)
-public:
-  // = Initialization and termination methods.
-  TAO_GIOP_Invocation (IIOP_Object *data,
-                       const char *operation,
-                       CORBA::Boolean is_roundtrip);
-
-  ~TAO_GIOP_Invocation (void);
-
-  void start (CORBA::Environment &env);
-  // <start> goes beyond initialising data structures, and makes calls
-  // that may fail -- and thus throw exceptions.
-
-  void put_param (CORBA::TypeCode_ptr tc,
-                  void *value,
-                  CORBA::Environment &env);
-  // Encodes the value into the undelying CDR stream based on the TypeCode
-  // parameter
-
-  TAO_GIOP_ReplyStatusType invoke (CORBA::ExceptionList &exceptions,
-                                   CORBA::Environment &env);
-  // Send request, block until any reply comes back, and unmarshal
-  // reply parameters as appropriate.
-
-  void get_value (CORBA::TypeCode_ptr tc,
-                  void *value,
-                  CORBA::Environment &env);
-  // No CORBA::Context support (deprecated).
-
-  CDR &stream (void);
-  // Return the underlying stream.
-
-private:
-  IIOP_Object *data_;
-  // The object on which this invocation is going.
-
-  const char *opname_;
-  // Name of the operation being invoked.
-
-  CORBA::Boolean do_rsvp_;
-  // Set to TRUE if this request a twoway.
-
-  CORBA::ULong my_request_id_;
-  // Request ID of this operation.
-
-  char buffer [CDR::DEFAULT_BUFSIZE];
-  // Buffer used for both the output and input CDR streams, this is
-  // "safe" because we only one of the streams at a time.
-
-  TAO_OutputCDR out_stream_;
-  // Stream into which the response is placed.
-
-  TAO_InputCDR inp_stream_;
-  // Stream into which the request is placed.
-
-  TAO_Client_Connection_Handler *handler_;
-  // The handler for the client's connection.
-};
-
-class TAO_Export TAO_GIOP
-{
-  // = TITLE
-  //   A namespace for GIOP-related operations.
-  //
-  // = DESCRIPTION
-  //   Only put static methods within this scope.
-  ACE_CLASS_IS_NAMESPACE (TAO_GIOP);
-
-public:
-  enum Message_Type
-  {
-    // = DESCRIPTION
-    //   All GIOP messages include a header and message type.  Not
-    //   really a message type, but needed to bring that information
-    //   back somehow
-
-    EndOfFile = -1, // "discovered" by either
-    Request = 0, // sent by client
-    Reply = 1, // by server
-    CancelRequest = 2, // by client
-    LocateRequest = 3, // by client
-    LocateReply = 4, // by server
-    CloseConnection = 5, // by server
-    MessageError = 6 // by both
-  };
-
-  static void close_connection (TAO_Client_Connection_Handler *&handle,
-                                void *ctx);
-  // Close a connection, first sending GIOP::CloseConnection.
-
-  static CORBA::Boolean start_message (TAO_GIOP::Message_Type t,
-                                       TAO_OutputCDR &msg);
-  // Build the header for a message of type <t> into stream <msg>.
-
-  static CORBA::Boolean send_request (TAO_SVC_HANDLER *handler,
-                                      TAO_OutputCDR &stream);
-  // Send message, returns TRUE if success, else FALSE.
-
-  static TAO_GIOP::Message_Type recv_request (TAO_SVC_HANDLER *&handler,
-					      TAO_InputCDR &msg,
-					      CORBA::Environment &env);
-  // Reads message, returns message type from header.
-
-  static void make_error (TAO_OutputCDR &msg, ...);
-  // Construct a message containing an error so that it can be sent as
-  // a response to a request.
-
-  static void dump_msg (const char *label,
-                        const u_char *ptr,
-                        size_t len);
-  // Print out a message header.
-
-  static void send_error (TAO_Client_Connection_Handler *&handler);
-  // Send an error message back to a caller.
-
-  static ssize_t read_buffer (ACE_SOCK_Stream &peer,
-                              char *buf,
-                              size_t len);
-  // Loop on data read ... this is required since <recv> won't block
-  // until the requested amount of data is available.
-
-  static const char *message_name (TAO_GIOP::Message_Type which);
-  // Returns the stringified <MsgType>.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_GIOP_H */
diff --git a/TAO/tao/GIOP.i b/TAO/tao/GIOP.i
deleted file mode 100644
index f5a9319fa70..00000000000
--- a/TAO/tao/GIOP.i
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-//
-
-ACE_INLINE
-TAO_GIOP_LocateRequestHeader::TAO_GIOP_LocateRequestHeader (void)
-  : request_id (0)
-{}
-
-ACE_INLINE
-TAO_GIOP_RequestHeader::TAO_GIOP_RequestHeader (void)
-  : request_id (0),
-    response_expected (CORBA::B_FALSE)
-{}
-
-ACE_INLINE void
-TAO_GIOP_Invocation::get_value (CORBA::TypeCode_ptr tc,
-                                void *value,
-                                CORBA::Environment &env)
-{
-  (void) this->inp_stream_.decode (tc, value, 0, env);
-}
-
-ACE_INLINE void
-TAO_GIOP_Invocation::put_param (CORBA::TypeCode_ptr tc,
-                                void *value,
-                                CORBA::Environment &env)
-{
-  (void) this->out_stream_.encode (tc, value, 0, env);
-}
-
-#if 0
-// @@ TODO
-ACE_INLINE CDR &
-TAO_GIOP_Invocation::stream (void)
-{
-  return this->stream_;
-}
-#endif /* 0 */
diff --git a/TAO/tao/IIOP_Interpreter.cpp b/TAO/tao/IIOP_Interpreter.cpp
deleted file mode 100644
index 1d59312d88d..00000000000
--- a/TAO/tao/IIOP_Interpreter.cpp
+++ /dev/null
@@ -1,894 +0,0 @@
-// $Id$
-
-// @(#)interp.cpp       1.4 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-#include "tao/corba.h"
-
-TAO_IIOP_Interpreter::Table_Element
-TAO_IIOP_Interpreter::table_[CORBA::TC_KIND_COUNT] =
-{
-  { 0, 1, 0 },                            // CORBA::tk_null
-  { 0, 1, 0 },                            // CORBA::tk_void
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_short
-  { 0, 1, 0, 0 },                         // CORBA::tk_long
-  { 0, 1, 0, 0 },                         // CORBA::tk_ushort
-  { 0, 1, 0, 0 },                         // CORBA::tk_ulong
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_float
-  { 0, 1, 0, 0 },                         // CORBA::tk_double
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_boolean
-  { 0, 1, 0, 0 },                         // CORBA::tk_char
-  { 0, 1, 0, 0 },                         // CORBA::tk_octet
-  { 0, 1, 0, 0 },                         // CORBA::tk_any
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_TypeCode
-  { 0, 1, 0, 0 },                         // CORBA::tk_Principal
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_objref
-
-  { 0, 1, calc_struct_attributes, 0 },    // CORBA::tk_struct
-  { 0, 1, calc_union_attributes, 0 },     // CORBA::tk_union
-
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_enum
-  { 0, 1, 0, skip_long },                 // CORBA::tk_string
-  { 0, 1, 0, skip_encapsulation },        // CORBA::tk_sequence
-  { 0, 1, calc_array_attributes, 0 },     // CORBA::tk_array
-
-  // = Two TCKind values added in 94-11-7
-  { 0, 1, calc_alias_attributes, 0 },     // CORBA::tk_alias
-  { 0, 1, calc_exception_attributes, 0 }, // CORBA::tk_except
-
-  // = Five extended IDL data types, defined in Appendix A of 94-9-32
-  // but here with different numeric TCKind codes.  These types
-  // represent extensions to CORBA (specifically, to IDL) which are
-  // not yet standardized.
-
-  { 0, 1, 0, 0 },                         // CORBA::tk_longlong
-  { 0, 1, 0, 0 },                         // CORBA::tk_ulonglong
-  { 0, 1, 0, 0 },                         // CORBA::tk_longdouble
-  { 0, 1, 0, 0 },                         // CORBA::tk_wchar
-  { 0, 1, 0, skip_long }                  // CORBA::tk_wstring
-};
-
-// Runtime initialization of the table above; note that this compiles
-// down to a set of assignment statements, with the real work done by
-// the C++ compiler when this file gets compiled.
-//
-// "Natural alignment" is a policy that the processor controls the
-// alignment of data based on its type.  There's variation; some CPUs
-// have a maximum alignment requirement of two or four bytes, others
-// have some type-specific exceptions to the normal "alignment ==
-// size" rule.
-//
-// "Fixed" alignment ignores data type when establishing alignment;
-// not all processors support such policies, and those which do often
-// pay a cost to do so (viz. RISC/CISC discussions).  The primary
-// example of an OS family that chose "fixed" alignment is Microsoft's
-// x86 systems, which normally align on one byte boundaries to promote
-// data space efficiency.
-//
-// NOTE: typical PC compiler options let you specify other alignments,
-// but none are "natural".  Also, they don't apply consistently to all
-// data types.  Change the "one byte" assumption with extreme caution!
-// And make sure all header files (e.g. generated by an IDL compiler)
-// make sure that alignment of IDL-defined data types is consistent
-// (one byte).
-
-  enum TCKIND
-  {
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,           // 94-11-7
-    tk_except             = 22,           // 94-11-7
-
-    // these five are OMG-IDL data type extensions
-    tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-    tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-    tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-    tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-    tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-
-    // This symbol is not defined by CORBA 2.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-#if defined (TAO_HAS_FIXED_BYTE_ALIGNMENT)
-  // Have a bogus one
-  #define declare_entry(x,t) struct align_struct_ ## t { }
-
-  #define setup_entry(x,t) \
-    { \
-      TAO_IIOP_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_IIOP_Interpreter::table_ [t].alignment_ = 1; \
-    }
-#else  /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
-  // unix, ACE_WIN32, VXWORKS, __Lynx__, at least
-  #define declare_entry(x,t) \
-    struct align_struct_ ## t \
-    { \
-      x one; \
-      char dummy [TAO_MAXIMUM_NATIVE_TYPE_SIZE + 1 - sizeof(x)]; \
-      x two; \
-    }
-
-  #define setup_entry(x,t) \
-    { \
-      align_struct_ ## t align; \
-      TAO_IIOP_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_IIOP_Interpreter::table_ [t].alignment_ = \
-      (char *) &align.two - (char *) &align.one - TAO_MAXIMUM_NATIVE_TYPE_SIZE; \
-    }
-#endif /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
-
-// Fills in fixed size and alignment values.
-
-declare_entry (CORBA::Short, tk_short);
-declare_entry (CORBA::Long, tk_long);
-declare_entry (CORBA::UShort, tk_ushort);
-declare_entry (CORBA::ULong, tk_ulong);
-
-declare_entry (CORBA::Float, tk_float);
-declare_entry (CORBA::Double, tk_double);
-
-declare_entry (CORBA::Boolean, tk_boolean);
-declare_entry (CORBA::Char, tk_char);
-declare_entry (CORBA::Octet, tk_octet);
-declare_entry (CORBA::Any, tk_any);
-
-declare_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-declare_entry (CORBA::Principal_ptr, tk_Principal);
-declare_entry (CORBA::Object_ptr, tk_objref);
-
-declare_entry (CORBA::String, tk_string);
-declare_entry (TAO_opaque, tk_sequence);
-
-declare_entry (CORBA::LongLong, tk_longlong);
-declare_entry (CORBA::ULongLong, tk_ulonglong);
-declare_entry (CORBA::LongDouble, tk_longdouble);
-declare_entry (CORBA::WChar, tk_wchar);
-declare_entry (CORBA::WString, tk_wstring);
-
-void
-TAO_IIOP_Interpreter::init_table (void)
-{
-  setup_entry (CORBA::Short, tk_short);
-  setup_entry (CORBA::Long, tk_long);
-  setup_entry (CORBA::UShort, tk_ushort);
-  setup_entry (CORBA::ULong, tk_ulong);
-
-  setup_entry (CORBA::Float, tk_float);
-  setup_entry (CORBA::Double, tk_double);
-
-  setup_entry (CORBA::Boolean, tk_boolean);
-  setup_entry (CORBA::Char, tk_char);
-  setup_entry (CORBA::Octet, tk_octet);
-  setup_entry (CORBA::Any, tk_any);
-
-  setup_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-  setup_entry (CORBA::Principal_ptr, tk_Principal);
-  setup_entry (CORBA::Object_ptr, tk_objref);
-
-  enum generic_enum {a, b, c, d};
-
-  // XXX workaround for G++ 2.6.3 bug
-  // setup_entry (generic_enum, CORBA::tk_enum);
-  TAO_IIOP_Interpreter::table_ [CORBA::tk_enum].size_ =
-    sizeof (generic_enum);
-  TAO_IIOP_Interpreter::table_ [CORBA::tk_enum].alignment_ =
-    sizeof (generic_enum);
-
-  setup_entry (CORBA::String, tk_string);
-  setup_entry (TAO_opaque, tk_sequence);
-
-  setup_entry (CORBA::LongLong, tk_longlong);
-  setup_entry (CORBA::ULongLong, tk_ulonglong);
-  setup_entry (CORBA::LongDouble, tk_longdouble);
-  setup_entry (CORBA::WChar, tk_wchar);
-  setup_entry (CORBA::WString, tk_wstring);
-}
-
-#undef  setup
-
-CORBA::Boolean
-TAO_IIOP_Interpreter::skip_encapsulation (TAO_InputCDR *stream)
-{
-  return stream->skip_string ();
-}
-
-CORBA::Boolean
-TAO_IIOP_Interpreter::skip_long (TAO_InputCDR *stream)
-{
-  CORBA::ULong  scratch;
-
-  return stream->read_ulong (scratch);
-}
-
-// For a given typecode, figure out its size and alignment needs.
-// This version is used mostly when traversing other typecodes, and
-// follows these rules:
-//
-// - Some typecodes are illegal (can't be nested inside others);
-// - Indirections are allowed;
-// - The whole typecode (including TCKind enum) is in the stream
-//
-// When the routine returns, the stream has skipped this TypeCode.
-//
-// "size" is returned, "alignment" is an 'out' parameter.  If it is
-// non-null, "tc" is initialized to hold the contents of the TypeCode;
-// it depends on the contents of the original stream to be valid.
-//
-// XXX explore splitting apart returning the size/alignment data and
-// the TypeCode initialization; union traversal would benefit a bit,
-// but it would need more than that to make it as speedy as struct
-// traversal.
-
-size_t
-TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-				       TAO_InputCDR* stream,
-				       CORBA::TCKind kind,
-				       size_t &alignment,
-				       CORBA::Environment &env)
-{
-  CORBA::ULong temp;
-  // Just a temporary to retrieve CORBA::TCKind variables as ULong's
-
-  // Check for illegal TCKind enum values ... out of range, or which
-  // represent data values that can't be nested.  (Some can't even
-  // exist freestanding!)
-
-  if (kind >= CORBA::TC_KIND_COUNT
-      || kind <= CORBA::tk_void
-      || kind == CORBA::tk_except)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Use attribute calculator routine if it exists; these are needed
-  // only for variable-sized data types, with encapsulated parameter
-  // lists that affect the size and alignment of "top level" memory
-  // needed to hold an instance of this type.
-
-  if (TAO_IIOP_Interpreter::table_[kind].calc_ != 0)
-    {
-      assert (TAO_IIOP_Interpreter::table_[kind].size_ == 0);
-
-      // Pull encapsulation length out of the stream.
-      if (stream->read_ulong (temp) == CORBA::B_FALSE)
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      // Initialize the TypeCode if requested
-      if (tc)
-        {
-          tc->kind_ = kind;
-          tc->buffer_ = stream->rd_ptr ();
-          tc->length_ = temp;
-        }
-
-      // Set up a separate stream for the parameters; it may easily
-      // have a different byte order, and this is as simple a way as
-      // any to ensure correctness.  Then use the calculator routine
-      // to calculate size and alignment.
-
-      assert (temp <= UINT_MAX);
-
-      TAO_InputCDR nested (*stream, temp);
-
-      if (nested.good_bit () == 0)
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      size_t size = TAO_IIOP_Interpreter::table_[kind].calc_ (&nested,
-							      alignment,
-							      env);
-      if (env.exception () != 0)
-	{
-	  return 0;
-	}
-
-      // Check for garbage at end of parameter lists, or other cases
-      // where parameters and the size allocated to them don't jive.
-
-      stream->skip_bytes (temp);
-
-      if (stream->rd_ptr () != nested.rd_ptr ())
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      return size;
-    }
-  assert (TAO_IIOP_Interpreter::table_[kind].size_ != 0);
-
-  // Reinitialize the TypeCode if requested; this consumes any
-  // TypeCode parameters in the stream.  They only exist for TCKind
-  // values that have parameters, but which represent fixed-size data
-  // types in the binary representation: CORBA::tk_string, CORBA::tk_wstring,
-  // CORBA::tk_objref, CORBA::tk_enum, and CORBA::tk_sequence.
-
-  if (tc)
-    {
-      CORBA::ULong len;
-
-      tc->kind_ = kind;
-      switch (kind)
-        {
-        default:
-          assert (TAO_IIOP_Interpreter::table_[kind].skipper_ == 0);
-          break;
-
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          if (stream->read_ulong (len) == CORBA::B_FALSE)
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-          tc->length_ = len;
-          break;
-
-        case CORBA::tk_enum:
-        case CORBA::tk_objref:
-        case CORBA::tk_sequence:
-          if (stream->read_ulong (len) == CORBA::B_FALSE)
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-          tc->length_ = len;
-
-          assert (len < UINT_MAX);
-          tc->buffer_ = stream->rd_ptr ();
-          stream->skip_bytes (len);
-          break;
-        }
-
-      // Otherwise, consume any parameters without stuffing them into
-      // a temporary TypeCode.
-    }
-  else if (TAO_IIOP_Interpreter::table_[kind].skipper_ != 0
-           && TAO_IIOP_Interpreter::table_[kind].skipper_ (stream) == CORBA::B_FALSE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Return statically known values.
-  alignment = TAO_IIOP_Interpreter::table_[kind].alignment_;
-  return TAO_IIOP_Interpreter::table_[kind].size_;
-}
-
-size_t
-TAO_IIOP_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
-                                            TAO_InputCDR *stream,
-                                            size_t &alignment,
-                                            CORBA::Environment &env)
-{
-  // Get the "kind" ... if this is an indirection, this is a guess
-  // which will soon be updated.
-  CORBA::ULong temp;
-  if (stream->read_ulong (temp) == CORBA::B_FALSE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  env.clear ();
-
-  CORBA::TCKind kind = (CORBA::TCKind) temp;
-
-  if (kind != ~0)
-    {
-      return TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i
-	(tc,
-	 stream,
-	 kind,
-	 alignment,
-	 env);
-    }
-
-  // Get indirection, sanity check it, set up new stream pointing
-  // there.
-  //
-  // XXX access to "real" size limit for this typecode and use it
-  // to check for errors before indirect and to limit the new
-  // stream's length.  ULONG_MAX is too much!
-
-  CORBA::Long offset;
-  if (!stream->read_long (offset)
-      || offset >= -8
-      || ((-offset) & 0x03) != 0)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Notice how we change the sign of the offset to estimate the
-  // maximum size.
-  TAO_InputCDR indirected_stream (*stream, -offset, offset);
-
-  // Fetch indirected-to TCKind.
-  if (!indirected_stream.read_ulong (temp))
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  kind = (CORBA::TCKind) temp;
-
-  return TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i (tc,
-						&indirected_stream,
-						kind,
-						alignment,
-						env);
-}
-
-// Given typecode bytes for a structure (or exception), figure out its
-// alignment and size; return size, alignment is an 'out' parameter.
-// Only "CORBA::tk_struct" (or "CORBA::tk_except") has been taken out of the stream
-// parameter holding the bytes.
-//
-// We use a one-pass algorithm, calculating size and inter-element
-// padding while recording the strongest alignment restriction.  Then
-// we correct the size to account for tail-padding.
-//
-// This routine recognizes that exceptions are just structs with some
-// additional information.  Different environments may differ in what
-// that additional information is, so this routine may need to be
-// taught about compiler-specific representation of that additional
-// "RTTI" data.
-
-size_t
-TAO_IIOP_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
-                                               size_t &alignment,
-                                               CORBA::Boolean is_exception,
-                                               CORBA::Environment &env)
-{
-  CORBA::ULong  members;
-  size_t size;
-
-  // Exceptions are like structs, with key additions (all of which
-  // might need to be be applied to structures!): vtable, typecode,
-  // and refcount.  The size must include these "hidden" members.
-  //
-  // NOTE: in environments with "true" C++ exceptions, there may need
-  // to be a slot for additional "RTTI" information; maybe it is part
-  // of the vtable, or maybe not.  Or, that information (needed to
-  // determine which 'catch' clauses apply) may only be provided by
-  // the compiler to the runtime support for the "throw" statement.
-
-  if (is_exception)
-    {
-      size = sizeof (CORBA::Exception);
-      alignment = TAO_IIOP_Interpreter::table_[CORBA::tk_TypeCode].alignment_;
-    }
-  else
-    {
-      alignment = 1;
-      size = 0;
-    }
-
-  // skip rest of header (type ID and name) and collect the number of
-  // struct members
-
-  if (!stream->skip_string ()
-      || !stream->skip_string ()
-      || !stream->read_ulong (members))
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // iterate over all the members, skipping their names and looking
-  // only at type data.
-
-  for ( ; members != 0; members--) {
-    size_t member_size;
-    size_t member_alignment;
-
-    // Skip name of the member.
-    if (!stream->skip_string ())
-      {
-        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-        return 0;
-      }
-
-    // Get size and alignment of the member, accounting for
-    // indirection and the various kinds of parameter encoding.
-
-    member_size = calc_nested_size_and_alignment (0,
-                                                  stream,
-                                                  member_alignment,
-                                                  env);
-    if (env.exception () != 0)
-      return 0;
-
-    // Round up the struct size to handle member alignment (by adding
-    // internal padding), then update the current size to handle the
-    // member's size.
-
-    size = (size_t) align_binary (size, member_alignment);
-    size += member_size;
-
-    // Finally update the overall structure alignment requirement, if
-    // this element must be more strongly aligned.
-
-    if (member_alignment > alignment)
-      alignment = member_alignment;
-  };
-
-  // Round up the structure size to match its overall alignment.  This
-  // adds tail padding, if needed.
-  return (size_t) align_binary (size, alignment);
-}
-
-// Calculate size and alignment for a structure.
-
-size_t
-TAO_IIOP_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
-                                    size_t &alignment,
-                                    CORBA::Environment &env)
-{
-  return calc_struct_and_except_attributes (stream,
-                                            alignment,
-                                            CORBA::B_FALSE,
-                                            env);
-}
-
-// Calculate size and alignment for an exception.
-
-size_t
-TAO_IIOP_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA::Environment &env)
-{
-  return calc_struct_and_except_attributes (stream,
-                                            alignment,
-                                            CORBA::B_TRUE,
-                                            env);
-}
-
-// Calculate and return sizes for both parts of a union, as needed by
-// other code.  Return value is the overall size.  The padded size of
-// the discriminant is needed to traverse the two values separately.
-// Unfortunately that is not quite practical to do with a single pass
-// over the typecode: the inter-element padding changes depending on
-// the strictest alignment required by _any_ arm of the union.
-
-size_t
-TAO_IIOP_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
-                                                 size_t &overall_alignment,
-                                                 size_t &discrim_size_with_pad,
-                                                 CORBA::Environment &env)
-{
-  CORBA::ULong members;
-  CORBA::ULong temp;
-  size_t discrim_size;
-  size_t value_alignment;
-  size_t value_size;
-
-  overall_alignment = value_alignment = 1;
-  value_size = discrim_size_with_pad = 0;
-
-  // Skip initial optional members (type ID and name).
-
-  if (!stream->skip_string ()                   // type ID
-      || !stream->skip_string ())
-    {   // typedef name
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Calculate discriminant size and alignment: it's the first member
-  // of the "struct" representing the union.  We detect illegal
-  // discriminant kinds a bit later.
-
-  CORBA::TypeCode discrim_tc (CORBA::tk_void);
-
-  discrim_size = calc_nested_size_and_alignment (&discrim_tc,
-                                                 stream,
-                                                 overall_alignment,
-                                                 env);
-  if (env.exception () != 0)
-    return 0;
-
-  // skip "default used" indicator, and save "member count"
-
-  if (!stream->read_ulong (temp)                 // default used
-      || !stream->read_ulong (members))
-    {   // member count
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // iterate over the tuples for all the members; all we care about is
-  // their types, which can affect either alignment or padding
-  // requirement for the union part of the construct.
-
-  for ( ; members != 0; members--) {
-    size_t member_size, member_alignment;
-
-    // Skip member label; its size varies with discriminant type, but
-    // here we don't care about its content.  This is where illegal
-    // discriminant kinds are detected.
-    //
-    // NOTE:  This modifies 94-9-32 Appendix A to stipulate that
-    // "long long" values are not legal as discriminants.
-
-    switch (discrim_tc.kind_)
-      {
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-      case CORBA::tk_wchar:
-        {
-          CORBA::Short s;
-
-          if (!stream->read_short (s))
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-        }
-      break;
-
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_enum:
-        {
-          CORBA::Long l;
-
-          if (!stream->read_long (l))
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-        }
-      break;
-
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-        {
-          CORBA::Char c;
-
-          if (!stream->read_char (c))
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-        }
-      break;
-
-      default:
-        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-        return 0;
-      }
-
-    // We also don't care about any member name.
-
-    if (!stream->skip_string ())
-      {
-        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-        return 0;
-      }
-
-    // Get the member size and alignment.
-
-    member_size = calc_nested_size_and_alignment (0,
-                                                  stream,
-                                                  member_alignment,
-                                                  env);
-    if (env.exception () != 0)
-      return 0;
-
-    // Save the largest member and alignment.  They don't need to be
-    // changed in sync -- e.g. "long double" size is larger than its
-    // alignment restriction on SPARC, x86, and some m68k platforms.
-    if (member_size > value_size)
-      value_size = member_size;
-    if (member_alignment > value_alignment)
-      value_alignment = member_alignment;
-  }
-
-  // Round up the discriminator's size to include padding it needs in
-  // order to be followed by the value.
-  discrim_size_with_pad = (size_t) align_binary (discrim_size,
-                                                 value_alignment);
-
-  // Now calculate the overall size of the structure, which is the
-  // discriminator, inter-element padding, value, and tail padding.
-  // We know all of those except tail padding, which is a function of
-  // the overall alignment.  (Ensures that arrays of these can be
-  // safely allocated and accessed!)
-
-  if (value_alignment > overall_alignment)
-    overall_alignment = value_alignment;
-
-  return (size_t) align_binary (discrim_size_with_pad + value_size,
-                                overall_alignment);
-}
-
-// Calculate size and alignment for a CORBA discriminated union.
-//
-// Note that this is really a two-element structure.  The first
-// element is the discriminator; the second is the value.  All normal
-// structure padding/alignment rules apply.  In particular, all arms
-// of the union have the same initial address (adequately aligned for
-// any of the members).
-
-size_t
-TAO_IIOP_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
-                                   size_t &alignment,
-                                   CORBA::Environment &env)
-{
-  size_t scratch;
-
-  return calc_key_union_attributes (stream, alignment, scratch, env);
-}
-
-// Calculate size and alignment for a typedeffed type.
-
-size_t
-TAO_IIOP_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
-                                   size_t &alignment,
-                                   CORBA::Environment &env)
-{
-  // Skip type ID and name in the parameter stream
-
-  if (!stream->skip_string ()                   // type ID
-      || !stream->skip_string ())               // typedef name
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // The typedef is identical to the type for which it stands.
-  return calc_nested_size_and_alignment (0, stream, alignment, env);
-}
-
-// Calculate size and alignment of an array.  (All such arrays are
-// described as single dimensional, even though the IDL definition may
-// specify a multidimensional array ... such arrays are treated as
-// nested single dimensional arrays.)
-
-size_t
-TAO_IIOP_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
-                                   size_t &alignment,
-                                   CORBA::Environment &env)
-{
-  size_t member_size;
-  CORBA::ULong member_count;
-
-  // get size and alignment of the array member
-
-  member_size = calc_nested_size_and_alignment (0, stream, alignment, env);
-  if (env.exception () != 0)
-    return 0;
-
-  // Get and check count of members.
-
-  if (stream->read_ulong (member_count) == CORBA::B_FALSE
-      || member_count > UINT_MAX)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Array size is a function only of member number and count
-  return member_size * (size_t) member_count;
-}
-
-// Cast the discriminant values to the right type and compare them.
-
-CORBA::Boolean
-TAO_IIOP_Interpreter::match_value (CORBA::TCKind kind,
-                         TAO_InputCDR *tc_stream,
-                         const void *value,
-                         CORBA::Environment &env)
-{
-  CORBA::Boolean retval = CORBA::B_FALSE;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      {
-        CORBA::UShort discrim;
-
-        if (tc_stream->read_ushort (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(CORBA::UShort *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-      {
-        CORBA::ULong discrim;
-
-        if (tc_stream->read_ulong (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(CORBA::ULong *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_enum:
-      {
-        CORBA::ULong discrim;
-
-        if (tc_stream->read_ulong (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(unsigned *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_boolean:
-      {
-        CORBA::Boolean discrim;
-
-        if (tc_stream->read_boolean (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(CORBA::Boolean *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_char:
-      {
-        CORBA::Char discrim;
-
-        if (tc_stream->read_char (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(CORBA::Char *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_wchar:
-      {
-        CORBA::WChar discrim;
-
-        if (tc_stream->read_wchar (discrim) != CORBA::B_FALSE)
-          retval = (discrim == *(CORBA::WChar *)value);
-        else
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    default:
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-    }
-
-  return retval;
-}
diff --git a/TAO/tao/IIOP_Interpreter.h b/TAO/tao/IIOP_Interpreter.h
deleted file mode 100644
index eaefd86f6c1..00000000000
--- a/TAO/tao/IIOP_Interpreter.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IIOP_Interpreter.h
-//
-// = DESCRIPTION
-//    Header file for TAO's IIOP interpreter.
-//
-// = AUTHOR
-//     Douglas C. Schmidt
-//
-// ============================================================================
-
-#if !defined (TAO_IIOP_INTERPRETER_H)
-#define TAO_IIOP_INTERPRETER_H
-
-// Useful typedefs.
-typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
-                                         size_t &alignment,
-                                         CORBA::Environment &env);
-typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *);
-
-class TAO_Export TAO_IIOP_Interpreter
-{
-  // = TITLE
-  //   TAO's CORBA TypeCode interpreter, which traverses GIOP/IIOP
-  //   data structures.
-  //
-  // = DESCRIPTION
-  //   This uses the standard C/C++ representation for data, and knows
-  //   how to do things like align and pad according to standard
-  //   rules.  It is driven by CDR marshaled representations of
-  //   TypeCodes.
-  //
-  //   It does two key things: (a) calculate size and alignment
-  //   restrictions for the data type described by any given typecode;
-  //   and (b) "visits" each element of a data type in the order those
-  //   elements are defined in the type's IDL definition.
-  //
-  //   A typical use is that some application-specific "visit"
-  //   function will be called with a typecode and data value.  Then
-  //   that "visit" function may choose to use the interpreter's
-  //   knowledge of the environment's size, padding, and alignment
-  //   rules to help it examine each of the constituents of complex
-  //   data values.  It does so by making a call to
-  //   <TypeCode::traverse>, and passing itself for future recursive
-  //   calls.
-  //
-  //   NOTE that this module has system dependent parts, and so should
-  //   be examined when porting to new CPU architectures, compilers,
-  //   and so forth to make sure it correctly implements the
-  //   appropriate binary interfaces.
-  //
-  //   Issues of concern are primarily that sizes and representations
-  //   of CORBA primitive data types are correct (key issues are
-  //   verified when the ORB initializes) and that the alignment rules
-  //   are recognized.
-  //
-  //   Also, exceptions have vtables in them, which may cause trouble
-  //   if they aren't located at the very beginning by the compiler in
-  //   question.
-  //
-  //   So for example, moving to another CPU architecture which still
-  //   uses standard sized two's complement integers and IEEE floating
-  //   point, and expects "natural" alignment, won't be hard.  Even
-  //   using PC style tightly packed data is simple; the alignment
-  //   rules are just simpler.  Most volume microprocessors used in
-  //   1995 are correctly supported.
-  //
-  //   Using data representations that are far from the standard C/C++
-  //   style data layout is probably not practical with this
-  //   implementation.  LISP systems, as one example, probably won't
-  //   use "in-memory" representations much like C/C++, even though
-  //   its "wire form" could directly match CDR.
-  //
-  //   ALSO, the treatment of exceptions may need to be examined in
-  //   language environments which actually rely on C++ exceptions.
-  //   The RTTI data that identifies exceptions can easily be ignored
-  //   by this interpreter (if it's taught about that compiler's RTTI)
-  //   but it may not be practical for any code not generated by that
-  //   specific C++ compiler to store such data in the right place to
-  //   look like a C++ exception, or to throw exceptions when that's
-  //   needed.  (RTTI == "Run Time Typing Information", needed to make
-  //   C++ exceptions work correctly and partially exposed to users by
-  //   the ANSI standards comittee.  It provides type-safe
-  //   "downcasting" and other features previously unavailable in
-  //   C++.)
-  //
-  //   THREADING NOTE: Data structures being traversed should only be
-  //   modified by the thread doing the traversal.  The interpretive
-  //   code itself is reentrant (recursive!) so presents no threading
-  //   issues; only the data being fed to the interpreter must be
-  //   protected against concurrency.
-public:
-  static void init_table (void);
-  // Initialize TAO's TypeCode table.
-
-  static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
-                                                TAO_InputCDR *original_stream,
-                                                size_t &alignment,
-                                                CORBA::Environment &env);
-  static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-						  TAO_InputCDR *stream,
-						  CORBA::TCKind kind,
-						  size_t &alignment,
-						  CORBA::Environment &env);
-  // For a given typecode, figure out its size and alignment needs.
-  // This version is used mostly when traversing other typecodes, and
-  // follows these rules:
-  //
-  // - Some typecodes are illegal (can't be nested inside others);
-  // - Indirections are allowed;
-  // - The whole typecode (including TCKind enum) is in the stream
-  //
-  // When the routine returns, the stream has skipped this TypeCode.
-  //
-  // "size" is returned, "alignment" is an 'out' parameter.  If it is
-  // non-null, "tc" is initialized to hold the contents of the TypeCode;
-  // it depends on the contents of the original stream to be valid.
-  //
-  // The _i routine encapsulates some common code for the case were an
-  // indirected TypeCode is in use.
-  //
-  // @@ explore splitting apart returning the size/alignment data and
-  // the TypeCode initialization; union traversal would benefit a bit,
-  // but it would need more than that to make it as speedy as struct
-  // traversal.
-
-  // = Static visitor methods.
-
-  // These methods manipulate CDR-encapsulated TypeCode parameter
-  // lists, calculating the size and alignment of the data type being
-  // described.  The TCKind value has always been removed from the CDR
-  // stream when these calculator routines get called.
-
-  static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream,
-                                                   size_t &alignment,
-                                                   CORBA::Boolean is_exception,
-                                                   CORBA::Environment &env);
-  // Given typecode bytes for a structure (or exception), figure out
-  // its alignment and size; return size, alignment is an 'out'
-  // parameter.  Only "CORBA::tk_struct" (or "CORBA::tk_except") has
-  // been taken out of the stream parameter holding the bytes.
-  //
-  // We use a one-pass algorithm, calculating size and inter-element
-  // padding while recording the strongest alignment restriction.
-  // Then we correct the size to account for tail-padding.
-  //
-  // This routine recognizes that exceptions are just structs with
-  // some additional information.  Different environments may differ
-  // in what that additional information is, so this routine may need
-  // to be taught about compiler-specific representation of that
-  // additional "RTTI" data.
-
-  static size_t calc_struct_attributes (TAO_InputCDR *stream,
-                                        size_t &alignment,
-                                        CORBA::Environment &env);
-  // Calculate size and alignment for a structure.
-
-
-  static size_t calc_exception_attributes (TAO_InputCDR *stream,
-                                           size_t &alignment,
-                                           CORBA::Environment &env);
-  // Calculate size and alignment for an exception.
-
-
-  static size_t calc_union_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA::Environment &env);
-  // Calculate size and alignment for a CORBA discriminated union.
-  //
-  // Note that this is really a two-element structure.  The first
-  // element is the discriminator; the second is the value.  All normal
-  // structure padding/alignment rules apply.  In particular, all arms
-  // of the union have the same initial address (adequately aligned for
-  // any of the members).
-
-
-  static size_t calc_alias_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA::Environment &env);
-  // Calculate size and alignment for a typedeffed type.
-
-  static size_t calc_array_attributes (TAO_InputCDR *stream,
-                                       size_t &alignment,
-                                       CORBA::Environment &env);
-  // Calculate size and alignment of an array.  (All such arrays are
-  // described as single dimensional, even though the IDL definition
-  // may specify a multidimensional array ... such arrays are treated
-  // as nested single dimensional arrays.)
-
-  static CORBA::Boolean match_value (CORBA::TCKind kind,
-                                     TAO_InputCDR *tc_stream,
-                                     const void *value,
-                                     CORBA::Environment &env);
-  // Cast the discriminant values to the right type and compare them.
-
-  static size_t
-  calc_key_union_attributes (TAO_InputCDR *stream,
-                             size_t &overall_alignment,
-                             size_t &discrim_size_with_pad,
-                             CORBA::Environment &env);
-
-  // = Utility routines that skip unneeded parameter lists.
-  static CORBA::Boolean skip_encapsulation (TAO_InputCDR *stream);
-  static CORBA::Boolean skip_long (TAO_InputCDR *stream);
-
-  struct Table_Element
-  {
-    size_t size_;
-    size_t alignment_;
-    TAO_attribute_calculator *calc_;
-    TAO_param_skip_rtn *skipper_;
-  };
-
-  static Table_Element table_[CORBA::TC_KIND_COUNT];
-  // Table supporting calculation of size and alignment requirements
-  // for any one instance of a given data types.
-  //
-  // This is indexed via CDR's TCKind values, which are "frozen" as
-  // part of the CDR standard.  Entries hold either the size and
-  // alignment values for that data type, or a pointer to a function
-  // that is used to calculate those values.  Function pointers are
-  // normally needed only for constructed types.
-  //
-  // A "skipper" routine is provided for some data types whose size is
-  // known statically (e.g. objrefs, structures, strings) but whose
-  // typecodes have parameters that sometimes need to be ignored when
-  // found in a CDR stream.  Any attribute calculator routine always
-  // skips parameters in the CDR input stream, so no type with such a
-  // routine also needs a "skipper".
-  //
-  // Rather than growing a set of processor-specific #ifdefs, we
-  // calculate most of this table (except functions) at ORB
-  // initialization time.
-};
-
-#endif /* TAO_IIOP_INTERPRETER_H */
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp
deleted file mode 100644
index cb8198c270d..00000000000
--- a/TAO/tao/IIOP_ORB.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-// $Id$
-//
-// @(#)iioporb.cpp      1.8 95/09/19
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// IIOP:                ORB pseudo-object
-//
-// This includes objref stringification/destringification for IIOP
-// object references.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_ORB.i"
-#endif /* ! __ACE_INLINE__ */
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-// Objref stringification.
-
-CORBA::String
-IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
-                            CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Application writer controls what kind of objref strings they get,
-  // maybe along with other things, by how they initialize the ORB.
-
-  if (use_omg_ior_format_)
-    {
-      // By default, orbs use IOR strings; these are ugly (and error
-      // prone) but specified by CORBA.
-      //
-      // XXX there should be a simple way to reuse this code in other
-      // ORB implementations ...
-
-      // @@ Is BUFSIZ the right size here?
-      char buf [BUFSIZ];
-      TAO_OutputCDR cdr (buf, sizeof buf, TAO_ENCAP_BYTE_ORDER);
-
-      // support limited oref ACE_OS::strcmp.
-      (void) ACE_OS::memset (buf, 0, BUFSIZ);
-
-      // Marshal the objref into an encapsulation bytestream.
-      (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if (cdr.encode (CORBA::_tc_Object,
-                        &obj, 0,
-                        env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-
-      // Now hexify the encapsulated CDR data into a string, and
-      // return that string.
-
-      CORBA::String cp;
-      size_t len = cdr.length ();
-
-      CORBA::String string = CORBA::string_alloc (sizeof ior_prefix + 2 * len);
-
-      ACE_OS::strcpy ((char *) string, ior_prefix);
-
-      const char* bytes = cdr.buffer ();
-
-      for (cp = (CORBA::String) ACE_OS::strchr ((char *) string, ':') + 1;
-           len--;
-           bytes++)
-        {
-          *cp++ = ACE::nibble2hex ((*bytes) >> 4);
-          *cp++ = ACE::nibble2hex (*bytes);
-        }
-
-      *cp = 0;
-      if (this->optimize_collocation_objects_)
-        {
-          IIOP_Object *iiopobj;
-          if (obj->QueryInterface (IID_IIOP_Object, (void **) &iiopobj) != TAO_NOERROR)
-            {
-              env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-              return 0;
-            }
-          this->_register_collocation (iiopobj->profile.object_addr ());
-        }
-      return string;
-    }
-  else
-    {
-      // The "internet" ORB uses readable URL style objrefs, as used
-      // in the World Wide Web.
-      //
-      // NOTE: the version ID in the string is ugly but we can't
-      // realistically eliminate it by any "assume 1.0" strategy...
-      // Similarly with the port, because there's no single IIOP port
-      // to which we could default.
-
-      static const char digits [] = "0123456789";
-
-      // This only works for IIOP objrefs.  If we're handed an objref
-      // that's not an IIOP objref, fail -- application must use an
-      // ORB that's configured differently.
-
-      IIOP_Object *obj2;
-
-      if (obj->QueryInterface (IID_IIOP_Object,
-                               (void **) &obj2) != TAO_NOERROR)
-        {
-          env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      if (!obj2)                        // null?
-        return CORBA::string_copy ((CORBA::String) iiop_prefix);
-
-      CORBA::String_var key;
-      TAO_POA::encode_sequence_to_string (key.inout(),
-                                          obj2->profile.object_key);
-
-      u_int buflen = (ACE_OS::strlen (iiop_prefix) +
-                      1 /* major # */ + 1 /* minor # */ +
-                      2 /* double-slash separator */ +
-                      ACE_OS::strlen (obj2->profile.host) +
-                      1 /* colon separator */ +
-                      5 /* port number */ +
-                      1 /* slash separator */ +
-                      ACE_OS::strlen (key) +
-                      1 /* zero terminator */);
-      CORBA::String buf = CORBA::string_alloc (buflen);
-
-      ACE_OS::sprintf (buf, "%s%c.%c//%s:%d/%s", iiop_prefix,
-                       digits [obj2->profile.iiop_version.major],
-                       digits [obj2->profile.iiop_version.minor],
-                       obj2->profile.host, obj2->profile.port,
-                       key.in ());
-
-      this->_register_collocation (obj2->profile.object_addr ());
-      return buf;
-    }
-}
-
-// Destringify OMG-specified "IOR" string.
-//
-// XXX there should be a simple way to reuse this code in other ORB
-// implementations ...
-
-static CORBA::Object_ptr
-ior_string_to_object (CORBA::String str,
-                      CORBA::Environment &env)
-{
-  // Unhex the bytes, and make a CDR deencapsulation stream from the
-  // resulting data.
-
-  size_t bufsize =
-    1 + ACE_OS::strlen ((char *) str) / 2 + CDR::MAX_ALIGNMENT;
-  char *non_aligned_buffer;
-  ACE_NEW_RETURN (non_aligned_buffer,
-                  char [bufsize],
-                  CORBA_Object::_nil ());
-  char *buffer = ptr_align_binary (non_aligned_buffer, CDR::MAX_ALIGNMENT);
-
-  char *tmp = (char *) str;
-  size_t len = 0;
-
-  while (tmp [0] && tmp [1])
-    {
-      u_char byte;
-
-      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
-        break;
-
-      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
-      byte |= ACE::hex2byte (tmp [1]);
-
-      buffer [len++] = byte;
-      tmp += 2;
-    }
-
-  if (tmp [0] && !isspace (tmp [0]))
-    {
-      delete [] non_aligned_buffer;
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Create deencapsulation stream ... then unmarshal objref from that
-  // stream.
-
-  TAO_InputCDR stream (buffer + 1, len - 1, buffer[0]);
-
-  CORBA::Object_ptr objref;
-  if (stream.decode (CORBA::_tc_Object,
-		     &objref, 0,
-		     env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    objref = 0;
-
-  delete [] non_aligned_buffer;
-  return objref;
-}
-
-// Destringify URL style IIOP objref.
-
-static CORBA::Object_ptr
-iiop_string_to_object (CORBA::String string,
-                       CORBA::Environment &env)
-{
-  // NIL objref encodes as just "iiop:" ... which has already been
-  // removed, so we see it as an empty string.
-
-  if (!string || !*string)
-    return 0;
-
-  // type ID not encoded in this string ... makes narrowing rather
-  // expensive, though it does ensure that type-safe narrowing code
-  // gets thoroughly excercised/debugged!  Without a typeID, the
-  // _narrow will be required to make an expensive remote "is_a" call.
-
-  IIOP_Object *data;
-
-  // null type ID.
-  ACE_NEW_RETURN (data, IIOP_Object ((char *) 0), 0);
-
-  // Remove the "N.N//" prefix, and verify the version's one
-  // that we accept
-
-  if (isdigit (string [0]) && isdigit (string [2]) && string [1] == '.'
-      && string [3] == '/' && string [4] == '/')
-    {
-      data->profile.iiop_version.major = (char) (string [0] - '0');
-      data->profile.iiop_version.minor = (char) (string [2] - '0');
-      string += 5;
-    }
-  else
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  if (data->profile.iiop_version.major != IIOP::MY_MAJOR
-      || data->profile.iiop_version.minor > IIOP::MY_MINOR)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  // Pull off the "hostname:port/" part of the objref
-
-  char *cp = ACE_OS::strchr (string, ':');
-  if (cp == 0)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  data->profile.host = CORBA::string_alloc (1 + cp - string);
-  for (cp = data->profile.host;
-       *string != ':';
-       *cp++ = *string++)
-    continue;
-
-  *cp = 0;
-  string++;
-
-  cp = ACE_OS::strchr ((char *) string, '/');
-
-  if (cp == 0)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      CORBA::string_free (data->profile.host);
-      data->profile.host = 0;
-      data->Release ();
-      return 0;
-    }
-
-  data->profile.port = (short) ACE_OS::atoi ((char *) string);
-  data->profile.object_addr (0);
-  string = ++cp;
-
-  // Parse the object key
-  TAO_POA::decode_string_to_sequence (data->profile.object_key,
-                                      string);
-
-  // Create the CORBA level proxy.
-  TAO_ServantBase *servant =
-    TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (data);
-
-  CORBA_Object *obj = new CORBA_Object (data, servant, servant != 0);
-
-  // Clean up in case of error
-  if (obj == 0)
-    data->Release ();
-
-  return obj;
-}
-
-// Destringify arbitrary objrefs.
-
-CORBA::Object_ptr
-IIOP_ORB::string_to_object (CORBA::String str,
-                            CORBA::Environment &env)
-{
-  env.clear ();
-
-  CORBA::Object_ptr obj = 0;
-
-  // Use the prefix code to choose which destringify algorithm to use.
-  if (ACE_OS::strncmp ((char *)str,
-                       iiop_prefix, sizeof iiop_prefix - 1) == 0)
-    obj = iiop_string_to_object (str + sizeof iiop_prefix - 1, env);
-
-  else if (ACE_OS::strncmp ((char *)str,
-                            ior_prefix,
-                            sizeof ior_prefix - 1) == 0)
-    obj = ior_string_to_object (str + sizeof ior_prefix - 1, env);
-
-  // Return the object
-  return obj;
-}
-
-int
-IIOP_ORB::_register_collocation (ACE_Addr &addr)
-{
-  if (this->optimize_collocation_objects_)
-    {
-      ACE_INET_Addr& ia =
-	ACE_reinterpret_cast (ACE_INET_Addr&, addr);
-
-#if 0
-      ACE_DEBUG ((LM_DEBUG,
-		  "IIOP_ORB: register collocation addr <%s:%d>\n",
-		  ia.get_host_name(),
-		  ia.get_port_number()));
-#endif
-      return this->collocation_record_.insert (ia);
-    }
-  return 0;
-}
-
-TAO_ServantBase *
-IIOP_ORB::_get_collocated_servant (STUB_Object *sobj)
-{
-  // ACE_DEBUG ((LM_DEBUG, "IIOP_ORB: get_collocated_servant\n"));
-
-  if (this->optimize_collocation_objects_ && sobj != 0)
-    {
-      IIOP_Object *iiopobj;
-      // Make sure users passed in an IIOP_Object otherwise, we don't
-      // know what to do next.
-      if (sobj->QueryInterface (IID_IIOP_Object, (void **) &iiopobj) != TAO_NOERROR)
-        {
-#if 0
-          ACE_ERROR ((LM_ERROR,
-		      "%p: Passing IIOP ORB and non-IIOP object\n",
-		      "_get_collocated_object"));
-#endif
-	  // Something must be wrong!
-          return 0;
-        }
-#if 0
-      ACE_DEBUG ((LM_DEBUG,
-		  "IIOP_ORB: checking collocation for <%s:%d>\n",
-		  iiopobj->profile.object_addr().get_host_name(),
-		  iiopobj->profile.object_addr().get_port_number()));
-#endif
-
-      // Check if the object requested is a collocated object.
-      if (this->collocation_record_.find (iiopobj->profile.object_addr ()) == 0)
-        {
-          CORBA::Environment env;
-          TAO_ObjectKey_var objkey = iiopobj->key (env);
-
-#if 0
-	  ACE_DEBUG ((LM_DEBUG,
-		      "IIOP_ORB: the addr is collocated <%s:%d>\n",
-		      iiopobj->profile.object_addr().get_host_name(),
-		      iiopobj->profile.object_addr().get_port_number()));
-#endif
-
-          if (env.exception ())
-            {
-#if 0
-	      ACE_DEBUG ((LM_DEBUG,
-			  "IIOP_ORB: cannot find key for <%s:%d>\n",
-			  iiopobj->profile.object_addr().get_host_name(),
-			  iiopobj->profile.object_addr().get_port_number()));
-#endif
-              return 0;
-            }
-          TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-
-          if (poa != 0)
-            {
-              PortableServer::Servant servant =
-		poa->find_servant (objkey.in (), env);
-              if (env.exception ())
-                {
-#if 0
-		  ACE_DEBUG ((LM_DEBUG,
-			      "IIOP_ORB: cannot find servant for <%s:%d>\n",
-			      iiopobj->profile.object_addr().get_host_name(),
-			      iiopobj->profile.object_addr().get_port_number()));
-#endif
-                  return 0;
-                }
-
-#if 0
-	      ACE_DEBUG ((LM_DEBUG,
-			  "IIOP_ORB: object at <%s:%d> is collocated\n",
-			  iiopobj->profile.object_addr().get_host_name(),
-			  iiopobj->profile.object_addr().get_port_number()));
-#endif
-              return servant;
-            }
-#if 0
-	  ACE_DEBUG ((LM_DEBUG,
-		      "IIOP_ORB: cannot find poa for <%s:%d>\n",
-		      iiopobj->profile.object_addr().get_host_name(),
-		      iiopobj->profile.object_addr().get_port_number()));
-#endif
-        }
-    }
-
-#if 0
-  ACE_DEBUG ((LM_DEBUG,
-	      "IIOP_ORB: collocation failed for \n"));
-#endif
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Unbounded_Set<ACE_INET_Addr>;
-template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Unbounded_Set<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_INET_Addr>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h
deleted file mode 100644
index 30614874264..00000000000
--- a/TAO/tao/IIOP_ORB.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    iiopobj.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_IIOPORB_H)
-#  define TAO_IIOPORB_H
-
-#include "tao/corba.h"
-
-// ORB pseudo-objref
-
-class TAO_Export IIOP_ORB : public CORBA_ORB
-{
-  // = TITLE
-  //    Bridge implementation of <IIOP_ORB>.
-  //
-  // = DESCRIPTION
-  //    This is one of the two main hooks into IIOP in this C/C++
-  //    based implementation; the other being <IIOP_Object>.
-public:
-  IIOP_ORB (void);
-  // constructor
-
-  ~IIOP_ORB (void);
-  // destructor
-
-  CORBA::Object_ptr string_to_object (CORBA::String str,
-                                      CORBA::Environment &env);
-  // Get an object reference from the IOR string.
-
-  CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                  CORBA::Environment &env);
-  // Convert an object reference to an IOR stringified form.
-
-  int _register_collocation (ACE_Addr &addr);
-  // Register a "collocation."  This method takes a pointer to an
-  // ACE_INET_Addr and records the location into an Unbounded_Set.
-  // Returns 0 if succeeds, -1 if recording fails, 1 if the location
-  // is already in the set.
-
-  TAO_ServantBase *_get_collocated_servant (STUB_Object *sobj);
-  // Return the object pointer of an collocated object it there is
-  // one, otherwise, return 0.
-
-  // = ACCESSORS
-  void _use_omg_ior_format (CORBA::Boolean ior);
-  // Set the IOR flag.
-  CORBA::Boolean _use_omg_ior_format (void);
-  // Get the IOR flag.
-
-  void _optimize_collocation_objects (CORBA::Boolean opt);
-  // Set collocation optimization status.
-  CORBA::Boolean _optimize_collocation_objects (void);
-  // Get collocation optimization status.
-
-private:
-  CORBA::Boolean use_omg_ior_format_;
-  // Decides whether to use the URL notation or to use IOR notation.
-
-  CORBA::Boolean optimize_collocation_objects_;
-  // Decides whether to use the URL notation or to use IOR notation.
-
-  ACE_Unbounded_Set<ACE_INET_Addr> collocation_record_;
-
-  // = These are not provided.
-  IIOP_ORB (const IIOP_ORB &);
-  IIOP_ORB &operator = (const IIOP_ORB &);
-};
-
-typedef IIOP_ORB *IIOP_ORB_ptr;
-
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_ORB.i"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* TAO_IIOPORB_H */
diff --git a/TAO/tao/IIOP_ORB.i b/TAO/tao/IIOP_ORB.i
deleted file mode 100644
index 3f04414db0f..00000000000
--- a/TAO/tao/IIOP_ORB.i
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-ACE_INLINE
-IIOP_ORB::IIOP_ORB(void)
-  : use_omg_ior_format_(CORBA::B_FALSE),
-    optimize_collocation_objects_ (CORBA::B_TRUE)
-{
-}
-
-ACE_INLINE
-IIOP_ORB::~IIOP_ORB(void)
-{
-}
-
-
-ACE_INLINE void
-IIOP_ORB::_use_omg_ior_format (CORBA::Boolean ior)
-{
-  use_omg_ior_format_ = ior;
-}
-
-ACE_INLINE CORBA::Boolean
-IIOP_ORB::_use_omg_ior_format (void)
-{
-  return use_omg_ior_format_;
-}
-
-ACE_INLINE void
-IIOP_ORB::_optimize_collocation_objects (CORBA::Boolean opt)
-{
-  optimize_collocation_objects_ = opt;
-}
-
-ACE_INLINE CORBA::Boolean
-IIOP_ORB::_optimize_collocation_objects (void)
-{
-  return optimize_collocation_objects_;
-}
diff --git a/TAO/tao/IIOP_Object.cpp b/TAO/tao/IIOP_Object.cpp
deleted file mode 100644
index 6066b2cf140..00000000000
--- a/TAO/tao/IIOP_Object.cpp
+++ /dev/null
@@ -1,732 +0,0 @@
-// $Id$
-
-// @ (#)iiopobj.cpp     1.9 95/11/04
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// IIOP Bridge:         CORBA::Object operations
-//
-// Some CORBA::Object and other operations are specific to this IIOP
-// based implementation, and can neither be used by other kinds of
-// objref nor have a default implementation.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_Object.i"
-#endif /* ! __ACE_INLINE__ */
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const ACE_INET_Addr *addr)
-{
-  this->iiop_version.major = IIOP::MY_MAJOR;
-  this->iiop_version.minor = IIOP::MY_MINOR;
-
-  if (this->host)
-    {
-      delete [] this->host;
-      this->host = 0;
-    }
-
-  this->port = p;
-
-  if (h)
-    {
-      ACE_NEW_RETURN (this->host,
-                      char[ACE_OS::strlen(h) + 1],
-                      -1);
-      ACE_OS::strcpy (this->host, h);
-    }
-
-  this->object_addr (addr);
-  return 0;
-}
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const char *key,
-                    const ACE_INET_Addr *addr)
-{
-  if (key == 0)
-    return -1;
-
-  if (this->set (h, p, addr) == -1)
-    return -1;
-
-  int l = ACE_OS::strlen (key);
-  this->object_key.length (l);
-
-  for (int i = 0; i < l; ++i)
-    this->object_key[i] = key[i];
-
-  return 0;
-}
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const TAO_opaque &key,
-                    const ACE_INET_Addr *addr)
-{
-  if (this->set (h, p, addr) == -1)
-    return -1;
-
-  this->object_key = key;
-
-  return 0;
-}
-
-IIOP::Profile::Profile (const IIOP::Profile &src)
-  : host (0)
-{
-  (void) this->set (src.host,
-                    src.port,
-                    src.object_key,
-                    &src.object_addr_);
-}
-
-int
-IIOP::Profile::set (const ACE_INET_Addr &addr,
-                    const char *key)
-{
-  // Set up an IIOP Profile to hold the host name.
-
-  if (addr.get_ip_address () == INADDR_ANY)
-    {
-      // Special case.
-      char temphost[MAXHOSTNAMELEN + 1];
-      if (addr.get_host_name (temphost, sizeof(temphost)) != 0)
-        return -1;
-      else
-        return this->set (temphost,
-                          addr.get_port_number (),
-                          key,
-                          &addr);
-    }
-  else
-    {
-      const char *tempaddr = addr.get_host_name ();
-      if (tempaddr == 0)
-        return -1;
-      else
-        return this->set (tempaddr,
-                          addr.get_port_number (),
-                          key,
-                          &addr);
-    }
-}
-
-int
-IIOP::Profile::set (const ACE_INET_Addr &addr,
-                    const TAO_opaque &key)
-{
-  // Set up an IIOP Profile to hold the host name.
-
-  if (addr.get_ip_address () == INADDR_ANY)
-    {
-      // Special case.
-      char temphost[MAXHOSTNAMELEN + 1];
-      if (addr.get_host_name (temphost, sizeof(temphost)) != 0)
-        return -1;
-      else
-        return this->set (temphost,
-                          addr.get_port_number (),
-                          key,
-                          &addr);
-    }
-  else
-    {
-      const char *tempaddr = addr.get_host_name ();
-      if (tempaddr == 0)
-        return -1;
-      else
-        return this->set (tempaddr,
-                          addr.get_port_number (),
-                          key,
-                          &addr);
-    }
-}
-
-IIOP::Profile::Profile (const char *h,
-                        const CORBA::UShort p,
-                        const char *key)
-  : host (0)
-{
-  (void) this->set (h, p, key);
-}
-
-IIOP::Profile::Profile (const char *h,
-                        const CORBA::UShort p,
-                        const char *key,
-                        const ACE_INET_Addr &addr)
-  : host (0)
-{
-  (void) this->set (h, p, key, &addr);
-}
-
-IIOP::Profile::Profile (const ACE_INET_Addr &addr,
-                        const char *key)
-  : host (0)
-{
-  (void) this->set (addr, key);
-}
-
-IIOP::Profile::Profile (const ACE_INET_Addr &addr,
-                        const TAO_opaque &key)
-  : host (0)
-{
-  (void) this->set (addr, key);
-}
-
-// Quick'n'dirty hash of objref data, for partitioning objrefs into
-// sets.
-//
-// NOTE that this must NOT go across the network!
-
-CORBA::ULong
-IIOP_Object::hash (CORBA::ULong max,
-                   CORBA::Environment &env)
-{
-  CORBA::ULong hashval;
-
-  env.clear ();
-
-  // Just grab a bunch of convenient bytes and hash them; could do
-  // more (hostname, full key, exponential hashing) but no real need
-  // to do so except if performance requires a more costly hash.
-
-  hashval = profile.object_key.length () * profile.port;
-  hashval += profile.iiop_version.minor;
-
-  if (profile.object_key.length () >= 4)
-    {
-      hashval += profile.object_key [1];
-      hashval += profile.object_key [3];
-    }
-
-  return hashval % max;
-}
-
-int operator==(const TAO_opaque& rhs,
-               const TAO_opaque& lhs)
-{
-  if (rhs.length () != lhs.length ())
-    return 0;
-
-  for (CORBA::ULong i = 0;
-       i < rhs.length ();
-       ++i)
-    if (rhs[i] != lhs[i])
-      return 0;
-
-  return 1;
-}
-
-// Expensive comparison of objref data, to see if two objrefs
-// certainly point at the same object. (It's quite OK for this to
-// return FALSE, and yet have the two objrefs really point to the same
-// object.)
-//
-// NOTE that this must NOT go across the network!
-
-CORBA::Boolean
-IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj,
-                            CORBA::Environment &env)
-{
-  IIOP::Profile *body, *body2;
-  IIOP_Object *other_iiop_obj;
-
-  env.clear ();
-
-  if (CORBA::is_nil (other_obj) == CORBA::B_TRUE
-      || other_obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &other_iiop_obj) != TAO_NOERROR)
-    return CORBA::B_FALSE;
-  CORBA::release (other_obj);
-
-  // Compare all the bytes of the object address -- must be the same.
-
-  body = &profile;
-  body2 = &other_iiop_obj->profile;
-
-  ACE_ASSERT (body->object_key.length () < UINT_MAX);
-
-  return body->object_key == body2->object_key
-    && body->port == body2->port
-    && ACE_OS::strcmp (body->host, body2->host) == 0
-    && body->iiop_version.minor == body2->iiop_version.minor
-    && body->iiop_version.major == body2->iiop_version.major;
-}
-
-// For COM -- IUnknown operations
-
-// {A201E4C3-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_IIOP_Object,
-0xa201e4c3, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG
-IIOP_Object::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->IUnknown_lock_, 0));
-
-  return ++this->refcount_;
-}
-
-ULONG
-IIOP_Object::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->IUnknown_lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--this->refcount_ > 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// Note that (as of this writing) this is the only place all the
-// interfaces to an "objref" come together:
-//
-// IUnknown ... this one
-// STUB_OBJECT ... inherited by this one
-// IIOP_OBJECT ... this one
-//
-TAO_HRESULT
-IIOP_Object::QueryInterface (REFIID riid,
-                             void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_IIOP_Object == riid
-      || IID_STUB_Object == riid
-      || IID_TAO_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return TAO_ResultFromScode (TAO_E_NOINTERFACE);
-
- (void) AddRef ();
-  return TAO_NOERROR;
-}
-
-// TAO extensions
-TAO_ObjectKey*
-IIOP_Object::key (CORBA::Environment &)
-{
-  return new TAO_ObjectKey (this->profile.object_key);
-}
-
-// It will usually be used by the _bind call.
-//
-// Note that if the repository ID (typeID) is NULL, it will make
-// narrowing rather expensive, though it does ensure that type-safe
-// narrowing code gets thoroughly exercised/debugged!  Without a
-// typeID, the _narrow will be required to make an expensive remote
-// "is_a" call.
-
-IIOP_Object::IIOP_Object (const char *host,
-                          const CORBA::UShort port,
-                          const char *objkey,
-                          char *repository_id)
-  : STUB_Object (repository_id),
-    profile (host, port, objkey),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
-
-// Constructor.  It will usually be used by the server side.
-IIOP_Object::IIOP_Object (char *repository_id,
-                          const ACE_INET_Addr &addr,
-                          const char *objkey)
-  : STUB_Object (repository_id),
-    profile (addr, objkey),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
-
-// THREADING NOTE: Code below this point is of course thread-safe (at
-// least on supported threaded platforms), so the caller of these
-// routines need only ensure that the data being passed in is not
-// being modified by any other thread.
-//
-// As an _experiment_ (to estimate the performance cost) remote calls
-// are currently deemed "cancel-safe".  That means that they can be
-// called by threads when they're in asynchronous cancellation mode.
-// The only effective way to do this is to disable async cancellation
-// for the duration of the call.  There are numerous rude interactions
-// with code generators for C++ ... cancellation handlers just do
-// normal stack unwinding like exceptions, but exceptions are purely
-// synchronous and sophisticated code generators rely on that to
-// generate better code, which in some cases may be very hard to
-// unwind.
-
-class TAO_Synchronous_Cancellation_Required
-  // = TITLE
-  //     Stick one of these at the beginning of a block that can't
-  //     support asynchronous cancellation, and which must be
-  //     cancel-safe.
-  //
-  // = EXAMPLE
-  //     somefunc()
-  //     {
-  //       TAO_Synchronous_Cancellation_Required NOT_USED;
-  //       ...
-  //     }
-{
-public:
-  // These should probably be in a separate inline file, but they're
-  // only used within this one file right now, and we always want them
-  // inlined, so here they sit.
-  TAO_Synchronous_Cancellation_Required (void)
-    : old_type_ (0)
-    {
-#if !defined (VXWORKS)
-      ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_);
-#endif /* ! VXWORKS */
-    }
-
-  ~TAO_Synchronous_Cancellation_Required (void)
-    {
-#if !defined (VXWORKS)
-      int dont_care;
-      ACE_OS::thr_setcanceltype(old_type_, &dont_care);
-#endif /* ! VXWORKS */
-    }
-private:
-  int old_type_;
-};
-
-// "Stub interpreter" for static stubs.  IDL compiler (or human
-// equivalent thereof :-) should just dump a read-only description of
-// the call into "calldata" and do varargs calls to this routine,
-// which does all the work.
-
-void
-IIOP_Object::do_static_call (CORBA::Environment &env,   // exception reporting
-                             const TAO_Call_Data *info, // call description
-                             ...)                       // ... any parameters
-
-{
-  TAO_Synchronous_Cancellation_Required NOT_USED;
-
-  TAO_GIOP_Invocation call (this,
-                            info->opname,
-                            info->is_roundtrip);
-
-  // We may need to loop through here more than once if we're
-  // forwarded to some other object reference.
-  //
-  // NOTE: A quality-of-service policy may be useful to establish
-  // here, specifically one controlling how many times the call is
-  // reissued before failing the call on the assumption that something
-  // is broken.
-  //
-  // NOTE: something missing is a dynamic way to change the policy of
-  // whether to issue LocateRequest messages or not.  This code uses a
-  // simple, fixed policy: never use LocateRequest messages.
-  //
-  for (;;)
-    {
-      // Start the call by constructing the request message header.
-
-      env.clear ();
-      call.start (env);
-
-      if (env.exception ())
-        {
-          dexc (env, "do_static_call, start request message");
-          return;
-        }
-
-      // Now, put all "in" and "inout" parameters into the request
-      // message body.
-      //
-      // Some "inout" data have an extra level of indirection,
-      // specified by the language mapping's memory allocation
-      // policies ... the indirection only shows up here when it's
-      // needed later for allocating "out" memory, otherwise there's
-      // just one indirection.
-
-      u_int i;
-      const TAO_Param_Data *pdp;
-      va_list param_vector;
-
-      va_start (param_vector, info);
-
-      for (i = 0, pdp = info->params;
-           i < info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = va_arg (param_vector, void *);
-
-          if (pdp->mode == PARAM_IN)
-            call.put_param (pdp->tc, ptr, env);
-          else if (pdp->mode == PARAM_INOUT)
-            {
-              if (pdp->value_size == 0)
-                call.put_param (pdp->tc, ptr, env);
-              else
-                call.put_param (pdp->tc, *(void **)ptr, env);
-            }
-
-          if (env.exception ())
-            {
-              dexc (env, "do_static_call, put request parameter");
-              return;
-            }
-        }
-      va_end (param_vector);
-
-      // Make the call ... blocking for response if needed.  Note that
-      // "oneway" calls can't return any exceptions except system
-      // ones.
-
-      TAO_GIOP_ReplyStatusType status;
-      CORBA::ExceptionList exceptions;
-
-      exceptions.length = exceptions.maximum = info->except_count;
-      exceptions.buffer = (CORBA::TypeCode_ptr *) info->excepts;
-
-      status = call.invoke (exceptions, env);
-
-      exceptions.buffer = 0;            // don't free it
-
-      if (env.exception ())
-        {
-          dexc (env, "do_static_call, invoke");
-          return;
-        }
-      if (!info->is_roundtrip
-          || status == TAO_GIOP_SYSTEM_EXCEPTION
-          || status == TAO_GIOP_USER_EXCEPTION)
-        return;
-
-      // Now, get all the "return", "out", and "inout" parameters from
-      // the response message body.
-
-      if (status == TAO_GIOP_NO_EXCEPTION)
-        {
-          va_start (param_vector, info);
-          for (i = 0, pdp = info->params;
-               i < info->param_count;
-               i++, pdp++)
-            {
-              void *ptr = va_arg (param_vector, void *);
-
-              // if it is an inout parameter, it would become necessary to
-              // first release the "in" memory
-              if (pdp->mode == PARAM_INOUT)
-                {
-                  // @@ - add others as we test each case
-                  // (ASG) will do 03/22/98.
-                  switch (pdp->tc->kind (env))
-                    {
-                    case CORBA::tk_string:
-                      {
-                        CORBA::string_free (*(char **)ptr);
-                        *(char **)ptr = 0;
-                      }
-                      break;
-                    default:
-                      break;
-                    }
-                }
-              if (pdp->mode == PARAM_RETURN
-                  || pdp->mode == PARAM_OUT
-                  || pdp->mode == PARAM_INOUT)
-                {
-                  // The language mapping's memory allocation policy
-                  // says that some data is heap-allocated.  This
-                  // interpreter is told about the relevant policy by
-                  // whoever built the operation description (e.g. the
-                  // IDL compiler) so it doesn't have to know the
-                  // policy associated with a particular language
-                  // binding (e.g. C/C++ differ, and C++ even has
-                  // different policies for different kinds of
-                  // structures).
-                  if (pdp->value_size == 0)
-                    call.get_value (pdp->tc, ptr, env);
-                  else
-                    {
-                      // assert (value_size == tc->size());
-                      *(void **)ptr = new CORBA::Octet [pdp->value_size];
-                      call.get_value (pdp->tc, *(void **)ptr, env);
-                    }
-
-                  if (env.exception ())
-                    {
-                      dexc (env, "do_static_call, get reply parameter");
-                      return;
-                    }
-                }
-            }
-          va_end (param_vector);
-          return;
-        }
-
-      // ... or maybe this request got forwarded to someplace else; send
-      // the request there instead.
-      assert (status == TAO_GIOP_LOCATION_FORWARD);
-    }
-}
-
-// DII analogue of the above.  Differs in how the vararg calling
-// convention is implemented -- DII doesn't use the normal call stack
-// with its implicit typing, but iinstead uses heap-based arguments
-// with explicit typing.
-
-void
-IIOP_Object::do_dynamic_call (const char *opname,               // operation name
-                              CORBA::Boolean is_roundtrip,      // results required?
-                              CORBA::NVList_ptr args,           // parameters
-                              CORBA::NamedValue_ptr result,     // result
-                              CORBA::Flags flags,               // per-call flag (one!)
-                              CORBA::ExceptionList &exceptions, // possible user exceptions
-                              CORBA::Environment &env)          // exception reporting
-{
-  TAO_Synchronous_Cancellation_Required NOT_USED;
-
-  TAO_GIOP_Invocation call (this, opname, is_roundtrip);
-
-  // Loop as needed for forwarding; see above.
-
-  for (;;)
-    {
-      // Start the call by constructing the request message header.
-      env.clear ();
-      call.start (env);
-
-      if (env.exception ())
-        {
-          dexc (env, "do_static_call, start request message");
-          return;
-        }
-
-      // Now, put all "in" and "inout" parameters into the request
-      // message body.
-
-      u_int i;
-
-      for (i = 0; i < args->count (); i++)
-        {
-          CORBA::NamedValue_ptr value = args->item (i, env);
-
-          if (value->flags () == CORBA::ARG_IN
-              || value->flags () == CORBA::ARG_INOUT)
-            {
-              call.put_param (value->value ()->type (),
-                              (void *) value->value ()->value (), env);
-              if (env.exception ())
-                {
-                  dexc (env, "do_dynamic_call, put request parameter");
-                  return;
-                }
-            }
-        }
-
-      // Make the call ... blocking for response if needed.  Note that
-      // "oneway" calls can't return any exceptions except system ones.
-
-      TAO_GIOP_ReplyStatusType status;
-
-      status = call.invoke (exceptions, env);
-      if (env.exception ())
-        {
-          dexc (env, "do_dynamic_call, invoke");
-          return;
-        }
-      if (!is_roundtrip
-          || status == TAO_GIOP_SYSTEM_EXCEPTION
-          || status == TAO_GIOP_USER_EXCEPTION)
-        return;
-
-      // Now, get all the "return", "out", and "inout" parameters from the
-      // response message body ... return parameter is first, the rest are
-      // in the order defined in the IDL spec (which is also the order that
-      // DII users are required to use).
-
-      if (status == TAO_GIOP_NO_EXCEPTION)
-        {
-          if (result != 0)
-            {
-              // If caller didn't set OUT_LIST_MEMORY flag, allocate
-              // memory for return value ...
-
-              if (!(flags & CORBA::OUT_LIST_MEMORY))
-                {
-                  CORBA::TypeCode_ptr tcp;
-                  size_t size;
-
-                  tcp = result->value ()->type ();
-                  size = tcp->size (env);
-                  dexc (env, "do_dynamic_call, get result size");
-
-                  if (size != 0)
-                    {
-                      void *ptr = new CORBA::Octet [size];
-
-                      tcp->AddRef ();
-                      result->value ()->replace (tcp, ptr,
-                                                 CORBA::B_TRUE, env);
-                      dexc (env, "do_dynamic_call, set result mem");
-                    }
-                }
-
-              call.get_value (result->value ()->type (),
-                              (void *) result->value ()->value (), env);
-            }
-
-          for (i = 0; i < args->count (); i++)
-            {
-              CORBA::NamedValue_ptr     value = args->item (i, env);
-
-              if (value->flags () == CORBA::ARG_OUT
-                  || value->flags () == CORBA::ARG_INOUT)
-                {
-                  // If caller didn't set OUT_LIST_MEMORY flag, allocate
-                  // memory for this parameter ...
-                  if (!(flags & CORBA::OUT_LIST_MEMORY))
-                    {
-                      CORBA::TypeCode_ptr tcp;
-                      size_t size;
-
-                      tcp = value->value ()->type ();
-                      size = tcp->size (env);
-                      dexc (env, "do_dynamic_call, get param size");
-
-                      if (size != 0)
-                        {
-                          void *ptr = new CORBA::Octet [size];
-
-                          tcp->AddRef ();
-                          value->value ()->replace (tcp, ptr,
-                                                    CORBA::B_TRUE, env);
-                          dexc (env, "do_dynamic_call, set result mem");
-                        }
-                    }
-
-                  call.get_value (value->value ()->type (),
-                                  (void *) value->value ()->value (), env);
-                  if (env.exception ())
-                    {
-                      dexc (env, "do_dynamic_call, get response parameter");
-                      return;
-                    }
-                }
-            }
-          return;
-        }
-
-      // ... or maybe this request got forwarded to someplace else.
-      assert (status == TAO_GIOP_LOCATION_FORWARD);
-    }
-}
diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h
deleted file mode 100644
index 5c4d070a49b..00000000000
--- a/TAO/tao/IIOP_Object.h
+++ /dev/null
@@ -1,268 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IIOP_Object.h
-//
-// = DESCRIPTION
-//     IIOP objref representation.
-//
-//     This allows stubs which support multiple protocols, since the
-//     stub (and DII) code only work with the parent "STUB_Objref"
-//     class when making calls.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_IIOPOBJ_H)
-#  define TAO_IIOPOBJ_H
-
-class TAO_Export IIOP
-{
-  // = TITLE
-  //   This class provides a namespace.
-public:
-  // = IIOP Protocol version is distinct from GIOP version.
-  enum
-  {
-    MY_MAJOR = 1,
-    MY_MINOR = 0
-  };
-
-  struct Version
-  {
-    CORBA::Octet major;
-    CORBA::Octet minor;
-
-    Version (CORBA::Octet maj = MY_MAJOR,
-             CORBA::Octet min = MY_MINOR);
-  };
-
-  struct Profile
-    // = TITLE
-    // IOR support ... Profile is encapsulated in an IIOP profile
-    // entry within an IOR.  Note that this structure is specified
-    // by CORBA 2.0, so we can't screw with it too much.
-  {
-    Version iiop_version;
-    TAO_opaque object_key;
-    char *host;
-    CORBA::UShort port;
-
-    Profile (void);
-    // Default constructor.
-
-    Profile (const Profile &src);
-    // Copy constructor.
-
-    Profile (const char *host,
-             const CORBA::UShort port,
-             const char *object_key);
-    // Called by client <_bind>.
-
-    Profile (const char *host,
-             const CORBA::UShort port,
-             const char *object_key,
-             const ACE_INET_Addr &addr);
-    // Called by server.
-
-    Profile (const ACE_INET_Addr &addr,
-             const char *object_key);
-    // Called by client or server.
-
-    Profile (const ACE_INET_Addr &addr,
-             const TAO_opaque &object_key);
-    // Called by client or server.
-
-    ~Profile (void);
-    // Destructor.
-
-    void object_addr (const ACE_INET_Addr *);
-    // Sets <object_addr_> cache from <host> and <port>
-
-    ACE_INET_Addr &object_addr (void);
-    // Returns the <ACE_INET_Addr> for this profile.
-
-  private:
-    int set (const char *host,
-             const CORBA::UShort port,
-             const ACE_INET_Addr *addr);
-    // Internal helper method (called by the next two methods).
-
-    int set (const char *host,
-             const CORBA::UShort port,
-             const char *object_key,
-             const ACE_INET_Addr *addr = 0);
-    // Called by server.
-
-    int set (const char *host,
-             const CORBA::UShort port,
-             const TAO_opaque &object_key,
-             const ACE_INET_Addr *addr = 0);
-    // Called by server.
-
-    int set (const ACE_INET_Addr &addr,
-             const char *object_key);
-    // Called by client or server.
-
-    int set (const ACE_INET_Addr &addr,
-             const TAO_opaque &object_key);
-    // Called by client or server.
-
-    Profile &operator = (const Profile &src);
-    // Disallow copy constructor.
-
-    ACE_INET_Addr object_addr_;
-    // Cached instance of <ACE_INET_Addr> for use in making
-    // invocations, etc.
-  };
-};
-
-class TAO_Export IIOP_Object : public STUB_Object
-{
-  // = TITLE
-  //   Representation of an IIOP objref: the profile body, and any
-  //   forwarded pointer.  Implementations of basic invocation code;
-  //   how to marshal an objref.  Contains a CORBA::Object interface.
-  //
-  // = DESCRIPTION
-  //   NOTE that this uses (single) implementation inheritance to share
-  //   most of the basic code for an object reference.
-  //
-  //   This implementation provides DII support, and an analagous
-  //   interpreter that let  static stubs be very small.  It's
-  //   specific to objrefs with IIOP::Profile.
-public:
-  void do_static_call (CORBA::Environment &env,
-                       const TAO_Call_Data *info,
-                       ...);
-  // SII-based "Stub interpreter" for static stubs.  IDL compiler just
-  // dumps a read-only description of the call into "calldata" and do
-  // varargs calls to this routine, which does all the work.
-
-  void do_dynamic_call (const char *opname,
-                        CORBA::Boolean is_roundtrip,
-                        CORBA::NVList_ptr args,
-                        CORBA::NamedValue_ptr result,
-                        CORBA::Flags flags,
-                        CORBA::ExceptionList &exceptions,
-                        CORBA::Environment &env);
-  // DII-based invocation analogue of the <do_static_call> above.
-  // Differs in how the vararg calling convention is implemented --
-  // DII doesn't use the normal call stack with its implicit typing,
-  // but instead uses heap-based arguments with explicit typing.
-
-  // = Support for tables keyed by objrefs.
-
-  CORBA::ULong hash (CORBA::ULong maximum,
-                     CORBA::Environment &env);
-  // Compute a hash value for the object.
-
-  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                CORBA::Environment &env);
-  // XXX All objref representations should know how to marshal
-  // themselves.  That will involve ensuring that the IOR that gets
-  // marshaled talks a specific protocol, otherwise the target of a
-  // message would not be invoke using the objref it receives
-  // (compromising functionality in a very basic and mysterious
-  // mannter).  So for example an objref might need to create a proxy
-  // for itself rather than marshaling its own representation.  [ The
-  // IIOP engine does not need to worry about such issues since it
-  // only supports one protocol -- the problem won't show up.
-  // "Multiprotocol ORBs" will need to solve that problem though.  ]
-
-  // = Thread-safe accessors for the forwarding profile
-  IIOP::Profile *fwd_profile (void);
-  // THREAD-SAFE.  Returns the current forwarding profile.
-
-  IIOP::Profile *fwd_profile (IIOP::Profile *new_profile);
-  // THREAD-SAFE.  Sets a new value for the forwarding profile and
-  // returns the current value.
-
-  // = Non-thread-safe accessors for the forwarding profile
-  ACE_SYNCH_MUTEX &fwd_profile_lock (void);
-  // Gives reference to the lock guarding the forwarding profile.
-
-  IIOP::Profile *fwd_profile_i (void);
-  // THREAD-SAFE.  Returns the current forwarding profile.
-
-  IIOP::Profile *fwd_profile_i (IIOP::Profile *new_profile);
-  // THREAD-SAFE.  Sets a new value for the forwarding profile and
-  // returns the current value.
-
-  // = Construction
-  IIOP_Object (char *repository_id);
-  // Construct from a repository (type) ID.
-
-  IIOP_Object (char *repository_id,
-               const IIOP::Profile &profile);
-  // Construct from a repository ID and a profile ID.
-
-  IIOP_Object (const char *host,
-               const CORBA::UShort p,
-               const char *objkey,
-               char *repository_id = 0);
-  // This constructor will usually be used by a <_bind> call on the
-  // client side.
-
-  IIOP_Object (char *repository_id,
-               const ACE_INET_Addr &addr,
-               const char *objkey);
-  // Constructor used typically by the server side.
-
-  // = Memory management.
-  ULONG AddRef (void);
-  ULONG Release (void);
-  TAO_HRESULT QueryInterface (REFIID type_id,
-                              void **ppv);
-
-  virtual TAO_ObjectKey *key (CORBA::Environment &env);
-  // Return the object key as an out parameter.  Caller should release
-  // return value when finished with it.
-
-  IIOP::Profile profile;
-  // Profile for this object.
-
-private:
-  ACE_SYNCH_MUTEX IUnknown_lock_;
-  // Mutex to protect <IUnknown>-related stuff.
-
-  u_int refcount_;
-  // Number of outstanding references to this object.
-
-  ACE_SYNCH_MUTEX fwd_profile_lock_;
-  // This lock covers the mutable info in all IIOP objref data,
-  // namely the forwarded-to objref.  It must be held when a client
-  // thread is reading or modifying that data, to prevent one from
-  // overwriting data the other's reading or writing.
-
-  IIOP::Profile *fwd_profile_;
-  // This is a pointer to a profile used if the object is not
-  // collocated in the current process.
-
-  ~IIOP_Object (void);
-  // Destructor is to be called only through Release()
-
-  // = Disallow copy constructor and assignment operator
-  ACE_UNIMPLEMENTED_FUNC (IIOP_Object (const IIOP_Object &))
-  ACE_UNIMPLEMENTED_FUNC (IIOP_Object &operator = (const IIOP_Object &))
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_Object.i"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* TAO_IIOPOBJ_H */
diff --git a/TAO/tao/IIOP_Object.i b/TAO/tao/IIOP_Object.i
deleted file mode 100644
index 333b1fb95aa..00000000000
--- a/TAO/tao/IIOP_Object.i
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-
-ACE_INLINE
-IIOP::Version::Version (CORBA::Octet maj, CORBA::Octet min)
-  : major (maj),
-    minor (min)
-{
-}
-
-ACE_INLINE
-IIOP::Profile::Profile (void)
-  : host (0)
-{
-}
-
-ACE_INLINE
-IIOP::Profile::~Profile (void)
-{
-  delete [] this->host;
-}
-
-ACE_INLINE void
-IIOP::Profile::object_addr (const ACE_INET_Addr *addr)
-{
-  if (addr != 0)
-    this->object_addr_ = *addr;
-  else if (this->host)
-    this->object_addr_.set (this->port, this->host);
-}
-
-ACE_INLINE ACE_INET_Addr &
-IIOP::Profile::object_addr (void)
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE
-IIOP_Object::~IIOP_Object (void)
-{
-  assert (this->refcount_ == 0);
-  delete this->fwd_profile_;
-}
-
-ACE_INLINE
-IIOP_Object::IIOP_Object (char *repository_id)
-  : STUB_Object (repository_id),
-    refcount_ (0),
-    fwd_profile_ (0)
-{
-}
-
-ACE_INLINE
-IIOP_Object::IIOP_Object (char *repository_id,
-                          const IIOP::Profile &a_profile)
-  : STUB_Object (repository_id),
-    profile (a_profile),
-    refcount_ (0),
-    fwd_profile_ (0)
-{
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile_i (void)
-{
-  return this->fwd_profile_;
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile_i (IIOP::Profile *new_profile)
-{
-  IIOP::Profile *old = this->fwd_profile_;
-  this->fwd_profile_ = new_profile;
-  return old;
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->fwd_profile_lock_, 0));
-  return this->fwd_profile_i ();
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile (IIOP::Profile *new_profile)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->fwd_profile_lock_, 0));
-  return this->fwd_profile_i (new_profile);
-}
-
-ACE_INLINE
-ACE_SYNCH_MUTEX &
-IIOP_Object::fwd_profile_lock (void)
-{
-  return fwd_profile_lock_;
-}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
deleted file mode 100644
index 8274738a453..00000000000
--- a/TAO/tao/Makefile
+++ /dev/null
@@ -1,7045 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for TAO
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libTAO
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# These are headers for things which are exported and must be
-# installed.  (Currently not used).
-PUB_HDRS = Align CDR GIOP IIOP_Object IIOP_ORB Connect Params \
-	   Marshal Debug \
-	   Default_Client Default_Server \
-	   Server_Strategy_Factory Client_Strategy_Factory ORB_Core
-
-ORBCORE_SRCS = \
-	Any \
-	Exception \
-	NVList \
-	Object \
-	ORB \
-	POA \
-	POAC \
-	POAS \
-	Principal \
-	Request \
-	Sequence \
-	Server_Request \
-	Stub \
-	Typecode \
-	Arg_Shifter \
-	CDR \
-	Client_Strategy_Factory \
-	Connect \
-	debug \
-	decode \
-	deep_copy \
-	deep_free \
-	default_client \
-	default_server \
-	Object_KeyC \
-	encode \
-	GIOP \
-	IIOP_Object \
-	IIOP_ORB \
-	IIOP_Interpreter \
-	Marshal \
-	Object_Table \
-	Operation_Table \
-	ORB_Core \
-	params \
-	Server_Strategy_Factory \
-	Servant_Base \
-	TAO_Internal \
-	Typecode_Constants \
-	TAO \
-	Timeprobe
-
-FILES	 = $(ORBCORE_SRCS)
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-COMPATDIR = $(TAO_ROOT)/tao/compat
-COMPATFILES = objbase.h initguid.h
-
-BIN = # t-sizes
-
-DEFS  	= $(addsuffix .h,$(PUB_HDRS))
-LSRC	= $(addsuffix .cpp,$(FILES))
-LSRC2	= $(addsuffix .cpp,$(TEMPLATE_FILES))
-
-LDLIBS = -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) $(VLIB) $(VBIN)
-
-#### Don't regenerate %[CS].* files using TAO's IDL compiler.  Instead,
-#### always use what's in our CVS repository, or in the TAO distribution.
-%S.h %C.h %S.i %C.i %S.cpp %C.cpp: %.idl
-	@touch $@
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(shared_libs),)
-  override fakesvcconf = 1
-endif # ($(shared_libs),)
-
-ifeq ($(fakesvcconf),1)
-  CPPFLAGS += -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-endif
-
-ifeq ($(probe),1)
-    CCFLAGS += -DACE_ENABLE_TIMEPROBES
-endif # probe
-
-#RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS))
-LDFLAGS += $(RLDFLAGS)
-
-.PRECIOUS: Object_KeyC.h Object_KeyC.i Object_KeyC.cpp
-.PRECIOUS: POAS.h POAS.i POAS.cpp POAC.h POAC.i POAC.cpp
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(TAO_ROOT)/tao/Timeprobe.i
-.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i
-.obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h POAC.h POAS.h
-.obj/POAS.o .obj/POAS.so .shobj/POAS.o .shobj/POAS.so: POAS.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h POAS.h
-.obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Arg_Shifter.o .obj/Arg_Shifter.so .shobj/Arg_Shifter.o .shobj/Arg_Shifter.so: Arg_Shifter.cpp Arg_Shifter.h
-.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Connect.o .obj/Connect.so .shobj/Connect.o .shobj/Connect.so: Connect.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(TAO_ROOT)/tao/Timeprobe.i
-.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/decode.o .obj/decode.so .shobj/decode.o .shobj/decode.so: decode.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/deep_copy.o .obj/deep_copy.so .shobj/deep_copy.o .shobj/deep_copy.so: deep_copy.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/deep_free.o .obj/deep_free.so .shobj/deep_free.o .shobj/deep_free.so: deep_free.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/default_client.i
-.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i
-.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/encode.o .obj/encode.so .shobj/encode.o .shobj/encode.so: encode.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/GIOP.o .obj/GIOP.so .shobj/GIOP.o .shobj/GIOP.so: GIOP.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(TAO_ROOT)/tao/Timeprobe.i
-.obj/IIOP_Object.o .obj/IIOP_Object.so .shobj/IIOP_Object.o .shobj/IIOP_Object.so: IIOP_Object.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/IIOP_ORB.o .obj/IIOP_ORB.so .shobj/IIOP_ORB.o .shobj/IIOP_ORB.so: IIOP_ORB.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/IIOP_Interpreter.o .obj/IIOP_Interpreter.so .shobj/IIOP_Interpreter.o .shobj/IIOP_Interpreter.so: IIOP_Interpreter.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Object_Table.o .obj/Object_Table.so .shobj/Object_Table.o .shobj/Object_Table.so: Object_Table.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/Arg_Shifter.h
-.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/TAO_Internal.h
-.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp TAO.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i Timeprobe.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i Timeprobe.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
deleted file mode 100644
index 15939e72f16..00000000000
--- a/TAO/tao/Marshal.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    marshal.cpp
-//
-// = DESCRIPTION
-//   Implements the Marshal_Object class and the factory
-//
-//   The original encoder and decoder code now appears in files encode.cpp and
-//   decode.cpp
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_Marshal_Factory* TAO_Marshal::DEFAULT_MARSHAL_FACTORY = 0;
-
-void
-TAO_Marshal::initialize (void)
-{
-  DEFAULT_MARSHAL_FACTORY = TAO_MARSHAL_FACTORY::instance();
-}
-
-// cosntructor for the factory
-TAO_Marshal_Factory::TAO_Marshal_Factory (void)
-#if 0
-  : m_primitive_ (TAO_MARSHAL_PRIMITIVE::instance ()),
-    m_any_ (TAO_MARSHAL_ANY::instance ()),
-    m_typecode_ (TAO_MARSHAL_TYPECODE::instance ()),
-    m_principal_ (TAO_MARSHAL_PRINCIPAL::instance ()),
-    m_objref_ (TAO_MARSHAL_OBJREF::instance ()),
-    m_struct_ (TAO_MARSHAL_STRUCT::instance ()),
-    m_union_ (TAO_MARSHAL_UNION::instance ()),
-    m_string_ (TAO_MARSHAL_STRING::instance ()),
-    m_sequence_ (TAO_MARSHAL_SEQUENCE::instance ()),
-    m_array_ (TAO_MARSHAL_ARRAY::instance ()),
-    m_alias_ (TAO_MARSHAL_ALIAS::instance ()),
-    m_except_ (TAO_MARSHAL_EXCEPT::instance ()),
-    m_wstring_ (TAO_MARSHAL_WSTRING::instance ())
-#endif /* 0 */
-{
-  // initialize the mobj table
-  mobj_table_[CORBA::tk_null].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_void].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_short].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_long].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ushort].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_float].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_double].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_boolean].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_char].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_octet].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_any].obj_ = TAO_MARSHAL_ANY::instance ();
-  mobj_table_[CORBA::tk_TypeCode].obj_ = TAO_MARSHAL_TYPECODE::instance ();
-  mobj_table_[CORBA::tk_Principal].obj_ = TAO_MARSHAL_PRINCIPAL::instance ();
-  mobj_table_[CORBA::tk_objref].obj_ = TAO_MARSHAL_OBJREF::instance ();
-  mobj_table_[CORBA::tk_struct].obj_ = TAO_MARSHAL_STRUCT::instance ();
-  mobj_table_[CORBA::tk_union].obj_ = TAO_MARSHAL_UNION::instance ();
-  mobj_table_[CORBA::tk_enum].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_string].obj_ = TAO_MARSHAL_STRING::instance ();
-  mobj_table_[CORBA::tk_sequence].obj_ = TAO_MARSHAL_SEQUENCE::instance ();
-  mobj_table_[CORBA::tk_array].obj_ = TAO_MARSHAL_ARRAY::instance ();
-  mobj_table_[CORBA::tk_alias].obj_ = TAO_MARSHAL_ALIAS::instance ();
-  mobj_table_[CORBA::tk_except].obj_ = TAO_MARSHAL_EXCEPT::instance ();
-  mobj_table_[CORBA::tk_longlong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulonglong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_longdouble].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wchar].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wstring].obj_ = TAO_MARSHAL_WSTRING::instance ();
-}
-
-TAO_Marshal_Factory::~TAO_Marshal_Factory (void)
-{
-}
-
-#if 0
-// factory method
-//
-// Based on the kind of the typecode, return the appropriate marshal object
-TAO_Marshal_Object* TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-                                                              CORBA::Environment &env)
-{
-  env.clear ();
-  if (tc)
-    {
-      switch (tc->kind_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-        case CORBA::tk_boolean:
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-        case CORBA::tk_longdouble:
-        case CORBA::tk_wchar:
-          return m_primitive_;
-        case CORBA::tk_any:
-          return m_any_;
-        case CORBA::tk_TypeCode:
-          return m_typecode_;
-        case CORBA::tk_Principal:
-          return m_principal_;
-        case CORBA::tk_objref:
-          return m_objref_;
-        case CORBA::tk_struct:
-          return m_struct_;
-        case CORBA::tk_union:
-          return m_union_;
-        case CORBA::tk_string:
-          return m_string_;
-        case CORBA::tk_sequence:
-          return m_sequence_;
-        case CORBA::tk_array:
-          return m_array_;
-        case CORBA::tk_alias:
-          return m_alias_;
-        case CORBA::tk_except:
-          return m_except_;
-        case CORBA::tk_wstring:
-          return m_wstring_;
-        default:
-          // anything else is an error
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return (TAO_Marshal_Object *)0;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return (TAO_Marshal_Object *)0;
-    }
-}
-#endif /* 0 */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
deleted file mode 100644
index ca932a6662e..00000000000
--- a/TAO/tao/Marshal.h
+++ /dev/null
@@ -1,527 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Marshal.h
-//
-// = DESCRIPTION
-//     Classes that marshal various IDL data types.
-//
-// = AUTHOR
-//     Aniruddha S. Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_MARSHAL_H)
-#define TAO_MARSHAL_H
-
-CORBA::TypeCode::traverse_status
-DEEP_COPY (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA::Environment &env);
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA::Environment &env);
-
-// = Forward declarations.
-class TAO_Marshal_Object;
-class TAO_Marshal_Primitive;
-class TAO_Marshal_Any;
-class TAO_Marshal_TypeCode;
-class TAO_Marshal_Principal;
-class TAO_Marshal_ObjRef;
-class TAO_Marshal_Struct;
-class TAO_Marshal_Union;
-class TAO_Marshal_String;
-class TAO_Marshal_Sequence;
-class TAO_Marshal_Array;
-class TAO_Marshal_Alias;
-class TAO_Marshal_Except;
-class TAO_Marshal_WString;
-
-class TAO_Export TAO_Marshal_Factory
-{
-  // = TITLE
-  // A Factory for generating specialized marshaling objects
-  //
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Factory (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Factory (void);
-  // destructor
-
-  virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc,
-                                                  CORBA::Environment &env);
-  // Factory method that returns the appropriate marshal object.
-
-private:
-  struct TAO_Marshal_Object_Entry
-  {
-    TAO_Marshal_Object *obj_;
-  };
-
-  TAO_Marshal_Object_Entry mobj_table_[CORBA::TC_KIND_COUNT];
-  // A table of specialized marshal objects indexed by the kind_ field
-
-};
-
-class TAO_Export TAO_Marshal
-// = TITLE
-//    Namespace in which to put otherwise "global" methods like
-//    initialize, etc.
-{
-public:
-  static void initialize (void);
-
-  static TAO_Marshal_Factory* DEFAULT_MARSHAL_FACTORY;
-};
-
-class TAO_Export TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Object
-  // = DESCRIPTION
-  //    The Marshaling object that provides a common interface to the
-  //    CDR object for marshaling different IDL data types
-  //
-  //    Provides a set of virtual methods for encoding, decoding,
-  //    deep_copying, and deep_freeing.
-public:
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env) = 0;
-  // encoding operation
-
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env) = 0;
-  // decoding operation
-
-  TAO_Marshal_Object (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Object (void);
-  // destructor
-};
-
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Primitive
-  // = DESCRIPTION
-  //   marshaling primitives
-public:
-  TAO_Marshal_Primitive (void);
-
-  virtual ~TAO_Marshal_Primitive (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Any
-  // = DESCRIPTION
-  //   Marshal an Any
-public:
-  TAO_Marshal_Any (void);
-
-  virtual ~TAO_Marshal_Any (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_TypeCode
-  // = DESCRIPTION
-  //   marshal a typecode
-public:
-  TAO_Marshal_TypeCode (void);
-
-  virtual ~TAO_Marshal_TypeCode (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Principal
-  // = DESCRIPTION
-  //   marshal a principal
-public:
-  TAO_Marshal_Principal (void);
-
-  virtual ~TAO_Marshal_Principal (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_ObjRef
-  // = DESCRIPTION
-  //   marshal an object reference
-public:
-  TAO_Marshal_ObjRef (void);
-
-  virtual ~TAO_Marshal_ObjRef (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Struct
-  // = DESCRIPTION
-  //   marshal a struct
-public:
-  TAO_Marshal_Struct (void);
-
-  virtual ~TAO_Marshal_Struct (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Union
-  // = DESCRIPTION
-  //   marshal a union
-public:
-  TAO_Marshal_Union (void);
-
-  virtual ~TAO_Marshal_Union (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_String
-  // = DESCRIPTION
-  //   marshal a string
-public:
-  TAO_Marshal_String (void);
-
-  virtual ~TAO_Marshal_String (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Sequence
-  // = DESCRIPTION
-  //   marshal a sequence
-public:
-  TAO_Marshal_Sequence (void);
-
-  virtual ~TAO_Marshal_Sequence (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Array
-  // = DESCRIPTION
-  //   marshal an array
-public:
-  TAO_Marshal_Array (void);
-
-  virtual ~TAO_Marshal_Array (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Alias
-  // = DESCRIPTION
-  //   marshal an alias
-public:
-  TAO_Marshal_Alias (void);
-
-  virtual ~TAO_Marshal_Alias (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_Except
-  // = DESCRIPTION
-  //   marshal an exception
-public:
-  TAO_Marshal_Except (void);
-  ~TAO_Marshal_Except (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-  // = TITLE
-  //   TAO_Marshal_WString
-  // = DESCRIPTION
-  //   marshal a wide string
-public:
-  TAO_Marshal_WString (void);
-  ~TAO_Marshal_WString (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
deleted file mode 100644
index fc44da1b79c..00000000000
--- a/TAO/tao/Marshal.i
+++ /dev/null
@@ -1,288 +0,0 @@
-ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::~TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::~TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::~TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::~TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::~TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::~TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::~TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::~TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::~TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::~TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::~TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::~TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::~TAO_Marshal_WString (void)
-{
-}
-
-// Factory method that returns the appropriate marshal object based on
-// the kind of the typecode.
-ACE_INLINE TAO_Marshal_Object *
-TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &env)
-{
-  if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
-    return this->mobj_table_[tc->kind_].obj_;
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-}
-
-// the deep_copy methods
-
-// deep_copy for any
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::deep_copy (CORBA::TypeCode_ptr,
-                            const void *source,
-			    const void *dest,
-			    CORBA::Environment &)
-{
-  (void) new (dest) CORBA::Any (*(CORBA::Any *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for TypeCode
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::deep_copy (CORBA::TypeCode_ptr,
-				 const void *source,
-				 const void *dest,
-				 CORBA::Environment &)
-{
-  if ((*(CORBA::TypeCode_ptr *) source) != 0)
-    dest = source;
-  else
-    dest = CORBA::_tc_null;
-
-  ((CORBA::TypeCode_ptr) dest)->AddRef ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for ObjRef
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::deep_copy (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *dest,
-			       CORBA::Environment &)
-{
-  *(CORBA::Object_ptr *) dest = CORBA::Object::_duplicate (*(CORBA::Object_ptr *)
-                                                           source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for string
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_String::deep_copy (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *dest,
-			       CORBA::Environment &)
-{
-  *(CORBA::String *) dest = CORBA::string_copy (*(CORBA::String *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for wstring
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::deep_copy (CORBA::TypeCode_ptr,
-				const void *source,
-				const void *dest,
-				CORBA::Environment &)
-{
-  *(CORBA::WString *) dest = CORBA::wstring_copy (*(CORBA::WString *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// *************** deep_free methods ******************
-
-// deep_free for Any
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::deep_free (CORBA::TypeCode_ptr,
-			    const void *source,
-			    const void *,
-			    CORBA::Environment &)
-{
- ((CORBA::Any *) source)->~CORBA_Any ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for TypeCode
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::deep_free (CORBA::TypeCode_ptr,
-                                 const void *source,
-                                 const void *,
-                                 CORBA::Environment &)
-{
-  if ((*(CORBA::TypeCode_ptr *) source) != 0)
-    (*(CORBA::TypeCode_ptr *) source)->Release ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for Principal
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::deep_free (CORBA::TypeCode_ptr,
-				  const void *value,
-				  const void *,
-				  CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::Principal_ptr *) value);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for ObjRef
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::deep_free (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *,
-			       CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::Object_ptr *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for string
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_String::deep_free (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *,
-			       CORBA::Environment &)
-{
-  CORBA::string_free (*(CORBA::String *) source);
-  //  *(CORBA::String *)source = 0;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for wstring
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::deep_free (CORBA::TypeCode_ptr,
-				const void *source,
-				const void *,
-				CORBA::Environment &)
-{
-  CORBA::wstring_free (*(CORBA::WString *) source);
-  *(CORBA::WString *)source = 0;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
deleted file mode 100644
index a6808686f8a..00000000000
--- a/TAO/tao/NVList.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-// $Id$
-
-// Implementation of Named Value List and NamedValue classes
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA::ULong
-CORBA_NamedValue::AddRef (void)
-{
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_NamedValue::Release (void)
-{
-  {
-    ACE_ASSERT (this != 0);
-
-    if (--this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  //  delete this;
-  // this is causing free mismatched memory error
-  this->~CORBA_NamedValue ();
-  ACE_OS::free (this);
-  return 0;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return (CORBA::Boolean) (nv == 0);
-}
-
-CORBA_NamedValue::~CORBA_NamedValue (void)
-{
-  if (this->name_)
-    {
-      CORBA::string_free (this->name_);
-      this->name_ = 0;
-    }
-  // the Any will be destroyed on its own as we hold an instance and not a
-  // pointer to Any
-}
-
-
-// =Methods on class NVList
-
-CORBA::ULong
-CORBA_NVList::AddRef (void)
-{
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA_NVList::Release (void)
-{
-  {
-    ACE_ASSERT (this != 0);
-
-    if (--this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    nvl->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) (nvl == 0);
-}
-
-CORBA_NVList::~CORBA_NVList (void)
-{
-  // destroy each NamedValue element
-  for (CORBA::ULong i = 0; i < this->max_; i++)
-    (&this->values_[i])->~CORBA_NamedValue ();
-
-  if (this->values_)
-    ACE_OS::free ((char *)values_);
-
-  this->values_ = 0;
-  this->len_ = this->max_ = 0;
-}
-
-// add an element and just initialize its flags
-CORBA::NamedValue_ptr
-CORBA_NVList::add (CORBA::Flags flags,
-                   CORBA::Environment &env)
-{
-  CORBA::ULong len = this->len_; // next slot
-
-  // call the helper to allocate a NamedValue element (if necessary)
-  if (!this->add_element (flags, env))
-    return 0;
-
-  // now initialize the fields
-  this->values_[len].flags_ = flags;
-  return &this->values_[len];
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA_NVList::add_item (const char *name,
-                        CORBA::Flags flags,
-                        CORBA::Environment &env)
-{
-  CORBA::ULong len = this->len_; // next slot
-
-  // call the helper to allocate a NamedValue element (if necessary)
-  if (!this->add_element (flags, env))
-    return 0;
-
-  // now initialize the fields
-  this->values_[len].flags_ = flags;
-  this->values_[len].name_ = CORBA::string_dup (name);
-  return &this->values_[len];
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA_NVList::add_value (const char *name,
-                         const CORBA::Any &value,
-                         CORBA::Flags flags,
-                         CORBA::Environment &env)
-{
-  CORBA::ULong len = this->len_; // next slot
-
-  // call the helper to allocate a NamedValue element (if necessary)
-  if (!this->add_element (flags, env))
-    return 0;
-
-  // now initialize the fields
-  this->values_[len].flags_ = flags;
-  this->values_[len].name_ = CORBA::string_dup (name); // make a copy
-
-  if (ACE_BIT_ENABLED (flags, CORBA::IN_COPY_VALUE))
-    // IN_COPY_VALUE means that the parameter is not "borrowed" by
-    // the ORB, but rather that the ORB copies its value.
-    //
-    // Initialize the newly allocated memory using a copy
-    // constructor that places the new "Any" value at just the right
-    // place, and makes a "deep copy" of the data.
-    (void) new (&this->values_[len].any_) CORBA::Any (value);
-  else
-
-    // The normal behaviour for parameters is that the ORB "borrows"
-    // their memory for the duration of calls.
-    //
-    // Initialize the newly allocated "Any" using a normal
-    // constructor that places the new "Any" value at just the right
-    // place, yet doesn't copy the memory (except for duplicating
-    // the typecode).
-    //
-    // NOTE: DSI has yet to be updated so that it's OK to use such
-    // application-allocated memory.  It needs at least a "send the
-    // response now" call.
-    //
-    (void) new (&this->values_[len].any_) CORBA::Any (value.type (),
-                                                      (void *)value.value (),
-                                                      CORBA::B_FALSE); // does
-                                                                       // not
-                                                                       // own
-
-  // return pointer to the newly inserted member
-  return &this->values_[len];
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA_NVList::add_item_consume (char *name,
-                                CORBA::Flags flags,
-                                CORBA::Environment &env)
-{
-  CORBA::ULong len = this->len_; // next slot
-
-  // call the helper to allocate a NamedValue element (if necessary)
-  if (!this->add_element (flags, env))
-    return 0;
-
-  // now initialize the fields
-  this->values_[len].flags_ = flags;
-  this->values_[len].name_ = name; // we consume it
-  return &this->values_[len];
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA_NVList::add_value_consume (char * /*name*/,
-                                 CORBA::Any * /*value*/,
-                                 CORBA::Flags /*flags*/,
-                                 CORBA::Environment &/*env*/)
-{
-  // not implemented because we need to see how we can consume the value
-  // One soln is to make the any_ member of NamedValue to be a Any_ptr or
-  // Any_var
-  // @@ (ASG) - TODO
-  return 0;
-}
-
-//CORBA::Status
-void
-CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/)
-{
-  // not implemented
-  // @@ (ASG) - TODO
-
-}
-
-// Helper method
-CORBA::Boolean
-CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env)
-{
-  env.clear ();
-  if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    {
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // We track "len_" and "max_" like sequences do; mixing the
-  // "add_arg" and nvlist[i] style accessors produces undefined
-  // behaviour.
-  CORBA::ULong len = this->len_++; // len_ points to the next available
-                                   // slot. Access is by zero based indexing
-
-  // Extend the array with an _initialized_ element ... relying on
-  // zeroed memory to be sufficiently initialized.
-  //
-
-  if (this->values_ == 0) // list was created as an empty list
-    {
-      this->values_ = (CORBA::NamedValue_ptr)
-        ACE_OS::calloc (this->len_, sizeof (CORBA::NamedValue));
-      this->max_ = this->len_;
-    }
-  else if (len >= max_) // need reallocation
-    {
-      // reallocate a larger buffer
-      this->values_ = (CORBA::NamedValue_ptr) ACE_OS::realloc
-        ((char *)this->values_, sizeof (CORBA::NamedValue) * this->len_);
-      // now zero the elements that have been newly allocated
-      (void) ACE_OS::memset (&this->values_[this->max_], 0,
-                             sizeof (values_[this->max_]) * (this->len_ - this->max_));
-      this->max_ = this->len_; // set the new maximum size
-    }
-  if (!this->values_)
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  return 1; // success
-}
-
-// This was inline, but didn't survive the removal of .i #includes
-// from corba.h.  env.exception wasn't known.  Maybe the circular
-// #includes between corba.h and ORB.h need to be removed.
-CORBA::NamedValue_ptr
-CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &env)
-{
-  env.clear ();
-  if (n >= this->max_) // 0 based indexing
-    {
-      env.exception (new CORBA::TypeCode::Bounds ());
-      return 0;
-    }
-  else
-    return &this->values_ [n];
-}
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
deleted file mode 100644
index 36ab8139896..00000000000
--- a/TAO/tao/NVList.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    NVList.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale (additions, missing operations)
-//
-// ============================================================================
-
-#if !defined (TAO_NVLIST_H)
-#  define TAO_NVLIST_H
-
-class TAO_Export CORBA_NamedValue
-{
-  // = TITLE
-  // NamedValue ... these occur only in "NVList" (named value list) data
-  // structures.  The binary form of the data structure is frozen and
-  // visible to programs using it (e.g. from C).  The C++ class supports
-  // some programming discipline, e.g. to avoid memory leaks.
-  //
-  // They just represent parameters to calls.  The name is optional, and
-  // the value is packaged as an Any.  The flags indicate parameter
-  // mode, and some ownership rules for "top level" memory.
-public:
-  const char *name (void) const;
-  // optional name
-
-  CORBA::Any_ptr value (void) const;
-  // return the value
-
-  CORBA::Flags flags (void) const;
-  // return the parameter mode flag
-
-  ~CORBA_NamedValue (void);
-  // destructor - manages the name and value
-
-  // = Methods required for COM IUnknown support.
-
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-private:
-  u_int refcount_;
-  // refcount used in release
-
-  CORBA::Any any_;
-  // holds the value
-
-  CORBA::Flags flags_;
-  // parameter mode flags
-
-  char *name_;
-  // optional IDL name of the parameter
-
-  CORBA_NamedValue (void);
-  // private constructor. Cannot be directly instantiated other than by its
-  // friends.
-
-  friend class CORBA_ORB;
-  friend class CORBA_NVList;
-  friend class CORBA_Request;
-};
-
-class TAO_Export CORBA_NVList
-{
-  // = TITLE
-  //   NVList ... this is used in the (client side) DII (Dynamic
-  //   Invocation Interface) to hold parameters, except for the return
-  //   parameter. It's used in the same role in the (server side) DSI
-  //   (Dynamic Skeleton Interface).
-  //
-  // = DESCRIPTION
-  //   Each user (client, server) provides the typecode and memory for
-  //   each parameter using an NVList, then talks to the ORB using a
-  //   Request or ServerRequest pseudo-object.  The ORB copies data
-  //   to/from the IPC messages (e.g. IIOP::Request, IIOP::Response)
-  //   as appropriate.
-public:
-  ~CORBA_NVList (void);
-  // destructor
-
-  CORBA::ULong count (void) const;
-  // return the current number of elements in the list
-
-  CORBA::NamedValue_ptr add (CORBA::Flags,
-                             CORBA::Environment &);
-  // add an element and just initialize the flags
-
-  CORBA::NamedValue_ptr add_item (const char *,
-                                  CORBA::Flags,
-                                  CORBA::Environment &);
-  // add an element and initialize its name and flags
-
-  CORBA::NamedValue_ptr add_value (const char *,
-                                   const CORBA::Any &,
-                                   CORBA::Flags,
-                                   CORBA::Environment &);
-  // initializes a value, name, and flags
-
-  CORBA::NamedValue_ptr add_item_consume (char *,
-                                          CORBA::Flags,
-                                          CORBA::Environment &);
-  // just like add_item. In addition, memory management of char * name is taken
-  // over by the NVList
-
-  CORBA::NamedValue_ptr add_value_consume (char *,
-                                           CORBA::Any_ptr,
-                                           CORBA::Flags,
-                                           CORBA::Environment &);
-  // just like add_value. In addition, the NVList controls the memory
-  // management of the char *name and Any *value parameter
-
-  CORBA::NamedValue_ptr item (CORBA::ULong n, CORBA::Environment &env);
-  // retrieve the item at the nth location. Raises Bounds
-
-
-  //  CORBA::Status
-  void remove (CORBA::ULong n, CORBA::Environment &env);
-  // remove element at index n. Raises Bounds
-
-  // = Methods required for COM IUnknown support
-
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-private:
-  CORBA_NVList (void);
-  // constructor - cannot be instantiated directly other than through the
-  // ORB::create_list method
-
-  CORBA::Boolean add_element (CORBA::Flags, CORBA::Environment &);
-  // helper to increase the list size. This is used by all the add_ methods of
-  // the NVList class
-
-  CORBA::NamedValue *values_;
-  // list of parameters stored as NamedValues
-
-  CORBA::ULong max_;
-  // maximum length of list
-
-  CORBA::ULong len_;
-  // current length of list
-
-  CORBA::ULong refcount_;
-  // maintains how many references exist to this object
-
-  friend class CORBA_ORB;
-  friend class CORBA_Request;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
deleted file mode 100644
index ae46118499b..00000000000
--- a/TAO/tao/NVList.i
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// constructor
-ACE_INLINE
-CORBA_NamedValue::CORBA_NamedValue (void)
-  : refcount_ (1),
-    flags_ (0),
-    name_ (0)
-{
-}
-
-// return the name
-ACE_INLINE const char*
-CORBA_NamedValue::name (void) const
-{
-  return this->name_;
-}
-
-// return the value
-ACE_INLINE CORBA::Any_ptr
-CORBA_NamedValue::value (void) const
-{
-  return ACE_const_cast(CORBA::Any_ptr,&this->any_);
-}
-
-// return the flags
-ACE_INLINE CORBA::Flags
-CORBA_NamedValue::flags (void) const
-{
-  return this->flags_;
-}
-
-
-// = methods for the NVList class
-
-// constructor
-ACE_INLINE
-CORBA_NVList::CORBA_NVList (void)
-  : values_ (0),
-    max_ (0),
-    len_ (0),
-    refcount_ (1)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_NVList::count (void) const
-{
-  return this->max_;
-}
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
deleted file mode 100644
index d2382e9c47c..00000000000
--- a/TAO/tao/ORB.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-// $Id$
-
-// @@ as with TAO, this has a strong coupling to the Internet ORB
-// (IIOP) code.  We should make it know less about that protocol
-// component and have a loose table-driven coupling to ORB/protocol
-// library components.
-
-#include "tao/corba.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Repository.h"
-#include "ace/Object_Manager.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "tao/TAO_Internal.h"
-#include "tao/Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ORB.i"
-#endif /* ! __ACE_INLINE__ */
-
-// COM's IUnknown support
-
-// {A201E4C7-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_STUB_Object,
-             0xa201e4c7, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-CORBA::String_var::String_var (char *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA::String_var::String_var (const CORBA::String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
-
-CORBA::String_var::~String_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = 0;
-    }
-}
-
-TAO_Export CORBA::String
-CORBA::string_dup (const CORBA::Char *str)
-{
-  return CORBA::string_copy (str);
-}
-
-CORBA_ORB::CORBA_ORB (void)
-  : refcount_ (1),
-    open_called_(CORBA::B_FALSE),
-    should_shutdown_(CORBA::B_FALSE),
-    name_service_ (CORBA_Object::_nil ()),
-    schedule_service_ (CORBA_Object::_nil ()),
-    event_service_ (CORBA_Object::_nil ())
-{
-}
-
-CORBA_ORB::~CORBA_ORB (void)
-{
-  TAO_ORB_Core_instance ()->fini ();
-
-  // This assertion isn't valid because our ORB is a singleton assert
-  // (refcount_ == 0);
-}
-
-// Set up listening endpoints.
-
-int
-CORBA_ORB::open (void)
-{
-  if (this->open_called_ != CORBA::B_FALSE)
-    return 1;
-
-  this->open_called_ = CORBA::B_TRUE;
-
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance ();
-  TAO_Server_Strategy_Factory *f = ocp->server_factory ();
-
-  // Initialize the endpoint ... or try!
-
-  if (ocp->acceptor ()->open (ocp->orb_params ()->addr (),
-                              ocp->reactor(),
-                              f->creation_strategy (),
-                              f->accept_strategy (),
-                              f->concurrency_strategy (),
-                              f->scheduling_strategy ()) == -1)
-    // Need to return an error somehow!!  Maybe set do_exit?
-    return -1;
-
-  if (ocp->acceptor ()->acceptor ().get_local_addr (ocp->addr ()) == -1)
-    return -1;
-
-  ocp->orb_params ()->addr (ocp->addr ());
-
-  return 0;
-}
-
-void
-CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
-{
-  ACE_UNUSED_ARG (wait_for_completion);
-
-  this->should_shutdown_ = CORBA::B_TRUE;
-  TAO_ORB_Core_instance ()->reactor ()->wakeup_all_threads ();
-  return;
-}
-
-ULONG
-CORBA_ORB::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-void
-CORBA_ORB::create_list (CORBA::Long count,
-                        CORBA::NVList_ptr &retval)
-{
-  assert (CORBA::ULong (count) <= UINT_MAX);
-
-  // create an empty list
-  retval = new CORBA::NVList;
-
-  // if count is greater than 0, create a list of NamedValues
-  if (count != 0)
-    {
-      retval->len_ = 0;
-      retval->max_ = (CORBA::ULong) count;
-      retval->values_ = (CORBA::NamedValue_ptr) ACE_OS::calloc ((u_int) count,
-                                                                sizeof (CORBA::NamedValue));
-      for (CORBA::Long i=0; i < count; i++)
-        {
-          // initilaize the NamedValue
-          (void) new (&retval->values_[i]) CORBA::NamedValue;
-        }
-    }
-}
-
-int
-CORBA_ORB::perform_work (ACE_Time_Value *tv)
-{
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  // Set the owning thread of the Reactor to the one which we're
-  // currently in.  This is necessary b/c it's possible that the
-  // application is calling us from a thread other than that in which
-  // the Reactor's CTOR (which sets the owner) was called.
-  r->owner (ACE_Thread::self ());
-
-  return r->handle_events (tv);
-}
-
-int
-CORBA_ORB::run (ACE_Time_Value *tv)
-{
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  // Set the owning thread of the Reactor to the one which we're
-  // currently in.  This is necessary b/c it's possible that the
-  // application is calling us from a thread other than that in which
-  // the Reactor's CTOR (which sets the owner) was called.
-  r->owner (ACE_Thread::self ());
-
-  // This method should only be called by servers, so now we set up
-  // for listening!
-  if (this->open () == -1)
-    return -1;
-
-  // Loop "forever" handling client requests.
-
-  while (this->should_shutdown_ == 0)
-    {
-      ACE_TIMEPROBE ("  -> CORBA_ORB::run handling events");
-      switch (r->handle_events (tv))
-        {
-        case 0: // Timed out, so we return to caller.
-          return 0;
-          /* NOTREACHED */
-        case -1: // Something else has gone wrong, so return to caller.
-          return -1;
-          /* NOTREACHED */
-        default: // Some handlers were dispatched, so keep on processing
-                 // requests until we're told to shutdown .
-          ACE_TIMEPROBE ("  -> CORBA_ORB::run events handled");
-          break;
-          /* NOTREACHED */
-        }
-    }
-  /* NOTREACHED */
-  return 0;
-}
-
-int
-CORBA_ORB::run (const ACE_Time_Value &tv)
-{
-  return this->run ((ACE_Time_Value *) &tv);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_poa (void)
-{
-  CORBA::Environment env;
-
-  TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-
-  PortableServer::POA_var result = poa->_this (env);
-  if (env.exception () != 0)
-    return CORBA_Object::_nil ();
-  else
-    return result._retn ();
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (void)
-{
-  // Return the pointer to this thread's POACurrent.
-
-  CORBA::Environment env;
-
-  TAO_POA_Current *poa_current = TAO_ORB_Core_instance ()->poa_current ();
-  if (poa_current == 0)
-    return CORBA_Object::_nil ();
-
-  PortableServer::Current_var result = poa_current->_this (env);
-  if (env.exception () != 0)
-    return CORBA_Object::_nil ();
-  else
-    return result._retn ();
-}
-
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_name_service (void)
-{
-  CORBA::Environment env;
-  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
-
-  // First check to see if we've already initialized this.
-  if (this->name_service_ != CORBA_Object::_nil ())
-    // @@ Someone please double-check this ;-)
-    return_value = this->name_service_;
-
-  char *name_service_ior =
-    TAO_ORB_Core_instance ()->orb_params ()->name_service_ior ();
-
-  // Second, check to see if the user has give us a parameter on
-  // the command-line.
-  if (name_service_ior == 0)
-    // Third, check to see if the user has an environment variable.
-    name_service_ior = ACE_OS::getenv ("NameService");
-
-  if (name_service_ior != 0)
-    {
-      this->name_service_ =
-        this->string_to_object (name_service_ior, env);
-
-      // check for errors
-      if (env.exception () != 0)
-        this->name_service_ = CORBA_Object::_nil ();
-
-      // Return ior.
-      return_value = this->name_service_;
-    }
-  else
-    {
-      // First, determine if the port was supplied on the command line
-      u_short port =
-        TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
-
-      if (port == 0)
-        {
-          // Look for the port among our environment variables.
-          const char *port_number = ACE_OS::getenv ("NameServicePort");
-
-          if (port_number != 0)
-            port = ACE_OS::atoi (port_number);
-          else
-            port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-        }
-
-      return_value =
-        this->multicast_to_service (TAO_SERVICEID_NAMESERVICE, port);
-    }
-
-  return CORBA_Object::_duplicate (return_value);
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_trading_service (void)
-{
-  CORBA::Environment env;
-  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
-
-  // First check to see if we've already initialized this.
-  if (this->trading_service_ != CORBA_Object::_nil ())
-    // @@ Someone please double-check this ;-)
-    return_value = this->trading_service_;
-  else
-    {
-      char *trading_service_ior =
-        TAO_ORB_Core_instance ()->orb_params ()->trading_service_ior ();
-
-      // Second, check to see if the user has give us a parameter on
-      // the command-line.
-      if (trading_service_ior == 0)
-        // Third, check to see if the user has an environment variable.
-        trading_service_ior = ACE_OS::getenv ("TradingService");
-
-      if (trading_service_ior != 0)
-        {
-          this->trading_service_ =
-            this->string_to_object (trading_service_ior, env);
-
-          // check for errors
-          if (env.exception () != 0)
-            this->trading_service_ = CORBA_Object::_nil ();
-
-          // Return ior.
-          return_value = this->trading_service_;
-        }
-      else
-        {
-          // First, determine if the port was supplied on the command line
-          u_short port =
-            TAO_ORB_Core_instance ()->orb_params ()->trading_service_port ();
-
-          if (port == 0)
-            {
-              // Look for the port among our environment variables.
-              const char *port_number = ACE_OS::getenv ("TradingServicePort");
-
-              if (port_number != 0)
-                port = ACE_OS::atoi (port_number);
-              else
-                port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
-            }
-
-          return_value =
-            this->multicast_to_service (TAO_SERVICEID_TRADINGSERVICE, port);
-        }
-    }
-
-  return CORBA_Object::_duplicate (return_value);
-}
-
-
-CORBA_Object_ptr
-CORBA_ORB::multicast_to_service (TAO_Service_ID service_id,
-                                 u_short port)
-{
-  CORBA::Environment env;
-  // Use UDP multicast to locate the  service.
-  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
-
-  // This is the code that implements the multicast
-  // Naming Service locator.
-  ACE_SOCK_Dgram_Mcast multicast;
-  ACE_INET_Addr remote_addr;
-  // This starts out initialized to all zeros!
-  ACE_INET_Addr multicast_addr (port,
-                                ACE_DEFAULT_MULTICAST_ADDR);
-
-  // Subscribe to multicast address.
-  if (multicast.subscribe (multicast_addr) == -1)
-    return return_value;
-
-  // Prepare connection for the reply.
-  ACE_INET_Addr response_addr;
-  ACE_SOCK_Dgram response;
-
-  // Choose any local port, we don't really care.
-  if (response.open (ACE_Addr::sap_any) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "open failed.\n"));
-      return return_value;
-    }
-
-  if (response.get_local_addr (response_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "get_local_addr failed.\n"));
-      return return_value;
-    }
-
-  struct
-  {
-    u_short reply_port;
-    CORBA::Short service_id;
-  } mcast_info;
-
-  // Figure out what port to listen on for server replies,
-  // and convert to network byte order.
-  mcast_info.reply_port = htons (response_addr.get_port_number ());
-  mcast_info.service_id = htons (service_id);
-
-  // Send multicast of one byte, enough to wake up server.
-  ssize_t n_bytes =
-    multicast.send (&mcast_info, sizeof (mcast_info));
-
-  ACE_DEBUG ((LM_DEBUG, "sent multicast request."));
-
-  // check for errors
-  if (n_bytes == -1)
-    return return_value;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%s; Sent multicast.  Reply port is %u.  # of bytes sent is %d.\n",
-              __FILE__,
-              response_addr.get_port_number (),
-              n_bytes));
-
-
-  // Wait for response until TAO_DEFAULT_NAME_SERVER_TIMEOUT.
-  ACE_Time_Value timeout (TAO_DEFAULT_NAME_SERVER_TIMEOUT);
-
-  // receive response message
-  char buf[ACE_MAX_DGRAM_SIZE];
-  n_bytes = response.recv (buf, BUFSIZ, remote_addr, 0, &timeout);
-
-  // Close endpoint for response.
-  int retval = response.close ();
-
-  // check for errors
-  if (n_bytes == -1 || retval == -1)
-    return return_value;
-
-  // null terminate message
-  buf[n_bytes] = 0;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%s; Service resolved to ior: '%s'\n",
-              __FILE__,
-              buf));
-
-  // convert ior to an object reference
-  CORBA_Object_ptr objectified_ior =
-    this->string_to_object ((CORBA::String) buf, env);
-
-  // check for errors
-  if (env.exception () == 0)
-    return_value = objectified_ior;
-
-  // Return ior.
-  return return_value;
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (CORBA::String name)
-{
-  if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
-    return this->resolve_name_service ();
-  if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
-    return this->resolve_trading_service ();
-  else if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_poa ();
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current ();
-  else
-    return CORBA_Object::_nil ();
-}
-
-int
-CORBA_ORB::preconnect (CORBA::String connections)
-{
-  return TAO_ORB_Core_instance ()->preconnect (connections);
-}
-
-
-// Create an objref
-
-CORBA::Object_ptr
-CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
-                          const char *type_id,
-                          CORBA::Environment &env)
-{
-  CORBA::String id;
-  IIOP_Object *data;
-
-  if (type_id)
-    id = CORBA::string_copy (type_id);
-  else
-    id = 0;
-
-  data = new IIOP_Object (id,
-                          IIOP::Profile (TAO_ORB_Core_instance ()->orb_params ()->addr (),
-                                         key));
-  if (data != 0)
-    env.clear ();
-  else
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Create the CORBA level proxy
-  CORBA_Object *new_obj = new CORBA_Object (data);
-
-  // Clean up in case of errors.
-  if (new_obj == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
-    }
-
-  return new_obj;
-}
-
-// String utility support; this can need to be integrated with the
-// ORB's own memory allocation subsystem.
-
-CORBA::String
-CORBA::string_copy (const CORBA::Char *str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::String retval =
-    CORBA::string_alloc (ACE_OS::strlen (str));
-
-  // clear the contents of the allocated string
-  ACE_OS::memset(retval, '\0', ACE_OS::strlen (str));
-
-  return ACE_OS::strcpy (retval, str);
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const char *p)
-{
-  if (this->ptr_ != 0)
-    CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const CORBA::String_var& r)
-{
-  if (this != &r)
-    {
-      if (this->ptr_ != 0)
-        CORBA::string_free (this->ptr_);
-      this->ptr_ = CORBA::string_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// Wide Character string utility support; this can need to be
-// integrated with the ORB's own memory allocation subsystem.
-
-CORBA::WString
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-CORBA::WString
-CORBA::wstring_copy (const CORBA::WChar *const str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::WString retval = CORBA::wstring_alloc (ACE_OS::wslen (str));
-  return ACE_OS::wscpy (retval, str);
-}
-
-void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-// ORB initialisation, per OMG document 94-9-46.
-//
-// XXX in addition to the "built in" Internet ORB, there will be ORBs
-// which are added separately, e.g. through a DLL listed in the
-// registry.  Registry will be used to assign orb names and to
-// establish which is the default.
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *const *argv,
-                 const char * /* orb_name */,
-                 CORBA::Environment &env)
-{
-  // Using ACE_Static_Object_Lock::instance() precludes ORB_init from
-  // being called within a static object CTOR.
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), 0));
-
-  env.clear ();
-
-  // @@ We need to make sure it's ok for the following 3
-  // initialization routines to be called multiple times.  Or better
-  // yet, ensure that we just call them the first time, e.g., by
-  // putting them in some type of TAO_Object_Manager, along with the
-  // Typecode_Constants...
-
-  // Put these initializations here so that exceptions are enabled
-  // immediately.
-  TAO_Marshal::initialize ();
-  TAO_Exceptions::init_standard_exceptions (env);
-  TAO_IIOP_Interpreter::init_table ();
-
-  if (env.exception () != 0)
-    return 0;
-
-  // Verify some of the basic implementation requirements.  This test
-  // gets optimized away by a decent compiler (or else the rest of the
-  // routine does).
-  //
-  // NOTE:  we still "just" assume that native floating point is IEEE.
-
-  if (sizeof (CORBA::Short) != 2
-      || sizeof (CORBA::Long) != 4
-      || sizeof (CORBA::LongLong) != 8
-      || sizeof (CORBA::Float) != 4
-      || sizeof (CORBA::Double) != 8
-      || sizeof (CORBA::LongDouble) != 16
-      || sizeof (CORBA::WChar) < 2
-      || sizeof (void *) != ACE_SIZEOF_VOID_P)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s; ERROR: unexpected basic type size; "
-                            "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n",
-                  __FILE__,
-                  sizeof (CORBA::Short),
-                  sizeof (CORBA::Long),
-                  sizeof (CORBA::LongLong),
-                  sizeof (CORBA::Float),
-                  sizeof (CORBA::Double),
-                  sizeof (CORBA::LongDouble),
-                  sizeof (CORBA::WChar),
-                  sizeof (void *)));
-
-      env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Initialize the ORB Core instance.
-  int result = TAO_ORB_Core_instance ()->init (argc, (char **)argv);
-
-  // check for errors and return 0 if error.
-  if (result == -1)
-    {
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  return TAO_ORB_Core_instance()->orb ();
-}
-
-#define TAO_HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr>
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Octet>;
-template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
-template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
-template class ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>;
-template class ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *>;
-template class ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Octet>
-#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
-#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>
-//#pragma instantiate TAO_HASH_ADDR
-#pragma instantiate ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
deleted file mode 100644
index ac7defa2b24..00000000000
--- a/TAO/tao/ORB.h
+++ /dev/null
@@ -1,1014 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    ORB.h
-//
-// = DESCRIPTION
-//     Header file for CORBA's <ORB> type and <CORBA> type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc. and Douglas C. Schmidt.
-//
-// ============================================================================
-
-#if !defined (TAO_ORB_H)
-#  define TAO_ORB_H
-
-#include "tao/corba.h"
-
-// ObjectIds recognized by CORBA_ORB::resolve_initial_references ()...
-// of course, no guarantees are made that the call will return
-// something useful.
-#define TAO_OBJID_NAMESERVICE      "NameService"
-#define TAO_OBJID_TRADINGSERVICE   "TradingService"
-#define TAO_OBJID_ROOTPOA          "RootPOA"
-#define TAO_OBJID_POACURRENT       "POACurrent"
-#define TAO_OBJID_INTERFACEREP     "InterfaceRepository"
-
-typedef enum
-{
-  TAO_SERVICEID_NAMESERVICE,
-  TAO_SERVICEID_TRADINGSERVICE
-} TAO_Service_ID;
-
-// For some reason, PC compilers don't implement "natural" alignment,
-// but only use fixed alignment policies.  The following #pragmas
-// configure fixed one-byte alignment policy, since some fixed policy
-// needs to apply throughout an ORB.
-
-#if defined (_MSC_VER)
-# pragma  pack (push, 1)          // VC++, stack 1-byte alignment policy
-# ifdef   _DEBUG                  // convert from VC++ convention ...
-#   define  DEBUG           // ... to normal convention
-# endif
-#elif defined (__BORLANDC__)
-# pragma option -a                // BC++, use 1 byte alignment
-#endif
-
-#if !defined (TAO_CONST)
-// Something to document the fact that we want to put 'const' in front
-// of a type, but that it won't turn out the way we want, e.g., we
-// really want to express that a CORBA_String is const, but since
-// CORBA_String is a char*, the const modifies the pointer and not the
-// pointed-to, and some compilers (like SGI's EDG-derived thang)
-// complain.
-#define TAO_CONST
-#endif /* TAO_CONST */
-
-// Forward declarations of some data types are needed.
-
-class CORBA_Any;
-class CORBA_Any_var;
-class CORBA_Any_out;
-//typedef class CORBA_Any *CORBA_Any_ptr;
-
-class CORBA_TypeCode;
-class CORBA_TypeCode_var;
-class CORBA_TypeCode_out;
-//typedef class CORBA_TypeCode *CORBA_TypeCode_ptr;
-
-class CORBA_Exception;
-//typedef class CORBA_Exception *CORBA_Exception_ptr;
-
-class CORBA_Request;
-//typedef class CORBA_Request *CORBA_Request_ptr;
-
-class CORBA_NamedValue;
-//typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
-
-class CORBA_NVList;
-//typedef class CORBA_NVList *CORBA_NVList_ptr;
-
-class CORBA_ORB;
-class CORBA_ORB_var;
-class CORBA_ORB_out;
-//typedef class CORBA_ORB *CORBA_ORB_ptr;
-
-class CORBA_Object;
-class CORBA_Object_var;
-class CORBA_Object_out;
-//typedef class CORBA_Object *CORBA_Object_ptr;
-
-class CORBA_ServerRequest;
-//typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
-
-class CORBA_Environment;
-//typedef class CORBA_Environment *CORBA_Environment_ptr;
-
-class CORBA_Principal;
-//typedef class CORBA_Principal *CORBA_Principal_ptr;
-
-class CORBA_SystemException;
-class CORBA_UserException;
-
-// forward declarations of system exceptions
-#define TAO_SYSTEM_EXCEPTION(name) class CORBA_ ## name
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-TAO_SYSTEM_EXCEPTION(INTERNAL);
-TAO_SYSTEM_EXCEPTION(MARSHAL);
-TAO_SYSTEM_EXCEPTION(INITIALIZE);
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-TAO_SYSTEM_EXCEPTION(TRANSIENT);
-TAO_SYSTEM_EXCEPTION(FREE_MEM);
-TAO_SYSTEM_EXCEPTION(INV_IDENT);
-TAO_SYSTEM_EXCEPTION(INV_FLAG);
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef TAO_SYSTEM_EXCEPTION
-
-typedef class CORBA_ImplementationDef *
-        CORBA_ImplementationDef_ptr;
-
-typedef class CORBA_InterfaceDef *
-        CORBA_InterfaceDef_ptr;
-
-// =Forward declarations
-struct TAO_Dispatch_Context;
-class TAO_Object_Table_Impl;
-class TAO_Operation_Table;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-class TAO_ORB_Parameters;
-class TAO_InputCDR;
-class TAO_OutputCDR;
-
-// The new (POA) base class for servants.
-class TAO_ServantBase;
-
-// enum values defined in nvlist.h, bitwise ORed.
-typedef u_int CORBA_Flags;
-
-#if defined (ghs) && defined (CHORUS)
-  // This is non-compliant, but a nasty but with Green Hills C++68000 1.8.8
-  // forces us into it.  TAO/tests/POA/RootPOA/RootPOA reveals the problem.
-  typedef ACE_UINT32 CORBA_Boolean;
-#else  /* ! (ghs && CHORUS) */
-  typedef u_char CORBA_Boolean;
-#endif /* ! (ghs && CHORUS) */
-
-// forward declare sequences.
-template <class T> class TAO_Unbounded_Sequence;
-
-template <class T>
-class CORBA_SEQUENCE
-{
-  // = TITLE
-  //    Utility template class.
-public:
-  // @@ Is there any reason we don't use CORBA::Long here?
-#if ACE_SIZEOF_LONG == 4
-  u_long maximum;
-  u_long length;
-#else
-  // = Just assume "int" is four bytes long ...
-  u_int maximum;
-  u_int length;
-#endif /* ACE_SIZEOF_LONG */
-  T *buffer;
-  CORBA_Boolean release;
-  // Only here to make it compliant with IDL-generated layout.
-
-  CORBA_SEQUENCE (void)
-    : maximum (0),
-      length (0),
-      buffer (0),
-      release (0)
-  {
-  }
-  // Constructor.
-
-  ~CORBA_SEQUENCE (void)
-  {
-    // @@ destructor should free buffer, elements!!
-  }
-  // Destructor.
-};
-
-class TAO_Export CORBA
-{
-  // = TITLE
-  //    Provides the CORBA namespace.
-  //
-  // = DESCRIPTION
-  //    This class allows the use of CORBA::Foo, as well as CORBA_Foo
-  //    for all standard types Foo.
-public:
-  enum { B_FALSE = 0, B_TRUE = 1 };
-
-  typedef CORBA_Boolean Boolean;
-  typedef Boolean &Boolean_out;
-  // Out type for boolean.
-
-  typedef u_char Octet;
-  typedef Octet  &Octet_out;
-  // Out type for octet.
-
-  typedef ACE_INT16 Short;
-  typedef Short &Short_out;
-  // Out type for Short.
-
-  typedef ACE_UINT16 UShort;
-  typedef UShort &UShort_out;
-  // Out type for UShort.
-
-  // = CORBA "Long" (and its unsigned cousin) are 32 bits.
-  typedef ACE_INT32 Long;
-  typedef ACE_UINT32 ULong;
-
-  // 94-9-32 Appendix A, also the OMG C++ mapping, stipulate that 64
-  // bit integers are "LongLong".
-  typedef Long &Long_out;
-  // Out type for long.
-
-  typedef ULong &ULong_out;
-  // Out type for unsigned long.
-
-  // = The following are IDL extensions, not yet standard.
-
-  typedef ACE_UINT64 ULongLong;
-# if defined (_MSC_VER) && _MSC_VER >= 900
-    typedef __int64 LongLong;
-# elif ACE_SIZEOF_LONG == 8
-    typedef long LongLong;
-# elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
-#   if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
-      // sun #defines u_longlong_t, maybe other platforms do also.
-      // Use it, at least with g++, so that its -pedantic doesn't
-      // complain about no ANSI C++ long long.
-      typedef longlong_t LongLong;
-#   else
-      // LynxOS 2.5.0 and Linux don't have u_longlong_t.
-      typedef long long LongLong;
-#   endif /* sun */
-# else  /* no native 64 bit integer type */
-
-    // If "long long" isn't native, programs can't use these data
-    // types in normal arithmetic expressions.  If any particular
-    // application can cope with the loss of range, it can define
-    // conversion operators itself.
-#   define NONNATIVE_LONGLONG
-#   if defined (ACE_BIG_ENDIAN)
-      struct LongLong { Long h, l; };
-#   else
-      struct LongLong { Long l, h; };
-#   endif /* ! ACE_BIG_ENDIAN */
-# endif /* no native 64 bit integer type */
-
-  typedef LongLong &LongLong_out;
-  // Out type for long long.
-
-  typedef ULongLong &ULongLong_out;
-  // Out type for unsigned long long.
-
-# if ACE_SIZEOF_FLOAT == 4
-    typedef float Float;
-# else  /* ACE_SIZEOF_FLOAT != 4 */
-#   define TAO_NONNATIVE_FLOAT
-    struct Float
-    {
-#     if ACE_SIZEOF_INT == 4
-        // Use u_int to get word alignment.
-        u_int f;
-#     else  /* ACE_SIZEOF_INT != 4 */
-        // Applications will probably have trouble with this.
-        char f[4];
-#     endif /* ACE_SIZEOF_INT != 4 */
-    };
-# endif /* ACE_SIZEOF_FLOAT != 4 */
-  typedef Float &Float_out; // out type for float
-
-# if ACE_SIZEOF_DOUBLE == 8
-    typedef double Double;
-# else  /* ACE_SIZEOF_DOUBLE != 8 */
-#   define TAO_NONNATIVE_DOUBLE
-    struct Double
-    {
-#     if ACE_SIZEOF_LONG == 8
-        // Use u_long to get word alignment.
-        u_long f;
-#     else  /* ACE_SIZEOF_INT != 8 */
-        // Applications will probably have trouble with this.
-        char f[8];
-#     endif /* ACE_SIZEOF_INT != 8 */
-    };
-# endif /* ACE_SIZEOF_DOUBLE != 8 */
-  typedef Double &Double_out;
-  // Out type for double.
-
-  // 94-9-32 Appendix A defines a 128 bit floating point "long double"
-  // data type, with greatly extended precision and four more bits of
-  // exponent (compared to "double").  This is an IDL extension, not
-  // yet standard.
-
-#  if   ACE_SIZEOF_LONG_DOUBLE == 16
-  typedef long double LongDouble;
-#  else
-#    define NONNATIVE_LONGDOUBLE
-  struct LongDouble
-  {
-    char ld[16];
-  };
-#  endif /* ACE_SIZEOF_LONG_DOUBLE != 16 */
-
-  typedef LongDouble &LongDouble_out;
-  // Out type for long doubles.
-
-  typedef char Char;
-  typedef Char &Char_out;
-  // Out type for char.
-
-  typedef CORBA_SEQUENCE<Octet> OctetSeq;
-
-  typedef Char *String;
-
-  // = String memory management.
-  static String string_alloc (ULong len);
-  static String string_copy (const Char *);
-  static String string_dup (const Char *);
-  static void string_free (Char *);
-
-  class TAO_Export String_var
-  {
-    // = TITLE
-    //   String var class. Provides automatic deallocation of storage
-    //   for the string once it goes out of scope.
-  public:
-    String_var (void);
-    // default constructor.
-
-    String_var (char *p);
-    // constructor, owns p.
-
-    String_var (const char *p);
-    // constructor. Makes a copy of p.
-
-    String_var (const String_var &s);
-    // copy constructor.
-
-    ~String_var (void);
-    // destructor.
-
-    String_var &operator= (char *p);
-    // assignment operator.
-
-    String_var &operator= (const char *p);
-    // assignment to a const char*.  Makes a copy.
-
-    String_var &operator= (const String_var &s);
-    // assignment operator.
-
-    operator char *();
-    // access and modify.
-
-    operator const char *() const;
-    // only read privileges.
-
-    char &operator[] (ULong index);
-    // allows access and modification using an index.
-
-    char operator[] (ULong index) const;
-    // allows only accessing thru an index.
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    const char *in (void) const;
-    // for in parameter.
-
-    char *&inout (void);
-    // for inout parameter.
-
-    char *&out (void);
-    // for out parameter.
-
-    char *_retn (void);
-    // for string of return type.
-
-  private:
-    char *ptr_;
-    // instance.
-  };
-
-  class TAO_Export String_out
-  {
-    // = TITLE
-    //   String_out
-    //
-    // = DESCRIPTION
-    //   To support the memory management for "out" parameter passing
-    //   mode.  ORBOS/97-05-15, Appendix C.2 defines a String_out class
-  public:
-    // = operations.
-
-    String_out (char *&p);
-    // Construction from a reference to a string.
-
-    String_out (String_var &p);
-    // Construction from a var.
-
-    String_out (String_out &s);
-    // Copy constructor.
-
-    String_out &operator= (String_out &s);
-    // Assignment from a string_out.
-
-    String_out &operator= (char *p);
-    // Assignment from a string.
-
-    String_out &operator= (const char *p);
-    // Assignment from a const string.
-
-    operator char *&();
-    // Cast.
-
-    char *&ptr (void);
-    // Return underlying instance.
-
-  private:
-    char *&ptr_;
-    // Instance.
-
-    // assignment from _var disallowed
-    void operator= (const String_var &);
-  };
-
-  // WChar is an IDL extension, not yet standard.  We use 32 bits
-  // because that's what many platforms use for their native wchar_t.
-
-  typedef ACE_OS::WChar WChar;
-  typedef WChar *WString;
-
-  typedef WChar &WChar_out;
-  // Out type for WChar.
-
-  // = String memory management routines.
-  static WString wstring_alloc (ULong len);
-  static WString wstring_copy (const WChar *const);
-  static WString wstring_dup (const WChar *const);
-  static void wstring_free (WChar *const);
-
-  // = various CORBA defined classes.
-  typedef CORBA_Any Any;
-  typedef CORBA_Any_var Any_var;
-  typedef CORBA_Any_out Any_out;
-  typedef Any *Any_ptr;
-
-  typedef CORBA_Environment Environment;
-  typedef Environment *Environment_ptr;
-
-  typedef CORBA_Exception Exception;
-  typedef Exception *Exception_ptr;
-
-  typedef CORBA_NamedValue NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  typedef CORBA_NVList NVList;
-  typedef NVList *NVList_ptr;
-
-  typedef CORBA_Object Object;
-  typedef CORBA_Object *Object_ptr;
-  typedef CORBA_Object_var Object_var;
-  typedef CORBA_Object_out Object_out;
-
-  typedef CORBA_Principal Principal;
-  typedef CORBA_Principal *Principal_ptr;
-
-  typedef CORBA_ORB ORB;
-  typedef CORBA_ORB *ORB_ptr;
-  typedef CORBA_ORB_var ORB_var;
-  typedef CORBA_ORB_out ORB_out;
-
-  typedef CORBA_Request Request;
-  typedef Request *Request_ptr;
-
-  typedef CORBA_ServerRequest ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-
-  typedef CORBA_SystemException
-  SystemException;
-
-  typedef CORBA_TypeCode TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-  typedef CORBA_TypeCode_var TypeCode_var;
-  typedef CORBA_TypeCode_out TypeCode_out;
-
-  typedef CORBA_UserException  UserException;
-
-  typedef CORBA_SEQUENCE<TypeCode_ptr> ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
-
-  typedef CORBA_ImplementationDef *ImplementationDef_ptr;
-
-  typedef class CORBA_InterfaceDef *InterfaceDef_ptr;
-
-  // enum values defined in nvlist.hh, bitwise ORed.
-  typedef u_int Flags;
-
-  enum CompletionStatus
-  {
-    // = Completion Status for System exceptions
-
-    COMPLETED_YES,     // successful or exceptional completion
-    COMPLETED_NO,      // didn't change any state; retry is OK
-    COMPLETED_MAYBE    // can't say what happened; retry unsafe
-  };
-
-  enum ExceptionType
-  {
-    // = Exception type.
-
-    NO_EXCEPTION,
-    SYSTEM_EXCEPTION,
-    USER_EXCEPTION
-  };
-
-  // all the system exception classes
-#define TAO_SYSTEM_EXCEPTION(name) \
-  typedef CORBA_ ## name      name
-  TAO_SYSTEM_EXCEPTION(UNKNOWN);
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-  TAO_SYSTEM_EXCEPTION(INTERNAL);
-  TAO_SYSTEM_EXCEPTION(MARSHAL);
-  TAO_SYSTEM_EXCEPTION(INITIALIZE);
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-  TAO_SYSTEM_EXCEPTION(TRANSIENT);
-  TAO_SYSTEM_EXCEPTION(FREE_MEM);
-  TAO_SYSTEM_EXCEPTION(INV_IDENT);
-  TAO_SYSTEM_EXCEPTION(INV_FLAG);
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef TAO_SYSTEM_EXCEPTION
-
-  // = all the CORBA::is_nil methods.
-  static Boolean is_nil (Object_ptr);
-  static Boolean is_nil (Environment_ptr);
-  static Boolean is_nil (NamedValue_ptr);
-  static Boolean is_nil (NVList_ptr);
-  static Boolean is_nil (Request_ptr);
-  //  static Boolean is_nil (Context_ptr);
-  static Boolean is_nil (TypeCode_ptr);
-  static Boolean is_nil (ORB_ptr);
-  static Boolean is_nil (Principal_ptr);
-  static Boolean is_nil (ServerRequest_ptr req);
-
-  // = all the CORBA release methods.
-  static void release (Object_ptr);
-  static void release (Environment_ptr);
-  static void release (NamedValue_ptr);
-  static void release (NVList_ptr);
-  static void release (Request_ptr);
-  static void release (Principal_ptr);
-  //  static Boolean release (Context_ptr);
-  static void release (TypeCode_ptr);
-  static void release (ORB_ptr);
-  static void release (ServerRequest_ptr req);
-
-  enum TCKind
-  {
-    // = Kinds of typecodes.
-
-    // Do not change these enum values, or duplicate them if you need
-    // to add values.  They are used to index tables, and if you
-    // change the values you'll need to find and update all of those
-    // tables.  The values are also part of the Common Data
-    // Representation, and hence are part of IIOP and other ORB
-    // protocols.
-
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,           // 94-11-7
-    tk_except             = 22,           // 94-11-7
-
-    // = These five are OMG-IDL data type extensions.
-    tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-    tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-    tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-    tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-    tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-
-    // This symbol is not defined by CORBA 2.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-  // All the typecode constants
-  static TypeCode_ptr _tc_null;
-  static TypeCode_ptr _tc_void;
-  static TypeCode_ptr _tc_short;
-  static TypeCode_ptr _tc_long;
-  static TypeCode_ptr _tc_ushort;
-  static TypeCode_ptr _tc_ulong;
-  static TypeCode_ptr _tc_float;
-  static TypeCode_ptr _tc_double;
-  static TypeCode_ptr _tc_boolean;
-  static TypeCode_ptr _tc_char;
-  static TypeCode_ptr _tc_octet;
-  static TypeCode_ptr _tc_any;
-  static TypeCode_ptr _tc_TypeCode;
-  static TypeCode_ptr _tc_Principal;
-  static TypeCode_ptr _tc_Object;
-  static TypeCode_ptr _tc_struct;
-  static TypeCode_ptr _tc_union;
-  static TypeCode_ptr _tc_enum;
-  static TypeCode_ptr _tc_string;
-  static TypeCode_ptr _tc_sequence;
-  static TypeCode_ptr _tc_array;
-  static TypeCode_ptr _tc_alias;
-  static TypeCode_ptr _tc_except;
-  static TypeCode_ptr _tc_longlong;
-  static TypeCode_ptr _tc_ulonglong;
-  static TypeCode_ptr _tc_longdouble;
-  static TypeCode_ptr _tc_wchar;
-  static TypeCode_ptr _tc_wstring;
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  static TypeCode_ptr          _tc_ ## name
-
-  TAO_SYSTEM_EXCEPTION(UNKNOWN);
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-  TAO_SYSTEM_EXCEPTION(INTERNAL);
-  TAO_SYSTEM_EXCEPTION(MARSHAL);
-  TAO_SYSTEM_EXCEPTION(INITIALIZE);
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-  TAO_SYSTEM_EXCEPTION(TRANSIENT);
-  TAO_SYSTEM_EXCEPTION(FREE_MEM);
-  TAO_SYSTEM_EXCEPTION(INV_IDENT);
-  TAO_SYSTEM_EXCEPTION(INV_FLAG);
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef  TAO_SYSTEM_EXCEPTION
-
-  static TypeCode_ptr _tc_Bounds;
-  static TypeCode_ptr _tc_BadKind;
-
-  static ORB_ptr ORB_init (int &argc,
-                           char *const *argv,
-                           const char *orb_name,
-                           Environment &env);
-  // ORB initialisation, per OMG document 94-9-46.
-
-  enum
-  {
-    // = Define flags for NVList add methods
-
-    ARG_IN = 0x01,
-    ARG_OUT = 0x02,
-    ARG_INOUT = 0x04,
-    IN_COPY_VALUE = 0x08,
-    OUT_LIST_MEMORY = 0x10
-  };
-};  // end of class (namespace) CORBA
-
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.h"
-#include "tao/Object_KeyC.h"
-
-class STUB_Object;
-// Forward declaration.
-
-class TAO_Export CORBA_ORB
-{
-  // = TITLE
-  //   ORB pseudo-objref.
-  //
-  // = DESCRIPTION
-  //   The "ORB" pseudo-object is used in bootstrapping, such as to
-  //   create object references from strings.  It's also used to
-  //   create strings from object references.
-public:
-  static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
-  // Return a duplicate of <{orb}>.  When work with this duplicate is
-  // complete, it should be freed up using <CORBA::release()>.
-
-  static CORBA::ORB_ptr _nil (void);
-  // Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
-  // can be used for initialization or in comparisons.
-
-  virtual CORBA::Object_ptr string_to_object (CORBA::String str,
-                                              CORBA::Environment &env) = 0;
-  // Turn a string-ified object reference back into an object pointer.
-  // Each type of ORB, e.g. an IIOP ORB, must implement this.
-  // Typically these strings are created using <object_to_string()>.
-  virtual CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                          CORBA::Environment &env) = 0;
-  // Turn an object reference into a string.  Each type of ORB,
-  // e.g. an IIOP ORB, must implement this.  This can be used by
-  // servers to publish their whereabouts to clients.  The output of
-  // this is typically eventually given to <string_to_object()> as an
-  // argument.
-
-  virtual int _register_collocation (ACE_Addr &) = 0;
-  // @@ Should I use ACE_Addr instead of void *?
-  // Register an "end-point" where the collocated objects can be
-  // found.  Each type of ORB, e. g., IIOP ORB must implement this.
-  // Returns 0 if the endpoint gets register properly, non-zero
-  // otherwise.
-
-  virtual TAO_ServantBase *_get_collocated_servant (STUB_Object *p) = 0;
-  // Return the object pointer of an collocated object it there is
-  // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
-  // must implement this and determine what is a collocated object
-  // based on information provided in the STUB_Object.
-
-  void create_list (CORBA::Long count,
-                    CORBA::NVList_ptr &retval);
-
-  // = New Things from the POA Specification
-  //
-  // Of all of these operations, only <run> is currently implemented.
-  // Others require clarification of design or more implementation
-  // than is currently available.
-
-  CORBA::Boolean work_pending (void);
-  // Returns an indication of whether the ORB needs the <{main thread}> to
-  // perform some work.
-
-  int perform_work (ACE_Time_Value * = 0);
-  // If called by the <{main thread}>, this operation performs an
-  // implementation-defined unit of work. Otherwise, it does nothing.
-  //
-  // It is platform-specific how the application and ORB arrange to
-  // use compatible threading primitives.
-
-  int run (ACE_Time_Value *tv = 0);
-  // Instructs the ORB to initialize itself and run its event loop in
-  // the current thread, not returning until the ORB has shut down.
-  // If an error occurs during initialization or a run-time this
-  // method will return -1.  If <tv> is non-NULL then if no requests
-  // arrive at this thread before the timeout elapses we return to the
-  // caller with a value of 0 (this allows timeouts).  Otherwise, if
-  // we've returned since we've been asked to shut down the value of 1
-  // is returned.
-  //
-  // <{Note that this interface differs from the POA specification,
-  // which is reproduced below:}>
-  //
-  // Returns when the ORB has shut down.  If called by the main
-  // thread, it enables the ORB to perform work using the main
-  // thread. Otherwise, it simply waits until the ORB has shut down.
-  //
-  // This operation can be used instead of perform_work() to give the
-  // main thread to the ORB if there are no other activities that need
-  // to share the main thread. Even in a pure multi-threaded server,
-  // calling run() in the main thread is useful to ensure that the
-  // process does not exit until the ORB has been shut down.
-
-  void shutdown (CORBA::Boolean wait_for_completion = CORBA::B_FALSE);
-  // This operation instructs the ORB to shut down. Shutting down the
-  // ORB causes all Object Adapters to be shut down. If
-  // <wait_for_completion> parameter is TRUE, this operation blocks
-  // until all ORB processing (including request processing and object
-  // deactivation or other operations associated with object adapters)
-  // has completed.  <[NOTE]> <wait_for_completion>=TRUE is not
-  // currently supported.
-
-  CORBA_Object_ptr resolve_initial_references (CORBA::String name);
-  // This method acts as a miniature name service provided by the ORB
-  // for certain well-known object references.  TAO supports the
-  // "NameService", "TradingService", "RootPOA", and "POACurrent" via
-  // this method.
-
-  // = TAO-specific Extensions
-
-  CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
-                                  const char *type_id,
-                                  CORBA::Environment &env);
-  // Convert key into an object reference.  Return Object_ptr as out
-  // parameter.  Errors will come through the environment.
-  //
-  // Object IDs are assigned and used by servers to identify objects.
-  //
-  // Type IDs are repository IDs, assigned as part of OMG-IDL
-  // interface definition to identify specific interfaces and their
-  // relationships to other OMG-IDL interfaces.  It's OK to provide a
-  // null type ID.  Providing a null object key will result in an
-  // INV_OBJREF exception.
-  //
-  // Clients which invoke operations using one of these references
-  // when the server is not active (or after the last reference to the
-  // POA is released) will normally see an OBJECT_NOT_EXIST exception
-  // reported by the ORB.  If the POA is a "Named POA" the client's
-  // ORB will not normally return OBJECT_NOT_EXIST unless the POA
-  // reports that fault.
-
-  int run (const ACE_Time_Value &tv);
-  // This is the same as the more "standard" <run> method, except that
-  // you don't need to put the & in front of <tv>.
-
-  int preconnect (CORBA::String connections);
-  // Establish connectsion to each of the comma-separated
-  // <{host}>:<{port}> combinations specified in <connections>.
-
-  // This class is intended to be inherited by others, which will
-  // provide some more of the CORBA support.  Implementations of this
-  // "CORBA::ORB" class must know how to create stringify/destringify
-  // their objrefs, as well as how to marshal and unmarshal them.
-  ULONG AddRef (void);
-  ULONG Release (void);
-
-  int open (void);
-  // Set up the ORB Core's acceptor to listen on the
-  // previously-specified port for requests.  Returns -1 on failure,
-  // else 0.
-
-protected:
-  // We must be created via the <ORB_init> call.
-  CORBA_ORB (void);
-  virtual ~CORBA_ORB (void);
-
-  CORBA_Object_ptr resolve_poa (void);
-  // Resolve the POA.
-
-  CORBA_Object_ptr resolve_poa_current (void);
-  // Resolve the POA current.
-
-private:
-  CORBA_Object_ptr resolve_name_service (void);
-  // Resolve the name service object reference.
-
-  CORBA_Object_ptr resolve_trading_service (void);
-  // Resolve the trading object reference.
-
-  CORBA_Object_ptr multicast_to_service (TAO_Service_ID service_id,
-                                         u_short port);
-  // Resolve the refernce of a service of type <name>.
-
-  ACE_SYNCH_MUTEX lock_;
-  u_int refcount_;
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int> open_called_;
-  // Flag which denotes that the open method was called.
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int> should_shutdown_;
-  // Flag which denotes that the ORB should shut down and <run> should
-  // return.
-
-  CORBA_Object_ptr name_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Naming Context.
-
-  CORBA_Object_ptr schedule_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured RtecScheduler::Scheduler.
-
-  CORBA_Object_ptr event_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Event Channel.
-
-  CORBA_Object_ptr trading_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Trading.
-
-  // = NON-PROVIDED METHODS
-  CORBA_ORB (const CORBA_ORB &);
-  CORBA_ORB &operator= (const CORBA_ORB &);
-};
-
-class TAO_Export CORBA_ORB_var
-{
-public:
-  CORBA_ORB_var (void); // default constructor
-  CORBA_ORB_var (CORBA::ORB_ptr);
-  CORBA_ORB_var (const CORBA_ORB_var &); // copy constructor
-  ~CORBA_ORB_var (void); // destructor
-
-  CORBA_ORB_var &operator= (CORBA::ORB_ptr);
-  CORBA_ORB_var &operator= (const CORBA_ORB_var &);
-  CORBA::ORB_ptr operator-> (void) const;
-
-  operator const CORBA::ORB_ptr &() const;
-  operator CORBA::ORB_ptr &();
-  // in, inout, out, _retn
-  CORBA::ORB_ptr in (void) const;
-  CORBA::ORB_ptr &inout (void);
-  CORBA::ORB_ptr &out (void);
-  CORBA::ORB_ptr _retn (void);
-  CORBA::ORB_ptr ptr (void) const;
-
-private:
-  CORBA::ORB_ptr ptr_;
-};
-
-class TAO_Export CORBA_ORB_out
-{
-public:
-  CORBA_ORB_out (CORBA::ORB_ptr &);
-  CORBA_ORB_out (CORBA_ORB_var &);
-  CORBA_ORB_out (CORBA_ORB_out &);
-  CORBA_ORB_out &operator= (CORBA_ORB_out &);
-  CORBA_ORB_out &operator= (const CORBA_ORB_var &);
-  CORBA_ORB_out &operator= (CORBA::ORB_ptr);
-  operator CORBA::ORB_ptr &();
-  CORBA::ORB_ptr &ptr (void);
-  CORBA::ORB_ptr operator-> (void);
-
-private:
-  CORBA::ORB_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB.i"
-#endif /* __ACE_INLINE__ */
-
-// Signature of a skeleton for every operation of an interface.
-typedef void (*TAO_Skeleton)(CORBA::ServerRequest &,
-                             void *, // object_ptr
-                             void *, // context_ptr
-                             CORBA::Environment &);
-
-// COM interface IIDs
-extern "C" TAO_Export const TAO_IID IID_CORBA_Any;
-extern "C" TAO_Export const TAO_IID IID_BOA;
-extern "C" TAO_Export const TAO_IID IID_CORBA_Exception;
-extern "C" TAO_Export const TAO_IID IID_CORBA_UserException;
-extern "C" TAO_Export const TAO_IID IID_CORBA_SystemException;
-extern "C" TAO_Export const TAO_IID IID_CORBA_Request;
-extern "C" TAO_Export const TAO_IID IID_CORBA_Object;
-extern "C" TAO_Export const TAO_IID IID_CORBA_ORB;
-extern "C" TAO_Export const TAO_IID IID_CORBA_NVList;
-extern "C" TAO_Export const TAO_IID IID_CORBA_Principal;
-extern "C" TAO_Export const TAO_IID IID_CORBA_TypeCode;
-extern "C" TAO_Export const TAO_IID IID_CORBA_ServerRequest;
-extern "C" TAO_Export const TAO_IID IID_IIOP_ServerRequest;
-extern "C" TAO_Export const TAO_IID IID_STUB_Object;
-extern "C" TAO_Export const TAO_IID IID_IIOP_Object;
-
-// NOTE: stub APIs are nonportable, and must be explicitly #included
-// by code emitted from an IDL compiler.
-
-#if     defined (_MSC_VER)
-#       pragma pack (pop)               // VC++, goes back to other padding rules
-#endif /* _MSV_VER */
-
-#endif /* TAO_ORB_H */
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
deleted file mode 100644
index 10b5e501d0e..00000000000
--- a/TAO/tao/ORB.i
+++ /dev/null
@@ -1,363 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// String utility support.  Since these are static methods we need to
-// explicitly export them from the DLL.
-
-ACE_INLINE TAO_Export CORBA::String
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // Allocate 1 + strlen to accomodate the null terminating character.
-  return new CORBA::Char[size_t (len + 1)];
-}
-
-ACE_INLINE TAO_Export void
-CORBA::string_free (CORBA::Char *str)
-{
-  delete [] str;
-}
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA::String_var::String_var (void)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (const char *p)
-  : ptr_ (CORBA::string_dup ((char *) p))
-{
-}
-
-ACE_INLINE CORBA::Char &
-CORBA::String_var::operator[] (CORBA::ULong index)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[index];
-}
-
-ACE_INLINE CORBA::Char
-CORBA::String_var::operator[] (CORBA::ULong index) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[index];
-}
-
-ACE_INLINE
-CORBA::String_var::operator char *()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::String_var::operator const char *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-CORBA::String_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-CORBA::String_var::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::String_out::String_out (char *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (CORBA::String_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (char *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const char *s)
-{
-  this->ptr_ = CORBA::string_dup (s);
-  return *this;
-}
-
-ACE_INLINE
-CORBA::String_out::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------------------------
-// Wide strings
-// ----------------------------------------------------------------------
-
-ACE_INLINE TAO_Export CORBA::WString
-CORBA::wstring_dup (const WChar *const str)
-{
-  return CORBA::wstring_copy (str);
-}
-
-// CORBA dup/release build on top of COM's (why not).
-
-ACE_INLINE void
-CORBA::release (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->Release ();
-}
-
-ACE_INLINE ULONG
-CORBA_ORB::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  return refcount_++;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_duplicate (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->AddRef ();
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::ORB_ptr obj)
-{
-  return (CORBA::Boolean) (obj == 0);
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA_ORB::work_pending (void)
-{
-  // There's ALWAYS work to do ;-)
-  return CORBA::B_TRUE;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (void) // default constructor
-  : ptr_ (CORBA_ORB::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (CORBA::ORB_ptr p)
-        : ptr_ (p)
-{
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (const CORBA_ORB_var &p) // copy constructor
-  : ptr_ (CORBA_ORB::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE
-CORBA_ORB_var::~CORBA_ORB_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (CORBA::ORB_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (const CORBA_ORB_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_var::operator const CORBA::ORB_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_var::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ORB_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ORB::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA::ORB_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA_ORB_var &p) // constructor from _var
-        : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA_ORB_out &p) // copy constructor
-        : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA_ORB_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (const CORBA_ORB_var &p)
-{
-  this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA::ORB_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_out::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
deleted file mode 100644
index a966171125c..00000000000
--- a/TAO/tao/ORB_Core.cpp
+++ /dev/null
@@ -1,1045 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Repository.h"
-#include "ace/Select_Reactor.h"
-#include "ace/Env_Value_T.h"
-#include "tao/TAO_Internal.h"
-#include "tao/Arg_Shifter.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
-#endif /* ! __ACE_INLINE__ */
-
-typedef ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>
-        TAO_ORB_CORE;
-
-TAO_ORB_Core::TAO_ORB_Core (void)
-  : orb_ (0),
-    reactor_ (0),
-    thr_mgr_ (0),
-    connector_ (0),
-    root_poa_ (0),
-    oa_params_ (0),
-    orb_params_ (0),
-    addr_ (0),
-    acceptor_ (0),
-    poa_current_ (0),
-    resource_factory_ (0),
-    resource_factory_from_service_config_ (CORBA::B_FALSE),
-    client_factory_ (0),
-    client_factory_from_service_config_ (CORBA::B_FALSE),
-    server_factory_ (0),
-    server_factory_from_service_config_ (CORBA::B_FALSE),
-    preconnections_ (0)
-{
-}
-
-TAO_ORB_Core::~TAO_ORB_Core (void)
-{
-  // This should probably be changed to use the allocator internal to
-  // here once that chunk is actually implemented.
-  if (preconnections_)
-    ACE_OS::free (preconnections_);
-}
-
-TAO_Default_Reactor::TAO_Default_Reactor (void)
-  : ACE_Reactor (reactor_impl_ = new ACE_Select_Reactor ())
-{
-}
-
-TAO_Default_Reactor::~TAO_Default_Reactor (void)
-{
-  delete reactor_impl_;
-}
-
-#define quote(x) #x
-
-int
-TAO_ORB_Core::init (int& argc, char** argv)
-{
-  // Right now, this code expects to begin parsing in argv[1] rather
-  // than argv[0].  I don't think that's wise.  I think we need to
-  // change that convention to argv[0] and let the initializing code
-  // make any necessary shifts.
-
-  // Parse arguments to the ORB.  Typically the ORB is passed
-  // arguments straight from the command line, so we will simply pass
-  // through them and respond to the ones we understand and ignore
-  // those we don't.
-  //
-  // In some instances, we may actually build another vector of
-  // arguments and stash it for use initializing other components such
-  // as the ACE_Service_Config or the RootPOA.
-
-  // Prepare a copy of the argument vector
-  char **svc_config_argv; // @@ Should this be a data member?
-  // Probably, but there's no object in which to scope it.
-
-  int svc_config_argc = 0;
-  ACE_NEW_RETURN (svc_config_argv, char *[argc + 1], 0);
-
-  // Be certain to copy the program name so that service configurator
-  // has something to skip!
-  Arg_Shifter arg_shifter(argc, argv);
-  svc_config_argv[svc_config_argc++] = argv[0];
-
-  ACE_Env_Value<int> defport(quote(TAO_DEFAULT_SERVER_PORT),
-                             TAO_DEFAULT_SERVER_PORT);
-  CORBA::String_var host = CORBA::string_dup ("");
-  CORBA::UShort port = defport;
-  CORBA::Boolean use_ior = CORBA::B_TRUE;
-  CORBA::Boolean opt_collocation = CORBA::B_TRUE;
-  // The following things should be changed to use the ACE_Env_Value<>
-  // template sometime.
-
-  // Name Service IOR string.
-  char *ns_ior = 0;
-
-  // Name Service port #.
-  u_short ns_port = 0;
-
-  // Trading Service IOR string.
-  char *ts_ior = 0;
-
-  // Trading Service port #.
-  u_short ts_port = 0;
-
-  // Buffer sizes for kernel socket buffers
-  size_t rcv_sock_size = 0;
-  size_t snd_sock_size = 0;
-
-  char *preconnections = 0;
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *current_arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (current_arg, "-ORBsvcconf") == 0)
-        {
-          // Specify the name of the svc.conf file to be used
-          svc_config_argv[svc_config_argc++] = "-f";
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* file_name = arg_shifter.get_current ();
-              // Should we dup the string before assigning?
-              svc_config_argv[svc_config_argc++] = file_name;
-              arg_shifter.consume_arg();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdaemon") == 0)
-        {
-          // Be a daemon
-          svc_config_argv[svc_config_argc++] = "-b";
-          arg_shifter.consume_arg ();
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdebug") == 0)
-        {
-          // Turn on debugging
-          svc_config_argv[svc_config_argc++] = "-d";
-          arg_shifter.consume_arg ();
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBhost") == 0)
-        {
-          // Specify the name of the host (i.e., interface) on which
-          // the server should listen.
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next())
-            {
-              char* host_name = arg_shifter.get_current ();
-              host = CORBA::string_dup (host_name);
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceior") == 0)
-        {
-          // Specify the IOR of the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ns_ior = CORBA::string_dup (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceport") == 0)
-        {
-          // Specify the port number for the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ns_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceior") == 0)
-        {
-          // Specify the IOR of the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ts_ior = CORBA::string_dup (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceport") == 0)
-        {
-          // Specify the port number for the NameService.
-
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              ts_port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBport") == 0)
-        {
-          // Specify the port number/name on which we should listen
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              // We really shouldn't limit this to being specified as
-              // an int, but oh well for now.
-              port = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBrcvsock") == 0)
-        {
-          arg_shifter.consume_arg ();
-          // Specify the size of the socket's receive buffer
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              rcv_sock_size = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBsndsock") == 0)
-        {
-          arg_shifter.consume_arg ();
-          // Specify the size of the socket's send buffer
-          if (arg_shifter.is_parameter_next ())
-            {
-              snd_sock_size = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBobjrefstyle") == 0)
-        {
-          // Specifies the style of printed objrefs: URL or IOR
-          //
-          // BEGIN COMMENTS FROM IIOP-1.4
-          // On Win32, we should be collecting information from the Registry
-          // such as what ORBs are configured, specific configuration details
-          // like whether they generate IOR or URL style stringified objrefs
-          // and which addresses they listen to (e.g. allowing multihomed
-          // hosts to implement firewalls), user-meaningful orb names (they
-          // will normally indicate domains), and more.
-          //
-          // On UNIX, we should collect that from some private config file.
-          //
-          // Instead, this just treats the "internet" ORB name specially and
-          // makes it always use URL-style stringified objrefs, where the
-          // hostname and TCP port number are explicit (and the whole objref
-          // is readable by mortals).
-          // BEGIN COMMENTS FROM IIOP-1.4
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "URL") == 0)
-                use_ior = CORBA::B_FALSE;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBcollocation") == 0)
-        // Specify whether we want to optimize against collocation objects.
-        // Valid arguments are: "yes" and "no".  Default is yes.
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0)
-                opt_collocation = CORBA::B_TRUE;
-              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
-                opt_collocation = CORBA::B_FALSE;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-      else if (ACE_OS::strcmp (current_arg, "-ORBpreconnect") == 0)
-        {
-          arg_shifter.consume_arg ();
-          // Get a string which describes the host/port of connections we
-          // want to cache up-front, thus reducing the latency of the first call.
-          // It is specified as a comma-separated list of host:port specifications, and
-          // if multiple connections to the same port are desired, they must be
-          // specified multiple times.  For example, the following connects to
-          // tango:10015 twice, and  watusi:10016 once:
-          //
-          //    -ORBpreconnect tango:10015,tango:10015,watusi:10016
-          if (arg_shifter.is_parameter_next ())
-            {
-              preconnections = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-      else
-        arg_shifter.ignore_arg ();
-    }
-
-#if defined (DEBUG)
-  // Make it a little easier to debug programs using this code.
-  {
-    // This should use ACE_Env_Value<>
-    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
-
-    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-    if (value != 0)
-      {
-        TAO_debug_level = ACE_OS::atoi (value);
-        if (TAO_debug_level <= 0)
-          TAO_debug_level = 1;
-        dmsg1 ("TAO_debug_level == %d", TAO_debug_level);
-      }
-  }
-#endif  /* DEBUG */
-
-  ACE_INET_Addr rendezvous;
-
-  // No host specified; find it
-  if (ACE_OS::strlen (host) == 0)
-    {
-      char buffer[MAXHOSTNAMELEN + 1];
-      if (rendezvous.get_host_name (buffer, sizeof (buffer)) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_ORB_Core::init failed to resolve local host %p.\n"), -1);
-      
-      host = CORBA::string_dup (buffer);
-    }
-  
-  if (rendezvous.set (port, (char *) host) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Core::init failed to resolve host %s, %p.\n",
-                       (char*)host, "reason"), -1);
-  
-#if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
-  // There's really no way to deal with this in a portable manner, so
-  // we just have to suck it up and get preprocessor conditional and
-  // ugly.
-  //
-  // Impractical to have each call to the ORB protect against the
-  // implementation artifact of potential writes to dead connections,
-  // as it'd be way expensive.  Do it here; who cares about SIGPIPE in
-  // these kinds of applications, anyway?
-  (void) ACE_OS::signal (SIGPIPE, SIG_IGN);
-#endif /* SIGPIPE */
-
-  // Initialize the Service Configurator
-  //  -check for return values.
-  int result = TAO_Internal::open_services (svc_config_argc, svc_config_argv);
-  delete [] svc_config_argv;
-
-  // check for errors returned from TAO_Internal::open_services()
-  if (result != 0 && errno != ENOENT)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to initialize the Service Configurator"),
-                      -1);
-
-  // Initialize the pointers to resources in the ORB Core instance,
-  // e.g., reactor, connector, etc.  Must do this after we open
-  // services because we'll load the factory from there.
-  TAO_Resource_Factory *trf = this->resource_factory ();
-
-  if (trf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to find a Resource Factory instance"),
-                      -1);
-
-  this->reactor (trf->get_reactor ());
-  this->thr_mgr (trf->get_thr_mgr ());
-  this->connector (trf->get_connector ());
-  this->acceptor (trf->get_acceptor ());
-
-  TAO_Server_Strategy_Factory *ssf = this->server_factory ();
-
-  if (ssf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "ORB Core unable to find a Server Strategy Factory instance"),
-                      -1);
-
-  ssf->open ();
-
-  // Inititalize the "ORB" pseudo-object now.
-  IIOP_ORB_ptr this_orb = 0;
-  ACE_NEW_RETURN (this_orb, IIOP_ORB, 0);
-
-  // Install the ORB * into the ORB Core instance.  Note that if we're
-  // running with a "thread-per-rate" concurrency model this ORB *
-  // will be located in thread-specific storage.
-  this->orb (this_orb);
-
-  // This should probably move into the ORB Core someday rather then
-  // being done at this level.
-  this_orb->_use_omg_ior_format (use_ior);
-  this_orb->_optimize_collocation_objects (opt_collocation);
-
-  // Set all kinds of orb parameters whose setting needed to be
-  // deferred until after the service config entries had been
-  // determined.
-
-  this->orb_params ()->addr (rendezvous);
-  if (ns_ior)
-    this->orb_params ()->name_service_ior (ns_ior);
-  if (ns_port != 0)
-    this->orb_params ()->name_service_port (ns_port);
-  if (ts_ior)
-    this->orb_params ()->trading_service_ior (ts_ior);
-  if (ts_port != 0)
-    this->orb_params ()->trading_service_port (ts_port);
-  if (rcv_sock_size != 0)
-    this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
-  if (snd_sock_size != 0)
-    this->orb_params ()->sock_rcvbuf_size (snd_sock_size);
-
-  // Open the <Strategy_Connector>.
-  if (this->connector ()->open (this->reactor(),
-                                &this->null_creation_strategy_,
-                                &this->caching_connect_strategy_,
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-                                this->concurrency_strategy_ ()
-#else
-                                &this->null_activation_strategy_
-#endif /* TAO_HAS_CLIENT_CONCURRENCY */
-                                ) != 0)
-    return -1;
-
-  if (preconnections)
-    this->preconnect (preconnections);
-
-  // Port not specified: find one for the user
-  if (port == 0)
-    return this_orb->open ();
-  else
-    return 0;
-}
-
-int
-TAO_ORB_Core::preconnect (const char* the_preconnections)
-{
-  // It would be good to use auto_ptr<> to guard against premature
-  // termination and, thus, leaks.
-  char *preconnections = ACE_OS::strdup (the_preconnections);
-
-#if 0
-  if (preconnections)
-    {
-      ACE_INET_Addr dest;
-      TAO_Client_Connection_Handler *handler;
-      ACE_Unbounded_Stack<TAO_Client_Connection_Handler *> handlers;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *tport = 0;
-          char *thost = where;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-              tport = sep + 1;
-
-              dest.set (atoi(tport), thost);
-
-              // Try to establish the connection
-              handler = 0;
-              if (this->connector ()->connect (handler, dest) == 0)
-                {
-                  // Save it for later so we can mark it as idle
-                  handlers.push (handler);
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "(%P|%t) Unable to preconnect to host '%s', port %d.\n",
-                              dest.get_host_name (), dest.get_port_number ()));
-                }
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) Yow!  Couldn't find a ':' separator in '%s' spec.\n", where));
-            }
-        }
-
-      // Walk the stack of handlers and mark each one as idle now.
-      handler = 0;
-      while (handlers.pop (handler) == 0)
-        handler->idle ();
-
-    }
-#else
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_INET_Addr dest;
-      ACE_Unbounded_Stack<ACE_INET_Addr> dests;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *tport = 0;
-          char *thost = where;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-              tport = sep + 1;
-
-              dest.set (atoi(tport), thost);
-              dests.push (dest);
-            }
-          else
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Yow!  Couldn't find a ':' separator in '%s' spec.\n", where));
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      size_t num_connections = dests.size ();
-      ACE_INET_Addr *remote_addrs = 0;
-      TAO_Client_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_INET_Addr[num_connections],
-                      -1);
-      ACE_NEW_RETURN (handlers,
-                      TAO_Client_Connection_Handler*[num_connections],
-                      -1);
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      // Fill in the remote address array
-      size_t index = 0;
-      while (dests.pop (remote_addrs[index]) == 0)
-        handlers[index++] = 0;
-
-      // Finally, try to connect.
-      this->connector ()->connect_n (num_connections,
-                                     handlers,
-                                     remote_addrs,
-                                     failures);
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (index = 0; index < num_connections; index++)
-        {
-          if (! failures[index])
-            {
-              handlers[index]->idle ();
-              successes++;
-              this->orb ()->_register_collocation (remote_addrs[index]);
-            }
-        }
-    }
-#endif /* 0 */
-  ACE_OS::free (preconnections);
-
-  return successes;
-}
-
-int
-TAO_ORB_Core::fini (void)
-{
-  this->connector ()->close ();
-
-  TAO_Internal::close_services ();
-
-  if (!this->resource_factory_from_service_config_)
-    delete resource_factory_;
-
-  if (!this->client_factory_from_service_config_)
-    delete client_factory_;
-
-  if (!this->server_factory_from_service_config_)
-    delete server_factory_;
-
-  return 0;
-}
-
-TAO_Resource_Factory *
-TAO_ORB_Core::resource_factory (void)
-{
-  if (this->resource_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->resource_factory_ =
-        ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory");
-      this->resource_factory_from_service_config_ = CORBA::B_TRUE;
-    }
-
-  if (this->resource_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      ACE_ERROR ((LM_WARNING,
-                  "(%P|%t) WARNING - No Resource Factory found in Service Repository."
-                  "  Using default instance with GLOBAL resource source specifier.\n"));
-
-      ACE_NEW_RETURN (this->resource_factory_,
-                      TAO_Resource_Factory,
-                      0);
-
-      this->resource_factory_from_service_config_ =
-        CORBA::B_FALSE;
-      this->resource_factory_->resource_source (TAO_Resource_Factory::TAO_GLOBAL);
-
-      // At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->resource_factory_;
-}
-
-TAO_Client_Strategy_Factory *
-TAO_ORB_Core::client_factory (void)
-{
-  if (this->client_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->client_factory_ =
-        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory");
-      this->client_factory_from_service_config_ =
-        CORBA::B_TRUE;
-    }
-
-  if (this->client_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      ACE_ERROR ((LM_WARNING,
-                  "(%P|%t) WARNING - No Client Strategy Factory found in Service Repository."
-                  "  Using default instance.\n"));
-
-      ACE_NEW_RETURN (this->client_factory_,
-                      TAO_Default_Client_Strategy_Factory,
-                      0);
-
-      this->client_factory_from_service_config_ = CORBA::B_FALSE;
-      // At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->client_factory_;
-}
-
-TAO_Server_Strategy_Factory *
-TAO_ORB_Core::server_factory (void)
-{
-  if (this->server_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->server_factory_ =
-        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory");
-
-      this->server_factory_from_service_config_ = CORBA::B_TRUE;
-    }
-
-  if (this->server_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      ACE_ERROR ((LM_WARNING,
-                  "(%P|%t) WARNING - No Server Strategy Factory found in Service Repository."
-                  "  Using default instance.\n"));
-
-      ACE_NEW_RETURN (this->server_factory_,
-                      TAO_Default_Server_Strategy_Factory,
-                      0);
-
-      this->server_factory_from_service_config_ = CORBA::B_FALSE;
-      // At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->server_factory_;
-}
-
-void
-TAO_ORB_Core::orb (CORBA::ORB_ptr op)
-{
-  // Shouldn't need to check for ptr validity at this point b/c
-  // we already did in ::init()
-  this->resource_factory ()->set_orb (op);
-  this->orb_ = op;
-}
-
-void
-TAO_ORB_Core::root_poa (TAO_POA *np)
-{
-  // Shouldn't need to check for ptr validity at this point b/c
-  // we already did in ::init()
-  this->resource_factory ()->set_root_poa (np);
-  this->root_poa_ = np;
-}
-
-void
-TAO_ORB_Core::create_and_set_root_poa (void)
-{
-  CORBA::Environment env;
-  TAO_POA *poa;
-
-  // Need to do double-checked locking here to cover the case of
-  // multiple threads using a global resource policy.
-  TAO_POA_Manager *manager = new TAO_Strategy_POA_Manager;
-  TAO_POA_Policies root_poa_policies;
-  root_poa_policies.implicit_activation (PortableServer::IMPLICIT_ACTIVATION);
-  
-  // Construct a new POA
-  poa = new TAO_Strategy_POA ("RootPOA",
-                              *manager,
-                              root_poa_policies,
-                              0,
-                              env);
-  
-  if (env.exception () != 0)
-    return;
-
-  // set the poa in the orbcore instance
-  this->root_poa (poa);
-}
-
-TAO_Resource_Factory::TAO_Resource_Factory (void)
-  : resource_source_ (TAO_GLOBAL),
-    poa_source_ (TAO_GLOBAL)
-{
-}
-
-TAO_Resource_Factory::~TAO_Resource_Factory (void)
-{
-}
-
-void
-TAO_Resource_Factory::resource_source (int which_source)
-{
-  resource_source_ = which_source;
-}
-
-int
-TAO_Resource_Factory::resource_source (void)
-{
-  return resource_source_;
-}
-
-void
-TAO_Resource_Factory::poa_source (int which_source)
-{
-  poa_source_ = which_source;
-}
-
-int
-TAO_Resource_Factory::poa_source (void)
-{
-  return poa_source_;
-}
-
-int
-TAO_Resource_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Resource_Factory::parse_args (int argc, char **argv)
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-  // This table shows the arguments that are parsed with their valid
-  // combinations.
-  //
-  //   ORB      POA    comments
-  // +-------+-------+-----------------+
-  // | TSS   | TSS   | if ORB==TSS     |
-  // |       |       | then POA=TSS    |
-  // |       |       | as def.value.   |
-  // +-------+-------+-----------------+
-  // | TSS   | GLOBAL| ok.             |
-  // +-------+-------+-----------------+
-  // | GLOBAL| GLOBAL| if ORB==Global  |
-  // |       |       | then POA=Global |
-  // |       |       | as def.value.   |
-  // +-------+-------+-----------------+
-  // | GLOBAL| TSS   | *NOT VALID*     |
-  // +-------+-------+-----------------+
-
-  int local_poa_source      = -1;
-  int local_resource_source = -1;
-
-  for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcmp (argv[curarg], "-ORBresources") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              local_resource_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
-              local_resource_source = TAO_TSS;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoa") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              local_poa_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
-              local_poa_source = TAO_TSS;
-          }
-      }
-
-  // Don't allow a global ORB and a tss POA.
-  if ( (local_resource_source == TAO_GLOBAL) &&
-       (local_poa_source == TAO_TSS) )
-    return -1;
-
-  // make poa=tss the default, if ORB is tss and the user didn't
-  // specify a value.
-  if ( (local_resource_source == TAO_TSS) &&
-       (local_poa_source      == -1) )
-    local_poa_source = TAO_TSS;
-
-  // update the object data members.
-  if (local_resource_source != -1)
-    this->resource_source_ = local_resource_source;
-  if (local_poa_source != -1)
-    this->poa_source_      = local_poa_source;
-
-  // Don't allow a global ORB and a tss POA.
-  if ( (this->resource_source_ == TAO_GLOBAL) &&
-       (this->poa_source_      == TAO_TSS) )
-    return -1;
-
-  return 0;
-}
-
-#define IMPLEMENT_PRE_GET_METHOD(methodname,rtype,membername)\
-rtype TAO_Resource_Factory::##methodname(void)\
-{\
-  switch (resource_source_)\
-    {\
-    case TAO_GLOBAL:\
-      return &GLOBAL_PRE_ALLOCATED::instance ()->##membername;\
-    case TAO_TSS:\
-      return &TSS_PRE_ALLOCATED::instance ()->##membername;\
-    }\
-  return 0;\
-}
-
-#define IMPLEMENT_APP_GET_METHOD(methodname,rtype,membername)\
-rtype TAO_Resource_Factory::##methodname(void)\
-{\
-  switch (resource_source_)\
-    {\
-    case TAO_GLOBAL:\
-      return GLOBAL_APP_ALLOCATED::instance ()->##membername;\
-    case TAO_TSS:\
-      return TSS_APP_ALLOCATED::instance ()->##membername;\
-    }\
-  return 0;\
-}
-
-IMPLEMENT_PRE_GET_METHOD(get_reactor, ACE_Reactor *, r_)
-IMPLEMENT_PRE_GET_METHOD(get_thr_mgr, ACE_Thread_Manager *, tm_)
-IMPLEMENT_PRE_GET_METHOD(get_acceptor, TAO_ACCEPTOR *, a_)
-IMPLEMENT_PRE_GET_METHOD(get_connector, TAO_CONNECTOR *, c_)
-IMPLEMENT_APP_GET_METHOD(get_orb, CORBA_ORB_ptr, orb_)
-IMPLEMENT_PRE_GET_METHOD(get_orb_params, TAO_ORB_Parameters *, orbparams_)
-IMPLEMENT_PRE_GET_METHOD(get_oa_params, TAO_OA_Parameters *, oaparams_)
-IMPLEMENT_PRE_GET_METHOD(get_addr, ACE_INET_Addr *, addr_)
-
-TAO_POA *
-TAO_Resource_Factory::get_root_poa (void)
-{
-  switch (poa_source_)
-    {
-    case TAO_GLOBAL:
-      return GLOBAL_APP_ALLOCATED::instance ()->poa_;
-    case TAO_TSS:\
-      return TSS_APP_ALLOCATED::instance ()->poa_;
-    }
-  return 0;
-}
-
-void
-TAO_Resource_Factory::set_root_poa (TAO_POA *pp)
-{
-  switch (poa_source_)
-    {
-    case TAO_GLOBAL:
-      GLOBAL_APP_ALLOCATED::instance ()->poa_ = pp;
-      break;
-    case TAO_TSS:
-      TSS_APP_ALLOCATED::instance ()->poa_ = pp;
-      break;
-    }
-}
-
-void
-TAO_Resource_Factory::set_orb (CORBA::ORB_ptr op)
-{
-  switch (resource_source_)
-    {
-    case TAO_GLOBAL:
-      GLOBAL_APP_ALLOCATED::instance ()->orb_ = op;
-      break;
-    case TAO_TSS:
-      TSS_APP_ALLOCATED::instance ()->orb_ = op;
-      break;
-    }
-}
-
-void
-TAO_Resource_Factory::set_allocator (ACE_Allocator *alloc)
-{
-  switch (resource_source_)
-    {
-    case TAO_GLOBAL:
-      GLOBAL_APP_ALLOCATED::instance ()->alloc_ = alloc;
-      break;
-    case TAO_TSS:
-      TSS_APP_ALLOCATED::instance ()->alloc_ = alloc;
-      break;
-    }
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::get_allocator (void)
-{
-  switch (resource_source_)
-    {
-    case TAO_GLOBAL:
-      return GLOBAL_APP_ALLOCATED::instance ()->alloc_;
-    case TAO_TSS:
-      return TSS_APP_ALLOCATED::instance ()->alloc_;
-    }
-  return 0;
-}
-
-// This function exists because of Win32's proclivity for expanding
-// templates at link time.  Since DLLs are just executables, templates
-// get expanded and instantiated at link time.  Thus, if there are
-// references to the same template in an application AND in a DLL,
-// you're screwed.  Using this function, we workaround this by
-// insuring that everybody ALWAYS accesses the same instantiation.
-//
-// There's room for optimizations by making this inline for the ORB
-// core and non-inlined elsewhere, but that can be done later--after
-// it works.
-
-TAO_Export TAO_ORB_Core *
-TAO_ORB_Core_instance (void)
-{
-  // Depending on whether ACE_HAS_TSS_ORBCORE is defined or not, the
-  // instance() method call below either returns a pointer to the
-  // process-wide ORB Core Singleton or it returns a pointer to the
-  // thread-specific ORB Core Singleton.
-  return TAO_ORB_CORE::instance ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-# if defined (__GNUG__)
-    template void ACE_Convert (const char *, u_int &);
-# endif /* __GNUG__ */
-
-template class ACE_Env_Value<int>;
-template class ACE_Env_Value<u_int>;
-template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Recycling_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>;
-#if 0
-template class ACE_Unbounded_Stack<TAO_Client_Connection_Handler *>;
-#else
-template class ACE_Unbounded_Stack<ACE_INET_Addr>;
-template class ACE_Node<ACE_INET_Addr>;
-#endif
-template class ACE_Node<TAO_Client_Connection_Handler *>;
-template class ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_ORB_Core>;
-template class ACE_Dynamic_Service<TAO_Resource_Factory>;
-
-template class ACE_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>;
-template class ACE_TSS_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_Resource_Factory::Pre_Allocated>;
-template class ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
-template class ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_Resource_Factory::App_Allocated>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Env_Value<int>
-#pragma instantiate ACE_Env_Value<u_int>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Recycling_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
-#if 0
-#pragma instantiate ACE_Unbounded_Stack<TAO_Client_Connection_Handler *>
-#else
-#pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr>
-#pragma instantiate ACE_Node<ACE_INET_Addr>
-#endif
-#pragma instantiate ACE_Node<TAO_Client_Connection_Handler *>
-#pragma instantiate ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_ORB_Core>
-#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
-
-#pragma instantiate ACE_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_Resource_Factory::Pre_Allocated>
-#pragma instantiate ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_Resource_Factory::App_Allocated>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
deleted file mode 100644
index cf95029423a..00000000000
--- a/TAO/tao/ORB_Core.h
+++ /dev/null
@@ -1,430 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     orb_core.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_ORB_CORE_H)
-#  define TAO_ORB_CORE_H
-
-#  include "tao/corba.h"
-
-typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
-        TAO_CONNECTOR;
-
-typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler,
-                                    ACE_SOCK_CONNECTOR,
-                                    ACE_SYNCH_RW_MUTEX>
-        TAO_CACHED_CONNECT_STRATEGY;
-
-typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
-
-typedef ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
-
-// Forward decl.
-class TAO_Resource_Factory;
-
-class TAO_Export TAO_ORB_Core
-{
-  // = TITLE
-  //    Encapsulates the state of an ORB.
-  //
-  // = DESCRIPTION
-  //    This class encapsulates the state of an ORB.  The motivation for
-  //    this is so that the state can be accessed as a singleton.  The scope
-  //    of the state can be regulated by utilizing singletons of different
-  //    scope, e.g., <ACE_Singleton> will provide process-wide scope, while
-  //    <ACE_TSS_Singleton> will provide thread-specific scope (which
-  //    is useful for the "thread-per-rate" real-time concurrency
-  //    model).
-  friend class CORBA_ORB;
-  friend CORBA::ORB_ptr CORBA::ORB_init (int &,
-                                         char * const*,
-                                         const char *,
-                                         CORBA::Environment &);
-public:
-  // = Initialization and termination methods.
-  TAO_ORB_Core (void);
-  // Constructor.
-
-  ~TAO_ORB_Core (void);
-  // Destructor
-
-  // = Accessors
-  CORBA_ORB_ptr orb (void);
-  // Should this be IIOP_ORB?
-
-  ACE_Reactor *reactor (void);
-  // Accessors for the <ACE_Reactor>.
-
-  ACE_Thread_Manager *thr_mgr (void);
-  // Accessor for the <ACE_Thread_Manager>.
-
-  TAO_POA *root_poa (void);
-  // Acceptor for the POA.
-
-  TAO_OA_Parameters *oa_params (void);
-  // Accessor for the Object Adapter parameters.
-
-  TAO_ORB_Parameters *orb_params (void);
-  // Accessor for the ORB parameters.
-
-  ACE_INET_Addr &addr (void);
-  // Accessors for the local address on which we're listening.
-
-  TAO_CONNECTOR *connector (void);
-  // Accessor which returns the connector.
-
-  TAO_ACCEPTOR *acceptor (void);
-  // Accessor which returns the acceptor.
-
-  TAO_POA_Current *poa_current (void);
-  // Accessor which returns a pointer to a structure containing
-  // context on the current POA upcall.
-
-  TAO_POA_Current *poa_current (TAO_POA_Current *new_current);
-  // Sets the thread-specific pointer to the new POA Current state,
-  // returning a pointer to the existing POA Current state.
-
-  // = Access to Factories.
-  //
-  // These factories are not thread-specific, and are presented here
-  // in order to have one place to get useful information.  Often, the
-  // instances to which the return pointers are stored in the Service
-  // Repository.
-
-  TAO_Resource_Factory *resource_factory (void);
-  // Returns pointer to the resource factory.
-  TAO_Client_Strategy_Factory *client_factory (void);
-  // Returns pointer to the client factory.
-  TAO_Server_Strategy_Factory *server_factory (void);
-  // Returns pointer to the server factory.
-
-private:
-  int init (int& argc, char ** argv);
-  // Initialize the guts of the ORB Core.  It is intended that this be
-  // called by <CORBA::ORB_init>.
-
-  int fini (void);
-  // Final termination hook, typically called by CORBA::ORB's DTOR.
-
-  int preconnect (const char *preconnections);
-  // Attempt to establish connections specified in <preconnections>.
-  // Returns -1 in case of error, or the number of connections
-  // actually established.
-
-  void orb (CORBA::ORB_ptr);
-  // Set pointer to the ORB.
-  CORBA::ORB_ptr orb_;
-
-  void reactor (ACE_Reactor *r);
-  ACE_Reactor* reactor_;
-  // Used for responding to I/O reactively
-
-  void thr_mgr (ACE_Thread_Manager *tm);
-  ACE_Thread_Manager* thr_mgr_;
-  // Used to manage threads within the ORB
-
-  void connector (TAO_CONNECTOR *c);
-  TAO_CONNECTOR *connector_;
-  // The connector actively initiating connection requests.
-
-  void root_poa (TAO_POA *np);
-  void create_and_set_root_poa (void);
-  TAO_POA *root_poa_;
-  // Pointer to the root POA.  It will eventually be the pointer
-  // returned by calls to CORBA::ORB::resolve_initial_references
-  // ("RootPOA").
-
-  TAO_OA_Parameters *oa_params_;
-  // Parameters which should be used by OAs attached to this ORB.
-
-  TAO_ORB_Parameters *orb_params_;
-  // Parameters used by the ORB.
-
-  ACE_INET_Addr *addr_;
-  // The address of the endpoint on which we're listening for
-  // connections and requests.
-
-  void acceptor (TAO_ACCEPTOR *a);
-  TAO_ACCEPTOR *acceptor_;
-  // The acceptor passively listening for connection requests.
-
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-#endif /* TAO_HAS_CLIENT_CONCURRENCY */
-
-  TAO_POA_Current *poa_current_;
-  // Points to structure containing state for the current upcall
-  // context in this thread.  Note that it does not come from the
-  // resource factory because it must always be held in
-  // thread-specific storage.  For now, since TAO_ORB_Core instances
-  // are TSS singletons, we simply ride along and don't allocate
-  // occupy another TSS slot since there are some platforms where
-  // those are precious commodities (e.g., NT).
-
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-  // This no-op creation strategy is necessary for using the
-  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
-
-  TAO_CACHED_CONNECT_STRATEGY caching_connect_strategy_;
-  // This connection strategy maintain a cache of preconnected
-  // <TAO_Client_Connection_Handler>s.  The goal is to reduce latency
-  // and locking overhead.
-
-  TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
-  // This no-op activation strategy prevents the cached connector from
-  // calling the service handler's <open> method multiple times.
-
-  TAO_Resource_Factory *resource_factory_;
-  // Handle to the factory for resource information..
-
-  CORBA::Boolean resource_factory_from_service_config_;
-  // TRUE if <resource_factory_> was obtained from the Service
-  // Configurator.
-
-  TAO_Client_Strategy_Factory *client_factory_;
-  // Handle to the factory for Client-side strategies.
-
-  CORBA::Boolean client_factory_from_service_config_;
-  // TRUE if <client_factory_> was obtained from the Service
-  // Configurator.
-
-  TAO_Server_Strategy_Factory *server_factory_;
-  // Handle to the factory for Server-side strategies.
-
-  CORBA::Boolean server_factory_from_service_config_;
-  // TRUE if <server_factory_> was obtained from the Service
-  // Configurator.
-
-  char *preconnections_;
-  // A string of comma-separated <{host}>:<{port}> pairs used to
-  // pre-establish connections using <preconnect>.
-};
-
-class TAO_Default_Reactor : public ACE_Reactor
-{
-  // = TITLE
-  //   Force TAO to use Select Reactor.
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Reactor (void);
-  ~TAO_Default_Reactor (void);
-
-private:
-  ACE_Reactor_Impl *reactor_impl_;
-};
-
-class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //   Factory which manufacturers resources for use by the ORB Core.
-  //
-  // = DESCRIPTION
-  //   This class is a factory/repository for critical ORB Core
-  //   resources.  Using a <{resource source specifier}> as a
-  //   discriminator, the factory can return resource instances which
-  //   are, e.g., global, stored in thread-specific storage, stored in
-  //   shared memory, etc.
-
-public:
-  // = Initialization and termination methods.
-  TAO_Resource_Factory (void);
-  virtual ~TAO_Resource_Factory (void);
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char *argv[]);
-
-  int parse_args (int argc, char *argv[]);
-  // Arguments are in the form of -ORBxxx.  Valid arguments are:
-  // <-ORBresources> <{which}> where <{which}> is one of <global> or
-  // <tss>.
-
-  // = Member Accessors
-  enum
-  {
-    TAO_GLOBAL,
-    TAO_TSS
-  };
-
-  // = Range of values for <{resource source specifier}>.
-  void resource_source (int which_source);
-  // Set the resource source specifier.
-  int resource_source (void);
-  // Get the resource source specifier.
-
-  void poa_source (int which_source);
-  // Set the POA source specifier.
-  int poa_source (void);
-  // Get the POA source specifier.
-
-  // = Resource Retrieval
-  //
-  // Methods in this category return pointers to resources.  Based on
-  // the resource source specifier value, these resources may be
-  // either global, i.e., the same resource is used across all threads
-  // throughout the process, or thread-specific, i.e., different
-  // resources are used in each thread.  Currently, all resources are
-  // either global or thread-specific; choosing on a per-resource
-  // basis is not supported.
-
-  ACE_Reactor *get_reactor (void);
-  // Return an <ACE_Reactor> to be utilized.
-
-  ACE_Thread_Manager *get_thr_mgr (void);
-  // Return an <ACE_Thread_Manager> to be utilized.
-
-  TAO_CONNECTOR *get_connector (void);
-  // Return an Connector to be utilized.
-
-  TAO_ACCEPTOR *get_acceptor (void);
-  // Return an Acceptor to be utilized.
-
-  TAO_ORB_Parameters *get_orb_params (void);
-  // Return ORB parameters to be utilized.
-
-  TAO_OA_Parameters *get_oa_params (void);
-  // Return ORB parameters to be utilized.
-
-  ACE_INET_Addr *get_addr (void);
-  // Return an address to be used for the endpoint for connections and
-  // requests.
-
-  CORBA::ORB_ptr get_orb (void);
-  // Return an ORB ptr to be utilized.
-
-  TAO_POA *get_root_poa (void);
-  // Return a root poa to be utilized.
-
-  ACE_Allocator *get_allocator (void);
-  // Return a pointer to an ACE_Allocator used for allocating memory
-  // within the ORB.
-
-  void set_allocator (ACE_Allocator *alloc);
-  // Set the allocator pointer which will be returned by
-  // <get_allocator()>.
-
-  void set_orb (CORBA::ORB_ptr op);
-  // Set the ORB pointer which will be returned by <get_orb()>.  This
-  // is necessary because the ORB is created in application space by
-  // <CORBA::ORB_init()>, but needs to be available to stubs and
-  // generated code.
-
-  void set_root_poa (TAO_POA *pp);
-  // Set the Root POA pointer which will be returned by
-  // <get_root_poa()>.  This is necessary because the Root POA is
-  // created in application space by <CORBA::ORB_init()>, but needs to
-  // be available to stubs and generated code.
-
-  // @@ I suspect that putting these structs inside of this class is
-  // going to break some compilers (e.g., HP/YUX) when you try to use
-  // this stuff with the ACE_Singletons below.  I suggest you move
-  // them out and rename them as TAO_Pre_Allocated, etc.
-  //
-  // Let's do this after we merge the poa branch and the main back
-  // together.
-  struct Pre_Allocated
-    // = TITLE
-    //   Structure containing resources which can be pre-allocated by
-    //   the ORB Core without intervention from the application.
-  {
-    TAO_Default_Reactor r_;
-    // The Reactor.
-
-    ACE_Thread_Manager tm_;
-    // The Thread Manager
-
-    TAO_CONNECTOR c_;
-    // The Connector
-
-    TAO_ACCEPTOR a_;
-    // The Acceptor
-
-    TAO_ORB_Parameters orbparams_;
-    // ORB Parameters
-
-    TAO_OA_Parameters oaparams_;
-    // OA Parameters (will go away with new POA impl)
-
-    ACE_INET_Addr addr_;
-    // Address for connection endpoint.
-  };
-
-  struct App_Allocated
-    // = TITLE
-    //   Structure containing resources which can only be allocated
-    //   after obtaining information from the application such as
-    //   arguments, etc.
-  {
-    App_Allocated (void): orb_(0), poa_(0), alloc_(0) { };
-    // Constructor necessary because we have pointers.  It's inlined
-    // here rather than in the .i file because it's easier than trying
-    // to re-order header files in corba.h to eliminate the "used
-    // before declared inline" warnings/errors on certain compilers.
-
-    // = Resources
-
-    // Note:  These should change to _var types when they are available.
-    CORBA::ORB_ptr orb_;
-    // Pointer to application-created ORB.
-
-    TAO_POA *poa_;
-    // Pointer to application-created POA.
-
-    ACE_Allocator *alloc_;
-    // Pointer to application-created ACE_Allocator.
-  };
-
-private:
-
-  int resource_source_;
-  // Flag indicating whether resources should be global or
-  // thread-specific.
-
-  int poa_source_;
-  // Flag indicating whether the POA should be global or
-  // thread-specific.  If not set specifically, this takes on the
-  // value of <resource_source_>.
-
-  // = Typedefs for the singleton types used to store our orb core
-  // information.
-  typedef ACE_Singleton<Pre_Allocated, ACE_SYNCH_MUTEX>
-          GLOBAL_PRE_ALLOCATED;
-  typedef ACE_TSS_Singleton<Pre_Allocated, ACE_SYNCH_MUTEX>
-          TSS_PRE_ALLOCATED;
-
-  typedef ACE_Singleton<App_Allocated, ACE_SYNCH_MUTEX>
-          GLOBAL_APP_ALLOCATED;
-  typedef ACE_TSS_Singleton<App_Allocated, ACE_SYNCH_MUTEX>
-          TSS_APP_ALLOCATED;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_FACTORY_DECLARE (TAO, TAO_Resource_Factory)
-
-extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
-
-// Declare that the following method should be specialized.
-
-#if defined (ACE_WIN32)
-#pragma warning(disable:4231)
-extern template size_t
-ACE_Hash_Addr<ACE_INET_Addr>::hash_i (const ACE_INET_Addr &addr) const;
-#endif /* ACE_WIN32 */
-
-#endif /* TAO_ORB_CORE_H */
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
deleted file mode 100644
index dfc06115dcc..00000000000
--- a/TAO/tao/ORB_Core.i
+++ /dev/null
@@ -1,120 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-
-#define TAO_TRF (this->resource_factory ())
-#define TAO_OC_RETRIEVE(member) \
-  ( (this->##member##_ == 0) ? (this->##member##_ = this->resource_factory ()->get_##member ()) : (this->##member##_) )
-
-ACE_INLINE void
-TAO_ORB_Core::reactor (ACE_Reactor *r)
-{
-  this->reactor_ = r;
-}
-
-ACE_INLINE ACE_Reactor*
-TAO_ORB_Core::reactor (void)
-{
-  return TAO_OC_RETRIEVE (reactor);
-}
-
-ACE_INLINE void
-TAO_ORB_Core::thr_mgr (ACE_Thread_Manager *tm)
-{
-  this->thr_mgr_ = tm;
-}
-
-ACE_INLINE ACE_Thread_Manager*
-TAO_ORB_Core::thr_mgr (void)
-{
-  return TAO_OC_RETRIEVE (thr_mgr);
-}
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_ORB_Core::orb (void)
-{
-  return TAO_OC_RETRIEVE (orb);
-}
-
-ACE_INLINE TAO_POA *
-TAO_ORB_Core::root_poa (void)
-{
-  if (TAO_OC_RETRIEVE (root_poa) == 0)
-    this->create_and_set_root_poa ();
-
-  return this->root_poa_;
-}
-
-ACE_INLINE TAO_OA_Parameters *
-TAO_ORB_Core::oa_params (void)
-{
-  return TAO_OC_RETRIEVE (oa_params);
-}
-
-ACE_INLINE
-TAO_ORB_Parameters *
-TAO_ORB_Core::orb_params(void)
-{
-  return TAO_OC_RETRIEVE (orb_params);
-}
-
-ACE_INLINE void
-TAO_ORB_Core::connector (TAO_CONNECTOR *c)
-{
-  this->connector_ = c;
-}
-
-ACE_INLINE TAO_CONNECTOR *
-TAO_ORB_Core::connector (void)
-{
-  return TAO_OC_RETRIEVE (connector);
-}
-
-ACE_INLINE void
-TAO_ORB_Core::acceptor (TAO_ACCEPTOR *a)
-{
-  this->acceptor_ = a;
-}
-
-ACE_INLINE TAO_ACCEPTOR *
-TAO_ORB_Core::acceptor (void)
-{
-  return TAO_OC_RETRIEVE (acceptor);
-}
-
-ACE_INLINE ACE_INET_Addr&
-TAO_ORB_Core::addr (void)
-{
-  return *TAO_OC_RETRIEVE (addr);
-}
-
-
-#undef TAO_OC_RETRIEVE
-#undef TAO_TRF
-
-ACE_INLINE TAO_POA_Current *
-TAO_ORB_Core::poa_current (void)
-{
-  return poa_current_;
-}
-
-ACE_INLINE TAO_POA_Current *
-TAO_ORB_Core::poa_current (TAO_POA_Current *new_current)
-{
-  TAO_POA_Current *old = poa_current_;
-  poa_current_ = new_current;
-  return old;
-}
-
-// Template specializations that allow the cached connection manager
-// to work better.
-
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-# if defined (__ACE_INLINE__) || (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && !defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA))
-    ACE_INLINE size_t
-    ACE_Hash_Addr<ACE_INET_Addr>::hash_i (const ACE_INET_Addr &addr) const
-    {
-      return addr.get_ip_address () + addr.get_port_number ();
-    }
-# endif /* __ACE_INLINE__ */
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
diff --git a/TAO/tao/ORB_Strategies_T.cpp b/TAO/tao/ORB_Strategies_T.cpp
deleted file mode 100644
index 4e236326a95..00000000000
--- a/TAO/tao/ORB_Strategies_T.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-
-#include "tao/ORB_Strategies_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/ORB_Strategies_T.i"
-#endif /* __ACE_INLINE__ */
-
-template <class SH> int
-TAO_Reactive_Strategy<SH>::activate_svc_handler (SH *svc_handler, void *arg)
-{
-  ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::activate_svc_handler");
-
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  int result = 0;
-
-  if (r == 0)
-    result = -1;
-
-  // Register with the Reactor with the appropriate <mask>.
-  else if (r->register_handler (svc_handler, this->mask_) == -1)
-    result = -1;
-
-  // If the implementation of the reactor uses event associations
-  else if (r->uses_event_associations ())
-    {
-      // If we don't have non-block on, it won't work with
-      // WFMO_Reactor
-      // This maybe too harsh
-      // if (!ACE_BIT_ENABLED (this->flags_, ACE_NONBLOCK))
-      // goto failure;
-      if (svc_handler->open ((void *) this) != -1)
-        return 0;
-      else
-        result = -1;
-    }
-  else
-    // Call up to our parent to do the SVC_HANDLER initialization.
-    return this->inherited::activate_svc_handler (svc_handler, arg);
-
-  if (result == -1)
-    svc_handler->close (0);
-
-  return result;
-}
diff --git a/TAO/tao/ORB_Strategies_T.h b/TAO/tao/ORB_Strategies_T.h
deleted file mode 100644
index 9f7dde2000a..00000000000
--- a/TAO/tao/ORB_Strategies_T.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     ORB_Strategies_T.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_ORB_STRATEGIES_T_H)
-#  define TAO_ORB_STRATEGIES_T_H
-
-#include "ace/Strategies_T.h"
-
-template <class SH>
-class TAO_Reactive_Strategy : public ACE_Reactive_Strategy<SH>
-{
-  // @@ Please document me.
-public:
-  TAO_Reactive_Strategy (void);
-  ~TAO_Reactive_Strategy (void);
-
-  virtual int activate_svc_handler (SH *sh, void *arg);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/ORB_Strategies_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/ORB_Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ORB_Strategies_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_ORB_STRATEGIES_T_H */
diff --git a/TAO/tao/ORB_Strategies_T.i b/TAO/tao/ORB_Strategies_T.i
deleted file mode 100644
index 9655ecf55a0..00000000000
--- a/TAO/tao/ORB_Strategies_T.i
+++ /dev/null
@@ -1,10 +0,0 @@
-template <class SH> ACE_INLINE
-TAO_Reactive_Strategy<SH>::TAO_Reactive_Strategy (void)
-{
-}
-
-template <class SH> ACE_INLINE
-TAO_Reactive_Strategy<SH>::~TAO_Reactive_Strategy (void)
-{
-}
-
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
deleted file mode 100644
index 4234c02e10c..00000000000
--- a/TAO/tao/Object.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-// @(#) $Id$
-//
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         CORBA_Object operations
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* ! __ACE_INLINE__ */
-
-// GET_INTERFACE ... send a simple call to the object, it returns
-// an InterfaceDef objref.
-
-static const TAO_Param_Data Object_get_interface_params [] =
-{
-  { CORBA::_tc_Object, PARAM_RETURN, 0 }
-  // XXX should be tc_InterfaceDef
-};
-
-static const TAO_Call_Data Object_get_interface_calldata =
-{
-  "_interface",
-  CORBA::B_TRUE,
-  1,
-  &Object_get_interface_params [0],
-  0, 0
-};
-
-CORBA_Object::~CORBA_Object (void)
-{
-  this->parent_->Release ();
-}
-
-CORBA_Object_var::~CORBA_Object_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA_Object_var::CORBA_Object_var (void) // default constructor
-        : ptr_ (CORBA_Object::_nil ())
-{
-}
-
-CORBA_Object::CORBA_Object (STUB_Object *protocol_proxy,
-                            TAO_ServantBase *servant,
-                            CORBA_Boolean collocated)
-  : servant_ (servant),
-    is_collocated_ (collocated),
-    parent_ (0),
-    refcount_ (1)
-{
-  // Notice that the refcount_ above is initialized to 1 because
-  // the semantics of CORBA Objects are such that obtaining one
-  // implicitly takes a reference.
-  this->_set_parent (protocol_proxy);
-}
-
-// CORBA dup/release build on top of COM's (why not).
-
-void
-CORBA::release (CORBA_Object_ptr obj)
-{
-  if (obj)
-    obj->Release ();
-}
-
-CORBA::InterfaceDef_ptr
-CORBA_Object::_get_interface (CORBA::Environment &env)
-{
-  CORBA::InterfaceDef_ptr retval = 0;
-
-  // At this time, we only have a single generic way to find the CORBA
-  // interface def for an object.
-
-  STUB_Object *istub;
-
-  if (QueryInterface (IID_STUB_Object, (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return retval;
-    }
-  Release ();
-
-  // NOTE: If istub->type_id is nonzero, we could try asking a "local"
-  // interface repository and avoid costly network I/O.  (It's wrong
-  // to have different data associated with the same interface ID in
-  // different repositories; the interface is the interface, it
-  // doesn't change!)
-  //
-  // We need to be prepared to ask the object itself for this
-  // information though, since there's no guarantee that any local
-  // interface repository will really have records of this particular
-  // interface.
-  istub->do_static_call (env, &Object_get_interface_calldata, &retval);
-  return retval;
-}
-
-// IS_A ... ask the object if it's an instance of the type whose
-// logical type ID is passed as a parameter.
-
-static const TAO_Param_Data Object_is_a_params [] =
-{
-  { CORBA::_tc_boolean, PARAM_RETURN, 0 },
-  { CORBA::_tc_string, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Object_is_a_calldata =
-{
-  "_is_a", CORBA::B_TRUE,
-  2, &Object_is_a_params [0],
-  0, 0
-};
-
-CORBA::Boolean
-CORBA_Object::_is_a (const CORBA::Char *type_id,
-                     CORBA::Environment &env)
-{
-  // If the object is collocated then try locally....
-  if (this->is_collocated_ && this->servant_ != 0)
-    return this->servant_->_is_a (type_id, env);
-
-  // At this time, we only have a single generic way to check the type
-  // of an object.
-  STUB_Object *istub;
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return CORBA::B_FALSE;
-    }
-
-  Release ();
-
-  // NOTE: if istub->type_id is nonzero and we have local knowledge of
-  // it, we can answer this question without a costly remote call.
-  //
-  // That "local knowledge" could come from stubs or skeletons linked
-  // into this process in the best case, or a "near" repository in a
-  // slightly worse case.  Or in a trivial case, if the ID being asked
-  // about is the ID we have recorded, we don't need to ask about the
-  // inheritance relationships at all!
-  //
-  // In real systems having local knowledge will be common, though as
-  // the systems built atop ORBs become richer it'll also become
-  // common to have the "real type ID" not be directly understood
-  // because it's more deeply derived than any locally known types.
-  //
-  // XXX if type_id is that of CORBA_Object, "yes, we comply" :-)
-
-  if ( ACE_static_cast(const char *, istub->type_id) != 0
-      && ACE_OS::strcmp ((char *) type_id, (char *) istub->type_id) == 0)
-    return CORBA::B_TRUE;
-
-  // Our local knowledge about this type is insufficient to say
-  // whether this reference is to an object of a type which "is_a"
-  // subtype of the type whose ID is passed as a parameter.  The
-  // implementation always knows the answer to that question, however!
-
-  CORBA::Boolean retval = CORBA::B_FALSE;
-
-  istub->do_static_call (env, &Object_is_a_calldata, &retval, &type_id);
-  return retval;
-}
-
-const char*
-CORBA_Object::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Object:1.0";
-}
-
-TAO_ServantBase *
-CORBA_Object::_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean
-CORBA_Object::_is_collocated (void) const
-{
-  return this->is_collocated_;
-}
-
-// GET_IMPLEMENTATION ... send a simple call to the object, it returns
-// an ImplementationDef objref.
-
-static const TAO_Param_Data Object_get_implementation_params [] =
-{
-  { CORBA::_tc_Object, PARAM_RETURN, 0 }
-  // XXX should be tc_ImplementationDef
-};
-
-static const TAO_Call_Data Object_get_implementation_calldata =
-{
-  "_implementation",
-  CORBA::B_TRUE,
-  1,
-  &Object_get_implementation_params [0],
-  0, 0
-};
-
-CORBA::ImplementationDef_ptr
-CORBA_Object::_get_implementation (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-  CORBA::ImplementationDef_ptr  retval = 0;
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return retval;
-    }
-  Release ();
-
-  istub->do_static_call (env, &Object_get_implementation_calldata, &retval);
-  return retval;
-}
-
-// NON_EXISTENT ... send a simple call to the object, which will
-// either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
-// the latter case, return FALSE.
-
-static const TAO_Param_Data Object_non_existent_params [] =
-{
-  { CORBA::_tc_boolean, PARAM_RETURN, 0 }
-};
-
-static const TAO_Call_Data Object_non_existent_calldata =
-{
-  "_non_existent", CORBA::B_TRUE,
-  1, &Object_non_existent_params [0],
-  0, 0
-};
-
-CORBA::Boolean
-CORBA_Object::_non_existent (CORBA::Environment &env)
-{
-  CORBA::Boolean retval = CORBA::B_FALSE;
-  STUB_Object *istub;
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return CORBA::B_FALSE;
-    }
-  Release ();
-
-  istub->do_static_call (env, &Object_non_existent_calldata, &retval);
-
-  CORBA::Exception *x = env.exception ();
-
-  if (x != 0)
-    {
-      const char *id;
-
-      id = CORBA::_tc_OBJECT_NOT_EXIST->id (env);
-      if (env.exception () == 0
-          && ACE_OS::strcmp (id, x->_id ()) == 0)
-        {
-          env.clear ();
-          return CORBA::B_TRUE;
-        }
-
-      // reporting a "real" exception ...
-
-      return CORBA::B_FALSE;
-    }
-  else
-    {
-      env.clear ();
-      return CORBA::B_FALSE;
-    }
-}
-
-// Quickly hash an object reference's representation data.  Used to
-// create hash tables.
-
-CORBA::ULong
-CORBA_Object::_hash (CORBA::ULong maximum,
-                     CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return CORBA::B_FALSE;
-    }
-  Release ();
-
-  return istub->hash (maximum, env);
-}
-
-// Compare two object references to see if they point to the same
-// object.  Used in linear searches, as in hash buckets.
-//
-// XXX would be useful to also have a trivalued comparison predicate,
-// such as strcmp(), to allow more comparison algorithms.
-
-CORBA::Boolean
-CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                              CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (other_obj == this)
-    {
-      env.clear ();
-      return CORBA::B_TRUE;
-    }
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return CORBA::B_FALSE;
-    }
-  Release ();
-
-  return istub->is_equivalent (other_obj, env);
-}
-
-// TAO's extensions
-
-TAO_ObjectKey *
-CORBA::Object::_key (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (QueryInterface (IID_STUB_Object,
-                      (void **) &istub) != TAO_NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  Release ();
-
-  if (istub)
-    return istub->key (env);
-
-  return 0; //otherwise
-}
-
-STUB_Object *
-CORBA_Object::stubobj (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  return istub;
-}
-
-
-// COM's IUnknown support
-
-// XXX this is not the GUID that Microsoft uses.  It can matter.
-
-// {77420089-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_TAO_IUnknown,
-0x77420089, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {A201E4C2-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_Object,
-0xa201e4c2, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
deleted file mode 100644
index 6f35b1c971b..00000000000
--- a/TAO/tao/Object.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    object.h
-//
-// = DESCRIPTION
-//     Header file for Win32 interface to CORBA's base "Object" type.
-//
-//     A "Object" is an entity that can be the target of an invocation
-//     using an ORB.  All CORBA objects provide this functionality.
-//     See the CORBA 2.0 specification for details.
-//
-// = AUTHOR
-//     Portions Copyright 1994-1995 by Sun Microsystems Inc.
-//     Portions Copyright 1997 by Washington University
-//
-// ============================================================================
-
-#if !defined (CORBA_OBJECT_H)
-#  define CORBA_OBJECT_H
-
-class TAO_ServantBase;
-class STUB_Object;
-
-class TAO_Export CORBA_Object : public TAO_IUnknown
-{
-public:
-  static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj);
-  // increment the ref count
-
-  static CORBA::Object_ptr _nil (void);
-  // return a NUL object
-
-  // These calls correspond to over-the-wire operations, or at least
-  // do so in many common cases.  The normal implementation assumes a
-  // particular simple, efficient, protocol-neutral interface for
-  // making such calls, but may be overridden when it appears
-  // appropriate.
-
-  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA::Environment &);
-  // Interface repository related operation
-
-  virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA::Environment &);
-  // determine if we are of the type specified by the "logical_type_id"
-
-  virtual const char* _interface_repository_id (void) const;
-  // The repository ID for the most derived class, this is an
-  // implementation method and does no remote invocations!
-
-  virtual TAO_ServantBase *_servant (void) const;
-  // return the associated servant (if one exists)
-
-  virtual CORBA::Boolean _is_collocated (void) const;
-  // are we collocated with the servant?
-
-  virtual CORBA::ImplementationDef_ptr _get_implementation (CORBA::Environment &);
-
-  virtual CORBA::Boolean _non_existent (CORBA::Environment &);
-
-  // The mapping for create_request is split into two forms,
-  // corresponding to the two usage styles described in CORBA section
-  // 6.2.1.
-  //
-  // The default implementation of this method uses the same simple,
-  // multi-protocol remote invocation interface as is assumed by the
-  // calls above ... that's how it can have a default implementation.
-
-  virtual void _create_request (const CORBA::Char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA::Environment &env);
-  // DII operation to create a request
-
-  virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA::Environment &env);
-  // DII operation to create a request
-
-  // These two rely on the representation of the object reference's
-  // private state.  Since that changes easily (when different ORB
-  // protocols are in use) there is no default implementation.
-
-  virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA::Environment &env);
-
-  virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA::Environment &env);
-
-  // = COM-like IUnknown Support
-  //
-  // This class is intended to aggregate or be contained with others,
-  // which in combination provide all requisite CORBA/COM support.
-
-  ULONG AddRef (void);
-  ULONG Release (void);
-  TAO_HRESULT QueryInterface (REFIID riid,
-                              void **ppv);
-
-  CORBA_Object (STUB_Object *p = 0,
-                TAO_ServantBase *servant = 0,
-                CORBA::Boolean collocated = CORBA::B_FALSE);
-  // constructor
-
-  virtual ~CORBA_Object (void);
-  // destructor
-
-  virtual TAO_ObjectKey *_key (CORBA::Environment &env);
-  // Return the object key as an out parameter.  Caller should release
-  // return value when finished with it.
-
-  virtual STUB_Object *stubobj (CORBA::Environment &env);
-  // get the underlying stub object
-
-  // = Non-standard
-
-  void _set_parent (STUB_Object *p);
-  // Set the protocol proxy object.
-
-  STUB_Object *_get_parent (void) const;
-  // Get the protocol proxy object.
-
-protected:
-  TAO_ServantBase *servant_;
-  // Servant pointer.  It is 0 except for collocated objects.
-
-  CORBA::Boolean is_collocated_;
-  // Flag to indicate collocation.  It is 0 except for collocated
-  // objects.
-
-private:
-  STUB_Object *parent_;
-  // Pointer to the protocol-specific "object" containing important
-  // profiling information regarding this proxy.
-  //
-  // This used to be a TAO_IUnknown, but that seemed overtly general.
-  // It's changed to a STUB_Object to make the relationship of the
-  // target more explicit and sensible.
-
-  ACE_SYNCH_MUTEX IUnknown_lock_;
-  // Mutex to protect reference counting stuff.
-
-  u_int refcount_;
-  // Number of outstanding references to this object.
-
-  // = Unimplemented methods
-  CORBA_Object (const CORBA_Object &);
-  CORBA_Object &operator = (const CORBA_Object &);
-};
-
-class TAO_Export CORBA_Object_var
-{
-public:
-  CORBA_Object_var (void); // default constructor
-  CORBA_Object_var (CORBA::Object_ptr);
-  CORBA_Object_var (const CORBA_Object_var &); // copy constructor
-  ~CORBA_Object_var (void); // destructor
-
-  CORBA_Object_var &operator= (CORBA::Object_ptr);
-  CORBA_Object_var &operator= (const CORBA_Object_var &);
-  CORBA::Object_ptr operator-> (void) const;
-
-  operator const CORBA::Object_ptr &() const;
-  operator CORBA::Object_ptr &();
-  // in, inout, out, _retn
-  CORBA::Object_ptr in (void) const;
-  CORBA::Object_ptr &inout (void);
-  CORBA::Object_ptr &out (void);
-  CORBA::Object_ptr _retn (void);
-  CORBA::Object_ptr ptr (void) const;
-
-private:
-  CORBA::Object_ptr ptr_;
-};
-
-class TAO_Export CORBA_Object_out
-{
-public:
-  CORBA_Object_out (CORBA::Object_ptr &);
-  CORBA_Object_out (CORBA_Object_var &);
-  CORBA_Object_out (CORBA_Object_out &);
-  CORBA_Object_out &operator= (CORBA_Object_out &);
-  CORBA_Object_out &operator= (const CORBA_Object_var &);
-  CORBA_Object_out &operator= (CORBA::Object_ptr);
-  operator CORBA::Object_ptr &();
-  CORBA::Object_ptr &ptr (void);
-  CORBA::Object_ptr operator-> (void);
-
-private:
-  CORBA::Object_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* CORBA_OBJECT_H */
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
deleted file mode 100644
index 73ecbc00f99..00000000000
--- a/TAO/tao/Object.i
+++ /dev/null
@@ -1,266 +0,0 @@
-// $Id$
-
-// = methods for class CORBA_Object
-
-ACE_INLINE ULONG
-CORBA_Object::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->IUnknown_lock_, 0));
-
-  return ++this->refcount_;
-}
-
-ACE_INLINE ULONG
-CORBA_Object::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->IUnknown_lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--this->refcount_ != 0)
-      return this->refcount_;
-  }
-  delete this;
-  return 0;
-}
-
-ACE_INLINE TAO_HRESULT
-CORBA_Object::QueryInterface (REFIID riid,
-                              void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_IIOP_Object == riid
-      || IID_STUB_Object == riid
-      || IID_TAO_IUnknown == riid)
-    *ppv = this->parent_;
-  else if (IID_CORBA_Object == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return TAO_ResultFromScode (TAO_E_NOINTERFACE);
-
- (void) this->AddRef ();
-  return TAO_NOERROR;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_duplicate (CORBA::Object_ptr obj)
-{
-  if (obj)
-    obj->AddRef ();
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Object_ptr obj)
-{
-  return (CORBA::Boolean) (obj == 0);
-}
-
-ACE_INLINE void
-CORBA_Object::_set_parent (STUB_Object *p)
-{
-  if (p != 0 && p->AddRef () != 0)
-    {
-      // Release the one we had.
-      if (this->parent_)
-        this->parent_->Release ();
-
-      // Hold on to the new one
-      this->parent_ = p;
-    }
-
-  ACE_ASSERT (this->parent_ != 0);
-}
-
-ACE_INLINE STUB_Object *
-CORBA_Object::_get_parent (void) const
-{
-  return this->parent_;
-}
-
-// DII hook to objref
-//
-// The mapping for create_request is split into two forms,
-// corresponding to the two usage styles described in CORBA section
-// 6.2.1.
-
-ACE_INLINE void
-CORBA_Object::_create_request (const CORBA::Char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &env)
-{
-  env.clear ();
-  request = new CORBA::Request (this, operation, arg_list, result, req_flags);
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA_Object::_request (const CORBA::Char *operation,
-                        CORBA::Environment &env)
-{
-  env.clear ();
-  return new CORBA::Request (this, operation);
-}
-
-
-// *************************************************************
-// Inline operations for class CORBA_Object_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Object_var::CORBA_Object_var (CORBA_Object_ptr p)
-        : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Object_var::CORBA_Object_var (const CORBA_Object_var &p) // copy constructor
-        : ptr_ (CORBA_Object::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Object_var &
-CORBA_Object_var::operator= (CORBA_Object_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_var &
-CORBA_Object_var::operator= (const CORBA_Object_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Object::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Object_var::operator const CORBA_Object_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Object_var::operator CORBA_Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Object::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Object_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Object::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Object_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (CORBA_Object_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Object::_nil ();
-}
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (CORBA_Object_var &p) // constructor from _var
-        : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Object::_nil ();
-}
-
-ACE_INLINE
-CORBA_Object_out::CORBA_Object_out (CORBA_Object_out &p) // copy constructor
-        : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (CORBA_Object_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (const CORBA_Object_var &p)
-{
-  this->ptr_ = CORBA_Object::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Object_out &
-CORBA_Object_out::operator= (CORBA_Object_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Object_out::operator CORBA_Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr &
-CORBA_Object_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Object_ptr
-CORBA_Object_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Object_Key.idl b/TAO/tao/Object_Key.idl
deleted file mode 100644
index b32eec288da..00000000000
--- a/TAO/tao/Object_Key.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// @@ Please document me.
-
-module TAO 
-{
-  typedef sequence<octet> ObjectKey;
-};
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
deleted file mode 100644
index f437bc9c40b..00000000000
--- a/TAO/tao/Object_KeyC.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
-#endif // !defined INLINE
-
-
-#if !defined (_TAO__TAO_SEQ_OCTET_CS_)
-#define _TAO__TAO_SEQ_OCTET_CS_
-
-const CORBA::Long _oc_TAO__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-CORBA::TypeCode _tc__tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_TAO__tao_seq_Octet), (char *) &_oc_TAO__tao_seq_Octet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr TAO_tc__tao_seq_Octet = &_tc__tc_TAO__tao_seq_Octet;
-
-
-#endif // end #if !defined
-
-const CORBA::Long _oc_TAO_ObjectKey[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  22, 0x49444c3a, 0x54414f2f, 0x4f626a65, 0x63744b65, 0x793a312e, 0x30000000,  // repository ID = IDL:TAO/ObjectKey:1.0
-  10, 0x4f626a65, 0x63744b65, 0x79000000,  // name = ObjectKey
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-CORBA::TypeCode _tc__tc_TAO_ObjectKey (CORBA::tk_alias, sizeof (_oc_TAO_ObjectKey), (char *) &_oc_TAO_ObjectKey, CORBA::B_FALSE);
-CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc__tc_TAO_ObjectKey;
-
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
deleted file mode 100644
index ed90e164db0..00000000000
--- a/TAO/tao/Object_KeyC.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- c++ -*-
-// $Id$
-//
-// Hand-modified by Chris Cleeland.
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_OBJECT_KEYC_H_)
-#define _TAO_IDL_OBJECT_KEYC_H_
-
-#if !defined (_TAO__TAO_SEQ_OCTET_CH_)
-#define _TAO__TAO_SEQ_OCTET_CH_
-
-// *************************************************************
-// TAO_tao_seq_Octet
-// *************************************************************
-  
-typedef TAO_Unbounded_Sequence<CORBA::Octet > TAO_tao_seq_Octet;
-typedef TAO_tao_seq_Octet* TAO_tao_seq_Octet_ptr;
-
-#endif // end #if !defined
-
-#if !defined (_TAO__TAO_SEQ_OCTET___VAR_CH_)
-#define _TAO__TAO_SEQ_OCTET___VAR_CH_
-
-// *************************************************************
-// class TAO_tao_seq_Octet_var
-// *************************************************************
-
-class TAO_tao_seq_Octet_var
-{
-public:
-  TAO_tao_seq_Octet_var (void); // default constructor
-  TAO_tao_seq_Octet_var (TAO_tao_seq_Octet *);
-  TAO_tao_seq_Octet_var (const TAO_tao_seq_Octet_var &); // copy constructor
-  ~TAO_tao_seq_Octet_var (void); // destructor
-    
-  TAO_tao_seq_Octet_var &operator= (TAO_tao_seq_Octet *);
-  TAO_tao_seq_Octet_var &operator= (const TAO_tao_seq_Octet_var &);
-  TAO_tao_seq_Octet *operator-> (void);
-  const TAO_tao_seq_Octet *operator-> (void) const;
-    
-  operator const TAO_tao_seq_Octet &() const;
-  operator TAO_tao_seq_Octet &();
-  operator TAO_tao_seq_Octet &() const;
-  CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
-  const TAO_tao_seq_Octet &in (void) const;
-  TAO_tao_seq_Octet &inout (void);
-  TAO_tao_seq_Octet *&out (void);
-  TAO_tao_seq_Octet *_retn (void);
-  TAO_tao_seq_Octet *ptr (void) const;
-
-private:
-  TAO_tao_seq_Octet *ptr_;
-};
-
-#endif // end #if !defined
-
-#if !defined (_TAO__TAO_SEQ_OCTET___OUT_CH_)
-#define _TAO__TAO_SEQ_OCTET___OUT_CH_
-
-class TAO_tao_seq_Octet_out
-{
-public:
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet *&);
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_var &);
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_out &);
-  TAO_tao_seq_Octet_out &operator= (TAO_tao_seq_Octet_out &);
-  TAO_tao_seq_Octet_out &operator= (TAO_tao_seq_Octet *);
-  operator TAO_tao_seq_Octet *&();
-  TAO_tao_seq_Octet *&ptr (void);
-  TAO_tao_seq_Octet *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong index);
-    
-private:
-  TAO_tao_seq_Octet *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const TAO_tao_seq_Octet_var &);
-};
-
-#endif // end #if !defined
-
-typedef TAO_tao_seq_Octet TAO_ObjectKey;
-typedef TAO_tao_seq_Octet_var TAO_ObjectKey_var;
-typedef TAO_tao_seq_Octet_out TAO_ObjectKey_out;
-
-#if defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
-#endif // defined INLINE
-
-#endif /* _TAO_IDL_OBJECT_KEYC_H_ */
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
deleted file mode 100644
index 03dc4e856da..00000000000
--- a/TAO/tao/Object_KeyC.i
+++ /dev/null
@@ -1,201 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO__TAO_SEQ_OCTET___VAR_CI_)
-#define _TAO__TAO_SEQ_OCTET___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-TAO_tao_seq_Octet_var::TAO_tao_seq_Octet_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_tao_seq_Octet_var::TAO_tao_seq_Octet_var (TAO_tao_seq_Octet *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-TAO_tao_seq_Octet_var::TAO_tao_seq_Octet_var (const TAO_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new TAO_tao_seq_Octet(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_tao_seq_Octet_var::~TAO_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet_var &
-TAO_tao_seq_Octet_var::operator= (TAO_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_tao_seq_Octet_var &
-TAO_tao_seq_Octet_var::operator= (const TAO_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TAO_tao_seq_Octet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TAO_tao_seq_Octet *
-TAO_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet *
-TAO_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-TAO_tao_seq_Octet_var::operator const TAO_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-TAO_tao_seq_Octet_var::operator TAO_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-TAO_tao_seq_Octet_var::operator TAO_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-TAO_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const TAO_tao_seq_Octet &
-TAO_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet &
-TAO_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE TAO_tao_seq_Octet *&
-TAO_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet *
-TAO_tao_seq_Octet_var::_retn (void)
-{
-  TAO_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE TAO_tao_seq_Octet *
-TAO_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_TAO__TAO_SEQ_OCTET___OUT_CI_)
-#define _TAO__TAO_SEQ_OCTET___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-TAO_tao_seq_Octet_out::TAO_tao_seq_Octet_out (TAO_tao_seq_Octet *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_tao_seq_Octet_out::TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_tao_seq_Octet_out::TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE TAO_tao_seq_Octet_out &
-TAO_tao_seq_Octet_out::operator= (TAO_tao_seq_Octet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_tao_seq_Octet_out &
-TAO_tao_seq_Octet_out::operator= (TAO_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-TAO_tao_seq_Octet_out::operator TAO_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet *&
-TAO_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_tao_seq_Octet *
-TAO_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-TAO_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif // end #if !defined
-
diff --git a/TAO/tao/Object_Table.cpp b/TAO/tao/Object_Table.cpp
deleted file mode 100644
index 9c206a027f2..00000000000
--- a/TAO/tao/Object_Table.cpp
+++ /dev/null
@@ -1,660 +0,0 @@
-// $Id$
-
-#include "ace/Auto_Ptr.h"
-
-#include "tao/corba.h"
-#include "tao/Object_Table.h"
-
-TAO_Object_Table_Iterator_Impl::~TAO_Object_Table_Iterator_Impl (void)
-{
-}
-
-TAO_Object_Table_Impl::~TAO_Object_Table_Impl (void)
-{
-}
-
-int
-TAO_Object_Table_Impl::find (const PortableServer::Servant servant)
-{
-  PortableServer::ObjectId* id;
-  PortableServer::ObjectId_out id_out (id);
-  int ret = this->find (servant, id_out);
-  if (ret == -1)
-    return -1;
-  
-  // It was found and returned in <id>, we must release it.
-  delete id;
-  return 0;
-}
-
-int
-TAO_Object_Table_Impl::find (const PortableServer::ObjectId &id)
-{
-  PortableServer::Servant servant;
-  return this->find (id, servant);
-}
-
-int
-TAO_Object_Table_Impl::find (const PortableServer::Servant servant,
-			     PortableServer::ObjectId_out id)
-{
-  id.ptr () = 0;
-  auto_ptr<TAO_Object_Table_Iterator_Impl> end (this->end ());
-  for (auto_ptr<TAO_Object_Table_Iterator_Impl> i (this->begin ());
-       !i->done (end.get ());
-       i->advance ())
-    {
-      const TAO_Object_Table_Entry& item = i->item ();
-      if (item.int_id_ == servant)
-	{
-	  if (id.ptr () != 0)
-	    {
-	      // More than one match return -1.
-	      delete id.ptr ();
-	      return -1;
-	    }
-	  // Store the match....
-	  id.ptr () = new PortableServer::ObjectId (item.ext_id_);
-	}
-    }
-  return (id.ptr () == 0)?-1:0;
-}
-
-
-
-TAO_Object_Table_Iterator::
-TAO_Object_Table_Iterator (TAO_Object_Table_Iterator_Impl *impl)
-  :  impl_ (impl)
-{
-}
-
-TAO_Object_Table_Iterator::
-TAO_Object_Table_Iterator (const TAO_Object_Table_Iterator &x)
-  :  impl_ (0)
-{
-  if (x.impl_ != 0)
-    {
-      this->impl_ = x.impl_->clone ();
-    }
-}
-
-TAO_Object_Table_Iterator&
-TAO_Object_Table_Iterator::operator= (const TAO_Object_Table_Iterator &x)
-{
-  if (this != &x)
-    {
-      delete this->impl_;
-      if (x.impl_ == 0)
-	{
-	  this->impl_ = 0;
-	}
-      else
-	{
-	  this->impl_ = x.impl_->clone ();
-	}
-    }
-  return *this;
-}
-
-TAO_Object_Table_Iterator::~TAO_Object_Table_Iterator (void)
-{
-  if (this->impl_ != 0)
-    {
-      delete this->impl_;
-      this->impl_ = 0;
-    }
-}
-
-const TAO_Object_Table_Entry&
-TAO_Object_Table_Iterator::operator* (void) const
-{
-  return this->impl_->item ();
-}
-
-TAO_Object_Table_Iterator
-TAO_Object_Table_Iterator::operator++ (void)
-{
-  TAO_Object_Table_Iterator tmp = *this;
-  this->impl_->advance ();
-  return tmp;
-}
-
-TAO_Object_Table_Iterator
-TAO_Object_Table_Iterator::operator++ (int)
-{
-  this->impl_->advance ();
-  return *this;
-}
-
-int
-operator== (const TAO_Object_Table_Iterator &l,
-	    const TAO_Object_Table_Iterator &r)
-{
-  return l.impl_->done (r.impl_);
-}
-
-int
-operator!= (const TAO_Object_Table_Iterator &l,
-	    const TAO_Object_Table_Iterator &r)
-{
-  return !(l == r);
-}
-
-
-
-TAO_Object_Table::TAO_Object_Table (void)
-{
-  this->impl_ = TAO_ORB_Core_instance ()->server_factory ()->create_object_table ();
-}
-  
-TAO_Object_Table::~TAO_Object_Table (void)
-{
-  delete this->impl_;
-}
-
-int
-TAO_Object_Table::find (const PortableServer::ObjectId &id, 
-			PortableServer::Servant &servant)
-{
-  return this->impl_->find (id, servant);
-}
-
-int
-TAO_Object_Table::bind (const PortableServer::ObjectId &id, 
-			PortableServer::Servant servant)
-{
-  return this->impl_->bind (id, servant);
-}
-
-int
-TAO_Object_Table::unbind (const PortableServer::ObjectId &id,
-			  PortableServer::Servant &servant)
-{
-  return this->impl_->unbind (id, servant);
-}
-
-int
-TAO_Object_Table::find (const PortableServer::Servant servant)
-{
-  return this->impl_->find (servant);
-}
-
-int
-TAO_Object_Table::find (const PortableServer::ObjectId &id)
-{
-  return this->impl_->find (id);
-}
-
-int
-TAO_Object_Table::find (const PortableServer::Servant servant,
-			PortableServer::ObjectId_out id)
-{
-  return this->impl_->find (servant, id);
-}
-
-TAO_Object_Table::iterator
-TAO_Object_Table::begin (void) const
-{
-  return TAO_Object_Table::iterator (this->impl_->begin ());
-}
-
-TAO_Object_Table::iterator
-TAO_Object_Table::end (void) const
-{
-  return TAO_Object_Table::iterator (this->impl_->end ());
-}
-
-
-
-/*
-int
-operator== (const PortableServer::ObjectId &l,
-	    const PortableServer::ObjectId &r)
-{
-  if (l.length () != r.length ())
-    return 0;
-
-  for (CORBA::ULong i = 0;
-       i < l.length ();
-       ++i)
-    {
-      if (l[i] != r[i])
-	return 0;
-    }
-  return 1;
-}
-*/
-
-// Template specialization....
-u_long
-ACE_Hash_Map_Manager<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>::
-hash (const PortableServer::ObjectId &ext_id)
-{
-  // Based on hash_pjw function on the ACE library.
-  u_long hash = 0;
-
-  for (CORBA::ULong i = 0;
-       i < ext_id.length ();
-       ++i)
-    {
-      hash = (hash << 4) + (ext_id[i] * 13);
-
-      u_long g = hash & 0xf0000000;
-
-      if (g)
-        {
-          hash ^= (g >> 24);
-          hash ^= g;
-        }
-    }
-
-  return hash;
-}
-
-TAO_Dynamic_Hash_ObjTable::TAO_Dynamic_Hash_ObjTable (CORBA::ULong size)
-  :  hash_map_ (size)
-{
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::find (const PortableServer::Servant servant)
-{
-  return this->TAO_Object_Table_Impl::find (servant);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::find (const PortableServer::ObjectId &id)
-{
-  return this->TAO_Object_Table_Impl::find (id);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::find (const PortableServer::Servant servant,
-				 PortableServer::ObjectId_out id)
-{
-  return this->TAO_Object_Table_Impl::find (servant, id);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::find (const PortableServer::ObjectId &id,
-				 PortableServer::Servant &servant)
-{
-  return this->hash_map_.find (id, servant);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::bind (const PortableServer::ObjectId &id,
-				 PortableServer::Servant servant)
-{
-  return this->hash_map_.bind (id, servant);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::unbind (const PortableServer::ObjectId &id,
-				   PortableServer::Servant &servant)
-{
-  return this->hash_map_.unbind (id, servant);
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Dynamic_Hash_ObjTable::begin (void) const
-{
-  TAO_Dynamic_Hash_ObjTable *non_const = 
-    ACE_const_cast(TAO_Dynamic_Hash_ObjTable*, this);
-  return new TAO_Dynamic_Hash_ObjTable_Iterator (Iterator (non_const->hash_map_));
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Dynamic_Hash_ObjTable::end (void) const
-{
-  return 0;
-}
-
-TAO_Dynamic_Hash_ObjTable_Iterator::
-TAO_Dynamic_Hash_ObjTable_Iterator (const Impl& impl)
-  :  impl_ (impl)
-{
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Dynamic_Hash_ObjTable_Iterator::clone (void) const
-{
-  return new TAO_Dynamic_Hash_ObjTable_Iterator (*this);
-}
-
-const TAO_Object_Table_Entry&
-TAO_Dynamic_Hash_ObjTable_Iterator::item (void) const
-{
-  static TAO_Object_Table_Entry entry;
-
-  ACE_Hash_Map_Entry<PortableServer::ObjectId,PortableServer::Servant>* tmp;
-  if (ACE_const_cast(TAO_Dynamic_Hash_ObjTable_Iterator*,this)->impl_.next (tmp) == 1)
-    {
-      entry.int_id_ = tmp->int_id_;
-      entry.ext_id_ = tmp->ext_id_;
-    }
-  return entry;
-}
-
-void
-TAO_Dynamic_Hash_ObjTable_Iterator::advance (void)
-{
-  this->impl_.advance ();
-}
-
-int
-TAO_Dynamic_Hash_ObjTable_Iterator::done (const TAO_Object_Table_Iterator_Impl *) const
-{
-  return this->impl_.done ();
-}
-
-
-
-TAO_Array_ObjTable_Iterator::
-TAO_Array_ObjTable_Iterator (TAO_Object_Table_Entry *pos)
-  :  pos_ (pos)
-{
-}
-
-TAO_Object_Table_Iterator_Impl *
-TAO_Array_ObjTable_Iterator::clone (void) const
-{
-  return new TAO_Array_ObjTable_Iterator (*this);
-}
-
-const TAO_Object_Table_Entry&
-TAO_Array_ObjTable_Iterator::item (void) const
-{
-  return *this->pos_;
-}
-
-void
-TAO_Array_ObjTable_Iterator::advance (void)
-{
-  this->pos_++;
-}
-
-int
-TAO_Array_ObjTable_Iterator::done (const TAO_Object_Table_Iterator_Impl *end) const
-{
-  const TAO_Array_ObjTable_Iterator *tmp =
-    ACE_dynamic_cast(const TAO_Array_ObjTable_Iterator*, end);
-  return (this->pos_ == tmp->pos_);
-}
-
-
-
-TAO_Linear_ObjTable::
-TAO_Linear_ObjTable (CORBA::ULong size)
-  :  next_ (0),
-     tablesize_ (size)
-{
-  ACE_NEW (table_, TAO_Object_Table_Entry[this->tablesize_]);
-}
-
-TAO_Linear_ObjTable::~TAO_Linear_ObjTable (void)
-{
-  if (this->table_ != 0)
-    {
-      delete[] this->table_;
-      this->table_ = 0;
-    }
-}
-
-int
-TAO_Linear_ObjTable::find (const PortableServer::Servant servant)
-{
-  return this->TAO_Object_Table_Impl::find (servant);
-}
-
-int
-TAO_Linear_ObjTable::find (const PortableServer::ObjectId &id)
-{
-  return this->TAO_Object_Table_Impl::find (id);
-}
-
-int
-TAO_Linear_ObjTable::find (const PortableServer::Servant servant,
-			   PortableServer::ObjectId_out id)
-{
-  return this->TAO_Object_Table_Impl::find (servant, id);
-}
-
-int
-TAO_Linear_ObjTable::find (const PortableServer::ObjectId &id, 
-			   PortableServer::Servant &servant)
-{
-  for (TAO_Object_Table_Entry *i = this->table_;
-       i != this->table_ + this->next_;
-       ++i)
-    {
-      if ((*i).ext_id_ == id)
-	{
-	  servant = (*i).int_id_;
-	  return 0;
-	}
-    }
-  return -1;
-}
-
-const int start_tblsiz = 128;
-const int max_exp = 65536; // Grow table exponentially up to 64K
-const int lin_chunk = 32768; // afterwards grow in chunks of 32K
-
-int
-TAO_Linear_ObjTable::bind (const PortableServer::ObjectId &id, 
-			   PortableServer::Servant servant)
-{
-  for (TAO_Object_Table_Entry *i = this->table_;
-       i != this->table_ + this->next_;
-       ++i)
-    {
-      if ((*i).ext_id_ == id || (*i).int_id_ == 0)
-	{
-	  (*i).ext_id_ = id;
-	  (*i).int_id_ = servant;
-	  return 0;
-	}
-    }
-  if (this->next_ == this->tablesize_)
-    {
-      if (this->next_ == 0)
-	{
-	  this->tablesize_ = start_tblsiz;
-	  ACE_NEW_RETURN (this->table_,
-			  TAO_Object_Table_Entry[this->tablesize_],
-			  -1);
-	}
-      else
-	{
-	  if (this->tablesize_ < max_exp)
-	    {
-	      this->tablesize_ *= 2;
-	    }
-	  else
-	    {
-	      this->tablesize_ += lin_chunk;
-	    }
-	  TAO_Object_Table_Entry *tmp;
-	  ACE_NEW_RETURN (tmp,
-			  TAO_Object_Table_Entry[this->tablesize_],
-			  -1);
-	  for (TAO_Object_Table_Entry *i = this->table_, *j = tmp;
-	       i != this->table_ + this->next_;
-	       ++i, ++j)
-	    {
-	      *j = *i;
-	    }
-	  delete[] this->table_;
-	  this->table_ = tmp;
-	}
-    }
-  this->table_[this->next_].ext_id_ = id;
-  this->table_[this->next_].int_id_ = servant;
-  this->next_++;
-  return 0;
-}
-
-int
-TAO_Linear_ObjTable::unbind (const PortableServer::ObjectId &id,
-			     PortableServer::Servant &servant)
-{
-  for (TAO_Object_Table_Entry *i = this->table_;
-       i != this->table_ + this->next_;
-       ++i)
-    {
-      if ((*i).ext_id_ == id)
-	{
-	  servant = (*i).int_id_;
-	  (*i).int_id_ = 0;
-	  return 0;
-	}
-    }
-  return -1;
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Linear_ObjTable::begin () const
-{
-  return new TAO_Array_ObjTable_Iterator (this->table_);
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Linear_ObjTable::end () const
-{
-  return new TAO_Array_ObjTable_Iterator (this->table_ + this->next_);
-}
-
-
-
-// Active Demux search strategy
-// constructor
-TAO_Active_Demux_ObjTable::TAO_Active_Demux_ObjTable (CORBA::ULong size)
-  : tablesize_ (size)
-{
-  ACE_NEW (this->table_, TAO_Object_Table_Entry[size]);
-  // @@ Maybe a proper constructor for TAO_Object_Table_Entry will
-  // solve this more cleanly.
-  for (TAO_Object_Table_Entry *i = this->table_;
-       i != this->table_ + this->tablesize_;
-       ++i)
-    {
-      (*i).int_id_ = 0;
-    }
-}
-
-// destructor
-TAO_Active_Demux_ObjTable::~TAO_Active_Demux_ObjTable ()
-{
-  delete [] this->table_;
-}
-
-int
-TAO_Active_Demux_ObjTable::index_from_id (const PortableServer::ObjectId & /*id*/) const
-{
-  // @@ TODO parse id an obtain the index, maybe write a "index" to id
-  // function or some method to obtain the next "free" id.
-  return 0;
-}
-
-
-int
-TAO_Active_Demux_ObjTable::next_free (void) const
-{
-  for (TAO_Object_Table_Entry *i = this->table_;
-       i != this->table_ + this->tablesize_;
-       ++i)
-    {
-      if ((*i).int_id_ == 0)
-	{
-	  return (i - this->table_);
-	}
-    }
-  return -1;
-}
-
-int
-TAO_Active_Demux_ObjTable::find (const PortableServer::Servant servant)
-{
-  return this->TAO_Object_Table_Impl::find (servant);
-}
-
-int
-TAO_Active_Demux_ObjTable::find (const PortableServer::ObjectId &id)
-{
-  return this->TAO_Object_Table_Impl::find (id);
-}
-
-int
-TAO_Active_Demux_ObjTable::find (const PortableServer::Servant servant,
-				 PortableServer::ObjectId_out id)
-{
-  return this->TAO_Object_Table_Impl::find (servant, id);
-}
-
-int
-TAO_Active_Demux_ObjTable::find (const PortableServer::ObjectId &id, 
-				 PortableServer::Servant &servant)
-{
-  int index = this->index_from_id (id);
-  if (index < 0 || index > this->tablesize_)
-    {
-      return -1;
-    }
-  servant = this->table_[index].int_id_;
-  return 0;
-}
-
-int
-TAO_Active_Demux_ObjTable::bind (const PortableServer::ObjectId &id, 
-				 PortableServer::Servant servant)
-{
-  int index = this->index_from_id (id);
-  if (index < 0 || index > this->tablesize_)
-    {
-      return -1;
-    }
-  this->table_[index].ext_id_ = id;
-  this->table_[index].int_id_ = servant;
-  return 0;
-}
-
-int
-TAO_Active_Demux_ObjTable::unbind (const PortableServer::ObjectId &id,
-				   PortableServer::Servant &servant)
-{
-  int index = this->index_from_id (id);
-  if (index < 0 || index > this->tablesize_)
-    {
-      return -1;
-    }
-  servant = this->table_[index].int_id_;
-  this->table_[index].int_id_ = 0;
-  return 0;
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Active_Demux_ObjTable::begin () const
-{
-  return new TAO_Array_ObjTable_Iterator (this->table_);
-}
-
-TAO_Object_Table_Iterator_Impl*
-TAO_Active_Demux_ObjTable::end () const
-{
-  return new TAO_Array_ObjTable_Iterator (this->table_ + this->tablesize_);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Entry<PortableServer::ObjectId, PortableServer::Servant>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ObjectId, PortableServer::Servant>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object_Table.h b/TAO/tao/Object_Table.h
deleted file mode 100644
index 005a958b0c0..00000000000
--- a/TAO/tao/Object_Table.h
+++ /dev/null
@@ -1,385 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    objtable.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_OBJTABLE_H)
-#  define TAO_OBJTABLE_H
-
-typedef
-ACE_Map_Entry<PortableServer::ObjectId,PortableServer::Servant> 
-TAO_Object_Table_Entry;
-
-class TAO_Export TAO_Object_Table_Iterator_Impl
-{
-  // = TITLE
-  //   Abstract iterator for all Object Table strategies.
-  //
-  // = DESCRIPTION
-  //   We want to provide an common interface for the different object
-  //   tables and their iterators.  Object Tables are handled using
-  //   base classes and virtual methods; but we must provide a "by
-  //   value" interface for iterators.
-  //   To do this we use several well know patterns:
-  //     TAO_Object_Table::iterator uses the Bridge pattern to give a
-  //     consistent and "by-value" interface to all the iterators.
-  //     The base class for all the iterators is
-  //     TAO_Object_Table_Iterator, here we use external polymorphism
-  //     to adapt all the iterators to this common interface.
-  //
-public:
-  virtual ~TAO_Object_Table_Iterator_Impl (void);
-  // dtor
-
-  virtual TAO_Object_Table_Iterator_Impl *clone (void) const = 0;
-  // Make a copy of the iterator, pointing to the current position.
-
-  virtual const TAO_Object_Table_Entry& item (void) const = 0;
-  // Obtain the current item
-
-  virtual void advance (void) = 0;
-  // Advance to the next element.
-
-  virtual int done (const TAO_Object_Table_Iterator_Impl *end) const = 0;
-  // Returns 1 if "this" points to the same position as <end>, returns
-  // 0 otherwise.
-};
-
-class TAO_Export TAO_Object_Table_Impl
-{
-  // = TITLE
-  //   Abstract class for maintaining a mapping from ObjectId's to
-  //   Servants.
-  //
-  // = DESCRIPTION
-  //   
-  // = NOTES
-  //   Iterators may return free entries, whose "int_id" (the servant)
-  //   is 0.
-public:
-  virtual ~TAO_Object_Table_Impl (void);
-  // Destructor.
-
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant) = 0;
-  // Find object associated with <{id}>.
-  // If the ObjectId is found it sets <{servant}> and returns a
-  // non-negative integer.  If not found, <{servant}> is unchanged and
-  // the value <-1> is returned. 
-
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant) = 0;
-  // Associate <{id}> with <{servant}>, returning 0 if object is
-  // registered successfully, 1 if it's already registered, and -1 if
-  // a failure occurs during registration.
-
-  virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant) = 0;
-  // Remote any association among <id> and <servant>.
-  // Returns 0 if the operation was succesful, <-1> otherwise.
-
-  virtual TAO_Object_Table_Iterator_Impl* begin () const = 0;
-  virtual TAO_Object_Table_Iterator_Impl* end () const = 0;
-  // Iterator interface
-
-  virtual int find (const PortableServer::Servant servant);
-  // Returns 0 if <servant> is in the table, <-1> otherwise.
-
-  virtual int find (const PortableServer::ObjectId &id);
-  // Returns 0 if there is a servant for <id> in the table, <-1>
-  // otherwise.
-
-  // This method is only used with unique ids.  Therefore, selecting
-  // the first match is ok. Also the "default" implementation (linear
-  // search on the iterator) makes sense, since the operation is not
-  // time critical.
-  virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  // Find the <id> for <servant>.
-  // Returns <-1> if <servant> is not found or if more than one <id>
-  // is associated with <servant>, returns <0> otherwise.
-
-};
-
-class TAO_Export TAO_Object_Table_Iterator
-{
-  // = TITLE
-  //   Bridge for abstract iterator.
-  //
-  // = DESCRIPTION
-  //   This class provides the "Abstraction" for iteration over Object
-  //   Tables.
-public:
-  TAO_Object_Table_Iterator (TAO_Object_Table_Iterator_Impl *impl);
-  // Constructor taking an implementation.
-
-  TAO_Object_Table_Iterator (const TAO_Object_Table_Iterator& x);
-  TAO_Object_Table_Iterator& operator=(const TAO_Object_Table_Iterator& x);
-  ~TAO_Object_Table_Iterator (void);
-  // This is a well behaved class
-
-  const TAO_Object_Table_Entry& operator* (void) const;
-  // Return the current item.
-
-  TAO_Object_Table_Iterator operator++ (void);
-  TAO_Object_Table_Iterator operator++ (int);
-  // Increase the current position.
-
-  friend int operator==(const TAO_Object_Table_Iterator &l,
-			const TAO_Object_Table_Iterator &r);
-  friend int operator!=(const TAO_Object_Table_Iterator &l,
-			const TAO_Object_Table_Iterator &r);
-  // Compare two iterators.
-
-private:
-  TAO_Object_Table_Iterator_Impl* impl_;
-};
-
-class TAO_Export TAO_Object_Table
-  // = TITLE
-  //     Abstract class for maintaining a mapping of CORBA object keys
-  //     to pointers to CORBA objects.
-{
-public:
-  TAO_Object_Table (void);
-  // Constructor
-  
-  ~TAO_Object_Table (void);
-  // Destructor.
-
-  int find (const PortableServer::ObjectId &id, 
-	    PortableServer::Servant &servant);
-  // Find object associated with <{id}>.
-  // If the ObjectId is found it sets <{servant}> and returns a
-  // non-negative integer.  If not found, <{servant}> is unchanged and
-  // the value <-1> is returned. 
-
-  int bind (const PortableServer::ObjectId &id, 
-	    PortableServer::Servant servant);
-  // Associate <{id}> with <{servant}>, returning 0 if object is
-  // registered successfully, 1 if it's already registered, and -1 if
-  // a failure occurs during registration.
-
-  int unbind (const PortableServer::ObjectId &id,
-	      PortableServer::Servant &servant);
-  // Remote any association among <id> and <servant>.
-  // Returns 0 if the operation was succesful, <-1> otherwise.
-
-  int find (const PortableServer::Servant servant);
-  // Returns 0 if <servant> is in the table, <-1> otherwise.
-
-  int find (const PortableServer::ObjectId &id);
-  // Returns 0 if there is a servant for <id> in the table, <-1>
-  // otherwise.
-
-  // This method is only used with unique ids.  Therefore, selecting
-  // the first match is ok. Also the "default" implementation (linear
-  // search on the iterator) makes sense, since the operation is not
-  // time critical.
-  int find (const PortableServer::Servant servant,
-	    PortableServer::ObjectId_out id);
-  // Find the <id> for <servant>.
-  // Returns <-1> if <servant> is not found or if more than one <id>
-  // is associated with <servant>, returns <0> otherwise.
-
-  typedef TAO_Object_Table_Iterator iterator;
-  iterator begin (void) const;
-  iterator end (void) const;
-
-private:
-  TAO_Object_Table (const TAO_Object_Table&);
-  TAO_Object_Table& operator= (const TAO_Object_Table&);
-  // disallow copying.
-
-private:
-  TAO_Object_Table_Impl* impl_;
-};
-
-/****************************************************************/
-
-// In the next section we implement a few concrete object table
-// implementations, namely:
-//   TAO_Dynamic_Hash_ObjTable, based on dynamic hashing
-//   (ACE_Hash_Map_Manager).
-//   TAO_Linear_ObjTable, using linear search and a simple dynamically
-//   growing array.
-//   TAO_Active_Demux_ObjTable, using also a dynamically allocated
-//   array, but using active demultiplexing to do the lookups.
-
-/****************************************************************/
-
-class TAO_Export TAO_Dynamic_Hash_ObjTable : public TAO_Object_Table_Impl
-{
-  // = TITLE
-  //   Lookup strategy based on dynamic hashing. This works on the
-  //   assumption that the object keys are essentially strings.
-  //
-  // = DESCRIPTION
-  //   The object table is implemented using a ACE_Hash_Map_Manager,
-  //   the iterators are implemented using the ACE_Hash_Map_Iterator
-  //   class.
-  //
-public:
-  TAO_Dynamic_Hash_ObjTable (CORBA::ULong size = 0);
-  // constructor. If size is 0, some default is used.
-
-  // Implement TAO_Dynamic_Hash_ObjTable....
-  virtual int find (const PortableServer::Servant servant);
-  virtual int find (const PortableServer::ObjectId &id);
-  virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
-  virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
-  virtual TAO_Object_Table_Iterator_Impl* begin (void) const;
-  virtual TAO_Object_Table_Iterator_Impl* end (void) const;
-
-  // Dynamic Hashing scheme using template specialization for char*
-  typedef ACE_Hash_Map_Manager<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX> Hash_Map;
-  typedef ACE_Hash_Map_Iterator<PortableServer::ObjectId, PortableServer::Servant, ACE_SYNCH_NULL_MUTEX> Iterator;
-
-private:
-  Hash_Map hash_map_;
-  // internal hash table
-};
-
-class TAO_Export TAO_Dynamic_Hash_ObjTable_Iterator : public TAO_Object_Table_Iterator_Impl
-{
-  // = TITLE
-  //   Iterator for TAO_Dynamic_Hash_ObjTable.
-public:
-  typedef TAO_Dynamic_Hash_ObjTable::Iterator Impl;
-  TAO_Dynamic_Hash_ObjTable_Iterator (const Impl& impl);
-
-  // default copy ctor, dtor and operator=
-
-  // TAO_Object_Table_Impl methods...
-  virtual TAO_Object_Table_Iterator_Impl *clone (void) const;
-  virtual const TAO_Object_Table_Entry& item (void) const;
-  virtual void advance (void);
-  virtual int done (const TAO_Object_Table_Iterator_Impl *end) const;
-
-private:
-  Impl impl_;
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_Array_ObjTable_Iterator : public TAO_Object_Table_Iterator_Impl
-{
-  // = TITLE
-  //   Iterator for TAO_Linear_ObjTable and TAO_Active_Demux_ObjTable
-public:
-  TAO_Array_ObjTable_Iterator (TAO_Object_Table_Entry *pos);
-
-  // default copy ctor, dtor and operator=
-
-  // TAO_Object_Table_Impl methods...
-  virtual TAO_Object_Table_Iterator_Impl *clone (void) const;
-  virtual const TAO_Object_Table_Entry& item (void) const;
-  virtual void advance (void);
-  virtual int done (const TAO_Object_Table_Iterator_Impl *end) const;
-
-private:
-  TAO_Object_Table_Entry* pos_;
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_Linear_ObjTable : public TAO_Object_Table_Impl
-{
-  // = TITLE
-  //    Lookup strategy based on a simple linear search.  Not
-  //    efficient, but most likely will always work.
-  //
-  // = DESCRIPTION
-  //   Uses a dynamic array to store the objects and linear search
-  //   for the lookups.
-  //
-public:
-  TAO_Linear_ObjTable (CORBA::ULong size);
-  virtual ~TAO_Linear_ObjTable (void);
-
-  virtual int find (const PortableServer::Servant servant);
-  virtual int find (const PortableServer::ObjectId &id);
-  virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
-  virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
-  virtual TAO_Object_Table_Iterator_Impl* begin () const;
-  virtual TAO_Object_Table_Iterator_Impl* end () const;
-
-private:
-  int next_;
-  int tablesize_;
-  TAO_Object_Table_Entry *table_;
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_Active_Demux_ObjTable : public TAO_Object_Table_Impl
-{
-  // = TITLE
-  //   An object table lookup strategy based on active
-  //   demultiplexing strategy.
-  //
-  // = DESCRIPTION
-  //   Use an static array to store the objects, keys must be the
-  //   string representation of the indices into the array so lookups
-  //   can be done in O(1).
-  //   Iterators are implemented using pointers on the array.
-public:
-  TAO_Active_Demux_ObjTable (CORBA::ULong size);
-  // Constructor, including an initial size.
-
-  ~TAO_Active_Demux_ObjTable (void);
-  // Destructor
-
-  int next_free (void) const;
-  // Searches the array for the next free element, returns -1 if none
-  // is found.
-  // @@ Discuss what is the right interface to create ObjectId's
-  // assigned by the Object Table...
-
-  // Implement TAO_Dynamic_Hash_ObjTable....
-  virtual int find (const PortableServer::Servant servant);
-  virtual int find (const PortableServer::ObjectId &id);
-  virtual int find (const PortableServer::Servant servant,
-		    PortableServer::ObjectId_out id);
-  virtual int find (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant &servant);
-  virtual int bind (const PortableServer::ObjectId &id, 
-		    PortableServer::Servant servant);
-  virtual int unbind (const PortableServer::ObjectId &id,
-		      PortableServer::Servant &servant);
-  virtual TAO_Object_Table_Iterator_Impl* begin () const;
-  virtual TAO_Object_Table_Iterator_Impl* end () const;
-
-private:
-  int index_from_id (const PortableServer::ObjectId &id) const;
-  // Return the array index for the id...
-
-private:
-  int tablesize_;
-  TAO_Object_Table_Entry *table_;
-};
-
-#endif /* TAO_OBJTABLE_H */
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp
deleted file mode 100644
index b76acddbf39..00000000000
--- a/TAO/tao/Operation_Table.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// $Id$
-#include "tao/corba.h"
-
-// destructor
-TAO_Operation_Table::~TAO_Operation_Table (void)
-{
-}
-
-// Template Specialization for char*
-int
-ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>::equal (const char *const &id1,
-                                                                               const char *const &id2)
-{
-  return ACE_OS::strcmp (id1, id2) == 0;
-}
-
-// Template Specialization for char *
-
-u_long
-ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>::hash (const char *const &ext_id)
-{
-  return ACE::hash_pjw (ext_id);
-}
-
-// constructor
-
-TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize,
-						    CORBA::ULong hashtblsize,
-                                                    ACE_Allocator *alloc)
-  : hash_ (hashtblsize, alloc)
-{
-  // Iterate thru each entry in the database and bind the operation
-  // name to its corresponding skeleton.
-
-  for (CORBA::ULong i = 0; i < dbsize; i++)
-    // @@ (ASG): what happens if bind fails ???
-    if (this->bind (db[i].opname_, db[i].skel_ptr_) == -1)
-      ACE_ERROR ((LM_DEBUG,
-                  "(%P|%t) %p\n",
-                  "bind failed"));
-}
-
-TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids.  In this case,
-  // these are strings.
-  OP_MAP_MANAGER::ITERATOR iterator (this->hash_);  
-
-  for (OP_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_); 
-      entry->ext_id_ = 0;
-
-      // We do not own this. So we just set it to 0.
-      entry->int_id_ = 0;  
-    }
-}
-
-int
-TAO_Dynamic_Hash_OpTable::bind (const char *opname,
-                                const TAO_Skeleton skel_ptr)
-{
-  return this->hash_.bind (CORBA::string_dup (opname), skel_ptr);
-}
-
-int
-TAO_Dynamic_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr)
-{
-  return this->hash_.find ((const char *)opname, skel_ptr);
-}
-
-// Linear search strategy
-
-TAO_Linear_OpTable::TAO_Linear_OpTable (const TAO_operation_db_entry *db,
-                                        CORBA::ULong dbsize)
-  : next_ (0),
-    tablesize_ (dbsize),
-    tbl_ (new TAO_Linear_OpTable_Entry[dbsize])
-{
-  // The job of the constructor is to go thru each entry of the
-  // database and bind the operation name to its corresponding
-  // skeleton.
-
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    // @@ (ASG): what happens if bind fails ???
-    (void)this->bind (db[i].opname_, db[i].skel_ptr_);
-}
-
-TAO_Linear_OpTable::~TAO_Linear_OpTable (void)
-{
-  delete [] this->tbl_;
-}
-
-int
-TAO_Linear_OpTable::bind (const char *opname,
-                          const TAO_Skeleton skel_ptr)
-{
-  CORBA::ULong i = this->next_;
-
-  if (i < this->tablesize_)
-    {
-      this->tbl_[i].opname_ = CORBA::string_dup (opname);
-      this->tbl_[i].skel_ptr_ = skel_ptr;
-      this->next_++;
-      return 0; // success
-    }
-
-  return -1; // error
-}
-
-int
-TAO_Linear_OpTable::find (const char *opname,
-                          TAO_Skeleton& skel_ptr)
-{
-  ACE_ASSERT (this->next_ <= this->tablesize_);
-
-  for (CORBA::ULong i = 0; i < this->next_; i++)
-
-    if (ACE_OS::strncmp (this->tbl_[i].opname_,
-                         opname,
-                         ACE_OS::strlen (opname)) == 0)
-      {
-        skel_ptr = this->tbl_[i].skel_ptr_;
-        return 0; // success
-      }
-
-  return -1;  // not found
-}
-
-// constructor
-TAO_Linear_OpTable_Entry::TAO_Linear_OpTable_Entry (void)
-{
-  opname_ = 0;
-  skel_ptr_ = 0;
-}
-
-// destructor
-TAO_Linear_OpTable_Entry::~TAO_Linear_OpTable_Entry (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-  this->skel_ptr_ = 0;  // cannot delete this as we do not own it
-}
-
-// Active Demux search strategy
-TAO_Active_Demux_OpTable::TAO_Active_Demux_OpTable (const
-						    TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize)
-  : next_ (0),
-    tablesize_ (dbsize),
-    tbl_ (new TAO_Active_Demux_OpTable_Entry[dbsize])
-{
-  // The job of the constructor is to go thru each entry of the
-  // database and bind the operation name to its corresponding
-  // skeleton.
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    // @@ (ASG): what happens if bind fails ???
-    (void) this->bind (db[i].opname_, db[i].skel_ptr_);
-}
-
-TAO_Active_Demux_OpTable::~TAO_Active_Demux_OpTable (void)
-{
-  delete [] this->tbl_;
-}
-
-int
-TAO_Active_Demux_OpTable::bind (const char *opname,
-				const TAO_Skeleton skel_ptr)
-{
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  if (i < this->tablesize_)
-    {
-      if (this->tbl_[i].skel_ptr_ != 0)
-        // overwriting previous one
-        return 1;
-      else
-	{
-	  this->tbl_[i].skel_ptr_ = skel_ptr;
-	  return 0;
-	}
-    }
-  return -1; // error
-}
-
-int
-TAO_Active_Demux_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr)
-{
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  ACE_ASSERT (i < this->tablesize_);
-  skel_ptr = this->tbl_[i].skel_ptr_;
-  return 0; //success
-}
-
-TAO_Active_Demux_OpTable_Entry::TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;
-}
-
-TAO_Active_Demux_OpTable_Entry::~TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;  // cannot delete this as we do not own it
-}
-
-// constructor
-TAO_Operation_Table_Parameters::TAO_Operation_Table_Parameters (void)
-  : strategy_ (0),
-    type_ (TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH) // default
-{
-}
-
-TAO_Operation_Table_Parameters::~TAO_Operation_Table_Parameters (void)
-{
-}
-
-void
-TAO_Operation_Table_Parameters::lookup_strategy (TAO_Operation_Table_Parameters::DEMUX_STRATEGY s)
-{
-  this->type_ = s;
-}
-
-// get the lookup type
-TAO_Operation_Table_Parameters::DEMUX_STRATEGY
-TAO_Operation_Table_Parameters::lookup_strategy (void) const
-{
-  return this->type_;
-}
-
-// set the concrete strategy
-void
-TAO_Operation_Table_Parameters::concrete_strategy (TAO_Operation_Table *ot)
-{
-  this->strategy_ = ot;
-}
-
-// return the concrete strategy
-TAO_Operation_Table* TAO_Operation_Table_Parameters::concrete_strategy (void)
-{
-  return this->strategy_;
-}
-
-TAO_Operation_Table_Factory::TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table_Factory::~TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table *
-TAO_Operation_Table_Factory::opname_lookup_strategy (void)
-{
-  TAO_Operation_Table_Parameters *p = TAO_OP_TABLE_PARAMETERS::instance ();
-
-  return p->concrete_strategy ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Entry<const char*, TAO_Skeleton>;
-template class ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<const char*, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<const char*, TAO_Skeleton>
-#pragma instantiate ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
deleted file mode 100644
index 2c18993d990..00000000000
--- a/TAO/tao/Operation_Table.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    optable.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_OPTABLE_H)
-#define TAO_OPTABLE_H
-
-class TAO_operation_db_entry
-{
-  // = TITLE
-  //   Define a table entry that holds an operation name and its
-  //   corresponding skeleton.  A table of such entries is used to
-  //   initialize the different lookup strategies.
-public:
-  CORBA::String opname_;
-  // operation name
-
-  TAO_Skeleton skel_ptr_;
-  // skeleton pointer
-};
-
-class TAO_Export TAO_Operation_Table
-{
-  // = TITLE
-  //     Abstract class for maintaining and lookup of CORBA IDL
-  //     operation names.
-public:
-  virtual int find (const char *opname,
-		   TAO_Skeleton &skelfunc) = 0;
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr) = 0;
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual ~TAO_Operation_Table (void);
-};
-
-// Dynamic hashing.  We use template specialization here to use const
-// char* as the external ID. The template specialization is needed
-// since the "hash" method is not defined on type "char *".
-typedef ACE_Hash_Map_Manager<const char *,
-                             TAO_Skeleton,
-                             ACE_SYNCH_NULL_MUTEX>
-        OP_MAP_MANAGER;
-
-class TAO_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //   Dynamic Hashing scheme for CORBA IDL operation name lookup.
-public:
-  // = Initialization and termination methods.
-  TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-                            CORBA::ULong dbsize,
-                            CORBA::ULong hashtblsize,
-                            ACE_Allocator *alloc);
-  // Initialize the dynamic hash operation table with a database of
-  // operation names. The hash table size may be different from the
-  // size of the database. Hence we use the third argument to specify
-  // the size of the internal hash table.  The <alloc> argument is
-  // used to determine where the memory comes from (usually from
-  // <ACE_Static_Allocator_Base>).
-
-  ~TAO_Dynamic_Hash_OpTable (void);
-  // destructor
-
-  virtual int bind (const char *opname,
-		    const TAO_Skeleton skel_ptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual int find (const char *opname,
-		    TAO_Skeleton &skelfunc);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-private:
-  OP_MAP_MANAGER hash_;
-  // The hash table data structure.
-};
-
-class TAO_Export TAO_Linear_OpTable_Entry
-{
-  // = TITLE
-  //   Table entry for linear search lookup strategy.
-public:
-  CORBA::String opname_;
-  // holds the operation name
-
-  TAO_Skeleton skel_ptr_;
-  // Holds a pointer to the skeleton corresponding to the operation
-  // name.
-
-  TAO_Linear_OpTable_Entry (void);
-  // constructor.
-
-  ~TAO_Linear_OpTable_Entry (void);
-  // destructor
-};
-
-class TAO_Export TAO_Linear_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //    Operation table lookup strategy based on
-  //    linear search.  Not efficient, but it works.
-public:
-  // = Initialization and termination methods.
-  TAO_Linear_OpTable (const TAO_operation_db_entry *db,
-                      CORBA::ULong dbsize);
-  // Initialize the linear search operation table with a database of
-  // operation names
-
-  ~TAO_Linear_OpTable (void);
-  // destructor.
-
-  virtual int find (const char *opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  CORBA::ULong next_;
-  // Keeps track of the next available slot to be filled.
-
-  CORBA::ULong tablesize_;
-  // Size of the internal table.
-
-  TAO_Linear_OpTable_Entry *tbl_;
-  // The table itself.
-};
-
-class TAO_Export TAO_Active_Demux_OpTable_Entry
-{
-  // = TITLE
-  //   Active Demux lookup table entry.
-public:
-  // = Initialization and termination methods.
-  TAO_Active_Demux_OpTable_Entry (void);
-  // constructor
-
-  ~TAO_Active_Demux_OpTable_Entry (void);
-  // destructor
-
-  TAO_Skeleton skel_ptr_;
-  // Skeleton pointer corresponding to the index.
-};
-
-class TAO_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
-{
-  // = TITLE
-  //   Implements the active demultiplexed lookup strategy. The key is
-  //   assumed to provide an index directly into the internal table.
-public:
-  // = Initialization and termination methods.
-  TAO_Active_Demux_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize);
-  // Initializes the internal table with the database of operations
-
-  ~TAO_Active_Demux_OpTable (void);
-  // destructor.
-
-  virtual int find (const char *opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const char *opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  CORBA::ULong next_;
-  // the next available free slot
-
-  CORBA::ULong tablesize_;
-  // size of the internal table
-
-  TAO_Active_Demux_OpTable_Entry *tbl_;
-  // internal lookup table
-};
-
-class TAO_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
-{
-  // TDB...
-};
-
-class TAO_Export TAO_Operation_Table_Parameters
-{
-  // = TITLE
-  //    Parameters used to create the operation table.
-public:
-  enum DEMUX_STRATEGY
-  {
-    // various lookup strategies
-    TAO_LINEAR,
-    TAO_DYNAMIC_HASH,
-    TAO_PERFECT_HASH,
-    TAO_ACTIVE_DEMUX,
-    TAO_USER_DEFINED
-  };
-
-  void lookup_strategy (DEMUX_STRATEGY s);
-  // set the lookup strategy from the list of enumerated values
-
-  DEMUX_STRATEGY lookup_strategy (void) const;
-  // Return the enumerated value for the lookup strategy. Default is
-  // Dynamic Hashing.
-
-  void concrete_strategy (TAO_Operation_Table *ot);
-  // Provide a data structure that will do the lookup. This is useful
-  // for user-defined lookup strategies.
-
-  TAO_Operation_Table *concrete_strategy (void);
-  // return the
-
-  TAO_Operation_Table_Parameters (void);
-  // constructor
-
-  ~TAO_Operation_Table_Parameters (void);
-  // destructor
-private:
-  TAO_Operation_Table *strategy_;
-  // pointer to the object that implements a lookup strategy
-
-  DEMUX_STRATEGY type_;
-  // the enumerated value indicating the lookup strategy
-};
-
-// Define a singleton instance of operation table parameters.
-typedef ACE_Singleton<TAO_Operation_Table_Parameters,
-                      ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_OP_TABLE_PARAMETERS;
-
-class TAO_Export TAO_Operation_Table_Factory
-{
-  // = TITLE
-  //   Factory for producing operation table lookup objects based on
-  //   the enumerated value of strategy held by the parameters.
-public:
-  TAO_Operation_Table *opname_lookup_strategy (void);
-  // return an instance of the specified lookup strategy
-
-  TAO_Operation_Table_Factory (void);
-  // constructor
-
-  ~TAO_Operation_Table_Factory (void);
-  // destructor
-};
-
-// Define a singleton instance of the operation table factory.
-typedef ACE_Singleton<TAO_Operation_Table_Factory,
-                      ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_OP_TABLE_FACTORY;
-
-#endif /* TAO_OPTABLE_H */
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
deleted file mode 100644
index 30bd361cd76..00000000000
--- a/TAO/tao/POA.cpp
+++ /dev/null
@@ -1,3857 +0,0 @@
-// @(#) $Id$
-
-// CORBA
-#include "tao/corba.h"
-
-// POA
-#include "tao/POA.h"
-
-// Exception macros
-#include "tao/poa_macros.h"
-
-// auto_ptr class
-#include "ace/Auto_Ptr.h"
-
-// This is the maximum space require to convert the ulong into a
-// string.
-const int TAO_POA::max_space_required_for_ulong = 24;
-
-// This is the maximum space require to convert the ulong into a
-// string.
-const int TAO_Creation_Time::max_space_required_for_two_ulong_to_hex = 8 * 2;
-
-TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
-                                      PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Thread_Policy::TAO_Thread_Policy (const TAO_Thread_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::ThreadPolicyValue
-TAO_Thread_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Thread_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Thread_Policy> new_policy (new TAO_Thread_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Thread_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Thread_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
-                                          PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::LifespanPolicyValue
-TAO_Lifespan_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Lifespan_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Lifespan_Policy> new_policy (new TAO_Lifespan_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Lifespan_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Lifespan_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::IdUniquenessPolicyValue
-TAO_Id_Uniqueness_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_policy (new TAO_Id_Uniqueness_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::IdAssignmentPolicyValue
-TAO_Id_Assignment_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Id_Assignment_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Id_Assignment_Policy> new_policy (new TAO_Id_Assignment_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Id_Assignment_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::ImplicitActivationPolicyValue
-TAO_Implicit_Activation_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Implicit_Activation_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Implicit_Activation_Policy> new_policy (new TAO_Implicit_Activation_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
-                                                            PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::ServantRetentionPolicyValue
-TAO_Servant_Retention_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Servant_Retention_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Servant_Retention_Policy> new_policy (new TAO_Servant_Retention_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Servant_Retention_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
-                                                              PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::RequestProcessingPolicyValue
-TAO_Request_Processing_Policy::value (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return this->value_;
-}
-
-PortableServer::Policy_ptr
-TAO_Request_Processing_Policy::copy (CORBA::Environment &env)
-{
-  auto_ptr<TAO_Request_Processing_Policy> new_policy (new TAO_Request_Processing_Policy (*this));
-
-  PortableServer::Policy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation object
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_Request_Processing_Policy::destroy (CORBA::Environment &env)
-{
-  // Remove self from POA
-  //
-  // Note that there is no real error checking here as we can't do
-  // much about errors here anyway
-  //
-  PortableServer::POA_var poa = this->_default_POA (env);
-  if (env.exception () == 0)
-    {
-      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
-      if (env.exception () == 0)
-        poa->deactivate_object (id.in (), env);
-    }
-
-  // Commit suicide: must have been dynamically allocated
-  delete this;
-}
-
-PortableServer::POA_ptr
-TAO_Request_Processing_Policy::_default_POA (CORBA::Environment &env)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_POA_Policies::TAO_POA_Policies (void)
-  :  thread_ (PortableServer::ORB_CTRL_MODEL),
-     lifespan_ (PortableServer::TRANSIENT),
-     id_uniqueness_ (PortableServer::UNIQUE_ID),
-     id_assignment_ (PortableServer::SYSTEM_ID),
-     implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-     servant_retention_ (PortableServer::RETAIN),
-     request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-{
-}
-
-void
-TAO_POA_Policies::parse_policies (const PortableServer::PolicyList &policies,
-                                  CORBA::Environment &env)
-{
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       i++)
-    {
-      this->parse_policy (policies[i], env);
-    }
-
-  if (this->validity_check () == -1)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::InvalidPolicy;
-      env.exception (exception);
-      return;
-    }
-}
-
-int
-TAO_POA_Policies::validity_check (void)
-{
-  // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
-  // USE_SERVANT_MANAGER policies.
-  if (this->servant_retention_ == PortableServer::NON_RETAIN)
-    if (this->request_processing_ != PortableServer::USE_SERVANT_MANAGER &&
-        this->request_processing_ != PortableServer::USE_DEFAULT_SERVANT)
-      return -1;
-
-  // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
-  if (this->request_processing_ == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    if (this->servant_retention_ != PortableServer::RETAIN)
-      return -1;
-
-  // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
-  if (this->request_processing_ == PortableServer::USE_DEFAULT_SERVANT)
-    if (this->id_uniqueness_ != PortableServer::MULTIPLE_ID)
-      return -1;
-
-  // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
-  if (this->implicit_activation_ == PortableServer::IMPLICIT_ACTIVATION)
-    if (this->servant_retention_ != PortableServer::RETAIN ||
-        this->id_assignment_ != PortableServer::SYSTEM_ID)
-      return -1;
-
-  return 0;
-}
-
-void
-TAO_POA_Policies::parse_policy (const PortableServer::Policy_ptr policy,
-                                CORBA::Environment &env)
-{
-  PortableServer::ThreadPolicy_var thread
-    = PortableServer::ThreadPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (thread.in ()))
-    {
-      this->thread_ = thread->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::LifespanPolicy_var lifespan
-    = PortableServer::LifespanPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (lifespan.in ()))
-    {
-      this->lifespan_ = lifespan->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::IdUniquenessPolicy_var id_uniqueness
-    = PortableServer::IdUniquenessPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (id_uniqueness.in ()))
-    {
-      this->id_uniqueness_ = id_uniqueness->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::IdAssignmentPolicy_var id_assignment
-    = PortableServer::IdAssignmentPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (id_assignment.in ()))
-    {
-      this->id_assignment_ = id_assignment->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::ImplicitActivationPolicy_var implicit_activation
-    = PortableServer::ImplicitActivationPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (implicit_activation.in ()))
-    {
-      this->implicit_activation_ = implicit_activation->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::ServantRetentionPolicy_var servant_retention
-    = PortableServer::ServantRetentionPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (servant_retention.in ()))
-    {
-      this->servant_retention_ = servant_retention->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy, env);
-  if (!CORBA::is_nil (request_processing.in ()))
-    {
-      this->request_processing_ = request_processing->value (env);
-      return;
-    }
-  else
-    {
-      env.clear ();
-    }
-
-  CORBA::Exception *exception = new PortableServer::POA::InvalidPolicy;
-  env.exception (exception);
-  return;
-}
-
-PortableServer::ThreadPolicyValue
-TAO_POA_Policies::thread (void) const
-{
-  return this->thread_;
-}
-
-void
-TAO_POA_Policies::thread (PortableServer::ThreadPolicyValue value)
-{
-  this->thread_ = value;
-}
-
-PortableServer::LifespanPolicyValue
-TAO_POA_Policies::lifespan (void) const
-{
-  return this->lifespan_;
-}
-
-void
-TAO_POA_Policies::lifespan (PortableServer::LifespanPolicyValue value)
-{
-  this->lifespan_ = value;
-}
-
-PortableServer::IdUniquenessPolicyValue
-TAO_POA_Policies::id_uniqueness (void) const
-{
-  return this->id_uniqueness_;
-}
-
-void
-TAO_POA_Policies::id_uniqueness (PortableServer::IdUniquenessPolicyValue value)
-{
-  this->id_uniqueness_ = value;
-}
-
-PortableServer::IdAssignmentPolicyValue
-TAO_POA_Policies::id_assignment (void) const
-{
-  return this->id_assignment_;
-}
-
-void
-TAO_POA_Policies::id_assignment (PortableServer::IdAssignmentPolicyValue value)
-{
-  this->id_assignment_ = value;
-}
-
-PortableServer::ImplicitActivationPolicyValue
-TAO_POA_Policies::implicit_activation (void) const
-{
-  return this->implicit_activation_;
-}
-
-void
-TAO_POA_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
-{
-  this->implicit_activation_ = value;
-}
-
-PortableServer::ServantRetentionPolicyValue
-TAO_POA_Policies::servant_retention (void) const
-{
-  return this->servant_retention_;
-}
-
-void
-TAO_POA_Policies::servant_retention (PortableServer::ServantRetentionPolicyValue value)
-{
-  this->servant_retention_ = value;
-}
-
-PortableServer::RequestProcessingPolicyValue
-TAO_POA_Policies::request_processing (void) const
-{
-  return this->request_processing_;
-}
-
-void
-TAO_POA_Policies::request_processing (PortableServer::RequestProcessingPolicyValue value)
-{
-  this->request_processing_ = value;
-}
-
-TAO_Creation_Time::TAO_Creation_Time (const ACE_Time_Value &creation_time)
-{
-  // Convert seconds and micro seconds into string
-  ACE_OS::sprintf (this->time_stamp_,
-                   "%08.8x%08.8x",
-                   creation_time.sec (),
-                   creation_time.usec ());
-}
-
-TAO_Creation_Time::TAO_Creation_Time (void)
-{
-  ACE_OS::memset (this->time_stamp_,
-                  0,
-                  TAO_Creation_Time::creation_time_length ());
-}
-
-void
-TAO_Creation_Time::creation_time (const void *creation_time)
-{
-  ACE_OS::memcpy (this->time_stamp_,
-                  creation_time,
-                  TAO_Creation_Time::creation_time_length ());
-}
-
-const void *
-TAO_Creation_Time::creation_time (void) const
-{
-  return &this->time_stamp_[0];
-}
-
-int
-TAO_Creation_Time::creation_time_length (void)
-{
-  return TAO_Creation_Time::max_space_required_for_two_ulong_to_hex;
-}
-
-int
-TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-}
-
-int
-TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-}
-
-int
-TAO_Creation_Time::operator== (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs == *this;
-}
-
-int
-TAO_Creation_Time::operator!= (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs != *this;
-}
-
-TAO_Temporary_Creation_Time::TAO_Temporary_Creation_Time (void)
-  : time_stamp_ (0)
-{
-}
-
-void
-TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
-{
-  this->time_stamp_ = (void *) creation_time;
-}
-
-int
-TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-}
-
-int
-TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-}
-
-TAO_POA::TAO_POA (const TAO_POA::String &adapter_name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policies &policies,
-                  TAO_POA *parent,
-                  CORBA::Environment &env)
-  : name_ (adapter_name),
-    poa_manager_ (poa_manager),
-    policies_ (policies),
-    parent_ (parent),
-    active_object_map_ (new TAO_Object_Table),
-    delete_active_object_map_ (1),
-    adapter_activator_ (),
-    servant_activator_ (),
-    servant_locator_ (),
-    default_servant_ (0),
-    children_ (),
-    lock_ (),
-    closing_down_ (0),
-    counter_ (0),
-    creation_time_ (ACE_OS::gettimeofday ())
-{
-  this->set_complete_name ();
-
-  // Register self with manager
-  this->poa_manager_.register_poa (this, env);
-}
-
-TAO_POA::TAO_POA (const TAO_POA::String &adapter_name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policies &policies,
-                  TAO_POA *parent,
-                  TAO_Object_Table &active_object_map,
-                  CORBA::Environment &env)
-  : name_ (adapter_name),
-    poa_manager_ (poa_manager),
-    policies_ (policies),
-    parent_ (parent),
-    active_object_map_ (&active_object_map),
-    delete_active_object_map_ (0),
-    adapter_activator_ (),
-    servant_activator_ (),
-    servant_locator_ (),
-    default_servant_ (0),
-    children_ (),
-    lock_ (),
-    closing_down_ (0),
-    counter_ (0),
-    creation_time_ (ACE_OS::gettimeofday ())
-{
-  this->set_complete_name ();
-
-  // Register self with manager
-  this->poa_manager_.register_poa (this, env);
-}
-
-TAO_POA *
-TAO_POA::clone (const TAO_POA::String &adapter_name,
-                TAO_POA_Manager &poa_manager,
-                const TAO_POA_Policies &policies,
-                TAO_POA *parent,
-                CORBA::Environment &env)
-{
-  return new TAO_POA (adapter_name,
-                      poa_manager,
-                      policies,
-                      parent,
-                      env);
-}
-
-TAO_POA *
-TAO_POA::clone (const TAO_POA::String &adapter_name,
-                TAO_POA_Manager &poa_manager,
-                const TAO_POA_Policies &policies,
-                TAO_POA *parent,
-                TAO_Object_Table &active_object_map,
-                CORBA::Environment &env)
-{
-  return new TAO_POA (adapter_name,
-                      poa_manager,
-                      policies,
-                      parent,
-                      active_object_map,
-                      env);
-}
-
-TAO_POA::~TAO_POA (void)
-{
-  if (this->delete_active_object_map_)
-    delete active_object_map_;
-
-  // Remove POA from the POAManager
-  //
-  // Note: Errors are ignored here since there is nothing we can do
-  // about them
-  //
-  CORBA::Environment env;
-  this->poa_manager_.remove_poa (this, env);
-}
-
-ACE_Lock &
-TAO_POA::lock (void)
-{
-  return this->lock_;
-}
-
-PortableServer::POA_ptr
-TAO_POA::create_POA (const char *adapter_name,
-                     PortableServer::POAManager_ptr poa_manager,
-                     const PortableServer::PolicyList &policies,
-                     CORBA::Environment &env)
-{
-  // If any of the policy objects specified are not valid for the ORB
-  // implementation, if conflicting policy objects are specified, or
-  // if any of the specified policy objects require prior
-  // administrative action that has not been performed, an
-  // InvalidPolicy exception is raised containing the index in the
-  // policies parameter value of the first offending policy object.
-  TAO_POA_Policies tao_policies;
-  tao_policies.parse_policies (policies, env);
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-
-  // If the poa_manager parameter is null, a new POAManager object is
-  // created and associated with the new POA. Otherwise, the specified
-  // POAManager object is associated with the new POA. The POAManager
-  // object can be obtained using the attribute name the_POAManager.
-  TAO_POA_Manager *poa_manager_impl = 0;
-  if (CORBA::is_nil (poa_manager))
-    {
-      poa_manager_impl = this->poa_manager_.clone ();
-    }
-  else
-    {
-      PortableServer::Servant servant = poa_manager->_servant ();
-      if (servant == 0)
-        {
-          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-          env.exception (exception);
-          return PortableServer::POA::_nil ();
-        }
-
-      void *ptr = servant->_downcast (servant->_interface_repository_id ());
-      POA_PortableServer::POAManager *mgr = (POA_PortableServer::POAManager *) ptr;
-      poa_manager_impl = ACE_dynamic_cast (TAO_POA_Manager *, mgr);
-    }
-
-  TAO_POA *result = this->create_POA (adapter_name,
-                                      *poa_manager_impl,
-                                      tao_policies,
-                                      env);
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-
-  return result->_this (env);
-}
-
-TAO_POA *
-TAO_POA::create_POA (const TAO_POA::String &adapter_name,
-                     TAO_POA_Manager &poa_manager,
-                     const TAO_POA_Policies &policies,
-                     CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->create_POA_i (adapter_name,
-                             poa_manager,
-                             policies,
-                             env);
-}
-
-TAO_POA *
-TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policies &policies,
-                       CORBA::Environment &env)
-{
-  // If this is the leaf POA name
-  if (this->leaf_poa_name (adapter_name, env))
-    {
-      // This operaton creates a new POA as a child of the target POA. The
-      // specified name identifies the new POA with respect to other POAs
-      // with the same parent POA. If the target POA already has a child
-      // POA with the specified name, the AdapterAlreadyExists exception
-      // is raised.
-      int result = this->children_.find (adapter_name);
-
-      // Child was found
-      if (result != -1)
-        {
-          CORBA::Exception *exception = new PortableServer::POA::AdapterAlreadyExists;
-          env.exception (exception);
-          return 0;
-        }
-
-      //
-      // Child was not found
-      //
-
-      // The specified policy objects are associated with the POA and used
-      // to control its behavior. The policy objects are effectively
-      // copied before this operation returns, so the application is free
-      // to destroy them while the POA is in use. Policies are not
-      // inherited from the parent POA.
-      auto_ptr<TAO_POA> new_poa (this->clone (adapter_name,
-                                              poa_manager,
-                                              policies,
-                                              this,
-                                              env));
-
-      if (env.exception () != 0)
-        return 0;
-
-      // Add to children map
-      if (this->children_.bind (adapter_name, new_poa.get ()) != 0)
-        {
-          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-          env.exception (exception);
-          return 0;
-        }
-
-      // Note: Creating a POA using a POA manager that is in the active
-      // state can lead to race conditions if the POA supports preexisting
-      // objects, because the new POA may receive a request before its
-      // adapter activator, servant manager, or default servant have been
-      // initialized. These problems do not occur if the POA is created by
-      // an adapter activator registered with a parent of the new POA,
-      // because requests are queued until the adapter activator
-      // returns. To avoid these problems when a POA must be explicitly
-      // initialized, the application can initialize the POA by invoking
-      // find_POA with a TRUE activate parameter.
-
-      // Everything is fine
-      // Don't let the auto_ptr delete the implementation
-      return new_poa.release ();
-    }
-  // Not the leaf POA name
-  else
-    {
-      // Find the topmost name
-      TAO_POA::String topmost_poa_name;
-      TAO_POA::String tail_poa_name;
-      this->parse_poa_name (adapter_name,
-                            topmost_poa_name,
-                            tail_poa_name,
-                            env);
-
-      if (env.exception () != 0)
-        return 0;
-
-      // If we are the topmost poa, let's create the tail
-      if (topmost_poa_name == this->name_)
-        {
-          return this->create_POA_i (tail_poa_name,
-                                     poa_manager,
-                                     policies,
-                                     env);
-        }
-
-      //
-      // We are not the topmost POA
-      //
-
-      // Try to find the topmost child
-      TAO_POA *child_poa = 0;
-      int result = this->children_.find (topmost_poa_name, child_poa);
-
-      // Child was not found or the topmost is us
-      if (result != 0)
-        {
-          child_poa = this->create_POA_i (topmost_poa_name,
-                                          poa_manager,
-                                          policies,
-                                          env);
-          if (env.exception () != 0)
-            return 0;
-        }
-
-      // At this point, the intermediate child POA was either found or
-      // created
-      return child_poa->create_POA (tail_poa_name,
-                                    poa_manager,
-                                    policies,
-                                    env);
-    }
-}
-
-PortableServer::POA_ptr
-TAO_POA::find_POA (const char *adapter_name,
-                   CORBA::Boolean activate_it,
-                   CORBA::Environment &env)
-{
-  TAO_POA::String name (adapter_name);
-
-  TAO_POA *result = this->find_POA (name,
-                                    activate_it,
-                                    env);
-
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-
-  return result->_this (env);
-}
-
-TAO_POA *
-TAO_POA::find_POA (const TAO_POA::String &adapter_name,
-                   CORBA::Boolean activate_it,
-                   CORBA::Environment &env)
-{
-  // Check if we are the POA the user is looking for
-  if (adapter_name == this->name_)
-    return this;
-
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->find_POA_i_optimized (adapter_name,
-                                     activate_it,
-                                     env);
-
-}
-
-TAO_POA *
-TAO_POA::find_POA_i (const TAO_POA::String &adapter_name,
-                     CORBA::Boolean activate_it,
-                     CORBA::Environment &env)
-{
-  // Check if we are the POA the user is looking for
-  if (adapter_name == this->name_)
-    return this;
-
-  return this->find_POA_i_optimized (adapter_name,
-                                     activate_it,
-                                     env);
-}
-
-TAO_POA *
-TAO_POA::find_POA_i_optimized (const TAO_POA::String &adapter_name,
-                               CORBA::Boolean activate_it,
-                               CORBA::Environment &env)
-{
-  // If this is the leaf POA name
-  if (this->leaf_poa_name (adapter_name, env))
-    {
-      // If the target POA is the parent of a child POA with the
-      // specified name (relative to the target POA), that child POA
-      // is returned.
-      TAO_POA *child_poa = 0;
-      int result = this->children_.find (adapter_name, child_poa);
-
-      // Child was found
-      if (result != -1)
-        return child_poa;
-
-      //
-      // Child was not found
-      //
-
-      // If a child POA with the specified name does not exist and the
-      // value of the activate_it parameter is TRUE, the target POA's
-      // AdapterActivator, if one exists, is invoked, and, if it
-      // successfully activates the child POA, that child POA is
-      // returned.
-      if (activate_it && !CORBA::is_nil (this->adapter_activator_.in ()))
-        {
-          PortableServer::POA_var self = this->_this (env);
-          // Check for exceptions
-          if (env.exception () != 0)
-            return 0;
-
-          CORBA::Boolean success =
-            this->adapter_activator_->unknown_adapter (self.in (),
-                                                       adapter_name.c_str (),
-                                                       env);
-          // Check for exceptions
-          if (env.exception () != 0)
-            return 0;
-
-          // On success
-          if (success)
-            {
-              // Search the children table again
-              result = this->children_.find (adapter_name, child_poa);
-
-              // Child was found
-              if (result != -1)
-                return child_poa;
-            }
-        }
-
-      // Otherwise, the AdapterNonExistent exception is raised.
-      CORBA::Exception *exception = new PortableServer::POA::AdapterNonExistent;
-      env.exception (exception);
-      return 0;
-    }
-  // Not the leaf POA name
-  else
-    {
-      // Find the topmost name
-      // Find the topmost name
-      TAO_POA::String topmost_poa_name;
-      TAO_POA::String tail_poa_name;
-      this->parse_poa_name (adapter_name,
-                            topmost_poa_name,
-                            tail_poa_name,
-                            env);
-
-      if (env.exception () != 0)
-        return 0;
-
-      // If we are the topmost poa, let's create the tail
-      if (topmost_poa_name == this->name_)
-        {
-          return this->find_POA_i (tail_poa_name,
-                                   activate_it,
-                                   env);
-        }
-
-      //
-      // We are not the topmost POA
-      //
-
-      // Try to find the topmost child
-      TAO_POA *child_poa;
-      int result = this->children_.find (topmost_poa_name, child_poa);
-
-      // Child was not found
-      if (result != 0)
-        {
-          child_poa = this->find_POA_i_optimized (topmost_poa_name,
-                                                  activate_it,
-                                                  env);
-          if (env.exception () != 0)
-            return 0;
-        }
-
-      // At this point, the intermediate child POA was either found or
-      // created
-      return child_poa->find_POA (tail_poa_name,
-                                  activate_it,
-                                  env);
-    }
-}
-
-void
-TAO_POA::destroy (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->destroy_i (etherealize_objects,
-                   wait_for_completion,
-                   env);
-}
-
-void
-TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                    CORBA::Boolean wait_for_completion,
-                    CORBA::Environment &env)
-{
-  this->closing_down_ = 1;
-
-  // This operation destroys the POA and all descendant POAs. The POA
-  // so destroyed (that is, the POA with its name) may be re-created
-  // later in the same process. (This differs from the
-  // POAManager::deactivate operation that does not allow a
-  // re-creation of its associated POA in the same process.)
-
-  // Remove POA from the parent
-  if (this->parent_ != 0)
-    this->parent_->delete_child (this->name_, env);
-
-  if (env.exception () != 0)
-    return;
-
-  // Remove all children POAs
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end () && env.exception () == 0;
-       iterator++)
-    {
-      TAO_POA *child_poa = (*iterator).int_id_;
-      child_poa->destroy (etherealize_objects,
-                          wait_for_completion,
-                          env);
-    }
-
-  if (env.exception () != 0)
-    return;
-
-  // When a POA is destroyed, any requests that have started execution
-  // continue to completion. Any requests that have not started
-  // execution are processed as if they were newly arrived, that is,
-  // the POA will attempt to cause recreation of the POA by invoking
-  // one or more adapter activators as described in Section 3.3.3.
-
-  // If the etherealize_objects parameter is TRUE, the POA has the
-  // RETAIN policy, and a servant manager is registered with the POA,
-  // the etherealize operation on the servant manager will be called
-  // for each active object in the Active Object Map. The apparent
-  // destruction of the POA occurs before any calls to etherealize are
-  // made.  Thus, for example, an etherealize method that attempts to
-  // invoke operations on the POA will receive the OBJECT_NOT_EXIST
-  // exception.
-
-  // Remove the registered objects
-  if (etherealize_objects)
-    {
-      if (this->policies ().servant_retention () == PortableServer::RETAIN &&
-          this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER &&
-          !CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          PortableServer::POA_var self = this->_this (env);
-          if (env.exception () != 0)
-            return;
-
-          while (1)
-            {
-              TAO_Object_Table::iterator iterator = this->active_object_map ().begin ();
-              if (iterator == this->active_object_map ().end () || env.exception () != 0)
-                break;
-
-              PortableServer::Servant servant = 0;
-              PortableServer::ObjectId id ((*iterator).ext_id_);
-
-              int result = this->active_object_map ().unbind (id, servant);
-              if (result != 0)
-                {
-                  CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-                  env.exception (exception);
-                  return;
-                }
-
-              CORBA::Boolean remaining_activations = CORBA::B_FALSE;
-
-              if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID &&
-                  this->active_object_map ().find (servant) != -1)
-                remaining_activations = CORBA::B_TRUE;
-
-              this->servant_activator_->etherealize (id,
-                                                     self.in (),
-                                                     servant,
-                                                     CORBA::B_TRUE,
-                                                     remaining_activations,
-                                                     env);
-            }
-        }
-    }
-
-  // If the wait_for_completion parameter is TRUE, the destroy
-  // operation will return only after all requests in process have
-  // completed and all invocations of etherealize have
-  // completed. Otherwise, the destroy operation returns after
-  // destroying the POAs.
-
-  ACE_UNUSED_ARG (wait_for_completion);
-
-  // Commit suicide
-  delete this;
-}
-
-void
-TAO_POA::delete_child (const TAO_POA::String &child,
-                       CORBA::Environment &env)
-{
-  // If we are not closing down, we must remove this child from our
-  // collection.
-  if (!this->closing_down_)
-    {
-      // Lock access to the POA for the duration of this transaction
-      TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-      this->delete_child_i (child,
-                            env);
-    }
-
-  // If we are closing down, we are currently iterating over our
-  // children and there is not need to remove this child from our
-  // collection.
-}
-
-void
-TAO_POA::delete_child_i (const TAO_POA::String &child,
-                         CORBA::Environment &env)
-{
-  if (this->children_.unbind (child) != 0)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-}
-
-TAO_POA_Policies &
-TAO_POA::policies (void)
-{
-  return this->policies_;
-}
-
-TAO_Object_Table &
-TAO_POA::active_object_map (void)
-{
-  return *this->active_object_map_;
-}
-
-PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil (), env);
-
-  return this->get_servant_manager_i (env);
-}
-
-PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (CORBA::Environment &env)
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return PortableServer::ServantManager::_nil ();
-    }
-
-  // This operation returns the servant manager associated with the
-  // POA.  If no servant manager has been associated with the POA, it
-  // returns a null reference.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
-  else
-    return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
-}
-
-void
-TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                              CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->set_servant_manager_i (imgr,
-                               env);
-}
-
-void
-TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                CORBA::Environment &env)
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return;
-    }
-
-  // This operation sets the default servant manager associated with
-  // the POA.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr, env);
-      if (CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-          env.exception (exception);
-          return;
-        }
-    }
-  else
-    {
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr, env);
-      if (CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-          env.exception (exception);
-          return;
-        }
-    }
-}
-
-PortableServer::Servant
-TAO_POA::get_servant (CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->get_servant_i (env);
-}
-
-PortableServer::Servant
-TAO_POA::get_servant_i (CORBA::Environment &env)
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // This operation returns the default servant associated with the
-  // POA.
-  if (this->default_servant_ != 0)
-    {
-      return this->default_servant_;
-    }
-  else
-    // If no servant has been associated with the POA, the NoServant
-    // exception is raised.
-    {
-      CORBA::Exception *exception = new PortableServer::POA::NoServant;
-      env.exception (exception);
-      return 0;
-    }
-}
-
-void
-TAO_POA::set_servant (PortableServer::Servant servant,
-                      CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->set_servant_i (servant,
-                       env);
-}
-
-void
-TAO_POA::set_servant_i (PortableServer::Servant servant,
-                        CORBA::Environment &env)
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return;
-    }
-
-  // This operation registers the specified servant with the POA as
-  // the default servant. This servant will be used for all requests
-  // for which no servant is found in the Active Object Map.
-  this->default_servant_ = servant;
-}
-
-PortableServer::ObjectId *
-TAO_POA::activate_object (PortableServer::Servant servant,
-                          CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->activate_object_i (servant,
-                                  env);
-}
-
-PortableServer::ObjectId *
-TAO_POA::activate_object_i (PortableServer::Servant servant,
-                            CORBA::Environment &env)
-{
-  // This operation requires the SYSTEM_ID and RETAIN policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (!(this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-        this->policies ().servant_retention () == PortableServer::RETAIN))
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // already in the Active Object Map, the ServantAlreadyActive
-  // exception is raised.
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find (servant) != -1)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ServantAlreadyActive;
-      env.exception (exception);
-      return 0;
-    }
-
-  // Otherwise, the activate_object operation generates an Object Id
-  // and enters the Object Id and the specified servant in the Active
-  // Object Map. The Object Id is returned.
-  PortableServer::ObjectId_var new_id = this->create_object_id ();
-
-  if (this->active_object_map ().bind (new_id.in (), servant) == -1)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-
-  // Everything is finally ok
-  return new_id._retn ();
-}
-
-void
-TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant servant,
-                                  CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->activate_object_with_id_i (id,
-                                   servant,
-                                   env);
-}
-
-void
-TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                    PortableServer::Servant servant,
-                                    CORBA::Environment &env)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return;
-    }
-
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the activate_object_with_id operation may raise the BAD_PARAM
-  // system exception.  An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke activate_object_with_id on a POA that has the SYSTEM_ID
-  // policy with an Object Id value that was not previously generated
-  // by the system for that POA, or, if the POA also has the
-  // PERSISTENT policy, for a previous instantiation of the same POA.
-  if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (id))
-    {
-      CORBA::Exception *exception = new CORBA::BAD_PARAM (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-
-  // If the CORBA object denoted by the Object Id value is already
-  // active in this POA (there is a servant bound to it in the Active
-  // Object Map), the ObjectAlreadyActive exception is raised.
-  if (this->active_object_map ().find (id) != -1)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ObjectAlreadyActive;
-      env.exception (exception);
-      return;
-    }
-
-  // If the POA has the UNIQUE_ID policy and the servant is already in
-  // the Active Object Map, the ServantAlreadyActive exception is
-  // raised.
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find (servant) != -1)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ServantAlreadyActive;
-      env.exception (exception);
-      return;
-    }
-
-  // Otherwise, the activate_object_with_id operation enters an
-  // association between the specified Object Id and the specified
-  // servant in the Active Object Map.
-  if (this->active_object_map ().bind (id, servant) == -1)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-
-  // Everything is finally ok
-}
-
-void
-TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                            CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->deactivate_object_i (oid,
-                             env);
-}
-
-void
-TAO_POA::deactivate_object_i (const PortableServer::ObjectId &oid,
-                              CORBA::Environment &env)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return;
-    }
-
-  // This operation causes the association of the Object Id specified
-  // by the oid parameter and its servant to be removed from the
-  // Active Object Map.
-  PortableServer::Servant servant = 0;
-  int result = this->active_object_map ().unbind (oid, servant);
-
-  // If there is no active object associated with the specified Object
-  // Id, the operation raises an ObjectNotActive exception.
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
-      env.exception (exception);
-      return;
-    }
-
-  // If a servant manager is associated with the POA,
-  // ServantLocator::etherealize will be invoked with the oid and the
-  // servant. (The deactivate_object operation does not wait for the
-  // etherealize operation to complete before deactivate_object
-  // returns.)
-  //
-  // Note: If the servant associated with the oid is serving multiple
-  // Object Ids, ServantLocator::etherealize may be invoked multiple
-  // times with the same servant when the other objects are
-  // deactivated. It is the responsibility of the object
-  // implementation to refrain from destroying the servant while it is
-  // active with any Id.
-  if (!CORBA::is_nil (this->servant_activator_.in ()))
-    {
-      PortableServer::POA_var self = this->_this (env);
-      if (env.exception () != 0)
-        return;
-
-      CORBA::Boolean remaining_activations = CORBA::B_FALSE;
-
-      if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID &&
-          this->active_object_map ().find (servant) != -1)
-        remaining_activations = CORBA::B_TRUE;
-
-      this->servant_activator_->etherealize (oid,
-                                             self.in (),
-                                             servant,
-                                             CORBA::B_FALSE,
-                                             remaining_activations,
-                                             env);
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference (const char *intf,
-                           CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), env);
-
-  return this->create_reference_i (intf,
-                                   env);
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_i (const char *intf,
-                             CORBA::Environment &env)
-{
-  // This operation requires the SYSTEM_ID policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().id_assignment () != PortableServer::SYSTEM_ID)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return CORBA::Object::_nil ();
-    }
-
-  // This operation creates an object reference that encapsulates a
-  // POA-generated Object Id value and the specified interface
-  // repository id. This operation does not cause an activation to
-  // take place. The resulting reference may be passed to clients, so
-  // that subsequent requests on those references will cause the
-  // appropriate servant manager to be invoked, if one is
-  // available. The generated Object Id value may be obtained by
-  // invoking POA::reference_to_id with the created reference.
-  PortableServer::ObjectId_var new_id = this->create_object_id ();
-  TAO_ObjectKey_var new_key = this->create_object_key (new_id.in ());
-
-  // Ask the ORB to create you a reference
-  return TAO_ORB_Core_instance ()->orb ()->key_to_object (new_key.in (), intf, env);
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                   const char *intf,
-                                   CORBA::Environment &env)
-{
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the create_reference_with_id operation may raise the BAD_PARAM
-  // system exception. An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke this operation on a POA that has the SYSTEM_ID policy with
-  // an Object Id value that was not previously generated by the
-  // system for that POA, or, if the POA also has the PERSISTENT
-  // policy, for a previous instantiation of the same POA.
-  if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (oid))
-    {
-      CORBA::Exception *exception = new CORBA::BAD_PARAM (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return CORBA::Object::_nil ();
-    }
-
-  // This operation creates an object reference that encapsulates the
-  // specified Object Id and interface repository Id values. This
-  // operation does not cause an activation to take place.  The
-  // resulting reference may be passed to clients, so that subsequent
-  // requests on those references will cause the object to be
-  // activated if necessary, or the default servant used, depending on
-  // the applicable policies.
-  TAO_ObjectKey_var new_key = this->create_object_key (oid);
-
-  // Ask the ORB to create you a reference
-  return TAO_ORB_Core_instance ()->orb ()->key_to_object (new_key.in (), intf, env);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_id (PortableServer::Servant servant,
-                        CORBA::Environment &env)
-{
-  // If we had upgradeable locks, this would initially be a read lock
-  //
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->servant_to_id_i (servant,
-                                env);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_id_i (PortableServer::Servant servant,
-                          CORBA::Environment &env)
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-  // exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN &&
-        (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID ||
-         this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // This operation has three possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var id;
-  PortableServer::ObjectId_out id_out (id);
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find (servant, id_out) != -1)
-    {
-      return id._retn ();
-    }
-
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID ||
-          this->active_object_map ().find (servant) != 0)
-        {
-          PortableServer::ObjectId_var new_id = this->create_object_id ();
-
-          if (this->active_object_map ().bind (new_id.in (), servant) == -1)
-            {
-              CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-              env.exception (exception);
-              return 0;
-            }
-
-          // Everything is finally ok
-          return new_id._retn ();
-        }
-    }
-
-  // Otherwise, the ServantNotActive exception is raised.
-  CORBA::Exception *exception = new PortableServer::POA::ServantNotActive;
-  env.exception (exception);
-  return 0;
-}
-
-CORBA::Object_ptr
-TAO_POA::servant_to_reference (PortableServer::Servant servant,
-                               CORBA::Environment &env)
-{
-  // Note: The allocation of an Object Id value and installation in
-  // the Active Object Map caused by implicit activation may actually
-  // be deferred until an attempt is made to externalize the
-  // reference. The real requirement here is that a reference is
-  // produced that will behave appropriately (that is, yield a
-  // consistent Object Id value when asked politely).
-  PortableServer::ObjectId_var oid = this->servant_to_id (servant,
-                                                          env);
-
-  if (env.exception () != 0)
-    return CORBA::Object::_nil ();
-  else
-    return this->create_reference_with_id (oid.in (),
-                                           servant->_interface_repository_id (),
-                                           env);
-}
-
-PortableServer::Servant
-TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
-                               CORBA::Environment &env)
-{
-  // This operation requires the RETAIN policy or the
-  // USE_DEFAULT_SERVANT policy. If neither policy is present, the
-  // WrongPolicy exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN ||
-        this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT))
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // If the POA has the RETAIN policy and the specified object is
-  // present in the Active Object Map, this operation returns the
-  // servant associated with that object in the Active Object Map.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      TAO_ObjectKey_var key = reference->_key (env);
-
-      // If the object reference was not created by this POA, the
-      // WrongAdapter exception is raised.
-      PortableServer::ObjectId_var id;
-      PortableServer::ObjectId_out id_out (id);
-      TAO_POA::String poa_name;
-      CORBA::Boolean persistent = CORBA::B_FALSE;
-      TAO_Temporary_Creation_Time poa_creation_time;
-
-      int result = this->parse_key_temporary_id (key.in (),
-                                                 poa_name,
-                                                 id_out,
-                                                 persistent,
-                                                 poa_creation_time);
-      if (result != 0 ||
-          poa_name != this->complete_name () ||
-          persistent != this->persistent () ||
-          !this->persistent () && poa_creation_time != this->creation_time_)
-        {
-          CORBA::Exception *exception = new PortableServer::POA::WrongAdapter;
-          env.exception (exception);
-          return 0;
-        }
-
-      return this->id_to_servant (id.in (), env);
-    }
-
-  // Otherwise, if the POA has the USE_DEFAULT_SERVANT policy and a
-  // default servant has been registered with the POA, this operation
-  // returns the default servant.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      // Lock access to the POA for the duration of this transaction
-      TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-      if (this->default_servant_ != 0)
-        {
-          return this->default_servant_;
-        }
-      else
-        // Otherwise, the ObjectNotActive exception is raised.
-        {
-          CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
-          env.exception (exception);
-          return 0;
-        }
-    }
-
-  // Not reached
-  return 0;
-}
-
-PortableServer::ObjectId *
-TAO_POA::reference_to_id (CORBA::Object_ptr reference,
-                          CORBA::Environment &env)
-{
-  // The WrongPolicy exception is declared to allow future extensions.
-
-  // This operation returns the Object Id value encapsulated by the
-  // specified reference.
-
-  // This operation is valid only if the reference was created by the
-  // POA on which the operation is being performed.  If the object
-  // reference was not created by this POA, the WrongAdapter exception
-  // is raised.
-  TAO_ObjectKey_var key = reference->_key (env);
-  PortableServer::ObjectId_var id;
-  PortableServer::ObjectId_out id_out (id);
-  TAO_POA::String poa_name;
-  CORBA::Boolean persistent = CORBA::B_FALSE;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = this->parse_key_permanent_id (key.in (),
-                                             poa_name,
-                                             id_out,
-                                             persistent,
-                                             poa_creation_time);
-  if (result != 0 ||
-      poa_name != this->complete_name () ||
-      persistent != this->persistent () ||
-      !this->persistent () && poa_creation_time != this->creation_time_)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongAdapter;
-      env.exception (exception);
-      return 0;
-    }
-
-  // The object denoted by the reference does not have to be active
-  // for this operation to succeed.
-  return id._retn ();
-}
-
-PortableServer::Servant
-TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                        CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->id_to_servant_i (oid,
-                                env);
-}
-
-PortableServer::Servant
-TAO_POA::id_to_servant_i (const PortableServer::ObjectId &oid,
-                          CORBA::Environment &env)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // This operation returns the active servant associated with the
-  // specified Object Id value.  If the Object Id value is not active
-  // in the POA, an ObjectNotActive exception is raised.
-  PortableServer::Servant servant = 0;
-  if (this->active_object_map ().find (oid, servant) != -1)
-    {
-      return servant;
-    }
-  else
-    // Otherwise, the ObjectNotActive exception is raised.
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
-      env.exception (exception);
-      return 0;
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                          CORBA::Environment &env)
-{
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  return this->id_to_reference_i (oid, env);
-}
-
-CORBA::Object_ptr
-TAO_POA::id_to_reference_i (const PortableServer::ObjectId &oid,
-                            CORBA::Environment &env)
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  // If an object with the specified Object Id value is currently
-  // active, a reference encapsulating the information used to
-  // activate the object is returned.
-  PortableServer::Servant servant = 0;
-  if (this->active_object_map ().find (oid, servant) != -1)
-    return this->create_reference_with_id (oid,
-                                           servant->_interface_repository_id (),
-                                           env);
-  else
-    // If the Object Id value is not active in the POA, an
-    // ObjectNotActive exception is raised.
-    {
-      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
-      env.exception (exception);
-      return 0;
-    }
-}
-
-PortableServer::POA_ptr
-TAO_POA::the_parent (CORBA::Environment &env)
-{
-  if (this->parent_ != 0)
-    return this->parent_->_this (env);
-  else
-    return PortableServer::POA::_nil ();
-}
-
-PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (CORBA::Environment &env)
-{
-  return this->poa_manager_._this (env);
-}
-
-PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
-}
-
-void
-TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                        CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
-}
-
-TAO_POA *
-TAO_POA::locate_poa_i (const TAO_ObjectKey &key,
-                       PortableServer::ObjectId_out id,
-                       CORBA::Environment &env)
-{
-  TAO_POA::String poa_name;
-  CORBA::Boolean persistent = CORBA::B_FALSE;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = this->parse_key_temporary_id (key,
-                                             poa_name,
-                                             id,
-                                             persistent,
-                                             poa_creation_time);
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-
-  TAO_POA *poa = this->find_POA_i (poa_name,
-                                   persistent,
-                                   env);
-  if (env.exception () != 0)
-    return 0;
-
-  // Make sure it is not an "old" objectId
-  if (!poa->persistent () &&
-      poa->creation_time () != poa_creation_time)
-    {
-      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-
-  return poa;
-}
-
-int
-TAO_POA::locate_servant (const TAO_ObjectKey &key,
-                         CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1, env);
-
-  PortableServer::Servant servant = 0;
-  TAO_POA::LOCATION_RESULT result = this->locate_servant_i (key, servant, env);
-
-  switch (result)
-    {
-    case TAO_POA::FOUND:
-    // Optimistic attitude
-    case TAO_POA::DEFAULT_SERVANT:
-    case TAO_POA::SERVANT_MANAGER:
-      return 0;
-
-    case TAO_POA::NOT_FOUND:
-      return -1;
-    }
-
-  return -1;
-}
-
-PortableServer::Servant
-TAO_POA::find_servant (const TAO_ObjectKey &key,
-                       CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
-
-  PortableServer::Servant servant = 0;
-  TAO_POA::LOCATION_RESULT result = this->locate_servant_i (key, servant, env);
-
-  switch (result)
-    {
-    case TAO_POA::FOUND:
-      return servant;
-
-    case TAO_POA::DEFAULT_SERVANT:
-    case TAO_POA::SERVANT_MANAGER:
-    case TAO_POA::NOT_FOUND:
-      return 0;
-    }
-
-  return 0;
-}
-
-TAO_POA::LOCATION_RESULT
-TAO_POA::locate_servant_i (const TAO_ObjectKey &key,
-                           PortableServer::Servant &servant,
-                           CORBA::Environment &env)
-{
-  PortableServer::ObjectId_var id;
-  PortableServer::ObjectId_out id_out (id);
-
-  TAO_POA *poa = this->locate_poa_i (key,
-                                     id_out,
-                                     env);
-  if (env.exception () != 0)
-    return TAO_POA::NOT_FOUND;
-
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists,
-  // return TAO_POA::FOUND.
-  if (poa->policies ().servant_retention () == PortableServer::RETAIN &&
-      poa->active_object_map ().find (id.in (), servant) != -1)
-    // Success
-    return TAO_POA::FOUND;
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (poa->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    return TAO_POA::NOT_FOUND;
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA, return
-  // TAO_POA::DEFAULT_SERVANT. If no servant has been associated with
-  // the POA, return TAO_POA::NOT_FOUND.
-  if (poa->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      if (poa->default_servant_ == 0)
-        return TAO_POA::NOT_FOUND;
-      else
-        // Success
-        return TAO_POA::DEFAULT_SERVANT;
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA, return
-  // TAO_POA::SERVANT_MANAGER. If no servant manager has been
-  // associated with the POA, return TAO_POA::NOT_FOUND.
-  if (poa->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (poa->servant_activator_.in ()) &&
-          CORBA::is_nil (poa->servant_locator_.in ()))
-        return TAO_POA::NOT_FOUND;
-      else
-        // Success
-        return TAO_POA::SERVANT_MANAGER;
-    }
-
-  // Failure
-  return TAO_POA::NOT_FOUND;
-}
-
-PortableServer::Servant
-TAO_POA::locate_poa_and_servant_i (const TAO_ObjectKey &key,
-                                   const char *operation,
-                                   PortableServer::ObjectId_out id,
-                                   TAO_POA *&poa_impl,
-                                   CORBA::Environment &env)
-{
-  poa_impl = this->locate_poa_i (key,
-                                 id,
-                                 env);
-  if (env.exception () != 0)
-    return 0;
-
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists, the
-  // POA invokes the appropriate method on the servant.
-  if (poa_impl->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      PortableServer::Servant servant = 0;
-      if (poa_impl->active_object_map ().find (*id.ptr (), servant) != -1)
-        // Success
-        return servant;
-    }
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (poa_impl->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA so the POA will invoke the
-  // appropriate method on that servant. If no servant has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  if (poa_impl->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      if (poa_impl->default_servant_ == 0)
-        {
-          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-          env.exception (exception);
-          return 0;
-        }
-      else
-        {
-          // Success
-          return poa_impl->default_servant_;
-        }
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA so the POA will invoke incarnate
-  // or preinvoke on it to find a servant that may handle the
-  // request. (The choice of method depends on the NON_RETAIN or
-  // RETAIN policy of the POA.) If no servant manager has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  //
-  // If a servant manager is located and invoked, but the servant
-  // manager is not directly capable of incarnating the object, it
-  // (the servant manager) may deal with the circumstance in a variety
-  // of ways, all of which are the application's responsibility.  Any
-  // system exception raised by the servant manager will be returned
-  // to the client in the reply. In addition to standard CORBA
-  // exceptions, a servant manager is capable of raising a
-  // ForwardRequest exception. This exception includes an object
-  // reference.
-  //
-  if (poa_impl->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (poa_impl->servant_activator_.in ()) &&
-          CORBA::is_nil (poa_impl->servant_locator_.in ()))
-        {
-          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-          env.exception (exception);
-          return 0;
-        }
-
-      PortableServer::POA_var poa = poa_impl->_this (env);
-      if (env.exception () != 0)
-        return 0;
-
-      if (poa_impl->policies ().servant_retention () == PortableServer::RETAIN)
-        {
-          // @@
-          // Invocations of incarnate on the servant manager are serialized.
-          // Invocations of etherealize on the servant manager are serialized.
-          // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-          PortableServer::Servant servant = poa_impl->servant_activator_->incarnate (*id.ptr (),
-                                                                                     poa.in (),
-                                                                                     env);
-          if (env.exception () != 0 || servant == 0)
-            return 0;
-
-          // If the incarnate operation returns a servant that is
-          // already active for a different Object Id and if the POA
-          // also has the UNIQUE_ID policy, the incarnate has violated
-          // the POA policy and is considered to be in error. The POA
-          // will raise an OBJ_ADAPTER system exception for the
-          // request.
-          if (poa_impl->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-              poa_impl->active_object_map ().find (servant) != -1)
-            {
-              CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-              env.exception (exception);
-              return 0;
-            }
-
-          // The POA enters the returned Servant value into the Active
-          // Object Map so that subsequent requests with the same
-          // ObjectId value will be delivered directly to that servant
-          // without invoking the servant manager.
-          if (poa_impl->active_object_map ().bind (*id.ptr (), servant) == -1)
-            {
-              CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-              env.exception (exception);
-              return 0;
-            }
-
-          // Success
-          return servant;
-        }
-      else
-        //
-        // Don't retain servant
-        //
-        {
-          // No serialization of invocations of preinvoke or
-          // postinvoke may be assumed; there may be multiple
-          // concurrent invocations of preinvoke for the same
-          // ObjectId.
-          //
-          // The same thread will be used to preinvoke the object,
-          // process the request, and postinvoke the object.
-          //
-          PortableServer::ServantLocator::Cookie cookie;
-          PortableServer::Servant servant = poa_impl->servant_locator_->preinvoke (*id.ptr (),
-                                                                                   poa.in (),
-                                                                                   operation,
-                                                                                   cookie,
-                                                                                   env);
-          if (env.exception () != 0 || servant == 0)
-            return 0;
-
-          // Remember the cookie
-          TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-          TAO_POA_Current *poa_current = orb_core->poa_current ();
-          poa_current->locator_cookie (cookie);
-
-          // Success
-          return servant;
-        }
-    }
-
-  // Failure
-  CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-  env.exception (exception);
-  return 0;
-}
-
-void
-TAO_POA::dispatch_servant (const TAO_ObjectKey &key,
-                           CORBA::ServerRequest &req,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_READ_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->dispatch_servant_i (key, req, context, env);
-}
-
-void
-TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
-                             CORBA::ServerRequest &req,
-                             void *context,
-                             CORBA::Environment &env)
-{
-  PortableServer::ObjectId_var id;
-  PortableServer::ObjectId_out id_out (id);
-  TAO_POA *poa = 0;
-  // const char *operation = req.operation ();
-  const char *operation = req.operation ();
-
-  // Setup for POA Current
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current current_context;
-  // Set the current context and remember the old one
-  TAO_POA_Current *previous_context = orb_core->poa_current (&current_context);
-
-  PortableServer::Servant servant = this->locate_poa_and_servant_i (key,
-                                                                    operation,
-                                                                    id_out,
-                                                                    poa,
-                                                                    env);
-  if (env.exception () != 0 || servant == 0)
-    return;
-
-  // Setup for upcall
-  poa->pre_invoke (key,
-                   id.in (),
-		   servant,
-                   &current_context,
-                   env);
-
-  // Upcall
-  servant->_dispatch (req,
-                      context,
-                      env);
-
-  // Cleanup from upcall
-  poa->post_invoke (servant,
-                    operation,
-                    &current_context,
-                    env);
-
-  // Reset old context
-  orb_core->poa_current (previous_context);
-
-}
-
-void
-TAO_POA::pre_invoke (const TAO_ObjectKey &key,
-                     const PortableServer::ObjectId &id,
-		     PortableServer::Servant servant,
-                     TAO_POA_Current *poa_current,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  poa_current->POA_impl (this);
-  poa_current->object_key (key);
-  poa_current->object_id (id);
-  poa_current->servant (servant);
-}
-
-void
-TAO_POA::post_invoke (PortableServer::Servant servant,
-                      const char *operation,
-                      TAO_POA_Current *poa_current,
-                      CORBA::Environment &env)
-{
-  PortableServer::ServantLocator::Cookie cookie = poa_current->locator_cookie ();
-
-  if (cookie != 0)
-    {
-      PortableServer::POA_var poa = poa_current->get_POA (env);
-
-      this->servant_locator_->postinvoke (poa_current->object_id (),
-                                          poa.in (),
-                                          operation,
-                                          cookie,
-                                          servant,
-                                          env);
-    }
-
-  // poa_current->clear ();
-
-}
-
-const TAO_Creation_Time &
-TAO_POA::creation_time (void)
-{
-  return this->creation_time_;
-}
-
-int
-TAO_POA::parse_key_permanent_id (const TAO_ObjectKey &key,
-                                 TAO_POA::String &poa_name,
-                                 PortableServer::ObjectId_out id,
-                                 CORBA::Boolean &persistent,
-                                 TAO_Temporary_Creation_Time &poa_creation_time)
-{
-  return this->parse_key (key,
-                          poa_name,
-                          id,
-                          persistent,
-                          poa_creation_time,
-                          0);
-}
-
-int
-TAO_POA::parse_key_temporary_id (const TAO_ObjectKey &key,
-                                 TAO_POA::String &poa_name,
-                                 PortableServer::ObjectId_out id,
-                                 CORBA::Boolean &persistent,
-                                 TAO_Temporary_Creation_Time &poa_creation_time)
-{
-  return this->parse_key (key,
-                          poa_name,
-                          id,
-                          persistent,
-                          poa_creation_time,
-                          1);
-}
-
-int
-TAO_POA::rfind (const TAO_ObjectKey &key,
-                char c,
-                int pos) const
-{
-  if (pos == ACE_CString::npos)
-    pos = key.length ();
-
-  for (int i = pos - 1; i >= 0; i--)
-    if (key[i] == c)
-      return i;
-
-  return TAO_POA::String::npos;
-}
-
-
-int
-TAO_POA::parse_key (const TAO_ObjectKey &key,
-                    TAO_POA::String &poa_name,
-                    PortableServer::ObjectId_out id,
-                    CORBA::Boolean &persistent,
-                    TAO_Temporary_Creation_Time &poa_creation_time,
-                    int temporary_id)
-{
-  // Try to find the last separator
-  int last_token_position = this->rfind (key, TAO_POA::name_separator ());
-
-  // If not found, the name is not correct
-  if (last_token_position == TAO_POA::String::npos)
-    return -1;
-
-  // Check the first byte (persistence indicator)
-  char object_key_type = key[0];
-  if (object_key_type == this->persistent_key_type ())
-    persistent = 1;
-  else if (object_key_type == this->transient_key_type ())
-    persistent = 0;
-  else
-    // Incorrect key
-    return -1;
-
-  // Starting at object_key_type_length, take the next
-  // creation_time_length byte for the timestamp
-  int starting_at = TAO_POA::object_key_type_length ();
-  poa_creation_time.creation_time (&key[starting_at]);
-
-  // Take the substring from creation_time_length +
-  // object_key_type_length to last_token_position for the POA name
-  starting_at = TAO_POA::object_key_type_length () + TAO_Creation_Time::creation_time_length ();
-  int how_many = last_token_position - starting_at;
-  poa_name.set ((const char *) &key[starting_at],
-                how_many);
-
-  // Take the substring from (last_token_position + separator_length)
-  // to length for the objectId
-  starting_at = last_token_position + TAO_POA::name_separator_length ();
-  how_many = key.length () - starting_at;
-
-  // Only for the life time of the upcall
-  if (temporary_id)
-    id = new PortableServer::ObjectId (how_many,
-                                       how_many,
-                                       (CORBA::Octet *) &key[starting_at],
-                                       CORBA::B_FALSE);
-  else
-    // You can use the id as long as you like
-    id = TAO_POA::string_to_ObjectId ((const char *) &key[starting_at],
-                                      how_many);
-
-  // Success
-  return 0;
-}
-
-CORBA::Boolean
-TAO_POA::persistent (void)
-{
-  return this->policies ().lifespan () == PortableServer::PERSISTENT;
-}
-
-PortableServer::ObjectId *
-TAO_POA::create_object_id (void)
-{
-  // Note:  This method assumes two things:
-  // 1. Locks are held when this method is called
-  // 2. Size of octet == size of string element
-
-  // Buffer for counter
-  char counter[TAO_POA::max_space_required_for_ulong];
-
-  // Convert counter into string
-  ACE_OS::sprintf (counter,
-                   "%ld",
-                   this->counter_);
-
-#if defined (POA_NAME_IN_POA_GENERATED_ID)
-
-  // Calculate the required buffer size.
-  // Note: 1 is for the null terminator
-  TAO_POA::String id =
-    this->name_ +
-    TAO_POA::id_separator () +
-    counter;
-
-  char *result = id.c_str ();
-
-#else /* POA_NAME_IN_POA_GENERATED_ID */
-
-  char *result = counter;
-
-#endif /* POA_NAME_IN_POA_GENERATED_ID */
-
-  // Increment counter
-  this->counter_++;
-
-  // Create the sequence
-  return TAO_POA::string_to_ObjectId (result);
-}
-
-TAO_ObjectKey *
-TAO_POA::create_object_key (const PortableServer::ObjectId &id)
-{
-  // Calculate the space required for the key
-  int buffer_size =
-    this->object_key_type_length () +
-    TAO_Creation_Time::creation_time_length () +
-    this->complete_name_.length () +
-    TAO_POA::name_separator_length () +
-    id.length ();
-
-  // Create the buffer for the key
-  CORBA::Octet *buffer = TAO_ObjectKey::allocbuf (buffer_size);
-
-  // Keeps track of where the next infomation goes; start at 0 byte
-  int starting_at = 0;
-
-  // Copy the persistence bit
-  buffer[starting_at] = (CORBA::Octet) this->object_key_type ();
-
-  // Then copy the timestamp
-  starting_at += this->object_key_type_length ();
-  ACE_OS::memcpy (&buffer[starting_at],
-                  this->creation_time_.creation_time (),
-                  TAO_Creation_Time::creation_time_length ());
-
-  // Put the POA name into the buffer
-  starting_at += TAO_Creation_Time::creation_time_length ();
-  ACE_OS::memcpy (&buffer[starting_at],
-                  this->complete_name_.c_str (),
-                  this->complete_name_.length ());
-
-  // Add the name separator
-  starting_at += this->complete_name_.length ();
-  buffer[starting_at] = (CORBA::Octet) TAO_POA::name_separator ();
-
-  // Then copy the ID into the key
-  starting_at += TAO_POA::name_separator_length ();
-  ACE_OS::memcpy (&buffer[starting_at],
-                  id.get_buffer (),
-                  id.length ());
-
-  // Create the key, giving the ownership of the buffer to the
-  // sequence.
-  return new TAO_ObjectKey (buffer_size,
-                            buffer_size,
-                            buffer,
-                            CORBA::B_TRUE);
-}
-
-int
-TAO_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
-{
-
-#if defined (POA_NAME_IN_POA_GENERATED_ID)
-
-  // Grab the buffer
-  const char *id_buffer = (const char *) id.get_buffer ();
-
-  // Check to see if the POA name is the first part of the id
-  return
-    this->name_.length () < id.length () &&
-    ACE_OS::strncmp (id_buffer,
-                     this->name_.c_str (),
-                     this->name_.length ()) == 0;
-
-#else /* POA_NAME_IN_POA_GENERATED_ID */
-
-  return 1;
-
-#endif /* POA_NAME_IN_POA_GENERATED_ID */
-}
-
-int
-TAO_POA::is_poa_generated_key (const TAO_ObjectKey &key)
-{
-  // Grab the buffer
-  const char *key_buffer = (const char *) key.get_buffer ();
-
-  // Check to see if the complete POA name is the first part of the
-  // key
-  return
-    this->complete_name_.length () < key.length () &&
-    ACE_OS::strncmp (key_buffer,
-                     this->complete_name_.c_str (),
-                     this->complete_name_.length ()) == 0;
-}
-
-int
-TAO_POA::leaf_poa_name (const TAO_POA::String &adapter_name,
-                        CORBA::Environment &env)
-{
-  // This method does not throw any exceptions
-  ACE_UNUSED_ARG (env);
-
-  // Try to find the name separator
-  if (adapter_name.find (TAO_POA::name_separator ()) == TAO_POA::String::npos)
-    // If not found, the name was a leaf
-    return 1;
-  else
-    // If found, the name was not a leaf
-    return 0;
-}
-
-void
-TAO_POA::parse_poa_name (const TAO_POA::String &adapter_name,
-                         TAO_POA::String &topmost_poa_name,
-                         TAO_POA::String &tail_poa_name,
-                         CORBA::Environment &env)
-{
-  // Try to find the name separator
-  int token_position = adapter_name.find (TAO_POA::name_separator ());
-
-  // If not found, the name was a leaf, throw exception
-  if (token_position == TAO_POA::String::npos)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-  else
-    {
-      // If found, take the substring from 0 to token_position
-      int starting_at = 0;
-      int how_many = token_position - starting_at;
-      topmost_poa_name = adapter_name.substr (starting_at,
-                                              how_many);
-
-      // Take the substring from (token_position + separator_length)
-      // to length
-      starting_at = token_position + TAO_POA::name_separator_length ();
-      how_many = adapter_name.length () - starting_at;
-      tail_poa_name = adapter_name.substr (starting_at,
-                                           how_many);
-    }
-}
-
-CORBA::String
-TAO_POA::the_name (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  return CORBA::string_dup (this->name_.c_str ());
-}
-
-TAO_POA::String
-TAO_POA::complete_name (void)
-{
-  return this->complete_name_;
-}
-
-void
-TAO_POA::set_complete_name (void)
-{
-  if (this->parent_ != 0)
-    {
-      this->complete_name_ += this->parent_->complete_name ();
-      this->complete_name_ += TAO_POA::name_separator ();
-    }
-  this->complete_name_ += this->name_;
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string)
-{
-  // Size of string
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong buffer_size = ACE_OS::strlen (string);
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create and return a new ID
-  return new PortableServer::ObjectId (buffer_size,
-                                       buffer_size,
-                                       buffer,
-                                       CORBA::B_TRUE);
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string,
-                             int size)
-{
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, size);
-
-  // Create and return a new ID
-  return new PortableServer::ObjectId (size,
-                                       size,
-                                       buffer,
-                                       CORBA::B_TRUE);
-}
-
-PortableServer::ObjectId *
-TAO_POA::wstring_to_ObjectId (const CORBA::WChar *string)
-{
-  // Size of Id
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong string_length = ACE_OS::wslen (string);
-
-  size_t buffer_size = string_length * sizeof (CORBA::WChar);
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create a new ID
-  return new PortableServer::ObjectId (buffer_size,
-                                       buffer_size,
-                                       buffer,
-                                       CORBA::B_TRUE);
-}
-
-CORBA::String
-TAO_POA::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  // Create space
-  CORBA::String string = CORBA::string_alloc (id.length ());
-
-  // Copy the data
-  ACE_OS::memcpy (string, id.get_buffer (), id.length ());
-
-  // Null terminate the string
-  string[id.length ()] = '\0';
-
-  // Return string
-  return string;
-}
-
-CORBA::WChar *
-TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  // Create space
-  CORBA::WString string = CORBA::wstring_alloc (id.length ());
-
-  // Copy the data
-  ACE_OS::memcpy (string, id.get_buffer (), id.length () * sizeof (CORBA::WChar));
-
-  // Null terminate the string
-  string[id.length ()] = '\0';
-
-  // Return string
-  return string;
-}
-
-char
-TAO_POA::name_separator (void)
-{
-  return '/';
-}
-
-char
-TAO_POA::id_separator (void)
-{
-  return ':';
-}
-
-CORBA::ULong
-TAO_POA::name_separator_length (void)
-{
-  return sizeof (char);
-}
-
-CORBA::ULong
-TAO_POA::id_separator_length (void)
-{
-  return sizeof (char);
-}
-
-char
-TAO_POA::object_key_type (void)
-{
-  if (this->persistent ())
-    return TAO_POA::persistent_key_type ();
-  else
-    return TAO_POA::transient_key_type ();
-}
-
-char
-TAO_POA::persistent_key_type (void)
-{
-  return 'P';
-}
-
-char
-TAO_POA::transient_key_type (void)
-{
-  return 'T';
-}
-
-CORBA::ULong
-TAO_POA::object_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-PortableServer::ThreadPolicy_ptr
-TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                               CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::ThreadPolicy::_nil ();
-
-  auto_ptr<TAO_Thread_Policy> new_policy (new TAO_Thread_Policy (value, self.in ()));
-  PortableServer::ThreadPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::ThreadPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::LifespanPolicy_ptr
-TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                 CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::LifespanPolicy::_nil ();
-
-  auto_ptr<TAO_Lifespan_Policy> new_policy (new TAO_Lifespan_Policy (value, self.in ()));
-  PortableServer::LifespanPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::LifespanPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                      CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::IdUniquenessPolicy::_nil ();
-
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_policy (new TAO_Id_Uniqueness_Policy (value, self.in ()));
-  PortableServer::IdUniquenessPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                      CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::IdAssignmentPolicy::_nil ();
-
-  auto_ptr<TAO_Id_Assignment_Policy> new_policy (new TAO_Id_Assignment_Policy (value, self.in ()));
-  PortableServer::IdAssignmentPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                            CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-
-  auto_ptr<TAO_Implicit_Activation_Policy> new_policy (new TAO_Implicit_Activation_Policy (value, self.in ()));
-  PortableServer::ImplicitActivationPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                          CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::ServantRetentionPolicy::_nil ();
-
-  auto_ptr<TAO_Servant_Retention_Policy> new_policy (new TAO_Servant_Retention_Policy (value, self.in ()));
-  PortableServer::ServantRetentionPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                           CORBA::Environment &env)
-{
-  PortableServer::POA_var self = this->_this (env);
-  // Check for exceptions
-  if (env.exception () != 0)
-    return PortableServer::RequestProcessingPolicy::_nil ();
-
-  auto_ptr<TAO_Request_Processing_Policy> new_policy (new TAO_Request_Processing_Policy (value, self.in ()));
-  PortableServer::RequestProcessingPolicy_var result = new_policy->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  else
-    {
-      // Make sure that the auto_ptr does not delete the
-      // implementation
-      new_policy.release ();
-      return result._retn ();
-    }
-}
-
-void
-TAO_POA::encode_sequence_to_string (CORBA::String &str,
-                                    const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length() + 1 /* for zero termination */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (cp+len) && i < seq.length();
-       i++)
-    {
-      u_char byte = seq[i];
-      if (isascii (byte) && isprint (byte) && byte != '\\')
-        {
-          *cp++ = (char) byte;
-          continue;
-        }
-
-      *cp++ = '\\';
-      *cp++ = ACE::nibble2hex (byte & 0x0f);
-      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-void
-TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                    CORBA::String str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  char *eos = str + length;
-  char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       i++)
-    {
-      if (*cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        {
-          // Copy it in
-          seq[i] = *cp++;
-        }
-    }
-
-  // Set the length appropriately
-  seq.length (i);
-}
-
-CORBA::Boolean
-TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name,
-                                        CORBA::Environment &env)
-{
-  // Default policies
-  PortableServer::PolicyList default_policies;
-
-  // This assumes that the lock on the parent is recursive
-  PortableServer::POA_var child = parent->create_POA (name,
-                                                      PortableServer::POAManager::_nil (),
-                                                      default_policies,
-                                                      env);
-
-  if (env.exception () != 0)
-    return CORBA::B_FALSE;
-  else
-    {
-      PortableServer::AdapterActivator_var activator = this->_this (env);
-      if (env.exception () != 0)
-        {
-          child->destroy (CORBA::B_FALSE,
-                          CORBA::B_FALSE,
-                          env);
-          return CORBA::B_FALSE;
-        }
-
-      child->the_activator (activator.in (), env);
-
-      if (env.exception () != 0)
-        {
-          child->destroy (CORBA::B_FALSE,
-                          CORBA::B_FALSE,
-                          env);
-          return CORBA::B_FALSE;
-        }
-
-      // Finally everything is fine
-      return CORBA::B_TRUE;
-    }
-}
-
-TAO_POA_Manager::TAO_POA_Manager (void)
-  : state_ (HOLDING),
-    closing_down_ (0),
-    lock_ (),
-    poa_collection_ ()
-{
-}
-
-TAO_POA_Manager::~TAO_POA_Manager (void)
-{
-}
-
-void
-TAO_POA_Manager::activate (CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  // This operation changes the state of the POA manager to active. If
-  // issued while the POA manager is in the inactive state, the
-  // AdapterInactive exception is raised.  Entering the active state
-  // enables the associated POAs to process requests.
-
-  if (this->state_ == INACTIVE)
-    {
-      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
-      env.exception (exception);
-      return;
-    }
-  else
-    this->state_ = ACTIVE;
-}
-
-void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
-                                CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  // This operation changes the state of the POA manager to
-  // holding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // holding state causes the associated POAs to queue incoming
-  // requests.  Any requests that have been queued but have not
-  // started executing will continue to be queued while in the holding
-  // state.
-
-  if (this->state_ == INACTIVE)
-    {
-      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
-      env.exception (exception);
-      return;
-    }
-  else
-    this->state_ = HOLDING;
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE, this operation does not return until either there are no
-  // actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) or the state of the POA
-  // manager is changed to a state other than holding.
-
-  ACE_UNUSED_ARG (wait_for_completion);
-}
-
-void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
-                                   CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  // This operation changes the state of the POA manager to
-  // discarding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // discarding state causes the associated POAs to discard incoming
-  // requests.  In addition, any requests that have been queued but
-  // have not started executing are discarded. When a request is
-  // discarded, a TRANSIENT system exception is returned to the
-  // client.
-
-  if (this->state_ == INACTIVE)
-    {
-      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
-      env.exception (exception);
-      return;
-    }
-  else
-    this->state_ = DISCARDING;
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE, this operation does not return until either there are no
-  // actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) or the state of the POA
-  // manager is changed to a state other than discarding.
-
-  ACE_UNUSED_ARG (wait_for_completion);
-}
-
-void
-TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion,
-                             CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->closing_down_ = 1;
-
-  // This operation changes the state of the POA manager to
-  // inactive. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // inactive state causes the associated POAs to reject requests that
-  // have not begun to be executed as well as any new requests.
-
-  if (this->state_ == INACTIVE)
-    {
-      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
-      env.exception (exception);
-      return;
-    }
-  else
-    this->state_ = INACTIVE;
-
-  // After changing the state, if the etherealize_objects parameter is:
-  //
-  // a) TRUE - the POA manager will cause all associated POAs that
-  // have the RETAIN and USE_SERVANT_MANAGER policies to perform the
-  // etherealize operation on the associated servant manager for all
-  // active objects.
-  //
-  // b) FALSE - the etherealize operation is not called. The purpose
-  // is to provide developers with a means to shut down POAs in a
-  // crisis (for example, unrecoverable error) situation.
-
-  for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-       iterator != this->poa_collection_.end () && env.exception () == 0;
-       iterator++)
-    {
-      TAO_POA *poa = *iterator;
-      poa->destroy (etherealize_objects,
-                    wait_for_completion,
-                    env);
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // will return immediately after changing the state. If the
-  // parameter is TRUE, this operation does not return until there are
-  // no actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) and, in the case of a TRUE
-  // etherealize_objects, all invocations of etherealize have
-  // completed for POAs having the RETAIN and USE_SERVANT_MANAGER
-  // policies.
-
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-}
-
-TAO_POA_Manager::Processing_State
-TAO_POA_Manager::state (CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), UNKNOWN, env);
-
-  return this->state_;
-}
-
-void
-TAO_POA_Manager::remove_poa (TAO_POA *poa,
-                             CORBA::Environment &env)
-{
-  // If we are not closing down, we must remove this poa from our
-  // collection.
-  if (!this->closing_down_)
-    {
-      // Lock access to the POAManager for the duration of this transaction
-      TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-      this->remove_poa_i (poa,
-                          env);
-    }
-
-  // If we are closing down, we are currently iterating over our poa
-  // collection and there is not need to remove this poa from our
-  // collection.
-}
-
-void
-TAO_POA_Manager::remove_poa_i (TAO_POA *poa,
-                               CORBA::Environment &env)
-{
-  int result = this->poa_collection_.remove (poa);
-
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-}
-
-void
-TAO_POA_Manager::register_poa (TAO_POA *poa,
-                               CORBA::Environment &env)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
-
-  this->register_poa_i (poa,
-                        env);
-}
-
-void
-TAO_POA_Manager::register_poa_i (TAO_POA *poa,
-                                 CORBA::Environment &env)
-{
-  int result = this->poa_collection_.insert (poa);
-
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return;
-    }
-}
-
-ACE_Lock &
-TAO_POA_Manager::lock (void)
-{
-  return this->lock_;
-}
-
-TAO_POA_Manager *
-TAO_POA_Manager::clone (void)
-{
-  return new TAO_POA_Manager;
-}
-
-TAO_Strategy_POA::TAO_Strategy_POA (const TAO_POA::String &adapter_name,
-                                    TAO_POA_Manager &poa_manager,
-                                    const TAO_POA_Policies &policies,
-                                    TAO_POA *parent,
-                                    CORBA::Environment &env)
-  : TAO_POA (adapter_name,
-             poa_manager,
-             policies,
-             parent,
-             env),
-    lock_ (0)
-{
-  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_poa_lock ();
-}
-
-TAO_Strategy_POA::TAO_Strategy_POA (const TAO_POA::String &adapter_name,
-                                    TAO_POA_Manager &poa_manager,
-                                    const TAO_POA_Policies &policies,
-                                    TAO_POA *parent,
-                                    TAO_Object_Table &active_object_map,
-                                    CORBA::Environment &env)
-  : TAO_POA (adapter_name,
-             poa_manager,
-             policies,
-             parent,
-             active_object_map,
-             env),
-    lock_ (0)
-{
-  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_poa_lock ();
-}
-
-TAO_Strategy_POA::~TAO_Strategy_POA (void)
-{
-  delete this->lock_;
-}
-
-TAO_POA *
-TAO_Strategy_POA::clone (const TAO_POA::String &adapter_name,
-                         TAO_POA_Manager &poa_manager,
-                         const TAO_POA_Policies &policies,
-                         TAO_POA *parent,
-                         CORBA::Environment &env)
-{
-  return new SELF (adapter_name,
-                   poa_manager,
-                   policies,
-                   parent,
-                   env);
-}
-
-TAO_POA *
-TAO_Strategy_POA::clone (const TAO_POA::String &adapter_name,
-                         TAO_POA_Manager &poa_manager,
-                         const TAO_POA_Policies &policies,
-                         TAO_POA *parent,
-                         TAO_Object_Table &active_object_map,
-                         CORBA::Environment &env)
-{
-  return new SELF (adapter_name,
-                   poa_manager,
-                   policies,
-                   parent,
-                   active_object_map,
-                   env);
-}
-
-ACE_Lock &
-TAO_Strategy_POA::lock (void)
-{
-  return *this->lock_;
-}
-
-TAO_Strategy_POA_Manager::TAO_Strategy_POA_Manager (void)
-  : TAO_POA_Manager (),
-    lock_ (0)
-{
-  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_poa_mgr_lock ();
-}
-
-TAO_Strategy_POA_Manager::~TAO_Strategy_POA_Manager (void)
-{
-  delete this->lock_;
-}
-
-TAO_POA_Manager *
-TAO_Strategy_POA_Manager::clone (void)
-{
-  return new SELF;
-}
-
-ACE_Lock &
-TAO_Strategy_POA_Manager::lock (void)
-{
-  return *this->lock_;
-}
-
-TAO_POA_Current::TAO_POA_Current (void)
-  : poa_impl_ (0),
-    object_id_ (0),
-    object_key_ (0),
-    cookie_ (0),
-    servant_ (0)
-{
-}
-
-TAO_POA_Current::TAO_POA_Current (TAO_POA *impl,
-                                  const TAO_ObjectKey &key,
-                                  const PortableServer::ObjectId &id,
-                                  PortableServer::Servant servant)
-  : poa_impl_ (impl),
-    object_id_ (&id),
-    object_key_ (&key),
-    cookie_ (0),
-    servant_ (servant)
-{}
-
-TAO_POA_Current::~TAO_POA_Current (void)
-{
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current::get_POA (CORBA::Environment &env)
-{
-  if (!this->context_is_valid ())
-    {
-      CORBA::Exception *exception = new PortableServer::Current::NoContext;
-      env.exception (exception);
-      return PortableServer::POA::_nil ();
-    }
-
-  PortableServer::POA_var result = this->poa_impl_->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-  else
-    return result._retn ();
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (CORBA::Environment &env)
-{
-  if (!this->context_is_valid ())
-    {
-      CORBA::Exception *exception = new PortableServer::Current::NoContext;
-      env.exception (exception);
-      return 0;
-    }
-
-  // Create a new one and pass it back
-  return new PortableServer::ObjectId (*this->object_id_);
-}
-
-void
-TAO_POA_Current::clear (void)
-{
-  this->poa_impl_ = 0;
-  this->object_id_ = 0;
-  this->servant_ = 0;
-  this->object_key_ = 0;
-  this->cookie_ = 0;
-}
-
-int
-TAO_POA_Current::context_is_valid (void)
-{
-  return
-    this->poa_impl_ != 0 &&
-    this->object_id_ != 0 &&
-    this->servant_ != 0 &&
-    this->object_key_ != 0;
-}
-
-void
-TAO_POA_Current::POA_impl (TAO_POA *impl)
-{
-  this->poa_impl_ = impl;
-}
-
-TAO_POA *
-TAO_POA_Current::POA_impl (void) const
-{
-  return this->poa_impl_;
-}
-
-void
-TAO_POA_Current::object_id (const PortableServer::ObjectId &id)
-{
-  this->object_id_ = &id;
-}
-
-const PortableServer::ObjectId &
-TAO_POA_Current::object_id (void) const
-{
-  return *this->object_id_;
-}
-
-void
-TAO_POA_Current::object_key (const TAO_ObjectKey &key)
-{
-  this->object_key_ = &key;
-}
-
-const TAO_ObjectKey &
-TAO_POA_Current::object_key (void) const
-{
-  return *this->object_key_;
-}
-
-void
-TAO_POA_Current::servant (PortableServer::Servant servant)
-{
-  this->servant_ = servant;
-}
-
-PortableServer::Servant
-TAO_POA_Current::servant (void) const
-{
-  return this->servant_;
-}
-
-int
-TAO_POA_Current::in_upcall (void) const
-{
-  return (this->servant_ != 0);
-}
-
-PortableServer::ServantLocator::Cookie
-TAO_POA_Current::locator_cookie (void) const
-{
-  return this->cookie_;
-}
-
-void
-TAO_POA_Current::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
-{
-  this->cookie_ = cookie;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Object_Table_Iterator_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_POA>;
-template class ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Thread_Policy>;
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-#if defined (ACE_HAS_THREADS)
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-#endif /* ACE_HAS_THREADS */
-template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
-template class ACE_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Read_Guard<ACE_Lock>;
-template class ACE_Unbounded_Set<TAO_POA *>;
-template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
-template class ACE_Write_Guard<ACE_Lock>;
-template class TAO_Object_Manager<PortableServer::Policy>;
-template class TAO_Unbounded_Object_Sequence<PortableServer::Policy>;
-template class auto_ptr<TAO_Id_Assignment_Policy>;
-template class auto_ptr<TAO_Id_Uniqueness_Policy>;
-template class auto_ptr<TAO_Implicit_Activation_Policy>;
-template class auto_ptr<TAO_Lifespan_Policy>;
-template class auto_ptr<TAO_Object_Table_Iterator_Impl>;
-template class auto_ptr<TAO_POA>;
-template class auto_ptr<TAO_Request_Processing_Policy>;
-template class auto_ptr<TAO_Servant_Retention_Policy>;
-template class auto_ptr<TAO_Thread_Policy>;
-template class ACE_Map_Entry<ACE_CString, TAO_POA *>;
-template class ACE_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Node<TAO_POA *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Table_Iterator_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Policy>
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#endif /* ACE_HAS_THREADS */
-#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
-#pragma instantiate ACE_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_Lock>
-#pragma instantiate ACE_Unbounded_Set<TAO_POA *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
-#pragma instantiate ACE_Write_Guard<ACE_Lock>
-#pragma instantiate TAO_Object_Manager<PortableServer::Policy>
-#pragma instantiate TAO_Unbounded_Object_Sequence<PortableServer::Policy>
-#pragma instantiate auto_ptr<TAO_Id_Assignment_Policy>
-#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate auto_ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Policy>
-#pragma instantiate auto_ptr<TAO_Object_Table_Iterator_Impl>
-#pragma instantiate auto_ptr<TAO_POA>
-#pragma instantiate auto_ptr<TAO_Request_Processing_Policy>
-#pragma instantiate auto_ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate auto_ptr<TAO_Thread_Policy>
-#pragma instantiate ACE_Map_Entry<ACE_CString, TAO_POA *>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Node<TAO_POA *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
deleted file mode 100644
index 857ac2f4c39..00000000000
--- a/TAO/tao/POA.h
+++ /dev/null
@@ -1,920 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    poa.h
-//
-// = DESCRIPTION
-//     POA
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#if !defined (POA_H)
-#define POA_H
-
-// CORBA
-#include "tao/corba.h"
-
-// Stubs
-#include "tao/POAC.h"
-
-// Servant
-#include "tao/Servant_Base.h"
-
-// Skeletons
-#include "tao/POAS.h"
-
-// String
-#include "ace/SString.h"
-
-// Map
-#include "ace/Map_Manager.h"
-
-// Vector
-#include "ace/Containers.h"
-
-// Locking
-#include "ace/Synch.h"
-
-// Active Object Table
-#include "tao/Object_Table.h"
-
-class TAO_POA;
-class TAO_POA_Manager;
-
-class TAO_Export TAO_Thread_Policy : public POA_PortableServer::ThreadPolicy
-{
-public:
-  TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
-                     PortableServer::POA_ptr poa);
-
-  TAO_Thread_Policy (const TAO_Thread_Policy &new_policy);
-
-  virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::ThreadPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Lifespan_Policy : public POA_PortableServer::LifespanPolicy
-{
-public:
-  TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
-                       PortableServer::POA_ptr poa);
-
-  TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs);
-
-  virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::LifespanPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Id_Uniqueness_Policy : public POA_PortableServer::IdUniquenessPolicy
-{
-public:
-  TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
-                            PortableServer::POA_ptr poa);
-
-  TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs);
-
-  virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::IdUniquenessPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Id_Assignment_Policy : public POA_PortableServer::IdAssignmentPolicy
-{
-public:
-  TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
-                            PortableServer::POA_ptr poa);
-
-  TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs);
-
-  virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::IdAssignmentPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Implicit_Activation_Policy : public POA_PortableServer::ImplicitActivationPolicy
-{
-public:
-  TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
-                                  PortableServer::POA_ptr poa);
-
-  TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs);
-
-  virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::ImplicitActivationPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Servant_Retention_Policy : public POA_PortableServer::ServantRetentionPolicy
-{
-public:
-  TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
-                                PortableServer::POA_ptr poa);
-
-  TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs);
-
-  virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::ServantRetentionPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_Request_Processing_Policy : public POA_PortableServer::RequestProcessingPolicy
-{
-public:
-  TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
-                                 PortableServer::POA_ptr poa);
-
-  TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs);
-
-  virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env);
-
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
-
-protected:
-  PortableServer::RequestProcessingPolicyValue value_;
-
-  PortableServer::POA_var poa_;
-};
-
-class TAO_Export TAO_POA_Policies
-{
-public:
-
-  TAO_POA_Policies (void);
-
-  virtual PortableServer::ThreadPolicyValue thread (void) const;
-  virtual void thread (PortableServer::ThreadPolicyValue value);
-
-  virtual PortableServer::LifespanPolicyValue lifespan (void) const;
-  virtual void lifespan (PortableServer::LifespanPolicyValue value);
-
-  virtual PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-  virtual void id_uniqueness (PortableServer::IdUniquenessPolicyValue value);
-
-  virtual PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-  virtual void id_assignment (PortableServer::IdAssignmentPolicyValue value);
-
-  virtual PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-  virtual void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
-
-  virtual PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-  virtual void servant_retention (PortableServer::ServantRetentionPolicyValue value);
-
-  virtual PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-  virtual void request_processing (PortableServer::RequestProcessingPolicyValue value);
-
-  virtual void parse_policies (const PortableServer::PolicyList &policies,
-                               CORBA::Environment &env);
-
-protected:
-
-  virtual void parse_policy (const PortableServer::Policy_ptr policy,
-                             CORBA::Environment &env);
-
-  virtual int validity_check (void);
-
-  PortableServer::ThreadPolicyValue thread_;
-
-  PortableServer::LifespanPolicyValue lifespan_;
-
-  PortableServer::IdUniquenessPolicyValue id_uniqueness_;
-
-  PortableServer::IdAssignmentPolicyValue id_assignment_;
-
-  PortableServer::ImplicitActivationPolicyValue implicit_activation_;
-
-  PortableServer::ServantRetentionPolicyValue servant_retention_;
-
-  PortableServer::RequestProcessingPolicyValue request_processing_;
-};
-
-class TAO_Temporary_Creation_Time;
-
-class TAO_Creation_Time
-{
-public:
-
-  TAO_Creation_Time (const ACE_Time_Value &creation_time);
-
-  TAO_Creation_Time (void);
-
-  virtual void creation_time (const void *creation_time);
-  
-  virtual const void *creation_time (void) const;
-  
-  static int creation_time_length (void);
-  
-  int operator== (const TAO_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Creation_Time &rhs) const;
-
-  int operator== (const TAO_Temporary_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Temporary_Creation_Time &rhs) const;
-
-private:
-  
-  // 32 bit ulong requires 8 octets
-  static const int max_space_required_for_two_ulong_to_hex;
-
-  // Timestamp buffer
-  char time_stamp_[(8 * 2) + 1];
-
-};
-
-// Special creation time only useful in the lifetime of the upcall
-class TAO_Temporary_Creation_Time
-{
-public:
-
-  TAO_Temporary_Creation_Time (void);
-
-  virtual void creation_time (const void *creation_time);
-  
-  int operator== (const TAO_Creation_Time &rhs) const;
-
-  int operator!= (const TAO_Creation_Time &rhs) const;
-
-private:
-  
-  void *time_stamp_;
-};
-
-class TAO_POA_Current;
-
-class TAO_Export TAO_POA : public POA_PortableServer::POA
-{
-public:
-
-  typedef ACE_CString String;
-  //typedef std::string String;
-
-  virtual PortableServer::POA_ptr create_POA (const char *adapter_name,
-                                              PortableServer::POAManager_ptr poa_manager,
-                                              const PortableServer::PolicyList &policies,
-                                              CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                            CORBA::Boolean activate_it,
-                                            CORBA::Environment &env);
-
-  virtual void destroy (CORBA::Boolean etherealize_objects,
-                        CORBA::Boolean wait_for_completion,
-                        CORBA::Environment &env);
-
-  virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                                 CORBA::Environment &env);
-
-  virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                                     CORBA::Environment &env);
-
-  virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                              CORBA::Environment &env);
-
-  virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                              CORBA::Environment &env);
-
-  virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                          CORBA::Environment &env);
-
-  virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                                      CORBA::Environment &env);
-
-  virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                        CORBA::Environment &env);
-
-  virtual CORBA::String the_name (CORBA::Environment &env);
-
-  virtual PortableServer::POA_ptr the_parent (CORBA::Environment &env);
-
-  virtual PortableServer::POAManager_ptr the_POAManager (CORBA::Environment &env);
-
-  virtual PortableServer::AdapterActivator_ptr the_activator (CORBA::Environment &env);
-
-  virtual void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                              CORBA::Environment &env);
-
-  virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA::Environment &env);
-
-  virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                                    CORBA::Environment &env);
-
-  virtual PortableServer::Servant get_servant (CORBA::Environment &env);
-
-  virtual void set_servant (PortableServer::Servant servant,
-                            CORBA::Environment &env);
-
-  virtual PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                                     CORBA::Environment &env);
-
-  virtual void activate_object_with_id (const PortableServer::ObjectId &id,
-                                        PortableServer::Servant p_servant,
-                                        CORBA::Environment &env);
-
-  virtual void deactivate_object (const PortableServer::ObjectId &oid,
-                                  CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr create_reference (const char *intf,
-                                              CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                                      const char *intf,
-                                                      CORBA::Environment &env);
-  virtual PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                                   CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                                  CORBA::Environment &env);
-
-  virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                        CORBA::Environment &env);
-
-  virtual PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                                     CORBA::Environment &env);
-
-  virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                                 CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                             CORBA::Environment &env);
-
-
-  // Utility functions for the other 
-  static void encode_sequence_to_string (CORBA::String &str,
-                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                         CORBA::String str);
-
-  static CORBA::String ObjectId_to_string (const PortableServer::ObjectId &id);
-
-  static CORBA::WString ObjectId_to_wstring (const PortableServer::ObjectId &id);
-
-  static PortableServer::ObjectId *string_to_ObjectId (const char *id);
-
-  static PortableServer::ObjectId *string_to_ObjectId (const char *string, 
-                                                       int size);
-
-  static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
-
-  TAO_POA (const String &adapter_name,
-           TAO_POA_Manager &poa_manager,
-           const TAO_POA_Policies &policies,
-           TAO_POA *parent,
-           CORBA::Environment &env);
-
-  TAO_POA (const String &adapter_name,
-           TAO_POA_Manager &poa_manager,
-           const TAO_POA_Policies &policies,
-           TAO_POA *parent,
-           TAO_Object_Table &active_object_map,
-           CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const String &adapter_name,
-                          TAO_POA_Manager &poa_manager,
-                          const TAO_POA_Policies &policies,
-                          TAO_POA *parent,
-                          CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const String &adapter_name,
-                          TAO_POA_Manager &poa_manager,
-                          const TAO_POA_Policies &policies,
-                          TAO_POA *parent,
-                          TAO_Object_Table &active_object_map,
-                          CORBA::Environment &env);
-
-  virtual ~TAO_POA (void);
-
-  virtual void dispatch_servant (const TAO_ObjectKey &key,
-                                 CORBA::ServerRequest &req,
-                                 void *context,
-                                 CORBA::Environment &env);
-
-  virtual int locate_servant (const TAO_ObjectKey &key,
-                              CORBA::Environment &env);
-
-  virtual PortableServer::Servant find_servant (const TAO_ObjectKey &key,
-                                                CORBA::Environment &env);
-
-  static char name_separator (void);
-
-  static char id_separator (void);
-
-  static CORBA::ULong name_separator_length (void);
-
-  static CORBA::ULong id_separator_length (void);
-
-protected:
-
-  virtual TAO_POA *create_POA (const String &adapter_name,
-                               TAO_POA_Manager &poa_manager,
-                               const TAO_POA_Policies &policies,
-                               CORBA::Environment &env);
-
-  virtual TAO_POA *create_POA_i (const String &adapter_name,
-                                 TAO_POA_Manager &poa_manager,
-                                 const TAO_POA_Policies &policies,
-                                 CORBA::Environment &env);
-
-  virtual TAO_POA *find_POA (const String &adapter_name,
-                             CORBA::Boolean activate_it,
-                             CORBA::Environment &env);
-
-  virtual TAO_POA *find_POA_i (const String &adapter_name,
-                               CORBA::Boolean activate_it,
-                               CORBA::Environment &env);
-
-  virtual TAO_POA *find_POA_i_optimized (const String &adapter_name,
-                                         CORBA::Boolean activate_it,
-                                         CORBA::Environment &env);
-
-  virtual void destroy_i (CORBA::Boolean etherealize_objects,
-                          CORBA::Boolean wait_for_completion,
-                          CORBA::Environment &env);
-
-  virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA::Environment &env);
-
-  virtual void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                      CORBA::Environment &env);
-
-  virtual PortableServer::Servant get_servant_i (CORBA::Environment &env);
-
-  virtual void set_servant_i (PortableServer::Servant servant,
-                              CORBA::Environment &env);
-
-  virtual PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                                       CORBA::Environment &env);
-
-  virtual void activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                          PortableServer::Servant p_servant,
-                                          CORBA::Environment &env);
-
-  virtual void deactivate_object_i (const PortableServer::ObjectId &oid,
-                                    CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr create_reference_i (const char *intf,
-                                                CORBA::Environment &env);
-
-  virtual PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
-                                                     CORBA::Environment &env);
-
-  virtual PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
-                                                   CORBA::Environment &env);
-
-  virtual CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
-                                               CORBA::Environment &env);
-
-  virtual ACE_Lock &lock (void);
-
-  virtual TAO_POA_Policies &policies (void);
-
-  virtual TAO_Object_Table &active_object_map (void);
-
-  virtual void delete_child (const String &child,
-                             CORBA::Environment &env);
-
-  virtual void delete_child_i (const String &child,
-                               CORBA::Environment &env);
-
-  virtual String complete_name (void);
-
-  virtual void set_complete_name (void);
-
-  virtual int leaf_poa_name (const String &adapter_name,
-                             CORBA::Environment &env);
-
-  virtual void parse_poa_name (const TAO_POA::String &adapter_name,
-                               TAO_POA::String &topmost_poa_name,
-                               TAO_POA::String &tail_poa_name,
-                               CORBA::Environment &env);
-
-  virtual PortableServer::ObjectId *create_object_id (void);
-
-  virtual TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
-
-  virtual int is_poa_generated_id (const PortableServer::ObjectId &id);
-
-  virtual int is_poa_generated_key (const TAO_ObjectKey &key);
-
-  virtual int parse_key_permanent_id (const TAO_ObjectKey &key,
-                                      String &poa_name,
-                                      PortableServer::ObjectId_out id,
-                                      CORBA::Boolean &persistent,
-                                      TAO_Temporary_Creation_Time &poa_creation_time);
-
-  virtual int parse_key_temporary_id (const TAO_ObjectKey &key,
-                                      String &poa_name,
-                                      PortableServer::ObjectId_out id,
-                                      CORBA::Boolean &persistent,
-                                      TAO_Temporary_Creation_Time &poa_creation_time);
-
-  virtual int parse_key (const TAO_ObjectKey &key,
-                         String &poa_name,
-                         PortableServer::ObjectId_out id,
-                         CORBA::Boolean &persistent,
-                         TAO_Temporary_Creation_Time &poa_creation_time,
-                         int temporary_id);
-
-  virtual int rfind (const TAO_ObjectKey &key,
-                     char c, 
-                     int pos = TAO_POA::String::npos) const;
-
-// Should really be protected, but some compilers complain
-public:
-  enum LOCATION_RESULT 
-  {
-    FOUND,
-    DEFAULT_SERVANT,
-    SERVANT_MANAGER,
-    NOT_FOUND
-  };
-
-protected:
-  virtual LOCATION_RESULT locate_servant_i (const TAO_ObjectKey &key,
-                                            PortableServer::Servant &servant,
-                                            CORBA::Environment &env);
-
-  virtual PortableServer::Servant locate_poa_and_servant_i (const TAO_ObjectKey &key,
-                                                            const char *operation,
-                                                            PortableServer::ObjectId_out id,
-                                                            TAO_POA *&poa_impl,
-                                                            CORBA::Environment &env);
-
-  virtual TAO_POA *locate_poa_i (const TAO_ObjectKey &key,
-                                 PortableServer::ObjectId_out id,
-                                 CORBA::Environment &env);
-
-  virtual void dispatch_servant_i (const TAO_ObjectKey &key,
-                                   CORBA::ServerRequest &req,
-                                   void *context,
-                                   CORBA::Environment &env);
-
-  virtual void pre_invoke (const TAO_ObjectKey &key,
-                           const PortableServer::ObjectId &id,
-                           PortableServer::Servant servant,
-                           TAO_POA_Current *poa_current,
-                           CORBA::Environment &env);
-
-  virtual void post_invoke (PortableServer::Servant servant,
-                            const char *operation,
-                            TAO_POA_Current *poa_current,
-                            CORBA::Environment &env);
-
-  virtual CORBA::Boolean persistent (void);
-
-  virtual const TAO_Creation_Time &creation_time (void);
-
-  virtual char object_key_type (void);
-
-  static char persistent_key_type (void);
-
-  static char transient_key_type (void);
-  
-  static CORBA::ULong object_key_type_length (void);
-
-  String name_;
-
-  String complete_name_;
-
-  TAO_POA_Manager &poa_manager_;
-
-  TAO_POA_Policies policies_;
-
-  TAO_POA *parent_;
-
-  TAO_Object_Table *active_object_map_;
-
-  int delete_active_object_map_;
-
-  PortableServer::AdapterActivator_var adapter_activator_;
-
-  PortableServer::ServantActivator_var servant_activator_;
-
-  PortableServer::ServantLocator_var servant_locator_;
-
-  PortableServer::Servant default_servant_;
-
-  typedef ACE_Map_Manager<String, TAO_POA *, ACE_Null_Mutex> CHILDREN;
-
-  CHILDREN children_;
-
-  ACE_Lock_Adapter<ACE_Null_Mutex> lock_;
-
-  int closing_down_;
-
-  CORBA::ULong counter_;
-
-  TAO_Creation_Time creation_time_;
-
-  static const int max_space_required_for_ulong;
-};
-
-class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager
-{
-  friend class TAO_POA;
-
-public:
-  enum Processing_State
-  {
-    ACTIVE,
-    DISCARDING,
-    HOLDING,
-    INACTIVE,
-    UNKNOWN
-  };
-
-  virtual void activate (CORBA::Environment &env);
-
-  virtual void hold_requests (CORBA::Boolean wait_for_completion,
-                              CORBA::Environment &env);
-
-  virtual void discard_requests (CORBA::Boolean wait_for_completion,
-                                 CORBA::Environment &env);
-
-  virtual void deactivate (CORBA::Boolean etherealize_objects,
-                           CORBA::Boolean wait_for_completion,
-                           CORBA::Environment &env);
-
-  TAO_POA_Manager (void);
-
-  virtual TAO_POA_Manager *clone (void);
-
-  virtual ~TAO_POA_Manager (void);
-
-  virtual Processing_State state (CORBA::Environment &env);
-
-protected:
-
-  virtual ACE_Lock &lock (void);
-
-  virtual void remove_poa (TAO_POA *poa,
-                           CORBA::Environment &env);
-
-  virtual void remove_poa_i (TAO_POA *poa,
-                             CORBA::Environment &env);
-
-  virtual void register_poa (TAO_POA *poa,
-                             CORBA::Environment &env);
-
-  virtual void register_poa_i (TAO_POA *poa,
-                               CORBA::Environment &env);
-
-  Processing_State state_;
-
-  int closing_down_;
-
-  ACE_Lock_Adapter<ACE_Null_Mutex> lock_;
-
-  typedef ACE_Unbounded_Set<TAO_POA *> POA_COLLECTION;
-
-  POA_COLLECTION poa_collection_;
-};
-
-class TAO_Export TAO_Adapter_Activator : public POA_PortableServer::AdapterActivator
-{
-public:
-
-  virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                          const char *name,
-                                          CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Strategy_POA : public TAO_POA
-{
-public:
-
-  TAO_Strategy_POA (const String &adapter_name,
-                    TAO_POA_Manager &poa_manager,
-                    const TAO_POA_Policies &policies,
-                    TAO_POA *parent,
-                    CORBA::Environment &env);
-
-  TAO_Strategy_POA (const String &adapter_name,
-                    TAO_POA_Manager &poa_manager,
-                    const TAO_POA_Policies &policies,
-                    TAO_POA *parent,
-                    TAO_Object_Table &active_object_map,
-                    CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const String &adapter_name,
-                          TAO_POA_Manager &poa_manager,
-                          const TAO_POA_Policies &policies,
-                          TAO_POA *parent,
-                          CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const String &adapter_name,
-                          TAO_POA_Manager &poa_manager,
-                          const TAO_POA_Policies &policies,
-                          TAO_POA *parent,
-                          TAO_Object_Table &active_object_map,
-                          CORBA::Environment &env);
-
-  virtual ~TAO_Strategy_POA (void);
-
-protected:
-
-  virtual ACE_Lock &lock (void);
-
-  ACE_Lock *lock_;
-
-  typedef TAO_Strategy_POA SELF;
-};
-
-class TAO_Export TAO_Strategy_POA_Manager : public TAO_POA_Manager
-{
-public:
-
-  TAO_Strategy_POA_Manager (void);
-
-  virtual TAO_POA_Manager *clone (void);
-
-  virtual ~TAO_Strategy_POA_Manager (void);
-
-protected:
-
-  virtual ACE_Lock &lock (void);
-
-  ACE_Lock *lock_;
-
-  typedef TAO_Strategy_POA_Manager SELF;
-};
-
-class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
-{
-  // = TITLE
-  //
-  // Implementation of the PortableServer::Current object.
-  //
-  // = DESCRIPTION
-  //
-  // Objects of this class hold state information regarding the
-  // current POA invocation.  Savvy readers will notice that this
-  // contains substantially more methods than the POA spec shows; they
-  // exist because the ORB either (a) needs them or (b) finds them
-  // useful for implementing a more efficient ORB.
-  //
-  // The intent is that instances of this class are held in
-  // Thread-Specific Storage so that upcalls can get context
-  // information regarding their invocation.  The POA itself must
-  // insure that all <set_*> operations are performed in the execution
-  // thread so that the proper <TAO_POA_Current> pointer is obtained
-  // from TSS.
-
-public:
-  // = Specification-mandated methods
-
-  virtual PortableServer::POA_ptr get_POA (CORBA::Environment &env);
-  // Return pointer to the invoking POA.  Raises the
-  // <CORBA::NoContext> exception.
-
-  virtual PortableServer::ObjectId *get_object_id (CORBA::Environment &env);
-  // Return pointer to the object id through which this was invoked.
-  // This may be necessary in cases where a <Servant> is serving under
-  // the guise of multiple object ids.  This has _out semantics Raises
-  // the <CORBA::NoContext> exception.
-
-  // = TAO Extensions
-
-  virtual void clear (void);
-  // Clear any prior settings made.  This will make things which can
-  // throw the <CORBA::NoContext> exception raise it if invoked
-  // without a corresponding <set_*> operation.
-
-  virtual int context_is_valid (void);
-  // Returns non-zero if the context is valid, i.e., if it would be
-  // impossible for a <CORBA::NoContext> exception to be raised.
-
-  virtual void POA_impl (TAO_POA *impl);
-  // Set the POA implementation.
-
-  virtual TAO_POA *POA_impl (void) const;
-  // Get the POA imeplemantation
-
-  virtual void object_id (const PortableServer::ObjectId &id);
-  // Set the object ID.
-
-  virtual const PortableServer::ObjectId &object_id (void) const;
-  // Get the object ID.
-
-  virtual void object_key (const TAO_ObjectKey &key);
-  // Set the object key.
-
-  virtual const TAO_ObjectKey &object_key (void) const;
-  // Get the object key.
-
-  virtual void servant (PortableServer::Servant servant);
-  // Set the servant for the current upcall.
-
-  virtual PortableServer::Servant servant (void) const;
-  // Get the servant for the current upcall.
-
-  virtual int in_upcall (void) const;
-  // Get whether we're in an upcall (non-zero is yes).
-
-  virtual PortableServer::ServantLocator::Cookie locator_cookie (void) const;
-  // Get the Servant Locator's cookie
-
-  virtual void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
-  // Set the Servant Locator's cookie
-
-  TAO_POA_Current (void);
-  // Constructor
-
-  TAO_POA_Current (TAO_POA *impl,
-                   const TAO_ObjectKey &key,
-                   const PortableServer::ObjectId &id,
-                   PortableServer::Servant servant);
-  // Convenience constructor combining construction & initialization.
-
-  virtual ~TAO_POA_Current (void);
-  // Destructor
-
-private:
-  TAO_POA *poa_impl_;
-  // The POA implementation invoking an upcall
-
-  const PortableServer::ObjectId *object_id_;
-  // The object ID of the current context.
-
-  const TAO_ObjectKey *object_key_;
-  // The object key of the current context.
-
-  PortableServer::ServantLocator::Cookie cookie_;
-  // Servant Locator's cookie
-
-  PortableServer::Servant servant_;
-  // The servant for the current upcall.
-
-  // = Hidden because we don't allow these
-  TAO_POA_Current (const TAO_POA_Current &);
-  void operator= (const TAO_POA_Current &);
-};
-
-#endif /* POA_H */
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
deleted file mode 100644
index e238c9fde54..00000000000
--- a/TAO/tao/POAC.cpp
+++ /dev/null
@@ -1,2050 +0,0 @@
-// $Id$
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/corba.h"
-#include "POAC.h"
-#include "POAS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "POAC.i"
-#endif // !defined INLINE
-
-static const CORBA::Long _oc_PortableServer_Identifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64656e74, 0x69666965, 0x723a312e, 0x30000000,  // repository ID = IDL:PortableServer/Identifier:1.0
-  11, 0x4964656e, 0x74696669, 0x65720000,  // name = Identifier
-  CORBA::tk_string,
-  0, // string length
-};
-static CORBA::TypeCode _tc__tc_PortableServer_Identifier (CORBA::tk_alias, sizeof (_oc_PortableServer_Identifier), (char *) &_oc_PortableServer_Identifier, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_Identifier = &_tc__tc_PortableServer_Identifier;
-
-static const CORBA::Long _oc_PortableServer_RepositoryId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f52, 0x65706f73, 0x69746f72, 0x7949643a, 0x312e3000,  // repository ID = IDL:PortableServer/RepositoryId:1.0
-  13, 0x5265706f, 0x7369746f, 0x72794964, 0x0,  // name = RepositoryId
-  CORBA::tk_string,
-  0, // string length
-};
-static CORBA::TypeCode _tc__tc_PortableServer_RepositoryId (CORBA::tk_alias, sizeof (_oc_PortableServer_RepositoryId), (char *) &_oc_PortableServer_RepositoryId, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_RepositoryId = &_tc__tc_PortableServer_RepositoryId;
-
-PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_duplicate (PortableServer::CurrentBase_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::CurrentBase::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/CurrentBase:1.0", env))
-    return PortableServer::CurrentBase::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::CurrentBase_ptr new_obj =
-      new PortableServer::CurrentBase (obj->_get_parent ());
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::CurrentBase::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/CurrentBase:1.0");
-  return new POA_PortableServer::_tao_collocated_CurrentBase(
-      ACE_reinterpret_cast(POA_PortableServer::CurrentBase_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::CurrentBase::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::CurrentBase::_nil ();
-    }
-  return PortableServer::CurrentBase::_narrow (objref, env);
-}
-
-CORBA::Boolean PortableServer::CurrentBase::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_CurrentBase[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f43, 0x75727265, 0x6e744261, 0x73653a31, 0x2e300000,  // repository ID = IDL:PortableServer/CurrentBase:1.0
-  12, 0x43757272, 0x656e7442, 0x61736500,  // name = CurrentBase,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_CurrentBase (CORBA::tk_objref, sizeof (_oc_PortableServer_CurrentBase), (char *) &_oc_PortableServer_CurrentBase, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_CurrentBase = &_tc__tc_PortableServer_CurrentBase;
-
-PortableServer::Policy_ptr PortableServer::Policy::_duplicate (PortableServer::Policy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::Policy_ptr PortableServer::Policy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::Policy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/Policy:1.0", env))
-    return PortableServer::Policy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::Policy_ptr new_obj = new PortableServer::Policy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Policy:1.0");
-  return new POA_PortableServer::_tao_collocated_Policy(
-      ACE_reinterpret_cast(POA_PortableServer::Policy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::Policy_ptr PortableServer::Policy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::Policy::_nil ();
-    }
-  return PortableServer::Policy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data PortableServer_Policy_copy_paramdata [] =
-{
-  {PortableServer::_tc_Policy, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_Policy_copy_calldata =
-{"copy", 1, 1, PortableServer_Policy_copy_paramdata, 0, 0};
-
-PortableServer::Policy_ptr  PortableServer::Policy::copy (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return PortableServer::Policy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &PortableServer_Policy_copy_calldata, &retval);
-  return PortableServer::Policy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_Policy_destroy_calldata =
-{"destroy", 1, 1, PortableServer_Policy_destroy_paramdata, 0, 0};
-
-void  PortableServer::Policy::destroy (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &PortableServer_Policy_destroy_calldata, 0);
-  return; // no value
-
-}
-
-CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_Policy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-  7, 0x506f6c69, 0x63790000,  // name = Policy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_Policy (CORBA::tk_objref, sizeof (_oc_PortableServer_Policy), (char *) &_oc_PortableServer_Policy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_Policy = &_tc__tc_PortableServer_Policy;
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CS_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY_CS_
-
-static const CORBA::Long _oc_PortableServer__tao_seq_Policy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-    7, 0x506f6c69, 0x63790000,  // name = Policy,
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer__tao_seq_Policy (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Policy), (char *) &_oc_PortableServer__tao_seq_Policy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Policy = &_tc__tc_PortableServer__tao_seq_Policy;
-
-
-#endif // end #if !defined
-
-static const CORBA::Long _oc_PortableServer_PolicyList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x794c6973, 0x743a312e, 0x30000000,  // repository ID = IDL:PortableServer/PolicyList:1.0
-  11, 0x506f6c69, 0x63794c69, 0x73740000,  // name = PolicyList
-  CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-    7, 0x506f6c69, 0x63790000,  // name = Policy,
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_PolicyList (CORBA::tk_alias, sizeof (_oc_PortableServer_PolicyList), (char *) &_oc_PortableServer_PolicyList, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_PolicyList = &_tc__tc_PortableServer_PolicyList;
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CS_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET_CS_
-
-static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *) &_oc_PortableServer__tao_seq_Octet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Octet = &_tc__tc_PortableServer__tao_seq_Octet;
-
-
-#endif // end #if !defined
-
-static const CORBA::Long _oc_PortableServer_ObjectId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f4f, 0x626a6563, 0x7449643a, 0x312e3000,  // repository ID = IDL:PortableServer/ObjectId:1.0
-  9, 0x4f626a65, 0x63744964, 0x0,  // name = ObjectId
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc__tc_PortableServer_ObjectId;
-
-// copy constructor
-PortableServer::ForwardRequest::ForwardRequest(const PortableServer::ForwardRequest &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-    this->forward_reference = _tao_excp.forward_reference;
-}
-
-// assignment operator
-PortableServer::ForwardRequest&
-PortableServer::ForwardRequest::operator= (const PortableServer::ForwardRequest &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  this->forward_reference = _tao_excp.forward_reference;
-  return *this;
-}
-
-// special constructor
-PortableServer::ForwardRequest::ForwardRequest(const CORBA::Object_ptr &_tao_forward_reference)
-        : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::_tc_ForwardRequest))
-{
-    this->forward_reference = _tao_forward_reference;
-}
-
-// narrow
-PortableServer::ForwardRequest_ptr
-PortableServer::ForwardRequest::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
-{
-  0, // byte order
-  38, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f46, 0x6f727761, 0x72645265, 0x71756573, 0x743a312e, 0x30000000,  // repository ID = IDL:PortableServer/ForwardRequest:1.0
-  15, 0x466f7277, 0x61726452, 0x65717565, 0x73740000,  // name = ForwardRequest
-  1, // member count
-    18, 0x666f7277, 0x6172645f, 0x72656665, 0x72656e63, 0x65000000,  // name = forward_reference
-    };
-static CORBA::TypeCode _tc__tc_PortableServer_ForwardRequest (CORBA::tk_struct, sizeof (_oc_PortableServer_ForwardRequest), (char *) &_oc_PortableServer_ForwardRequest, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ForwardRequest = &_tc__tc_PortableServer_ForwardRequest;
-
-
-static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f54, 0x68726561, 0x64506f6c, 0x69637956, 0x616c7565, 0x3a312e30, 0x0,  // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0
-  18, 0x54687265, 0x6164506f, 0x6c696379, 0x56616c75, 0x65000000,  // name = ThreadPolicyValue
-  2, // member count
-    15, 0x4f52425f, 0x4354524c, 0x5f4d4f44, 0x454c0000,  // name = ORB_CTRL_MODEL
-    20, 0x53494e47, 0x4c455f54, 0x48524541, 0x445f4d4f, 0x44454c00,  // name = SINGLE_THREAD_MODEL
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *) &_oc_PortableServer_ThreadPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicyValue = &_tc__tc_PortableServer_ThreadPolicyValue;
-
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ThreadPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ThreadPolicy:1.0", env))
-    return PortableServer::ThreadPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::ThreadPolicy_ptr new_obj = new PortableServer::ThreadPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ThreadPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ThreadPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_ThreadPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ThreadPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ThreadPolicy::_nil ();
-    }
-  return PortableServer::ThreadPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0};
-
-PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::ThreadPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_ThreadPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f54, 0x68726561, 0x64506f6c, 0x6963793a, 0x312e3000,  // repository ID = IDL:PortableServer/ThreadPolicy:1.0
-  13, 0x54687265, 0x6164506f, 0x6c696379, 0x0,  // name = ThreadPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ThreadPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ThreadPolicy), (char *) &_oc_PortableServer_ThreadPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicy = &_tc__tc_PortableServer_ThreadPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f4c, 0x69666573, 0x70616e50, 0x6f6c6963, 0x7956616c, 0x75653a31, 0x2e300000,  // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0
-  20, 0x4c696665, 0x7370616e, 0x506f6c69, 0x63795661, 0x6c756500,  // name = LifespanPolicyValue
-  2, // member count
-    10, 0x5452414e, 0x5349454e, 0x54000000,  // name = TRANSIENT
-    11, 0x50455253, 0x49535445, 0x4e540000,  // name = PERSISTENT
-};
-static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *) &_oc_PortableServer_LifespanPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc__tc_PortableServer_LifespanPolicyValue;
-
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::LifespanPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/LifespanPolicy:1.0", env))
-    return PortableServer::LifespanPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::LifespanPolicy_ptr new_obj = new PortableServer::LifespanPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::LifespanPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/LifespanPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_LifespanPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::LifespanPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::LifespanPolicy::_nil ();
-    }
-  return PortableServer::LifespanPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0};
-
-PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::LifespanPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_LifespanPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f4c, 0x69666573, 0x70616e50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/LifespanPolicy:1.0
-  15, 0x4c696665, 0x7370616e, 0x506f6c69, 0x63790000,  // name = LifespanPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_LifespanPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_LifespanPolicy), (char *) &_oc_PortableServer_LifespanPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicy = &_tc__tc_PortableServer_LifespanPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64556e69, 0x7175656e, 0x65737350, 0x6f6c6963, 0x7956616c, 0x75653a31, 0x2e300000,  // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0
-  24, 0x4964556e, 0x69717565, 0x6e657373, 0x506f6c69, 0x63795661, 0x6c756500,  // name = IdUniquenessPolicyValue
-  2, // member count
-    10, 0x554e4951, 0x55455f49, 0x44000000,  // name = UNIQUE_ID
-    12, 0x4d554c54, 0x49504c45, 0x5f494400,  // name = MULTIPLE_ID
-};
-static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *) &_oc_PortableServer_IdUniquenessPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicyValue = &_tc__tc_PortableServer_IdUniquenessPolicyValue;
-
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/IdUniquenessPolicy:1.0", env))
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::IdUniquenessPolicy_ptr new_obj = new PortableServer::IdUniquenessPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::IdUniquenessPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdUniquenessPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::IdUniquenessPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::IdUniquenessPolicy::_nil ();
-    }
-  return PortableServer::IdUniquenessPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0};
-
-PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::IdUniquenessPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64556e69, 0x7175656e, 0x65737350, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/IdUniquenessPolicy:1.0
-  19, 0x4964556e, 0x69717565, 0x6e657373, 0x506f6c69, 0x63790000,  // name = IdUniquenessPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_IdUniquenessPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *) &_oc_PortableServer_IdUniquenessPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicy = &_tc__tc_PortableServer_IdUniquenessPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64417373, 0x69676e6d, 0x656e7450, 0x6f6c6963, 0x7956616c, 0x75653a31, 0x2e300000,  // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0
-  24, 0x49644173, 0x7369676e, 0x6d656e74, 0x506f6c69, 0x63795661, 0x6c756500,  // name = IdAssignmentPolicyValue
-  2, // member count
-    8, 0x55534552, 0x5f494400,  // name = USER_ID
-    10, 0x53595354, 0x454d5f49, 0x44000000,  // name = SYSTEM_ID
-};
-static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *) &_oc_PortableServer_IdAssignmentPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicyValue = &_tc__tc_PortableServer_IdAssignmentPolicyValue;
-
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/IdAssignmentPolicy:1.0", env))
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::IdAssignmentPolicy_ptr new_obj = new PortableServer::IdAssignmentPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::IdAssignmentPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdAssignmentPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::IdAssignmentPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::IdAssignmentPolicy::_nil ();
-    }
-  return PortableServer::IdAssignmentPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0};
-
-PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::IdAssignmentPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64417373, 0x69676e6d, 0x656e7450, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/IdAssignmentPolicy:1.0
-  19, 0x49644173, 0x7369676e, 0x6d656e74, 0x506f6c69, 0x63790000,  // name = IdAssignmentPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_IdAssignmentPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *) &_oc_PortableServer_IdAssignmentPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc__tc_PortableServer_IdAssignmentPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  53, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x6d706c69, 0x63697441, 0x63746976, 0x6174696f, 0x6e506f6c, 0x69637956, 0x616c7565, 0x3a312e30, 0x0,  // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0
-  30, 0x496d706c, 0x69636974, 0x41637469, 0x76617469, 0x6f6e506f, 0x6c696379, 0x56616c75, 0x65000000,  // name = ImplicitActivationPolicyValue
-  2, // member count
-    20, 0x494d504c, 0x49434954, 0x5f414354, 0x49564154, 0x494f4e00,  // name = IMPLICIT_ACTIVATION
-    23, 0x4e4f5f49, 0x4d504c49, 0x4349545f, 0x41435449, 0x56415449, 0x4f4e0000,  // name = NO_IMPLICIT_ACTIVATION
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue), (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc__tc_PortableServer_ImplicitActivationPolicyValue;
-
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ImplicitActivationPolicy:1.0", env))
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::ImplicitActivationPolicy_ptr new_obj = new PortableServer::ImplicitActivationPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ImplicitActivationPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ImplicitActivationPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ImplicitActivationPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ImplicitActivationPolicy::_nil ();
-    }
-  return PortableServer::ImplicitActivationPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0};
-
-PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::ImplicitActivationPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x6d706c69, 0x63697441, 0x63746976, 0x6174696f, 0x6e506f6c, 0x6963793a, 0x312e3000,  // repository ID = IDL:PortableServer/ImplicitActivationPolicy:1.0
-  25, 0x496d706c, 0x69636974, 0x41637469, 0x76617469, 0x6f6e506f, 0x6c696379, 0x0,  // name = ImplicitActivationPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ImplicitActivationPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy), (char *) &_oc_PortableServer_ImplicitActivationPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicy = &_tc__tc_PortableServer_ImplicitActivationPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  51, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f53, 0x65727661, 0x6e745265, 0x74656e74, 0x696f6e50, 0x6f6c6963, 0x7956616c, 0x75653a31, 0x2e300000,  // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0
-  28, 0x53657276, 0x616e7452, 0x6574656e, 0x74696f6e, 0x506f6c69, 0x63795661, 0x6c756500,  // name = ServantRetentionPolicyValue
-  2, // member count
-    7, 0x52455441, 0x494e0000,  // name = RETAIN
-    11, 0x4e4f4e5f, 0x52455441, 0x494e0000,  // name = NON_RETAIN
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), (char *) &_oc_PortableServer_ServantRetentionPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc__tc_PortableServer_ServantRetentionPolicyValue;
-
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ServantRetentionPolicy:1.0", env))
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::ServantRetentionPolicy_ptr new_obj = new PortableServer::ServantRetentionPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ServantRetentionPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantRetentionPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ServantRetentionPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ServantRetentionPolicy::_nil ();
-    }
-  return PortableServer::ServantRetentionPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0};
-
-PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::ServantRetentionPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f53, 0x65727661, 0x6e745265, 0x74656e74, 0x696f6e50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/ServantRetentionPolicy:1.0
-  23, 0x53657276, 0x616e7452, 0x6574656e, 0x74696f6e, 0x506f6c69, 0x63790000,  // name = ServantRetentionPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ServantRetentionPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantRetentionPolicy), (char *) &_oc_PortableServer_ServantRetentionPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicy = &_tc__tc_PortableServer_ServantRetentionPolicy;
-
-
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  52, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f52, 0x65717565, 0x73745072, 0x6f636573, 0x73696e67, 0x506f6c69, 0x63795661, 0x6c75653a, 0x312e3000,  // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0
-  29, 0x52657175, 0x65737450, 0x726f6365, 0x7373696e, 0x67506f6c, 0x69637956, 0x616c7565, 0x0,  // name = RequestProcessingPolicyValue
-  3, // member count
-    27, 0x5553455f, 0x41435449, 0x56455f4f, 0x424a4543, 0x545f4d41, 0x505f4f4e, 0x4c590000,  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-    20, 0x5553455f, 0x44454641, 0x554c545f, 0x53455256, 0x414e5400,  // name = USE_DEFAULT_SERVANT
-    20, 0x5553455f, 0x53455256, 0x414e545f, 0x4d414e41, 0x47455200,  // name = USE_SERVANT_MANAGER
-};
-static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue), (char *) &_oc_PortableServer_RequestProcessingPolicyValue, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicyValue = &_tc__tc_PortableServer_RequestProcessingPolicyValue;
-
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/RequestProcessingPolicy:1.0", env))
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::RequestProcessingPolicy_ptr
-    new_obj = new PortableServer::RequestProcessingPolicy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::RequestProcessingPolicy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/RequestProcessingPolicy:1.0");
-  return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::RequestProcessingPolicy::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::RequestProcessingPolicy::_nil ();
-    }
-  return PortableServer::RequestProcessingPolicy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0};
-
-PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env)
-{
-  PortableServer::RequestProcessingPolicyValue retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f52, 0x65717565, 0x73745072, 0x6f636573, 0x73696e67, 0x506f6c69, 0x63793a31, 0x2e300000,  // repository ID = IDL:PortableServer/RequestProcessingPolicy:1.0
-  24, 0x52657175, 0x65737450, 0x726f6365, 0x7373696e, 0x67506f6c, 0x69637900,  // name = RequestProcessingPolicy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_RequestProcessingPolicy (CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy), (char *) &_oc_PortableServer_RequestProcessingPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicy = &_tc__tc_PortableServer_RequestProcessingPolicy;
-
-PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableServer::POAManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::POAManager::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/POAManager:1.0", env))
-    return PortableServer::POAManager::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::POAManager::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::POAManager::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0");
-  return new POA_PortableServer::_tao_collocated_POAManager(
-      ACE_reinterpret_cast(POA_PortableServer::POAManager_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::POAManager_ptr PortableServer::POAManager::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::POAManager::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::POAManager::_nil ();
-    }
-  return PortableServer::POAManager::_narrow (objref, env);
-}
-
-// copy constructor
-PortableServer::POAManager::AdapterInactive::AdapterInactive(const PortableServer::POAManager::AdapterInactive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POAManager::AdapterInactive&
-PortableServer::POAManager::AdapterInactive::operator= (const PortableServer::POAManager::AdapterInactive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POAManager::AdapterInactive_ptr
-PortableServer::POAManager::AdapterInactive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
-{
-  0, // byte order
-  50, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f414d61, 0x6e616765, 0x722f4164, 0x61707465, 0x72496e61, 0x63746976, 0x653a312e, 0x30000000,  // repository ID = IDL:PortableServer/POAManager/AdapterInactive:1.0
-  16, 0x41646170, 0x74657249, 0x6e616374, 0x69766500,  // name = AdapterInactive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POAManager_AdapterInactive (CORBA::tk_struct, sizeof (_oc_PortableServer_POAManager_AdapterInactive), (char *) &_oc_PortableServer_POAManager_AdapterInactive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc__tc_PortableServer_POAManager_AdapterInactive;
-
-CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_POAManager[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f414d61, 0x6e616765, 0x723a312e, 0x30000000,  // repository ID = IDL:PortableServer/POAManager:1.0
-  11, 0x504f414d, 0x616e6167, 0x65720000,  // name = POAManager,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POAManager (CORBA::tk_objref, sizeof (_oc_PortableServer_POAManager), (char *) &_oc_PortableServer_POAManager, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc__tc_PortableServer_POAManager;
-
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicate (PortableServer::AdapterActivator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::AdapterActivator::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/AdapterActivator:1.0", env))
-    return PortableServer::AdapterActivator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::AdapterActivator::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::AdapterActivator::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0");
-  return new POA_PortableServer::_tao_collocated_AdapterActivator(
-      ACE_reinterpret_cast(POA_PortableServer::AdapterActivator_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::AdapterActivator::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::AdapterActivator::_nil ();
-    }
-  return PortableServer::AdapterActivator::_narrow (objref, env);
-}
-
-CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f41, 0x64617074, 0x65724163, 0x74697661, 0x746f723a, 0x312e3000,  // repository ID = IDL:PortableServer/AdapterActivator:1.0
-  17, 0x41646170, 0x74657241, 0x63746976, 0x61746f72, 0x0,  // name = AdapterActivator,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_AdapterActivator (CORBA::tk_objref, sizeof (_oc_PortableServer_AdapterActivator), (char *) &_oc_PortableServer_AdapterActivator, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_AdapterActivator = &_tc__tc_PortableServer_AdapterActivator;
-
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantManager::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ServantManager:1.0", env))
-    return PortableServer::ServantManager::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::ServantManager::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ServantManager::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantManager(
-      ACE_reinterpret_cast(POA_PortableServer::ServantManager_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ServantManager::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ServantManager::_nil ();
-    }
-  return PortableServer::ServantManager::_narrow (objref, env);
-}
-
-CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ServantManager[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f53, 0x65727661, 0x6e744d61, 0x6e616765, 0x723a312e, 0x30000000,  // repository ID = IDL:PortableServer/ServantManager:1.0
-  15, 0x53657276, 0x616e744d, 0x616e6167, 0x65720000,  // name = ServantManager,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ServantManager (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantManager), (char *) &_oc_PortableServer_ServantManager, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc__tc_PortableServer_ServantManager;
-
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantActivator::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ServantActivator:1.0", env))
-    return PortableServer::ServantActivator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::ServantActivator::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ServantActivator::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantActivator(
-      ACE_reinterpret_cast(POA_PortableServer::ServantActivator_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ServantActivator::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ServantActivator::_nil ();
-    }
-  return PortableServer::ServantActivator::_narrow (objref, env);
-}
-
-CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ServantActivator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f53, 0x65727661, 0x6e744163, 0x74697661, 0x746f723a, 0x312e3000,  // repository ID = IDL:PortableServer/ServantActivator:1.0
-  17, 0x53657276, 0x616e7441, 0x63746976, 0x61746f72, 0x0,  // name = ServantActivator,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ServantActivator (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantActivator), (char *) &_oc_PortableServer_ServantActivator, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ServantActivator = &_tc__tc_PortableServer_ServantActivator;
-
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::ServantLocator::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/ServantLocator:1.0", env))
-    return PortableServer::ServantLocator::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::ServantLocator::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::ServantLocator::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0");
-  return new POA_PortableServer::_tao_collocated_ServantLocator(
-      ACE_reinterpret_cast(POA_PortableServer::ServantLocator_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::ServantLocator::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::ServantLocator::_nil ();
-    }
-  return PortableServer::ServantLocator::_narrow (objref, env);
-}
-
-CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_ServantLocator[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f53, 0x65727661, 0x6e744c6f, 0x6361746f, 0x723a312e, 0x30000000,  // repository ID = IDL:PortableServer/ServantLocator:1.0
-  15, 0x53657276, 0x616e744c, 0x6f636174, 0x6f720000,  // name = ServantLocator,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_ServantLocator (CORBA::tk_objref, sizeof (_oc_PortableServer_ServantLocator), (char *) &_oc_PortableServer_ServantLocator, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc__tc_PortableServer_ServantLocator;
-
-PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::POA_ptr PortableServer::POA::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::POA::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/POA:1.0", env))
-    return PortableServer::POA::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    // This can only be colocated
-    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-    return PortableServer::POA::_nil ();
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0");
-  return new POA_PortableServer::_tao_collocated_POA(
-      ACE_reinterpret_cast(POA_PortableServer::POA_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::POA_ptr PortableServer::POA::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::POA::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::POA::_nil ();
-    }
-  return PortableServer::POA::_narrow (objref, env);
-}
-
-// copy constructor
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists(const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::AdapterAlreadyExists&
-PortableServer::POA::AdapterAlreadyExists::operator= (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::AdapterAlreadyExists_ptr
-PortableServer::POA::AdapterAlreadyExists::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
-{
-  0, // byte order
-  48, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f41, 0x64617074, 0x6572416c, 0x72656164, 0x79457869, 0x7374733a, 0x312e3000,  // repository ID = IDL:PortableServer/POA/AdapterAlreadyExists:1.0
-  21, 0x41646170, 0x74657241, 0x6c726561, 0x64794578, 0x69737473, 0x0,  // name = AdapterAlreadyExists
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterAlreadyExists (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists), (char *) &_oc_PortableServer_POA_AdapterAlreadyExists, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc__tc_PortableServer_POA_AdapterAlreadyExists;
-
-// copy constructor
-PortableServer::POA::AdapterInactive::AdapterInactive(const PortableServer::POA::AdapterInactive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::AdapterInactive&
-PortableServer::POA::AdapterInactive::operator= (const PortableServer::POA::AdapterInactive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::AdapterInactive_ptr
-PortableServer::POA::AdapterInactive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] =
-{
-  0, // byte order
-  43, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f41, 0x64617074, 0x6572496e, 0x61637469, 0x76653a31, 0x2e300000,  // repository ID = IDL:PortableServer/POA/AdapterInactive:1.0
-  16, 0x41646170, 0x74657249, 0x6e616374, 0x69766500,  // name = AdapterInactive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterInactive (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *) &_oc_PortableServer_POA_AdapterInactive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterInactive = &_tc__tc_PortableServer_POA_AdapterInactive;
-
-// copy constructor
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent(const PortableServer::POA::AdapterNonExistent &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::AdapterNonExistent&
-PortableServer::POA::AdapterNonExistent::operator= (const PortableServer::POA::AdapterNonExistent &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::AdapterNonExistent_ptr
-PortableServer::POA::AdapterNonExistent::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
-{
-  0, // byte order
-  46, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f41, 0x64617074, 0x65724e6f, 0x6e457869, 0x7374656e, 0x743a312e, 0x30000000,  // repository ID = IDL:PortableServer/POA/AdapterNonExistent:1.0
-  19, 0x41646170, 0x7465724e, 0x6f6e4578, 0x69737465, 0x6e740000,  // name = AdapterNonExistent
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_AdapterNonExistent (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_AdapterNonExistent), (char *) &_oc_PortableServer_POA_AdapterNonExistent, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc__tc_PortableServer_POA_AdapterNonExistent;
-
-// copy constructor
-PortableServer::POA::InvalidPolicy::InvalidPolicy(const PortableServer::POA::InvalidPolicy &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-    this->index = _tao_excp.index;
-}
-
-// assignment operator
-PortableServer::POA::InvalidPolicy&
-PortableServer::POA::InvalidPolicy::operator= (const PortableServer::POA::InvalidPolicy &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  this->index = _tao_excp.index;
-  return *this;
-}
-
-// special constructor
-PortableServer::POA::InvalidPolicy::InvalidPolicy(const CORBA::UShort _tao_index)
-        : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_InvalidPolicy))
-{
-    this->index = _tao_index;
-}
-
-// narrow
-PortableServer::POA::InvalidPolicy_ptr
-PortableServer::POA::InvalidPolicy::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
-{
-  0, // byte order
-  41, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f49, 0x6e76616c, 0x6964506f, 0x6c696379, 0x3a312e30, 0x0,  // repository ID = IDL:PortableServer/POA/InvalidPolicy:1.0
-  14, 0x496e7661, 0x6c696450, 0x6f6c6963, 0x79000000,  // name = InvalidPolicy
-  1, // member count
-    6, 0x696e6465, 0x78000000,  // name = index
-    CORBA::tk_ushort,
-
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_InvalidPolicy (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *) &_oc_PortableServer_POA_InvalidPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc__tc_PortableServer_POA_InvalidPolicy;
-
-// copy constructor
-PortableServer::POA::NoServant::NoServant(const PortableServer::POA::NoServant &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::NoServant&
-PortableServer::POA::NoServant::operator= (const PortableServer::POA::NoServant &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::NoServant_ptr
-PortableServer::POA::NoServant::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
-{
-  0, // byte order
-  37, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f4e, 0x6f536572, 0x76616e74, 0x3a312e30, 0x0,  // repository ID = IDL:PortableServer/POA/NoServant:1.0
-  10, 0x4e6f5365, 0x7276616e, 0x74000000,  // name = NoServant
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_NoServant (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_NoServant), (char *) &_oc_PortableServer_POA_NoServant, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = &_tc__tc_PortableServer_POA_NoServant;
-
-// copy constructor
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive(const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::ObjectAlreadyActive&
-PortableServer::POA::ObjectAlreadyActive::operator= (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::ObjectAlreadyActive_ptr
-PortableServer::POA::ObjectAlreadyActive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
-{
-  0, // byte order
-  47, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f4f, 0x626a6563, 0x74416c72, 0x65616479, 0x41637469, 0x76653a31, 0x2e300000,  // repository ID = IDL:PortableServer/POA/ObjectAlreadyActive:1.0
-  20, 0x4f626a65, 0x6374416c, 0x72656164, 0x79416374, 0x69766500,  // name = ObjectAlreadyActive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectAlreadyActive (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive), (char *) &_oc_PortableServer_POA_ObjectAlreadyActive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc__tc_PortableServer_POA_ObjectAlreadyActive;
-
-// copy constructor
-PortableServer::POA::ObjectNotActive::ObjectNotActive(const PortableServer::POA::ObjectNotActive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::ObjectNotActive&
-PortableServer::POA::ObjectNotActive::operator= (const PortableServer::POA::ObjectNotActive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::ObjectNotActive_ptr
-PortableServer::POA::ObjectNotActive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
-{
-  0, // byte order
-  43, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f4f, 0x626a6563, 0x744e6f74, 0x41637469, 0x76653a31, 0x2e300000,  // repository ID = IDL:PortableServer/POA/ObjectNotActive:1.0
-  16, 0x4f626a65, 0x63744e6f, 0x74416374, 0x69766500,  // name = ObjectNotActive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ObjectNotActive (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_ObjectNotActive), (char *) &_oc_PortableServer_POA_ObjectNotActive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc__tc_PortableServer_POA_ObjectNotActive;
-
-// copy constructor
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive(const PortableServer::POA::ServantAlreadyActive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::ServantAlreadyActive&
-PortableServer::POA::ServantAlreadyActive::operator= (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::ServantAlreadyActive_ptr
-PortableServer::POA::ServantAlreadyActive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
-{
-  0, // byte order
-  48, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f53, 0x65727661, 0x6e74416c, 0x72656164, 0x79416374, 0x6976653a, 0x312e3000,  // repository ID = IDL:PortableServer/POA/ServantAlreadyActive:1.0
-  21, 0x53657276, 0x616e7441, 0x6c726561, 0x64794163, 0x74697665, 0x0,  // name = ServantAlreadyActive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantAlreadyActive (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_ServantAlreadyActive), (char *) &_oc_PortableServer_POA_ServantAlreadyActive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc__tc_PortableServer_POA_ServantAlreadyActive;
-
-// copy constructor
-PortableServer::POA::ServantNotActive::ServantNotActive(const PortableServer::POA::ServantNotActive &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::ServantNotActive&
-PortableServer::POA::ServantNotActive::operator= (const PortableServer::POA::ServantNotActive &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::ServantNotActive_ptr
-PortableServer::POA::ServantNotActive::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
-{
-  0, // byte order
-  44, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f53, 0x65727661, 0x6e744e6f, 0x74416374, 0x6976653a, 0x312e3000,  // repository ID = IDL:PortableServer/POA/ServantNotActive:1.0
-  17, 0x53657276, 0x616e744e, 0x6f744163, 0x74697665, 0x0,  // name = ServantNotActive
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_ServantNotActive (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_ServantNotActive), (char *) &_oc_PortableServer_POA_ServantNotActive, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc__tc_PortableServer_POA_ServantNotActive;
-
-// copy constructor
-PortableServer::POA::WrongAdapter::WrongAdapter(const PortableServer::POA::WrongAdapter &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::WrongAdapter&
-PortableServer::POA::WrongAdapter::operator= (const PortableServer::POA::WrongAdapter &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::WrongAdapter_ptr
-PortableServer::POA::WrongAdapter::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
-{
-  0, // byte order
-  40, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f57, 0x726f6e67, 0x41646170, 0x7465723a, 0x312e3000,  // repository ID = IDL:PortableServer/POA/WrongAdapter:1.0
-  13, 0x57726f6e, 0x67416461, 0x70746572, 0x0,  // name = WrongAdapter
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongAdapter (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_WrongAdapter), (char *) &_oc_PortableServer_POA_WrongAdapter, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc__tc_PortableServer_POA_WrongAdapter;
-
-// copy constructor
-PortableServer::POA::WrongPolicy::WrongPolicy(const PortableServer::POA::WrongPolicy &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::POA::WrongPolicy&
-PortableServer::POA::WrongPolicy::operator= (const PortableServer::POA::WrongPolicy &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::POA::WrongPolicy_ptr
-PortableServer::POA::WrongPolicy::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
-{
-  0, // byte order
-  39, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f412f57, 0x726f6e67, 0x506f6c69, 0x63793a31, 0x2e300000,  // repository ID = IDL:PortableServer/POA/WrongPolicy:1.0
-  12, 0x57726f6e, 0x67506f6c, 0x69637900,  // name = WrongPolicy
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongPolicy (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_WrongPolicy), (char *) &_oc_PortableServer_POA_WrongPolicy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc__tc_PortableServer_POA_WrongPolicy;
-
-CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_POA[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x4f413a31, 0x2e300000,  // repository ID = IDL:PortableServer/POA:1.0
-  4, 0x504f4100,  // name = POA,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_POA (CORBA::tk_objref, sizeof (_oc_PortableServer_POA), (char *) &_oc_PortableServer_POA, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_POA = &_tc__tc_PortableServer_POA;
-
-PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::Current_ptr PortableServer::Current::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::Current::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/Current:1.0", env))
-    return PortableServer::Current::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::Current_ptr
-    new_obj = new PortableServer::Current (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::Current::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Current:1.0");
-  return new POA_PortableServer::_tao_collocated_Current(
-      ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::Current_ptr PortableServer::Current::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return PortableServer::Current::_nil ();
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::Current::_nil ();
-    }
-  return PortableServer::Current::_narrow (objref, env);
-}
-
-// copy constructor
-PortableServer::Current::NoContext::NoContext(const PortableServer::Current::NoContext &_tao_excp)
-        :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp._type ()))
-{
-  }
-
-// assignment operator
-PortableServer::Current::NoContext&
-PortableServer::Current::NoContext::operator= (const PortableServer::Current::NoContext &_tao_excp)
-{
-  this->type_ = CORBA::TypeCode::_duplicate (_tao_excp._type ());
-  return *this;
-}
-
-// narrow
-PortableServer::Current::NoContext_ptr
-PortableServer::Current::NoContext::_narrow(CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
-        return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc);
-  else
-        return 0;
-}
-
-static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
-{
-  0, // byte order
-  41, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f43, 0x75727265, 0x6e742f4e, 0x6f436f6e, 0x74657874, 0x3a312e30, 0x0,  // repository ID = IDL:PortableServer/Current/NoContext:1.0
-  10, 0x4e6f436f, 0x6e746578, 0x74000000,  // name = NoContext
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_PortableServer_Current_NoContext (CORBA::tk_struct, sizeof (_oc_PortableServer_Current_NoContext), (char *) &_oc_PortableServer_Current_NoContext, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc__tc_PortableServer_Current_NoContext;
-
-PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return PortableServer::POA::_nil ();
-}
-
-static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] =
-{
-  {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)}
-};
-
-static const TAO_Call_Data PortableServer_Current_get_object_id_calldata =
-{"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0};
-
-PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env)
-{
-  PortableServer::ObjectId *retval = 0;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &PortableServer_Current_get_object_id_calldata, &retval);
-  return retval;
-
-}
-
-CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_Current[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f43, 0x75727265, 0x6e743a31, 0x2e300000,  // repository ID = IDL:PortableServer/Current:1.0
-  8, 0x43757272, 0x656e7400,  // name = Current,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_Current (CORBA::tk_objref, sizeof (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_Current = &_tc__tc_PortableServer_Current;
-
-char *
-PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_string (id);
-}
-
-CORBA::WChar *
-PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_wstring (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::string_to_ObjectId (const char *id)
-{
-  return TAO_POA::string_to_ObjectId (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
-{
-  return TAO_POA::wstring_to_ObjectId (id);
-}
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
deleted file mode 100644
index 884168a3e81..00000000000
--- a/TAO/tao/POAC.h
+++ /dev/null
@@ -1,2339 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAC.h
-//
-// = DESCRIPTION
-//
-//    POA stubs. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and is not meant to be read.
-//
-// ============================================================================
-
-#if !defined (TAO_IDL_POAC_H)
-#define TAO_IDL_POAC_H
-
-class TAO_ServantBase;
-class TAO_Local_ServantBase;
-class TAO_DynamicImplementation;
-
-class TAO_Export PortableServer{
-public:
-
-  typedef TAO_ServantBase ServantBase;
-  typedef ServantBase *Servant;
-
-  typedef TAO_Local_ServantBase LocalServantBase;
-  typedef TAO_DynamicImplementation DynamicImplementation;
-
-  typedef CORBA::String Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-
-  static CORBA::TypeCode_ptr _tc_Identifier;
-
-  typedef CORBA::String RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-
-  static CORBA::TypeCode_ptr _tc_RepositoryId;
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___PTR_CH_)
-#define _PORTABLESERVER_CURRENTBASE___PTR_CH_
-
-class CurrentBase;
-  typedef CurrentBase *CurrentBase_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___VAR_CH_)
-#define _PORTABLESERVER_CURRENTBASE___VAR_CH_
-
-  class TAO_Export CurrentBase_var
-  {
-  public:
-    CurrentBase_var (void); // default constructor
-    CurrentBase_var (CurrentBase_ptr);
-    CurrentBase_var (const CurrentBase_var &); // copy constructor
-    ~CurrentBase_var (void); // destructor
-
-    CurrentBase_var &operator= (CurrentBase_ptr);
-    CurrentBase_var &operator= (const CurrentBase_var &);
-    CurrentBase_ptr operator-> (void) const;
-
-    operator const CurrentBase_ptr &() const;
-    operator CurrentBase_ptr &();
-    // in, inout, out, _retn
-    CurrentBase_ptr in (void) const;
-    CurrentBase_ptr &inout (void);
-    CurrentBase_ptr &out (void);
-    CurrentBase_ptr _retn (void);
-    CurrentBase_ptr ptr (void) const;
-
-  private:
-    CurrentBase_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___OUT_CH_)
-#define _PORTABLESERVER_CURRENTBASE___OUT_CH_
-
-  class TAO_Export CurrentBase_out
-  {
-  public:
-    CurrentBase_out (CurrentBase_ptr &);
-    CurrentBase_out (CurrentBase_var &);
-    CurrentBase_out (CurrentBase_out &);
-    CurrentBase_out &operator= (CurrentBase_out &);
-    CurrentBase_out &operator= (const CurrentBase_var &);
-    CurrentBase_out &operator= (CurrentBase_ptr);
-    operator CurrentBase_ptr &();
-    CurrentBase_ptr &ptr (void);
-    CurrentBase_ptr operator-> (void);
-
-  private:
-    CurrentBase_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE_CH_)
-#define _PORTABLESERVER_CURRENTBASE_CH_
-
-  class TAO_Export CurrentBase: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static CurrentBase_ptr _duplicate (CurrentBase_ptr obj);
-    static CurrentBase_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static CurrentBase_ptr _nil (void);
-    static CurrentBase_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    CurrentBase (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~CurrentBase (void);
-  private:
-    CurrentBase (const CurrentBase&);
-    void operator= (const CurrentBase&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_CurrentBase;
-
-
-#if !defined (_PORTABLESERVER_POLICY___PTR_CH_)
-#define _PORTABLESERVER_POLICY___PTR_CH_
-
-class Policy;
-  typedef Policy *Policy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___VAR_CH_)
-#define _PORTABLESERVER_POLICY___VAR_CH_
-
-  class TAO_Export Policy_var
-  {
-  public:
-    Policy_var (void); // default constructor
-    Policy_var (Policy_ptr);
-    Policy_var (const Policy_var &); // copy constructor
-    ~Policy_var (void); // destructor
-
-    Policy_var &operator= (Policy_ptr);
-    Policy_var &operator= (const Policy_var &);
-    Policy_ptr operator-> (void) const;
-
-    operator const Policy_ptr &() const;
-    operator Policy_ptr &();
-    // in, inout, out, _retn
-    Policy_ptr in (void) const;
-    Policy_ptr &inout (void);
-    Policy_ptr &out (void);
-    Policy_ptr _retn (void);
-    Policy_ptr ptr (void) const;
-
-  private:
-    Policy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___OUT_CH_)
-#define _PORTABLESERVER_POLICY___OUT_CH_
-
-  class TAO_Export Policy_out
-  {
-  public:
-    Policy_out (Policy_ptr &);
-    Policy_out (Policy_var &);
-    Policy_out (Policy_out &);
-    Policy_out &operator= (Policy_out &);
-    Policy_out &operator= (const Policy_var &);
-    Policy_out &operator= (Policy_ptr);
-    operator Policy_ptr &();
-    Policy_ptr &ptr (void);
-    Policy_ptr operator-> (void);
-
-  private:
-    Policy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY_CH_)
-#define _PORTABLESERVER_POLICY_CH_
-
-  class TAO_Export Policy: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static Policy_ptr _duplicate (Policy_ptr obj);
-    static Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static Policy_ptr _nil (void);
-    static Policy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual Policy_ptr  copy (CORBA::Environment &env);
-    virtual void  destroy (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    Policy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~Policy (void);
-  private:
-    Policy (const Policy&);
-    void operator= (const Policy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_Policy;
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY_CH_
-
-  // *************************************************************
-  // _tao_seq_Policy
-  // *************************************************************
-
-  typedef TAO_Unbounded_Object_Sequence<Policy > _tao_seq_Policy;
-  typedef _tao_seq_Policy* _tao_seq_Policy_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_Policy;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___VAR_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CH_
-
-// *************************************************************
-  // class PortableServer::_tao_seq_Policy_var
-  // *************************************************************
-
-  class TAO_Export _tao_seq_Policy_var
-  {
-  public:
-    _tao_seq_Policy_var (void); // default constructor
-    _tao_seq_Policy_var (_tao_seq_Policy *);
-    _tao_seq_Policy_var (const _tao_seq_Policy_var &); // copy constructor
-    ~_tao_seq_Policy_var (void); // destructor
-
-    _tao_seq_Policy_var &operator= (_tao_seq_Policy *);
-    _tao_seq_Policy_var &operator= (const _tao_seq_Policy_var &);
-    _tao_seq_Policy *operator-> (void);
-    const _tao_seq_Policy *operator-> (void) const;
-
-    operator const _tao_seq_Policy &() const;
-    operator _tao_seq_Policy &();
-    operator _tao_seq_Policy &() const;
-    TAO_Object_Manager <Policy > operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const _tao_seq_Policy &in (void) const;
-    _tao_seq_Policy &inout (void);
-    _tao_seq_Policy *&out (void);
-    _tao_seq_Policy *_retn (void);
-    _tao_seq_Policy *ptr (void) const;
-
-  private:
-    _tao_seq_Policy *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_
-
-  class TAO_Export _tao_seq_Policy_out
-  {
-  public:
-    _tao_seq_Policy_out (_tao_seq_Policy *&);
-    _tao_seq_Policy_out (_tao_seq_Policy_var &);
-    _tao_seq_Policy_out (_tao_seq_Policy_out &);
-    _tao_seq_Policy_out &operator= (_tao_seq_Policy_out &);
-    _tao_seq_Policy_out &operator= (_tao_seq_Policy *);
-    operator _tao_seq_Policy *&();
-    _tao_seq_Policy *&ptr (void);
-    _tao_seq_Policy *operator-> (void);
-    TAO_Object_Manager <Policy > operator[] (CORBA::ULong index);
-
-  private:
-    _tao_seq_Policy *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao_seq_Policy_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef _tao_seq_Policy PolicyList;
-  typedef _tao_seq_Policy_var PolicyList_var;
-  typedef _tao_seq_Policy_out PolicyList_out;
-
-  static CORBA::TypeCode_ptr _tc_PolicyList;
-
-  class POA;
-
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-
-typedef POA *POA_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-
-  class TAO_Export POA_var
-  {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr);
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-
-  private:
-    POA_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-
-  class TAO_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (POA_out &);
-    POA_out &operator= (POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-
-  private:
-    POA_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET_CH_
-
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-
-  typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet;
-  typedef _tao_seq_Octet* _tao_seq_Octet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___VAR_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CH_
-
-// *************************************************************
-  // class PortableServer::_tao_seq_Octet_var
-  // *************************************************************
-
-  class TAO_Export _tao_seq_Octet_var
-  {
-  public:
-    _tao_seq_Octet_var (void); // default constructor
-    _tao_seq_Octet_var (_tao_seq_Octet *);
-    _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-    ~_tao_seq_Octet_var (void); // destructor
-
-    _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-    _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-    _tao_seq_Octet *operator-> (void);
-    const _tao_seq_Octet *operator-> (void) const;
-
-    operator const _tao_seq_Octet &() const;
-    operator _tao_seq_Octet &();
-    operator _tao_seq_Octet &() const;
-    CORBA::Octet &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const _tao_seq_Octet &in (void) const;
-    _tao_seq_Octet &inout (void);
-    _tao_seq_Octet *&out (void);
-    _tao_seq_Octet *_retn (void);
-    _tao_seq_Octet *ptr (void) const;
-
-  private:
-    _tao_seq_Octet *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_
-
-  class TAO_Export _tao_seq_Octet_out
-  {
-  public:
-    _tao_seq_Octet_out (_tao_seq_Octet *&);
-    _tao_seq_Octet_out (_tao_seq_Octet_var &);
-    _tao_seq_Octet_out (_tao_seq_Octet_out &);
-    _tao_seq_Octet_out &operator= (_tao_seq_Octet_out &);
-    _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-    operator _tao_seq_Octet *&();
-    _tao_seq_Octet *&ptr (void);
-    _tao_seq_Octet *operator-> (void);
-    CORBA::Octet &operator[] (CORBA::ULong index);
-
-  private:
-    _tao_seq_Octet *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao_seq_Octet_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef _tao_seq_Octet ObjectId;
-  typedef _tao_seq_Octet_var ObjectId_var;
-  typedef _tao_seq_Octet_out ObjectId_out;
-
-  static CORBA::TypeCode_ptr _tc_ObjectId;
-
-
-#if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST___PTR_CH_
-
-  class ForwardRequest;
-  typedef ForwardRequest *ForwardRequest_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST_CH_
-
-  class TAO_Export ForwardRequest : public CORBA::UserException
-  {
-  public:
-    ForwardRequest (void); // default ctor
-    ForwardRequest (const ForwardRequest &); // copy ctor
-    ~ForwardRequest(void); // dtor
-    ForwardRequest(const CORBA::Object_ptr&);
-    ForwardRequest &operator= (const ForwardRequest &);
-    static ForwardRequest *_narrow (CORBA::Exception *);
-    CORBA::Object_var forward_reference;
-  };
-    static CORBA::TypeCode_ptr _tc_ForwardRequest;
-
-
-#endif // end #if !defined
-
-  enum ThreadPolicyValue
-  {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-  typedef ThreadPolicyValue &ThreadPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___PTR_CH_
-
-class ThreadPolicy;
-  typedef ThreadPolicy *ThreadPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CH_
-
-  class TAO_Export ThreadPolicy_var
-  {
-  public:
-    ThreadPolicy_var (void); // default constructor
-    ThreadPolicy_var (ThreadPolicy_ptr);
-    ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
-    ~ThreadPolicy_var (void); // destructor
-
-    ThreadPolicy_var &operator= (ThreadPolicy_ptr);
-    ThreadPolicy_var &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_ptr operator-> (void) const;
-
-    operator const ThreadPolicy_ptr &() const;
-    operator ThreadPolicy_ptr &();
-    // in, inout, out, _retn
-    ThreadPolicy_ptr in (void) const;
-    ThreadPolicy_ptr &inout (void);
-    ThreadPolicy_ptr &out (void);
-    ThreadPolicy_ptr _retn (void);
-    ThreadPolicy_ptr ptr (void) const;
-
-  private:
-    ThreadPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CH_
-
-  class TAO_Export ThreadPolicy_out
-  {
-  public:
-    ThreadPolicy_out (ThreadPolicy_ptr &);
-    ThreadPolicy_out (ThreadPolicy_var &);
-    ThreadPolicy_out (ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_out &operator= (ThreadPolicy_ptr);
-    operator ThreadPolicy_ptr &();
-    ThreadPolicy_ptr &ptr (void);
-    ThreadPolicy_ptr operator-> (void);
-
-  private:
-    ThreadPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
-#define _PORTABLESERVER_THREADPOLICY_CH_
-
-  class TAO_Export ThreadPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ThreadPolicy_ptr _nil (void);
-    static ThreadPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual ThreadPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ThreadPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ThreadPolicy (void);
-  private:
-    ThreadPolicy (const ThreadPolicy&);
-    void operator= (const ThreadPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ThreadPolicy;
-
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-  typedef LifespanPolicyValue &LifespanPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
-
-class LifespanPolicy;
-  typedef LifespanPolicy *LifespanPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
-
-  class TAO_Export LifespanPolicy_var
-  {
-  public:
-    LifespanPolicy_var (void); // default constructor
-    LifespanPolicy_var (LifespanPolicy_ptr);
-    LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
-    ~LifespanPolicy_var (void); // destructor
-
-    LifespanPolicy_var &operator= (LifespanPolicy_ptr);
-    LifespanPolicy_var &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_ptr operator-> (void) const;
-
-    operator const LifespanPolicy_ptr &() const;
-    operator LifespanPolicy_ptr &();
-    // in, inout, out, _retn
-    LifespanPolicy_ptr in (void) const;
-    LifespanPolicy_ptr &inout (void);
-    LifespanPolicy_ptr &out (void);
-    LifespanPolicy_ptr _retn (void);
-    LifespanPolicy_ptr ptr (void) const;
-
-  private:
-    LifespanPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
-
-  class TAO_Export LifespanPolicy_out
-  {
-  public:
-    LifespanPolicy_out (LifespanPolicy_ptr &);
-    LifespanPolicy_out (LifespanPolicy_var &);
-    LifespanPolicy_out (LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_out &operator= (LifespanPolicy_ptr);
-    operator LifespanPolicy_ptr &();
-    LifespanPolicy_ptr &ptr (void);
-    LifespanPolicy_ptr operator-> (void);
-
-  private:
-    LifespanPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY_CH_
-
-  class TAO_Export LifespanPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static LifespanPolicy_ptr _nil (void);
-    static LifespanPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual LifespanPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    LifespanPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~LifespanPolicy (void);
-  private:
-    LifespanPolicy (const LifespanPolicy&);
-    void operator= (const LifespanPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_LifespanPolicy;
-
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
-
-class IdUniquenessPolicy;
-  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
-
-  class TAO_Export IdUniquenessPolicy_var
-  {
-  public:
-    IdUniquenessPolicy_var (void); // default constructor
-    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr);
-    IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
-    ~IdUniquenessPolicy_var (void); // destructor
-
-    IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
-    IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_ptr operator-> (void) const;
-
-    operator const IdUniquenessPolicy_ptr &() const;
-    operator IdUniquenessPolicy_ptr &();
-    // in, inout, out, _retn
-    IdUniquenessPolicy_ptr in (void) const;
-    IdUniquenessPolicy_ptr &inout (void);
-    IdUniquenessPolicy_ptr &out (void);
-    IdUniquenessPolicy_ptr _retn (void);
-    IdUniquenessPolicy_ptr ptr (void) const;
-
-  private:
-    IdUniquenessPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
-
-  class TAO_Export IdUniquenessPolicy_out
-  {
-  public:
-    IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
-    IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out (IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
-    operator IdUniquenessPolicy_ptr &();
-    IdUniquenessPolicy_ptr &ptr (void);
-    IdUniquenessPolicy_ptr operator-> (void);
-
-  private:
-    IdUniquenessPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-
-  class TAO_Export IdUniquenessPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static IdUniquenessPolicy_ptr _nil (void);
-    static IdUniquenessPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual IdUniquenessPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    IdUniquenessPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~IdUniquenessPolicy (void);
-  private:
-    IdUniquenessPolicy (const IdUniquenessPolicy&);
-    void operator= (const IdUniquenessPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
-
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
-
-class IdAssignmentPolicy;
-  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
-
-  class TAO_Export IdAssignmentPolicy_var
-  {
-  public:
-    IdAssignmentPolicy_var (void); // default constructor
-    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr);
-    IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
-    ~IdAssignmentPolicy_var (void); // destructor
-
-    IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
-    IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_ptr operator-> (void) const;
-
-    operator const IdAssignmentPolicy_ptr &() const;
-    operator IdAssignmentPolicy_ptr &();
-    // in, inout, out, _retn
-    IdAssignmentPolicy_ptr in (void) const;
-    IdAssignmentPolicy_ptr &inout (void);
-    IdAssignmentPolicy_ptr &out (void);
-    IdAssignmentPolicy_ptr _retn (void);
-    IdAssignmentPolicy_ptr ptr (void) const;
-
-  private:
-    IdAssignmentPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
-
-  class TAO_Export IdAssignmentPolicy_out
-  {
-  public:
-    IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
-    IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out (IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
-    operator IdAssignmentPolicy_ptr &();
-    IdAssignmentPolicy_ptr &ptr (void);
-    IdAssignmentPolicy_ptr operator-> (void);
-
-  private:
-    IdAssignmentPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-
-  class TAO_Export IdAssignmentPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static IdAssignmentPolicy_ptr _nil (void);
-    static IdAssignmentPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual IdAssignmentPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    IdAssignmentPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~IdAssignmentPolicy (void);
-  private:
-    IdAssignmentPolicy (const IdAssignmentPolicy&);
-    void operator= (const IdAssignmentPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
-
-  enum ImplicitActivationPolicyValue
-  {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-  typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
-
-class ImplicitActivationPolicy;
-  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
-
-  class TAO_Export ImplicitActivationPolicy_var
-  {
-  public:
-    ImplicitActivationPolicy_var (void); // default constructor
-    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr);
-    ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
-    ~ImplicitActivationPolicy_var (void); // destructor
-
-    ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
-    ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_ptr operator-> (void) const;
-
-    operator const ImplicitActivationPolicy_ptr &() const;
-    operator ImplicitActivationPolicy_ptr &();
-    // in, inout, out, _retn
-    ImplicitActivationPolicy_ptr in (void) const;
-    ImplicitActivationPolicy_ptr &inout (void);
-    ImplicitActivationPolicy_ptr &out (void);
-    ImplicitActivationPolicy_ptr _retn (void);
-    ImplicitActivationPolicy_ptr ptr (void) const;
-
-  private:
-    ImplicitActivationPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
-
-  class TAO_Export ImplicitActivationPolicy_out
-  {
-  public:
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
-    operator ImplicitActivationPolicy_ptr &();
-    ImplicitActivationPolicy_ptr &ptr (void);
-    ImplicitActivationPolicy_ptr operator-> (void);
-
-  private:
-    ImplicitActivationPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
-  class TAO_Export ImplicitActivationPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ImplicitActivationPolicy_ptr _nil (void);
-    static ImplicitActivationPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual ImplicitActivationPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ImplicitActivationPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ImplicitActivationPolicy (void);
-  private:
-    ImplicitActivationPolicy (const ImplicitActivationPolicy&);
-    void operator= (const ImplicitActivationPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
-
-  enum ServantRetentionPolicyValue
-  {
-    RETAIN,
-    NON_RETAIN
-  };
-  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
-
-class ServantRetentionPolicy;
-  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
-
-  class TAO_Export ServantRetentionPolicy_var
-  {
-  public:
-    ServantRetentionPolicy_var (void); // default constructor
-    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr);
-    ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
-    ~ServantRetentionPolicy_var (void); // destructor
-
-    ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
-    ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_ptr operator-> (void) const;
-
-    operator const ServantRetentionPolicy_ptr &() const;
-    operator ServantRetentionPolicy_ptr &();
-    // in, inout, out, _retn
-    ServantRetentionPolicy_ptr in (void) const;
-    ServantRetentionPolicy_ptr &inout (void);
-    ServantRetentionPolicy_ptr &out (void);
-    ServantRetentionPolicy_ptr _retn (void);
-    ServantRetentionPolicy_ptr ptr (void) const;
-
-  private:
-    ServantRetentionPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
-
-  class TAO_Export ServantRetentionPolicy_out
-  {
-  public:
-    ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
-    ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out (ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
-    operator ServantRetentionPolicy_ptr &();
-    ServantRetentionPolicy_ptr &ptr (void);
-    ServantRetentionPolicy_ptr operator-> (void);
-
-  private:
-    ServantRetentionPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
-  class TAO_Export ServantRetentionPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ServantRetentionPolicy_ptr _nil (void);
-    static ServantRetentionPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual ServantRetentionPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ServantRetentionPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ServantRetentionPolicy (void);
-  private:
-    ServantRetentionPolicy (const ServantRetentionPolicy&);
-    void operator= (const ServantRetentionPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
-
-  enum RequestProcessingPolicyValue
-  {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-  typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-  static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
-
-class RequestProcessingPolicy;
-  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
-
-  class TAO_Export RequestProcessingPolicy_var
-  {
-  public:
-    RequestProcessingPolicy_var (void); // default constructor
-    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr);
-    RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
-    ~RequestProcessingPolicy_var (void); // destructor
-
-    RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
-    RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_ptr operator-> (void) const;
-
-    operator const RequestProcessingPolicy_ptr &() const;
-    operator RequestProcessingPolicy_ptr &();
-    // in, inout, out, _retn
-    RequestProcessingPolicy_ptr in (void) const;
-    RequestProcessingPolicy_ptr &inout (void);
-    RequestProcessingPolicy_ptr &out (void);
-    RequestProcessingPolicy_ptr _retn (void);
-    RequestProcessingPolicy_ptr ptr (void) const;
-
-  private:
-    RequestProcessingPolicy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
-
-  class TAO_Export RequestProcessingPolicy_out
-  {
-  public:
-    RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
-    RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out (RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
-    operator RequestProcessingPolicy_ptr &();
-    RequestProcessingPolicy_ptr &ptr (void);
-    RequestProcessingPolicy_ptr operator-> (void);
-
-  private:
-    RequestProcessingPolicy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
-  class TAO_Export RequestProcessingPolicy: public virtual Policy
-  {
-  public:
-    // the static operations
-    static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static RequestProcessingPolicy_ptr _nil (void);
-    static RequestProcessingPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual RequestProcessingPolicyValue value (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    RequestProcessingPolicy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~RequestProcessingPolicy (void);
-  private:
-    RequestProcessingPolicy (const RequestProcessingPolicy&);
-    void operator= (const RequestProcessingPolicy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER___PTR_CH_
-
-class POAManager;
-  typedef POAManager *POAManager_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CH_
-
-  class TAO_Export POAManager_var
-  {
-  public:
-    POAManager_var (void); // default constructor
-    POAManager_var (POAManager_ptr);
-    POAManager_var (const POAManager_var &); // copy constructor
-    ~POAManager_var (void); // destructor
-
-    POAManager_var &operator= (POAManager_ptr);
-    POAManager_var &operator= (const POAManager_var &);
-    POAManager_ptr operator-> (void) const;
-
-    operator const POAManager_ptr &() const;
-    operator POAManager_ptr &();
-    // in, inout, out, _retn
-    POAManager_ptr in (void) const;
-    POAManager_ptr &inout (void);
-    POAManager_ptr &out (void);
-    POAManager_ptr _retn (void);
-    POAManager_ptr ptr (void) const;
-
-  private:
-    POAManager_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CH_
-
-  class TAO_Export POAManager_out
-  {
-  public:
-    POAManager_out (POAManager_ptr &);
-    POAManager_out (POAManager_var &);
-    POAManager_out (POAManager_out &);
-    POAManager_out &operator= (POAManager_out &);
-    POAManager_out &operator= (const POAManager_var &);
-    POAManager_out &operator= (POAManager_ptr);
-    operator POAManager_ptr &();
-    POAManager_ptr &ptr (void);
-    POAManager_ptr operator-> (void);
-
-  private:
-    POAManager_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER_CH_)
-#define _PORTABLESERVER_POAMANAGER_CH_
-
-  class TAO_Export POAManager: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static POAManager_ptr _duplicate (POAManager_ptr obj);
-    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static POAManager_ptr _nil (void);
-    static POAManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_
-
-    class AdapterInactive;
-    typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-
-    class TAO_Export AdapterInactive : public CORBA::UserException
-    {
-    public:
-      AdapterInactive (void); // default ctor
-      AdapterInactive (const AdapterInactive &); // copy ctor
-      ~AdapterInactive(void); // dtor
-      AdapterInactive &operator= (const AdapterInactive &);
-      static AdapterInactive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_AdapterInactive;
-
-
-#endif // end #if !defined
-
-    virtual void  activate (CORBA::Environment &env) = 0;
-    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
-    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
-    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    POAManager (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~POAManager (void);
-  private:
-    POAManager (const POAManager&);
-    void operator= (const POAManager&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_POAManager;
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-
-class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
-
-  class TAO_Export AdapterActivator_var
-  {
-  public:
-    AdapterActivator_var (void); // default constructor
-    AdapterActivator_var (AdapterActivator_ptr);
-    AdapterActivator_var (const AdapterActivator_var &); // copy constructor
-    ~AdapterActivator_var (void); // destructor
-
-    AdapterActivator_var &operator= (AdapterActivator_ptr);
-    AdapterActivator_var &operator= (const AdapterActivator_var &);
-    AdapterActivator_ptr operator-> (void) const;
-
-    operator const AdapterActivator_ptr &() const;
-    operator AdapterActivator_ptr &();
-    // in, inout, out, _retn
-    AdapterActivator_ptr in (void) const;
-    AdapterActivator_ptr &inout (void);
-    AdapterActivator_ptr &out (void);
-    AdapterActivator_ptr _retn (void);
-    AdapterActivator_ptr ptr (void) const;
-
-  private:
-    AdapterActivator_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
-
-  class TAO_Export AdapterActivator_out
-  {
-  public:
-    AdapterActivator_out (AdapterActivator_ptr &);
-    AdapterActivator_out (AdapterActivator_var &);
-    AdapterActivator_out (AdapterActivator_out &);
-    AdapterActivator_out &operator= (AdapterActivator_out &);
-    AdapterActivator_out &operator= (const AdapterActivator_var &);
-    AdapterActivator_out &operator= (AdapterActivator_ptr);
-    operator AdapterActivator_ptr &();
-    AdapterActivator_ptr &ptr (void);
-    AdapterActivator_ptr operator-> (void);
-
-  private:
-    AdapterActivator_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-
-  class TAO_Export AdapterActivator: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static AdapterActivator_ptr _nil (void);
-    static AdapterActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    AdapterActivator (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~AdapterActivator (void);
-  private:
-    AdapterActivator (const AdapterActivator&);
-    void operator= (const AdapterActivator&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_AdapterActivator;
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
-
-class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
-
-  class TAO_Export ServantManager_var
-  {
-  public:
-    ServantManager_var (void); // default constructor
-    ServantManager_var (ServantManager_ptr);
-    ServantManager_var (const ServantManager_var &); // copy constructor
-    ~ServantManager_var (void); // destructor
-
-    ServantManager_var &operator= (ServantManager_ptr);
-    ServantManager_var &operator= (const ServantManager_var &);
-    ServantManager_ptr operator-> (void) const;
-
-    operator const ServantManager_ptr &() const;
-    operator ServantManager_ptr &();
-    // in, inout, out, _retn
-    ServantManager_ptr in (void) const;
-    ServantManager_ptr &inout (void);
-    ServantManager_ptr &out (void);
-    ServantManager_ptr _retn (void);
-    ServantManager_ptr ptr (void) const;
-
-  private:
-    ServantManager_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
-
-  class TAO_Export ServantManager_out
-  {
-  public:
-    ServantManager_out (ServantManager_ptr &);
-    ServantManager_out (ServantManager_var &);
-    ServantManager_out (ServantManager_out &);
-    ServantManager_out &operator= (ServantManager_out &);
-    ServantManager_out &operator= (const ServantManager_var &);
-    ServantManager_out &operator= (ServantManager_ptr);
-    operator ServantManager_ptr &();
-    ServantManager_ptr &ptr (void);
-    ServantManager_ptr operator-> (void);
-
-  private:
-    ServantManager_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER_CH_
-
-  class TAO_Export ServantManager: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ServantManager_ptr _nil (void);
-    static ServantManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ServantManager (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ServantManager (void);
-  private:
-    ServantManager (const ServantManager&);
-    void operator= (const ServantManager&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ServantManager;
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
-
-class ServantActivator;
-  typedef ServantActivator *ServantActivator_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
-
-  class TAO_Export ServantActivator_var
-  {
-  public:
-    ServantActivator_var (void); // default constructor
-    ServantActivator_var (ServantActivator_ptr);
-    ServantActivator_var (const ServantActivator_var &); // copy constructor
-    ~ServantActivator_var (void); // destructor
-
-    ServantActivator_var &operator= (ServantActivator_ptr);
-    ServantActivator_var &operator= (const ServantActivator_var &);
-    ServantActivator_ptr operator-> (void) const;
-
-    operator const ServantActivator_ptr &() const;
-    operator ServantActivator_ptr &();
-    // in, inout, out, _retn
-    ServantActivator_ptr in (void) const;
-    ServantActivator_ptr &inout (void);
-    ServantActivator_ptr &out (void);
-    ServantActivator_ptr _retn (void);
-    ServantActivator_ptr ptr (void) const;
-
-  private:
-    ServantActivator_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
-
-  class TAO_Export ServantActivator_out
-  {
-  public:
-    ServantActivator_out (ServantActivator_ptr &);
-    ServantActivator_out (ServantActivator_var &);
-    ServantActivator_out (ServantActivator_out &);
-    ServantActivator_out &operator= (ServantActivator_out &);
-    ServantActivator_out &operator= (const ServantActivator_var &);
-    ServantActivator_out &operator= (ServantActivator_ptr);
-    operator ServantActivator_ptr &();
-    ServantActivator_ptr &ptr (void);
-    ServantActivator_ptr operator-> (void);
-
-  private:
-    ServantActivator_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-
-  class TAO_Export ServantActivator: public virtual ServantManager
-  {
-  public:
-    // the static operations
-    static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ServantActivator_ptr _nil (void);
-    static ServantActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env) = 0;
-    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ServantActivator (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ServantActivator (void);
-  private:
-    ServantActivator (const ServantActivator&);
-    void operator= (const ServantActivator&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ServantActivator;
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
-
-class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
-
-  class TAO_Export ServantLocator_var
-  {
-  public:
-    ServantLocator_var (void); // default constructor
-    ServantLocator_var (ServantLocator_ptr);
-    ServantLocator_var (const ServantLocator_var &); // copy constructor
-    ~ServantLocator_var (void); // destructor
-
-    ServantLocator_var &operator= (ServantLocator_ptr);
-    ServantLocator_var &operator= (const ServantLocator_var &);
-    ServantLocator_ptr operator-> (void) const;
-
-    operator const ServantLocator_ptr &() const;
-    operator ServantLocator_ptr &();
-    // in, inout, out, _retn
-    ServantLocator_ptr in (void) const;
-    ServantLocator_ptr &inout (void);
-    ServantLocator_ptr &out (void);
-    ServantLocator_ptr _retn (void);
-    ServantLocator_ptr ptr (void) const;
-
-  private:
-    ServantLocator_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
-
-  class TAO_Export ServantLocator_out
-  {
-  public:
-    ServantLocator_out (ServantLocator_ptr &);
-    ServantLocator_out (ServantLocator_var &);
-    ServantLocator_out (ServantLocator_out &);
-    ServantLocator_out &operator= (ServantLocator_out &);
-    ServantLocator_out &operator= (const ServantLocator_var &);
-    ServantLocator_out &operator= (ServantLocator_ptr);
-    operator ServantLocator_ptr &();
-    ServantLocator_ptr &ptr (void);
-    ServantLocator_ptr operator-> (void);
-
-  private:
-    ServantLocator_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
-  class TAO_Export ServantLocator: public virtual ServantManager
-  {
-  public:
-
-    typedef void *Cookie;
-
-    // the static operations
-    static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ServantLocator_ptr _nil (void);
-    static ServantLocator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA::Environment &env) = 0;
-    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    ServantLocator (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~ServantLocator (void);
-  private:
-    ServantLocator (const ServantLocator&);
-    void operator= (const ServantLocator&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ServantLocator;
-
-
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-
-class POA;
-  typedef POA *POA_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-
-  class TAO_Export POA_var
-  {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr);
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-
-  private:
-    POA_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-
-  class TAO_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (POA_out &);
-    POA_out &operator= (POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-
-  private:
-    POA_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_CH_)
-#define _PORTABLESERVER_POA_CH_
-
-  class TAO_Export POA: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static POA_ptr _duplicate (POA_ptr obj);
-    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static POA_ptr _nil (void);
-    static POA_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_
-
-    class AdapterAlreadyExists;
-    typedef AdapterAlreadyExists *AdapterAlreadyExists_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-
-    class TAO_Export AdapterAlreadyExists : public CORBA::UserException
-    {
-    public:
-      AdapterAlreadyExists (void); // default ctor
-      AdapterAlreadyExists (const AdapterAlreadyExists &); // copy ctor
-      ~AdapterAlreadyExists(void); // dtor
-      AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-      static AdapterAlreadyExists *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_AdapterAlreadyExists;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_
-
-    class AdapterInactive;
-    typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POA_ADAPTERINACTIVE_CH_
-
-    class TAO_Export AdapterInactive : public CORBA::UserException
-    {
-    public:
-      AdapterInactive (void); // default ctor
-      AdapterInactive (const AdapterInactive &); // copy ctor
-      ~AdapterInactive(void); // dtor
-      AdapterInactive &operator= (const AdapterInactive &);
-      static AdapterInactive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_AdapterInactive;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_
-
-    class AdapterNonExistent;
-    typedef AdapterNonExistent *AdapterNonExistent_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-
-    class TAO_Export AdapterNonExistent : public CORBA::UserException
-    {
-    public:
-      AdapterNonExistent (void); // default ctor
-      AdapterNonExistent (const AdapterNonExistent &); // copy ctor
-      ~AdapterNonExistent(void); // dtor
-      AdapterNonExistent &operator= (const AdapterNonExistent &);
-      static AdapterNonExistent *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_AdapterNonExistent;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_
-
-    class InvalidPolicy;
-    typedef InvalidPolicy *InvalidPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-
-    class TAO_Export InvalidPolicy : public CORBA::UserException
-    {
-    public:
-      InvalidPolicy (void); // default ctor
-      InvalidPolicy (const InvalidPolicy &); // copy ctor
-      ~InvalidPolicy(void); // dtor
-      InvalidPolicy(const CORBA::UShort);
-      InvalidPolicy &operator= (const InvalidPolicy &);
-      static InvalidPolicy *_narrow (CORBA::Exception *);
-      CORBA::UShort index;
-    };
-        static CORBA::TypeCode_ptr _tc_InvalidPolicy;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_
-
-    class NoServant;
-    typedef NoServant *NoServant_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT_CH_
-
-    class TAO_Export NoServant : public CORBA::UserException
-    {
-    public:
-      NoServant (void); // default ctor
-      NoServant (const NoServant &); // copy ctor
-      ~NoServant(void); // dtor
-      NoServant &operator= (const NoServant &);
-      static NoServant *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_NoServant;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_
-
-    class ObjectAlreadyActive;
-    typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-
-    class TAO_Export ObjectAlreadyActive : public CORBA::UserException
-    {
-    public:
-      ObjectAlreadyActive (void); // default ctor
-      ObjectAlreadyActive (const ObjectAlreadyActive &); // copy ctor
-      ~ObjectAlreadyActive(void); // dtor
-      ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-      static ObjectAlreadyActive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_ObjectAlreadyActive;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_
-
-    class ObjectNotActive;
-    typedef ObjectNotActive *ObjectNotActive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-
-    class TAO_Export ObjectNotActive : public CORBA::UserException
-    {
-    public:
-      ObjectNotActive (void); // default ctor
-      ObjectNotActive (const ObjectNotActive &); // copy ctor
-      ~ObjectNotActive(void); // dtor
-      ObjectNotActive &operator= (const ObjectNotActive &);
-      static ObjectNotActive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_ObjectNotActive;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_
-
-    class ServantAlreadyActive;
-    typedef ServantAlreadyActive *ServantAlreadyActive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-
-    class TAO_Export ServantAlreadyActive : public CORBA::UserException
-    {
-    public:
-      ServantAlreadyActive (void); // default ctor
-      ServantAlreadyActive (const ServantAlreadyActive &); // copy ctor
-      ~ServantAlreadyActive(void); // dtor
-      ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-      static ServantAlreadyActive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_ServantAlreadyActive;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_
-
-    class ServantNotActive;
-    typedef ServantNotActive *ServantNotActive_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-
-    class TAO_Export ServantNotActive : public CORBA::UserException
-    {
-    public:
-      ServantNotActive (void); // default ctor
-      ServantNotActive (const ServantNotActive &); // copy ctor
-      ~ServantNotActive(void); // dtor
-      ServantNotActive &operator= (const ServantNotActive &);
-      static ServantNotActive *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_ServantNotActive;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_
-
-    class WrongAdapter;
-    typedef WrongAdapter *WrongAdapter_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-
-    class TAO_Export WrongAdapter : public CORBA::UserException
-    {
-    public:
-      WrongAdapter (void); // default ctor
-      WrongAdapter (const WrongAdapter &); // copy ctor
-      ~WrongAdapter(void); // dtor
-      WrongAdapter &operator= (const WrongAdapter &);
-      static WrongAdapter *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_WrongAdapter;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_
-
-    class WrongPolicy;
-    typedef WrongPolicy *WrongPolicy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-
-    class TAO_Export WrongPolicy : public CORBA::UserException
-    {
-    public:
-      WrongPolicy (void); // default ctor
-      WrongPolicy (const WrongPolicy &); // copy ctor
-      ~WrongPolicy(void); // dtor
-      WrongPolicy &operator= (const WrongPolicy &);
-      static WrongPolicy *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_WrongPolicy;
-
-
-#endif // end #if !defined
-
-    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const PolicyList &policies, CORBA::Environment &env) = 0;
-    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env) = 0;
-    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
-    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env) = 0;
-    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env) = 0;
-    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env) = 0;
-    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env) = 0;
-    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env) = 0;
-    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env) = 0;
-    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env) = 0;
-    virtual char * the_name (CORBA::Environment &env) = 0;
-    virtual POA_ptr  the_parent (CORBA::Environment &env) = 0;
-    virtual POAManager_ptr  the_POAManager (CORBA::Environment &env) = 0;
-    virtual AdapterActivator_ptr  the_activator (CORBA::Environment &env) = 0;
-    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0;
-    virtual ServantManager_ptr  get_servant_manager (CORBA::Environment &env) = 0;
-    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env) = 0;
-    virtual Servant  get_servant (CORBA::Environment &env) = 0;
-    virtual void  set_servant (Servant p_servant, CORBA::Environment &env) = 0;
-    virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env) = 0;
-    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env) = 0;
-    virtual void  deactivate_object (const ObjectId &oid, CORBA::Environment &env) = 0;
-    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA::Environment &env) = 0;
-    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env) = 0;
-    virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env) = 0;
-    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA::Environment &env) = 0;
-    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env) = 0;
-    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env) = 0;
-    virtual Servant  id_to_servant (const ObjectId &oid, CORBA::Environment &env) = 0;
-    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA::Environment &env) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    POA (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~POA (void);
-  private:
-    POA (const POA&);
-    void operator= (const POA&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_POA;
-
-
-#if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT___PTR_CH_
-
-class Current;
-  typedef Current *Current_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
-#define _PORTABLESERVER_CURRENT___VAR_CH_
-
-  class TAO_Export Current_var
-  {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr);
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-
-  private:
-    Current_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
-#define _PORTABLESERVER_CURRENT___OUT_CH_
-
-  class TAO_Export Current_out
-  {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (Current_out &);
-    Current_out &operator= (Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-
-  private:
-    Current_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT_CH_)
-#define _PORTABLESERVER_CURRENT_CH_
-
-  class TAO_Export Current: public virtual CurrentBase
-  {
-  public:
-    // the static operations
-    static Current_ptr _duplicate (Current_ptr obj);
-    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static Current_ptr _nil (void);
-    static Current_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_
-
-    class NoContext;
-    typedef NoContext *NoContext_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-
-    class TAO_Export NoContext : public CORBA::UserException
-    {
-    public:
-      NoContext (void); // default ctor
-      NoContext (const NoContext &); // copy ctor
-      ~NoContext(void); // dtor
-      NoContext &operator= (const NoContext &);
-      static NoContext *_narrow (CORBA::Exception *);
-    };
-        static CORBA::TypeCode_ptr _tc_NoContext;
-
-
-#endif // end #if !defined
-
-    virtual POA_ptr  get_POA (CORBA::Environment &env);
-    virtual ObjectId * get_object_id (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    Current (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~Current (void);
-  private:
-    Current (const Current&);
-    void operator= (const Current&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_Current;
-
-  static char *ObjectId_to_string (const PortableServer::ObjectId &id);
-  static CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
-  static PortableServer::ObjectId *string_to_ObjectId (const char *id);
-  static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "POAC.i"
-#endif // defined INLINE
-
-#endif /* TAO_IDL_POAC_H */
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
deleted file mode 100644
index 272e6c80df5..00000000000
--- a/TAO/tao/POAC.i
+++ /dev/null
@@ -1,3897 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-PortableServer::CurrentBase::CurrentBase(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::CurrentBase::~CurrentBase (void) // destructor
-{}
-
-ACE_INLINE PortableServer::CurrentBase_ptr
-PortableServer::CurrentBase::_nil (void)
-{
-  return (PortableServer::CurrentBase_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___VAR_CI_)
-#define _PORTABLESERVER_CURRENTBASE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::CurrentBase_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::CurrentBase_var::CurrentBase_var (void) // default constructor
-	: ptr_ (PortableServer::CurrentBase::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::CurrentBase_var::CurrentBase_var (PortableServer::CurrentBase_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::CurrentBase_ptr 
-PortableServer::CurrentBase_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::CurrentBase_var::CurrentBase_var (const PortableServer::CurrentBase_var &p) // copy constructor
-	: ptr_ (PortableServer::CurrentBase::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::CurrentBase_var::~CurrentBase_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::CurrentBase_var &
-PortableServer::CurrentBase_var::operator= (PortableServer::CurrentBase_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::CurrentBase_var &
-PortableServer::CurrentBase_var::operator= (const PortableServer::CurrentBase_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::CurrentBase::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::CurrentBase_var::operator const PortableServer::CurrentBase_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::CurrentBase_var::operator PortableServer::CurrentBase_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr 
-PortableServer::CurrentBase_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr
-PortableServer::CurrentBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr &
-PortableServer::CurrentBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr &
-PortableServer::CurrentBase_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::CurrentBase::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr 
-PortableServer::CurrentBase_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::CurrentBase_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::CurrentBase::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___OUT_CI_)
-#define _PORTABLESERVER_CURRENTBASE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::CurrentBase_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::CurrentBase_out::CurrentBase_out (PortableServer::CurrentBase_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::CurrentBase::_nil ();
-}
-
-ACE_INLINE
-PortableServer::CurrentBase_out::CurrentBase_out (PortableServer::CurrentBase_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::CurrentBase::_nil ();
-}
-
-ACE_INLINE
-PortableServer::CurrentBase_out::CurrentBase_out (PortableServer::CurrentBase_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::CurrentBase_out &
-PortableServer::CurrentBase_out::operator= (PortableServer::CurrentBase_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::CurrentBase_out &
-PortableServer::CurrentBase_out::operator= (const PortableServer::CurrentBase_var &p)
-{
-  this->ptr_ = PortableServer::CurrentBase::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::CurrentBase_out &
-PortableServer::CurrentBase_out::operator= (PortableServer::CurrentBase_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::CurrentBase_out::operator PortableServer::CurrentBase_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr &
-PortableServer::CurrentBase_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::CurrentBase_ptr 
-PortableServer::CurrentBase_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::Policy::Policy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::Policy::~Policy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::Policy_ptr
-PortableServer::Policy::_nil (void)
-{
-  return (PortableServer::Policy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_POLICY___VAR_CI_)
-#define _PORTABLESERVER_POLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Policy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (void) // default constructor
-	: ptr_ (PortableServer::Policy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (PortableServer::Policy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (const PortableServer::Policy_var &p) // copy constructor
-	: ptr_ (PortableServer::Policy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::Policy_var::~Policy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::Policy_var &
-PortableServer::Policy_var::operator= (PortableServer::Policy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_var &
-PortableServer::Policy_var::operator= (const PortableServer::Policy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::Policy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Policy_var::operator const PortableServer::Policy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::Policy_var::operator PortableServer::Policy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr
-PortableServer::Policy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Policy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::Policy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::Policy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___OUT_CI_)
-#define _PORTABLESERVER_POLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Policy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::Policy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Policy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (PortableServer::Policy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (const PortableServer::Policy_var &p)
-{
-  this->ptr_ = PortableServer::Policy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (PortableServer::Policy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Policy_out::operator PortableServer::Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Policy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (PortableServer::_tao_seq_Policy *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (const PortableServer::_tao_seq_Policy_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new PortableServer::_tao_seq_Policy(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::~_tao_seq_Policy_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_var &
-PortableServer::_tao_seq_Policy_var::operator= (PortableServer::_tao_seq_Policy *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_var &
-PortableServer::_tao_seq_Policy_var::operator= (const PortableServer::_tao_seq_Policy_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new PortableServer::_tao_seq_Policy (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator const PortableServer::_tao_seq_Policy &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator PortableServer::_tao_seq_Policy &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator PortableServer::_tao_seq_Policy &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <PortableServer::Policy > 
-PortableServer::_tao_seq_Policy_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Policy &
-PortableServer::_tao_seq_Policy_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy &
-PortableServer::_tao_seq_Policy_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE PortableServer::_tao_seq_Policy *&
-PortableServer::_tao_seq_Policy_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::_retn (void)
-{
-  PortableServer::_tao_seq_Policy *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___OUT_CI_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Policy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_out &
-PortableServer::_tao_seq_Policy_out::operator= (PortableServer::_tao_seq_Policy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_out &
-PortableServer::_tao_seq_Policy_out::operator= (PortableServer::_tao_seq_Policy *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_out::operator PortableServer::_tao_seq_Policy *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *&
-PortableServer::_tao_seq_Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <PortableServer::Policy > 
-PortableServer::_tao_seq_Policy_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CI_)
-#define _PORTABLESERVER_POA___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA::_nil (void)
-{
-  return (PortableServer::POA_ptr)0;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (void) // default constructor
-	: ptr_ (PortableServer::POA::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (PortableServer::POA_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-	: ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (PortableServer::POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CI_)
-#define _PORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_var &p)
-{
-  this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (PortableServer::_tao_seq_Octet *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (const PortableServer::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new PortableServer::_tao_seq_Octet(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_var &
-PortableServer::_tao_seq_Octet_var::operator= (PortableServer::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_var &
-PortableServer::_tao_seq_Octet_var::operator= (const PortableServer::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new PortableServer::_tao_seq_Octet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Octet_var::operator const PortableServer::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Octet_var::operator PortableServer::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Octet_var::operator PortableServer::_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-PortableServer::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Octet &
-PortableServer::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet &
-PortableServer::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE PortableServer::_tao_seq_Octet *&
-PortableServer::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::_retn (void)
-{
-  PortableServer::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___OUT_CI_)
-#define _PORTABLESERVER__TAO_SEQ_OCTET___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_out &
-PortableServer::_tao_seq_Octet_out::operator= (PortableServer::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet_out &
-PortableServer::_tao_seq_Octet_out::operator= (PortableServer::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Octet_out::operator PortableServer::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *&
-PortableServer::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Octet *
-PortableServer::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif // end #if !defined
-
-// *************************************************************
-// Inline operations for exception PortableServer::ForwardRequest
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::ForwardRequest::ForwardRequest (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::_tc_ForwardRequest))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::ForwardRequest::~ForwardRequest (void)
-{
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy::ThreadPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy::~ThreadPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_nil (void)
-{
-  return (PortableServer::ThreadPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CI_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::ThreadPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (PortableServer::ThreadPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr 
-PortableServer::ThreadPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const PortableServer::ThreadPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::ThreadPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (PortableServer::ThreadPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (const PortableServer::ThreadPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ThreadPolicy_var::operator const PortableServer::ThreadPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ThreadPolicy_var::operator PortableServer::ThreadPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr 
-PortableServer::ThreadPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr 
-PortableServer::ThreadPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ThreadPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CI_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (PortableServer::ThreadPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const PortableServer::ThreadPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (PortableServer::ThreadPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ThreadPolicy_out::operator PortableServer::ThreadPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_ptr 
-PortableServer::ThreadPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::LifespanPolicy::LifespanPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy::~LifespanPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_nil (void)
-{
-  return (PortableServer::LifespanPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::LifespanPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (PortableServer::LifespanPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr 
-PortableServer::LifespanPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const PortableServer::LifespanPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::LifespanPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (PortableServer::LifespanPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (const PortableServer::LifespanPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::LifespanPolicy_var::operator const PortableServer::LifespanPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::LifespanPolicy_var::operator PortableServer::LifespanPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr 
-PortableServer::LifespanPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr 
-PortableServer::LifespanPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::LifespanPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (PortableServer::LifespanPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const PortableServer::LifespanPolicy_var &p)
-{
-  this->ptr_ = PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (PortableServer::LifespanPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::LifespanPolicy_out::operator PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_ptr 
-PortableServer::LifespanPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy::IdUniquenessPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_nil (void)
-{
-  return (PortableServer::IdUniquenessPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::IdUniquenessPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (PortableServer::IdUniquenessPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr 
-PortableServer::IdUniquenessPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const PortableServer::IdUniquenessPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (PortableServer::IdUniquenessPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (const PortableServer::IdUniquenessPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::IdUniquenessPolicy_var::operator const PortableServer::IdUniquenessPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::IdUniquenessPolicy_var::operator PortableServer::IdUniquenessPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr 
-PortableServer::IdUniquenessPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr 
-PortableServer::IdUniquenessPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::IdUniquenessPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (PortableServer::IdUniquenessPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const PortableServer::IdUniquenessPolicy_var &p)
-{
-  this->ptr_ = PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (PortableServer::IdUniquenessPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::IdUniquenessPolicy_out::operator PortableServer::IdUniquenessPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_ptr 
-PortableServer::IdUniquenessPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy::IdAssignmentPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_nil (void)
-{
-  return (PortableServer::IdAssignmentPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::IdAssignmentPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (PortableServer::IdAssignmentPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr 
-PortableServer::IdAssignmentPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const PortableServer::IdAssignmentPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (PortableServer::IdAssignmentPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (const PortableServer::IdAssignmentPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::IdAssignmentPolicy_var::operator const PortableServer::IdAssignmentPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::IdAssignmentPolicy_var::operator PortableServer::IdAssignmentPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr 
-PortableServer::IdAssignmentPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr 
-PortableServer::IdAssignmentPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::IdAssignmentPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (PortableServer::IdAssignmentPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const PortableServer::IdAssignmentPolicy_var &p)
-{
-  this->ptr_ = PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (PortableServer::IdAssignmentPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::IdAssignmentPolicy_out::operator PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_ptr 
-PortableServer::IdAssignmentPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_nil (void)
-{
-  return (PortableServer::ImplicitActivationPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::ImplicitActivationPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (PortableServer::ImplicitActivationPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr 
-PortableServer::ImplicitActivationPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (PortableServer::ImplicitActivationPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (const PortableServer::ImplicitActivationPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ImplicitActivationPolicy_var::operator const PortableServer::ImplicitActivationPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ImplicitActivationPolicy_var::operator PortableServer::ImplicitActivationPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr 
-PortableServer::ImplicitActivationPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr 
-PortableServer::ImplicitActivationPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ImplicitActivationPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (PortableServer::ImplicitActivationPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const PortableServer::ImplicitActivationPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (PortableServer::ImplicitActivationPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ImplicitActivationPolicy_out::operator PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr 
-PortableServer::ImplicitActivationPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy::ServantRetentionPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_nil (void)
-{
-  return (PortableServer::ServantRetentionPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::ServantRetentionPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (PortableServer::ServantRetentionPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr 
-PortableServer::ServantRetentionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const PortableServer::ServantRetentionPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (PortableServer::ServantRetentionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (const PortableServer::ServantRetentionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantRetentionPolicy_var::operator const PortableServer::ServantRetentionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ServantRetentionPolicy_var::operator PortableServer::ServantRetentionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr 
-PortableServer::ServantRetentionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr 
-PortableServer::ServantRetentionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantRetentionPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (PortableServer::ServantRetentionPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const PortableServer::ServantRetentionPolicy_var &p)
-{
-  this->ptr_ = PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (PortableServer::ServantRetentionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantRetentionPolicy_out::operator PortableServer::ServantRetentionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_ptr 
-PortableServer::ServantRetentionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy::RequestProcessingPolicy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_nil (void)
-{
-  return (PortableServer::RequestProcessingPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
-	: ptr_ (PortableServer::RequestProcessingPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (PortableServer::RequestProcessingPolicy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr 
-PortableServer::RequestProcessingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const PortableServer::RequestProcessingPolicy_var &p) // copy constructor
-	: ptr_ (PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (PortableServer::RequestProcessingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (const PortableServer::RequestProcessingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::RequestProcessingPolicy_var::operator const PortableServer::RequestProcessingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::RequestProcessingPolicy_var::operator PortableServer::RequestProcessingPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr 
-PortableServer::RequestProcessingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr 
-PortableServer::RequestProcessingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::RequestProcessingPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (PortableServer::RequestProcessingPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const PortableServer::RequestProcessingPolicy_var &p)
-{
-  this->ptr_ = PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (PortableServer::RequestProcessingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::RequestProcessingPolicy_out::operator PortableServer::RequestProcessingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_ptr 
-PortableServer::RequestProcessingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::POAManager::POAManager(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::POAManager::~POAManager (void) // destructor
-{}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager::_nil (void)
-{
-  return (PortableServer::POAManager_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CI_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (void) // default constructor
-	: ptr_ (PortableServer::POAManager::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (PortableServer::POAManager_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POAManager_ptr 
-PortableServer::POAManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (const PortableServer::POAManager_var &p) // copy constructor
-	: ptr_ (PortableServer::POAManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POAManager_var::~POAManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (PortableServer::POAManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (const PortableServer::POAManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::POAManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POAManager_var::operator const PortableServer::POAManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::POAManager_var::operator PortableServer::POAManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr 
-PortableServer::POAManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-PortableServer::POAManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POAManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr 
-PortableServer::POAManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POAManager_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POAManager::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CI_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (PortableServer::POAManager_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const PortableServer::POAManager_var &p)
-{
-  this->ptr_ = PortableServer::POAManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (PortableServer::POAManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POAManager_out::operator PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POAManager_ptr 
-PortableServer::POAManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-// *************************************************************
-// Inline operations for exception PortableServer::POAManager::AdapterInactive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POAManager::_tc_AdapterInactive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator::AdapterActivator(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator::~AdapterActivator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_nil (void)
-{
-  return (PortableServer::AdapterActivator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
-	: ptr_ (PortableServer::AdapterActivator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (PortableServer::AdapterActivator_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr 
-PortableServer::AdapterActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (const PortableServer::AdapterActivator_var &p) // copy constructor
-	: ptr_ (PortableServer::AdapterActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (PortableServer::AdapterActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (const PortableServer::AdapterActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::AdapterActivator_var::operator const PortableServer::AdapterActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::AdapterActivator_var::operator PortableServer::AdapterActivator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr 
-PortableServer::AdapterActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr 
-PortableServer::AdapterActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::AdapterActivator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (PortableServer::AdapterActivator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const PortableServer::AdapterActivator_var &p)
-{
-  this->ptr_ = PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (PortableServer::AdapterActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::AdapterActivator_out::operator PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_ptr 
-PortableServer::AdapterActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantManager::ServantManager(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantManager::~ServantManager (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_nil (void)
-{
-  return (PortableServer::ServantManager_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
-	: ptr_ (PortableServer::ServantManager::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (PortableServer::ServantManager_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantManager_ptr 
-PortableServer::ServantManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (const PortableServer::ServantManager_var &p) // copy constructor
-	: ptr_ (PortableServer::ServantManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (PortableServer::ServantManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (const PortableServer::ServantManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ServantManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantManager_var::operator const PortableServer::ServantManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ServantManager_var::operator PortableServer::ServantManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr 
-PortableServer::ServantManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr 
-PortableServer::ServantManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantManager_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (PortableServer::ServantManager_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const PortableServer::ServantManager_var &p)
-{
-  this->ptr_ = PortableServer::ServantManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (PortableServer::ServantManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantManager_out::operator PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantManager_ptr 
-PortableServer::ServantManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantActivator::ServantActivator(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator::~ServantActivator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_nil (void)
-{
-  return (PortableServer::ServantActivator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
-	: ptr_ (PortableServer::ServantActivator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (PortableServer::ServantActivator_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantActivator_ptr 
-PortableServer::ServantActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (const PortableServer::ServantActivator_var &p) // copy constructor
-	: ptr_ (PortableServer::ServantActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (PortableServer::ServantActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (const PortableServer::ServantActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ServantActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantActivator_var::operator const PortableServer::ServantActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ServantActivator_var::operator PortableServer::ServantActivator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr 
-PortableServer::ServantActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr 
-PortableServer::ServantActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantActivator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (PortableServer::ServantActivator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const PortableServer::ServantActivator_var &p)
-{
-  this->ptr_ = PortableServer::ServantActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (PortableServer::ServantActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantActivator_out::operator PortableServer::ServantActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantActivator_ptr 
-PortableServer::ServantActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::ServantLocator::ServantLocator(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator::~ServantLocator (void) // destructor
-{}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_nil (void)
-{
-  return (PortableServer::ServantLocator_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
-	: ptr_ (PortableServer::ServantLocator::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (PortableServer::ServantLocator_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::ServantLocator_ptr 
-PortableServer::ServantLocator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (const PortableServer::ServantLocator_var &p) // copy constructor
-	: ptr_ (PortableServer::ServantLocator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (PortableServer::ServantLocator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (const PortableServer::ServantLocator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::ServantLocator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantLocator_var::operator const PortableServer::ServantLocator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::ServantLocator_var::operator PortableServer::ServantLocator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr 
-PortableServer::ServantLocator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr 
-PortableServer::ServantLocator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::ServantLocator_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (PortableServer::ServantLocator_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const PortableServer::ServantLocator_var &p)
-{
-  this->ptr_ = PortableServer::ServantLocator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (PortableServer::ServantLocator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::ServantLocator_out::operator PortableServer::ServantLocator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::ServantLocator_ptr 
-PortableServer::ServantLocator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-PortableServer::POA::POA(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::POA::~POA (void) // destructor
-{}
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CI_)
-#define _PORTABLESERVER_POA___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (void) // default constructor
-	: ptr_ (PortableServer::POA::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (PortableServer::POA_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-	: ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (PortableServer::POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CI_)
-#define _PORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_var &p)
-{
-  this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr 
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterAlreadyExists
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_AdapterAlreadyExists))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterInactive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::AdapterInactive::AdapterInactive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_AdapterInactive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterNonExistent
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_AdapterNonExistent))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::InvalidPolicy
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_InvalidPolicy))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::NoServant
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::NoServant::NoServant (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_NoServant))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::NoServant::~NoServant (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectAlreadyActive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_ObjectAlreadyActive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectNotActive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_ObjectNotActive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantAlreadyActive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_ServantAlreadyActive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantNotActive
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::ServantNotActive::ServantNotActive (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_ServantNotActive))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::ServantNotActive::~ServantNotActive (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongAdapter
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::WrongAdapter::WrongAdapter (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_WrongAdapter))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::WrongAdapter::~WrongAdapter (void)
-{
-}
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongPolicy
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::POA::WrongPolicy::WrongPolicy (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_WrongPolicy))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::POA::WrongPolicy::~WrongPolicy (void)
-{
-}
-
-ACE_INLINE
-PortableServer::Current::Current(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::Current::~Current (void) // destructor
-{}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current::_nil (void)
-{
-  return (PortableServer::Current_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CI_)
-#define _PORTABLESERVER_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Current_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (void) // default constructor
-	: ptr_ (PortableServer::Current::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (PortableServer::Current_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::Current_ptr 
-PortableServer::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (const PortableServer::Current_var &p) // copy constructor
-	: ptr_ (PortableServer::Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::Current_var::~Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (PortableServer::Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (const PortableServer::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Current_var::operator const PortableServer::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::Current_var::operator PortableServer::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr 
-PortableServer::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr
-PortableServer::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Current::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr 
-PortableServer::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::Current_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::Current::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CI_)
-#define _PORTABLESERVER_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Current_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (PortableServer::Current_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (PortableServer::Current_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (PortableServer::Current_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (PortableServer::Current_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (const PortableServer::Current_var &p)
-{
-  this->ptr_ = PortableServer::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (PortableServer::Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Current_out::operator PortableServer::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Current_ptr 
-PortableServer::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-// *************************************************************
-// Inline operations for exception PortableServer::Current::NoContext
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-PortableServer::Current::NoContext::NoContext (void)
-	: CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::Current::_tc_NoContext))
-{
-}
-
-// destructor - all members are of self managing types
-ACE_INLINE
-PortableServer::Current::NoContext::~NoContext (void)
-{
-}
-
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
deleted file mode 100644
index fd17f5e33f5..00000000000
--- a/TAO/tao/POAS.cpp
+++ /dev/null
@@ -1,3150 +0,0 @@
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/corba.h"
-#include "POAS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "POAS.i"
-#endif // !defined INLINE
-
-static const TAO_operation_db_entry PortableServer_CurrentBase_operations [] = {
-  {"_is_a", &POA_PortableServer::CurrentBase::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_CurrentBase_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_CurrentBase_optable_pool [_tao_PortableServer_CurrentBase_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_CurrentBase_allocator (_tao_PortableServer_CurrentBase_optable_pool, _tao_PortableServer_CurrentBase_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_CurrentBase_optable (PortableServer_CurrentBase_operations, 1, 1, &_tao_PortableServer_CurrentBase_allocator);
-
-// skeleton constructor
-POA_PortableServer::CurrentBase::CurrentBase (void)
-{
-  this->optable_ = &tao_PortableServer_CurrentBase_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_CurrentBase_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_CurrentBase_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_CurrentBase_is_a_paramdata};
-void POA_PortableServer::CurrentBase::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::CurrentBase_ptr  _tao_impl = (POA_PortableServer::CurrentBase_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_CurrentBase_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_CurrentBase_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::CurrentBase::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::CurrentBase::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/CurrentBase:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::CurrentBase_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::CurrentBase::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::CurrentBase::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/CurrentBase:1.0";
-}
-
-POA_PortableServer::_tao_collocated_CurrentBase::_tao_collocated_CurrentBase (
-    POA_PortableServer::CurrentBase_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, CurrentBase) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::CurrentBase_ptr POA_PortableServer::_tao_collocated_CurrentBase::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_CurrentBase::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-
-PortableServer::CurrentBase*
-POA_PortableServer::CurrentBase::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_CurrentBase (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_Policy_operations [] = {
-  {"copy", &POA_PortableServer::Policy::copy_skel},
-  {"destroy", &POA_PortableServer::Policy::destroy_skel},
-  {"_is_a", &POA_PortableServer::Policy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_Policy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
-static char _tao_PortableServer_Policy_optable_pool [_tao_PortableServer_Policy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_Policy_allocator (_tao_PortableServer_Policy_optable_pool, _tao_PortableServer_Policy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_Policy_optable (PortableServer_Policy_operations, 3, 6, &_tao_PortableServer_Policy_allocator);
-
-// skeleton constructor
-POA_PortableServer::Policy::Policy (void)
-{
-  this->optable_ = &tao_PortableServer_Policy_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_copy_paramdata [] =
-{
-  {PortableServer::_tc_Policy, 0, 0}
-}; // PortableServer_Policy_copy_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Policy_copy_calldata =
-{"copy", 1, 1, PortableServer_Policy_copy_paramdata};
-
-void POA_PortableServer::Policy::copy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Policy *_tao_impl = (POA_PortableServer::Policy *)_tao_object_reference;
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_copy_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->copy (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_copy_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, 0, 0}
-}; // PortableServer_Policy_destroy_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Policy_destroy_calldata =
-{"destroy", 1, 1, PortableServer_Policy_destroy_paramdata};
-
-void POA_PortableServer::Policy::destroy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Policy *_tao_impl = (POA_PortableServer::Policy *)_tao_object_reference;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_destroy_calldata,
-    0
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_impl->destroy (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_destroy_calldata,
-    0
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_Policy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_Policy_is_a_paramdata};
-void POA_PortableServer::Policy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::Policy_ptr  _tao_impl = (POA_PortableServer::Policy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::Policy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::Policy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::Policy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/Policy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_Policy::_tao_collocated_Policy (
-    POA_PortableServer::Policy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, Policy) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_Policy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_Policy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-
-PortableServer::Policy*
-POA_PortableServer::Policy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_Policy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ThreadPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::ThreadPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ThreadPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_ThreadPolicy_optable_pool [_tao_PortableServer_ThreadPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ThreadPolicy_allocator (_tao_PortableServer_ThreadPolicy_optable_pool, _tao_PortableServer_ThreadPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer_ThreadPolicy_operations, 4, 8, &_tao_PortableServer_ThreadPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::ThreadPolicy::ThreadPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_ThreadPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_ThreadPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ThreadPolicyValue, 0, 0}
-}; // PortableServer_ThreadPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ThreadPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata};
-
-void POA_PortableServer::ThreadPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::ThreadPolicy *_tao_impl = (POA_PortableServer::ThreadPolicy *)_tao_object_reference;
-  PortableServer::ThreadPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_ThreadPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_ThreadPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata};
-void POA_PortableServer::ThreadPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ThreadPolicy_ptr  _tao_impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ThreadPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ThreadPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ThreadPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ThreadPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy (
-    POA_PortableServer::ThreadPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ThreadPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_ThreadPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::ThreadPolicyValue
-POA_PortableServer::_tao_collocated_ThreadPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::ThreadPolicy*
-POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_LifespanPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::LifespanPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_LifespanPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_LifespanPolicy_optable_pool [_tao_PortableServer_LifespanPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_LifespanPolicy_allocator (_tao_PortableServer_LifespanPolicy_optable_pool, _tao_PortableServer_LifespanPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServer_LifespanPolicy_operations, 4, 8, &_tao_PortableServer_LifespanPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::LifespanPolicy::LifespanPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_LifespanPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_LifespanPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_LifespanPolicyValue, 0, 0}
-}; // PortableServer_LifespanPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_LifespanPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata};
-
-void POA_PortableServer::LifespanPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::LifespanPolicy *_tao_impl = (POA_PortableServer::LifespanPolicy *)_tao_object_reference;
-  PortableServer::LifespanPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_LifespanPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_LifespanPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata};
-void POA_PortableServer::LifespanPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::LifespanPolicy_ptr  _tao_impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::LifespanPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/LifespanPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::LifespanPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/LifespanPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy (
-    POA_PortableServer::LifespanPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, LifespanPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_LifespanPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::LifespanPolicyValue
-POA_PortableServer::_tao_collocated_LifespanPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::LifespanPolicy*
-POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_IdUniquenessPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_IdUniquenessPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_IdUniquenessPolicy_optable_pool [_tao_PortableServer_IdUniquenessPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_IdUniquenessPolicy_allocator (_tao_PortableServer_IdUniquenessPolicy_optable_pool, _tao_PortableServer_IdUniquenessPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (PortableServer_IdUniquenessPolicy_operations, 4, 8, &_tao_PortableServer_IdUniquenessPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_IdUniquenessPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdUniquenessPolicyValue, 0, 0}
-}; // PortableServer_IdUniquenessPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata};
-
-void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::IdUniquenessPolicy *_tao_impl = (POA_PortableServer::IdUniquenessPolicy *)_tao_object_reference;
-  PortableServer::IdUniquenessPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_IdUniquenessPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_IdUniquenessPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata};
-void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::IdUniquenessPolicy_ptr  _tao_impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::IdUniquenessPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdUniquenessPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::IdUniquenessPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/IdUniquenessPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy (
-    POA_PortableServer::IdUniquenessPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, IdUniquenessPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_IdUniquenessPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::IdUniquenessPolicyValue
-POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::IdUniquenessPolicy*
-POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_IdAssignmentPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_IdAssignmentPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_IdAssignmentPolicy_optable_pool [_tao_PortableServer_IdAssignmentPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_IdAssignmentPolicy_allocator (_tao_PortableServer_IdAssignmentPolicy_optable_pool, _tao_PortableServer_IdAssignmentPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (PortableServer_IdAssignmentPolicy_operations, 4, 8, &_tao_PortableServer_IdAssignmentPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_IdAssignmentPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdAssignmentPolicyValue, 0, 0}
-}; // PortableServer_IdAssignmentPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata};
-
-void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::IdAssignmentPolicy *_tao_impl = (POA_PortableServer::IdAssignmentPolicy *)_tao_object_reference;
-  PortableServer::IdAssignmentPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_IdAssignmentPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_IdAssignmentPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata};
-void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::IdAssignmentPolicy_ptr  _tao_impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::IdAssignmentPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdAssignmentPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::IdAssignmentPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/IdAssignmentPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy (
-    POA_PortableServer::IdAssignmentPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, IdAssignmentPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_IdAssignmentPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::IdAssignmentPolicyValue
-POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::IdAssignmentPolicy*
-POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ImplicitActivationPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ImplicitActivationPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_ImplicitActivationPolicy_optable_pool [_tao_PortableServer_ImplicitActivationPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ImplicitActivationPolicy_allocator (_tao_PortableServer_ImplicitActivationPolicy_optable_pool, _tao_PortableServer_ImplicitActivationPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (PortableServer_ImplicitActivationPolicy_operations, 4, 8, &_tao_PortableServer_ImplicitActivationPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_ImplicitActivationPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ImplicitActivationPolicyValue, 0, 0}
-}; // PortableServer_ImplicitActivationPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata};
-
-void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::ImplicitActivationPolicy *_tao_impl = (POA_PortableServer::ImplicitActivationPolicy *)_tao_object_reference;
-  PortableServer::ImplicitActivationPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_ImplicitActivationPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_ImplicitActivationPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata};
-void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ImplicitActivationPolicy_ptr  _tao_impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ImplicitActivationPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ImplicitActivationPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ImplicitActivationPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy (
-    POA_PortableServer::ImplicitActivationPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ImplicitActivationPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::ImplicitActivationPolicyValue
-POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::ImplicitActivationPolicy*
-POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ServantRetentionPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ServantRetentionPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_ServantRetentionPolicy_optable_pool [_tao_PortableServer_ServantRetentionPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ServantRetentionPolicy_allocator (_tao_PortableServer_ServantRetentionPolicy_optable_pool, _tao_PortableServer_ServantRetentionPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (PortableServer_ServantRetentionPolicy_operations, 4, 8, &_tao_PortableServer_ServantRetentionPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_ServantRetentionPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ServantRetentionPolicyValue, 0, 0}
-}; // PortableServer_ServantRetentionPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata};
-
-void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::ServantRetentionPolicy *_tao_impl = (POA_PortableServer::ServantRetentionPolicy *)_tao_object_reference;
-  PortableServer::ServantRetentionPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_ServantRetentionPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_ServantRetentionPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata};
-void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ServantRetentionPolicy_ptr  _tao_impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ServantRetentionPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantRetentionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantRetentionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ServantRetentionPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy (
-    POA_PortableServer::ServantRetentionPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ServantRetentionPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_ServantRetentionPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::ServantRetentionPolicyValue
-POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::ServantRetentionPolicy*
-POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_RequestProcessingPolicy_operations [] = {
-  {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel},
-  {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel},
-  {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel},
-  {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_RequestProcessingPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
-static char _tao_PortableServer_RequestProcessingPolicy_optable_pool [_tao_PortableServer_RequestProcessingPolicy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_RequestProcessingPolicy_allocator (_tao_PortableServer_RequestProcessingPolicy_optable_pool, _tao_PortableServer_RequestProcessingPolicy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (PortableServer_RequestProcessingPolicy_operations, 4, 8, &_tao_PortableServer_RequestProcessingPolicy_allocator);
-
-// skeleton constructor
-POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
-{
-  this->optable_ = &tao_PortableServer_RequestProcessingPolicy_optable;
-}
-
-static const TAO_Param_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_RequestProcessingPolicyValue, 0, 0}
-}; // PortableServer_RequestProcessingPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata};
-
-void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::RequestProcessingPolicy *_tao_impl = (POA_PortableServer::RequestProcessingPolicy *)_tao_object_reference;
-  PortableServer::RequestProcessingPolicyValue _tao_retval;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &_get_PortableServer_RequestProcessingPolicy_value_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->value (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &_get_PortableServer_RequestProcessingPolicy_value_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata};
-void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::RequestProcessingPolicy_ptr  _tao_impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::RequestProcessingPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/RequestProcessingPolicy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::RequestProcessingPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/RequestProcessingPolicy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy (
-    POA_PortableServer::RequestProcessingPolicy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, RequestProcessingPolicy) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_Policy (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_RequestProcessingPolicy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-PortableServer::RequestProcessingPolicyValue
-POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->value(_tao_environment);
-}
-
-PortableServer::RequestProcessingPolicy*
-POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_POAManager_operations [] = {
-  {"_is_a", &POA_PortableServer::POAManager::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_POAManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_POAManager_optable_pool [_tao_PortableServer_POAManager_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_POAManager_allocator (_tao_PortableServer_POAManager_optable_pool, _tao_PortableServer_POAManager_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 1, 1, &_tao_PortableServer_POAManager_allocator);
-
-// skeleton constructor
-POA_PortableServer::POAManager::POAManager (void)
-{
-  this->optable_ = &tao_PortableServer_POAManager_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_POAManager_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_POAManager_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_POAManager_is_a_paramdata};
-void POA_PortableServer::POAManager::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::POAManager_ptr  _tao_impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_POAManager_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_POAManager_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::POAManager::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::POAManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POAManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::POAManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/POAManager:1.0";
-}
-
-POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager (
-    POA_PortableServer::POAManager_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, POAManager) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POAManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_POAManager::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::activate (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->activate (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::hold_requests (
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->hold_requests (
-      wait_for_completion,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::discard_requests (
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->discard_requests (
-      wait_for_completion,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POAManager::deactivate (
-    CORBA::Boolean etherealize_objects,
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->deactivate (
-      etherealize_objects,
-      wait_for_completion,
-       _tao_environment
-    );
-}
-
-
-PortableServer::POAManager*
-POA_PortableServer::POAManager::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_AdapterActivator_operations [] = {
-  {"_is_a", &POA_PortableServer::AdapterActivator::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_AdapterActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_AdapterActivator_optable_pool [_tao_PortableServer_AdapterActivator_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_AdapterActivator_allocator (_tao_PortableServer_AdapterActivator_optable_pool, _tao_PortableServer_AdapterActivator_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 1, 1, &_tao_PortableServer_AdapterActivator_allocator);
-
-// skeleton constructor
-POA_PortableServer::AdapterActivator::AdapterActivator (void)
-{
-  this->optable_ = &tao_PortableServer_AdapterActivator_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_AdapterActivator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_AdapterActivator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_AdapterActivator_is_a_paramdata};
-void POA_PortableServer::AdapterActivator::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::AdapterActivator_ptr  _tao_impl = (POA_PortableServer::AdapterActivator_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_AdapterActivator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_AdapterActivator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::AdapterActivator::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/AdapterActivator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::AdapterActivator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/AdapterActivator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator (
-    POA_PortableServer::AdapterActivator_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, AdapterActivator) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_AdapterActivator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_adapter (
-    PortableServer::POA_ptr  parent,
-    const char* name,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->unknown_adapter (
-      parent,
-      name,
-       _tao_environment
-    );
-}
-
-
-PortableServer::AdapterActivator*
-POA_PortableServer::AdapterActivator::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ServantManager_operations [] = {
-  {"_is_a", &POA_PortableServer::ServantManager::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ServantManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_ServantManager_optable_pool [_tao_PortableServer_ServantManager_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ServantManager_allocator (_tao_PortableServer_ServantManager_optable_pool, _tao_PortableServer_ServantManager_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantManager_optable (PortableServer_ServantManager_operations, 1, 1, &_tao_PortableServer_ServantManager_allocator);
-
-// skeleton constructor
-POA_PortableServer::ServantManager::ServantManager (void)
-{
-  this->optable_ = &tao_PortableServer_ServantManager_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_ServantManager_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantManager_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantManager_is_a_paramdata};
-void POA_PortableServer::ServantManager::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ServantManager_ptr  _tao_impl = (POA_PortableServer::ServantManager_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ServantManager_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ServantManager_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ServantManager::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ServantManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ServantManager:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager (
-    POA_PortableServer::ServantManager_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ServantManager) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_ServantManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-
-PortableServer::ServantManager*
-POA_PortableServer::ServantManager::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ServantActivator_operations [] = {
-  {"_is_a", &POA_PortableServer::ServantActivator::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ServantActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_ServantActivator_optable_pool [_tao_PortableServer_ServantActivator_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ServantActivator_allocator (_tao_PortableServer_ServantActivator_optable_pool, _tao_PortableServer_ServantActivator_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 1, 1, &_tao_PortableServer_ServantActivator_allocator);
-
-// skeleton constructor
-POA_PortableServer::ServantActivator::ServantActivator (void)
-{
-  this->optable_ = &tao_PortableServer_ServantActivator_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_ServantActivator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantActivator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantActivator_is_a_paramdata};
-void POA_PortableServer::ServantActivator::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ServantActivator_ptr  _tao_impl = (POA_PortableServer::ServantActivator_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ServantActivator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ServantActivator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ServantActivator::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ServantActivator::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantActivator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantActivator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ServantActivator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator (
-    POA_PortableServer::ServantActivator_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ServantActivator) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_ServantManager (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantActivator_ptr POA_PortableServer::_tao_collocated_ServantActivator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantActivator::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_ServantActivator::incarnate (
-    const PortableServer::ObjectId & oid,
-    PortableServer::POA_ptr  adapter,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->incarnate (
-      oid,
-      adapter,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
-    const PortableServer::ObjectId & oid,
-    PortableServer::POA_ptr  adapter,
-    PortableServer::Servant serv,
-    CORBA::Boolean cleanup_in_progress,
-    CORBA::Boolean remaining_activations,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->etherealize (
-      oid,
-      adapter,
-      serv,
-      cleanup_in_progress,
-      remaining_activations,
-       _tao_environment
-    );
-}
-
-
-PortableServer::ServantActivator*
-POA_PortableServer::ServantActivator::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_ServantLocator_operations [] = {
-  {"_is_a", &POA_PortableServer::ServantLocator::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_ServantLocator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_ServantLocator_optable_pool [_tao_PortableServer_ServantLocator_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_ServantLocator_allocator (_tao_PortableServer_ServantLocator_optable_pool, _tao_PortableServer_ServantLocator_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 1, 1, &_tao_PortableServer_ServantLocator_allocator);
-
-// skeleton constructor
-POA_PortableServer::ServantLocator::ServantLocator (void)
-{
-  this->optable_ = &tao_PortableServer_ServantLocator_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_ServantLocator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantLocator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantLocator_is_a_paramdata};
-void POA_PortableServer::ServantLocator::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::ServantLocator_ptr  _tao_impl = (POA_PortableServer::ServantLocator_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_ServantLocator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_ServantLocator_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::ServantLocator::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::ServantLocator::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantLocator:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantLocator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/ServantLocator:1.0";
-}
-
-POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator (
-    POA_PortableServer::ServantLocator_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, ServantLocator) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_ServantManager (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::ServantLocator_ptr POA_PortableServer::_tao_collocated_ServantLocator::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_ServantLocator::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::preinvoke (
-    const PortableServer::ObjectId & oid,
-    PortableServer::POA_ptr  adapter,
-    const char * operation,
-    PortableServer::ServantLocator::Cookie & the_cookie,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->preinvoke (
-      oid,
-      adapter,
-      operation,
-      the_cookie,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
-    const PortableServer::ObjectId & oid,
-    PortableServer::POA_ptr  adapter,
-    const char * operation,
-    PortableServer::ServantLocator::Cookie the_cookie,
-    PortableServer::Servant the_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->postinvoke (
-      oid,
-      adapter,
-      operation,
-      the_cookie,
-      the_servant,
-       _tao_environment
-    );
-}
-
-
-PortableServer::ServantLocator*
-POA_PortableServer::ServantLocator::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_POA_operations [] = {
-  {"_is_a", &POA_PortableServer::POA::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_POA_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
-static char _tao_PortableServer_POA_optable_pool [_tao_PortableServer_POA_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_POA_allocator (_tao_PortableServer_POA_optable_pool, _tao_PortableServer_POA_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 1, 1, &_tao_PortableServer_POA_allocator);
-
-// skeleton constructor
-POA_PortableServer::POA::POA (void)
-{
-  this->optable_ = &tao_PortableServer_POA_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_POA_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_POA_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_POA_is_a_paramdata};
-void POA_PortableServer::POA::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::POA_ptr  _tao_impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_POA_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_POA_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::POA::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::POA::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POA:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::POA_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/POA:1.0";
-}
-
-POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA (
-    POA_PortableServer::POA_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, POA) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA (
-    const char* adapter_name,
-    PortableServer::POAManager_ptr  a_POAManager,
-    const PortableServer::PolicyList & policies,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_POA (
-      adapter_name,
-      a_POAManager,
-      policies,
-       _tao_environment
-    );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::find_POA (
-    const char* adapter_name,
-    CORBA::Boolean activate_it,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->find_POA (
-      adapter_name,
-      activate_it,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POA::destroy (
-    CORBA::Boolean etherealize_objects,
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-      etherealize_objects,
-      wait_for_completion,
-       _tao_environment
-    );
-}
-
-PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_thread_policy (
-    PortableServer::ThreadPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_thread_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_lifespan_policy (
-    PortableServer::LifespanPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_lifespan_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_uniqueness_policy (
-    PortableServer::IdUniquenessPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_id_uniqueness_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_assignment_policy (
-    PortableServer::IdAssignmentPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_id_assignment_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_implicit_activation_policy (
-    PortableServer::ImplicitActivationPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_implicit_activation_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_servant_retention_policy (
-    PortableServer::ServantRetentionPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_servant_retention_policy (
-      value,
-       _tao_environment
-    );
-}
-
-PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_request_processing_policy (
-    PortableServer::RequestProcessingPolicyValue value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_request_processing_policy (
-      value,
-       _tao_environment
-    );
-}
-
-char*
-POA_PortableServer::_tao_collocated_POA::the_name (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->the_name(_tao_environment);
-}
-PortableServer::POA_ptr
-POA_PortableServer::_tao_collocated_POA::the_parent (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->the_parent(_tao_environment);
-}
-PortableServer::POAManager_ptr
-POA_PortableServer::_tao_collocated_POA::the_POAManager (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->the_POAManager(_tao_environment);
-}
-PortableServer::AdapterActivator_ptr
-POA_PortableServer::_tao_collocated_POA::the_activator (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->the_activator(_tao_environment);
-}
-
-void POA_PortableServer::_tao_collocated_POA::the_activator (
-    PortableServer::AdapterActivator_ptr _tao_value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->the_activator (
-      _tao_value,
-      _tao_environment
-    );
-}
-
-PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_POA::get_servant_manager (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->get_servant_manager (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POA::set_servant_manager (
-    PortableServer::ServantManager_ptr  imgr,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->set_servant_manager (
-      imgr,
-       _tao_environment
-    );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::get_servant (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->get_servant (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POA::set_servant (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->set_servant (
-      p_servant,
-       _tao_environment
-    );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::activate_object (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->activate_object (
-      p_servant,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POA::activate_object_with_id (
-    const PortableServer::ObjectId & id,
-    PortableServer::Servant p_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->activate_object_with_id (
-      id,
-      p_servant,
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_POA::deactivate_object (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->deactivate_object (
-      oid,
-       _tao_environment
-    );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference (
-    const char *intf,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_reference (
-      intf,
-       _tao_environment
-    );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference_with_id (
-    const PortableServer::ObjectId & oid,
-    const char *intf,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->create_reference_with_id (
-      oid,
-      intf,
-       _tao_environment
-    );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::servant_to_id (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->servant_to_id (
-      p_servant,
-       _tao_environment
-    );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::servant_to_reference (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->servant_to_reference (
-      p_servant,
-       _tao_environment
-    );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::reference_to_servant (
-    CORBA::Object_ptr  reference,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->reference_to_servant (
-      reference,
-       _tao_environment
-    );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::reference_to_id (
-    CORBA::Object_ptr  reference,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->reference_to_id (
-      reference,
-       _tao_environment
-    );
-}
-
-PortableServer::Servant POA_PortableServer::_tao_collocated_POA::id_to_servant (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->id_to_servant (
-      oid,
-       _tao_environment
-    );
-}
-
-CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->id_to_reference (
-      oid,
-       _tao_environment
-    );
-}
-
-
-PortableServer::POA*
-POA_PortableServer::POA::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_POA (this, stub);
-}
-
-static const TAO_operation_db_entry PortableServer_Current_operations [] = {
-  {"get_POA", &POA_PortableServer::Current::get_POA_skel},
-  {"get_object_id", &POA_PortableServer::Current::get_object_id_skel},
-  {"_is_a", &POA_PortableServer::Current::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_Current_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
-static char _tao_PortableServer_Current_optable_pool [_tao_PortableServer_Current_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_Current_allocator (_tao_PortableServer_Current_optable_pool, _tao_PortableServer_Current_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Current_operations, 3, 6, &_tao_PortableServer_Current_allocator);
-
-// skeleton constructor
-POA_PortableServer::Current::Current (void)
-{
-  this->optable_ = &tao_PortableServer_Current_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_Current_get_POA_paramdata [] =
-{
-  {PortableServer::_tc_POA, 0, 0}
-}; // PortableServer_Current_get_POA_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Current_get_POA_calldata =
-{"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata};
-
-void POA_PortableServer::Current::get_POA_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Current_get_POA_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->get_POA (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Current_get_POA_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Current_get_object_id_paramdata [] =
-{
-  {PortableServer::_tc_ObjectId, 0, 0}
-}; // PortableServer_Current_get_object_id_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Current_get_object_id_calldata =
-{"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata};
-
-void POA_PortableServer::Current::get_object_id_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
-  PortableServer::ObjectId *_tao_retval = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Current_get_object_id_calldata,
-    _tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->get_object_id (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Current_get_object_id_calldata,
-    _tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Current_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_Current_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_Current_is_a_paramdata};
-void POA_PortableServer::Current::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::Current_ptr  _tao_impl = (POA_PortableServer::Current_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Current_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Current_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::Current::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::Current::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Current:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/CurrentBase:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::CurrentBase_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/Current:1.0";
-}
-
-POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current (
-    POA_PortableServer::Current_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, Current) (stub, servant, CORBA::B_TRUE),
-    _tao_collocated_CurrentBase (servant, stub),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::Current_ptr POA_PortableServer::_tao_collocated_Current::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_Current::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::POA_ptr POA_PortableServer::_tao_collocated_Current::get_POA (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->get_POA (
-       _tao_environment
-    );
-}
-
-PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_object_id (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->get_object_id (
-       _tao_environment
-    );
-}
-
-
-PortableServer::Current*
-POA_PortableServer::Current::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_Current (this, stub);
-}
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
deleted file mode 100644
index d8f873cc63c..00000000000
--- a/TAO/tao/POAS.h
+++ /dev/null
@@ -1,1182 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAC.h
-//
-// = DESCRIPTION
-//
-//    POA skels. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and is not meant to be read.
-//
-// ============================================================================
-
-#if !defined (TAO_IDL_POAS_H)
-#define TAO_IDL_POAS_H
-
-#include "POAC.h"
-
-class POA_PortableServer
-{
-public:
-  class CurrentBase;
-  typedef CurrentBase *CurrentBase_ptr;
-  class CurrentBase :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    CurrentBase (void);
-      public:
-    virtual ~CurrentBase (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::CurrentBase *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_CURRENTBASE___COLLOCATED_SH_)
-#define _PORTABLESERVER_CURRENTBASE___COLLOCATED_SH_
-
-  class _tao_collocated_CurrentBase    : public virtual PortableServer::CurrentBase
-  {
-  public:
-    _tao_collocated_CurrentBase (
-        CurrentBase_ptr  servant,
-        STUB_Object *stub
-      );
-    CurrentBase_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    CurrentBase_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-  class Policy :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    Policy (void);
-      public:
-    virtual ~Policy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::Policy_ptr  copy ( CORBA::Environment &env) = 0; // pure virtual
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void destroy ( CORBA::Environment &env) = 0; // pure virtual
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::Policy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_POLICY___COLLOCATED_SH_
-
-  class _tao_collocated_Policy    : public virtual PortableServer::Policy
-  {
-  public:
-    _tao_collocated_Policy (
-        Policy_ptr  servant,
-        STUB_Object *stub
-      );
-    Policy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    Policy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ThreadPolicy;
-  typedef ThreadPolicy *ThreadPolicy_ptr;
-  class ThreadPolicy : public virtual Policy
-  {
-  protected:
-    ThreadPolicy (void);
-      public:
-    virtual ~ThreadPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ThreadPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_THREADPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_ThreadPolicy    : public virtual PortableServer::ThreadPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ThreadPolicy (
-        ThreadPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    ThreadPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ThreadPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ThreadPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class LifespanPolicy;
-  typedef LifespanPolicy *LifespanPolicy_ptr;
-  class LifespanPolicy : public virtual Policy
-  {
-  protected:
-    LifespanPolicy (void);
-      public:
-    virtual ~LifespanPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::LifespanPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_LifespanPolicy    : public virtual PortableServer::LifespanPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_LifespanPolicy (
-        LifespanPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    LifespanPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::LifespanPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    LifespanPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class IdUniquenessPolicy;
-  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-  class IdUniquenessPolicy : public virtual Policy
-  {
-  protected:
-    IdUniquenessPolicy (void);
-      public:
-    virtual ~IdUniquenessPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::IdUniquenessPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_IdUniquenessPolicy    : public virtual PortableServer::IdUniquenessPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_IdUniquenessPolicy (
-        IdUniquenessPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    IdUniquenessPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::IdUniquenessPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    IdUniquenessPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class IdAssignmentPolicy;
-  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-  class IdAssignmentPolicy : public virtual Policy
-  {
-  protected:
-    IdAssignmentPolicy (void);
-      public:
-    virtual ~IdAssignmentPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::IdAssignmentPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_IdAssignmentPolicy    : public virtual PortableServer::IdAssignmentPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_IdAssignmentPolicy (
-        IdAssignmentPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    IdAssignmentPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::IdAssignmentPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    IdAssignmentPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ImplicitActivationPolicy;
-  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-  class ImplicitActivationPolicy : public virtual Policy
-  {
-  protected:
-    ImplicitActivationPolicy (void);
-      public:
-    virtual ~ImplicitActivationPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ImplicitActivationPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_ImplicitActivationPolicy    : public virtual PortableServer::ImplicitActivationPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ImplicitActivationPolicy (
-        ImplicitActivationPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    ImplicitActivationPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ImplicitActivationPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ImplicitActivationPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantRetentionPolicy;
-  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  class ServantRetentionPolicy : public virtual Policy
-  {
-  protected:
-    ServantRetentionPolicy (void);
-      public:
-    virtual ~ServantRetentionPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ServantRetentionPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_ServantRetentionPolicy    : public virtual PortableServer::ServantRetentionPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ServantRetentionPolicy (
-        ServantRetentionPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    ServantRetentionPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ServantRetentionPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ServantRetentionPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class RequestProcessingPolicy;
-  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  class RequestProcessingPolicy : public virtual Policy
-  {
-  protected:
-    RequestProcessingPolicy (void);
-      public:
-    virtual ~RequestProcessingPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::RequestProcessingPolicy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___COLLOCATED_SH_
-
-  class _tao_collocated_RequestProcessingPolicy    : public virtual PortableServer::RequestProcessingPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestProcessingPolicy (
-        RequestProcessingPolicy_ptr  servant,
-        STUB_Object *stub
-      );
-    RequestProcessingPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::RequestProcessingPolicyValue value (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    RequestProcessingPolicy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-  class POAManager :  public virtual PortableServer::LocalServantBase
-  {
-  protected:
-    POAManager (void);
-      public:
-    virtual ~POAManager (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual void activate ( CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::POAManager *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER___COLLOCATED_SH_)
-#define _PORTABLESERVER_POAMANAGER___COLLOCATED_SH_
-
-  class _tao_collocated_POAManager    : public virtual PortableServer::POAManager
-  {
-  public:
-    _tao_collocated_POAManager (
-        POAManager_ptr  servant,
-        STUB_Object *stub
-      );
-    POAManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void activate (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void hold_requests (
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void discard_requests (
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void deactivate (
-        CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    POAManager_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-  class TAO_Export AdapterActivator :  public virtual PortableServer::LocalServantBase
-  {
-  protected:
-    AdapterActivator (void);
-      public:
-    virtual ~AdapterActivator (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA::Environment &env) = 0; // pure virtual
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::AdapterActivator *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___COLLOCATED_SH_
-
-  class _tao_collocated_AdapterActivator    : public virtual PortableServer::AdapterActivator
-  {
-  public:
-    _tao_collocated_AdapterActivator (
-        AdapterActivator_ptr  servant,
-        STUB_Object *stub
-      );
-    AdapterActivator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual CORBA::Boolean unknown_adapter (
-        PortableServer::POA_ptr  parent,
-        const char* name,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    AdapterActivator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-  class TAO_Export ServantManager :  public virtual PortableServer::LocalServantBase
-  {
-  protected:
-    ServantManager (void);
-      public:
-    virtual ~ServantManager (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ServantManager *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTMANAGER___COLLOCATED_SH_
-
-  class _tao_collocated_ServantManager    : public virtual PortableServer::ServantManager
-  {
-  public:
-    _tao_collocated_ServantManager (
-        ServantManager_ptr  servant,
-        STUB_Object *stub
-      );
-    ServantManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ServantManager_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantActivator;
-  typedef ServantActivator *ServantActivator_ptr;
-  class TAO_Export ServantActivator : public virtual ServantManager
-  {
-  protected:
-    ServantActivator (void);
-      public:
-    virtual ~ServantActivator (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA::Environment &env) = 0; // pure virtual
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ServantActivator *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___COLLOCATED_SH_
-
-  class _tao_collocated_ServantActivator    : public virtual PortableServer::ServantActivator,
-      public virtual _tao_collocated_ServantManager
-  {
-  public:
-    _tao_collocated_ServantActivator (
-        ServantActivator_ptr  servant,
-        STUB_Object *stub
-      );
-    ServantActivator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Servant incarnate (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr  adapter,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void etherealize (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr  adapter,
-        PortableServer::Servant serv,
-        CORBA::Boolean cleanup_in_progress,
-        CORBA::Boolean remaining_activations,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ServantActivator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
-  class TAO_Export ServantLocator : public virtual ServantManager
-  {
-  protected:
-    ServantLocator (void);
-      public:
-    virtual ~ServantLocator (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, 
-                                               PortableServer::POA_ptr adapter, 
-                                               const char *operation, 
-                                               PortableServer::ServantLocator::Cookie & the_cookie,  
-                                               CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::ServantLocator *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___COLLOCATED_SH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___COLLOCATED_SH_
-
-  class _tao_collocated_ServantLocator    : public virtual PortableServer::ServantLocator,
-      public virtual _tao_collocated_ServantManager
-  {
-  public:
-    _tao_collocated_ServantLocator (
-        ServantLocator_ptr  servant,
-        STUB_Object *stub
-      );
-    ServantLocator_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Servant preinvoke (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr  adapter,
-        const char * operation,
-        PortableServer::ServantLocator::Cookie & the_cookie,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void postinvoke (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr  adapter,
-        const char * operation,
-        PortableServer::ServantLocator::Cookie the_cookie,
-        PortableServer::Servant the_servant,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    ServantLocator_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class POA;
-  typedef POA *POA_ptr;
-  class POA :  public virtual PortableServer::LocalServantBase
-  {
-  protected:
-    POA (void);
-      public:
-    virtual ~POA (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const PortableServer::PolicyList &policies,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual char * the_name (CORBA::Environment &env) = 0;
-
-    virtual PortableServer::POA_ptr  the_parent (CORBA::Environment &env) = 0;
-
-    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA::Environment &env) = 0;
-
-    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA::Environment &env) = 0;
-
-    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0;
-
-    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::Servant get_servant ( CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void set_servant (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-
-    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::POA *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POA___COLLOCATED_SH_)
-#define _PORTABLESERVER_POA___COLLOCATED_SH_
-
-  class _tao_collocated_POA    : public virtual PortableServer::POA
-  {
-  public:
-    _tao_collocated_POA (
-        POA_ptr  servant,
-        STUB_Object *stub
-      );
-    POA_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::POA_ptr create_POA (
-        const char* adapter_name,
-        PortableServer::POAManager_ptr  a_POAManager,
-        const PortableServer::PolicyList & policies,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::POA_ptr find_POA (
-        const char* adapter_name,
-        CORBA::Boolean activate_it,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
-        PortableServer::ThreadPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-        PortableServer::LifespanPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-        PortableServer::IdUniquenessPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-        PortableServer::IdAssignmentPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-        PortableServer::ImplicitActivationPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-        PortableServer::ServantRetentionPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-        PortableServer::RequestProcessingPolicyValue value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual char*  the_name (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::POA_ptr the_parent (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::POAManager_ptr the_POAManager (
-        CORBA::Environment &env
-      );
-    virtual PortableServer::AdapterActivator_ptr the_activator (
-        CORBA::Environment &env
-      );
-    virtual void the_activator (PortableServer::AdapterActivator_ptr  _tao_value,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ServantManager_ptr get_servant_manager (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void set_servant_manager (
-        PortableServer::ServantManager_ptr  imgr,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Servant get_servant (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void set_servant (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ObjectId * activate_object (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void activate_object_with_id (
-        const PortableServer::ObjectId & id,
-        PortableServer::Servant p_servant,
-        CORBA::Environment &_tao_environment
-      );
-    virtual void deactivate_object (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &_tao_environment
-      );
-    virtual CORBA::Object_ptr create_reference (
-        const char *intf,
-        CORBA::Environment &_tao_environment
-      );
-    virtual CORBA::Object_ptr create_reference_with_id (
-        const PortableServer::ObjectId & oid,
-        const char *intf,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ObjectId * servant_to_id (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &_tao_environment
-      );
-    virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Servant reference_to_servant (
-        CORBA::Object_ptr  reference,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ObjectId * reference_to_id (
-        CORBA::Object_ptr  reference,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &_tao_environment
-      );
-    virtual CORBA::Object_ptr id_to_reference (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    POA_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-  class Current;
-  typedef Current *Current_ptr;
-  class Current : public virtual CurrentBase
-  {
-  protected:
-    Current (void);
-      public:
-    virtual ~Current (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::POA_ptr  get_POA ( CORBA::Environment &env) = 0; // pure virtual
-    static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual PortableServer::ObjectId * get_object_id ( CORBA::Environment &env) = 0; // pure virtual
-    static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::Current *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_CURRENT___COLLOCATED_SH_)
-#define _PORTABLESERVER_CURRENT___COLLOCATED_SH_
-
-  class _tao_collocated_Current    : public virtual PortableServer::Current,
-      public virtual _tao_collocated_CurrentBase
-  {
-  public:
-    _tao_collocated_Current (
-        Current_ptr  servant,
-        STUB_Object *stub
-      );
-    Current_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::POA_ptr get_POA (
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::ObjectId * get_object_id (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    Current_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "POAS.i"
-#endif // defined INLINE
-
-
-#endif /* TAO_IDL_POAS_H */
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
deleted file mode 100644
index 781dfd5d1b7..00000000000
--- a/TAO/tao/POAS.i
+++ /dev/null
@@ -1,157 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::CurrentBase::~CurrentBase (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::Policy::~Policy (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
-{
-}
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
-{
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::POAManager::~POAManager (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::AdapterActivator::~AdapterActivator (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantManager::~ServantManager (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantActivator::~ServantActivator (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::ServantLocator::~ServantLocator (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::POA::~POA (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_PortableServer::Current::~Current (void)
-{
-}
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
deleted file mode 100644
index 877c01ddacb..00000000000
--- a/TAO/tao/Principal.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-// ORB:		Principal identifier pseudo-objref
-
-#include "tao/corba.h"
-
-void
-CORBA::release (CORBA::Principal_ptr principal)
-{
-  if (principal)
-    principal->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::Principal_ptr principal)
-{
-  return (CORBA::Boolean) (principal == 0);
-}
-
-CORBA_Principal::CORBA_Principal (void)
-{
-}
-
-CORBA_Principal::~CORBA_Principal (void)
-{
-  assert (refcount_ == 0);
-
-  if (id.buffer)
-    delete [] id.buffer;
-}
-
-CORBA::ULong
-CORBA_Principal::AddRef (void)
-{
-  return ++refcount_;
-}
-
-CORBA::ULong
-CORBA_Principal::Release (void)
-{
-  {
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
deleted file mode 100644
index 0de5dde1404..00000000000
--- a/TAO/tao/Principal.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    principal.h
-//
-// = DESCRIPTION
-//    The CORBA_Principal pseudo-object implementation.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_PRINCIPAL_H)
-#  define TAO_PRINCIPAL_H
-
-class TAO_Export CORBA_Principal
-{
-  // = TITLE
-  //    A "Principal" identifies an authenticated entity in the
-  //    network administration framework.  Identities are used to
-  //    control acccess (authorization) as well as in audit trails
-  //    (accountability).
-public:
-  // To applications, the identifier is an opaque ID.
-
-  //  CORBA::SEQUENCE <CORBA::Octet> id;
-  CORBA::OctetSeq id;
-
-  // @@ add "==", "<", ">" operators
-
-  // = Stuff required for memory management.
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-  CORBA_Principal (void);
-
-private:
-  CORBA::ULong refcount_;
-
-  ~CORBA_Principal (void);
-
-  // = these are not provided
-  CORBA_Principal &operator = (const CORBA::Principal_ptr &);
-  CORBA_Principal (const CORBA::Principal_ptr &);
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-#endif /* TAO_PRINCIPAL_H */
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
deleted file mode 100644
index 1ef67d282fa..00000000000
--- a/TAO/tao/Request.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA::ULong
-CORBA_Request::AddRef (void)
-{
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Request::Release (void)
-{
-  ACE_ASSERT (this != 0);
-
-  if (--refcount_ != 0)
-    return refcount_;
-
-  delete this;
-  return 0;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::Request_ptr req)
-{
-  if (req)
-    req->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::Request_ptr req)
-{
-  return (CORBA::Boolean) (req == 0);
-}
-
-
-// DII Request class implementation
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-                              const CORBA::Char *op,
-                              CORBA::NVList_ptr args,
-                              CORBA::NamedValue_ptr result,
-                              CORBA::Flags flags)
-  : args_ (args),
-    result_ (result),
-    flags_ (flags),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_copy (op);
-}
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-                              const CORBA::Char *op)
-  : flags_ (0),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_copy (op);
-
-  ACE_NEW (args_,
-           CORBA::NVList);
-  ACE_NEW (result_,
-           CORBA::NamedValue);
-
-  result_->AddRef ();
-}
-
-CORBA_Request::~CORBA_Request (void)
-{
-  assert (refcount_ == 0);
-
-  CORBA::release (this->target_);
-  CORBA::string_free ((CORBA::String) this->opname_);
-  this->opname_ = 0;
-  CORBA::release (this->args_);
-  CORBA::release (this->result_);
-}
-
-// The public DII interfaces:  normal and oneway calls.
-//
-// NOTE that using DII, programmers can get the special behaviour of
-// discarding the response for normal calls.  This doesn't change the
-// semantics of any OMG-IDL interface, it just streamlines control
-// flow in some exotic situations.
-
-void
-CORBA_Request::invoke (void)
-{
-  STUB_Object *stub = this->target_->_get_parent ();
-  stub->AddRef ();
-
-  stub->do_dynamic_call ((char *) opname_,
-                         CORBA::B_TRUE,
-                         args_,
-                         result_,
-                         flags_,
-                         exceptions_,
-                         env_);
-  stub->Release ();
-}
-
-void
-CORBA_Request::send_oneway (void)
-{
-  STUB_Object *stub = this->target_->_get_parent ();
-  stub->AddRef ();
-
-  stub->do_dynamic_call ((char *) opname_,
-                         CORBA::B_TRUE,
-                         args_,
-                         result_,
-                         flags_,
-                         exceptions_,
-                         env_);
-  stub->Release ();
-}
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
deleted file mode 100644
index de245329af1..00000000000
--- a/TAO/tao/Request.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Invocation Interface "Request"
-//    type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_REQUEST_H)
-#  define TAO_REQUEST_ H
-
-class TAO_Export CORBA_Request
-{
-  // = TITLE
-  //   CORBA_Request
-  // = DESCRIPTION
-  //   Provides a way to create requests and populate it with parameters for
-  //   use in the Dynamic Invocation Interface
-public:
-  CORBA::Object_ptr target (void) const;
-  // Return the target of this request.
-
-  const CORBA::Char *operation (void) const;
-  // Return the operation name for the request.
-
-  CORBA::NVList_ptr arguments (void);
-  // Return the arguments for the request.
-
-  CORBA::NamedValue_ptr result (void);
-  // Return the result for the request.
-
-  CORBA::ExceptionList_ptr exceptions (void);
-  // Return the exceptions resulting from this request.
-
-  CORBA::Environment *env (void);
-  // Return the <Environment> for this request.
-
-  void invoke (void);
-  // Perform method resolution and invoke an appropriate method. If
-  // the method returns successfully, its result is placed in the
-  // result argument specified on <create_request>. The behavior is
-  // undefined if this <Request> has already been used with a previous
-  // call to <invoke>, <send>, or <send_multiple_requests>.
-
-  void send_oneway (void);
-  // Send a oneway request.
-
-  // = Required for COM IUnknown support
-  CORBA::ULong AddRef (void);
-  CORBA::ULong Release (void);
-
-private:
-  friend class CORBA_Object;
-
-  // following are not allowed
-
-  CORBA_Request (CORBA::Object_ptr obj,
-                 const CORBA::Char *op,
-                 CORBA::NVList_ptr args,
-                 CORBA::NamedValue_ptr result,
-                 CORBA::Flags flags);
-
-  CORBA_Request (CORBA::Object_ptr obj,
-                 const CORBA::Char *op);
-
-  ~CORBA_Request (void);
-
-  CORBA::Object_ptr target_;
-  // target object
-
-  const CORBA::Char *opname_;
-  // operation name
-
-  CORBA::NVList_ptr args_;
-  // parameter list
-
-  CORBA::NamedValue_ptr result_;
-  // result of the operation
-
-  CORBA::Flags flags_;
-  // invocation flags
-
-  CORBA::Environment env_;
-  // holds exceptions
-
-  CORBA::ExceptionList exceptions_;
-  // list of exceptions raised by the operation
-
-  CORBA::ULong refcount_;
-  // reference counting
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Request.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/Request.i b/TAO/tao/Request.i
deleted file mode 100644
index 91fc13f1efe..00000000000
--- a/TAO/tao/Request.i
+++ /dev/null
@@ -1,44 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// Return the target of this request.
-
-ACE_INLINE CORBA::Object_ptr 
-CORBA_Request::target (void) const 
-{ 
-  return target_; 
-}
-
-// Return the operation name for the request.
-ACE_INLINE const CORBA::Char *
-CORBA_Request::operation (void) const 
-{
-  return opname_; 
-}
-
-// Return the arguments for the request.
-ACE_INLINE CORBA::NVList_ptr 
-CORBA_Request::arguments (void) 
-{ 
-  return args_; 
-}
-
-// Return the result for the request.
-ACE_INLINE CORBA::NamedValue_ptr 
-CORBA_Request::result (void) 
-{
-  return result_; 
-}
-
-// Return the exceptions resulting from this request.
-ACE_INLINE CORBA::ExceptionList_ptr 
-CORBA_Request::exceptions (void) 
-{ 
-  return &exceptions_; 
-}
-
-// Return the <Environment> for this request.
-ACE_INLINE CORBA::Environment *
-CORBA_Request::env (void) 
-{
-  return &env_; 
-}
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
deleted file mode 100644
index 42258139c90..00000000000
--- a/TAO/tao/Sequence.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-// *************************************************************
-// Operations for class TAO_Base_Sequence
-// *************************************************************
-
-TAO_Base_Sequence::~TAO_Base_Sequence (void)
-{
-}
-
-void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
-{
-  // default is no op.
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Base_Sequence
-// *************************************************************
-
-TAO_Unbounded_Base_Sequence::~TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Base_Sequence
-// *************************************************************
-
-TAO_Bounded_Base_Sequence::~TAO_Bounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-// Operations for class TAO_String_Manager
-// *************************************************************
-
-// assignment
-TAO_String_Manager&
-TAO_String_Manager::operator=(const TAO_String_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      CORBA::string_free (*this->ptr_);
-      *this->ptr_ = CORBA::string_dup (*rhs.ptr_);
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
-    }
-  return *this;
-}
-
-// assignment from char*
-TAO_String_Manager &
-TAO_String_Manager::operator= (const char * p)
-{
-  if (this->release_)
-    {
-      CORBA::string_free (*this->ptr_);
-      *this->ptr_ = CORBA::string_dup (p);
-    }
-  else
-    {
-      // @@ TODO find out why was this cast needed.
-      *this->ptr_ = ACE_const_cast(char*,p);
-    }
-  return *this;
-}
-
-// *************************************************************
-
-// constructor for unbounded seq
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_String_Sequence::allocbuf (maximum))
-{
-}
-
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (const TAO_Unbounded_String_Sequence &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  char* *tmp1 = TAO_Unbounded_String_Sequence::allocbuf (this->maximum_);
-  char ** const tmp2 =
-    ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-TAO_Unbounded_String_Sequence::~TAO_Unbounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-TAO_Unbounded_String_Sequence&
-TAO_Unbounded_String_Sequence::
-operator= (const TAO_Unbounded_String_Sequence &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the older buffer
-          TAO_Unbounded_String_Sequence::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  return *this;
-}
-
-char* *
-TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
-{
-  char* *buf = new char*[nelems];
-  for (CORBA::ULong i=0; i < nelems; i++)
-    buf[i] = 0;
-  return buf;
-}
-
-void
-TAO_Unbounded_String_Sequence::freebuf (char* *buffer)
-{
-  if (buffer == 0)
-    return;
-
-  // {orbos/97-05-15:16.11}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  //  Mark the length in the first four bytes? For the moment we let
-  //  that be.
-
-  delete[] buffer;
-}
-
-void
-TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
-{
-  char* *tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      char* *old = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also
-        // own the objects.  If we already own the objects there is
-        // no need to copy them, if we did we would also have to
-        // remove the old instances.
-        if (!this->release_)
-          tmp [i] = CORBA::string_dup (old[i]);
-        else
-          tmp [i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-  this->buffer_ = tmp;
-}
-
-void
-TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-  for (CORBA::ULong i = 0;
-       i < this->length_;
-       ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_String_Sequence::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-void
-TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
-                                               CORBA::ULong ol)
-{
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
deleted file mode 100644
index 7d7c62bd921..00000000000
--- a/TAO/tao/Sequence.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence.h
-//
-// = AUTHOR
-//
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_SEQUENCE_H)
-#  define TAO_SEQUENCE_H
-
-class TAO_Export TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for TAO sequences.
-  //
-  // = DESCRIPTION
-  //   This class provides a common interface for all IDL sequences,
-  //   hence the interpreted marshal engine can manipulate them in a
-  //   type safe manner.
-public:
-  friend class TAO_Marshal_Sequence;
-  // We give access to TAO_Marshal_Sequence, this allows a safe yet
-  // small footprint implementation of the marshal engine.
-
-  virtual ~TAO_Base_Sequence (void);
-  // destructor.
-
-  CORBA::ULong maximum (void) const;
-  // return the maximum length of the sequence
-
-  virtual void _allocate_buffer (CORBA::ULong length) = 0;
-  // Ensure that the buffer contains space for at least <length>
-  // elements.  The constructor must be called for any new elements,
-  // the old ones (if any) must be copied into the buffer using
-  // operator= and then their destructors must be called.
-  // Finally the old buffer must be released.
-
-  virtual void _deallocate_buffer (void) = 0;
-  // Must deallocate the buffer and then set it to zero.
-
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-  // Some sequences (of objects and strings) require some cleanup if
-  // the sequence is shrunk. The spec requires the destructor to
-  // release the objects only from position <0> to <length-1>; so
-  // shrink and then delete could result in a memory leak.
-
-protected:
-  TAO_Base_Sequence (void);
-  // Default constructor.
-
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     CORBA::ULong length,
-                     void *buffer,
-                     CORBA::Boolean release = CORBA::B_FALSE);
-  // Constructor with control of ownership.
-
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     void *buffer);
-  // Assume ownership and set length to 0.
-
-  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
-  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
-  // Copy constructor and assignment operator are protected, the
-  // derived classes must provided the right semantics for the buffer
-  // copy, only the static fields are actually copy.
-
-  // = orbos/98-01-11 proposed extensions.
-  CORBA::Boolean release (void) const;
-  // Returns the state of the sequence release flag.
-
-protected:
-  CORBA::ULong maximum_;
-  // The maximum number of elements the buffer can contain.
-
-  CORBA::ULong length_;
-  // The current number of elements in the buffer.
-
-  void *buffer_;
-  // The buffer with all the elements, casting must be done in derived
-  // classes.
-
-  CORBA::Boolean release_;
-  // If true then the sequence should release the buffer when it is
-  // destroyed.
-};
-
-class TAO_Export TAO_Unbounded_Base_Sequence : public TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for all bounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class implements part of the funcionality common to all
-  //   bounded sequences, using this intermediate class instead of
-  //   virtual methods on TAO_Base_Sequence give us a slight
-  //   improvement of performance, but also reduces the amount of
-  //   generated code in the templates.
-public:
-  void length (CORBA::ULong length);
-  // = SPEC {16.11.2}
-  // For an unbounded sequence, setting the length to a larger value
-  // than the current length may reallocate the sequence
-  // data. Reallocation is conceptually equivalent to creating a new
-  // sequence of the desired new length, copying the old sequence
-  // elements zero through length into the new sequence, and then
-  // assigning the old sequence to be the same as the new sequence.
-
-  CORBA::ULong length (void) const;
-  // return the current length, it cannot go into the base class due
-  // to the C++ name lookup rules (if you don't know what I'm talking
-  // about, then try moving it there).
-
-protected:
-  TAO_Unbounded_Base_Sequence (void);
-  // Default constructor.
-
-  virtual ~TAO_Unbounded_Base_Sequence (void);
-  // destructor.
-
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               void *buffer,
-                               CORBA::Boolean release = 0);
-  // Constructor with control of ownership.
-
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               void *buffer);
-  // Assume ownership and set length to 0.
-};
-
-class TAO_Export TAO_Bounded_Base_Sequence : public TAO_Base_Sequence
-{
-  // = TITLE
-  //   Base class for all bounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class implements part of the funcionality common to all
-  //   bounded sequences, using this intermediate class instead of
-  //   virtual methods on TAO_Base_Sequence give us a slight
-  //   improvement of performance, but also reduces the amount of
-  //   generated code in the templates.
-public:
-  void length (CORBA::ULong length);
-  // set the length, for this sequences this call is ignored if the
-  // new length is greater that the maximum.
-
-  CORBA::ULong length (void) const;
-  // return the current length, it cannot go into the base class due
-  // to the C++ name lookup rules (if you don't know what I'm talking
-  // about, then try moving it there).
-
-protected:
-  TAO_Bounded_Base_Sequence (void);
-  // Default constructor.
-
-  virtual ~TAO_Bounded_Base_Sequence (void);
-  // destructor.
-
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void *buffer,
-                             CORBA::Boolean release = 0);
-  // Constructor with control of ownership.
-
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             void *buffer);
-  // Assume ownership and set length to 0.
-};
-
-/****************************************************************/
-
-class TAO_Export TAO_String_Manager
-{
-  // = TITLE
-  //   Manager for strings.
-  //
-  // = DESCRIPTION
-  //   Similar to the mapping for sequences of objects (and other
-  //   pseudo objects) the mapping for sequences of strings requires
-  //   an auxiliar class or <Manager> to handle the allocation and
-  //   deallocation of the string.  The main difference with respect
-  //   to String_var classes is that automatic release is not
-  //   controlled on a per-item basis, but for the sequence as a
-  //   whole.  The difference wrt Object_Manager is that strings are
-  //   duplicated using CORBA::string_copy() as opposed to
-  //   T::_duplicate(), and released using CORBA::string_free()
-  //   instead of CORBA::release()
-  //
-  //   This class implements the generic string manager and is used to
-  //   instantiate the proper sequence types.
-  //
-public:
-  friend class TAO_Unbounded_String_Sequence;
-
-  // @@ Giving friendship to a template is not implemented on several
-  // compilers:
-  // friend template<CORBA::ULong MAX>
-  //   class TAO_Bounded_String_Sequence<TAO_String_Manager,MAX>;
-
-  TAO_String_Manager (const TAO_String_Manager &);
-  // copy constructor
-
-  TAO_String_Manager (char **buffer, CORBA::Boolean release);
-  // constructor from address of an element
-
-  ~TAO_String_Manager (void);
-  // destructor
-
-  TAO_String_Manager &operator= (const TAO_String_Manager&);
-  // assignment from another managed type
-
-  TAO_String_Manager &operator= (const char *);
-  // assignment from a constant char*
-
-  operator const char*() const;
-  // cast  (read-only)
-
-private:
-  char **ptr_;
-  // Address of string element from the parent's buffer.
-
-  CORBA::Boolean release_;
-  // control memory managment semantics.
-};
-
-class TAO_Export TAO_Unbounded_String_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // =TITLE
-  //  Unbounded sequence of strings.
-  //
-  // =DESCRIPTION
-  //  IDL sequences of strings must automatically duplicate and
-  //  release their members based on some global <release> flag.
-
-  // = SPEC
-  // 16.8 Mapping for Structured Types
-  // The mapping for struct, union, and sequence (but not array) is a
-  // C++ struct or class with a default constructor, a copy
-  // constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Operations for the Unbounded_ObjectSequence
-
-  TAO_Unbounded_String_Sequence (void);
-  // {orbos/97-05-15:16.8}
-  // The default constructor initializes object reference members to
-  // appropriately typed nil object references and string members to
-  // NULL; all other members are initialized via their default
-  // constructors.
-  //
-  // {orbos/97-05-15:16.11}
-  // For both bounded and unbounded sequences, the default constructor
-  // (as shown in the example above) sets the sequence length equal to
-  // 0.
-
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum);
-  // Unbounded sequences provide a constructor that allows only the
-  // initial value of the maximum length to be set (the ``maximum
-  // constructor'' shown in the example above). This allows
-  // applications to control how much buffer space is initially
-  // allocated by the sequence. This constructor also sets the length
-  // to 0 and the release flag to TRUE.
-
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 char **data,
-                                 CORBA::Boolean release=0);
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage.
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it.
-
-  TAO_Unbounded_String_Sequence(const TAO_Unbounded_String_Sequence&);
-  // The copy constructor performs a deep copy from the existing
-  // structure to create a new structure, including calling _duplicate
-  // on all object  reference members and performing the necessary
-  // heap allocations for all string members.
-  //
-  // The copy constructor creates a new sequence with the same maximum
-  // and length as the given sequence, copies each of its current
-  // elements (items zero through length-1), and sets the release
-  // flag to TRUE.
-
-  ~TAO_Unbounded_String_Sequence (void);
-  // The destructor releases all object reference members and frees
-  // all string members.
-
-  TAO_Unbounded_String_Sequence &operator= (const TAO_Unbounded_String_Sequence &);
-  // The assignment operator first releases all object reference
-  // members and frees all string  members, and then performs a
-  // deep­copy to create a new structure.
-  //
-  // The assignment operator deep­copies its parameter, releasing
-  // old storage if necessary. It behaves as if the original sequence
-  // is destroyed via its destructor and then the source sequence
-  // copied using the copy constructor. If release=TRUE, the
-  // destructor destroys each of the current elements (items zero
-  // through length--1).
-  // For an unbounded sequence, if a reallocation is necessary due to
-  // a change in the length and the sequence was created using the
-  // release=TRUE parameter in its constructor, the sequence will
-  // deallocate the old storage. If release is FALSE under these
-  // circumstances, old storage will not be freed before the
-  // reallocation is performed. After reallocation, the release flag
-  // is always set to TRUE.
-
-  TAO_String_Manager operator[] (CORBA::ULong index) const;
-  // read-write accessor
-
-  static char* *allocbuf (CORBA::ULong);
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function.
-
-  static void freebuf (char **);
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
deleted file mode 100644
index 206a4b76752..00000000000
--- a/TAO/tao/Sequence.i
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale and Carlos O'Ryan
-//
-// ============================================================================
-
-// Operations on the unbounded sequence class.
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (void)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (CORBA::B_FALSE)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      CORBA::ULong length,
-                                      void *buffer,
-                                      CORBA::Boolean release)
-  : maximum_ (maximum),
-    length_ (length),
-    buffer_ (buffer),
-    release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      void *data)
-  : maximum_ (maximum),
-    length_ (0),
-    buffer_ (data),
-    release_ (CORBA::B_TRUE)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
-  : maximum_ (rhs.maximum_),
-    length_ (rhs.length_),
-    release_ (CORBA::B_TRUE)
-{
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Base_Sequence::release (void) const
-{
-  return this->release_;
-}
-
-ACE_INLINE TAO_Base_Sequence &
-TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
-{
-  this->maximum_ = rhs.maximum_;
-  this->length_ = rhs.length_;
-  this->release_ = CORBA::B_TRUE;
-  return *this;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Base_Sequence::maximum (void) const
-{
-  return this->maximum_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void* buffer,
-                             CORBA::Boolean release)
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             void* buffer)
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Unbounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE void
-TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-    {
-      this->_allocate_buffer (length);
-      this->maximum_ = length;
-      this->release_ = CORBA::B_TRUE;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           CORBA::ULong length,
-                           void* buffer,
-                           CORBA::Boolean release)
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           void* buffer)
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Bounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE void
-TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-    {
-      return;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager (char **buffer,
-                                        CORBA::Boolean release)
-  :  ptr_ (buffer),
-     release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager(const TAO_String_Manager &rhs)
-  :  ptr_ (rhs.ptr_),
-     release_ (rhs.release_)
-{
-}
-
-ACE_INLINE
-TAO_String_Manager::~TAO_String_Manager (void)
-{
-}
-
-ACE_INLINE
-TAO_String_Manager::operator const char* (void) const
-{
-  return *this->ptr_;
-}
-
-// ****************************************************************
-
-//default constructor
-ACE_INLINE
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               char* *value,
-                               CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE TAO_String_Manager
-TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  char **const tmp =
-    ACE_reinterpret_cast (char **ACE_CAST_CONST, this->buffer_);
-  return TAO_String_Manager (tmp + index, this->release_);
-}
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
deleted file mode 100644
index 097df14b76c..00000000000
--- a/TAO/tao/Sequence_T.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-// $Id$
-
-#if !defined (TAO_SEQUENCE_T_C)
-#define TAO_SEQUENCE_T_C
-
-#include "tao/Sequence_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-#endif /* __ACE_INLINE__ */
-
-template <class T>
-TAO_Unbounded_Sequence<T>::
-TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  T *tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-template <class T> TAO_Unbounded_Sequence<T> &
-TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          T *tmp = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
-          TAO_Unbounded_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T *tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-template<class T>
-TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<class T>
-void TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
-{
-  T* tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T *old = ACE_reinterpret_cast (T *,
-                                     this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-
-  this->buffer_ = tmp;
-}
-
-template<class T>
-void TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
-
-  TAO_Unbounded_Sequence<T>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-// ****************************************************************
-// Bounded_Sequence
-// ****************************************************************
-
-template <class T, CORBA::ULong MAX>
-TAO_Bounded_Sequence<T, MAX>::
-TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T, MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  T *tmp1 = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
-
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-template <class T, CORBA::ULong MAX> TAO_Bounded_Sequence<T, MAX> &
-TAO_Bounded_Sequence<T, MAX>::
-operator= (const TAO_Bounded_Sequence<T, MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-#if 0
-      // We never need to reallocate the buffer because they are
-      // always of size MAX.
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          T *tmp = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
-          TAO_Bounded_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Bounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-#endif /* 0 */
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T* tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T* const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-template<class T, CORBA::ULong MAX>
-TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<class T, CORBA::ULong MAX>
-void TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
-}
-
-template<class T, CORBA::ULong MAX>
-void TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
-  TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-// *************************************************************
-// class TAO_Object_Manager
-// *************************************************************
-
-template <class T>
-TAO_Object_Manager<T>&
-TAO_Object_Manager<T>::operator= (const TAO_Object_Manager<T> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (*rhs.ptr_);
-    }
-  else
-    *this->ptr_ = *rhs.ptr_;
-
-  return *this;
-}
-
-template <class T>
-TAO_Object_Manager<T> &
-TAO_Object_Manager<T>::operator=(T* p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    *this->ptr_ = p;
-
-  return *this;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-// constructor for unbounded seq
-template <class T>
-TAO_Unbounded_Object_Sequence<T>::
-TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Object_Sequence<T>::allocbuf (maximum))
-{
-}
-
-template <class T>
-TAO_Unbounded_Object_Sequence<T>::
-TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T> &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  T **tmp1 = TAO_Unbounded_Object_Sequence<T>::allocbuf (this->maximum_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-template<class T>
-TAO_Unbounded_Object_Sequence<T>::~TAO_Unbounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-// assignment operator
-template <class T>
-TAO_Unbounded_Object_Sequence<T>&
-TAO_Unbounded_Object_Sequence<T>::
-operator= (const TAO_Unbounded_Object_Sequence<T> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Object_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ =
-      TAO_Unbounded_Object_Sequence<T>::allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-
-  return *this;
-}
-
-template <class T> T **
-TAO_Unbounded_Object_Sequence<T>::allocbuf (CORBA::ULong nelems)
-{
-  T **buf;
-
-  ACE_NEW_RETURN (buf, T*[nelems], 0);
-
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T> void
-TAO_Unbounded_Object_Sequence<T>::freebuf (T **buffer)
-{
-  if (buffer == 0)
-    return;
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete[] buffer;
-}
-
-template<class T>
-void TAO_Unbounded_Object_Sequence<T>::_allocate_buffer (CORBA::ULong length)
-{
-  T **tmp = TAO_Unbounded_Object_Sequence<T>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T **old = ACE_reinterpret_cast (T**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          tmp[i] = T::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
-      if (this->release_)
-        delete[] old;
-    }
-  this->buffer_ = tmp;
-}
-
-template<class T>
-void TAO_Unbounded_Object_Sequence<T>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T**, this->buffer_);
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-  TAO_Unbounded_Object_Sequence<T>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T> void
-TAO_Unbounded_Object_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  T **tmp = ACE_reinterpret_cast (T**, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template <class T, CORBA::ULong MAX>
-TAO_Bounded_Object_Sequence<T, MAX>::
-TAO_Bounded_Object_Sequence (void)
-  :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (MAX))
-{
-}
-
-template <class T, CORBA::ULong MAX>
-TAO_Bounded_Object_Sequence<T, MAX>::
-TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  T **tmp1 =
-    TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (MAX);
-  T ** const tmp2 = ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i = 0; i < rhs.length_; i++)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  this->buffer_ = tmp1;
-}
-
-template <class T, CORBA::ULong MAX>
-TAO_Bounded_Object_Sequence<T, MAX>&
-TAO_Bounded_Object_Sequence<T, MAX>::operator=
-(const TAO_Bounded_Object_Sequence<T, MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-#if 0
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Bounded_Object_Sequence<T, MAX>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (rhs.maximum_);
-        }
-#endif /* 0 */
-    }
-  else
-    this->buffer_ =
-      TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
-  return *this;
-}
-
-template <class T, CORBA::ULong MAX> T **
-TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (CORBA::ULong)
-{
-  T **buf;
-
-  ACE_NEW_RETURN (buf, T*[MAX], 0);
-
-  for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = T::_nil ();
-
-  return buf;
-}
-
-template <class T, CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T, MAX>::freebuf (T **buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    if (buffer[i] != T::_nil ())
-      {
-        CORBA::release (buffer[i]);
-        buffer[i] = T::_nil ();
-      }
-
-  delete[] buffer;
-}
-
-template<class T, CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong length)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (length);
-}
-
-template<class T, CORBA::ULong MAX>
-void TAO_Bounded_Object_Sequence<T, MAX>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-  TAO_Bounded_Object_Sequence<T, MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<class T, CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T, MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                     CORBA::ULong ol)
-{
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<CORBA::ULong MAX>
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (void)
-  :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_String_Sequence<MAX>::allocbuf(MAX))
-{
-}
-
-template<CORBA::ULong MAX>
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &rhs)
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  char **tmp1 =
-    TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-
-  for (CORBA::ULong i=0; i < rhs.length_; i++)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-
-  this->buffer_ = tmp1;
-}
-
-template<CORBA::ULong MAX>
-TAO_Bounded_String_Sequence<MAX>&
-TAO_Bounded_String_Sequence<MAX>::operator=
-(const TAO_Bounded_String_Sequence<MAX> &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-#if 0
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Bounded_String_Sequence<T, MAX>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence<T, MAX>::allocbuf (rhs.maximum_);
-        }
-#endif /* 0 */
-    }
-  else
-    this->buffer_ =
-      TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
-  char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                             rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; i++)
-    tmp1[i] = CORBA::string_dup (tmp2[i]);
-  return *this;
-}
-
-template<CORBA::ULong MAX> char **
-TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
-{
-  char **buf;
-
-  ACE_NEW_RETURN (buf, char *[MAX], 0);
-
-  for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = 0;
-
-  return buf;
-}
-
-template<CORBA::ULong MAX> void
-TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
-{
-  // How much do we deallocate? Easy! <allocbuf> always creates MAX
-  // elements and initialize them to 0 (they say NULL, yuck!).  So we
-  // can be complaint and call CORBA::string_free() on each one.
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          CORBA::string_free (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template<CORBA::ULong MAX> void
-TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong length)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
-}
-
-template<CORBA::ULong MAX>
-void TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
-  TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template<CORBA::ULong MAX> void
-TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  char **tmp = ACE_reinterpret_cast (char **,
-                                     this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-#endif /* TAO_SEQUENCE_T_C */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
deleted file mode 100644
index 397521694f1..00000000000
--- a/TAO/tao/Sequence_T.h
+++ /dev/null
@@ -1,568 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence_T.h
-//
-// = AUTHOR
-//    Carlos O'Ryan and Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_SEQUENCE_T_H)
-#define TAO_SEQUENCE_T_H
-
-template <class T>
-class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametrized implementation of IDL unbounded sequences.
-  //
-  // = DESCRIPTION
-  //   This class completes the implementation for TAO_Base_Sequence
-  //   for the unbounded case.
-public:
-  // = Initialization and termination methods.
-
-  TAO_Unbounded_Sequence (void);
-  // Default constructor.
-
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-  // Constructor using a maximum length value.
-
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-			  CORBA::ULong length,
-			  T *data,
-			  CORBA::Boolean release = 0);
-  // Constructor using the data and memory management flag.  Memory
-  // *must* be allocated using the ::allocbuf static method, since in
-  // the future this classes may use a global ACE_Allocator.
-
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &);
-  // Copy constructor.
-
-  TAO_Unbounded_Sequence<T> &operator= (const TAO_Unbounded_Sequence<T> &);
-  // Assignment operator.
-
-  ~TAO_Unbounded_Sequence (void);
-  // Dtor.
-
-  // = Accessors.
-
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // = Static operations.
-
-  static T *allocbuf (CORBA::ULong);
-  // Allocate storage for the sequence.
-
-  static void freebuf (T *);
-  // Free the sequence.
-
-  // @@ What do these methods do? (i.e., please add comments).
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  T *get_buffer (CORBA::Boolean orphan = CORBA::B_FALSE);
-  // Allows read-write access to the underlying buffer.  If <orphan>
-  // is FALSE the sequence returns a pointer to its buffer, allocating
-  // one if it has not yet done so.  The number of elements in the
-  // buffer can be determined from the sequence <length> accessor.
-  // 
-  // If the <orphan> argument to <get_buffer> is FALSE, the sequence
-  // maintains ownership of the underlying buffer.  Elements in the
-  // returned buffer may be directly replaced by the caller.  For
-  // sequences of strings, wide strings, and object references, the
-  // caller must use the sequence <release> accessor to determine
-  // whether elements should be freed (using <string_free>,
-  // <wstring_free>, or <CORBA::release> for strings, wide straings,
-  // and object references, respective) before being directly assigned
-  // to.
-  //
-  // If the <orphan> argument to <get_buffer> is TRUE, the sequence
-  // yields ownership of the buffer to the caller.  If <orphan> is
-  // TRUE and the sequence does not own its buffer (i.e., its
-  // <release> flag is FALSE), the return value is a null pointer.  If
-  // the buffer is taken from the sequence using this form of
-  // <get_buffer>, the sequence reverts to the same state it would
-  // have if constructed using its default constructor.  The caller
-  // becomes responsible for eventually freeing each element of the
-  // returned buffer (for strings, wide string, and object
-  // references), and then freeing the returned buffer itself using
-  // <freebuf>.
-
-  const T *get_buffer (void) const;
-  // This function allows read-only access to the sequence buffer.
-  // The sequence returns its buffer, allocating one of one has not
-  // yet been allocated.  No direct modification of the returned
-  // buffer by the caller is permitted.
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = CORBA::B_FALSE);
-  // Allows the buffer underlying a sequence to be replaced.  The
-  // parameters to <replace> are identical in type, order, and purpose
-  // to those for the <T *data> constructor for the sequence.
-};
-
-template <class T, CORBA::ULong MAX>
-class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric bounded sequence.
-  //
-  // = DESCRIPTION
-  //   This class completes the implementation for TAO_Base_Sequence
-  //   for the bounded case.
-public:
-  // = Initialization and termination methods.
-  TAO_Bounded_Sequence (void);
-  // Default constructor.
-
-  TAO_Bounded_Sequence (CORBA::ULong length,
-                        T *data,
-			CORBA::Boolean release=0);
-  // Constructor using the data and memory management flag.
-
-  TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
-  // Copy constructor.
-
-  TAO_Bounded_Sequence<T,MAX> &operator= (const TAO_Bounded_Sequence<T,MAX> &);
-  // Assignment operator.
-
-  ~TAO_Bounded_Sequence (void);
-  // Dtor.
-
-  // = Accessors.
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // = Static operations.
-
-  static T *allocbuf (CORBA::ULong);
-  // Allocate storage for the sequence.
-
-  static void freebuf (T *);
-  // Free the sequence.
-
-  // @@ Please document me.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  T *get_buffer (CORBA::Boolean orphan = CORBA::B_FALSE);
-  // Allows read-write access to the underlying buffer.  If <orphan>
-  // is FALSE the sequence returns a pointer to its buffer, allocating
-  // one if it has not yet done so.  The size of the returned buffer
-  // is equal to the sequence bound, which can be determined with the
-  // <maximum> accessor.  The number of elements in the buffer can be
-  // determined from the sequence <length> accessor.  
-  // 
-  // If the <orphan> argument to <get_buffer> is FALSE, the sequence
-  // maintains ownership of the underlying buffer.  Elements in the
-  // returned buffer may be directly replaced by the caller.  For
-  // sequences of strings, wide strings, and object references, the
-  // caller must use the sequence <release> accessor to determine
-  // whether elements should be freed (using <string_free>,
-  // <wstring_free>, or <CORBA::release> for strings, wide straings,
-  // and object references, respective) before being directly assigned
-  // to.
-  //
-  // If the <orphan> argument to <get_buffer> is TRUE, the sequence
-  // yields ownership of the buffer to the caller.  If <orphan> is
-  // TRUE and the sequence does not own its buffer (i.e., its
-  // <release> flag is FALSE), the return value is a null pointer.  If
-  // the buffer is taken from the sequence using this form of
-  // <get_buffer>, the sequence reverts to the same state it would
-  // have if constructed using its default constructor.  The caller
-  // becomes responsible for eventually freeing each element of the
-  // returned buffer (for strings, wide string, and object
-  // references), and then freeing the returned buffer itself using
-  // <freebuf>.
-
-  const T *get_buffer (void) const;
-  // This function allows read-only access to the sequence buffer.
-  // The sequence returns its buffer, allocating one of one has not
-  // yet been allocated.  No direct modification of the returned
-  // buffer by the caller is permitted.
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = CORBA::B_FALSE);
-  // Allows the buffer underlying a sequence to be replaced.  The
-  // parameters to <replace> are identical in type, order, and purpose
-  // to those for the <T *data> constructor for the sequence.
-};
-
-// *************************************************************
-
-template<class T> class TAO_Unbounded_Object_Sequence;
-template<class T, CORBA::ULong MAX> class TAO_Bounded_Object_Sequence;
-template<CORBA::ULong MAX> class TAO_Bounded_String_Sequence;
-
-// *************************************************************
-
-template<class T>
-class TAO_Object_Manager
-{
-  // = TITLE
-  //   Manager for Objects.
-  //
-  // = DESCRIPTION
-  //   The mapping for sequences of objects (and other pseudo objects)
-  //   requires an auxiliar class or <Manager> to handle the reference
-  //   count on the object, (a kind of smart pointer).
-  //   The main difference with respect to T_var classes is that
-  //   automatic release is not controlled on a per-item basis, but
-  //   for the sequence as a whole.
-  //   Further the class must implement "transparent" assignment into
-  //   the sequence, for instance, operator[] returns a managed
-  //   object, but:
-  //
-  //      object_sequence[i] = foo;
-  //
-  //   must change the state of the sequence.
-  //
-  //   This class implements the generic object manager and is used to
-  //   instantiate the proper sequence types.
-  //
-  // = NOTES
-  //   It has been proposed that the class should be parametric on
-  //   both T and T_ptr, IMHO this is no necesary: though the IDL spec
-  //   says that T_ptr *could* map to a type different to T* in the
-  //   particular case of TAO it does map to <T*>.
-  //
-  friend class TAO_Unbounded_Object_Sequence<T>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  TAO_Object_Manager (const TAO_Object_Manager<T> &rhs);
-  // Copy constructor, the semantics are non-trivial:
-  //   + The referenced element is duplicated or not according to the
-  //   release value on the <rhs>.
-  //   + In any case a new reference to the same object is created.
-
-  TAO_Object_Manager (T **, CORBA::Boolean release);
-  // Constructor from address of an element, it should be private and
-  // only TAO_*_Object_Sequence would use it, but we have some
-  // problems with friendship and templates.
-
-  ~TAO_Object_Manager (void);
-  // Destructor, only releases the object if <release_> is true.
-
-  TAO_Object_Manager<T> &operator= (const TAO_Object_Manager<T> &rhs);
-  // Assignment from another managed type, only release if
-  // <this->release_> is true.
-  // @@ TODO what happens if rhs.release_ is true an this->relase_ is
-  // false?
-
-  TAO_Object_Manager<T> &operator= (T *);
-  // Assignment from T *.
-
-  operator const T *() const;
-  // Cast (read-only).
-
-  operator T *&();
-  // Cast.
-
-private:
-  T **ptr_;
-  // data member, notice that it is a pointer, to implement the
-  // reference behavior for assignment.
-
-  CORBA::Boolean release_;
-  // release flag based on parent's flag
-};
-
-// *************************************************************
-
-template<class T>
-class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric sequence for types that require managers.
-  //
-  // = DESCRIPTION
-  //   Some IDL types require that sequences on them have a "manager"
-  //   class, in charge of handling the object lifetime, examples are
-  //   pseudo objects, object references and strings.
-
-  // = SPEC
-  // 16.8 Mapping for Structured Types 
-  // The mapping for struct, union, and sequence (but not array) is a
-  // C++ struct or class with a default constructor, a copy
-  // constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Initialization and termination methods.
-
-  TAO_Unbounded_Object_Sequence (void);
-  // {orbos/97-05-15:16.8}
-  // The default constructor initializes object reference members to
-  // appropriately typed nil object references and string members to
-  // NULL; all other members are initialized via their default
-  // constructors.
-  //
-  // {orbos/97-05-15:16.11}
-  // For both bounded and unbounded sequences, the default constructor
-  // (as shown in the example above) sets the sequence length equal to
-  // 0.
-
-  TAO_Unbounded_Object_Sequence (CORBA::ULong max);
-  // Unbounded sequences provide a constructor that allows only the
-  // initial value of the maximum length to be set (the ``maximum
-  // constructor'' shown in the example above). This allows
-  // applications to control how much buffer space is initially
-  // allocated by the sequence. This constructor also sets the length
-  // to 0 and the release flag to TRUE. 
-
-  TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-				 CORBA::ULong length,
-				 T* *data,
-				 CORBA::Boolean release=0);
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage. 
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it. 
-
-  TAO_Unbounded_Object_Sequence(const TAO_Unbounded_Object_Sequence<T> &);
-  // The copy constructor performs a deep copy from the existing
-  // structure to create a new structure, including calling _duplicate
-  // on all object  reference members and performing the necessary
-  // heap allocations for all string members.
-  //
-  // The copy constructor creates a new sequence with the same maximum
-  // and length as the given sequence, copies each of its current
-  // elements (items zero through length-1), and sets the release
-  // flag to TRUE. 
-
-  ~TAO_Unbounded_Object_Sequence (void);
-  // The destructor releases all object reference memebrs and frees
-  // all string members.
-
-  TAO_Unbounded_Object_Sequence<T> &operator= (const TAO_Unbounded_Object_Sequence <T> &);
-  // The assignment operator first releases all object reference
-  // members and frees all string members, and then performs a
-  // deepcopy to create a new structure.
-  //
-  // The assignment operator deepcopies its parameter, releasing old
-  // storage if necessary. It behaves as if the original sequence is
-  // destroyed via its destructor and then the source sequence copied
-  // using the copy constructor. If release=TRUE, the destructor
-  // destroys each of the current elements (items zero through
-  // length--1).  For an unbounded sequence, if a reallocation is
-  // necessary due to a change in the length and the sequence was
-  // created using the release=TRUE parameter in its constructor, the
-  // sequence will deallocate the old storage. If release is FALSE
-  // under these circumstances, old storage will not be freed before
-  // the reallocation is performed. After reallocation, the release
-  // flag is always set to TRUE.
-
-  TAO_Object_Manager<T> operator[] (CORBA::ULong index) const;
-  // read-write accessor
-
-  static T **allocbuf (CORBA::ULong);
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function.
-
-  static void freebuf (T **);
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-template<class T, CORBA::ULong MAX>
-class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Parametric sequence for types that require managers.
-  //
-  // = DESCRIPTION
-  //   Some IDL types require that sequences on them have a "manager"
-  //   class, in charge of handling the object lifetime, examples are
-  //   pseudo objects, object references and strings.
-public:
-  // = Initialization and termination methods.
-
-  TAO_Bounded_Object_Sequence (void);
-  // For bounded sequences, the maximum length is part of the type and
-  // cannot be set or modified, while for unbounded sequences, the
-  // default constructor also sets the maximum length to 0. The
-  // default constructor for a bounded sequence always allocates a
-  // contents vector, so it always sets the release flag to TRUE.
-
-  TAO_Bounded_Object_Sequence (CORBA::ULong length,
-			       T* *value,
-			       CORBA::Boolean release=0);
-  // Constructor from data.
-
-  TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,MAX> &);
-  // Copy constructor.
-
-  ~TAO_Bounded_Object_Sequence (void);
-  // destructor
-
-  TAO_Bounded_Object_Sequence &operator= (const TAO_Bounded_Object_Sequence<T,MAX> &);
-  // Assignment from another Bounded sequence.
-
-  TAO_Object_Manager<T> operator[] (CORBA::ULong index) const;
-  // Read-write accessor.
-
-  static T **allocbuf (CORBA::ULong length);
-  // Allocate storage for a sequence..
-
-  static void freebuf (T **buffer);
-  // Free a buffer allocated by allocbuf() and release each element on
-  // it.
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-template<CORBA::ULong MAX>
-class TAO_Bounded_String_Sequence : public TAO_Bounded_Base_Sequence
-{
-  // = TITLE
-  //   Bounded sequence of strings.
-  //
-  // = DESCRIPTION
-  //   As its unbounded counterpart it duplicates and releases strings
-  //   (via CORBA::string_dup and CORBA::string_free) under the
-  //   control of a per sequence flag, but the capacity of the
-  //   sequence is bound on the type.
-public:
-  TAO_Bounded_String_Sequence (void);
-  // {SPEC}
-  // For bounded sequences, the maximum length is part of the type and
-  // cannot be set or modified, while for unbounded  sequences, the
-  // default constructor also sets the maximum length to 0. The
-  // default constructor for a bounded sequence always allocates a
-  // contents vector, so it always sets the release flag to TRUE. 
-
-  TAO_Bounded_String_Sequence (CORBA::ULong length,
-			       char* *value,
-			       CORBA::Boolean release = 0);
-  // {SPEC}
-  // The ``T *data'' constructor (as shown in the example above)
-  // allows the length and contents of a bounded or unbounded sequence
-  // to be set. For unbounded sequences, it also allows the initial
-  // value of the maximum length to be set. For this constructor,
-  // ownership of the contents vector is determined by the release
-  // parameter---FALSE means the caller owns the storage, while TRUE
-  // means that the sequence assumes ownership of the storage. 
-  //
-  // If release is TRUE, the contents vector must have been allocated
-  // using the sequence  allocbuf function, and the sequence will pass
-  // it to freebuf when finished with it. 
-
-  TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &);
-  // {SPEC}
-  // Management Functions'' on page 16. The copy constructor creates a
-  // new sequence with the same maximum and length as the given
-  // sequence, copies each of its current elements (items zero through
-  // length--1), and sets the release flag to TRUE. 
-
-  TAO_Bounded_String_Sequence &operator= (const TAO_Bounded_String_Sequence<MAX> &);
-  // {SPEC}
-  // The assignment operator deep copies its parameter, releasing
-  // old storage if necessary. It behaves as if the original sequence
-  // is destroyed via its destructor and then the source sequence
-  // copied using the copy constructor.
-
-  ~TAO_Bounded_String_Sequence (void);
-  // {SPEC}
-  // If release=TRUE, the destructor destroys each of the current
-  // elements (items zero through length-1).
-
-  TAO_String_Manager operator[] (CORBA::ULong index) const;
-  // read-write accessor
-
-  static char **allocbuf (CORBA::ULong length);
-  // {SPEC}
-  // The allocbuf function allocates a vector of T elements that can
-  // be passed to the T *data constructor. The length of the vector is
-  // given by the nelems function argument.  The allocbuf function
-  // initializes each element using its default constructor, except
-  // for strings, which are initialized to null pointers, and object
-  // references, which are initialized to suitably typed nil object
-  // references. A null pointer is returned if allocbuf for some
-  // reason cannot allocate the requested vector. Vectors allocated by
-  // allocbuf should be freed using the freebuf function. 
-
-  static void freebuf (char **buffer);
-  // {SPEC}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ Please document me.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-			       CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_SEQUENCE_T_H */
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
deleted file mode 100644
index 15015f25b21..00000000000
--- a/TAO/tao/Sequence_T.i
+++ /dev/null
@@ -1,314 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ***************************************************
-// Operations on the generic unbounded sequence class.
-// ***************************************************
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
-{
-}
-
-template <class T> ACE_INLINE T *
-TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
-{
-  if (orphan == CORBA::B_FALSE)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        this->buffer_ = (void *) new T[this->length_];
-    }
-  else // if (orphan == CORBA::B_TRUE)
-    {
-      if (this->release_ == CORBA::B_FALSE)
-        // Oops, it's not our buffer to relinquish...
-        return 0;
-      else
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = CORBA::B_FALSE;
-        }
-    }
-  return (T *) this->buffer_;
-}
-
-template <class T> ACE_INLINE const T *
-TAO_Unbounded_Sequence<T>::get_buffer (void) const
-{
-  return (const T *) this->buffer_;
-}
-
-template <class T> ACE_INLINE void
-TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
-                                    CORBA::ULong length,
-                                    T *data,
-                                    CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == CORBA::B_TRUE)
-    TAO_Unbounded_Sequence<T>::freebuf ((T *) this->buffer_);
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Sequence<T>::allocbuf (maximum))
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
-                                                   CORBA::ULong length,
-                                                   T *data,
-                                                   CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-template <class T> ACE_INLINE T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  T* tmp = ACE_reinterpret_cast(T*,this->buffer_);
-  return tmp[i];
-}
-
-template <class T> ACE_INLINE const T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  T * const tmp = ACE_reinterpret_cast (T* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-template <class T> ACE_INLINE T *
-TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
-{
-  return new T[size];
-}
-
-template <class T> ACE_INLINE void
-TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-// ***************************************************
-// operations on the generic Bounded sequence class
-// ***************************************************
-
-template <class T, CORBA::ULong MAX> ACE_INLINE T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  if (orphan == CORBA::B_FALSE)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        this->buffer_ = (void *) new T[this->maximum_];
-    }
-  else // if (orphan == CORBA::B_TRUE)
-    {
-      if (this->release_ == CORBA::B_FALSE)
-        // Oops, it's not our buffer to relinquish...
-        return 0;
-      else
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = CORBA::B_FALSE;
-        }
-    }
-  return (T *) this->buffer_;
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE const T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
-{
-  return (const T *) this->buffer_;
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::replace (CORBA::ULong max,
-                                       CORBA::ULong length,
-                                       T *data,
-                                       CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == CORBA::B_TRUE)
-    TAO_Bounded_Sequence<T, MAX>::freebuf ((T *) this->buffer_);
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
-{
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
-                                                    T *data,
-                                                    CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (length, MAX, data, release)
-{
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  T *tmp = ACE_reinterpret_cast (T*,this->buffer_);
-  return tmp[i];
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE const T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  const T* tmp = ACE_reinterpret_cast (const T*,this->buffer_);
-  return tmp[i];
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE T *
-TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
-{
-  return new T[MAX];
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-// *************************************************************
-// Inline operations for class TAO_Object_Manager<T>
-// *************************************************************
-
-template <class T> ACE_INLINE
-TAO_Object_Manager<T>::~TAO_Object_Manager (void)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Object_Manager<T>::TAO_Object_Manager (const TAO_Object_Manager &rhs)
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Object_Manager<T>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Object_Manager<T>::operator const T* () const // cast
-{
-  return *this->ptr_;
-}
-
-template <class T> ACE_INLINE
-TAO_Object_Manager<T>::operator T* &() // cast
-{
-  return *this->ptr_;
-}
-
-// *************************************************************
-// class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-//default constructor
-template <class T> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T>::TAO_Unbounded_Object_Sequence (void)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T>::
-TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <class T> ACE_INLINE TAO_Object_Manager<T>
-TAO_Unbounded_Object_Sequence<T>::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T> (tmp + index, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template<class T, CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,MAX>::~TAO_Bounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,MAX>::
-TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                             T **value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template <class T, CORBA::ULong MAX> ACE_INLINE TAO_Object_Manager<T>
-TAO_Bounded_Object_Sequence<T, MAX>::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T> (tmp + index, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (CORBA::ULong length,
-                             char **value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template<CORBA::ULong MAX> ACE_INLINE TAO_String_Manager
-TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  char **const tmp = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
-                                           this->buffer_);
-  return TAO_String_Manager (tmp + index, this->release_);
-}
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
deleted file mode 100644
index a6a2cdeb36c..00000000000
--- a/TAO/tao/Servant_Base.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-TAO_ServantBase::TAO_ServantBase (void)
-  :  optable_ (0)
-{
-}
-
-TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &)
-{
-}
-
-TAO_ServantBase &
-TAO_ServantBase::operator= (const TAO_ServantBase &)
-{
-  return *this;
-}
-
-TAO_ServantBase::~TAO_ServantBase (void)
-{
-}
-
-PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (CORBA::Environment &env)
-{
-  TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-  PortableServer::POA_var result = poa->_this (env);
-  if (env.exception () != 0)
-    return PortableServer::POA::_nil ();
-  else
-    return result._retn ();
-}
-
-CORBA::Boolean
-TAO_ServantBase::_is_a (const char* logical_type_id,
-			CORBA::Environment &env)
-{
-  if (ACE_OS::strcmp (logical_type_id, CORBA::_tc_Object->id (env)) == 0)
-    {
-      return CORBA::B_TRUE;
-    }
-  return CORBA::B_FALSE;
-}
-
-int
-TAO_ServantBase::_find (const char *opname,
-                        TAO_Skeleton& skelfunc)
-{
-  return optable_->find (opname, skelfunc);
-}
-
-int
-TAO_ServantBase::_bind (const char *opname,
-                        const TAO_Skeleton skel_ptr)
-{
-  return optable_->bind (opname, skel_ptr);
-}
-
-void
-TAO_ServantBase::_dispatch (CORBA::ServerRequest &req,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  // @@ (ASG) - we should check here if the call was for _non_existant, else
-  // issue an error. For the time being we issue an error
-  const char *opname = req.operation ();
-  ACE_UNUSED_ARG (context);
-
-  // Something really bad happened: the operation was not
-  // found in the object, fortunately there is a standard
-  // exception for that purpose.
-  env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-  ACE_ERROR ((LM_ERROR,
-              "Cannot find operation <%s> in object\n",
-              opname));
-}
-
-STUB_Object *
-TAO_ServantBase::_create_stub (CORBA_Environment &env)
-{
-  STUB_Object *stub;
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current *poa_current = orb_core->poa_current ();
-
-  if (poa_current != 0
-      && poa_current->in_upcall ()
-      && this == poa_current->servant ())
-    {
-      stub = new IIOP_Object (CORBA::string_copy (this->_interface_repository_id ()),
-                              IIOP::Profile (orb_core->orb_params ()->addr (),
-                                             poa_current->object_key ()));
-    }
-  else
-    {
-      PortableServer::POA_var poa = this->_default_POA (env);
-      if (env.exception () != 0)
-	return 0;
-
-      CORBA::Object_var object = poa->servant_to_reference (this, env);
-      if (env.exception () != 0)
-	return 0;
-
-      TAO_ObjectKey_var object_key = object->_key (env);
-      stub = new IIOP_Object (CORBA::string_copy (this->_interface_repository_id ()),
-                              IIOP::Profile (orb_core->orb_params ()->addr (),
-                                             object_key.in ()));
-    }
-
-  return stub;
-}
-
-STUB_Object *
-TAO_Local_ServantBase::_create_stub (CORBA_Environment &env)
-{
-  // Note the use of a fake key and no registration with POAs
-  return new IIOP_Object (CORBA::string_copy (this->_interface_repository_id ()),
-                          IIOP::Profile (TAO_ORB_Core_instance ()->orb_params ()->addr (),
-                                         "0"));
-}
-
-CORBA::Object_ptr
-TAO_DynamicImplementation::_this (CORBA::Environment &env)
-{
-  // The _this() function returns a CORBA::Object_ptr for the target
-  // object. Unlike _this() for static skeletons, its return type is
-  // not interface-specific because a DSI servant may very well
-  // incarnate multiple CORBA objects of different types.
-  STUB_Object *stub = this->_create_stub (env);
-  if (env.exception () != 0)
-    return CORBA::Object::_nil ();
-
-  // Create a object
-  return new CORBA::Object (stub, this, CORBA::B_TRUE);
-}
-
-const char *
-TAO_DynamicImplementation::_interface_repository_id (void) const
-{
-  // This should never be called
-  return 0;
-}
-
-void *
-TAO_DynamicImplementation::_downcast (const char *repository_id)
-{
-  ACE_UNUSED_ARG (repository_id);
-
-  // Don't know enough to do better
-  return this;
-}
-
-STUB_Object *
-TAO_DynamicImplementation::_create_stub (CORBA::Environment &env)
-{
-  // If DynamicImplementation::_this() is invoked outside of the
-  // context of a request invocation on a target object being served
-  // by the DSI servant, it raises the PortableServer::WrongPolicy
-  // exception.
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current *poa_current = orb_core->poa_current ();
-
-  if (poa_current == 0
-      || !poa_current->in_upcall ()
-      || this != poa_current->servant ())
-    {
-      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
-      env.exception (exception);
-      return 0;
-    }
-
-  PortableServer::POA_var poa = poa_current->get_POA (env);
-  if (env.exception () != 0)
-    return 0;
-
-  // CORBA::RepositoryId interface = this->_primary_interface (poa_current->object_id (),
-  //                                                           poa.in (),
-  //                                                           env);
-  PortableServer::RepositoryId interface = this->_primary_interface (poa_current->object_id (),
-                                                                     poa.in (),
-                                                                     env);
-  if (env.exception () != 0)
-    return 0;
-
-  return new IIOP_Object (interface,
-                          IIOP::Profile (orb_core->orb_params ()->addr (),
-                                         poa_current->object_key ()));
-}
-
-void
-TAO_DynamicImplementation::_dispatch (CORBA::ServerRequest &request,
-                                      void *context,
-                                      CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (context);
-
-  // Delegate to user
-  this->invoke (&request, env);
-}
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
deleted file mode 100644
index 96553236382..00000000000
--- a/TAO/tao/Servant_Base.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Servant_Base.h
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#if !defined (SERVANT_BASE_H)
-#define SERVANT_BASE_H
-
-class TAO_Export TAO_ServantBase
-  // = TITLE
-  //   Base class for skeletons and servants.
-  //
-  // = DESCRIPTION
-  //   The POA spec requires that all servants inherit from this
-  //   class.
-{
-  friend class TAO_POA;
-  friend class CORBA_Object;
-public:
-  virtual ~TAO_ServantBase (void);
-  // destructor
-
-  TAO_ServantBase &operator= (const TAO_ServantBase &);
-  // assignment operator.
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-  // Returns the default POA for this servant.
-
-  virtual void *_downcast (const char *repository_id) = 0;
-  // Get the correct vtable.
-
-  virtual STUB_Object *_create_stub (CORBA_Environment &env);
-  // This is an auxiliar method for _this() and _narrow().
-
-protected:
-  TAO_ServantBase (void);
-  // Default constructor, only derived classes can be created.
-
-  TAO_ServantBase (const TAO_ServantBase &);
-  // Copy constructor, protected so no instances can be created.
-
-  virtual CORBA::Boolean _is_a (const char* logical_type_id,
-				CORBA::Environment &env);
-  // Local implementation of the CORBA::Object::_is_a method.
-
-  virtual void _dispatch (CORBA::ServerRequest &request,
-                          void *context,
-                          CORBA::Environment &env);
-  // Dispatches a request to the object: find the operation, cast the
-  // type to the most derived type, demarshall all the parameters from
-  // the request and finally invokes the operation, storing the
-  // results and out parameters (if any) or the exceptions thrown into
-  // <request>.
-
-  virtual int _find (const char *opname,
-                     TAO_Skeleton &skelfunc);
-  // Find an operation in the operation table.
-
-  virtual int _bind (const char *opname,
-                     const TAO_Skeleton skel_ptr);
-  // Register a CORBA IDL operation name.
-
-  virtual const char *_interface_repository_id (void) const = 0;
-  // Get this interface's repository id.
-
-protected:
-  TAO_Operation_Table *optable_;
-  // The operation table for this servant, it is initialized by the
-  // most derived class.
-};
-
-class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase
-  // = TITLE
-  //   Base class for local skeletons and servants.
-  //
-{
-protected:
-  STUB_Object *_create_stub (CORBA_Environment &env);
-  // This is an auxiliar method for _this().  Make sure *not* to
-  // register with the default POA
-};
-
-class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
-  // = TITLE
-  //   Base class for DSI.
-  //
-  // = DESCRIPTION
-
-  //   It is expected that the invoke() and _primary_interface()
-  //   methods will be only invoked by the POA in the context of
-  //   serving a CORBA request. Invoking this method in other
-  //   circumstances may lead to unpredictable results.
-{
-public:
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA::Environment &env) = 0;
-  // The invoke() method receives requests issued to any CORBA object
-  // incarnated by the DSI servant and performs the processing
-  // necessary to execute the request.
-
-  virtual PortableServer::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
-                                                           PortableServer::POA_ptr poa,
-                                                           CORBA::Environment &env) = 0;
-  // The _primary_interface() method receives an ObjectId value and a
-  // POA_ptr as input parameters and returns a valid RepositoryId
-  // representing the most-derived interface for that oid.
-
-  CORBA::Object_ptr _this (CORBA::Environment &env);
-  // Returns a CORBA::Object_ptr for the target object.
-
-protected:
-
-  virtual const char *_interface_repository_id (void) const;
-  // Return 0.  Should never be used.
-
-  virtual void *_downcast (const char *repository_id);
-  // Simply returns "this"
-
-  virtual STUB_Object *_create_stub (CORBA_Environment &env);
-  // This is an auxiliar method for _this() and _narrow().
-
-  virtual void _dispatch (CORBA::ServerRequest &request,
-                          void *context,
-                          CORBA::Environment &env);
-  // Turns around and calls invoke.
-};
-
-#endif /* SERVANT_BASE_H */
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
deleted file mode 100644
index d11e94f187b..00000000000
--- a/TAO/tao/Server_Request.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-// $Id$
-
-// Implementation of the Dynamic Server Skeleton Interface
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Server_Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-// {77420086-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_IIOP_ServerRequest,
-0x77420086, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {4B48D881-F7F0-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_ServerRequest,
-0x4b48d881, 0xf7f0, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-CORBA_ServerRequest *
-CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *req)
-{
-  if (req)
-    {
-      req->AddRef ();
-      return req;
-    }
-  return (CORBA_ServerRequest *) 0;
-}
-
-CORBA_ServerRequest *
-CORBA_ServerRequest::_nil (void)
-{
-  return (CORBA_ServerRequest *) 0;
-}
-
-IIOP_ServerRequest::IIOP_ServerRequest (const TAO_GIOP_RequestHeader &hdr,
-					TAO_InputCDR *req,
-                                        TAO_OutputCDR *resp,
-                                        CORBA::ORB_ptr the_orb,
-                                        TAO_POA *the_poa)
-  : opname_ (CORBA::string_dup (hdr.operation)),
-    incoming_ (req),
-    outgoing_ (resp),
-    reqid_ (hdr.request_id),
-    params_ (0),
-    retval_ (0),
-    exception_ (0),
-    refcount_ (1),
-    orb_ (the_orb),
-    poa_ (the_poa)
-{
-}
-
-IIOP_ServerRequest::~IIOP_ServerRequest (void)
-{
-  if (this->params_)
-    CORBA::release (this->params_);
-  if (this->retval_)
-    delete this->retval_;
-  if (this->exception_)
-    delete this->exception_;
-}
-
-ULONG
-IIOP_ServerRequest::AddRef (void)
-{
-  ACE_ASSERT (this->refcount_ > 0);
-  return this->refcount_++;
-}
-
-ULONG
-IIOP_ServerRequest::Release (void)
-{
-  ACE_ASSERT (this != 0);
-
-  if (--this->refcount_ != 0)
-    return this->refcount_;
-
-  delete this;
-  return 0;
-}
-
-TAO_HRESULT
-IIOP_ServerRequest::QueryInterface (REFIID riid,
-                                    void **ppv)
-{
-  ACE_ASSERT (this->refcount_ > 0);
-  *ppv = 0;
-
-  if (IID_IIOP_ServerRequest == riid
-      || IID_CORBA_ServerRequest == riid
-      || IID_TAO_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return TAO_ResultFromScode (TAO_E_NOINTERFACE);
-
- (void) this->AddRef ();
-  return TAO_NOERROR;
-}
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-
-void
-IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
-                               CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Save params for later use when marshaling the reply.
-  this->params_ = list;
-
-  // Then unmarshal each "in" and "inout" parameter.
-  for (u_int i = 0; i < list->count (); i++)
-    {
-      CORBA::NamedValue_ptr nv = list->item (i, env);
-
-      // check if it is an in or inout parameter
-      if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
-        continue;
-
-      // First, make sure the memory into which we'll be unmarshaling
-      // exists, and is the right size.
-      //
-      // NOTE: desirable to have a way to let the dynamic
-      // implementation routine preallocate this data, for
-      // environments where DSI is just being used in lieu of a
-      // language mapped server-side API and the size is really
-      // knowable in advance.
-      //
-      // This is exactly what the TAO IDL compiler generated skeletons do.
-
-      CORBA::Any_ptr any = nv->value ();
-      CORBA::TypeCode_ptr tc = any->type ();
-
-      tc->AddRef ();
-
-      void *value;
-      if (!any->value ())
-        { // not preallocated
-          ACE_NEW (value, char [tc->size (env)]);
-
-	  if (env.exception () != 0)
-	    return;
-
-          any->replace (tc, value, CORBA::B_TRUE, env);
-	  if (env.exception () != 0)
-	    return;
-
-          // Decrement the refcount of "tc".
-          //
-          // The earlier AddRef is needed since Any::replace () releases
-          // the typecode inside the Any.  Without the dup, the reference
-          // count can go to zero, and the typecode would then be deleted.
-          //
-          // This Release ensures that the reference count is correct so
-          // the typecode can be deleted some other time.
-
-          tc->Release ();
-        }
-      else
-        value = (void *)any->value (); // memory was already preallocated
-
-      // Then just unmarshal the value.
-      (void) incoming_->decode (tc, value, 0, env);
-      if (env.exception () != 0)
-	{
-	  const char* param_name = nv->name ();
-	  if (param_name == 0)
-	    param_name = "(no name given)";
-	  ACE_ERROR ((LM_ERROR,
-		      "IIOP_ServerRequest::arguments - problem while"
-		      " decoding parameter %d <%s>\n", i, param_name));
-	  return;
-	}
-    }
-
-  // If any data is left over, it'd be context values ... else error.
-  // We don't support context values, so it's always an error.
-
-  // @@ (TAO) support for Contexts??
-  if (incoming_->length () != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  "IIOP_ServerRequest::arguments - "
-		  "%d bytes left in buffer\n", incoming_->length ()));
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-    }
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results (and exceptions) can be reported
-// only after the parameter list has been provided (maybe empty).
-
-void
-IIOP_ServerRequest::set_result (const CORBA::Any &value,
-                                CORBA::Environment &env)
-{
-  env.clear ();
-
-  // setting a result when another result already exists or if an exception
-  // exists is an error
-  if (!this->params_ || this->retval_ || this->exception_)
-    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-  else
-    {
-      this->retval_ = new CORBA::Any;
-      this->retval_->replace (value.type (), value.value (), 1, env);
-    }
-}
-
-// Store the exception value.
-
-void
-IIOP_ServerRequest::set_exception (const CORBA::Any &value,
-                                   CORBA::Environment &env)
-{
-  if (!this->params_ || this->retval_ || this->exception_)
-    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-  else
-    {
-      this->exception_ = new CORBA::Any;
-      this->exception_->replace (value.type (), value.value (), 1, env);
-    }
-}
-
-// Extension
-void
-IIOP_ServerRequest::demarshal (CORBA::Environment &env,  // exception reporting
-                               const TAO_Call_Data_Skel *info, // call description
-                               ...)                       // ... any parameters
-{
-  // First find out the size of the list to be created. info->count
-  // keeps track of the table size. If "roundtrip" is true => one
-  // entry is for RETURN type which does not go into the NVList
-  CORBA::ULong list_size =
-    info->is_roundtrip ? (info->param_count - 1) : info->param_count;
-
-  CORBA::NVList_ptr nvlist;
-
-  // Create an NVList of the appropriate size.
-  this->orb ()->create_list (list_size, nvlist);
-
-  // Now, put all "in" and "inout" parameters into the NVList.
-  CORBA::ULong i;
-
-  // Setup the variable argument list.
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  for (i = 0, pdp = info->params;
-       i < info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = va_arg (param_vector, void *);
-
-      if ((pdp->mode == CORBA::ARG_IN)
-          || (pdp->mode == CORBA::ARG_INOUT))
-        // Populate the NVList.
-        (void) nvlist->add_item (0, pdp->mode, env)->value ()->replace (pdp->tc, ptr, pdp->own, env);
-      else if (pdp->mode == CORBA::ARG_OUT)
-        // Don't add any value.
-        (void) nvlist->add_item (0, pdp->mode, env);
-
-    }
-
-  va_end (param_vector);
-
-  // Now demarshal the parameters using a call to params.
-  this->arguments (nvlist, env); // nvlist is now owned by us
-}
-
-// Extension
-
-void
-IIOP_ServerRequest::marshal (CORBA::Environment &env,  // exception reporting
-                             const TAO_Call_Data_Skel *info, // call description
-                             ...)                       // ... any parameters
-{
-  CORBA::Environment env2;
-
-  // check if we are inside with an exception. This may have happened
-  // since the upcall could have set some exception
-  if (env.exception ())
-    {
-      CORBA::Any any (env.exception ()->_type (), env.exception ()); // don't
-                                                                     // own it
-      this->set_exception (any, env2);
-    }
-
-  // Setup a Reply message.
-  this->init_reply (env2);
-
-  if (env2.exception () || env.exception ()) // exception, nothing to do
-    return;
-
-  // Now, put all "in" and "inout" parameters into the NVList.
-  CORBA::ULong i;
-  CORBA::ULong j;
-
-  // Setup the variable argument list.
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  j = 0;
-
-  for (i = 0, pdp = info->params;
-       i < info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = va_arg (param_vector, void *);
-
-      if (pdp->mode == 0) // return type
-        {
-          this->retval_ = new CORBA::Any (pdp->tc, ptr, pdp->own);
-          continue;
-        }
-
-      if (pdp->mode == CORBA::ARG_OUT)
-        // don't add any value.
-        (void) this->params_->item (j, env)->value ()->replace (pdp->tc, ptr, pdp->own, env);
-
-      j++;
-    }
-  va_end (param_vector);
-
-  // Normal reply.
-  if (!env.exception ())
-    {
-      // ... then send any return value ...
-      if (this->retval_)
-        {
-          CORBA::TypeCode_ptr tc = this->retval_->type ();
-          const void *value = this->retval_->value ();
-
-          if (value)
-            (void) this->outgoing_->encode (tc, value, 0, env);
-        }
-
-      // ... Followed by "inout" and "out" parameters, left to right
-      for (i = 0;
-           i < this->params_->count ();
-           i++)
-        {
-          CORBA::NamedValue_ptr nv = this->params_->item (i, env);
-          CORBA::Any_ptr any;
-
-          if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
-            continue;
-
-          any = nv->value ();
-          CORBA::TypeCode_ptr tc = any->type ();
-          const void *value = any->value ();
-          (void) this->outgoing_->encode (tc, value, 0, env);
-        }
-    }
-}
-
-void
-IIOP_ServerRequest::init_reply (CORBA::Environment &env)
-{
-  // Construct a REPLY header.
-  TAO_GIOP::start_message (TAO_GIOP::Reply, *this->outgoing_);
-  TAO_GIOP_ServiceContextList resp_ctx;
-  resp_ctx.length (0);
-  this->outgoing_->encode (&TC_ServiceContextList,
-                           &resp_ctx,
-                           0,
-                           env);
-  this->outgoing_->write_ulong (this->reqid_);
-
-  // Standard exceptions only.
-  if (env.exception () != 0)
-    {
-      CORBA::Environment env2;
-      CORBA::Exception *x = env.exception ();
-      CORBA::TypeCode_ptr except_tc = x->_type ();
-
-      this->outgoing_->write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      (void) this->outgoing_->encode (except_tc, x, 0, env2);
-    }
-
-  // Any exception at all.
-  else if (this->exception_)
-    {
-      CORBA::Exception *x;
-      CORBA::TypeCode_ptr except_tc;
-
-      x = (CORBA::Exception *) this->exception_->value ();
-      except_tc = this->exception_->type ();
-
-      // Finish the GIOP Reply header, then marshal the exception.
-      // XXX x->type () someday ...
-
-      if (CORBA::UserException::_narrow (x))
-        this->outgoing_->write_ulong (TAO_GIOP_USER_EXCEPTION);
-      else
-        this->outgoing_->write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      (void) this->outgoing_->encode (except_tc, x, 0, env);
-    }
-  else // Normal reply
-    // First finish the GIOP header ...
-    this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
-}
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
deleted file mode 100644
index 594d5393ba3..00000000000
--- a/TAO/tao/Server_Request.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
-
-#if !defined (TAO_SERVER_REQUEST_H)
-#define TAO_SERVER_REQUEST_H
-
-class TAO_POA;
-class TAO_GIOP_RequestHeader;
-
-class TAO_Param_Data_Skel
-{
-  // = TITLE
-  //   Description of a single parameter.
-  //
-  // = DESCRIPTION
-  //
-  //   If value_size is nonzero for OUT, INOUT, or RETURN parameters,
-  //   it's (a) an indicator that the ORB returns a pointer-to-value
-  //   for this parameter, and also (b) is the size of the top-level
-  //   of the value that's returned (e.g. ignoring nested sequence
-  //   buffers).  That is, it moves CPU cycles from runtime -- some
-  //   calls to tc->size() -- to compile time where they're
-  //   cheap/free.
-  //
-  //   It _must_ only be set for cases where the ORB allocates the
-  //   return value, which must then be ORB::free()d ... e.g. where
-  //   the value is a pointer to data such as a struct, sequence, or
-  //   union.  (The CORBA C++ mapping doesn't require that for all
-  //   "out" structs; only those of "variable size".)  If this value
-  //   is nonzero, the value passed to do_static_call() must be the address
-  //   of a pointer.
-public:
-  CORBA::TypeCode_ptr tc;
-  // Type of param.
-
-  CORBA::ULong mode;
-  // Its mode.
-
-  CORBA::Boolean own;
-  // whether we own it or not
-};
-
-class TAO_Call_Data_Skel
-{
-  // = TITLE
-  //   Descriptions of operations, as used by the stub interpreter.
-  //   Only interpretive marshaling/unmarshaling is used, and the
-  //   stubs don't know what particular on-the-wire protocol is being
-  //   used.
-  //
-  // = DESCRIPTION
-  //   When using C++ exceptions, many C++ compilers will require the
-  //   use of compiled code throw the exception.  As binary standards
-  //   for exception throwing evolve, it may become practical to
-  //   interpretively throw exceptions.
-public:
-  const char *opname;
-  // Operation name.
-
-  CORBA::Boolean is_roundtrip;
-  // !oneway
-
-  // When constructing tables of parameters, put them in the same
-  // order they appear in the IDL spec: return value, then parameters
-  // left to right.  Other orders may produce illegal IIOP protocol
-  // messages.
-
-  CORBA::ULong param_count;
-  // # parameters.
-
-  const TAO_Param_Data_Skel *params;
-  // Their descriptions.
-
-};
-
-class TAO_Export CORBA_ServerRequest : public TAO_IUnknown
-{
-  // = TITLE
-  //    Class representing a CORBA ServerRequest object.
-  //
-  // = DESCRIPTION
-  //   This is not supposed to be IIOP-specific, or to expose quite so
-  //   many implementation details, but right now does.
-public:
-  static CORBA_ServerRequest *_duplicate (CORBA_ServerRequest *req);
-  // the duplicate method for Pseudo Objects
-
-  static CORBA_ServerRequest *_nil (void);
-  // the standard _nil method on pseudo objects
-
-  virtual void arguments (CORBA::NVList_ptr &list,
-                          CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the ORB with the operation's
-  // parameter list ... on return, their values are available; the
-  // list fed in has typecodes and (perhap) memory assigned.
-
-  virtual void set_result (const CORBA::Any &value,
-                           CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the operation result
-  // ... illegal if exception() was called or params() was not called.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  virtual void set_exception (const CORBA::Any &value,
-                              CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the exception value which is
-  // the only result of this particular invocation.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  // = Get various universal call attributes.
-
-  // e.g., who made the call, the target of the call, what ORB and OA
-  // that target object uses.
-  //
-  // NOTE: none of these report exceptions; unavailability of any of
-  // this stuff is a catastrophic error since this is all part of the
-  // basic CORBA Object Model.
-
-  virtual const char *operation (void) const = 0;
-  // get the operation name
-
-  //  CORBA::Context_ptr ctx (void) = 0;
-  // return the context pointer
-
-  // = Extensions.
-
-  virtual TAO_POA *oa (void) = 0;
-  // get the Object Adapter
-
-  virtual CORBA::ORB_ptr  orb (void) = 0;
-  // get the underlying ORB
-
-  virtual void demarshal (CORBA::Environment &env,
-                          const TAO_Call_Data_Skel *info,
-                          ...) = 0;
-  // demarshal incoming parameters
-
-  virtual void marshal (CORBA::Environment &env,
-                        const TAO_Call_Data_Skel *info,
-                        ...) = 0;
-  // marshal outgoing parameters
-
-  virtual void init_reply (CORBA::Environment &env) = 0;
-  // Start a Reply message.
-
-  virtual TAO_InputCDR &incoming (void) = 0;
-  // Retrieve the incoming stream.
-
-  virtual TAO_OutputCDR &outgoing (void) = 0;
-  // Retrieve the outgoing stream.
-};
-
-class TAO_Export IIOP_ServerRequest : public CORBA_ServerRequest
-{
-  // = TITLE
-  //    Class representing an IIOP ServerRequest object.
-public:
-  // = Initialization and termination methods.
-  IIOP_ServerRequest (const TAO_GIOP_RequestHeader &hdr,
-		      TAO_InputCDR *req,
-                      TAO_OutputCDR *resp,
-		      CORBA::ORB_ptr the_orb,
-		      TAO_POA *the_poa);
-  // Constructor
-
-  virtual ~IIOP_ServerRequest (void);
-  // Destructor.
-
-  // = General ServerRequest operations
-  void arguments (CORBA::NVList_ptr &list,
-                  CORBA::Environment &env);
-
-  void set_result (const CORBA::Any &value,
-                   CORBA::Environment &env);
-
-  void set_exception (const CORBA::Any &value,
-                      CORBA::Environment &env);
-
-  // = Request attributes.
-
-  const char *operation (void) const;
-  // return the operation name
-
-  //  CORBA::Context_ptr ctx (void);
-  // return the context pointer
-
-  // = TAO extensions
-
-  CORBA::ORB_ptr  orb (void);
-  // return the underlying ORB
-
-  TAO_POA *oa (void);
-  // retturn the Object Adapter
-
-  virtual void demarshal (CORBA::Environment &env,
-                          const TAO_Call_Data_Skel *info,
-                          ...);
-  // demarshal incoming parameters
-
-  virtual void marshal (CORBA::Environment &env,
-                        const TAO_Call_Data_Skel *info,
-                        ...);
-  // marshal outgoing parameters and return value
-
-  virtual void init_reply (CORBA::Environment &env);
-  // start a Reply message
-
-  virtual TAO_InputCDR &incoming (void);
-  // Retrieve the incoming stream.
-
-  virtual TAO_OutputCDR &outgoing (void);
-  // Retrieve the outgoing stream.
-
-  // = Stuff required for memory management and COM
-  ULONG  AddRef (void);
-  ULONG  Release (void);
-  TAO_HRESULT  QueryInterface (REFIID riid,
-                               void **ppv);
-
-private:
-  CORBA::String_var opname_;
-  // Operation name.
-
-  TAO_InputCDR *incoming_;               
-  // Incoming stream.
-
-  TAO_OutputCDR *outgoing_;               
-  // Outgoing stream.
-
-  CORBA::ULong reqid_;
-  // request ID
-
-  CORBA::NVList_ptr params_;
-  // Incoming parameters.
-
-  CORBA::Any_ptr retval_;
-  // Return value.
-
-  CORBA::Any_ptr exception_;
-  // Any exception which might be raised.
-
-  u_int refcount_;
-  // Number of things hold references to here.
-
-  CORBA::ORB_ptr orb_;
-  // The ORB with which this server request is associated.
-
-  TAO_POA *poa_;
-  // The object adapter with whicih this server request is associated.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Server_Request.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_SERVER_REQUEST_H */
diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
deleted file mode 100644
index ae9ffd8fa26..00000000000
--- a/TAO/tao/Server_Request.i
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-ACE_INLINE void
-CORBA::release (CORBA_ServerRequest *req)
-{
-   if (req)
-     req->Release ();
-}
-
-ACE_INLINE TAO_InputCDR &
-IIOP_ServerRequest::incoming (void)
-{
-  return *this->incoming_;
-}
-
-ACE_INLINE TAO_OutputCDR &
-IIOP_ServerRequest::outgoing (void)
-{
-  return *this->outgoing_;
-}
-
-// Invocation attributes.
-ACE_INLINE const char *
-IIOP_ServerRequest::operation (void) const
-{
-  return this->opname_;
-}
-
-#if 0
-//@@ (TAO) to do after Context is implemented
-ACE_INLINE CORBA::Context_ptr
-IIOP_ServerRequest::ctx (void)
-{
-  return 0;
-}
-#endif
-
-ACE_INLINE CORBA::ORB_ptr
-IIOP_ServerRequest::orb (void)
-{
-  return orb_;
-}
-
-ACE_INLINE TAO_POA *
-IIOP_ServerRequest::oa (void)
-{
-  return poa_;
-}
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
deleted file mode 100644
index 9e2098d7001..00000000000
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
-{
-}
-
-TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
-{
-}
-
-int
-TAO_Server_Strategy_Factory::open (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::CREATION_STRATEGY *
-TAO_Server_Strategy_Factory::creation_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::ACCEPT_STRATEGY *
-TAO_Server_Strategy_Factory::accept_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::CONCURRENCY_STRATEGY *
-TAO_Server_Strategy_Factory::concurrency_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::SCHEDULING_STRATEGY *
-TAO_Server_Strategy_Factory::scheduling_strategy (void)
-{
-  return 0;
-}
-
-TAO_Object_Table_Impl *
-TAO_Server_Strategy_Factory::create_object_table (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Server_Strategy_Factory::create_poa_lock (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Server_Strategy_Factory::create_poa_mgr_lock (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Server_Strategy_Factory::create_servant_lock (void)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Creation_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Creation_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
deleted file mode 100644
index ac8c4ab11b8..00000000000
--- a/TAO/tao/Server_Strategy_Factory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Server_Strategy_Factory.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_SERVER_STRATEGY_FACTORY_H)
-#  define TAO_SERVER_STRATEGY_FACTORY_H
-
-class TAO_Server_Strategy_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //    Base class for the server's abstract factory that manufactures
-  //    various strategies of special utility to it.  This simply
-  //    serves as an interface to a subclass that REALLY gets
-  //    specified and loaded by the Service Configurator.
-public:
-  // = Initialization and termination methods.
-  TAO_Server_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Server_Strategy_Factory(void);
-  // Destructor.
-
-  virtual int open (void);
-  // Call <open> on various strategies.  This is not performed in
-  // <init> so that the other portions of the ORB have a chance to
-  // "settle" in their initialization since the streategies herein
-  // might need some of that information.
-
-  // = Server-side factory types.
-  typedef ACE_Creation_Strategy<TAO_Server_Connection_Handler>
-          CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-          ACCEPT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>
-          CONCURRENCY_STRATEGY;
-  typedef ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>
-          SCHEDULING_STRATEGY;
-
-  // = Factory methods for the server-side strategies.
-
-  virtual CREATION_STRATEGY *creation_strategy (void);
-  // Return concrete creation strategy.
-
-  virtual ACCEPT_STRATEGY *accept_strategy (void);
-  // Return concrete acceptor strategy.
-
-  virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
-  // Return the concurrency strategy used.
-
-  virtual SCHEDULING_STRATEGY *scheduling_strategy (void);
-  // Return the scheduling strategy used.
-
-  virtual TAO_Object_Table_Impl *create_object_table (void);
-  // Return a new key-->object table
-
-  virtual ACE_Lock *create_poa_lock (void);
-  // Return a new lock for use in locking the POA.
-
-  virtual ACE_Lock *create_poa_mgr_lock (void);
-  // Return a new lock for use in locking the POA Manager.
-
-  virtual ACE_Lock *create_servant_lock (void);
-  // Return a new lock for use in locking the servant.
-};
-
-#endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
deleted file mode 100644
index 80f4731f02f..00000000000
--- a/TAO/tao/Stub.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Stub.i"
-#endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
deleted file mode 100644
index 916082a8c78..00000000000
--- a/TAO/tao/Stub.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Stub.h
-//
-// = DESCRIPTION
-//
-//    Data structures used by static and dynamic stubs, and to a
-//    lesser degree by skeletons
-//
-//    Header file for Win32 C/C++/COM interface to one kind of CORBA
-//    remote invocation framework.  This is for use by
-//    compiler-generated code, not by portable applications!
-//
-//    These constitute the stub API to this "ORB Core".  Such
-//    interfaces are not specified by OMG, and may differ between
-//    different ORBs.  This one has the particular advantage that
-//    stubs can be quite small.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_STUB_H)
-#  define TAO_STUB_H
-
-// Descriptions of parameters.
-
-enum TAO_Param_Type
-{
-  // = TITLE
-  //   TAO_Param_Type
-  // =DESCRIPTION
-  // Parameter mode of a given parameter.
-  PARAM_IN,
-  PARAM_OUT,
-  PARAM_INOUT,
-  PARAM_RETURN  // = PARAM_OUT
-};
-
-struct TAO_Param_Data
-{
-  // = TITLE
-  //   TAO_Param_Data
-  //
-  // = DESCRIPTION
-  //   Description of a single parameter.
-  //
-  //   If value_size is nonzero for OUT, INOUT, or RETURN parameters,
-  //   it's (a) an indicator that the ORB returns a pointer-to-value
-  //   for this parameter, and also (b) is the size of the top-level
-  //   of the value that's returned (e.g. ignoring nested sequence
-  //   buffers).  That is, it moves CPU cycles from runtime -- some
-  //   calls to tc->size() -- to compile time where they're
-  //   cheap/free.
-  //
-  //   It _must_ only be set for cases where the ORB allocates the
-  //   return value, which must then be ORB::free()d ... e.g. where
-  //   the value is a pointer to data such as a struct, sequence, or
-  //   union.  (The CORBA C++ mapping doesn't require that for all
-  //   "out" structs; only those of "variable size".)  If this value
-  //   is nonzero, the value passed to do_static_call() must be the address
-  //   of a pointer.
-
-  CORBA::TypeCode_ptr tc;
-  // TypeCode for the parameter
-
-  TAO_Param_Type mode;
-  // Its mode.
-
-  size_t value_size;
-  // zero or tc->size (). For SII, we always know its size since it is the IDL
-  // compiler which generates the stub code.
-};
-
-struct TAO_Call_Data
-{
-  // = TITLE
-  //   TAO_Call_Data
-  //
-  // = DESCRIPTION
-  //   Descriptions of operations, as used by the stub interpreter.
-  //   Only interpretive marshaling/unmarshaling is used, and the
-  //   stubs don't know what particular on-the-wire protocol is being
-  //   used.
-  //
-  //   When using C++ exceptions, many C++ compilers will require the
-  //   use of compiled code throw the exception.  As binary standards
-  //   for exception throwing evolve, it may become practical to
-  //   interpretively throw exceptions.
-
-  const char *opname;
-  // Operation name.
-
-  CORBA::Boolean is_roundtrip;
-  // !oneway
-
-  // When constructing tables of parameters, put them in the same
-  // order they appear in the IDL spec: return value, then parameters
-  // left to right.  Other orders may produce illegal IIOP protocol
-  // messages.
-
-  u_int param_count;
-  // # parameters.
-
-  const TAO_Param_Data *params;
-  // Their descriptions.
-
-  // The exceptions allowed by this operation can be listed in any
-  // order, and need not include the system exceptions which may be
-  // returned by OMG-IDL operations.  If an operation tries to return
-  // any exception not allowed by its type signature, this causes a a
-  // system exception to be reported.
-
-  u_int except_count;
-  // # exceptions.
-
-  const CORBA::TypeCode_ptr *excepts;
-  // Their descriptions.
-};
-
-struct TAO_Skel_Entry
-{
-  // = TITLE
-  //   TAO_Skel_Entry
-  //
-  // = DESCRIPTION
-  //   Skeletons map "ServerRequest" generic signatures to the static
-  //   call signature required by the implementation's methods.  table
-  //   of these per implementation
-  //
-  //   There are several optimizations that'd be desirable for use by
-  //   "static skeletons", notably (a) passing of per-object data held
-  //   by the OA so that the method doesn't need to look it up itself,
-  //   (b) removing all mandatory heap allocation of data, and of
-  //   course (c) handling all the built-in ORB calls like "is_a" and
-  //   "get_implementation".  This code is currently set up only for
-  //   Dynamic Skeletons and bridging, for which none of those are
-  //   real issues.
-
-  const TAO_Call_Data *op_descriptor;
-  // pointer to the calldata structure that holds information about all the
-  // parameters
-
-  TAO_Skeleton impl_skeleton;
-  // skeleton corresponding to the operation
-};
-
-class TAO_Export STUB_Object : public TAO_IUnknown
-{
-  // = TITLE
-  //   STUB_Object
-  //
-  // = DESCRIPTION
-  //   Per-objref data includes the (protocol-specific) Profile, which
-  //   is handled by placing it into a subclass of this type along
-  //   with data that may be used in protocol-specific caching
-  //   schemes.
-  //
-  //   The type ID (the data specified by CORBA 2.0 that gets exposed
-  //   "on the wire", and in stringified objrefs) is held by this
-  //   module.
-  //
-  //   The stub and DII interpreter APIs are member functions of this
-  //   type.
-public:
-  virtual void do_static_call (CORBA::Environment &env,
-                               const TAO_Call_Data *info,
-                               ...) = 0;
-  // The "stub interpreter" method parameters are:
-  //
-  //    - env ... used for exception reporting
-  //    - info ... describes the call
-  //    - varargs parameters follow
-  //
-  // The varargs parameters are pointers to data instances as
-  // described by info->params.  (If the value_size is nonzero, the
-  // data instance is itself a pointer.)  The order on the call stack
-  // must be exactly the order they're listed in info->params;
-  // normally this is the order the values are listed in the OMG-IDL
-  // operation specification.
-  //
-  // NOTE: This can be sped up by eliminating some parameter
-  // shuffling.  The stub and "do_static_call" parameters are all but the
-  // same, except that their order is different.
-
-  virtual void do_dynamic_call (const char *opname,
-                                CORBA::Boolean is_roundtrip,
-                                CORBA::NVList_ptr args,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::Flags flags,
-                                CORBA::ExceptionList &exceptions,
-                                CORBA::Environment &env) = 0;
-  // Dynamic invocations use a more costly "varargs" calling
-  // convention; it's got the same input data as the (static)
-  // stub-oriented one, but the data is represented somewhat
-  // differently.
-  //
-  // Operation-specific data isn't collected in a stack frame and into
-  // a static/readonly "calldata" structure, but instead is collected
-  // into these parameters, the majority of which are heap-allocated:
-  //
-  //    - opname ... the name of the operation
-  //    - is_roundtrip ... true except for oneway operations, or ones where
-  //      the client doesn't care about responses
-  //    - args ... call parameters and their descriptions
-  //    - result ... result and its description
-  //    - flags ... only one DII flag is legal
-  //    - exceptions ... list of legal user-defined exceptions
-  //    - env ... used for exception reporting.
-
-  CORBA::String_var type_id;
-  // All objref representations carry around a type ID.
-
-  virtual CORBA::ULong hash (CORBA::ULong maximum,
-                             CORBA::Environment &env) = 0;
-  // All objref representations know how to hash themselves and
-  // compare themselves for equivalence to others.  It's easily
-  // possible to have two objrefs that are distinct copies of data
-  // that refers/points to the same remote object (i.e. are
-  // equivalent).
-
-  virtual CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                        CORBA::Environment &env) = 0;
-  // check for equivalence
-
-  STUB_Object (CORBA::String p = 0);
-  // XXX All objref representations should know how to marshal
-  // themselves.  That will involve ensuring that the IOR that gets
-  // marshaled talks a specific protocol, otherwise the target of a
-  // message would not be invoke using the objref it receives
-  // (compromising functionality in a very basic and mysterious
-  // manner).  So for example an objref might need to create a proxy
-  // for itself rather than marshaling its own representation.  [ The
-  // IIOP engine does not need to worry about such issues since it
-  // only supports one protocol -- the problem won't show up.
-  // "Multiprotocol ORBs" will need to solve that problem though.  ]
-
-  virtual TAO_ObjectKey *key (CORBA::Environment &env) = 0;
-  // Return the object key as an out parameter.  Caller should release
-  // return value when finished with it.
-
-protected:
-  virtual ~STUB_Object (void);
-  // XXX virtual inlines are evil.
-
-  // COM operations ... provided by an implementation class which
-  // inherits from this one.
-
-private:
-  // = Disallow copy constructor and assignment operator
-  ACE_UNIMPLEMENTED_FUNC (STUB_Object (const STUB_Object &))
-  ACE_UNIMPLEMENTED_FUNC (STUB_Object &operator = (const STUB_Object &))
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Stub.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_STUB_H */
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
deleted file mode 100644
index 94264e0a703..00000000000
--- a/TAO/tao/Stub.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE
-STUB_Object::STUB_Object (char *p)
-  : type_id (p)
-{
-  // Empty CTOR
-}
-
-ACE_INLINE
-STUB_Object::~STUB_Object (void)
-{
-}
diff --git a/TAO/tao/TAO.MAK b/TAO/tao/TAO.MAK
deleted file mode 100644
index a89121df5c4..00000000000
--- a/TAO/tao/TAO.MAK
+++ /dev/null
@@ -1,13620 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on TAO.dsp
-!IF "$(CFG)" == ""
-CFG=TAO - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to TAO - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "TAO - Win32 Release" && "$(CFG)" != "TAO - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\TAO.dll"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\TAO.dll"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\any.obj"
-	-@erase "$(INTDIR)\arg_shifter.obj"
-	-@erase "$(INTDIR)\cdr.obj"
-	-@erase "$(INTDIR)\client_factory.obj"
-	-@erase "$(INTDIR)\connect.obj"
-	-@erase "$(INTDIR)\corbacom.obj"
-	-@erase "$(INTDIR)\debug.obj"
-	-@erase "$(INTDIR)\decode.obj"
-	-@erase "$(INTDIR)\deep_copy.obj"
-	-@erase "$(INTDIR)\deep_free.obj"
-	-@erase "$(INTDIR)\default_client.obj"
-	-@erase "$(INTDIR)\default_server.obj"
-	-@erase "$(INTDIR)\encode.obj"
-	-@erase "$(INTDIR)\except.obj"
-	-@erase "$(INTDIR)\giop.obj"
-	-@erase "$(INTDIR)\iiopobj.obj"
-	-@erase "$(INTDIR)\iioporb.obj"
-	-@erase "$(INTDIR)\interp.obj"
-	-@erase "$(INTDIR)\invoke.obj"
-	-@erase "$(INTDIR)\marshal.obj"
-	-@erase "$(INTDIR)\nvlist.obj"
-	-@erase "$(INTDIR)\object.obj"
-	-@erase "$(INTDIR)\objtable.obj"
-	-@erase "$(INTDIR)\optable.obj"
-	-@erase "$(INTDIR)\orb_core.obj"
-	-@erase "$(INTDIR)\orbobj.obj"
-	-@erase "$(INTDIR)\params.obj"
-	-@erase "$(INTDIR)\poa.obj"
-	-@erase "$(INTDIR)\principa.obj"
-	-@erase "$(INTDIR)\request.obj"
-	-@erase "$(INTDIR)\sequence.obj"
-	-@erase "$(INTDIR)\server_factory.obj"
-	-@erase "$(INTDIR)\svrrqst.obj"
-	-@erase "$(INTDIR)\tao_internals.obj"
-	-@erase "$(INTDIR)\tc_const.obj"
-	-@erase "$(INTDIR)\typecode.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\TAO.dll"
-	-@erase "$(OUTDIR)\TAO.exp"
-	-@erase "$(OUTDIR)\TAO.lib"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32"\
- /D "_WINDOWS" /D "TAO_BUILD_DLL" /Fp"$(INTDIR)\TAO.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\TAO.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=ace.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\TAO.pdb" /machine:I386 /out:"$(OUTDIR)\TAO.dll"\
- /implib:"$(OUTDIR)\TAO.lib" /libpath:"..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\any.obj" \
-	"$(INTDIR)\arg_shifter.obj" \
-	"$(INTDIR)\cdr.obj" \
-	"$(INTDIR)\client_factory.obj" \
-	"$(INTDIR)\connect.obj" \
-	"$(INTDIR)\corbacom.obj" \
-	"$(INTDIR)\debug.obj" \
-	"$(INTDIR)\decode.obj" \
-	"$(INTDIR)\deep_copy.obj" \
-	"$(INTDIR)\deep_free.obj" \
-	"$(INTDIR)\default_client.obj" \
-	"$(INTDIR)\default_server.obj" \
-	"$(INTDIR)\encode.obj" \
-	"$(INTDIR)\except.obj" \
-	"$(INTDIR)\giop.obj" \
-	"$(INTDIR)\iiopobj.obj" \
-	"$(INTDIR)\iioporb.obj" \
-	"$(INTDIR)\interp.obj" \
-	"$(INTDIR)\invoke.obj" \
-	"$(INTDIR)\marshal.obj" \
-	"$(INTDIR)\nvlist.obj" \
-	"$(INTDIR)\object.obj" \
-	"$(INTDIR)\objtable.obj" \
-	"$(INTDIR)\optable.obj" \
-	"$(INTDIR)\orb_core.obj" \
-	"$(INTDIR)\orbobj.obj" \
-	"$(INTDIR)\params.obj" \
-	"$(INTDIR)\poa.obj" \
-	"$(INTDIR)\principa.obj" \
-	"$(INTDIR)\request.obj" \
-	"$(INTDIR)\sequence.obj" \
-	"$(INTDIR)\server_factory.obj" \
-	"$(INTDIR)\svrrqst.obj" \
-	"$(INTDIR)\tao_internals.obj" \
-	"$(INTDIR)\tc_const.obj" \
-	"$(INTDIR)\typecode.obj"
-
-"$(OUTDIR)\TAO.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\TAO.dll"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\TAO.dll"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\any.obj"
-	-@erase "$(INTDIR)\arg_shifter.obj"
-	-@erase "$(INTDIR)\cdr.obj"
-	-@erase "$(INTDIR)\client_factory.obj"
-	-@erase "$(INTDIR)\connect.obj"
-	-@erase "$(INTDIR)\corbacom.obj"
-	-@erase "$(INTDIR)\debug.obj"
-	-@erase "$(INTDIR)\decode.obj"
-	-@erase "$(INTDIR)\deep_copy.obj"
-	-@erase "$(INTDIR)\deep_free.obj"
-	-@erase "$(INTDIR)\default_client.obj"
-	-@erase "$(INTDIR)\default_server.obj"
-	-@erase "$(INTDIR)\encode.obj"
-	-@erase "$(INTDIR)\except.obj"
-	-@erase "$(INTDIR)\giop.obj"
-	-@erase "$(INTDIR)\iiopobj.obj"
-	-@erase "$(INTDIR)\iioporb.obj"
-	-@erase "$(INTDIR)\interp.obj"
-	-@erase "$(INTDIR)\invoke.obj"
-	-@erase "$(INTDIR)\marshal.obj"
-	-@erase "$(INTDIR)\nvlist.obj"
-	-@erase "$(INTDIR)\object.obj"
-	-@erase "$(INTDIR)\objtable.obj"
-	-@erase "$(INTDIR)\optable.obj"
-	-@erase "$(INTDIR)\orb_core.obj"
-	-@erase "$(INTDIR)\orbobj.obj"
-	-@erase "$(INTDIR)\params.obj"
-	-@erase "$(INTDIR)\poa.obj"
-	-@erase "$(INTDIR)\principa.obj"
-	-@erase "$(INTDIR)\request.obj"
-	-@erase "$(INTDIR)\sequence.obj"
-	-@erase "$(INTDIR)\server_factory.obj"
-	-@erase "$(INTDIR)\svrrqst.obj"
-	-@erase "$(INTDIR)\tao_internals.obj"
-	-@erase "$(INTDIR)\tc_const.obj"
-	-@erase "$(INTDIR)\typecode.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\TAO.dll"
-	-@erase "$(OUTDIR)\TAO.exp"
-	-@erase "$(OUTDIR)\TAO.ilk"
-	-@erase "$(OUTDIR)\TAO.lib"
-	-@erase "$(OUTDIR)\TAO.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /Fp"$(INTDIR)\TAO.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\TAO.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:windows /dll /incremental:yes\
- /pdb:"$(OUTDIR)\TAO.pdb" /debug /machine:I386 /out:"$(OUTDIR)\TAO.dll"\
- /implib:"$(OUTDIR)\TAO.lib" /libpath:"..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\any.obj" \
-	"$(INTDIR)\arg_shifter.obj" \
-	"$(INTDIR)\cdr.obj" \
-	"$(INTDIR)\client_factory.obj" \
-	"$(INTDIR)\connect.obj" \
-	"$(INTDIR)\corbacom.obj" \
-	"$(INTDIR)\debug.obj" \
-	"$(INTDIR)\decode.obj" \
-	"$(INTDIR)\deep_copy.obj" \
-	"$(INTDIR)\deep_free.obj" \
-	"$(INTDIR)\default_client.obj" \
-	"$(INTDIR)\default_server.obj" \
-	"$(INTDIR)\encode.obj" \
-	"$(INTDIR)\except.obj" \
-	"$(INTDIR)\giop.obj" \
-	"$(INTDIR)\iiopobj.obj" \
-	"$(INTDIR)\iioporb.obj" \
-	"$(INTDIR)\interp.obj" \
-	"$(INTDIR)\invoke.obj" \
-	"$(INTDIR)\marshal.obj" \
-	"$(INTDIR)\nvlist.obj" \
-	"$(INTDIR)\object.obj" \
-	"$(INTDIR)\objtable.obj" \
-	"$(INTDIR)\optable.obj" \
-	"$(INTDIR)\orb_core.obj" \
-	"$(INTDIR)\orbobj.obj" \
-	"$(INTDIR)\params.obj" \
-	"$(INTDIR)\poa.obj" \
-	"$(INTDIR)\principa.obj" \
-	"$(INTDIR)\request.obj" \
-	"$(INTDIR)\sequence.obj" \
-	"$(INTDIR)\server_factory.obj" \
-	"$(INTDIR)\svrrqst.obj" \
-	"$(INTDIR)\tao_internals.obj" \
-	"$(INTDIR)\tc_const.obj" \
-	"$(INTDIR)\typecode.obj"
-
-"$(OUTDIR)\TAO.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "TAO - Win32 Release" || "$(CFG)" == "TAO - Win32 Debug"
-SOURCE=.\any.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_ANY_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_ANY_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\arg_shifter.cpp
-DEP_CPP_ARG_S=\
-	".\arg_shifter.h"\
-	
-
-"$(INTDIR)\arg_shifter.obj" : $(SOURCE) $(DEP_CPP_ARG_S) "$(INTDIR)"
-
-
-SOURCE=.\cdr.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_CDR_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_CDR_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\client_factory.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_CLIEN=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_CLIEN=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\connect.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_CONNE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\Timeprobe.h"\
-	".\Timeprobe.i"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\connect.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_CONNE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\Timeprobe.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\connect.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\corbacom.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_CORBA=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\corbacom.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_CORBA=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\corbacom.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\debug.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DEBUG=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\debug.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DEBUG=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\debug.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\decode.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DECOD=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\decode.obj" : $(SOURCE) $(DEP_CPP_DECOD) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DECOD=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\decode.obj" : $(SOURCE) $(DEP_CPP_DECOD) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\deep_copy.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DEEP_=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\deep_copy.obj" : $(SOURCE) $(DEP_CPP_DEEP_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DEEP_=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\deep_copy.obj" : $(SOURCE) $(DEP_CPP_DEEP_) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\deep_free.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DEEP_F=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\deep_free.obj" : $(SOURCE) $(DEP_CPP_DEEP_F) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DEEP_F=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\deep_free.obj" : $(SOURCE) $(DEP_CPP_DEEP_F) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\default_client.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DEFAU=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\default_client.obj" : $(SOURCE) $(DEP_CPP_DEFAU) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DEFAU=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\default_client.obj" : $(SOURCE) $(DEP_CPP_DEFAU) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\default_server.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_DEFAUL=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\default_server.obj" : $(SOURCE) $(DEP_CPP_DEFAUL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_DEFAUL=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\default_server.obj" : $(SOURCE) $(DEP_CPP_DEFAUL) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\encode.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_ENCOD=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\encode.obj" : $(SOURCE) $(DEP_CPP_ENCOD) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_ENCOD=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\encode.obj" : $(SOURCE) $(DEP_CPP_ENCOD) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\except.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_EXCEP=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\except.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_EXCEP=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\except.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\giop.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_GIOP_=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\Timeprobe.h"\
-	".\Timeprobe.i"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\giop.obj" : $(SOURCE) $(DEP_CPP_GIOP_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_GIOP_=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\Timeprobe.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\giop.obj" : $(SOURCE) $(DEP_CPP_GIOP_) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\iiopobj.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_IIOPO=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\iiopobj.obj" : $(SOURCE) $(DEP_CPP_IIOPO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_IIOPO=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\iiopobj.obj" : $(SOURCE) $(DEP_CPP_IIOPO) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\iioporb.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_IIOPOR=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\iioporb.obj" : $(SOURCE) $(DEP_CPP_IIOPOR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_IIOPOR=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\iioporb.obj" : $(SOURCE) $(DEP_CPP_IIOPOR) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\interp.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_INTER=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\interp.obj" : $(SOURCE) $(DEP_CPP_INTER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_INTER=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\interp.obj" : $(SOURCE) $(DEP_CPP_INTER) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\invoke.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_INVOK=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\invoke.obj" : $(SOURCE) $(DEP_CPP_INVOK) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_INVOK=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\invoke.obj" : $(SOURCE) $(DEP_CPP_INVOK) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\marshal.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_MARSH=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\marshal.obj" : $(SOURCE) $(DEP_CPP_MARSH) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_MARSH=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\marshal.obj" : $(SOURCE) $(DEP_CPP_MARSH) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\nvlist.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_NVLIS=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\nvlist.obj" : $(SOURCE) $(DEP_CPP_NVLIS) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_NVLIS=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\nvlist.obj" : $(SOURCE) $(DEP_CPP_NVLIS) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\object.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_OBJEC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_OBJEC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\objtable.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_OBJTA=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_OBJTA=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\optable.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_OPTAB=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\optable.obj" : $(SOURCE) $(DEP_CPP_OPTAB) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_OPTAB=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\optable.obj" : $(SOURCE) $(DEP_CPP_OPTAB) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\orb_core.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_ORB_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Env_Value_T.cpp"\
-	"..\..\ace\Env_Value_T.h"\
-	"..\..\ace\Env_Value_T.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\arg_shifter.h"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\orb_core.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_ORB_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Env_Value_T.cpp"\
-	"..\..\ace\Env_Value_T.h"\
-	"..\..\ace\Env_Value_T.i"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\arg_shifter.h"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\orb_core.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\orbobj.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_ORBOB=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_Dgram.h"\
-	"..\..\ace\SOCK_Dgram.i"\
-	"..\..\ace\SOCK_Dgram_Mcast.h"\
-	"..\..\ace\SOCK_Dgram_Mcast.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\Timeprobe.h"\
-	".\Timeprobe.i"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\orbobj.obj" : $(SOURCE) $(DEP_CPP_ORBOB) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_ORBOB=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_Dgram.h"\
-	"..\..\ace\SOCK_Dgram.i"\
-	"..\..\ace\SOCK_Dgram_Mcast.h"\
-	"..\..\ace\SOCK_Dgram_Mcast.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\Timeprobe.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\orbobj.obj" : $(SOURCE) $(DEP_CPP_ORBOB) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\params.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_PARAM=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_PARAM=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\poa.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_POA_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\poa.obj" : $(SOURCE) $(DEP_CPP_POA_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_POA_C=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\poa.obj" : $(SOURCE) $(DEP_CPP_POA_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\principa.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_PRINC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\principa.obj" : $(SOURCE) $(DEP_CPP_PRINC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_PRINC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\principa.obj" : $(SOURCE) $(DEP_CPP_PRINC) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\request.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_REQUE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_REQUE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\sequence.cpp
-DEP_CPP_SEQUE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\sequence.obj" : $(SOURCE) $(DEP_CPP_SEQUE) "$(INTDIR)"
-
-
-SOURCE=.\server_factory.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_SERVE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\server_factory.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_SERVE=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\server_factory.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\svrrqst.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_SVRRQ=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\svrrqst.obj" : $(SOURCE) $(DEP_CPP_SVRRQ) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_SVRRQ=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\svrrqst.obj" : $(SOURCE) $(DEP_CPP_SVRRQ) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\tao_internals.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_TAO_I=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\tao_internals.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_TAO_I=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\tao_internals.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\tao_internals.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\tc_const.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_TC_CO=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\tc_const.obj" : $(SOURCE) $(DEP_CPP_TC_CO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_TC_CO=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\tc_const.obj" : $(SOURCE) $(DEP_CPP_TC_CO) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\typecode.cpp
-
-!IF  "$(CFG)" == "TAO - Win32 Release"
-
-DEP_CPP_TYPEC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Addr.i"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Auto_Ptr.cpp"\
-	"..\..\ace\Auto_Ptr.h"\
-	"..\..\ace\Auto_Ptr.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\Basic_Types.i"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic.i"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Event_Handler.i"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Get_Opt.i"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Handle_Set.i"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\INET_Addr.i"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\iosfwd.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc.h"\
-	"..\..\ace\Malloc.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Mem_Map.i"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Memory_Pool.i"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Block.i"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\Object_Manager.i"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\OS.i"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor.i"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Config.i"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Object.i"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Repository.i"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Service_Types.i"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Shared_Object.i"\
-	"..\..\ace\Signal.h"\
-	"..\..\ace\Signal.i"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Acceptor.i"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\SString.i"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch.i"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\sys_conf.h"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task.i"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread.i"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Thread_Manager.i"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	"..\..\ace\WFMO_Reactor.i"\
-	"..\..\ace\ws2tcpip.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\compat\initguid.h"\
-	".\compat\objbase.h"\
-	".\connect.h"\
-	".\connect.i"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_client.i"\
-	".\default_server.h"\
-	".\default_server.i"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\params.i"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\server_factory.i"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\typecode.obj" : $(SOURCE) $(DEP_CPP_TYPEC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"
-
-DEP_CPP_TYPEC=\
-	"..\..\ace\Acceptor.cpp"\
-	"..\..\ace\Acceptor.h"\
-	"..\..\ace\Acceptor.i"\
-	"..\..\ace\ACE.h"\
-	"..\..\ace\ACE.i"\
-	"..\..\ace\Addr.h"\
-	"..\..\ace\Atomic_Op.i"\
-	"..\..\ace\Basic_Types.h"\
-	"..\..\ace\config-win32-common.h"\
-	"..\..\ace\config-win32.h"\
-	"..\..\ace\config.h"\
-	"..\..\ace\Connector.cpp"\
-	"..\..\ace\Connector.h"\
-	"..\..\ace\Connector.i"\
-	"..\..\ace\Containers.cpp"\
-	"..\..\ace\Containers.h"\
-	"..\..\ace\Containers.i"\
-	"..\..\ace\Dynamic.h"\
-	"..\..\ace\Dynamic_Service.cpp"\
-	"..\..\ace\Dynamic_Service.h"\
-	"..\..\ace\Event_Handler.h"\
-	"..\..\ace\Free_List.cpp"\
-	"..\..\ace\Free_List.h"\
-	"..\..\ace\Free_List.i"\
-	"..\..\ace\Get_Opt.h"\
-	"..\..\ace\Handle_Set.h"\
-	"..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\ace\Hash_Map_Manager.h"\
-	"..\..\ace\inc_user_config.h"\
-	"..\..\ace\INET_Addr.h"\
-	"..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\ace\IPC_SAP.h"\
-	"..\..\ace\IPC_SAP.i"\
-	"..\..\ace\Log_Msg.h"\
-	"..\..\ace\Log_Priority.h"\
-	"..\..\ace\Log_Record.h"\
-	"..\..\ace\Log_Record.i"\
-	"..\..\ace\Malloc_T.cpp"\
-	"..\..\ace\Malloc_T.h"\
-	"..\..\ace\Malloc_T.i"\
-	"..\..\ace\Managed_Object.cpp"\
-	"..\..\ace\Managed_Object.h"\
-	"..\..\ace\Managed_Object.i"\
-	"..\..\ace\Map_Manager.cpp"\
-	"..\..\ace\Map_Manager.h"\
-	"..\..\ace\Map_Manager.i"\
-	"..\..\ace\Mem_Map.h"\
-	"..\..\ace\Memory_Pool.h"\
-	"..\..\ace\Message_Block.h"\
-	"..\..\ace\Message_Queue.cpp"\
-	"..\..\ace\Message_Queue.h"\
-	"..\..\ace\Message_Queue.i"\
-	"..\..\ace\Module.cpp"\
-	"..\..\ace\Module.h"\
-	"..\..\ace\Module.i"\
-	"..\..\ace\Object_Manager.h"\
-	"..\..\ace\OS.h"\
-	"..\..\ace\Reactor.h"\
-	"..\..\ace\Reactor_Impl.h"\
-	"..\..\ace\Service_Config.h"\
-	"..\..\ace\Service_Object.h"\
-	"..\..\ace\Service_Repository.h"\
-	"..\..\ace\Service_Types.h"\
-	"..\..\ace\Shared_Object.h"\
-	"..\..\ace\Singleton.cpp"\
-	"..\..\ace\Singleton.h"\
-	"..\..\ace\Singleton.i"\
-	"..\..\ace\SOCK.h"\
-	"..\..\ace\SOCK.i"\
-	"..\..\ace\SOCK_Acceptor.h"\
-	"..\..\ace\SOCK_Connector.h"\
-	"..\..\ace\SOCK_Connector.i"\
-	"..\..\ace\SOCK_IO.h"\
-	"..\..\ace\SOCK_IO.i"\
-	"..\..\ace\SOCK_Stream.h"\
-	"..\..\ace\SOCK_Stream.i"\
-	"..\..\ace\SString.h"\
-	"..\..\ace\Strategies.h"\
-	"..\..\ace\Strategies_T.cpp"\
-	"..\..\ace\Strategies_T.h"\
-	"..\..\ace\Stream_Modules.cpp"\
-	"..\..\ace\Stream_Modules.h"\
-	"..\..\ace\Stream_Modules.i"\
-	"..\..\ace\streams.h"\
-	"..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\ace\Svc_Handler.cpp"\
-	"..\..\ace\Svc_Handler.h"\
-	"..\..\ace\Svc_Handler.i"\
-	"..\..\ace\Synch.h"\
-	"..\..\ace\Synch_Options.h"\
-	"..\..\ace\Synch_T.cpp"\
-	"..\..\ace\Synch_T.h"\
-	"..\..\ace\Synch_T.i"\
-	"..\..\ace\Task.h"\
-	"..\..\ace\Task_T.cpp"\
-	"..\..\ace\Task_T.h"\
-	"..\..\ace\Task_T.i"\
-	"..\..\ace\Thread.h"\
-	"..\..\ace\Thread_Manager.h"\
-	"..\..\ace\Time_Value.h"\
-	"..\..\ace\Timer_Queue.h"\
-	"..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\ace\Timer_Queue_T.h"\
-	"..\..\ace\Timer_Queue_T.i"\
-	"..\..\ace\Trace.h"\
-	"..\..\ace\Version.h"\
-	"..\..\ace\WFMO_Reactor.h"\
-	".\align.h"\
-	".\any.h"\
-	".\any.i"\
-	".\cdr.h"\
-	".\cdr.i"\
-	".\client_factory.h"\
-	".\connect.h"\
-	".\corba.h"\
-	".\corbacom.h"\
-	".\corbacom.i"\
-	".\debug.h"\
-	".\default_client.h"\
-	".\default_server.h"\
-	".\except.h"\
-	".\giop.h"\
-	".\giop.i"\
-	".\iiopobj.h"\
-	".\iiopobj.i"\
-	".\iioporb.h"\
-	".\iioporb.i"\
-	".\marshal.h"\
-	".\marshal.i"\
-	".\nvlist.h"\
-	".\nvlist.i"\
-	".\object.h"\
-	".\object.i"\
-	".\objtable.h"\
-	".\optable.h"\
-	".\orb.h"\
-	".\orb_core.h"\
-	".\orb_core.i"\
-	".\orbconf.h"\
-	".\orbobj.h"\
-	".\orbobj.i"\
-	".\params.h"\
-	".\poa.h"\
-	".\poa.i"\
-	".\principa.h"\
-	".\request.h"\
-	".\sequence.h"\
-	".\sequence.i"\
-	".\sequence_T.cpp"\
-	".\sequence_T.h"\
-	".\sequence_T.i"\
-	".\server_factory.h"\
-	".\singletons.h"\
-	".\stub.h"\
-	".\stub.i"\
-	".\svrrqst.h"\
-	".\typecode.h"\
-	".\typecode.i"\
-	
-
-"$(INTDIR)\typecode.obj" : $(SOURCE) $(DEP_CPP_TYPEC) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
deleted file mode 100644
index ce890089874..00000000000
--- a/TAO/tao/TAO.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = FILENAME
-//   tao_util.cpp
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "TAO.h"
-
-// constructor
-TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa,
-                                  PortableServer::POAManager_ptr poa_manager)
-  : orb_ (orb),
-    poa_ (poa),
-    poa_manager_ (poa_manager)
-{
-}
-
-// Initialize the ORB, using the supplied command line arguments.  the
-// poa_name is a user-supplied string that is used to name the POA
-// created.
-int
-TAO_ORB_Manager::init (int argc,
-                       char **argv,
-                       CORBA::Environment &env)
-{
-  if (CORBA::is_nil (this->orb_.in ()))
-    {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0,
-                                    env);
-      TAO_CHECK_ENV_RETURN (env, -1);
-    }
-
-  if (CORBA::is_nil (this->poa_.in ()))
-    {
-      // Get the POA from the ORB.
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          -1);
-
-      // Get the POA object.
-      this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      env);
-
-      TAO_CHECK_ENV_RETURN (env, -1);
-    }
-
-  if (CORBA::is_nil (this->poa_manager_.in ()))
-    {
-      // Get the POA_Manager.
-      this->poa_manager_ =
-        this->poa_->the_POAManager (env);
-
-      TAO_CHECK_ENV_RETURN (env, -1);
-    }
-
-  return 0;
-}
-
-// Initialize the child poa.
-
-int
-TAO_ORB_Manager::init_child_poa (int argc,
-				 char **argv,       
-				 char *poa_name,
-				 CORBA_Environment &env)
-{
-  int init_result;
-  
-  // check to see if root poa has to be created.
-  init_result = this->init (argc, argv, env);
-
-  if (init_result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Error in init.\n"),
-                      -1);
-
-  // Create the default policies - user-supplied ID, and persistent
-  // objects.
-  // CORBA::PolicyList policies (2);
-  PortableServer::PolicyList policies (2);
-  policies.length (2);
-
-  // Id Assignment policy
-  policies[0] =
-    this->poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Lifespan policy
-  policies[1] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // We use a different POA, otherwise the user would have to change
-  // the object key each time it invokes the server.
-
-  this->child_poa_ =
-    this->poa_->create_POA (poa_name,
-                            this->poa_manager_.in (),
-                            policies,
-                            env);
-  // Warning!  If create_POA fails, then the policies won't be
-  // destroyed and there will be hell to pay in memory leaks!
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  // Creation of the new POAs over, so destroy the Policy_ptr's.
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  return 0;
-}
-
-// Activate servant in the POA.
-
-CORBA::String
-TAO_ORB_Manager::activate (PortableServer::Servant servant,
-                           CORBA_Environment &env)
-{
-  PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant,
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in (),
-                                 env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  CORBA::String str =
-    this->orb_->object_to_string (obj.in (),
-                                  env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  return str;
-}
-
-// Activate the object with the object_name under the child POA.
-
-CORBA::String
-TAO_ORB_Manager::activate_under_child_poa (const char* object_name,
-                                           PortableServer::Servant servant,
-                                           CORBA_Environment& env)
-{
-  if (object_name == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "\n(%P|%t) TAO_ORB_Manager::register: "
-                       "object_name is null!"),
-                      0);
-
-  PortableServer::ObjectId_var id =
-    PortableServer::string_to_ObjectId (object_name);
-
-  this->child_poa_->activate_object_with_id (id.in (),
-                                             servant,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  CORBA::Object_var obj =
-    this->child_poa_->id_to_reference (id.in (),
-                                       env);
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  CORBA::String str =
-    this->orb_->object_to_string (obj.in (),
-                                  env);
-
-  TAO_CHECK_ENV_RETURN (env, 0);
-
-  return str;
-}
-  
-// Enter the ORB event loop.
-
-int
-TAO_ORB_Manager::run (CORBA_Environment &env,
-                      ACE_Time_Value *tv)
-{
-  this->poa_manager_->activate (env);
-
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  if (this->orb_->run (tv) == -1)
-    ACE_ERROR_RETURN ( (LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                       -1);
-
-  TAO_CHECK_ENV_RETURN (env, -1);
-  return 0;
-}
-
-// Return the corba orb reference.
-
-CORBA::ORB_ptr
-TAO_ORB_Manager::orb (void)
-{
-  return CORBA_ORB::_duplicate (this->orb_.in ());
-}
-
-// Return the root POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::root_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-// Return the child POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::child_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->child_poa_.in ());
-}
-
-// Destructor.
-
-TAO_ORB_Manager::~TAO_ORB_Manager (void)
-{
-  CORBA::Environment env;
-
-  if (CORBA::is_nil (this->poa_.in ()) == 0)
-    this->poa_->destroy (CORBA::B_TRUE,
-                         CORBA::B_TRUE,
-                         env);
-}
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
deleted file mode 100644
index 5344a1dee5b..00000000000
--- a/TAO/tao/TAO.dsp
+++ /dev/null
@@ -1,567 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=TAO - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Release"

-# PROP BASE Intermediate_Dir ".\Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /incremental:yes

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Debug"

-# PROP BASE Intermediate_Dir ".\Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO - Win32 Release"

-# Name "TAO - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Any.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Arg_Shifter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_copy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Interpreter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_ORB.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Marshal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Table.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Core.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Servant_Base.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Stub.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Typecode_Constants.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\align.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\arg_shifter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Client_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corba.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Interpreter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_ORB.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\compat\initguid.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\nvlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\compat\objbase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Table.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Operation_Table.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Principal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\servant_base.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Strategy_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\singletons.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\varout.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "*.i"

-# Begin Source File

-

-SOURCE=.\any.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Exception.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Object.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NVList.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_KeyC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ORB_Strategies_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\poaS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sequence_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server_Request.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TAO_Internal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Timeprobe.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.i

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
deleted file mode 100644
index c6eef81be49..00000000000
--- a/TAO/tao/TAO.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "TAO"=.\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
deleted file mode 100644
index 8f30943723a..00000000000
--- a/TAO/tao/TAO.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-// 
-// = FILENAME
-//   tao.h
-//
-// = DESCRIPTION
-//   Externally visible TAO extensions.   
-//
-// = AUTHOR
-//    Chris Cleeland
-// 
-// ============================================================================
-
-#if !defined (TAO_H)
-#define	TAO_H
-
-#include "tao/corba.h"
-
-class TAO_Export TAO_ORB_Manager
-{
-  // = TITLE
-  //     Helper class for simple ORB/POA initialization and 
-  //     registering servants with the POA.
-public:
-  // = Initialization and termination methods.
-  TAO_ORB_Manager (CORBA::ORB_ptr orb = 0,
-                   PortableServer::POA_ptr poa = 0,
-                   PortableServer::POAManager_ptr poa_manager = 0); 
-  // Constructor.
-
-  ~TAO_ORB_Manager (void);
-  // Destructor.
-      
-  int init (int argc, 
-            char *argv[],
-            CORBA_Environment &env);
-  // Initialize the ORB/root POA, using the supplied command line
-  // arguments or the default ORB components.  Returns -1 on failure.
-      
-  int init_child_poa (int argc,
-		      char *argv[],
-		      char *poa_name,
-		      CORBA_Environment &env);
-  // Creates a child poa under the root poa with PERSISTENT and
-  // USER_ID policies.  Call this if you want a <child_poa> with the
-  // above policies, otherwise call init.  Returns -1 on failure.
-		      
-  CORBA::String activate (PortableServer::Servant servant,
-                          CORBA_Environment &env);
-  // Activate <servant>, using the POA <activate_object> call.  Users
-  // can call this method multiple times to activate multiple objects.
-  // Returns 0 on failure.
-      
-  CORBA::String activate_under_child_poa (const char *servant_name,
-					  PortableServer::Servant servant,
-					  CORBA_Environment& env);
-  // Precondition: init_child_poa has been called.  Activate <servant>
-  // using the POA <activate_object_with_id> created from the string
-  // servant_name. Users should call this to activate objects under
-  // the child_poa.
-
-  int run (CORBA_Environment &env,
-           ACE_Time_Value *tv = 0);
-  // Run the ORB event loop with the specified <tv> time value Returns
-  // -1 on failure.
-      
-  CORBA::ORB_ptr orb (void);
-  // Accessor which returns the ORB pointer.
-
-  PortableServer::POA_ptr root_poa (void);
-  // Accessor which returns the root poa
-
-  PortableServer::POA_ptr child_poa (void);
-  // Accessor which returns the child poa
-  
-protected:
-  CORBA::ORB_var orb_;
-  // The ORB.
-      
-  PortableServer::POA_var poa_;
-  // The POA for this ORB.
-
-  PortableServer::POA_var child_poa_;
-  // Child poa under the root POA.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA manager of poa_.
-};
-  
-class TAO
-{
-  // = TITLE
-  //   Defines a namespace for externally visible TAO extensions.
-public:
-  // From Object_KeyC.h
-  typedef TAO_ObjectKey ObjectKey;
-  typedef TAO_ObjectKey_var ObjectKey_var;
-  typedef TAO_ObjectKey_out ObjectKey_out;
-
-  typedef TAO_ORB_Manager ORB_Manager;
-
-  ACE_CLASS_IS_NAMESPACE (TAO);
-};
-
-#endif /* TAO_H */
diff --git a/TAO/tao/TAO4.mak b/TAO/tao/TAO4.mak
deleted file mode 100644
index 63eb9a5b482..00000000000
--- a/TAO/tao/TAO4.mak
+++ /dev/null
@@ -1,8818 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-!IF "$(CFG)" == ""

-CFG=TAO - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to TAO - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "TAO - Win32 Release" && "$(CFG)" != "TAO - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO4.mak" CFG="TAO - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "TAO - Win32 Debug"

-RSC=rc.exe

-MTL=mktyplib.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\TAO4.dll"

-

-CLEAN : 

-	-@erase "$(INTDIR)\any.obj"

-	-@erase "$(INTDIR)\cdr.obj"

-	-@erase "$(INTDIR)\client_factory.obj"

-	-@erase "$(INTDIR)\connect.obj"

-	-@erase "$(INTDIR)\corbacom.obj"

-	-@erase "$(INTDIR)\debug.obj"

-	-@erase "$(INTDIR)\decode.obj"

-	-@erase "$(INTDIR)\deep_copy.obj"

-	-@erase "$(INTDIR)\deep_free.obj"

-	-@erase "$(INTDIR)\default_client.obj"

-	-@erase "$(INTDIR)\default_server.obj"

-	-@erase "$(INTDIR)\encode.obj"

-	-@erase "$(INTDIR)\except.obj"

-	-@erase "$(INTDIR)\giop.obj"

-	-@erase "$(INTDIR)\iiopobj.obj"

-	-@erase "$(INTDIR)\iioporb.obj"

-	-@erase "$(INTDIR)\interp.obj"

-	-@erase "$(INTDIR)\invoke.obj"

-	-@erase "$(INTDIR)\marshal.obj"

-	-@erase "$(INTDIR)\nvlist.obj"

-	-@erase "$(INTDIR)\object.obj"

-	-@erase "$(INTDIR)\objtable.obj"

-	-@erase "$(INTDIR)\optable.obj"

-	-@erase "$(INTDIR)\orb_core.obj"

-	-@erase "$(INTDIR)\orbobj.obj"

-	-@erase "$(INTDIR)\params.obj"

-	-@erase "$(INTDIR)\poa.obj"

-	-@erase "$(INTDIR)\principa.obj"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\server_factory.obj"

-	-@erase "$(INTDIR)\svrrqst.obj"

-	-@erase "$(INTDIR)\tao_internals.obj"

-	-@erase "$(INTDIR)\tc_const.obj"

-	-@erase "$(INTDIR)\typecode.obj"

-	-@erase "$(OUTDIR)\TAO4.dll"

-	-@erase "$(OUTDIR)\TAO4.exp"

-	-@erase "$(OUTDIR)\TAO4.lib"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\

- "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /D "__ACE_INLINE__"\

- /Fp"$(INTDIR)/TAO4.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE MTL /nologo /D "NDEBUG" /win32

-# ADD MTL /nologo /D "NDEBUG" /win32

-MTL_PROJ=/nologo /D "NDEBUG" /win32 

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO4.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\

- /pdb:"$(OUTDIR)/TAO4.pdb" /machine:I386 /out:"$(OUTDIR)/TAO4.dll"\

- /implib:"$(OUTDIR)/TAO4.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\any.obj" \

-	"$(INTDIR)\cdr.obj" \

-	"$(INTDIR)\client_factory.obj" \

-	"$(INTDIR)\connect.obj" \

-	"$(INTDIR)\corbacom.obj" \

-	"$(INTDIR)\debug.obj" \

-	"$(INTDIR)\decode.obj" \

-	"$(INTDIR)\deep_copy.obj" \

-	"$(INTDIR)\deep_free.obj" \

-	"$(INTDIR)\default_client.obj" \

-	"$(INTDIR)\default_server.obj" \

-	"$(INTDIR)\encode.obj" \

-	"$(INTDIR)\except.obj" \

-	"$(INTDIR)\giop.obj" \

-	"$(INTDIR)\iiopobj.obj" \

-	"$(INTDIR)\iioporb.obj" \

-	"$(INTDIR)\interp.obj" \

-	"$(INTDIR)\invoke.obj" \

-	"$(INTDIR)\marshal.obj" \

-	"$(INTDIR)\nvlist.obj" \

-	"$(INTDIR)\object.obj" \

-	"$(INTDIR)\objtable.obj" \

-	"$(INTDIR)\optable.obj" \

-	"$(INTDIR)\orb_core.obj" \

-	"$(INTDIR)\orbobj.obj" \

-	"$(INTDIR)\params.obj" \

-	"$(INTDIR)\poa.obj" \

-	"$(INTDIR)\principa.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\server_factory.obj" \

-	"$(INTDIR)\svrrqst.obj" \

-	"$(INTDIR)\tao_internals.obj" \

-	"$(INTDIR)\tc_const.obj" \

-	"$(INTDIR)\typecode.obj"

-

-"$(OUTDIR)\TAO4.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\TAO4.dll"

-

-CLEAN : 

-	-@erase "$(INTDIR)\any.obj"

-	-@erase "$(INTDIR)\cdr.obj"

-	-@erase "$(INTDIR)\client_factory.obj"

-	-@erase "$(INTDIR)\connect.obj"

-	-@erase "$(INTDIR)\corbacom.obj"

-	-@erase "$(INTDIR)\debug.obj"

-	-@erase "$(INTDIR)\decode.obj"

-	-@erase "$(INTDIR)\deep_copy.obj"

-	-@erase "$(INTDIR)\deep_free.obj"

-	-@erase "$(INTDIR)\default_client.obj"

-	-@erase "$(INTDIR)\default_server.obj"

-	-@erase "$(INTDIR)\encode.obj"

-	-@erase "$(INTDIR)\except.obj"

-	-@erase "$(INTDIR)\giop.obj"

-	-@erase "$(INTDIR)\iiopobj.obj"

-	-@erase "$(INTDIR)\iioporb.obj"

-	-@erase "$(INTDIR)\interp.obj"

-	-@erase "$(INTDIR)\invoke.obj"

-	-@erase "$(INTDIR)\marshal.obj"

-	-@erase "$(INTDIR)\nvlist.obj"

-	-@erase "$(INTDIR)\object.obj"

-	-@erase "$(INTDIR)\objtable.obj"

-	-@erase "$(INTDIR)\optable.obj"

-	-@erase "$(INTDIR)\orb_core.obj"

-	-@erase "$(INTDIR)\orbobj.obj"

-	-@erase "$(INTDIR)\params.obj"

-	-@erase "$(INTDIR)\poa.obj"

-	-@erase "$(INTDIR)\principa.obj"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\server_factory.obj"

-	-@erase "$(INTDIR)\svrrqst.obj"

-	-@erase "$(INTDIR)\tao_internals.obj"

-	-@erase "$(INTDIR)\tc_const.obj"

-	-@erase "$(INTDIR)\typecode.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\TAO4.dll"

-	-@erase "$(OUTDIR)\TAO4.exp"

-	-@erase "$(OUTDIR)\TAO4.ilk"

-	-@erase "$(OUTDIR)\TAO4.lib"

-	-@erase "$(OUTDIR)\TAO4.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D\

- "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /Fp"$(INTDIR)/TAO4.pch" /YX\

- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE MTL /nologo /D "_DEBUG" /win32

-# ADD MTL /nologo /D "_DEBUG" /win32

-MTL_PROJ=/nologo /D "_DEBUG" /win32 

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO4.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\

- /pdb:"$(OUTDIR)/TAO4.pdb" /debug /machine:I386 /out:"$(OUTDIR)/TAO4.dll"\

- /implib:"$(OUTDIR)/TAO4.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\any.obj" \

-	"$(INTDIR)\cdr.obj" \

-	"$(INTDIR)\client_factory.obj" \

-	"$(INTDIR)\connect.obj" \

-	"$(INTDIR)\corbacom.obj" \

-	"$(INTDIR)\debug.obj" \

-	"$(INTDIR)\decode.obj" \

-	"$(INTDIR)\deep_copy.obj" \

-	"$(INTDIR)\deep_free.obj" \

-	"$(INTDIR)\default_client.obj" \

-	"$(INTDIR)\default_server.obj" \

-	"$(INTDIR)\encode.obj" \

-	"$(INTDIR)\except.obj" \

-	"$(INTDIR)\giop.obj" \

-	"$(INTDIR)\iiopobj.obj" \

-	"$(INTDIR)\iioporb.obj" \

-	"$(INTDIR)\interp.obj" \

-	"$(INTDIR)\invoke.obj" \

-	"$(INTDIR)\marshal.obj" \

-	"$(INTDIR)\nvlist.obj" \

-	"$(INTDIR)\object.obj" \

-	"$(INTDIR)\objtable.obj" \

-	"$(INTDIR)\optable.obj" \

-	"$(INTDIR)\orb_core.obj" \

-	"$(INTDIR)\orbobj.obj" \

-	"$(INTDIR)\params.obj" \

-	"$(INTDIR)\poa.obj" \

-	"$(INTDIR)\principa.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\server_factory.obj" \

-	"$(INTDIR)\svrrqst.obj" \

-	"$(INTDIR)\tao_internals.obj" \

-	"$(INTDIR)\tc_const.obj" \

-	"$(INTDIR)\typecode.obj"

-

-"$(OUTDIR)\TAO4.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "TAO - Win32 Release"

-# Name "TAO - Win32 Debug"

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\typecode.cpp

-DEP_CPP_TYPEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\typecode.obj" : $(SOURCE) $(DEP_CPP_TYPEC) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cdr.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_CDR_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_CDR_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\client_factory.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_CLIEN=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_CLIEN=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\connect.cpp

-DEP_CPP_CONNE=\

-	"..\..\ace\config-win32.h"\

-	".\Timeprobe.i"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\Timeprobe.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\connect.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\corbacom.cpp

-DEP_CPP_CORBA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\corbacom.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\debug.cpp

-DEP_CPP_DEBUG=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\debug.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\decode.cpp

-DEP_CPP_DECOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\decode.obj" : $(SOURCE) $(DEP_CPP_DECOD) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\deep_copy.cpp

-DEP_CPP_DEEP_=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\deep_copy.obj" : $(SOURCE) $(DEP_CPP_DEEP_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-DEP_CPP_DEEP_F=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\deep_free.obj" : $(SOURCE) $(DEP_CPP_DEEP_F) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-DEP_CPP_DEFAU=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\default_client.obj" : $(SOURCE) $(DEP_CPP_DEFAU) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-DEP_CPP_DEFAUL=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\default_server.obj" : $(SOURCE) $(DEP_CPP_DEFAUL) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\encode.cpp

-DEP_CPP_ENCOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\encode.obj" : $(SOURCE) $(DEP_CPP_ENCOD) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\except.cpp

-DEP_CPP_EXCEP=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\except.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\giop.cpp

-DEP_CPP_GIOP_=\

-	"..\..\ace\config-win32.h"\

-	".\Timeprobe.i"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\Timeprobe.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\giop.obj" : $(SOURCE) $(DEP_CPP_GIOP_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\iiopobj.cpp

-DEP_CPP_IIOPO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\iiopobj.obj" : $(SOURCE) $(DEP_CPP_IIOPO) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\iioporb.cpp

-DEP_CPP_IIOPOR=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\iioporb.obj" : $(SOURCE) $(DEP_CPP_IIOPOR) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\interp.cpp

-DEP_CPP_INTER=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\interp.obj" : $(SOURCE) $(DEP_CPP_INTER) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\invoke.cpp

-DEP_CPP_INVOK=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\invoke.obj" : $(SOURCE) $(DEP_CPP_INVOK) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\marshal.cpp

-DEP_CPP_MARSH=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\marshal.obj" : $(SOURCE) $(DEP_CPP_MARSH) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\nvlist.cpp

-DEP_CPP_NVLIS=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\nvlist.obj" : $(SOURCE) $(DEP_CPP_NVLIS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\object.cpp

-DEP_CPP_OBJEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\objtable.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_OBJTA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_OBJTA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\optable.cpp

-DEP_CPP_OPTAB=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\optable.obj" : $(SOURCE) $(DEP_CPP_OPTAB) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\orb_core.cpp

-DEP_CPP_ORB_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\arg_shifter.h"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Env_Value_T.cpp"\

-	{$(INCLUDE)}"\ace\Env_Value_T.h"\

-	{$(INCLUDE)}"\ace\Env_Value_T.i"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\orb_core.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\orbobj.cpp

-DEP_CPP_ORBOB=\

-	"..\..\ace\config-win32.h"\

-	".\Timeprobe.i"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\Timeprobe.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\orbobj.obj" : $(SOURCE) $(DEP_CPP_ORBOB) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\params.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_PARAM=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_PARAM=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\poa.cpp

-DEP_CPP_POA_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\poa.obj" : $(SOURCE) $(DEP_CPP_POA_C) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\principa.cpp

-DEP_CPP_PRINC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\principa.obj" : $(SOURCE) $(DEP_CPP_PRINC) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\request.cpp

-DEP_CPP_REQUE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\server_factory.cpp

-DEP_CPP_SERVE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\server_factory.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svrrqst.cpp

-DEP_CPP_SVRRQ=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\svrrqst.obj" : $(SOURCE) $(DEP_CPP_SVRRQ) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\tao_internals.cpp

-DEP_CPP_TAO_I=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\tao_internals.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\tc_const.cpp

-DEP_CPP_TC_CO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\tc_const.obj" : $(SOURCE) $(DEP_CPP_TC_CO) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\any.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_ANY_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_ANY_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\compat\initguid.h"\

-	{$(INCLUDE)}"\.\compat\objbase.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\nvlist.i"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\sequence_T.cpp"\

-	{$(INCLUDE)}"\.\sequence_T.h"\

-	{$(INCLUDE)}"\.\sequence_T.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\Basic_Types.h"\

-	{$(INCLUDE)}"\ace\Basic_Types.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\inc_user_config.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\iosfwd.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\streams.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\sys_conf.h"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\sys\stat.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tao/TAO4.mdp b/TAO/tao/TAO4.mdp
deleted file mode 100644
index 0f3780aaa15..00000000000
--- a/TAO/tao/TAO4.mdp
+++ /dev/null
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
deleted file mode 100644
index 2f67f884a23..00000000000
--- a/TAO/tao/TAO_Internal.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "ace/Service_Config.h"
-#include "ace/Service_Repository.h"
-#include "ace/Object_Manager.h"
-#include "tao/default_server.h"
-#include "tao/default_client.h"
-#include "tao/TAO_Internal.h"
-
-int TAO_Internal::service_open_count_ = 0;
-
-int
-TAO_Internal::fake_service_entries_i (void)
-{
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-#define FAKE_SVC_ENTRY(svcname, svctype, argc, argv) \
-  do \
-    { \
-      ACE_Service_Object *obj = _make_##svctype (); \
-      obj->init (argc, argv); \
-      ACE_Service_Repository::instance ()->insert \
-        (new ACE_Service_Type (svcname,\
-                               new ACE_Service_Object_Type\
-                               (obj, svcname, \
-                                (ACE_Service_Type::DELETE_OBJ \
-                                 | ACE_Service_Type::DELETE_THIS)), \
-                               0, 1));\
-    }\
-  while (0) //;
-
-  char *rfactory_args[] = TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
-  FAKE_SVC_ENTRY ("Resource_Factory",
-                  TAO_Resource_Factory,
-                  sizeof rfactory_args / sizeof rfactory_args[0],
-                  rfactory_args);
-
-  char *client_args[] = TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
-  FAKE_SVC_ENTRY ("Client_Strategy_Factory",
-                  TAO_Default_Client_Strategy_Factory,
-                  0,
-                  client_args);
-
-  char* server_args[] = TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
-  FAKE_SVC_ENTRY ("Server_Strategy_Factory",
-                  TAO_Default_Server_Strategy_Factory,
-                  sizeof server_args / sizeof server_args[0],
-                  server_args);
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-
-  return 0;
-}
-
-int
-TAO_Internal::open_services (int& argc, char** argv)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1));
-
-  if (TAO_Internal::service_open_count_++ == 0)
-    {
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-      ACE_UNUSED_ARG (argc);
-      ACE_UNUSED_ARG (argv);
-      return fake_service_entries_i ();
-#else
-      return ACE_Service_Config::open (argc, argv);
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-    }
-  else
-    return 0;
-}
-
-TAO_Internal::TAO_Internal (void)
-{
-}
-
-int
-TAO_Internal::close_services (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-			    *ACE_Static_Object_Lock::instance (), -1));
-
-  if (service_open_count_ == 0)
-    return -1;
-
-  // @@ Should this be removed?
-  //  if (--service_open_count_ == 0)
-  //    return ACE_Service_Config::close ();
-
-  return 0;
-}
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
deleted file mode 100644
index 2f040c93b99..00000000000
--- a/TAO/tao/TAO_Internal.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    TAO_Internal.h
-//
-// = DESCRIPTION
-//    Structures and methods completely internal to TAO.
-//
-// = AUTHOR
-//    Chris Cleeland
-// 
-// ============================================================================
-
-#if !defined (TAO_INTERNAL_H)
-#  define TAO_INTERNAL_H
-
-#  include "tao/corba.h"
-
-class TAO_Export TAO_Internal
-  // = TITLE
-  //    This class encapsulates some private behaviors and global data
-  //    structures used internal to TAO.  No application should EVER
-  //    see this class.
-{
-public:
-  static int open_services (int& argc, char** argv);
-  // Initialize the ACE Service Configurator.  This is a one-shot
-  // method, i.e., it can be called multiple times but it will only do
-  // its work once.  It does, however, track the number of times it's
-  // called (see <open_services>).  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.
-
-  static int close_services (void);
-  // The complement to <open_services>, this will perform appropriate
-  // ACE Service Configurator closure operations.  It should be called
-  // as many times as <open_services>, and will only actually close
-  // things down on the last call.  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.
-
-protected:
-  static int fake_service_entries_i (void);
-  // If your platform can't support the Service Configurator's model
-  // of loading services found in a file, then you should change the
-  // code in here in order to get service entries into the service
-  // repository.
-  
-private:
-  TAO_Internal (void);
-  // Private CTOR prevents this class from being instantiated.
-
-  static int service_open_count_;
-  // Number of times <open_services> has been called.  Incremented by
-  // <open_services>, and decremented by <close_services>.  Access to
-  // this is protected via the <ACE_Static_Object_Lock>.
-};
-
-#endif /* TAO_INTERNAL_H */
diff --git a/TAO/tao/TAO_Internal.i b/TAO/tao/TAO_Internal.i
deleted file mode 100644
index 357b59f4a8d..00000000000
--- a/TAO/tao/TAO_Internal.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- c++ -*-
-//
-// $Id$
-
diff --git a/TAO/tao/Timeprobe.cpp b/TAO/tao/Timeprobe.cpp
deleted file mode 100644
index bdf4a601f6c..00000000000
--- a/TAO/tao/Timeprobe.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-#include "ace/OS.h"
-#include "Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Timeprobe.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Timeprobe *ACE_Timeprobe::instance_ = 0;
-
-ACE_Timeprobe &
-ACE_Timeprobe::instance (void)
-{
-  if (instance_ == 0)
-    // If this allocation fails, we're in big trouble . . .
-    ACE_NEW_RETURN (instance_,
-                    ACE_Timeprobe (),
-                    *instance_);
-  return *instance_;
-}
-
-void
-ACE_Timeprobe::timeprobe (const char *id)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-  timeprobes [current_slot_].id_ = id;
-  timeprobes [current_slot_].time_ = ACE_OS::gethrtime ();
-  timeprobes [current_slot_].thread_ = ACE_OS::thr_self ();
-
-  ++current_slot_;
-
-  ACE_ASSERT (current_slot_ < SLOTS);
-}
-
-void
-ACE_Timeprobe::print_times (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nACE_Timeprobe; %u timeprobes were recorded:\n",
-              current_slot_ > 1 ? current_slot_ - 1 : 0));
-
-  if (current_slot_ <= 0)
-  return;
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "%-52.52s %8.8s %10.10s\n",
-              "NAME",
-              "thread",
-              "usec"));
-  ACE_DEBUG ((LM_DEBUG,
-              "\"%-50s\" %8.8x %10.10s\n",
-              timeprobes[0].id_,
-              timeprobes[0].thread_,
-              "START"));
-
-  for (u_int i = 1; i < current_slot_; ++i)
-    {
-      ACE_hrtime_t elapsed =
-        timeprobes [i].time_ - timeprobes [i-1].time_;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\"%-50s\" %8.8x %10.3f\n",
-                  timeprobes [i].id_,
-                  timeprobes [i].thread_,
-                  (double) (elapsed /
-                            (ACE_UINT32) 1000u) /* nanosec/microsec */));
-    }
-#if 0
-  ACE_hrtime_t elapsed2 = (timeprobes [current_slot_ - 1].time_
-                           - timeprobes [0].time_);
-
-  double total = elapsed2/1000.0; // nanoseconds/microsecond
-  // print the total time
-  ACE_DEBUG ((LM_DEBUG, 
-              "%52.52s =========\n"
-              "%46.46s total %10.3f usec\n",
-              "",
-              "",
-              total));
-#endif /* 0 */
-}
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
deleted file mode 100644
index 59007bf7105..00000000000
--- a/TAO/tao/Timeprobe.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#if !defined (ACE_TIMEPROBE_H)
-#define ACE_TIMEPROBE_H
-
-#include "ace/Synch.h"
-
-class ACE_Timeprobe
-{
-  // @@ Please comment me.
-public:
-  static ACE_Timeprobe &instance (void);
-
-  void timeprobe (const char *id);
-
-  void print_times (void) const;
-
-  void reset (void);
-
-  void destroy (void);
-
-private:
-  ACE_Timeprobe (void);
-  ~ACE_Timeprobe (void);
-
-  ACE_Timeprobe (const ACE_Timeprobe &); 
-  // Not implemented.
-
-private:
-  static ACE_Timeprobe *instance_;
-
-  enum { SLOTS = 8192 };
-
-  ACE_SYNCH_MUTEX mutex_;
-
-  u_int current_slot_;
-
-  struct timeprobe_t
-  {
-    const char *id_;
-    ACE_hrtime_t time_;
-    ACE_thread_t thread_;
-  };
-
-  timeprobe_t timeprobes [SLOTS];
-
-  // @@ Don't we have a macro that does this?
-  friend class null_friend_to_avoid_compiler_warning_about_no_friends;
-};
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-#  define ACE_TIMEPROBE_RESET ACE_Timeprobe::instance ().reset ()
-#  define ACE_TIMEPROBE(id) ACE_Timeprobe::instance ().timeprobe (id)
-#  define ACE_TIMEPROBE_PRINT ACE_Timeprobe::instance ().print_times ()
-#  define ACE_TIMEPROBE_FINI ACE_Timeprobe::instance ().destroy ()
-#else
-#  define ACE_TIMEPROBE_RESET
-#  define ACE_TIMEPROBE(id)
-#  define ACE_TIMEPROBE_PRINT
-#  define ACE_TIMEPROBE_FINI
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-#if defined (__ACE_INLINE__)
-#include "Timeprobe.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_TIMEPROBE_H */
diff --git a/TAO/tao/Timeprobe.i b/TAO/tao/Timeprobe.i
deleted file mode 100644
index faed2b6d69c..00000000000
--- a/TAO/tao/Timeprobe.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_Timeprobe::ACE_Timeprobe (void)
-  : current_slot_ (0)
-{
-}
-
-ACE_INLINE
-ACE_Timeprobe::~ACE_Timeprobe (void)
-{
-}
-
-ACE_INLINE void
-ACE_Timeprobe::destroy (void)
-{
-  delete instance_;
-  instance_ = 0;
-}
-
-ACE_INLINE void
-ACE_Timeprobe::reset (void)
-{
-  current_slot_ = 0;
-}
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
deleted file mode 100644
index 454cc1333d5..00000000000
--- a/TAO/tao/Typecode.cpp
+++ /dev/null
@@ -1,2320 +0,0 @@
-// $Id$
-
-// Typecodes essentially consist of just the CDR octets that get
-// marshaled and unmarshaled, and this code knows how to parse those
-// octets and answer questions CORBA's TypeCode APIs require.
-//
-// NOTE: This isn't well tuned performance-wise.  Given how much is
-// variable (byte order, alignment) it's clear tuning has its limits
-// with respect to CDR bytecode interpretation.
-//
-// THREADING NOTE: Typecodes are readonly data structures, and the
-// only mutual exclusion relates to reference counting and
-// construction.
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Typecode.i"
-#endif /* ! __ACE_INLINE__ */
-
-// Just fetch the 'kind' field out of the typecode.
-void *
-CORBA_TypeCode::operator new (size_t s)
-{
-  return ::operator new (s);
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    tc->AddRef ();
-  return tc;
-}
-
-CORBA_Bounds::CORBA_Bounds (void)
-  : CORBA_UserException (CORBA::_tc_Bounds)
-{
-}
-
-CORBA_BadKind::CORBA_BadKind (void)
-  : CORBA_UserException (CORBA::_tc_BadKind)
-{
-}
-
-// Constructor for CONSTANT typecodes with empty parameter lists.
-// These are only created once, and those constants are shared.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind)
-  : length_ (0),
-    buffer_ (0),
-    byte_order_ (0),
-    kind_ (kind),
-    parent_ (0),
-    refcount_ (1),
-    delete_flag_ (CORBA::B_FALSE),
-    orb_owns_ (CORBA::B_TRUE),
-    private_state_ (new TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
-{
-}
-
-// Constructor for all other typecodes, including constants with
-// non-empty parameter lists.  See "corba.hh" for details.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
-                                size_t length,
-                                const char *buffer,
-                                CORBA::Boolean orb_owns_tc,
-                                CORBA::TypeCode_ptr parent)
-  : length_ (length - 4),
-    kind_ (kind),
-    parent_ (parent),
-    refcount_ (1),
-    delete_flag_ (CORBA::B_FALSE),
-    orb_owns_ (orb_owns_tc),
-    private_state_ (new TC_Private_State (kind))
-{
-  // The CDR code used to interpret TypeCodes requires in-memory
-  // alignments to match the "on-the-wire" alignments, simplifying
-  // algorithms used to marshal/unmarshal.
-  //
-  // However, it's often hard to get compilers (in particular) to
-  // generate data that's so aligned, since C++ doesn't provide
-  // primitives giving control at that low a level.  Although there
-  // are ways to get that alignment which work in almost all cases, we
-  // need to ensure adequate alignment in _all_ cases.
-  //
-  // This code exists to ensure such alignment; since the constructor
-  // is intended only for use by an IDL compiler or ORB code, it's not
-  // currently a priority to ensure the allocated code is freed.
-
-  // TAO comments:
-
-  // For free standing typecodes, we choose to always make a copy of
-  // the buffer passed in. That way, our destructor doesn't have to
-  // deal with the case where the buffer was either allocated in which
-  // case it must be freed or the case where our buffer just points to
-  // the buffer passed in.
-
-  if (!parent_)
-    {
-      // Allocate a buffer to hold the encapsulated stream. We
-      // allocate extra space since we need a buffer that is aligned
-      // on a 4 byte word boundary. As a result, it is quite possible
-      // that we may start accessing the buffer from a position
-      // shifted to the right in the allocated buffer. As a result,
-      // during destruction, we do not want part of the allocated heap
-      // to remain dangling. Hence we save a handle to the original
-      // allocated buffer.
-
-      // @@ The typecode buffer contain the encapsulation byte order
-      // in the first byte...
-      const CORBA::Octet* ptr =
-	ACE_reinterpret_cast(const CORBA::Octet*,buffer);
-      this->byte_order_ = *ptr;
-
-      ACE_NEW (this->non_aligned_buffer_,
-	       char [this->length_ + CDR::MAX_ALIGNMENT]);
-
-      char* start = ptr_align_binary (this->non_aligned_buffer_,
-				      CDR::MAX_ALIGNMENT);
-
-      (void) ACE_OS::memcpy (start, buffer + 4, this->length_);
-
-      this->buffer_ = start;
-      // The ORB does not own this typecode.
-      this->orb_owns_ = CORBA::B_FALSE;
-    }
-  else
-    {
-      // We are a child. We do not allocate a new buffer, but share it
-      // with our parent. We know that our parent's buffer was
-      // properly aligned.
-      const CORBA::Octet* ptr =
-	ACE_reinterpret_cast(const CORBA::Octet*,buffer);
-      this->byte_order_ = *ptr;
-
-      this->buffer_ = buffer + 4;
-    }
-}
-
-// Destructor.  For "indirected" typecodes and children, the typecode
-// reuses the buffer owned by its parent.
-
-void
-CORBA_TypeCode::operator delete (void* p)
-{
-  CORBA::TypeCode_ptr tc = (CORBA_TypeCode *) p;
-
-  if (!tc->orb_owns_)
-    ::delete p;
-}
-
-CORBA_TypeCode::~CORBA_TypeCode (void)
-{
-  if (this->orb_owns_)
-    // we are constants, don't do anything
-    return;
-  else if (this->parent_) // check if we have a parent
-    {
-      // We have a parent which means that we were not directly
-      // created by IDL compiler generated code, but by the
-      // precomputation logic. We should delete ourselves and the
-      // subtree below us only if our parent was in the process of
-      // deleteing itself
-      if (parent_->delete_flag_)
-        // Parent is deleting, so we have to go.
-        {
-          // Set our delete flag to TRUE so that our children (if any)
-          // will know that we have initiated our destruction
-          this->delete_flag_ = CORBA::B_TRUE;
-
-          // Delete any private state we have and thus free up the
-          // children.
-	  if (this->private_state_)
-	    {
-	      delete this->private_state_;
-	      this->private_state_ = 0;
-	    }
-
-          // We share the buffer octets of our parent. Hence we don't
-          // deallocate it.
-          this->buffer_ = 0;
-        }
-      // Else, somebody maliciously tried to delete us, but we won't
-      // get deleted.
-    }
-  else
-    {
-      // We are free standing (IDL compiler generated code) and are to
-      // be deleted.  We indicate to our children that we are getting
-      // deleted.
-      this->delete_flag_ = CORBA::B_TRUE;
-
-      // Free up our children.
-      delete this->private_state_;
-
-      // Delete the original, possibly nonaligned, buffer.
-      delete [] this->non_aligned_buffer_;
-      this->buffer_ = 0;
-    }
-}
-
-// decreases the refcount and deletes when refcount reaches 0
-
-void CORBA::release (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    tc->Release ();
-}
-
-// returns true if the typecode is NULL
-CORBA::Boolean CORBA::is_nil (CORBA::TypeCode_ptr tc)
-{
-  return (CORBA::Boolean) (tc == 0);
-}
-
-// Return the i-th member typecode if it exists, else raise an
-// exception. Possible exceptions are BadKind and Bounds.
-//
-// Applicable only to struct, union, and except
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::member_type (CORBA::ULong index,
-                             CORBA::Environment &env) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_type_list_known_)
-    {
-      if (index < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_type_list_[index];
-      else
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-    }
-  else
-    return this->private_member_type (index, env);
-}
-
-// Applicable only to struct, union, and except
-
-const char *
-CORBA_TypeCode::member_name (CORBA::ULong index,
-                             CORBA::Environment &env) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_name_list_known_)
-    {
-      if (index < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_name_list_[index];
-      else
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-    }
-  else
-    return this->private_member_name (index, env);
-}
-
-// Return the label of the i-th member.  Applicable only to CORBA::tk_union
-CORBA::Any_ptr
-CORBA_TypeCode::member_label (CORBA::ULong index,
-                              CORBA::Environment &env) const
-{
-  if (this->private_state_->tc_member_count_known_
-      && this->private_state_->tc_member_label_list_known_)
-    {
-      if (index < this->private_state_->tc_member_count_)
-        return this->private_state_->tc_member_label_list_[index];
-      else
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-    }
-  else
-    return this->private_member_label (index, env);
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (CORBA::Environment &env) const
-{
-  if (this->kind_ == CORBA::tk_union)
-    {
-      if (this->private_state_->tc_discriminator_type_known_)
-        return this->private_state_->tc_discriminator_type_;
-      else
-        return this->private_discriminator_type (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::TypeCode_ptr)0;
-    }
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::Long
-CORBA_TypeCode::default_index (CORBA::Environment &env) const
-{
-  if (this->kind_ == CORBA::tk_union)
-    {
-      if (this->private_state_->tc_default_index_used_known_)
-        return this->private_state_->tc_default_index_used_;
-      else
-        return this->private_default_index (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// returns the length. Applicable only to string, sequence, and arrays
-CORBA::ULong
-CORBA_TypeCode::length (CORBA::Environment &env) const
-{
-  // a switch stmt, unfortunately, doesn't get inlined
-  if (this->kind_ == CORBA::tk_sequence
-      || this->kind_ == CORBA::tk_array
-      || this->kind_ == CORBA::tk_string
-      || this->kind_ == CORBA::tk_wstring)
-    {
-      if (this->private_state_->tc_length_known_)
-        return this->private_state_->tc_length_;
-      else
-        return this->private_length (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// returns the typecode. Applicable only to string, sequence, and arrays
-CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (CORBA::Environment &env) const
-{
-  if (this->kind_ == CORBA::tk_sequence
-      || this->kind_ == CORBA::tk_array
-      || this->kind_ == CORBA::tk_alias)
-    {
-      if (this->private_state_->tc_content_type_known_)
-        return this->private_state_->tc_content_type_;
-      else
-        return this->private_content_type (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// compute the padded size of the discriminant
-CORBA::ULong
-CORBA_TypeCode::TAO_discrim_pad_size (CORBA::Environment &env)
-{
-  if (this->kind_ == CORBA::tk_union)
-    {
-      if (this->private_state_->tc_discrim_pad_size_known_)
-        return this->private_state_->tc_discrim_pad_size_;
-      else
-        return this->private_discrim_pad_size (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// skip a typecode encoding in a given CDR stream
-// This is just a helper function
-CORBA::Boolean
-CORBA_TypeCode::skip_typecode (TAO_InputCDR &stream)
-{
-  CORBA::ULong kind;
-  CORBA::ULong temp;
-
-  if (stream.read_ulong (kind)
-      && (kind < CORBA::TC_KIND_COUNT || kind == ~CORBA::ULong(0)))
-    {
-
-      switch (kind)
-        {
-          // Most TypeCodes have empty parameter lists, nothing to skip
-        default:
-          break;
-
-          // Some have single integer parameters, easy to skip.  Some have
-          // preallocated constants that could be used.
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-        case ~0:
-          return stream.read_ulong (temp);
-
-          // The rest have "complex" parameter lists that are
-          // encoded as bulk octets ... just skip them.
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_enum:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-          return (stream.read_ulong (temp) != CORBA::B_FALSE
-                  && stream.skip_bytes (temp) != CORBA::B_FALSE);
-        }
-
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-// constructor for the private state
-TC_Private_State::TC_Private_State (CORBA::TCKind kind)
-  : tc_kind_ (kind),
-    tc_id_known_ (CORBA::B_FALSE),
-    tc_name_known_ (CORBA::B_FALSE),
-    tc_member_count_known_ (CORBA::B_FALSE),
-    tc_member_type_list_known_ (CORBA::B_FALSE),
-    tc_member_name_list_known_ (CORBA::B_FALSE),
-    tc_member_label_list_known_ (CORBA::B_FALSE),
-    tc_discriminator_type_known_ (CORBA::B_FALSE),
-    tc_default_index_used_known_ (CORBA::B_FALSE),
-    tc_length_known_ (CORBA::B_FALSE),
-    tc_content_type_known_ (CORBA::B_FALSE),
-    tc_size_known_ (CORBA::B_FALSE),
-    tc_alignment_known_ (CORBA::B_FALSE),
-    tc_discrim_pad_size_known_ (CORBA::B_FALSE),
-    tc_id_ (0),
-    tc_name_ (0),
-    tc_member_count_ (0),
-    tc_member_type_list_ (0),
-    tc_member_name_list_ (0),
-    tc_member_label_list_ (0),
-    tc_discriminator_type_ (0),
-    tc_default_index_used_ (0),
-    tc_length_ (0),
-    tc_content_type_ (0),
-    tc_size_ (0),
-    tc_alignment_ (0),
-    tc_discrim_pad_size_ (0)
-{
-}
-
-// destructor for the private state. In effect, this cleans up all the children
-// and the subtree we hold.
-TC_Private_State::~TC_Private_State (void)
-{
-  // the following two just point into the buffer. So we just make it point to NUL
-  this->tc_id_ = 0;
-  this->tc_name_ = 0;
-
-  // determine what kind of children we may have and free the space accordingly
-  switch (this->tc_kind_)
-    {
-    case CORBA::tk_enum:
-        // free up the member name list
-        if (this->tc_member_name_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              this->tc_member_name_list_ [i] = 0; // not owned by us
-
-            delete [] this->tc_member_name_list_;
-          }
-        break;
-    case CORBA::tk_struct:
-    case CORBA::tk_except:
-      {
-        // free up the member name list
-        if (this->tc_member_name_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              this->tc_member_name_list_ [i] = 0; // not owned by us
-
-            delete [] this->tc_member_name_list_;
-          }
-
-        // free up member type list
-        if (this->tc_member_type_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              // free up the memory allocated for the typecode only if it has a parent
-              if (this->tc_member_type_list_[i]->parent_)
-                delete this->tc_member_type_list_[i];
-
-            // Now free up the array.
-            delete [] this->tc_member_type_list_;
-          }
-        this->tc_member_count_ = 0;
-      }
-      break;
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-      // Delete the content type only if it has a parent i.e., if it
-      // is not acquired from the pool of constant or predefined
-      // typecodes.
-      if (this->tc_content_type_known_
-          && this->tc_content_type_->parent_)
-        delete this->tc_content_type_;
-      break;
-    case CORBA::tk_union:
-      {
-        // free up the member name list
-        if (this->tc_member_name_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              this->tc_member_name_list_ [i] = 0; // not owned by us
-
-            delete [] this->tc_member_name_list_;
-          }
-
-        // Free up type list, label list, and finally the discriminator
-        if (this->tc_member_type_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              // free up the memory allocated for the typecode if it has a
-              // parent that owns it
-              if (this->tc_member_type_list_[i]->parent_)
-                delete this->tc_member_type_list_[i];
-
-            // Now free up the array.
-            delete [] this->tc_member_type_list_;
-          }
-        if (this->tc_member_label_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < this->tc_member_count_;
-                 i++)
-              // Free up the label (Any_ptr).
-              delete this->tc_member_label_list_[i];
-
-            delete [] this->tc_member_label_list_;
-          }
-        this->tc_member_count_ = 0;
-        // Discriminator must come last b/c it will be inside the Any
-        // in each element of the label list.
-        delete this->tc_discriminator_type_;
-      }
-      break;
-    default:
-      // nothing to do
-      break;
-    }
-}
-
-CORBA::ULong
-CORBA_TypeCode::AddRef (void)
-{
-  assert (this != 0);
-
-  if (this->orb_owns_)
-    return this->refcount_; // this better be 1
-  else if (parent_)
-    // we are owned by the parent
-    //    return parent_->Addref ();
-    return this->refcount_; // 1
-  else
-    return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA_TypeCode::Release (void)
-{
-  ACE_ASSERT (this != 0);
-
-  u_long result;
-
-  if (this->orb_owns_)
-    result = this->refcount_; // 1
-  else if (this->parent_)
-    // return parent_->Release ();
-    result = this->refcount_; // 1
-  else
-    {
-      result = --this->refcount_;
-
-      if (result == 0)
-        delete this;
-
-      return result;
-    }
-
-  return result;
-}
-
-// check if typecodes are equal. Equality is based on a mix of structural and
-// name equivalence i.e., if names are provided, we also check for name
-// equivalence, else resort simply to structural equivalence.
-CORBA::Boolean
-CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &env) const
-{
-  // We come in here only if the typecode kinds of both are same
-  // Handle each complex typecode separately.
-  switch (this->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_boolean:
-    case CORBA::tk_octet:
-    case CORBA::tk_char:
-    case CORBA::tk_wchar:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-      // all these are simple typecodes and the comparison is based solely on
-      // the kind_ field
-      return CORBA::B_TRUE;
-    case CORBA::tk_objref:
-      return this->private_equal_objref (tc, env);
-    case CORBA::tk_struct:
-      return this->private_equal_struct (tc, env);
-    case CORBA::tk_union:
-      return this->private_equal_union (tc, env);
-    case CORBA::tk_enum:
-      return this->private_equal_enum (tc, env);
-    case CORBA::tk_string:
-      return this->private_equal_string (tc, env);
-    case CORBA::tk_wstring:
-      return this->private_equal_wstring (tc, env);
-    case CORBA::tk_sequence:
-      return this->private_equal_sequence (tc, env);
-    case CORBA::tk_array:
-      return this->private_equal_array (tc, env);
-    case CORBA::tk_alias:
-      return this->private_equal_alias (tc, env);
-    case CORBA::tk_except:
-      return this->private_equal_except (tc, env);
-    case ~0: // indirection
-      {
-        // indirection offset must be same
-        return CORBA::B_TRUE;
-      }
-      ACE_NOTREACHED (break);
-    default:
-      return CORBA::B_FALSE;
-    }
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_objref (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const
-{
-  env.clear ();
-  // compare the repoID and name, of which the name is optional as per GIOP
-  // spec. However, the repoID is mandatory.
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-
-  if (!ACE_OS::strcmp (my_id, tc_id))
-    {
-      // same repository IDs. Now check their names
-      const char *myname = this->name (env);
-      if (env.exception ())
-        return 0;
-      const char *tcname = tc->name (env);
-      if (env.exception ())
-        return 0;
-      if ((ACE_OS::strlen (myname) > 1) &&
-          (ACE_OS::strlen (tcname) > 1))
-        {
-          // both of them specify names, compare them
-          if (!ACE_OS::strcmp (myname, tcname))
-            return 1; // success
-          else
-            return 0; // failed
-        }
-      return 1; // equal (success)
-    }
-  return 0; // failed
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // for structs the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-  const char *my_name = this->name (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_name = tc->name (env);
-  if (env.exception ())
-    return 0;
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1
-      && ACE_OS::strlen (tc_id) > 1
-      && ACE_OS::strcmp (my_id, tc_id)) // not same
-    return 0;
-
-  // Compare names if they exist.
-  if (ACE_OS::strlen (my_name) > 1
-      && ACE_OS::strlen (tc_name) > 1
-      && ACE_OS::strcmp (my_name, tc_name)) // not same
-    return 0;
-
-  // Check if the member count is same.
-  CORBA::ULong my_count = this->member_count (env);
-
-  if (env.exception ())
-    return 0;
-  CORBA::ULong tc_count = tc->member_count (env);
-  if (env.exception ())
-    return 0;
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      const char *my_member_name =
-        this->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      const char *tc_member_name =
-        tc->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      if (ACE_OS::strlen (my_member_name) > 1
-          && ACE_OS::strlen (tc_member_name) > 1
-          && ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-        return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::Boolean flag =
-        my_member_tc->equal (tc_member_tc, env);
-
-      if (!flag || env.exception ())
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // For unions the repoID and names are optional. However, if
-  // provided, we must compare them.
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-  const char *my_name = this->name (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_name = tc->name (env);
-  if (env.exception ())
-    return 0;
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1
-      && ACE_OS::strlen (tc_id) > 1
-      && ACE_OS::strcmp (my_id, tc_id)) // not same
-    return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1
-      && ACE_OS::strlen (tc_name) > 1
-      && ACE_OS::strcmp (my_name, tc_name)) // not same
-    return 0;
-
-  // check if the discriminant type is same
-  CORBA::TypeCode_ptr my_discrim = this->discriminator_type (env);
-  if (env.exception ())
-    return 0;
-  CORBA::TypeCode_ptr tc_discrim = tc->discriminator_type (env);
-  if (env.exception ())
-    return 0;
-  if (!my_discrim->equal (tc_discrim, env))
-    return 0;
-
-  // check the default used
-  CORBA::Long my_default = this->default_index (env);
-  if (env.exception ())
-    return 0;
-  CORBA::Long tc_default = tc->default_index (env);
-  if (env.exception ())
-    return 0;
-  if (my_default != tc_default)
-    return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (env);
-  if (env.exception ())
-    return 0;
-  CORBA::ULong tc_count = tc->member_count (env);
-  if (env.exception ())
-    return 0;
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      // First check if labels are same.
-
-      // check if member names are same
-      const char *my_member_name = this->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      const char *tc_member_name = tc->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, env);
-      if (!flag || env.exception ())
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
-                                    CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // for enum the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-  const char *my_name = this->name (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_name = tc->name (env);
-  if (env.exception ())
-    return 0;
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
-    if (ACE_OS::strcmp (my_id, tc_id)) // not same
-      return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (env);
-  if (env.exception ())
-    return 0;
-  CORBA::ULong tc_count = tc->member_count (env);
-  if (env.exception ())
-    return 0;
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      // now check if the member names are same
-      const char *my_member_name = this->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      const char *tc_member_name = tc->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_string (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const
-{
-  // compare the lengths
-  CORBA::ULong my_len = this->length (env);
-  if (env.exception ())
-    return 0;
-
-  CORBA::ULong tc_len = tc->length (env);
-  if (env.exception ())
-    return 0;
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &env) const
-{
-  // compare the lengths
-  CORBA::ULong my_len = this->length (env);
-  if (env.exception ())
-    return 0;
-
-  CORBA::ULong tc_len = tc->length (env);
-  if (env.exception ())
-    return 0;
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                        CORBA::Environment &env) const
-{
-  // this involves comparing the typecodes of the element type as well as the
-  // bounds
-  CORBA::TypeCode_ptr my_elem = this->content_type (env);
-  if (env.exception ())
-    return 0;
-
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (env);
-  if (env.exception ())
-    return 0;
-
-  if (!my_elem->equal (tc_elem, env))
-    return 0;
-
-  // now check if bounds are same
-  CORBA::ULong my_len = this->length (env);
-  if (env.exception ())
-    return 0;
-
-  CORBA::ULong tc_len = tc->length (env);
-  if (env.exception ())
-    return 0;
-
-  return (my_len == tc_len);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &env) const
-{
-  // exactly like sequence
-  return this->private_equal_sequence (tc, env);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // for structs the repoID and names are optional. However, if provided, we
-  // must compare them
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-  const char *my_name = this->name (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_name = tc->name (env);
-  if (env.exception ())
-    return 0;
-
-  // compare repoIDs if they exist
-  if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
-    if (ACE_OS::strcmp (my_id, tc_id)) // not same
-      return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // now compare element typecodes
-  CORBA::TypeCode_ptr my_elem = this->content_type (env);
-  if (env.exception ())
-    return 0;
-
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (env);
-  if (env.exception ())
-    return 0;
-
-  return my_elem->equal (tc_elem, env);
-}
-
-CORBA::Boolean
-CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const
-{
-  // exactly similar to structs, except that the repository ID is mandatory
-  env.clear ();
-
-  const char *my_id = this->id (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_id = tc->id (env);
-  if (env.exception ())
-    return 0;
-
-  if (ACE_OS::strcmp (my_id, tc_id))
-    return 0; // failed
-
-  // now compare names. They may be optional
-  const char *my_name = this->name (env);
-  if (env.exception ())
-    return 0;
-  const char *tc_name = tc->name (env);
-  if (env.exception ())
-    return 0;
-
-  // compare names if they exist
-  if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
-
-  // check if the member count is same
-  CORBA::ULong my_count = this->member_count (env);
-  if (env.exception ())
-    return 0;
-  CORBA::ULong tc_count = tc->member_count (env);
-  if (env.exception ())
-    return 0;
-
-  if (my_count != tc_count)
-    return 0; // number of members don't match
-
-  for (CORBA::ULong i=0; i < my_count; i++)
-    {
-      const char *my_member_name = this->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      const char *tc_member_name = tc->member_name (i, env);
-      if (env.exception ())
-        return 0;
-
-      if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
-          (tc_member_name) > 1)
-        // both specify member names
-        if (ACE_OS::strcmp (my_member_name, tc_member_name)) // not same
-          return 0;
-
-      // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
-      if (env.exception ())
-        return 0;
-
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, env);
-      if (!flag || env.exception ())
-        return 0;
-    }
-
-  return 1; // success (equal)
-}
-
-// Return the type ID (RepositoryId) for the TypeCode; it may be empty.
-//
-// NOTE the string returned here is owned by the typecode!!
-//
-// Valid only for objref, struct, union, enum, alias, and except. Raises
-// BadKind exception for the rest of the cases.
-const char *
-CORBA_TypeCode::private_id (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (this->kind_)
-    {
-      // These are all complex typecodes, which have as their first
-      // parameter (number zero) a repository/type ID string encoded
-      // per CDR rules.  That means we can just return a pointer to
-      // that string directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-        this->private_state_->tc_id_known_ = CORBA::B_TRUE;
-        this->private_state_->tc_id_ = (CORBA::String) (buffer_
-                                                 + 4    // skip byte order flag
-                                                        // and padding
-                                                 + 4);  // skip (strlen + 1)
-        return this->private_state_->tc_id_; // this is OK because the strings in the
-                                       // CDR stream are NULL terminated
-      }
-    // No other typecodes ever have type IDs
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// return the name. The string is owned by the typecode
-const char *
-CORBA_TypeCode::private_name (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (this->kind_)
-    {
-      // These are all complex typecodes, which have as their second
-      // parameter (number one) a name string encoded
-      // per CDR rules.  That means we can just return a pointer to
-      // that string directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip the typecode ID
-        if (stream.skip_string ())  // ID
-          {
-            this->private_state_->tc_name_known_ = CORBA::B_TRUE;
-
-            // "Read" the string without copying.
-            stream.read_string (this->private_state_->tc_name_);
-
-            return this->private_state_->tc_name_;
-          }
-        else
-          {
-            env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
-            return (CORBA::String)0;
-          }
-      }
-    // No other typecodes ever have type IDs
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::String)0;
-    }
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-CORBA::ULong
-CORBA_TypeCode::private_member_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (kind_)
-    {
-    case CORBA::tk_alias:
-      return 1;
-
-    case CORBA::tk_enum:
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()          // ID
-            || !stream.skip_string ()       // struct name
-            || !stream.read_ulong (members))
-          {
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        this->private_state_->tc_member_count_known_ = CORBA::B_TRUE;
-        this->private_state_->tc_member_count_ = members;
-        return this->private_state_->tc_member_count_;
-      }
-    case CORBA::tk_union:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip rest of header (type ID, name, etc...) and collect the
-        // number of struct members
-        if (!stream.skip_string ()              // ID
-            || !stream.skip_string ()           // struct name
-            || !skip_typecode (stream)          // discriminant TC
-            || !stream.read_ulong (members)      // default used
-            || !stream.read_ulong (members))     // real member count
-          {
-            // this is a system exception indicating something is wrong with
-            // the typecode itself.
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        this->private_state_->tc_member_count_known_ = CORBA::B_TRUE;
-        this->private_state_->tc_member_count_ = members;
-        return this->private_state_->tc_member_count_;
-      }
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// NOTE special calling convention for stream.decode () when we're
-// potentially deencapsulating an indirected typecode: the "data2"
-// value indicates that this typecode is the parent.  See comments at
-// stream.decode () for further details.
-//
-// Applicable only to struct, union, and except
-//
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_member_type (CORBA::ULong index,
-                                     CORBA::Environment &env) const
-{
-  CORBA::ULong temp, mcount;
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-  CORBA::TypeCode_ptr tc = 0;
-
-  switch (kind_)
-    {
-    case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (env);                // clears env
-      if (env.exception () == 0)
-        {
-          // the first time in. Precompute and store types of all members
-
-          // Allocate a list to hold the member typecodes
-          this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
-
-          if (this->private_state_->tc_member_type_list_)
-            {
-              // skip the id, name, and member_count part
-              if (!stream.skip_string ()        // type ID, hidden
-                  || !stream.skip_string ()     // typedef name
-                  || !stream.read_ulong (temp))  // member count
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return (CORBA::TypeCode_ptr)0;
-                }
-              else
-                {
-                  // compute the typecodes for all the members and
-                  // return the required one.
-                  for (CORBA::ULong i = 0; i < mcount; i++)
-                    // the ith entry will have the typecode of the ith guy
-                    if (!stream.skip_string ()  // skip the name
-                        || stream.decode (CORBA::_tc_TypeCode,
-                                          // the typecode will be
-                                          // retrieved at the i-th
-                                          // location. The decode
-                                          // routine will allocate the
-                                          // storage to hold a
-                                          // typecode
-                                          &this->private_state_->
-                                          tc_member_type_list_[i],
-                                          this,
-                                          // pass ourselves since we
-                                          // will be the parent. This
-                                          // is the case where the 3rd
-                                          // parameter is used in a
-                                          // decode method
-                                          env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      {
-                        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                        return 0;
-                      }
-
-                  this->private_state_->tc_member_type_list_known_ = CORBA::B_TRUE;
-
-                  if (index < mcount)
-                    return this->private_state_->tc_member_type_list_[index];
-                  else
-                    {
-                      env.exception (new CORBA::TypeCode::Bounds ());
-                      return (CORBA::TypeCode_ptr)0;
-                    }
-                }
-            }
-          else  // no memory for the member_list
-            {
-              env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-              return (CORBA::TypeCode_ptr)0;
-            }
-        }
-      else // out of bounds
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return (CORBA::TypeCode_ptr)0;
-        }
-      ACE_NOTREACHED (break;)
-    case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (env);                // clears env
-      if (env.exception () == 0)
-        {
-          // the first time in. Precompute and store types of all members
-          this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
-          if (this->private_state_->tc_member_type_list_)
-            {
-              // skip the id, name, and discrimant type part
-              if (!stream.skip_string ()        // type ID, hidden
-                  || !stream.skip_string ()     // typedef name
-                  || !skip_typecode (stream))   // skip typecode for discriminant
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return (CORBA::TypeCode_ptr)0;
-                }
-              else if (!stream.read_ulong (temp)     // default used
-                       || !stream.read_ulong (temp)) // member count
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return 0;
-                }
-              else
-                {
-                  // Always big enough because labels can only be of a
-                  // few different types of which "long" has the
-                  // largest size.
-                  CORBA::Long scratch;
-
-                  // get the typecode for the discriminator
-                  tc = this->discriminator_type (env);
-                  // compute the typecodes for all the members and return the
-                  // required one
-
-                  for (CORBA::ULong i = 0; i < mcount; i++)
-                    // the ith entry will have the typecode of the ith guy
-                    if (stream.decode (tc, &scratch, this,  env) // member label
-                        != CORBA::TypeCode::TRAVERSE_CONTINUE
-                        || !stream.skip_string ()  // skip the name
-                        || stream.decode (CORBA::_tc_TypeCode,  // get the typecode
-                                          &private_state_->tc_member_type_list_[i],
-                                          this,
-                                          env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                      {
-                        env.exception (new CORBA::BAD_TYPECODE
-                                       (CORBA::COMPLETED_NO));
-                        return 0;
-                      }
-                  this->private_state_->tc_member_type_list_known_ = CORBA::B_TRUE;
-
-                  if (index < mcount)
-                    return this->private_state_->tc_member_type_list_[index];
-                  else
-                    {
-                      env.exception (new CORBA::TypeCode::Bounds ());
-                      return (CORBA::TypeCode_ptr)0;
-                    }
-                }
-            }
-          else  // no memory for the member_list
-            {
-              env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-              return (CORBA::TypeCode_ptr)0;
-            }
-        }
-      else // out of bounds
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return (CORBA::TypeCode_ptr)0;
-        }
-
-    default:
-      // bad kind
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::TypeCode_ptr)0;
-    }
-}
-
-// Return the name for the nth member
-// Applicable only to CORBA::tk_struct, CORBA::tk_union, CORBA::tk_enum, and
-// CORBA::tk_except
-const char *
-CORBA_TypeCode::private_member_name (CORBA::ULong index,
-                                     CORBA::Environment &env) const
-{
-  CORBA::ULong temp, mcount;
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-  CORBA::TypeCode_ptr tc = 0;
-
-  switch (kind_)
-    {
-    case CORBA::tk_enum:
-      mcount = this->member_count (env);                // clears env
-      if (env.exception () == 0)
-        {
-          // the first time in. Precompute and store names of all members
-          // Allocate a list to hold the member names
-          this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-          if (this->private_state_->tc_member_name_list_)
-            {
-              // skip the id, name, and member_count part
-              if (!stream.skip_string ()     // type ID, hidden
-                  || !stream.skip_string ()     // enum name
-                  || !stream.read_ulong (temp)) // member count
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return (char *)0;
-                }
-              else
-                {
-                  // compute the typecodes for all the members and
-                  // return the required one.
-                  for (CORBA::ULong i = 0; i < mcount; i++)
-                    {
-                      // now skip this name
-                      if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]))
-                        {
-                          env.exception (new CORBA::BAD_TYPECODE
-                                         (CORBA::COMPLETED_NO));
-                          return (char *)0;
-                        }
-                    }
-
-                  this->private_state_->tc_member_name_list_known_ = CORBA::B_TRUE;
-
-                  if (index < mcount)
-                    return this->private_state_->tc_member_name_list_[index];
-                  else
-                    {
-                      env.exception (new CORBA::TypeCode::Bounds ());
-                      return (char *)0;
-                    }
-                }
-            }
-          else  // no memory for the member_list
-            {
-              env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-              return (char *)0;
-            }
-        }
-      else // out of bounds
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return (char *)0;
-        }
-      ACE_NOTREACHED (break;)
-    case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (env);                // clears env
-      if (env.exception () == 0)
-        {
-          // the first time in. Precompute and store names of all members
-          // Allocate a list to hold the member names
-          this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-          if (this->private_state_->tc_member_name_list_)
-            {
-              // skip the id, name, and member_count part
-              if (!stream.skip_string ()     // type ID, hidden
-                  || !stream.skip_string ()     // struct/except name
-                  || !stream.read_ulong (temp)) // member count
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return (char *)0;
-                }
-              else
-                {
-                  // compute the typecodes for all the members and
-                  // return the required one.
-                  for (CORBA::ULong i = 0; i < mcount; i++)
-                    if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
-                        || !skip_typecode (stream))
-                      {
-                        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                        return 0;
-                      }
-
-                  this->private_state_->tc_member_name_list_known_ = CORBA::B_TRUE;
-
-                  if (index < mcount)
-                    return this->private_state_->tc_member_name_list_[index];
-                  else
-                    {
-                      env.exception (new CORBA::TypeCode::Bounds ());
-                      return (char *)0;
-                    }
-                }
-            }
-          else  // no memory for the member_list
-            {
-              env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-              return (char *)0;
-            }
-        }
-      else // out of bounds
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return (char *)0;
-        }
-      ACE_NOTREACHED (break;)
-    case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (env);                // clears env
-      if (env.exception () == 0)
-        {
-          // the first time in. Precompute and store names of all members
-          // Allocate a list to hold the member names
-          this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-          if (this->private_state_->tc_member_name_list_)
-            {
-              // skip the id, name, and discrimant type part
-              if (!stream.skip_string ()        // type ID, hidden
-                  || !stream.skip_string ()     // typedef name
-                  || !skip_typecode (stream))   // skip typecode for discriminant
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return (char *)0;
-                }
-              else if (!stream.read_ulong (temp)     // default used
-                       || !stream.read_ulong (temp)) // member count
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return 0;
-                }
-              else
-                {
-                  CORBA::Long scratch; // always big enough because labels can
-                                      // only be of a few different types of
-                                      // which "long" has the largest size
-
-                  // get the typecode for the discriminator
-                  tc = this->discriminator_type (env);
-                  // compute the name for all the members and return the
-                  // required one
-
-                  for (CORBA::ULong i = 0; i < mcount; i++)
-                    {
-                      // the ith entry will have the name of the ith member
-                      if (stream.decode (tc, &scratch, this,  env) // member label
-                          != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          env.exception (new CORBA::BAD_TYPECODE
-                                         (CORBA::COMPLETED_NO));
-                          return 0;
-                        }
-                      // skip typecode for member
-                      if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
-                          || (!skip_typecode (stream))) // skip typecode
-                        {
-                          env.exception (new CORBA::BAD_TYPECODE
-                                         (CORBA::COMPLETED_NO));
-                          return 0;
-                        }
-                    }
-                  this->private_state_->tc_member_name_list_known_ = CORBA::B_TRUE;
-
-                  if (index < mcount)
-                    return this->private_state_->tc_member_name_list_[index];
-                  else
-                    {
-                      env.exception (new CORBA::TypeCode::Bounds ());
-                      return (char *)0;
-                    }
-                }
-            }
-          else  // no memory for the member_list
-            {
-              env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-              return (char *)0;
-            }
-        }
-      else // out of bounds
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return (char *)0;
-        }
-      ACE_NOTREACHED (break;)
-    default:
-      // bad kind
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (char *)0;
-    }
-  ACE_NOTREACHED (return (char *)0;)
-}
-
-// Return member labels for CORBA::tk_union typecodes.
-CORBA::Any_ptr
-CORBA_TypeCode::private_member_label (CORBA::ULong n,
-                                      CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // this function is only applicable to the CORBA::tk_union TC
-  if (this->kind_ == CORBA::tk_union)
-    {
-      TAO_InputCDR stream (this->buffer_, this->length_,
-			   this->byte_order_);
-
-      // skip ID and name, and then get the discriminant TC
-      CORBA::TypeCode_ptr    tc = 0;
-
-      if (!stream.skip_string ()       // type ID, hidden
-          || !stream.skip_string ()    // typedef name
-          || !skip_typecode (stream))  // skip discriminant typecode
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      // skip default used, and get member count
-      CORBA::ULong member_count;
-
-      if (!stream.read_ulong (member_count)      // default used
-          || !stream.read_ulong (member_count))  // member count
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          dmsg ("TypeCode::private_member_label -- error reading from stream");
-          return 0;
-        }
-
-      // member labels are of type Any. However, the actual types are
-      // restricted to simple types
-      this->private_state_->tc_member_label_list_ = new CORBA::Any_ptr [member_count];
-      if (this->private_state_->tc_member_label_list_)
-        {
-          tc = this->discriminator_type (env); // retrieve the discriminator
-                                               // type as this decides what the
-                                               // label is
-          for (CORBA::ULong i = 0; i < member_count; i++)
-            {
-              // allocate buffer to hold the member label value
-              void *buf = new CORBA::Octet [tc->size (env)];
-              if (stream.decode (tc, buf, this,  env)
-                  != CORBA::TypeCode::TRAVERSE_CONTINUE
-                  || !stream.skip_string ()         // member name
-                  || !skip_typecode (stream)) // member type
-                {           // member TC
-                  dmsg1 ("TypeCode::private_member_label -- error getting typecode for member %d",i);
-                  delete [] buf;
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  return 0;
-                }
-              else
-                {
-                  this->private_state_->tc_member_label_list_[i] = new
-                    CORBA::Any (tc, buf, CORBA::B_TRUE);
-                }
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      this->private_state_->tc_member_label_list_known_ = CORBA::B_TRUE;
-
-      // If caller asked for the label for a nonexistent member, they get
-      // an error report!
-      if (n >= member_count)
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-      else
-        return this->private_state_->tc_member_label_list_[n];
-    }
-  else // wrong typecode
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const
-{
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string () // type ID, hidden
-      || !stream.skip_string () // typedef name
-      || stream.decode (CORBA::_tc_TypeCode,
-                        &this->private_state_->tc_discriminator_type_, this,
-                        env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  else
-    {
-      this->private_state_->tc_discriminator_type_known_ = CORBA::B_TRUE;
-      return this->private_state_->tc_discriminator_type_;
-    }
-}
-
-CORBA::Long
-CORBA_TypeCode::private_default_index (CORBA::Environment &env) const
-{
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string ()            // type ID, hidden
-      || !stream.skip_string ()         // typedef name
-      || !skip_typecode (stream)        // skip discriminant
-      || !stream.read_long (this->private_state_->tc_default_index_used_))
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  else
-    {
-      this->private_state_->tc_default_index_used_known_ = CORBA::B_TRUE;
-      return this->private_state_->tc_default_index_used_;
-    }
-}
-
-CORBA::Long
-CORBA_TypeCode::private_length (CORBA::Environment &env) const
-{
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-  switch (this->kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-        // skip the typecode of the element and get the bounds
-        if (!skip_typecode (stream) // skip typecode
-            || !stream.read_ulong (this->private_state_->tc_length_))
-          {
-            env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-            return 0;
-          }
-        else
-          {
-            this->private_state_->tc_length_known_ = CORBA::B_TRUE;
-            return this->private_state_->tc_length_;
-          }
-      case CORBA::tk_string:
-      case CORBA::tk_wstring:
-        {
-          if (stream.read_ulong (this->private_state_->tc_length_))
-            {
-              this->private_state_->tc_length_known_ = CORBA::B_TRUE;
-              return this->private_state_->tc_length_;
-            }
-          else
-            {
-              env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-              return 0;
-            }
-        }
-      default:
-        env.exception (new CORBA::TypeCode::BadKind);
-        return 0;
-      }
-    }
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
-{
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  switch (kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-        // retrieve the content type
-        if (stream.decode (CORBA::_tc_TypeCode,
-                           &this->private_state_->tc_content_type_,
-                           this,  env) !=
-            CORBA::TypeCode::TRAVERSE_CONTINUE) // element type
-          {
-            env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-            return 0;
-          }
-        else
-          {
-            this->private_state_->tc_content_type_known_ = CORBA::B_TRUE;
-            return this->private_state_->tc_content_type_;
-          }
-      case CORBA::tk_alias:
-        {
-          if (!stream.skip_string ()  // typeID
-              || !stream.skip_string () // name
-              || stream.decode (CORBA::_tc_TypeCode,
-                                &this->private_state_->tc_content_type_, this,
-                                env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-              return 0;
-            }
-          else
-            {
-              this->private_state_->tc_content_type_known_ = CORBA::B_TRUE;
-              return this->private_state_->tc_content_type_;
-            }
-        }
-      default:
-        env.exception (new CORBA::TypeCode::BadKind);
-        return 0;
-      }
-    }
-}
-
-CORBA::ULong
-CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &env)
-{
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  size_t discrim_size;
-  size_t overall_align;
-
- (void) TAO_IIOP_Interpreter::calc_key_union_attributes (&stream,
-                                                         overall_align,
-                                                         discrim_size,
-                                                         env);
-  if (env. exception () == 0)
-    {
-      this->private_state_->tc_discrim_pad_size_known_ = CORBA::B_TRUE;
-      this->private_state_->tc_discrim_pad_size_ = discrim_size;
-      return discrim_size;
-    }
-  else
-    return 0;
-}
-// ************ The following are deprecated ****************
-
-// say how many parameters this typecode has; normally a fixed number,
-// some are variable length.
-//
-// NOTE: This refers to "real" parameters, not what shows up in the
-// IFR spec !!  That is, "hidden" parameters are counted here, this
-// doesn't strictly comply with what CORBA says "param_count"
-// provides.
-
-CORBA::ULong
-CORBA_TypeCode::param_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (this->kind_)
-    {
-    default:
-      return 0;
-
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      return 1;
-
-    case CORBA::tk_objref:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      return 2;
-
-    case CORBA::tk_alias:
-      return 3;
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                  // ID
-            || !stream.skip_string ()       // struct name
-            || !stream.read_ulong (members))
-          {
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        return 3 + 2 * members;
-      }
-    case CORBA::tk_enum:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                      // ID
-            || !stream.skip_string ()           // typedef name
-            || !stream.read_ulong (members))
-          {
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        return 3 + members;
-      }
-    case CORBA::tk_union:
-      {
-        CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        // skip rest of header (type ID, name, etc...) and collect the
-        // number of struct members
-        if (!stream.skip_string ()                      // ID
-            || !stream.skip_string ()           // struct name
-            || !skip_typecode (stream)          // discriminant TC
-            || !stream.read_ulong (members)      // default used
-            || !stream.read_ulong (members))     // real member count
-          {
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        return 5 + 3 * members;
-      }
-    }
-}
-
-
-// Internal hack, used until member_count () and length () are
-// implemented.  Doesn't support all the types that those routines
-// support.
-
-CORBA::ULong
-CORBA_TypeCode::ulong_param (CORBA::ULong n,
-                             CORBA::Environment &env) const
-{
-  CORBA::ULong temp;
-
-  temp = this->param_count (env);               // clears env
-  if (env.exception ())
-    return 0;
-
-  if (temp < n)
-    {
-      env.exception (new CORBA::TypeCode::Bounds);
-      return 0;
-    }
-
-  // Get parameters for non-empty typecodes; their parameter lists are
-  // encapsulated CDR (for complex ones) or inlined (for simple ones).
-  switch (kind_)
-    {
-    default: // most have no long params
-      break;
-
-      // Array, sequence ... complex parameter lists
-    case CORBA::tk_array:               // param 1 is an integer
-    case CORBA::tk_sequence:            // ... identical content
-      {
-        if (n == 0)
-          break;
-
-        // Build CDR stream for encapsulated params, and skip the
-        // typecode up front.
-        TAO_InputCDR stream (this->buffer_, this->length_,
-			     this->byte_order_);
-
-        if (!skip_typecode (stream))
-          {
-            env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-        // Then comes the "bounds" parameter.
-        if (!stream.read_ulong (temp))
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-        return temp;
-      }
-
-    // string, wstring ... simple parameter lists, containing just the
-    // string bounds (zero indicates unbounded).  Stored specially
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      if (n != 0)
-        break;
-      return this->length_;
-    }
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-  return 0;
-}
-
-// Internal hack, used until member_type (), discriminator_type (),
-// and content_type () are implemented.
-//
-// NOTE special calling convention for stream.decode () when we're
-// potentially deencapsulating an indirected typecode: the "data2"
-// value indicates that this typecode is the parent.  See comments at
-// stream.decode () for further details.
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::typecode_param (CORBA::ULong n,
-                                CORBA::Environment &env) const
-{
-  CORBA::ULong temp;
-
-  temp = this->param_count (env);               // clears env
-  if (env.exception ())
-    return 0;
-
-  if (temp < n)
-    {
-      env.exception (new CORBA::TypeCode::Bounds);
-      return 0;
-    }
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-  CORBA::TypeCode_ptr tc = 0;
-
-  switch (this->kind_)
-    {
-    default:                            // most have no tc params
-      break;
-
-    case CORBA::tk_sequence:            // param 0 is a tc
-    case CORBA::tk_array:
-      if (n != 0)
-        break;
-      if (stream.decode (CORBA::_tc_TypeCode,
-                         &tc,
-                         this,
-                         env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      return tc;
-
-    case CORBA::tk_alias:               // #1 is a tc
-      if (n != 2)
-        break;
-      if (!stream.skip_string ()                // type ID, hidden
-          || !stream.skip_string ()     // typedef name
-          || stream.decode (CORBA::_tc_TypeCode, &tc, this,  env)
-          != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      return tc;
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:              // #5 and up are tc, index from 0
-      if (n < 4 || n & 0x1)
-        {       // tc is at odd number of param list
-          env.exception (new CORBA::TypeCode::Bounds);
-          return 0;
-        }
-
-      if (!stream.skip_string ()                // type ID, hidden
-          || !stream.skip_string ()     // typedef name
-          || !stream.read_ulong (temp))
-        {       // member count
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      else
-        {
-          temp = (n - 3) / 2;
-
-          // skip member pairs to the one we want
-          for (CORBA::ULong i = 0; i < temp; i++)
-            // skip to the member being asked
-            if (!stream.skip_string ()        // member name
-                || !skip_typecode (stream))
-              {
-                env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                return 0;
-              }
-
-          if (!stream.skip_string ()
-              || stream.decode (CORBA::_tc_TypeCode,
-                                &tc,
-                                this,
-                                env)!= CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              return 0;
-            }
-          return tc;
-        }
-
-    case CORBA::tk_union:            // #6 and up are tc, index from 0
-      if (n != 2 && (n < 7 || (n - 7) % 3))
-        {
-          env.exception (new CORBA::TypeCode::Bounds);
-          return 0;
-        }
-
-      if (!stream.skip_string ()                // type ID, hidden
-          || !stream.skip_string ()     // typedef name
-          || stream.decode (CORBA::_tc_TypeCode,
-                            &tc, this,
-                            env) != CORBA::TypeCode::TRAVERSE_CONTINUE)  // TC
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      else if (!stream.read_ulong (temp) // default used
-                 || !stream.read_ulong (temp))   // member count
-        {
-          tc->Release ();
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-
-      if (n == 2)
-        return tc;
-
-      temp = (n - 7) / 3;
-
-      // skip to the member requested
-
-      CORBA::Long scratch;              // always big enough
-
-      for (CORBA::ULong i = 0; i < temp; i++)
-        if (stream.decode (tc, &scratch, this,  env) // member label
-            != CORBA::TypeCode::TRAVERSE_CONTINUE
-            || !stream.skip_string ()         // member name
-            || !skip_typecode (stream))
-          {   // member typecode
-            tc->Release ();
-            env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-            return 0;
-          }
-
-      // member label
-      if (stream.decode (tc,
-                        &scratch, this,
-                         env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-          || !stream.skip_string ())            // member name
-        {
-          tc->Release ();
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      tc->Release ();
-
-      if (stream.decode (CORBA::_tc_TypeCode,
-                        &tc, this,
-                         env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          return 0;
-        }
-      return tc;
-    }
-
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-  return 0;
-}
-
-// Tell user the size of an instance of the data type described by
-// this typecode ... typically used to allocate memory.
-
-size_t
-CORBA::TypeCode::private_size (CORBA::Environment &env)
-{
-  if (kind_ >= CORBA::TC_KIND_COUNT)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  env.clear ();
-
-  if (TAO_IIOP_Interpreter::table_[kind_].calc_ == 0)
-    {
-      private_state_->tc_size_known_ = CORBA::B_TRUE;
-      private_state_->tc_size_ =
-        TAO_IIOP_Interpreter::table_[kind_].size_;
-      return private_state_->tc_size_;
-    }
-
-  size_t alignment;
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  private_state_->tc_size_known_ = CORBA::B_TRUE;
-  private_state_->tc_size_ =
-    TAO_IIOP_Interpreter::table_[kind_].calc_ (&stream, alignment, env);
-  return private_state_->tc_size_;
-}
-
-// Tell user the alignment restriction for the data type described by
-// an instance of this data type.  Rarely used; provided for
-// completeness.
-
-size_t
-CORBA::TypeCode::private_alignment (CORBA::Environment &env)
-{
-  if (kind_ >= CORBA::TC_KIND_COUNT)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  env.clear ();
-
-  if (TAO_IIOP_Interpreter::table_[kind_].calc_ == 0)
-    {
-      private_state_->tc_alignment_known_ = CORBA::B_TRUE;
-      private_state_->tc_alignment_ =
-        TAO_IIOP_Interpreter::table_[kind_].alignment_;
-      return private_state_->tc_alignment_;
-    }
-
-  size_t alignment;
-  TAO_InputCDR stream (this->buffer_, this->length_,
-		       this->byte_order_);
-
-  (void) TAO_IIOP_Interpreter::table_[kind_].calc_ (&stream,
-                                                    alignment,
-                                                    env);
-  private_state_->tc_alignment_known_ = CORBA::B_TRUE;
-  private_state_->tc_alignment_ = alignment;
-  return alignment;
-}
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
deleted file mode 100644
index 21f423ff497..00000000000
--- a/TAO/tao/Typecode.h
+++ /dev/null
@@ -1,479 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Typecode.h
-//
-// = DESCRIPTION
-//    Header file CORBA's "TypeCode" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_TYPECODE_H)
-#  define TAO_TYPECODE_H
-
-// Forward decl.
-class TAO_InputCDR;
-
-// Two "user exceptions" are defined for manipulating TypeCodes. These
-// two classes are really to be defined inside the TypeCode class.
-// @@ Andy, can you please explain why they aren't defined there?
-
-//extern CORBA::TypeCode_ptr CORBA::_tc_Bounds;
-class CORBA_Bounds : public CORBA_UserException
-{
-public:
-  CORBA_Bounds (void);
-};
-
-//extern CORBA::TypeCode_ptr CORBA::_tc_BadKind;
-class CORBA_BadKind : public CORBA_UserException
-{
-public:
-  CORBA_BadKind (void);
-};
-
-// A TypeCode describes data.  This one's as thin a wrapper around CDR
-// octet sequences as is practical.  There are guesses here about how
-// the OMG C++ mapping and CORBA 2.0 IFR specification will interact.
-//
-// NOTE: Use TypeCode_ptr, except in code (e.g. output of and OMG-IDL
-// compiler) that needs to create typecodes from their octet-sequence
-// encodings.
-
-class TC_Private_State;
-
-class TAO_Export CORBA_TypeCode
-  // = TITLE
-  //   The CORBA TypeCode class. It maintains the in-memory
-  //   representation of any OMG CORBA IDL data type.
-  //
-  // = DESCRIPTION
-  //   Implements the CORBA::TypeCode interface specified by CORBA 2.0
-  //   spec.  Typecodes essentially consist of just the CDR octets
-  //   that get marshaled and unmarshaled, and this code knows how to
-  //   parse those octets and answer questions CORBA's TypeCode APIs
-  //   require.
-  //
-  //   NOTE: This isn't well tuned performance-wise.  Given how much
-  //   is variable (byte order, alignment) it's clear tuning has its
-  //   limits with respect to CDR bytecode interpretation.
-  //
-  //   THREADING NOTE: Typecodes are readonly data structures, and the
-  //   only mutual exclusion relates to reference counting and
-  //   construction.
-{
-public:
-  void operator delete (void*);
-  // Help debug free-non-heap-memory problems.
-
-  typedef CORBA_Bounds Bounds;
-  typedef CORBA_BadKind BadKind;
-  // As per the spec, these two exception classes are supposed to be
-  // nested inside the TypeCode class. Since we are trying to avoid
-  // nesting of classes, we use the above typedef.
-
-  static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-  // Duplicates i.e., increments ref count.
-
-  static CORBA::TypeCode_ptr _nil (void);
-  // Returns a NULL typecode.
-
-  CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA::Environment &env) const;
-  // Compares two typecodes.
-
-  CORBA::TCKind  kind (CORBA::Environment &) const;
-  // For all TypeCode kinds, returns the "kind" of the typecode.
-
-  const char *id (CORBA::Environment &) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  const char *name (CORBA::Environment &) const;
-  // Returns name (), raises (BadKind).
-
-  CORBA::ULong member_count (CORBA::Environment &) const;
-  // Returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  const char *member_name (CORBA::ULong index,
-                           CORBA::Environment &) const;
-  // Returns member_name (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr member_type (CORBA::ULong index,
-                                   CORBA::Environment &) const;
-  // Returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except.
-
-  CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA::Environment&) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr discriminator_type (CORBA::Environment &) const;
-  // Returns the discriminator type for tk_union. raises (BadKind).
-
-  CORBA::Long default_index (CORBA::Environment &) const;
-  // Returns the default index for the tk_union. Raises (BadKind).
-
-  CORBA::ULong length (CORBA::Environment &) const;
-  // Returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array.
-
-  CORBA::TypeCode_ptr content_type (CORBA::Environment &) const;
-  // Returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias.
-
-  CORBA::ULong TAO_discrim_pad_size (CORBA::Environment &);
-  // Calculates the padded size of discriminant type TAO Extension.
-
-  // = Creation/refcounting
-
-  // These aren't really public APIs, but an IDL compiler will need to
-  // be able to create TypeCodes as part of creating stubs.
-
-  CORBA_TypeCode (CORBA::TCKind kind);
-  // This constructor is used only for built-in TypeCode constants,
-  // with no parameters.
-
-  CORBA_TypeCode (CORBA::TCKind kind,
-                  size_t length,
-                  const char *buffer,
-                  CORBA::Boolean orb_owns_tc,
-                  CORBA::TypeCode_ptr parent = 0);
-  // This constructor is used both for typecode constants and for
-  // heap-allocated TypeCodes.  The two are distinguished by the
-  // orb_owns_tc flag passed in by the creator.
-  //
-  // For simple param lists with a single numeric parameter, only
-  // 'length' matters.
-  //
-  // For complex param lists, or simple param lists for which the
-  // parameter is a string or typecode, length _and_ buffer matter.
-  //
-  // For typecodes that are precomputed from the encapsulation stream
-  // of the parent, even the "parent" argument matters because this
-  // implies that all children will share the octet buffers of its
-  // parent
-
-  // = Class-specific allocation.
-  void *operator new (size_t, void *p);
-  void *operator new (size_t s);
-
-  ~CORBA_TypeCode (void);
-  // destructor
-
-  enum traverse_status
-  {
-    TRAVERSE_STOP,
-    TRAVERSE_CONTINUE
-  };
-  // these are used to indicate the status of marshaling
-
-  size_t size (CORBA::Environment &env);
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t alignment (CORBA::Environment &env);
-  // returns the alignment requirements for this typecode. used by the
-  // IIOP marshaling engine.
-
-  CORBA::ULong  AddRef (void);
-  CORBA::ULong  Release (void);
-
-  // = Following three are deprecated
-
-  CORBA::ULong param_count (CORBA::Environment &) const;
-  // Deprecated, CORBA 1.2, not fully usable. Returns the number of
-  // parameters that the typecode takes.
-
-  CORBA::ULong ulong_param (CORBA::ULong n,
-                            CORBA::Environment &) const;
-
-  CORBA::TypeCode_ptr typecode_param (CORBA::ULong n,
-                                      CORBA::Environment &) const;
-  // Internal utilities, pending CORBA 2.0 IFR APIs; just enough to
-  // make array and sequence typecode interpretation cheap
-
-  // private:
-  //
-  // = The guts of the typecode implementation class
-
-  // This is implemented as a counted set of bytes, in marshaled CDR
-  // format.
-
-  size_t length_;
-  // length of the encapsulated stream
-
-  const char* buffer_;
-  // the encapsulated stream
-
-  CORBA::Long byte_order_;
-  // The byte order in the encapsulated stream.
-
-  CORBA::TCKind kind_;
-  // the TypeCode kind
-
-  CORBA::TypeCode_ptr parent_;
-  // Indirected typecodes share "buffer" with a parent, and hold a
-  // reference to that parent to ensure its memory is not freed
-  // inappropriately.
-
-  static CORBA::Boolean skip_typecode (TAO_InputCDR &stream);
-  // skip a typecode encoding in a given CDR stream.  This is just a
-  // helper function.
-
-private:
-  // = All the private/helper methods
-
-  CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA::Environment &env) const;
-  // Compares the typecodes.
-
-  const char *private_id (CORBA::Environment &) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  const char *private_name (CORBA::Environment &) const;
-  // returns name (), raises (BadKind)
-
-  CORBA::ULong private_member_count (CORBA::Environment &) const;
-  // returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr private_member_type (CORBA::ULong index,
-                                           CORBA::Environment &) const;
-  // returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except
-
-  const char *private_member_name (CORBA::ULong index,
-                                    CORBA::Environment &) const;
-  // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union,
-  // tk_struct, tk_except, and tk_enum
-
-  CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA::Environment&) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA::Environment &) const;
-  // returns the discriminator type for tk_union. raises (BadKind);
-
-  CORBA::Long private_default_index (CORBA::Environment &) const;
-  // returns the default index for the tk_union. Raises (BadKind);
-
-  CORBA::Long private_length (CORBA::Environment &) const;
-  // returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array
-
-  CORBA::TypeCode_ptr private_content_type (CORBA::Environment &) const;
-  // returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias
-
-  size_t private_size (CORBA::Environment &env);
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t private_alignment (CORBA::Environment &env);
-  // returns the alignment requirements for this typecode. used by the
-  // IIOP marshaling engine.
-
-  CORBA::ULong private_discrim_pad_size (CORBA::Environment &);
-  // Calculates the padded size of discriminant type TAO Extension
-
-  // = All the private helpers testing for equality of typecodes
-
-  CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &env) const;
-  // test equality for typecodes of objrefs
-
-  CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &env) const;
-  // test equality for typecodes of structs
-
-  CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const;
-  // test equality for typecodes of unions
-
-  CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &env) const;
-  // test equality for typecodes of enums
-
-  CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &env) const;
-  // test equality for typecodes of strings
-
-  CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA::Environment &env) const;
-  // test equality for typecodes of wide strings
-
-  CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA::Environment &env) const;
-  // test equality for typecodes of sequences
-
-  CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const;
-  // test equality for typecodes of array
-
-  CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &env) const;
-  // test equality for typecodes of typedefs
-
-  CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &env) const;
-  // test equality for typecodes of exceptions
-
-  CORBA::ULong refcount_;
-  // if refcount reaches 0, free this typecode
-
-  CORBA::Boolean delete_flag_;
-  // indicates if we are freeing ourselves. This flag serves as an indication
-  // to the children that they can delete themselves and their children if this
-  // flag is set.
-
-  CORBA::Boolean orb_owns_;
-  // TAO's approach differs from the SunSoft IIOP. Constant typecodes
-  // are owned by the ORB and get freed only when the ORB dies.
-
-  // If "orb_owns" is false, the value is a not a constant typecode
-  // with both the typecode and the buffer allocated (typically, this
-  // will be created by the IDL compiler generated code)
-
-  TC_Private_State *private_state_;
-  // maintains precomputed state. We need a separate class that
-  // maintains the precomputed state since most of the TypeCode class
-  // operations keep the state of the object constant. However, for
-  // the purpose of precomputation, we need to update the state. We
-  // cannot update state directly in the TypeCode class as that
-  // defeats the constness. However, we can keep an object in our
-  // typecode class that remains constant, but we can update its
-  // state.
-
-  // = No copy constructor or assignment operator supported;
-
-  // Use TypeCode_ptr values, duplicate (), release ().
-  CORBA_TypeCode (const CORBA::TypeCode &src);
-  CORBA_TypeCode &operator = (const CORBA::TypeCode &src);
-
-  char *non_aligned_buffer_;
-  // Original buffer that may possibly be non-aligned. We still need a
-  // handle to the allocated memory so that all of it can be freed by
-  // the destructor.
-};
-
-class TAO_Export TC_Private_State
-  // = TITLE
-  //   Private state of the TypeCode.
-  //
-  // = DESCRIPTION
-  //   Used to store precomputed values
-{
-public:
-  TC_Private_State (CORBA::TCKind kind);
-  // constructor
-
-  ~TC_Private_State (void);
-  // destructor
-
-  CORBA::TCKind  tc_kind_;
-  // our kind that will determine what kind of children we may have
-
-  // = data members that indicate if the desired quantify was precomputed or not.
-  CORBA::Boolean tc_id_known_;
-  CORBA::Boolean tc_name_known_;
-  CORBA::Boolean tc_member_count_known_;
-  CORBA::Boolean tc_member_type_list_known_;
-  CORBA::Boolean tc_member_name_list_known_;
-  CORBA::Boolean tc_member_label_list_known_;
-  CORBA::Boolean tc_discriminator_type_known_;
-  CORBA::Boolean tc_default_index_used_known_;
-  CORBA::Boolean tc_length_known_;
-  CORBA::Boolean tc_content_type_known_;
-  CORBA::Boolean tc_size_known_;
-  CORBA::Boolean tc_alignment_known_;
-  CORBA::Boolean tc_discrim_pad_size_known_;
-
-  // = These data members store the precomputed values
-  CORBA::String  tc_id_;
-  CORBA::String  tc_name_;
-  CORBA::ULong   tc_member_count_;
-  CORBA::TypeCode_ptr *tc_member_type_list_;
-  char **tc_member_name_list_;
-  CORBA::Any_ptr *tc_member_label_list_;
-  CORBA::TypeCode_ptr tc_discriminator_type_;
-  CORBA::Long   tc_default_index_used_;
-  CORBA::ULong   tc_length_;
-  CORBA::TypeCode_ptr  tc_content_type_;
-  CORBA::ULong  tc_size_;
-  CORBA::ULong  tc_alignment_;
-  CORBA::ULong  tc_discrim_pad_size_;
-
-};
-
-class TAO_Export CORBA_TypeCode_var
-{
-  //
-  // = TITLE
-  //   A smart pointer for TypeCodes.
-  //
-  // = DESCRIPTION
-  //   Implements the _var class for the TypeCode pseudo object.
-  //
-public:
-  CORBA_TypeCode_var (void); // default constructor
-  CORBA_TypeCode_var (CORBA_TypeCode_ptr);
-  CORBA_TypeCode_var (const CORBA_TypeCode_var &); // copy constructor
-  ~CORBA_TypeCode_var (void); // destructor
-
-  CORBA_TypeCode_var &operator= (CORBA_TypeCode_ptr);
-  CORBA_TypeCode_var &operator= (const CORBA_TypeCode_var &);
-  CORBA_TypeCode_ptr operator-> (void) const;
-
-  operator const CORBA_TypeCode_ptr &() const;
-  operator CORBA_TypeCode_ptr &();
-  // in, inout, out, _retn
-  CORBA_TypeCode_ptr in (void) const;
-  CORBA_TypeCode_ptr &inout (void);
-  CORBA_TypeCode_ptr &out (void);
-  CORBA_TypeCode_ptr _retn (void);
-  CORBA_TypeCode_ptr ptr (void) const;
-
-private:
-  CORBA_TypeCode_ptr ptr_;
-};
-
-class TAO_Export CORBA_TypeCode_out
-{
-  //
-  // = TITLE
-  //   The _out class for TypeCode.
-  //
-  // = DESCRIPTION
-  //   Implements the _out class for the TypeCode pseudo object.
-  //
-public:
-  CORBA_TypeCode_out (CORBA_TypeCode_ptr &);
-  CORBA_TypeCode_out (CORBA_TypeCode_var &);
-  CORBA_TypeCode_out (CORBA_TypeCode_out &);
-  CORBA_TypeCode_out &operator= (CORBA_TypeCode_out &);
-  CORBA_TypeCode_out &operator= (const CORBA_TypeCode_var &);
-  CORBA_TypeCode_out &operator= (CORBA_TypeCode_ptr);
-  operator CORBA_TypeCode_ptr &();
-  CORBA_TypeCode_ptr &ptr (void);
-  CORBA_TypeCode_ptr operator-> (void);
-
-private:
-  CORBA_TypeCode_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Typecode.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
deleted file mode 100644
index 084d41e4db0..00000000000
--- a/TAO/tao/Typecode.i
+++ /dev/null
@@ -1,249 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::TCKind
-CORBA_TypeCode::kind (CORBA::Environment &env) const
-{
-  env.clear ();
-  return this->kind_;
-}
-
-// Returns true if the two typecodes are identical
-ACE_INLINE CORBA::Boolean
-CORBA_TypeCode::equal (const CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &env) const
-{
-  if (this->kind_ != tc->kind (env))
-    // simple case
-    return CORBA::B_FALSE;
-  else
-    // typecode kinds are same
-    return this->private_equal (tc, env);
-}
-
-// returns the Repository ID
-ACE_INLINE const char *
-CORBA_TypeCode::id (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (this->private_state_->tc_id_known_)
-    return this->private_state_->tc_id_;
-  else
-    return this->private_id (env);
-}
-
-// returns the string name
-ACE_INLINE const char *
-CORBA_TypeCode::name (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (this->private_state_->tc_name_known_)
-    return this->private_state_->tc_name_;
-  else
-    return this->private_name (env);
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (this->private_state_->tc_member_count_known_)
-    return this->private_state_->tc_member_count_;
-  else
-    return this->private_member_count (env);
-}
-
-// calculate size of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::size (CORBA::Environment &env)
-{
-  if (this->private_state_->tc_size_known_)
-    return this->private_state_->tc_size_;
-  else
-    return this->private_size (env);
-}
-
-// calculate alignment requirements of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::alignment (CORBA::Environment &env)
-{
-  if (this->private_state_->tc_alignment_known_)
-    return this->private_state_->tc_alignment_;
-  else
-    return this->private_alignment (env);
-}
-
-ACE_INLINE void *
-CORBA_TypeCode::operator new (size_t, void *p)
-{
-  return p;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (void)
-  : ptr_ (CORBA_TypeCode::_nil ())
-{}
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (CORBA_TypeCode_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::CORBA_TypeCode_var (const CORBA_TypeCode_var &p)
-  : ptr_ (CORBA_TypeCode::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_TypeCode_var::~CORBA_TypeCode_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_TypeCode_var &
-CORBA_TypeCode_var::operator= (CORBA_TypeCode_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCode_var &
-CORBA_TypeCode_var::operator= (const CORBA_TypeCode_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA_TypeCode::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::operator const CORBA_TypeCode_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_TypeCode_var::operator CORBA_TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_TypeCode::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_TypeCode_ptr val = this->ptr_;
-  this->ptr_ = CORBA_TypeCode::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_TypeCode_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (CORBA_TypeCode_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (CORBA_TypeCode_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::CORBA_TypeCode_out (CORBA_TypeCode_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_TypeCode_out &
-CORBA_TypeCode_out::operator= (CORBA_TypeCode_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCode_out &
-CORBA_TypeCode_out::operator= (const CORBA_TypeCode_var &p)
-{
-  this->ptr_ = CORBA_TypeCode::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCode_out &
-CORBA_TypeCode_out::operator= (CORBA_TypeCode_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_TypeCode_out::operator CORBA_TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr &
-CORBA_TypeCode_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_TypeCode_ptr
-CORBA_TypeCode_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
deleted file mode 100644
index c5393c5f910..00000000000
--- a/TAO/tao/Typecode_Constants.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Typecode_Constants.cpp
-//
-// = DESCRIPTION
-//   All the CORBA-specified typecode constants.
-//
-//   NOTE:  IFR TypeCode constants aren't here; they're left for an IDL
-//   compiler to generate from the appropriate IDL source.
-//
-//   NOTE:  it'd be nice to have these not use init sections.  Most can easily
-//   be in readonly data (e.g. text segment, ROM) rather than writable data;
-//   that speeds program startup and page sharing in shared libraries.
-//
-//   THREADING NOTE:  no issues, these are immutable constants
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-// Null and void
-
-static CORBA::TypeCode tc_null (CORBA::tk_null);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_null = (CORBA::TypeCode_ptr) &tc_null;
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return &tc_null;
-}
-
-static CORBA::TypeCode tc_void (CORBA::tk_void);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_void = &tc_void;
-
-// Basic numeric types:  short, long, longlong, and unsigned variants
-
-static CORBA::TypeCode tc_short (CORBA::tk_short);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_short = &tc_short;
-
-static CORBA::TypeCode tc_long (CORBA::tk_long);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_long = &tc_long;
-
-static CORBA::TypeCode tc_longlong (CORBA::tk_longlong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_longlong = &tc_longlong;
-
-static CORBA::TypeCode tc_ushort (CORBA::tk_ushort);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ushort = &tc_ushort;
-
-static CORBA::TypeCode tc_ulong (CORBA::tk_ulong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ulong = &tc_ulong;
-
-static CORBA::TypeCode tc_ulonglong (CORBA::tk_ulonglong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ulonglong = &tc_ulonglong;
-
-// Floating point types: single, double, quad precision
-
-static CORBA::TypeCode tc_float (CORBA::tk_float);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_float = &tc_float;
-
-static CORBA::TypeCode tc_double (CORBA::tk_double);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_double = &tc_double;
-
-static CORBA::TypeCode tc_longdouble (CORBA::tk_longdouble);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_longdouble = &tc_longdouble;
-
-// Various simple quantities.
-
-static CORBA::TypeCode tc_boolean (CORBA::tk_boolean);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_boolean = &tc_boolean;
-
-static CORBA::TypeCode tc_octet (CORBA::tk_octet);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_octet = &tc_octet;
-
-// Internationalization-related data types: ISO Latin/1 and "wide"
-// characters, and strings of each.  "wchar" is probably Unicode 1.1,
-// "wstring" being null-terminated sets thereof.
-
-static CORBA::TypeCode tc_char (CORBA::tk_char);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_char = &tc_char;
-
-static CORBA::TypeCode tc_wchar (CORBA::tk_wchar);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_wchar = &tc_wchar;
-
-// a string/wstring have a simple parameter list that indicates the length
-static const CORBA::Long _oc_string [] =
-{	// CDR typecode octets
-  TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
-  0                     // ... unbounded string
-};
-static CORBA::TypeCode tc_string (CORBA::tk_string,
-				  sizeof _oc_string,
-				  (char*)&_oc_string,
-				  CORBA::B_FALSE);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_string = &tc_string;
-
-static const CORBA::Long _oc_wstring [] =
-{	// CDR typecode octets
-  TAO_ENCAP_BYTE_ORDER,	// native endian + padding; "tricky"
-  0                     // ... unbounded string
-};
-static CORBA::TypeCode tc_wstring (CORBA::tk_wstring,
-			  sizeof _oc_wstring,
-			  (char *) &_oc_wstring,
-			  CORBA::B_FALSE);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_wstring = &tc_wstring;
-
-//
-// Various things that can be passed as "general" parameters:
-// Any, TypeCode_ptr, Principal_ptr, Object_ptr
-//
-static CORBA::TypeCode tc_any (CORBA::tk_any);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_any = &tc_any;
-
-static CORBA::TypeCode tc_typecode (CORBA::tk_TypeCode);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_TypeCode = &tc_typecode;
-
-static CORBA::TypeCode tc_principal (CORBA::tk_Principal);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_Principal = &tc_principal;
-
-// typecode for objref is complex, has two string parameters
-//
-// NOTE:  Must be four-byte aligned
-
-static const u_char oc_objref [] =
-{
-  0, 0, 0, 0,			// big endian encoding (+ padding)
-  0, 0, 0, 29,                  // 29 char string + 3 pad bytes
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'O', 'b',
-  'j', 'e', 'c', 't',
-  ':', '1', '.', '0',
-  '\0', 0, 0, 0,
-  0, 0, 0, 7,			// 7 chars "Object" + 1 pad byte
-  'O', 'b', 'j', 'e',
-  'c', 't', '\0', 0,
-};
-
-static CORBA::TypeCode tc_objref (CORBA::tk_objref,
-				 sizeof oc_objref,
-				 (char *) &oc_objref,
-				 CORBA::B_FALSE);
-
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_Object = &tc_objref;
diff --git a/TAO/tao/VCAUTO.MAK b/TAO/tao/VCAUTO.MAK
deleted file mode 100644
index 28f48c75716..00000000000
--- a/TAO/tao/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tao/
-
-MAK_LIST = TAO
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tao/compat/initguid.h b/TAO/tao/compat/initguid.h
deleted file mode 100644
index f90676559a9..00000000000
--- a/TAO/tao/compat/initguid.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* This may look like C, but it's really -*- C++ -*- */
-#ifndef TAO_COMPAT_INITGUID_H
-#  define TAO_COMPAT_INITGUID_H
-
-/* Insure proper inclusion order */
-#ifndef DEFINE_GUID
-#error initguid: must include objbase.h first.
-#endif
-
-/* assert DEFINE_GUID is defined */
-#undef	DEFINE_GUID
-
-#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
-            EXTERN_C const TAO_IID name = { 0 }
-
-#endif /* TAO_COMPAT_INITGUID_H */
diff --git a/TAO/tao/compat/objbase.h b/TAO/tao/compat/objbase.h
deleted file mode 100644
index d6dbad2898f..00000000000
--- a/TAO/tao/compat/objbase.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* This may look like C, but it's really -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    objbase.h
-//
-// = DESCRIPTION
-// 
-//   This has "enough COM" to compile (on UNIX) a recent version of the
-//   IIOP engine code, which more or less uses COM as a source standard.
-//
-//   (It's unknown whether the C++ compilers on UNIX put vtables as the first
-//   member or not; that matters to folk writing "objects in C", relying on the
-//   COM ABI.  In any case, the API to a pure C++ programmer is the same.)
-//
-//   Note that Microsoft changed the header file structure so that some
-//   development environments now prefer "objbase.h" not "compobj.h".
-//
-// = AUTHOR
-//     Portions Copyright 1994-1995 by Sun Microsystems Inc.
-//     Portions Copyright 1997 by Washington University
-//
-// ============================================================================
-
-#ifndef _compobj_h
-#define _compobj_h
-
-#  if !defined(ACE_OS_H)
-#    error You did not include "ace/OS.h" before objbase.h.  This will break on WIN32 platforms.
-#  endif
-
-//
-// Random data types that come from Microsoft's APIs.
-//
-typedef u_long ULONG;
-typedef u_long TAO_HRESULT;
-
-//
-// Details of the procedure calling convention matter.
-//
-//#define __stdcall                // MS-Windows non-varargs call convention
-
-#if defined(__cplusplus)
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-//
-// IDs come built from UUIDs
-//      IID -- interface ID
-//      CLSID -- implementation ID
-//
-typedef char TAO_IID [16];          // XXX actually a struct
-typedef const TAO_IID &REFIID;
-#if !defined(INITGUID)
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
-                      extern "C" const TAO_IID name
-#else
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \
-                      extern "C" const TAO_IID name = { 0 }
-#endif
-
-
-//
-// All objects in the "Component Object Model" (COM) inherit from
-// this pure virtual base class.
-//
-DEFINE_GUID (IID_TAO_IUnknown, b,c,d,e,f,g,h,i,j,k,l);
-
-class TAO_IUnknown
-{
-public:
-  virtual TAO_HRESULT  QueryInterface (REFIID riid,
-                                   void **ppv) = 0;
-  virtual ULONG  AddRef (void) = 0;
-  virtual ULONG  Release (void) = 0;
-};
-
-// XXX haven't looked closely at COM's fault reporting yet ...
-
-typedef u_long TAO_SCODE;
-
-inline TAO_HRESULT
-TAO_ResultFromScode(TAO_SCODE scode)
-{
-  return scode;
-}
-
-#define TAO_NOERROR         ((TAO_SCODE) 0)
-#if !defined(NOERROR)
-#  define NOERROR TAO_NOERROR
-#endif /* ! NOERROR */
-#define TAO_E_NOINTERFACE   ((TAO_SCODE) 17)
-
-
-// VARIANT is OLE's extremely limited version of "Any".  There are
-// numerous definitions of this type in different MS environments;
-// this one's the Win32 version.  We need it here because part of the
-// CORBA-COM mapping is conversions between Any and VARIANT.
-//
-// XXX not all of these types are worth trying to support portably,
-// and even those that are worth supporting portably aren't fully
-// supported at this writing.
-
-typedef u_short         TAO_VARTYPE;
-enum TAO_VARENUM
-{                  // only types suitable for VARIANTs
-  VT_EMPTY    = 0,            // nothing
-  VT_NULL     = 1,            // SQL style ull (XXX)
-  VT_I2       = 2,            // signed 2 byte integer
-  VT_I4       = 3,            // signed 4 byte integer
-  VT_R4       = 4,            // IEEE "single" floating point
-  VT_R8       = 5,            // IEEE "double" floating point
-  VT_CY       = 6,            // currency
-  VT_DATE     = 7,            // date
-  VT_BSTR     = 8,            // counted string
-  VT_DISPATCH = 9,            // IDispatch COM object
-  VT_ERROR    = 10,           // SCODE
-  VT_BOOL     = 11,           // true=1, false=0
-  VT_VARIANT  = 12,           // variant pointer
-  VT_UNKNOWN  = 13,           // IUnknown COM object
-  VT_UI1      = 17,           // octet
-  VT_ARRAY    = 0x2000,       // SAFEARRAY * of more primitive type
-  VT_BYREF    = 0x4000        // pointer to more primitive type
-};
-
-struct TAO_CY
-  // = TITLE
-  //   Currency is an eight byte fixed point number (could be "long long").
-{
-#if defined (WORDS_BIGENDIAN)
-    long Hi;
-    u_long Lo;
-#else
-    u_long Lo;
-    long Hi;
-#endif /* WORDS_BIGENDIAN */
-};
-
-// DATE format is days since 30-Dec-1889 ... days in the "whole"
-// part, time in the fractional part (part of a day).
-
-typedef double TAO_DATE;
-
-struct TAO_VARIANT
-{
-  TAO_VARTYPE               vt;             // type ID
-  u_short               wReserved1, wReserved2, wReserved3;
-  union
-  {
-    //
-    // By-Value fields
-    //
-    long                lVal;                   // VT_I4
-    u_char              bVal;                   // VT_UI1
-    short               iVal;                   // VT_I2
-    float               fltVal;                 // VT_R4
-    double              dblVal;                 // VT_R8
-    // VARIANT_BOOL     bool;                   // VT_BOOL
-    TAO_SCODE           scode;                  // VT_ERROR
-    TAO_CY              cyVal;                  // VT_CY
-    TAO_DATE            date;                   // VT_DATE
-    // BSTR             bstrVal;                // VT_BSTR
-    TAO_IUnknown        *punkVal;               // VT_UNKNOWN
-    // IDispatch        *pdispVal;              // VT_DISPATCH
-    // SAFEARRAY        *parray;                // VT_ARRAY
-
-    //
-    // By-Reference fields (for VARIANTARG)
-    //
-    u_char              *pbVal;                 // VT_BYREF|VT_UI1
-    short               *piVal;                 // VT_BYREF|VT_I2
-    long                *plVal;                 // VT_BYREF|VT_I4
-    float               *pfltVal;               // VT_BYREF|VT_R4
-    double              *pdblVal;               // VT_BYREF|VT_R8
-    // VARIANT_BOOL     *pbool;                 // VT_BYREF|VT_BOOL
-    TAO_SCODE           *pscode;                // VT_BYREF|VT_ERROR
-    TAO_CY              *pcyVal;                // VT_BYREF|VT_CY
-    TAO_DATE            *pdate;                 // VT_BYREF|VT_DATE
-    // BSTR             *pbstrVal;              // VT_BYREF|VT_BSTR
-    TAO_IUnknown            **ppunkVal;             // VT_BYREF|VT_UNKNOWN
-    // IDispatch        **ppdisVal;             // VT_BYREF|VT_DISPATCH
-    // SAFEARRAY        *pparray;               // VT_BYREF|VT_ARRAY
-
-    TAO_VARIANT         *pvarVal;               // VT_BYREF|VT_VARIANT
-    void                *byref;                 // generic VT_BYREF
-  };
-};
-
-#endif  // _compobj_h
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
deleted file mode 100644
index c821b4025d6..00000000000
--- a/TAO/tao/corba.h
+++ /dev/null
@@ -1,332 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    corba.h
-//
-// = DESCRIPTION
-//     Master Header file for the TAO CORBA ORB.  Include only this
-//     file, to see all public ORB interfaces declared by TAO.
-//
-//     This follows the OMG C++ mapping for compilers that don't
-//     support C++ exceptions or namespaces.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc., Chris Cleeland,
-//     and Douglas C. Schmidt.
-//
-// ============================================================================
-
-#if !defined (TAO_MASTER_CORBA_H)
-#define TAO_MASTER_CORBA_H
-
-// ACE specific includes
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Synch_T.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/SString.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Strategies.h"
-#include "ace/Connector.h"
-#include "ace/Singleton.h"
-#include "ace/Reactor.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Synch.h"
-#include "ace/Svc_Handler.h"
-
-#if !defined (TAO_HAS_DLL)
-// On Windows NT, the default is to build TAO as a DLL library.
-#  define TAO_HAS_DLL 1
-#endif /* TAO_HAS_DLL */
-
-// Here are definition for TAO library.
-#if defined (TAO_HAS_DLL) && (TAO_HAS_DLL == 1)
-#  if defined (TAO_BUILD_DLL)
-#    define TAO_Export ACE_Proper_Export_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-#  else
-#    define TAO_Export ACE_Proper_Import_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T)
-#  endif /* TAO_BUILD_DLL */
-#else /* TAO_HAS_DLL */
-#  define TAO_Export
-#  define TAO_SINGLETON_DECLARATION(T)
-#  define TAO_SINGLETON_INSTANTIATION(T)
-#endif /* TAO_HAS_DLL */
-
-// COM stuff
-#include "tao/compat/objbase.h"
-#include "tao/compat/initguid.h"
-
-// ORB configuration
-#include "tao/orbconf.h"
-
-// For some reason, PC compilers don't implement "natural" alignment,
-// but only use fixed alignment policies.  The following #pragmas
-// configure fixed one-byte alignment policy, since some fixed policy
-// needs to apply throughout an ORB.
-
-#if     defined (_MSC_VER)
-#       pragma  pack (push, 1)          // VC++, stack 1-byte alignment policy
-
-#       ifdef   _DEBUG                  // convert from VC++ convention ...
-#               define  DEBUG           // ... to normal convention
-#       endif
-
-#elif   defined (__BORLANDC__)
-#       pragma option -a                // BC++, use 1 byte alignment
-
-#endif /* _MSC_VER */
-
-// Get various definitions facilitating portability.
-#include "tao/orbconf.h"
-
-// Forward declarations of some data types are needed.
-
-class CORBA_Any;
-typedef class CORBA_Any *CORBA_Any_ptr;
-
-class CORBA_TypeCode;
-typedef class CORBA_TypeCode *CORBA_TypeCode_ptr;
-
-class CORBA_Exception;
-typedef class CORBA_Exception *CORBA_Exception_ptr;
-
-class CORBA_Request;
-typedef class CORBA_Request *CORBA_Request_ptr;
-
-class CORBA_NamedValue;
-typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
-
-class CORBA_NVList;
-typedef class CORBA_NVList *CORBA_NVList_ptr;
-
-class CORBA_ORB;
-typedef class CORBA_ORB *CORBA_ORB_ptr;
-
-class CORBA_Object;
-typedef class CORBA_Object *CORBA_Object_ptr;
-
-class CORBA_ServerRequest;
-typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
-
-class CORBA_Environment;
-typedef class CORBA_Environment *CORBA_Environment_ptr;
-
-class CORBA_Principal;
-typedef class CORBA_Principal *CORBA_Principal_ptr;
-
-typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr;
-
-typedef class CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
-
-class CORBA_String_var;
-
-// enum values defined in nvlist.hh, bitwise ORed.
-typedef u_int CORBA_Flags;
-
-typedef void (*TAO_Skeleton)(CORBA_ServerRequest &,
-                             //                      CORBA_Object_ptr,
-                             void *,
-                             void *,
-                             CORBA_Environment &);
-
-// NOTE: stub APIs are nonportable, and must be explicitly #included
-// by code emitted from an IDL compiler.
-
-#if     defined (_MSC_VER)
-#       pragma pack (pop)               // VC++, goes back to other padding rules
-#endif /* _MSC_VER */
-
-// Alignment macros
-#include "tao/Align.h"
-
-// CORBA class.
-#include "tao/ORB.h"
-
-typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
-extern CORBA::TypeCode TC_opaque;
-
-#include "tao/Exception.h"
-#include "tao/Any.h"
-
-#include "tao/params.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/default_client.h"
-#include "tao/default_server.h"
-
-#include "tao/NVList.h"
-#include "tao/Principal.h"
-#include "tao/Request.h"
-#include "tao/Stub.h"
-#include "tao/Object.h"
-#include "tao/Server_Request.h"
-#include "tao/Typecode.h"
-
-// Marshaling
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-
-#include "tao/POA.h"
-
-extern TAO_Export int operator== (const PortableServer::ObjectId &l,
-                                  const PortableServer::ObjectId &r);
-
-extern TAO_Export int operator== (const TAO_ObjectKey &l,
-                                  const TAO_ObjectKey &r);
-
-// TAO specific includes
-#include "tao/Connect.h"
-#include "tao/ORB_Core.h"
-#include "tao/Object_Table.h"
-#include "tao/Operation_Table.h"
-#include "tao/debug.h"
-
-// GIOP - IIOP related includes
-#include "tao/IIOP_Object.h"
-#include "tao/IIOP_ORB.h"
-#include "tao/IIOP_Interpreter.h"
-#include "tao/GIOP.h"
-
-#include "tao/singletons.h"
-
-#if !defined (ACE_NESTED_CLASS)
-#if defined (ACE_WIN32)
-#define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS
-#else /* !ACE_WIN32 */
-#define ACE_NESTED_CLASS(SCOPE,CLASS) SCOPE::CLASS
-#endif /* ACE_WIN32 */
-#endif /* ACE_NESTED_CLASS */
-
-//
-// These macros can be used to write "portable" code between platforms
-// supporting CORBA exceptions natively (using the C++ exceptions) or
-// through the Enviroment parameter.
-// Their use requires some discipline, but they certainly help...
-//
-// TODO: Currently the IDL compiler does not support C++ exceptions, so we
-// cannot use them even if the platform has them.
-//
-#if defined (ACE_HAS_EXCEPTIONS) && defined (TAO_IDL_COMPILER_HAS_EXCEPTIONS)
-
-#define TAO_TRY_ENV __env
-// The first "do" scope is for the env.
-// The second "do" scope is for the TAO_CHECK_ENV continues.
-#define TAO_TRY \
-try { CORBA::Environment TAO_TRY_ENV;
-#define TAO_CATCH(TYPE,VAR) \
-} catch (TYPE VAR) {
-#define TAO_CATCHANY \
-} catch (...) {
-#define TAO_ENDTRY }
-
-// No need to do checking, exception handling does it for us.
-#define TAO_CHECK_ENV
-#define TAO_CHECK_ENV_RETURN(X, Y)
-
-#define TAO_THROW(EXCEPTION) throw EXCEPTION;
-#define TAO_THROW_RETURN(EXCEPTION, RETURN) throw EXCEPTION
-#define TAO_RETHROW throw;
-
-#define TAO_THROW_SPEC(X) throw X
-
-#else /* ACE_HAS_EXCEPTIONS && TAO_IDL_COMPILES_HAS_EXCEPTIONS */
-
-// Define a local enviroment variable...
-#define TAO_TRY_ENV __env
-
-// I would like to experiment with this idea in the future....
-#if 0 /* g++ on VxWorks didn't like the backslashes at the end of comment
-         lines . . . */
-#define TAO_TRY_VAR(X) \
-do { CORBA::Environment &TAO_TRY_ENV = X; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-#endif /* 0 */
-
-// The first "do" scope is for the env.
-// The second "do" scope is for the TAO_CHECK_ENV continues.
-#define TAO_TRY \
-do { CORBA::Environment TAO_TRY_ENV; \
-int TAO_TRY_FLAG = 1; \
-TAO_TRY_LABEL: \
-if (TAO_TRY_FLAG) \
-do {
-
-// Each CATCH statement ends the previous scope and starts a new one.
-// Since all CATCH statements can end the TAO_TRY macro, they must all
-// start a new scope for the next potential TAO_CATCH.  The TAO_ENDTRY
-// will finish them all.  Cool, eh?
-#define TAO_CATCH(TYPE,VAR) \
-} while (0); \
-do \
-if (TAO_TRY_ENV.exception () != 0 && \
-    TYPE::_narrow(TAO_TRY_ENV.exception ()) != 0) { \
-  TYPE &VAR = *TYPE::_narrow (TAO_TRY_ENV.exception ()); \
-  ACE_UNUSED_ARG (VAR);
-
-#define TAO_CATCHANY \
-} while (0); \
-do { \
-if (TAO_TRY_ENV.exception () != 0)
-
-// The first "while" closes the local scope.  The second "while"
-// closes the TAO_TRY_ENV scope.
-#define TAO_ENDTRY \
-} while (0); \
-} while (0)
-
-// If continue is called, control will skip to the next TAO_CATCHANY
-// statement.
-#define TAO_CHECK_ENV \
-{\
-if (TAO_TRY_ENV.exception () != 0) \
-  { \
-    TAO_TRY_FLAG = 0; \
-    goto TAO_TRY_LABEL; \
-  } \
-}
-
-#define TAO_CHECK_ENV_RETURN(X, Y) \
-if ( X . exception () != 0) return Y
-
-#define TAO_THROW(EXCEPTION) \
-do {\
-  _env.exception (new EXCEPTION); \
-  return; } while (0)
-
-#define TAO_THROW_RETURN(EXCEPTION, RETURN) \
-do {\
- _env.exception (new EXCEPTION); \
- return RETURN; } while (0)
-
-#define TAO_RETHROW \
-_env.exception (TAO_TRY_ENV.exception ()); \
-return
-
-#define TAO_RETHROW_RETURN(RETURN) \
-_env.exception (TAO_TRY_ENV.exception ()); \
-return RETURN
-
-#define TAO_THROW_SPEC(X)
-#endif /* ACE_HAS_EXCEPTIONS */
-
-#endif /* TAO_MASTER_CORBA_H */
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
deleted file mode 100644
index f9358f257f3..00000000000
--- a/TAO/tao/debug.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-// $Id$
-// @ (#)debug.cpp       1.3 95/10/02
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Simple debug/trace support
-//
-// THREADING NOTE: the global values here  (debug_{level,filter,stream)
-// are assumed to be modified "safely", e.g. in the main thread as
-// part of process initialization.  They are treated as immutable
-// values through all of this debuging package.
-//
-// XXX on Windows, make it always use OutputDebugString () instead of stdio. 
-
-#include "tao/corba.h"
-
-#if !defined (ACE_HAS_PTHREADS) && !defined (ACE_HAS_DCE_DRAFT4_THREADS)
-  // _POSIX_THREAD_SAFE_FUNCTIONS implied
-# define flockfile(f)
-# define funlockfile(f)
-#endif /* ! ACE_HAS_PTHREADS && ! ACE_HAS_DCE_DRAFT4_THREADS */
-
-u_int TAO_Export TAO_debug_level = 0;
-char *TAO_Export TAO_debug_filter = "l";
-
-static FILE *debug_stream = stderr;
-
-// Dummy function to get rid of "'debug_stream' defined but not used"
-// warning.
-
-FILE *
-use_debug_stream_to_get_rid_of_warning (void)
-{
- return debug_stream;
-}
-
-// The rest of this file is not needed without -DDEBUG, and unless the
-// vfprintf () call is available it can't work.
-//
-// NOTE:  some older platforms have "_doprnt" that provides much the
-// same functionality ... this could be modified to use that routine
-// where it's available.
-
-#if defined (DEBUG) && defined (HAVE_VPRINTF)
-
-// Support for prefixing debug messages with process ID and, if
-// threaded, the thread ID.  This lets messages from different sources
-// be safely disentangled, even though they're interspersed in the
-// output stream.
-static pid_t my_pid;
-
-#if defined (unix) || defined (VXWORKS)
-
-#if defined (ACE_HAS_PTHREADS)
-
-// Use POSIX initialization support to initialize just once.
-
-static pthread_once_t debug_init = PTHREAD_ONCE_INIT;
-
-#define setup() pthread_once (&debug_init, setup_once)
-
-static void
-setup_once ()
-{
-  my_pid = ACE_OS::getpid ();
-}
-
-static void
-emit_prefix (FILE *stream)
-{
-  pthread_t self = pthread_self ();
-
-  ACE_OS::fprintf (stream, "p%ld t%ld:  ", (long) my_pid, (long) self);
-}
-
-// !defined (ACE_HAS_PTHREADS)
-#else
-
-// Without threads, guard initialization so it can be repeated,
-// and don't emit the thread ID in the messages.
-
-static void
-setup (void)
-{
-  if (my_pid == 0)
-    my_pid = ACE_OS::getpid ();
-  
-// Any other setup goes here.
-}
-
-#define emit_prefix(stream) fprintf (stream, "p%ld:  ", (long) my_pid)
-#endif  /* !ACE_HAS_PTHREADS */
-
-#elif defined (_WIN32)
-
-// Not all implementations of Win32 have threads, but in any case this
-// code doesn't yet support Win32 threads.
-
-static void
-setup (void)
-{
-  if (my_pid == 0)
-    my_pid = GetCurrentProcessId ();
-  // Any other setup goes here.
-}
-
-#define emit_prefix(stream) fprintf (stream, "p%ld:  ", my_pid)
-
-#else
-#       error "unknown OS platform"
-#endif /* OS-specific initialization */
-
-void TAO_Export
-dmsg_filter (const char *_FAR categories,
-             const char *_FAR fmt,
-             ...)
-{
-  const char *cp = 0;
-
-  if (!categories || !TAO_debug_filter)
-    return;
-  else if (*TAO_debug_filter != '*')
-    {           // filter with "*" --> all pass
-      for (cp = categories; *cp; cp++)
-        if (strchr (TAO_debug_filter, *cp) != 0)
-          break;
-
-      if (!*cp)
-        return;
-    }
-
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-
-  switch (*cp)
-    {                   // standard categories
-    case 'l':
-      ACE_OS::fprintf (debug_stream, " (LEAK) "); 
-      break;
-    }
-
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_filter\n");   // experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_filter (u_int level,
-             const char *_FAR fmt,
-             ...)
-{
-  if (level > TAO_debug_level)
-    return;
-
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_filter\n");   // experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_v (const char *_FAR fmt,
-        ...)
-{
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_v\n");        // experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-_dmsg_x (CORBA::Environment _FAR &env,
-         const char *_FAR info)
-{
-  const CORBA::Exception *ex = env.exception ();
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream,
-                   "exception '%s' at '%s'\n",
-                   ex->_id (),
-                   info);
-
-  if (env.exception_type () == CORBA::SYSTEM_EXCEPTION)
-    {
-      CORBA::SystemException *sysex = (CORBA::SystemException *) ex;
-
-      emit_prefix (debug_stream);
-      ACE_OS::fprintf (debug_stream,
-                       "minor %#lx, completion %#lx\n",
-                       sysex->minor (),
-                       (long) sysex->completion ());
-    }
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called _dmsg_x\n");       // experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_opaque (char *_FAR label,
-             u_char *_FAR buffer,
-             u_long len)
-{
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream,
-                   "%s ",
-                   label);
-
-  if (len == 0 || !buffer)
-    ACE_OS::fprintf (debug_stream,
-                     " (empty)");
-  else if (len > UINT_MAX)
-    ACE_OS::fprintf (debug_stream,
-                     "Oversized opaque data:  %ld bytes",
-                     len);
-  else
-    {
-      u_int i;
-
-      for (i = 0; i < len; i++)
-        if (!isprint (buffer [i]))
-          break;
-
-      if (i < len)
-        {
-          if (len >= 20)
-            ACE_OS::fprintf (debug_stream,
-                             "%ld bytes binary data",
-                             len);
-          else
-            {
-              ACE_OS::fprintf (debug_stream,
-                               "binary data {%2X", buffer [0]);
-              for (i = 1; i < len; i++)
-                ACE_OS::fprintf (debug_stream,
-                                 ", %2x",
-                                 buffer [i]);
-              ACE_OS::fprintf (debug_stream,
-                               "}");
-            }
-        }
-      else
-        {
-          if (len >= 50)
-            ACE_OS::fprintf (debug_stream,
-                             "%ld bytes string data",
-                             len);
-          else
-            ACE_OS::fprintf (debug_stream,
-                             "string data { \"%.*s\" }",
-                             (int) len,
-                             buffer);
-        }
-    }
-  ACE_OS::fprintf (debug_stream,
-                   "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_opaque\n");   // experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_opaque_full (char *_FAR label,
-                  const u_char *_FAR buffer,
-                  u_long len)
-{
-  setup ();
-  flockfile (debug_stream);
-
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream,
-                   "%s ",
-                   label);
-
-  if (len == 0 || !buffer)
-    ACE_OS::fprintf (debug_stream,
-                     " (empty)");
-  else
-    {
-      u_int i;
-
-      for (i = 0; i < len; i++)
-        {
-          if (i == 0)
-            ACE_OS::fprintf (debug_stream,
-                             "\nhex:   ");
-          else if ((i % 32) == 0)
-            ACE_OS::fprintf (debug_stream,
-                             "\n       ");
-          else if ((i % 4) == 0)
-            ACE_OS::fprintf (debug_stream,
-                             " ");
-          ACE_OS::fprintf (debug_stream,
-                           "%02x",
-                           buffer[i]);
-        }
-
-      for (i = 0; i < len; i++)
-        {
-          if (i == 0)
-            ACE_OS::fprintf (debug_stream,
-                             "\nchars: ");
-          else if ((i % 32) == 0)
-            ACE_OS::fprintf (debug_stream,
-                             "\n       ");
-          else if ((i % 4) == 0)
-            ACE_OS::fprintf (debug_stream,
-                             " ");
-          ACE_OS::fprintf (debug_stream, "%c ",
-                           (isprint (buffer[i]) ? buffer[i] : '?'));
-
-        }
-
-      ACE_OS::fprintf (debug_stream,
-                       "\n");
-    }
-  ACE_OS::fprintf (debug_stream,
-                   "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_opaque_full\n");      // experimental
-#endif /* _WIN32 */
-}
-
-#endif /* DEBUG && HAVE_VPRINTF */
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
deleted file mode 100644
index 7f9ff844a62..00000000000
--- a/TAO/tao/debug.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    debug.h
-//
-// = DESCRIPTION
-//     debug/trace support.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_DEBUG_H)
-#define	TAO_DEBUG_H
-
-// These are global to simplify is use by other code, very much in
-// particular by getopt and related argument-parsing code
-//
-// THREADING NOTE: don't set them except in an unthreaded environment
-// such as process initialization.  They're treated as immutable.
-
-// 0 to ??; higher == more
-extern u_int TAO_Export TAO_debug_level;	
-
-// set by getopt
-extern char * TAO_Export TAO_debug_filter;
-
-// These are just simple 0, 1, and 2 argument messages that will
-// appear when debugging's enabled, regardless of category.  They also
-// just compile out painlessly.
-
-#if defined (DEBUG)
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-// 1, 2, 3 argument messages -- generic
-#define dmsg(s)		{ if (TAO_debug_level) dmsg_v (s); }
-#define dmsg1(s,a1)	{ if (TAO_debug_level) dmsg_v (s, a1); }
-#define dmsg2(s,a1,a2)	{ if (TAO_debug_level) dmsg_v (s, a1, a2); }
-
-// dump CORBA_Exception, if any, with id tag
-#define dexc(env,s)	{ if (TAO_debug_level && env.exception ()) \
-				_dmsg_x (env, s); }
-
-// dump POSIX error indication, if any, with ID tag
-#define dperror(str)	{ if (TAO_debug_level) dmsg_v ("%s: %s", \
-				str, strerror (errno)); }
-
-// dump socket error indication, if any, with ID tag
-#if defined (_WINSOCKAPI_)
-#define	dsockerr(s) { if (TAO_debug_level) dmsg_v ("%s:  winsock error %d", \
-                                                   s, WSAGetLastError()); }
-#else
-#define	dsockerr(s)	dperror(s)
-#endif /* _WINSOCKAPI_ */
-
-#else	/* !DEBUG */
-#define dmsg(s) { }
-#define dmsg1(s,a1) { }
-#define dmsg2(s,a1,a2) { }
-
-#define dexc(env, s) { }
-#define	dperror(s) { }
-#define	dsockerr(s) { }
-#endif	/* DEBUG */
-
-// These don't compile out; you must #ifdef them.  This is done
-// intentionally since CPP macros have severe limits, and varargs _(or
-// lack thereof) is one of them.
-
-#if defined (DEBUG)
-
-// This is like an fprintf statement except the filter is a set of
-// characters (string).  If TAO_debug_level is nonzero and any
-// characters in that string are in the "TAO_debug_filter" string, the
-// message is then printed.  Assign thosee characters as needed.
-
-extern void TAO_Export dmsg_filter (const char *_FAR filter,
-                                    const char *_FAR fmt,
-                                    ...);
-
-// Filter according to TAO_debug_level instead of category.  (For
-// speed, test against TAO_debug_level directly.)
-
-extern void TAO_Export dmsg_filter (u_int level, 
-                                    const char *_FAR fmt,
-                                    ...);
-
-// General varargs debug message printer, no filtering
-
-extern void TAO_Export dmsg_v (const char *_FAR fmt,
-                               ...);
-extern void TAO_Export _dmsg_x (CORBA_Environment _FAR &env,
-                                const char *_FAR info);
-extern void TAO_Export dmsg_opaque (char *_FAR label,
-                                    u_char *_FAR buffer,
-                                    u_long len);
-extern void TAO_Export dmsg_opaque_full (char *_FAR label,
-                                         const u_char *_FAR buffer,
-                                         u_long len);
-#endif /* DEBUG */
-
-#endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
deleted file mode 100644
index 3701f4f1cc6..00000000000
--- a/TAO/tao/decode.cpp
+++ /dev/null
@@ -1,1653 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    decode.cpp
-//
-// = DESCRIPTION
-//   Code for decoding different data types
-//
-//   The original code had a single static decoder function defined on
-//   the CDR class that called traverse to interpret the data
-//   types. This version defines a virtual method "decode" on each
-//   class and avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// The decoder is exactly the reverse of the encoder, except that:
-//
-//      * Unmarshaling some data types involve allocating memory.  Such
-//        types include sequences (the buffer), objrefs, Principals, Anys,
-//        TypeCodes, and strings.
-//
-//      * The decoder is used when retrieving typecode parameters from
-//        encapsulations.  This means it must deal with "CORBA::tk_indirect",
-//        the magic value (~0) signifying typecode indirection.
-//
-// This second case is identified by a bit of a hack: the second
-// "data" value is used to hold the parent typecode, rather than being
-// ignored.  This means that all other invocations of decoder () **
-// MUST ** pass zero for the second data parameter, in case they
-// decode a TypeCode.  If they didn't, this case might be signified
-// inappropriately.
-//
-// XXX desirable to have a less hacky solution to that ... pull that
-// code out into a separate routine called both by CDR::decoder () and
-// by the code retrieving typecode parameters from encapsulations.
-
-CORBA::TypeCode_ptr __tc_consts [CORBA::TC_KIND_COUNT] =
-{
-  CORBA::_tc_null,
-  CORBA::_tc_void,
-  CORBA::_tc_short,
-  CORBA::_tc_long,
-  CORBA::_tc_ushort,
-
-  CORBA::_tc_ulong,
-  CORBA::_tc_float,
-  CORBA::_tc_double,
-  CORBA::_tc_boolean,
-  CORBA::_tc_char,
-
-  CORBA::_tc_octet,
-  CORBA::_tc_any,
-  CORBA::_tc_TypeCode,
-  CORBA::_tc_Principal,
-
-  0, // CORBA::_tc_Object ... type ID is CORBA_Object
-  0, // CORBA_tk_struct
-  0, // CORBA_tk_union
-  0, // CORBA_tk_enum
-  0, // CORBA::_tc_string ... unbounded
-  0, // CORBA_tk_sequence
-  0, // CORBA_tk_array
-  0, // CORBA_tk_alias
-  0, // CORBA_tk_except
-
-  CORBA::_tc_longlong,
-  CORBA::_tc_ulonglong,
-  CORBA::_tc_longdouble,
-  CORBA::_tc_wchar,
-  0           // CORBA::_tc_wstring ... unbounded
-};
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_decoding = stream->read_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_decoding = stream->read_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_decoding = stream->read_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_decoding = stream->read_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_decoding = stream->read_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_decoding = stream->read_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_decoding = stream->read_wchar (*(CORBA::WChar *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Primitive::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
-                         const void *data,
-                         const void *,
-                         void *context,
-                         CORBA::Environment &env)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_ptr elem_tc;
-
-  // Value maintained by the Any.
-  void *value = 0;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Status of encode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Decode the typecode description for the element.
-  if (stream->decode (CORBA::_tc_TypeCode,
-                      &elem_tc,
-                      0,
-                      env) == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      ACE_NEW_RETURN (value,
-                      CORBA::Octet[elem_tc->size (env)],
-                      CORBA::TypeCode::TRAVERSE_STOP);
-
-      if (env.exception () == 0)
-        {
-          // Switch on the data type and handle the cases for
-          // primitives here for efficiency rather than calling.
-          switch (elem_tc->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-              break;
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              continue_decoding =
-                stream->read_short (*(CORBA::Short *) value);
-              break;
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              continue_decoding =
-                stream->read_long (*(CORBA::Long *) value);
-              break;
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-              continue_decoding =
-                stream->read_longlong (*(CORBA::LongLong *) value);
-              break;
-            case CORBA::tk_boolean:
-              continue_decoding =
-                stream->read_boolean (*(CORBA::Boolean *) value);
-              break;
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              continue_decoding =
-                stream->read_char (*(CORBA::Char *) value);
-              break;
-            case CORBA::tk_longdouble:
-              continue_decoding =
-                stream->read_longdouble (*(CORBA::LongDouble *) value);
-              break;
-            case CORBA::tk_wchar:
-              continue_decoding =
-                stream->read_wchar (*(CORBA::WChar *) value);
-              break;
-            case CORBA::tk_any:
-            case CORBA::tk_TypeCode:
-            case CORBA::tk_Principal:
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_string:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_wstring:
-              retval = stream->decode (elem_tc, value, 0, env);
-              break;
-            default:
-              // Anything else is an error.
-              retval = CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    {
-      // Allocate an Any and populate it with the value and
-      // typecode. This eventually appears as "data"
-      (void) new (any) CORBA::Any (elem_tc, value, CORBA::B_TRUE);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-      // Free the allocated storage and release the typecode.
-      delete [] value;
-      CORBA::release (elem_tc);
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Any::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
-                              const void *data,
-                              const void *parent_typecode,
-                              void *context,
-                              CORBA::Environment  &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Typecode to be decoded.
-  CORBA::TypeCode_ptr *tcp;
-
-  // Typecode kind.
-  CORBA::ULong kind;
-
-  // TypeCode for the parent.
-  CORBA::TypeCode_ptr parent = (CORBA::TypeCode_ptr) parent_typecode;
-
-  // Decode the "kind" field of the typecode from the stream
-  continue_decoding = stream->read_ulong (kind);
-
-  if (continue_decoding == CORBA::B_TRUE)
-    {
-      // The data has to be a TypeCode_ptr *.
-      tcp = (CORBA::TypeCode_ptr *) data;
-
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if (kind < CORBA::TC_KIND_COUNT
-          && (*tcp = __tc_consts [(u_int) kind]) != 0)
-        *tcp = __tc_consts [(u_int) kind];
-      else if (kind == ~(CORBA::ULong)0 || kind < CORBA::TC_KIND_COUNT)
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // Error: missed a case!
-              env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-
-              // Some have "simple" parameter lists ... some of these
-              // also have preallocated constants that could be used.
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                CORBA::ULong bound;
-
-                continue_decoding = stream->read_ulong (bound);
-                if (continue_decoding)
-                  {
-                    if (bound == 0)
-                      {
-                        if (kind == CORBA::tk_string)
-                          *tcp = CORBA::_tc_string;
-                        else
-                          *tcp = CORBA::_tc_wstring;
-                      }
-                    else
-                      {
-                        // Bounded string. Save the bounds
-                        *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                                    bound, 0, CORBA::B_FALSE,
-                                                    parent);
-                      }
-                  }
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level" but we
-            // allow unmarshaling of them here because we use the same
-            // code to read "off the wire" (where they're illegal) and
-            // to read out of an encapsulation stream.  We distinguish
-            // the case where this is legal as described above.
-            case ~0:
-              {
-                if (parent_typecode == 0)
-                  {
-                    env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-                    return CORBA::TypeCode::TRAVERSE_STOP;
-                  }
-
-                // Get the long indicating the encapsulation offset,
-                // then set up indirection stream that's like "stream"
-                // but has space enough only for the typecode and the
-                // length for the encapsulated parameters.
-                CORBA::Long offset;
-
-                continue_decoding = stream->read_long (offset);
-                if (continue_decoding)
-                  {
-                    // Since indirected typecodes cannot occur at the
-                    // topmost level, they can occur starting only at the
-                    // second and subsequent levels. This means that a
-                    // normal encoding of that typecode occurred somewhere
-                    // before in the stream. As a result the offset field
-                    // must always be negative. See the CORBA spec for details.
-                    continue_decoding = (offset < 0);
-                  }
-
-                TAO_InputCDR indir_stream (*stream, 8, offset);
-
-		continue_decoding = indir_stream.good_bit ();
-
-                // Get "kind" and length of target typecode
-                //
-                // XXX this currently assumes the TCKind to which we
-                // indirect is the same byte order as the "parent"
-                // typecode -- not the right assumption; see how the
-                // TypeCode interpreter does it.
-
-                CORBA::ULong indir_kind;
-                CORBA::ULong indir_len;
-
-                // retrieve the typecode kind
-                if (continue_decoding)
-                  continue_decoding = indir_stream.read_ulong (indir_kind);
-
-                if (continue_decoding
-                    && indir_kind >= CORBA::TC_KIND_COUNT)
-                  continue_decoding = CORBA::B_FALSE;
-
-                // now retrieve the encapsulation length
-                if (continue_decoding)
-                  continue_decoding = indir_stream.read_ulong (indir_len);
-
-                // Now construct indirected typecode.  This shares the
-                // typecode octets with the "parent" typecode,
-                // increasing the amount of memory sharing and
-                // reducing the cost of getting typecodes.
-                if (continue_decoding)
-                  {
-                    *tcp = new CORBA::TypeCode ((CORBA::TCKind) indir_kind,
-                                                indir_len,
-                                                indir_stream.rd_ptr(),
-                                                CORBA::B_FALSE,
-                                                parent);
-#if 0
-                    (*tcp)->parent_ = parent;
-                    parent->AddRef ();
-#endif /* 0 */
-                  }
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-              {
-                CORBA::ULong length;
-
-                continue_decoding = stream->read_ulong (length);
-                if (!continue_decoding)
-                  break;
-
-                // if length > MAXUNSIGNED, error ...
-                u_int len = (u_int) length;
-
-                *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                            len,
-                                            stream->rd_ptr (),
-                                            CORBA::B_FALSE,
-                                            parent);
-                // skip length number of bytes in the stream, else we may
-                // leave the stream in an undefined state
-                (void) stream->skip_bytes (length);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          dmsg ("TAO_Marshal_TypeCode: Bad kind_ value in CDR stream");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Encode Principal.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::Principal_ptr *pp = (CORBA::Principal_ptr *) data;
-  CORBA::ULong len;
-
-  continue_decoding = stream->read_ulong (len);
-  if (len == 0)
-    *pp = 0;  // null principal
-  else
-    {
-      // Allocate storage for Principal and its buffer.
-      ACE_NEW_RETURN (*pp,
-                      CORBA::Principal,
-                      CORBA::TypeCode::TRAVERSE_CONTINUE);
-      ACE_NEW_RETURN ((*pp)->id.buffer,
-                      CORBA::Octet [(size_t) len],
-                      CORBA::TypeCode::TRAVERSE_CONTINUE);
-      (*pp)->id.maximum = (*pp)->id.length = len;
-
-      for (u_int i = 0;
-           continue_decoding != CORBA::B_FALSE && i < len;
-           i++)
-        continue_decoding = stream->read_octet ((*pp)->id.buffer [i]);
-    }
-
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Principal::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Decode obj ref.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
-                            const void *data, // where the result will go
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::String type_hint;
-
-  // First, read the type hint. This will be the type_id encoded in an
-  // object reference.
-  stream->decode (CORBA::_tc_string, &type_hint, 0, env);
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-
-  CORBA::ULong profiles;
-  IIOP_Object *objdata = 0;
-
-  // get the count of profiles that follow
-  continue_decoding = stream->read_ulong (profiles);
-
-  // No profiles means a NIL objref.
-
-  if (profiles == 0)
-    {
-      *(CORBA::Object_ptr *) data = CORBA::Object::_nil ();
-      CORBA::string_free (type_hint);
-      type_hint = 0;
-    }
-  else
-    while (profiles-- != 0 && continue_decoding)
-      {
-        CORBA::ULong tag;
-
-        // get the profile ID tag
-        if ( (continue_decoding = stream->read_ulong (tag)) == CORBA::B_FALSE)
-	  continue;
-
-        if (tag != TAO_IOP_TAG_INTERNET_IOP || objdata != 0)
-          {
-            continue_decoding = stream->skip_string ();
-            continue;
-          }
-
-        // OK, we've got an IIOP profile.  It's going to be
-        // encapsulated ProfileData.  Create a new decoding stream and
-        // context for it, and tell the "parent" stream that this data
-        // isn't part of it any more.
-
-	CORBA::ULong encap_len;
-        // ProfileData is encoded as a sequence of octet. So first get
-        // the length of the sequence.
-        // Create the decoding stream from the encapsulation in the
-        // buffer, and skip the encapsulation.
-	if ( (continue_decoding = stream->read_ulong (encap_len)) == CORBA::B_FALSE)
-	  continue;
-
-        TAO_InputCDR str (*stream, encap_len);
-
-	continue_decoding =
-	  str.good_bit ()
-	  && stream->skip_bytes(encap_len);
-
-	if (!continue_decoding)
-	  continue;
-
-        // Ownership of type_hint is given to IIOP_Object
-        ACE_NEW_RETURN (objdata,
-                        IIOP_Object (type_hint),
-                        CORBA::TypeCode::TRAVERSE_STOP);
-
-        IIOP::Profile *profile = &objdata->profile;
-
-        // Read and verify major, minor versions, ignoring IIOP
-        // profiles whose versions we don't understand.
-        //
-        // XXX this doesn't actually go back and skip the whole
-        // encapsulation...
-        if (!(str.read_octet (profile->iiop_version.major)
-              && profile->iiop_version.major == IIOP::MY_MAJOR
-              && str.read_octet (profile->iiop_version.minor)
-              && profile->iiop_version.minor <= IIOP::MY_MINOR))
-          {
-            ACE_DEBUG ((LM_DEBUG, "detected new v%d.%d IIOP profile",
-			profile->iiop_version.major,
-			profile->iiop_version.minor));
-            objdata->type_id = (const char *) 0;
-            objdata->Release ();
-            objdata = 0;
-            continue;
-          }
-
-        // Get host and port
-        if (str.decode (CORBA::_tc_string,
-                        &profile->host,
-                        0,
-                        env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-            || !str.read_ushort (profile->port))
-          {
-            env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-            dmsg ("error decoding IIOP host/port");
-            objdata->Release ();
-            return CORBA::TypeCode::TRAVERSE_STOP;
-          }
-
-        profile->object_addr (0);
-
-        // ... and object key.
-
-        continue_decoding = str.decode (&TC_opaque,
-                                        &profile->object_key,
-                                        0,
-                                        env) == CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-        if (str.length () != 0)
-          {
-            env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-            ACE_DEBUG ((LM_DEBUG,
-			"%d bytes out of %d left after IIOP profile data\n",
-			str.length (), encap_len));
-            objdata->Release ();
-            return CORBA::TypeCode::TRAVERSE_STOP;
-          }
-      }
-
-  if (objdata == 0)
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg2 ("no IIOP v%d.%d (or earlier) profile in IOR!",
-             IIOP::MY_MAJOR, IIOP::MY_MINOR);
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else
-    {
-      // Create a new CORBA_Object and give it the IIOP_Object just
-      // created.
-      TAO_ServantBase *servant =
-	TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (objdata);
-      CORBA_Object *corba_proxy = 0;
-
-      ACE_NEW_RETURN (corba_proxy,
-                      CORBA_Object (objdata, servant, servant != 0),
-                      CORBA::TypeCode::TRAVERSE_CONTINUE);
-
-      if (corba_proxy)
-        *(CORBA_Object **)data = corba_proxy;
-      else
-        continue_decoding = CORBA::B_FALSE;
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error"));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Decode structs.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)data;
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (env);
-
-  if (env.exception () == 0)
-    for (int i = 0; i < member_count
-           && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-           && continue_decoding == CORBA::B_TRUE;
-         i++)
-      {
-        param = tc->member_type (i, env);
-        if (env.exception () == 0)
-          {
-            size = param->size (env);
-            if (env.exception () == 0)
-              {
-                alignment = param->alignment (env);
-                if (env.exception () == 0)
-                  {
-                    align_offset =
-                      (ptr_arith_t) ptr_align_binary (data, alignment)
-                      - (ptr_arith_t) data
-                      + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-                      - (ptr_arith_t) start_addr;
-                    // if both the start_addr and data are not aligned as per
-                    // the alignment, we do not add the offset
-                    data = (const void *) ((ptr_arith_t) data +
-                                           ((align_offset == alignment) ?
-                                            0 : align_offset));
-                    switch (param->kind_)
-                      {
-                      case CORBA::tk_null:
-                      case CORBA::tk_void:
-                        break;
-                      case CORBA::tk_short:
-                      case CORBA::tk_ushort:
-                        continue_decoding =
-                          stream->read_short (*(CORBA::Short *) data);
-                        break;
-                      case CORBA::tk_long:
-                      case CORBA::tk_ulong:
-                      case CORBA::tk_float:
-                      case CORBA::tk_enum:
-                        continue_decoding =
-                          stream->read_long (*(CORBA::Long *) data);
-                        break;
-                      case CORBA::tk_double:
-                      case CORBA::tk_longlong:
-                      case CORBA::tk_ulonglong:
-                        continue_decoding =
-                          stream->read_longlong (*(CORBA::LongLong *) data);
-                        break;
-                      case CORBA::tk_boolean:
-                        continue_decoding =
-                          stream->read_boolean (*(CORBA::Boolean *) data);
-                        break;
-                      case CORBA::tk_char:
-                      case CORBA::tk_octet:
-                        continue_decoding =
-                          stream->read_char (*(CORBA::Char *) data);
-                        break;
-                      case CORBA::tk_longdouble:
-                        continue_decoding =
-                          stream->read_longdouble (*(CORBA::LongDouble *) data);
-                        break;
-                      case CORBA::tk_wchar:
-                        continue_decoding =
-                          stream->read_wchar (*(CORBA::WChar *) data);
-                        break;
-                      case CORBA::tk_string:
-                      case CORBA::tk_wstring:
-                      case CORBA::tk_any:
-                      case CORBA::tk_TypeCode:
-                      case CORBA::tk_Principal:
-                      case CORBA::tk_objref:
-                      case CORBA::tk_struct:
-                      case CORBA::tk_union:
-                      case CORBA::tk_sequence:
-                      case CORBA::tk_array:
-                      case CORBA::tk_alias:
-                      case CORBA::tk_except:
-                        retval = stream->decode (param, data, 0, env);
-                        break;
-                      default:
-                        break;
-                      }
-                    data = (char *) data + size;
-                  }
-                else
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-              }
-            else
-              return CORBA::TypeCode::TRAVERSE_STOP;
-          }
-        else
-          return CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  else
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Encode unions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *data2,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULong discrim_size_with_pad;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-  discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-
-  if (env.exception () == 0)
-    {
-      // decode the discriminator value
-      retval = stream->decode (discrim_tc, data, data2, env);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-
-          if (env.exception () == 0)
-            {
-              discrim_val = data; // save the pointer to the discriminator
-                                  // value
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-              // now get ready to marshal the actual union value
-              default_index = tc->default_index (env);
-
-              if (env.exception () == 0)
-                {
-                  member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // check which label value matches with the discriminator
-                      // value. Accordingly, marshal the corresponding
-                      // member_type. If none match, check if default exists
-                      // and marshal accordingly. Otherwise it is an error.
-
-                      for (i = 0; member_count-- != 0; i++)
-                        {
-                          member_label = tc->member_label (i, env);
-                          if (env.exception () == 0)
-                            {
-                              // do the matching
-                              switch (member_label->type ()->kind (env))
-                                {
-                                case CORBA::tk_short:
-                                case CORBA::tk_ushort:
-                                  if (*(CORBA::Short *) member_label->value () ==
-                                      *(CORBA::Short *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_long:
-                                case CORBA::tk_ulong:
-                                case CORBA::tk_enum:
-                                  if (*(CORBA::ULong *) member_label->value () ==
-                                      *(CORBA::ULong *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_char:
-                                  if (*(CORBA::Char *) member_label->value () ==
-                                      *(CORBA::Char *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_wchar:
-                                  if (*(CORBA::WChar *) member_label->value () ==
-                                      *(CORBA::WChar *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_boolean:
-                                  if (*(CORBA::Boolean *) member_label->value () ==
-                                      *(CORBA::Boolean *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                default:
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }// end of switch
-
-                              // get the member typecode
-                              member_tc = tc->member_type (i, env);
-                              if (env.exception () == 0)
-                                {
-                                  if (default_index >= 0 && default_index-- == 0)
-                                    // have we reached the default label?, if so,
-                                    // save a handle to the typecode for the default
-                                    default_tc = member_tc;
-                                  if (discrim_matched)
-                                    // marshal according to the matched typecode
-                                    return stream->decode (member_tc, data,
-                                                           data2, env);
-                                }
-                              else
-                                {
-                                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }
-                            }
-                          else
-                            {
-                              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                              return CORBA::TypeCode::TRAVERSE_STOP;
-                            }
-                        } // end of for loop
-                      // we are here only if there was no match
-                      if (default_tc)
-                        return stream->decode (default_tc, data, data2, env);
-                      else
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    }
-                  else
-                    {
-                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else
-                {
-                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  CORBA::String* str_ptr = (CORBA::String*)data;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_decoding = stream->read_string (*str_ptr);
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Decode sequence.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  TAO_Base_Sequence *seq = (TAO_Base_Sequence *)data;
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-  // Size of element.
-  size_t size;
-  CORBA::ULong bounds;
-  char *value;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  continue_decoding = stream->read_ulong (seq->length_);
-  seq->maximum_ = seq->length_;
-  seq->release_ = 1;
-  seq->buffer_ = 0;
-
-  if (continue_decoding)
-    {
-      // No point decoding an empty sequence.
-      if (seq->length_ > 0)
-        {
-          // Get element typecode.
-          tc2 = tc->content_type (env);
-
-          if (env.exception () == 0)
-            {
-              size = tc2->size (env);
-
-              if (env.exception () == 0)
-                {
-                  bounds = seq->length_;
-
-                  // Allocate the buffer using the virtual
-                  // _allocate_buffer method, hence the right
-                  // constructors are invoked and size for the array
-                  // is OK.  The sequence will release it, since its
-                  // release_ field is 1.
-                  seq->_allocate_buffer (bounds);
-
-                  value = (char *) seq->buffer_;
-
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->read_short (*(CORBA::Short *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_long (*(CORBA::Long *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_longlong (*(CORBA::LongLong *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_boolean:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_boolean (*(CORBA::Boolean *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_char (*(CORBA::Char *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_longdouble:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_longdouble (*(CORBA::LongDouble *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_wchar:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_wchar (*(CORBA::WChar *) value);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_enum:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding =
-                            stream->read_long (*(CORBA::Long *) value);
-                          value += size;
-
-                        }
-                      // CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                      // handle all aggregate types here
-                    case CORBA::tk_objref:
-                    case CORBA::tk_string:
-                    case CORBA::tk_wstring:
-                    case CORBA::tk_any:
-                    case CORBA::tk_TypeCode:
-                    case CORBA::tk_Principal:
-                    case CORBA::tk_struct:
-                    case CORBA::tk_union:
-                    case CORBA::tk_sequence:
-                    case CORBA::tk_array:
-                    case CORBA::tk_alias:
-                    case CORBA::tk_except:
-                      // For those aggregate types whose size is
-                      // constant, we compute it only once.
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = stream->decode (tc2, value, 0, env);
-                          value += size;
-                        }
-                      // CORBA::release (tc2);
-                      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    default:
-                      break;
-                    } // end of switch
-                } // no exception computing size
-            } // no exception computing content type
-        } // length is > 0
-      else
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::decode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// Decode array.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  // Size of element.
-  size_t  size;
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (env);
-  if (env.exception () == 0)
-    {
-
-      // get element typecode
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              switch (tc2->kind_)
-                {
-                case CORBA::tk_null:
-                case CORBA::tk_void:
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                case CORBA::tk_short:
-                case CORBA::tk_ushort:
-
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_short (*(CORBA::Short *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_long:
-                case CORBA::tk_ulong:
-                case CORBA::tk_float:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_double:
-                case CORBA::tk_longlong:
-                case CORBA::tk_ulonglong:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_longlong (*(CORBA::LongLong *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_boolean:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_boolean (*(CORBA::Boolean *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_char:
-                case CORBA::tk_octet:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_char (*(CORBA::Char *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_longdouble:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_longdouble (*(CORBA::LongDouble *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_wchar:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_wchar (*(CORBA::WChar *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_enum:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding =
-                        stream->read_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                  // handle all aggregate types here
-                case CORBA::tk_any:
-                case CORBA::tk_TypeCode:
-                case CORBA::tk_Principal:
-                case CORBA::tk_objref:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_string:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                case CORBA::tk_wstring:
-                  // For those aggregate types whose size is constant, we
-                  // compute it only once
-                  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      retval = stream->decode (tc2, value, 0, env);
-                      value += size;
-                    }
-                  // CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                default:
-                  break;
-                } // end of switch
-            } // no exception computing size
-        } // no exception computing content type
-    } // no exception computing bounds
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::decode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// Decode alias.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_ptr tc2;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-
-  // Status of decode operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (env);
-  if (env.exception () == 0)
-    {
-    // Switch on the data type and handle the cases for primitives
-    // here for efficiency rather than calling.
-    switch (tc2->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_decoding =
-          stream->read_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_decoding =
-          stream->read_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_decoding =
-          stream->read_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_decoding =
-          stream->read_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_decoding =
-          stream->read_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_decoding =
-          stream->read_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_decoding =
-          stream->read_wchar (*(CORBA::WChar *) value);
-        break;
-      case CORBA::tk_string:
-      case CORBA::tk_wstring:
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-        retval = stream->decode (tc2, data, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-  //  tc2->Release ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Alias::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  data = (char *) data + sizeof (CORBA::Exception);
-  // @@ (ASG) The reason this is done is because we want to skip the size
-  // of the the base class and its private data members (type_ and
-  // refcount_). After skipping these data members, we will have the data
-  // members of the derived class which must be encoded.
-
-  // Number of fields in the struct.
-  int member_count = tc->member_count (env);
-  if (env.exception () == 0)
-    {
-      for (int i = 0; i < member_count
-             && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-             && continue_decoding == CORBA::B_TRUE; i++)
-        {
-          param = tc->member_type (i, env);
-          if (env.exception () == 0)
-            {
-              size = param->size (env);
-              if (env.exception () == 0)
-                {
-                  alignment = param->alignment (env);
-                  if (env.exception () == 0)
-                    {
-                      data = ptr_align_binary (data, alignment);
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                          break;
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                          continue_decoding =
-                            stream->read_short (*(CORBA::Short *) data);
-                          break;
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                          continue_decoding =
-                            stream->read_long (*(CORBA::Long *) data);
-                          break;
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                          continue_decoding =
-                            stream->read_longlong (*(CORBA::LongLong *) data);
-                          break;
-                        case CORBA::tk_boolean:
-                          continue_decoding =
-                            stream->read_boolean (*(CORBA::Boolean *) data);
-                          break;
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                          continue_decoding =
-                            stream->read_char (*(CORBA::Char *) data);
-                          break;
-                        case CORBA::tk_longdouble:
-                          continue_decoding =
-                            stream->read_longdouble (*(CORBA::LongDouble *) data);
-                          break;
-                        case CORBA::tk_wchar:
-                          continue_decoding =
-                            stream->read_wchar (*(CORBA::WChar *) data);
-                          break;
-                        case CORBA::tk_any:
-                        case CORBA::tk_TypeCode:
-                        case CORBA::tk_Principal:
-                        case CORBA::tk_objref:
-                        case CORBA::tk_struct:
-                        case CORBA::tk_union:
-                        case CORBA::tk_string:
-                        case CORBA::tk_sequence:
-                        case CORBA::tk_array:
-                        case CORBA::tk_alias:
-                        case CORBA::tk_except:
-                        case CORBA::tk_wstring:
-                          retval = stream->decode (param, data, 0, env);
-                          break;
-                        default:
-                          break;
-                        }
-                      data = (char *) data + size;
-                    }
-                  else
-                    return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-              else
-                return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          else
-            return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-      return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Except detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
-                             const void *data,
-                             const void *,
-                             void *context,
-                             CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  TAO_InputCDR *stream = (TAO_InputCDR *) context;
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  CORBA::ULong len;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_decoding = stream->read_ulong (len);
-
-  ACE_NEW_RETURN (str,
-                  CORBA::WChar [(size_t) (len)],
-                  CORBA::TypeCode::TRAVERSE_CONTINUE);
-  *((CORBA::WChar **) data) = str;
-
-  if (len != 0)
-    while (continue_decoding != CORBA::B_FALSE && len--)
-      {
-        continue_decoding = stream->read_wchar (*str);
-        str++;
-      }
-
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp
deleted file mode 100644
index d03d71b6082..00000000000
--- a/TAO/tao/deep_copy.cpp
+++ /dev/null
@@ -1,1277 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    deep_copy.cpp
-//
-// = DESCRIPTION
-//   Code for deep_copy
-//   The original code had a single static deep_copy function that called
-//   traverse to interpret the data types. This version defines a static method
-//   "deep_copy" on each class and avoids calling traverse.
-//
-//   Helper routine for "Any" copy constructor ...
-//
-//   "Deep Copy" from source to dest.  Memory is always there to be
-//   copied to ... if this calls other deep_copy methods, it ensures that
-//   this remains true (only really an issue for sequences) .
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// Deep copy from "source" to "dest" ... this code "knows" a bit about
-// representations, verify it when porting to oddball platforms with
-// non-IEEE floating point values or atypical byte and word sizes.
-
-CORBA::TypeCode::traverse_status
-DEEP_COPY (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (param->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      *(CORBA::Short *) dest = *(CORBA::Short *) source;
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      *(CORBA::Long *) dest = *(CORBA::Long *) source;
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-      break;
-    case CORBA::tk_boolean:
-      *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      *(CORBA::Char *) dest = *(CORBA::Char *) source;
-      break;
-    case CORBA::tk_longdouble:
-      *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-      break;
-    case CORBA::tk_wchar:
-      *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-      break;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    } // end of switch
-  return retval;
-}
-
-// deep copy for primitives
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::deep_copy (CORBA::TypeCode_ptr  tc,
-                                  const void *source,
-                                  const void *dest,
-                                  CORBA::Environment &env)
-{
-  if (tc)
-    {
-      CORBA::TCKind mykind_ = tc->kind (env);
-
-      if (env.exception () == 0)
-        {
-          switch (mykind_)
-            {
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              *(CORBA::Octet *) dest = *(CORBA::Octet *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              *(CORBA::Short *) dest = *(CORBA::Short *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_wchar:
-              *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              *(CORBA::Long *) dest = *(CORBA::Long *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-            case CORBA::tk_double:
-              *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_longdouble:
-              *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_boolean:
-              *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            default:
-              env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-
-  env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE) );
-  dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// deep_copy for Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::deep_copy (CORBA::TypeCode_ptr  tc,
-                                  const void *source,
-                                  const void *dest,
-                                  CORBA::Environment &env)
-{
-  if (tc)
-    {
-      CORBA::Principal_ptr src =
-        *(CORBA::Principal_ptr *) source;
-
-      ACE_NEW_RETURN (*(CORBA::Principal_ptr *) dest,
-                      CORBA::Principal,
-                      CORBA::TypeCode::TRAVERSE_STOP);
-
-      CORBA::Principal_ptr dst = *(CORBA::Principal_ptr *) dest;
-
-      if (dst)
-        {
-          // Principals are just opaque IDs ... copy them
-          assert (src->id.length <= UINT_MAX);
-          dst->id.length = dst->id.maximum = src->id.length;
-
-          if (dst->id.length > 0)
-            {
-              ACE_NEW_RETURN (dst->id.buffer,
-                              CORBA::Octet [(u_int) dst->id.length],
-                              CORBA::TypeCode::TRAVERSE_STOP);
-              if (dst->id.buffer)
-                {
-                  ACE_OS::memcpy (dst->id.buffer,
-				  src->id.buffer,
-				  (size_t) dst->id.length);
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                }
-              else
-                {
-                  env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE) );
-                  dmsg ("TAO_Marshal_Principal::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else
-            {
-              dst->id.buffer = 0;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE) );
-          dmsg ("TAO_Marshal_Principal::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE) );
-      dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Deep_copy structs.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::deep_copy (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &env)
-{
-  if (tc)
-    {
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-
-      if (env.exception () == 0)
-        {
-	  CORBA::TypeCode::traverse_status retval =
-	    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-          for (int i = 0;
-               i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-	       i++)
-            {
-              // Get the typecode for the ith field.
-	      CORBA::TypeCode_ptr param =
-                tc->member_type (i, env);
-              if (env.exception () == 0)
-                {
-                  // Get the size of the field.
-                  CORBA::Long size = param->size (env);
-                  if (env.exception () == 0)
-                    {
-                      // get the alignment of the field
-#if defined (TAO_NEEDS_UNUSED_VARIABLES)
-                      CORBA::Long alignment = param->alignment (env);
-#endif /* TAO_NEEDS_UNUSED_VARIABLES */
-                      if (env.exception () == 0)
-                        {
-                          switch (param->kind_)
-                            {
-                            case CORBA::tk_null:
-                            case CORBA::tk_void:
-                              break;
-                            case CORBA::tk_short:
-                            case CORBA::tk_ushort:
-                              *(CORBA::Short *) dest =
-                                *(CORBA::Short *) source;
-                              break;
-                            case CORBA::tk_long:
-                            case CORBA::tk_ulong:
-                            case CORBA::tk_float:
-                            case CORBA::tk_enum:
-                              *(CORBA::Long *) dest =
-                                *(CORBA::Long *) source;
-                              break;
-                            case CORBA::tk_double:
-                            case CORBA::tk_longlong:
-                            case CORBA::tk_ulonglong:
-                              *(CORBA::LongLong *) dest =
-                                *(CORBA::LongLong *) source;
-                              break;
-                            case CORBA::tk_boolean:
-                              *(CORBA::Boolean *) dest =
-                                *(CORBA::Boolean *) source;
-                              break;
-                            case CORBA::tk_char:
-                            case CORBA::tk_octet:
-                              *(CORBA::Char *) dest =
-                                *(CORBA::Char *) source;
-                              break;
-                            case CORBA::tk_longdouble:
-                              *(CORBA::LongDouble *) dest =
-                                *(CORBA::LongDouble *) source;
-                              break;
-                            case CORBA::tk_wchar:
-                              *(CORBA::WChar *) dest =
-                                *(CORBA::WChar *) source;
-                              break;
-                            case CORBA::tk_any:
-                              retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_TypeCode:
-                              retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_Principal:
-                              retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_objref:
-                              retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_struct:
-                              retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_union:
-                              retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_string:
-                              retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_sequence:
-                              retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_array:
-                              retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_alias:
-                              retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_except:
-                              retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_wstring:
-                              retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-                              break;
-                            default:
-                              retval = CORBA::TypeCode::TRAVERSE_STOP;
-                            } // end of switch
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      else  // exception computing alignment
-                        {
-                          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                          return CORBA::TypeCode::TRAVERSE_STOP;
-                        }
-                    }
-                  else  // exception computing size
-                    {
-                      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else  // exception computing typecode
-                {
-                  dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } // end of loop
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting member count
-        {
-          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Deep_copy for union.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::deep_copy (CORBA::TypeCode_ptr tc,
-                              const void *data,
-                              const void *data2,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (env);
-
-  // Get the discriminator type.
-  if (env.exception () == 0)
-    {
-      // deep_copy the discriminator value.
-      CORBA::TypeCode::traverse_status retval =
-	DEEP_COPY (discrim_tc, data, data2, env);
-
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-	  CORBA::ULong discrim_size_with_pad =
-	    tc->TAO_discrim_pad_size (env);
-
-          if (env.exception () == 0)
-            {
-	      CORBA::TypeCode_ptr default_tc = 0;
-
-              // Save the pointer to the discriminator.
-	      const void *discrim_val = data;
-
-	      // value
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-
-              // Now get ready to marshal the actual union value.
-
-              CORBA::Long default_index = tc->default_index (env);
-              if (env.exception () == 0)
-                {
-                  int member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // check which label value matches with the
-                      // discriminator value. Accordingly, marshal the
-                      // corresponding member_type. If none match,
-                      // check if default exists and marshal
-                      // accordingly. Otherwise it is an error.
-                      for (int i = 0; member_count-- != 0; i++)
-			{
-			  CORBA::Any_ptr member_label =
-                            tc->member_label (i, env);
-			  if (env.exception () == 0)
-			    {
-			      CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-			      // do the matching
-			      switch (member_label->type ()->kind (env))
-				{
-				case CORBA::tk_short:
-				case CORBA::tk_ushort:
-				  if (*(CORBA::Short *) member_label->value () ==
-				      *(CORBA::Short *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_long:
-				case CORBA::tk_ulong:
-				case CORBA::tk_enum:
-				  if (*(CORBA::ULong *) member_label->value () ==
-				      *(CORBA::ULong *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_char:
-				  if (*(CORBA::Char *) member_label->value () ==
-				      *(CORBA::Char *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_wchar:
-				  if (*(CORBA::WChar *) member_label->value () ==
-				      *(CORBA::WChar *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_boolean:
-				  if (*(CORBA::Boolean *) member_label->value () ==
-				      *(CORBA::Boolean *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				default:
-				  env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_NO));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}// end of switch
-
-			      // get the member typecode
-			      CORBA::TypeCode_ptr member_tc = tc->member_type (i, env);
-			      if (env.exception () == 0)
-				{
-				  if (default_index >= 0 && default_index-- == 0)
-				    // have we reached the default label?, if so,
-				    // save a handle to the typecode for the default
-				    default_tc = member_tc;
-				  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return DEEP_COPY (member_tc, data,
-						      data2, env);
-				}
-			      else
-				{
-				  env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}
-			    }
-			  else
-			    {
-			      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-			      return CORBA::TypeCode::TRAVERSE_STOP;
-			    }
-			} // end of while
-
-		      // we are here only if there was no match
-		      if (default_tc)
-			return DEEP_COPY (default_tc, data, data2, env);
-		      else
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		    }
-                  else
-                    {
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else
-                {
-                  env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Deep_copy for Sequence.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::deep_copy (CORBA::TypeCode_ptr  tc,
-                                 const void *source,
-                                 const void *dest,
-                                 CORBA::Environment &env)
-{
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  // Size of element.
-  size_t size;
-  CORBA::ULong bounds;
-  char *value1;
-  char *value2;
-  CORBA::OctetSeq *src;
-  CORBA::OctetSeq *dst;
-
-  // Rely on binary format of sequences -- all are the same except for
-  // the type pointed to by "buffer."
-
-  if (tc)
-    {
-      src = (CORBA::OctetSeq *) source;
-      dst = (CORBA::OctetSeq *) dest;
-
-      assert (src->length <= UINT_MAX);
-      dst->length = dst->maximum = src->length;
-
-      // Get element typecode.
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          // Get the size of the element.
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              // Compute the length of the sequence.
-              bounds = src->length;
-
-              // Allocate a buffer to hold the sequence.
-              dst->buffer = new CORBA::Octet [size *(size_t) src->maximum];
-              if (dst->buffer)
-                {
-                  value1 = (char *) src->buffer;
-                  value2 = (char *) dst->buffer;
-
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      // CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                    case CORBA::tk_boolean:
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                    case CORBA::tk_longdouble:
-                    case CORBA::tk_wchar:
-                    case CORBA::tk_enum:
-                      // just do a memcpy rather than copying each element
-                      ACE_OS::memcpy (value2, value1, size*bounds);
-                      //                      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_TypeCode:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_Principal:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_objref:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_struct:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_union:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_string:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      retval =
-                        TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-                      break;
-                    case CORBA::tk_sequence:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_array:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_alias:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_except:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_wstring:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    default:
-                      retval = CORBA::TypeCode::TRAVERSE_STOP;
-                      break;
-                    } // end of switch
-                  // CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  else
-                    {
-                      // error exit
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_NO));
-                      dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else
-                {
-                  // error exit
-                  // CORBA::release (tc2);
-                  env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE));
-                  dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else // exception computing size
-            {
-              // CORBA::release (tc2);
-              dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception computing content type
-        {
-          dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// Deep_copy for Array.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::deep_copy (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  // Return status.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  // Typecode of the element.
-  CORBA::TypeCode_ptr tc2;
-
-  // Size of element.
-  size_t size;
-  CORBA::ULong  bounds;
-
-  // Used only to access the marshal_object factory.
-  CDR stream;
-
-  // Rely on binary format of sequences -- all are the same except for
-  // the type pointed to by "buffer".
-
-  if (tc)
-    {
-      bounds = tc->length (env);
-      if (env.exception () == 0)
-        {
-          // get element typecode
-          tc2 = tc->content_type (env);
-          if (env.exception () == 0)
-            {
-              // Get the size of the element type.
-              size = tc2->size (env);
-              if (env.exception () == 0)
-                {
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      // CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                    case CORBA::tk_boolean:
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                    case CORBA::tk_longdouble:
-                    case CORBA::tk_wchar:
-                    case CORBA::tk_enum:
-                      // Just do a memcpy rather than copying each
-                      // element.
-                      ACE_OS::memcpy ((char *) dest,
-                                      (char *) source,
-                                      size*bounds);
-                      // CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_TypeCode:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_Principal:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_objref:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_struct:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_union:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_string:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      retval =
-                        TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-                      break;
-                    case CORBA::tk_sequence:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_array:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_alias:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_except:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_wstring:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval =
-                            TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    default:
-                      retval = CORBA::TypeCode::TRAVERSE_STOP;
-                      break;
-                    } // end of switch
-                  // CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  else
-                    {
-                      // error exit
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_NO));
-                      dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                } // no exception computing size
-              else
-		// CORBA::release (tc2);
-		return CORBA::TypeCode::TRAVERSE_STOP;
-            } // no exception computing content type
-          else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-        } // bounds are fine
-      else
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::deep_copy (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_ptr tc2;
-  // Status of deep_copy operation.
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  if (tc)
-    {
-      // Get element type.
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          // Switch on the data type and handle the cases for
-          // primitives here for efficiency.
-          switch (tc2->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              *(CORBA::Short *) dest = *(CORBA::Short *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              *(CORBA::Long *) dest = *(CORBA::Long *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-              *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_boolean:
-              *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              *(CORBA::Char *) dest = *(CORBA::Char *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_longdouble:
-              *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_wchar:
-              *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-              // CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_any:
-              retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_TypeCode:
-              retval = TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_Principal:
-              retval = TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_objref:
-              retval = TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_struct:
-              retval = TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_union:
-              retval = TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_string:
-              retval = TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_sequence:
-              retval = TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_array:
-              retval = TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_alias:
-              retval = TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_except:
-              retval = TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_wstring:
-              retval = TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-              break;
-            default:
-              // anything else is an error
-              retval = CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          // CORBA::release (tc2);
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Alias::decode detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting content_type
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::deep_copy (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size;
-
-  if (tc)
-    {
-      // Exceptions in memory have a "hidden" typecode up front, used
-      // to ensure that memory is appropriately freed and to hold the
-      // exception ID.  We just copy that typecode.
-
-      *(CORBA::TypeCode_ptr *) dest = *(CORBA::TypeCode_ptr *) source;
-      (void) (*(CORBA::TypeCode_ptr *) dest)->AddRef ();
-
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-      if (env.exception () == 0)
-        {
-          for (int i = 0;
-	       i < member_count
-		 && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-	       i++)
-            {
-              // get the typecode for the ith field
-              param = tc->member_type (i, env);
-              if (env.exception () == 0)
-                {
-                  // get the size of the field
-                  size = param->size (env);
-                  if (env.exception () == 0)
-                    {
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                          break;
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                          *(CORBA::Short *) dest = *(CORBA::Short *) source;
-                          break;
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                          *(CORBA::Long *) dest = *(CORBA::Long *) source;
-                          break;
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                          *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-                          break;
-                        case CORBA::tk_boolean:
-                          *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-                          break;
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                          *(CORBA::Char *) dest = *(CORBA::Char *) source;
-                          break;
-                        case CORBA::tk_longdouble:
-                          *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-                          break;
-                        case CORBA::tk_wchar:
-                          *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-                          break;
-                        case CORBA::tk_any:
-                          retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_TypeCode:
-                          retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_Principal:
-                          retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_objref:
-                          retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_struct:
-                          retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_union:
-                          retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_string:
-                          retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_sequence:
-                          retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_array:
-                          retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_alias:
-                          retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_except:
-                          retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_wstring:
-                          retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-                          break;
-                        default:
-                          retval = CORBA::TypeCode::TRAVERSE_STOP;
-                        } // end of switch
-                      source = (char *) source + size;
-                      dest = (char *) dest + size;
-                    }
-                  else  // exception computing size
-                    {
-                      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else  // exception computing typecode
-                {
-                  dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } // end of loop
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting member count
-        {
-          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
deleted file mode 100644
index 368b80da8d4..00000000000
--- a/TAO/tao/deep_free.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    deep_free.cpp
-//
-// = DESCRIPTION
-//   Code for deep_free
-//   The original code had a single static deep_free function that called
-//   traverse to interpret the data types. This version defines a static method
-//   "deep_free" on each class and avoids calling traverse.
-//
-//   Helper routine for "Any" destructor.
-//
-//   This frees all the memory pointed to by any given value held inside
-//   of an "Any".  For most data types it does nothing, since most data
-//   types don't hold any memory.  For a few, it calls other deep_free methods
-//   to free the memory
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-	   const void *source,
-	   const void *dest,
-	   CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (param->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-      break;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    } // end of switch
-  return retval;
-}
-
-// deep copy for primitives
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
-				  const void *,
-				  const void *,
-				  CORBA::Environment &env)
-{
-  CORBA::TCKind my_kind;
-
-  if (tc)
-    {
-      my_kind = tc->kind (env);
-
-      if (env.exception () == 0)
-	{
-	  switch (my_kind)
-	    {
-	    case CORBA::tk_null:
-	    case CORBA::tk_void:
-	    case CORBA::tk_char:
-	    case CORBA::tk_octet:
-	    case CORBA::tk_short:
-	    case CORBA::tk_ushort:
-	    case CORBA::tk_wchar:
-	    case CORBA::tk_long:
-	    case CORBA::tk_ulong:
-	    case CORBA::tk_float:
-	    case CORBA::tk_enum:
-	    case CORBA::tk_longlong:
-	    case CORBA::tk_ulonglong:
-	    case CORBA::tk_double:
-	    case CORBA::tk_longdouble:
-	    case CORBA::tk_boolean:
-	      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	    default:
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-	      dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	}
-      else
-	{
-	  dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE) );
-      dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size;
-
-  if (tc)
-    {
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-      if (env.exception () == 0)
-        {
-          for (int i = 0; i < member_count && retval ==
-                 CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
-            {
-              // get the typecode for the ith field
-              param = tc->member_type (i, env);
-              if (env.exception () == 0)
-                {
-                  // get the size of the field
-                  size = param->size (env);
-                  if (env.exception () == 0)
-                    {
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                        case CORBA::tk_boolean:
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                        case CORBA::tk_longdouble:
-                        case CORBA::tk_wchar:
-                          break;
-                        case CORBA::tk_any:
-                          retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_TypeCode:
-                          retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_Principal:
-                          retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_objref:
-                          retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_struct:
-                          retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_union:
-                          retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_string:
-                          //retval = TAO_Marshal_String::deep_free (param, &source, dest, env);
-                          break;
-                        case CORBA::tk_sequence:
-                          retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_array:
-                          retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_alias:
-                          retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_except:
-                          retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_wstring:
-                          retval = TAO_Marshal_WString::deep_free (param, &source, dest, env);
-                          break;
-                        default:
-                          retval = CORBA::TypeCode::TRAVERSE_STOP;
-                        } // end of switch
-                      source = (char *)source + size;
-                    }
-                  else  // exception computing size
-                    {
-                      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else  // exception computing typecode
-                {
-                  dmsg ("TAO_Marshal_Struct::deep_free detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } // end of loop
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Struct::deep_free detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting member count
-        {
-          dmsg ("TAO_Marshal_Struct::deep_free detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free for union
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
-			      const void *data,
-			      const void *data2,
-			      CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULong discrim_size_with_pad;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-  discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-  if (env.exception () == 0)
-    {
-      // deep_free the discriminator value
-      retval = DEEP_FREE (discrim_tc, data, data2, env);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	{
-	  discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-	  if (env.exception () == 0)
-	    {
-	      discrim_val = data; // save the pointer to the discriminator
-				  // value
-	      // move the pointer to point to the actual value
-	      data = (char *)data + discrim_size_with_pad;
-	      data2 = (char *)data2 + discrim_size_with_pad;
-	      // now get ready to marshal the actual union value
-	      default_index = tc->default_index (env);
-	      if (env.exception () == 0)
-		{
-		  member_count = tc->member_count (env);
-		  if (env.exception () == 0)
-		    {
-		      // check which label value matches with the discriminator
-		      // value. Accordingly, marshal the corresponding
-		      // member_type. If none match, check if default exists
-		      // and marshal accordingly. Otherwise it is an error.
-		      for (i = 0; member_count-- != 0; i++)
-			{
-			  member_label = tc->member_label (i, env);
-			  if (env.exception () == 0)
-			    {
-			      // do the matching
-			      switch (member_label->type ()->kind (env))
-				{
-				case CORBA::tk_short:
-				case CORBA::tk_ushort:
-				  if (*(CORBA::Short *)member_label->value () ==
-				      *(CORBA::Short *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_long:
-				case CORBA::tk_ulong:
-				case CORBA::tk_enum:
-				  if (*(CORBA::ULong *)member_label->value () ==
-				      *(CORBA::ULong *)discrim_val)
-				      discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_char:
-				  if (*(CORBA::Char *)member_label->value () ==
-				      *(CORBA::Char *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_wchar:
-				  if (*(CORBA::WChar *)member_label->value () ==
-				      *(CORBA::WChar *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_boolean:
-				  if (*(CORBA::Boolean *)member_label->value () ==
-				      *(CORBA::Boolean *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				default:
-				  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}// end of switch
-
-			      // get the member typecode
-			      member_tc = tc->member_type (i, env);
-			      if (env.exception () == 0)
-				{
-				  if (default_index >= 0 && default_index-- == 0)
-				    {
-				      // have we reached the default label?, if so,
-				      // save a handle to the typecode for the default
-				      default_tc = member_tc;
-				    }
-				  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return DEEP_FREE (member_tc, data,
-						      data2, env);
-				}
-			      else
-				{
-				  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}
-
-			    }
-			  else
-			    {
-			      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-			      return CORBA::TypeCode::TRAVERSE_STOP;
-			    }
-			} // end of while
-		      // we are here only if there was no match
-		      if (default_tc)
-			return DEEP_FREE (default_tc, data, data2, env);
-		      else
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		    }
-		  else
-		    {
-		      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-		      return CORBA::TypeCode::TRAVERSE_STOP;
-		    }
-		}
-	      else
-		{
-		  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-		  return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	    }
-	  else
-	    {
-	      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	}
-      else
-	{
-	  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free for Sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr  tc,
-                                 const void *source,
-                                 const void *,
-                                 CORBA::Environment &)
-{
-  // TAO implements sequences using inheritance from a base
-  // class. That class allocate  and deallocates the buffer, using
-  // virtual methods.
-
-  if (tc)
-    {
-      TAO_Base_Sequence *src =
-	ACE_reinterpret_cast(TAO_Base_Sequence*,ACE_const_cast(void*,source));
-
-      src->_deallocate_buffer ();
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// deep_free for Array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr	tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (tc)
-    {
-      bounds = tc->length (env);
-      if (env.exception () == 0)
-        {
-          // get element typecode
-          tc2 = tc->content_type (env);
-          if (env.exception () == 0)
-            {
-              // get the size of the element type
-              size = tc2->size (env);
-              if (env.exception () == 0)
-                {
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                    case CORBA::tk_boolean:
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                    case CORBA::tk_longdouble:
-                    case CORBA::tk_wchar:
-                    case CORBA::tk_enum:
-                      //		      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_TypeCode:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_Principal:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_objref:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_struct:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_union:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_string:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_sequence:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_array:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_alias:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_except:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    case CORBA::tk_wstring:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
-                          source = (char *)source + size;
-                        }
-                      break;
-                    default:
-                      retval = CORBA::TypeCode::TRAVERSE_STOP;
-                      break;
-                    } // end of switch
-                  //		  CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  else
-                    {
-                      // error exit
-                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-                      dmsg ("marshaling TAO_Marshal_Sequence::deep_free detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                } // no exception computing size
-              else
-                //		  CORBA::release (tc2);
-                return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          else // exception computing content type
-            return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-      else // exception getting bounds
-        return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr	tc2;  // typecode of the aliased type
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  if (tc)
-    {
-      // get element type
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          // switch on the data type and handle the cases for primitives here for
-          // efficiency
-          switch (tc2->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-            case CORBA::tk_boolean:
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-            case CORBA::tk_longdouble:
-            case CORBA::tk_wchar:
-              //	      CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_any:
-              retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_TypeCode:
-              retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_Principal:
-              retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_objref:
-              retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_struct:
-              retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_union:
-              retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_string:
-              retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_sequence:
-              retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_array:
-              retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_alias:
-              retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_except:
-              retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
-              break;
-            case CORBA::tk_wstring:
-              retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
-              break;
-            default:
-              // anything else is an error
-              retval = CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          //	  CORBA::release (tc2);
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-            return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Alias::decode detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting content_type
-        return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
-                               const void *,
-                               const void *,
-                               CORBA::Environment &env)
-{
-#if 0
-  // temporarily commented out to make compiler happy
-  CORBA::Long i,
-    member_count;      // number of fields in the struct
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-#endif /* 0 */
-
-  if (tc)
-    // XXX: Exceptions are currently leaked because of bugs lurking
-    // in this area.  Keep in mind that there are two things to
-    // free: (a) the typecode in the exception base class; (b) any
-    // pointers held by a user-defined exception, such as an objref
-    // or string.
-    //
-    // Since this code does nothing, it should leak BOTH of those
-    // kinds of memory.  Since it's not supposed to be called except
-    // when the exception really is being freed, it should only be
-    // called when the reference count in the exception base class
-    // is zero.
-    //
-    // It's not clear which of those assertions actually hold.
-    //
-    // The code SHOULD be just like the traverse () call for a
-    // structure, with (a) a precondition that the reference count
-    // is zero, (b) an assertion that the typecode in the exception
-    // and "tc" are equivalent, (c) releasing that typecode found
-    // within the exception.
-    //
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/default.bld b/TAO/tao/default.bld
deleted file mode 100644
index 46fd517391f..00000000000
--- a/TAO/tao/default.bld
+++ /dev/null
@@ -1,24 +0,0 @@
-#!build
-default:
-	nobuild
-	:cx_template_option=noautomatic
-	:optimize=standard
-	:optimize=memory
-	:optimize=loop
-	:debuglevel=multi
-	:cx_template=never
-	:defines=TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-tao.bld
-	library
-	:cx_e_option=msgnumbers
-	:dependency=nodepend
-	:object_dir=./.obj
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=/home/ace/ACE_wrappers.latest
-	:sourcedirs=..
-	:sourcedirs=./compat
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
deleted file mode 100644
index da1e817b405..00000000000
--- a/TAO/tao/default_client.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "tao/default_client.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-int
-TAO_Default_Client_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Client_Strategy_Factory::parse_args (int /* argc */, char ** /* argv */)
-{
-  // no args to parse at this time
-  return 0;
-}
-
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
deleted file mode 100644
index fdb4b783677..00000000000
--- a/TAO/tao/default_client.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//     default_client.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_DEFAULT_CLIENT_H)
-#  define TAO_DEFAULT_CLIENT_H
-
-#include "tao/corba.h"
-
-class TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
-{
-  // = TITLE
-  //   This is the "default" client strategy factor for TAO.  It
-  //   includes strategies that are configured through command-line
-  //   options so that everything operates as if there were no
-  //   dynamically-linkable strategies.
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Client_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
-  // Destructor.
-  
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  int parse_args(int argc, char* argv[]);
-  // Parse svc.conf arguments
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_client.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
deleted file mode 100644
index 303650850d1..00000000000
--- a/TAO/tao/default_server.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-// $Id$
-
-#include "tao/default_server.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
-  : thread_flags_ (0),
-    object_table_size_ (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE),
-    object_lookup_strategy_ (TAO_DYNAMIC_HASH),
-    poa_lock_type_ (TAO_THREAD_LOCK),
-    poa_mgr_lock_type_ (TAO_THREAD_LOCK),
-    concurrency_strategy_ (0)
-{
-}
-
-TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
-{
-  // Perform appropriate cleanup.
-}
-
-TAO_Default_Server_Strategy_Factory::CONCURRENCY_STRATEGY *
-TAO_Default_Server_Strategy_Factory::concurrency_strategy (void)
-{
-  return this->concurrency_strategy_;
-}
-
-ACE_Lock *
-TAO_Default_Server_Strategy_Factory::create_poa_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  switch (this->poa_lock_type_)
-    {
-    case TAO_THREAD_LOCK:
-#if defined (ACE_HAS_THREADS)
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> (),
-                      0);
-      break;
-#endif /* ACE_HAS_THREADS */
-    default:
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
-                      0);
-      break;
-    }
-
-  return the_lock;// Just to make sure we return something
-}
-
-ACE_Lock *
-TAO_Default_Server_Strategy_Factory::create_poa_mgr_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  switch (this->poa_mgr_lock_type_)
-    {
-    case TAO_THREAD_LOCK:
-#if defined (ACE_HAS_THREADS)
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Thread_Mutex> (),
-                      0);
-      break;
-#endif /* ACE_HAS_THREADS */
-    default:
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
-                      0);
-      break;
-    }
-
-  // Just to make sure we return something.
-  return the_lock;
-}
-
-ACE_Lock *
-TAO_Default_Server_Strategy_Factory::create_servant_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-#if defined (ACE_HAS_THREADS)
-  if (this->concurrency_strategy_ != &this->reactive_strategy_ &&
-      this->concurrency_strategy_ != 0)
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Thread_Mutex> (),
-                      0);
-  else
-#endif /* ACE_HAS_THREADS */
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
-                      0);
-
-  return the_lock;
-}
-
-TAO_Object_Table_Impl *
-TAO_Default_Server_Strategy_Factory::create_object_table (void)
-{
-  // Create the appropriate-sized object table based on passed
-  // arguments.
-  TAO_Object_Table_Impl *objtable = 0;
-
-  switch (this->object_lookup_strategy_)
-    {
-    case TAO_LINEAR:
-      ACE_NEW_RETURN (objtable,
-                      TAO_Linear_ObjTable (this->object_table_size_),
-                      0);
-      break;
-      // Don't do this one right now until we determine how to deal
-      // with its reliance on a global singleton.
-    case TAO_USER_DEFINED:
-      // it is assumed that the user would have used the hooks to
-      // supply a user-defined instance of the object table
-      //
-      // Note that the usage below doesn't really fit very well now.
-      // We need for the userdef stuff to provide a creation hook--IF
-      // we decide to keep the whole demultiplexing strategy creation
-      // the way it is.  IMHO, the way that userdef stuff should be
-      // done is to create the User_Server_Strategy_Factory and just
-      // link it in.  The default server would only encompass the
-      // strategies that are "shipped", so to speak. --cjc
-      objtable = TAO_ORB_Core_instance()->oa_params()->userdef_lookup_strategy ();
-      break;
-    case TAO_ACTIVE_DEMUX:
-      ACE_NEW_RETURN (objtable,
-                      TAO_Active_Demux_ObjTable (this->object_table_size_),
-                      0);
-      break;
-    case TAO_DYNAMIC_HASH:
-    case TAO_NONE:
-    default:
-      ACE_NEW_RETURN (objtable,
-                      TAO_Dynamic_Hash_ObjTable (this->object_table_size_),
-                      0);
-      break;
-    }
-
-  return objtable;
-}
-
-// Evil macros b/c I'm lazy!
-#define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) else if (ACE_OS::strcmp (flag, #sym) == 0) ACE_SET_BITS (this->thread_flags_, sym)
-#define TAO_ENDCHECK
-
-void
-TAO_Default_Server_Strategy_Factory::tokenize (char *flag_string)
-{
-  char *lasts = 0;
-
-  for (char *flag = ACE_OS::strtok_r (flag_string, "|", &lasts);
-       flag != 0;
-       flag = ACE_OS::strtok_r (0, "|", &lasts))
-    {
-      TAO_BEGINCHECK;
-      TAO_CHECKANDSET (THR_DETACHED);
-      TAO_CHECKANDSET (THR_BOUND);
-      TAO_CHECKANDSET (THR_NEW_LWP);
-      TAO_CHECKANDSET (THR_SUSPENDED);
-#if !defined (ACE_WIN32)
-      TAO_CHECKANDSET (THR_DAEMON);
-#endif /* ACE_WIN32 */
-      TAO_ENDCHECK;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Server_Strategy_Factory::open (void)
-{
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-
-  if (reactive_strategy_.open (orb_core->reactor ()) == 0
-      && threaded_strategy_.open (orb_core->thr_mgr (),
-                                  this->thread_flags_) == 0)
-    return 0;
-  else
-    return -1;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-
-  int curarg;
-
-  for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    if (ACE_OS::strcmp (argv[curarg], "-ORBconcurrency") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "reactive") == 0)
-              this->concurrency_strategy_ = &reactive_strategy_;
-            else if (ACE_OS::strcasecmp (name, "thread-per-connection") == 0)
-              this->concurrency_strategy_ = &threaded_strategy_;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          this->object_table_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->object_lookup_strategy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->object_lookup_strategy_ = TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name, "active") == 0)
-              this->object_lookup_strategy_ = TAO_ACTIVE_DEMUX;
-            else if (ACE_OS::strcasecmp (name, "user") == 0)
-              this->object_lookup_strategy_ = TAO_USER_DEFINED;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoalock") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
-              this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
-              this->poa_lock_type_ = TAO_NULL_LOCK;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoamgrlock") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
-              this->poa_mgr_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
-              this->poa_mgr_lock_type_ = TAO_NULL_LOCK;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBthreadflags") == 0)
-      {
-        curarg++;
-
-        if (curarg < argc)
-          this->tokenize (argv[curarg]);
-      }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Reactive_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Reactive_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Thread_Strategy<TAO_Server_Connection_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Reactive_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Reactive_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Thread_Strategy<TAO_Server_Connection_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
deleted file mode 100644
index 4f868b5b06c..00000000000
--- a/TAO/tao/default_server.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     default_server.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_DEFAULT_SERVER_FACTORY_H)
-#  define TAO_DEFAULT_SERVER_FACTORY_H
-
-#include "tao/corba.h"
-#include "tao/ORB_Strategies_T.h"
-
-class TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory
-{
-  // = TITLE
-  //   This is the default strategy factory for CORBA servers.  It
-  //   allows developers to choose strategies via argument flags.
-  //   This design gives substantial freedom for experimentation.
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
-
-  virtual int open (void);
-  // Call <open> for our strategies.
-
-  // = Server-side ORB Strategy Factory Methods.
-  virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
-
-  virtual TAO_Object_Table_Impl *create_object_table (void);
-  // Factory method for object tables.
-
-  virtual ACE_Lock *create_poa_lock (void);
-  // Creates and returns a lock for POA based on the setting for
-  // <-ORBpoalock>.  A setting of <thread> returns an
-  // <ACE_Lock_Adapter\<ACE_Thread_Mutex\>>; a setting of <null>
-  // returns an <ACE_Lock_Adapter\<ACE_NULL_Mutex\>>.
-
-  virtual ACE_Lock *create_poa_mgr_lock (void);
-  // Creates and returns a lock for a POA Manager based on the setting
-  // for <-ORBpoamgrlock>.  A setting of <thread> returns an
-  // <ACE_Lock_Adapter\<ACE_Thread_Mutex\>>; a setting of <null>
-  // returns an <ACE_Lock_Adapter\<ACE_NULL_Mutex\>>.
-
-  virtual ACE_Lock *create_servant_lock (void);
-  // Creates and returns a lock for servants based on the setting of
-  // POA, and concurrency strategy as follows:
-  // 1. If concurrency policy is reactive and POA is TSS
-  //    then return ACE_Null_Mutex via ACE_Lock_Adapter.
-  //
-  // 2. If concurrency policy is non-reactive then
-  //    return ACE_Thread_Mutex ...
-  //
-  // 3. If the POA is global then, return
-  //    ACE_Null_Mutex iff ORB_init count == 1,
-  //    else if ORB_init count > 1 return
-  //    ACE_Thread_Mutex.
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char *argv[]);
-  // Initialize the ORB when it's linked dynamically.
-
-  int parse_args (int argc, char *argv[]);
-  // Arguments are in the form of -ORBxxx.  Valid arguments are:
-  // <-ORBconcurrency> <{which}>
-  //   where <{which}> is one of <reactive> or <thread-per-connection>.
-  // <-ORBtablesize> <{num}>
-  //   to set the table size
-  // <-ORBdemuxstrategy> <{which}>
-  //   where <{which}> is one of <dynamic>, <linear>, or <active>
-  // <-ORBpoalock> <{which}>
-  //   where <{which}> is one of <thread> or <null> (default <thread>)
-  // <-ORBpoamgrlock> <{which}>
-  //   where <{which}> is one of <thread> or <null> (default <thread>)
-
-private:
-  void tokenize (char *flag_string);
-
-  u_long thread_flags_;
-  // Default thread flags passed to thr_create().
-
-  u_long object_table_size_;
-  // Default size of object lookup table.
-
-  TAO_Demux_Strategy object_lookup_strategy_;
-  // The type of lookup/demultiplexing strategy being used
-
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  Lock_Type poa_lock_type_;
-  // The type of lock to be returned by <create_poa_lock()>.
-
-  Lock_Type poa_mgr_lock_type_;
-  // The type of lock to be returned by <create_poa_mgr_lock()>.
-
-  // = Strategies Used.
-  TAO_Reactive_Strategy<TAO_Server_Connection_Handler> reactive_strategy_;
-  // A strategy for passively establishing connections which utilizes
-  // the Reactor.
-
-  ACE_Thread_Strategy<TAO_Server_Connection_Handler> threaded_strategy_;
-  // The threaded strategy used for passively establishing
-  // connections.
-
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // concrete concurrency strategy.
-
-#if 0
-  // Someday we'll need these!
-  CREATION_STRATEGY *creation_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-  SCHEDULING_STRATEGY *scheduling_strategy_;
-#endif /* 0 */
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/default_server.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_server.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
deleted file mode 100644
index 994509cd113..00000000000
--- a/TAO/tao/encode.cpp
+++ /dev/null
@@ -1,1319 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    encode.cpp
-//
-// = DESCRIPTION
-//   Code for encoding different data types
-//
-//   The original code had a single static encoder function defined on
-//   the CDR class that called traverse to interpret the data types.
-//   This version defines a virtual method "encode" on each class and
-//   avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// Encode instances of arbitrary data types based only on typecode.
-// "data" points to the data type; if it's not a primitve data type,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = stream->write_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_encoding = stream->write_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_encoding = stream->write_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Primitive::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
-                         const void *data,
-                         const void *,
-                         void *context,
-                         CORBA::Environment &env)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_ptr elem_tc;
-
-  // Value maintained by the Any.
-  void *value;
-
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Status of encode operation
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  elem_tc = any->type ();
-
-  // Encode the typecode description for the element.
-  if (stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE) {
-    value = (void *) any->value ();
-
-    // Switch on the data type and handle the cases for primitives
-    // here for efficiency rather than calling.
-    switch (elem_tc->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_encoding = stream->write_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_encoding = stream->write_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_encoding = stream->write_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-        break;
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_string:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-      case CORBA::tk_wstring:
-        retval = stream->encode (elem_tc, value, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Any::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode_ptr tc2;         // typecode to be encoded
-
-  tc2 = *(CORBA::TypeCode_ptr *) data;  // the data has to be a TypeCode_ptr
-
-  // encode the "kind" field of the typecode
-  continue_encoding = stream->write_ulong ((CORBA::ULong) tc2->kind_);
-  if (continue_encoding == CORBA::B_TRUE)
-    {
-      // now encode the parameters, if any
-      switch (tc2->kind_)
-        {
-          // Most TypeCodes have empty parameter lists
-        default:
-          break;
-
-          // A few have "simple" parameter lists
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          continue_encoding = stream->write_ulong (tc2->length_);
-          break;
-
-          // Indirected typecodes can't occur at "top level" like
-          // this, only nested inside others!
-        case ~0:
-          dmsg ("indirected typecode at top level!");
-          continue_encoding = CORBA::B_FALSE;
-          break;
-
-          // The rest have "complex" parameter lists that are
-          // already encoded as bulk octets ... put length, then
-          // octets.
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_enum:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-          {
-            continue_encoding = stream->write_ulong (tc2->length_);
-
-            for (u_int i = 0; i < tc2->length_ && continue_encoding; i++)
-              continue_encoding = stream->write_octet (tc2->buffer_ [i]);
-          }
-        }
-    }
-  if (continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  CORBA::Principal_ptr p = *(CORBA::Principal_ptr *) data;
-
-  if (p != 0)
-    {
-      continue_encoding = stream->write_long (p->id.length);
-
-      for (u_int i = 0;
-           continue_encoding && i < p->id.length;
-           i++)
-        continue_encoding = stream->write_octet (p->id.buffer [i]);
-    }
-  else
-    continue_encoding = stream->write_long (0);
-  if (continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Principal::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode obj ref
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Current version:  objref is really an IIOP_Object.
-  //
-  // This will change in the future; STUB_Object knows how to
-  // marshal itself, that will be used.
-  //
-  // XXX this doesn't actually verify that the stuff got written
-  // OK to the "wire" ...
-  CORBA::Object_ptr obj = *(CORBA::Object_ptr*) data;
-
-  // NIL objrefs ... marshal as empty type hint, no elements.
-
-  if (CORBA::is_nil (obj))
-    {
-      // encode an empty type_id i.e., an empty string
-      stream->write_ulong (1);
-      stream->write_char (0);
-
-      // Number of profiles = 0
-      stream->write_ulong (0);
-
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-
-      // All other objrefs ... narrow to a "real type" that we
-      // recognize, then marshal.
-      //
-      // XXX this will be changed so it narrows to STUB_Object and
-      // then asks that surrogate/proxy to marshal itself.
-      //
-      // For now, the original code is minimally changed.
-
-      IIOP_Object *objdata;
-      IIOP::Profile *profile;
-
-      if (obj->QueryInterface (IID_IIOP_Object, (void **) &objdata)
-          != TAO_NOERROR)
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-      obj->Release ();
-      profile = &objdata->profile;
-
-      // STRING, a type ID hint
-      stream->encode (CORBA::_tc_string, &objdata->type_id, 0, env);
-
-      // UNSIGNED LONG, value one, count of the sequence of
-      // encapsulated protocol profiles;
-      stream->write_ulong (1);
-
-      // UNSIGNED LONG, tag for this protocol profile;
-      stream->write_ulong (TAO_IOP_TAG_INTERNET_IOP);
-
-      // UNSIGNED LONG, number of succeeding bytes in the
-      // encapsulation.  We don't actually need to make the
-      // encapsulation, as nothing needs stronger alignment than
-      // this longword; it guarantees the rest is aligned for us.
-      u_int hostlen;
-
-      hostlen = ACE_OS::strlen ((char *) profile->host);
-      CORBA::ULong encap_len = 
-	1                              // byte order
-	+ 1                            // version major
-	+ 1                            // version minor
-	+ 1                            // pad byte
-	+ 4                            // sizeof (strlen)
-	+ hostlen + 1                  // strlen + null
-	+ (~hostlen & 01)              // optional pad byte
-	+ 2                            // port
-	+ ( hostlen & 02)              // optional pad short
-	+ 4                            // sizeof (key length)
-	+ profile->object_key.length (); // key length.
-      stream->write_ulong (encap_len);
-
-#if 0
-      size_t current_len = stream->length ();
-#endif
-
-      // CHAR describing byte order, starting the encapsulation
-
-      stream->write_octet (TAO_ENCAP_BYTE_ORDER);
-
-      // IIOP::Version, two characters (version 1.0) padding
-      stream->write_char (profile->iiop_version.major);
-      stream->write_char (profile->iiop_version.minor);
-
-      // STRING hostname from profile
-      stream->encode (CORBA::_tc_string, &profile->host, 0, env);
-
-      // UNSIGNED SHORT port number
-      stream->write_ushort (profile->port);
-
-      // OCTET SEQUENCE for object key
-      stream->encode (&TC_opaque, &profile->object_key, 0, env);
-
-#if 0
-      // This is good for debugging the computation of the key
-      // length.
-      size_t final_len = stream->length ();
-      ACE_DEBUG ((LM_DEBUG, "ObjRef::encode: "
-		  "stored_len = %d, "
-		  "real_len = %d\n",
-		  encap_len,
-		  final_len - current_len));
-#endif /* 0 */
-
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-}
-
-// encode structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment, align_offset;
-
-  void *start_addr = (void *)data;
-
-  if (env.exception () == 0)
-    {
-      int member_count = tc->member_count (env);
-
-      for (int i = 0;
-           i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-             && continue_encoding == CORBA::B_TRUE;
-           i++)
-        {
-          param = tc->member_type (i, env);
-          if (env.exception () == 0)
-            {
-              size = param->size (env);
-              if (env.exception () == 0)
-                {
-                  alignment = param->alignment (env);
-                  if (env.exception () == 0)
-                    {
-                      align_offset =
-                        (ptr_arith_t) ptr_align_binary (data, alignment)
-                        - (ptr_arith_t) data
-                        + (ptr_arith_t) ptr_align_binary (start_addr, alignment)
-                        - (ptr_arith_t) start_addr;
-                      // if both the start_addr and data are not aligned as per
-                      // the alignment, we do not add the offset
-                      data = (const void *) ((ptr_arith_t) data +
-                                             ((align_offset == alignment) ?
-                                              0 : align_offset));
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                          break;
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                          continue_encoding = stream->write_short (*(CORBA::Short *) data);
-                          break;
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                          continue_encoding = stream->write_long (*(CORBA::Long *) data);
-                          break;
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                          continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-                          break;
-                        case CORBA::tk_boolean:
-                          continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-                          break;
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                          continue_encoding = stream->write_char (*(CORBA::Char *) data);
-                          break;
-                        case CORBA::tk_longdouble:
-                          continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-                          break;
-                        case CORBA::tk_wchar:
-                          continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-                          break;
-                        case CORBA::tk_any:
-                        case CORBA::tk_TypeCode:
-                        case CORBA::tk_Principal:
-                        case CORBA::tk_objref:
-                        case CORBA::tk_struct:
-                        case CORBA::tk_union:
-                        case CORBA::tk_string:
-                        case CORBA::tk_sequence:
-                        case CORBA::tk_array:
-                        case CORBA::tk_alias:
-                        case CORBA::tk_except:
-                        case CORBA::tk_wstring:
-                          retval = stream->encode (param, data, 0, env);
-                          break;
-                        default:
-                          break;
-                        }
-                      data = (char *) data + size;
-                    }
-                  else
-                    return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-              else
-                return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          else
-            return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-      return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode unions
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *data2,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-
-  if (env.exception () == 0)
-    {
-      CORBA::TypeCode_ptr member_tc;
-      CORBA::Any_ptr member_label;
-      CORBA::ULong discrim_size_with_pad;
-      const void *discrim_val;
-      CORBA::ULong member_count;
-      CORBA::Long default_index;
-      CORBA::TypeCode_ptr default_tc = 0;
-      CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-      // encode the discriminator value
-      CORBA::TypeCode::traverse_status retval =
-        stream->encode (discrim_tc, data, data2, env);
-
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-          if (env.exception () == 0)
-            {
-              discrim_val = data; // save the pointer to the discriminator
-                                  // value
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-              // now get ready to marshal the actual union value
-              default_index = tc->default_index (env);
-              if (env.exception () == 0)
-                {
-                  // get the member count
-                  member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // Check which label value matches with the
-                      // discriminator value. Accordingly, marshal the
-                      // corresponding member_type. If none match,
-                      // check if default exists and marshal
-                      // accordingly. Otherwise it is an error.
-                      for (int i = 0; member_count-- != 0; i++)
-                        {
-                          member_label = tc->member_label (i, env);
-                          if (env.exception () == 0)
-                            {
-                              // do the matching
-                              switch (member_label->type ()->kind (env))
-                                {
-                                case CORBA::tk_short:
-                                case CORBA::tk_ushort:
-                                  if (*(CORBA::Short *) member_label->value () == *(CORBA::Short *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_long:
-                                case CORBA::tk_ulong:
-                                case CORBA::tk_enum:
-                                  if (*(CORBA::ULong *) member_label->value () == *(CORBA::ULong *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_char:
-                                  if (*(CORBA::Char *) member_label->value () == *(CORBA::Char *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_wchar:
-                                  if (*(CORBA::WChar *) member_label->value () == *(CORBA::WChar *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_boolean:
-                                  if (*(CORBA::Boolean *) member_label->value () == *(CORBA::Boolean *) discrim_val)
-                                    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                default:
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  dmsg ("Union::encode - Bad discriminant type");
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }// end of switch
-
-                              // get the member typecode
-                              member_tc = tc->member_type (i, env);
-                              if (env.exception () == 0)
-                                {
-                                  if (default_index >= 0 && default_index-- == 0)
-                                    {
-                                      // have we reached the default label?, if so,
-                                      // save a handle to the typecode for the default
-                                      default_tc = member_tc;
-                                    }
-                                  if (discrim_matched)
-                                    // marshal according to the matched typecode
-                                    return stream->encode (member_tc, data,
-                                                           data2, env);
-                                }
-                              else // error getting member type
-                                {
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  dmsg1 ("Union::encode - error getting member type:%d",i);
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }
-
-                            }
-                          else // error getting member label
-                            {
-                              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                              dmsg1 ("Union::encode - error member label : %d", i);
-                              return CORBA::TypeCode::TRAVERSE_STOP;
-                            }
-                        } // end of while
-                      // we are here only if there was no match
-                      if (default_tc)
-                        return stream->encode (default_tc, data, data2, env);
-                      else
-                        {
-                          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-                          dmsg ("Union::encode - failed. No match and no default case");
-                          return CORBA::TypeCode::TRAVERSE_STOP;
-                        }
-                    }
-                  else // error getting member count
-                    {
-                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-                      dmsg ("Union::encode - error getting member count");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else // error getting default index
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  dmsg ("Union::encode - error getting default used");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else // error getting discrim_pad_size
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              dmsg ("Union::encode - error getting discrim padded size");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // error encoding discriminant
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-          dmsg ("Union::encode - error encoding discriminant");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // error getting the discriminant
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      dmsg ("Union::encode - error getting the discriminant typecode");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::String str = *(CORBA::String *) data;
-
-  // Verify string satisfies bounds requirements.  We're not so
-  // permissive as to send messages violating the interface spec
-  // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (env);
-
-  if (env.exception () == 0)
-    {
-      if (stream->write_string (str))
-	return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// encode sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  TAO_Base_Sequence *seq = (TAO_Base_Sequence *)data;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  len = seq ? seq->length_ : 0;
-  char *value;
-
-  // First marshal the sequence length, verifying that it's within the
-  // sequence bounds ...
-
-  if (len > 0)
-    {
-      // retrieve the bounds of the sequence
-      CORBA::ULong bounds = tc->length (env);
-      if (env.exception () == 0)
-        {
-          // encode only if it is an unbounded sequence or if length is
-          // less/equal to the bounds
-          if (bounds == 0 || len <= bounds)
-            {
-              bounds = len;  // number of times you encode
-              continue_encoding = stream->write_ulong (seq->length_);
-              if (continue_encoding && seq->length_ != 0)
-                {
-                  // get element typecode
-                  tc2 = tc->content_type (env);
-                  if (env.exception () == 0)
-                    {
-                      size = tc2->size (env);
-                      if (env.exception () == 0)
-                        {
-                          value = (char *) seq->buffer_;
-                          switch (tc2->kind_)
-                            {
-                            case CORBA::tk_null:
-                            case CORBA::tk_void:
-                              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                            case CORBA::tk_short:
-                            case CORBA::tk_ushort:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_short (*(CORBA::Short *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_long:
-                            case CORBA::tk_ulong:
-                            case CORBA::tk_float:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_long (*(CORBA::Long *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_double:
-                            case CORBA::tk_longlong:
-                            case CORBA::tk_ulonglong:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_boolean:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_char:
-                            case CORBA::tk_octet:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_char (*(CORBA::Char *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_longdouble:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_wchar:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_enum:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->write_long (*(CORBA::Long *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                              // handle all aggregate types here
-                            case CORBA::tk_any:
-                            case CORBA::tk_TypeCode:
-                            case CORBA::tk_Principal:
-                            case CORBA::tk_objref:
-                            case CORBA::tk_struct:
-                            case CORBA::tk_union:
-                            case CORBA::tk_string:
-                            case CORBA::tk_sequence:
-                            case CORBA::tk_array:
-                            case CORBA::tk_alias:
-                            case CORBA::tk_except:
-                            case CORBA::tk_wstring:
-                              // For those aggregate types whose size is constant, we
-                              // compute it only once
-                              while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                                {
-                                  retval = stream->encode (tc2, value, 0, env);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            default:
-                              break;
-                            } // end of switch
-                        } // no exception computing size
-                    } // no exception computing content type
-                } // seq length not 0
-            } // within bounds or unbounded
-        } // no exception computing bounds
-    } // length is > 0
-  else
-    {
-      // length is 0, encode it
-      continue_encoding = stream->write_ulong (len);
-      if (continue_encoding == CORBA::B_TRUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    }
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::encode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// encode array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (env);
-  if (env.exception () == 0)
-    {
-      // get element typecode.
-      CORBA::TypeCode_ptr tc2 = tc->content_type (env);
-
-      if (env.exception () == 0)
-        {
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              switch (tc2->kind_)
-                {
-                case CORBA::tk_null:
-                case CORBA::tk_void:
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                case CORBA::tk_short:
-                case CORBA::tk_ushort:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_short (*(CORBA::Short *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_long:
-                case CORBA::tk_ulong:
-                case CORBA::tk_float:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_double:
-                case CORBA::tk_longlong:
-                case CORBA::tk_ulonglong:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_boolean:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_char:
-                case CORBA::tk_octet:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_char (*(CORBA::Char *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_longdouble:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    {
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    }
-                  break;
-                case CORBA::tk_wchar:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_enum:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->write_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                  // handle all aggregate types here
-                case CORBA::tk_any:
-                case CORBA::tk_TypeCode:
-                case CORBA::tk_Principal:
-                case CORBA::tk_objref:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_string:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                case CORBA::tk_wstring:
-                  // For those aggregate types whose size is constant, we
-                  // compute it only once
-                  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      retval = stream->encode (tc2, value, 0, env);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                default:
-                  break;
-                } // end of switch
-            } // no exception computing size
-        } // no exception computing content type
-    } // no exception computing bounds
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::encode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr tc2;  // typecode of the aliased type
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (env);
-  if (env.exception () == 0)
-    {
-    // switch on the data type and handle the cases for primitives here for
-    // efficiency rather than calling
-    switch (tc2->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_encoding = stream->write_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_encoding = stream->write_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_encoding = stream->write_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_encoding = stream->write_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_encoding = stream->write_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_encoding = stream->write_wchar (*(CORBA::WChar *) value);
-        break;
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_string:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-      case CORBA::tk_wstring:
-        retval = stream->encode (tc2, value, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-  //  tc2->Release ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Alias::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-
-// encode exception
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  if (env.exception () == 0)
-    {
-      CORBA::TypeCode_ptr param;
-      CORBA::Long size, alignment;
-
-      // first encode the RepositoryID which we can grab from the
-      // typecode pointer 
-      continue_encoding = stream->write_string (tc->id (env));
-
-      data = (char *) data + sizeof (CORBA::Exception);
-      // @@ (ASG) The reason this is done is because we want to skip the size
-      // of the the base class and its private data members (type_ and
-      // refcount_). After skipping these data members, we will have the data
-      // members of the derived class which must be encoded.
-
-      int member_count = tc->member_count (env);
-
-      for (int i = 0;
-           i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-             && continue_encoding == CORBA::B_TRUE;
-           i++)
-        {
-          param = tc->member_type (i, env);
-          if (env.exception () == 0)
-            {
-              size = param->size (env);
-              if (env.exception () == 0)
-                {
-                  alignment = param->alignment (env);
-                  if (env.exception () == 0)
-                    {
-                      data = ptr_align_binary (data, alignment);
-                      switch (param->kind_){
-                      case CORBA::tk_null:
-                      case CORBA::tk_void:
-                        break;
-                      case CORBA::tk_short:
-                      case CORBA::tk_ushort:
-                        continue_encoding = stream->write_short (*(CORBA::Short *) data);
-                        break;
-                      case CORBA::tk_long:
-                      case CORBA::tk_ulong:
-                      case CORBA::tk_float:
-                      case CORBA::tk_enum:
-                        continue_encoding = stream->write_long (*(CORBA::Long *) data);
-                        break;
-                      case CORBA::tk_double:
-                      case CORBA::tk_longlong:
-                      case CORBA::tk_ulonglong:
-                        continue_encoding = stream->write_longlong (*(CORBA::LongLong *) data);
-                        break;
-                      case CORBA::tk_boolean:
-                        continue_encoding = stream->write_boolean (*(CORBA::Boolean *) data);
-                        break;
-                      case CORBA::tk_char:
-                      case CORBA::tk_octet:
-                        continue_encoding = stream->write_char (*(CORBA::Char *) data);
-                        break;
-                      case CORBA::tk_longdouble:
-                        continue_encoding = stream->write_longdouble (*(CORBA::LongDouble *) data);
-                        break;
-                      case CORBA::tk_wchar:
-                        continue_encoding = stream->write_wchar (*(CORBA::WChar *) data);
-                        break;
-                      case CORBA::tk_any:
-                      case CORBA::tk_TypeCode:
-                      case CORBA::tk_Principal:
-                      case CORBA::tk_objref:
-                      case CORBA::tk_struct:
-                      case CORBA::tk_union:
-                      case CORBA::tk_string:
-                      case CORBA::tk_sequence:
-                      case CORBA::tk_array:
-                      case CORBA::tk_alias:
-                      case CORBA::tk_except:
-                      case CORBA::tk_wstring:
-                        retval = stream->encode (param, data, 0, env);
-                        break;
-                      default:
-                        break;
-                      }
-                      data = (char *) data + size;
-                    }
-                  else
-                    return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-              else
-                return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          else
-            return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Except detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-
-// encode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc,
-                             const void *data,
-                             const void *,
-                             void *context,
-                             CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
-
-  // Verify string satisfies bounds requirements.  We're not so
-  // permissive as to send messages violating the interface spec
-  // by having excessively long strings!
-  CORBA::ULong bounds = tc->length (env);
-
-  if (env.exception () == 0)
-    {
-      // get the actual length of the string
-      CORBA::ULong len = ACE_OS::wslen ((CORBA::WChar *) str);
-
-      // if it is an unbounded string or if the length is less than the
-      // bounds for an unbounded string
-      if ((bounds == 0) || (len <= bounds))
-	{
-	  // Encode the string, followed by a NUL character.
-
-	  for (continue_encoding = stream->write_ulong (len + 1);
-	       continue_encoding != CORBA::B_FALSE && *str;
-	       continue_encoding = stream->write_wchar (*str++))
-	    continue;
-
-	  stream->write_wchar (0);
-	  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	}
-    }
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h
deleted file mode 100644
index 496dae62ed2..00000000000
--- a/TAO/tao/factories.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//     factories.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#if !defined (TAO_FACTORIES_H)
-#  define TAO_FACTORIES_H
-
-#if 0
-#  include "ace/SOCK_Acceptor.h"
-#  include "ace/SOCK_Connector.h"
-#  include "ace/Strategies_T.h"
-#  include "ace/Connector.h"
-#  include "ace/Synch.h"
-
-#  include "tao/params.h"
-#  include "tao/connect.h"
-#  include "tao/objtable.h"
-#endif
-
-class TAO_Client_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned
-  //      by the <TAO_Client_Factory::CONNECTOR>.
-{
-public:
-  TAO_Client_Connection_Handler (ACE_Thread_Manager* = 0);
-  // Do-nothing constructor
-
-  virtual int open (void*);
-  // Initialization hook
-
-  void in_use (CORBA::Boolean);
-  // Set the in-use flag.
-
-  CORBA::Boolean in_use (void);
-  // Return state of the in-use flag.
-
-private:
-  CORBA::Boolean in_use_;
-  // True value indicates that something is using this handler.
-};
-
-class TAO_Client_Factory
-  // = TITLE
-  //    Abstract factory used by the client to turn out various
-  //    strategies used on the client side.
-{
-public:
-  typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR> 
-          CONNECTOR;
-  typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler> 
-          NULL_CREATION_STRATEGY;
-  typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, 
-                                      ACE_SOCK_CONNECTOR,
-				      ACE_SYNCH_RW_MUTEX>
-          CACHED_CONNECT_STRATEGY;
-
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-#endif
-  
-  CONNECTOR *connector (void);
-  // Return a pointer to a connector using appropriate strategies.
-
-  TAO_Client_Factory (void);
-  ~TAO_Client_Factory (void);
-  
-private:
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-#endif
-  CONNECTOR connector_;
-  NULL_CREATION_STRATEGY null_creation_strategy_;
-  CACHED_CONNECT_STRATEGY caching_connect_strategy_;
-};
-
-class TAO_Server_Factory
-  // = TITLE
-  //    Abstract factory used by the server side to turn out various
-  //    strategies of special utility to it.
-{
-public:
-  // = SERVER-SIDE
-  typedef ACE_Creation_Strategy<TAO_OA_Connection_Handler> CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<TAO_OA_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<TAO_OA_Connection_Handler> CONCURRENCY_STRATEGY;
-  typedef ACE_Scheduling_Strategy<TAO_OA_Connection_Handler> SCHEDULING_STRATEGY;
-
-  CREATION_STRATEGY *creation_strategy (void);
-  // return concrete creation strategy
-
-  ACCEPT_STRATEGY *accept_strategy (void);
-  // return concrete acceptor strategy
-
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-  // return the concurrency strategy used
-
-  SCHEDULING_STRATEGY *scheduling_strategy (void);
-  // return the scheduling strategy used
-
-  TAO_Object_Table *object_lookup_strategy (void);
-  // return the concrete object lookup strategy
-
-  TAO_Server_Factory (void);
-  // constructor
-  
-private:
-  // = COMMON
-  ACE_Thread_Strategy<TAO_OA_Connection_Handler> threaded_strategy_;
-  // The threaded strategy used for passively establishing connections.
-  ACE_Reactive_Strategy<TAO_OA_Connection_Handler> reactive_strategy_;
-  // A strategy for passively establishing connections which utilizes the Reactor.
-
-  // = SERVER
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // concrete concurrency strategy
-
-  TAO_Object_Table *objtable_;
-  // instance of object table
-#if 0
-  // Someday we'll need these!
-  CREATION_STRATEGY *creation_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-  SCHEDULING_STRATEGY *scheduling_strategy_;
-#endif
-};
-
-#endif /* TAO_FACTORIES_H */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
deleted file mode 100644
index 1bc92e77975..00000000000
--- a/TAO/tao/orbconf.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// @ (#) $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     default_server.h
-//
-// = DESCRIPTION
-//     Build configuration file for the Inter-ORB Engine, and application
-//     level code using it via <corba.hh>
-//
-// = AUTHOR
-//     Copyright 1995 by Sun Microsystems, Inc.
-//
-//     TAO-specific changes by Chris Cleeland and Douglas C. Schmidt
-//
-// ============================================================================
-
-#if !defined (TAO_ORB_CONFIG_H)
-#define TAO_ORB_CONFIG_H
-
-#include "ace/OS.h"
-
-// The default arguments of the resource factory for the fake service 
-// configurator
-#if !defined (TAO_DEFAULT_RESOURCE_FACTORY_ARGS)
-#define TAO_DEFAULT_RESOURCE_FACTORY_ARGS { "-ORBresources", "tss" }
-#endif /* TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-
-// The default arguments of the client strategy factory for the fake service 
-// configurator
-#if !defined (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS { 0 }
-#endif /* TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS */
-
-// The default arguments of the server strategy factory for the fake service 
-// configurator
-#if !defined (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS { "-ORBconcurrency", "reactive", \
-                                                   "-ORBdemuxstrategy", "dynamic", \
-                                                   "-ORBtablesize", "128" }
-#endif /* TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
-
-// The default size of TAO's server object table.
-#if !defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)
-#define TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE 64
-#endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
-
-// The default UDP multicast port number for locating the TAO Naming
-// Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REQUEST_PORT 10013
-#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REPLY_PORT 10014
-#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO Trading
-// Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT 10016
-#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Trading Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REPLY_PORT 10017
-#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
-
-// The default timeout receiving the location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_TIMEOUT)
-#define TAO_DEFAULT_NAME_SERVER_TIMEOUT 5
-#endif /* TAO_DEFAULT_NAME_SERVER_TIMEOUT */
-
-// The default starting port number for TAO servers.
-#if !defined (TAO_DEFAULT_SERVER_PORT)
-#define TAO_DEFAULT_SERVER_PORT 10015
-#endif /* TAO_DEFAULT_SERVER_PORT */
-
-// TAO's max buffer size
-#if !defined (TAO_MAXBUFSIZE)
-#define TAO_MAXBUFSIZE 1024
-#endif /* TAO_MAXBUFSIZE */
-
-// This controls the alignment for TAO structs.  It supports built-in
-// types up to and including 16 bytes (128 bits) in size.
-#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE)
-# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
-#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
-
-//
-// In some environments it is useful to swap the bytes on write, for
-// instance: a fast server can be feeding a lot of slow clients that
-// happen to have the wrong byte order.
-// This macro enables the functionality to support that, but we still
-// need a way to activate it on a per-connection basis.
-//
-// #define TAO_ENABLE_SWAP_ON_WRITE
-//
-
-//
-// In some environements we never need to swap bytes when reading, for
-// instance embebbed systems (such as avionics) or homogenous
-// networks.
-// Setting this macro disables the capabilities to demarshall streams
-// in the wrong byte order.
-//
-// #define TAO_DISABLE_SWAP_ON_READ
-//
-
-// BC++ seems to have a different convention for detecting Win32 than
-// VC++.
-
-#if defined (__WIN32__)
-# define _WIN32
-#endif /* BC++ convention */
-
-// Define to `int' if <sys/types.h> doesn't define.
-/* #undef pid_t */
-
-// Define if your processor does not store words with the most significant
-// byte first.
-#if defined (ACE_LITTLE_ENDIAN)
-#  define TAO_ENCAP_BYTE_ORDER 1  /* little endian encapsulation byte order has
-                                     the value = 1 */
-#else  /* ! ACE_LITTLE_ENDIAN */
-#  define TAO_ENCAP_BYTE_ORDER 0  /* big endian encapsulation byte order has
-                                     the value = 0 */
-#endif /* ! ACE_LITTLE_ENDIAN */
-
-// Define as the return type of signal handlers (int or void).
-#define RETSIGTYPE void
-
-// Define if you don't have vprintf but do have _doprnt.
-/* #undef HAVE_DOPRNT */
-
-// Define if you have the vprintf function.
-#define HAVE_VPRINTF 1
-
-// Avoid namespace pollution that's common on older UNIXes...
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-#if defined (major)
-#undef major
-#endif /* major*/
-
-// For Win16, near/far pointers reflect same/other segment addressing.
-// Of course, ACE doesn't support Win16, so why bother?
-
-// For now, we simply set the default to empty definition and let
-// places that it fails bubble up.
-#define _FAR
-
-// Assume DOS/Windows if "configure" didn't get run.
-
-#if defined (_WIN32)
-// "C4355: 'this' : used in base member initializer list"
-#  pragma warning (disable:4355) /* disable C4355 warning */
-#endif /* defined (_WIN32) */
-
-#endif  /* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
deleted file mode 100644
index df30d8c521b..00000000000
--- a/TAO/tao/params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-TAO_ORB_Parameters::TAO_ORB_Parameters (void)
-  : name_service_ior_ (0),
-    name_service_port_ (0),
-    sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
-    sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
-{
-}
-
-TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
-{
-}
-
-void
-TAO_ORB_Parameters::addr (const ACE_INET_Addr &addr)
-{
-  this->addr_ = addr;
-}
-
-// Get the address on which we're listening.
-
-const ACE_INET_Addr &
-TAO_ORB_Parameters::addr (void)
-{
-  return this->addr_;
-}
-
-void
-TAO_ORB_Parameters::name_service_ior (CORBA::String ns)
-{
-  this->name_service_ior_ = ns;
-}
-
-// Set the IOR of our name service.
-
-CORBA::String
-TAO_ORB_Parameters::name_service_ior (void)
-{
-  return this->name_service_ior_;
-}
-
-// Get the IOR of our name service.
-
-void
-TAO_ORB_Parameters::name_service_port (CORBA::UShort port)
-{
-  this->name_service_port_ = port;
-}
-
-// Set the port of our name service.
-
-CORBA::UShort
-TAO_ORB_Parameters::name_service_port (void)
-{
-  return this->name_service_port_;
-}
-
-
-void
-TAO_ORB_Parameters::trading_service_ior (CORBA::String ns)
-{
-  this->trading_service_ior_ = ns;
-}
-
-// Set the IOR of our trading service.
-
-CORBA::String
-TAO_ORB_Parameters::trading_service_ior (void)
-{
-  return this->trading_service_ior_;
-}
-
-// Get the IOR of our trading service.
-
-void
-TAO_ORB_Parameters::trading_service_port (CORBA::UShort port)
-{
-  this->trading_service_port_ = port;
-}
-
-// Set the port of our trading service.
-
-CORBA::UShort
-TAO_ORB_Parameters::trading_service_port (void)
-{
-  return this->trading_service_port_;
-}
-
-void
-TAO_OA_Parameters::demux_strategy (const char* strategy)
-{
-  // Determine the demux strategy based on the given name
-  if (!ACE_OS::strcmp (strategy, "linear"))
-    this->demux_ = TAO_LINEAR;
-  else if (!ACE_OS::strcmp (strategy, "dynamic_hash"))
-    this->demux_ = TAO_DYNAMIC_HASH;
-  else if (!ACE_OS::strcmp (strategy, "user_def"))
-    this->demux_ = TAO_USER_DEFINED;
-  else if (!ACE_OS::strcmp (strategy, "active_demux"))
-    this->demux_ = TAO_ACTIVE_DEMUX;
-  else
-    // Provide fallback!
-    this->demux_ = TAO_DYNAMIC_HASH;
-}
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
deleted file mode 100644
index 8c41a2f1218..00000000000
--- a/TAO/tao/params.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    params.h
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_PARAMS_H)
-#  define TAO_PARAMS_H
-
-// Forward decls.
-
-class TAO_Server_Connection_Handler;
-
-// This is a quick hack to avoid having to unravel the intracacies of
-// the all the hairy order interdepencies that currently exist in TAO.
-#if ! defined (__ACE_INLINE__)
-#define TAO_LOCAL_INLINE
-#else
-#define TAO_LOCAL_INLINE ACE_INLINE
-#endif /* ! __ACE_INLINE__ */
-
-class TAO_Export TAO_ORB_Parameters
-  // = TITLE
-  //    Parameters that are specific to the ORB.  These parameters can
-  //    be for the client, the server, or for both.
-  //
-  // = NOTE
-  // Some of the functions have inline definitions in the class header
-  // below.  Please do not move them back to the .i file.
-  // cygnus-2.7.2-960126, distributed with Tornado 1.0.1, can't deal
-  // with returing a const reference here.  It raises an internal
-  // compiler error at ace/Svc_Handler.cpp:46, of all places.
-{
-public:
-  TAO_ORB_Parameters (void);
-  // Constructor.
-
-  ~TAO_ORB_Parameters (void);
-  // Destructor.
-
-  void addr (const ACE_INET_Addr &addr);
-  // Set the address on which we're listening.
-
-  const ACE_INET_Addr &addr (void);
-  // Get the address on which we're listening.
-
-  void name_service_ior (CORBA::String ns);
-  // Set the IOR of our name service.
-
-  CORBA::String name_service_ior (void);
-  // Get the IOR of our name service.
-
-  void name_service_port (CORBA::UShort port);
-  // Set the port of our name service.
-
-  CORBA::UShort name_service_port (void);
-  // Get the port of our name service.
-
-  void trading_service_ior (CORBA::String ns);
-  // Set the IOR of our trading service.
-
-  CORBA::String trading_service_ior (void);
-  // Get the IOR of our trading service.
-
-  void trading_service_port (CORBA::UShort port);
-  // Set the port of our trading service.
-
-  CORBA::UShort trading_service_port (void);
-  // Get the port of our trading service.
-
-  int sock_rcvbuf_size (void);
-  // Get the size to be used for a socket's receive buffer.
-
-  void sock_rcvbuf_size (int);
-  // Set the size to be used for a socket's receive buffer.
-
-  int sock_sndbuf_size (void);
-  // Get the size to be used for a socket's send buffer.
-
-  void sock_sndbuf_size (int);
-  // Set the size to be used for a socket's send buffer.
-
-  int cdr_default_size (void) const;
-  void cdr_default_size (int);
-  // If the user does not specify the size of a CDR stream this is the
-  // size of its internal buffer.
-
-  int cdr_max_exp_size (void) const;
-  void cdr_max_exp_size (int);
-  // CDR streams internal buffers grow exponentially until they reach
-  // this size.
-
-  int cdr_linear_chunk (void) const;
-  void cdr_linear_chunk (int);
-  // After reaching their maximum exponential size limit CDR streams
-  // grow linearly in chunks of this size.
-
-private:
-  ACE_INET_Addr addr_;
-  // host + port number we are listening on
-
-  CORBA::String name_service_ior_;
-  // The IOR of our configured Naming Service.
-
-  CORBA::UShort name_service_port_;
-  // The port number of our configured Naming Service.
-
-  CORBA::String trading_service_ior_;
-  // The IOR of our configured Trading Service.
-
-  CORBA::UShort trading_service_port_;
-  // The port number of our configured Trading Service.
-
-  int sock_rcvbuf_size_;
-  // Size to be used for a socket's receive buffer.
-
-  int sock_sndbuf_size_;
-  // Size to be used for a socket's send buffer.
-
-  int cdr_default_size_;
-  // Default size for CDR buffers.
-
-  int cdr_max_exp_size_;
-  // Cutoff value for exponential growth of CDR buffers.
-
-  int cdr_linear_chunk_;
-  // Control for linear growth of CDR buffers.
-};
-
-typedef enum
-{
-  TAO_NONE,
-  TAO_LINEAR,
-  TAO_DYNAMIC_HASH,
-  TAO_ACTIVE_DEMUX,
-  TAO_USER_DEFINED
-} TAO_Demux_Strategy;
-
-class TAO_Export TAO_OA_Parameters
-  // = TITLE
-  //    Parameters specific to an Object Adapter.  By definition, this
-  //    is only on the server side, since a client does not have an
-  //    object adapter.
-  //
-  // = NOTES
-  //    This can be subclassed in order to have OA-specific
-  //    parameters, e.g., the Realtime Object Adapter might subclass
-  //    this and add its own parameters.
-{
-public:
-  TAO_LOCAL_INLINE TAO_OA_Parameters (void);
-  // Constructor
-
-  TAO_LOCAL_INLINE ~TAO_OA_Parameters (void);
-  // Destructor
-
-  void demux_strategy (const char *strategy);
-  // Specify the demultiplexing strategy to be used via <{strategy}>.
-  // Valid values are one of (case matters) "linear", "dynamic_hash",
-  // "user_def", or "active_demux".  If the value is not valid, then
-  // <Dynamic Hash> is used as a default.
-
-  TAO_LOCAL_INLINE void demux_strategy (TAO_Demux_Strategy s);
-  // Specify the demultiplexing strategy to be used.
-
-  TAO_LOCAL_INLINE TAO_Demux_Strategy demux_strategy (void);
-  // Return the demultiplexing strategy being used.
-
-  TAO_LOCAL_INLINE void userdef_lookup_strategy (TAO_Object_Table_Impl *&ot);
-  // Provide a way for user defined object key lookup strategies to be
-  // plugged in.
-
-  TAO_LOCAL_INLINE TAO_Object_Table_Impl *userdef_lookup_strategy (void);
-  // return the lookup strategy
-
-  TAO_LOCAL_INLINE void tablesize (CORBA::ULong tablesize);
-  // set the table size for lookup table
-
-  TAO_LOCAL_INLINE CORBA::ULong tablesize (void);
-  // get the table size for the lookup table
-
-private:
-  TAO_Demux_Strategy demux_;
-  // demux strategy
-
-  CORBA::ULong tablesize_;
-  // size of object lookup table
-
-  TAO_Object_Table_Impl *ot_;
-  // concrete lookup table instance
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_PARAMS_H */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
deleted file mode 100644
index f4b8a76a182..00000000000
--- a/TAO/tao/params.i
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    params.i
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-ACE_INLINE
-TAO_OA_Parameters::TAO_OA_Parameters (void)
-{
-}
-
-ACE_INLINE
-TAO_OA_Parameters::~TAO_OA_Parameters (void)
-{
-}
-
-ACE_INLINE void
-TAO_OA_Parameters::demux_strategy (TAO_Demux_Strategy strategy)
-{
-  this->demux_ = strategy;      // Trust that the value is valid!
-}
-
-//ACE_INLINE TAO_OA_Parameters::TAO_Demux_Strategy
-ACE_INLINE TAO_Demux_Strategy
-TAO_OA_Parameters::demux_strategy (void)
-{
-  return this->demux_;
-}
-
-ACE_INLINE void
-TAO_OA_Parameters::tablesize (CORBA::ULong tblsize)
-{
-  this->tablesize_ = tblsize;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_OA_Parameters::tablesize (void)
-{
-  return this->tablesize_;
-}
-
-ACE_INLINE void
-TAO_OA_Parameters::userdef_lookup_strategy (TAO_Object_Table_Impl *&ot)
-{
-  // provide a way for user defined object key lookup strategies to be plugged
-  // in
-  ot_ = ot;
-  ot = 0;  // we own it now
-}
-
-ACE_INLINE TAO_Object_Table_Impl *
-TAO_OA_Parameters::userdef_lookup_strategy (void)
-{
-  // return the lookup strategy
-  return ot_;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::sock_rcvbuf_size (void)
-{
-  return sock_rcvbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_rcvbuf_size (int s)
-{
-  sock_rcvbuf_size_ = s <= ACE_DEFAULT_MAX_SOCKET_BUFSIZ ? s : ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::sock_sndbuf_size (void)
-{
-  return sock_sndbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_sndbuf_size (int s)
-{
-  sock_sndbuf_size_ = s <= ACE_DEFAULT_MAX_SOCKET_BUFSIZ ? s : ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
-}
diff --git a/TAO/tao/poa.idl b/TAO/tao/poa.idl
deleted file mode 100644
index 8d131600045..00000000000
--- a/TAO/tao/poa.idl
+++ /dev/null
@@ -1,364 +0,0 @@
-// POA related IDL from "ORB Portability Joint Submission", orbos/97-04-14,
-//    Section 3.4
-//
-// Changes to IDL in that section:
-//   1.  Take out "..." in CORBA module which indicated "everything else
-//       in the CORBA module".
-//   2.  Add some definition from the full CORBA module which are needed
-//       for compiling the PortableServer module.
-//   3.  Add fake definitions of "native" since it does not yet exist
-//       in IDL. These fake definitions allow the rest of the module to
-//       compile as if "native" were indeed an IDL keyword.
-//   4.  Took out an extra semi-colon accidentally added during last
-//       editing pass
-// These changes (except removal of "...") are marked with beginning and
-//   ending comment lines containing "****change****".
-
-// IDL
-#pragma prefix "omg.org"
-module PortableServer
-{
-  typedef string Identifier;
-  typedef string RepositoryId;
-  interface CurrentBase{};
-  // ****change**** end   definitions from CORBA needed for standalone compile
-
-  // basic Policy definition
-  interface Policy
-    {
-      Policy copy( );
-      void destroy( );
-    };
-
-  typedef sequence <Policy>  PolicyList;
-
-  // forward reference
-  interface POA;
-
-  native Servant;
-  typedef sequence<octet> ObjectId;
-
-  exception ForwardRequest
-    {
-      Object forward_reference;
-    };
-
-  // **********************************************
-  //
-  // Policy interfaces
-  //
-  // **********************************************
-  enum ThreadPolicyValue {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-  interface ThreadPolicy : Policy
-    {
-      readonly attribute ThreadPolicyValue value;
-    };
-
-  enum LifespanPolicyValue {
-    TRANSIENT,
-    PERSISTENT
-  };
-  interface LifespanPolicy : Policy
-    {
-      readonly attribute LifespanPolicyValue value;
-    };
-
-  enum IdUniquenessPolicyValue {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-  interface IdUniquenessPolicy : Policy
-    {
-      readonly attribute IdUniquenessPolicyValue value;
-    };
-
-  enum IdAssignmentPolicyValue {
-    USER_ID,
-    SYSTEM_ID
-  };
-  interface IdAssignmentPolicy : Policy
-    {
-      readonly attribute IdAssignmentPolicyValue value;
-    };
-
-  enum ImplicitActivationPolicyValue {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-  interface ImplicitActivationPolicy : Policy
-    {
-      readonly attribute ImplicitActivationPolicyValue value;
-    };
-
-  enum ServantRetentionPolicyValue {
-    RETAIN,
-    NON_RETAIN
-  };
-  interface ServantRetentionPolicy : Policy
-    {
-      readonly attribute ServantRetentionPolicyValue value;
-    };
-
-  enum RequestProcessingPolicyValue {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-  interface RequestProcessingPolicy : Policy
-    {
-      readonly attribute RequestProcessingPolicyValue value;
-    };
-
-  // **************************************************
-  //
-  // POAManager interface
-  //
-  // **************************************************
-
-  interface POAManager
-    {
-      exception AdapterInactive{};
-
-      void activate()
-	raises(AdapterInactive);
-      void hold_requests(in boolean wait_for_completion)
-	raises(AdapterInactive);
-      void discard_requests(in boolean wait_for_completion)
-	raises(AdapterInactive);
-      // ****change**** begin take out semi-colon after parameter list in 97-04-14
-      void deactivate(	in boolean etherealize_objects,
-			in boolean wait_for_completion)
-	raises(AdapterInactive);
-      // ****change**** end   take out semi-colon after parameter list in 97-04-14
-    };
-
-  // **************************************************
-  //
-  // AdapterActivator interface
-  //
-  // **************************************************
-
-  interface AdapterActivator
-    {
-      boolean unknown_adapter(in POA parent, in string name);
-    };
-
-  // **************************************************
-  //
-  // ServantManager interface
-  //
-  // **************************************************
-
-  interface ServantManager
-    { };
-
-  interface ServantActivator : ServantManager {
-    Servant incarnate (
-		       in ObjectId 	oid,
-		       in POA 	adapter )
-      raises (ForwardRequest);
-
-    void etherealize (
-		      in ObjectId 	oid,
-		      in POA 	adapter,
-		      in Servant 	serv,
-		      in boolean	cleanup_in_progress,
-		      in boolean 	remaining_activations );
-  };
-
-  interface ServantLocator : ServantManager {
-    native 	Cookie;
-
-    Servant preinvoke(
-		      in ObjectId	oid,
-		      in POA	adapter,
-		      in Identifier	operation,
-		      out Cookie	the_cookie )
-      raises (ForwardRequest);
-
-    void postinvoke(
-		    in ObjectId 	oid,
-		    in POA 	adapter,
-		    in Identifier 	operation,
-		    in Cookie 	the_cookie,
-		    in Servant	the_servant	);
-  };
-
-
-  // **************************************************
-  //
-  // POA interface
-  //
-  // **************************************************
-
-  interface POA
-    {
-      exception AdapterAlreadyExists {};
-      exception AdapterInactive {};
-      exception AdapterNonExistent {};
-      exception InvalidPolicy { unsigned short index; };
-      exception NoServant {};
-      exception ObjectAlreadyActive {};
-      exception ObjectNotActive {};
-      exception ServantAlreadyActive {};
-      exception ServantNotActive {};
-      exception WrongAdapter {};
-      exception WrongPolicy {};
-
-      //--------------------------------------------------
-      //
-      // POA creation and destruction
-      //
-      //--------------------------------------------------
-
-      POA create_POA(in string adapter_name,
-		     in POAManager a_POAManager,
-		     in PolicyList policies)
-	raises (AdapterAlreadyExists, InvalidPolicy);
-
-      POA find_POA(in string adapter_name,  in boolean activate_it)
-	raises (AdapterNonExistent);
-
-      void destroy(	in boolean etherealize_objects,
-			in boolean wait_for_completion);
-
-      // **************************************************
-      //
-      // Factories for Policy objects
-      //
-      // **************************************************
-      ThreadPolicy
-	create_thread_policy(in ThreadPolicyValue value);
-      LifespanPolicy
-	create_lifespan_policy(in LifespanPolicyValue value);
-      IdUniquenessPolicy
-	create_id_uniqueness_policy
-	(in IdUniquenessPolicyValue value);
-      IdAssignmentPolicy
-	create_id_assignment_policy
-	(in IdAssignmentPolicyValue value);
-      ImplicitActivationPolicy
-	create_implicit_activation_policy
-	(in ImplicitActivationPolicyValue value);
-      ServantRetentionPolicy
-	create_servant_retention_policy
-	(in ServantRetentionPolicyValue value);
-      RequestProcessingPolicy
-	create_request_processing_policy
-	(in RequestProcessingPolicyValue value);
-
-      //--------------------------------------------------
-      //
-      // POA attributes
-      //
-      //--------------------------------------------------
-
-      readonly attribute string the_name;
-      readonly attribute POA the_parent;
-      readonly attribute POAManager the_POAManager;
-      attribute AdapterActivator the_activator;
-
-
-      //--------------------------------------------------
-      //
-      // Servant Manager registration:
-      //
-      //--------------------------------------------------
-
-      ServantManager get_servant_manager()
-	raises (WrongPolicy);
-
-      void set_servant_manager( in ServantManager imgr)
-	raises (WrongPolicy);
-
-      //--------------------------------------------------
-      //
-      // operations for the USE_DEFAULT_SERVANT policy
-      //
-      //--------------------------------------------------
-
-      Servant get_servant()
-	raises (NoServant, WrongPolicy);
-
-      void set_servant(	in Servant p_servant)
-	raises (WrongPolicy);
-
-      // **************************************************
-      //
-      // object activation and deactivation
-      //
-      // **************************************************
-
-      ObjectId activate_object( in Servant p_servant )
-	raises (ServantAlreadyActive, WrongPolicy);
-
-      void activate_object_with_id(
-				   in ObjectId id,
-				   in Servant p_servant)
-	raises (ServantAlreadyActive, ObjectAlreadyActive,
-		WrongPolicy);
-
-      void deactivate_object(in ObjectId oid)
-	raises (ObjectNotActive, WrongPolicy);
-
-      // **************************************************
-      //
-      // reference creation operations
-      //
-      // **************************************************
-
-      Object create_reference (
-			       in RepositoryId intf )
-	raises (WrongPolicy);
-
-      Object create_reference_with_id (
-				       in ObjectId oid,
-				       in RepositoryId intf )
-	raises (WrongPolicy);
-
-
-      //--------------------------------------------------
-      //
-      // Identity mapping operations:
-      //
-      //--------------------------------------------------
-
-      ObjectId servant_to_id(in Servant p_servant)
-	raises (ServantNotActive, WrongPolicy);
-
-      Object servant_to_reference(in Servant p_servant)
-	raises (ServantNotActive, WrongPolicy);
-
-      Servant reference_to_servant(in Object reference)
-	raises (ObjectNotActive, WrongAdapter, WrongPolicy);
-
-      ObjectId reference_to_id(in Object reference)
-	raises (WrongAdapter, WrongPolicy);
-
-      Servant id_to_servant(in ObjectId oid)
-	raises (ObjectNotActive, WrongPolicy);
-
-      Object id_to_reference(in ObjectId oid)
-	raises (ObjectNotActive, WrongPolicy);
-
-    };
-
-
-  // **************************************************
-  //
-  // Current interface
-  //
-  // **************************************************
-
-  interface Current : CurrentBase
-    {
-      exception NoContext { };
-
-      POA get_POA() raises (NoContext);
-      ObjectId get_object_id() raises (NoContext);
-    };
-
-};
diff --git a/TAO/tao/poa_T.cpp b/TAO/tao/poa_T.cpp
deleted file mode 100644
index f81093139b1..00000000000
--- a/TAO/tao/poa_T.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#if !defined (POA_T_CPP)
-#define POA_T_CPP
-
-#include "tao/poa_T.h"
-
-template <class ACE_LOCKING_MECHANISM>
-TAO_Locked_POA<ACE_LOCKING_MECHANISM>::TAO_Locked_POA (const char *adapter_name,
-                                                       PortableServer::POAManager_ptr poa_manager,
-                                                       TAO_POA_Policies &policies,
-                                                       PortableServer::POA_ptr parent,
-                                                       CORBA::Environment &env)
-  : TAO_POA (adapter_name,
-             poa_manager,
-             policies,
-             parent,
-             env)
-{
-}
-
-template <class ACE_LOCKING_MECHANISM>
-TAO_Locked_POA<ACE_LOCKING_MECHANISM>::TAO_Locked_POA (const char *adapter_name,
-                                                       PortableServer::POAManager_ptr poa_manager,
-                                                       TAO_POA_Policies &policies,
-                                                       PortableServer::POA_ptr parent,
-                                                       TAO_Object_Table &active_object_table,
-                                                       CORBA::Environment &env)
-  : TAO_POA (adapter_name,
-             poa_manager,
-             policies,
-             parent,
-             active_object_table,
-             env)
-{
-}
-
-
-template <class ACE_LOCKING_MECHANISM> TAO_POA *
-TAO_Locked_POA<ACE_LOCKING_MECHANISM>::clone (const char *adapter_name,
-                                              PortableServer::POAManager_ptr poa_manager,
-                                              TAO_POA_Policies &policies,
-                                              PortableServer::POA_ptr parent,
-                                              CORBA::Environment &env)
-{
-  return new SELF (adapter_name,
-                   poa_manager,
-                   policies,
-                   parent,
-                   env);
-}
-
-
-template <class ACE_LOCKING_MECHANISM> TAO_POA *
-TAO_Locked_POA<ACE_LOCKING_MECHANISM>::clone (const char *adapter_name,
-                                              PortableServer::POAManager_ptr poa_manager,
-                                              TAO_POA_Policies &policies,
-                                              PortableServer::POA_ptr parent,
-                                              TAO_Object_Table &active_object_table,
-                                              CORBA::Environment &env)
-{
-  return new SELF (adapter_name,
-                   poa_manager,
-                   policies,
-                   parent,
-                   active_object_table,
-                   env);
-}
-
-
-template <class ACE_LOCKING_MECHANISM> ACE_Lock &
-TAO_Locked_POA<ACE_LOCKING_MECHANISM>::lock (void)
-{
-  return this->lock_;
-}
-
-template <class ACE_LOCKING_MECHANISM>
-TAO_Locked_POA_Manager<ACE_LOCKING_MECHANISM>::TAO_Locked_POA_Manager (void)
-  : TAO_POA_Manager ()
-{
-}
-
-
-template <class ACE_LOCKING_MECHANISM> TAO_POA_Manager *
-TAO_Locked_POA_Manager<ACE_LOCKING_MECHANISM>::clone (void)
-{
-  return new SELF;
-}
-
-template <class ACE_LOCKING_MECHANISM> ACE_Lock &
-TAO_Locked_POA_Manager<ACE_LOCKING_MECHANISM>::lock (void)
-{
-  return this->lock_;
-}
-
-#endif /* POA_T_CPP */
diff --git a/TAO/tao/poa_T.h b/TAO/tao/poa_T.h
deleted file mode 100644
index a125aa77d5b..00000000000
--- a/TAO/tao/poa_T.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#if !defined (POA_T_H)
-#define POA_T_H
-
-#include "tao/poa.h"
-
-template <class ACE_LOCKING_MECHANISM>
-class TAO_Locked_POA : public TAO_POA
-{
-public:
-
-  TAO_Locked_POA (const char *adapter_name,
-                  PortableServer::POAManager_ptr poa_manager,
-                  TAO_POA_Policies &policies,
-                  PortableServer::POA_ptr parent,
-                  CORBA::Environment &env);
-
-  TAO_Locked_POA (const char *adapter_name,
-                  PortableServer::POAManager_ptr poa_manager,
-                  TAO_POA_Policies &policies,
-                  PortableServer::POA_ptr parent,
-                  TAO_Object_Table &active_object_table,
-                  CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const char *adapter_name,
-                          PortableServer::POAManager_ptr poa_manager,
-                          TAO_POA_Policies &policies,
-                          PortableServer::POA_ptr parent,
-                          CORBA::Environment &env);
-
-  virtual TAO_POA *clone (const char *adapter_name,
-                          PortableServer::POAManager_ptr poa_manager,
-                          TAO_POA_Policies &policies,
-                          PortableServer::POA_ptr parent,
-                          TAO_Object_Table &active_object_table,
-                          CORBA::Environment &env);
-
-protected:
-
-  virtual ACE_Lock &lock (void);
-
-  ACE_Lock_Adapter<ACE_LOCKING_MECHANISM> lock_;
-
-  typedef TAO_Locked_POA<ACE_LOCKING_MECHANISM> SELF;
-};
-
-template <class ACE_LOCKING_MECHANISM>
-class TAO_Locked_POA_Manager : public TAO_POA_Manager
-{
-public:
-
-  TAO_Locked_POA_Manager (void);
-
-  virtual TAO_POA_Manager *clone (void);
-
-protected:
-
-  virtual ACE_Lock &lock (void);
-
-  ACE_Lock_Adapter<ACE_LOCKING_MECHANISM> lock_;
-
-  typedef TAO_Locked_POA_Manager<ACE_LOCKING_MECHANISM> SELF;
-};
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/poa_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("poa_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* POA_T_H */
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
deleted file mode 100644
index b46ae1a10f8..00000000000
--- a/TAO/tao/poa_macros.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Convenient macro for testing for deadlock, as well as for detecting
-// when mutexes fail.
-#define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  do { \
-    ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) \
-      { \
-        CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO); \
-        ENV.exception (exception); \
-        return; \
-      } \
-  } \
-  while (0);
-#define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  do { \
-    ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) \
-      { \
-        CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO); \
-        ENV.exception (exception); \
-        return; \
-      } \
-  } \
-  while (0);
-#define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  do { \
-    ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) \
-      { \
-        CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO); \
-        ENV.exception (exception); \
-        return RETURN; \
-      } \
-  } \
-  while (0);
-#define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  do { \
-    ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) \
-      { \
-        CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO); \
-        ENV.exception (exception); \
-        return RETURN; \
-      } \
-  } \
-  while (0);
-
diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h
deleted file mode 100644
index cd707705be2..00000000000
--- a/TAO/tao/singletons.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    singletons.h
-//
-// = DESCRIPTION
-//    Type declarations for singletons used in TAO.
-//
-// = AUTHOR
-//    Chris Cleeland, WU DOC
-//
-// = COPYRIGHT
-//    Copyright 1997
-// 
-// ============================================================================
-
-#if !defined (TAO_SINGLETONS_H)
-#  define TAO_SINGLETONS_H
-
-typedef ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_FACTORY;
-typedef ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRIMITIVE;
-typedef ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ANY;
-typedef ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_TYPECODE;
-typedef ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRINCIPAL;
-typedef ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_OBJREF;
-typedef ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRUCT;
-typedef ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_UNION;
-typedef ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRING;
-typedef ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_SEQUENCE;
-typedef ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ARRAY;
-typedef ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ALIAS;
-typedef ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_EXCEPT;
-typedef ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_WSTRING;
-
-#endif /* TAO_SINGLETONS_H */
diff --git a/TAO/tao/t-sizes.cpp b/TAO/tao/t-sizes.cpp
deleted file mode 100644
index 3da0e18d469..00000000000
--- a/TAO/tao/t-sizes.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-
-#define SHOWSIZE(t) ACE_OS::printf ("sizeof (%s) = %u\n", #t, sizeof(t));
-
-int
-main (int, char*[])
-{
-  SHOWSIZE (CORBA::Boolean);
-  SHOWSIZE (CORBA::Short);
-  SHOWSIZE (CORBA::Long);
-  SHOWSIZE (CORBA::LongLong);
-  SHOWSIZE (CORBA::Float);
-  SHOWSIZE (CORBA::Double);
-  SHOWSIZE (CORBA::LongDouble);
-}
diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld
deleted file mode 100644
index bbdea12fe5c..00000000000
--- a/TAO/tao/tao.bld
+++ /dev/null
@@ -1,88 +0,0 @@
-#!build
-default:
-	library
-	:defines=DEBUG
-Any.cpp
-	C++
-Arg_Shifter.cpp
-	C++
-CDR.cpp
-	C++
-Client_Strategy_Factory.cpp
-	C++
-Connect.cpp
-	C++
-debug.cpp
-	C++
-decode.cpp
-	C++
-deep_copy.cpp
-	C++
-deep_free.cpp
-	C++
-default_client.cpp
-	C++
-default_server.cpp
-	C++
-encode.cpp
-	C++
-Exception.cpp
-	C++
-GIOP.cpp
-	C++
-IIOP_Interpreter.cpp
-	C++
-IIOP_Object.cpp
-	C++
-IIOP_ORB.cpp
-	C++
-Marshal.cpp
-	C++
-NVList.cpp
-	C++
-Object.cpp
-	C++
-Object_KeyC.cpp
-	C++
-Object_Table.cpp
-	C++
-Operation_Table.cpp
-	C++
-ORB.cpp
-	C++
-ORB_Core.cpp
-	C++
-params.cpp
-	C++
-POA.cpp
-	C++
-POAC.cpp
-	C++
-POAS.cpp
-	C++
-Principal.cpp
-	C++
-Request.cpp
-	C++
-Sequence.cpp
-	C++
-Servant_Base.cpp
-	C++
-Server_Request.cpp
-	C++
-Server_Strategy_Factory.cpp
-	C++
-Stub.cpp
-	C++
-TAO.cpp
-	C++
-TAO_Internal.cpp
-	C++
-Timeprobe.cpp
-	C++
-Typecode.cpp
-	C++
-Typecode_Constants.cpp
-	C++
-timetest.cpp
-	C++
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
deleted file mode 100644
index 2fe6c6acab4..00000000000
--- a/TAO/tao/varout.h
+++ /dev/null
@@ -1,624 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    varout.h
-//
-// = DESCRIPTION
-//     Templates for _var and _out types
-//
-// = AUTHOR
-//
-//   Aniruddha Gokhale
-// ============================================================================
-
-#if !defined (TAO_VAROUT_H)
-#define TAO_VAROUT_H
-
-template <class T>
-class TAO_Fixed_var
-  // = TITLE
-  //    template<class T> TAO_Fixed_var
-  //
-  // = DESCRIPTION
-  //    Provides a parametrized version of the _var class for fixed
-  //    length data structs and unions.
-{
-public:
-  // = Operations
-
-  TAO_Fixed_var (void);
-  // default constructor
-
-  TAO_Fixed_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Fixed_var (const TAO_Fixed_var<T> &);
-  // copy constructor
-
-  ~TAO_Fixed_var (void);
-  // destructor
-
-  TAO_Fixed_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Fixed_var<T> &operator= (const TAO_Fixed_var<T> &);
-  // assignment from a TAO_Fixed_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = Operations for parameter passing modes.
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T _retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-  // instance
-};
-
-template <class T>
-class TAO_Variable_var
-  // = TITLE
-  //   template<class T> TAO_Variable_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for Variable
-  //   length data structs and unions.
-{
-public:
-  // = Operations
-
-  TAO_Variable_var (void);
-  // default constructor
-
-  TAO_Variable_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Variable_var (const TAO_Variable_var<T> &);
-  // copy constructor
-
-  ~TAO_Variable_var (void);
-  // destructor
-
-  TAO_Variable_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Variable_var<T> &operator= (const TAO_Variable_var<T> &);
-  // assignment from a TAO_Variable_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T *&out (void);
-  // for out parameter
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-};
-
-template <class T>
-class TAO_Sequence_var
-  // = TITLE
-  //   template<class T> TAO_Sequence_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for Sequence
-  //   data type.  CORBA sequences are considered to always be
-  //   variable length.
-{
-public:
-  // = Operations
-
-  TAO_Sequence_var (void);
-  // default constructor
-
-  TAO_Sequence_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Sequence_var (const TAO_Sequence_var &);
-  // copy constructor
-
-  ~TAO_Sequence_var (void);
-  // destructor
-
-  TAO_Sequence_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Sequence_var<T> &operator= (const TAO_Sequence_var &);
-  // assignment from a TAO_Sequence_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = additional operators for sequence
-
-  T::ElemType &operator[] (CORBA::ULong);
-  // operator [] that passes the argument to the [] operator of T
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T *&out (void);
-  // for out parameter
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-  // seq instance
-};
-
-template <class T, class T_ptr>
-class TAO_Object_var
-  // = TITLE
-  //   template<class T, class T_ptr> TAO_Object_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_Object_var (void);
-  // default constructor
-
-  TAO_Object_var (T_ptr);
-  // constructor from a pointer to T
-
-  TAO_Object_var (const TAO_Object_var<T,T_ptr> &);
-  // copy constructor
-
-  ~TAO_Object_var (void);
-  // destructor
-
-  TAO_Object_var<T_ptr> &operator= (T_ptr);
-  // assignment from a pointer to T
-
-  TAO_Object_var<T_ptr> &operator= (const TAO_Object_var<T,T_ptr> &);
-  // assignment from a TAO_Object_var
-
-  T_ptr operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T_ptr &() const;
-  // cast operator
-
-  operator T_ptr &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T_ptr &in (void);
-  // for in type parameter
-
-  T_ptr &inout (void);
-  // for inout type parameter
-
-  T_ptr &out (void);
-  // for out parameter
-
-  T_ptr _retn (void);
-  // for return type
-
-private:
-  T_ptr ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_FixedArray_var
-  // = TITLE
-  //   template<class T, class T_slice> TAO_FixedArray_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // = Operations
-
-  TAO_FixedArray_var (void);
-  // default constructor
-
-  TAO_FixedArray_var (T_slice *);
-  // constructor from a pointer to T
-
-  TAO_FixedArray_var (const TAO_FixedArray_var<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_FixedArray_var (void);
-  // destructor
-
-  TAO_FixedArray_var<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_FixedArray_var<T, T_slice> &operator= (const TAO_FixedArray_var<T, T_slice> &);
-  // assignment from a TAO_FixedArray_var
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_VariableArray_var
-  // = TITLE
-  //   template<class T, class T_slice> TAO_VariableArray_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // = Operations
-
-  TAO_VariableArray_var (void);
-  // default constructor
-
-  TAO_VariableArray_var (T_slice *);
-  // constructor from a pointer to T
-
-  TAO_VariableArray_var (const TAO_VariableArray_var<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_VariableArray_var (void);
-  // destructor
-
-  TAO_VariableArray_var<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_VariableArray_var<T, T_slice> &operator= (const TAO_VariableArray_var<T, T_slice> &);
-  // assignment from a TAO_VariableArray_var
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T_slice *&out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_FixedArray_forany
-  // = TITLE
-  //   template<class T, class T_slice> TAO_FixedArray_forany
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_FixedArray_forany (void);
-  // default constructor
-
-  TAO_FixedArray_forany (T_slice *, CORBA::Boolean nocopy=0);
-  // constructor from a pointer to T slice
-
-  TAO_FixedArray_forany (const TAO_FixedArray_forany<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_FixedArray_forany (void);
-  // destructor
-
-  TAO_FixedArray_forany<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_FixedArray_forany<T, T_slice> &operator= (const TAO_FixedArray_forany<T, T_slice> &);
-  // assignment from a TAO_FixedArray_forany
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // =operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_VariableArray_forany
-  // = TITLE
-  //   template<class T, class T_slice> TAO_VariableArray_forany
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_VariableArray_forany (void);
-  // default constructor
-
-  TAO_VariableArray_forany (T_slice *, CORBA::Boolean nocopy=0);
-  // constructor from a pointer to T slice
-
-  TAO_VariableArray_forany (const TAO_VariableArray_forany<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_VariableArray_forany (void);
-  // destructor
-
-  TAO_VariableArray_forany<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_VariableArray_forany<T, T_slice> &operator= (const TAO_VariableArray_forany<T, T_slice> &);
-  // assignment from a TAO_VariableArray_forany
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // =operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T_slice *&out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_var>
-class TAO_Variable_out
-  // = TITLE
-  //   TAO_Variable_out
-  //
-  // = Description
-  //  _out class definition for variable size struct/union.
-{
-public:
-  TAO_Variable_out (T *&);
-  // constructor
-
-  TAO_Variable_out (T_var &);
-  // constructor
-
-  TAO_Variable_out (TAO_Variable_out <T,T_var> &);
-  // copy constructor
-
-  TAO_Variable_out<T,T_var> &operator= (TAO_Variable_out<T,T_var> &);
-  // assignment operator
-
-  TAO_Variable_out<T,T_var> &operator= (T *);
-  // assignment
-
-  operator T *&();
-  // cast
-
-  T *&ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T *operator-> (void);
-  // arrow operator (smart pointer)
-
-private:
-  T *&ptr_;
-};
-
-template <class T, class T_var>
-class TAO_Sequence_out
-  // = TITLE
-  //   TAO_Sequence_out
-  //
-  // = Description
-  //   _out class definition for Sequence
-{
-public:
-  TAO_Sequence_out (T *&);
-  // constructor
-
-  TAO_Sequence_out (T_var &);
-  // constructor
-
-  TAO_Sequence_out (TAO_Sequence_out <T,T_var> &);
-  // copy constructor
-
-  TAO_Sequence_out<T,T_var> &operator= (TAO_Sequence_out<T,T_var> &);
-  // assignment operator
-
-  TAO_Sequence_out<T,T_var> &operator= (T *);
-  // assignment
-
-  operator T *&();
-  // cast
-
-  T *&ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T *operator-> (void);
-  // arrow operator (smart pointer)
-
-  T::ElemType operator[] (CORBA::ULong);
-  // return the element at index i
-
-private:
-  T *&ptr_;
-};
-
-template <class T_ptr, class T_var>
-class TAO_Object_out
-{
-  // = TITLE
-  //   TAO_Object_out
-  //
-  // = Description
-  //   _out class definition for Object
-public:
-  TAO_Object_out (T_ptr &);
-  // constructor
-
-  TAO_Object_out (T_var &);
-  // constructor
-
-  TAO_Object_out (TAO_Object_out <T_ptr,T_var> &);
-  // copy constructor
-
-  TAO_Object_out<T_ptr,T_var> &operator= (TAO_Object_out<T_ptr,T_var> &);
-  // assignment operator
-
-  TAO_Object_out<T_ptr,T_var> &operator= (const T_var &);
-  // assignment operator
-
-  TAO_Object_out<T_ptr,T_var> &operator= (T_ptr);
-  // assignment
-
-  operator T_ptr &();
-  // cast
-
-  T_ptr &ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T_ptr operator-> (void);
-  // arrow operator (smart pointer)
-
-private:
-  T_ptr &ptr_;
-};
-
-#endif /* TAO_VAROUT_H */
diff --git a/TAO/taoconfig.mk b/TAO/taoconfig.mk
deleted file mode 100644
index 424d36476ef..00000000000
--- a/TAO/taoconfig.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Common makefile definitions for all applications
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDFLAGS := $(patsubst -L$(ACE_ROOT)/ace, -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace, $(LDFLAGS))
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
diff --git a/TAO/tests/CDR/CDR.dsw b/TAO/tests/CDR/CDR.dsw
deleted file mode 100644
index 827e0a5c2e5..00000000000
--- a/TAO/tests/CDR/CDR.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "basic_types"=.\basic_types.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "tc"=.\tc.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
deleted file mode 100644
index c5b56c1563e..00000000000
--- a/TAO/tests/CDR/Makefile
+++ /dev/null
@@ -1,684 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-PROG_SRCS = \
-	basic_types.cpp \
-	tc.cpp \
-	growth.cpp \
-
-LSRC = $(PROG_SRCS)
-
-BASIC_TYPES_OBJS = basic_types.o
-TC_OBJS = tc.o
-GROWTH_OBJS = growth.o
-
-BIN = basic_types tc growth
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-basic_types: $(addprefix $(VDIR),$(BASIC_TYPES_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-tc: $(addprefix $(VDIR),$(TC_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-growth: $(addprefix $(VDIR),$(GROWTH_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/basic_types.o .obj/basic_types.so .shobj/basic_types.o .shobj/basic_types.so: basic_types.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/tc.o .obj/tc.so .shobj/tc.o .shobj/tc.so: tc.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/growth.o .obj/growth.so .shobj/growth.o .shobj/growth.so: growth.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/CDR/README b/TAO/tests/CDR/README
deleted file mode 100644
index 5e159a3d469..00000000000
--- a/TAO/tests/CDR/README
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id$
-
-This directory contains two simple tests for the CDR stream class;
-
-+ basic_types: simply encodes a lot of CORBA::Octets, 
-    CORBA::Short and CORBA::Long into a CDR stream and then decodes
-    them; verifying that the same results are obtained.
-
-+ tc: TAO implements TypeCodes using a CDR buffer (this was
-    inherited from the Sun IIOP engine), this test verifies thatn some
-    of the basic TypeCodes actually are able to interpret their CDR
-    buffers.
-
-	Both tests take no arguments and return 0 on success.
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
deleted file mode 100644
index f7c5762328b..00000000000
--- a/TAO/tests/CDR/basic_types.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    basic_types.cpp
-//
-// = DESCRIPTION
-//   Test the basic funcionality of a CDR stream by encoding some
-//   basic types and then decoding them again.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "tao/debug.h"
-
-static const int n = 4096;
-static int nloops = 100;
-
-struct CDR_Test_Types
-{
-  CDR_Test_Types (void);
-
-  CORBA::Octet o;
-  CORBA::Short s;
-  CORBA::Long l;
-  CORBA::String str;
-  CORBA::Double d;
-  
-  enum {
-    ARRAY_SIZE = 10
-  };
-
-  CORBA::Short a[ARRAY_SIZE];
-};
-
-CDR_Test_Types::CDR_Test_Types (void)
-:
-  o (1), s (2), l (4), str ("abc"), d (8)
-{
-  for (int i = 0; i < CDR_Test_Types::ARRAY_SIZE; ++i)
-    {
-      a[i] = i;
-    }
-}
-
-static int
-test_put (TAO_OutputCDR &cdr, CDR_Test_Types &test_types)
-{
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.write_octet (test_types.o) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_octet[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_short (test_types.s) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_short[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_octet (test_types.o) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_octet-2[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_long (test_types.l) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_long[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_long (test_types.l) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_long-2[%d] failed\n",
-                           i),
-                          1);
-#if 0
-      if (cdr.write_string (test_types.str) == 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "write_string[%d] failed\n",
-			   i),
-			  1);
-#endif
-    }
-
-  return 0;
-}
-
-static int
-test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
-{
-  CORBA::Octet xo;
-  CORBA::Short xs;
-  CORBA::Long xl;
-  CORBA::String xstr;
-
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.read_octet (xo) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_octet[%d] failed\n",
-                           i),
-                          1);
-      if (xo != test_types.o)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "octet[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_short (xs) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_short[%d] failed\n",
-                           i), 1);
-      if (xs != test_types.s)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "short[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_octet (xo) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_octet-2[%d] failed\n",
-                           i),
-                          1);
-      if (xo != test_types.o)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "octet-2[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_long (xl) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_long[%d] failed\n",
-                           i),
-                          1);
-      if (xl != test_types.l)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "long[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_long (xl) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_long-2[%d] failed\n",
-                           i),
-                          1);
-      if (xl != test_types.l)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "long-2[%d] differs\n",
-                           i),
-                          1);
-#if 0
-      if (cdr.read_string (xstr) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_string2[%d] failed\n",
-                           i),
-                          1);
-      if (ACE_OS::strcmp (xstr, test_types.str) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "string[%d] differs\n",
-                           i),
-                          1);
-      CORBA::string_free (xstr);
-#endif
-    }
-
-  return 0;
-}
-
-int
-main (int, char *[])
-{
-  for (int i = 0; i < nloops; ++i)
-    {
-      TAO_OutputCDR output;
-      CDR_Test_Types test_types;
- 
-      if (test_put (output, test_types) != 0)
-	{
-	  return 1;
-	}
-      TAO_InputCDR input (output);
-#if 0
-      ACE_DEBUG ((LM_DEBUG, "Output CDR: \n"));
-      ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
-      ACE_DEBUG ((LM_DEBUG, "Input CDR: \n"));
-      ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
-#endif
-      if (test_get (input, test_types) != 0)
-	{
-	  return 1;
-	}
-    }
-  return 0;
-}
diff --git a/TAO/tests/CDR/basic_types.dsp b/TAO/tests/CDR/basic_types.dsp
deleted file mode 100644
index 323b1f2e194..00000000000
--- a/TAO/tests/CDR/basic_types.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="basic_types" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=basic_types - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "basic_types.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "basic_types.mak" CFG="basic_types - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "basic_types - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "basic_types - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "basic_types - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "basic_types - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "basic_types - Win32 Release"

-# Name "basic_types - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\basic_types.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
deleted file mode 100644
index 9424cd4f40f..00000000000
--- a/TAO/tests/CDR/growth.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    growth.cpp
-//
-// = DESCRIPTION
-//   Helps in measuring how the growth strategy affects the
-//   performance of CDR streams.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-
-#include "tao/corba.h"
-#include "tao/debug.h"
-
-static int
-test_write (TAO_OutputCDR &cdr, int n)
-{
-  CORBA::Long l = 0xdeadbeef;
-
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.write_long (l) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_long[%d] failed\n",
-                           i),
-                          1);
-    }
-
-  return 0;
-}
-
-static int
-test_read (TAO_InputCDR &cdr, int n)
-{
-  CORBA::Long xl;
-
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.read_long (xl) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_long[%d] failed\n",
-                           i),
-                          1);
-    }
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int n = 100;
-  int low = 64;
-  int hi = 4096;
-  int s = 4;
-
-  ACE_Get_Opt get_opt (argc, argv, "n:l:h:s:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-        {
-	case 'n':
-	  n = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'l':
-	  low = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'h':
-	  hi = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 's':
-	  s = ACE_OS::atoi (get_opt.optarg);
-	  break;
-        case '?':
-        default:
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "-l low "
-                      "-h high "
-		      "-s step "
-		      "-n n "
-		      "\n"
-		      "Writes and then reads longs to a CDR stream "
-		      "starting from <low> up to <high> incrementing "
-		      "by <step>, at each step run <n> iterations to "
-		      "average."
-                      "\n",
-                      argv[0]));
-          return -1;
-        }
-    }
-
-  for (int x = low; x <= hi; x += s)
-    {
-      ACE_High_Res_Timer writing;
-      ACE_High_Res_Timer reading;
-
-      for (int i = 0; i < n; ++i)
-	{
-	  writing.start ();
-	  TAO_OutputCDR output;
-
-	  if (test_write (output, x) != 0)
-	    {
-	      return 1;
-	    }
-	  writing.stop();
-
-	  reading.start ();
-	  TAO_InputCDR input (output);
-	  if (test_read (input, x) != 0)
-	    {
-	      return 1;
-	    }
-	  reading.stop ();
-	}
-      double m = n * x;
-      ACE_hrtime_t wusecs;
-      writing.elapsed_microseconds (wusecs);
-      ACE_hrtime_t rusecs;
-      reading.elapsed_microseconds (rusecs);
-
-      double write_average = wusecs / m;
-      double read_average = rusecs / m;
-      ACE_OS::printf ("AVE: %d %f %f\n",
-		      x, write_average, read_average);
-    }
-  return 0;
-}
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
deleted file mode 100644
index 8b4bcae09f3..00000000000
--- a/TAO/tests/CDR/tc.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/CDR
-//
-// = FILENAME
-//    tc.cpp
-//
-// = DESCRIPTION
-//   Verify that the basic typecodes are able to interpret their CDR
-//   buffers.
-//
-// = AUTHORS
-//    Carlos O'Ryan
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-// In this version of TAO typecodes are based on CDR, we have to
-// verify that CDR offers the services needed for Typecode...
-
-static CORBA::TypeCode_ptr tcs[]= 
-{
-  CORBA::_tc_null,
-  CORBA::_tc_void,
-  CORBA::_tc_short,
-  CORBA::_tc_long,
-  CORBA::_tc_ushort,
-  CORBA::_tc_ulong,
-  CORBA::_tc_float,
-  CORBA::_tc_double,
-  CORBA::_tc_boolean,
-  CORBA::_tc_char,
-  CORBA::_tc_octet,
-  CORBA::_tc_any,
-  CORBA::_tc_TypeCode,
-  CORBA::_tc_Principal,
-  CORBA::_tc_Object,
-  // CORBA::_tc_struct,
-  // CORBA::_tc_union,
-  // CORBA::_tc_enum,
-  CORBA::_tc_string,
-  // CORBA::_tc_sequence,
-  // CORBA::_tc_array,
-  // CORBA::_tc_alias,
-  // CORBA::_tc_except,
-  CORBA::_tc_longlong,
-  CORBA::_tc_ulonglong,
-  CORBA::_tc_longdouble,
-  CORBA::_tc_wchar,
-  CORBA::_tc_wstring,
-  CORBA::_tc_UNKNOWN,
-  CORBA::_tc_BAD_PARAM,
-  CORBA::_tc_NO_MEMORY,
-  CORBA::_tc_IMP_LIMIT,
-  CORBA::_tc_COMM_FAILURE,
-  CORBA::_tc_INV_OBJREF,
-  CORBA::_tc_OBJECT_NOT_EXIST,
-  CORBA::_tc_NO_PERMISSION,
-  CORBA::_tc_INTERNAL,
-  CORBA::_tc_MARSHAL,
-  CORBA::_tc_INITIALIZE,
-  CORBA::_tc_NO_IMPLEMENT,
-  CORBA::_tc_BAD_TYPECODE,
-  CORBA::_tc_BAD_OPERATION,
-  CORBA::_tc_NO_RESOURCES,
-  CORBA::_tc_NO_RESPONSE,
-  CORBA::_tc_PERSIST_STORE,
-  CORBA::_tc_BAD_INV_ORDER,
-  CORBA::_tc_TRANSIENT,
-  CORBA::_tc_FREE_MEM,
-  CORBA::_tc_INV_IDENT,
-  CORBA::_tc_INV_FLAG,
-  CORBA::_tc_INTF_REPOS,
-  CORBA::_tc_BAD_CONTEXT,
-  CORBA::_tc_OBJ_ADAPTER,
-  CORBA::_tc_DATA_CONVERSION,
-  CORBA::_tc_Bounds,
-  CORBA::_tc_BadKind
-};
-
-static int n = sizeof (tcs) / sizeof (tcs[0]);
-
-int
-main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-					    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      for (CORBA::TypeCode_ptr *i = tcs;
-           i != tcs + n;
-           ++i)
-	{
-	  CORBA::TypeCode_ptr tc = *i;
-	  
-	  CORBA::TCKind k = tc->kind (TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
-
-	  switch (k)
-	    {
-	    case CORBA::tk_objref:
-	    case CORBA::tk_struct:
-	    case CORBA::tk_union:
-	    case CORBA::tk_enum:
-	    case CORBA::tk_alias:
-	    case CORBA::tk_except:
-	      {
-		const char *id = tc->id (TAO_TRY_ENV);
-		TAO_CHECK_ENV;
-
-		const char *name = tc->name (TAO_TRY_ENV);
-		TAO_CHECK_ENV;
-		
-		CORBA::ULong length = 0; 
-                // tc->length (TAO_TRY_ENV);
-		TAO_CHECK_ENV;
-
-		ACE_DEBUG ((LM_DEBUG,
-			    "ID = '%s'\n"
-			    "%{%{ NAME = %s%$"
-			    " KIND = %d%$"
-			    " LENGTH = %d"
-			    "%}%}\n",
-			    id,
-                            name,
-                            k,
-                            length));
-                break;
-	      }
-	    default:
-              ACE_DEBUG ((LM_DEBUG,
-                          "basic type: %d\n",
-                          k));
-              break;
-	    }
-	}
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("TC");
-    }
-  TAO_ENDTRY;
-  
-  return 0;
-}
diff --git a/TAO/tests/CDR/tc.dsp b/TAO/tests/CDR/tc.dsp
deleted file mode 100644
index bc697fe1201..00000000000
--- a/TAO/tests/CDR/tc.dsp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="tc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=tc - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "tc.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "tc.mak" CFG="tc - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "tc - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "tc - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "tc - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "tc - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "tc - Win32 Release"

-# Name "tc - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\tc.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/tests/Cubit/COOL/IDL_Cubit/Makefile
deleted file mode 100644
index 12f5ed52a92..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the CHORUS COOL Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-IDL_SRC = cubit.cpp cubit.H sk_cubit.C sk_cubit.H 
-
-SRC = $(IDL_SRC) cubit_i.cpp server.cpp client.cpp tmplinst.cpp
-
-SVR_OBJS = cubit_i.o server.o cubit.o tmplinst.o
-
-CLT_OBJS = client.o cubit.o tmplinst.o
-
-LDLIBS	 = -lm -lOrb-mt -lposix4 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	CHORUS related macros and target settings.
-#----------------------------------------------------------------------------
-
-CHORUS_BINDIR    = $(CHORUS_ROOT)/bin
-CHORUS_LIBDIR    = $(CHORUS_ROOT)/lib
-CHORUS_INCDIR    = $(CHORUS_ROOT)/include
-
-CPPFLAGS += -I$(CHORUS_INCDIR) -I$(CHORUS_ROOT)
-LDFLAGS  += -L$(CHORUS_LIBDIR) -R $(CHORUS_LIBDIR) -L$(ACE)/ace
-IDLFLAGS = --stub-header --stub-impl --skeleton-header --skeleton-impl --no-local --binding Cubit Cubit_i --binding Cubit_Factory Cubit_Factory_i 
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: $(IDL_SRC) server client
-
-$(IDL_SRC): cubit.idl
-	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-/bin/mv cubit.C cubit.cpp
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit.o .obj/cubit.so .shobj/cubit.o .shobj/cubit.so: cubit.cpp cubit.H
-.obj/sk_cubit.o .obj/sk_cubit.so .shobj/sk_cubit.o .shobj/sk_cubit.so: sk_cubit.C
-.obj/cubit_i.o .obj/cubit_i.so .shobj/cubit_i.o .shobj/cubit_i.so: cubit_i.cpp cubit_i.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i cubit.H sk_cubit.H
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i cubit_i.h cubit.H \
- sk_cubit.H sk_cubit.C
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i client.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/cool.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/api/api.H \
- sk_cubit.H
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubit.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/cool.H
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/README b/TAO/tests/Cubit/COOL/IDL_Cubit/README
deleted file mode 100644
index 5987e0d6df2..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/README
+++ /dev/null
@@ -1,34 +0,0 @@
-This is the cubit example that uses the TAO IDL compiler to generate
-the stubs and skeletons. Additional features include presence of a
-factory to create Cubit objects and testing the _bind call to get the
-factory object reference.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-% server [-d] [-ORBhost <serverhost>] [-ORBport <portnum>]
-              [-n <number-of-cubit-objects>]
-
-The server cubit factory maintained num_of_cubit objects (default =
-1). They are assigned keys that look like "key0", "key1", ...
-
-When the server is started and you have used the -d flag, you should
-see as the first line of output something that looks like
-	iiop:1.0//serverhost:10013/factory (using -ORBobjrefstyle url)
-or
-	IOR:000000000000001649444c3a43756269745... (using default -ORBobjrefstyle ior)
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-client:
--------
-
-% client [-d] -h <hostname> -p <port> -k <cubit key> -n <iterations>
-
-cubit_key corresponds to "key0", "key1", ...
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/client.cpp b/TAO/tests/Cubit/COOL/IDL_Cubit/client.cpp
deleted file mode 100644
index 8ddb3e88602..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/client.cpp
+++ /dev/null
@@ -1,747 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Copyright 1994-1995 by Sun Microsystems Inc.
-//    and
-//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Profile_Timer.h"
-#include "ace/Env_Value_T.h"
-#include "client.h"
-
-#include "api/api.H"
-#include "cubit.H"
-#include "sk_cubit.H"
-
-// Constants
-u_int _debug_level = 0;
-const u_int DEFAULT_PORT = 3000;
-CORBA::Environment Cubit_Client::env_;
-
-
-// Constructor.
-
-#define quote(x) #x
-
-Cubit_Client::Cubit_Client (void)
-  : cubit_factory_key_ ("factory"),
-    cubit_key_ ("key0"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    loop_count_ (250),
-    exit_later_ (0),
-    factory_ (Cubit_Factory::_nil ()),
-    objref_ (CORBA::Object::_nil ()),
-    cubit_ (Cubit::_nil ()),
-    orb_ptr_ (0),
-    call_count_ (0),
-    error_count_ (0),
-    portnum_(DEFAULT_PORT)
-{
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:h:p:k:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        _debug_level++;
-        break;
-      case 'n':			// loop count
-        loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'k':			// stringified objref
-        cubit_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        this->exit_later_++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-h hostname]"
-                           " [-p port]"
-                           " [-x]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Exercise the union.  Cube a union.
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  CORBA::Environment env;
-  Cubit::oneof u, r;
-
-  this->call_count_++;
-
-  u.l (3); // use the long union branch
-
-  // Cube a "union" ...
-  r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube union ..."));
-      u.l (u.l () * u.l () * u.l ()) ;
-
-      if (u.l () != r.l ())
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-
-    }
-
-  this->call_count_++;
-
-  u._d (Cubit::e_3rd);
-#if 0
-  u.cm ().l = this->func (i);
-  u.cm ().s = this->func (i);
-  u.cm ().o = this->func (i);
-#endif
-
-  u.cm ().l = 7;
-  u.cm ().s = 5;
-  u.cm ().o = 3;
-
-  // Cube another "union" which uses the default arm ... NOT tested yet
-  r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube union ..."));
-      u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
-      u.cm ().s = u.cm ().s * u.cm ().s * u.cm ().s;
-      u.cm ().o = u.cm ().o * u.cm ().o * u.cm ().o;
-
-      if (u.cm ().l != r.cm ().l
-	  || u.cm ().s != r.cm ().s
-	  || u.cm ().o != r.cm ().o)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Exercise the union using dii.
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-
-  this->call_count_++;
-
-  req = this->cubit_->_request ((CORBA::String) "cube_union", this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-
-      this->print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::oneof	*u, r;
-
-  u = new Cubit::oneof;
-  u->_d (Cubit::e_3rd);
-
-  u->cm ().l = 5;
-  u->cm ().s = -7;
-  u->cm ().o = 3;
-
-  CORBA::Any tmp_arg (Cubit::_tc_oneof, u, CORBA_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA_ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_oneof, 0, CORBA_TRUE);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      this->error_count_++;
-      this->print_exception ("cube_union_dii invoke", *req->env ());
-      CORBA::release (req);
-      return;
-    }
-
-  r = *(Cubit::oneof *) req->result ()->value ()->value ();
-
-  if (r.cm ().o != 27 || r.cm ().l != 125 || r.cm ().s != -343)
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG, "cube_union_dii ... success!!"));
-
-  CORBA::release (req);
-  delete u;
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->cube_short (arg_short, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube short:  %d --> %d\n",
-		    arg_short,
-		    ret_short));
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-		      (CORBA::Short) this->func (i),
-		      ret_short));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->cube_octet (arg_octet, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube octet:  %d --> %d\n", arg_octet, ret_octet));
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-	ACE_DEBUG ((LM_DEBUG,
-		    "** cube_octet (%d) ERROR (--> %d)\n",
-		    (CORBA::Octet) this->func (i),
-		    ret_octet));
-	this->error_count_++;
-      }
-    }
-}
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->cube_long (arg_long, this->env_);;
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube long:  %d --> %d\n", arg_long, ret_long));
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-	ACE_ERROR ((LM_ERROR,
-		    "** cube_long (%ld) ERROR (--> %ld)\n",
-		    (CORBA::Long) this->func (i),
-		    ret_long));
-	this->error_count_++;
-      }
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit::Many arg_struct;
-  Cubit::Many ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->cube_struct (arg_struct, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      if (_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "cube struct ..."));
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct.l
-	  || arg_struct.s != ret_struct.s
-	  || arg_struct.o != ret_struct.o)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req =
-    this->cubit_->_request ((CORBA::String) "cube_struct", this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::Many arg;
-  Cubit::Many result;
-
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-
-  CORBA::Any tmp_arg (Cubit::_tc_Many, &arg, CORBA_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA_ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_Many, 0, CORBA_TRUE);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      this->print_exception ("DII invoke sending struct", *req->env ());
-      CORBA::release (req);
-      return;
-    }
-
-  result = *(Cubit::Many *) req->result ()->value ()->value ();
-
-  if (result.o != 27 || result.l != 125 || result.s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG, "DII cube_struct ... success!!"));
-
-  CORBA::release (req);
-}
-
-void
-Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  double tmp;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "%s:\n",
-	      call_name));
-
-  if (this->call_count_ > 0  &&  this->error_count_ == 0)
-    {
-      tmp = 1000 / elapsed_time.real_time;
-
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= this->call_count_;
-      elapsed_time.user_time /= this->call_count_;
-      elapsed_time.system_time /= this->call_count_;
-
-      tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t= %0.06f ms, \n\t"
-		  "user_time\t= %0.06f ms, \n\t"
-		  "system_time\t= %0.06f ms\n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		  tmp < 0.0? 0.0 : tmp));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "\t%d calls, %d errors\n",
-	      this->call_count_,
-	      this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-
-#if 0   // this test is segfaulting, comment for now.
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-  // ------------------>
-  // Two more tests, using the "cube_union" function
-
-  // unions using stubs
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_stub ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-  // union DII
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_dii ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-#endif
-  if (this->exit_later_)
-    {
-      this->cubit_->please_exit (this->env_);
-      this->print_exception ("server, please ACE_OS::exit", this->env_);
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  CORBA::release (this->factory_);
-  CORBA::release (this->cubit_);
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Retrieve the ORB.
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-				    0,
-                                    this->env_);
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return -1;
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("ORB initialization");
-      return -1;
-    }
-
-  if (this->cubit_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-               "%s: must specify an object reference using -k <key>\n",
-		       this->argv_[0]),
-		      -1);
-
-  // Retrieve a factory objref.
-  char ior[BUFSIZ];
-  sprintf ( ior, "cool-tcp://%s:%d", this->hostname_, this->portnum_ );
-
-  ACE_DEBUG ((LM_DEBUG, "ior is \"%s\"\n", ior));
-
-  COOL::EOABindingData bindingData (ior);
-
-  this->factory_ = Cubit_Factory::_bind(bindingData, this->env_);
-
-  //  this->objref_ = Cubit_Factory::_bind (this->hostname_,
-  //                                      this->portnum_,
-  //                                      this->cubit_factory_key_,
-  //                                      this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("Cubit_Factory::_bind");
-      return -1;
-    }
-
-  if (CORBA::is_nil (this->factory_) == CORBA_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " _bind returned null object for host (%s), port (%d)\n",
-                       this->hostname_,
-                       this->portnum_),
-                      -1);
-
-  // Narrow the CORBA::Object reference to the stub object, checking
-  // the type along the way using _is_a.  There is really no need to
-  // narrow <objref> because <_bind> will return us the
-  // <Cubit_Factory> pointer.  However, we do it so that we can
-  // explicitly test the _narrow function.
-  
-//this->factory_ = Cubit_Factory::_narrow (this->objref_, this->env_);
-
-  //CORBA::release (this->objref_);
-  // this->objref_->Release ();
-
-  //  if (this->factory_ == 0)
-  //    ACE_ERROR_RETURN ((LM_ERROR,
-  //		       " (%P|%t) Unable to narrow object reference to a Cubit_Factory_ptr.\n"),
-  //		      -1);
-
-  // Now retrieve the Cubit obj ref corresponding to the key.
-  this->cubit_ =
-    this->factory_->make_cubit (this->cubit_key_, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->print_exception ("make_cubit");
-      return -1;
-    }
-
-  if (CORBA::is_nil (this->cubit_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null cubit objref returned by factory\n"),
-                      -1);
-
-  return 0;
-}
-
-void Cubit_Client::print_exception (const char * str,
-				    const CORBA_Environment &env)
-{
-  CORBA::SystemException* ex;
-    
-  ex = CORBA::SystemException::_narrow(env.exception());
-  
-  if (ex) 
-    {
-      CORBA::String_var msg = ex->message();
-      fprintf(stderr, "%s: %s.\n", str, (const char *) msg);
-    } 
-  else 
-    {
-      fprintf(stderr, "%s: Unknown user exception.\n", str);
-    }
-}
-
-
-
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
-
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Env_Value<unsigned long>;
-template class ACE_Env_Value<unsigned short>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Env_Value<unsigned long>
-#pragma instantiate ACE_Env_Value<unsigned short>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/client.h b/TAO/tests/Cubit/COOL/IDL_Cubit/client.h
deleted file mode 100644
index 94cc36a14bd..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/client.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Copyright 1994-1995 by Sun Microsystems Inc.
-//    and
-//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "cubit.H"
-
-class Cubit_Client
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-  void print_exception (const char * str,
-			const CORBA_Environment &env=Cubit_Client::env_);
-			
-private:
-  int func (u_int i);
-  // simple function that returns the substraction of 117 from the parameter.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // prints the time stats
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-
-  void cube_union_dii (void);
-  // Exercise the union using dii.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long
-
-  void cube_octet (int i);
-  // Cube an octet
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_sequence (int i);
-  // Cube a sequence.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  const char *cubit_factory_key_;
-  // Key of factory obj ref.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::UShort portnum_;
-  // default port number of server.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  Cubit_Factory_ptr factory_;
-  // factory pointer for cubit.
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-
-  static CORBA::Environment env_;
-  // Environment variable
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  u_int call_count_;
-  // # of calls made to functions
-
-  u_int error_count_;
-  // #  of errors incurred in the lifetime of the application.
-};
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit.idl b/TAO/tests/Cubit/COOL/IDL_Cubit/cubit.idl
deleted file mode 100644
index 9ddc2d8954f..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit.idl
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-interface Cubit
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-
-{
-  octet	cube_octet (in octet o);
-  // cube an octet
-
-  short	cube_short (in short s);
-  // cube a short
-
-  long	cube_long (in long l);
-  // cube a long
-
-  struct Many
-  {
-    octet o;		// + 3 bytes padding (normally) ...
-    long l;
-    short s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many cube_struct (in Many values);
-  // Cube a struct
-
-  enum discrim
-  {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd
-  };
-  // Enumeration of the different elements in a union.
-
-  union oneof switch (discrim)
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet o;
-    case e_1st:
-      short s;
-    case e_2nd:
-      long l;
-    case e_3rd:
-      Many cm;
-
-      // default:
-      // Many cm;
-    };
-  // Union of different types.
-
-  oneof	cube_union (in oneof values);
-  // cube a union.
-
-  oneway void please_exit ();
-  // shutdown the application.
-};
-
-interface Cubit_Factory
-  // = TITLE
-  //    Creates Cubit objects
-{
-  Cubit make_cubit (in string key);
-};
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.cpp b/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.cpp
deleted file mode 100644
index cf4a3c99630..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    cubit_i.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "cubit_i.h"
-#include <api/api.H>
-#include <api/binding.H>
-#include <corba/eoa.H>
-#include <corba/eorb.H>
-
-extern void print_exception (const CORBA_Environment &env, const char * str);
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (const char *key, int numobjs)
-{
-  // Create implementation object with user specified key.
-
-  this->numobjs_ = numobjs;
-  this->my_cubit_ = new Cubit_i_ptr [this->numobjs_];
-
-  static char obj_str [MAXNAMELEN];
-
-  for (u_int i = 0; i < this->numobjs_; i++)
-    {
-      ACE_OS::memset (obj_str, '\0', MAXNAMELEN);
-      ACE_OS::sprintf (obj_str, "key%d", i);
-
-      my_cubit_[i] = new Cubit_i (obj_str);
-
-      if (my_cubit_[i] == 0)
-        ACE_ERROR ((LM_ERROR,
-                    " (%P|%t) Unable to create implementation object%d\n",
-                    i));
-
-    }
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-  delete [] this->my_cubit_;
-}
-
-Cubit_ptr
-Cubit_Factory_i::make_cubit (const char *key, CORBA::Environment &env)
-{
-  Cubit_ptr cb = 0;
-
-  for (size_t i = 0; i < this->numobjs_; i++)
-    {
-      const char *obj_str = this->my_cubit_[i]->_get_name ();
-
-      // Keys matched.
-      if (!ACE_OS::strcmp (obj_str, key))
-	{
-	  COOL_bind(*(this->my_cubit_ [i]), cb, env);
-	  if (env.exception() != 0)
-	    print_exception (env, "COOL_bind");
-	  //        return Cubit::_duplicate (this->my_cubit_ [i]);
-	  return cb;
-	}
-    }
-
-  return Cubit::_nil ();
-}
-
-// Constructor
-
-Cubit_i::Cubit_i (const char *obj_name)
-  // : POA_Cubit (obj_name)
-{
-  obj_name_ = ACE_OS::strdup (obj_name);
-}
-
-const char *
-Cubit_i::_get_name (void)
-{
-  return this->obj_name_;
-}
-
-// Destructor
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-// Cube an octet
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return o * o * o;
-}
-
-// Cube a short.
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return s * s * s;
-}
-
-// Cube a long
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return l * l * l;
-}
-
-// Cube a struct
-
-Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &env)
-{
-  Cubit::Many temp;
-
-  ACE_UNUSED_ARG (env);
-  temp.o = values.o * values.o * values.o;
-  temp.s = values.s * values.s * values.s;
-  temp.l = values.l * values.l * values.l;
-
-  return temp;
-}
-
-// Cube a union
-
-Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values,
-                     CORBA::Environment &env)
-{
-  Cubit::oneof temp;
-
-  ACE_UNUSED_ARG (env);
-  switch (values._d ())
-    {
-    case Cubit::e_0th:
-      temp.o (values.o () * values.o () * values.o ());
-      break;
-    case Cubit::e_1st:
-      temp.s (values.s () * values.s () * values.s ());
-      break;
-    case Cubit::e_2nd:
-      temp.l (values.l () * values.l () * values.l ());
-      break;
-    case Cubit::e_3rd:
-    default:
-      temp._d (values._d ()); // set the discriminant
-      // use the read/write accessor
-      temp.cm ().o  = values.cm ().o * values.cm ().o * values.cm ().o;
-      temp.cm ().s  = values.cm ().s * values.cm ().s * values.cm ().s;
-      temp.cm ().l  = values.cm ().l * values.cm ().l * values.cm ().l;
-
-    }
-  return temp;
-}
-
-// Shutdown.
-
-void Cubit_i::please_exit (CORBA::Environment &env)
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (env);
-
-  ACE_DEBUG ((LM_DEBUG, "I've been asked to shut down..."));
-  thisCapsule->boa()->shutdown();
-
-  CORBA_BOA::deactivate_object(this, env);
-}
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.h b/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.h
deleted file mode 100644
index 9db23e7dbb6..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/cubit_i.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-// 
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
-// ============================================================================
-
-#if !defined (_CUBIT_I_HH)
-#define	_CUBIT_I_HH
-
-#include "ace/ACE.h"
-
-#include <api/api.H>
-#include <api/binding.H>
-#include <corba/eoa.H>
-#include <corba/eorb.H>
-
-extern COOL_CurrentCapsule* thisCapsule;
-
-#include "cubit.H"
-#include "sk_cubit.H"
-
-// Forward declarations
-class Cubit_i;
-
-// Typedefs.
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i 
-  // = TITLE
-  //    Illustrates how to integrate a servant with the
-  //    generated skeleton.
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  // Constructor
-
-  ~Cubit_i (void);
-  // Destructor
-
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-  // Cube an octet
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  // Cube a short
-
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  // Cube a long
-
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  // Cube a struct.
-
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env);
-  // Cube a union.
-
-  virtual void please_exit (CORBA::Environment &env);
-  // Shutdown routine.
-
-  const char *_get_name (void);
-
- private:
-  const char * obj_name_;
-};
-
-
-class Cubit_Factory_i;
-
-typedef Cubit_Factory_i *Cubit_Factory_i_ptr;
-
-class Cubit_Factory_i
-  // =TITLE
-  //  Cubit_Factory_i
-  //
-  // DESCRIPTION
-  //  factory object returning the cubit objrefs
-{
-public:
-  Cubit_Factory_i (const char *key, int numobjs);
-  // constructor
-
-  ~Cubit_Factory_i (void);
-  // destructor
-
-  virtual Cubit_ptr make_cubit (const char *key, CORBA::Environment &env);
-  // make the cubit object whose key is "key"
-
-private:
-  Cubit_i_ptr *my_cubit_;
-  u_int numobjs_;
-};
-
-#endif /* _CUBIT_I_HH */
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/server.cpp b/TAO/tests/Cubit/COOL/IDL_Cubit/server.cpp
deleted file mode 100644
index 6a787fe7e93..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/server.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "cubit_i.h"
-
-#include <api/binding.H>
-#include <api/api.H>
-#include "cubit.H"
-#include "sk_cubit.H"
-#include "sk_cubit.C"
-
-void print_exception (const CORBA_Environment &env,
-		      const char * str)
-{
-  CORBA::SystemException* ex;
-    
-  ex = CORBA::SystemException::_narrow(env.exception());
-  
-  if (ex) 
-    {
-      CORBA::String_var msg = ex->message();
-      fprintf(stderr, "%s: %s.\n", str, (const char *) msg);
-    } 
-  else 
-    {
-      fprintf(stderr, "Unknown user exception.\n");
-    }
-}
-
-
-// Global Variables
-static int num_of_objs = 1;
-
-u_int _debug_level = 0;
-
-// Parses the command line arguments and returns an error status
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "dn:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        _debug_level++;
-        break;
-      case 'n':	// number of cubit objects we hold
-        num_of_objs = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Environment env;
-
-  COOL::EOA::bind(argv[1], env);
-  if (env.exception()) {
-    ACE_DEBUG ((LM_ERROR, "Impossible to bind the ORB to the description:%s\n", argv[1]));
-    return -1;
-  }
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, argv, 0, env);
-
-  if (env.exception () != 0)
-    {
-      print_exception (env, "ORB init");
-      return 1;
-    }
-
-  // Initialize the Object Adapter
-  CORBA_BOA_ptr oa_ptr = orb_ptr->OA_init (argc, argv, 0, env);
-
-  if (env.exception() != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize the POA.\n"),
-		      1);
-
-  // Parse remaining command line and verify parameters.
-  parse_args (argc, argv);
-
-  // create a factory implementation
-  Cubit_Factory_ptr factory;
-  Cubit_Factory_i *factory_i;
-  COOL::EOABindingData bindingData;
-
-  ACE_NEW_RETURN (factory_i, Cubit_Factory_i ("factory", num_of_objs), 1);
-
-  COOL_bind (*factory_i, factory, bindingData, env);
-
-  if (_debug_level > 0)
-    {
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-
-      CORBA::String str;
-
-      str = orb_ptr->object_to_string (factory, env);
-
-      if (env.exception () != 0)
-        {
-          print_exception (env, "object_to_string");
-          return -1;
-        }
-
-      ACE_OS::puts ((char *) str);
-      ACE_OS::fflush (stdout);
-
-      ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str));
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  ACE_DEBUG ((LM_DEBUG, "Entering boa->run ().\n"));
-  oa_ptr->run ();
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/IDL_Cubit/tmplinst.cpp b/TAO/tests/Cubit/COOL/IDL_Cubit/tmplinst.cpp
deleted file mode 100644
index f5cb1888b55..00000000000
--- a/TAO/tests/Cubit/COOL/IDL_Cubit/tmplinst.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "cubit.H"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<long>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<long>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/tests/Cubit/COOL/MT_Cubit/Makefile
deleted file mode 100644
index 53b76a30af3..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/Makefile
+++ /dev/null
@@ -1,271 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the CHORUS COOL Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-IDL_SRC = cubit.cpp cubit.H sk_cubit.C sk_cubit.H 
-
-SRC = $(IDL_SRC) cubit_impl.cpp server.cpp client.cpp Task_Client.cpp Util_Thread.cpp
-
-SVR_OBJS = cubit_impl.o server.o cubit.o
-
-CLT_OBJS = Task_Client.o client.o cubit.o Util_Thread.o
-
-LDLIBS	 = -lOrb-mt 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	CHORUS related macros and target settings.
-#----------------------------------------------------------------------------
-
-CHORUS_BINDIR    = $(CHORUS_ROOT)/bin
-CHORUS_LIBDIR    = $(CHORUS_ROOT)/lib
-CHORUS_INCDIR    = $(CHORUS_ROOT)/include
-
-CPPFLAGS += -I$(CHORUS_INCDIR) -I$(CHORUS_ROOT)
-LDFLAGS  += -L$(CHORUS_LIBDIR) -R $(CHORUS_LIBDIR) -L$(ACE)/ace
-IDLFLAGS = --stub-header --stub-impl --skeleton-header --skeleton-impl --no-local --no-any --binding Cubit Cubit_Impl
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: $(IDL_SRC) server client
-
-$(IDL_SRC): cubit.idl
-	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-/bin/mv cubit.C cubit.cpp
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit.o .shobj/cubit.so: cubit.cpp cubit.H
-.obj/sk_cubit.o .shobj/sk_cubit.so: sk_cubit.C
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i cubit_impl.h \
- cubit.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/cool.H
-.obj/server.o .shobj/server.so: server.cpp cubit.H cubit_impl.h sk_cubit.H sk_cubit.C \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/api/api.H \
- cubit.H Task_Client.h
-.obj/Task_Client.o .shobj/Task_Client.so: Task_Client.cpp Task_Client.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/api/api.H \
- cubit.H
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/README b/TAO/tests/Cubit/COOL/MT_Cubit/README
deleted file mode 100644
index 31e1b9fc72a..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/README
+++ /dev/null
@@ -1,149 +0,0 @@
-The MT-Cubit example for the CHORUS COOL ORB
---------------------------------------------
-
-Compiling
----------
-
-Setup the CHORUS COOL environment variables before compiling, the
-following is an example.  You would typically want this in the shells'
-resource file (e.g. .cshrc.mine).  The example provided is for a C
-shell.
-
-   setenv CHORUS_ROOT /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt
-   set path = ($path /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/bin)
-   setenv LD_LIBRARY_PATH /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/lib:$LD_LIBRARY_PATH
-   setenv MANPATH /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/man:$MANPATH
- 
-Makefiles are provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./server <tpr | tpool> cool-tcp://<THIS_HOSTNAME>:<THIS_HOST_PORT> -v -cool-tcp -cool-iiop
-
-tpr	: this indicates to the server to use the Thread Per Request concurrency model.
-
-tpool	: this indicates to the server to use the Thread Pool concurrency model.
-
-THIS_HOSTNAME : the name of the host that the server will be running on.  This is useful 
-		if you want to specifya different interface (e.g. ATM, 100Mbit Ethernet)
-
-THIS_HOST_PORT: is the port number at which the server will start the high
-		priority servant. The low priority servant will be created at
-		(THIS_HOST_PORT+1).
-
-The server will print the IOR of the high and low priority servants,
-but it is not required by the client.
-
-client:
--------
-
-./client [-n <LOOP_COUNT>] [-t <NUM_THREADS>] [-h SERVER_HOSTNAME] [-p <SERVER_PORT_NUM>] -cool-tcp -cool-iiop
-
-<SERVER_HOSTNAME>: is the hostname of the server.
-
-<SERVER_PORT_NUM>: is the port number of the servant. 
-
-Based on the SERVER_HOSTNAME and the SERVER_PORT_NUM, the client constructs
-the IOR's for the high priority servant and the low priority servant.
-
-<LOOP_COUNT>	: is the number of times the group of CORBA twoway calls are to 
-		be made.  The group consists of the following calls: cube_octet(), cube_short(),
-		cube_long() and cube_struct().  The default is 100 loops (i.e. 400 calls are made).
-
-<NUM_THREADS> 	: is the total number of concurrent clients to be
-		created. One of these clients will be a high priority client (and thus
-		send requests to the high priority servant), and the rest will have
-		low priority.
-
-The high priority client makes requests at 20Hz, and the low priority
-clients make requests at 10Hz.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority client.
-
-An Example
-----------
-
-   On the host lambada.cs.wustl.edu :
-      
-   % ./server tpool cool-tcp://lambada.cs.wustl.edu:3000 -v -cool-tcp -cool-iiop
-      
-   On the host merengue.cs.wustl.edu :
-      
-   % ./client -t 2 -h lambada.cs.wustl.edu -p 3000 -cool-tcp -cool-iiop 
-      
-   The output of the client program may look like this:
-      
-   (5) Everyone's done, here I go!!
-   (4) Threads have bound, utilization test started
-   (9) Everyone's done, here I go!!
-   (8) Everyone's done, here I go!!
-   (6) Everyone's done, here I go!!
-   (7) Everyone's done, here I go!!
-   cube average call ACE_OS::time  = 20.917016 msec,       47.807966 calls/second
-   (5) My latency was 20.917016
-   5 calls, 0 errors
-   cube average call ACE_OS::time  = 19.299501 msec,       51.814811 calls/second
-   (8) My latency was 19.299501
-   cube average call ACE_OS::time  = 19.262436 msec,       51.914514 calls/second
-   5 calls, 0 errors
-   (9) My latency was 19.262436
-   5 calls, 0 errors
-   cube average call ACE_OS::time  = 15.101540 msec,       66.218412 calls/second
-   (6) My latency was 15.101540
-   5 calls, 0 errors
-   cube average call ACE_OS::time  = 10.320359 msec,       96.895858 calls/second
-   (7) My latency was 10.320359
-   5 calls, 0 errors
-   Test done.
-   High priority client latency : 20.917016 msec, jitter: 36.582330 msec
-   Low priority client latency : 15.995959 msec, jitter: 527.515277 msec
-   utilization task performed 435 computations
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
\ No newline at end of file
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.cpp b/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.cpp
deleted file mode 100644
index 5b2c2c067f2..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-#include "Task_Client.h"
-
-#if defined (VXWORKS)
-#include "my_time.h"
-#endif /* defined (VXWORKS) */
-
-int stats(int data[], int n)
-{
-    int i, j, key, sum, mean;
-
-    if( n < 2 )
-        return 0;
-
-    /* sort the samples */
-    for(j=1; j<n; j++) {
-        key = data[j];
-        i = j - 1;
-        while( i >= 0 && data[i] > key ) {
-            data[i+1] = data[i];
-            i--;
-        }
-        data[i+1] = key;
-    }
-
-    sum = 0;
-    for(i=0; i<n; i++) {
-        sum += data[i];
-    }
-
-    if( (n%2) == 0 )
-        mean = (data[n/2-1] + data[n/2]) / 2;
-    else
-        mean = data[n/2];
-
-    return sum/n;
-}
-
-Task_State::Task_State (int argc, char **argv)
-  : start_count_ (0),
-    loop_count_ (5),
-    thread_count_ (5),
-    base_port_ (5000),
-    datatype_ (CB_OCTET),
-    argc_ (argc),
-    argv_ (argv),
-    thread_per_rate_ (0),
-    global_jitter_array_ (0)
-{
-  ACE_OS::strcpy (server_host_, "localhost");
-  ACE_Get_Opt opts (argc, argv, "h:n:t:p:d:r");
-  int c;
-  int datatype;
-
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'r':
-      thread_per_rate_ = 1;
-      break;
-    case 'd':
-      datatype = ACE_OS::atoi (opts.optarg);
-      switch (datatype)
-        {
-        case CB_OCTET:
-          ACE_DEBUG ((LM_DEBUG, "Testing Octets\n"));
-          datatype_ = CB_OCTET;
-          break;
-        case CB_LONG:
-          ACE_DEBUG ((LM_DEBUG, "Testing Longs\n"));
-          datatype_ = CB_LONG;
-          break;
-        case CB_STRUCT:
-          ACE_DEBUG ((LM_DEBUG, "Testing Structs\n"));
-          datatype_ = CB_STRUCT;
-          break;
-        case CB_SHORT:
-        default:
-          datatype_ = CB_SHORT;
-          ACE_DEBUG ((LM_DEBUG, "Testing Shorts\n"));
-          break;
-        }
-      continue;
-    case 'h':
-      ACE_OS::strcpy (server_host_, opts.optarg);
-      continue;
-    case 'p':
-      base_port_ = ACE_OS::atoi (opts.optarg);
-      continue;
-    case 'n':			// loop count
-      loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case 't':
-      thread_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case '?':
-    default:
-      ACE_DEBUG ((LM_DEBUG, "usage:  %s"
-                  "[-d datatype Octet=0, Short=1, Long=2, Struct=3]"
-                  " [-n num_calls]"
-                  " [-h server_hostname]"
-                  " [-p server_port_num]"
-                  " [-t num_threads]"
-                  "\n", argv [0]));
-    }
-  // thread_count_ + 1 because there is one utilization thread also
-  // wanting to begin at the same time the clients begin..
-  ACE_NEW (barrier_, ACE_Barrier (thread_count_ + 1));
-  ACE_NEW (latency_, double [thread_count_]);
-  ACE_NEW (global_jitter_array_, double *[thread_count_]);
-  ACE_NEW (ave_latency_, int [thread_count_]);
-}
-
-Client::Client (Task_State *ts)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
-    ts_ (ts)
-{
-
-}
-
-void
-Client::put_ave_latency (int ave_latency, u_int thread_id) {
-  ts_->lock_.acquire ();
-  ts_->ave_latency_[thread_id] = ave_latency;
-  ts_->lock_.release ();
-}
-
-void
-Client::put_latency (double *jitter, double latency, u_int thread_id) 
-{
-  ts_->lock_.acquire ();
-  ts_->latency_[thread_id] = latency;
-  ACE_DEBUG ((LM_DEBUG, "(%t) My latency was %f\n", latency));
-  ts_->global_jitter_array_ [thread_id] = jitter;
-  ts_->lock_.release ();
-}
-
-double
-Client::get_high_priority_latency (void)
-{
-  return (double) ts_->latency_ [0];
-}
-
-double
-Client::get_low_priority_latency (void) 
-{
-  double l = 0;
-
-  for (u_int i = 1; i < ts_->start_count_; i++)
-    l += (double) ts_->latency_[i];
-  return l / (double) (ts_->start_count_ - 1);
-}
-
-int
-Client::get_latency (u_int thread_id) 
-{
-  return ts_->ave_latency_ [thread_id];
-}
-
-double
-Client::get_high_priority_jitter () {
-  double jitter = 0;
-  double average = get_high_priority_latency ();
-  for (u_int i = 0; i < ts_->loop_count_; i ++)
-    {
-      double difference = ts_->global_jitter_array_ [0][i] - average;
-      jitter += difference * difference;
-    }
-  return sqrt (jitter / (double) (ts_->loop_count_ - 1));
-}
-
-double
-Client::get_low_priority_jitter () {
-  double jitter = 0;
-  double average = get_low_priority_latency ();
-  for (u_int j = 1; j < ts_->start_count_; j ++)
-      for (u_int i = 0; i < ts_->loop_count_; i ++)
-        {
-          double difference = ts_->global_jitter_array_ [j][i] - average;
-          jitter += difference * difference;
-        }
-  return (double) (jitter / ((ts_->loop_count_* (ts_->start_count_ - 1)) - 1));
-}
-
-int
-Client::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Thread created\n"));
-  u_int thread_id;
-  Cubit_ptr cb;
-  char ior [1024];
-  double frequency;
-  CORBA::ORB_ptr orb_ptr;
-
-  {
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, ts_->lock_, -1);
-
-    thread_id = ts_->start_count_;
-    ts_->start_count_++;
-
-    if (ts_->thread_per_rate_ == 0)
-      {
-        if (thread_id == 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im the high priority client, my id is %d.\n",
-                        thread_id));
-            ::sprintf (ior,
-                       "cool-tcp://%s:%d",
-                       ts_->server_host_,
-                       ts_->base_port_);
-            frequency = CB_HIGH_PRIORITY_RATE;
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im a low priority client, my id is %d\n",
-                        thread_id));
-            ::sprintf (ior,
-                       "cool-tcp://%s:%d",
-                       ts_->server_host_,
-                       ts_->base_port_);// + thread_id);
-            frequency = CB_LOW_PRIORITY_RATE;
-          }
-      }
-    else
-      {
-	switch (thread_id)
-	  {
-	  case CB_40HZ_CONSUMER:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-	    ::sprintf (ior, "cool-tcp://%s:%d", ts_->server_host_, ts_->base_port_);
-	    frequency = CB_40HZ_CONSUMER_RATE;
-	    break;
-	  case CB_20HZ_CONSUMER:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-	    ::sprintf (ior, "cool-tcp://%s:%d", ts_->server_host_, ts_->base_port_);//+1);
-	    frequency = CB_20HZ_CONSUMER_RATE;
-	    break;
-	  case CB_10HZ_CONSUMER:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-	    ::sprintf (ior, "cool-tcp://%s:%d", ts_->server_host_, ts_->base_port_);//+2);
-	    frequency = CB_10HZ_CONSUMER_RATE;
-	    break;
-	  case CB_5HZ_CONSUMER:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-	    ::sprintf (ior, "cool-tcp://%s:%d", ts_->server_host_, ts_->base_port_);//+3);
-	    frequency = CB_5HZ_CONSUMER_RATE;
-	    break;
-	  case CB_1HZ_CONSUMER:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-	    ::sprintf (ior, "cool-tcp://%s:%d", ts_->server_host_, ts_->base_port_);//+4);
-	    frequency = CB_1HZ_CONSUMER_RATE;
-	    break;
-	  default:
-	    ACE_DEBUG ((LM_DEBUG, "(%t) Invalid Thread ID.\n", thread_id));
-	  }
-      } /* else */
-
-    ACE_DEBUG ((LM_DEBUG, "Using ior = %s\n", ior));
-    
-    CORBA::Object_ptr objref = CORBA::Object::_nil ();
-    CORBA::Environment env;
-
-    orb_ptr = CORBA::ORB_init (ts_->argc_, ts_->argv_, 0, env);
-
-    if (env.exception () != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,"%s:ORB initialization", env.exception ()), 2);
-
-    //    CORBA_BOA_ptr oa_ptr = orb_ptr->OA_init (ts_->argc_, ts_->argv_, 0, env);
-    //
-    //    if (oa_ptr == 0)
-    //      ACE_ERROR_RETURN ((LM_ERROR,
-    //                         " (%P|%t) Unable to initialize the POA.\n"),
-    //                        1);
-
-
-    //
-    // Initialise client's binding to an
-    // arbitrary cubit server (at some host)
-    //
-    COOL::EOABindingData bindingData (ior);
-    
-    cb = Cubit::_bind(bindingData, env);
-    
-
-
-    //    objref = orb_ptr->string_to_object ((CORBA::String) ior, env);
-
-    //    if (env.exception () != 0)
-    //      ACE_ERROR_RETURN ((LM_ERROR,
-    //                         "%s:string2object failed. Supply valid IOR with the -O option\n",
-    //                         env.exception ()), 2);
-
-    //    if (CORBA::is_nil (objref) == CORBA_TRUE)
-    //      ACE_ERROR_RETURN ((LM_ERROR,
-    //                         "%s:  must identify non-null target objref\n",
-    //                         ts_->argv_ [0]),
-    //                        1);
-
-    // Narrow the CORBA::Object reference to the stub object, checking
-    // the type along the way using _is_a.
-    //    cb = Cubit::_narrow (objref);
-
-   if ( (CORBA::is_nil (cb) == CORBA_TRUE) || (env.exception () != 0))
-     {
-       ACE_ERROR_RETURN ((LM_ERROR, "%s:Create cubit failed\n", env.exception ()), 1);
-     }
-    ACE_DEBUG ((LM_DEBUG, "(%t) Binding succeeded\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%t) Cb == %x\n", cb));
-
-    CORBA::String str;
-
-    str = orb_ptr->object_to_string (cb, env);
-
-    if (env.exception () != 0)
-      ACE_ERROR_RETURN ((LM_ERROR, "object_to_string %s\n", env.exception ()), -1);
-
-    ACE_OS::puts ((char *) str);
-    ACE_OS::fflush (stdout);
-    ACE_DEBUG ((LM_DEBUG, "Object Created at: '%ul'", cb));
-    ACE_DEBUG ((LM_DEBUG, "connected to object '%s'", str));
-    //    if (cb->cube_short (2, env) == 8) // dummy call.
-    //      ACE_DEBUG ((LM_DEBUG, "(%t) Made successful dummy call"));
-  }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for other threads to finish binding..\n"));
-  ts_->barrier_->wait ();
-  ACE_DEBUG ((LM_DEBUG, "(%t) Everyone's done, here I go!!\n"));
-
-  this->run_tests (cb, ts_->loop_count_, thread_id, ts_->datatype_, frequency);
-
-  // Free resources
-  //  CORBA::release (orb_ptr);
-
-  return 0;
-}
-
-int
-Client::run_tests (Cubit_ptr cb,
-                   u_int loop_count,
-                   u_int thread_id,
-                   Cubit_Datatypes datatype,
-                   double frequency)
-{
-  CORBA::Environment env;
-  u_int i = 0;
-  u_int call_count = 0, error_count = 0;
-  double *my_jitter_array;
-  ACE_NEW_RETURN (my_jitter_array, double [ts_->loop_count_], 1);
-
-  double latency = 0;
-  double sleep_time = (1/frequency) * (1000 * 1000);
-  double delta = 0;
-  // Make the calls in a loop.
-
-  for (i = 0; i < loop_count; i++)
-    {
-#if defined (VXWORKS)
-      TimeStamp(&start[i]);
-#else
-      ACE_Profile_Timer timer;
-      ACE_Time_Value tv (0, (long int) (sleep_time - delta));
-      ACE_OS::sleep (tv);
-      timer.start ();
-#endif /* defined (VXWORKS) */
-      switch (datatype)
-        {
-        case CB_OCTET:
-          {
-            // Cube an octet.
-            CORBA::Octet arg_octet = func (i), ret_octet = 0;
-
-            ret_octet = cb->cube_octet (arg_octet, env);
-            if (env.exception () != 0)
-	      {
-		CORBA::SystemException* ex;
-		
-		ex = CORBA::SystemException::_narrow(env.exception());
-		if (ex) 
-		  {
-		    CORBA::String_var msg = ex->message();
-		    fprintf(stderr, "%s.\n", (const char*) msg);
-		  } 
-		else 
-		  {
-		    fprintf(stderr, "Unknown user exception.\n");
-		  }
-		ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-	      }
-
-            arg_octet = arg_octet * arg_octet * arg_octet;
-
-            if (arg_octet != ret_octet)
-              {
-                ACE_DEBUG ((LM_DEBUG, "** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet));
-                error_count++;
-              }
-            call_count++;
-          }
-        break;
-
-        case CB_SHORT:
-          // Cube a short.
-          {
-            call_count++;
-
-            CORBA::Short arg_short = func (i), ret_short;
-
-            ret_short = cb->cube_short (arg_short, env);
-
-            if (env.exception () != 0) 
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%s:Call failed\n",
-                                 env.exception ()),
-                                2);
-
-            arg_short = arg_short * arg_short * arg_short;
-
-            if (arg_short != ret_short) 
-              {
-                ACE_DEBUG ((LM_DEBUG, "** cube_short(%d)  (--> %d)\n", arg_short , ret_short));
-                error_count++;
-              }
-            break;
-          }
-        // Cube a long.
-
-        case CB_LONG:
-          {
-            call_count++;
-
-            CORBA::Long arg_long = func (i), ret_long;
-
-            ret_long = cb->cube_long (arg_long, env);
-
-            if (env.exception () != 0)
-              ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-
-            arg_long = arg_long * arg_long * arg_long;
-
-            if (arg_long != ret_long)
-              {
-                ACE_DEBUG ((LM_DEBUG, "** cube_long(%d)  (--> %d)\n", arg_long , ret_long));
-                error_count++;
-              }
-            break;
-          }
-
-        case CB_STRUCT:
-          // Cube a "struct" ...
-          {
-            Cubit::Many	arg_struct, ret_struct;
-
-            call_count++;
-
-            arg_struct.l = func (i);
-            arg_struct.s = func (i);
-            arg_struct.o = func (i);
-
-            ret_struct = cb->cube_struct (arg_struct, env);
-
-            if (env.exception () != 0)
-              ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-
-            arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-            arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-            arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-
-            if (arg_struct.l  != ret_struct.l
-              || arg_struct.s  != ret_struct.s
-              || arg_struct.o  != ret_struct.o )
-              {
-                ACE_DEBUG ((LM_DEBUG, "**cube_struct error!\n"));
-                error_count++;
-              }
-                
-            break;
-          }
-        }
-
-#if defined (VXWORKS)
-      TimeStamp(&stop[i]);
-      elapsed_time[i] = DeltaTime(start[i], stop[i]);
-      delta = ( (0.4 * fabs (elapsed_time[i])) + (0.6 * delta) ); // pow(10,6)
-      latency += (double)elapsed_time[i];
-#else
-      timer.stop();
-      ACE_Profile_Timer::ACE_Elapsed_Time et;
-      timer.elapsed_time (et);
-      delta = ((0.4 * fabs (et.real_time * (1000 * 1000))) + (0.6 * delta)); // pow(10,6)
-      latency += et.real_time;
-      my_jitter_array [i] = et.real_time * 1000;
-#endif /* defined (VXWORKS) */
-    }
-
-#if defined (VXWORKS)
-  int ave_latency = stats(elapsed_time, loop_count);
-  put_ave_latency(ave_latency, thread_id);
-#endif
-
-  if (call_count > 0)
-    {
-#if !defined (VXWORKS)
-      if (error_count == 0)
-        {
-
-          latency /= call_count;
-
-          if (latency > 0) 
-            {
-              ACE_DEBUG ((LM_DEBUG, "cube average call ACE_OS::time\t= %f msec, \t"
-                              "%f calls/second\n",
-                              latency * 1000,
-                              1 / latency));
-              this->put_latency (my_jitter_array, latency * 1000, thread_id);
-            }
-        }
-#endif /* !defined (VXWORKS) */
-      ACE_DEBUG ((LM_DEBUG, "%d calls, %d errors\n", call_count, error_count));
-    }
-
-  // cb->please_exit (env);
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.h b/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.h
deleted file mode 100644
index 038f8a1db53..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/Task_Client.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Task_Client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (TASK_CLIENT_H)
-#define TASK_CLIENT_H
-
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include <math.h>
-#include "api/api.H"
-
-#include "cubit.H"
-
-// Arbitrary generator used by the client to create the numbers to be
-// cubed.
-inline int func (unsigned i) { return i - 117; }
-
-// The various datatypes which the client and the server can exchange. 
-enum Cubit_Datatypes 
-{
-  CB_OCTET,
-  CB_SHORT,
-  CB_LONG,
-  CB_STRUCT
-};
-
-const int CB_40HZ_CONSUMER = 0;
-const int CB_20HZ_CONSUMER = 1;    
-const int CB_10HZ_CONSUMER = 2;    
-const int CB_5HZ_CONSUMER = 3;    
-const int CB_1HZ_CONSUMER = 4;
-
-const int CB_40HZ_CONSUMER_RATE = 40;
-const int CB_20HZ_CONSUMER_RATE = 20;
-const int CB_10HZ_CONSUMER_RATE = 10;
-const int CB_5HZ_CONSUMER_RATE = 5;
-const int CB_1HZ_CONSUMER_RATE = 1;
-
-const int CB_HIGH_PRIORITY_RATE = 20;
-const int CB_LOW_PRIORITY_RATE = 10;
-
-class Task_State
-  // = TITLE
-  //     Maintains state common to multiple Cubit clients
-
-  // = DESCRIPTION
-  //     This class maintains state which is common to the potentially
-  //     multiple concurrent clients. 
-
-
-{
-public:
-  ACE_Barrier *barrier_;
-  // Barrier for the multiple clients to synchronize after
-  // binding to the servants.
-
-  Task_State (int argc, char **argv);
-  // Constructor. Takes the command line arguments, which are
-  // later passed into ORB_init
-
-  u_int start_count_;
-  // keeps a count of the number of clients started.. This
-  // count also serves as a thread-id. The first thread created
-  // gets an ID of 0, then 1, and so on..
-
-  u_int loop_count_;
-  // number of times to loop, making calls..
-
-  u_int thread_count_;
-  // number of concurrent clients to create..
-
-  u_int base_port_;
-  // this is the port at which the high priority servant is
-  // listening.. lower priority ports begin at base_port_ + 1
-
-  char server_host_ [1024];
-  // Server hostname
-
-  double *latency_;
-  // Array to store the latency for every client, indexed by
-  // thread-id.
-
-  int *ave_latency_;
-  // Int array to store the latencies
-
-  Cubit_Datatypes datatype_;
-  // Which datatype to use to make the calls
-
-  ACE_Thread_Mutex lock_;
-  // lock to protect access to this object
-
-  int argc_;
-  char **argv_;
-  // command line arguments
-
-  u_int thread_per_rate_;
-  // Flag for the thread_per_rate test
-
-  double **global_jitter_array_;
-  // this array stores the latency seen by each client for each
-  // request, to be used later to compute jitter
-
-};
-
-class Client : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     The Cubit client. 
-{
-public:
-  Client (Task_State *ts);
-  // constructor, with a pointer to the common task state.
-
-  virtual int svc (void);
-  // the thread function
-
-  double get_high_priority_latency (void);
-  double get_low_priority_latency (void);
-  double get_high_priority_jitter (void);
-  double get_low_priority_jitter (void);
-  int get_latency (u_int thread_id);
-  // accessors to get the various measured quantities
-
-
-private:
-
-  int run_tests (Cubit_ptr, 
-                 unsigned int, 
-                 unsigned int, 
-                 Cubit_Datatypes, 
-                 double frequency);
-  // makes the calls to the servant
-
-  void put_latency (double *jitter, 
-                    double latency, 
-                    unsigned int);
-  // Records the latencies in the Task_State
-
-  void put_ave_latency (int latency, unsigned int);
-  // Records the latencies in the Task_State 
-
-  int parse_args (int, char **);
-  // parses the arguments
-
-  Task_State *ts_;
-  // pointer to shared state
-  
-};
-
-#endif /* !defined (TASK_CLIENT_H) */
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.cpp b/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.cpp
deleted file mode 100644
index a883a3537ec..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-
-#include "Util_Thread.h"
-
-Util_Thread::Util_Thread (Task_State *ts,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr),
-    done_ (0),
-    number_of_computations_ (0),
-    ts_ (ts)
-{
-}
-
-int
-Util_Thread::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Utilization Thread created, "
-              "waiting for threads to finish binding\n"));
-
-  // Sumedh, please add comments here.
-  this->ts_->barrier_->wait ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Threads have bound, "
-              "utilization test started\n"));
-
-  this->run_computations ();
-  return 0;
-}
-
-double
-Util_Thread::get_number_of_computations (void)
-{
-  return this->number_of_computations_;
-}
-
-// Perform repeated prime factor computations on an arbitrary number
-// and you thought your life was boring. :-)
-
-int
-Util_Thread::run_computations (void)
-{
-  // Sumedh, isn't there a "ACE::is_prime()" method that we can reuse
-  // here?  If this doesn't work right, can you please add a new
-  // method in class ACE so that we can leverage existing effort and
-  // prepare for the future?
-
-  while (this->done_ == 0)
-    {
-      u_long original = CUBIT_ARBIT_NUMBER;
-      u_long n = original;
-      u_long test_done = 1;
-      u_long sqrt_n = (u_long) ceil (sqrt (n));
-      u_long i;
-
-      for (i = 2; i <= sqrt_n; i++)
-        while ((n % i) == 0) 
-          {
-            n /= i;
-            test_done *= i;
-          }
-
-      ACE_ASSERT (test_done * n == original);
-
-      this->number_of_computations_ ++;
-    }
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.h b/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.h
deleted file mode 100644
index b336c11c2de..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/Util_Thread.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Util_Thread.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "Task_Client.h"
-
-const int CUBIT_ARBIT_NUMBER = 2064885;
-
-class Util_Thread : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     The thread that computes utilization.
-{
-public:
-  Util_Thread (Task_State *,
-               ACE_Thread_Manager *thr_mgr);
-  // constructor.
-
-  virtual int svc (void);
-  // The thread entry point function.
-
-  double get_number_of_computations (void);
-  // Gets the number of computations the thread was able to perform.
-
-  int done_;
-  // Indicates whether we're done.
-
-private:
-  int run_computations (void);
-  // Run the computations.
-
-  // Sumedh, please add comments here.
-  double number_of_computations_;
-  Task_State *ts_;
-};
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/client.cpp b/TAO/tests/Cubit/COOL/MT_Cubit/client.cpp
deleted file mode 100644
index 4ec478f6ea9..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/client.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "client.h"
-
-int
-initialize (void)
-{
-#if defined (VXWORKS)
-    hostAdd ("mv2604d", "130.38.183.132");
-#if defined (VME_DRIVER)
-    STATUS status = vmeDrv ();
-    if (status != OK)
-      printf ("ERROR on call to vmeDrv()\n");
-    status = vmeDevCreate ("/vme");
-    if (status != OK)
-      printf ("ERROR on call to vmeDevCreate()\n");
-#endif /* defined (VME_DRIVER) */
-#endif   /* defined (VXWORKS) */
-
-  // Make sure we've got plenty of socket handles.  This call will use
-  // the default maximum.
-  ACE::set_handle_limit ();
-  return 0;
-}
-
-int
-do_priority_inversion_test (Task_State &ts)
-{
-  // Create the clients
-  Client high_priority_client (&ts);
-  Client low_priority_client (&ts);
-  
-  // Create the daemon thread in its own <ACE_Thread_Manager>.
-  ACE_Thread_Manager thr_mgr;
-  
-  Util_Thread util_thread (&ts, &thr_mgr);
-      
-  ACE_Sched_Priority priority = 
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, 
-                                    ACE_SCOPE_THREAD);
-      
-  // First activate the Utilization thread.  It will wait until all
-  // threads have finished binding.
-  util_thread.activate (THR_BOUND,
-                        1,
-                        0,
-                        priority);
-  
-  
-  // Now activate the high priority client.
-
-  // @@ The ifdef here is temporarily placed here until
-  // I figure out how to map NT's thread priorities
-  // into pthread's priorities.
-#if defined (ACE_THR_PRI_FIFO_DEF)  
-  priority = ACE_THR_PRI_FIFO_DEF;
-#else
-  priority = ACE_DEFAULT_THREAD_PRIORITY;
-#endif
-  
-  if (high_priority_client.activate (THR_BOUND | ACE_SCHED_FIFO,
-                                     1,
-                                     0,
-                                     priority) == -1)
-    
-    ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "activate failed"));
-  
-  // @@ Sumedh, can you please document why we need this VxWorks
-  // #ifdef?  Is there a way to make this more general so we don't
-  // need the #ifdef?  In other words, please check with David or
-  // Brian about this.
-  
-#if !defined (VXWORKS)
-  priority = 
-    ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO, 
-                                         priority,
-                                         ACE_SCOPE_THREAD);
-#else
-  priority = 65;
-#endif /* !defined (VXWORKS) */
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating %d clients with low priority\n", 
-              ts.thread_count_ - 1));
-  
-  for (u_int i = 0; i < ts.thread_count_ - 1; i++)
-    {
-      // The first thread starts at min + 1, since the minimum
-      // priority thread is the utilization thread.
-      
-      // get the next higher priority
-      priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                      priority,
-                                                      ACE_SCOPE_THREAD);
-      if (low_priority_client.activate (THR_BOUND,
-                                        1,
-                                        1,
-                                        priority) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "activate failed"));
-    }
-    // Wait for all the threads to exit.
-    ACE_Thread_Manager::instance ()->wait ();
-
-#if !defined (VXWORKS)
-    ACE_DEBUG ((LM_DEBUG, "Test done.\n"
-                "High priority client latency : %f msec, jitter: %f msec\n"
-                "Low priority client latency : %f msec, jitter: %f msec\n",
-                high_priority_client.get_high_priority_latency (),
-                high_priority_client.get_high_priority_jitter (),
-                low_priority_client.get_low_priority_latency (),
-                low_priority_client.get_low_priority_jitter ()));
-#else
-    ACE_OS::printf ("Test done.\n"
-                    "High priority client latency : %d usec\n"
-                    "Low priority client latency : %d usec\n",
-                    high_client.get_high_priority_latency (),
-                    low_client.get_low_priority_latency ());
-#endif /* !defined (VXWORKS) */
- util_thread.done_ = 1;
- thr_mgr.wait ();
- cerr << "utilization task performed " 
-      << util_thread.get_number_of_computations ()
-      << " computations" 
-      << endl;
- 
- return 0;
-    
-}
-
-int
-do_thread_per_rate_test (Task_State &ts)
-{
-  // First activate the high priority client.
-    Client CB_40Hz_client (&ts);
-    Client CB_20Hz_client (&ts);
-    Client CB_10Hz_client (&ts);
-    Client CB_5Hz_client (&ts);
-    Client CB_1Hz_client (&ts);
-    
-    ACE_Sched_Priority priority = 
-      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, 
-                                      ACE_SCOPE_THREAD);
-
-    // VxWorks priority of 0 causes problems.
-    priority = 10;
-    ACE_DEBUG ((LM_DEBUG, "Creating 40 Hz client with priority %d\n", priority));
-    if (CB_40Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-    
-    ACE_DEBUG ((LM_DEBUG, "Creating 20 Hz client with priority %d\n", priority));
-    if (CB_20Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-    
-    ACE_DEBUG ((LM_DEBUG, "Creating 10 Hz client with priority %d\n", priority));
-    if (CB_10Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-    
-    ACE_DEBUG ((LM_DEBUG, "Creating 5 Hz client with priority %d\n", priority));
-    if (CB_5Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-    
-    ACE_DEBUG ((LM_DEBUG, "Creating 1 Hz client with priority %d\n", priority));
-    if (CB_1Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-    // Wait for all the threads to exit.
-    ACE_Thread_Manager::instance ()->wait ();
-
-    ACE_OS::printf ("Test done.\n"
-                    "40Hz client latency : %d usec\n"
-                    "20Hz client latency : %d usec\n"
-                    "10Hz client latency : %d usec\n"
-                    "5Hz client latency : %d usec\n"
-                    "1Hz client latency : %d usec\n",
-                    CB_40Hz_client.get_latency (0),
-                    CB_20Hz_client.get_latency (1),
-                    CB_10Hz_client.get_latency (2),
-                    CB_5Hz_client.get_latency (3),
-                 CB_1Hz_client.get_latency (4));
-    return 0;
-}
-
-// This is the main routine of the client, where we create a high
-// priority and a low priority client. we then activate the clients
-// with the appropriate priority threads, and wait for them to
-// finish. After they aer done, we compute the latency and jitter
-// metrics and print them.
-
-int
-main (int argc, char *argv [])
-{
-#if defined (FORCE_ARGS)
-    int argc = 7;
-    char *argv[] = {"main",
-                    "-d",
-                    "3",   // Data Type
-                    "-t",
-                    "10",   // Thread Count
-                    "-h",
-                    "mv2604d"};  // Host name
-#endif   /* defined (FORCE_ARGS) */
-
-  Task_State ts (argc, argv);
-  if (ts.thread_per_rate_ == 0)
-    do_priority_inversion_test (ts);
-  else
-    do_thread_per_rate_test (ts);
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/client.h b/TAO/tests/Cubit/COOL/MT_Cubit/client.h
deleted file mode 100644
index dc355016ad1..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/client.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "cubit.H"
-#include "Task_Client.h"
-#include "Util_Thread.h"
-
-#if defined (VME_DRIVER)
-#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
-extern "C" STATUS vmeDevCreate (char *);
-#endif /* defined (VME_DRIVER) */
-
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/cubit.idl b/TAO/tests/Cubit/COOL/MT_Cubit/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.cpp b/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.cpp
deleted file mode 100644
index 1f50e334099..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "ace/ACE.h"
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) 
-{
-  //  ACE_DEBUG ((LM_DEBUG, "octet cubed is %d\n", o*o*o));
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env)  {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env)  {
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env)  {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env)  {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env)  {
-}
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.h b/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.h
deleted file mode 100644
index f6651687b88..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/cubit_impl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.H"
-
-class Cubit_Impl {
-
-public:
-        virtual CORBA_Octet cube_octet (CORBA_Octet o, CORBA_Environment &IT_env=_environment);
-        virtual CORBA_Short cube_short (CORBA_Short s, CORBA_Environment &IT_env=_environment);
-        virtual CORBA_Long cube_long (CORBA_Long l, CORBA_Environment &IT_env=_environment);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA_Environment &IT_env=_environment);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA_Environment &IT_env=_environment);
-        virtual void please_exit (CORBA_Environment &IT_env=_environment);
-};
-
-
-#endif
diff --git a/TAO/tests/Cubit/COOL/MT_Cubit/server.cpp b/TAO/tests/Cubit/COOL/MT_Cubit/server.cpp
deleted file mode 100644
index 97bd79847bd..00000000000
--- a/TAO/tests/Cubit/COOL/MT_Cubit/server.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-
-#include <api/binding.H>
-#include <api/api.H>
-#include <api/coolThreadPool.H>
-#include <corba/eoa.H>
-#include <corba/eorb.H>
-
-#include "cubit.H"
-#include "cubit_impl.h"		// server header file
-#include "sk_cubit.H"
-#include "sk_cubit.C"
-#include "ace/OS.h"
-
-CORBA_BOA_ptr boa;
-
-int
-create_servant (void *arg)
-{
-  //  char name [1024];
-  //  int i = * (int *)arg;
-  //
-  //  if (i == 0)
-  //    strcpy (name, "HP_Cubit");
-  //  else
-  //    strcpy (name, "LP_Cubit");
-
-  char ** argv = (char **) arg;
-
-  CORBA_Environment env;
-  Cubit_ptr cubit;
-  Cubit_Impl cubit_impl;
-
-  COOL_ThreadPool*        MyPool_1;
-  u_int concurrencyModel = 0;
-  
-  if (strcmp (argv[1], "tpool") == 0)
-    {
-      //
-      // Defines a policy for using a pool of 20 threads.
-      //
-      concurrencyModel = THREAD_POOL;
-      ACE_DEBUG ((LM_DEBUG, "Using Thread Pool concurrency model\n"));
-    }
-  else if (strcmp (argv[1], "tpr") == 0)
-    {
-      // Defines policy to create a thread for each incoming
-      // request.
-      concurrencyModel = THREAD_PER_REQUEST;
-      ACE_DEBUG ((LM_DEBUG, "Using Thread Per Request concurrency model\n"));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "Concurrency model determination failed.\n"));
-      return -1;
-    }
-
-  COOL_ThreadPoolControl poolCtl_1 (concurrencyModel, 1, 20, -1);
-  COOL_QueueControl      qCtl;
-  
-  // Defines thread attributes for threads belonging to pools.
-  COOL_ThreadAttributes  poolAttr;
-  struct sched_param sp;
-  poolAttr.init();
-  poolAttr.stack_size(8192*2);
-  sp.sched_priority = 43;
-  poolAttr.sched_attr(&sp);
-  //
-  // Allocate and initialize first pool
-  //
-  MyPool_1  = new COOL_ThreadPool;
-  MyPool_1->init_pool(poolCtl_1, poolAttr, qCtl);
-  
-  COOL::EOABindingData bindingData (argv[2]);
-  bindingData.threadpool(MyPool_1);
-  
-  COOL_bind (cubit_impl, cubit, bindingData, env);
-
-  if (env.exception ()) 
-    {
-      ACE_DEBUG ((LM_ERROR, "Bind failed.\n"));
-      return -1;
-    }
-  
-  if (env.exception ()) {
-    ACE_DEBUG ((LM_ERROR, "Object Reference Export Failed.\n"));
-    return -1;
-  }
-
-  ACE_DEBUG ((LM_DEBUG, "Entering boa->run ().\n"));
-  boa->run ();
-  return 0;
-}
-
-
-int 
-main (int argc, char** argv)
-{
-  CORBA_Environment env;
-
-  COOL::EOA::bind(argv[2], env);
-  if (env.exception()) {
-    ACE_DEBUG ((LM_ERROR, "Impossible to bind the ORB to the description:%s\n", argv[1]));
-    return -1;
-  }
-
-  CORBA_ORB_ptr orb = CORBA_ORB_init (argc, argv, 0, env);
-  if (env.exception ()) {
-    ACE_DEBUG ((LM_ERROR, "ORB_init failed..\n"));
-    CORBA::SystemException* ex;
-    
-    ex = CORBA::SystemException::_narrow(env.exception());
-    if (ex) {
-      CORBA::String_var msg = ex->message();
-      fprintf(stderr, "%s.\n", (const char*) msg);
-    } else {
-      fprintf(stderr, "Unknown user exception.\n");
-    }
-    return -1;
-  }
-
-  boa = orb->OA_init (argc, argv, 0, env);
-  if (env.exception ()) 
-    {
-      ACE_DEBUG ((LM_ERROR, "OA_init failed..\n"));
-      return -1;
-    }
-
-  COOL_Activity_ptr new_activity [2];
-
-  for (int i = 0; i < 1; i++)
-    {
-      if (thisCapsule->createActivity ((COOL_ActivityFunc) create_servant,
-				       //(void *) &i, 
-				       (void *) argv,
-                                       new_activity [i]) != C_OK)
-        {
-        ACE_ERROR ((LM_ERROR, "%p\n", "activate failed\n"));
-        }
-    }
-
-  CORBA_Long status;
-  for (i = 0; i < 1; i++)
-    {
-      if (new_activity [i]->join (status) != C_OK)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n", "join failed\n"));
-        }
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "Cubit server is exiting\n"));
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/Makefile b/TAO/tests/Cubit/COOL/Makefile
deleted file mode 100644
index b0a5e0a8a8f..00000000000
--- a/TAO/tests/Cubit/COOL/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for the COOL tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = MT_Cubit
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/Makefile b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/Makefile
deleted file mode 100644
index 99cbc857d2e..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lcorba -lunixsvc -lpbroker -lboadc -lnaming -llifecycl -lfsstream
-
-IDL_SRC	= cubit.cpp cubit_s.cpp
-PROG_SRCS =	$(IDL_SRC) svr.cpp clnt.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o
-CUBIT_CLT_OBJS = cubit.o clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-exceptions = 1
-
-#include $(PBHOME)/make/make.cfg
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#$(VDIR)%.o:     %.C
-#VOBJS   = $(LSRC:%.C=$(VDIR)%.o)
-
-DCFLAGS = -g 
-LDFLAGS += -L$(PBHOME)/lib
-CPPFLAGS += -I$(PBHOME)/include 
-
-$(IDL_SRC): cubit.idl
-	$(PBHOME)/bin/idlc cubit.idl
-	-/bin/mv cubit.C cubit.cpp
-	-/bin/mv cubit_s.C cubit_s.cpp
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-clean:
-	-/bin/rm -rf *.o cubit.cpp cubit.h cubit_s.cpp cubit_s.h $(CUBIT_SVR_OBJS) $(CUBIT_CLT_OBJS) $(BIN) core
- 
-realclean: clean
-
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/README b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/README
deleted file mode 100644
index 7e3219a7d4c..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/README
+++ /dev/null
@@ -1,54 +0,0 @@
-This is the cubit example that uses the CORBAplus IDL compiler to generate
-the stubs and skeletons. Additional features include presence of a
-factory to create Cubit objects.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-% svr [-d] [-n <number-of-cubit-objects>] [-pbtrace]
-
-The server cubit factory maintained num_of_cubit objects (default =
-1). They are assigned keys that look like "key0", "key1", ...
-
-When the server is started and you have used the -d flag, you should
-see a line of output that looks something like:
-XpsIiopServerProfileFactory::XpsIiopServerProfileFactory() : new tcp server listening at port 45372
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-NOTE:  
-
-0. $PBHOME is the directory where CORBAplus is installed.
-
-1. Set the appropriate environment variables for CORBAplus to work.  Look at the example script at
-$PBHOME/.cshrc_pb   You can append this script to your .cshrc.mine file assuming you run a csh shell.
-You can also execute it, like:
-
-	source $PBHOME/.cshrc_pb
-
-2.  Make sure the CORBAplus BOA server is running, before trying to run the server example.  
-
-	To run the BOA server execute:
-
-	$PBHOME/bin/pbboad -pbtrace
-
-client:
--------
-
-% clnt [-d] [-k <cubit key>] [-n <iterations>] -pbinit Cubit_Factory iiop://<host>:<port>/cubit_factory
-
-  where 
-	<host> is the machine where the server is running.
-	<port> is the port number that was displayed when the server was run.  See example output above.
-
-<cubit_key> corresponds to "key0", "key1", ...
-
-<iterations> are the number of times you want to execute a call.
-
--d : see same option for server above.
\ No newline at end of file
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.cpp b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.cpp
deleted file mode 100644
index 3a18184fea3..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the CORBAplus ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "pbroker/pberr.h"
-//#include <pbroker/corba/ifr/ifrc.h>
-#include "ace/Profile_Timer.h"
-#include "clnt.h"
-
-int _debug_level = 1;
-
-// Constructor.
-
-Cubit_Client::Cubit_Client (void)
-  : cubit_factory_key_ ("cubit_factory"),
-    cubit_key_ ("key0"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    portnum_ (ACE_DEFAULT_SERVER_PORT),
-    loop_count_ (250),
-    exit_later_ (0),
-    factory_ (Cubit_Factory::_nil ()),
-    objref_ (CORBA::Object::_nil ()),
-    cubit_ (Cubit::_nil ()),   
-    orb_ptr_ (0),
-    call_count_ (0),
-    error_count_ (0)
-{
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:k:xp:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-	_debug_level++;
-        break;
-      case 'n':			// loop count
-        loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'k':			// stringified objref
-        cubit_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        this->exit_later_++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-x]"
-                           " [-pbtrace]"
-                           " -pbinit Cubit_Factory <Object_Reference>"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Exercise the union.  Cube a union.
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  CORBA::Environment env;
-  Cubit::oneof u, r;
-
-  this->call_count_++;
-
-  u.l (3); // use the long union branch
-
-  // Cube a "union" ...
-  // @@ Put exception handling here !!!
-  r = this->cubit_->cube_union (u);
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg1 ((LM_DEBUG, "cube union ...\n"));
-      u.l (u.l () * u.l () * u.l ()) ;
-
-      if (u.l () != r.l ())
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-
-    }
-
-  this->call_count_++;
-
-  u._d (Cubit::e_3rd);
-#if 0
-  u.cm ().l = this->func (i);
-  u.cm ().s = this->func (i);
-  u.cm ().o = this->func (i);
-#endif
-
-  u.cm ().l = 7;
-  u.cm ().s = 5;
-  u.cm ().o = 3;
-
-  // Cube another "union" which uses the default arm ... NOT tested yet
-  r = this->cubit_->cube_union (u);
-//, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg1 ((LM_DEBUG, "cube union ...\n"));
-      u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
-      u.cm ().s = u.cm ().s * u.cm ().s * u.cm ().s;
-      u.cm ().o = u.cm ().o * u.cm ().o * u.cm ().o;
-
-      if (u.cm ().l != r.cm ().l
-	  || u.cm ().s != r.cm ().s
-	  || u.cm ().o != r.cm ().o)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Exercise the union using dii.
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-
-  this->call_count_++;
-
-  req = this->cubit_->_request ((CORBA::String) "cube_union");
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-
-      //      this->env_.print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::oneof	*u, r;
-
-  u = new Cubit::oneof;
-  u->_d (Cubit::e_3rd);
-
-  u->cm ().l = 5;
-  u->cm ().s = -7;
-  u->cm ().o = 3;
-
-  CORBA::Any tmp_arg (Cubit::_tc_oneof, u, CORBA_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA::ARG_IN);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      //      this->env_.print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_oneof, 0, CORBA_TRUE);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      //      this->env_.print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      this->error_count_++;
-      //      req->env ()->print_exception ("cube_union_dii invoke");
-      CORBA::release (req);
-      return;
-    }
-
-  r = *(Cubit::oneof *) req->result ()->value ()->value ();
-
-  if (r.cm ().o != 27 || r.cm ().l != 125 || r.cm ().s != -343)
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    dmsg1 ((LM_DEBUG, "cube_union_dii ... success!!\n"));
-
-  CORBA::release (req);
-  delete u;
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->cube_short (arg_short);
-  //, this->env_); @@ put exception handling here !!
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ((LM_DEBUG, "cube short:  %d --> %d\n",
-	     arg_short,
-	     ret_short));
-
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-		      (CORBA::Short) this->func (i),
-		      ret_short));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->cube_octet (arg_octet);
-  //, this->env_); @@ put exception handling here !!
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ((LM_DEBUG, "cube octet:  %d --> %d\n", 
-	     arg_octet, 
-	     ret_octet));
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-	ACE_DEBUG ((LM_DEBUG,
-		    "** cube_octet (%d) ERROR (--> %d)\n",
-		    (CORBA::Octet) this->func (i),
-		    ret_octet));
-	this->error_count_++;
-      }
-    }
-}
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->cube_long (arg_long);
-  //, this->env_);; @@ put exception handling here !!
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ((LM_DEBUG, "cube long:  %d --> %d\n", 
-	     arg_long, 
-	     ret_long));
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-	ACE_ERROR ((LM_ERROR,
-		    "** cube_long (%ld) ERROR (--> %ld)\n",
-		    (CORBA::Long) this->func (i),
-		    ret_long));
-	this->error_count_++;
-      }
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit::Many arg_struct;
-  Cubit::Many ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->cube_struct (arg_struct);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg1 ((LM_DEBUG, "cube struct ...\n"));
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct.l
-	  || arg_struct.s != ret_struct.s
-	  || arg_struct.o != ret_struct.o)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req =
-    this->cubit_->_request ((CORBA::String) "cube_struct");
-  //, this->env_); @@ put exception handling here !!
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::Many arg;
-  Cubit::Many result;
-
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-
-  CORBA::Any tmp_arg (Cubit::_tc_Many, &arg, CORBA_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA::ARG_IN);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_Many, 0, CORBA_TRUE);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      //      req->env ()->print_exception ("DII invoke sending struct");
-      CORBA::release (req);
-      return;
-    }
-
-  result = *(Cubit::Many *) req->result ()->value ()->value ();
-
-  if (result.o != 27 || result.l != 125 || result.s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    dmsg1 ((LM_DEBUG, "DII cube_struct ... success!!\n"));
-
-  CORBA::release (req);
-}
-
-void
-Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  double tmp;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "%s:\n",
-	      call_name));
-  
-  if (this->call_count_ > 0  &&  this->error_count_ == 0)
-    {
-      tmp = 1000 / elapsed_time.real_time;
-
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= this->call_count_;
-      elapsed_time.user_time /= this->call_count_;
-      elapsed_time.system_time /= this->call_count_;
-
-      tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t= %0.06f ms, \n\t"
-		  "user_time\t= %0.06f ms, \n\t"
-		  "system_time\t= %0.06f ms\n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		  tmp < 0.0? 0.0 : tmp));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "\t%d calls, %d errors\n",
-	      this->call_count_,
-	      this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-
-#if 0  // cube_struct_dii() is not enabled for now in this test
-
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-#endif /* DII test not enabled for now */
-
-  // ------------------>
-  // Two more tests, using the "cube_union" function
-
-  // unions using stubs
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_stub ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-#if 0  // cube_union_dii() is not enabled for now in this test
-  // union DII
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_dii ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-#endif /* cube_union_dii test not enabled for now */
-
-  if (this->exit_later_)
-    {
-      this->cubit_->please_exit ();
-      //this->env_); @@ put exception handling here !!
-      //dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  CORBA::release (this->orb_ptr_);
-  CORBA::release (this->objref_);
-  CORBA::release (this->factory_);
-  CORBA::release (this->cubit_);
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  int check = 0;
-
-  try {
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return -1;
-
-  // Retrieve the ORB.
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_);
-
-  //  @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //  this->env_.print_exception ("ORB initialization");
-      return -1;
-    }
-
-  // Retrieve a factory objref.
-  this->objref_ = this->orb_ptr_->resolve_initial_references ("Cubit_Factory");
-  //  @@ put exception handling here !!
-  
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("Cubit_Factory::_bind");
-      return -1;
-    }
-  
-  if (CORBA::is_nil (this->objref_) == CORBA_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "resolve_initial_references returned null object for Cubit_Factory\n"),
-                      -1);
-
-  // Narrow the CORBA::Object reference to the stub object
-  this->factory_ = Cubit_Factory::_narrow (this->objref_);
-
-  //, this->env_); @@ put exception handling here !!
-
-  CORBA::release (this->objref_);
-
-  if (this->factory_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to narrow object reference to a Cubit_Factory_ptr.\n"),
-		      -1);
-
-  // Now retrieve the Cubit obj ref corresponding to the key.
-  this->cubit_ = this->factory_->make_cubit (this->cubit_key_);
-  //, this->env_); @@ put exception handling here !!
-
-  if (this->env_.exception () != 0)
-    {
-      //      this->env_.print_exception ("string2object");
-      return -1;
-    }
-
-  if (CORBA::is_nil (this->cubit_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null cubit objref returned by factory\n"),
-                      -1);
-  }
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): clnt.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: clnt.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: clnt.cpp\n\n"));
-    }
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
-
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.h b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.h
deleted file mode 100644
index 5713668e0e5..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/clnt.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// $Id$
-// -*- C++ -*-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit 
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-#if !defined (_CLNT_H_)
-#define _CLNT_H_
-
-#include "ace/Get_Opt.h"
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/request.h"
-#include "pbroker/corba/environ.h"
-#include "cubit.h"
-
-class Cubit_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
- public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int func (u_int i);
-  // simple function that returns the substraction of 117 from the parameter.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // prints the time stats
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-  
-  void cube_union_dii (void);
-  // Exercise the union using dii.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long
-
-  void cube_octet (int i);
-  // Cube an octet
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  const char *cubit_factory_key_;
-  // Key of factory obj ref.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  Cubit_Factory_ptr factory_;
-  // factory pointer for cubit.
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  u_int call_count_;
-  // # of calls made to functions
-
-  u_int error_count_;
-  // #  of errors incurred in the lifetime of the application.
-};
-
-#if defined (DEBUG)
-#define dmsg1(X) { if (_debug_level > 0) ACE_DEBUG (X); }
-#define dmsg2(X) { if (_debug_level > 1) ACE_DEBUG (X); }
-#else
-#define dmsg1(X) { }
-#define dmsg2(X) { }
-#endif /* DEBUG */
-
-#endif /* _CLNT_H_ */
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit.idl b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit.idl
deleted file mode 100644
index 9ddc2d8954f..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit.idl
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-interface Cubit
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-
-{
-  octet	cube_octet (in octet o);
-  // cube an octet
-
-  short	cube_short (in short s);
-  // cube a short
-
-  long	cube_long (in long l);
-  // cube a long
-
-  struct Many
-  {
-    octet o;		// + 3 bytes padding (normally) ...
-    long l;
-    short s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many cube_struct (in Many values);
-  // Cube a struct
-
-  enum discrim
-  {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd
-  };
-  // Enumeration of the different elements in a union.
-
-  union oneof switch (discrim)
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet o;
-    case e_1st:
-      short s;
-    case e_2nd:
-      long l;
-    case e_3rd:
-      Many cm;
-
-      // default:
-      // Many cm;
-    };
-  // Union of different types.
-
-  oneof	cube_union (in oneof values);
-  // cube a union.
-
-  oneway void please_exit ();
-  // shutdown the application.
-};
-
-interface Cubit_Factory
-  // = TITLE
-  //    Creates Cubit objects
-{
-  Cubit make_cubit (in string key);
-};
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.cpp b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.cpp
deleted file mode 100644
index 4ad44df668b..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-//
-// = FILENAME
-//    cubit_i.cpp
-//
-// = AUTHOR
-//    Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/environ.h"
-#include <pbroker/corba/xpsboa.h>
-#include <pbroker/corba/lifecycl/impldecl.h>
-#include "cubit_i.h"
-
-// Declare the Implementation 
-XPS_DECLARE_IMPLEMENTATION_ID(Cubit_Factory_iId,"Cubit_Factory_iId")
-XPS_DECLARE_IMPLEMENTATION(Cubit_Factory_decl,Cubit_Factory_iId,Cubit_Factory)
-
-// Declare the associated activator, 
-XPS_DECLARE_DEFAULT_ACTIVATOR(Cubit_Factory_decl,Cubit_FactoryDefActivator,Cubit_Factory,Cubit_Factory_i)
-
-XPS_CAST1_IMPL(Cubit_Factory_i,Cubit_Factory_base_impl)
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (const char *key, int numobjs)
-  :numobjs_ (numobjs)
-{
-  // Create implementation object with user specified key.
-  this->my_cubit_ = new Cubit_i_ptr [this->numobjs_];
-
-  static char obj_str [MAXNAMELEN];
-
-  for (u_int i = 0; i < this->numobjs_; i++)
-    {
-      ACE_OS::memset (obj_str, '\0', MAXNAMELEN);
-      ACE_OS::sprintf (obj_str, "key%d", i);
-
-      my_cubit_[i] = new Cubit_i (obj_str);
-
-      if (my_cubit_[i] == 0)
-        ACE_ERROR ((LM_ERROR,
-                    " (%P|%t) Unable to create implementation object%d\n",
-                    i));
-    }
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "~~~ in destructor ~Cubit_Factory_i()\n"));
-  delete [] this->my_cubit_;
-}
-
-Cubit_ptr
-Cubit_Factory_i::make_cubit (const char *key)
-{
-  CORBA_Environment env;
-
-  for (size_t i = 0; i < this->numobjs_; i++)
-    {
-      const char *obj_str = this->my_cubit_[i]->_get_name ();
-
-      // Keys matched.
-      if (!ACE_OS::strcmp (obj_str, key))
-        return Cubit::_duplicate (this->my_cubit_ [i]);
-    }
-
-  return Cubit::_nil ();
-}
-
-// Constructor
-
-Cubit_i::Cubit_i (const char *obj_name)
-  : key_(obj_name)
-{
-}
-
-const char *
-Cubit_i::_get_name (void)
-{
-  return key_;
-}
-
-// Destructor
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-// Cube an octet
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o)
-{
-  return o * o * o;
-}
-
-// Cube a short.
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s)
-{
-  return s * s * s;
-}
-
-// Cube a long
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l)
-{
-  return l * l * l;
-}
-
-// Cube a struct
-
-Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values)
-{
-  Cubit::Many temp;
-
-  temp.o = values.o * values.o * values.o;
-  temp.s = values.s * values.s * values.s;
-  temp.l = values.l * values.l * values.l;
-
-  return temp;
-}
-
-// Cube a union
-
-Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values)
-{
-  Cubit::oneof temp;
-
-  switch (values._d ())
-    {
-    case e_0th:
-      temp.o (values.o () * values.o () * values.o ());
-      break;
-    case e_1st:
-      temp.s (values.s () * values.s () * values.s ());
-      break;
-    case e_2nd:
-      temp.l (values.l () * values.l () * values.l ());
-      break;
-    case e_3rd:
-    default:
-      temp._d (values._d ()); // set the discriminant
-      // use the read/write accessor
-      temp.cm ().o  = values.cm ().o * values.cm ().o * values.cm ().o;
-      temp.cm ().s  = values.cm ().s * values.cm ().s * values.cm ().s;
-      temp.cm ().l  = values.cm ().l * values.cm ().l * values.cm ().l;
-
-    }
-  return temp;
-}
-
-// Shutdown.
-
-void Cubit_i::please_exit (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "I've been asked to shut down...\n"));
-  // TAO_ORB_Core_instance ()->orb ()->shutdown ();
-  //dexc (env, "please_exit, shutdown");
-}
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h
deleted file mode 100644
index b97c92c2e7d..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/cubit_i.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-// 
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
-// ============================================================================
-
-#if !defined (_CUBIT_I_HH)
-#define	_CUBIT_I_HH
-
-#include <pbroker/corba/lifecycl/actvtr.h>
-#include <pbroker/corba/lifecycl/impldecl.h>
-
-#include "ace/OS.h"
-#include "cubit_s.h"
-
-// Forward declarations
-class Cubit_i;
-
-// Typedefs.
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public Cubit_base_impl
-  // = TITLE
-  //    Illustrates how to integrate a servant with the
-  //    generated skeleton.
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  // Constructor
-
-  ~Cubit_i (void);
-  // Destructor
-
-  virtual CORBA::Octet cube_octet (CORBA::Octet o);
-  // Cube an octet
-
-  virtual CORBA::Short cube_short (CORBA::Short s);
-  // Cube a short
-
-  virtual CORBA::Long cube_long (CORBA::Long l);
-  // Cube a long
-
-  virtual Cubit::Many cube_struct (const Cubit::Many &values);
-  // Cube a struct.
-
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values);
-  // Cube a union.
-
-  virtual void please_exit (void);
-  // Shutdown routine.
-
-  const char *_get_name (void);
-  // get the key of the object.
- private:
-  const char *key_;
-};
-
-
-class Cubit_Factory_i;
-
-typedef Cubit_Factory_i *Cubit_Factory_i_ptr;
-
-class Cubit_Factory_i: public Cubit_Factory_base_impl
-  // =TITLE
-  //  Cubit_Factory_i
-  //
-  // DESCRIPTION
-  //  factory object returning the cubit objrefs
-{
-public:
-  XPS_CAST1_DECL(Cubit_Factory_i,Cubit_Factory_base_impl)
-  XPS_DEFINE_IMPLEMENTATION(Cubit_Factory_decl)
-    
-  Cubit_Factory_i (void) 
-    {Cubit_Factory_i ("keyone", 1);}
-  
-  Cubit_Factory_i (const CORBA_ReferenceData & refData) 
-    {Cubit_Factory_i ("keyone", 1);}
-  
-  Cubit_Factory_i (const char *key, int numobjs);
-  // constructor
-
-  ~Cubit_Factory_i (void);
-  // destructor
-
-  virtual Cubit_ptr make_cubit (const char *key);
-  // make the cubit object whose key is "key"
-
-private:
-  Cubit_i_ptr *my_cubit_;
-  u_int numobjs_;
-};
-
-#endif /* _CUBIT_I_HH */
diff --git a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/svr.cpp b/TAO/tests/Cubit/CORBAplus/IDL_Cubit/svr.cpp
deleted file mode 100644
index 28d0d5da22f..00000000000
--- a/TAO/tests/Cubit/CORBAplus/IDL_Cubit/svr.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/CORBAplus/IDL_Cubit
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/environ.h"
-#include "pbroker/pberr.h"
-#include <pbroker/corba/xpsorb.h>
-#include <pbroker/corba/xpsboa.h>
-#include "pbroker/corba/boad/boafull.h"   // will force usage of "Full" BOA API
-
-#include <pbroker/unixsvc/unixsvc.h>
-
-#include "cubit_i.h"
-
-// Global Variables
-static int num_of_objs = 1;
-static pbbool killSelf = pbfalse;
-
-// Declare the server activation policy
-XPS_DECLARE_SERVER(Cubit_Factory,"Cubit_Factory",SHARED_SERVER)
-
-// Parses the command line arguments and returns an error status
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "dn:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        break;
-      case 'n':	// number of cubit objects we hold
-        num_of_objs = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  CORBA_Environment env;
-  //  char *orb_name = "internet";
-  
-  XpsORB_ptr       orb_ptr = XpsORB::_nil();
-  XpsBOA *         oa_ptr  = XpsBOA::_nil ();
-  CORBA_Object_ptr obj_ptr = CORBA_Object::_nil();
-  
-  try
-    {
-      // Initialize the ORB pointer
-      orb_ptr = XpsORB::init (argc, argv); 
-
-      // Initialize the Object Adapter
-      oa_ptr = XpsBOA::init (argc, argv);
-      
-      if (CORBA::is_nil(orb_ptr) || CORBA::is_nil(oa_ptr))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR, 
-			     " (%P|%t) Unable to initialize the ORB and/or the BOA\n"),
-			    1);
-	}
-
-
-      // Parse remaining command line and verify parameters.
-      //      parse_args (argc, argv);
-
-      // create a factory implementation
-      Cubit_Factory_ptr factory;
-      
-      ACE_NEW_RETURN (factory, Cubit_Factory_i ("factory", num_of_objs), 1);
-      
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-      
-      CORBA::String str = 0;
-      
-      str = orb_ptr->object_to_url (factory);
-      
-      ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str));
-      CORBA_string_free (str);
-
-      oa_ptr->obj_is_ready (factory, nil);
-      oa_ptr->registerAlias (factory, "cubit_factory");
-
-      XpsEventService  eventService;
-      eventService.mainloop();   // control will not return to this point
-    }
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): svr.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: svr.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: svr.cpp\n\n"));
-    }
-
-  // Free resources
-  CORBA::release (oa_ptr);
-  CORBA::release (orb_ptr);
-  
-  return 0;
-}
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/Makefile b/TAO/tests/Cubit/CORBAplus/MT_Cubit/Makefile
deleted file mode 100644
index 2d391b27ad6..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO MT-Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = client \
-        server
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/README b/TAO/tests/Cubit/CORBAplus/MT_Cubit/README
deleted file mode 100644
index a27939bd690..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/README
+++ /dev/null
@@ -1,58 +0,0 @@
-The MT-Cubit example
---------------------
-
-Compiling
----------
-
-Makefiles are provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./svr -pbtrace
-
-port_num is the port number at which the server will start the high
-priority servant. The low priority servant will be created at
-(port_num+1).
-
-The server will print the IOR of the high and low priority servants,
-but it is not required by the client.
-
-client:
--------
-
-./client -d <datatype> -n <num_calls> -t <num_threads> -pbtrace -pbinit Cubit iiop://<remoteHost>:<port>/Cubit00 
-
-<datatype> is one of the following:
-
-0 Octet
-1 Short
-2 Long
-3 Struct of the above 3 types
-
-<port_num> is the port number of the high priority servant. The low
-priority servant is assumed to be at (port_num+1).
-
-<server_hostname> is the hostname of the server.
-
-Based on the server_hostname and the port_num, the client constructs
-the IOR's for the high priority servant and the low priority servant.
-
-<num_calls> is the number of CORBA twoway calls to be made
-
-<num_threads> is the total number of concurrent clients to be
-created. One of these clients will be a high priority client (and thus
-send requests to the high priority servant), and the rest will have
-low priority.
-
-The high priority client makes requests at 20Hz, and the low priority
-clients make requests at 10Hz.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority client.
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Makefile b/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
deleted file mode 100644
index d29054dd986..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
+++ /dev/null
@@ -1,148 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lmtcorba -lmtunixsvc -lmtpbroker -lmtboadc -lmtnaming -lmtlifecycl -lmtfsstream
-
-IDL_SRC	= cubit.cpp 
-PROG_SRCS = $(IDL_SRC) Task_Client.cpp client.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_CLIENT_OBJS = cubit.o Task_Client.o client.o
-
-BIN = client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-WRAPPER_ROOT = $(ACE_ROOT)/
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-#enable C++ exceptions
-exceptions = 1
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-##DCFLAGS = -g
-LDFLAGS += -L$(PBHOME)/lib
-CPPFLAGS += -I$(PBHOME)/include
-
-$(IDL_SRC): cubit.idl
-	$(PBHOME)/bin/idlc cubit.idl 
-	-/bin/mv cubit.C cubit.cpp
-
-client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/mtiiop_s.o $(VLDLIBS) $(POSTLINK)
-
-clean:	
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit.o .shobj/cubit.: cubit.cpp
-.obj/Task_Client.o .shobj/Task_Client.: Task_Client.cpp Task_Client.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.cpp b/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.cpp
deleted file mode 100644
index 7e288796b11..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-#include "pbroker/corba/xpsorb.h"
-#include "pbroker/corba/xpsboa.h"
-#include "pbroker/corba/boad/boafull.h"   // will force usage of "Full" BOA API
-#include "Task_Client.h"
-
-Task_State::Task_State (int argc, char **argv)
-  : start_count_ (0),
-    loop_count_ (5),
-    thread_count_ (5),
-    base_port_ (5000),
-    datatype_ (CB_OCTET),
-    argc_ (argc),
-    argv_ (argv)
-{
-  ACE_OS::strcpy (server_host_, "localhost");
-  ACE_Get_Opt opts (argc, argv, "h:n:t:p:d:");
-  int c;
-  int datatype;
-
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'd':
-      datatype = ACE_OS::atoi (opts.optarg);
-      switch (datatype)
-        {
-        case CB_OCTET:
-          ACE_DEBUG ((LM_DEBUG, "Testing Octets\n"));
-          datatype_ = CB_OCTET;
-          break;
-        case CB_LONG:
-          ACE_DEBUG ((LM_DEBUG, "Testing Longs\n"));
-          datatype_ = CB_LONG;
-          break;
-        case CB_STRUCT:
-          ACE_DEBUG ((LM_DEBUG, "Testing Structs\n"));
-          datatype_ = CB_STRUCT;
-          break;
-        case CB_SHORT:
-        default:
-          datatype_ = CB_SHORT;
-          ACE_DEBUG ((LM_DEBUG, "Testing Shorts\n"));
-          break;
-        }
-      continue;
-    case 'h':
-      ACE_OS::strcpy (server_host_, opts.optarg);
-      continue;
-    case 'p':
-      base_port_ = ACE_OS::atoi (opts.optarg);
-      continue;
-    case 'n':			// loop count
-      loop_count_ = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-    case 't':
-      thread_count_ = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       "[-d datatype Octet=0, Short=1, Long=2, Struct=3]"
-                       " [-n num_calls]"
-                       " [-h server_hostname]"
-                       " [-p server_port_num]"
-                       " [-t num_threads]"
-                       "\n", argv [0]
-                       );
-    }
-  barrier_ = new ACE_Barrier (thread_count_);
-  latency_ = new double [thread_count_];
-}
-
-Client::Client (Task_State *ts)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
-    ts_ (ts)
-{
-}
-
-void
-Client::put_latency (double latency, u_int thread_id) {
-  ts_->lock_.acquire ();
-  ts_->latency_[thread_id] = latency;
-  ACE_DEBUG ((LM_DEBUG, "(%t) My latency was %f\n", latency));
-  ts_->lock_.release ();
-}
-
-double
-Client::get_high_priority_latency () {
-  return (double) ts_->latency_ [0];
-}
-
-double
-Client::get_low_priority_latency () {
-  double l = 0;
-  for (u_int i = 1; i < ts_->start_count_; i++)
-    l += (double) ts_->latency_[i];
-  return l / (double) (ts_->start_count_ - 1);
-}
-
-int
-Client::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Thread created\n"));
-  u_int thread_id;
-  Cubit_ptr cb;
-  char ior [1024];
-  double frequency;
-  XpsORB_ptr       orb_ptr = XpsORB::_nil();
-  //  XpsBOA *         oa_ptr  = XpsBOA::_nil ();
-  //CORBA_Object_ptr obj_ptr = CORBA_Object::_nil();
-  // CORBA::ORB_ptr orb_ptr;
-  try {
-    {
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, ts_->lock_, -1);
-
-    thread_id = ts_->start_count_;
-    ts_->start_count_++;
-
-    if (thread_id == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, my id is %d.\n", thread_id));
-        ::sprintf (ior, "iiop:1.0//%s:%d/Cubit00", ts_->server_host_, ts_->base_port_);
-        frequency = CB_HIGH_PRIORITY_RATE;
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) Im a low priority client, my id is %d\n", thread_id));
-        ::sprintf (ior, "iiop:1.0//%s:%d/Cubit00", ts_->server_host_, ts_->base_port_ + 1);
-        frequency = CB_LOW_PRIORITY_RATE;
-      }
-
-    ACE_DEBUG ((LM_DEBUG, "Using ior = %s\n", ior));
-
-    CORBA::Object_ptr objref = CORBA::Object::_nil ();
-    CORBA::Environment env;
-
-    orb_ptr = XpsORB::init (ts_->argc_, ts_->argv_);
-    //orb_ptr = CORBA::ORB_init (ts_->argc_, ts_->argv_);
-    //if (env.exception () != 0) @@ put exception handling here !!
-    //   ACE_ERROR_RETURN ((LM_ERROR,"%s:ORB initialization", env.exception ()), 2);
-
-    // Retrieve a factory objref.
-    objref = orb_ptr->resolve_initial_references ("Cubit");
-
-    if (CORBA::is_nil (objref) == CORBA_TRUE)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%s:  must identify non-null target objref\n",
-                         ts_->argv_ [0]),
-		      1);
-
-    // Narrow the CORBA::Object reference to the stub object, checking
-    // the type along the way using _is_a.
-    cb = Cubit::_narrow (objref);
-
-   if (cb == NULL) 
-     {
-       ACE_ERROR_RETURN ((LM_ERROR, "Create cubit failed\n"), 1);
-     }
-    ACE_DEBUG ((LM_DEBUG, "(%t) Binding succeeded\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%t) Cb == %x\n", cb));
-
-    CORBA::String str;
-
-    str = orb_ptr->object_to_url (cb);
-    // 
-    //ACE_ERROR_RETURN ((LM_ERROR, "object_to_string\n"), -1);
-
-    ACE_OS::puts ((char *) str);
-    ACE_OS::fflush (stdout);
-    ACE_DEBUG ((LM_DEBUG, "Object Created at: '%ul'", cb));
-    ACE_DEBUG ((LM_DEBUG, "connected to object '%s'", str));
-    //    if (cb->cube_short (2, env) == 8) // dummy call.
-    //      ACE_DEBUG ((LM_DEBUG, "(%t) Made successful dummy call"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for other threads to finish binding..\n"));
-  ts_->barrier_->wait ();
-  ACE_DEBUG ((LM_DEBUG, "(%t) Everyone's done, here I go!!\n"));
-
-  this->run_tests (cb, ts_->loop_count_, thread_id, ts_->datatype_, frequency);
-
-  // Free resources
-  CORBA::release (orb_ptr);
-  }
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): client.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: client.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: client.cpp\n\n"));
-    }
-
-  return 0;
-}
-
-int
-Client::run_tests (Cubit_ptr cb,
-                   u_int loop_count,
-                   u_int thread_id,
-                   Cubit_Datatypes datatype,
-                   double frequency)
-{
-  CORBA::Environment env;
-  unsigned i = 0;
-  unsigned call_count = 0, error_count = 0;
-
-  double latency = 0;
-  double sleep_time = (1/frequency) * (1000 * 1000);
-  double delta = 0;
-
-  //
-  // Make the calls in a loop.
-  //
-  for (i = 0; i < loop_count; i++)
-    {
-      ACE_Profile_Timer timer;
-      ACE_Time_Value tv (0, (long int) (sleep_time - delta));
-      ACE_OS::sleep (tv);
-      timer.start ();
-
-      switch (datatype)
-        {
-        case CB_OCTET:
-          {
-            // Cube an octet.
-            call_count++;
-
-            CORBA::Octet arg_octet = func (i), ret_octet = 0;
-
-            ret_octet = cb->cube_octet (arg_octet);
-
-            if (env.exception () != 0)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-              }
-            arg_octet = arg_octet * arg_octet * arg_octet;
-            if (arg_octet != ret_octet)
-              {
-                ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-                error_count++;
-              }
-          }
-        break;
-
-        case CB_SHORT:
-          // Cube a short.
-          {
-            call_count++;
-
-            CORBA::Short arg_short = func (i), ret_short;
-
-            ret_short = cb->cube_short (arg_short);
-
-            if (env.exception () != 0) 
-              ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-
-            arg_short = arg_short * arg_short * arg_short;
-            if (arg_short != ret_short) {
-              ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-              error_count++;
-            }
-          }
-        break;
-          // Cube a long.
-
-        case CB_LONG:
-          {
-            call_count++;
-
-            CORBA::Long arg_long = func (i), ret_long;
-
-            ret_long = cb->cube_long (arg_long);
-
-            if (env.exception () != 0)
-              ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-
-            arg_long = arg_long * arg_long * arg_long;
-            if (arg_long != ret_long)
-              {
-                ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-                error_count++;
-              }
-          }
-          break;
-
-        case CB_STRUCT:
-          // Cube a "struct" ...
-          {
-            Cubit::Many	arg_struct, ret_struct;
-
-            call_count++;
-
-            arg_struct.l = func (i);
-            arg_struct.s = func (i);
-            arg_struct.o = func (i);
-
-            ret_struct = cb->cube_struct (arg_struct);
-
-            if (env.exception () != 0)
-              ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-
-            arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-            arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-            arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-
-            if (arg_struct.l  != ret_struct.l
-              || arg_struct.s  != ret_struct.s
-              || arg_struct.o  != ret_struct.o )
-              {
-                ACE_OS::printf ("**cube_struct error!\n");
-                error_count++;
-              }
-                
-          }
-          break;
-        }
-      timer.stop();
-      ACE_Profile_Timer::ACE_Elapsed_Time et;
-      timer.elapsed_time (et);
-      delta = ( (0.4 * fabs (et.real_time * (1000 * 1000))) + (0.6 * delta) ); // pow(10,6)
-      latency += et.real_time;
-    }
-
-  if (call_count > 0)
-    {
-      if (error_count == 0)
-        {
-
-          latency /= call_count;
-
-          if (latency > 0) {
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %f msec, \t"
-                            "%f calls/second\n",
-                            latency * 1000,
-                            1 / latency);
-            this->put_latency (latency * 1000, thread_id);
-          }
-
-        }
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //  cb->please_exit (env);
-  return 0;
-}
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h b/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h
deleted file mode 100644
index aa14d21a682..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/Task_Client.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/request.h"
-#include "pbroker/corba/environ.h"
-
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-#include "ace/Profile_Timer.h"
-#include <math.h>
-
-inline int func (unsigned i) { return i - 117; }
-
-enum Cubit_Datatypes {CB_OCTET, CB_SHORT, CB_LONG, CB_STRUCT};
-
-#define CB_HIGH_PRIORITY_RATE 20
-#define CB_LOW_PRIORITY_RATE 10
-
-class Task_State
-{
- public:
-  ACE_Barrier *barrier_;
-  Task_State (int argc, char **argv);
-  unsigned int start_count_;
-  unsigned int loop_count_;
-  unsigned int thread_count_;
-  unsigned int base_port_;
-  char server_host_ [1024];
-  double *latency_;
-  Cubit_Datatypes datatype_;
-  ACE_Thread_Mutex lock_;
-  int argc_;
-  char **argv_;
-};
-
-class Client : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  //  Client (char *hostname, unsigned int n_threads, unsigned int loop_count_);
-  Client (Task_State *ts);
-  virtual int svc (void);
-  double get_high_priority_latency ();
-  double get_low_priority_latency ();
-private:
-  int run_tests (Cubit_ptr, unsigned int, unsigned int, Cubit_Datatypes, double frequency);
-  void put_latency (double latency, unsigned int);
-  int parse_args (int, char **);
-  Task_State *ts_;
-};
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/client.cpp b/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/client.cpp
deleted file mode 100644
index 93cb0bc8ce0..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/client.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "cubit.h"
-#include "Task_Client.h"
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  Task_State ts (argc, argv);
-
-  ACE::set_handle_limit ();
-
-  Client low_client (&ts);
-
-  // First activate the high priority client.
-
-  Client high_client (&ts);
-
-  ACE_Sched_Priority priority = 
-    ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG, "Creating client with high priority\n"));
-
-  if (high_client.activate (THR_BOUND, 1, 0, priority) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-  priority = 
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG, "Creating %d clients with low priority\n", ts.thread_count_ - 1));
-
-  if (low_client.activate (THR_BOUND, ts.thread_count_ - 1, 0, priority) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %f msec\n"
-                  "Low priority client latency : %f msec\n",
-                  high_client.get_high_priority_latency (),
-                  low_client.get_low_priority_latency ());
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/cubit.idl b/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/cubit.idl
deleted file mode 100644
index 165a2de649c..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/client/cubit.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-  interface Cubit {
-     octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    /*    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-        Many            cm;
-      };
-    
-      oneof	cube_union (in oneof values); */
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in short priority);
-  };
-
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/Makefile b/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
deleted file mode 100644
index 276b69a1569..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-#LDLIBS     =  -lmtcorba -lmtunixsvc -lmtpbroker -lmtboadc -lmtnaming -lmtlifecycl -lmtfsstream
-LDLIBS     =  -lcorba -lunixsvc -lpbroker -lboadc -lnaming -llifecycl -lfsstream
-
-IDL_SRC	= cubit.cpp cubit_s.cpp
-PROG_SRCS =	svr.cpp cubit_i.cpp
-
-LSRC = $(IDL_SRC) $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o
-
-BIN = svr
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-#enable C++ exceptions
-exceptions = 1
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-DCFLAGS = -g
-LDFLAGS += -L$(PBHOME)/lib
-CPPFLAGS += -I$(PBHOME)/include
-
-#CXX := purify $(CXX)
-
-$(IDL_SRC): cubit.idl
-	$(PBHOME)/bin/idlc cubit.idl 
-	-/bin/mv cubit.C cubit.cpp
-	-/bin/mv cubit_s.C cubit_s.cpp
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
-
-clean:	
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit.o .shobj/cubit.: cubit.cpp
-.obj/cubit_s.o .shobj/cubit_s.: cubit_s.cpp
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit.idl b/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit.idl
deleted file mode 100644
index 5ad02f47c28..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    /*    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-        Many            cm;
-      };
-    
-      oneof	cube_union (in oneof values); */
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in short priority);
-  };
-
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.cpp b/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.cpp
deleted file mode 100644
index 4b1d730a45e..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/environ.h"
-#include "cubit_i.h"
-
-Cubit_i::Cubit_i (const char *obj_name)
-{
-}
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet       o)
-{
-  return (CORBA::Octet) (o * o * o);
-}
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short       s)
-{
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long        l)
-{
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many 
-Cubit_i::cube_struct (const Cubit::Many        &values)
-{
-  Cubit::Many out_values;
-  out_values.o  = values.o * values.o * values.o;
-  out_values.s  = values.s * values.s * values.s;
-  out_values.l  = values.l * values.l * values.l;
-
-  return out_values;
-}
-
-/*Cubit_oneof *
-Cubit_i::cube_union (Cubit_oneof       &values,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  switch (values._disc)
-    {
-    case e_0th:
-      values.o = (CORBA::Octet) (values.o * values.o * values.o);
-      break;
-    case e_1st:
-      values.s = (CORBA::Short) (values.s * values.s * values.s);
-      break;
-    case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-    case e_3rd:
-    default:
-      values.cm.o = (CORBA::Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA::Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-    }
-  return &values;
-} */
-
-void Cubit_i::please_exit (void)
-{
-}
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h b/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h
deleted file mode 100644
index 08d2563f945..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/cubit_i.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubit_s.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public Cubit_base_impl
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  ~Cubit_i (void);
-   
-  virtual
-  CORBA::Octet cube_octet (CORBA::Octet       o);
-
-  virtual
-  CORBA::Short cube_short (CORBA::Short       s);
-  
-  virtual
-  CORBA::Long cube_long (CORBA::Long        l);
-  
-  virtual
-    Cubit::Many cube_struct (const Cubit::Many        &values);
-  
-  /*  virtual
-  Cubit::oneof *cube_union (Cubit::oneof       &values,
-  CORBA::Environment &env); */
-  
-  virtual
-  void please_exit (void);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp b/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp
deleted file mode 100644
index 63000464623..00000000000
--- a/TAO/tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode,
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/request.h"
-#include "pbroker/corba/environ.h"
-#include "pbroker/unixsvc/unixsvc.h"
-#include "pbroker/corba/xpsorb.h"
-#include "pbroker/corba/xpsboa.h"
-#include "pbroker/corba/boad/boafull.h"   // will force usage of "Full" BOA API
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "ace/Task.h"
-#include "ace/ARGV.h"
-#include "ace/Sched_Params.h"
-
-#include "cubit_i.h"
-
-// Global Variables
-static CORBA::String key = (CORBA::String) "Cubit";
-
-
-class Cubit_Task : public ACE_Task<ACE_NULL_SYNCH>
-// = TITLE
-//    Encapsulates an ORB for the Cubit application
-{
-public:
-  Cubit_Task (const char* args, const char* orbname, unsigned int num_of_objs); //
-
-  virtual int svc (void);
-
-protected:
-  Cubit_Task () {};
-
-private:
-  char* orbname_;
-  char* orbargs_;
-  unsigned int num_of_objs_;
-};
-
-Cubit_Task::Cubit_Task (const char* args, const char* orbname, unsigned int num_of_objs)
-  : orbname_ ((char*)orbname),
-    orbargs_ ((char*)args),
-    num_of_objs_ (num_of_objs)
-{}
-
-
-int
-Cubit_Task::svc (void)
-{
-  CORBA::Environment env;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Beginning Cubit task with args = '%s'\n", orbargs_));
-  ACE_ARGV args (orbargs_);
-
-  int argc = args.argc ();
-  char** argv = args.argv ();
-
-  XpsORB_ptr       orb_ptr = XpsORB::_nil();
-  XpsBOA *         oa_ptr  = XpsBOA::_nil ();
-  CORBA_Object_ptr obj_ptr = CORBA_Object::_nil();
-
-  try {
-    // Initialize the ORB pointer
-    orb_ptr = XpsORB::init (argc, argv); 
-    
-    // Initialize the Object Adapter
-    oa_ptr = XpsBOA::init (argc, argv);
-    
-    if (CORBA::is_nil(orb_ptr) || CORBA::is_nil(oa_ptr))
-      {
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   " (%P|%t) Unable to initialize the ORB and/or the BOA\n"),
-			  1);
-      }
-    
-  // Create implementation object with user specified key.
-  Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs_];
-
-  u_int i;
-  for (i = 0; i < num_of_objs_; i++)
-    {
-      CORBA::String obj_str = CORBA::string_alloc (ACE_OS::strlen ((char *) key)+30);
-
-#if 0
-      ACE_OS::sprintf (obj_str, "%s-%u-%02d", (char *) key, ACE_Thread::self (), i);
-#else
-      ACE_OS::sprintf (obj_str, "%s%02d", (char *) key, i);
-#endif
-
-      my_cubit[i] = new Cubit_i (obj_str);
-
-      if (my_cubit[i] == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to create implementation object&d\n",
-			   i),
-			  2);
-
-      //CORBA::OctetSeq obj_key;
-      //obj_key.buffer = (CORBA::Octet *) obj_str;
-      //obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-
-      //CORBA::Object_ptr obj = 0;
-
-      //      if (oa_ptr->find (obj_key, obj) == -1)
-      //   ACE_ERROR_RETURN ((LM_ERROR,
-      //                     " (%P|%t) Unable to locate object with key '%s', %p\n",
-      //                     key),
-      //                    3);
-
-      // Stringify the objref we'll be implementing, and print it
-      // to stdout.  Someone will take that string and give it to
-      // some client.  Then release the object.
-
-      CORBA::String str;
-
-      //  str = orb_ptr->object_to_string (obj);
-      str = orb_ptr->object_to_url (my_cubit[i]);
-      
-      ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str));
-      CORBA_string_free (str);
-
-      oa_ptr->obj_is_ready (my_cubit[i], nil);
-      oa_ptr->registerAlias (my_cubit[i], obj_str);
-
-      if (env.exception () != 0)
-        {
-	  //          env.print_exception ("object2string");
-          return 1;
-        }
-
-      ACE_OS::puts ((char *) str);
-      ACE_OS::fflush (stdout);
-      //ACE_DEBUG ((LM_DEBUG,"Object Created at: '%ul'", obj));
-      CORBA::string_free (obj_str);
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  XpsEventService  eventService;
-  eventService.mainloop();   // control will not return to this point
-  //  orb_ptr->run ();
-
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-
-  //  oa_ptr->clean_shutdown (env);
-
-  // Need to clean up and do a CORBA::release on everything we've
-  // created!
-  for (i = 0; i < num_of_objs_; i++)
-    {
-      delete my_cubit[i];
-    }
-
-  // Free resources
-  CORBA::release (orb_ptr);
-  CORBA::release (oa_ptr);
-  }
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): svr.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: svr.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: svr.cpp\n\n"));
-    }
-
-  return 0;
-}
-
-static char *hostname = NULL;
-static int base_port = 0;
-
-// Parses the command line arguments and returns an error status
-
-static int num_of_objs = 1;
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt opts (argc, argv, "h:p:n:");
-  int c;
-
-  while ((c = opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        hostname = opts.optarg;
-        break;
-      case 'p':
-	base_port = ACE_OS::atoi (opts.optarg);
-	break;
-      case 'n':
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " -p port"
-			   " -h my_hostname"
-                           " -n num_objects"
-			   "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-
-#if 0
-  parse_args (argc, argv);
-
-  if ((hostname == NULL) || (base_port == 0)) 
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			 "usage: %s "
-			 " -p port -h my_hostname"
-			 "\n",argv [0]), 1);
-      
-    }
-#endif
-  
-  const size_t arg_size =
-    strlen("rate20 -ORBport %d -ORBhost %s")
-    + 5 /* port number */
-    + MAXHOSTNAMELEN /* hostname */
-    + 1 /* zero terminator */;
-  
-  char *args1 = 0;
-  ACE_NEW_RETURN (args1, char[arg_size], -1);
-
-  ::sprintf (args1, "rate20");
-  Cubit_Task task1 (args1 , "internet", 1);
-  ACE_Sched_Priority priority;
-#if defined(VXWORKS)
-  priority = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD) + 6;
-#else
-  priority = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
-#endif  
-  ACE_DEBUG ((LM_DEBUG, "Creating servant with high priority\n"));
-  task1.activate (THR_BOUND, 1, 0, priority);
-
-
-  char *args2 = 0;
-  ACE_NEW_RETURN (args2, char[arg_size], -1);
-
-  ::sprintf (args2, "rate10");//, base_port+1, hostname);
-  Cubit_Task task2 (args2 , "internet", 1);
-  priority =
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
-  ACE_DEBUG ((LM_DEBUG, "Creating servant with low priority\n"));
-  task2.activate (THR_BOUND, 1, 0, priority);
-
-  ACE_Thread_Manager::instance ()->wait ();
-
-  delete [] args1;
-  delete [] args2;
-  
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Makefile b/TAO/tests/Cubit/Makefile
deleted file mode 100644
index db182c11161..00000000000
--- a/TAO/tests/Cubit/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Makefile for the Cubit test (for several ORBs)
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = TAO 
-
-# These are disabled by default...
-# Orbix \
-# VisiBroker
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/Orbix/Makefile b/TAO/tests/Cubit/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/tests/Cubit/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/Makefile b/TAO/tests/Cubit/Orbix/base_server/Makefile
deleted file mode 100644
index a6aa32a05ce..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = -lorbixmt
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-exceptions = 1
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/inc
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf server cubitC.* cubitS.* cubit.hh
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.hh cubitC.cpp
-.obj/cubit_impl.o .obj/cubit_impl.so .shobj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.hh
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h cubit_impl.h \
- cubit.hh
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit.idl b/TAO/tests/Cubit/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h b/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index ef5b0dffe5f..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.hh"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/base_server/server.cpp b/TAO/tests/Cubit/Orbix/base_server/server.cpp
deleted file mode 100644
index cfeafe72375..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "ace/streams.h"
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/client/Makefile b/TAO/tests/Cubit/Orbix/client/Makefile
deleted file mode 100644
index 73f775bee2f..00000000000
--- a/TAO/tests/Cubit/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/client/client.cpp b/TAO/tests/Cubit/Orbix/client/client.cpp
deleted file mode 100644
index 50bda0fd40c..00000000000
--- a/TAO/tests/Cubit/Orbix/client/client.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  ACE_Time_Value before, after;
-
-  
-  //
-  // Cube an octet.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-        ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    }
-  
-  //
-  // Cube a short.
-  //
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-        ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-    }
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a long.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-        ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-    }
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a "struct" ...
-  //
-  Cubit::Many	arg_struct, ret_struct;
-      
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      TRY {
-        ret_struct = cb->cube_struct (arg_struct);
-      }
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-      arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-      arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-      if (arg_struct.l  != ret_struct.l 
-          || arg_struct.s  != ret_struct.s 
-          || arg_struct.o  != ret_struct.o )
-        {
-          cerr << "** cube_struct ERROR\n";
-          error_count++;
-        }
-    }
-    
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-  
-}
diff --git a/TAO/tests/Cubit/Orbix/client/cubit.h b/TAO/tests/Cubit/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/client/cubit.idl b/TAO/tests/Cubit/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/client/cubitC.cpp b/TAO/tests/Cubit/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/Makefile b/TAO/tests/Cubit/Orbix/factory_client/Makefile
deleted file mode 100644
index 63cc8a65e02..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/factory_client/client.cpp b/TAO/tests/Cubit/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/tests/Cubit/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.hh b/TAO/tests/Cubit/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.idl b/TAO/tests/Cubit/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp b/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp b/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/orb.mk b/TAO/tests/Cubit/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/tests/Cubit/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/tests/Cubit/Orbix/tpool/Makefile b/TAO/tests/Cubit/Orbix/tpool/Makefile
deleted file mode 100644
index 0e425af78b1..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit.h b/TAO/tests/Cubit/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit.idl b/TAO/tests/Cubit/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp b/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp b/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h b/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpool/server.cpp b/TAO/tests/Cubit/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/tests/Cubit/Orbix/tpool/tpool.h b/TAO/tests/Cubit/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/Makefile b/TAO/tests/Cubit/Orbix/tpr/Makefile
deleted file mode 100644
index 650d6aaf259..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit.h b/TAO/tests/Cubit/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit.idl b/TAO/tests/Cubit/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp b/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/tests/Cubit/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp b/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/tests/Cubit/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h b/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpr/server.cpp b/TAO/tests/Cubit/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/tests/Cubit/Orbix/tpr/tpr.h b/TAO/tests/Cubit/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/tests/Cubit/Orbix/tps/Makefile b/TAO/tests/Cubit/Orbix/tps/Makefile
deleted file mode 100644
index 69701ba3b63..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit.h b/TAO/tests/Cubit/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit.idl b/TAO/tests/Cubit/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubitC.cpp b/TAO/tests/Cubit/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubitS.cpp b/TAO/tests/Cubit/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/tests/Cubit/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tps/tps.cpp b/TAO/tests/Cubit/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/tests/Cubit/Orbix/tps/tps.h b/TAO/tests/Cubit/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/tests/Cubit/README b/TAO/tests/Cubit/README
deleted file mode 100644
index 6f20322a2ed..00000000000
--- a/TAO/tests/Cubit/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the example from the SunSoft's IIOP 1.4 distribution modified
-to work with TAO, Orbix, and VisiBroker.
-
-Benchmarking results are under results and tnf directories.
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw b/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
deleted file mode 100644
index 18eee22051f..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
+++ /dev/null
@@ -1,1213 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lTAO
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-# Local modifications to variables imported by includes above.
-#LDFLAGS    += -L../../../proto/lib
-#CPPFLAGS   += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-DCFLAGS = -g
-OCFLAGS = 
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS) $(POSTLINK)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS) $(POSTLINK)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS) $(POSTLINK)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS) $(POSTLINK)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS) $(POSTLINK)
-endif
-
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/svr.o .shobj/svr.: svr.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h cubit_i.h cubitS.h \
- cubitC.h
-.obj/clnt.o .shobj/clnt.: clnt.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h cubitC.h
-.obj/cubit.o .shobj/cubit.: cubit.cpp cubit.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1.o .shobj/test1.: test1.cpp test1.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1_clnt.o .shobj/test1_clnt.: test1_clnt.cpp test1.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1_svr.o .shobj/test1_svr.: test1_svr.cpp test1.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/README b/TAO/tests/Cubit/TAO/DII_Cubit/README
deleted file mode 100644
index 2b5cefa071b..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/README
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the cubit example that uses hand-generated stubs and
-skeletons.  Once we've got a real DII C++ mapping in TAO, we'll modify
-this to use that mapping.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-% svr [-d] -ORBhost <serverhost> [-orbport <portnum>]
-
-When the server is started and you have used the -d flag, you should
-see as the first line of output something that looks like
-iiop:1.0//serverhost:10013/key00.  You will need this when you run the
-client.
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-client:
--------
-
-% clnt [-d] -n <iterations> -O <IOR string displayed by server>
-
-In another window (on the same machine or a different machine) type in
-client -O IIOP where IIOP is the name that the server gave you.
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp
deleted file mode 100644
index 15c3d76cb23..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\client\Release"

-# PROP BASE Intermediate_Dir ".\client\Release"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\client\Debug"

-# PROP BASE Intermediate_Dir ".\client\Debug"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 TAO.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubitC.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld
deleted file mode 100644
index e9bd0318b5c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld
+++ /dev/null
@@ -1,11 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubitC.cpp
-	C++
-clnt.cpp
-	C++
-/home/m225527/vme/src/sockem.c
-	C
-	:c_option=slashcomment
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
deleted file mode 100644
index 5bb1e2dc995..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/DII_Cubit
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-#include "ace/Profile_Timer.h"
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-#include "clnt.h"
-
-// Constructor.
-
-Cubit_Client::Cubit_Client (void)
-  : loop_count_ (250),
-    exit_later_ (0),
-    objref_ (CORBA::Object::_nil ()),
-    cubit_ (Cubit::_nil ()),
-    orb_ptr_ (0),
-    call_count_ (0),
-    error_count_ (0),
-    cubit_key_ ("key00"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    portnum_ (TAO_DEFAULT_SERVER_PORT)
-{
-}
-
-// destructor
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  CORBA::release (this->cubit_);
-  CORBA::release (this->objref_);
-  CORBA::release (this->orb_ptr_);
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt opts (argc_, argv_, "dn:k:h:p:x");
-  int c;
-   
-  while ((c = opts ()) != -1)
-    switch (c) 
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'n':			// loop count
-	loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-	break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (opts.optarg);
-        break;
-      case 'k':			// stringified objref
-        cubit_key_ = ACE_OS::strdup (opts.optarg);
-        break;
-      case 'x':
-	exit_later_++;
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-			   " [-n loopcount]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-h hostname]"
-                           " [-p port]"
-			   " [-x]"
-			   "\n", argv_ [0]
-			   ), -1);
-      }
-   
-  return 0;  // Indicates successful parsing of command line
-}
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  this->cubit_ = Cubit::_narrow (this->objref_);
-
-  Cubit_oneof u, *r;
-   
-  this->call_count_++;
-   
-  u._disc = e_2nd;
-  u.l = 3;
-   
-  // Cube a "union" ...
-  r = this->cubit_->Cubit_cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    } 
-  else 
-    {
-      dmsg ("cube union ...");
-      u.l = u.l * u.l * u.l ;
-      
-      if (u.l != r->l) 
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-      
-      delete r;
-    }
-   
-  this->call_count_++;
-   
-  u._disc = e_5th;
-#if 0
-  u.cm.l = this->func (i);
-  u.cm.s = this->func (i);
-  u.cm.o = this->func (i);
-#endif
-   
-  u.cm.l = 7;
-  u.cm.s = 5;
-  u.cm.o = 3;
-   
-  // Cube another "union" which uses the default arm ...
-  r = this->cubit_->Cubit_cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    } 
-  else 
-    {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-	  || u.cm.s != r->cm.s
-	  || u.cm.o != r->cm.o) 
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-      
-      delete r;
-    }
-}
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-   
-  this->call_count_++;
-
-  req = this->objref_->_request ((CORBA::String) "cube_union", this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-
-      this->env_.print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit_oneof u, *r;
-   
-  u._disc = e_3rd;
-  u.cm.l = 5;
-  u.cm.s = -7;
-  u.cm.o = 3;
-
-  CORBA::Any tmp_arg (TC_Cubit_oneof, &u, CORBA::B_FALSE);
-   
-  req->arguments ()->add_value (0, tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-	
-  req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0) 
-    {
-      this->error_count_++;
-      req->env ()->print_exception ("cube_union_dii invoke");
-      CORBA::release (req);
-      return;
-    }
-
-  r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-  if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) 
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    dmsg ("cube_union_dii ... success!!");
-   
-  CORBA::release (req);
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->Cubit_cube_octet (arg_octet, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-	ACE_DEBUG ((LM_DEBUG,
-		    "** cube_octet (%d) ERROR (--> %d)\n",
-		    (CORBA::Octet) this->func (i),
-		    ret_octet));
-	this->error_count_++;
-      }
-    }
-}
-
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->Cubit_cube_long (arg_long, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-	ACE_ERROR ((LM_ERROR,
-		    "** cube_long (%ld) ERROR (--> %ld)\n",
-		    (CORBA::Long) this->func (i),
-		    ret_long));
-	this->error_count_++;
-      }
-    }
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->Cubit_cube_short (arg_short, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube short:  %d --> %d\n",
-	     arg_short,
-	     ret_short);
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-		      (CORBA::Short) this->func (i),
-		      ret_short));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit_Many arg_struct;
-  Cubit_Many *ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->Cubit_cube_struct (arg_struct, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube struct ...");
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct->l
-	  || arg_struct.s != ret_struct->s
-	  || arg_struct.o != ret_struct->o)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-  delete ret_struct;
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return -1;
-  
-  // construct the TAO ior for the Cubit object reference
-  ACE_OS::sprintf (this->buf_, 
-		   "iiop:1.0//%s:%d/%s", 
-		   this->hostname_, 
-		   this->portnum_, 
-		   this->cubit_key_);
-
-  // Retrieve the ORB.
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("ORB initialization");
-      return -1;
-    }
-
-  this->objref_ = this->orb_ptr_->string_to_object ((CORBA::String) this->buf_, 
-						    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("string2object");
-      return 1;
-    }
-
-  if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       "%s:  must identify non-null target objref\n",
-		       this->argv_ [0]),
-		      -1);
-
-  // Narrow the CORBA::Object reference to the stub object, checking
-  // the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (this->objref_);
-
-  if (this->cubit_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"),
-		      -1);
-
-  return 0;
-}
-
-// Simple test for DII: call "cube_struct". 
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-
-  CORBA::Request_ptr	req = 
-    this->objref_->_request ((CORBA::String) "cube_struct", this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit_Many arg, *result;
-       
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-       
-  CORBA::Any	tmp_arg (TC_Cubit_Many, &arg, CORBA::B_FALSE);
-       
-  req->arguments ()->add_value (0, tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-       
-  req->result ()->value ()->replace (TC_Cubit_Many, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  this->call_count_++;
-  req->invoke ();
-
-  if (req->env ()->exception () != 0) 
-    {
-      req->env ()->print_exception ("DII invoke");
-      CORBA::release (req);
-      return;
-    }
-       
-  result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-  if (result->o != 27 || result->l != 125 || result->s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    dmsg ("DII cube_struct ... success!!");
-       
-  CORBA::release (req);
-}
-
-// prints time statistics
-
-void
-Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  double tmp;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "%s:\n",
-	      call_name));
-  
-  if (this->call_count_ > 0  &&  this->error_count_ == 0)
-    {
-      tmp = 1000 / elapsed_time.real_time;
-
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= this->call_count_;
-      elapsed_time.user_time /= this->call_count_;
-      elapsed_time.system_time /= this->call_count_;
-
-      tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t= %0.06f ms, \n\t"
-		  "user_time\t= %0.06f ms, \n\t"
-		  "system_time\t= %0.06f ms\n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		  tmp < 0.0? 0.0 : tmp));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "\t%d calls, %d errors\n",
-	      this->call_count_,
-	      this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_stub ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-
-  if (this->exit_later_)
-    {
-      this->cubit_->Cubit_please_exit (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
- 
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
deleted file mode 100644
index 058e44283c5..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/DII_Cubit
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements a simple wrapper around the "cube" CORBA 
-//      client for the Cubit example using stubs generated by the TAO 
-//      ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-
-class ACE_winsock_proper_shutdown
-// @@ We need this helper class to properly shutdown
-// WinSock before we figure out how to do this properly.
-{
-public:
-  ~ACE_winsock_proper_shutdown (void)
-  {
-    ACE_OS::socket_fini ();
-  }
-};
-
-class Cubit_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int func (u_int i);
-  // simple function that returns the substraction of 117 from the parameter.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // prints the time stats
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-  
-  void cube_union_dii (void);
-  // Exercise the union using dii.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long
-
-  void cube_octet (int i);
-  // Cube an octet
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct
-
-  // private member variables.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  u_int call_count_;
-  // # of calls made to functions
-
-  u_int error_count_;
-  // #  of errors incurred in the lifetime of the application.
-
-  ACE_winsock_proper_shutdown shutdown_object;
-  // Winsock shutdown object.  
-
-  const char *TAO_arg_ior_;
-  // pointer to object reference string.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  char buf_[BUFSIZ];
-  // buffer for temporary use
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp
deleted file mode 100644
index cf7ef472641..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-
-#include "cubit.h"		// for stubs ...
-#include "tao/corba.h"		// ... and skeletons
-
-// CUBE OCTET
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-  { CORBA::_tc_octet, PARAM_RETURN, 0 },
-  { CORBA::_tc_octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-  "cube_octet", CORBA::B_TRUE,
-  2, &Cubit_cube_octet_params [0],
-  0, 0
-};
-
-CORBA::Octet
-Cubit_cube_octet (Cubit_ptr target,
-		  CORBA::Octet o,
-		  CORBA::Environment &env)
-{
-  CORBA::Octet retval = 0;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_cube_octet_calldata,
-		     &retval, &o);
-      data->Release ();
-    }
-
-  return retval;
-}
-
-static void
-_cube_octet_skel (CORBA::ServerRequest &req,    
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_octet);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA::Octet* value = new CORBA::Octet;
-
-  *value = *(CORBA::Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-
-  *value = (CORBA::Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_octet, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-// CUBE SHORT
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-  { CORBA::_tc_short, PARAM_RETURN, 0 },
-  { CORBA::_tc_short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-  "cube_short", CORBA::B_TRUE,
-  2, &Cubit_cube_short_params [0],
-  0, 0
-};
-
-CORBA::Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA::Short s,
-		  CORBA::Environment &env)
-{
-  CORBA::Short retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_cube_short_calldata,
-		     &retval, &s);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_short_skel (CORBA::ServerRequest &req,
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_short);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA::Short* value = new CORBA::Short;
-
-  *value = *(CORBA::Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-
-  *value =(CORBA::Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_short, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-// CUBE LONG
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-  { CORBA::_tc_long, PARAM_RETURN, 0 },
-  { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-  "cube_long", CORBA::B_TRUE,
-  2, &Cubit_cube_long_params [0],
-  0, 0
-};
-
-CORBA::Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA::Long l,
-		 CORBA::Environment &env)
-{
-  CORBA::Long retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_long_skel (CORBA::ServerRequest &req,
-		 CORBA::Object_ptr obj,
-		 CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA::Long* value = new CORBA::Long;
-
-  *value = *(CORBA::Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_long, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-
-static const CORBA::Long _oc_Cubit_Many [] = 
-{ 
-  MY_BYTE_SEX,				// byte order flag (TRICKY!)
-
-  1, 0,			// empty string:  repository/type ID
-  1, 0,			// empty string:  struct name
-
-  3,				// three struct elements
-
-  // First structure element:  name, typecode for Octet
-  1, 0,			// empty string:  name "o"
-  tk_octet,
-
-  // Second structure element:  name, typecode for Long
-  1, 0,			// empty string:  name "l"
-  tk_long,
-
-  // Third structure element:  name, typecode for Short
-  1, 0,			// empty string:  name "s"
-  tk_short,
-};
-
-static CORBA::TypeCode _tc_Cubit_Many (tk_struct,
-				      sizeof _oc_Cubit_Many,
-				      (u_char *) &_oc_Cubit_Many,
-				      CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-// CUBE STRUCT
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-  { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-  { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-  "cube_struct", CORBA::B_TRUE,
-  2, &Cubit_cube_struct_params [0],
-  0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA::Environment &env)
-{
-  Cubit_Many *retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_struct_skel (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (TC_Cubit_Many);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA::Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA::Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA::Any *any =
-    new CORBA::Any (TC_Cubit_Many, retval, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-// CUBE UNION
-
-// NOTE: not all union typecodes can be encoded as an array of "long
-// "values, but this one can.  Ones with discriminants that are one or
-// two bytes long can't easily be coded portably.
-//
-// The benefit of doing it as an array of "long" values is twofold:
-// (a) easier to read; (b) on most systems it's then adequately
-// aligned for the typecode interpreter to use, so no additional
-// runtime copy needs to be made.
-
-static const CORBA::Long _oc_Cubit_oneof [] = 
-{
-  MY_BYTE_SEX,				// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted struct name, "oneof"
-
-  // discriminant typecode:
-  tk_enum,		// tk_enum
-  72,			// encapsulation length
-
-  MY_BYTE_SEX,			// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted enum name, "discrim"
-  6,			// 5 elements in the enum
-
-  1, 0,			// omitted member name, "e_0th"
-  1, 0,			// omitted member name, "e_1st"
-  1, 0,			// omitted member name, "e_2nd"
-  1, 0,			// omitted member name, "e_3rd" 
-  1, 0,			// omitted member name, "e_4th" 
-  1, 0,			// omitted member name, "e_5th" 
-
-  4,				// default member index (zero based)
-  5,				// number of union members
-
-  // the 1st union branch arm
-  e_0th,			// member label value
-  1, 0,			// omitted member name, "o"
-  tk_octet,		// member typecode
-
-  // the 2nd union branch arm
-  e_1st,			// member label value
-  1, 0,			// omitted member name, "s"
-  tk_short,		// member typecode
-
-  // the 3rd union branch arm
-  e_2nd,			// member label value
-  1, 0,			// omitted member name, "l"
-  tk_long,		// member typecode
-
-  // the 4th union branch arm
-  e_3rd,			// member label value
-  1, 0,			// omitted member name, "cm"
-
-  // the 4th union member typecode
-  tk_struct,		// tk_struct
-  60,			// encap length
-
-  MY_BYTE_SEX,			// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted struct name, "Many"
-  3,			// three struct members
-
-  // First structure element
-  1, 0,			// omitted member name, "o"
-  tk_octet,	// member type, tk_octet
-
-  // Second structure element
-  1, 0,			// omitted member name, "l"
-  tk_long,	// member type, tk_long
-
-  // Third structure element
-  1, 0,			// omitted member name, "s"
-  tk_short,	// member type, tk_short
-
-  // the 5th union branch arm
-  4,				// the 5th member label value
-  1, 0,			// omitted member name, "cm"
-  ~0,				// indirected typecode (~0)
-  -84			// offset to struct "Many" typecode
-};
-
-static CORBA::TypeCode _tc_Cubit_oneof (tk_union,
-				       (sizeof _oc_Cubit_oneof),
-				       (u_char *) &_oc_Cubit_oneof,
-				       CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-  { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-  { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-  "cube_union", CORBA::B_TRUE,
-  2, &Cubit_cube_union_params [0],
-  0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA::Environment &env)
-{
-  Cubit_oneof *retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-cube_union_skel (CORBA::ServerRequest &req,
-		 CORBA::Object_ptr obj,
-		 CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_oneof);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) 
-    {
-    case e_0th:
-      r->o = (CORBA::Octet) (v->o * v->o * v->o);
-      break;
-
-    case e_1st:
-      r->s = (CORBA::Short) (v->s * v->s * v->s);
-      break;
-
-    case e_2nd:
-      r->l = v->l * v->l * v->l;
-      break;
-
-    case e_3rd:
-    default:
-      r->cm.o = (CORBA::Octet) (v->cm.o * v->cm.o * v->cm.o);
-      r->cm.s = (CORBA::Short) (v->cm.s * v->cm.s * v->cm.s);
-      r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-      break;
-    }
-
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_oneof, r, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-// PLEASE EXIT
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-  "please_exit", CORBA::B_FALSE,
-  0, 0,
-  0, 0
-};
-
-void
-Cubit_please_exit (Cubit_ptr target,
-		   CORBA::Environment &env)
-{
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_please_exit_calldata);
-      data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  dmsg ("I've been asked to shut down...");
-  req.oa ()->please_shutdown (env);
-  dexc (env, "please_exit, please_shutdown");
-}
-
-const CORBA::Char *Cubit__id = (CORBA::Char *) "IDL:Eng.SUN.COM/Cubit:1.1";
-
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small
-// cache (e.g. like Obj-C?).  for now, just lsearch.
-
-const TAO_Skel_Entry Cubit_operations [] = 
-{
-  { &Cubit_cube_octet_calldata, _cube_octet_skel },
-  { &Cubit_cube_short_calldata, _cube_short_skel },
-  { &Cubit_cube_long_calldata, _cube_long_skel },
-  { &Cubit_cube_struct_calldata, _cube_struct_skel },
-  { &Cubit_cube_union_calldata, _cube_union_skel },
-  { &Cubit_please_exit_calldata, _please_exit_skel },
-  { 0, 0 } // last entry
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h
deleted file mode 100644
index f587f6802f1..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation (all parent
-// interfaces are virtual public parents) makes object references have
-// different "views".  That is, a pointer to a Cubit (i.e. a
-// Cubit_ptr) would not have the same binary value as a pointer to a
-// CORBA::Object (i.e. a CORBA::Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "tao/corba.h"
-
-//
-// C style binding
-//
-
-typedef CORBA::Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA::TypeCode_ptr	TC_Cubit_Many;
-extern CORBA::TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-  CORBA::Octet	o;
-  CORBA::Long	l;
-  CORBA::Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof 
-{
-  Cubit_discrim _disc;
-
-  union 
-  {
-    CORBA::Octet	o;
-    CORBA::Short	s;
-    CORBA::Long	l;
-    Cubit_Many      cm;
-  };
-};
-
-CORBA::Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA::Octet	o,
-    CORBA::Environment	&env
-);
-
-CORBA::Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA::Short	s,
-    CORBA::Environment	&env
-);
-
-CORBA::Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA::Long		l,
-    CORBA::Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA::Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA::Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA::Environment	&env
-);
-
-extern const CORBA::Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl
deleted file mode 100644
index a424b9e5c1c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit 
-{
-  octet	cube_octet (in octet o);
-  short	cube_short (in short s);
-  long	cube_long (in long l);
-
-  struct Many 
-  {
-    octet	o;		// + 3 bytes padding (normally) ...
-    long	l;
-    short	s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many	cube_struct (in Many values);
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-  union oneof switch (discrim) 
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet		o;
-    case e_1st:
-      short		s;
-    case e_2nd:
-      long		l;
-    case e_3rd:
-    default:
-      Many		cm;
-    };
-
-  oneof	cube_union (in oneof values);
-
-  oneway void please_exit ();
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp
deleted file mode 100644
index d8956f625ea..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// @ (#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate (Cubit_ptr obj)
-{
-  if (obj)
-    obj->AddRef ();
-
-  return obj;
-}
-
-Cubit_ptr Cubit::_narrow (CORBA::Object_ptr obj)
-{
-  CORBA::Environment env;
-
-  if (obj->_is_a ("IDL:Cubit:1.0", env))
-    {
-      obj->Release (); // Release the reference grabbed by _is_a ()
-
-      STUB_Object *istub;
-
-      if (obj->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-	return Cubit::_nil ();
-
-      obj->Release ();
-      Cubit_ptr new_obj = new Cubit (istub);
-      return Cubit::_duplicate (new_obj);
-    }
-  else
-    ;// Do we need to do an obj->Release () here if _is_a () failed?
-
-  return Cubit::_nil ();
-}
-
-Cubit_ptr Cubit::_nil (void)
-{
-  return (Cubit_ptr)NULL;
-}
-
-// CUBE OCTET
-
-static const TAO_Param_Data Cubit_cube_octet_params [] =
-{
-  { CORBA::_tc_octet, PARAM_RETURN, 0 },
-  { CORBA::_tc_octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata =
-{
-  "cube_octet", CORBA::B_TRUE,
-  2, &Cubit_cube_octet_params [0],
-  0, 0
-};
-
-CORBA::Octet
-Cubit::Cubit_cube_octet (CORBA::Octet o,
-			 CORBA::Environment &env)
-{
-  CORBA::Octet retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_octet_calldata,
-		  &retval, &o);
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE SHORT
-
-static const TAO_Param_Data Cubit_cube_short_params [] =
-{
-  { CORBA::_tc_short, PARAM_RETURN, 0 },
-  { CORBA::_tc_short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata =
-{
-  "cube_short", CORBA::B_TRUE,
-  2, &Cubit_cube_short_params [0],
-  0, 0
-};
-
-
-CORBA::Short
-Cubit::Cubit_cube_short (CORBA::Short s,
-			 CORBA::Environment &env)
-{
-  CORBA::Short retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE LONG
-
-static const TAO_Param_Data Cubit_cube_long_params [] =
-{
-  { CORBA::_tc_long, PARAM_RETURN, 0 },
-  { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata =
-{
-  "cube_long", CORBA::B_TRUE,
-  2, &Cubit_cube_long_params [0],
-  0, 0
-};
-
-CORBA::Long
-Cubit::Cubit_cube_long (CORBA::Long l,
-			CORBA::Environment &env)
-{
-  CORBA::Long retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-  istub->Release ();
-
-  return retval;
-}
-
-// Encapsulated parameters for struct "Cubit_Many" typecode.  None of
-// these parameters is complicated, so this is just a linear sequence
-// of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-
-static const CORBA::Long _oc_Cubit_Many [] =
-{
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY!)
-
-  1, 0,       // empty string:  repository/type ID
-  1, 0,       // empty string:  struct name
-
-  3,          // three struct elements
-
-  // First structure element:  name, typecode for Octet
-  1, 0,       // empty string:  name "o"
-  CORBA::tk_octet,
-
-  // Second structure element:  name, typecode for Long
-  1, 0,       // empty string:  name "l"
-  CORBA::tk_long,
-
-  // Third structure element:  name, typecode for Short
-  1, 0,       // empty string:  name "s"
-  CORBA::tk_short,
-};
-
-static CORBA::TypeCode _tc_Cubit_Many (CORBA::tk_struct,
-                                      sizeof _oc_Cubit_Many,
-				      (u_char *) &_oc_Cubit_Many,
-                                      CORBA::B_FALSE);
-CORBA::TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-// CUBE STRUCT
-
-static const TAO_Param_Data Cubit_cube_struct_params [] =
-{
-  { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-  { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata =
-{
-  "cube_struct", CORBA::B_TRUE,
-  2, &Cubit_cube_struct_params [0],
-  0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA::Environment &env)
-{
-  Cubit_Many *retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_struct_calldata,
-		  &retval, &values);
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE UNION
-
-// NOTE: not all union typecodes can be encoded as an array of "long
-// "values, but this one can.  Ones with discriminants that are one or
-// two bytes long can't easily be coded portably.
-//
-// The benefit of doing it as an array of "long" values is twofold:
-// (a) easier to read; (b) on most systems it's then adequately
-// aligned for the typecode interpreter to use, so no additional
-// runtime copy needs to be made.
-
-static const CORBA::Long _oc_Cubit_oneof [] =
-{
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted struct name, "oneof"
-
-  //
-  // discriminant typecode:
-  //
-  CORBA::tk_enum,    // CORBA::tk_enum
-  72,         // encapsulation length
-
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted enum name, "discrim"
-  6,          // 5 elements in the enum
-
-  1, 0,       // omitted member name, "e_0th"
-  1, 0,       // omitted member name, "e_1st"
-  1, 0,       // omitted member name, "e_2nd"
-  1, 0,       // omitted member name, "e_3rd"
-  1, 0,       // omitted member name, "e_4th"
-  1, 0,       // omitted member name, "e_5th"
-
-  4,       	// default member index (zero based)
-  5,       	// number of union members
-
-  // the 1st union branch arm
-  e_0th,       // member label value
-  1, 0,        // omitted member name, "o"
-  CORBA::tk_octet,    // member typecode
-
-  // the 2nd union branch arm
-  e_1st,      // member label value
-  1, 0,       // omitted member name, "s"
-  CORBA::tk_short,   // member typecode
-
-  // the 3rd union branch arm
-  e_2nd,      // member label value
-  1, 0,       // omitted member name, "l"
-  CORBA::tk_long,    // member typecode
-
-  // the 4th union branch arm
-  e_3rd,      // member label value
-  1, 0,       // omitted member name, "cm"
-
-  // the 4th union member typecode
-  CORBA::tk_struct,  // CORBA::tk_struct
-  60,         // encap length
-
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted struct name, "Many"
-  3,          // three struct members
-
-  // First structure element
-  1, 0,       // omitted member name, "o"
-  CORBA::tk_octet,   // member type, CORBA::tk_octet
-
-  // Second structure element
-  1, 0,       // omitted member name, "l"
-  CORBA::tk_long,    // member type, CORBA::tk_long
-
-  // Third structure element
-  1, 0,       // omitted member name, "s"
-  CORBA::tk_short,   // member type, CORBA::tk_short
-
-  // the 5th union branch arm
-  4,          // the 5th member label value
-  1, 0,       // omitted member name, "cm"
-  ~0,         // indirected typecode (~0)
-  -88         // offset to struct "Many" typecode
-};
-
-static CORBA::TypeCode _tc_Cubit_oneof (CORBA::tk_union,
-				       (sizeof _oc_Cubit_oneof),
-				       (u_char *) &_oc_Cubit_oneof,
-                                       CORBA::B_FALSE);
-CORBA::TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] =
-{
-  { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-  { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata =
-{
-  "cube_union", CORBA::B_TRUE,
-  2, &Cubit_cube_union_params [0],
-  0, 0
-};
-
-Cubit_oneof *
-Cubit::Cubit_cube_union (Cubit_oneof &values,
-			 CORBA::Environment &env)
-{
-  Cubit_oneof *retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-  istub->Release ();
-
-  return retval;
-}
-
-// PLEASE EXIT
-
-static const TAO_Call_Data Cubit_please_exit_calldata =
-{
-  "please_exit", CORBA::B_FALSE,
-  0, 0,
-  0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_please_exit_calldata);
-  istub->Release ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h
deleted file mode 100644
index 26c44f7b546..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "tao/corba.h"
-
-#include <iostream.h>
-
-extern CORBA::TypeCode_ptr	TC_Cubit_Many;
-extern CORBA::TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-  CORBA::Octet o;
-  CORBA::Long  l;
-  CORBA::Short s;
-};
-
-enum Cubit_discrim
-{ 
-  e_0th = 0,
-  e_1st = 1,
-  e_2nd = 2,
-  e_3rd = 3,
-  e_4th = 4,
-  e_5th = 5 
-};
-
-struct Cubit_oneof 
-{
-  Cubit_discrim  _disc;
-   
-  union 
-  {    
-    CORBA::Octet o;
-    CORBA::Short s;
-    CORBA::Long  l;
-    Cubit_Many  cm;
-  };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-  static Cubit_ptr _duplicate(Cubit_ptr obj);
-  static Cubit_ptr _narrow(CORBA::Object_ptr obj);
-  static Cubit_ptr _nil();
-
-  virtual CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-					CORBA::Environment &env);
-
-  virtual CORBA::Short Cubit_cube_short (CORBA::Short       s,
-					CORBA::Environment &env);
-  
-  virtual CORBA::Long Cubit_cube_long (CORBA::Long        l,
-				      CORBA::Environment &env);
-  
-  virtual Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-					 CORBA::Environment &env);
-  
-  virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-					 CORBA::Environment &env);
-  
-  virtual void Cubit_please_exit (CORBA::Environment &env);
-
-protected:
-  Cubit (void) { }
-  Cubit (STUB_Object *objref)
-    : CORBA_Object (objref) { }
-  virtual ~Cubit (void) { }
-};
-
-extern const CORBA::Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
-
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp
deleted file mode 100644
index a0edb1001f0..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include "tao/corba.h"
-
-#include "cubitS.h"
-#include "cubitC.cpp"
-
-#include "method_db.i"
-
-TAO_Dynamic_Hash_OpTable tao_cubit_optable (cubit_operations, 7, 14);  // Dynamic Operation Table
-
-_skel_Cubit::_skel_Cubit (const char *obj_name)
-{
-#if 0
-  const char* mn = "_skel_Cubit::_skel_Cubit ()";
-
-  char *type_id = "IDL:Cubit:1.0";
-  IIOP_Object *data;
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance ();
-  CORBA::POA_ptr oa = ocp->root_poa ();
-  CORBA::ORB_ptr orb = ocp->orb ();
-
-  if (oa == 0)
-    {
-      // We just have to assume that oa will be good, or we have to
-      // throw an exception.  For now we "assume", but we'll
-      ACE_ERROR ((LM_ERROR, " (%P|%t) %s Unable to locate a valid object adapter\n", mn));
-      return;
-    }
-
-  this->optable_ = &tao_cubit_optable;
-  data = new IIOP_Object (type_id);
-
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  const ACE_INET_Addr& addr = ocp->orb_params ()->addr ();
-  data->profile.host = ACE_OS::strdup (addr.get_host_name ());
-  data->profile.port = addr.get_port_number ();
-  data->profile.object_key.length =  ACE_OS::strlen (obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer =
-    new CORBA::Octet[(size_t)data->profile.object_key.length + 1];
-
-  ACE_OS::memcpy (data->profile.object_key.buffer,
-		  obj_name,
-		  data->profile.object_key.length+1);
-
-  this->set_parent (data);
-  this->sub_ = this;
-
-  if (oa->bind (data->profile.object_key, this) == -1)
-    ACE_ERROR ((LM_ERROR,
-		" (%P|%t) %s Unable to bind object to key '%s': %p\n",
-		mn,
-		data->profile.object_key.buffer));
-#endif
-  const CORBA::String repoID = "IDL:Cubit:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_cubit_optable;
-
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void
-_skel_Cubit::_cube_octet_skel (CORBA::ServerRequest &req,
-                               void *obj,
-                               void */*context*/,
-                               CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (CORBA::_tc_octet);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  // Call Implementation
-  CORBA::Octet *value = new CORBA::Octet;
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-
-  *value = the_cubit->Cubit_cube_octet (*(CORBA::Octet *) nv->value ()->value (), env);
-
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_octet, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA::ServerRequest &req,
-                               void *obj, void */*context*/,
-                               CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_short);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  // Call Implementation
-  CORBA::Short *value = new CORBA::Short;
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-  *value = the_cubit->Cubit_cube_short (*(CORBA::Short *) nv->value ()->value (), env);
-
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_short, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA::ServerRequest &req,
-                              void *obj, void */*context*/,
-                              CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  // Call Implementation
-  CORBA::Long *value = new CORBA::Long;
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-  *value = the_cubit->Cubit_cube_long (*(CORBA::Long *) nv->value ()->value (), env);
-
-  CORBA::Any  		*any =
-    new CORBA::Any (CORBA::_tc_long, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA::ServerRequest &req,
-                                void *obj, void */*context*/,
-                                CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_Many);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  // Call Implementation
-  Cubit_Many *value;
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-  value = the_cubit->Cubit_cube_struct (*(Cubit_Many *) nv->value ()->value (), env);
-
-  Cubit_Many *retval = new Cubit_Many;
-  retval->o = (CORBA::Octet)value->o;
-  retval->s = (CORBA::Short)value->s;
-  retval->l = value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_Many, retval, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA::ServerRequest	&req,
-                               void *obj, void */*context*/,
-                               CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_oneof);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  // Call Implementation
-  Cubit_oneof *v;
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-  v = the_cubit->Cubit_cube_union (*(Cubit_oneof *) nv->value ()->value (), env);
-
-  Cubit_oneof *r = new Cubit_oneof;
-  r->_disc = v->_disc;
-  r->o = (CORBA::Octet) (v->o);
-  r->s = (CORBA::Short) (v->s);
-  r->l = v->l;
-  r->cm.o = (CORBA::Octet) (v->cm.o);
-  r->cm.s = (CORBA::Short) (v->cm.s);
-  r->cm.l =  v->cm.l;
-
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_oneof, r, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA::ServerRequest &req,
-                                void *obj, void */*context*/,
-                                CORBA::Environment   &env)
-{
-  ACE_UNUSED_ARG (req);
-
-  _skel_Cubit *the_cubit = (_skel_Cubit *) obj;
-  the_cubit->Cubit_please_exit (env);
-}
-
-void _skel_Cubit::dispatch (CORBA::ServerRequest &req,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  CORBA::String opname = req.op_name (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-  else
-  	skel (req, this, context, env);
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h
deleted file mode 100644
index 9cde582496b..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-#include "tao/corba.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-  virtual
-  CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-				CORBA::Environment &env) = 0;
-  static
-  void _cube_octet_skel(CORBA::ServerRequest &req,
-                        void *obj,
-                        void *context,
-                        CORBA::Environment   &env);
-
-  virtual
-  CORBA::Short Cubit_cube_short (CORBA::Short       s,
-				CORBA::Environment &env) = 0;
-
-  static
-  void _cube_short_skel (CORBA::ServerRequest &req,
-                         void *obj,
-                         void *context,
-                         CORBA::Environment   &env);
-
-  virtual
-  CORBA::Long Cubit_cube_long (CORBA::Long        l,
-			      CORBA::Environment &env) = 0;
-
-  static
-  void _cube_long_skel (CORBA::ServerRequest &req,
-                        void *obj,
-                        void *context,
-                        CORBA::Environment   &env);
-
-  virtual
-  Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-				 CORBA::Environment &env) = 0;
-
-  static
-  void _cube_struct_skel (CORBA::ServerRequest &req,
-                          void *obj,
-                          void *context,
-                          CORBA::Environment   &env);
-
-  virtual
-  Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-				 CORBA::Environment &env) = 0;
-
-  static
-  void _cube_union_skel (CORBA::ServerRequest &req,
-                         void *obj,
-                         void *context,
-                         CORBA::Environment   &env);
-
-  virtual
-  void Cubit_please_exit (CORBA::Environment &env) = 0;
-
-  static
-  void _please_exit_skel (CORBA::ServerRequest  &req,
-                          void *obj,
-                          void *context,
-                          CORBA::Environment    &env);
-  virtual void dispatch (CORBA::ServerRequest &req,
-                         void *context,
-                         CORBA::Environment &env);
-protected:
-  _skel_Cubit (const char* obj_name = 0);
-  virtual ~_skel_Cubit (void) { }
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp
deleted file mode 100644
index d15c4b71df0..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "tao/corba.h"    // ... and skeletons
-#include "cubit_i.h"
-
-Cubit_i::Cubit_i (const char *obj_name)
-  : _skel_Cubit (obj_name)
-{
-}
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-CORBA::Octet
-Cubit_i::Cubit_cube_octet (CORBA::Octet       o,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Octet) (o * o * o);
-}
-
-CORBA::Short
-Cubit_i::Cubit_cube_short (CORBA::Short       s, 
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long
-Cubit_i::Cubit_cube_long (CORBA::Long        l,
-                          CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit_Many *
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  values.o = values.o * values.o * values.o;
-  values.s = values.s * values.s * values.s;
-  values.l = values.l * values.l * values.l;
-   
-  return &values;
-}
-
-Cubit_oneof *
-Cubit_i::Cubit_cube_union (Cubit_oneof &values,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  switch (values._disc)
-    {
-    case e_0th:
-      values.o = (CORBA::Octet) (values.o * values.o * values.o);
-      break;
-    case e_1st:
-      values.s = (CORBA::Short) (values.s * values.s * values.s);
-      break;
-    case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-    case e_3rd:
-    default:
-      values.cm.o = (CORBA::Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA::Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-    }
-  return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Cubit_please_exit: I've been asked to shut down.\n"));
-  TAO_ORB_Core_instance()->orb ()->shutdown ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h
deleted file mode 100644
index e2178d65fd5..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  ~Cubit_i (void);
-   
-  virtual
-  CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-				CORBA::Environment &env);
-
-  virtual
-  CORBA::Short Cubit_cube_short (CORBA::Short       s,
-				CORBA::Environment &env);
-  
-  virtual
-  CORBA::Long Cubit_cube_long (CORBA::Long        l,
-			      CORBA::Environment &env);
-  
-  virtual
-  Cubit_Many *Cubit_cube_struct (Cubit_Many        &values,
-				 CORBA::Environment &env);
-  
-  virtual
-  Cubit_oneof *Cubit_cube_union (Cubit_oneof       &values,
-				 CORBA::Environment &env);
-  
-  virtual
-  void Cubit_please_exit (CORBA::Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/default.bld b/TAO/tests/Cubit/TAO/DII_Cubit/default.bld
deleted file mode 100644
index 196d95eb950..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/default.bld
+++ /dev/null
@@ -1,35 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:optimize=standard
-	:optimize=memory
-	:optimize=algorithmic
-	:optimize=loop
-	:object_dir=./.obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=../../../..
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../../../tao/compat
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
-	:libraries=vmeXport.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
-	:defines=FORCE_ARGS
-	:defines=VME_DRIVER
-clnt.bld
-	program
-svr.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i b/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i
deleted file mode 100644
index 76595399353..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i
+++ /dev/null
@@ -1,54 +0,0 @@
-// @ (#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA::ServerRequest &req,
-           void */* obj */,
-           void */* context */,
-           CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    {
-      dexc (env, "is_a_skel, get params");
-      return;
-    }
-
-  CORBA::Boolean *retval;
-  CORBA::String value = * (CORBA::String *) nv->value ()->value ();
-
-  if (ACE_OS::strcmp ( (char*)value, "IDL:Cubit:1.0") == 0
-      || ACE_OS::strcmp ( (char *)value, CORBA::_tc_Object->id (env)) == 0)
-    retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-    retval = new CORBA::Boolean (CORBA::B_FALSE);
-
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
-static const TAO_operation_db_entry cubit_operations[] =
-{
-  { "_is_a", &is_a_skel },
-  { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-  { "cube_short", &_skel_Cubit::_cube_short_skel },
-  { "cube_long", &_skel_Cubit::_cube_long_skel },
-  { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-  { "cube_union", &_skel_Cubit::_cube_union_skel },
-  { "please_exit", &_skel_Cubit::_please_exit_skel },
-  { 0, 0 }
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp b/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp
deleted file mode 100644
index 34f76f1e0b2..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\server\Release"

-# PROP BASE Intermediate_Dir ".\server\Release"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\server\Debug"

-# PROP BASE Intermediate_Dir ".\server\Debug"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svr.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubit_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf b/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld b/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld
deleted file mode 100644
index 33ca5152c92..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-svr.cpp
-	C++
-/home/m225527/vme/src/sockem.c
-	C
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
deleted file mode 100644
index 1151df9e0fd..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode,
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "tao/corba.h"
-
-#include "cubit_i.h"
-
-// Global Variables
-static CORBA::String key = (CORBA::String) "key0";
-
-static int num_of_objs = 1;
-
-// Parses the command line arguments and returns an error status
-
-static int 
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt opts (argc, argv, "dk:n:");
-  int			c;
-   
-  while ((c = opts ()) != -1)
-    switch (c) 
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'k':			// key (str)
-	key = (CORBA::String) opts.optarg;
-	break;
-      case 'n':			// idle seconds b4 exit
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-			   " [-k {object_key}]"
-			   "\n", argv [0]), 1);
-      }
-   
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Environment env;
-  char *orb_name = "internet";
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, argv, orb_name, env);
-
-  if (env.exception () != 0) 
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  // Initialize the Basic Object Adapter
-  CORBA::POA_ptr oa_ptr = orb_ptr->POA_init (argc, argv);
-
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
-
-  // Parse remaining command line and verify parameters.
-
-  parse_args (argc, argv);
-  
-  // Create implementation object with user specified key.
-  Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs];
-
-  for (int i = 0; i < num_of_objs; i++)
-    {
-      CORBA::String obj_str = CORBA::string_alloc (ACE_OS::strlen ((char *) key)+2);
-
-      ::sprintf (obj_str, "%s%d", (char *) key, i);
-
-      my_cubit[i] = new Cubit_i (obj_str);
-
-      if (my_cubit[i] == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to create implementation object&d\n",
-			   i),
-			  2);
-
-      if (TAO_debug_level > 0)
-	{
-	  // Why are we getting the POA_ptr from here when we've
-	  // already got it above?
-
-	  CORBA::OctetSeq obj_key;
-	  obj_key.buffer = (CORBA::Octet *) obj_str;
-	  obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-#if 0
-	  CORBA::Object_ptr obj = 0;
-
-	  if (oa_ptr->find (obj_key, obj) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       " (%P|%t) Unable to locate object with key '%s', %p\n", 
-			       key),
-			      3);
-#endif
-     
- 	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
-
-	  CORBA::String str;
-         
-	  str = orb_ptr->object_to_string (my_cubit[i], env);
-
-	  if (env.exception () != 0) 
-	    {
-              env.print_exception ("object2string");
-	      return 1;
-	    }
-
-	  ACE_OS::puts ((char *) str);
-	  ACE_OS::fflush (stdout);
-	  //dmsg1 ("Object Created at: '%ul'", obj);
-	  dmsg1 ("listening as object '%s'", str);
-	}
-
-      CORBA::string_free (obj_str);  
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_ptr->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  // Free resources
-  CORBA::release (orb_ptr);
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak b/TAO/tests/Cubit/TAO/DII_Cubit/test.mak
deleted file mode 100644
index 5fd62ea9ef6..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak
+++ /dev/null
@@ -1,1596 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client-r.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client-r.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\

- "__ACE_INLINE__" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"client-r.exe"

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client-r.pdb" /machine:I386 /out:"$(OUTDIR)/client-r.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client-r.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server-r.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server-r.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\

- "__ACE_INLINE__" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"server-r.exe"

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server-r.pdb" /machine:I386 /out:"$(OUTDIR)/server-r.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server-r.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITS=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT_=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_SVR_C=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp b/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp
deleted file mode 100644
index 50425134c35..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp
+++ /dev/null
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp
deleted file mode 100644
index 2548eb10008..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { CORBA::_tc_ ## truetypename, PARAM_RETURN, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_IN, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_OUT, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA::B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA:: ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA:: ## truetype in_a1, \
-		CORBA:: ## truetype &out_a2, \
-		CORBA:: ## truetype &inout_a3, \
-		CORBA::Environment &env) { \
-	CORBA:: ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA:: ## truetype _retval = 0; to changed CORBA:: ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA::B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA::Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA::B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA::Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { CORBA::_tc_float , PARAM_RETURN , 0 },
-    { CORBA::_tc_float , PARAM_IN , 0 },
-    { CORBA::_tc_float , PARAM_OUT , 0 },
-    { CORBA::_tc_float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA::B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA::Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA::Float	in_a1,
-    CORBA::Float	&out_a2,
-    CORBA::Float	&inout_a3,
-    CORBA::Environment	&env
-)
-{
-    CORBA::Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA::Float	_in_a1 = in_a1;
-    CORBA::Float	_out_a2 = out_a2;
-    CORBA::Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA::Any *
-test1_test_any (test1_ptr target,
-	const CORBA::Any &in_a1,
-	CORBA::Any *&out_a2,
-	CORBA::Any &inout_a3,
-	CORBA::Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA::Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA::TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA::B_FALSE);
-CORBA::TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA::Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA::TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA::B_FALSE);
-CORBA::TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static CORBA::TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA::B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA::Long	case_num,
-    CORBA::Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA::B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA::Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.h b/TAO/tests/Cubit/TAO/DII_Cubit/test1.h
deleted file mode 100644
index c3f35de198c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include "tao/corba.h"
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA::UShort		test1_ushort;
-typedef CORBA::ULong		test1_ulong;
-
-typedef CORBA::LongLong	test1_longlong;
-typedef CORBA::ULongLong 	test1_ulonglong;
-typedef CORBA::LongDouble	test1_longdouble;
-
-typedef CORBA::Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA::Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA::Environment &env);
-void test1_test_void (test1_ptr target, CORBA::Environment &env);
-
-DECL_TEST (short, CORBA::Short);
-DECL_TEST (long, CORBA::Long);
-DECL_TEST (ushort, CORBA::UShort);
-DECL_TEST (ulong, CORBA::ULong);
-DECL_TEST (float, CORBA::Float);
-DECL_TEST (double, CORBA::Double);
-DECL_TEST (boolean, CORBA::Boolean);
-DECL_TEST (char, CORBA::Char);
-DECL_TEST (octet, CORBA::Octet);
-
-CORBA::Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA::Any	&in_a1,
-    CORBA::Any		*&out_a2,
-    CORBA::Any		&inout_a3,
-    CORBA::Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA::TypeCode_ptr);
-DECL_TEST (Principal, CORBA::Principal_ptr);
-DECL_TEST (Object, CORBA::Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA::String);
-
-DECL_TEST (longlong, CORBA::LongLong);
-DECL_TEST (ulonglong, CORBA::ULongLong);
-DECL_TEST (wchar, CORBA::WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA::WString);
-
-DECL_TEST (longdouble, CORBA::LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA::TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA::UserException {
-  public:
-    CORBA::Long	case_num;
-			
-			test1_x1 (CORBA::Long n)
-			: CORBA::UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA::TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA::UserException {
-  public:
-    CORBA::Object_ptr	obj;
-    CORBA::Long	case_num;
-
-			test1_x2 (CORBA::Object_ptr obj1,
-				CORBA::Long n)
-			: CORBA::UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA::release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA::Long	case_num,
-    CORBA::Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA::Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl b/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp
deleted file mode 100644
index 1b6d1abbc2d..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-// @(#)test1_clnt.cpp	1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		client driver for "test1"
-//
-
-#ifdef	USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include "test1.h"
-#include "tao/corba.h"
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA::Exception *, const char *, FILE *f=stdout);
-
-
-//
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first) parameter,
-// and the "inout" (third) parameter is the same function the its
-// initial value.   Caller is expected to specify two different "in"
-// values.   This helps make the marshaled bits vary, and turn up a class
-// of potential problems that'd be hidden if parameter order had no
-// effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases where
-// the ORB or operation failed.  The COMPARE symbol can be redefined
-// to achieve different functions -- e.g. cubing numbers, identity,
-// negation, etc.  It should return true iff the correct result was
-// returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating client
-// side memory leaks in the test.
-//
-#define	RELEASE(X)		// NOP by default
-#define	PERFORM_TEST(name,type,value1,value2) \
-    { \
-	CORBA:: ## type	v1, v2, v3; \
- 	\
-	v1 = (CORBA:: ## type)(value1); \
-	v2 = 0; \
-	v3 = (CORBA:: ## type)(value2); \
- 	\
-	test_count++; \
-	v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-	if (env.exception () != 0) { \
-	    print_exception (env.exception (), "perform test_" #name); \
-	    error_count++; \
-	} else if (!COMPARE (CORBA:: ## type, v1, value1) \
-		|| !COMPARE (CORBA:: ## type, v2, value1) \
-		|| !COMPARE (CORBA:: ## type, v3, value2) ) { \
-	    ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-	    BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-	    error_count++; \
-	} \
-	RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef	USE_IOSTREAM
-#	define	DO_IO(x) x
-#else
-#	define	DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-	    DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA:: ## type, value1) << "\n"; \
-	    cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA:: ## type, value1) << "\n"; \
-	    cerr << " v3=" << v3; \
-	    cerr << " expecting " << EXPVAL(CORBA:: ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-
-//
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-//
-static CORBA::Boolean
-compare_objrefs (
-    CORBA::Object_ptr	v1,
-    CORBA::Object_ptr	v2
-)
-{
-    CORBA::Boolean	temp;
-    CORBA::Environment	env;
-
-    if (v1 == v2)
-	return CORBA::B_TRUE;
-
-    if (CORBA::is_nil (v1))
-	return CORBA::is_nil (v2);
-
-    temp = v1->_is_equivalent (v2, env);
-    if (env.exception () != 0) {
-	print_exception (env.exception (), "compare objref");
-	return CORBA::B_FALSE;
-    }
-    return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-
-static int	skip_longdouble = 0;
-
-//
-// This just performs the tests ...
-//
-void
-do_tests (
-    test1_ptr	target,
-    unsigned	loop_count,
-    unsigned	&test_count,
-    unsigned	&error_count
-)
-{
-    int		count;
-
-    for (count = 0; count < loop_count; count++) {
-	CORBA::Environment	env;
-	CORBA::Environment	env2;	// XXX
-
-	//
-	// test_void
-	//
-	test_count++;
-	test1_test_void (target, env);
-	if (env.exception () != 0) { 
-	    print_exception (env.exception (), "perform test_void");
-	    error_count++;
-	}
-
-	//
-	// Numeric tests ... try some variety in computation, no real
-	// rationale in the choice of initial parameter values except
-	// not to use the same values all the time.
-	//
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-	((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-	PERFORM_TEST (short, Short, count - 23, count + 19);
-	PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-    	PERFORM_TEST (long, Long, count - 17, count + 20);
-    	PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-	PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-	PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif	// !NONNATIVE_LONGLONG
-
-#if	!defined (i386)
-	//
-	// XXX not sure what's wrong with the COMPARE macro with respect to
-	// floating point on x86, since fprintf shows the values basically
-	// look correct ... but these float/double tests fail.
-	//
-	PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-	PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif	// !defined (i386)
-
-
-#ifndef	NONNATIVE_LONGDOUBLE
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	//
-	// don't try this between two platforms that don't provide
-	// arithmetic support for LongDouble values ...
-	//
-	if (!skip_longdouble) {
-	    PERFORM_TEST (longdouble, LongDouble,
-		    count - 2.33, count * 3.14159);
-	}
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	COMPARE
-#undef	EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		(count & 0x01) != 0, (count & 0x01) == 0);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Char, WChar -- identity
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-	PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Object_ptr -- identity (special comparision)
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	    (compare_objrefs (retval, original_value) == CORBA::B_TRUE)
-#undef	RELEASE
-#define	RELEASE(obj) \
-	    { CORBA::release (obj); }
-
-	PERFORM_TEST (Object, Object_ptr, target, CORBA::Object::_nil ());
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// TypeCode_ptr -- identity (special comparision), and verifies
-	// that most of the built-in typecode constants exist.
-	//
-	// XXX should try this on all standard and system exceptions!
-	//
-	// XXX  this currently tests only marshaling/unmarshaling of
-	// "no parameter" TypeCodes ... complex ones (objref, struct,
-	// union, enum, sequence, array, alias, exception) are _NOT_
-	// currently attempted.
-	//
-	// XXX  for the simple typecodes (string, wstring), the single
-	// "bound" parameter isn't exercised/verified as it should be.
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define	COMPARE(type,retval,original) \
-	    (((retval) == (original)) || \
-		((retval)->_kind == (original)->_kind))
-
-#undef	RELEASE
-#define	RELEASE(tc) \
-	    { CORBA::release (tc); }
-
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	{
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_null, _tc_CORBA_Void);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_short, _tc_CORBA_UShort);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_long, _tc_CORBA_ULong);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longLong, _tc_CORBA_ULongLong);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_float, _tc_CORBA_Double);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_boolean, _tc_CORBA_Octet);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_any, _tc_CORBA_TypeCode);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longDouble, _tc_CORBA_Principal);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_char, _tc_CORBA_String);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_wChar, _tc_CORBA_WString);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longDouble, _tc_CORBA_Octet);
-
-	    //
-	    // Try all of the standard exception typecodes.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_uNKNOWN, _tc_CORBA_BAD_PARAM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_nO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_cOMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_oBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNTERNAL, _tc_CORBA_MARSHAL);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_bAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_nO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_pERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_tRANSIENT, _tc_CORBA_FREE_MEM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNV_IDENT, _tc_CORBA_INV_FLAG);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_oBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	    //
-	    // All the built-in "user defined" system exceptions.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_badKind, _tc_CORBA_Bounds);
-	}
-#undef	COMPARE
-#undef	RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	    (strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef	RELEASE
-#define	RELEASE(obj) CORBA::string_free(obj)
-	static const CORBA::Char str1 [] = "small";
-	static const CORBA::Char str2 [] =
-			"relatively long string, constructed"
-			" with the aid of C++ implicit string"
-			" catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef	COMPARE
-#undef	RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	    CORBA::Exception	*xp;
-
-	    //
-	    // Case one:  with parameter <= zero, must throw
-	    // an "x1" exception whose "case_num" is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, -5, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x1	*xp2 = (test1_x1 *) xp;
-
-		    if (xp2->case_num != -5) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 1, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-			"no exception thrown !!\n");
-	    }
-
-
-	    //
-	    // Case two:  with positive odd parameter, must throw
-	    // an "x2" exception whose obj is null, and whose case_num
-	    // is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 101, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 2, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 101) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    if (!CORBA::is_nil (xp2->obj)) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"non-null objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 2, "
-			"no exception thrown !!\n");
-	    }
-
-
-#if	0
-// 18-sept-95:  commented this out.  Work remains to be done in
-// this area:  (a) ServerRequest::target operation unimplemented,
-// so for the servers of current interest this test is no help;
-// (b) probable pointer leak in exceptions holding data.
-
-	    //
-	    // Case three:  with positive even parameter, must throw
-	    // an "x2" exception whose obj is the target, and whose
-	    // case_num is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 42, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 42) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    CORBA::Boolean	status;
-
-		    status = target->_is_equivalent (xp2->obj, env);
-
-		    if (env.exception () != 0) {
-			error_count++;
-			print_exception (env.exception (),
-				"test_throw/3 call to is_equivalent");
-		    } else if (status != CORBA::B_TRUE) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"non-equivalent objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 3, "
-			"no exception thrown !!\n");
-	    }
-
-	    env.clear ();
-#endif	// 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-		|| ACE_OS::strcmp ((char *) env.exception()->id(),
-			(char *) CORBA::_tc_bAD_OPERATION->id (env2)) != 0) { 
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	}
-    }
-}
-
-
-int
-main (int    argc, char   *argv[])
-{
-    CORBA::ORB_ptr	orb_ptr;
-    CORBA::Environment	env;
-    CORBA::Object_ptr	objref = CORBA::Object::_nil();
-    unsigned		loop_count = 1;
-    unsigned		tests = 0, errors = 0;
-    int			exit_later = 0;
-
-    orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-    if (env.exception () != 0) {
-	dexc (env, "ORB initialisation");
-	return 1;
-    }
-
-    //
-    // Parse and verify parameters.
-    //
-    ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-    int			c;
-
-    while ((c = get_opt ()) != -1)
-	switch (c) {
-	  case 'd':			// debug flag
-	    TAO_debug_level++;
-	    continue;
-
-	  case 'l':			// skip "long double" test
-	    skip_longdouble++;
-	    continue;
-
-	  case 'n':			// loop count
-	    loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	    continue;
-
-	  case 'O':			// stringified objref
-	    {
-		objref = orb_ptr->string_to_object (
-			(CORBA::String)get_opt.optarg, env);
-		if (env.exception () != 0) {
-		    dexc (env, "string2object");
-		    return 1;
-		}
-	    }
-	    continue;
-
-	  case 'x':
-	    exit_later++;
-	    continue;
-
-	  case '?':
-	  default:
-	    ACE_OS::fprintf (stderr, "usage:  %s"
-			    " [-d]"
-			    " [-l]"
-			    " [-n loopcount]"
-			    " [-O objref]"
-			    " [-x]"
-			    "\n", argv [0]
-			    );
-	    return 1;
-        }
-    
-    if (CORBA::is_nil (objref) == CORBA::B_TRUE) {
-	ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		argv [0]);
-	return 1;
-    }
-
-
-    do_tests (objref, loop_count, tests, errors);
-
-    char		*progname = ACE_OS::strrchr (argv [0], '/');
-
-    if (progname != 0)
-	progname += 1;
-    else
-	progname = argv [0];
-
-    ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-	progname, loop_count, tests, errors);
-
-    if (exit_later) {
-	test1_please_exit (objref, env);
-	if (env.exception () != 0)
-	    print_exception (env.exception (), "test1_please_exit");
-    }
-
-    CORBA::release (objref);
-
-    return errors != 0;
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp
deleted file mode 100644
index bcabdf79e30..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp
+++ /dev/null
@@ -1,666 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include "test1.h"
-#include "tao/corba.h"
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method code,
-// in lieu of having an IDL compmiler generate static skeletons.  Static
-// skeletons would be more efficient; most mallocation could go away.
-//
-// Use by:  defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE:  "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList should
-// also get a public constructor, and a way to provide the buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA::ServerRequest	&req, \
-        CORBA::Object_ptr        obj, \
-	CORBA::Environment	&env \
-    ) \
-    { \
-	CORBA::NVList_ptr	nvlist; \
-	CORBA:: ## truetype	scratch = 0; \
-	CORBA::Any		temp_value (CORBA::_tc_ ## truetypename, \
-				    &scratch, CORBA::B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA:: ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA:: ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA:: ## truetype; \
-	*v2 = (CORBA:: ## truetype) OPERATION (*v1); \
-	retval = new CORBA:: ## truetype; \
-	*retval = (CORBA:: ## truetype) OPERATION (*v1); \
- 	\
-	CORBA::Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA::B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA:: ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA:: ## truetype v1copy = *v1; \
-	*v1 = (CORBA:: ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA::Any (CORBA::_tc_ ## truetypename, \
-		retval, CORBA::B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA::ServerRequest &req,
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA::string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA::wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-  CORBA::Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA::Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA::Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA::Any (_tc_test1_x1, x, CORBA::B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA::Object::_nil (), value);
-      any = new CORBA::Any (_tc_test1_x2, x, CORBA::B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA::Any (_tc_test1_x2, x, CORBA::B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // POA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA::IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (
-    CORBA::OctetSeq		&key,
-    CORBA::ServerRequest		&req,
-    void			*context,
-    CORBA::Environment		&env
-)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA::OctetSeq		*obj_key;
-
-  obj_key = (CORBA::OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA::OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA::String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA::Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-    return;
-  }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA::BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA::Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA::ORB_ptr orb_ptr,
-	   CORBA::POA_ptr oa_ptr,
-	   CORBA::String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA::OctetSeq	obj_key;
-  CORBA::Object_ptr	obj;
-  CORBA::Environment	env;
-
-  obj_key.buffer = (CORBA::Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA::String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "POA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA::String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA::release (obj);
-  CORBA::string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what POA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA::B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA::B_FALSE, &tv, env);
-      }
-
-    CORBA::Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA::Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, CORBA::_tc_bAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "POA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  POA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA::Environment	env;
-  CORBA::ORB_ptr	orb_ptr;
-  CORBA::POA_ptr		oa_ptr;
-  CORBA::String	key = (CORBA::String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA::String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The POA may or may not actually be named ...
-  //
-  oa_ptr = CORBA::POA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init");
-    return 1;
-  }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak
deleted file mode 100644
index afa815291e8..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak
+++ /dev/null
@@ -1,2068 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=client - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to client - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"\

- && "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Cubit.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "client - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase ".\cubitC.cpp"

-	-@erase ".\cubitC.h"

-	-@erase ".\cubitC.i"

-	-@erase ".\cubitS.cpp"

-	-@erase ".\cubitS.h"

-	-@erase ".\cubitS.i"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitC.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-	-@erase ".\cubitC.cpp"

-	-@erase ".\cubitC.h"

-	-@erase ".\cubitC.i"

-	-@erase ".\cubitS.cpp"

-	-@erase ".\cubitS.h"

-	-@erase ".\cubitS.i"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitC.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_SVR_C=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT_=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITC=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP Exclude_From_Build 0

-# Begin Custom Build - Compiling IDL file(s):

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl.exe $(InputName).idl \

-	

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP Exclude_From_Build 0

-# Begin Custom Build - Compiling IDL file(s):

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl.exe $(InputName).idl \

-	

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITC=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp
deleted file mode 100644
index c26de1aa337..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp
+++ /dev/null
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw b/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Test.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Test.cpp
deleted file mode 100644
index dff517a9e9f..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Test.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Cubit/TAO/IDL_Cubit
-// 
-// = FILENAME
-//    IDL_Cubit_Test.cpp
-//
-// = DESCRIPTION
-//    This example tests the IDL Cubit server and client
-//    components. The test forks and execs two processes to run both
-//    the client and the time server. The clerk and the server
-//    communicate for a short duration after which the main process
-//    kills both the processes. No command line arguments are needed
-//    to run the test.
-//
-// = AUTHOR
-//    Nagarajan Surendran
-// 
-// ============================================================================
-
-#include "tests/test_config.h"
-#include "ace/Process.h"
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("IDL_Cubit_Test:");
-
-  // Make sure that the backing store is not there. We need to make
-  // sure because this test kills the Time Clerk and on some platforms
-  // the Clerk is not allowed to do a graceful shutdown. By cleaning
-  // the backing store here, we are sure that we get a fresh start and
-  // no garbage data from a possible aborted run
-  ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE);
-
-  ACE_Process_Options server_options;
-  server_options.command_line ("./server");
-  ACE_Process server;
-
-  if (server.spawn (server_options) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%n %p.\n",
-                       "Server fork failed"),
-                      0);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "Server forked with pid = %d.\n",
-                server.getpid ()));
-
-  ACE_OS::sleep (5);
-
-  ACE_Process_Options clerk_options;
-  clerk_options.command_line ("./client");
-  ACE_Process clerk;
-
-  if (clerk.spawn (clerk_options) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%p.\n",
-                       "Client spawn failed"),
-                      0);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "Client forked with pid = %d.\n",
-                clerk.getpid ()));
-
-  ACE_DEBUG ((LM_DEBUG, "Sleeping...\n"));
-  ACE_OS::sleep (10);
-
-  if (clerk.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Terminate failed for clerk.\n"),
-                      -1);
-
-  if (server.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Terminate failed for server.\n"),
-                      -1);
-
-  // Since we kill the clerk process, on Win32 it may not do a
-  // graceful shutdown and the backing store file is left behind.
-  if (clerk.wait () != 0)
-    ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE);
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile
deleted file mode 100644
index 7e9fa7cee35..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lorbsvcs -lTAO 
-
-IDL_SRC	= cubitC.cpp cubitS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp tmplinst.cpp 
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = cubitC.o cubitS.o  server.o cubit_i.o tmplinst.o 
-CUBIT_CLT_OBJS = cubitC.o cubitS.o client.o tmplinst.o
-TEST_OBJS      = IDL_Cubit_Test.o
-
-BIN = server client IDL_Cubit_Test
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-#$(IDL_SRC): cubit.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
-
-server:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-IDL_Cubit_Test: $(addprefix $(VDIR),$(TEST_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/README b/TAO/tests/Cubit/TAO/IDL_Cubit/README
deleted file mode 100644
index 73388962aef..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/README
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-This is the cubit example that uses the TAO IDL compiler to generate
-the stubs and skeletons. Additional features include presence of a
-factory to create Cubit objects and testing the _bind call to get the
-factory object reference.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-The client and server by default make use of the Naming Service.
-The cubit server now has its own NamingServer implementation and hence
-you don't have to start the NamingService before starting the client
-and server.
-	You just have to use the -s flags on both the server and
-client if you don't want to use the naming service.
-
-server:
--------
-
-% server [-d] [-s] [-ORBhost <serverhost>] [-ORBport <portnum>]
-           [-n <number-of-cubit-objects>] [-o <ior_output_file>] 
-
-Options:
--------
--s       Tells the server not to register the cubit-factory object 
-         with the Naming Service.
-
--d       Debug flag (It is additive more -d flags will give debugging).
-
--o      Outputs the cubit_factory ior file to the file
-
--n      Number of cubit objects exported by the server
-
-The server cubit factory maintains num_of_cubit objects (default =
-1). They are assigned keys that look like "key0", "key1", ...
-
-When the server is started and you have used the -d flag, you should
-see as the first line of output something that looks like
-	iiop:1.0//swarm:10015/Persistent/886013035/850128/RootPOA/RootPOA_is_BAD/factory
-	(-ORBobjrefstyle url)
-or
-	IOR:000000000000001649444c3a43756269745...
-	(-ORBobjrefstyle ior)
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-
-client:
--------
-
-% client [-d] [-s] [-x] <-f cubit_factory_ior_file> <-k cubit_factory_ior>  -n <iterations> 
-
-Options:
--------
-	d	Debug flag
-	s	Don't Use the Naming Service
-	x 	Tells the server to shutdown.
-	f	Reads the cubit factory ior from the file
-	k	Reads the cubit factory ior from commandline
-	n	no. of iterations
-	
-	There are 3 ways of giving the CubitFactory IOR to the client:
-
-	1. From a file using the -f option. (This file can be produced using 
-		the -o option of the server.)
-	
-	2. Directly on the commandline using the -k option.
-	
-	3. Get it from the Naming Service (which is the default client
-       	   behavior).  
-
-IDL_Cubit_Test:
---------------
-
-        This is a simple test program which tests the server and
-client using the default options of the server and client. To test
-using this just run 
-
-        %IDL_Cubit_Test       
-
-
-Sample Run- Using files to communicate IOR:
-------------------------------------------
-
-1. Start the server.
-
-% server -s -ORBport 20000 -ORBobjrefstyle url -o theior 
-
-starting up daemon <unknown>
-opening dynamic service Resource_Factory
-did dynamic on Resource_Factory, error = 0
-opening dynamic service Client_Strategy_Factory
-did dynamic on Client_Strategy_Factory, error = 0
-opening dynamic service Server_Strategy_Factory
-did dynamic on Server_Strategy_Factory, error = 0
-The IOR is: <iiop:1.0//tango:20000/Persistent/887665222/647179/RootPOA/RootPOA_is_BAD/factory\00\00>
-
-
-2.Start the client.
-
-%client -s -ORBport 19998 -f theior
-
-starting up daemon <unknown>
-opening dynamic service Resource_Factory
-did dynamic on Resource_Factory, error = 0
-opening dynamic service Client_Strategy_Factory
-did dynamic on Client_Strategy_Factory, error = 0
-opening dynamic service Server_Strategy_Factory
-did dynamic on Server_Strategy_Factory, error = 0
-Factory received OK
-.
-.
-.
-
-Sample Run-Using Naming Service:
---------------------------------
-1. Start the server
-	%server -ORBport 19999
-
-2. Start the client
-	%client -ORBport 19998
-		if you don't want the server to shutdown.
-	%client -ORBport 19998  -x
-		if you want to shutdown the server after this request.
-
-3. If Multicast is not supported the naming service can be reached by
-the  following 2 methods.
-        
-        a) use the -ORBnameserviceior flag to the client to give the
-        naming service ior outputted by the server.
-        
-        b)set the ENVIRONMENT variable "NameService"
-        
-       This might be helpful if more than one person is running the
-        Naming service in which case Multicast might cause confusion with some
-        other Naming Service trying to answer your call.
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/VCAUTO.MAK b/TAO/tests/Cubit/TAO/IDL_Cubit/VCAUTO.MAK
deleted file mode 100644
index 1a7d3a74927..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/Cubit/TAO/IDL_Cubit/
-
-MAK_LIST = server client
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.MAK b/TAO/tests/Cubit/TAO/IDL_Cubit/client.MAK
deleted file mode 100644
index f1bbb82136a..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.MAK
+++ /dev/null
@@ -1,630 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on client.dsp
-!IF "$(CFG)" == ""
-CFG=client - Win32 Release
-!MESSAGE No configuration specified. Defaulting to client - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\clnt.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\client.exe"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D\
- "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fp"$(INTDIR)\client.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=ace.lib tao.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\client.pdb" /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\clnt.obj" \
-	"$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\clnt.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\client.exe"
-	-@erase "$(OUTDIR)\client.ilk"
-	-@erase "$(OUTDIR)\client.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I\
- "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE"\
- /Fp"$(INTDIR)\client.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib TAO.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\client.pdb" /debug /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\clnt.obj" \
-	"$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "client - Win32 Release" || "$(CFG)" == "client - Win32 Debug"
-SOURCE=.\clnt.cpp
-DEP_CPP_CLNT_=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Env_Value_T.cpp"\
-	"..\..\..\..\..\ace\Env_Value_T.h"\
-	"..\..\..\..\..\ace\Env_Value_T.i"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\clnt.h"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)" ".\cubitC.h"\
- ".\cubitC.i"
-
-
-SOURCE=.\cubit.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-InputPath=.\cubit.idl
-InputName=cubit
-
-"$(InputName)C.cpp"	"$(InputName)C.i"	"$(InputName)C.h"	 : $(SOURCE)\
- "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl $(InputName).idl
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-InputPath=.\cubit.idl
-InputName=cubit
-
-"$(InputName)C.cpp"	"$(InputName)C.i"	"$(InputName)C.h"	 : $(SOURCE)\
- "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl $(InputName).idl
-
-!ENDIF 
-
-SOURCE=.\cubitC.cpp
-DEP_CPP_CUBIT=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitC.h"\
- ".\cubitC.i"
-
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/client.bld
deleted file mode 100755
index 9b912e57dd0..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubitC.cpp
-	C++
-cubitS.cpp
-	C++
-client.cpp
-	C++
-tmplinst.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp
deleted file mode 100644
index 30810a39464..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ /dev/null
@@ -1,852 +0,0 @@
-// $Id$
-
-#include "ace/Profile_Timer.h"
-#include "ace/Env_Value_T.h"
-#include "ace/Read_Buffer.h"
-#include "client.h"
-#include "orbsvcs/CosNamingC.h"
-
-#define quote(x) #x
-
-const int max_sequence_length = 10;
-// Limit the sequence length, otherwise the time to run the test
-// increases to fast....
-
-// Constructor.
-Cubit_Client::Cubit_Client (void)
-  : cubit_factory_key_ (0),
-    cubit_key_ (ACE_OS::strdup ("key0")),
-    loop_count_ (250),
-    shutdown_ (0),
-    cubit_ (Cubit::_nil ()),
-    call_count_ (0),
-    error_count_ (0),
-    cubit_factory_ior_file_ (0),
-    f_handle_ (ACE_INVALID_HANDLE),
-    use_naming_service_ (1)
-{
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Reads the Cubit factory ior from a file
-
-int
-Cubit_Client::read_ior (char *filename)
-{
-  // Open the file for reading.
-  this->f_handle_ = ACE_OS::open (filename,0);
-
-  if (this->f_handle_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
-                       filename),
-                      -1);
-  ACE_Read_Buffer ior_buffer (this->f_handle_);
-  this->cubit_factory_key_ = ior_buffer.read ();
-
-  if (this->cubit_factory_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                      -1);
-   return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:k:xs");
-  int c;
-  int result;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'n':                 // loop count
-        this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-            break;
-      case 'k': // read the cubit IOR from the command-line.
-        this->cubit_factory_key_ =
-          ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        this->shutdown_ = 1;
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_ = 0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-f cubit_factory-obj-ref-key-file]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-x]"
-                           " [-s]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Exercise the union.  Cube a union.
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  CORBA::Environment env;
-  Cubit::oneof u;
-
-  this->call_count_++;
-
-  u.l (3); // use the long union branch.
-
-  // Cube a "union" ...
-  Cubit::oneof r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube union ...");
-      u.l (u.l () * u.l () * u.l ()) ;
-
-      if (u.l () != r.l ())
-        {
-          ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-          this->error_count_++;
-        }
-
-    }
-
-  this->call_count_++;
-
-  u._d (Cubit::e_3rd);
-#if 0
-  u.cm ().l = this->func (i);
-  u.cm ().s = this->func (i);
-  u.cm ().o = this->func (i);
-#endif
-
-  u.cm ().l = 7;
-  u.cm ().s = 5;
-  u.cm ().o = 3;
-
-  // Cube another "union" which uses the default arm ... NOT tested yet
-  r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube union ...");
-      u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
-      u.cm ().s = u.cm ().s * u.cm ().s * u.cm ().s;
-      u.cm ().o = u.cm ().o * u.cm ().o * u.cm ().o;
-
-      if (u.cm ().l != r.cm ().l
-          || u.cm ().s != r.cm ().s
-          || u.cm ().o != r.cm ().o)
-        {
-          ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-          this->error_count_++;
-        }
-    }
-}
-
-// Exercise the union using dii.
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-
-  this->call_count_++;
-
-  req = this->cubit_->_request ((CORBA::String) "cube_union", this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-
-      this->env_.print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::oneof  *u, r;
-
-  u = new Cubit::oneof;
-  u->_d (Cubit::e_3rd);
-
-  u->cm ().l = 5;
-  u->cm ().s = -7;
-  u->cm ().o = 3;
-
-  CORBA::Any tmp_arg (Cubit::_tc_oneof, u, CORBA::B_FALSE);
-
-  req->arguments ()->add_value ("values",
-                                tmp_arg,
-                                CORBA::ARG_IN,
-                                this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  // @@ Naga, please check with Andy and see if we can update all uses
-  // of the Any methods with the new <<= and >>= operators.  Please
-  // make sure you document what is going on here if you do this.
-  req->result ()->value ()->replace (Cubit::_tc_oneof,
-                                     0,
-                                     CORBA::B_TRUE,
-                                     this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      this->error_count_++;
-      req->env ()->print_exception ("cube_union_dii invoke");
-      CORBA::release (req);
-      return;
-    }
-
-  r = *(Cubit::oneof *) req->result ()->value ()->value ();
-
-  if (r.cm ().o != 27 || r.cm ().l != 125 || r.cm ().s != -343)
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    dmsg ("cube_union_dii ... success!!");
-
-  CORBA::release (req);
-  delete u;
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->cube_short (arg_short, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube short:  %d --> %d\n",
-             arg_short,
-             ret_short);
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-        {
-          ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-                      (CORBA::Short) this->func (i),
-                      ret_short));
-          this->error_count_++;
-        }
-    }
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->cube_octet (arg_octet, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_DEBUG ((LM_DEBUG,
-                    "** cube_octet (%d) ERROR (--> %d)\n",
-                    (CORBA::Octet) this->func (i),
-                    ret_octet));
-        this->error_count_++;
-      }
-    }
-}
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->cube_long (arg_long, this->env_);;
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-      arg_long = arg_long * arg_long * arg_long;
-
-      if (arg_long != ret_long)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "** cube_long (%ld) ERROR (--> %ld)\n",
-                      (CORBA::Long) this->func (i),
-                      ret_long));
-          this->error_count_++;
-        }
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit::Many arg_struct;
-  Cubit::Many ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->cube_struct (arg_struct, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube struct ...");
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct.l
-          || arg_struct.s != ret_struct.s
-          || arg_struct.o != ret_struct.o)
-        {
-          ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-          this->error_count_++;
-        }
-    }
-}
-
-// Cube the numbers in a sequence
-
-void
-Cubit_Client::cube_sequence (int i)
-{
-  this->call_count_++;
-
-  int l = i + 1;
-  if (l > max_sequence_length)
-    l = max_sequence_length;
-
-  Cubit::vector input (l);
-  input.length (l);
-
-  // Fill in the input sequence...
-  for (int j = 0; j < l; ++j)
-    input[j] = j;
-
-  Cubit::vector_var output;
-  Cubit::vector_out vout (output);
-
-  // Cube the sequence
-  this->cubit_->cube_sequence (input, vout, this->env_);
-
-  //  Cubit::vector& output = *vout.ptr ();
-  //  output = vout;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      if (output->length () != input.length ())
-        {
-          ACE_ERROR ((LM_ERROR, "** cube sequence, wrong length\n"));
-          this->error_count_++;
-        }
-
-      u_int rl = output->length ();
-      if (input.length () < rl)
-        rl = input.length ();
-      for (u_int j = 0; j < rl; ++j)
-        {
-          int x = input[j];
-          if (x*x*x != output[j])
-            {
-              ACE_ERROR ((LM_ERROR, "** cube_sequence ERROR\n"));
-              this->error_count_++;
-            }
-        }
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req =
-    this->cubit_->_request ((CORBA::String) "cube_struct", this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::Many arg;
-  Cubit::Many result;
-
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-
-  CORBA::Any tmp_arg (Cubit::_tc_Many, &arg, CORBA::B_FALSE);
-
-  req->arguments ()->add_value ("values",
-                                tmp_arg,
-                                CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_Many,
-                                     0,
-                                     CORBA::B_TRUE,
-                                     this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      req->env ()->print_exception ("DII invoke sending struct");
-      CORBA::release (req);
-      return;
-    }
-
-  result = *(Cubit::Many *) req->result ()->value ()->value ();
-
-  if (result.o != 27 || result.l != 125 || result.s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    dmsg ("DII cube_struct ... success!!");
-
-  CORBA::release (req);
-}
-
-void
-Cubit_Client::print_stats (const char *call_name,
-                           ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "%s:\n",
-              call_name));
-
-  if (this->call_count_ > 0 && this->error_count_ == 0)
-    {
-#if defined (ACE_LACKS_FLOATING_POINT)
-      // elapsed_time.real_time is in units of microseconds.
-      const u_int calls_per_sec =
-        this->call_count_ * 1000000u / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\treal_time\t= %u ms,\n"
-                  "\t%u calls/second\n",
-                  elapsed_time.real_time / 1000u,
-                  calls_per_sec));
-#else  /* ! ACE_LACKS_FLOATING_POINT */
-      // elapsed_time.real_time is in units of seconds.
-      double calls_per_sec = this->call_count_ / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\treal_time\t= %0.06f ms, \n\t"
-                  "user_time\t= %0.06f ms, \n\t"
-                  "system_time\t= %0.06f ms\n"
-                  "\t%0.00f calls/second\n",
-                  elapsed_time.real_time < 0.0 ? 0.0
-                    : elapsed_time.real_time * ACE_ONE_SECOND_IN_MSECS,
-                  elapsed_time.user_time < 0.0 ? 0.0
-                    : elapsed_time.user_time * ACE_ONE_SECOND_IN_MSECS,
-                  elapsed_time.system_time < 0.0 ? 0.0
-                    : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS,
-                  calls_per_sec < 0.0 ? 0.0 : calls_per_sec));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-    }
-  else
-    ACE_ERROR ((LM_ERROR,
-                "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\t%d calls, %d errors\n",
-              this->call_count_,
-              this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-      this->cube_sequence (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    this->cube_struct_dii ();
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-  // ------------------>
-  // Two more tests, using the "cube_union" function
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  // unions using stubs
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    this->cube_union_stub ();
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  // union DII
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    this->cube_union_dii ();
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  // Sequences
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    this->cube_sequence (this->loop_count_);
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_sequence", elapsed_time);
-
-  if (this->shutdown_)
-    {
-      this->cubit_->shutdown (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  // Close the ior files
-  if (this->cubit_factory_ior_file_)
-    ACE_OS::fclose (this->cubit_factory_ior_file_);
-  if (this->f_handle_ != ACE_INVALID_HANDLE)
-    ACE_OS::close (this->f_handle_);
-
-  CORBA::release (this->cubit_);
-
-  if (this->cubit_factory_key_ != 0)
-    ACE_OS::free (this->cubit_factory_key_);
-  if (this->cubit_key_ != 0)
-    ACE_OS::free (this->cubit_key_);
-}
-
-int
-Cubit_Client::init_naming_service (void)
-{
-  TAO_TRY
-    {
-      CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the Name Service.\n"),
-                          -1);
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CosNaming::Name cubit_factory_name (2);
-      cubit_factory_name.length (2);
-      cubit_factory_name[0].id = CORBA::string_dup ("IDL_Cubit");
-      cubit_factory_name[1].id = CORBA::string_dup ("cubit_factory");
-      CORBA::Object_var factory_obj =
-        naming_context->resolve (cubit_factory_name,TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->factory_ =
-        Cubit_Factory::_narrow (factory_obj.in (),TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->factory_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve cubit factory in Naming service <%s>\n"),
-                          -1);
-   }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Cubit::init_naming_service");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  int naming_result;
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  TAO_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      if (this->use_naming_service_)
-        {
-          naming_result = this->init_naming_service ();
-          if (naming_result < 0)
-            return naming_result;
-        }
-      else
-        {
-          if (this->cubit_factory_key_ == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s: no cubit factory key specified\n",
-                               this->argv_[0]),
-                              -1);
-
-
-          CORBA::Object_var factory_object =
-            this->orb_->string_to_object (this->cubit_factory_key_,
-                                          TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          this->factory_ =
-            Cubit_Factory::_narrow (factory_object.in(), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          if (CORBA::is_nil (this->factory_.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid factory key <%s>\n",
-                               this->cubit_factory_key_),
-                              -1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Factory received OK\n"));
-
-      // Now retrieve the Cubit obj ref corresponding to the key.
-      this->cubit_ =
-        this->factory_->make_cubit (this->cubit_key_,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->cubit_))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "null cubit objref returned by factory\n"),
-                          -1);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Cubit::init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t IDL_Cubit: client \n\n"));
-
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Env_Value<unsigned long>;
-template class ACE_Env_Value<unsigned short>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Env_Value<unsigned long>
-#pragma instantiate ACE_Env_Value<unsigned short>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp
deleted file mode 100644
index 1271f1f8738..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp
+++ /dev/null
@@ -1,158 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\client\Release"

-# PROP BASE Intermediate_Dir ".\client\Release"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\client\Debug"

-# PROP BASE Intermediate_Dir ".\client\Debug"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubitC.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.h b/TAO/tests/Cubit/TAO/IDL_Cubit/client.h
deleted file mode 100644
index 5b82fd36443..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-
-class Cubit_Client
-{
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
-public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int init_naming_service (void);
-  // Function to initialize the naming service.
-
-  int func (u_int i);
-  // Simple function that returns the substraction of 117 from the
-  // parameter.
-
-  int read_ior (char *filename);
-  // Function to read the cubit factory ior from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name,
-                    ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // Prints the time stats.
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-
-  void cube_union_dii (void);
-  // Exercise the union using DII.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long.
-
-  void cube_octet (int i);
-  // Cube an octet.
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_sequence (int i);
-  // Cube a sequence.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *cubit_factory_key_;
-  // Key of factory obj ref.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int shutdown_;
-  // Flag to tell server to shutdown.
-
-  Cubit_Factory_var factory_;
-  // factory pointer for cubit.
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  u_int call_count_;
-  // # of calls made to functions.
-
-  u_int error_count_;
-  // # of errors incurred in the lifetime of the application.
-
-  FILE *cubit_factory_ior_file_;
-  // File from which to obtain the IOR.
-
-  ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
-
-  int use_naming_service_;
-  // Flag to tell client not to use Namingservice to find the cubit
-  // Factory.
-};
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl
deleted file mode 100644
index 632ddb78b74..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-interface Cubit
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-{
-  octet	cube_octet (in octet o);
-  // cube an octet
-
-  short	cube_short (in short s);
-  // cube a short
-
-  long	cube_long (in long l);
-  // cube a long
-
-  struct Many
-  {
-    octet o;		// + 3 bytes padding (normally) ...
-    long l;
-    short s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many cube_struct (in Many values);
-  // Cube a struct
-
-  enum discrim
-  {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd
-  };
-  // Enumeration of the different elements in a union.
-
-  union oneof switch (discrim)
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet o;
-    case e_1st:
-      short s;
-    case e_2nd:
-      long l;
-    case e_3rd:
-      Many cm;
-
-      // default:
-      // Many cm;
-    };
-  // Union of different types.
-
-  oneof	cube_union (in oneof values);
-  // cube a union.
-
-  typedef sequence<long> vector;
-
-  void cube_sequence (in vector input,
-		      out vector output);
-  // Cube several longs...
-
-  oneway void shutdown ();
-  // shutdown the application.
-};
-
-interface Cubit_Factory
-  // = TITLE
-  //    Creates Cubit objects.
-{
-  Cubit make_cubit (in string key);
-};
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp
deleted file mode 100644
index 1ce4ddf2519..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    cubit_i.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "ace/Auto_Ptr.h"
-#include "cubit_i.h"
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (void)
-{
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-}
-
-Cubit_ptr
-Cubit_Factory_i::make_cubit (const char *,
-			     CORBA::Environment &env)
-{
-  return my_cubit_._this (env);
-}
-
-// Constructor
-
-Cubit_i::Cubit_i (const char *)
-{
-}
-
-// Destructor
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-// Cube an octet
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return o * o * o;
-}
-
-// Cube a short.
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return s * s * s;
-}
-
-// Cube a long
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return l * l * l;
-}
-
-// Cube a struct
-
-Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &env)
-{
-  Cubit::Many temp;
-
-  ACE_UNUSED_ARG (env);
-  temp.o = values.o * values.o * values.o;
-  temp.s = values.s * values.s * values.s;
-  temp.l = values.l * values.l * values.l;
-
-  return temp;
-}
-
-// Cube a union
-
-Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values,
-                     CORBA::Environment &env)
-{
-  Cubit::oneof temp;
-
-  ACE_UNUSED_ARG (env);
-  switch (values._d ())
-    {
-    case Cubit::e_0th:
-      temp.o (values.o () * values.o () * values.o ());
-      break;
-    case Cubit::e_1st:
-      temp.s (values.s () * values.s () * values.s ());
-      break;
-    case Cubit::e_2nd:
-      temp.l (values.l () * values.l () * values.l ());
-      break;
-    case Cubit::e_3rd:
-    default:
-      temp._d (values._d ()); // set the discriminant
-      // use the read/write accessor
-      temp.cm ().o  = values.cm ().o * values.cm ().o * values.cm ().o;
-      temp.cm ().s  = values.cm ().s * values.cm ().s * values.cm ().s;
-      temp.cm ().l  = values.cm ().l * values.cm ().l * values.cm ().l;
-
-    }
-  return temp;
-}
-
-// Cube a sequence
-void
-Cubit_i::cube_sequence(const Cubit::vector &input,
-		       Cubit::vector_out output,
-		       CORBA::Environment &)
-{
-  if (output.ptr () == 0)
-    output = new Cubit::vector (input.length ());
-
-  output->length (input.length ());
-
-  for (CORBA::ULong i = 0; i < input.length (); ++i)
-    {
-      CORBA::Long x = input[i];
-      output[i] = x * x * x;
-    }
-}
-
-// Shutdown.
-
-void Cubit_i::shutdown (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "%s",
-	      "I have been asked to shut down "));
-	      
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
-
-
-
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h
deleted file mode 100644
index 055c749fd11..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-// 
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
-// ============================================================================
-
-#if !defined (_CUBIT_I_H)
-#define	_CUBIT_I_H
-
-#include "cubitS.h"
-
-// Forward declarations.
-class Cubit_i;
-
-// Typedefs.
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public POA_Cubit
-{
-  // = TITLE
-  //    Illustrates how to integrate a servant with the generated
-  //    skeleton.
-  //
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
-public:
-  Cubit_i (const char *obj_name = 0);
-  // Constructor
-
-  ~Cubit_i (void);
-  // Destructor
-
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-  // Cube an octet
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  // Cube a short
-
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  // Cube a long
-
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  // Cube a struct.
-
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env);
-  // Cube a union.
-
-  virtual void cube_sequence (const Cubit::vector &input,
-			      Cubit::vector_out output,
-			      CORBA::Environment &env);
-  // Cube a sequence.
-
-  virtual void shutdown (CORBA::Environment &env);
-  // Shutdown routine.
-};
-
-class Cubit_Factory_i;
-
-typedef Cubit_Factory_i *Cubit_Factory_i_ptr;
-
-class Cubit_Factory_i: public POA_Cubit_Factory
-{
-  // = TITLE
-  //   Cubit_Factory_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the cubit objrefs
-public:
-  Cubit_Factory_i (void);
-  // Constructor.
-
-  ~Cubit_Factory_i (void);
-  // Destructor.
-
-  virtual Cubit_ptr make_cubit (const char *key,
-                                CORBA::Environment &env);
-  // Make the cubit object whose key is "key".
-
-private:
-  Cubit_i my_cubit_;
-};
-
-#endif /* _CUBIT_I_H */
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld
deleted file mode 100644
index c678d14dca1..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld
+++ /dev/null
@@ -1,32 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:object_dir=./obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=../../../../orbsvcs
-	:sourcedirs=/home/ace/ACE_wrappers.latest
-	:sourcedirs=../../../../tao/compat
-	:sourcedirs=../../../..
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../orbsvcs
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.latest/ace
-	:libraries=vmeXportNoLogging.a
-	:libraries=orbsvcs.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:defines=DEBUG
-	:defines=VME_DRIVER
-client.bld
-	program
-server.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.MAK b/TAO/tests/Cubit/TAO/IDL_Cubit/server.MAK
deleted file mode 100644
index adf479bc159..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.MAK
+++ /dev/null
@@ -1,1070 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on server.dsp
-!IF "$(CFG)" == ""
-CFG=server - Win32 Release
-!MESSAGE No configuration specified. Defaulting to server - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\cubit_i.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\cubitS.obj"
-	-@erase "$(INTDIR)\svr.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\server.exe"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D\
- "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fp"$(INTDIR)\server.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib TAO.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\server.pdb" /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\cubit_i.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\cubitS.obj" \
-	"$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\cubit_i.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\cubitS.obj"
-	-@erase "$(INTDIR)\svr.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\server.exe"
-	-@erase "$(OUTDIR)\server.ilk"
-	-@erase "$(OUTDIR)\server.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I\
- "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE"\
- /Fp"$(INTDIR)\server.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib TAO.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\server.pdb" /debug /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\cubit_i.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\cubitS.obj" \
-	"$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "server - Win32 Release" || "$(CFG)" == "server - Win32 Debug"
-SOURCE=.\cubit.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-InputPath=.\cubit.idl
-InputName=cubit
-
-"$(InputName)C.cpp"	"$(InputName)S.cpp"	"$(InputName)C.i"	"$(InputName)C.h"\
-	"$(InputName)S.i"	"$(InputName)S.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl $(InputName).idl
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-InputPath=.\cubit.idl
-InputName=cubit
-
-"$(InputName)C.cpp"	"$(InputName)S.cpp"	"$(InputName)C.i"	"$(InputName)C.h"\
-	"$(InputName)S.i"	"$(InputName)S.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl $(InputName).idl
-
-!ENDIF 
-
-SOURCE=.\cubit_i.cpp
-DEP_CPP_CUBIT=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubit_i.h"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	".\cubitS.h"\
-	".\cubitS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitS.h"\
- ".\cubitC.h" ".\cubitS.i" ".\cubitC.i"
-
-
-SOURCE=.\cubitC.cpp
-DEP_CPP_CUBITC=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)" ".\cubitC.h"\
- ".\cubitC.i"
-
-
-SOURCE=.\cubitS.cpp
-DEP_CPP_CUBITS=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	".\cubitS.h"\
-	".\cubitS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)" ".\cubitS.h"\
- ".\cubitS.i" ".\cubitC.h" ".\cubitC.i"
-
-
-SOURCE=.\svr.cpp
-DEP_CPP_SVR_C=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubit_i.h"\
-	".\cubitC.h"\
-	".\cubitC.i"\
-	".\cubitS.h"\
-	".\cubitS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitS.h"\
- ".\cubitC.h" ".\cubitS.i" ".\cubitC.i"
-
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/server.bld
deleted file mode 100755
index 8fab8b0f590..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-cubitC.cpp
-	C++
-server.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp
deleted file mode 100644
index af9a8ddf22d..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// $Id$
-
-#include "server.h"
-
-Cubit_Server::Cubit_Server (void)
-  : num_of_objs_ (1),
-    use_naming_service_ (1),
-    ior_output_file_ (0)
-{
-}
-
-int
-Cubit_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:o:s");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'n': // number of cubit objects we export
-        this->num_of_objs_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_=0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           " [-o] <ior_output_file>"
-                           " [-s]"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Cubit_Server::init (int argc,
-                    char** argv,
-                    CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  if (this->orb_manager_.init_child_poa (argc,
-                                         argv,
-                                         "child_poa",
-                                         env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "init_child_poa"),
-                      -1);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // @@ Check for the return value here.
-
-  CORBA::String_var str  =
-    this->orb_manager_.activate_under_child_poa ("factory",
-                                                 &this->factory_impl_,
-                                                 env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_, "%s", str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-  if (this->use_naming_service_)
-    return this->init_naming_service (env);
-
-  return 0;
-}
-
-// Initialisation of Naming Service and register IDL_Cubit Context and
-// cubit_factory object.
-
-int
-Cubit_Server::init_naming_service (CORBA::Environment& env)
-{
-  int result;
-  CORBA::ORB_var orb;
-  PortableServer::POA_var child_poa;
-
-  orb = this->orb_manager_.orb ();
-  child_poa = this->orb_manager_.child_poa ();
-
-  result = this->my_name_server_.init (orb,
-                                       child_poa);
-  if (result < 0)
-    return result;
-  factory = this->factory_impl_._this (env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  CosNaming::Name cubit_context_name (1);
-  cubit_context_name.length (1);
-  cubit_context_name[0].id = CORBA::string_dup ("IDL_Cubit");
-  this->cubit_context_ =
-    this->my_name_server_->bind_new_context (cubit_context_name,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  //Register the cubit_factory name with the IDL_Cubit Naming
-  //Context...
-  CosNaming::Name factory_name (1);
-  factory_name.length (1);
-  factory_name[0].id = CORBA::string_dup ("cubit_factory");
-  this->cubit_context_->bind (factory_name,
-                              factory.in (),
-                              env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-  return 0;
-}
-
-int
-Cubit_Server::run (CORBA::Environment& env)
-{
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cubit_Server::run"),
-                      -1);
-  return 0;
-}
-
-Cubit_Server::~Cubit_Server (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
-  Cubit_Server cubit_server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t IDL_Cubit:SERVER \n \n"));
-  TAO_TRY
-    {
-      if (cubit_server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          cubit_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp
deleted file mode 100644
index bbea52fe83b..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ /dev/null
@@ -1,188 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\server\Release"

-# PROP BASE Intermediate_Dir ".\server\Release"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\server\Debug"

-# PROP BASE Intermediate_Dir ".\server\Debug"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubit_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.h b/TAO/tests/Cubit/TAO/IDL_Cubit/server.h
deleted file mode 100644
index f97d6b75285..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA server for the Cubit
-//      example using skeletons generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (_C_SERVER_H)
-#define _C_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "orbsvcs/CosNamingC.h"
-#include "cubit_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-class Cubit_Server
-{
-  // = TITLE
-  //   Defines a Cubit Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the cubit_server's state and then call run
-  //   to run the orb.
-public:
-
-  Cubit_Server (void);
-  // Default constructor
-
-  ~Cubit_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-	    CORBA::Environment& env);
-  // Initialize the Cubit_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb 
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  int init_naming_service (CORBA::Environment &env);
-  // Initialises the name server and registers cubit factory with the
-  // name server.
-
-  int num_of_objs_;
-  // Number of cubit objects we export.
-
-  int use_naming_service_;
-  //Flag to tell server not to use the TAO Naming Service to register
-  //the cubit factory.
-
-  FILE* ior_output_file_;
-  // File to output the cubit factory IOR.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
-  TAO_Naming_Server my_name_server_;
-  // An instance of the name server used for registering the factory
-  // objects.
-
-  Cubit_Factory_i factory_impl_;
-  // Implementation object of the cubit factory.
-       
-  Cubit_Factory_var factory;
-  // Factory_var to register with NamingService.
-
-  CosNaming::NamingContext_var cubit_context_;
-  // Naming context for the cubit_factory.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Naming context for the Naming Service.
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _C_SERVER_H */
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/tmplinst.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/tmplinst.cpp
deleted file mode 100644
index dcd4f235cb4..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/tmplinst.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "cubitC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw b/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile
deleted file mode 100644
index 2db17eadaee..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     =  -lTAO -lorbsvcs $(MATHLIB)
-
-IDL_SRC	= cubitC.cpp cubitS.cpp
-PROG_SRCS = server.cpp \
-	cubit_i.cpp \
-	Task_Client.cpp \
-	client.cpp \
-	Util_Thread.cpp \
-	tmplinst.cpp
-
-LSRC = $(IDL_SRC) $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = \
-	cubitC.o \
-	cubitS.o \
-	server.o \
-	cubit_i.o \
-	tmplinst.o
-CUBIT_CLIENT_OBJS = \
-	cubitC.o \
-	cubitS.o \
-	Task_Client.o \
-	client.o \
-	Util_Thread.o \
-	tmplinst.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-#CPPFLAGS += -DACE_NLOGGING
-
-#CXX := purify $(CXX)
-
-LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/tao/compat
-##POSTLINK += -lnk="-n -T $(VME_ROOT)/src/act/slots/act_s2.ld" 
-.PRECIOUS: cubitC.h cubitC.i cubitC.cpp cubitS.h cubitS.i cubitS.cpp
-
-server:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)  $(POSTLINK)
-## -lnk="-n -T $(VME_ROOT)/src/act/slots/act_s2.ld"
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/README b/TAO/tests/Cubit/TAO/MT_Cubit/README
deleted file mode 100644
index b6c463e94ca..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/README
+++ /dev/null
@@ -1,75 +0,0 @@
-The MT-Cubit example
---------------------
-
-Compiling
----------
-
-Makefile is provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./server -p <port_num> -h <my_hostname> -t <number_of_servants>
-
-port_num is the port number at which the server will start the first
-(and highest priority) servant. Successive servants (with successively
-lower priorities) will be created starting at (port_num+1). The -n
-parameter specifies the total number of servants.
-
-The server will print the IOR of the servants, but it is not required
-by the client.
-
-client:
--------
-
-./client [-ORBobjrefstyle url] 
-	 [-p <port_num>]
- 	 [-h <server_hostname>]
-         [-d <datatype>]
-	 [-n <num_calls>]
- 	 [-t <num_of_clients>]
-	 [-r]
-
-[-ORBobjrefstyle url]  Makes the IOR appear in URL format instead 
-   of that ugly number sequence format.
-
-<port_num> is the port number of the highest priority servant and
-   should be the same as the port_num supplied to the server, as
-   described earlier. The lower priority servant is assumed to be at
-   (port_num+1).
-
-<server_hostname> is the hostname of the server.
-
-   Based on the server_hostname and the port_num, the client
-   automatically constructs the IOR's for the servants
-
-<datatype> is one of the following:
-
-   0 Octet
-   1 Short
-   2 Long
-   3 Struct of the above 3 types
-
-<num_calls> is the number of CORBA twoway calls to be made
-
-<num_of_clients> is the total number of concurrent clients to be
-   created. The clients will have successively decreasing
-   priorities. 
-
-[-r] this option can be used to turn on the thread-per-rate tests.
-
-[-o] enables oneway calls instead of two-way calls.  The oneway call 
-   is a noop call (for now).
-
-[-x] makes the client call the shutdown() method on the servant which 
-   invokes the shutdown() method on the ORB and causes it to exit.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority clients. Jitter
-(standard deviation of the latency) is also printed by the client.
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
deleted file mode 100644
index bb7ce38b643..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ /dev/null
@@ -1,847 +0,0 @@
-// $Id$
-
-#include "Task_Client.h"
-
-Task_State::Task_State (int argc, char **argv)
-  : key_ ("Cubit"),
-    start_count_ (0),
-    loop_count_ (5),
-    thread_count_ (5),
-    datatype_ (CB_OCTET),
-    argc_ (argc),
-    argv_ (argv),
-    thread_per_rate_ (0),
-    global_jitter_array_ (0),
-    factory_ior_ (0),
-    shutdown_ (0),
-    oneway_ (0),
-    use_name_service_ (1),
-    ior_file_ (0),
-    use_sysbench_ (0)
-{
-  ACE_Get_Opt opts (argc, argv, "sn:t:d:rk:xof:y");
-  int c;
-  int datatype;
-
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'y':
-      use_sysbench_ = 1;
-      break;
-    case 's':
-      use_name_service_ = 0;
-      break;
-    case 'k':
-      factory_ior_ = ACE_OS::strdup (opts.optarg);
-      break;
-    case 'f':
-      ior_file_ = ACE_OS::strdup (opts.optarg);
-      break;
-    case 'o':
-      oneway_ = 1;
-      break;
-    case 'x':
-      shutdown_ = 1;
-      break;
-    case 'r':
-      thread_per_rate_ = 1;
-      break;
-    case 'd':
-      datatype = ACE_OS::atoi (opts.optarg);
-      switch (datatype)
-        {
-        case CB_OCTET:
-          ACE_DEBUG ((LM_DEBUG, "Testing Octets\n"));
-          datatype_ = CB_OCTET;
-          break;
-        case CB_LONG:
-          ACE_DEBUG ((LM_DEBUG, "Testing Longs\n"));
-          datatype_ = CB_LONG;
-          break;
-        case CB_STRUCT:
-          ACE_DEBUG ((LM_DEBUG, "Testing Structs\n"));
-          datatype_ = CB_STRUCT;
-          break;
-        case CB_SHORT:
-        default:
-          ACE_DEBUG ((LM_DEBUG, "Testing Shorts\n"));
-          datatype_ = CB_SHORT;
-          break;
-        }
-      continue;
-    case 'n':                   // loop count
-      loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case 't':
-      thread_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-      continue;
-    case '?':
-    default:
-      ACE_DEBUG ((LM_DEBUG, "usage:  %s"
-                  "[-d datatype Octet=0, Short=1, Long=2, Struct=3]"
-                  " [-n num_calls]"
-                  " [-t num_threads]"
-                  " [-k factory_ior_key]"
-                  " [-f ior_file]"
-                  " [-x] // makes a call to servant to shutdown"
-                  " [-o] // makes client use oneway calls instead"
-                  " [-s] // makes client *NOT* use the name service"
-                  "\n", argv [0]));
-    }
-
-  // allocate the array of character pointers.
-  ACE_NEW (iors_,
-           char *[thread_count_]);
-
-  if (ior_file_ != 0)
-    {
-      FILE *ior_file = ACE_OS::fopen (ior_file_, "r");
-      char buf[BUFSIZ];
-      int i = 0;
-      int j = 0;
-
-      while (ACE_OS::fgets (buf, BUFSIZ, ior_file) != 0)
-        {
-          j = ACE_OS::strlen (buf);
-          buf[j - 1] = 0;  // this is to delete the "\n" that was read from the file.
-          iors_[i] = ACE_OS::strdup (buf);
-          i++;
-        }
-
-      ACE_OS::fclose (ior_file);
-    }
-
-  // thread_count_ + 1 because there is one utilization thread also
-  // wanting to begin at the same time the clients begin..
-  ACE_NEW (barrier_,
-           ACE_Barrier (thread_count_ + 1));
-  ACE_NEW (latency_,
-           double [thread_count_]);
-  ACE_NEW (global_jitter_array_,
-           double *[thread_count_]);
-}
-
-Client::Client (Task_State *ts)
-  : ACE_MT (ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())),
-    ts_ (ts)
-{
-}
-
-void
-Client::put_latency (double *jitter,
-                     double latency,
-                     u_int thread_id)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, ts_->lock_));
-
-  ts_->latency_[thread_id] = latency;
-  ts_->global_jitter_array_[thread_id] = jitter;
-
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) My latency was %u\n",
-              latency));
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) My latency was %f\n",
-              latency));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-}
-
-double
-Client::get_high_priority_latency (void)
-{
-  return (double) ts_->latency_ [0];
-}
-
-double
-Client::get_low_priority_latency (void)
-{
-  double l = 0;
-
-  for (u_int i = 1; i < ts_->start_count_; i++)
-    l += (double) ts_->latency_[i];
-
-  return ts_->start_count_ > 1? l / (double) (ts_->start_count_ - 1) : 0;
-}
-
-int
-Client::get_latency (u_int thread_id)
-{
-  return ts_->latency_ [thread_id];
-}
-
-double
-Client::get_high_priority_jitter (void)
-{
-  double jitter = 0;
-  double average = get_high_priority_latency ();
-
-  // Compute the standard deviation (i.e. jitter) from the values
-  // stored in the global_jitter_array_.
-
-  // we first compute the sum of the squares of the differences
-  // each latency has from the average
-  for (u_int i = 0; i < ts_->loop_count_; i ++)
-    {
-      double difference =
-        ts_->global_jitter_array_ [0][i] - average;
-      jitter += difference * difference;
-    }
-
-  // Return the square root of the sum of the differences computed
-  // above, i.e. jitter.
-  return sqrt (jitter);
-}
-
-double
-Client::get_low_priority_jitter (void)
-{
-  double jitter = 0;
-  double average = get_low_priority_latency ();
-
-  // Compute the standard deviation (i.e. jitter) from the values
-  // stored in the global_jitter_array_.
-
-  // We first compute the sum of the squares of the differences each
-  // latency has from the average.
-  for (u_int j = 1; j < ts_->start_count_; j ++)
-    for (u_int i = 0; i < ts_->loop_count_; i ++)
-      {
-        double difference = ts_->global_jitter_array_[j][i] - average;
-        jitter += difference * difference;
-      }
-
-  // Return the square root of the sum of the differences computed
-  // above, i.e. jitter.
-  return sqrt (jitter);
-}
-
-int
-Client::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Thread created\n"));
-
-  u_int thread_id;
-  Cubit_ptr cb = 0;
-  CORBA::ORB_var orb;
-  CORBA::Object_var objref (0);
-  CORBA::Object_var naming_obj (0);
-  CORBA::Environment env;
-
-  double frequency = 0.0;
-
-  /// Add "-ORBobjrefstyle url" argument to the argv vector for the
-  //orb to / use a URL style to represent the ior.
-
-  // Convert the argv vector into a string.
-  ACE_ARGV tmp_args (ts_->argv_);
-  char tmp_buf[BUFSIZ];
-
-  ACE_OS::strcpy (tmp_buf,
-                  tmp_args.buf ());
-
-  // Add the argument.
-  ACE_OS::strcat (tmp_buf,
-                  " -ORBobjrefstyle url ");
-
-  // Convert back to argv vector style.
-  ACE_ARGV tmp_args2 (tmp_buf);
-  int argc = tmp_args2.argc ();
-
-  char *const *argv = tmp_args2.argv ();
-
-  u_int naming_success = CORBA::B_FALSE;
-
-  orb = CORBA::ORB_init (argc,
-                         argv,
-                         "internet",
-                         env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB_init()\n");
-      return -1;
-    }
-
-  if (ts_->use_name_service_ != 0)
-    {
-      naming_obj =
-        orb->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR ((LM_ERROR,
-                    " (%P|%t) Unable to resolve the Name Service.\n"));
-      else
-        this->naming_context_ =
-          CosNaming::NamingContext::_narrow (naming_obj.in (), env);
-    }
-
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, ts_->lock_, -1));
-
-    thread_id = ts_->start_count_;
-    ts_->start_count_++;
-
-    if (ts_->thread_per_rate_ == 0)
-      {
-        if (thread_id == 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im the high priority client, my id is %d.\n",
-                        thread_id));
-            frequency = CB_HIGH_PRIORITY_RATE;
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) Im a low priority client, my id is %d\n",
-                        thread_id));
-            frequency = CB_LOW_PRIORITY_RATE;
-          }
-      }
-    else
-      switch (thread_id)
-        {
-        case CB_40HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_40HZ_CONSUMER_RATE;
-          break;
-        case CB_20HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_20HZ_CONSUMER_RATE;
-          break;
-        case CB_10HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_10HZ_CONSUMER_RATE;
-          break;
-        case CB_5HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_5HZ_CONSUMER_RATE;
-          break;
-        case CB_1HZ_CONSUMER:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client, "
-                      "my id is %d.\n", thread_id));
-          frequency = CB_1HZ_CONSUMER_RATE;
-          break;
-        default:
-          ACE_DEBUG ((LM_DEBUG, "(%t) Invalid Thread ID.\n", thread_id));
-        }
-
-    TAO_TRY
-      {
-        // if the naming service was resolved successsfully ...
-        if (!CORBA::is_nil (this->naming_context_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        " (%t) ----- Using the NameService resolve() method to get cubit objects -----\n"));
-
-            // Construct the key for the name service lookup.
-            CosNaming::Name mt_cubit_context_name (1);
-            mt_cubit_context_name.length (1);
-            mt_cubit_context_name[0].id = CORBA::string_dup ("MT_Cubit");
-
-            objref =
-              this->naming_context_->resolve (mt_cubit_context_name,
-                                              TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            this->mt_cubit_context_ =
-              CosNaming::NamingContext::_narrow (objref.in (),
-                                                 TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            char *buffer;
-            int l = ACE_OS::strlen (ts_->key_) + 3;
-            ACE_NEW_RETURN (buffer,
-                            char[l],
-                            -1);
-
-            ACE_OS::sprintf (buffer,
-                             "%s%02d",
-                             (char *) ts_->key_,
-                             thread_id);
-
-            // Construct the key for the name service lookup.
-            CosNaming::Name cubit_name (1);
-            cubit_name.length (1);
-            cubit_name[0].id = CORBA::string_dup (buffer);
-
-            objref = this->mt_cubit_context_->resolve (cubit_name,
-                                                       TAO_TRY_ENV);
-
-            if (TAO_TRY_ENV.exception () != 0
-                || CORBA::is_nil (objref.in ()))
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) resolve() returned nil\n"));
-                TAO_TRY_ENV.print_exception ("Attempt to resolve() a cubit object using the name service Failed!\n");
-              }
-            else
-              {
-                naming_success = CORBA::B_TRUE;
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) Cubit object resolved to the name \"%s\".\n",
-                            buffer));
-              }
-          }
-
-        if (naming_success == CORBA::B_FALSE && ts_->factory_ior_ != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        " (%t) ----- Using the factory IOR method to get cubit objects -----\n"));
-
-            objref =
-              orb->string_to_object (ts_->factory_ior_, TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (CORBA::is_nil (objref.in ()))
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%s:  must identify non-null target objref\n",
-                                 ts_->argv_ [0]),
-                                1);
-
-            // Narrow the CORBA::Object reference to the stub object,
-            // checking the type along the way using _is_a.
-            Cubit_Factory_var cb_factory =
-              Cubit_Factory::_narrow (objref.in (),
-                                      TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (CORBA::is_nil (cb_factory.in ()))
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Create cubit factory failed\n"),
-                                1);
-
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%t) >>> Factory binding succeeded\n"));
-
-
-            char * tmp_ior = cb_factory->create_cubit (thread_id,
-                                                       TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-
-            if (tmp_ior == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "create_cubit() returned a null pointer!\n"),
-                                 -1);
-
-            char *my_ior = ACE_OS::strdup (tmp_ior);
-
-            TAO_CHECK_ENV;
-
-            objref = orb->string_to_object (my_ior,
-                                            TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-          }
-        else
-          {
-            char *my_ior = ts_->iors_[thread_id];
-
-            if (my_ior == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Must specify valid factory ior key with -k option,"
-                                 " naming service, or ior filename\n"),
-                                -1);
-
-            objref = orb->string_to_object (my_ior,
-                                            TAO_TRY_ENV);
-            TAO_CHECK_ENV;
-          }
-
-        if (CORBA::is_nil (objref.in ()))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             " (%t) string_to_object or NameService->resolve() Failed!\n"),
-                            -1);
-
-        // Narrow the CORBA::Object reference to the stub object,
-        // checking the type along the way using _is_a.
-        cb = Cubit::_narrow (objref.in (),
-                             TAO_TRY_ENV);
-        TAO_CHECK_ENV;
-
-        if (CORBA::is_nil (cb))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Create cubit failed\n"),
-                            1);
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) Binding succeeded\n"));
-
-        CORBA::String_var str =
-          orb->object_to_string (cb, TAO_TRY_ENV);
-        TAO_CHECK_ENV;
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) CUBIT OBJECT connected <%s>\n",
-                    str.in ()));
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%t) Waiting for other threads to "
-                    "finish binding..\n"));
-      }
-    TAO_CATCHANY
-      {
-        TAO_TRY_ENV.print_exception ("get_object");
-        return 1;
-      }
-    TAO_ENDTRY;
-  }
-
-  // Wait for all the client threads to be initialized before going
-  // any further.
-  ts_->barrier_->wait ();
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Everyone's done, here I go!!\n"));
-
-  if (ts_->oneway_ == 1)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%t) **** USING ONEWAY CALLS ****\n"));
-
-  // Perform the tests.
-  int result = this->run_tests (cb,
-                                ts_->loop_count_,
-                                thread_id,
-                                ts_->datatype_,
-                                frequency);
-
-  if (result == -1)
-    return -1;
-
-  if (ts_->shutdown_)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-      cb->shutdown (env);
-      if (env.exception () != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Shutdown of the server failed!\n"));
-          env.print_exception ("shutdown() call failed.\n");
-        }
-    }
-  return 0;
-}
-
-int
-Client::run_tests (Cubit_ptr cb,
-                   u_int loop_count,
-                   u_int thread_id,
-                   Cubit_Datatypes datatype,
-                   double frequency)
-{
-  CORBA::Environment env;
-  u_int i = 0;
-  u_int call_count = 0;
-  u_int error_count = 0;
-  double *my_jitter_array;
-
-  ACE_NEW_RETURN (my_jitter_array,
-                  double [loop_count],
-                  -1);
-
-  double latency = 0;
-  double sleep_time = (1 / frequency) * (1000 * 1000);
-  double delta = 0;
-
-#if defined (USE_QUANTIFY)
-  quantify_stop_recording_data();
-  quantify_clear_data ();
-#endif /* USE_QUANTIFY */
-
-  // Make the calls in a loop.
-
-  for (i = 0; i < loop_count; i++)
-    {
-      ACE_High_Res_Timer timer_;
-      ACE_Time_Value tv (0, (long int) (sleep_time - delta));
-      ACE_OS::sleep (tv);
-
-      // Elapsed time will be in microseconds.
-      ACE_Time_Value delta_t;
-
-      // use sysBench when CHORUS defined and option specified on command line
-#if defined (CHORUS)      
-      if (ts_->use_sysbench_ == 1)
-	timer_.start (ACE_OS::ACE_HRTIMER_START); 
-      else 
-#endif /* CHORUS */
-	timer_.start ();
-
-      if (ts_->oneway_ == 0)
-        {
-          switch (datatype)
-            {
-            case CB_OCTET:
-              {
-                // Cube an octet.
-                CORBA::Octet arg_octet = func (i), ret_octet = 0;
-
-#if defined (USE_QUANTIFY)
-                /* start recording quantify data from here */
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-                ret_octet = cb->cube_octet (arg_octet, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_octet()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-                arg_octet = arg_octet * arg_octet * arg_octet;
-
-                if (arg_octet != ret_octet)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_octet(%d)  (--> %d)\n",
-                                arg_octet,
-                                ret_octet));
-                    error_count++;
-                  }
-                call_count++;
-                break;
-              }
-            case CB_SHORT:
-              // Cube a short.
-              {
-                call_count++;
-
-                CORBA::Short arg_short = func (i), ret_short;
-
-#if defined (USE_QUANTIFY)
-                // start recording quantify data from here.
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_short = cb->cube_short (arg_short, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_short()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-
-                arg_short = arg_short * arg_short * arg_short;
-
-                if (arg_short != ret_short)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_short(%d)  (--> %d)\n",
-                                arg_short ,
-                                ret_short));
-                    error_count++;
-                  }
-                break;
-              }
-            // Cube a long.
-
-            case CB_LONG:
-              {
-                call_count++;
-
-                CORBA::Long arg_long = func (i);
-                CORBA::Long ret_long;
-
-#if defined (USE_QUANTIFY)
-                /* start recording quantify data from here */
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_long = cb->cube_long (arg_long, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_long()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,
-                                       "%s:Call failed\n",
-                                       env.exception ()),
-                                      2);
-                  }
-
-                arg_long = arg_long * arg_long * arg_long;
-
-                if (arg_long != ret_long)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "** cube_long(%d)  (--> %d)\n",
-                                arg_long,
-                                ret_long));
-                    error_count++;
-                  }
-                break;
-              }
-
-            case CB_STRUCT:
-              // Cube a "struct" ...
-              {
-                Cubit::Many arg_struct, ret_struct;
-
-                call_count++;
-
-                arg_struct.l = func (i);
-                arg_struct.s = func (i);
-                arg_struct.o = func (i);
-
-#if defined (USE_QUANTIFY)
-                // start recording quantify data from here.
-                quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-
-                ret_struct = cb->cube_struct (arg_struct, env);
-
-#if defined (USE_QUANTIFY)
-                quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-
-                if (env.exception () != 0)
-                  {
-                    env.print_exception ("call to cube_struct()\n");
-                    ACE_ERROR_RETURN ((LM_ERROR,"%s:Call failed\n", env.exception ()), 2);
-                  }
-
-                arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-                arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-                arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-
-                if (arg_struct.l  != ret_struct.l
-                    || arg_struct.s  != ret_struct.s
-                    || arg_struct.o  != ret_struct.o )
-                  {
-                    ACE_DEBUG ((LM_DEBUG, "**cube_struct error!\n"));
-                    error_count++;
-                  }
-
-                break;
-              }
-            default:
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%P|%t); %s:%d; unexpected datatype: %d\n",
-                                 datatype), -1);
-            }
-        }
-      else
-        {
-          call_count++;
-#if defined (USE_QUANTIFY)
-          // start recording quantify data from here.
-          quantify_start_recording_data ();
-#endif /* USE_QUANTIFY */
-          cb->noop (env);
-#if defined (USE_QUANTIFY)
-          quantify_stop_recording_data();
-#endif /* USE_QUANTIFY */
-          if (env.exception () != 0)
-            {
-              env.print_exception ("oneway call noop()\n");
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%t) noop() call failed\n"),
-                                2);
-            }
-        }
-
-      // use sysBench when CHORUS defined and option specified on command line
-#if defined (CHORUS)      
-      if (ts_->use_sysbench_ == 1)
-	timer_.stop (ACE_OS::ACE_HRTIMER_STOP); 
-      else 
-#endif /* CHORUS */
-      // if CHORUS is not defined just use plain timer_.stop ().
-      timer_.stop (); 
-
-      timer_.elapsed_time (delta_t);
-
-      double real_time = 0.0;
-
-#if !defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE) && defined (ACE_LACKS_FLOATING_POINT)
-      // Store the time in usecs.
-      real_time = delta_t.sec () * ACE_ONE_SECOND_IN_USECS  +
-        delta_t.usec ();
-
-      delta = ((40 * fabs (real_time) / 100) + (60 * delta / 100)); // pow(10,6)
-      latency += real_time;
-      my_jitter_array [i] = real_time; // in units of microseconds.
-#else
-      // Store the time in secs.
-      real_time = delta_t.sec () + (double)delta_t.usec () / ACE_ONE_SECOND_IN_USECS;
-
-      delta = ((40 * fabs (real_time * (1000 * 1000)) / 100) + (60 * delta / 100)); // pow(10,6)
-      latency += real_time;
-      my_jitter_array [i] = real_time * 1000;
-#endif /* !defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE) && defined (ACE_LACKS_FLOATING_POINT) */
-    }
-
-  if (call_count > 0)
-    {
-      if (error_count == 0)
-        {
-#if defined (ACE_LACKS_FLOATING_POINT)
-          double calls_per_second = (call_count * ACE_ONE_SECOND_IN_USECS) / latency;
-#endif /* ACE_LACKS_FLOATING_POINT */
-
-          latency /= call_count; // calc average latency
-
-          if (latency > 0)
-            {
-#if defined (ACE_LACKS_FLOATING_POINT)
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) cube average call ACE_OS::time\t= %u usec, \t"
-                          "%u calls/second\n",
-                          latency,
-                          calls_per_second));
-
-              this->put_latency (my_jitter_array, latency, thread_id);
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) cube average call ACE_OS::time\t= %f msec, \t"
-                          "%f calls/second\n",
-                          latency * 1000,
-                          1 / latency));
-              this->put_latency (my_jitter_array,
-                                 latency * 1000,
-                                 thread_id);
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-            }
-          else
-            {
-              // still we have to call this function to store a valid array pointer.
-              this->put_latency (my_jitter_array,
-                                 0,
-                                 thread_id);
-              ACE_DEBUG ((LM_DEBUG,
-                          "*** Warning: Latency is less than or equal to zero."
-                          "  Precision may have been lost.\n"));
-            }
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d calls, %d errors\n",
-                  call_count,
-                  error_count));
-    }
-
-  // cb->please_exit (env);
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.h
deleted file mode 100644
index b7ef4352b82..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Task_Client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (TASK_CLIENT_H)
-#define TASK_CLIENT_H
-
-#include <math.h>
-
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include "ace/ARGV.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "cubitC.h"
-
-// @@ Should we put this into a more general file, e.g., OS.h?
-//
-// I will integrate this, together with the sqrt() function when
-// the implementation is complete.  --Sergio.
-#if defined (ACE_LACKS_FLOATING_POINT)
-#define double ACE_UINT32
-#define fabs(X) ((X) >= 0 ? (X) : -(X))
-// the following is just temporary, until we finish the sqrt()
-// implementation.
-#define sqrt(X) (1)
-#endif /* ACE_LACKS_FLOATING_POINT */
-
-#if !defined (ACE_HAS_THREADS)
-class NOOP_ACE_Barrier
-{
-public:
-  NOOP_ACE_Barrier (int) {}
-  void wait (void) {}
-};
-#define ACE_Barrier NOOP_ACE_Barrier
-#endif /* ACE_HAS_THREADS */
-
-// Arbitrary generator used by the client to create the numbers to be
-// cubed.
-static inline int 
-func (u_int i) 
-{ 
-  return i - 117; 
-}
-
-enum Cubit_Datatypes
-{
-  // = The various datatypes the client and the server can exchange.
-  CB_OCTET,
-  CB_SHORT,
-  CB_LONG,
-  CB_STRUCT,
-
-  // = Rate constants.
-  CB_40HZ_CONSUMER = 0,
-  CB_20HZ_CONSUMER = 1,
-  CB_10HZ_CONSUMER = 2,
-  CB_5HZ_CONSUMER = 3,
-  CB_1HZ_CONSUMER = 4,
-
-  CB_40HZ_CONSUMER_RATE = 40,
-  CB_20HZ_CONSUMER_RATE = 20,
-  CB_10HZ_CONSUMER_RATE = 10,
-  CB_5HZ_CONSUMER_RATE = 5,
-  CB_1HZ_CONSUMER_RATE = 1,
-
-  CB_HIGH_PRIORITY_RATE = 20,
-  CB_LOW_PRIORITY_RATE = 10
-};
-
-class Task_State
-{
-  // = TITLE
-  //     Maintains state common to multiple Cubit clients.
-  //
-  // = DESCRIPTION
-  //     This class maintains state which is common to the potentially
-  //     multiple concurrent clients.
-public:
-  ACE_Barrier *barrier_;
-  // Barrier for the multiple clients to synchronize after binding to
-  // the servants.
-
-  Task_State (int argc, char **argv);
-  // Constructor. Takes the command line arguments, which are later
-  // passed into ORB_init.
-
-  CORBA::String key_;
-  // All cubit objects will have this as prefix to its key.
-
-  u_int start_count_;
-  // Keeps a count of the number of clients started.  This count also
-  // serves as a thread-id.  The first thread created gets an ID of 0,
-  // then 1, and so on.
-
-  u_int loop_count_;
-  // Number of times to loop, making calls.
-
-  u_int thread_count_;
-  // Number of concurrent clients to create.
-
-  double *latency_;
-  // Array to store the latency for every client, indexed by
-  // thread-id.
-
-  int *ave_latency_;
-  // Int array to store the latencies.
-
-  Cubit_Datatypes datatype_;
-  // Which datatype to use to make the calls.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Lock to protect access to this object.
-
-  // = Command line arguments.
-  int argc_;
-  char **argv_;
-
-  u_int thread_per_rate_;
-  // Flag for the thread_per_rate test.
-
-  double **global_jitter_array_;
-  // This array stores the latency seen by each client for each
-  // request, to be used later to compute jitter.
-
-  char *factory_ior_;
-  // Object reference string for the cubit factory.
-
-  u_int shutdown_;
-  // Flag that indicates if we are going to call the shutdown methos
-  // for the servant.
-
-  u_int oneway_;
-  // Flag that indicates if we are going to use oneway calls instead
-  // of two-way.
-
-  u_int use_name_service_;
-  // Flag that say if we are using the or not the name service.
-
-  char **iors_;
-  // Array of pointers used to hold the ior strings read from the ior file
-  // that the server created.
-
-  char *ior_file_;
-  // Name of the filename that the server used to store the iors.
-
-  u_int use_sysbench_;
-  // flag that  indicates that we are going to use the sysBench() call
-  // to time calls.  This only applies to the CHORUS ClassiX OS.
-};
-
-class Client : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //     The Cubit client.
-  // 
-  // = DESCRIPTION
-  //     This class implements the Cubit Client, which is an active object.
-  //     `n' threads execute svc, and make 2way CORBA calls on the server
-public:
-  Client (Task_State *ts);
-  // constructor, with a pointer to the common task state.
-
-  virtual int svc (void);
-  // The thread function.
-
-  double get_high_priority_latency (void);
-  double get_low_priority_latency (void);
-  double get_high_priority_jitter (void);
-  double get_low_priority_jitter (void);
-  int get_latency (u_int thread_id);
-  // Accessors to get the various measured quantities.
-
-private:
-  int run_tests (Cubit_ptr,
-                 u_int,
-                 u_int,
-                 Cubit_Datatypes,
-                 double frequency);
-  // Makes the calls to the servant.
-
-  void put_latency (double *jitter,
-                    double latency,
-                    u_int);
-  // Records the latencies in the <Task_State>.
-
-  int parse_args (int, char **);
-  // Parses the arguments.
-
-  Task_State *ts_;
-  // Pointer to shared state.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Object reference to the naming service.
-
-  CosNaming::NamingContext_var mt_cubit_context_;
-  // Object reference to the cubit context "MT_Cubit".
-};
-
-#endif /* !defined (TASK_CLIENT_H) */
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
deleted file mode 100644
index 409bfaa8d9c..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "Util_Thread.h"
-
-Util_Thread::Util_Thread (Task_State *ts,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_MT (ACE_Task<ACE_MT_SYNCH> (thr_mgr)),
-    done_ (0),
-    number_of_computations_ (0),
-    ts_ (ts)
-{
-}
-
-int
-Util_Thread::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Utilization Thread created, "
-              "waiting for threads to finish binding\n"));
-
-  // this barrier synchronizes the utilization thread with 
-  // the client threads
-  // i.e., the Util_thread should wait until all the 
-  // clients have finished binding, and only then
-  // start measuring the utilization. 
-  this->ts_->barrier_->wait ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) Threads have bound, "
-              "utilization test started\n"));
-
-  this->run_computations ();
-  return 0;
-}
-
-double
-Util_Thread::get_number_of_computations (void)
-{
-  return this->number_of_computations_;
-}
-
-// Perform repeated prime factor computations on an arbitrary number.
-// And you thought your life was boring... :-)
-
-int
-Util_Thread::run_computations (void)
-{
-  while (this->done_ == 0)
-    {
-      // See if this number is prime. 2 and CUBIT_ARBIT_NUMBER / 2 are
-      // the recommended values for min_factor and max_factor, as
-      // explained in ACE.h (is_prime).
-      ACE::is_prime (CUBIT_ARBIT_NUMBER,
-                     2,
-                     CUBIT_ARBIT_NUMBER / 2);
-      this->number_of_computations_ ++;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.h
deleted file mode 100644
index e1de9332dd5..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    Util_Thread.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (UTIL_THREAD_H)
-#define UTIL_THREAD_H
-
-#include "Task_Client.h"
-
-// This is the arbitrary number that the Util_Thread uses to check for
-// primality.
-const int CUBIT_ARBIT_NUMBER = 10000019;
-
-class Util_Thread : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //     The thread that computes utilization.
-public:
-  Util_Thread (Task_State *,
-               ACE_Thread_Manager *thr_mgr);
-  // Constructor.
-
-  virtual int svc (void);
-  // The thread entry point function.
-
-  double get_number_of_computations (void);
-  // Gets the number of computations the thread was able to perform.
-
-  int done_;
-  // Indicates whether we're done.
-
-private:
-  int run_computations (void);
-  // Run the computations.
-
-  double number_of_computations_;
-  // This stores the number of computations performed
-  // by the Util_Thread so far
-
-  Task_State *ts_;
-  // Pointer to the Task state. Stores the state
-  // common to the multiple client threads
-};
-
-#endif /* !defined (UTIL_THREAD_H) */
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/VCAUTO.MAK b/TAO/tests/Cubit/TAO/MT_Cubit/VCAUTO.MAK
deleted file mode 100644
index bda9bf9c2a8..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/Cubit/TAO/MT_Cubit/
-
-MAK_LIST = server client
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.MAK b/TAO/tests/Cubit/TAO/MT_Cubit/client.MAK
deleted file mode 100644
index 28c8c4f1672..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.MAK
+++ /dev/null
@@ -1,603 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on client.dsp
-!IF "$(CFG)" == ""
-CFG=client - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to client - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\client.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\Task_Client.obj"
-	-@erase "$(INTDIR)\Util_Thread.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\client.exe"
-	-@erase "cubitC.cpp"
-	-@erase "cubitC.h"
-	-@erase "cubitC.i"
-	-@erase "cubitS.cpp"
-	-@erase "cubitS.h"
-	-@erase "cubitS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D\
- "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST"\
- /Fp"$(INTDIR)\client.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=ace.lib TAO.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\client.pdb" /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\client.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\Task_Client.obj" \
-	"$(INTDIR)\Util_Thread.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\client.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\Task_Client.obj"
-	-@erase "$(INTDIR)\Util_Thread.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\client.exe"
-	-@erase "$(OUTDIR)\client.ilk"
-	-@erase "$(OUTDIR)\client.pdb"
-	-@erase "cubitC.cpp"
-	-@erase "cubitC.h"
-	-@erase "cubitC.i"
-	-@erase "cubitS.cpp"
-	-@erase "cubitS.h"
-	-@erase "cubitS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I\
- "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST"\
- /Fp"$(INTDIR)\client.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib TAO.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\client.pdb" /debug /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /pdbtype:sept /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\client.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\Task_Client.obj" \
-	"$(INTDIR)\Util_Thread.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "client - Win32 Release" || "$(CFG)" == "client - Win32 Debug"
-SOURCE=.\client.cpp
-DEP_CPP_CLIEN=\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Sched_Params.h"\
-	"..\..\..\..\..\ace\Sched_Params.i"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	".\client.h"\
-	".\Task_Client.h"\
-	".\Util_Thread.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-NODEP_CPP_CLIEN=\
-	".\cubitC.h"\
-	
-
-"$(INTDIR)\client.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)" ".\cubitC.h"
-
-
-SOURCE=.\cubit.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-InputPath=.\cubit.idl
-
-"cubitC.h"	"cubitC.i"	"cubitC.cpp"	"cubitS.h"	"cubitS.i"	"cubitS.cpp"	 : \
-$(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl cubit.idl
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-InputPath=.\cubit.idl
-
-"cubitC.h"	"cubitC.i"	"cubitC.cpp"	"cubitS.h"	"cubitS.i"	"cubitS.cpp"	 : \
-$(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl cubit.idl
-
-!ENDIF 
-
-SOURCE=.\cubitC.cpp
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\Task_Client.cpp
-DEP_CPP_TASK_=\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	".\Task_Client.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-NODEP_CPP_TASK_=\
-	".\cubitC.h"\
-	".\my_time.h"\
-	
-
-"$(INTDIR)\Task_Client.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"\
- ".\cubitC.h"
-
-
-SOURCE=.\Util_Thread.cpp
-DEP_CPP_UTIL_=\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	".\Task_Client.h"\
-	".\Util_Thread.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-NODEP_CPP_UTIL_=\
-	".\cubitC.h"\
-	
-
-"$(INTDIR)\Util_Thread.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"\
- ".\cubitC.h"
-
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp
deleted file mode 100644
index c01677c54a2..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "client.h"
-
-int
-initialize (void)
-{
-#if defined (VXWORKS)
-#if defined (VME_DRIVER)
-  STATUS status = vmeDrv ();
-  if (status != OK)
-    printf ("ERROR on call to vmeDrv()\n");
-  status = vmeDevCreate ("/vme");
-  if (status != OK)
-    printf ("ERROR on call to vmeDevCreate()\n");
-#endif /* defined (VME_DRIVER) */
-#endif /* defined (VXWORKS) */
-
-  // Make sure we've got plenty of socket handles.  This call will
-  // use the default maximum.
-  ACE::set_handle_limit ();
-
-  return 0;
-}
-
-int
-do_priority_inversion_test (Task_State &ts)
-{
-  // Create the clients.
-  Client high_priority_client (&ts);
-  Client low_priority_client (&ts);
-
-  // Create the daemon thread in its own <ACE_Thread_Manager>.
-  ACE_Thread_Manager thr_mgr;
-
-  Util_Thread util_thread (&ts, &thr_mgr);
-
-  // The minimum priority thread is the utilization thread.
-  ACE_Sched_Priority priority =
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                    ACE_SCOPE_THREAD);
-
-  // First activate the Utilization thread.  It will wait until all
-  // threads have finished binding.
-  util_thread.activate (THR_BOUND,
-                        1,
-                        0,
-                        priority);
-
-  // Now activate the high priority client.
-  priority = ACE_THR_PRI_FIFO_DEF;
-
-  if (high_priority_client.activate (THR_BOUND | ACE_SCHED_FIFO,
-                                     1,
-                                     0,
-                                     priority) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%p; priority is %d\n",
-                "activate failed",
-                priority));
-
-  u_int i;
-
-  // Drop the priority, so that the priority of clients will increase
-  // with increasing client number.
-  for (i = 0; i < ts.thread_count_; i++)
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating %d clients with low priority of %d\n",
-              ts.thread_count_ - 1,
-              priority));
-
-  for (i = 0; i < ts.thread_count_ - 1; i++)
-    {
-      // The first thread starts at the lowest priority of all the low
-      // priority clients.
-      if (low_priority_client.activate (THR_BOUND,
-                                        1,
-                                        1,
-                                        priority) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p; priority is %d\n",
-                    "activate failed",
-                    priority));
-
-      // Get the next higher priority.
-      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-						  priority,
-						  ACE_SCOPE_THREAD);
-    }
-
-  // Wait for all the threads to exit (except the utilization thread).
-  ACE_Thread_Manager::instance ()->wait ();
-#if defined (VXWORKS)
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %d usec\n"
-                  "Low priority client latency : %d usec\n",
-                  high_priority_client.get_high_priority_latency (),
-                  low_priority_client.get_low_priority_latency ());
-#elif defined (CHORUS)
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %u usec\n"
-                  "Low priority client latency : %u usec\n",
-                  high_priority_client.get_high_priority_latency (),
-                  low_priority_client.get_low_priority_latency ());
-
-  // output the latency values to a file, tab separated, to import it
-  // to Excel to calculate jitter, in the mean time we come up with
-  // the sqrt() function.
-  FILE *latency_file_handle = 0;
-  char latency_file[BUFSIZ];
-  char buffer[BUFSIZ];
-
-  sprintf (latency_file,
-	   "cb%d%s%d.txt",
-	   ACE_OS::getpid (),
-	   ts.use_sysbench_ == 1? "SB": "__",
-	   ts.thread_count_);
-  ACE_DEBUG ((LM_DEBUG,
-              "--->Output file for latency data is \"%s\"\n",
-              latency_file));
-
-  latency_file_handle = ACE_OS::fopen (latency_file, "w");
-
-  // @@ What does this loop do?
-  for (u_int j = 0; j < ts.start_count_; j ++)
-    {
-      sprintf (buffer,
-               "%s #%d",
-               j == 0 ? "High Priority": "Low Priority",
-               j);
-
-      for (u_int i = 0; i < ts.loop_count_; i ++)
-	{
-	  sprintf (buffer + ACE_OS::strlen (buffer),
-                   "\t%u\n", ts.global_jitter_array_[j][i]);
-	  ACE_OS::fputs (buffer,
-                         latency_file_handle);
-	  buffer[0] = 0;
-	}
-    }
-
-  ACE_OS::fclose (latency_file_handle);
-
-#else /* !defined (CHORUS) */
-  ACE_DEBUG ((LM_DEBUG, "Test done.\n"
-              "High priority client latency : %f msec, jitter: %f msec\n"
-              "Low priority client latency : %f msec, jitter: %f msec\n",
-              high_priority_client.get_high_priority_latency (),
-              high_priority_client.get_high_priority_jitter (),
-              low_priority_client.get_low_priority_latency (),
-              low_priority_client.get_low_priority_jitter ()));
-#endif /* !defined (VXWORKS) && !defined (CHORUS) */
-
-  // signal the utilization thread to finish with its work..
-  util_thread.done_ = 1;
-
-  // This will wait for the utilization thread to finish.
-  thr_mgr.wait ();
-
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) utilization task performed %u computations\n",
-              util_thread.get_number_of_computations ()));
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) utilization task performed %g computations\n",
-              util_thread.get_number_of_computations ()));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
-
-  return 0;
-}
-
-int
-do_thread_per_rate_test (Task_State &ts)
-{
-  // First activate the high priority client.
-    Client CB_40Hz_client (&ts);
-    Client CB_20Hz_client (&ts);
-    Client CB_10Hz_client (&ts);
-    Client CB_5Hz_client (&ts);
-    Client CB_1Hz_client (&ts);
-
-    ACE_Sched_Priority priority = ACE_THR_PRI_FIFO_DEF;
-
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 40 Hz client with priority %d\n",
-                priority));
-    if (CB_40Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 20 Hz client with priority %d\n",
-                priority));
-    if (CB_20Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 10 Hz client with priority %d\n",
-                priority));
-    if (CB_10Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 5 Hz client with priority %d\n",
-                priority));
-    if (CB_5Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-    ACE_DEBUG ((LM_DEBUG,
-                "Creating 1 Hz client with priority %d\n",
-                priority));
-    if (CB_1Hz_client.activate (THR_BOUND, 1, 0, priority) == -1)
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "activate failed"));
-
-    // Wait for all the threads to exit.
-    ACE_Thread_Manager::instance ()->wait ();
-
-    ACE_DEBUG ((LM_DEBUG,
-                "Test done.\n"
-                "40Hz client latency : %d usec\n"
-                "20Hz client latency : %d usec\n"
-                "10Hz client latency : %d usec\n"
-                "5Hz client latency : %d usec\n"
-                "1Hz client latency : %d usec\n",
-                CB_40Hz_client.get_latency (0),
-                CB_20Hz_client.get_latency (1),
-                CB_10Hz_client.get_latency (2),
-                CB_5Hz_client.get_latency (3),
-                CB_1Hz_client.get_latency (4)));
-    return 0;
-}
-
-// This is the main routine of the client, where we create a high
-// priority and a low priority client. we then activate the clients
-// with the appropriate priority threads, and wait for them to
-// finish. After they aer done, we compute the latency and jitter
-// metrics and print them.
-
-int
-main (int argc, char *argv [])
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (FORCE_ARGS)
-  int argc = 7;
-  char *argv[] = {"main",
-                  "-d",
-                  "3",   // Data Type
-                  "-t",
-                  "10",   // Thread Count
-                  "-h",
-                  "mv2604d"};  // Host name
-#endif   /* defined (FORCE_ARGS) */
-  initialize ();
-
-  Task_State ts (argc, argv);
-  if (ts.thread_per_rate_ == 0)
-    do_priority_inversion_test (ts);
-  else
-    do_thread_per_rate_test (ts);
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "Test not run.  This platform doesn't seem to have threads.\n"));
-#endif /* ACE_HAS_THREADS */
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp
deleted file mode 100644
index 1731bb35fdb..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp
+++ /dev/null
@@ -1,166 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl cubit.idl

-

-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl cubit.idl

-

-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Task_Client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Util_Thread.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.h b/TAO/tests/Cubit/TAO/MT_Cubit/client.h
deleted file mode 100644
index 064382899b4..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.h
-//
-// = AUTHOR
-//    Andy Gokhale, Brian Mendel, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "cubitC.h"
-#include "Task_Client.h"
-#include "Util_Thread.h"
-
-#if defined (VME_DRIVER)
-#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
-extern "C" STATUS vmeDevCreate (char *);
-#endif /* defined (VME_DRIVER) */
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld b/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld
deleted file mode 100644
index 8bd06f00178..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld
+++ /dev/null
@@ -1,10 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-client.cpp
-	C++
-Task_Client.cpp
-	C++
-cubitC.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/cubit.idl b/TAO/tests/Cubit/TAO/MT_Cubit/cubit.idl
deleted file mode 100644
index 5bdf1645870..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/cubit.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-interface Cubit
-{
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-
-  struct Many
-  {
-    octet o;            // + 3 bytes padding (normally) ...
-    long l;
-    short s;            // + 2 bytes padding (normally) ...
-  };
-
-  octet cube_octet (in octet o);
-  // cube an octet
-
-  short cube_short (in short s);
-  // cube a short
-
-  long cube_long (in long l);
-  // cube a long
-
-  Many cube_struct (in Many values);
-  // cube each of the members of a struct
-
-  oneway void noop ();
-  // null operation
-
-  oneway void shutdown ();
-  // shut down the application
-};
-
-interface Cubit_Factory
-{
-  // = TITLE
-  //    Creates Cubit objects.
-
-  string create_cubit (in unsigned short index);
-  // Factory method that creates an string containing the IOR of the
-  // designated Cubit object.
-};
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
deleted file mode 100644
index 573e4fe2fd6..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "cubit_i.h"
-
-Cubit_i::Cubit_i (void)
-{
-}
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &)
-{
-  return (CORBA::Octet) (o * o * o);
-}
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &)
-{
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &)
-{
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many 
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &)
-{
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-
-  return out_values;
-}
-
-void 
-Cubit_i::noop (CORBA::Environment &)
-{
-  // does nothing.
-}
-
-void Cubit_i::shutdown (CORBA::Environment &)
-{
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (CORBA::String *cubits,
-                                  u_int num_of_objs)
-  : num_of_objs_ (num_of_objs)
-{
-  ACE_NEW (my_cubit_,
-           CORBA::String[num_of_objs_]);
-
-  for (u_int i = 0; 
-       i < num_of_objs_;
-       ++i)
-      my_cubit_[i] = ACE_OS::strdup (cubits[i]);
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-}
-
-CORBA::String 
-Cubit_Factory_i::create_cubit (CORBA::UShort orb_index, 
-			       CORBA::Environment &env)
-{
-  // if out of range, return a nil string.
-  if (orb_index >= num_of_objs_)
-    {
-      env.clear ();
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%P|%t) ior returned is [%d]:<%s>\n", 
-	      orb_index, 
-	      my_cubit_[orb_index]));
-
-  return ACE_OS::strdup (my_cubit_[orb_index]);
-}
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.h
deleted file mode 100644
index 96bbd22d62d..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (_CUBIT_I_HH)
-#define _CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i : public POA_Cubit
-{
-  // = TITLE
-  //   Cubit implementation class.
-public:
-  Cubit_i (void);
-  ~Cubit_i (void);
-   
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  
-  virtual void noop (CORBA::Environment &env);
-
-  virtual void shutdown (CORBA::Environment &env);
-};
-
-class Cubit_Factory_i : public POA_Cubit_Factory
-{
-  // = TITLE
-  //   Cubit Factory implementation class.
-public:
-  Cubit_Factory_i (CORBA::String *cubits,
-                   u_int num_of_objs);
-  // Constructor.
-
-  ~Cubit_Factory_i (void);
-  // Destructor.
-  
-  virtual CORBA::String create_cubit (CORBA::UShort index, 
-				      CORBA::Environment &env); 
-  // Make the cubit object whose priority is "priority".
-
-private:
-  CORBA::String * my_cubit_;
-  // Array of cubit iors.
-
-  u_int num_of_objs_;
-  // Number of cubit objects we have ior's for.
-};
-
-#endif /* _CUBIT_I_HH */
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/default.bld b/TAO/tests/Cubit/TAO/MT_Cubit/default.bld
deleted file mode 100644
index e13ed31e337..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/default.bld
+++ /dev/null
@@ -1,33 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:object_dir=./.obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=../../../..
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../../../tao/compat
-	:sourcedirs=./client
-	:sourcedirs=./server
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
-	:libraries=vmeXport.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
-	:defines=FORCE_ARGS
-	:defines=VME_DRIVER
-clnt.bld
-	program
-svr.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.MAK b/TAO/tests/Cubit/TAO/MT_Cubit/server.MAK
deleted file mode 100644
index 14e7cc85e27..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.MAK
+++ /dev/null
@@ -1,444 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on server.dsp
-!IF "$(CFG)" == ""
-CFG=server - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to server - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\cubit_i.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\cubitS.obj"
-	-@erase "$(INTDIR)\svr.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\server.exe"
-	-@erase "cubitC.cpp"
-	-@erase "cubitC.h"
-	-@erase "cubitC.i"
-	-@erase "cubitS.cpp"
-	-@erase "cubitS.h"
-	-@erase "cubitS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D\
- "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST"\
- /Fp"$(INTDIR)\server.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=ace.lib TAO.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\server.pdb" /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\cubit_i.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\cubitS.obj" \
-	"$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "cubitS.i" "cubitS.h" "cubitS.cpp" "cubitC.i" "cubitC.h" "cubitC.cpp"\
- "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\cubit_i.obj"
-	-@erase "$(INTDIR)\cubitC.obj"
-	-@erase "$(INTDIR)\cubitS.obj"
-	-@erase "$(INTDIR)\svr.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\server.exe"
-	-@erase "$(OUTDIR)\server.ilk"
-	-@erase "$(OUTDIR)\server.pdb"
-	-@erase "cubitC.cpp"
-	-@erase "cubitC.h"
-	-@erase "cubitC.i"
-	-@erase "cubitS.cpp"
-	-@erase "cubitS.h"
-	-@erase "cubitS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I\
- "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST"\
- /Fp"$(INTDIR)\server.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib TAO.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\server.pdb" /debug /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /pdbtype:sept /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\cubit_i.obj" \
-	"$(INTDIR)\cubitC.obj" \
-	"$(INTDIR)\cubitS.obj" \
-	"$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "server - Win32 Release" || "$(CFG)" == "server - Win32 Debug"
-SOURCE=.\cubit.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-InputPath=.\cubit.idl
-
-"cubitC.h"	"cubitC.i"	"cubitC.cpp"	"cubitS.h"	"cubitS.i"	"cubitS.cpp"	 : \
-$(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl cubit.idl
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-InputPath=.\cubit.idl
-
-"cubitC.h"	"cubitC.i"	"cubitC.cpp"	"cubitS.h"	"cubitS.i"	"cubitS.cpp"	 : \
-$(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\..\..\tao_idl\tao_idl cubit.idl
-
-!ENDIF 
-
-SOURCE=.\cubit_i.cpp
-DEP_CPP_CUBIT=\
-	"..\..\..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\..\..\ace\Acceptor.h"\
-	"..\..\..\..\..\ace\Acceptor.i"\
-	"..\..\..\..\..\ace\ACE.h"\
-	"..\..\..\..\..\ace\ACE.i"\
-	"..\..\..\..\..\ace\Addr.h"\
-	"..\..\..\..\..\ace\Addr.i"\
-	"..\..\..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\..\..\ace\Basic_Types.h"\
-	"..\..\..\..\..\ace\Basic_Types.i"\
-	"..\..\..\..\..\ace\config-win32-common.h"\
-	"..\..\..\..\..\ace\config-win32.h"\
-	"..\..\..\..\..\ace\config.h"\
-	"..\..\..\..\..\ace\Connector.cpp"\
-	"..\..\..\..\..\ace\Connector.h"\
-	"..\..\..\..\..\ace\Connector.i"\
-	"..\..\..\..\..\ace\Containers.cpp"\
-	"..\..\..\..\..\ace\Containers.h"\
-	"..\..\..\..\..\ace\Containers.i"\
-	"..\..\..\..\..\ace\Dynamic.h"\
-	"..\..\..\..\..\ace\Dynamic.i"\
-	"..\..\..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\..\..\ace\Event_Handler.h"\
-	"..\..\..\..\..\ace\Event_Handler.i"\
-	"..\..\..\..\..\ace\Free_List.cpp"\
-	"..\..\..\..\..\ace\Free_List.h"\
-	"..\..\..\..\..\ace\Free_List.i"\
-	"..\..\..\..\..\ace\Get_Opt.h"\
-	"..\..\..\..\..\ace\Get_Opt.i"\
-	"..\..\..\..\..\ace\Handle_Set.h"\
-	"..\..\..\..\..\ace\Handle_Set.i"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\..\..\ace\inc_user_config.h"\
-	"..\..\..\..\..\ace\INET_Addr.h"\
-	"..\..\..\..\..\ace\INET_Addr.i"\
-	"..\..\..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\..\..\ace\iosfwd.h"\
-	"..\..\..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\..\..\ace\Log_Msg.h"\
-	"..\..\..\..\..\ace\Log_Priority.h"\
-	"..\..\..\..\..\ace\Log_Record.h"\
-	"..\..\..\..\..\ace\Log_Record.i"\
-	"..\..\..\..\..\ace\Malloc.h"\
-	"..\..\..\..\..\ace\Malloc.i"\
-	"..\..\..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\..\..\ace\Malloc_T.h"\
-	"..\..\..\..\..\ace\Malloc_T.i"\
-	"..\..\..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\..\..\ace\Managed_Object.h"\
-	"..\..\..\..\..\ace\Managed_Object.i"\
-	"..\..\..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\..\..\ace\Map_Manager.h"\
-	"..\..\..\..\..\ace\Map_Manager.i"\
-	"..\..\..\..\..\ace\Mem_Map.h"\
-	"..\..\..\..\..\ace\Mem_Map.i"\
-	"..\..\..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\..\..\ace\Message_Block.h"\
-	"..\..\..\..\..\ace\Message_Block.i"\
-	"..\..\..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\..\..\ace\Message_Queue.h"\
-	"..\..\..\..\..\ace\Message_Queue.i"\
-	"..\..\..\..\..\ace\Module.cpp"\
-	"..\..\..\..\..\ace\Module.h"\
-	"..\..\..\..\..\ace\Module.i"\
-	"..\..\..\..\..\ace\Object_Manager.h"\
-	"..\..\..\..\..\ace\Object_Manager.i"\
-	"..\..\..\..\..\ace\OS.h"\
-	"..\..\..\..\..\ace\OS.i"\
-	"..\..\..\..\..\ace\Reactor.h"\
-	"..\..\..\..\..\ace\Reactor.i"\
-	"..\..\..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\..\..\ace\Service_Config.h"\
-	"..\..\..\..\..\ace\Service_Config.i"\
-	"..\..\..\..\..\ace\Service_Object.h"\
-	"..\..\..\..\..\ace\Service_Object.i"\
-	"..\..\..\..\..\ace\Service_Repository.h"\
-	"..\..\..\..\..\ace\Service_Repository.i"\
-	"..\..\..\..\..\ace\Service_Types.h"\
-	"..\..\..\..\..\ace\Service_Types.i"\
-	"..\..\..\..\..\ace\Shared_Object.h"\
-	"..\..\..\..\..\ace\Shared_Object.i"\
-	"..\..\..\..\..\ace\Signal.h"\
-	"..\..\..\..\..\ace\Signal.i"\
-	"..\..\..\..\..\ace\Singleton.cpp"\
-	"..\..\..\..\..\ace\Singleton.h"\
-	"..\..\..\..\..\ace\Singleton.i"\
-	"..\..\..\..\..\ace\SOCK.h"\
-	"..\..\..\..\..\ace\SOCK.i"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\..\..\ace\SString.h"\
-	"..\..\..\..\..\ace\SString.i"\
-	"..\..\..\..\..\ace\Strategies.h"\
-	"..\..\..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\..\..\ace\Strategies_T.h"\
-	"..\..\..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\..\..\ace\streams.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\..\..\ace\Synch.h"\
-	"..\..\..\..\..\ace\Synch.i"\
-	"..\..\..\..\..\ace\Synch_Options.h"\
-	"..\..\..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\..\..\ace\Synch_T.h"\
-	"..\..\..\..\..\ace\Synch_T.i"\
-	"..\..\..\..\..\ace\sys_conf.h"\
-	"..\..\..\..\..\ace\Task.h"\
-	"..\..\..\..\..\ace\Task.i"\
-	"..\..\..\..\..\ace\Task_T.cpp"\
-	"..\..\..\..\..\ace\Task_T.h"\
-	"..\..\..\..\..\ace\Task_T.i"\
-	"..\..\..\..\..\ace\Thread.h"\
-	"..\..\..\..\..\ace\Thread.i"\
-	"..\..\..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\..\..\ace\Time_Value.h"\
-	"..\..\..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\..\..\ace\Trace.h"\
-	"..\..\..\..\..\ace\Version.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\..\..\ace\ws2tcpip.h"\
-	"..\..\..\..\tao\align.h"\
-	"..\..\..\..\tao\any.h"\
-	"..\..\..\..\tao\any.i"\
-	"..\..\..\..\tao\cdr.h"\
-	"..\..\..\..\tao\cdr.i"\
-	"..\..\..\..\tao\client_factory.h"\
-	"..\..\..\..\tao\compat\initguid.h"\
-	"..\..\..\..\tao\compat\objbase.h"\
-	"..\..\..\..\tao\connect.h"\
-	"..\..\..\..\tao\connect.i"\
-	"..\..\..\..\tao\corba.h"\
-	"..\..\..\..\tao\corbacom.h"\
-	"..\..\..\..\tao\corbacom.i"\
-	"..\..\..\..\tao\debug.h"\
-	"..\..\..\..\tao\default_client.h"\
-	"..\..\..\..\tao\default_client.i"\
-	"..\..\..\..\tao\default_server.h"\
-	"..\..\..\..\tao\default_server.i"\
-	"..\..\..\..\tao\except.h"\
-	"..\..\..\..\tao\giop.h"\
-	"..\..\..\..\tao\giop.i"\
-	"..\..\..\..\tao\iiopobj.h"\
-	"..\..\..\..\tao\iiopobj.i"\
-	"..\..\..\..\tao\iioporb.h"\
-	"..\..\..\..\tao\iioporb.i"\
-	"..\..\..\..\tao\marshal.h"\
-	"..\..\..\..\tao\marshal.i"\
-	"..\..\..\..\tao\nvlist.h"\
-	"..\..\..\..\tao\nvlist.i"\
-	"..\..\..\..\tao\object.h"\
-	"..\..\..\..\tao\object.i"\
-	"..\..\..\..\tao\objtable.h"\
-	"..\..\..\..\tao\optable.h"\
-	"..\..\..\..\tao\orb.h"\
-	"..\..\..\..\tao\orb_core.h"\
-	"..\..\..\..\tao\orb_core.i"\
-	"..\..\..\..\tao\orbconf.h"\
-	"..\..\..\..\tao\orbobj.h"\
-	"..\..\..\..\tao\orbobj.i"\
-	"..\..\..\..\tao\params.h"\
-	"..\..\..\..\tao\params.i"\
-	"..\..\..\..\tao\poa.h"\
-	"..\..\..\..\tao\poa.i"\
-	"..\..\..\..\tao\principa.h"\
-	"..\..\..\..\tao\request.h"\
-	"..\..\..\..\tao\sequence.h"\
-	"..\..\..\..\tao\sequence.i"\
-	"..\..\..\..\tao\sequence_T.cpp"\
-	"..\..\..\..\tao\sequence_T.h"\
-	"..\..\..\..\tao\sequence_T.i"\
-	"..\..\..\..\tao\server_factory.h"\
-	"..\..\..\..\tao\server_factory.i"\
-	"..\..\..\..\tao\singletons.h"\
-	"..\..\..\..\tao\stub.h"\
-	"..\..\..\..\tao\stub.i"\
-	"..\..\..\..\tao\svrrqst.h"\
-	"..\..\..\..\tao\typecode.h"\
-	"..\..\..\..\tao\typecode.i"\
-	".\cubit_i.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-NODEP_CPP_CUBIT=\
-	".\cubitS.h"\
-	
-
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitS.h"
-
-
-SOURCE=.\cubitC.cpp
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\cubitS.cpp
-
-"$(INTDIR)\cubitS.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\svr.cpp
-
-"$(INTDIR)\svr.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
deleted file mode 100644
index ad072424ee9..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
+++ /dev/null
@@ -1,822 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "server.h"
-
-// Global options used to configure various parameters.
-static char hostname[BUFSIZ];
-static char *ior_file = 0;
-static int base_port = ACE_DEFAULT_SERVER_PORT;
-static int num_of_objs = 1;
-static u_int use_name_service = 1;
-
-Cubit_Task::Cubit_Task (void)
-{
-  // No-op.
-}
-
-Cubit_Task::Cubit_Task (const char *args,
-                        const char *orbname,
-                        u_int num_of_objs,
-                        ACE_Barrier *barrier,
-                        u_int task_id)
-  : key_ ("Cubit"),
-    orbname_ ((char *) orbname),
-    orbargs_ ((char *) args),
-    num_of_objs_ (num_of_objs),
-    servants_ (0),
-    barrier_ (barrier),
-    servants_iors_ (0),
-    task_id_ (task_id)
-{
-}
-
-int
-Cubit_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Beginning Cubit task with args = '%s'\n",
-              orbargs_));
-  int rc = this->initialize_orb ();
-  if (rc == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ORB initialization failed.\n"),
-                      -1);
-
-  rc = this->create_servants ();
-  if (rc == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Create Servants failed.\n"),
-                      -1);
-
-  TAO_TRY
-    {
-      this->poa_manager_->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->barrier_->wait ();
-
-      // Handle requests for this object until we're killed, or one of
-      // the methods asks us to exit.
-      if (this->orb_->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "run"),
-                          -1);
-
-      // Shut down the OA.
-      this->poa_->destroy (CORBA::B_TRUE,
-                           CORBA::B_TRUE,
-                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("poa->destroy()");
-    }
-  TAO_ENDTRY;
-
-  // Need to clean up and do a CORBA::release on everything we've
-  // created!
-
-  for (u_int i = 0; i < num_of_objs_; i++)
-    delete servants_ [i];
-
-  return 0;
-}
-
-int
-Cubit_Task::initialize_orb (void)
-{
-  TAO_TRY
-    {
-      ACE_ARGV args (this->orbargs_);
-
-      int argc = args.argc ();
-      char **argv = args.argv ();
-
-      // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    this->orbname_,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the Object Adapter.
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in(),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->poa_manager_ =
-        this->root_poa_->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
-      policies.length (2);
-
-      // Id Assignment policy
-      policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Lifespan policy
-      policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      this->poa_ =
-        this->root_poa_->create_POA ("Persistent_POA",
-                                     this->poa_manager_.in (),
-                                     policies,
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && TAO_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_TRY_ENV);
-        }
-      TAO_CHECK_ENV;
-
-      if (use_name_service == 0)
-        return 0;
-
-      CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the Name Service.\n"),
-                          1);
-
-      this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-
-      // Check the environment and return 1 if exception occurred or
-      // nil pointer.
-      if (TAO_TRY_ENV.exception () != 0 ||
-          CORBA::is_nil (this->naming_context_.in ())==CORBA::B_TRUE )
-        return 1;
-
-      // Register the servant with the Naming Context....
-      CosNaming::Name cubit_context_name (1);
-      cubit_context_name.length (1);
-      cubit_context_name[0].id =
-        CORBA::string_dup ("MT_Cubit");
-
-      TAO_TRY_ENV.clear ();
-      CORBA::Object_var objref =
-        this->naming_context_->bind_new_context (cubit_context_name,
-                                                 TAO_TRY_ENV);
-
-      if (TAO_TRY_ENV.exception() != 0)
-        {
-          CosNaming::NamingContext::AlreadyBound_ptr ex =
-            CosNaming::NamingContext::AlreadyBound::_narrow (TAO_TRY_ENV.exception());
-          if (ex != 0)
-            {
-              TAO_TRY_ENV.clear ();
-              objref = this->naming_context_->resolve (cubit_context_name,
-                                                       TAO_TRY_ENV);
-              printf("NamingContext::AlreadyBound\n");
-            }
-          else
-            TAO_TRY_ENV.print_exception ("bind() Cubit context object\n");
-        }
-      TAO_CHECK_ENV;
-
-      this->mt_cubit_context_ =
-        CosNaming::NamingContext::_narrow (objref.in (),
-                                           TAO_TRY_ENV);
-
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("orb_init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-CORBA::String
-Cubit_Task::get_servant_ior (u_int index)
-{
-  if (index >= num_of_objs_)
-    return 0;
-
-  return ACE_OS::strdup (this->servants_iors_[index]);
-}
-
-int
-Cubit_Task::create_servants ()
-{
-  TAO_TRY
-    {
-      // Create the array of cubit implementations.
-      ACE_NEW_RETURN (this->servants_,
-                      Cubit_i *[this->num_of_objs_],
-                      -1);
-
-      // Create the array of strings.
-      ACE_NEW_RETURN (this->servants_iors_,
-                      CORBA::String [this->num_of_objs_],
-                      -1);
-
-      char *buffer;
-      int l = ACE_OS::strlen (this->key_) + 3;
-
-      ACE_NEW_RETURN (buffer,
-                      char[l],
-                      -1);
-
-      // This loop creates multiple servants, and prints out their
-      // IORs.
-      for (u_int i = 0;
-           i < this->num_of_objs_;
-           i++)
-        {
-          ACE_OS::sprintf (buffer,
-                           "%s%02d",
-                           (char *) this->key_,
-                           this->task_id_);
-
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId (buffer);
-
-          ACE_NEW_RETURN (this->servants_[i],
-                          Cubit_i,
-                          -1);
-
-          if (this->servants_[i] == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               " (%P|%t) Unable to create "
-                               "implementation object #%d\n",
-                               i),
-                              2);
-
-          this->poa_->activate_object_with_id (id.in (),
-                                               this->servants_[i],
-                                               TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          // Stringify the objref we'll be implementing, and print it
-          // to stdout.  Someone will take that string and give it to
-          // some client.  Then release the object.
-
-          Cubit_var cubit =
-            this->servants_[i]->_this (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          CORBA::String_var str =
-            this->orb_->object_to_string (cubit.in (),
-                                          TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          this->servants_iors_[i] = ACE_OS::strdup (str.in ());
-
-          // Register the servant with the Naming Context....
-          CosNaming::Name cubit_name (1);
-          cubit_name.length (1);
-          cubit_name[0].id =
-            CORBA::string_dup (buffer);
-
-          if (CORBA::is_nil (this->mt_cubit_context_.in ()) == CORBA::B_FALSE)
-            {
-              this->mt_cubit_context_->bind (cubit_name,
-                                             cubit.in (),
-                                             TAO_TRY_ENV);
-              if (TAO_TRY_ENV.exception () != 0)
-                TAO_TRY_ENV.print_exception ("Attempt to bind() a cubit object to the name service Failed!\n");
-              else
-                ACE_DEBUG ((LM_DEBUG,
-                            " (%t) Cubit object bound to the name \"%s\".\n",
-                            buffer));
-            }
-
-          ACE_DEBUG ((LM_DEBUG,
-                      " (%t) Object <%s> created\n",
-                      this->servants_iors_[i]));
-        }
-      delete [] buffer;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("print IOR");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-Cubit_Factory_Task::Cubit_Factory_Task (void)
-{
-  // No-op.
-}
-
-Cubit_Factory_Task::Cubit_Factory_Task (const char *args,
-                                        const char *orbname,
-                                        CORBA::String * cubits,
-                                        u_int num_of_objs)
-  : orbname_ ((char *) orbname),
-    orbargs_ ((char *) args),
-    cubits_ (cubits),
-    cubit_factory_ (0),
-    num_of_objs_ (num_of_objs)
-{
-}
-
-int
-Cubit_Factory_Task::create_factory (void)
-{
-  TAO_TRY
-    {
-      // Create implementation object with user specified key.
-      ACE_NEW_RETURN (this->cubit_factory_,
-                      Cubit_Factory_i (cubits_, num_of_objs_),
-                      -1);
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("Cubit_Factory");
-
-      this->poa_->activate_object_with_id (id.in (),
-                                           this->cubit_factory_,
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-          // Stringify the objref we'll be implementing, and print it
-          // to stdout.  Someone will take that string and give it to
-          // some client.  Then release the object.
-
-      Cubit_Factory_var cubit_factory =
-        this->cubit_factory_->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        this->orb_->object_to_string (cubit_factory.in (),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ">>> (%P|%t) Cubit Factory Object created with IOR <%s>\n",
-                  str.in ()));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("print IOR");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-int
-Cubit_Factory_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ">>> (%P|%t) Beginning Cubit Factory task with args = '%s'\n",
-              orbargs_));
-
-  // @@ This should be replaced with the TAO_ORB_Manager...
-  this->initialize_orb ();
-  this->create_factory ();
-
-  TAO_TRY
-    {
-      this->poa_manager_->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Handle requests for this object until we're killed, or one of
-      // the methods asks us to exit.
-      if (this->orb_->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "run"),
-                          -1);
-
-      // Shut down the OA.
-      this->poa_->destroy (CORBA::B_TRUE,
-                           CORBA::B_TRUE,
-                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("poa->destroy()");
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-Cubit_Factory_Task::initialize_orb (void)
-{
-  TAO_TRY
-    {
-      ACE_ARGV args (this->orbargs_);
-
-      int argc = args.argc ();
-      char **argv = args.argv ();
-
-      // Initialize the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    this->orbname_,
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the Object Adapter
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in(),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->poa_manager_ =
-        this->root_poa_->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
-      policies.length (2);
-
-      // Id Assignment policy
-      policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Lifespan policy
-      policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      this->poa_ =
-        this->root_poa_->create_POA ("Persistent_POA",
-                                     this->poa_manager_.in (),
-                                     policies,
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && TAO_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_TRY_ENV);
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("orb_init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-// @@ This method should be integrated into one of the classes
-// (preferably into an Options singleton) rather than kept as a
-// stand-alone function.
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt opts (argc, argv, "sh:p:t:f:");
-  int c;
-
-  if (ACE_OS::hostname (hostname, BUFSIZ) != 0)
-    {
-      perror ("gethostname");
-      return -1;
-    }
-
-  while ((c = opts ()) != -1)
-    switch (c)
-      {
-      case 's':
-        use_name_service = 0;
-        break;
-      case 'f':
-        ior_file = opts.optarg;
-        break;
-      case 'h':
-        ACE_OS::strcpy (hostname, opts.optarg);
-        ACE_DEBUG ((LM_DEBUG, "h\n"));
-        break;
-      case 'p':
-        base_port = ACE_OS::atoi (opts.optarg);
-        ACE_DEBUG ((LM_DEBUG, "p\n"));
-        break;
-      case 't':
-        num_of_objs = ACE_OS::atoi (opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-s Means NOT to use the name service] "
-                           " [-p <port>]"
-                           " [-h <my_hostname>]"
-                           " [-t <num_objects>]"
-                           " [-f <ior_file>]"
-                           "\n", argv [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line
-  return 0;
-}
-
-// @@ This method should be integrated into one of the classes rather
-// than kept as a stand-alone function.
-
-static int
-initialize (int argc, char **argv)
-{
-#if defined (VXWORKS)
-   hostAdd ("mv2604e", "130.38.183.178");
-#if defined (VME_DRIVER)
-   STATUS status = vmeDrv ();
-
-   if (status != OK)
-     printf ("ERROR on call to vmeDrv()\n");
-
-   status = vmeDevCreate ("/vme");
-
-   if (status != OK)
-     printf ("ERROR on call to vmeDevCreate()\n");
-#endif /* defined (VME_DRIVER) */
-
-#if defined (FORCE_ARGS)
-   int argc = 5;
-   char *argv[] = { "main",
-                    "-p",
-                    "10014",
-                    "-h",
-                    "130.38.183.132" };
-
-#endif /* defined (FORCE_ARGS) */
-#endif /* defined (VXWORKS) */
-
-   // Standard command line parsing utilities used.
-   if (parse_args (argc, argv) != 0) return 1;
-
-   if (hostname == 0 || base_port == 0)
-     ACE_ERROR_RETURN ((LM_ERROR,
-                        "usage:  %s"
-                        " [-s Means NOT to use the name service] "
-                        " [-p port]"
-                        " [-h my_hostname]"
-                        " [-t num_objects]"
-                        " [-f <ior_file>]"
-                        "\n", argv [0]),
-                       1);
-
-   // Make sure we've got plenty of socket handles.  This call will use
-   // the default maximum.
-   ACE::set_handle_limit ();
-
-   return 0;
-}
-
-// Starts up the servants
-
-// @@ This method should be integrated into one of the classes rather
-// than kept as a stand-alone function.
-
-static int
-start_servants (void)
-{
-  char *args1;
-
-  ACE_NEW_RETURN (args1,
-                  char[BUFSIZ],
-                  -1);
-  int i;
-
-  // Barrier for the multiple clients to synchronize after binding to
-  // the servants.
-  ACE_Barrier barrier_ (num_of_objs + 1);
-
-  // Create an array to hold pointers to the Cubit objects.
-  CORBA::String *cubits;
-
-  ACE_NEW_RETURN (cubits,
-                  CORBA::String [num_of_objs],
-                  -1);
-
-  ACE_OS::sprintf (args1,
-                   "rate20 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port,
-                   hostname);
-
-  Cubit_Task *high_priority_task;
-
-  ACE_NEW_RETURN (high_priority_task,
-                  Cubit_Task (args1,
-                              "internet",
-                              1,
-                              &barrier_,
-                              0), //task id 0.
-                  -1);
-
-  ACE_Sched_Priority priority = ACE_THR_PRI_FIFO_DEF;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating servant with high priority %d\n", priority));
-
-  // Make the high priority task an active object.
-  if (high_priority_task->activate (THR_BOUND | ACE_SCHED_FIFO,
-                                    1,
-                                    0,
-                                    priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                  "high_priority_task->activate"));
-    }
-
-  // Create an array to hold pointers to the low priority tasks.
-  Cubit_Task **low_priority_task;
-
-  ACE_NEW_RETURN (low_priority_task,
-                  Cubit_Task *[num_of_objs],
-                  -1);
-
-  // Drop the priority, so that the priority of clients will increase
-  // with increasing client number.
-  for (i = 0; i < num_of_objs; i++)
-    priority = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
-                                                    priority,
-                                                    ACE_SCOPE_THREAD);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Creating %d servants with low priority\n",
-              num_of_objs - 1));
-
-  // Create the low priority servants.
-
-  for (i = 0; i < num_of_objs - 1; i++)
-    {
-      char *args;
-
-      ACE_NEW_RETURN (args,
-                      char [BUFSIZ],
-                      -1);
-
-      ACE_OS::sprintf (args,
-                       "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                       base_port + 1 + i,
-                       hostname);
-
-      ACE_NEW_RETURN (low_priority_task [i],
-                      Cubit_Task (args, "internet", 1, &barrier_, i+1),
-                      -1);
-
-      // Make the low priority task an active object.
-    if (low_priority_task [i]->activate (THR_BOUND | ACE_SCHED_FIFO,
-                                       1,
-                                       0,
-                                       priority) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                    "low_priority_task[i]->activate"));
-      }
-
-      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority,
-                                                  ACE_SCOPE_THREAD);
-    }
-
-  char *args;
-
-  ACE_NEW_RETURN (args,
-                  char [BUFSIZ],
-                  -1);
-
-  ACE_OS::sprintf (args,
-                   "rate10 -ORBport %d -ORBhost %s -ORBobjrefstyle URL ",
-                   base_port + num_of_objs,
-                   hostname);
-
-  Cubit_Factory_Task * factory_task;
-
-  barrier_.wait ();
-
-  cubits[0] = high_priority_task->get_servant_ior (0);
-
-  for (i = 0; i < num_of_objs-1; ++i)
-    cubits[i + 1] = low_priority_task[i]->get_servant_ior (0);
-
-  FILE *ior_f = 0;
-
-  if (ior_file != 0)
-    ior_f = ACE_OS::fopen (ior_file, "w");
-
-  for (i = 0; i < num_of_objs; ++i)
-    {
-      if (ior_f != 0)
-        {
-          ACE_OS::fprintf (ior_f, "%s\n", cubits[i]);
-        }
-      ACE_OS::printf ("cubits[%d] ior = %s\n",
-                      i,
-                      cubits[i]);
-    }
-
-  if (ior_f != 0)
-    ACE_OS::fclose (ior_f);
-
-  ACE_NEW_RETURN (factory_task,
-                  Cubit_Factory_Task (args, "internet", cubits, num_of_objs),
-                  -1);
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_THREAD);
-
-  //  Make the factory low priority task an active object.
-  if (factory_task->activate (THR_BOUND | ACE_SCHED_FIFO,
-                          1,
-                          0,
-                          priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "(%P|%t; %p\n",
-                  "factory_task->activate"));
-    }
-
-  return 0;
-}
-
-// main routine.
-
-int
-main (int argc, char *argv[])
-{
-#if defined (ACE_HAS_THREADS)
-  if (initialize (argc, argv) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error in Initialization\n"),
-                      1);
-  if (start_servants () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error creating the servants\n"),
-                      1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Wait for all the threads to exit\n"));
-
-  // Wait for all the threads to exit.
-  ACE_Thread_Manager::instance ()->wait ();
-#else
-  ACE_DEBUG ((LM_DEBUG,
-              "Test not run.  This platform doesn't seem to have threads.\n"));
-#endif /* ACE_HAS_THREADS */
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp
deleted file mode 100644
index 7e2fb67e084..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp
+++ /dev/null
@@ -1,162 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAO.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl cubit.idl

-

-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl cubit.idl

-

-"cubitC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"cubitS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.h b/TAO/tests/Cubit/TAO/MT_Cubit/server.h
deleted file mode 100644
index 0c5f0b29f28..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    server.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-// ACE includes.
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "ace/ARGV.h"
-#include "ace/Sched_Params.h"
-#include "orbsvcs/CosNamingC.h"
-
-// TAO includes.
-#include "tao/corba.h"
-
-// MT Cubit application includes.
-#include "cubit_i.h"
-
-#if defined (VME_DRIVER)
-#include <hostLib.h>
-extern "C" STATUS vmeDrv (void);
-extern "C" STATUS vmeDevCreate (char *);
-#endif /* VME_DRIVER */
-
-#if !defined (ACE_HAS_THREADS)
-class NOOP_ACE_Barrier
-{
-public:
-  NOOP_ACE_Barrier (int ) {}
-  void wait (void) {}
-};
-#define ACE_Barrier NOOP_ACE_Barrier
-#endif /* ACE_HAS_THREADS */
-
-class Cubit_Task : public ACE_Task<ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //    Encapsulates an ORB for the Cubit application.
- public:
-  Cubit_Task (const char *args,
-              const char* orbname,
-              u_int num_of_objs,
-	      ACE_Barrier *barrier,
-	      u_int task_id);
-  // Constructor.
-  
-  virtual int svc (void);
-  // Active Object entry point.
-
-  CORBA::String get_servant_ior (u_int index);
-  
-protected:
-  Cubit_Task (void);
-  // No-op constructor.
-
-private:
-  int initialize_orb (void);
-  // Initialize the ORB, and POA.
-
-  int create_servants (void);
-  // Create the servants
-
-  CORBA::String key_;
-  // All cubit objects will have this as prefix to its key.
-
-  char *orbname_;
-  // Name of the ORB.
-
-  char *orbargs_;
-  // ORB arguments.
-
-  u_int num_of_objs_;
-  // Number of objects we're managing.
-
-  CORBA::ORB_var orb_;
-  // Pointer to the ORB
-
-  PortableServer::POA_var root_poa_;
-  // Pointer to the Root POA
-
-  PortableServer::POA_var poa_;
-  // Pointer to the child POA used on the application.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA Manager for both the root POA and the child POA.
-
-  Cubit_i **servants_;
-  // Array to hold the servants
-
-  ACE_Barrier *barrier_;
-  // Barrier for the multiple servants to synchronize after
-  // binding to the orb.
-
-  CORBA::String *servants_iors_;
-  // ior strings of the servants
-
-  CosNaming::NamingContext_var naming_context_;
-  // Object reference to the naming service
-
-  u_int task_id_;
-  // id used for naming service object name.
-
-  CosNaming::NamingContext_var mt_cubit_context_;
-  // context where all MT Cubit objects will be created.
-};
-
-class Cubit_Factory_Task : public ACE_Task<ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //    Encapsulates an ORB for the Cubit Factory application.
-public:
-  Cubit_Factory_Task (const char *args,
-		      const char* orbname,
-		      CORBA::String * cubits,
-		      u_int num_of_objs);
-  // Constructor.
-
-  virtual int svc (void);
-  // Active Object entry point.
-
-protected:
-  Cubit_Factory_Task (void);
-  // No-op constructor.
-
-private:
-  int initialize_orb (void);
-  // Initialize the ORB, and POA.
-
-  int create_factory (void);
-  // activates the factory in the poa.
-
-  char *orbname_;
-  // Name of the ORB.
-
-  char *orbargs_;
-  // ORB arguments.
-
-  CORBA::ORB_var orb_;
-  // Pointer to the ORB
-
-  PortableServer::POA_var root_poa_;
-  // Pointer to the Root POA
-
-  PortableServer::POA_var poa_;
-  // Pointer to the child POA used on the application.
-
-  PortableServer::POAManager_var poa_manager_;
-  // The POA Manager for both the root POA and the child POA.
-
-  CORBA::String *cubits_;
-  // Array of cubit ior strings
-  
-  Cubit_Factory_i *cubit_factory_;
-  // cubit factory object
-
-  u_int num_of_objs_;
-  // number of cubit objects we have ior's for.
-};
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/tests/Cubit/TAO/MT_Cubit/svc.conf
deleted file mode 100644
index 284c327aa0a..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() ""
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld b/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld
deleted file mode 100644
index 94b68d515c4..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-svr.cpp
-	C++
-cubitC.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/tmplinst.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/tmplinst.cpp
deleted file mode 100644
index dcd4f235cb4..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/tmplinst.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "cubitC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/Cubit/TAO/Makefile b/TAO/tests/Cubit/TAO/Makefile
deleted file mode 100644
index 66b7272553a..00000000000
--- a/TAO/tests/Cubit/TAO/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for the TAO tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = IDL_Cubit \
-	MT_Cubit
-
-# These are disabled by default...
-# Orbix \
-# VisiBroker
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/TAO/README b/TAO/tests/Cubit/TAO/README
deleted file mode 100644
index 61da08408de..00000000000
--- a/TAO/tests/Cubit/TAO/README
+++ /dev/null
@@ -1,20 +0,0 @@
-There are three versions of the Cubit example. Individual README files
-in the respective directories explain these versions in further
-detail.
-
-        . IDL_Cubit
-
-                 Cubit example with tao_idl compiler generated stubs
-                 and skeletons
-
-        . MT_Cubit 
-
-		 Multithreaded real-time Cubit example.
-
-        . DII_Cubit
-                
-                 Cubit example with hand-generated stubs.  When
-                 TAO supports the DII interface this will
-                 illustrate how it works.
-
-
diff --git a/TAO/tests/Cubit/TAO/VCAUTO.MAK b/TAO/tests/Cubit/TAO/VCAUTO.MAK
deleted file mode 100644
index 5465bf9d044..00000000000
--- a/TAO/tests/Cubit/TAO/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/Cubit/TAO/
-
-DIR_LIST = IDL_Cubit.dir MT_Cubit.dir
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tests/Cubit/VCAUTO.MAK b/TAO/tests/Cubit/VCAUTO.MAK
deleted file mode 100644
index 8f68612bfaa..00000000000
--- a/TAO/tests/Cubit/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/Cubit/
-
-DIR_LIST = TAO.dir
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Makefile b/TAO/tests/Cubit/VisiBroker/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl b/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp b/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h b/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/server.cpp b/TAO/tests/Cubit/VisiBroker/base_server/server.cpp
deleted file mode 100644
index ed74dbf458a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// **************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-// ****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/stdmk b/TAO/tests/Cubit/VisiBroker/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/tests/Cubit/VisiBroker/client/Makefile b/TAO/tests/Cubit/VisiBroker/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/tests/Cubit/VisiBroker/client/client.cpp b/TAO/tests/Cubit/VisiBroker/client/client.cpp
deleted file mode 100644
index ccfa9b15696..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/client.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  Profile_Timer pt;
-  Elapsed_Time et;
-
-  //
-  // Cube an octet.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube octet average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-    
-  
-  //
-  // Cube a short.
-  //
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube short average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a long.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube long average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-
-  //
-  // Cube a "struct" ...
-  //
-  Cubit::Many	arg_struct, ret_struct;
-      
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      try {
-        ret_struct = cb->cube_struct (arg_struct);
-
-      } catch (const CORBA::Exception &sysEx) {
-        cerr << "Call failed: " << endl;
-        cerr << sysEx;
-        error_count++;
-      } catch (...) {
-        cerr << "Unexpected exception" << endl;
-        error_count++;
-      }       
-
-
-      arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-      arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-      arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-      if (arg_struct.l  != ret_struct.l 
-          || arg_struct.s  != ret_struct.s 
-          || arg_struct.o  != ret_struct.o )
-        {
-          cerr << "** cube_struct ERROR\n";
-          error_count++;
-        }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube struuct average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/tests/Cubit/VisiBroker/client/cubit.idl b/TAO/tests/Cubit/VisiBroker/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/VisiBroker/client/stdmk b/TAO/tests/Cubit/VisiBroker/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/tests/Cubit/results/Orbix b/TAO/tests/Cubit/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/tests/Cubit/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/tests/Cubit/results/TAO b/TAO/tests/Cubit/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/tests/Cubit/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/tests/Cubit/results/Visibroker b/TAO/tests/Cubit/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/tests/Cubit/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/tests/Cubit/results/orbs.xls b/TAO/tests/Cubit/results/orbs.xls
deleted file mode 100644
index 53a7948d182..00000000000
--- a/TAO/tests/Cubit/results/orbs.xls
+++ /dev/null
diff --git a/TAO/tests/Demux_Test/CodeGen/Makefile b/TAO/tests/Demux_Test/CodeGen/Makefile
deleted file mode 100644
index 8892815b4f4..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/Makefile
+++ /dev/null
@@ -1,316 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile to compile the Demux application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN 	= tao
-LIB     = libtao.a
-SHLIB   = libtao.$(SOEXT)
-
-FILES   = tao \
-	  gen \
-	  client \
-	  stub \
-	  skel \
-	  impl \
-	  perf \
-	  objcreate
-
-LSRC    = $(addsuffix .cpp,$(FILES)) 
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-LDLIBS  = -ltao
-LIBS    = -lACE
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#BUILD   = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
-BUILD   = $(VSHLIB) $(SHLIBA) $(VBIN)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include         $(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-# 	Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-CPPFLAGS   += -DDEBUG
-
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/tao.o .shobj/tao.so: tao.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/gen.o .shobj/gen.so: gen.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/client.o .shobj/client.so: client.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/stub.o .shobj/stub.so: stub.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/skel.o .shobj/skel.so: skel.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/impl.o .shobj/impl.so: impl.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/perf.o .shobj/perf.so: perf.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/objcreate.o .shobj/objcreate.so: objcreate.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/streams.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Demux_Test/CodeGen/README b/TAO/tests/Demux_Test/CodeGen/README
deleted file mode 100644
index 13fcae3c48f..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains a code generator that will generate stubs and
-skeletons for an interface called "tao_demux". The number of
-operations in this interface is controlled by the -m option to the
-executable "tao".
-
-Usage:
-
-tao -o <num of objs> -m < num of operations>
-
-The stubs and skeletons are for 2-way calls. The operation names and
-object keys are automatically generated and have arbitrary string
-names. 
\ No newline at end of file
diff --git a/TAO/tests/Demux_Test/CodeGen/client.cpp b/TAO/tests/Demux_Test/CodeGen/client.cpp
deleted file mode 100644
index 9260285ce37..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/client.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "tao.h"
-
-
-// Generate the client side include file "client.i". This file has a table of
-// function pointers to the the different operations of the
-// interface. Depending on the strategy chosen, we make appropriate calls
-
-long GenClientCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream client_incl;
-  int i;
-  ACE_CString *str;
-
-  client_incl.open("client.i", ios::out);
-
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    client_incl << "void " << str->rep() << "(tao_demux_ptr obj)" << endl;
-    client_incl << "{" << endl;
-    client_incl << "\tCORBA_Environment env;" << endl << endl;
-    client_incl << "\tobj->" << str->rep() << "(env);" << endl;
-    client_incl << "}" << endl;
-  }
-  client_incl << endl;
-  client_incl << "static const method_db mtbl[] = {" << endl;
-  for (i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    client_incl << "\t" << str->rep() << "," << endl;
-  }
-  client_incl << "};" << endl << endl;
-  client_incl.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/gen.cpp b/TAO/tests/Demux_Test/CodeGen/gen.cpp
deleted file mode 100644
index ecc4fd5ce5a..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/gen.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "tao.h"
-
-static long GenDistinctString(ACE_Unbounded_Queue<ACE_CString> &, int);
-static long GenRand(int, int);
-static long IsPresent(ACE_Unbounded_Queue<ACE_CString> &, int, ACE_CString &);
-static ACE_CString	CreateString(long);
-static char	GetVarChar(int);
-
-// object table generator
-long GenObjectTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i,j,k;	// indices
-  long	rnd;	// random number
-  int opt;
-  fstream arrfp;
-  ACE_CString *str;
-
-
-  // Generate "limit" distinct strings
-  for (i=0; i < limit; i++)
-    {
-      if (GenDistinctString(arr, i) == -1) // side effect: inserts a new string
-	 return -1;                        // at locn i in array "arr" 
-    }
-	
-  // write the strings into a file whose format will be understood by GPERF
-  arrfp.open("gperf_objects.dat",ios::out);
-  
-  arrfp << "struct object_db {" << endl;
-  arrfp << "\tchar *name; // name of method" << endl;
-  arrfp << "\tCORBA_Object_ptr obj; //fn pointer to obj impl" << endl;
-  arrfp << "};" << endl;
-  arrfp << "%%" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  // error
-	  return -1;
-	}
-      arrfp << str->rep() << ", " << "0" << endl;
-      // we do not know the addresses of the objects. We shall insert them
-      // later. 
-    }
-  arrfp.close();
-  return 0;
-}
-
-// method table generator
-long GenMethodTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i,j,k;	// indices
-  long	rnd;	// random number
-  int opt;
-  fstream arrfp;
-  ACE_CString *str;
-
-
-  // Generate "limit" distinct strings
-  for (i=0; i < limit; i++){
-    if (GenDistinctString(arr, i) == -1) // side effect: inserts a new string at locn i
-	return -1;			 // in array "arr" 
-  }
-	
-  // write the strings into a file whose format will be understood by GPERF
-  arrfp.open("gperf_methods.dat",ios::out);
-  
-  arrfp << "struct method_db {" << endl;
-  arrfp << "\tchar *name; // name of method" << endl;
-  arrfp << "\tTAO_Skeleton skel_ptr; //fn pointer to skeleton" << endl;
-  arrfp << "};" << endl;
-  arrfp << "%%" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  // error
-	  return -1;
-	}
-      arrfp << (str->rep()) << ", " << "_skel_tao_demux::" <<  str->rep() <<
-	"_skel" << endl;
-    }
-  arrfp.close();
-  return 0;
-}
-
-
-// generate a distinct string and insert it at location "limit"
-long GenDistinctString(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i, j;	// indices
-  long rnd;
-  ACE_CString s;
-  long status;
-
-  rnd = GenRand(3,32); // get a random number between 3 and 32 which will be
-  // used as a string length of the distinct string to be
-  // generated. We use 3-32 because certain function
-  // names such as _N, _C cause name conflicts.
-  // Continue generating strings until a distinct one not generated before
-  // is formed
-  do {
-    s = CreateString(rnd);
-    status = IsPresent (arr, limit, s);
-    if (status == -1)
-      return -1;
-  } while (status > 0);
-
-  // save it at this location
-  if (arr.enqueue_tail(s) == -1)
-    {
-      return -1;
-    }  
-  return 0;
-}
-
-// generate a random number in the given limits
-long GenRand(int low, int up)
-{
-  return (lrand48() % (up-low+1)) + low; // rnd will be the size of the 
-}
-
-// check if the given string is present in the array
-long IsPresent(ACE_Unbounded_Queue<ACE_CString> &arr, int limit, ACE_CString &s)
-{
-  ACE_CString *str;
-
-  if (!strcasecmp(s.rep(), "_is_a"))
-    return 1;
-
-  for (int i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    if (!strcasecmp(str->rep(), s.rep()))
-      return 1;  // they are same
-  }
-  return 0; 	// not present
-}
-
-// create a string of length = len
-ACE_CString	CreateString(long len)
-{
-  int i;
-  ACE_CString s;
-  char ch;
-
-  for (i=0; i < len; i++){
-    ch = GetVarChar(i);
-    s += ACE_CString(&ch);
-  }
-  return s;
-}
-
-// Generate a valid character for a C++ variable
-char GetVarChar(int i)
-{
-  // for i == 0, we cannot return a digit as the first character
-  char ch;
-  while(1) {
-    ch = GenRand(48, 122);
-    if (isdigit(ch) || isupper(ch) || islower(ch) || (ch == '_')){
-      if ((i == 0) && (isdigit(ch) || (ch == '_')))
-	continue;
-      break;	//otherwise
-    }
-  }
-  return ch;
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/impl.cpp b/TAO/tests/Demux_Test/CodeGen/impl.cpp
deleted file mode 100644
index 6b3c7551558..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/impl.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "tao.h"
-
-// generate the implementation header
-long GenServantHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // generate the implementation class
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demux_i.h", ios::out);
-
-  hdr << "#if !defined(TAO_DEMUX_I_H)" << endl;
-  hdr << "#define TAO_DEMUX_I_H" << endl << endl;
-
-  hdr << "#include \"tao_demuxS.h\"" << endl << endl;
-
-  hdr << "class tao_demux_i: public virtual _skel_tao_demux" << endl;
-  hdr << "{" << endl;
-  hdr << "public:" << endl;
-  hdr << "\ttao_demux_i(char *obj_name);" << endl;
-  hdr << "\t~tao_demux_i();" << endl;
-  hdr << "\t//now all the methods" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      hdr << "\tvoid " << str->rep() <<
-	"(CORBA_Environment &env);" << endl; 
-    }
-  hdr << "};" << endl; 
-
-  hdr << "#endif" << endl;
-}
-
-
-// generate the implementation
-long GenServantImpl(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // generate the implementation class
-  fstream impl;
-  int i;
-  ACE_CString *str;
-
-  impl.open("tao_demux_i.cpp", ios::out);
-
-  impl << "#include <iostream.h>" << endl;
-  impl << "#include \"tao_demux_i.h\"" << endl << endl;
-
-  impl << "tao_demux_i::tao_demux_i(char *obj_name)" << endl;
-  impl << "  :_skel_tao_demux(obj_name){}" << endl;
-  impl << "tao_demux_i::~tao_demux_i(){}" << endl;
-  impl << "\t//now all the methods" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      impl << "void tao_demux_i::" << str->rep() <<
-	"(CORBA_Environment &env)" << endl;
-      impl << "{" << endl;
-      impl << "#ifdef DEBUG" << endl;
-      impl << "   cout << \"Object name = \" << this->_get_name(env) << " <<
-	"\", Operation name = " << str->rep() << "\" << endl;" << endl; 
-      impl << "#endif" << endl;
-      impl << "}" << endl << endl;
-    }
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/objcreate.cpp b/TAO/tests/Demux_Test/CodeGen/objcreate.cpp
deleted file mode 100644
index e25dbd947d3..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/objcreate.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "tao.h"
-
-long GenObjectCreateCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // code for creating objects. The strategy will be based on active demux or
-  // other strategies
-  fstream file;
-  int i;
-  ACE_CString *str;
-
-  file.open("obj_create.i", ios::out);
-
-  file << "\t  if (params->demux_strategy() == " <<
-    "TAO_OA_Parameters::TAO_ACTIVE_DEMUX){" << endl;
-
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      file << "\t\tmymux[" << i << "] = new tao_demux_i(\"" << i << "\");" <<
-	endl; 
-      file << "\t\tstr = orb_ptr->object_to_string(mymux[" << i << "], env);"
-	   << endl;
-      file << "#ifdef DEBUG" << endl;
-      file << "\t\tcout << \"IOR = \" << (char *)str << endl;" << endl;
-      file << "#endif" << endl;
-      file << "\t\tiorfile << (char *)str << endl; " << endl;
-      file << "\t\tCORBA_string_free(str);" << endl;
-    }
-  file << "\t  } else {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      file << "\t\tmymux[" << i << "] = new tao_demux_i(CORBA_string_dup (\""
-	   << str->rep() << "\"));" << endl; 
-      file << "\t\tstr = orb_ptr->object_to_string(mymux[" << i << "], env);"
-	   << endl;
-      file << "#ifdef DEBUG" << endl;
-      file << "\t\tcout << \"IOR = \" << (char *)str << endl;" << endl;
-      file << "#endif" << endl;
-      file << "\t\tiorfile << (char *)str << endl; " << endl;
-      file << "\t\tCORBA_string_free(str);" << endl;
-    }
-  file << "\t  }" << endl;
-
-  file.close();
-  return 0;
-}
diff --git a/TAO/tests/Demux_Test/CodeGen/perf.cpp b/TAO/tests/Demux_Test/CodeGen/perf.cpp
deleted file mode 100644
index ccd2da961ff..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/perf.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "tao.h"
-
-void GenGPERFCode()
-{
-  char command[500];
-
-  // first generate code for object hash
-  sprintf(command, 
-    "gperf -c -C -D -E -T -f 0 -a -o -t -p -L C++ -Z Method_Hash %s >\
-gperf_method.i", "gperf_methods.dat");
-  system(command);
-  
-  // omit the -C switch for gperf because we will not know the address of the
-  // objects until they are instantiated. But we do know the keys in advance.
-  sprintf(command, 
-    "gperf -c -D -E -T -f 0 -a -o -t -p -L C++ -Z Object_Hash %s >\
-gperf_object.i", "gperf_objects.dat");
-  system(command);
-
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/skel.cpp b/TAO/tests/Demux_Test/CodeGen/skel.cpp
deleted file mode 100644
index db48cfeb908..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/skel.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "tao.h"
-
-long GenServerHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demuxS.h", ios::out);
-
-  hdr << "#if !defined(TAO_DEMUX_S_H)" << endl;
-  hdr << "#define TAO_DEMUX_S_H" << endl << endl;
-
-  hdr << "#include \"tao_demuxC.h\"" << endl;
-  hdr << "class _skel_tao_demux: public tao_demux" << endl;
-  hdr << "{" << endl;
-  hdr << "protected:" << endl;
-  hdr << "\t_skel_tao_demux(const char *objname=0);" << endl;
-  hdr << "\tvirtual ~_skel_tao_demux() {}" << endl;
-  hdr << "public:" << endl;
-  hdr << "\t//All methods defined on this interface" << endl;
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    //generate skeletons
-    hdr << "\tvirtual void " << str->rep() <<
-      "(CORBA_Environment &env) = 0;" << endl;
-  }
-  hdr << endl;
-  hdr << "\t// All skeletons used for dispatching" << endl;
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    //generate skeletons
-    hdr << "\tstatic void " << str->rep() <<
-      "_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-      "CORBA_Environment &env);" << endl;
-  }
-  hdr << "\tstatic void " << 
-    "_is_a_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-    "CORBA_Environment &env);" << endl;
-  hdr << "};" << endl;
-
-  hdr << "#endif" << endl;
-  hdr.close();
-}
-
-// generate server side skeletons
-long GenServerSkels(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream skel;
-  int i;
-  ACE_CString *str;
-
-  skel.open("tao_demuxS.cpp", ios::out);
-
-  skel << "#include \"tao_demuxS.h\"" << endl;
-  //  skel << "#include \"iiopobj.h\"" << endl;
-  // skel << "#include \"params.h\"" << endl;
-  // skel << "#include \"corba/optable.h\"" << endl;
-  // skel << "#include \"corba/corbacom.h\"" << endl << endl;
-
-  // table of methods
-  skel << "static const TAO_operation_db_entry tao_demux_operations [] = {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      skel << "\t{\"" << str->rep() << "\", &_skel_tao_demux::" << str->rep() <<
-	"_skel}," << endl;
-      
-    }
-  skel << "\t{\"_is_a\", &_skel_tao_demux::_is_a_skel}" << endl;
-  skel << "};" << endl;
-
-  // table of methods
-  skel << "static const TAO_operation_db_entry tao_active_demux_operations [] = {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      skel << "\t{\"" << i << "\", &_skel_tao_demux::" << str->rep() <<
-	"_skel}," << endl;
-      
-    }
-  skel << "\t{\"" << limit << "\", &_skel_tao_demux::_is_a_skel}" << endl;
-  skel << "};" << endl;
-
-  // instantiate operation lookup tables
-  skel << "// instantiate a dynamic hash operation table" << endl;
-  skel << "TAO_Dynamic_Hash_OpTable dyn_hash_tao_demux_op_tbl(" <<
-    "tao_demux_operations, " << (limit+1) << ", " << (limit+1)*2 << ");" << endl;
-
-  skel << "// instantiate a linear search based operation table" << endl;
-  skel << "TAO_Linear_OpTable linear_tao_demux_op_tbl(" <<
-    "tao_demux_operations, " << limit+1 << ");" << endl;
-
-  skel << "// instantiate a active demux operation table" << endl;
-  skel << "TAO_Active_Demux_OpTable active_tao_demux_op_tbl(" <<
-    "tao_active_demux_operations, " << limit+1 << ");" << endl;
-
-  skel << "// constructor for skel_tao_demux" << endl;
-  skel << "_skel_tao_demux::_skel_tao_demux(const char *obj_name)" << endl;
-  //  skel << "\t:optable_(&tao_demux_op_tbl)" << endl;
-  skel << "{" << endl;
-  skel << "\tconst char* repoID = \"IDL:tao_demux:1.0\";" << endl;
-  skel << "\tCORBA_String_var  _tao_typeid = repoID;" << endl;
-  skel << "\tIIOP_Object *data; // IIOP object reference" << endl;
-  skel << "\tCORBA_POA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // our OA" << endl;
-  skel << "\tTAO_Operation_Table_Parameters *op_params = " << endl;
-  skel << "\t\tTAO_OP_TABLE_PARAMETERS::instance();" << endl << endl;
-  skel << "\tCORBA_Long i;" << endl;
-  
-  // set the operation table based on user's choice
-  skel << "\tswitch(op_params->lookup_strategy()){" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX:" << endl;
-  skel << "\t\tthis->optable_ = &active_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_LINEAR:" << endl;
-  skel << "\t\tthis->optable_ = &linear_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH:" << endl;
-  skel << "\t\tthis->optable_ = &dyn_hash_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_PERFECT_HASH:" << endl;
-  skel << "\t\tthis->optable_ = op_params->concrete_strategy ();" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_USER_DEFINED:" << endl;
-  skel << "\t\tthis->optable_ = op_params->concrete_strategy ();" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\t}" << endl << endl;
-
-  // code to create IIOP object
-  skel << "\tdata = new IIOP_Object(CORBA_string_dup(_tao_typeid));" << endl;
-  skel << "\tdata->profile.iiop_version.major = IIOP::MY_MAJOR;" << endl;
-  skel << "\tdata->profile.iiop_version.minor = IIOP::MY_MINOR;" << endl;
-  skel << "\tdata->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());" << endl;
-  skel << "\tdata->profile.port = oa->get_addr().get_port_number();" << endl;
-  skel << "\tdata->profile.object_key.length = ACE_OS::strlen(obj_name);" << endl;
-  skel << "\tdata->profile.object_key.maximum = " <<
-    "data->profile.object_key.length;" << endl;
-  skel << "\tdata->profile.object_key.buffer = " << 
-    "new CORBA_Octet [(size_t)data->profile.object_key.length+1];" << endl;
-  skel << "\tACE_OS::memcpy(data->profile.object_key.buffer, obj_name, " <<
-    "data->profile.object_key.length);" << endl;
-  skel << "\tthis->set_parent(data);" << endl;
-  skel << "\tthis->sub_ = this;" << endl;
-  skel << "\tif (oa) oa->bind(data->profile.object_key, this);" <<
-    "// register ourselves" << endl;
-  skel << "}" << endl << endl;
-
-  // now the code for each skeleton
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    skel << "void _skel_tao_demux::" << str->rep() <<
-      "_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-      "CORBA_Environment&env)" << endl;
-    skel << "{" << endl;
-    skel << "\tCORBA_NVList_ptr nvlist;" << endl;
-    skel << "\ttao_demux_ptr impl;" << endl << endl;
-
-    // create a NVlist and populate it
-    skel << "\treq.orb()->create_list(0, nvlist);" << endl;
-    skel << "\treq.params(nvlist,env); //useless operation, but required "
-	 << endl; 
-    skel << "\t impl = (tao_demux_ptr) (obj->get_subclass());" << endl;
-    skel << "\t// now the magic of dynamic binding" << endl;
-    skel << "\timpl->" << str->rep() << "(env);" << endl;
-    skel << "}" << endl;
-  }
-
-  // finally the code for _is_a
-  skel << "void _skel_tao_demux::_is_a_skel" <<
-    "(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-    "CORBA_Environment&env)" << endl;
-  skel << "{" << endl;
-  skel << "\tCORBA_NVList_ptr nvlist;" << endl;
-  skel << "\tCORBA_NamedValue_ptr nv;" << endl;
-  skel << "\tCORBA_Any  temp_value(_tc_CORBA_String);" << endl;
-  skel << "\tchar *_tao_typeid = \"IDL:tao_demux:1.0\";" << endl << endl;
-
-  // create a NVlist and populate it
-  skel << "\treq.orb()->create_list(0, nvlist);" << endl;
-  skel << "\tnv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);" << endl;
-  skel << "\treq.params(nvlist,env);" << endl;
-  skel << "\tif (env.exception() != 0)" << endl;
-  skel << "\t  {" << endl;
-  skel << "\t\tdexc(env, \"is_a_skel, params\");" << endl;
-  skel << "\t\treturn;" << endl;
-  skel << "\t  }" << endl << endl;
-  skel << "\tCORBA_Boolean *retval;" << endl;
-  skel << "\tCORBA_String value = *(CORBA_String *)nv->value()->value();" << endl;
-  skel << "\tif (strcmp((char *)value,(char *)_tao_typeid) == 0" << endl;
-  skel << "\t   || strcmp((char *)value, _tc_CORBA_Object->id(env)) == 0)" << endl;
-  skel << "\t\tretval = new CORBA_Boolean(CORBA_B_TRUE);" << endl;
-  skel << "\telse" << endl;
-  skel << "\t\tretval = new CORBA_Boolean(CORBA_B_FALSE);" << endl;
-  skel << "\tCORBA_Any *any = new CORBA_Any(_tc_CORBA_Boolean, retval," <<
-    "CORBA_B_TRUE);" << endl;
-  skel << "\treq.result(any, env);" << endl;
-  skel << "\tdexc(env, \"_is_a, result\");" << endl;
-  skel << "}" << endl;
-  
-  skel.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/stub.cpp b/TAO/tests/Demux_Test/CodeGen/stub.cpp
deleted file mode 100644
index 136fbf1116a..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/stub.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "tao.h"
-
-long GenClientHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demuxC.h", ios::out);
- 
-  hdr << "//******** Generated by the tool: taoidl ********" << endl << endl;
-
-  hdr << "#if !defined (TAO_DEMUXC_H)" << endl;
-  hdr << "#define TAO_DEMUXC_H" << endl << endl;
-
-  hdr << "#include <stdlib.h>" << endl;
-  hdr << "#include \"tao/corba.h\"" << endl;
-  //  hdr << "#include \"tao/orb.h\"" << endl;
-  //  hdr << "#include \"tao/stub.h\"" << endl;
-  //  hdr << "#include \"tao/optable.h\"" << endl;
-
-  hdr << "class tao_demux;" << endl;
-  hdr << "typedef tao_demux *\ttao_demux_ptr;" << endl;
-  hdr << "class tao_demux: public virtual CORBA_Object" << endl;
-  hdr << "{" << endl;
-  hdr << "public:" << endl;
-  // define the CORBA compliant mapping
-  hdr << "\tstatic tao_demux_ptr _duplicate(tao_demux_ptr obj);" << endl;
-  hdr << "\tstatic tao_demux_ptr _narrow(CORBA_Object_ptr obj);" << endl;
-  hdr << "\tstatic tao_demux_ptr _nil();" << endl << endl;
-
-  // now generate all the methods
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      hdr << "\tvirtual void " << str->rep() << "(CORBA_Environment &env);" << endl;
-    }
-  hdr << "protected:" << endl;
-  hdr << "\ttao_demux() {}" << endl;
-  hdr << "\ttao_demux(STUB_Object *objref): CORBA_Object(objref) {}" << endl;
-  hdr << "\tvirtual ~tao_demux() {}" << endl;
-  hdr << "private:" << endl;
-  hdr << "\t//copy constructor and assignment operator" << endl;
-  hdr << "\ttao_demux(const tao_demux&) { }" << endl;
-  hdr << "\tvoid operator=(const tao_demux&) { }" << endl;
-  hdr << "};" << endl;
-
-  hdr << "#endif" << endl;
-  hdr.close();
-}
-
-long GenClientStubs(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream stub;
-  int i;
-  ACE_CString *str;
-
-  stub.open("tao_demuxC.cpp", ios::out);
-
-  stub << "#include \"tao_demuxC.h\"" << endl << endl;
-
-  // generate the static functions
-
-  // the _duplicate method
-  stub << "tao_demux_ptr tao_demux::_duplicate(tao_demux_ptr obj)" << endl;
-  stub << "{" << endl;
-  stub << "\tif (obj) obj->AddRef();" << endl;
-  stub << "\treturn obj;" << endl;
-  stub << "}" << endl << endl;
-
-  // the _narrow method
-  stub << "tao_demux_ptr tao_demux::_narrow(CORBA_Object_ptr obj)" << endl;
-  stub << "{" << endl;
-  // check if object "is_a" IDL:tao_demux:1.0 and if so, addref and return a
-  // pointer to it
-  stub << "\tCORBA_Environment env;" << endl;
-  stub << "\tif (obj->_is_a(\"IDL:tao_demux:1.0\", env)){" << endl;
-  stub << "\t  STUB_Object *istub;" << endl;
-  stub << "\t  if (obj->QueryInterface(IID_STUB_Object, (void **)&istub)" <<
-    " != NOERROR){" << endl;
-  stub << "\t\treturn tao_demux::_nil();" << endl;
-  stub << "\t  }" << endl;
-  stub << "\t  tao_demux_ptr new_obj = new tao_demux(istub);" << endl;
-  stub << "\t  return tao_demux::_duplicate(new_obj);" << endl;
-  stub << "\t}" << endl;
-  stub << "\treturn tao_demux::_nil();" << endl;
-  stub << "}" << endl << endl;
-
-  // the _nil method
-  stub << "tao_demux_ptr tao_demux::_nil()" << endl;
-  stub << "{" << endl;
-  stub << "\treturn (tao_demux_ptr)NULL;" << endl;
-  stub << "}" << endl << endl;
-
-  // All the TAO_Param_Data and TAO_Call_Data structures
-  stub <<
-    "// All the TAO_Param_Data and TAO_Call_Data structures required for invoking do_call"
-     << endl; 
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-
-    // generate TAO_Param_Data structure
-    stub << "static const TAO_Param_Data tao_demux_" << str->rep() <<
-      "_params[] = {" << endl;
-    stub << "\t{_tc_CORBA_Void, PARAM_RETURN, 0}" << endl;
-    stub << "};" << endl;
-
-    // generate TAO_Call_Data structure
-    stub << "static const TAO_Call_Data tao_demux_" << str->rep() << 
-      "_calldata = {" << endl;
-    stub << "\t\"" << str->rep() << "\"," << endl;
-    stub << "\tCORBA_B_TRUE, //twoway" << endl;
-    stub << "\t1, &tao_demux_" << str->rep() << "_params[0]," << endl;
-    stub << "\t0, 0" << endl;
-    stub << "};" << endl;
-
-    // generate TAO_Call_Data structure that uses active demultiplexing
-    stub << "static const TAO_Call_Data tao_demux_" << str->rep() << 
-      "_active_calldata = {" << endl;
-    stub << "\t\"" << i << "\"," << endl;
-    stub << "\tCORBA_B_TRUE, //twoway" << endl;
-    stub << "\t1, &tao_demux_" << str->rep() << "_params[0]," << endl;
-    stub << "\t0, 0" << endl;
-    stub << "};" << endl;
-
-    // now the actual stub
-    stub << "void tao_demux::" << str->rep() << "(CORBA_Environment &env)"
-	 << endl;
-    stub << "{" << endl;
-    stub << "\tSTUB_Object *istub;" << endl;
-    stub << "\tif (this->QueryInterface (IID_STUB_Object, (void **) &istub) "
-	 << "!= NOERROR){" << endl;
-    stub << "\t  env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));" << endl;
-    stub << "\t  return;" << endl;
-    stub << "\t}" << endl;
-    stub << "\tTAO_Operation_Table_Parameters *paramTbl = " << endl;
-    stub << "\t\tTAO_OP_TABLE_PARAMETERS::instance();" << endl;
-    stub << "\tif (paramTbl->lookup_strategy() == ";
-    stub << "TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX)" << endl;
-    stub << "\t\tistub->do_call(env, &tao_demux_" << str->rep() <<
-      "_active_calldata);" << endl;
-    stub << "\telse" << endl;
-    stub << "\t\tistub->do_call(env, &tao_demux_" << str->rep() <<
-      "_calldata);" << endl;
-    stub << "}" << endl << endl;
-  }
-  stub.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/tao.cpp b/TAO/tests/Demux_Test/CodeGen/tao.cpp
deleted file mode 100644
index b01df4002fe..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/tao.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "tao.h"
-
-int main (int argc, char *argv[])
-{
-  // define the two arrays that will hold generated object keys and method
-  // names of the hypothetical "tao_demux" interface
-  ACE_Unbounded_Queue<ACE_CString> *objectArr, *methodArr;
-
-  // provide default values to the limit on the number of object keys and
-  // method names
-  long objectLimit = 5, 
-    methodLimit = 4;
-
-  // for parsing the arguments
-  ACE_Get_Opt get_opt (argc, argv, "hm:o:");
-
-  for (int c; (c = get_opt ()) != EOF;)
-    {
-      switch (c)
-	{
-	case 'm': // number of methods
-	  methodLimit = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'o': // number of object keys
-	  objectLimit = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'h': // usage
-	default:
-	  Usage ();
-	  return 1;
-	}
-    }
-
-  cout << "Generating code for " << objectLimit << " objects and " <<
-    methodLimit << " methods" << endl;
-  objectArr = new ACE_Unbounded_Queue<ACE_CString> [objectLimit];
-  methodArr = new ACE_Unbounded_Queue<ACE_CString> [methodLimit];
-
-  // generate the object keys
-  if (GenObjectTable (*objectArr, objectLimit) == -1)
-    {
-    }
-
-  // generate method names
-  if (GenMethodTable (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate client side stub headers
-  if (GenClientHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate client stubs
-  if (GenClientStubs (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate include code for client-side main program
-  if (GenClientCode (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate server skeleton header
-  if (GenServerHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate server skeletons
-  if (GenServerSkels (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate th eimpl header
-  if (GenServantHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate impl 
-  if (GenServantImpl (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate code that creates instances of objects
-  if (GenObjectCreateCode (*objectArr, objectLimit) == -1)
-    {
-    }
-
-  GenGPERFCode ();
-}
-
-void Usage (void)
-{
-  cerr << "Usage: tao [-m <#methods>] [-o <#objects>] [-h]" << endl;
-  return;
-}
diff --git a/TAO/tests/Demux_Test/CodeGen/tao.h b/TAO/tests/Demux_Test/CodeGen/tao.h
deleted file mode 100644
index cdabc2a3446..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/tao.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/SString.h"
-#include "ace/Containers.h"
-#include "ace/Singleton.h"
-#include "ace/Get_Opt.h"
-
-long GenObjectTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenMethodTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientStubs(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenObjectCreateCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServerHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServerSkels(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServantHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServantImpl(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-void GenGPERFCode();
-void Usage();
-
diff --git a/TAO/tests/Demux_Test/Makefile b/TAO/tests/Demux_Test/Makefile
deleted file mode 100755
index 81821f77342..00000000000
--- a/TAO/tests/Demux_Test/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the CORBA request demultiplexing benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lTAO
-
-PROG_SRCS 	= client.cpp tao_demuxC.cpp tao_demuxS.cpp tao_demux_i.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-TAO_DEMUX_CLIENT_OBJS = client.o tao_demuxC.o
-
-TAO_DEMUX_SERVER_OBJS = server.o tao_demuxC.o tao_demuxS.o tao_demux_i.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-LDFLAGS    += -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat
-
-ifdef quantify
-LDFLAGS	+= -L/pkg/purify/quantify-2.1-solaris2/ -lquantify_stubs
-endif
-
-ifdef debug
-CPPFLAGS += -DDEBUG
-endif
-
-server:	$(addprefix $(VDIR),$(TAO_DEMUX_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(TAO_DEMUX_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clean:
-	$(MAKE) realclean
-	rm -fr tao_demux* gperf* *.i client server
-
diff --git a/TAO/tests/Demux_Test/README b/TAO/tests/Demux_Test/README
deleted file mode 100644
index 133758e62e6..00000000000
--- a/TAO/tests/Demux_Test/README
+++ /dev/null
@@ -1,20 +0,0 @@
-
-***** NOTE: This is still under development and will not work *****
-
-
-This test directory tests various demultiplexing strategies used in
-TAO.
-
-Description of various files:
-
-make_all	script that generates executables for different number
-		of objects and methods
-gen_bin		generates the binary for the desired number of objects
-		and methods
-run_client	runs a client
-run_server	runs a server
-run_all_client	runs all clients generated by the make_all
-run_all_server	runs all servers generated by the make_all
-CodeGen		Directory containing the code generator
-server.cpp	server main program
-client.cpp	client main program
diff --git a/TAO/tests/Demux_Test/client.cpp b/TAO/tests/Demux_Test/client.cpp
deleted file mode 100755
index fb73dd5037b..00000000000
--- a/TAO/tests/Demux_Test/client.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// $Id$
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "tao_demuxC.h"
-#include "tao/debug.h"
-
-#include "ace/streams.h"
-
-void print_exception (const CORBA_Exception     *x,
-                      const char                  *info,
-                      FILE                        *stream
-                      );
-
-char Usage[] = "\
-Usage: client options\n\
-options:\n\
--l strategy: operation lookup strategy - a(active), l(linear), d (dyn hash), p (perf)\n\
--i iter: number of iterations \n\
--m num: number of methods \n\
--o num: number of objects \n\
--t type: type can be l(linear), r(random), b (best), w (worst)\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)();
-#endif
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-enum SendType{
-  LINEAR,
-  BEST,
-  WORST,
-  RANDOM
-};
-
-void do_test(tao_demux_ptr *demux, int olimit, int mlimit, SendType, int iter);
-
-int
-main (int argc, char *argv[])
-{
-
-  unsigned long addr_tmp;
-  unsigned short done = 0;
-  int c;
-
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_Environment     env;
-  CORBA_Object_ptr      objref;
-  tao_demux_ptr        *demux;
-  unsigned              loop_count = 0;
-  int                   exit_later = 0;
-  int                   i;
-  int                   ObjectLimit = 5,
-    MethodLimit = 4;
-  int iter= 1; // number of iterations
-  SendType              st = RANDOM;
-  TAO_Operation_Table_Parameters *op_params = TAO_OP_TABLE_PARAMETERS::instance();
-
-  CORBA_String str;
-  fstream iorfile;
-
-  while (!done && ((c = getopt (argc, argv, "i:l:t:m:o:")) !=
-                   -1)){
-    switch(c){
-    case 'i':
-      iter = atoi (optarg);
-      break;
-    case 'l': // op table lookup strategy
-      break;
-    case 'm':
-      MethodLimit = atoi(optarg);
-      break;
-    case 'o':
-      ObjectLimit = atoi(optarg);
-      break;
-    case 't':
-      switch(*optarg){
-      case 'b':
-        st = BEST;
-        break;
-      case 'w':
-        st = WORST;
-        break;
-      case 'l':
-        st = LINEAR;
-        break;
-      case 'r':
-      default:
-        st = RANDOM;
-        break;
-      }
-      break;
-    default:
-      goto usage;
-    }
-  }
-
-  TAO_debug_level = 0;
-  //
-  // Transmitter
-  //
-  orb_ptr = CORBA_ORB_init (argc, argv, "ior", env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB initialization", stdout);
-    return 1;
-  }
-
-  str = CORBA_string_alloc (500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("./ior.txt", ios::in);
-
-  for (;!iorfile.eof ();){
-    memset(str, '\0', 500);
-    iorfile >> ((char *)str);
-    if (iorfile.good ())
-      loop_count++;
-  }
-  iorfile.close();
-
-  ACE_DEBUG ((LM_DEBUG, "Total of %d object references read\n", loop_count));
-  demux = new tao_demux_ptr [loop_count];
-  for (i=0; i < loop_count; i++){
-    demux[i] = 0;
-  }
-
-  // read the IOR from the file ior.txt
-  iorfile.open("./ior.txt", ios::in);
-
-  for (i=0; i < loop_count; i++){
-    ACE_OS::memset (str, '\0', 500);
-    iorfile >> ((char *)str);
-    objref = orb_ptr->string_to_object(str, env);
-    if (env.exception() != 0){
-      print_exception(env.exception(), "string2object", stdout);
-      return 1;
-    }
-
-    cout << "objref " << i << " has key = " << objref->_get_name(env) << endl;
-    if (!CORBA_is_nil(objref)){
-      // narrow to the desired interface type
-      demux[i] = tao_demux::_narrow (objref);
-    }
-  }
-  iorfile.close();
-  CORBA_string_free(str);
-
-
-  // send operations
-  do_test(demux, ObjectLimit, MethodLimit, st, iter);
-
-  for (i=0; i < loop_count; i++){
-    CORBA_release(demux[i]);
-  }
-  delete [] demux;
-  return(0);
-usage:
-  fprintf (stderr, Usage);
-  return 1;
-}
-
-typedef void (*method_ptr)(tao_demux_ptr);
-struct method_db {
-  method_ptr method;
-};
-
-#include "client.i"
-
-void do_test(tao_demux_ptr *demux, int olimit, int mlimit, SendType st, int iter)
-{
-  int i, j, k;
-  int loop = 0;
-  hrtime_t  start, end, sum, diff;
-  fstream result;
-  CORBA_Environment env;
-
-  result.open("result.dat",ios::out|ios::app);
-#ifdef __TAO_ACTIVE__
-  result << "# ACTIVE ";
-#endif
-#ifdef __TAO_GPERF__
-  result << "# GPERF ";
-#endif
-#ifdef __TAO_LINEAR__
-  result << "# LINEAR ";
-#endif
-
-  //  result << "@type xy" << endl;
-  sum = 0;
-
-  if (st == LINEAR){
-    result << " LINEAR" << endl;
-#ifdef __DEBUG__
-    cout << "Linear strategy for sending" << endl;
-#endif
-    for (k=0; k < iter; k++) {
-      // invoke the jth method on the ith object
-      for (i=0; i < olimit; i++){
-        for (j=0; j < mlimit; j++){
-          loop++;
-          start = ACE_OS::gethrtime ();
-          mtbl[j].method(demux[i]);
-          end = ACE_OS::gethrtime ();
-          diff = (end - start);
-#ifdef __DEBUG__
-          cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-          sum += diff;
-          //    result << loop << "\t" << diff/1.e+06 << endl;
-        }
-      }
-    }
-  } else if (st == BEST){
-    result << " BEST" << endl;
-#ifdef __DEBUG__
-    cout << "best strategy for sending" << endl;
-#endif
-    for (k=0; k < iter; k++) {
-      // invoke the jth method on the ith object
-      for (i=0; i < olimit; i++){
-        for (j=0; j < mlimit; j++){
-          loop++;
-          start = ACE_OS::gethrtime ();
-          mtbl[0].method(demux[0]);
-          end = ACE_OS::gethrtime ();
-          diff = (end - start);
-#ifdef __DEBUG__
-          cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-          sum += diff;
-          //    result << loop << "\t" << diff/1.e+06 << endl;
-        }
-      }
-    }
-  } else if (st == RANDOM) {
-    result << " RANDOM" << endl;
-#ifdef __DEBUG__
-    cout << "Random strategy for sending" << endl;
-#endif
-    // choose the object and method name randomly
-    srand48(time(NULL));
-    long p, q;
-    for (k=0; k < iter; k++) {
-      for (i=0; i < olimit; i++){
-        for (j=0; j < mlimit; j++){
-          loop++;
-          p = lrand48() % olimit;
-          q = lrand48() % mlimit;
-          start = ACE_OS::gethrtime ();
-#ifdef DEBUG
-          ACE_DEBUG ((LM_DEBUG, "Invoking op %s on object with key %s\n",
-                      mtbl[q], demux[p]->_get_name(env)));
-#endif
-          mtbl[q].method(demux[p]);
-          end = ACE_OS::gethrtime ();
-          diff = (end - start);
-#ifdef __DEBUG__
-          cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-          sum += diff;
-          //    result << loop << "\t" << diff/1.e+06 << endl;
-        }
-      }
-    }
-  } else if (st == WORST){
-    result << " WORST" << endl;
-#ifdef __DEBUG__
-    cout << "worst strategy for sending" << endl;
-#endif
-    // invoke the jth method on the ith object
-    for (k=0; k < iter; k++) {
-      for (i=0; i < olimit; i++){
-        for (j=0; j < mlimit; j++){
-          loop++;
-          start = ACE_OS::gethrtime ();
-          mtbl[mlimit-1].method(demux[olimit-1]);
-          end = ACE_OS::gethrtime ();
-          diff = (end - start);
-#ifdef __DEBUG__
-          cout << "Latency for this request = " << diff/1.0e+06  << endl;
-#endif
-          sum += diff;
-          //    result << loop << "\t" << diff/1.e+06 << endl;
-        }
-      }
-    }
-  }
-  result << olimit << "\t" << mlimit << "\t" << sum/(loop*1000000.0) << endl;
-  cout << olimit << "\t" << mlimit << "\t" << sum/(loop*1000000.0) << endl;
-  result.close();
-}
-
diff --git a/TAO/tests/Demux_Test/gen_bin b/TAO/tests/Demux_Test/gen_bin
deleted file mode 100755
index b0650ff4249..00000000000
--- a/TAO/tests/Demux_Test/gen_bin
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-make clean
-./CodeGen/tao -o $1 -m $2
-make
-mv client client_${1}_${2}
-mv server server_${1}_${2}
diff --git a/TAO/tests/Demux_Test/make_all b/TAO/tests/Demux_Test/make_all
deleted file mode 100755
index 4ac9b18cc3f..00000000000
--- a/TAO/tests/Demux_Test/make_all
+++ /dev/null
@@ -1,19 +0,0 @@
-rm -fr server_*_* client_*_*
-gen_bin 1 1
-gen_bin 1 10
-gen_bin 1 100
-gen_bin 100 1
-gen_bin 100 10
-gen_bin 100 100
-gen_bin 200 1
-gen_bin 200 10
-gen_bin 200 100
-gen_bin 300 1
-gen_bin 300 10
-gen_bin 300 100
-gen_bin 400 1
-gen_bin 400 10
-gen_bin 400 100
-gen_bin 500 1
-gen_bin 500 10
-gen_bin 500 100
diff --git a/TAO/tests/Demux_Test/run_all_client b/TAO/tests/Demux_Test/run_all_client
deleted file mode 100755
index a5a3b61c48f..00000000000
--- a/TAO/tests/Demux_Test/run_all_client
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# usage: run_client <num objs> <num methods> <num iters>
-run_client 500 100 1
-sleep 5
-run_client 500 10  1
-sleep 5
-run_client 500 1   1
-sleep 5
-run_client 400 100 1
-sleep 5
-run_client 400 10  1
-sleep 5
-run_client 400 1   1
-sleep 5
-run_client 300 100 1
-sleep 5
-run_client 300 10  1
-sleep 5
-run_client 300 1   1
-sleep 5
-run_client 200 100 1
-sleep 5
-run_client 200 10  1
-sleep 5
-run_client 200 1   1
-sleep 5
-run_client 100 100 1
-sleep 5
-run_client 100 10  1
-sleep 5
-run_client 100 1   1
-sleep 5
-run_client 1   100 1
-sleep 5
-run_client 1   10  10
-sleep 5
-run_client 1   1   100
diff --git a/TAO/tests/Demux_Test/run_all_server b/TAO/tests/Demux_Test/run_all_server
deleted file mode 100755
index 15b4762efcb..00000000000
--- a/TAO/tests/Demux_Test/run_all_server
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# usage: run_server <num objs> <num methods> <num iters>
-run_server 500 100 1
-run_server 500 10  1
-run_server 500 1   1
-run_server 400 100 1
-run_server 400 10  1
-run_server 400 1   1
-run_server 300 100 1
-run_server 300 10  1
-run_server 300 1   1
-run_server 200 100 1
-run_server 200 10  1
-run_server 200 1   1
-run_server 100 100 1
-run_server 100 10  1
-run_server 100 1   1
-run_server 1   100 1
-run_server 1   10  10
-run_server 1   1   100 
diff --git a/TAO/tests/Demux_Test/run_client b/TAO/tests/Demux_Test/run_client
deleted file mode 100755
index 19dab08670d..00000000000
--- a/TAO/tests/Demux_Test/run_client
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
diff --git a/TAO/tests/Demux_Test/run_server b/TAO/tests/Demux_Test/run_server
deleted file mode 100755
index 7f2ac61445a..00000000000
--- a/TAO/tests/Demux_Test/run_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-server_${1}_${2} -OAhost merengue -OAobjdemux linear -OAtablesize ${1} -o ${1} -m ${2} -t l -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux linear -OAtablesize ${1} -o ${1} -m ${2} -t l -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux active_demux -OAtablesize ${1} -o ${1} -m ${2} -t a -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux active_demux -OAtablesize ${1} -o ${1} -m ${2} -t a -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux user_def -o ${1} -m ${2} -t g -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux user_def -o ${1} -m ${2} -t g -i $3
-server_${1}_${2} -OAhost merengue -o ${1} -m ${2} -i $3
-server_${1}_${2} -OAhost merengue -o ${1} -m ${2} -i $3
-
diff --git a/TAO/tests/Demux_Test/server.cpp b/TAO/tests/Demux_Test/server.cpp
deleted file mode 100755
index 1e3931b01c2..00000000000
--- a/TAO/tests/Demux_Test/server.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-#include "tao_demux_i.h"
-
-#ifdef USE_QUANTIFY
-#include <quantify.h>
-#endif
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/SString.h"
-
-void print_exception (const CORBA_Exception     *x,
-		      const char                  *info,
-		      FILE                        *stream
-		      );
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-//****************** perf hash for obj lookup *************
-// for perfect hash
-struct object_db 
-{
-  char *name; // name of method
-  CORBA_Object_ptr obj; //fn pointer to obj impl
-};
-
-// include the perfect hash code for objects
-#include "gperf_object.i"
-
-// Perfect hash table class
-class TAO_Perfect_Hash_ObjTable: public TAO_Object_Table
-{
-public:
-  TAO_Perfect_Hash_ObjTable (Object_Hash *oh);
-
-  ~TAO_Perfect_Hash_ObjTable (void);
-
-  virtual int bind (const CORBA_OctetSeq &key, 
-		    CORBA_Object_ptr obj);
-  // Registers a CORBA_Object into the object table and associates the
-  // key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA_OctetSeq &key, 
-		    CORBA_Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-private:
-  Object_Hash *hash_;
-};
-
-TAO_Perfect_Hash_ObjTable::TAO_Perfect_Hash_ObjTable (Object_Hash *oh)
-  : hash_ (oh)
-{
-}
-
-TAO_Perfect_Hash_ObjTable::~TAO_Perfect_Hash_ObjTable (void)
-{
-}
-
-int
-TAO_Perfect_Hash_ObjTable::bind (const CORBA_OctetSeq &key, CORBA_Object_ptr obj)
-{
-  struct object_db *entry;
-
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  entry = this->hash_->in_word_set (objkey.rep (), key.length);
-  if (entry != 0)
-    {
-      // now fill up the entry
-      entry->obj = obj;
-    }
-  else
-    {
-      return -1; // error
-    }
-}
-
-int
-TAO_Perfect_Hash_ObjTable::find (const CORBA_OctetSeq &key, CORBA_Object_ptr &obj)
-{
-  struct object_db *entry;
-
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  entry = this->hash_->in_word_set (objkey.rep (), key.length);
-
-  if (entry != 0)
-    {
-      obj = entry->obj;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-//****************** perf hash for opname lookup *************
-struct method_db 
-{
-  char *name; // name of method
-  TAO_Skeleton skel_ptr_; //fn pointer to obj impl
-};
-
-#include "gperf_method.i"
-
-// Perfect hash table class
-class TAO_Perfect_Hash_Op_Table: public TAO_Operation_Table
-{
-public:
-  TAO_Perfect_Hash_Op_Table (Method_Hash *mh);
-
-  ~TAO_Perfect_Hash_Op_Table (void);
-
-  virtual int find (const CORBA_String &opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const CORBA_String &opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-private:
-  Method_Hash *hash_;
-};
-
-TAO_Perfect_Hash_Op_Table::TAO_Perfect_Hash_Op_Table (Method_Hash *mh)
-  : hash_ (mh)
-{
-}
-
-TAO_Perfect_Hash_Op_Table::~TAO_Perfect_Hash_Op_Table (void)
-{
-}
-
-int
-TAO_Perfect_Hash_Op_Table::bind (const CORBA_String &opname,
-				 const TAO_Skeleton skelptr)
-{
-  return 0; // nothing to do
-}
-
-int
-TAO_Perfect_Hash_Op_Table::find (const CORBA_String &opname,
-				 TAO_Skeleton &skelptr)
-{
-  method_db *entry;
-
-  entry = (method_db*) this->hash_->in_word_set (opname, ACE_OS::strlen (opname));
-  if (entry != 0)
-    {
-      skelptr = entry->skel_ptr_;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-//***********************************************************
-char Usage[] = "\
-Usage: server [options] \n\
-Common options:\n\
--t demux_strategy: l(linear), g(GPERF), a (delayered active demux), d (dynamic hash)\n\
--i iter: number of iterations to expect from client \n\
-";
-
-extern CORBA_Double TAO_Avg;
-extern CORBA_Long TAO_HowMany;
-extern CORBA_Long TAO_Loop;
-int
-main (int argc, char *const *argv)
-{
-  unsigned long addr_tmp;
-  int c;
-  unsigned short done = 0;
-  CORBA_Environment env;
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_POA_ptr oa_ptr;
-  int iter = 1;
-  TAO_OA_Parameters    *params = TAO_OA_PARAMS::instance();
-  char                *orb_name = "ior";
-  int                 idle = -1;
-  int use_ior = 0;
-  int terminationStatus = 0;
-  tao_demux_i **mymux;  // array of objects implementing the "demux" interface
-  int  numObjs = 5, numMethods = 4;
-  Object_Hash oh;
-  TAO_Object_Table *objt = new TAO_Perfect_Hash_ObjTable (&oh);
-  Method_Hash mh;
-  TAO_Operation_Table *optbl = new TAO_Perfect_Hash_Op_Table (&mh);
-
-  TAO_Operation_Table_Parameters *op_params =
-     TAO_OP_TABLE_PARAMETERS::instance(); 
-			 
-  fstream iorfile;  // stores the object references of all the objects
-  fstream outfile;
-  CORBA_String str; // scratch area
-
-  params->userdef_lookup_strategy (objt);
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init", stdout);
-    return 1;
-  }
-
-  oa_ptr = orb_ptr->BOA_init (argc, argv, "ROA");
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init", stdout);
-    return 1;
-  }
-
-  TAO_debug_level = 0;
-  // Now process the options other than Orbix specific options
-  while ((c = getopt (argc, argv, "ui:t:o:m:")) != -1)
-    {
-      switch (c)
-	{
-	case 't':
-	  switch (*optarg)
-	    {
-	    case 'l':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_LINEAR); 
-	      break;
-	    case 'a':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX);
-	      break;
-	    case 'g':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_PERFECT_HASH); 
-	      op_params->concrete_strategy (optbl);
-	      break;
-	    case 'd':
-	    default:
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH);
-	      break;
-	    }
-	  break;
-	case 'u':
-	  use_ior = 1;
-	  orb_name = "";
-	  break;
-	case 'i':
-	  iter = atoi (optarg);
-	  break;
-	case 'o':
-	  numObjs = atoi(optarg);
-	  break;
-	case 'm':
-	  numMethods = atoi(optarg);
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-
-  TAO_Avg = 0;
-  TAO_Loop = 0;
-  TAO_HowMany = iter*numObjs*numMethods;
-    
-  //
-  // Receiver
-  //
-
-  iorfile.open ("ior.txt", ios::out);
-  mymux = new tao_demux_i* [numObjs];
-
-  // instantiate objects
-#include "obj_create.i"
-  iorfile.close();
-  cout << "Server ready to handle events" << endl;
-
-#if defined (USE_QUANTIFY)
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  ACE_Service_Config::run_reactor_event_loop();
-
-  outfile.open ("muxcost.dat", ios::out|ios::app);
-  outfile << numObjs << "\t" << numMethods << "\t" << TAO_Avg << endl;
-  outfile.close ();
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return terminationStatus;
-usage:
-  fprintf (stderr, Usage);
-  return(1);
-}
-
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
deleted file mode 100644
index 4aebdf4609a..00000000000
--- a/TAO/tests/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Makefile for the TAO tests
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Cubit \
-	POA \
-	Param_Test \
-	Thruput \
-	CDR \
-
-# The following tests have not been updated yet
-# 	Demux_Test
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/NestedUpcall/Makefile b/TAO/tests/NestedUpcall/Makefile
deleted file mode 100644
index 6a3a390d9f2..00000000000
--- a/TAO/tests/NestedUpcall/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_FILES = Reactor
-IDL_SRC = $(IDL_FILES:%=%.idl)
-IDL_GENERATED = $(foreach idlfile,$(IDL_FILES),$(addprefix $(idlfile),C.cpp S.cpp))
-PROG_SRCS = $(IDL_GENERATED) server.cpp client.cpp \
-            reactor_i.cpp eh_i.cpp tmplinst.cpp
-
-LSRC = $(PROG_SRCS)
-
-SVR_OBJS = $(IDL_GENERATED:%.cpp=%.o) server.o reactor_i.o #tmplinst.o
-CLT_OBJS = $(IDL_GENERATED:%.cpp=%.o) client.o eh_i.o #tmplinst.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-DCFLAGS = -g
-
-server:	$(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-client:	$(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-.PRECIOUS:	$(IDL_GENERATED)
-
-realclean: clean
-	-/bin/rm -rf $(IDL_GENERATED)
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/NestedUpcall.dsw b/TAO/tests/NestedUpcall/NestedUpcall.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/NestedUpcall/NestedUpcall.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/NestedUpcall/README b/TAO/tests/NestedUpcall/README
deleted file mode 100644
index 29153b044e8..00000000000
--- a/TAO/tests/NestedUpcall/README
+++ /dev/null
@@ -1,54 +0,0 @@
--*- indented-text -*-
-
-$Id$
-
-			      BACKGROUND
-			      ==========
-
-This example tests the scenario of nested upcalls.  For example, a
-particular process may need to act in both the role of client and
-server.  This interaction is common in situations where the process
-makes a twoway invocation on a remote servant, passing a local object
-reference 'o' to that servant.  In the process of servicing that
-invocation, the servant makes a twoway invocation on 'o'.
-
-In this example, we draw upon an interaction of this sort which should
-be familiar to anyone who's used ACE: the process of registering a
-handler with a Reactor.  The EventHandler is the local object
-reference, and the Reactor the remote servant.  NOTE: This example in
-no way should be construed as testimony that remote Reactors make
-sense or are in any way useful.  It is merely a motivating example!
-
-			      EXECUTION
-			      =========
-
-server
-------
-
-$ server [orb options] [-d]
-
-where 
-	-d	turns on debugging messages
-
-
-client
-------
-
-$ client [orb options] [-d] [-f ior_file] [-k ior_string]
-
-where
-	-d	turns on debugging messages
-
-	-f	specifies the name of a file in which the IOR
-		for the Reactor can be found
-	
-	-k	specifies a string which is the IOR of the Reactor
-
-
-NOTES
------
-
-If running both on the same machine, it will be necessary to specify a
-different port for each the client and the server using -ORBport on
-the command line.  This is because there is also a servant within the
-confines of the client executable.
diff --git a/TAO/tests/NestedUpcall/Reactor.idl b/TAO/tests/NestedUpcall/Reactor.idl
deleted file mode 100644
index 2fc1d0acb22..00000000000
--- a/TAO/tests/NestedUpcall/Reactor.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall
-//
-// = FILENAME
-//    Reactor.idl
-//
-// = DESCRIPTION
-//    A simple test of nested upcalls using a structure we likely all
-//    know and love.
-//
-//    Existence of this interface should not be taken as testimony that
-//    such a structure would work in ACE!  There is no such thing as an
-//    IDL interface to the Reactor (yet)!
-//
-// = AUTHORS
-//    Chris Cleeland
-//
-// ============================================================================
-
-interface Reactor;
-
-interface EventHandler 
-{
-  Long peer ();
-  // Returns an integer corresponding to the event handler's file
-  // descriptor.
-
-  UShort decrement (in Reactor r, in UShort num);
-  // Decrements <num> by invoking the <decrement> operation on <r>
-  // and returning that value, finally stopping when it gets to zero.
-};
-
-interface Reactor 
-{
-  Long register_handler (in EventHandler eh);
-  // Turns around and queries <eh> for the peer.
-
-  oneway void set_value ();
-  // do-nothing oneway to check for proper operation.
-
-  UShort decrement (in EventHandler eh, in UShort num);
-  // Decrements <num> by invoking the <decrement> operation on <eh>
-  // and returning that value, finally stopping when it gets to zero.
-
-  void stop ();
-  // Stops the reactor.
-};
diff --git a/TAO/tests/NestedUpcall/client.cpp b/TAO/tests/NestedUpcall/client.cpp
deleted file mode 100644
index b47d00f2035..00000000000
--- a/TAO/tests/NestedUpcall/client.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    client.cpp
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Get_Opt.h"
-
-#include "tao/corba.h"
-
-#include "eh_i.h"
-
-CORBA::String_var remote_reactor_key = (char *) 0;
-
-// Completely arbitrary constant that ought to be big enough.
-#define MAX_IOR_SIZE 4096
-
-int
-parse_args (int argc_, char* argv_[])
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "df:k:");
-  int c;
-  char temp_buf[MAX_IOR_SIZE];
-  char *result = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'f':
-        {
-          FILE *ior_file_ =
-            ACE_OS::fopen (get_opts.optarg,"r");
-
-          if (ior_file_ == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unable to open %s for writing: %p\n",
-                               get_opts.optarg, "open"), -1);
-
-          result = ACE_OS::fgets (temp_buf, MAX_IOR_SIZE, ior_file_);
-          if (result == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unable to read ior from file %s: %p\n",
-                               get_opts.optarg,
-                               "fgets"),
-                              -1);
-
-          remote_reactor_key =
-            CORBA::string_copy (temp_buf);
-          ACE_OS::fclose (ior_file_);
-        }
-	break;
-      case 'k':
-        remote_reactor_key =
-          CORBA::string_copy (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-f ior-key-file]"
-                           " [-k ior-as-string]"
-                           "\n",
-                           argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "client",
-                                            TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the object adapter.
-      CORBA::Object_var poa_object =
-	orb->resolve_initial_references ("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      parse_args (argc, argv);
-
-      if (remote_reactor_key.in () == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: no remote Reactor key specified\n"),
-                          -1);
-
-      CORBA::Object_var reactor_object =
-        orb->string_to_object (ACE_const_cast(char*, remote_reactor_key.in ()),
-                               TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      Reactor_var remote_reactor = Reactor::_narrow (reactor_object.in (),
-                                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (remote_reactor.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: invalid Reactor key <%s>\n",
-                           argv[0], remote_reactor_key.in ()), -1);
-
-      // Create an EventHandler servant to hand to the other side...
-      auto_ptr<EventHandler_i> eh_impl (new EventHandler_i);
-      EventHandler_var eh = eh_impl->_this (TAO_TRY_ENV);
-
-      // Get into the event loop briefly...just to make sure that the
-      // ORB gets a chance to set things up for us to be a server.
-      // What this really means is that there's a listening port.
-      //
-      // The bad thing is that we have to do something non-standard
-      // such as call orb->run() with a zero timeout.  It would be
-      // nice if the spec gave us a standard way to do this.
-      if (orb->run (ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: %p\n",
-                           argv[0], "unable to get the ORB Core to listen"),
-                          -1);
-
-      // Now, after all that, we can invoke an operation on the remote
-      // side.
-      CORBA::Long r = remote_reactor->register_handler (eh.in (), TAO_TRY_ENV);
-
-      // We ought to have a result!
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s: received %d as return from register_handler ()\n",
-                  argv[0], r));
-
-      remote_reactor->set_value (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      remote_reactor->decrement (eh.in (), 5, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      remote_reactor->stop (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("main");
-      return 1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<EventHandler_i>;
-template class ACE_Auto_Basic_Ptr<EventHandler_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<EventHandler_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<EventHandler_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/NestedUpcall/client.dsp b/TAO/tests/NestedUpcall/client.dsp
deleted file mode 100644
index 2c6b4cc2c8a..00000000000
--- a/TAO/tests/NestedUpcall/client.dsp
+++ /dev/null
@@ -1,164 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\eh_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reactor.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\Reactor.idl

-InputName=Reactor

-

-BuildCmds= \

-	..\..\TAO_IDL\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\Reactor.idl

-InputName=Reactor

-

-BuildCmds= \

-	..\..\TAO_IDL\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorS.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/NestedUpcall/eh_i.cpp b/TAO/tests/NestedUpcall/eh_i.cpp
deleted file mode 100644
index 95821243136..00000000000
--- a/TAO/tests/NestedUpcall/eh_i.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "eh_i.h"
-
-// CTOR
-EventHandler_i::EventHandler_i (void)
-{
-}
-
-// DTOR
-EventHandler_i::~EventHandler_i (void)
-{
-}
-
-// Return a long
-CORBA::Long
-EventHandler_i::peer (CORBA::Environment &env)
-{
-  // Doesn't matter what value we return!
-  CORBA::Long val = 6;
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "EventHandler_i::peer() returning %d\n",
-              val));
-  
-  return val;
-}
-
-CORBA::UShort
-EventHandler_i::decrement (Reactor_ptr eh,
-                      CORBA::UShort num,
-                      CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num));
-  
-  CORBA::UShort ret;
-  if (--num <= 0)
-    ret = 0;
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) EventHandler::decrement() invoking Reactor::decrement(%d)%$", num));
-      ret = eh->decrement (_this (env), num, env);
-    }
-  ACE_DEBUG ((LM_DEBUG, "%}(%P|%t) EventHandler::decrement() returning %d%$", ret));
-  return ret;
-}
-
diff --git a/TAO/tests/NestedUpcall/eh_i.h b/TAO/tests/NestedUpcall/eh_i.h
deleted file mode 100644
index 3be2aa8f3ca..00000000000
--- a/TAO/tests/NestedUpcall/eh_i.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-#if !defined (EVENTHANDLER_I_H)
-#  define EVENTHANDLER_I_H
-
-#include "ReactorS.h"
-
-class EventHandler_i : public POA_EventHandler
-{
-  // = TITLE
-  //     Servant implementation for the <EventHandler> IDL interface. 
-public:
-  EventHandler_i (void);
-  // Constructor.
-
-  virtual ~EventHandler_i (void);
-  // Destructor.
-
-  virtual CORBA::Long peer (CORBA::Environment &env);
-  // Return some value...doesn't matter what.
-
-  virtual CORBA::UShort decrement (Reactor_ptr eh,
-                                   CORBA::UShort num,
-                                   CORBA::Environment &env);
-  // deccrement <num> by calling decrement thru <eh> until zero is
-  // reached, then return.
-};
-
-#endif /* EVENTHANDLER_I_H */
diff --git a/TAO/tests/NestedUpcall/reactor_i.cpp b/TAO/tests/NestedUpcall/reactor_i.cpp
deleted file mode 100644
index cb0010f82de..00000000000
--- a/TAO/tests/NestedUpcall/reactor_i.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "reactor_i.h"
-
-// CTOR
-Reactor_i::Reactor_i (void)
-{
-}
-
-// DTOR
-Reactor_i::~Reactor_i (void)
-{
-}
-
-// register...with nothing
-CORBA::Long
-Reactor_i::register_handler (EventHandler_ptr eh,
-                             CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Reactor_i::register_handler ()\n"));
-
-  CORBA::Long r = 0;
-
-  TAO_TRY
-    {
-      r = eh->peer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("getting peer");
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) got this value from peer: %d\n",
-              r));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Reactor_i::register_handler ()\n"));
-  return 0;
-}
-
-void
-Reactor_i::set_value (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) doing Reactor_i::set_value()\n"));
-}
-
-CORBA::UShort
-Reactor_i::decrement (EventHandler_ptr eh,
-                      CORBA::UShort num,
-                      CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num));
-  
-  CORBA::UShort ret;
-  if (--num <= 0)
-    ret = 0;
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reactor::decrement() invoking EventHandler::decrement(%d)%$", num));
-      Reactor_var me = _this (env);
-      ret = eh->decrement (me.in (), num, env);
-    }
-  ACE_DEBUG ((LM_DEBUG, "%}(%P|%t) Reactor::decrement() returning %d\n", ret));
-  return ret;
-}
-
-void
-Reactor_i::stop (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) stopping.\n"));
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
diff --git a/TAO/tests/NestedUpcall/reactor_i.h b/TAO/tests/NestedUpcall/reactor_i.h
deleted file mode 100644
index 3d4ede734c9..00000000000
--- a/TAO/tests/NestedUpcall/reactor_i.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-#if !defined (REACTOR_I_H)
-#  define REACTOR_I_H
-
-#include "ReactorS.h"
-
-class Reactor_i : public POA_Reactor
-{
-  // = TITLE
-  //     Implement the <Reactor> IDL interface.
-public:
-  Reactor_i (void);
-  // Constructor.
-
-  virtual ~Reactor_i (void);
-  // Destructor.
-
-  virtual CORBA::Long register_handler(EventHandler_ptr eh,
-                                       CORBA::Environment &env);
-  // Register (with nothing...it's an example!)
-
-  virtual void set_value (CORBA::Environment &env);
-
-  virtual CORBA::UShort decrement (EventHandler_ptr eh,
-                                   CORBA::UShort num,
-                                   CORBA::Environment &env);
-  // deccrement <num> by calling decrement thru <eh> until zero is
-  // reached, then return.
-
-  virtual void stop (CORBA::Environment &env);
-  // Stops the reactor.
-};
-
-#endif /* REACTOR_I_H */
diff --git a/TAO/tests/NestedUpcall/server.cpp b/TAO/tests/NestedUpcall/server.cpp
deleted file mode 100644
index 161e5e98e7b..00000000000
--- a/TAO/tests/NestedUpcall/server.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHOR
-//    Chris Cleeland
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "tao/TAO.h"
-#include "reactor_i.h"
-
-int
-main (int argc, char* argv[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "NestedUpcall server starting\n"));
-
-  TAO_TRY
-    {
-#if defined(DONT_USE_ORBMGR)
-      // @@ Chris, can you please try to replace most of this boiler
-      // plate code with the TAO_Object_Manager stuff that Sumedh has
-      // devised?  If we need to generalize his implementation to
-      // handle some of the things you do (e.g., create a special
-      // POAManager) please let me know.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "server", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the object adapter.
-      CORBA::Object_var poa_object =
-	orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in(),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::PolicyList policies (2);
-      policies.length (2);  
-      policies[0] =
-	root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               TAO_TRY_ENV);
-      policies[1] =
-	root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          TAO_TRY_ENV);
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      PortableServer::POA_var poa =
-	root_poa->create_POA ("Persistent_POA",
-                              poa_manager.in (),
-                              policies,
-                              TAO_TRY_ENV);  
-      TAO_CHECK_ENV;
-#else
-      TAO_ORB_Manager om;
-
-      om.init_child_poa (argc, argv, "Persistent_POA", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA_ORB_var orb = om.orb ();
-#endif      
-      
-
-      // Now that we've got all that done, we need to create our impl
-      // and register!
-      Reactor_i *reactor_impl = 0;
-      ACE_NEW_RETURN (reactor_impl, Reactor_i, -1);
-#if defined(DONT_USE_ORBMGR)
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("Reactor");
-
-      poa->activate_object_with_id (id.in (),
-                                    reactor_impl, TAO_TRY_ENV);
-#else
-      CORBA::String s = om.activate_under_child_poa ("Reactor", reactor_impl, TAO_TRY_ENV);
-      CORBA::string_free (s);
-#endif
-      TAO_CHECK_ENV;
-      
-
-      // Stringify the object
-      Reactor_ptr reactor = reactor_impl->_this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        orb->object_to_string (reactor, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) The reactor IOR is <%s>\n",
-                  str.in ()));
-      
-      // Run the server now.
-#if defined(DONT_USE_ORBMGR)
-      orb->run ();
-#else
-      om.run (TAO_TRY_ENV);
-#endif
-      CORBA::release (reactor);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("orb_init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, "NestedUpcall server ending\n"));
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/server.dsp b/TAO/tests/NestedUpcall/server.dsp
deleted file mode 100644
index a3324e9ea70..00000000000
--- a/TAO/tests/NestedUpcall/server.dsp
+++ /dev/null
@@ -1,162 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\Reactor.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\Reactor.idl

-InputName=Reactor

-

-BuildCmds= \

-	..\..\TAO_IDL\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\Reactor.idl

-InputName=Reactor

-

-BuildCmds= \

-	..\..\TAO_IDL\tao_idl $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\reactor_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/NestedUpcall/svc.conf b/TAO/tests/NestedUpcall/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/NestedUpcall/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.dsw b/TAO/tests/POA/Default_Servant/Default_Servant.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/POA/Default_Servant/Default_Servant.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/Default_Servant/File.idl b/TAO/tests/POA/Default_Servant/File.idl
deleted file mode 100644
index 0caa3792c23..00000000000
--- a/TAO/tests/POA/Default_Servant/File.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-//=================================================================
-//
-// = FILENAME
-//     File.idl
-//
-// = DESCRIPTION
-//     A simple File Descriptor and File System IDL interface.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================
-
-// IDL
-
-module File 
-{
-  exception IOError 
-    {
-      long error;
-    };
-
-  interface Descriptor 
-    {
-      typedef sequence<octet> DataBuffer;
-      
-	// write buffer to File
-      long write (in DataBuffer buffer)
-        raises (IOError);
-
-	// read num_bytes to DataBuffer
-      DataBuffer read (in long num_bytes)
-        raises (IOError);
-
-	// seek to offset in File from whence
-      unsigned long lseek (in unsigned long offset,
-                           in long whence)
-        raises (IOError);
-
-	// destroy the descriptor
-      void destroy ();
-    };
-
-  interface System 
-    {
-	// File open operation
-      Descriptor open (in string file_name, in long flags)
-        raises (IOError);
-    };        
-};
diff --git a/TAO/tests/POA/Default_Servant/File_i.cpp b/TAO/tests/POA/Default_Servant/File_i.cpp
deleted file mode 100644
index c1b2771d3c0..00000000000
--- a/TAO/tests/POA/Default_Servant/File_i.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-//
-//===================================================================
-//
-// = FILENAME
-//     File_i.cpp
-//
-// = DESCRIPTION
-//      Implementation of the File IDL module and the interfaces
-//      Descriptor and System in it.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-#include "File_i.h"
-
-// IDL File::System constructor
-FileImpl::System::System (PortableServer::POA_ptr poa)
- : poa_ (PortableServer::POA::_duplicate (poa)),
-   // Create the Default Descriptor Servant
-    fd_servant_ (poa)
-{
-  CORBA::Environment env;
-  // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_, env);
-  ACE_ASSERT (env.exception () == 0);
-}
-
-FileImpl::System::~System (void)
-{
-}
-
-PortableServer::POA_ptr
-FileImpl::System::_default_POA (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-File::Descriptor_ptr
-FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags,
-                        CORBA::Environment &env)
-{
-  // Do an ACE_OS::open
-  ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
-                                             flags);
-
-  if (file_descriptor == ACE_INVALID_HANDLE)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-
-  char file_descriptor_buffer[BUFSIZ];
-
-  // convert ACE_HANDLE to a string
-  ACE_OS::sprintf (file_descriptor_buffer,
-                   "%ld",
-                   (CORBA::Long) file_descriptor);
-
-  //Create an objectID from the ACE_HANDLE string
-  PortableServer::ObjectId_var oid =
-    PortableServer::string_to_ObjectId (file_descriptor_buffer);
-
-  // create an object reference with the specified ObjectID got
-  // from ACE_HANDLE string
-  CORBA::Object_var obj =
-    this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0",
-                                          env);
-  if (env.exception () != 0)
-    return File::Descriptor::_nil ();
-
-  // Narrow the object reference to a File Descriptor
-  File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in (), env);
-
-  if (env.exception () != 0)
-    return File::Descriptor::_nil ();
-
-  return fd._retn ();
-}
-
-// IDL File::Descriptor constructor
-FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
-  : poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-FileImpl::Descriptor::~Descriptor (void)
-{
-}
-
-PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-//Extracts the ACE_HANDLE from the passed object reference
-ACE_HANDLE
-FileImpl::Descriptor::fd (CORBA::Environment &env)
-{
-  // Get a reference to myself
-  File::Descriptor_var me = this->_this (env);
-
-  if (env.exception () != 0)
-    return ACE_INVALID_HANDLE;
-
-  // Get the ObjectId from the reference
-  PortableServer::ObjectId_var oid =
-    this->poa_->reference_to_id (me.in (), env);
-
-  if (env.exception () != 0)
-    return ACE_INVALID_HANDLE;
-
-  // Convert the ObjectId to a string
-  CORBA::String_var s =
-    PortableServer::ObjectId_to_string (oid.in ());
-
-  // Get the ACE_HANDLE from the string
-  return (ACE_HANDLE) ::atol (s.in ());
-}
-
-CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
-                             CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  const CORBA::Octet *data = &buffer[0];
-
-  ssize_t len = ACE_OS::write (file_descriptor,
-                               data,
-                               buffer.length ());
-  if (len > 0)
-    return len;
-  else
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes,
-                            CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
-  int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
-
-  if (length > 0)
-    return new File::Descriptor::DataBuffer (length,
-                                             length,
-                                             buffer,
-                                             CORBA::B_TRUE);
-  else
-    {
-      File::Descriptor::DataBuffer::freebuf (buffer);
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-CORBA::ULong
-FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence,
-                             CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
-                                                    offset,
-                                                    whence);
-  if (result == -1)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-  else
-    return (CORBA::ULong) result;
-}
-
-void
-FileImpl::Descriptor::destroy (CORBA::Environment &env)
-{
-  // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return;
-
-  //close the file corresponding to this object reference
-  int result = ACE_OS::close (file_descriptor);
-
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return;
-    }
-}
diff --git a/TAO/tests/POA/Default_Servant/File_i.h b/TAO/tests/POA/Default_Servant/File_i.h
deleted file mode 100644
index 4ebbccea87b..00000000000
--- a/TAO/tests/POA/Default_Servant/File_i.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-//===================================================================
-//
-// = FILENAME
-//     File_i.h
-//
-// = DESCRIPTION
-//      Defines the implementation classes for the File IDL
-//     module
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-
-
-#include "FileS.h"
-
-class FileImpl
-// FileImpl class provides the namespace for the File IDL module .
-{
-public:
-  class Descriptor : public POA_File::Descriptor
-    // Descriptor implements the Descriptor interface in the File Module
-    // A single Descriptor servant can serve multiple object references
-  {
-  public:
-    //Constructor
-    Descriptor (PortableServer::POA_ptr poa);
-
-    //Destructor
-    ~Descriptor (void);
-
-    // Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-    // write buffer to File corresponding to this Descriptor
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer, 
-                               CORBA::Environment &env);
-
-    // Reads num_bytes from the file and returns it
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes, 
-                                                CORBA::Environment &env);
-    // seek to the offset in file from whence
-    virtual CORBA::ULong lseek (CORBA::ULong offset, 
-                                CORBA::Long whence,  
-                                CORBA::Environment &env);
-
-    // closes the file corresponding to the requested ObjectID
-    virtual void destroy (CORBA::Environment &env);
-
-  private:
-    
-    // Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (CORBA::Environment &env);
-   
-    PortableServer::POA_var poa_;
-  };
-
-  class System : public POA_File::System
-    // File System implementation class
-  {
-  public:
-    // Constructor, Creates a single File Descriptor Servant and 
-    // registers it with the POA as the Default Servant
-    System (PortableServer::POA_ptr poa);
-
-    //Destructor
-    ~System (void);
-
-    //Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-    //Opens a file ,creates a Descriptor reference with the ACE_HANDLE
-    // and returns that reference	
-    File::Descriptor_ptr open (const char *file_name, 
-                               CORBA::Long flags,
-                               CORBA::Environment &env);
-    
-  private:
-    PortableServer::POA_var poa_;
-    
-    // The single File Descriptor servant which serves requests for any
-    // Descriptor object under poa_.
-    Descriptor fd_servant_;
-  };
-};
-
diff --git a/TAO/tests/POA/Default_Servant/Makefile b/TAO/tests/POA/Default_Servant/Makefile
deleted file mode 100644
index a6df3a59a33..00000000000
--- a/TAO/tests/POA/Default_Servant/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= FileC.cpp FileS.cpp
-PROG_SRCS =	$(IDL_SRC) server.cpp client.cpp File_i.cpp
-
-LSRC = $(PROG_SRCS)
-
-FILE_SVR_OBJS = FileC.o FileS.o server.o File_i.o
-FILE_CLT_OBJS = FileC.o FileS.o client.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-DCFLAGS = -g
-
-.PRECIOUS: FileC.h FileC.i FileC.cpp FileS.h FileS.i FileS.cpp
-
-server:	$(addprefix $(VDIR),$(FILE_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf FileC.* FileS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/Default_Servant/README b/TAO/tests/POA/Default_Servant/README
deleted file mode 100644
index d64c59dbe80..00000000000
--- a/TAO/tests/POA/Default_Servant/README
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-
-Default_Servants
-================
-	
-	By using the USE_DEFAULT_SERVANT policy, the developer can create
-	a POA that will use a single servant to implement all of its objects.
-	This approach is useful when there is very little data associated 
-	with each object, so little that the data can be encoded in the
-	Object Id.
-
-Example:
-=======
-	In the example implementation a Single Servant is enough to
-	serve requests for a File Descriptor interface. The Object Id of the
-	Descriptor objects are formed from the file handle returned by the
-	System call. The servant can get the file handle from the object
-	reference to process the request. Thus a single Descriptor servant
-	can serve multiple objects.
-
-SERVER:
-======
-
-	1. To run the server, type
-	
-	   % server [-ORBport port] [-ORBobjrefstyle URL] [-ORBhost host]
-			
-CLIENT:
-======
-	The client tries to create a file "test" and writes a message to 
-	the file and reads it back and prints it.
-
-	1. To run the client, type
-
-	   % client -k IOR
-
-	where the IOR is got from the server output.
-
-	
-	
-	
-
-
-		
diff --git a/TAO/tests/POA/Default_Servant/client.cpp b/TAO/tests/POA/Default_Servant/client.cpp
deleted file mode 100644
index 78ad1ab6aee..00000000000
--- a/TAO/tests/POA/Default_Servant/client.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/client
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "FileC.h"
-
-static char *ior = 0;
-static char *filename = "test";
-static char *message = "POA rules!!";
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:f:m:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case 'f':
-        filename = get_opts.optarg;
-        break;
-      case 'm':
-        message = get_opts.optarg;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           "-k IOR"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  if (ior == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Please specify the IOR for the servant"), -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Parse the command-line arguments to get the IOR 
-  parse_args (argc, argv);
-
-  // Get the object reference with the IOR
-  CORBA::Object_var object = orb->string_to_object (ior, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::string_to_object");
-      return -1;
-    }
-  
-  // Narrow the object reference to a File::System
-  File::System_var file_system = File::System::_narrow (object.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::System::_narrow");
-      return -1;
-    }
-
-  // Creat the file filename i.e "test"
-  File::Descriptor_var fd = file_system->open (filename, O_CREAT | O_RDWR, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::System::open");
-      return -1;
-    }
-
-  int message_length = ACE_OS::strlen (message) + 1;
-  CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (message_length);
-  ACE_OS::strcpy ((char *) buffer, message);
-  File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, CORBA::B_TRUE);
-
-  // write the message to the file
-  fd->write (data_sent, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::write");
-      return -1;
-    }
-
-  //seek to the beginning of the file
-  fd->lseek (0, SEEK_SET, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::lseek");
-      return -1;
-    }
-
-  // Read back the written message
-  File::Descriptor::DataBuffer_var data_received = fd->read (message_length, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::read");
-      return -1;
-    }
-
-  char *result = (char *) &data_received[0];
-
-  // print the read message
-  ACE_DEBUG((LM_DEBUG,"%s\n",
-	     result));
-
-  // close the file 
-  fd->destroy (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Default_Servant/client.dsp b/TAO/tests/POA/Default_Servant/client.dsp
deleted file mode 100644
index d9b6b151a3b..00000000000
--- a/TAO/tests/POA/Default_Servant/client.dsp
+++ /dev/null
@@ -1,160 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client__"

-# PROP BASE Intermediate_Dir "client__"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\File.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\File.idl

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl File.idl

-

-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\File.idl

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl File.idl

-

-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\FileC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FileS.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Default_Servant/server.cpp b/TAO/tests/POA/Default_Servant/server.cpp
deleted file mode 100644
index ba398514034..00000000000
--- a/TAO/tests/POA/Default_Servant/server.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/server
-//
-//  = FILENAME
-//      server.cpp
-//
-//  = DESCRIPTION
-//      A server program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-
-#include "ace/streams.h"
-#include "File_i.h"
-
-int 
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Get the Root POA object reference
-  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-  // Narrow the object reference to a POA reference
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-  
-  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::the_POAManager");
-      return -1;
-    }
-  
-  // CORBA::PolicyList policies (5);
-  PortableServer::PolicyList policies (5);
-  policies.length (5);  
-
-  // ID Assignment Policy
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
-      return -1;
-    }
-
-  // Lifespan Policy
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_lifespan_policy");
-      return -1;
-    }
-  
-  // Request Processing Policy
-  policies[2] =
-    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_request_processing_policy");
-      return -1;
-    }
-  
-  // Servant Retention Policy
-  policies[3] =
-    root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_servant_retention_policy");
-      return -1;
-    }
-
-  // Id Uniqueness Policy
-  policies[4] =
-    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_uniqueness_policy");
-      return -1;
-    }
-
-  ACE_CString name = "firstPOA";
-  PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
-                                                            poa_manager.in (),
-                                                            policies,
-                                                            env);  
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }  
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Create a File System Implementation object in first_poa
-  FileImpl::System file_system_impl (first_poa.in ());
-
-  PortableServer::ObjectId_var file_system_oid =
-    PortableServer::string_to_ObjectId ("FileSystem");
-
-  first_poa->activate_object_with_id (file_system_oid.in (), 
-                                      &file_system_impl, 
-                                      env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::activate_object_with_id");
-      return -1;
-    }
-  
-  CORBA::Object_var file_system =
-    first_poa->id_to_reference (file_system_oid.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::id_to_reference");
-      return -1;
-    }
-  // Get the IOR for the "FileSystem" object
-  CORBA::String_var file_system_ior =
-    orb->object_to_string (file_system.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  ACE_DEBUG((LM_DEBUG,"%s\n",
-	     file_system_ior.in ()));
-
-  // set the state of the poa_manager to active i.e ready to process requests
-  poa_manager->activate (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::activate");
-      return -1;
-    }
-
-  // Run the ORB
-  if (orb->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-  // Destroy the rootPOA and its children
-  root_poa->destroy (CORBA::B_TRUE, 
-                     CORBA::B_TRUE, 
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
-
-
diff --git a/TAO/tests/POA/Default_Servant/server.dsp b/TAO/tests/POA/Default_Servant/server.dsp
deleted file mode 100644
index e18b2ce8743..00000000000
--- a/TAO/tests/POA/Default_Servant/server.dsp
+++ /dev/null
@@ -1,164 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\File.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\File.idl

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl File.idl

-

-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\File.idl

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl File.idl

-

-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\File_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FileC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FileS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Default_Servant/svc.conf b/TAO/tests/POA/Default_Servant/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/POA/Default_Servant/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/POA/Explicit_Activation/Explicit_Activation.dsw b/TAO/tests/POA/Explicit_Activation/Explicit_Activation.dsw
deleted file mode 100644
index 293f7320fc8..00000000000
--- a/TAO/tests/POA/Explicit_Activation/Explicit_Activation.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/Explicit_Activation/Makefile b/TAO/tests/POA/Explicit_Activation/Makefile
deleted file mode 100644
index e525d97f48b..00000000000
--- a/TAO/tests/POA/Explicit_Activation/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-BIN = server
-
-LSRC = 	$(addsuffix .cpp,$(BIN))
-
-CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
-
-LDLIBS     =   -lserver -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-INSTALL =
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/Explicit_Activation/README b/TAO/tests/POA/Explicit_Activation/README
deleted file mode 100644
index c167476cc8b..00000000000
--- a/TAO/tests/POA/Explicit_Activation/README
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
------
-
-!!!!!!!!!!!!   Bug   !!!!!!!!!!!
-Currently, this application has some bugs. The _narrow function at the
-server fails.  
-It will be fixed soon.
-!!!!!!!!!!!!   BUG   !!!!!!!!!!!
-
-This application demostrates various operations that can be used for
-explicit activation of Servant objects.
-
-The server program is available here. Use the Generic_Servant/client
-program to test this.
-
-Run the server as follows:
-
-% ./server -ORBobjrefstyle URL &
-
-
-Run the client as follows:
-
-% cd $TAO_ROOT/tests/POA/Generic_Servant
-% ./client -k <IOR>
-
-
-Comments : 
-=========
-
- - As soon as, the server prints out the IOR, cut it and use it for
-running the client.
----------
-
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
deleted file mode 100644
index 05c068e52ab..00000000000
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// $Id$
-
-// ===========================================================================================
-// = LIBRARY
-//    TAO/tests/POA/Explicit_Activation
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    In this example,
-//     - A new POA ( firstPOA) is created, and the different functions
-//       for the explicit activation of objects are demonstrated.
-//     - The Foo application class objects (defined in
-//       ./../Generic_Servant/MyFooSerVant) are used as sample objects. 
-//
-// = AUTHOR
-//    Irfan Pyarali
-// ===========================================================================================
-
-#include "ace/streams.h"
-#include "MyFooServant.h"
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB first.
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Obtain the RootPOA.
-  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-  // Get the POA_var object from Object_var.
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  // Get the POAManager of the RootPOA.
-  PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::the_POAManager");
-      return -1;
-    }
-
-  // Policies for the firstPOA to be created.
-  // CORBA::PolicyList policies (2); 
-  PortableServer::PolicyList policies (2);
-  policies.length (2);
-
-  // Id Assignment Policy
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
-      return -1;
-    }
-
-  // Lifespan policy
-  policies[1] = 
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_lifespan_policy");
-      return -1;
-    }
-
-  // Create the firstPOA under the RootPOA.
-  ACE_CString name = "firstPOA";
-  PortableServer::POA_var first_poa =
-    root_poa->create_POA (name.c_str (),
-                          poa_manager.in (),
-                          policies,
-                          env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Creation of firstPOA is over. Destroy the Policy objects.
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Create two Objects of Class MyFooServant (defined in
-  // ./../GenericServant/MyFooServant.h) Create one object at RootPOA
-  // and the other at firstPOA.
-  MyFooServant first_foo_impl (root_poa.in (), 27);
-  MyFooServant second_foo_impl (first_poa.in (), 28);
-
-  // Do "activate_object" to activate the first_foo_impl object.  It
-  // returns ObjectId for that object.  Operation Used :
-  //  ObjectId activate_object( in Servant p_servant)
-  //    raises (ServantAlreadyActive, WrongPolicy);
-  PortableServer::ObjectId_var first_oid =
-    root_poa->activate_object (&first_foo_impl, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::activate_object");
-      return -1;
-    }
-
-  // Get Object Reference for the first_foo_impl object.
-  Foo_var first_foo = first_foo_impl._this (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("POA_Foo::_this");
-      return -1;
-    }
-
-  // Get ObjectId for object secondFoo and use that ObjectId to
-  // activate the second_foo_impl object.
-  // Operation Used :
-  //  void activate_object_with_id( in ObjectId oid, in Servant p_servant)
-  //       raises (ObjectAlreadyActive, ServantAlreadyActive, WrongPolicy);
-  PortableServer::ObjectId_var second_oid =
-    PortableServer::string_to_ObjectId ("secondFoo");
-
-  first_poa->activate_object_with_id (second_oid.in (),
-                                      &second_foo_impl,
-                                      env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::activate_object_with_id");
-      return -1;
-    }
-
-  // Get Object reference for second_foo_impl object.
-  Foo_var second_foo = second_foo_impl._this (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("POA_Foo::_this");
-      return -1;
-    }
-
-  // Get ObjectId for the string thirdPOA Create the object reference
-  // for thirdPOA using that ObjectId.  Operation Used :
-  //   Object create_reference_with_id (in ObjectId oid, in CORBA::RepositoryId intf );
-  // This operation creates an object reference that encapsulates the
-  // specified Object Id and interface repository Id values.
-  /* 
-  PortableServer::ObjectId_var third_oid =
-    PortableServer::string_to_ObjectId ("thirdFoo");
-  */
-
-  // This will test how the POA handles a user given ID
-  PortableServer::ObjectId_var third_oid = 
-    PortableServer::string_to_ObjectId ("third Foo");
-
-  third_oid[5] = (CORBA::Octet) '\0';
-
-  CORBA::Object_var third_foo =
-    first_poa->create_reference_with_id (third_oid.in (),
-                                         "IDL:Foo:1.0", env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_reference_with_id");
-      return -1;
-    }
-
-  // Stringyfy all the object references and print them out.
-  CORBA::String_var first_ior =
-    orb->object_to_string (first_foo.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  CORBA::String_var second_ior =
-    orb->object_to_string (second_foo.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  CORBA::String_var third_ior =
-    orb->object_to_string (third_foo.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  cout << first_ior.in () << endl;
-  cout << second_ior.in () << endl;
-  cout << third_ior.in () << endl;
-
-  // Activate thirdPOA using its ObjectID.
-  MyFooServant third_foo_impl (first_poa.in (), 29);
-  first_poa->activate_object_with_id (third_oid.in (),
-                                      &third_foo_impl,
-                                      env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::activate_object_with_id");
-      return -1;
-    }
-
-  poa_manager->activate (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::activate");
-      return -1;
-    }
-
-  if (orb->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-  // Destroy RootPOA. ( Also destroys firstPOA)
-  root_poa->destroy (CORBA::B_TRUE,
-                     CORBA::B_TRUE,
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Explicit_Activation/server.dsp b/TAO/tests/POA/Explicit_Activation/server.dsp
deleted file mode 100644
index 0421abf651e..00000000000
--- a/TAO/tests/POA/Explicit_Activation/server.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Explicit_Activation/svc.conf b/TAO/tests/POA/Explicit_Activation/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/POA/Explicit_Activation/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/POA/FindPOA/FindPOA.cpp b/TAO/tests/POA/FindPOA/FindPOA.cpp
deleted file mode 100644
index 583b5c83981..00000000000
--- a/TAO/tests/POA/FindPOA/FindPOA.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// $Id$
-
-//===============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/FindPOA
-//
-// = FILENAME
-//     FindPOA.cpp
-//
-// = DESCRIPTION
-//     This Program tests the find_POA method of a POA.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "ace/streams.h"
-#include "tao/corba.h"
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Get Object reference to RootPOA.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA");
-
-  // Narrow Object reference to RootPOA to a POA reference.
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in(), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  // Get a TAO_Adapter_Activator reference
-  TAO_Adapter_Activator activator_impl;
-
-  PortableServer::AdapterActivator_var activator =
-    activator_impl._this (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("TAO_Adapter_Activator::_this");
-      return -1;
-    }
-
-  // Register the TAO_Adapter_Activator reference to be the RootPOA's
-  // Adapter Activator.
-
-  root_poa->the_activator (activator.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::the_activator");
-      return -1;
-    }
-
-  // Try to find a childPOA of RootPOA named firstPOA
-  ACE_CString name = "firstPOA";
-  PortableServer::POA_var first_poa =
-    root_poa->find_POA (name.c_str (),
-                        CORBA::B_TRUE,
-                        env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::find_POA");
-      return -1;
-    }
-
-  // Use the TAO_POA name_separator (which is '/') to find a childPOA
-  // of firstPOA named secondPOA.
-
-  name += TAO_POA::name_separator ();
-  name += "secondPOA";
-  PortableServer::POA_var second_poa =
-    root_poa->find_POA (name.c_str (),
-                        CORBA::B_TRUE,
-                        env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::find_POA");
-      return -1;
-    }
-
-  // Create a hierarchical string of POA names
-  // eg. thirdPOA/forthPOA/fifthPOA thirdPOA being the root of the
-  // hierarchy with forthPOA as its child and fifthPOA as its
-  // grandchild.
-
-  name = "thirdPOA";
-  name += TAO_POA::name_separator ();
-  name += "forthPOA";
-  name += TAO_POA::name_separator ();
-  name += "fifthPOA";
-
-  // Try to find the fifth_poa by passing the hierarchy of POA names
-  // resulting in the creation of third and forth POAs as well as the
-  // fifth POA.
-
-  PortableServer::POA_var fifth_poa =
-    root_poa->find_POA (name.c_str (),
-                        CORBA::B_TRUE,
-                        env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::find_POA");
-      return -1;
-    }
-
-  // Get the names of all the POAs
-
-  CORBA::String_var root_poa_name =
-    root_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var first_poa_name =
-    first_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var second_poa_name =
-    second_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var fifth_poa_name =
-    fifth_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-
-  ACE_DEBUG((LM_DEBUG,"%s\n%s\n%s\n%s\n",
-	     root_poa_name.in (),
-	     first_poa_name.in (),
-	     second_poa_name.in (),
-	     fifth_poa_name.in ()));
-
-  // This should destroy all its children
-
-  root_poa->destroy (CORBA::B_TRUE,
-                     CORBA::B_TRUE,
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/FindPOA/FindPOA.dsp b/TAO/tests/POA/FindPOA/FindPOA.dsp
deleted file mode 100644
index 77859c2e61d..00000000000
--- a/TAO/tests/POA/FindPOA/FindPOA.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="FindPOA" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=FindPOA - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "FindPOA.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "FindPOA.mak" CFG="FindPOA - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "FindPOA - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "FindPOA - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "FindPOA - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "FindPOA - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "FindPOA - Win32 Release"

-# Name "FindPOA - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\FindPOA.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/FindPOA/FindPOA.dsw b/TAO/tests/POA/FindPOA/FindPOA.dsw
deleted file mode 100644
index f63bde91efd..00000000000
--- a/TAO/tests/POA/FindPOA/FindPOA.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "FindPOA"=.\FindPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/FindPOA/Makefile b/TAO/tests/POA/FindPOA/Makefile
deleted file mode 100644
index 9e1c2376493..00000000000
--- a/TAO/tests/POA/FindPOA/Makefile
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# $Id$
-#
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-BIN = FindPOA
-
-LSRC = 	$(addsuffix .cpp,$(BIN))
-
-CPPFLAGS += -I$(TAO_ROOT)
-
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-INSTALL =
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/FindPOA.o .obj/FindPOA.so .shobj/FindPOA.o .shobj/FindPOA.so: FindPOA.cpp \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/FindPOA/README b/TAO/tests/POA/FindPOA/README
deleted file mode 100644
index 8895bb62512..00000000000
--- a/TAO/tests/POA/FindPOA/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-FindPOA test:
-============
-
-Executable:	FindPOA
-
-
-Description:
-===========
-	This is a program to test the findPOA method of the POA. It makes use of TAO_Adapter_Activator.
-	Adapter activators are associated with POAs. An adapter activator supplies a POA with the ability to create child POAs on demand
-	, as a side-effect of receiving a request that names the child POA (or one of its children),
-	or when find_POA is called with an activate parameter value of TRUE. An application server that creates
-	 all its needed POAs at the beginning of execution does not need to use or provide an adapter activator;
-	 it is necessary only for the case in which POAs need to be created during request processing.
-		TAO_Adapter_Activator takes a '/' (backslash) separated string of POA names and creates them
-	in a hierarchy with the left most substring as the root of that hierarchy.
-
-		The test program tests the "findPOA" method in RootPOA with a single POA named "firstPOA" and
-	then with a POA namestring "firstPOA/secondPOA". In the second case the secondPOA is
-	non-existent and is created.
-		Finally the findPOA method in RootPOA is called with a string "thirdPOA/forthPOA/fifthPOA",
-	resulting in the creation of thirdPOA,forthPOA and a fifthPOA and returns the fifthPOA.
-
-	To check the findPOA method the names of the POA are queried and printed on the screen. POAs hold only the
-	name relative to its parent. For eg. the name of fifthPOA is just "fifthPOA" and NOT "RootPOA/thirdPOA/forthPOA/fifthPOA".
-
-To Test:
-========
-	1. Just run the FindPOA program.
-
-	2. You should see the following as the output:
-
-		RootPOA
-		firstPOA
-		secondPOA
-		fifthPOA
-
-	3. There might be other diagnostic messages.
diff --git a/TAO/tests/POA/Generic_Servant/Foo.idl b/TAO/tests/POA/Generic_Servant/Foo.idl
deleted file mode 100644
index 0773c9a0325..00000000000
--- a/TAO/tests/POA/Generic_Servant/Foo.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-//===============================================================================
-//
-// = FILENAME
-//     Foo.idl
-//
-//==================================================================================
-
-// IDL
-
-interface Foo
-{
-  long doit();
-};
diff --git a/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw b/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/Generic_Servant/Makefile b/TAO/tests/POA/Generic_Servant/Makefile
deleted file mode 100644
index 0c9a9b1781d..00000000000
--- a/TAO/tests/POA/Generic_Servant/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-TAO_IDLFLAGS = -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
-
-LDLIBS = -lTAO
-
-LIB = libserver.a
-
-IDL_SRC	= FooC FooS
-
-BINFILES = $(IDL_SRC) client
-
-LIB_SRC = $(IDL_SRC) MyFooServant
-
-LSRC = $(addsuffix .cpp,$(LIB_SRC))
-LOBJ = $(addsuffix .o,$(LIB_SRC))
-
-POA_CLT_SRCS = $(addsuffix .cpp,$(BINFILES))
-POA_CLT_OBJS = $(addprefix $(VDIR),$(addsuffix .o,$(BINFILES)))
-
-BIN = client
-
-BUILD = $(VOBJS) $(VLIB) $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-DCFLAGS = -g
-
-#$(IDL_SRC): cubit.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
-
-client: $(POA_CLT_OBJS)
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-#clean:
-#	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf FooC.* FooS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/Generic_Servant/MyFooServant.cpp b/TAO/tests/POA/Generic_Servant/MyFooServant.cpp
deleted file mode 100644
index 29e6a02c3f7..00000000000
--- a/TAO/tests/POA/Generic_Servant/MyFooServant.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-//===============================================================================
-//
-//
-// = FILENAME
-//     MyFooServant.cpp
-//
-// = DESCRIPTION
-//     This is a simple foo servant implementation
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "MyFooServant.h"
-
-// Constructor
-MyFooServant::MyFooServant (PortableServer::POA_ptr poa,
-                            CORBA::Long value)
-  : poa_ (PortableServer::POA::_duplicate (poa)),
-    value_ (value)
-{
-}
-
-// Destructor
-MyFooServant::~MyFooServant (void)
-{
-}
-
-// Return the Default POA of this Servant
-PortableServer::POA_ptr
-MyFooServant::_default_POA (CORBA::Environment &/*env*/)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in());
-}
-
-// Return this->value
-CORBA::Long
-MyFooServant::doit (CORBA::Environment &/*env*/)
-{
-  return this->value_;
-}
diff --git a/TAO/tests/POA/Generic_Servant/MyFooServant.h b/TAO/tests/POA/Generic_Servant/MyFooServant.h
deleted file mode 100644
index 60d08af7ce1..00000000000
--- a/TAO/tests/POA/Generic_Servant/MyFooServant.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-//=============================================================================
-//
-//
-// = FILENAME
-//     MyFooServant.h
-//
-// = DESCRIPTION
-//     Defines MyFooServant class for the Foo interface
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=============================================================================
-
-#if !defined (MYFOOSERVANT_H)
-#define MYFOOSERVANT_H
-
-#include "FooS.h"
-
-class GENERIC_SERVANT_Export MyFooServant : public POA_Foo
-{
-public:
-  // constructor - takes a POA and a value parameter
-  MyFooServant (PortableServer::POA_ptr poa,
-                CORBA::Long value);
-
-  // Destructor
-  virtual ~MyFooServant (void);
-
-  //Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-  // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env);
-
-protected:
-  // Default poa associated with this servant
-  PortableServer::POA_var poa_;
-  CORBA::Long value_;
-};
-
-#endif /* MYFOOSERVANT_H */
diff --git a/TAO/tests/POA/Generic_Servant/README b/TAO/tests/POA/Generic_Servant/README
deleted file mode 100644
index 05ee0f2a18e..00000000000
--- a/TAO/tests/POA/Generic_Servant/README
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-Generic Servant:
-===============
-
-File Name
----------
-
-Foo.idl                 Simple Foo idl interface
-MyFooServant.h          Servant definition  for the Foo interface
-MyFooServant.cpp        Servant implementation for the FOO interface
-client.cpp              A simple Foo client
-
-Typing
-
-% Make
-
- creates an executable client and server library libserver.a.
-
-To run the client, type 
-
-% client [-ORBport port] -k IOR
-
-where IOR can be got from the server output.
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
deleted file mode 100644
index 18b75d1e86f..00000000000
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-//===============================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a simple foo client implementation.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include "FooC.h"
-
-static char *IOR = 0;
-static int iterations = 1;
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        IOR = get_opts.optarg;
-        break;
-      case 'i':
-        iterations = ::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           "-k IOR"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  if (IOR == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Please specify the IOR for the servant\n"), -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-void
-print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
-             int iterations)
-{
-  if (iterations > 0)
-    {
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= iterations;
-      elapsed_time.user_time /= iterations;
-      elapsed_time.system_time /= iterations;
-
-      double tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t = %0.06f ms, \n"
-		  "\tuser_time\t = %0.06f ms, \n"
-		  "\tsystem_time\t = %0.06f ms, \n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
-		  elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time,
-		  tmp < 0.0 ? 0.0 : tmp));
-    }
-  else
-    ACE_ERROR ((LM_ERROR,
-		"\tNo time stats printed.  Zero iterations or error ocurred.\n"));
-}
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Initialize options based on command-line arguments.
-  int parse_args_result = parse_args (argc, argv);
-  if (parse_args_result != 0)
-    return parse_args_result;
-
-  // Get an object reference from the argument string.
-  CORBA::Object_var object = orb->string_to_object (IOR, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::string_to_object");
-      return -1;
-    }
-
-  // Try to narrow the object reference to a Foo reference.
-  Foo_var foo = Foo::_narrow (object.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("Foo::_narrow");
-      return -1;
-    }
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  CORBA::Long result = 0;
-  int i = 0;
-  for (i = 0; i < iterations; i++ && env.exception () == 0)
-    {
-      // Invoke the doit() method of the foo reference.
-      result = foo->doit (env);
-    }
-     
-  // stop the timer.
-  timer.stop ();
-  timer.elapsed_time (elapsed_time);
-
-  // compute average time.
-  print_stats (elapsed_time, i);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("Foo::doit");
-      return -1;
-    }
-  
-  // Print the result of doit () method of the foo reference.
-  cout << result << endl;
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
deleted file mode 100644
index 4ee9d087ee9..00000000000
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ /dev/null
@@ -1,164 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client__"

-# PROP BASE Intermediate_Dir "client__"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Foo.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\Foo.idl

-InputName=Foo

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

- -Wb,export_include=generic_servant_export.h $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\Foo.idl

-InputName=Foo

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

- -Wb,export_include=generic_servant_export.h $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\FooC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FooS.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
deleted file mode 100644
index ad0e36483ab..00000000000
--- a/TAO/tests/POA/Generic_Servant/generic_servant_export.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
-// ------------------------------
-#if !defined (GENERIC_SERVANT_EXPORT_H)
-#define GENERIC_SERVANT_EXPORT_H
-
-#include "ace/OS.h"
-
-#if defined (GENERIC_SERVANT_HAS_DLL)
-#  if (GENERIC_SERVANT_HAS_DLL == 1)
-#    if defined (GENERIC_SERVANT_BUILD_DLL)
-#      define GENERIC_SERVANT_Export ACE_Proper_Export_Flag
-#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-#    else
-#      define GENERIC_SERVANT_Export ACE_Proper_Import_Flag
-#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#    endif /* GENERIC_SERVANT_BUILD_DLL */
-#  else
-#    define GENERIC_SERVANT_Export
-#    define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#    define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#  endif   /* ! GENERIC_SERVANT_HAS_DLL == 1 */
-#else
-#  define GENERIC_SERVANT_Export
-#  define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#  define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#endif     /* GENERIC_SERVANT_HAS_DLL */
-
-#endif     /* GENERIC_SERVANT_EXPORT_H */
-           // End of auto generated file.
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
deleted file mode 100644
index 78b16995046..00000000000
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ /dev/null
@@ -1,176 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server__"

-# PROP BASE Intermediate_Dir "server__"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server_0"

-# PROP BASE Intermediate_Dir "server_0"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-# Begin Special Build Tool

-SOURCE=$(InputPath)

-PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\

- ..\On_Demand_Activation

-PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\

- ..\On_Demand_Activation

-# End Special Build Tool

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\Foo.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\Foo.idl

-InputName=Foo

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

- -Wb,export_include=generic_servant_export.h $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\Foo.idl

-InputName=Foo

-

-BuildCmds= \

-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

- -Wb,export_include=generic_servant_export.h $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\FooC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FooS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MyFooServant.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/Makefile b/TAO/tests/POA/Makefile
deleted file mode 100644
index 1876f90703c..00000000000
--- a/TAO/tests/POA/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-# Makefile for the POA tests
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Generic_Servant \
-	Default_Servant \
-	Explicit_Activation \
-	FindPOA \
-	NewPOA \
-	On_Demand_Activation \
-	RootPOA
-
-# The following test hasn't been updated yet
-# Demux_Test
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/POA/NewPOA/Makefile b/TAO/tests/POA/NewPOA/Makefile
deleted file mode 100644
index ccfaf7f5e19..00000000000
--- a/TAO/tests/POA/NewPOA/Makefile
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# $Id$
-#
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-BIN = NewPOA
-
-LSRC = 	$(addsuffix .cpp,$(BIN))
-
-CPPFLAGS += -I$(TAO_ROOT)
-
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-INSTALL =
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/NewPOA.o .obj/NewPOA.so .shobj/NewPOA.o .shobj/NewPOA.so: NewPOA.cpp \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
deleted file mode 100644
index 100d75ca5ed..00000000000
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// $Id$
-
-// ===========================================================================================
-// = LIBRARY
-//    TAO/tests/POA/NewPOA
-//
-// = FILENAME
-//    NewPOA.cpp
-//
-// = DESCRIPTION
-//    This program demonstrates creation of new POAs, as children of the root POA or the
-//    existing POA.
-//    There are five new POA created in this example.
-//    The hierarchy of POAs looks like this.
-//
-//             /-->first_poa-->first_poa/second_poa
-//    RootPOA--
-//             \-->third_poa-->third_poa/fourth_poa-->third_poa/fourth_poa/fifth_poa
-//
-// = AUTHOR
-//    Irfan Pyarali
-// ===========================================================================================
-
-#include "ace/streams.h"
-#include "tao/corba.h"
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // The first step Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Obtain the object reference to the RootPOA.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA");
-
-  // _narrow() the Object to get the POA object, i.e., the root_poa.
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in(), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  // Policies for the new POAs
-  // CORBA::PolicyList policies (2);
-  PortableServer::PolicyList policies (2);
-  policies.length (2);
-
-  // Threading policy
-  policies[0] =
-    root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_thread_policy");
-      return -1;
-    }
-
-  // Lifespan policy
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::TRANSIENT, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_lifespan_policy");
-      return -1;
-    }
-
-  // Creation of the firstPOA
-  ACE_CString name = "firstPOA";
-  PortableServer::POA_var first_poa =
-    root_poa->create_POA (name.c_str (),
-                          PortableServer::POAManager::_nil(),
-                          policies,
-                          env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Creation of the new POA, i.e. firstPOA/secondPOA
-  name += TAO_POA::name_separator ();
-  name += "secondPOA";
-  PortableServer::POA_var second_poa =
-    root_poa->create_POA (name.c_str (),
-                          PortableServer::POAManager::_nil(),
-                          policies,
-                          env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Creating thirdPOA/fourthPOA/fifthPOA. The non-existing thirdPOA
-  // and thirdPOA/fourthPOA are created automatically.
-  name = "thirdPOA";
-  name += TAO_POA::name_separator ();
-  name += "forthPOA";
-  name += TAO_POA::name_separator ();
-  name += "fifthPOA";
-
-  PortableServer::POA_var fifth_poa =
-    root_poa->create_POA (name.c_str (),
-                          PortableServer::POAManager::_nil(),
-                          policies,
-                          env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Creation of the new POAs over, so destroy the Policy_ptr's.
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Get the names of all the POAs and print them out.
-
-  CORBA::String_var root_poa_name =
-    root_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var first_poa_name =
-    first_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var second_poa_name =
-    second_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  CORBA::String_var fifth_poa_name =
-    fifth_poa->the_name (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  cout << root_poa_name.in () << endl;
-  cout << first_poa_name.in () << endl;
-  cout << second_poa_name.in () << endl;
-  cout << fifth_poa_name.in () << endl;
-
-  // This should destroy all its children
-  root_poa->destroy (CORBA::B_TRUE,
-                     CORBA::B_TRUE,
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/NewPOA/NewPOA.dsp b/TAO/tests/POA/NewPOA/NewPOA.dsp
deleted file mode 100644
index 8ebd8d2b115..00000000000
--- a/TAO/tests/POA/NewPOA/NewPOA.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NewPOA" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=NewPOA - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "NewPOA.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "NewPOA.mak" CFG="NewPOA - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "NewPOA - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "NewPOA - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "NewPOA - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "NewPOA - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "NewPOA - Win32 Release"

-# Name "NewPOA - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\NewPOA.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/NewPOA/NewPOA.dsw b/TAO/tests/POA/NewPOA/NewPOA.dsw
deleted file mode 100644
index e7ce2ae3196..00000000000
--- a/TAO/tests/POA/NewPOA/NewPOA.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "NewPOA"=.\NewPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/NewPOA/README b/TAO/tests/POA/NewPOA/README
deleted file mode 100644
index 8a47ed95cfc..00000000000
--- a/TAO/tests/POA/NewPOA/README
+++ /dev/null
@@ -1,22 +0,0 @@
-This application explains the usage scenario, where new POAs will have
-to be created.
-
-Run this example as follows.
-
-% NewPOA.
-
-Comments :
-=========
-
- - Creates the POA hierarchy as given in the header of the NewPOA.cpp 
-   file.
-        
- - Prints out names of all the POAs.
-
- - It prints out two warning messages, since there is no Resource Factory  
-   and Strategy Factory found in the Service Repository.
-
-   It takes the default instances of the Resource and Strategy Factories.
-
-   These Default factories are ok for this simple application.
-
diff --git a/TAO/tests/POA/On_Demand_Activation/Makefile b/TAO/tests/POA/On_Demand_Activation/Makefile
deleted file mode 100644
index 3f1fb5352dd..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-
-BIN = server
-
-MYFILES = Servant_Activator Servant_Locator
-
-SRC = 	$(addsuffix .cpp,$(MYFILES))
-OBJ =  $(addsuffix .o,$(MYFILES))
-
-CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
-
-LDLIBS     =   -lserver -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-INSTALL =
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/On_Demand_Activation/On_Demand_Activation.dsw b/TAO/tests/POA/On_Demand_Activation/On_Demand_Activation.dsw
deleted file mode 100644
index 293f7320fc8..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/On_Demand_Activation.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/POA/On_Demand_Activation/README b/TAO/tests/POA/On_Demand_Activation/README
deleted file mode 100644
index 97e57170061..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/README
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id$
-
-On_Demand_Activation Tests:
-==========================
-
-Description:
-===========
-
-ServantManagers:
-===============
-
-Servant managers are associated with POAs. A servant manager supplies
-a POA with the ability to objects on demand when the POA receives a
-request targeted at an inactive object. A servant manager is
-registered with a POA as a callback object, to be invoked by the POA
-when necessary.An application server that activates all its needed
-objects at the beginning of execution does not need to use a servant
-manager; it is used only for the case in which an object must be
-activated during request processing.
-
-When the POA has the RETAIN policy it uses servant managers that are
-ServantActivators. When the POA has the NON_RETAIN policy it uses
-servant managers that are ServantLocators.
-
-server:
-======
-
-        The test program server creates 2 POAs firstPOA and secondPOA.
-firstPOA is created with a RETAIN,USER_ID,USE_SERVANT_MANAGER policy
-and MyFooServantActivator is registered as its servant Manager.
-secondPOA is created with a NON_RETAIN,USER_ID,USE_SERVANT_MANAGER
-policy and MyFooServantLocator is registered as it servant Manager.
-
-        It then creates an object reference from the string "firstFoo"
-in firstPOA and prints its IOR.Similarly it creates an object
-reference from the string "secondFoo" in secondPOA and prints its
-IOR. Finally it changes the state of the POA_Manager to 'active' and
-runs the ORB.
-
-USAGE:
-======
-
-%server [-ORBhost host ] [-ORBport port] [-ORBobjrefstyle URL ]
-
-client:
-======
-        The Foo client program is in the path
-
-        TAO/tests/POA/Generic_Servant/client
-        i.e ../Generic_Servant/client
-
-% client -k IOR
-
-where IOR is got from the server output.
-
-To Test:
-=======
-
-1. Run the server
-
-Servant Activator:
-===================
-
-2. Get the IOR for "firstFOO"  from the server output .
-
-3. Run client -k IOR	
-
-4. You should get an output
-
-        27
-
-along with some diagnostic messages.
-
-Servant Locator:
-=================
-
-2. Get the IOR for "secondFoo" from the server output
-
-3. Run client -k IOR
-
-4. The first time a client is run you should get an output
-
-        2
-
-along with some diagnostic messages.
-
-5. Subsequent runs of the client program results in the output
-   incremented by 2.
-
-6. Thus, the second run of client should give you an output 4.
-
-
-
-
-
-
-
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp
deleted file mode 100644
index b25784261a6..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Activator
-//
-// = FILENAME
-//     Servant_Activator.cpp
-//
-// = DESCRIPTION
-//     Implementation of MyFooServantActivator , which is used by a
-//     POA with a RETAIN policy.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#include "Servant_Activator.h"
-#include "MyFooServant.h"
-
-PortableServer::Servant
-MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
-                                  PortableServer::POA_ptr poa,
-                                  CORBA::Environment &env)
-{
-  // Convert ObjectId to String.
-
-  CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
-
-  // If ObjectId string has a Foo Substring, create and return a
-  // MyFooServant.
-
-  if (ACE_OS::strstr (s.in (), "Foo") != 0)
-    return new MyFooServant (poa, 27);
-  else
-    {
-      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-
-void
-MyFooServantActivator::etherealize (const PortableServer::ObjectId &oid,
-                                    PortableServer::POA_ptr poa,
-                                    PortableServer::Servant servant,
-                                    CORBA::Boolean cleanup_in_progress,
-                                    CORBA::Boolean remaining_activations,
-                                    CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (oid);
-  ACE_UNUSED_ARG (poa);
-  ACE_UNUSED_ARG (cleanup_in_progress);
-  ACE_UNUSED_ARG (env);
-
-  // If there are no remaining activations i.e ObjectIds associated
-  // with MyFooServant delete it.
-
-  if (remaining_activations == CORBA::B_FALSE)
-    delete servant;
-}
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
deleted file mode 100644
index 21da251c7ac..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-//=================================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Activator
-//
-// = FILENAME
-//     Servant_Activator.h
-//
-// = DESCRIPTION
-//     Defines a MyFooServantActivator class.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "tao/corba.h"
-
-class MyFooServantActivator : public POA_PortableServer::ServantActivator
-{
-public:
-  virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa,
-                                             CORBA::Environment &env);
-  // This method is invoked by a POA with USE_SERVANT_MANAGER and
-  // RETAIN policies , whenever it receives a request for a MyFoo
-  // object that is not currently active.
-
-  virtual void etherealize (const PortableServer::ObjectId &oid,
-                            PortableServer::POA_ptr adapter,
-                            PortableServer::Servant servant,
-                            CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations,
-                            CORBA::Environment &env);
-  // This method is invoked whenever a MyFooServant for a MyFoo object
-  // is deactivated.
-};
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
deleted file mode 100644
index 7c79485e4ec..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.cpp
-//
-// = DESCRIPTION
-//     Implementation of MyFooServantLocator class , used with a POA
-//     having a NON_RETAIN policy.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#include "Servant_Locator.h"
-#include "MyFooServant.h"
-
-MyFooServantLocator::MyFooServantLocator (void)
-  : counter_ (0)
-{
-}
-
-
-PortableServer::Servant
-MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
-                                PortableServer::POA_ptr poa,
-                                const char *operation,
-                                PortableServer::ServantLocator::Cookie &cookie,
-                                CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (operation);
-
-  // Convert ObjectID to String.
-
-  CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
-  // If ObjectID string has a Foo Substring create and return a
-  // MyFooServant.
-
-  if (ACE_OS::strstr (s.in (), "Foo") != 0)
-    {
-      PortableServer::Servant servant = new MyFooServant (poa, ++this->counter_);
-
-      // Return the servant as the cookie , used as a check when
-      // postinvoke is called on this MyFooServantLocator.
-
-      cookie = servant;
-      return servant;
-    }
-  else
-    {
-      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-void
-MyFooServantLocator::postinvoke (const PortableServer::ObjectId &oid,
-                                 PortableServer::POA_ptr poa,
-                                 const char *operation,
-                                 PortableServer::ServantLocator::Cookie cookie,
-                                 PortableServer::Servant servant,
-                                 CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (oid);
-  ACE_UNUSED_ARG (poa);
-  ACE_UNUSED_ARG (operation);
-  ACE_UNUSED_ARG (env);
-
-  // Check the passed servant with the cookie.
-
-  PortableServer::Servant my_servant = (PortableServer::Servant) cookie;
-  ACE_ASSERT (servant == my_servant);
-  delete servant;
-}
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
deleted file mode 100644
index d40d758d154..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-//================================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/On_Demand_Activation/Servant_Locator
-//
-// = FILENAME
-//     Servant_Locator.h
-//
-// = DESCRIPTION
-//     Defines a MyFooServantLocator class , used with a POA having
-//     a NON_RETAIN policy
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "tao/corba.h"
-
-class MyFooServantLocator : public POA_PortableServer::ServantLocator
-{
-  // = TITLE
-  //   This class is used by a POA with USE_SERVANT_MANAGER and
-  //   NON_RETAIN policy.
-public:
-  MyFooServantLocator (void);
-  // constructor
-
-  virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr adapter,
-                                             const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie,
-                                             CORBA::Environment &env);
-  // This method is invoked by a POA whenever it receives a request
-  // for MyFoo object that is not currently active.
-
-  virtual void postinvoke (const PortableServer::ObjectId &oid,
-                           PortableServer::POA_ptr adapter,
-                           const char *operation,
-                           PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant,
-                           CORBA::Environment &env);
-  // This method is invoked whenever a MyFooServant completes a
-  // request.
-
-private:
-  int counter_;
-  // Counter for number of invocations of this.
-};
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
deleted file mode 100644
index 41bdc42bc4a..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-// $Id$
-
-//============================================================================
-//
-//  =FILENAME
-//     server.cpp
-//
-//  =DESCRIPTION
-//     Server to test the Servant Activator and Servant Locator for a POA.
-//
-//  =AUTHOR
-//     Irfan Pyarali
-//
-//=============================================================================
-
-#include "ace/streams.h"
-#include "Servant_Activator.h"
-#include "Servant_Locator.h"
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB.
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Get an Object reference to RootPOA.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA");
-
-  // Narrow the Object reference to a POA reference
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  // Get the POAManager of RootPOA
-  PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::the_POAManager");
-      return -1;
-    }
-
-  // CORBA::PolicyList policies (4);
-  PortableServer::PolicyList policies (4);
-  policies.length (4);
-
-    // ID Assignment Policy
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
-      return -1;
-    }
-
-  // Lifespan Policy
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_lifespan_policy");
-      return -1;
-    }
-  
-  // Request Processing Policy
-  policies[2] =
-    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_request_processing_policy");
-      return -1;
-    }
-  
-  PortableServer::POA_var first_poa;
-  {
-    // Servant Retention Policy
-    policies[3] =
-      root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
-    if (env.exception () != 0)
-      {
-        env.print_exception ("PortableServer::POA::create_servant_retention_policy");
-        return -1;
-      }
-
-    ACE_CString name = "firstPOA";
-
-    // Create firstPOA as the child of RootPOA with the above policies
-    // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
-    first_poa = root_poa->create_POA (name.c_str (),
-                                      poa_manager.in (),
-                                      policies,
-                                      env);
-    if (env.exception () != 0)
-      {
-        env.print_exception ("PortableServer::POA::create_POA");
-        return -1;
-      }
-  }
-
-  PortableServer::POA_var second_poa;
-  {
-    // Servant Retention Policy
-    policies[3] =
-      root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, env);
-    if (env.exception () != 0)
-      {
-        env.print_exception ("PortableServer::POA::create_servant_retention_policy");
-        return -1;
-      }
-
-    ACE_CString name = "secondPOA";
-
-    // Create secondPOA as child of RootPOA with the above policies
-    // secondPOA will use a SERVANT_LOCATOR because of NON_RETAIN
-    // policy.
-    second_poa = root_poa->create_POA (name.c_str (),
-                                      poa_manager.in (),
-                                      policies,
-                                      env);
-    if (env.exception () != 0)
-      {
-        env.print_exception ("PortableServer::POA::create_POA");
-        return -1;
-      }
-  }
-
-  // Destroy the policy objects as they have been passed to
-  // create_POA and no longer needed.
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  MyFooServantActivator servant_activator_impl;
-  PortableServer::ServantActivator_var servant_activator =
-    servant_activator_impl._this (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::_this");
-      return -1;
-    }
-
-  // Set MyFooServantActivator object as the servant_manager of
-  // firstPOA.
-
-  first_poa->set_servant_manager (servant_activator.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::set_servant_manager");
-      return -1;
-    }
-
-  // Create a reference with user created ID in firstPOA which uses
-  // the MyFooServantActivator.
-
-  PortableServer::ObjectId_var first_foo_oid =
-    PortableServer::string_to_ObjectId ("firstFoo");
-
-  CORBA::Object_var first_foo =
-    first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_reference_with_id");
-      return -1;
-    }
-
-  MyFooServantLocator servant_locator_impl;
-  PortableServer::ServantLocator_var servant_locator =
-    servant_locator_impl._this (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::_this");
-      return -1;
-    }
-
-  // Set MyFooServantLocator object as the servant Manager of
-  // secondPOA.
-
-  second_poa->set_servant_manager (servant_locator.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::set_servant_manager");
-      return -1;
-    }
-
-  // Try to create a reference with user created ID in second_poa
-  // which uses MyFooServantLocator.
-
-  PortableServer::ObjectId_var second_foo_oid =
-    PortableServer::string_to_ObjectId ("secondFoo");
-
-  CORBA::Object_var second_foo =
-    second_poa->create_reference_with_id (second_foo_oid.in (),
-                                          "IDL:Foo:1.0", env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_reference_with_id");
-      return -1;
-    }
-
-  // Invoke object_to_string on the references created in firstPOA and
-  // secondPOA.
-
-  CORBA::String_var first_foo_ior = 
-    orb->object_to_string (first_foo.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  CORBA::String_var second_foo_ior = 
-    orb->object_to_string (second_foo.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  // Print the ior's of first_foo and second_foo.
-
-  ACE_DEBUG((LM_DEBUG,"%s\n%s\n",
-	     first_foo_ior.in (),
-	     second_foo_ior.in ()));
-
-  // Set the poa_manager state to active, ready to process requests.
-  poa_manager->activate (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::activate");
-      return -1;
-    }
-
-  // Run the ORB.
-  if (orb->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-  // Destroy the root_poa and also first_poa and second_poa
-
-  root_poa->destroy (CORBA::B_TRUE,
-                     CORBA::B_TRUE,
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
-
diff --git a/TAO/tests/POA/On_Demand_Activation/server.dsp b/TAO/tests/POA/On_Demand_Activation/server.dsp
deleted file mode 100644
index 2d22f5a98a9..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/server.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib ..\Generic_Servant\server.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\Servant_Activator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Servant_Locator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/On_Demand_Activation/svc.conf b/TAO/tests/POA/On_Demand_Activation/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/POA/On_Demand_Activation/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/POA/README b/TAO/tests/POA/README
deleted file mode 100644
index f7bbc2d70bc..00000000000
--- a/TAO/tests/POA/README
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-The following TAO applications illustate various Portable Object
-Adapter (POA) interfaces and their usage scenarios.
-
-        Individual README files in the respective directories explain
-these applications further. 
-
-        . RootPOA
-
-                This example explains how to obtain the name of the
-                RootPOA.
-
-        . NewPOA
-
-                This example explains the operations involved in
-                creation of new POAs.
-
-        . FindPOA
-
-                This example explains registering an adapter activator
-                for a POA and also the find_POA operation.
-
-        . Generic_Servant
-
-                A simple interface (Foo) is defined here and its
-                implementations, server and client programs are
-                available, which can be used for testing POA
-                applications.  Several servers for that interface are
-                implemented using different POA policies; a common
-                client for all the servers is also provided.
-
-        . On_Demand_Activation 
-                
-                Contains programs that test the POA's 2 types of
-                activation of objects on demand, namely , Servant
-                Activator approach and Servant Locator , which depend
-                on the RETAIN/NON-RETAIN policy of a POA.
-
-        . Default_Servant 
-		
-		Contains a File IDL module and its implementation and
-		a server,client to test the File Module interfaces.
-		The System interface uses the USE_DEFAULT_MANAGER policy
-		to create a POA and registers a single File Descriptor
-		object as the default servant. The default servant serves
-		requests for many Descriptor objects.
-
-        . Explicit_Activation
-
-                This application explains various operations involved
-                in the explicit activation of objects; including the
-                creation of objects without servants (the servant is
-                created on demand).  NOTE: Currently the example does
-                not work.  < It compiles; but at runtime, _narrow()
-                raises an exception on the client. >
-        
-        
diff --git a/TAO/tests/POA/RootPOA/Makefile b/TAO/tests/POA/RootPOA/Makefile
deleted file mode 100644
index 85ec2c2bfc9..00000000000
--- a/TAO/tests/POA/RootPOA/Makefile
+++ /dev/null
@@ -1,249 +0,0 @@
-#
-# $Id$
-#
-
-BIN = RootPOA
-
-LSRC = 	$(addsuffix .cpp,$(BIN))
-
-CPPFLAGS += -I$(TAO_ROOT)
-
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-INSTALL =
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/RootPOA.o .obj/RootPOA.so .shobj/RootPOA.o .shobj/RootPOA.so: RootPOA.cpp \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/POA/RootPOA/README b/TAO/tests/POA/RootPOA/README
deleted file mode 100644
index bf5f5f0aab5..00000000000
--- a/TAO/tests/POA/RootPOA/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This program obtains the name of the Root POA.
-
-Run the application as follows.
-
-% RootPOA
-
-Comments:
-========
-
-- It prints out the name of the Root POA.
-
-- It prints out two warning messages, since there is no Resource Factory  and Strategy Factory
-  found in the Service Repository.
-
-  So, it takes the default instances of the Resource and Strategy Factories.
-
-  This is ok for this simple application.
diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp
deleted file mode 100644
index d28918a8c84..00000000000
--- a/TAO/tests/POA/RootPOA/RootPOA.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// $Id$
-
-
-//==================================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/RootPOA
-//
-//
-// = FILENAME
-//     RootPOA.cpp
-//
-// = DESCRIPTION
-//     This program gets the name of the Root POA and prints it out on
-//     the standard output.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "ace/streams.h"
-#include "tao/corba.h"
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initilize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Resolve the initial references for the name RootPOA thus getting
-  // an object of type CORBA::Object.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA");
-
-  // apply _narrow on the object of type CORBA::Object, to make it a
-  // POA class Object.
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  // Get the name of the root POA.
-  CORBA::String_var poa_name =
-    root_poa->the_name (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-
-  cout << "The RootPOA is : " << poa_name.in () << endl;
-
-  // Destroy the POA object,also destroys the child POAs if any.
-  root_poa->destroy (CORBA::B_TRUE,
-                     CORBA::B_TRUE,
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/RootPOA/RootPOA.dsp b/TAO/tests/POA/RootPOA/RootPOA.dsp
deleted file mode 100644
index cd00fd9b073..00000000000
--- a/TAO/tests/POA/RootPOA/RootPOA.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="RootPOA" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=RootPOA - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "RootPOA.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "RootPOA.mak" CFG="RootPOA - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "RootPOA - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "RootPOA - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "RootPOA - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "RootPOA - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "RootPOA - Win32 Release"

-# Name "RootPOA - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\RootPOA.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/POA/RootPOA/RootPOA.dsw b/TAO/tests/POA/RootPOA/RootPOA.dsw
deleted file mode 100644
index a14deafc332..00000000000
--- a/TAO/tests/POA/RootPOA/RootPOA.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "RootPOA"=.\RootPOA.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
deleted file mode 100644
index 097386f724e..00000000000
--- a/TAO/tests/Param_Test/Makefile
+++ /dev/null
@@ -1,486 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Param_Test test example
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-IDL_HDR	= param_testC.h param_testS.h
-IDL_SRC	= param_testC.cpp param_testS.cpp
-PROG_SRCS =	$(IDL_SRC) server.cpp client.cpp param_test_i.cpp helper.cpp \
-		driver.cpp options.cpp results.cpp tests.cpp tmplinst.cpp
-
-LSRC = $(PROG_SRCS)
-
-PARAM_TEST_SVR_OBJS = param_testC.o param_testS.o server.o param_test_i.o tmplinst.o
-PARAM_TEST_CLT_OBJS = param_testC.o param_testS.o driver.o client.o options.o results.o \
-			tmplinst.o tests.o helper.o
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-.PRECIOUS: $(IDL_HDR) $(IDL_SRC)
-#$(IDL_HDR) $(IDL_SRC): param_test.idl
-#	$(TAO_IDL/tao_idl param_test.idl
-
-server:	$(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf param_testC.* param_testS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/options.o .obj/options.so .shobj/options.o .shobj/options.so: options.cpp options.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/results.o .obj/results.so .shobj/results.o .shobj/results.so: results.cpp results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/compat/objbase.h \
- $(TAO_ROOT)/tao/compat/initguid.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Param_Test/Param_Test.dsw b/TAO/tests/Param_Test/Param_Test.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Param_Test/Param_Test.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Param_Test/README b/TAO/tests/Param_Test/README
deleted file mode 100644
index 5061d29648c..00000000000
--- a/TAO/tests/Param_Test/README
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    README
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-This directory contains an application that tests all the parameter
-passing conventions in CORBA for a number of OMG IDL data types.
-
-Type "make" to make the application. The server executable is called
-"server" and the client executable is called "client".
-
-You should have the TAO IDL compiler and the TAO library installed
-before using this application.
-
-To run the server, type
-
-   server [arguments to ORB_init] [-d] [-o <ior_output_file>]
-
-          arguments to ORB_init start with the letters -ORB. Please
-          see TAO documentattion on all the supported arguments
-
-          -d for debugging. 
-	  -o <ior_output_file> for outputting the servant IOR to a file.
-
-To run the client, type
-
-   client [arguments to ORB_init] [options for this application]
-
-   Supported options are:
-
-   [-d]                                 debugging
-   [-n loopcount]                       number of times to run the test
-   [-f servant-IOR-file]		reads the servant-IOR from the specified file.
-   [-k Param_Test-obj-ref-key]          object key of Param_Test object
-   [-h hostname]                        host to bind to
-   [-p port]                            port number of server
-   [-i invocation (sii/dii)]            default is static invocation
-                                        interface. To use DII, type
-                                        -i dii
-   [-t data type]
-       Data types supported in this version are:
-
-       short                for shorts
-       ubstring             for unbounded string
-       fixed_struct         for fixed sized structs
-       strseq         	    for sequences of strings
-       var_struct           for variable structs
-       nested_struct        for nested structs
-       struct_seq           for sequences of structs
-       objref               for object references
-
-
-	There are 2 options of giving the Param_obj-ref-key i.e IOR to the client:
-
-	1. Using the -f option to read the IOR from a file.
-
-	2. Using the -k option to read the IOR from the 	
-	   command line.
-
-run_test:
---------
-	There is a shell script in this directory named run_test to test all
-	the types for sii invocation. It starts the server first and then runs
-	the client with the different data type parameters.
-
-
-
-
diff --git a/TAO/tests/Param_Test/VCAUTO.MAK b/TAO/tests/Param_Test/VCAUTO.MAK
deleted file mode 100644
index 98f0163f025..00000000000
--- a/TAO/tests/Param_Test/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/Param_Test/
-
-MAK_LIST = server client
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/TAO/tests/Param_Test/client.MAK b/TAO/tests/Param_Test/client.MAK
deleted file mode 100644
index 802ce52739a..00000000000
--- a/TAO/tests/Param_Test/client.MAK
+++ /dev/null
@@ -1,2155 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on client.dsp
-!IF "$(CFG)" == ""
-CFG=client - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to client - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\client.obj"
-	-@erase "$(INTDIR)\driver.obj"
-	-@erase "$(INTDIR)\helper.obj"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\param_testC.obj"
-	-@erase "$(INTDIR)\results.obj"
-	-@erase "$(INTDIR)\tests.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\client.exe"
-	-@erase "param_testC.cpp"
-	-@erase "param_testC.h"
-	-@erase "param_testC.i"
-	-@erase "param_testS.cpp"
-	-@erase "param_testS.h"
-	-@erase "param_testS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D\
- "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\client.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=TAO.lib ace.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\client.pdb" /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /libpath:"..\..\tao" /libpath:"..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\client.obj" \
-	"$(INTDIR)\driver.obj" \
-	"$(INTDIR)\helper.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\param_testC.obj" \
-	"$(INTDIR)\results.obj" \
-	"$(INTDIR)\tests.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\client.exe"
-
-!ELSE 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\client.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\client.obj"
-	-@erase "$(INTDIR)\driver.obj"
-	-@erase "$(INTDIR)\helper.obj"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\param_testC.obj"
-	-@erase "$(INTDIR)\results.obj"
-	-@erase "$(INTDIR)\tests.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\client.exe"
-	-@erase "$(OUTDIR)\client.ilk"
-	-@erase "$(OUTDIR)\client.pdb"
-	-@erase "param_testC.cpp"
-	-@erase "param_testC.h"
-	-@erase "param_testC.i"
-	-@erase "param_testS.cpp"
-	-@erase "param_testS.h"
-	-@erase "param_testS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D\
- "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\client.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\client.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=TAO.lib aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\client.pdb" /debug /machine:I386 /out:"$(OUTDIR)\client.exe"\
- /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\client.obj" \
-	"$(INTDIR)\driver.obj" \
-	"$(INTDIR)\helper.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\param_testC.obj" \
-	"$(INTDIR)\results.obj" \
-	"$(INTDIR)\tests.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "client - Win32 Release" || "$(CFG)" == "client - Win32 Debug"
-SOURCE=.\client.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_CLIEN=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\client.h"\
-	".\options.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\results.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\client.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"\
- ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-
-"$(INTDIR)\client.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\driver.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_DRIVE=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\client.cpp"\
-	".\client.h"\
-	".\driver.h"\
-	".\options.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\results.h"\
-	".\tests.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\driver.obj" : $(SOURCE) $(DEP_CPP_DRIVE) "$(INTDIR)"\
- ".\param_testC.h" ".\client.cpp" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-
-"$(INTDIR)\driver.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\helper.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_HELPE=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\helper.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\helper.obj" : $(SOURCE) $(DEP_CPP_HELPE) "$(INTDIR)"\
- ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-
-"$(INTDIR)\helper.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\options.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_OPTIO=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\options.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\options.obj" : $(SOURCE) $(DEP_CPP_OPTIO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-DEP_CPP_OPTIO=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\options.h"\
-	
-
-"$(INTDIR)\options.obj" : $(SOURCE) $(DEP_CPP_OPTIO) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\param_test.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-InputPath=.\param_test.idl
-
-"param_testS.h"	"param_testS.i"	"param_testS.cpp"	"param_testC.h"\
-	"param_testC.i"	"param_testC.cpp"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\tao_idl\tao_idl param_test.idl
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-InputPath=.\param_test.idl
-
-"param_testS.h"	"param_testS.i"	"param_testS.cpp"	"param_testC.h"\
-	"param_testC.i"	"param_testC.cpp"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\tao_idl\tao_idl param_test.idl
-
-!ENDIF 
-
-SOURCE=.\param_testC.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_PARAM=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\param_testC.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"\
- ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-
-"$(INTDIR)\param_testC.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\results.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_RESUL=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\ace\High_Res_Timer.i"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\ace\Profile_Timer.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\results.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\results.obj" : $(SOURCE) $(DEP_CPP_RESUL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-DEP_CPP_RESUL=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\High_Res_Timer.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\Profile_Timer.h"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\results.h"\
-	
-
-"$(INTDIR)\results.obj" : $(SOURCE) $(DEP_CPP_RESUL) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\tests.cpp
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-DEP_CPP_TESTS=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\helper.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\tests.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\tests.obj" : $(SOURCE) $(DEP_CPP_TESTS) "$(INTDIR)"\
- ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-
-"$(INTDIR)\tests.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
deleted file mode 100644
index abc165c7ae7..00000000000
--- a/TAO/tests/Param_Test/client.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    This file contains the implementation of the client-side of the
-//    Param_Test application.
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (CLIENT_CPP)
-#define CLIENT_CPP
-
-#include "options.h"
-#include "results.h"
-#include "client.h"
-
-// Constructor.p
-template <class T>
-Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb,
-                                         Param_Test_ptr objref,
-                                         T *t)
-  : orb_ (orb),
-    param_test_ (objref),
-    test_object_ (t)
-{
-}
-
-// destructor
-template <class T>
-Param_Test_Client<T>::~Param_Test_Client (void)
-{
-  CORBA::release (this->orb_);
-  delete this->test_object_;
-}
-
-// All the individual tests.
-template <class T> int
-Param_Test_Client<T>::run_sii_test (void)
-{
-  CORBA::ULong i;  // loop index
-  CORBA::Environment env; // to track errors
-  Options *opt = OPTIONS::instance (); // get the options
-  const char *opname = this->test_object_->opname (); // operation
-
-  // Initialize call count and error count.
-  this->results_.call_count (0);
-  this->results_.error_count (0);
-  this->results_.iterations (opt->loop_count ());
-
-  // Initialize parameters for the test.
-  if (this->test_object_->init_parameters (this->param_test_, env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) client.cpp - run_sii_test:"
-                       "init_parameters failed for opname - %s",
-                       opname), -1);
-
-  // Make the calls in a loop.
-  for (i = 0; i < opt->loop_count (); i++)
-    {
-      this->results_.call_count (this->results_.call_count () + 1);
-      if (opt->debug ())
-        ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
-
-      // start the timing
-      this->results_.start_timer ();
-
-      // make the call
-      if (this->test_object_->run_sii_test (this->param_test_, env) == -1)
-        {
-          this->results_.error_count (this->results_.error_count () + 1);
-          env.print_exception (opname);
-          ACE_ERROR ((LM_ERROR,
-                      "(%N:%l) client.cpp - run_sii_test:"
-                      "run_sii_test exception in iteration %d",
-                      i));
-          continue;
-        }
-      // stop the timer.
-      this->results_.stop_timer ();
-
-      // now check if the values returned are as expected
-      if (opt->debug ())
-        {
-          ACE_DEBUG ((LM_DEBUG, "\n****** After call values *****\n"));
-          this->test_object_->print_values ();
-        }
-
-      if (!this->test_object_->check_validity ())
-        {
-          this->results_.error_count (this->results_.error_count () + 1);
-          ACE_ERROR ((LM_ERROR,
-                      "(%N:%l) client.cpp - run_sii_test: "
-                      "Invalid results in iteration %d - ",
-                      i));
-          continue;
-        }
-      // reset parameters for the test
-      if (this->test_object_->reset_parameters () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) client.cpp - run_dii_test:"
-                           "init_parameters failed for opname - %s",
-                           opname), -1);
-    }
-
-  // print statistics
-  this->results_.print_stats (this->test_object_->opname ());
-  return this->results_.error_count ()? -1:0;
-}
-
-// use DII
-template <class T> int
-Param_Test_Client<T>::run_dii_test (void)
-{
-  CORBA::ULong i;  // loop index
-  CORBA::Request_ptr req; // DII request
-  const char *opname = this->test_object_->opname ();
-  Options *opt = OPTIONS::instance ();
-  CORBA::Environment env; // environment
-  CORBA::NVList_ptr nvlist;  // argument list for DII parameters
-  CORBA::NVList_ptr retval; // to access the NamedValue that stores the result
-
-  // initialize call count and error count
-  this->results_.call_count (0);
-  this->results_.error_count (0);
-  this->results_.iterations (opt->loop_count ());
-
-  // initialize parameters for the test
-  if (this->test_object_->init_parameters (this->param_test_, env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) client.cpp - run_dii_test:"
-                       "init_parameters failed for opname - %s",
-                       opname), -1);
-
-  // Make the calls in a loop.
-  for (i = 0; i < opt->loop_count (); i++)
-    {
-      this->results_.call_count (this->results_.call_count () + 1);
-
-      // start the timing. We measure the entire overhead of DII, including the
-      // time required to create and populate the NVList
-      this->results_.start_timer ();
-
-      // first create the argument list and populate it
-      this->orb_->create_list (3, nvlist);
-      this->orb_->create_list (1, retval);
-
-      // add arguments and typecode for return valueto the NVList
-      if (this->test_object_->add_args (nvlist, retval, env) == -1)
-        {
-          this->results_.error_count (this->results_.error_count () + 1);
-          env.print_exception (opname);
-          ACE_ERROR ((LM_ERROR,
-                      "(%N:%l) client.cpp - "
-                      "Failed to add args in iteration %d",
-                      i));
-          continue;
-        }
-
-      // create the request
-      this->param_test_->_create_request (opname,
-                                          nvlist,
-                                          retval->item (0, env),
-                                          req,
-                                          0, //CORBA::OUT_LIST_MEMORY,
-                                          env);
-      // The OUT_LIST_MEMORY is to be used when the ORB assumes that
-      // we will provide the top-level storage. With 0, the returned
-      // values for ret, inout, and out parameters are all owned by
-      // the ORB and hence we must not free them explicitly.
-
-      if (opt->debug ())
-        ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
-
-      // Make the invocation, verify the result.
-      req->invoke ();
-      if (req->env ()->exception () != 0)
-        {
-          this->results_.error_count (this->results_.error_count () + 1);
-          req->env ()->print_exception (opname);
-          CORBA::release (req);
-          continue;
-        }
-
-      if (opt->debug ())
-        {
-          ACE_DEBUG ((LM_DEBUG, "\n****** After call values *****\n"));
-          this->test_object_->print_values ();
-        }
-      // now check if the values returned are as expected
-      if (!this->test_object_->check_validity (req))
-        {
-          this->results_.error_count (this->results_.error_count () + 1);
-          ACE_ERROR ((LM_ERROR,
-                      "(%N:%l) client.cpp - "
-                      "Invalid results in run_dii_test in iteration %d",
-                      i));
-          CORBA::release (req);
-          continue;
-        }
-      // release the request
-      CORBA::release (req);
-
-      // stop the this->results_.
-      this->results_.stop_timer ();
-
-      // reset parameters for the test
-      this->test_object_->reset_parameters ();
-
-    } // for loop
-
-  // print statistics
-  this->results_.print_stats (opname);
-  return this->results_.error_count ()? -1:0;
-
-  return 0;
-}
-
-
-#endif /* CLIENT_CPP */
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp
deleted file mode 100644
index 3b521ea6b6b..00000000000
--- a/TAO/tests/Param_Test/client.dsp
+++ /dev/null
@@ -1,178 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\helper.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\options.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_test.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\param_test.idl

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl Param_Test.idl

-

-"param_testS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\param_test.idl

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl Param_Test.idl

-

-"param_testS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_testS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\results.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\tests.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h
deleted file mode 100644
index a21b4d16cce..00000000000
--- a/TAO/tests/Param_Test/client.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Header file for the Param_Test client application.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (PARAM_TEST_CLIENT_H)
-#define PARAM_TEST_CLIENT_H
-
-#include "param_testC.h"
-#include "results.h"
-
-template <class T>
-class Param_Test_Client
-{
-  // = TITLE
-  //    Param_Test_Client
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Param_Test CORBA server.  All the complexity for initializing
-  //    the client is hidden in the class.  Just the run () interface
-  //    is needed. The template class does the specific work of making
-  //    the request of the desired data type
-public:
-  typedef T TEST_OBJECT;
-
-  // = Constructor and destructor.
-  Param_Test_Client (CORBA::ORB_ptr orb,
-                     Param_Test_ptr objref,
-                     T *);
-
-  ~Param_Test_Client (void);
-
-  int run_sii_test (void);
-  // run the SII test
-
-  int run_dii_test (void);
-  // run the DII test
-
-private:
-  CORBA::ORB_ptr orb_;
-  // underlying ORB
-
-  Param_Test_ptr param_test_;
-  // param test object reference
-
-  TEST_OBJECT *test_object_;
-  // object doing the actual work
-
-  Results results_;
-  // results
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "client.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("client.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* CLIENTS_H */
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
deleted file mode 100644
index f4ea0b14d75..00000000000
--- a/TAO/tests/Param_Test/driver.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    driver.cpp
-//
-// = DESCRIPTION
-//    Driver program
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "options.h"
-#include "results.h"
-#include "client.h"
-#include "tests.h"
-#include "driver.h"
-
-// This function runs the test (main program)
-int
-main (int argc, char **argv)
-{
-  // get an instance of the driver object
-  Driver *drv = DRIVER::instance ();
-
-  // initialize the driver
-  if (drv->init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) driver.cpp - "
-                       "Driver initialization failed\n"),
-                      -1);
-
-  // run various tests
-  if (drv->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) driver.cpp - "
-                       "tests failed\n"),
-                      -1);
-  return 0;
-}
-
-// constructor
-Driver::Driver (void)
-  : orb_ptr_ (0)
-{
-}
-
-Driver::~Driver (void)
-{
-}
-
-// initialize the driver
-int
-Driver::init (int argc, char **argv)
-{
-  // environment to track exceptions
-  CORBA::Environment env;
-
-  // retrieve the instance of Options
-  Options *opt = OPTIONS::instance ();
-
-  // Retrieve the underlying ORB
-  this->orb_ptr_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    "internet",
-                                    env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB initialization");
-      return -1;
-    }
-
-  // Parse command line and verify parameters.
-  if (opt->parse_args (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) driver.cpp - "
-                       "parse_args failed\n"),
-                      -1);
-
-  // Retrieve a Param_Test object reference
-  CORBA::Object_var temp =
-    this->orb_ptr_->string_to_object (opt->param_test_ior (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB::string_to_object() failed.");
-      return -1;
-    }
-
-  if (CORBA::is_nil (temp.in()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ORB::string_to_object() returned null object for IOR <%s>\n",
-                       opt->param_test_ior ()),
-                      -1);
-
-  this->objref_ = Param_Test::_narrow (temp.in(), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("Param_Test::_narrow failed");
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-Driver::run (void)
-{
-  // serves as a factory of Param_Client objects. It is also responsible to
-  // start the test
-
-  Options *opt = OPTIONS::instance ();  // get the options object
-  int retstatus = -1;
-
-  switch (opt->test_type ())
-    {
-    case Options::TEST_SHORT:
-      {
-        Param_Test_Client<Test_Short> *client = new
-          Param_Test_Client<Test_Short> (this->orb_ptr_,
-                                         this->objref_.in(),
-                                         new Test_Short);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_UNBOUNDED_STRING:
-      {
-        Param_Test_Client<Test_Unbounded_String> *client = new
-          Param_Test_Client<Test_Unbounded_String> (this->orb_ptr_,
-                                                    this->objref_.in(),
-                                                    new Test_Unbounded_String);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_FIXED_STRUCT:
-      {
-        Param_Test_Client<Test_Fixed_Struct> *client = new
-          Param_Test_Client<Test_Fixed_Struct> (this->orb_ptr_,
-                                                this->objref_.in(),
-                                                new Test_Fixed_Struct);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_STRING_SEQUENCE:
-      {
-        Param_Test_Client<Test_String_Sequence> *client = new
-          Param_Test_Client<Test_String_Sequence> (this->orb_ptr_,
-                                                   this->objref_.in(),
-                                                   new Test_String_Sequence);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_VAR_STRUCT:
-      {
-        Param_Test_Client<Test_Var_Struct> *client = new
-          Param_Test_Client<Test_Var_Struct> (this->orb_ptr_,
-                                              this->objref_.in(),
-                                              new Test_Var_Struct);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_NESTED_STRUCT:
-      {
-        Param_Test_Client<Test_Nested_Struct> *client = new
-          Param_Test_Client<Test_Nested_Struct> (this->orb_ptr_,
-                                                 this->objref_.in(),
-                                                 new Test_Nested_Struct);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_STRUCT_SEQUENCE:
-      {
-        Param_Test_Client<Test_Struct_Sequence> *client = new
-          Param_Test_Client<Test_Struct_Sequence> (this->orb_ptr_,
-                                                 this->objref_.in(),
-                                                 new Test_Struct_Sequence);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_OBJREF:
-      {
-        Param_Test_Client<Test_ObjRef> *client = new
-          Param_Test_Client<Test_ObjRef> (this->orb_ptr_,
-                                          this->objref_.in(),
-                                          new Test_ObjRef);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_ANY:
-      {
-        Param_Test_Client<Test_Any> *client = new
-          Param_Test_Client<Test_Any> (this->orb_ptr_,
-                                       this->objref_.in(),
-                                       new Test_Any);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    default:
-      break;
-    }
-  return retstatus;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Driver, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class Param_Test_Client<Test_Short>;
-template class Param_Test_Client<Test_Unbounded_String>;
-template class Param_Test_Client<Test_Fixed_Struct>;
-template class Param_Test_Client<Test_String_Sequence>;
-template class Param_Test_Client<Test_Var_Struct>;
-template class Param_Test_Client<Test_Nested_Struct>;
-template class Param_Test_Client<Test_Struct_Sequence>;
-template class Param_Test_Client<Test_ObjRef>;
-template class Param_Test_Client<Test_Any>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Driver, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate Param_Test_Client<Test_Short>
-#pragma instantiate Param_Test_Client<Test_Unbounded_String>
-#pragma instantiate Param_Test_Client<Test_Fixed_Struct>
-#pragma instantiate Param_Test_Client<Test_String_Sequence>
-#pragma instantiate Param_Test_Client<Test_Var_Struct>
-#pragma instantiate Param_Test_Client<Test_Nested_Struct>
-#pragma instantiate Param_Test_Client<Test_Struct_Sequence>
-#pragma instantiate Param_Test_Client<Test_ObjRef>
-#pragma instantiate Param_Test_Client<Test_Any>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h
deleted file mode 100644
index 797a0ad7066..00000000000
--- a/TAO/tests/Param_Test/driver.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    driver.h
-//
-// = DESCRIPTION
-//    Header file for the driver program. The driver is a singleton.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (DRIVER_H)
-#define DRIVER_H
-
-#include "ace/Get_Opt.h"
-
-class Driver
-{
-  // = TITLE
-  //    Driver
-  //
-  // = DESCRIPTION
-  //    Driver program for the client
-public:
-  // = Constructor and destructor.
-  Driver (void);
-  ~Driver (void);
-
-  int init (int argc, char **argv);
-  // Initialize the driver object
-
-  int run (void);
-  // Execute client example code.
-
-private:
-  CORBA::ORB_ptr orb_ptr_;
-  // underlying ORB (we do not own it)
-
-  Param_Test_var objref_;
-  // object reference (we do not own it)
-};
-
-typedef ACE_Singleton<Driver, ACE_SYNCH_RECURSIVE_MUTEX> DRIVER;
-#endif /* !defined */
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
deleted file mode 100644
index 5e22ba3a49f..00000000000
--- a/TAO/tests/Param_Test/helper.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    helper.cpp
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Param_Test example
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "helper.h"
-
-Generator::Generator (void)
-{
-}
-
-Generator::~Generator (void)
-{
-}
-
-CORBA::Short
-Generator::gen_short (void)
-{
-  return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE);
-}
-
-CORBA::Long
-Generator::gen_long (void)
-{
-  return ::ACE_OS::rand () % TEST_BUFSIZE;
-}
-
-char *
-Generator::gen_string (void)
-{
-  CORBA::ULong len = (CORBA::ULong) (::ACE_OS::rand () % TEST_BUFSIZE);
-  char *buf = CORBA::string_alloc (len);
-  CORBA::ULong i = 0;
-
-  while (i < len)
-    {
-      int c = ACE_OS::rand () % 128;
-      if (isprint (c) && !isspace (c))
-        {
-          buf [i] = c;
-          i++;
-        }
-    }
-  buf[i] = 0;
-  return buf;
-}
-
-const Param_Test::Fixed_Struct
-Generator::gen_fixed_struct (void)
-{
-  this->fixed_struct_.l = ACE_OS::rand ();
-  this->fixed_struct_.c = ACE_OS::rand () % 128;
-  this->fixed_struct_.s = (CORBA::Short) ACE_OS::rand ();
-  this->fixed_struct_.o = ACE_OS::rand () % 128;
-  this->fixed_struct_.f = (CORBA::Float) (ACE_OS::rand () * 1.0);
-  this->fixed_struct_.b = (CORBA::Boolean) ACE_OS::rand () % 2;
-  this->fixed_struct_.d = (ACE_OS::rand () * 1.0);
-  return this->fixed_struct_;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h
deleted file mode 100644
index d80e8ae40df..00000000000
--- a/TAO/tests/Param_Test/helper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    helper.h
-//
-// = DESCRIPTION
-//    Defines a helper class that can generate values for the parameters used
-//    for the Param_Test example
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (HELPER_H)
-#define HELPER_H
-
-#include "param_testC.h"
-
-#define TEST_BUFSIZE 128
-
-class Generator
-{
-public:
-  Generator (void);
-  // constructor
-
-  ~Generator (void);
-  // destructor
-
-  CORBA::Short gen_short (void);
-  CORBA::Long gen_long (void);
-#if 0
-  CORBA::Char gen_char (void);
-  CORBA::Octet gen_octet (void);
-  CORBA::Float gen_float (void);
-  CORBA::Double gen_double (void);
-#endif
-  CORBA::String gen_string (void);
-  const Param_Test::Fixed_Struct gen_fixed_struct (void);
-private:
-  Param_Test::Fixed_Struct fixed_struct_;
-};
-
-typedef ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX> GENERATOR;
-#endif /* HELPER_H */
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
deleted file mode 100644
index 1802cab69d5..00000000000
--- a/TAO/tests/Param_Test/options.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id:
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    options.cpp
-//
-// = DESCRIPTION
-//    Options for the Param_Test application
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "options.h"
-
-// @@ Naga, can you please generalize this so we don't use a fixed
-// sized constant?! 
-#define MAX_IOR_SIZE 512
-
-// Constructor.p
-Options::Options (void)
-  : ior_ (0),
-    test_type_ (Options::NO_TEST),
-    invoke_type_ (Options::SII),
-    loop_count_ (1),
-    debug_ (0)
-{
-}
-
-Options::~Options (void)
-{
-  // Free resources
-  CORBA::string_free (this->ior_);
-  this->ior_ = 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Options::parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "dn:f:i:t:k:");
-  int c;
-  char temp_buf[MAX_IOR_SIZE];
-  char *result;
-  FILE *ior_file;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        this->debug_ = 1;
-        break;
-      case 'n':			// loop count
-        this->loop_count_ = (CORBA::ULong) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'f':
-	ior_file = ACE_OS::fopen (get_opts.optarg,"r");
-	if (ior_file == 0)
-	  ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-	result = ACE_OS::fgets (temp_buf, MAX_IOR_SIZE, ior_file);
-	if (result == 0)
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "Unable to read cubit_factory_ior from file %s: %p\n",
-			     get_opts.optarg), -1);
-	this->ior_ = CORBA::string_copy (temp_buf);
-	ACE_OS::fclose (ior_file);
-	break;
-     case 'k':
-	CORBA::string_free (this->ior_);
-	this->ior_ = CORBA::string_copy (get_opts.optarg);
-	break;
-      case 'i':  // invocation
-        if (!ACE_OS::strcmp (get_opts.optarg, "dii"))
-          this->invoke_type_ = Options::DII;
-        break;
-      case 't': // data type
-        if (!ACE_OS::strcmp (get_opts.optarg, "short"))
-          this->test_type_ = Options::TEST_SHORT;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "ubstring"))
-          this->test_type_ = Options::TEST_UNBOUNDED_STRING;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "fixed_struct"))
-          this->test_type_ = Options::TEST_FIXED_STRUCT;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "strseq"))
-          this->test_type_ = Options::TEST_STRING_SEQUENCE;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "var_struct"))
-          this->test_type_ = Options::TEST_VAR_STRUCT;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "nested_struct"))
-          this->test_type_ = Options::TEST_NESTED_STRUCT;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "struct_seq"))
-          this->test_type_ = Options::TEST_STRUCT_SEQUENCE;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "objref"))
-          this->test_type_ = Options::TEST_OBJREF;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "any"))
-          this->test_type_ = Options::TEST_ANY;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-f servant-IOR-file]"
-                           " [-i invocation (sii/dii)]"
-                           " [-t data type]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-char *
-Options::param_test_ior (void)
-{
-  return this->ior_;
-}
-
-Options::TEST_TYPE
-Options::test_type (void)
-{
-  return this->test_type_;
-}
-
-Options::INVOKE_TYPE
-Options::invoke_type (void)
-{
-  return this->invoke_type_;
-}
-
-CORBA::ULong
-Options::loop_count (void)
-{
-  return this->loop_count_;
-}
-
-CORBA::Boolean
-Options::debug (void) const
-{
-  return this->debug_;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
deleted file mode 100644
index b34830f4e4b..00000000000
--- a/TAO/tests/Param_Test/options.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    options.h
-//
-// = DESCRIPTION
-//    Options for the Param_Test application
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (OPTIONS_H)
-#define OPTIONS_H
-
-#include "ace/Singleton.h"
-#include "tao/corba.h"
-
-class Options
-{
-public:
-  enum TEST_TYPE
-  {
-    NO_TEST,
-    TEST_SHORT,
-    TEST_UNBOUNDED_STRING,
-    TEST_FIXED_STRUCT,
-    TEST_STRING_SEQUENCE,
-    TEST_VAR_STRUCT,
-    TEST_NESTED_STRUCT,
-    TEST_STRUCT_SEQUENCE,
-    TEST_OBJREF,
-    TEST_ANY
-  };
-
-  enum INVOKE_TYPE
-  {
-    SII,
-    DII
-  };
-
-  Options (void);
-  // constructor
-
-  ~Options (void);
-  // destructor
-
-  int parse_args (int argc, char **argv);
-  // Parses the arguments passed on the command line.
-
-  char *param_test_ior (void);
-  // return the IOR for the servant
-
-  TEST_TYPE test_type (void);
-  // what test to run
-
-  INVOKE_TYPE invoke_type (void);
-  // whether to use SII or DII
-
-  CORBA::ULong loop_count (void);
-  // number of times to run the test
-
-  CORBA::Boolean debug (void) const;
-  // whether debug option is on or not
-private:
-  char *ior_;
-  // IOR for the servant
-
-  TEST_TYPE test_type_;
-  // what test to run
-
-  INVOKE_TYPE invoke_type_;
-  // whether SII or DII
-
-  CORBA::ULong loop_count_;
-  // Number of times to do the "test_*" operations.
-
-  CORBA::Boolean debug_;
-  // debugging output values
-};
-
-typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
-
-#endif /* OPTIONS_H */
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
deleted file mode 100644
index ef58954d4d4..00000000000
--- a/TAO/tests/Param_Test/param_test.idl
+++ /dev/null
@@ -1,194 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    params.idl
-//
-// = DESCRIPTION
-//    This IDL description is used to test all the parameter passing modes (in,
-//    inout, out, and return) for a number of IDL data types. The goal is to
-//    verify the correctness of the generated stubs and skeletons, and the
-//    the marshaling engine of TAO.
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-interface Coffee
-{
-  struct Desc
-  {
-    string name;
-  };
-
-  attribute Desc description; // provides us the coffee object type
-};
-
-//typedef sequence<Coffee> ObjSeq;
-
-interface Param_Test
-{
-  // Add exceptions to each
-
-  // primitive types
-  short test_short (in short s1,
-                    inout short s2,
-                    out short s3);
-
-  // strings unbounded
-  string test_unbounded_string (in string s1,
-                                inout string s2,
-                                out string s3);
-
-  // structures (fixed size)
-  struct Fixed_Struct
-  {
-    long l;
-    char c;
-    short s;
-    octet o;
-    float f;
-    boolean b;
-    double d;
-  };
-
-  Fixed_Struct test_fixed_struct (in Fixed_Struct s1,
-                                  inout Fixed_Struct s2,
-                                  out Fixed_Struct s3);
-
-  // = Sequences of long, strings, Var_Struct and Object
-  // references...
-  typedef sequence<long> Long_Seq;
-  Long_Seq test_long_sequence (in Long_Seq s1,
-			       inout Long_Seq s2,
-			       out Long_Seq s3);
-
-  typedef sequence<long,32> Bounded_Long_Seq;
-  Bounded_Long_Seq test_bounded_long_sequence (in Bounded_Long_Seq s1,
-					       inout Bounded_Long_Seq s2,
-					       out Bounded_Long_Seq s3);
-
-  typedef sequence<string> StrSeq;
-  StrSeq test_strseq (in StrSeq s1,
-                      inout StrSeq s2,
-                      out StrSeq s3);
-
-  typedef sequence<string,32> Bounded_StrSeq;
-  Bounded_StrSeq test_bounded_strseq (in Bounded_StrSeq s1,
-				      inout Bounded_StrSeq s2,
-				      out Bounded_StrSeq s3);
-
-  typedef sequence<Fixed_Struct> StructSeq;
-  StructSeq test_struct_sequence (in StructSeq s1,
-                                  inout StructSeq s2,
-                                  out StructSeq s3);
-
-  typedef sequence<Fixed_Struct,32> Bounded_StructSeq;
-  Bounded_StructSeq test_bounded_struct_sequence (in Bounded_StructSeq s1,
-						  inout Bounded_StructSeq s2,
-						  out Bounded_StructSeq s3);
-
-  typedef sequence<Coffee> Coffee_Mix;
-  Coffee_Mix test_coffe_mix (in Coffee_Mix s1,
-			     inout Coffee_Mix s2,
-			     out Coffee_Mix s3);
-
-  typedef sequence<Coffee,32> Bounded_Coffee_Mix;
-  Bounded_Coffee_Mix test_bounded_coffe_mix (in Bounded_Coffee_Mix s1,
-					     inout Bounded_Coffee_Mix s2,
-					     out Bounded_Coffee_Mix s3);
-
-
-  typedef string DUMMY;
-  // variable structures
-  struct Var_Struct
-  {
-    DUMMY dummy1;
-    DUMMY dummy2;
-    StrSeq seq;
-  };
-
-  Var_Struct test_var_struct (in Var_Struct s1,
-                              inout Var_Struct s2,
-                              out Var_Struct s3);
-
-  // nested structs (We reuse the var_struct defn above to make a very
-  // complicated nested structure)
-  struct Nested_Struct
-  {
-    Var_Struct vs;
-  };
-
-  Nested_Struct test_nested_struct (in Nested_Struct s1,
-                                    inout Nested_Struct s2,
-                                    out Nested_Struct s3);
-
-  // object references
-  Coffee make_coffee (); // make a Coffee object
-
-  // test the parameter passing conventions for ObjRefs
-  Coffee test_objref (in Coffee o1, inout Coffee o2, out Coffee o3);
-
-  // Anys. We try to pump in all kinds of data types thru these Anys
-  any test_any (in any a1, inout any a2, out any a3);
-
-  // test simple objects
-  //  Object test_object (in Object o1, inout Object o2, out Object o3);
-
-  // test typecodes
-  //  TypeCode test_typecode (in TypeCode t1, inout TypeCode t2, out TypeCode t3);
-
-  // sequence of typecodes
-  //  typedef sequence<TypeCode> TypeCodeSeq;
-  //  TypeCodeSeq test_tcseq (in TypeCodeSeq t1,  inout TypeCodeSeq t2, out TypeCodeSeq t3);
-  /*
-  long test_long (in long l1,
-                  inout long l2,
-                  out long l3);
-  char test_char (in char c1,
-                  inout char c2,
-                  out char c3);
-  octet test_octet (in octet o1,
-                    inout octet o2,
-                    out octet o3);
-
-  double test_double (in double d1,
-                      inout double d2,
-                      out double d3);
-
-  // strings bounded
-  const unsigned long STRLEN = 10;
-  string<STRLEN> test_bstring (in string<STRLEN> s1,
-                               inout string<STRLEN> s2,
-                               out string<STRLEN> s3);
-
-  // typedefed string
-  typedef string MYSTRING;
-  MYSTRING test_tstring (in MYSTRING s1,
-                         inout MYSTRING s2,
-                         out MYSTRING s3);
-
-
-  // arrays (fixed)
-
-  // arrays (variable)
-
-  // multidimensional arrays (fixed)
-
-  // more combinations to follow
-  union U switch (long)
-    {
-    case 0: sequence<char> cseq;
-    case 1: sequence<octet> oseq;
-    case 2: StrSeq sseq;
-    };
-
-  // complex (but meaningless) to test the naming scheme
-  typedef sequence <sequence <sequence <long>, 5>, 10> complex;
-  */
-};
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
deleted file mode 100644
index f6b02cdb701..00000000000
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    param_test_i.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "param_test_i.h"
-
-// ********* class Coffee_i ****************
-// Constructor
-
-Coffee_i::Coffee_i (const char *name)
-  : name_ (name)
-{
-}
-
-// Destructor
-
-Coffee_i::~Coffee_i (void)
-{
-}
-
-// get attribute
-Coffee::Desc *
-Coffee_i::description (CORBA::Environment & /*env*/)
-{
-  Coffee::Desc *desc = new Coffee::Desc;
-  desc->name = CORBA::string_dup (this->name_);
-  return desc;
-}
-
-// set attribute
-void
-Coffee_i::description (const Coffee::Desc &description,
-                       CORBA::Environment & /*env*/)
-{
-  this->name_ = CORBA::string_dup (description.name);
-}
-
-
-// ********* class Param_Test_i ****************
-
-// Constructor
-
-Param_Test_i::Param_Test_i (const char *coffee_name,
-                            const char *)
-  : obj_ (coffee_name)
-{
-}
-
-// Destructor
-
-Param_Test_i::~Param_Test_i (void)
-{
-}
-
-// test shorts
-CORBA::Short
-Param_Test_i::test_short (CORBA::Short s1,
-                          CORBA::Short &s2,
-                          CORBA::Short_out s3,
-                          CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  s2 = s1 * 2;
-  s3 = s1 * 3;
-  return s1 * 4;
-}
-
-// test unbounded strings. For return and out types, we return duplicates of
-// the in string. For the inout, we append the same string to itself and send
-// it back
-char *
-Param_Test_i::test_unbounded_string (const char *s1,
-                                     char *&s2,
-                                     CORBA::String_out s3,
-                                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  char *retstr = CORBA::string_dup (s1);
-  s3 = CORBA::string_dup (s1);
-  char *tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2));
-  ACE_OS::sprintf (tmp, "%s%s", s2, s2);
-  CORBA::string_free (s2);
-  s2 = tmp;
-  return retstr;
-}
-
-// test for fixed structures. Just copy the in parameter into all the others
-Param_Test::Fixed_Struct
-Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
-                                 Param_Test::Fixed_Struct &s2,
-                                 Param_Test::Fixed_Struct_out s3,
-                                 CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  s2 = s1;
-  s3 = s1;
-  return s1;
-}
-
-// = Sequences
-
-Param_Test::Long_Seq * Param_Test_i::test_long_sequence (
-      const Param_Test::Long_Seq & s1,
-      Param_Test::Long_Seq & s2,
-      Param_Test::Long_Seq_out s3,
-      CORBA::Environment &
-     )
-{
-  Param_Test::Long_Seq
-    *ret = new Param_Test::Long_Seq,
-    *out = new Param_Test::Long_Seq;
-
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence (
-      const Param_Test::Bounded_Long_Seq & s1,
-      Param_Test::Bounded_Long_Seq & s2,
-      Param_Test::Bounded_Long_Seq_out s3,
-      CORBA::Environment &
-     )
-{
-  Param_Test::Bounded_Long_Seq
-    *ret = new Param_Test::Bounded_Long_Seq,
-    *out = new Param_Test::Bounded_Long_Seq;
-
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::StrSeq *
-Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
-                           Param_Test::StrSeq &s2,
-                           Param_Test::StrSeq_out s3,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  // we copy the "in" sequences into all the inout, out and return sequences.
-
-  Param_Test::StrSeq
-    *ret = new Param_Test::StrSeq,
-    *out = new Param_Test::StrSeq;
-
-  // now copy all elements of s1 into the others using the assignment operator
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq (
-      const Param_Test::Bounded_StrSeq & s1,
-      Param_Test::Bounded_StrSeq & s2,
-      Param_Test::Bounded_StrSeq_out s3,
-      CORBA::Environment &
-     )
-{
-  // we copy the "in" sequences into all the inout, out and return sequences.
-
-  Param_Test::Bounded_StrSeq
-    *ret = new Param_Test::Bounded_StrSeq,
-    *out = new Param_Test::Bounded_StrSeq;
-
-  // now copy all elements of s1 into the others using the assignment operator
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-// test for struct sequences
-Param_Test::StructSeq *
-Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
-                                    Param_Test::StructSeq &s2,
-                                    Param_Test::StructSeq_out s3,
-                                    CORBA::Environment &)
-{
-  // we copy the "in" sequences into all the inout, out and return sequences.
-
-  Param_Test::StructSeq
-    *ret = new Param_Test::StructSeq,
-
-    *out = new Param_Test::StructSeq;
-
-  // now copy all elements of s1 into the others using the assignment operator
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence (
-      const Param_Test::Bounded_StructSeq & s1,
-      Param_Test::Bounded_StructSeq & s2,
-      Param_Test::Bounded_StructSeq_out s3,
-      CORBA::Environment &
-     )
-{
-  Param_Test::Bounded_StructSeq
-    *ret = new Param_Test::Bounded_StructSeq,
-    *out = new Param_Test::Bounded_StructSeq;
-
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix (
-      const Param_Test::Coffee_Mix & s1,
-      Param_Test::Coffee_Mix & s2,
-      Param_Test::Coffee_Mix_out s3,
-      CORBA::Environment &
-     )
-{
-  Param_Test::Coffee_Mix
-    *ret = new Param_Test::Coffee_Mix,
-    *out = new Param_Test::Coffee_Mix;
-
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix (
-      const Param_Test::Bounded_Coffee_Mix & s1,
-      Param_Test::Bounded_Coffee_Mix & s2,
-      Param_Test::Bounded_Coffee_Mix_out s3,
-      CORBA::Environment &
-     )
-{
-  Param_Test::Bounded_Coffee_Mix
-    *ret = new Param_Test::Bounded_Coffee_Mix,
-    *out = new Param_Test::Bounded_Coffee_Mix;
-
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-
-// = end of sequences...
-
-// test for variable structs
-Param_Test::Var_Struct *
-Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
-                             Param_Test::Var_Struct &s2,
-                             Param_Test::Var_Struct_out s3,
-                             CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  // we copy the "in" sequences into all the inout, out and return sequences.
-
-  Param_Test::Var_Struct
-    *ret = new Param_Test::Var_Struct,
-    *out = new Param_Test::Var_Struct;
-
-  // now copy all elements of s1 into the others
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-// test for nested structs
-Param_Test::Nested_Struct *
-Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
-                                  Param_Test::Nested_Struct &s2,
-                                  Param_Test::Nested_Struct_out s3,
-                                  CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  // we copy the "in" sequences into all the inout, out and return sequences.
-
-  Param_Test::Nested_Struct
-    *ret = new Param_Test::Nested_Struct,
-    *out = new Param_Test::Nested_Struct;
-
-  // now copy all elements of s1 into the others
-  s2 = s1;
-  *out = s1;
-  *ret = s1;
-  s3 = out;
-  return ret;
-}
-
-// make a Coffee object
-Coffee_ptr
-Param_Test_i::make_coffee (CORBA::Environment &env)
-{
-  return this->obj_._this (env);
-}
-
-// test for object references
-Coffee_ptr
-Param_Test_i::test_objref (Coffee_ptr o1,
-                           Coffee_ptr &o2,
-                           Coffee_out o3,
-                           CORBA::Environment &env)
-{
-  Coffee_ptr ret = Coffee::_nil ();
-
-  TAO_TRY
-    {
-      Coffee_var myobj = obj_._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (myobj->_is_equivalent (o1, env))
-        {
-          o2 = Coffee::_duplicate (myobj.in ());
-          o3 = Coffee::_duplicate (myobj.in ());
-          ret = Coffee::_duplicate (myobj.in ());
-        }
-      else
-        {
-          o2 = Coffee::_nil ();
-          o3 = Coffee::_nil ();
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      TAO_TRY_ENV.print_exception ("System Exception");
-      env.exception (TAO_TRY_ENV.exception ());
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      TAO_TRY_ENV.print_exception ("User Exception");
-      env.exception (TAO_TRY_ENV.exception ());
-    }
-  TAO_ENDTRY;
-
-  return ret;
-}
-
-// test for Anys
-CORBA::Any *
-Param_Test_i::test_any (const CORBA::Any &a1,
-                        CORBA::Any &a2,
-                        CORBA::Any_out a3,
-                        CORBA::Environment &env)
-{
-  return 0;
-}
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
deleted file mode 100644
index 53f035e3d3e..00000000000
--- a/TAO/tests/Param_Test/param_test_i.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    param_test_i.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (PARAM_TEST_I_H)
-#define	PARAM_TEST_I_H
-
-#include "param_testS.h"
-
-// Implementation of the Coffee interface
-class Coffee_i : public POA_Coffee
-
-{
-public:
-  Coffee_i (const char *name);
-  // constructor
-
-  ~Coffee_i (void);
-  // destructor
-
-  // =methods for the attribute
-
-  virtual Coffee::Desc * description (CORBA::Environment &env);
-  // get attribute
-
-  virtual void description (const Coffee::Desc &description,
-                            CORBA::Environment &env);
-  // set attribute
-
-private:
-  CORBA::String_var name_;
-  // my description
-};
-
-// the implementation of the Param_test interface
-class Param_Test_i : public POA_Param_Test
-{
-  // = TITLE
-  //    Param_Test_i
-  // = DESCRIPTION
-  //    Implementation of the Param_Test test suite.
-public:
-  Param_Test_i (const char *coffee_name,
-                const char *obj_name = 0);
-  // Constructor
-
-  ~Param_Test_i (void);
-  // Destructor
-
-  virtual CORBA::Short test_short (CORBA::Short s1,
-                                   CORBA::Short &s2,
-                                   CORBA::Short_out s3,
-                                   CORBA::Environment &env);
-  // test for shorts
-
-  virtual char *test_unbounded_string (const char *s1,
-                                       char *&s2,
-                                       CORBA::String_out s3,
-                                       CORBA::Environment &env);
-  // test for unbounded strings
-
-  virtual Param_Test::Fixed_Struct
-  test_fixed_struct (const Param_Test::Fixed_Struct &s1,
-                     Param_Test::Fixed_Struct &s2,
-                     Param_Test::Fixed_Struct_out s3,
-                     CORBA::Environment &env);
-  // test for fixed structures
-
-  // = Start of sequences tests...
-  virtual Param_Test::Long_Seq * test_long_sequence (
-      const Param_Test::Long_Seq & s1,
-      Param_Test::Long_Seq & s2,
-      Param_Test::Long_Seq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
-      const Param_Test::Bounded_Long_Seq & s1,
-      Param_Test::Bounded_Long_Seq & s2,
-      Param_Test::Bounded_Long_Seq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::StrSeq * test_strseq (
-      const Param_Test::StrSeq & s1,
-      Param_Test::StrSeq & s2,
-      Param_Test::StrSeq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
-      const Param_Test::Bounded_StrSeq & s1,
-      Param_Test::Bounded_StrSeq & s2,
-      Param_Test::Bounded_StrSeq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::StructSeq * test_struct_sequence (
-      const Param_Test::StructSeq & s1,
-      Param_Test::StructSeq & s2,
-      Param_Test::StructSeq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
-      const Param_Test::Bounded_StructSeq & s1,
-      Param_Test::Bounded_StructSeq & s2,
-      Param_Test::Bounded_StructSeq_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::Coffee_Mix * test_coffe_mix (
-      const Param_Test::Coffee_Mix & s1,
-      Param_Test::Coffee_Mix & s2,
-      Param_Test::Coffee_Mix_out s3,
-      CORBA::Environment &env
-     );
-  virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
-      const Param_Test::Bounded_Coffee_Mix & s1,
-      Param_Test::Bounded_Coffee_Mix & s2,
-      Param_Test::Bounded_Coffee_Mix_out s3,
-      CORBA::Environment &env
-     );
-  // = End of sequences tests.... 
-
-  virtual Param_Test::Var_Struct *
-  test_var_struct (const Param_Test::Var_Struct &s1,
-                   Param_Test::Var_Struct &s2,
-                   Param_Test::Var_Struct_out s3,
-                   CORBA::Environment &env);
-  // test for variable structs
-
-  virtual Param_Test::Nested_Struct *
-  test_nested_struct (const Param_Test::Nested_Struct &s1,
-                      Param_Test::Nested_Struct &s2,
-                      Param_Test::Nested_Struct_out s3,
-                      CORBA::Environment &env);
-  // test for nested structs
-
-  virtual Coffee_ptr
-  make_coffee (CORBA::Environment &env);
-  // make a coffee object
-
-  virtual Coffee_ptr
-  test_objref (Coffee_ptr o1,
-               Coffee_ptr &o2,
-               Coffee_out o3,
-               CORBA::Environment &env);
-  // test for object references
-
-  virtual CORBA::Any *
-  test_any (const CORBA::Any &a1,
-            CORBA::Any &a2,
-            CORBA::Any_out a3,
-            CORBA::Environment &env);
-  // test for Anys
-
-private:
-  Coffee_i obj_;
-  // the coffee object reference we maintain
-};
-
-#endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
deleted file mode 100644
index d9ef89ed88f..00000000000
--- a/TAO/tests/Param_Test/results.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id:
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    results.cpp
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "results.h"
-
-Results::Results (void)
-{
-}
-
-Results::~Results (void)
-{
-  delete [] this->elapsed_time_;
-}
-
-void
-Results::print_stats (const char *call_name)
-{
-  double
-    avg_real_time = 0,
-    avg_user_time = 0,
-    avg_system_time = 0,
-    cps; // calls per sec
-
-  CORBA::ULong i;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "********** %s *********\n",
-	      call_name));
-
-  if (this->error_count_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Iteration\tReal time (msec)\tUser time (msec)"
-                  "\tSystem time (msec)\n\n"));
-      for (i = 0; i < this->call_count_; i++)
-        {
-          this->elapsed_time_[i].real_time *= ACE_ONE_SECOND_IN_MSECS;
-          this->elapsed_time_[i].user_time *= ACE_ONE_SECOND_IN_MSECS;
-          this->elapsed_time_[i].system_time *= ACE_ONE_SECOND_IN_MSECS;
-          avg_real_time += this->elapsed_time_[i].real_time;
-          avg_user_time += this->elapsed_time_[i].user_time;
-          avg_system_time += this->elapsed_time_[i].system_time;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "%u\t\t%0.06f\t\t%0.06f\t\t%0.06f\n",
-                      i,
-                      (this->elapsed_time_[i].real_time < 0.0?
-                       0.0:this->elapsed_time_[i].real_time),
-                      (this->elapsed_time_[i].user_time < 0.0?
-                       0.0:this->elapsed_time_[i].user_time),
-                      (this->elapsed_time_[i].system_time < 0.0?
-                       0.0:this->elapsed_time_[i].system_time)));
-        } // end of for loop
-
-      // compute average
-      avg_real_time /= this->call_count_;
-      avg_user_time /= this->call_count_;
-      avg_system_time /= this->call_count_;
-      cps = 1000 / avg_real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n*=*=*=*=*= Average *=*=*=*=*=*=\n"
-                  "\treal_time\t= %0.06f ms, \n"
-                  "\tuser_time\t= %0.06f ms, \n"
-                  "\tsystem_time\t= %0.06f ms\n"
-                  "\t%0.00f calls/second\n"
-                  "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
-                  (avg_real_time < 0.0? 0.0:avg_real_time),
-                  (avg_user_time < 0.0? 0.0:avg_user_time),
-                  (avg_system_time < 0.0? 0.0:avg_system_time),
-                  (cps < 0.0? 0.0 : cps)));
-
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\t%d calls, %d errors\n"
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
-              this->call_count_,
-              this->error_count_));
-}
-
-void
-Results::print_exception (const char *call_name,
-                          CORBA::Environment &env)
-{
-  env.print_exception (call_name);
-}
-
-void
-Results::start_timer (void)
-{
-  this->timer_.start ();
-}
-
-void
-Results::stop_timer (void)
-{
-  this->timer_.stop ();
-  this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]);
-}
-
-CORBA::ULong
-Results::call_count (void)
-{
-  return this->call_count_;
-}
-
-void
-Results::call_count (CORBA::ULong c)
-{
-  this->call_count_ = c;
-}
-
-CORBA::ULong
-Results::error_count (void)
-{
-  return this->error_count_;
-}
-
-void
-Results::error_count (CORBA::ULong c)
-{
-  this->error_count_ = c;
-}
-
-void
-Results::iterations (CORBA::ULong iters)
-{
-  this->elapsed_time_ = new ACE_Profile_Timer::ACE_Elapsed_Time [iters];
-}
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
deleted file mode 100644
index 2b13af0495e..00000000000
--- a/TAO/tests/Param_Test/results.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id:
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    results.h
-//
-// = DESCRIPTION
-//    Printing the results
-//
-// = AUTHORS
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (RESULTS_H)
-#define RESULTS_H
-
-#include "ace/Profile_Timer.h"
-#include "ace/Log_Msg.h"
-#include "tao/corba.h"
-
-class Results
-{
-public:
-  Results (void);
-  // ctor
-
-  ~Results (void);
-  // destructor
-
-  void print_stats (const char *call_name);
-  // prints the time stats
-
-  void print_exception (const char *call_name,
-                        CORBA::Environment &);
-  // print the exception
-
-  void start_timer (void);
-  // start timing
-
-  void stop_timer (void);
-  // stop timing
-
-  CORBA::ULong call_count (void);
-  // return call count
-
-  void call_count (CORBA::ULong);
-  // set the call count
-
-  CORBA::ULong error_count (void);
-  // return the error count
-
-  void error_count (CORBA::ULong);
-  // set error count
-
-  void iterations (CORBA::ULong iters);
-  // set the number of times the test will be run
-
-private:
-  CORBA::ULong call_count_;
-  // # of calls made to functions
-
-  CORBA::ULong error_count_;
-  // # of errors incurred in the lifetime of the application.
-
-  ACE_Profile_Timer timer_;
-  // for timing the test
-
-  ACE_Profile_Timer::ACE_Elapsed_Time *elapsed_time_;
-  // holds the elapsed time for each iteration
-};
-
-#endif /* RESULTS_H */
diff --git a/TAO/tests/Param_Test/run_test b/TAO/tests/Param_Test/run_test
deleted file mode 100755
index 70864337b49..00000000000
--- a/TAO/tests/Param_Test/run_test
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-PORT=20001
-IORFILE=theior
-INVOCATION=sii
-start_server()
-{
-  ./server -ORBobjrefstyle url -ORBport $PORT -o $IORFILE 2>&1 | sed -e 's/^/SERVER: /' &
-}
-
-# Restart the server if we get SIGCHLD, i.e., the server died.
-trap "start_server" 17
-trap "rm -f $IORFILE" 0
-start_server
-trap "kill `ps | grep server | awk '{print $1;}'`" 0
-
-TYPES="short ubstring fixed_struct strseq var_struct nested_struct struct_seq objref"
-for type in $TYPES
-do
-  echo "BEGIN Testing type $type"
-  sleep 2	# Give the server a chance to start up
-  ./client -f $IORFILE  -i $INVOCATION -t $type 2>&1 | sed -e "s/^/CLIENT($type): /"
-  echo "END   Testing type $type"
-done 
diff --git a/TAO/tests/Param_Test/server.MAK b/TAO/tests/Param_Test/server.MAK
deleted file mode 100644
index c388f7d1321..00000000000
--- a/TAO/tests/Param_Test/server.MAK
+++ /dev/null
@@ -1,1120 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on server.dsp
-!IF "$(CFG)" == ""
-CFG=server - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to server - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-OUTDIR=.
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\param_test_i.obj"
-	-@erase "$(INTDIR)\param_testC.obj"
-	-@erase "$(INTDIR)\param_testS.obj"
-	-@erase "$(INTDIR)\server.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\server.exe"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D\
- "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\server.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=TAO.lib ace.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\server.pdb" /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /libpath:"..\..\tao" /libpath:"..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\param_test_i.obj" \
-	"$(INTDIR)\param_testC.obj" \
-	"$(INTDIR)\param_testS.obj" \
-	"$(INTDIR)\server.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\server.exe"
-
-!ELSE 
-
-ALL : "param_testS.i" "param_testS.h" "param_testS.cpp" "param_testC.i"\
- "param_testC.h" "param_testC.cpp" "$(OUTDIR)\server.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\param_test_i.obj"
-	-@erase "$(INTDIR)\param_testC.obj"
-	-@erase "$(INTDIR)\param_testS.obj"
-	-@erase "$(INTDIR)\server.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\server.exe"
-	-@erase "$(OUTDIR)\server.ilk"
-	-@erase "$(OUTDIR)\server.pdb"
-	-@erase "param_testC.cpp"
-	-@erase "param_testC.h"
-	-@erase "param_testC.i"
-	-@erase "param_testS.cpp"
-	-@erase "param_testS.h"
-	-@erase "param_testS.i"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D\
- "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\server.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\server.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=TAO.lib aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\server.pdb" /debug /machine:I386 /out:"$(OUTDIR)\server.exe"\
- /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\param_test_i.obj" \
-	"$(INTDIR)\param_testC.obj" \
-	"$(INTDIR)\param_testS.obj" \
-	"$(INTDIR)\server.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(CFG)" == "server - Win32 Release" || "$(CFG)" == "server - Win32 Debug"
-SOURCE=.\param_test.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-InputPath=.\param_test.idl
-
-"param_testS.h"	"param_testS.i"	"param_testS.cpp"	"param_testC.h"\
-	"param_testC.i"	"param_testC.cpp"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\tao_idl\tao_idl param_test.idl
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-InputPath=.\param_test.idl
-
-"param_testS.h"	"param_testS.i"	"param_testS.cpp"	"param_testC.h"\
-	"param_testC.i"	"param_testC.cpp"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\tao_idl\tao_idl param_test.idl
-
-!ENDIF 
-
-SOURCE=.\param_test_i.cpp
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-DEP_CPP_PARAM=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\param_test_i.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\param_testS.h"\
-	".\param_testS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\param_test_i.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"\
- ".\param_testS.h" ".\param_testC.h" ".\param_testS.i" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-
-"$(INTDIR)\param_test_i.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\param_testC.cpp
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-DEP_CPP_PARAM_=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\param_testC.obj" : $(SOURCE) $(DEP_CPP_PARAM_) "$(INTDIR)"\
- ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-
-"$(INTDIR)\param_testC.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\param_testS.cpp
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-DEP_CPP_PARAM_T=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\param_testS.h"\
-	".\param_testS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\param_testS.obj" : $(SOURCE) $(DEP_CPP_PARAM_T) "$(INTDIR)"\
- ".\param_testS.h" ".\param_testS.i" ".\param_testC.h" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-
-"$(INTDIR)\param_testS.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\server.cpp
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-DEP_CPP_SERVE=\
-	"..\..\..\ace\Acceptor.cpp"\
-	"..\..\..\ace\Acceptor.h"\
-	"..\..\..\ace\Acceptor.i"\
-	"..\..\..\ace\ACE.h"\
-	"..\..\..\ace\ACE.i"\
-	"..\..\..\ace\Addr.h"\
-	"..\..\..\ace\Addr.i"\
-	"..\..\..\ace\Atomic_Op.i"\
-	"..\..\..\ace\Auto_Ptr.cpp"\
-	"..\..\..\ace\Auto_Ptr.h"\
-	"..\..\..\ace\Auto_Ptr.i"\
-	"..\..\..\ace\Basic_Types.h"\
-	"..\..\..\ace\Basic_Types.i"\
-	"..\..\..\ace\config-win32-common.h"\
-	"..\..\..\ace\config-win32.h"\
-	"..\..\..\ace\config.h"\
-	"..\..\..\ace\Connector.cpp"\
-	"..\..\..\ace\Connector.h"\
-	"..\..\..\ace\Connector.i"\
-	"..\..\..\ace\Containers.cpp"\
-	"..\..\..\ace\Containers.h"\
-	"..\..\..\ace\Containers.i"\
-	"..\..\..\ace\Dynamic.h"\
-	"..\..\..\ace\Dynamic.i"\
-	"..\..\..\ace\Dynamic_Service.cpp"\
-	"..\..\..\ace\Dynamic_Service.h"\
-	"..\..\..\ace\Event_Handler.h"\
-	"..\..\..\ace\Event_Handler.i"\
-	"..\..\..\ace\Free_List.cpp"\
-	"..\..\..\ace\Free_List.h"\
-	"..\..\..\ace\Free_List.i"\
-	"..\..\..\ace\Get_Opt.h"\
-	"..\..\..\ace\Get_Opt.i"\
-	"..\..\..\ace\Handle_Set.h"\
-	"..\..\..\ace\Handle_Set.i"\
-	"..\..\..\ace\Hash_Map_Manager.cpp"\
-	"..\..\..\ace\Hash_Map_Manager.h"\
-	"..\..\..\ace\inc_user_config.h"\
-	"..\..\..\ace\INET_Addr.h"\
-	"..\..\..\ace\INET_Addr.i"\
-	"..\..\..\ace\IO_Cntl_Msg.h"\
-	"..\..\..\ace\iosfwd.h"\
-	"..\..\..\ace\IPC_SAP.h"\
-	"..\..\..\ace\IPC_SAP.i"\
-	"..\..\..\ace\Log_Msg.h"\
-	"..\..\..\ace\Log_Priority.h"\
-	"..\..\..\ace\Log_Record.h"\
-	"..\..\..\ace\Log_Record.i"\
-	"..\..\..\ace\Malloc.h"\
-	"..\..\..\ace\Malloc.i"\
-	"..\..\..\ace\Malloc_T.cpp"\
-	"..\..\..\ace\Malloc_T.h"\
-	"..\..\..\ace\Malloc_T.i"\
-	"..\..\..\ace\Managed_Object.cpp"\
-	"..\..\..\ace\Managed_Object.h"\
-	"..\..\..\ace\Managed_Object.i"\
-	"..\..\..\ace\Map_Manager.cpp"\
-	"..\..\..\ace\Map_Manager.h"\
-	"..\..\..\ace\Map_Manager.i"\
-	"..\..\..\ace\Mem_Map.h"\
-	"..\..\..\ace\Mem_Map.i"\
-	"..\..\..\ace\Memory_Pool.h"\
-	"..\..\..\ace\Memory_Pool.i"\
-	"..\..\..\ace\Message_Block.h"\
-	"..\..\..\ace\Message_Block.i"\
-	"..\..\..\ace\Message_Queue.cpp"\
-	"..\..\..\ace\Message_Queue.h"\
-	"..\..\..\ace\Message_Queue.i"\
-	"..\..\..\ace\Module.cpp"\
-	"..\..\..\ace\Module.h"\
-	"..\..\..\ace\Module.i"\
-	"..\..\..\ace\Object_Manager.h"\
-	"..\..\..\ace\Object_Manager.i"\
-	"..\..\..\ace\OS.h"\
-	"..\..\..\ace\OS.i"\
-	"..\..\..\ace\Reactor.h"\
-	"..\..\..\ace\Reactor.i"\
-	"..\..\..\ace\Reactor_Impl.h"\
-	"..\..\..\ace\Service_Config.h"\
-	"..\..\..\ace\Service_Config.i"\
-	"..\..\..\ace\Service_Object.h"\
-	"..\..\..\ace\Service_Object.i"\
-	"..\..\..\ace\Service_Repository.h"\
-	"..\..\..\ace\Service_Repository.i"\
-	"..\..\..\ace\Service_Types.h"\
-	"..\..\..\ace\Service_Types.i"\
-	"..\..\..\ace\Shared_Object.h"\
-	"..\..\..\ace\Shared_Object.i"\
-	"..\..\..\ace\Signal.h"\
-	"..\..\..\ace\Signal.i"\
-	"..\..\..\ace\Singleton.cpp"\
-	"..\..\..\ace\Singleton.h"\
-	"..\..\..\ace\Singleton.i"\
-	"..\..\..\ace\SOCK.h"\
-	"..\..\..\ace\SOCK.i"\
-	"..\..\..\ace\SOCK_Acceptor.h"\
-	"..\..\..\ace\SOCK_Acceptor.i"\
-	"..\..\..\ace\SOCK_Connector.h"\
-	"..\..\..\ace\SOCK_Connector.i"\
-	"..\..\..\ace\SOCK_IO.h"\
-	"..\..\..\ace\SOCK_IO.i"\
-	"..\..\..\ace\SOCK_Stream.h"\
-	"..\..\..\ace\SOCK_Stream.i"\
-	"..\..\..\ace\SString.h"\
-	"..\..\..\ace\SString.i"\
-	"..\..\..\ace\Strategies.h"\
-	"..\..\..\ace\Strategies_T.cpp"\
-	"..\..\..\ace\Strategies_T.h"\
-	"..\..\..\ace\Stream_Modules.cpp"\
-	"..\..\..\ace\Stream_Modules.h"\
-	"..\..\..\ace\Stream_Modules.i"\
-	"..\..\..\ace\streams.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.h"\
-	"..\..\..\ace\SV_Semaphore_Complex.i"\
-	"..\..\..\ace\SV_Semaphore_Simple.h"\
-	"..\..\..\ace\SV_Semaphore_Simple.i"\
-	"..\..\..\ace\Svc_Conf_Tokens.h"\
-	"..\..\..\ace\Svc_Handler.cpp"\
-	"..\..\..\ace\Svc_Handler.h"\
-	"..\..\..\ace\Svc_Handler.i"\
-	"..\..\..\ace\Synch.h"\
-	"..\..\..\ace\Synch.i"\
-	"..\..\..\ace\Synch_Options.h"\
-	"..\..\..\ace\Synch_T.cpp"\
-	"..\..\..\ace\Synch_T.h"\
-	"..\..\..\ace\Synch_T.i"\
-	"..\..\..\ace\sys_conf.h"\
-	"..\..\..\ace\Task.h"\
-	"..\..\..\ace\Task.i"\
-	"..\..\..\ace\Task_T.cpp"\
-	"..\..\..\ace\Task_T.h"\
-	"..\..\..\ace\Task_T.i"\
-	"..\..\..\ace\Thread.h"\
-	"..\..\..\ace\Thread.i"\
-	"..\..\..\ace\Thread_Manager.h"\
-	"..\..\..\ace\Thread_Manager.i"\
-	"..\..\..\ace\Time_Value.h"\
-	"..\..\..\ace\Timer_Queue.h"\
-	"..\..\..\ace\Timer_Queue_T.cpp"\
-	"..\..\..\ace\Timer_Queue_T.h"\
-	"..\..\..\ace\Timer_Queue_T.i"\
-	"..\..\..\ace\Trace.h"\
-	"..\..\..\ace\Version.h"\
-	"..\..\..\ace\WFMO_Reactor.h"\
-	"..\..\..\ace\WFMO_Reactor.i"\
-	"..\..\..\ace\ws2tcpip.h"\
-	"..\..\tao\align.h"\
-	"..\..\tao\any.h"\
-	"..\..\tao\any.i"\
-	"..\..\tao\cdr.h"\
-	"..\..\tao\cdr.i"\
-	"..\..\tao\client_factory.h"\
-	"..\..\tao\compat\initguid.h"\
-	"..\..\tao\compat\objbase.h"\
-	"..\..\tao\connect.h"\
-	"..\..\tao\connect.i"\
-	"..\..\tao\corba.h"\
-	"..\..\tao\corbacom.h"\
-	"..\..\tao\corbacom.i"\
-	"..\..\tao\debug.h"\
-	"..\..\tao\default_client.h"\
-	"..\..\tao\default_client.i"\
-	"..\..\tao\default_server.h"\
-	"..\..\tao\default_server.i"\
-	"..\..\tao\except.h"\
-	"..\..\tao\giop.h"\
-	"..\..\tao\giop.i"\
-	"..\..\tao\iiopobj.h"\
-	"..\..\tao\iiopobj.i"\
-	"..\..\tao\iioporb.h"\
-	"..\..\tao\iioporb.i"\
-	"..\..\tao\marshal.h"\
-	"..\..\tao\marshal.i"\
-	"..\..\tao\nvlist.h"\
-	"..\..\tao\nvlist.i"\
-	"..\..\tao\object.h"\
-	"..\..\tao\object.i"\
-	"..\..\tao\objtable.h"\
-	"..\..\tao\optable.h"\
-	"..\..\tao\orb.h"\
-	"..\..\tao\orb_core.h"\
-	"..\..\tao\orb_core.i"\
-	"..\..\tao\orbconf.h"\
-	"..\..\tao\orbobj.h"\
-	"..\..\tao\orbobj.i"\
-	"..\..\tao\params.h"\
-	"..\..\tao\params.i"\
-	"..\..\tao\poa.h"\
-	"..\..\tao\poa.i"\
-	"..\..\tao\principa.h"\
-	"..\..\tao\request.h"\
-	"..\..\tao\sequence.h"\
-	"..\..\tao\sequence.i"\
-	"..\..\tao\sequence_T.cpp"\
-	"..\..\tao\sequence_T.h"\
-	"..\..\tao\sequence_T.i"\
-	"..\..\tao\server_factory.h"\
-	"..\..\tao\server_factory.i"\
-	"..\..\tao\singletons.h"\
-	"..\..\tao\stub.h"\
-	"..\..\tao\stub.i"\
-	"..\..\tao\svrrqst.h"\
-	"..\..\tao\typecode.h"\
-	"..\..\tao\typecode.i"\
-	".\param_test_i.h"\
-	".\param_testC.h"\
-	".\param_testC.i"\
-	".\param_testS.h"\
-	".\param_testS.i"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\server.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"\
- ".\param_testS.h" ".\param_testC.h" ".\param_testS.i" ".\param_testC.i"
-
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-
-"$(INTDIR)\server.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
deleted file mode 100644
index a4d09b8f250..00000000000
--- a/TAO/tests/Param_Test/server.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "param_test_i.h"
-
-// Parses the command line arguments and returns an error status.
-static FILE *ior_output_file = 0;
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "do:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'o':
-        ior_output_file = ACE_OS::fopen (get_opts.optarg, "w");
-        if (ior_output_file == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  PortableServer::POA_var oa_ptr;
-  Param_Test_i *param_test = 0;
-
-  TAO_TRY
-    {
-      char *orb_name = "internet"; // unused by TAO
-      CORBA::Object_var temp; // holder for the myriad of times we get
-                              // an object which we then have to narrow.
-
-      // get the underlying ORB
-      CORBA::ORB_var orb_ptr = CORBA::ORB_init (argc, argv, orb_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Get the Root POA
-
-      temp = orb_ptr->resolve_initial_references ("RootPOA");
-      if (CORBA::is_nil (temp.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to get root poa reference.\n"),
-                          1);
-
-      oa_ptr = PortableServer::POA::_narrow (temp.in(), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-        oa_ptr->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::PolicyList policies (2);
-      policies.length (2);
-      policies[0] =
-        oa_ptr->create_id_assignment_policy (PortableServer::USER_ID,
-                                             TAO_TRY_ENV);
-      policies[1] =
-        oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        TAO_TRY_ENV);
-
-      // We use a different POA, otherwise the user would have to
-      // change the object key each time it invokes the server.
-      PortableServer::POA_var good_poa =
-        oa_ptr->create_POA ("RootPOA_is_BAD",
-                            poa_manager.in (),
-                            policies,
-                            TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Parse remaining command line and verify parameters.
-      parse_args (argc, argv);
-
-      // initialize a param_test target object and register it with the object
-      // adapter
-
-      // Create the implementation object
-      ACE_NEW_RETURN (param_test, Param_Test_i ("unknown"), 1);
-
-      // Register with GoodPOA with a specific name
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("param_test");
-      good_poa->activate_object_with_id (id.in (),
-                                         param_test,
-                                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-
-      temp = good_poa->id_to_reference (id.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-        orb_ptr->object_to_string (temp.in (),
-                                   TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) The IOR is <%s>\n", str.in ()));
-      if (ior_output_file)
-        {
-          ACE_OS::fprintf (ior_output_file, "%s", str.in());
-          ACE_OS::fclose (ior_output_file);
-        }
-      
-
-      // Make the POAs controlled by this manager active
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (orb_ptr->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-      good_poa->destroy (CORBA::B_TRUE,
-                         CORBA::B_TRUE,
-                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      oa_ptr->destroy (CORBA::B_TRUE,
-                       CORBA::B_TRUE,
-                       TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  // Free resources
-  delete param_test;
-
-  return 0;
-}
diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp
deleted file mode 100644
index ac7d8a5d830..00000000000
--- a/TAO/tests/Param_Test/server.dsp
+++ /dev/null
@@ -1,162 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\param_test.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\param_test.idl

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl Param_Test.idl

-

-"param_testS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\param_test.idl

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl Param_Test.idl

-

-"param_testS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"param_testC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_test_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_testS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/Param_Test/svc.conf b/TAO/tests/Param_Test/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Param_Test/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Param_Test/tests.cpp b/TAO/tests/Param_Test/tests.cpp
deleted file mode 100644
index d57911b3665..00000000000
--- a/TAO/tests/Param_Test/tests.cpp
+++ /dev/null
@@ -1,1517 +0,0 @@
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    tests.cpp
-//
-// = DESCRIPTION
-//    All the test objects defined here
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "helper.h"
-#include "tests.h"
-
-
-// ************************************************************************
-//               Test_Short
-// ************************************************************************
-
-Test_Short::Test_Short (void)
-  : opname_ (CORBA::string_dup ("test_short"))
-{
-}
-
-Test_Short::~Test_Short (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Short::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Short::init_parameters (Param_Test_ptr objref,
-                             CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  this->in_ = gen->gen_short ();
-  this->inout_ =  0;
-  return 0;
-}
-
-int
-Test_Short::reset_parameters (void)
-{
-  this->inout_ =  0;
-  this->out_ =  0;
-  this->ret_ =  0;
-  return 0;
-}
-
-int
-Test_Short::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &env)
-{
-  this->ret_ = objref->test_short (this->in_, this->inout_, this->out_, env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Short::add_args (CORBA::NVList_ptr &param_list,
-                      CORBA::NVList_ptr &retval,
-                      CORBA::Environment &env)
-{
-  CORBA::Any in_arg (CORBA::_tc_short, &this->in_, 0);
-  CORBA::Any inout_arg (CORBA::_tc_short, &this->inout_, 0);
-  CORBA::Any out_arg (CORBA::_tc_short, &this->out_, 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (CORBA::_tc_short,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Short::check_validity (void)
-{
-  if (this->inout_ == this->in_*2 &&
-      this->out_ == this->in_*3 &&
-      this->ret_ == this->in_*4)
-    return 1; // success
-  else
-    return 0;
-}
-
-CORBA::Boolean
-Test_Short::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = *(CORBA::Short *) req->arguments ()->item (1, env)->value ()->value ();
-  this->out_ = *(CORBA::Short *) req->arguments ()->item (2, env)->value ()->value ();
-  this->ret_ = *(CORBA::Short *)req->result ()->value ()->value ();
-  return this->check_validity ();
-}
-
-void
-Test_Short::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n=*=*=*=*=*=*\n"
-              "in = %d, "
-              "inout = %d, "
-              "out = %d, "
-              "ret = %d\n"
-              "\n=*=*=*=*=*=*\n",
-              this->in_,
-              this->inout_,
-              this->out_,
-              this->ret_));
-}
-
-
-// ************************************************************************
-//               Test_Unbounded_String
-// ************************************************************************
-
-Test_Unbounded_String::Test_Unbounded_String (void)
-  : opname_ (CORBA::string_dup ("test_unbounded_string")),
-    in_ (0),
-    inout_ (0),
-    out_ (0),
-    ret_ (0)
-{
-}
-
-Test_Unbounded_String::~Test_Unbounded_String (void)
-{
-  CORBA::string_free (this->opname_);
-  CORBA::string_free (this->in_);
-  CORBA::string_free (this->inout_);
-  CORBA::string_free (this->out_);
-  CORBA::string_free (this->ret_);
-  this->opname_ = 0;
-  this->in_ = 0;
-  this->inout_ = 0;
-  this->out_ = 0;
-  this->ret_ = 0;
-}
-
-const char *
-Test_Unbounded_String::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Unbounded_String::init_parameters (Param_Test_ptr objref,
-                                        CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  // release any previously occupied values
-  CORBA::string_free (this->in_);
-  CORBA::string_free (this->inout_);
-  CORBA::string_free (this->out_);
-  CORBA::string_free (this->ret_);
-  this->in_ = 0;
-  this->inout_ = 0;
-  this->out_ = 0;
-  this->ret_ = 0;
-
-  this->in_ = gen->gen_string ();
-  this->inout_ = CORBA::string_dup (this->in_);
-  return 0;
-}
-
-int
-Test_Unbounded_String::reset_parameters (void)
-{
-  // release any previously occupied values
-  this->inout_ = 0;
-  this->out_ = 0;
-  this->ret_ = 0;
-
-  this->inout_ = CORBA::string_dup (this->in_);
-  return 0;
-}
-
-int
-Test_Unbounded_String::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &env)
-{
-  CORBA::String_out str_out (this->out_);
-  this->ret_ = objref->test_unbounded_string (this->in_, this->inout_, str_out,
-                                              env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Unbounded_String::add_args (CORBA::NVList_ptr &param_list,
-                      CORBA::NVList_ptr &retval,
-                      CORBA::Environment &env)
-{
-  CORBA::Any in_arg (CORBA::_tc_string, &this->in_, 0);
-  CORBA::Any inout_arg (CORBA::_tc_string, &this->inout_, 0);
-  CORBA::Any out_arg (CORBA::_tc_string, &this->out_, 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (CORBA::_tc_string,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Unbounded_String::check_validity (void)
-{
-  CORBA::ULong len = ACE_OS::strlen (this->in_);
-
-  if (!ACE_OS::strcmp (this->in_, this->out_) &&
-      !ACE_OS::strcmp (this->in_, this->ret_) &&
-      ACE_OS::strlen (this->inout_) == 2*len &&
-      !ACE_OS::strncmp (this->in_, this->inout_, len) &&
-      !ACE_OS::strncmp (this->in_, &this->inout_[len], len))
-    return 1;
-
-  return 0; // otherwise
-}
-
-CORBA::Boolean
-Test_Unbounded_String::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = *(char **) req->arguments ()->item (1, env)->value ()->value ();
-  this->out_ = *(char **) req->arguments ()->item (2, env)->value ()->value ();
-  this->ret_ = *(char **)req->result ()->value ()->value ();
-  return this->check_validity ();
-}
-
-void
-Test_Unbounded_String::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n=*=*=*=*=*=*\n"
-              "in with len (%d) = %s\n"
-              "inout with len (%d) = %s\n"
-              "out with len (%d) = %s\n"
-              "ret with len (%d) = %s\n"
-              "\n=*=*=*=*=*=*\n",
-              (this->in_ ? ACE_OS::strlen (this->in_):0),
-              (this->in_ ? this->in_:"<nul string>"),
-              (this->inout_ ? ACE_OS::strlen (this->inout_):0),
-              (this->inout_ ? this->inout_:"<nul string>"),
-              (this->out_ ? ACE_OS::strlen (this->out_):0),
-              (this->out_ ? this->out_:"<nul string>"),
-              (this->ret_ ? ACE_OS::strlen (this->ret_):0),
-              (this->ret_ ? this->ret_:"<nul string>")));
-}
-
-// ************************************************************************
-//               Test_Fixed_Struct
-// ************************************************************************
-
-Test_Fixed_Struct::Test_Fixed_Struct (void)
-  : opname_ (CORBA::string_dup ("test_fixed_struct"))
-{
-}
-
-Test_Fixed_Struct::~Test_Fixed_Struct (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Fixed_Struct::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Fixed_Struct::init_parameters (Param_Test_ptr objref,
-                                    CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  this->in_ = gen->gen_fixed_struct ();
-  ACE_OS::memset (&this->inout_, 0, sizeof (Param_Test::Fixed_Struct));
-  return 0;
-}
-
-int
-Test_Fixed_Struct::reset_parameters (void)
-{
-  ACE_OS::memset (&this->inout_, 0, sizeof (Param_Test::Fixed_Struct));
-  ACE_OS::memset (&this->out_, 0, sizeof (Param_Test::Fixed_Struct));
-  ACE_OS::memset (&this->ret_, 0, sizeof (Param_Test::Fixed_Struct));
-  return 0;
-}
-
-int
-Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref,
-                                 CORBA::Environment &env)
-{
-  this->ret_ = objref->test_fixed_struct (this->in_, this->inout_, this->out_,
-                                          env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Fixed_Struct::add_args (CORBA::NVList_ptr &param_list,
-                             CORBA::NVList_ptr &retval,
-                             CORBA::Environment &env)
-{
-  // the Any does not own any of these
-  CORBA::Any in_arg (Param_Test::_tc_Fixed_Struct, &this->in_, 0);
-  CORBA::Any inout_arg (Param_Test::_tc_Fixed_Struct, &this->inout_, 0);
-  CORBA::Any out_arg (Param_Test::_tc_Fixed_Struct, &this->out_, 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (Param_Test::_tc_Fixed_Struct,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Fixed_Struct::check_validity (void)
-{
-  if (this->in_.l == this->inout_.l &&
-      this->in_.c == this->inout_.c &&
-      this->in_.s == this->inout_.s &&
-      this->in_.o == this->inout_.o &&
-      this->in_.f == this->inout_.f &&
-      this->in_.b == this->inout_.b &&
-      this->in_.d == this->inout_.d &&
-      this->in_.l == this->out_.l &&
-      this->in_.c == this->out_.c &&
-      this->in_.s == this->out_.s &&
-      this->in_.o == this->out_.o &&
-      this->in_.f == this->out_.f &&
-      this->in_.b == this->out_.b &&
-      this->in_.d == this->out_.d &&
-      this->in_.l == this->ret_.l &&
-      this->in_.c == this->ret_.c &&
-      this->in_.s == this->ret_.s &&
-      this->in_.o == this->ret_.o &&
-      this->in_.f == this->ret_.f &&
-      this->in_.b == this->ret_.b &&
-      this->in_.d == this->ret_.d)
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean
-Test_Fixed_Struct::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = *(Param_Test::Fixed_Struct *) req->arguments ()->item (1, env)
-    ->value ()->value ();
-  this->out_ = *(Param_Test::Fixed_Struct *) req->arguments ()->item (2, env)
-    ->value ()->value ();
-  this->ret_ = *(Param_Test::Fixed_Struct *)req->result ()->value ()->value ();
-  return this->check_validity ();
-}
-
-void
-Test_Fixed_Struct::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n=*=*=*=*=*=*\n"
-              "in = {\n"
-              "\tl = %d\n"
-              "\tc = %c\n"
-              "\ts = %d\n"
-              "\to = %x\n"
-              "\tf = %f\n"
-              "\tb = %d\n"
-              "\td = %f\n"
-              "}\n"
-              "inout = {\n"
-              "\tl = %d\n"
-              "\tc = %c\n"
-              "\ts = %d\n"
-              "\to = %x\n"
-              "\tf = %f\n"
-              "\tb = %d\n"
-              "\td = %f\n"
-              "}\n"
-              "out = {\n"
-              "\tl = %d\n"
-              "\tc = %c\n"
-              "\ts = %d\n"
-              "\to = %x\n"
-              "\tf = %f\n"
-              "\tb = %d\n"
-              "\td = %f\n"
-              "}\n"
-              "ret = {\n"
-              "\tl = %d\n"
-              "\tc = %c\n"
-              "\ts = %d\n"
-              "\to = %x\n"
-              "\tf = %f\n"
-              "\tb = %d\n"
-              "\td = %f\n"
-              "}\n"
-              "=*=*=*=*=*=*\n",
-              this->in_.l,
-              this->in_.c,
-              this->in_.s,
-              this->in_.o,
-              this->in_.f,
-              this->in_.b,
-              this->in_.d,
-              this->inout_.l,
-              this->inout_.c,
-              this->inout_.s,
-              this->inout_.o,
-              this->inout_.f,
-              this->inout_.b,
-              this->inout_.d,
-              this->out_.l,
-              this->out_.c,
-              this->out_.s,
-              this->out_.o,
-              this->out_.f,
-              this->out_.b,
-              this->out_.d,
-              this->ret_.l,
-              this->ret_.c,
-              this->ret_.s,
-              this->ret_.o,
-              this->ret_.f,
-              this->ret_.b,
-              this->ret_.d));
-}
-
-// ************************************************************************
-//               Test_String_Sequence
-// ************************************************************************
-
-Test_String_Sequence::Test_String_Sequence (void)
-  : opname_ (CORBA::string_dup ("test_strseq")),
-    in_ (new Param_Test::StrSeq),
-    inout_ (new Param_Test::StrSeq),
-    out_ (0),
-    ret_ (0)
-{
-}
-
-Test_String_Sequence::~Test_String_Sequence (void)
-{
-}
-
-const char *
-Test_String_Sequence::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_String_Sequence::init_parameters (Param_Test_ptr objref,
-                                       CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  const char *choiceList[] =
-  {
-    "one",
-    "two",
-    "three"
-  };
-
-  CORBA::ULong len = sizeof(choiceList)/sizeof(char *);
-
-  // get some sequence length (not more than 10)
-  //  CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
-
-  // set the length of the sequence
-  this->in_->length (len);
-  // now set each individual element
-  for (CORBA::ULong i=0; i < this->in_->length (); i++)
-    {
-      // generate some arbitrary string to be filled into the ith location in
-      // the sequence
-      //      char *str = gen->gen_string ();
-      //this->in_[i] = str;
-      this->in_[i] = choiceList[i];
-
-    }
-  return 0;
-}
-
-int
-Test_String_Sequence::reset_parameters (void)
-{
-  this->inout_ = new Param_Test::StrSeq; // delete the previous one
-  this->out_ = 0;
-  this->ret_ = 0;
-  return 0;
-}
-
-int
-Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &env)
-{
-  Param_Test::StrSeq_out out (this->out_.out ());
-  this->ret_ = objref->test_strseq (this->in_.in (),
-                                    this->inout_.inout (),
-                                    out,
-                                    env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_String_Sequence::add_args (CORBA::NVList_ptr &param_list,
-                                CORBA::NVList_ptr &retval,
-                                CORBA::Environment &env)
-{
-  CORBA::Any in_arg (Param_Test::_tc_StrSeq, (void *) &this->in_.in (), 0);
-  CORBA::Any inout_arg (Param_Test::_tc_StrSeq, &this->inout_.inout (), 0);
-  CORBA::Any out_arg (Param_Test::_tc_StrSeq, this->out_.out (), 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (Param_Test::_tc_StrSeq,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_String_Sequence::check_validity (void)
-{
-  CORBA::Boolean flag = 0;
-  if ((this->in_->length () == this->inout_->length ()) &&
-      (this->in_->length () == this->out_->length ()) &&
-      (this->in_->length () == this->ret_->length ()))
-    {
-      flag = 1; // assume all are equal
-      // lengths are same. Now compare the contents
-      for (CORBA::ULong i=0; i < this->in_->length () && flag; i++)
-        {
-          if (ACE_OS::strcmp (this->in_[i], this->inout_[i]) ||
-              ACE_OS::strcmp (this->in_[i], this->out_[i]) ||
-              ACE_OS::strcmp (this->in_[i], this->ret_[i]))
-            // not equal
-            flag = 0;
-        }
-    }
-  return flag;
-}
-
-CORBA::Boolean
-Test_String_Sequence::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = new Param_Test::StrSeq (*(Param_Test::StrSeq *) req->arguments
-                                         ()->item (1, env)->value ()->value ());
-  this->out_ = new Param_Test::StrSeq (*(Param_Test::StrSeq *) req->arguments
-                                       ()->item (2, env)->value ()->value ());
-  this->ret_ = new Param_Test::StrSeq (*(Param_Test::StrSeq *)req->result
-                                       ()->value ()->value ());
-  return this->check_validity ();
-}
-
-void
-Test_String_Sequence::print_values (void)
-{
-  CORBA::ULong i;
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->in_.ptr () && (i < this->in_->length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  this->in_[i]? (const char *)this->in_[i]:"<nul>"));
-    }
-  if (!this->in_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\nin sequence is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->inout_.ptr () && (i < this->inout_->length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  (this->inout_[i]? (const char *)this->inout_[i]:"<nul>")));
-    }
-  if (!this->inout_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\ninout sequence is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->out_.ptr () && (i < this->out_->length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  (this->out_[i]? (const char *)this->out_[i]:"<nul>")));
-    }
-  if (!this->out_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\nout sequence is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->ret_.ptr () && (i < this->ret_->length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  (this->ret_[i]? (const char *)this->ret_[i]:"<nul>")));
-    }
-  if (!this->ret_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\nin sequence is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-}
-
-// ************************************************************************
-//               Test_Var_Struct
-// ************************************************************************
-
-Test_Var_Struct::Test_Var_Struct (void)
-  : opname_ (CORBA::string_dup ("test_var_struct")),
-    inout_ (new Param_Test::Var_Struct),
-    out_ (0),
-    ret_ (0)
-{
-}
-
-Test_Var_Struct::~Test_Var_Struct (void)
-{
-  CORBA::string_free (this->opname_);
-  // the other data members will be freed as they are "_var"s and objects
-  // (rather than pointers to objects)
-}
-
-const char *
-Test_Var_Struct::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Var_Struct::init_parameters (Param_Test_ptr objref,
-                                  CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  // get some sequence length (not more than 10)
-  CORBA::ULong len = (CORBA::ULong) gen->gen_long ();
-
-  // set the length of the sequence
-  this->in_.dummy1 = gen->gen_string ();
-  this->in_.dummy2 = gen->gen_string ();
-  this->in_.seq.length (len);
-  // now set each individual element
-  for (CORBA::ULong i=0; i < this->in_.seq.length (); i++)
-    {
-      // generate some arbitrary string to be filled into the ith location in
-      // the sequence
-      char *str = gen->gen_string ();
-      this->in_.seq[i] = str;
-    }
-  return 0;
-}
-
-int
-Test_Var_Struct::reset_parameters (void)
-{
-  this->inout_ = new Param_Test::Var_Struct; // delete the previous one
-  this->out_ = 0;
-  this->ret_ = 0;
-  return 0;
-}
-
-int
-Test_Var_Struct::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &env)
-{
-  Param_Test::Var_Struct_out out (this->out_.out ());
-  this->ret_ = objref->test_var_struct (this->in_,
-                                        this->inout_.inout (),
-                                        out,
-                                        env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Var_Struct::add_args (CORBA::NVList_ptr &param_list,
-                                CORBA::NVList_ptr &retval,
-                                CORBA::Environment &env)
-{
-  CORBA::Any in_arg (Param_Test::_tc_Var_Struct, (void *) &this->in_, 0);
-  CORBA::Any inout_arg (Param_Test::_tc_Var_Struct, &this->inout_.inout (), 0);
-  CORBA::Any out_arg (Param_Test::_tc_Var_Struct, this->out_.out (), 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (Param_Test::_tc_Var_Struct,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Var_Struct::check_validity (void)
-{
-  CORBA::Boolean flag = 0;
-  if ((!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->inout_->dummy2)) &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->out_->dummy2)) &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->ret_->dummy2)) &&
-      (this->in_.seq.length () == this->inout_->seq.length ()) &&
-      (this->in_.seq.length () == this->out_->seq.length ()) &&
-      (this->in_.seq.length () == this->ret_->seq.length ()))
-    {
-      flag = 1; // assume all are equal
-      // lengths are same. Now compare the contents
-      for (CORBA::ULong i=0; i < this->in_.seq.length () && flag; i++)
-        {
-          if (ACE_OS::strcmp (this->in_.seq[i], this->inout_->seq[i]) ||
-              ACE_OS::strcmp (this->in_.seq[i], this->out_->seq[i]) ||
-              ACE_OS::strcmp (this->in_.seq[i], this->ret_->seq[i]))
-            // not equal
-            flag = 0;
-        }
-    }
-  return flag;
-}
-
-CORBA::Boolean
-Test_Var_Struct::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = new Param_Test::Var_Struct (*(Param_Test::Var_Struct *) req->arguments
-                                         ()->item (1, env)->value ()->value ());
-  this->out_ = new Param_Test::Var_Struct (*(Param_Test::Var_Struct *) req->arguments
-                                       ()->item (2, env)->value ()->value ());
-  this->ret_ = new Param_Test::Var_Struct (*(Param_Test::Var_Struct *)req->result
-                                       ()->value ()->value ());
-  return this->check_validity ();
-}
-
-void
-Test_Var_Struct::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n*=*=*=*=*=*=*=*=*=*=\n"
-              "in_.dummy1 = %s\n"
-              "inout_.dummy1 = %s\n"
-              "out_.dummy1 = %s\n"
-              "ret_.dummy1 = %s\n",
-              this->in_.dummy1.in (),
-              this->inout_->dummy1.in (),
-              this->out_->dummy1.in (),
-              this->ret_->dummy1.in ()));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n*=*=*=*=*=*=*=*=*=*=\n"
-              "in_.dummy2 = %s\n"
-              "inout_.dummy2 = %s\n"
-              "out_.dummy2 = %s\n"
-              "ret_.dummy2 = %s\n",
-              this->in_.dummy2.in (),
-              this->inout_->dummy2.in (),
-              this->out_->dummy2.in (),
-              this->ret_->dummy2.in ()));
-
-  CORBA::ULong i;
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; i < this->in_.seq.length (); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in.seq : %s\n",
-                  i,
-                  (this->in_.seq[i]? (const char *)this->in_.seq[i]:"<nul>")));
-    }
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->inout_.ptr () && (i < this->inout_->seq.length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "inout : %s\n",
-                  i,
-                  (this->inout_->seq[i]? (const char *)this->inout_->seq[i]:"<nul>")));
-    }
-  if (!this->inout_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\ninout struct does not exist\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->out_.ptr () && (i < this->out_->seq.length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  (this->out_->seq[i]? (const char *)this->out_->seq[i]:"<nul>")));
-    }
-  if (!this->out_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\nout struct is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-  for (i=0; this->ret_.ptr () && (i < this->ret_->seq.length ()); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-                  "in : %s\n",
-                  i,
-                  (this->ret_->seq[i]? (const char *)this->ret_->seq[i]:"<nul>")));
-    }
-  if (!this->ret_.ptr ())
-    ACE_DEBUG ((LM_DEBUG, "\nret struct is NUL\n"));
-  ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n"));
-}
-
-// ************************************************************************
-//               Test_Nested_Struct
-// ************************************************************************
-
-Test_Nested_Struct::Test_Nested_Struct (void)
-  : opname_ (CORBA::string_dup ("test_nested_struct")),
-    inout_ (new Param_Test::Nested_Struct),
-    out_ (0),
-    ret_ (0)
-{
-}
-
-Test_Nested_Struct::~Test_Nested_Struct (void)
-{
-  CORBA::string_free (this->opname_);
-  // the other data members will be freed as they are "_var"s and objects
-  // (rather than pointers to objects)
-}
-
-const char *
-Test_Nested_Struct::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Nested_Struct::init_parameters (Param_Test_ptr objref,
-                                     CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  // get some sequence length (not more than 10)
-  CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
-
-  // set the length of the sequence
-  this->in_.vs.seq.length (len);
-  // now set each individual element
-  for (CORBA::ULong i=0; i < this->in_.vs.seq.length (); i++)
-    {
-      // generate some arbitrary string to be filled into the ith location in
-      // the sequence
-      char *str = gen->gen_string ();
-      this->in_.vs.seq[i] = str;
-    }
-  return 0;
-}
-
-int
-Test_Nested_Struct::reset_parameters (void)
-{
-  this->inout_ = new Param_Test::Nested_Struct; // delete the previous one
-  this->out_ = 0;
-  this->ret_ = 0;
-  return 0;
-}
-
-int
-Test_Nested_Struct::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &env)
-{
-  Param_Test::Nested_Struct_out out (this->out_.out ());
-  this->ret_ = objref->test_nested_struct (this->in_,
-                                           this->inout_.inout (),
-                                           out,
-                                           env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Nested_Struct::add_args (CORBA::NVList_ptr &param_list,
-                                CORBA::NVList_ptr &retval,
-                                CORBA::Environment &env)
-{
-  CORBA::Any in_arg (Param_Test::_tc_Nested_Struct, (void *) &this->in_, 0);
-  CORBA::Any inout_arg (Param_Test::_tc_Nested_Struct, &this->inout_.inout (), 0);
-  CORBA::Any out_arg (Param_Test::_tc_Nested_Struct, this->out_.out (), 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (Param_Test::_tc_Nested_Struct,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Nested_Struct::check_validity (void)
-{
-  CORBA::Boolean flag = 0;
-  if ((this->in_.vs.seq.length () == this->inout_->vs.seq.length ()) &&
-      (this->in_.vs.seq.length () == this->out_->vs.seq.length ()) &&
-      (this->in_.vs.seq.length () == this->ret_->vs.seq.length ()))
-    {
-      flag = 1; // assume all are equal
-      // lengths are same. Now compare the contents
-      for (CORBA::ULong i=0; i < this->in_.vs.seq.length () && flag; i++)
-        {
-          if (ACE_OS::strcmp (this->in_.vs.seq[i], this->inout_->vs.seq[i]) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i], this->out_->vs.seq[i]) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i], this->ret_->vs.seq[i]))
-            // not equal
-            flag = 0;
-        }
-    }
-  return flag;
-}
-
-CORBA::Boolean
-Test_Nested_Struct::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *)
-                                                req->arguments ()->item
-                                                (1, env)->value ()->value ());
-  this->out_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *) req->arguments
-                                              ()->item (2, env)->value ()->value ());
-  this->ret_ = new Param_Test::Nested_Struct (*(Param_Test::Nested_Struct *)req->result
-                                              ()->value ()->value ());
-  return this->check_validity ();
-}
-
-void
-Test_Nested_Struct::print_values (void)
-{
-  for (CORBA::ULong i=0; i < this->in_.vs.seq.length (); i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n*=*=*=*=*=*=*=*=*=*=\n"
-                  "Element # %d\n"
-                  "in (len = %d): %s\n"
-                  "inout (len = %d): %s\n"
-                  "out (len = %d): %s\n"
-                  "ret (len = %d): %s\n",
-                  this->in_.vs.seq.length (),
-                  (this->in_.vs.seq.length ()? (const char *)this->in_.vs.seq[i]:"<nul>"),
-                  this->inout_->vs.seq.length (),
-                  (this->inout_->vs.seq.length ()? (const char *)this->inout_->vs.seq[i]:"<nul>"),
-                  this->out_->vs.seq.length (),
-                  (this->out_->vs.seq.length ()? (const char *)this->out_->vs.seq[i]:"<nul>"),
-                  this->ret_->vs.seq.length (),
-                  (this->ret_->vs.seq.length ()? (const char *)this->ret_->vs.seq[i]:"<nul>")));
-    }
-}
-
-// ************************************************************************
-//               Test_Struct_Sequence
-// ************************************************************************
-
-Test_Struct_Sequence::Test_Struct_Sequence (void)
-  : opname_ (CORBA::string_dup ("test_struct_sequence")),
-    inout_ (new Param_Test::StructSeq),
-    out_ (0),
-    ret_ (0)
-{
-}
-
-Test_Struct_Sequence::~Test_Struct_Sequence (void)
-{
-  CORBA::string_free (this->opname_);
-  // the other data members will be freed as they are "_var"s and objects
-  // (rather than pointers to objects)
-}
-
-const char *
-Test_Struct_Sequence::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Struct_Sequence::init_parameters (Param_Test_ptr objref,
-                                     CORBA::Environment &env)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (env);
-
-  // get some sequence length (not more than 10)
-  CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
-
-  // set the length of the sequence
-  this->in_.length (len);
-  // now set each individual element
-  for (CORBA::ULong i = 0; i < this->in_.length (); i++)
-    {
-      // generate some arbitrary string to be filled into the ith location in
-      // the sequence
-      this->in_[i] = gen->gen_fixed_struct ();
-    }
-  return 0;
-}
-
-int
-Test_Struct_Sequence::reset_parameters (void)
-{
-  this->inout_ = new Param_Test::StructSeq; // delete the previous one
-  this->out_ = 0;
-  this->ret_ = 0;
-  return 0;
-}
-
-int
-Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &env)
-{
-  Param_Test::StructSeq_out out (this->out_.out ());
-  this->ret_ = objref->test_struct_sequence (this->in_,
-                                           this->inout_.inout (),
-                                           out,
-                                           env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_Struct_Sequence::add_args (CORBA::NVList_ptr &param_list,
-                                CORBA::NVList_ptr &retval,
-                                CORBA::Environment &env)
-{
-  CORBA::Any in_arg (Param_Test::_tc_StructSeq, (void *) &this->in_, 0);
-  CORBA::Any inout_arg (Param_Test::_tc_StructSeq, &this->inout_.inout (), 0);
-  CORBA::Any out_arg (Param_Test::_tc_StructSeq, this->out_.out (), 0);
-
-  // add parameters
-  (void)param_list->add_value ("s1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("s2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("s3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (Param_Test::_tc_StructSeq,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Struct_Sequence::check_validity (void)
-{
-  if (this->compare (this->in_, this->inout_.in ()) &&
-      this->compare (this->in_, this->out_.in ()) &&
-      this->compare (this->in_, this->ret_.in ()))
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean
-Test_Struct_Sequence::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = new Param_Test::StructSeq (*(Param_Test::StructSeq *)
-                                                req->arguments ()->item
-                                                (1, env)->value ()->value ());
-  this->out_ = new Param_Test::StructSeq (*(Param_Test::StructSeq *) req->arguments
-                                              ()->item (2, env)->value ()->value ());
-  this->ret_ = new Param_Test::StructSeq (*(Param_Test::StructSeq *)req->result
-                                              ()->value ()->value ());
-  return this->check_validity ();
-}
-
-void
-Test_Struct_Sequence::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
-              "IN sequence\n"));
-  this->print_sequence (this->in_);
-  ACE_DEBUG ((LM_DEBUG,
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
-              "INOUT sequence\n"));
-  this->print_sequence (this->inout_.in ());
-  ACE_DEBUG ((LM_DEBUG,
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
-              "OUT sequence\n"));
-  this->print_sequence (this->out_.in ());
-  ACE_DEBUG ((LM_DEBUG,
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n"
-              "RET sequence\n"));
-  this->print_sequence (this->ret_.in ());
-}
-
-CORBA::Boolean
-Test_Struct_Sequence::compare (const Param_Test::StructSeq &s1,
-                               const Param_Test::StructSeq &s2)
-{
-  if (s1.maximum () != s2.maximum ())
-      return 0;
-  if (s1.length () != s2.length ())
-    return 0;
-
-  for (CORBA::ULong i=0; i < s1.length (); i++)
-    {
-      const Param_Test::Fixed_Struct& vs1 = s1[i];
-      const Param_Test::Fixed_Struct& vs2 = s2[i];
-
-      if (vs1.l != vs2.l
-	  || vs1.c != vs2.c
-	  || vs1.s != vs2.s
-	  || vs1.o != vs2.o
-	  || vs1.f != vs2.f
-	  || vs1.b != vs2.b
-	  || vs1.d != vs2.d )
-	return 0;
-    }
-
-  return 1; // success
-}
-
-void
-Test_Struct_Sequence::print_sequence (const Param_Test::StructSeq &s)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "maximum = %d\n"
-              "length = %d\n",
-              s.maximum (),
-              s.length ()));
-  ACE_DEBUG ((LM_DEBUG, "Elements -\n"));
-  for (CORBA::ULong i=0; i < s.length (); i++)
-    {
-      const Param_Test::Fixed_Struct& vs = s[i];
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Element #%d\n"
-		  "\tl = %d\n"
-		  "\tc = %c\n"
-		  "\ts = %d\n"
-		  "\to = %x\n"
-		  "\tf = %f\n"
-		  "\tb = %d\n"
-		  "\td = %f\n",
-                  i,
-		  vs.l, vs.c, vs.s, vs.o, vs.f, vs.b, vs.d));
-    }
-}
-
-// ************************************************************************
-//               Test_ObjRef
-// ************************************************************************
-
-Test_ObjRef::Test_ObjRef (void)
-  : opname_ (CORBA::string_dup ("test_objref"))
-{
-}
-
-Test_ObjRef::~Test_ObjRef (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_ObjRef::opname (void) const
-{
-  return this->opname_;
-}
-
-static const char *Coffee_Flavor [] = {
-  "Italian Roast",
-  "Irish Creme",
-  "Costa Rican",
-  "Colombian Supremo",
-  "Macademia Nut",
-  "Swiss Chocolate Mocha"
-};
-
-int
-Test_ObjRef::init_parameters (Param_Test_ptr objref,
-                              CORBA::Environment &env)
-{
-  Coffee::Desc desc;
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  // first get a Coffee object
-  this->in_ = objref->make_coffee (env);
-  if (env.exception ())
-    {
-      env.print_exception ("make_coffee");
-      return -1;
-    }
-
-  // get some sequence length (not more than 10)
-  CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
-  desc.name = Coffee_Flavor [index];
-  // set the attribute of the object
-  this->in_->description (desc, env); // set the attribute for the in object
-  if (env.exception ())
-    {
-      env.print_exception ("set coffee attribute");
-      return -1;
-    }
-  return 0;
-}
-
-int
-Test_ObjRef::reset_parameters (void)
-{
-  CORBA::Environment env;
-  Coffee::Desc desc;
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  // get some sequence length (not more than 10)
-  CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
-  desc.name = Coffee_Flavor [index];
-  // set the attribute of the object
-  this->in_->description (desc, env); // set the attribute for the in object
-  if (env.exception ())
-    {
-      env.print_exception ("set coffee attribute");
-      return -1;
-    }
-
-  this->inout_ = Coffee::_nil ();
-  this->out_ =  Coffee::_nil ();
-  this->ret_ =  Coffee::_nil ();
-  return 0;
-}
-
-int
-Test_ObjRef::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &env)
-{
-  Coffee_out out (this->out_.out ());
-  this->ret_ = objref->test_objref (this->in_.in (),
-                                    this->inout_.inout (),
-                                    out,
-                                    env);
-  return (env.exception () ? -1:0);
-}
-
-int
-Test_ObjRef::add_args (CORBA::NVList_ptr &param_list,
-                      CORBA::NVList_ptr &retval,
-                      CORBA::Environment &env)
-{
-  CORBA::Any in_arg (_tc_Coffee, &this->in_, 0);
-  CORBA::Any inout_arg (_tc_Coffee, &this->inout_, 0);
-  CORBA::Any out_arg (_tc_Coffee, &this->out_, 0);
-
-  // add parameters
-  (void)param_list->add_value ("o1", in_arg, CORBA::ARG_IN, env);
-  (void)param_list->add_value ("o2", inout_arg, CORBA::ARG_INOUT, env);
-  (void)param_list->add_value ("o3", out_arg, CORBA::ARG_OUT, env);
-
-  // add return value
-  (void)retval->item (0, env)->value ()->replace (_tc_Coffee,
-                                                  &this->ret_,
-                                                  0, // does not own
-                                                  env);
-  return 0;
-}
-
-CORBA::Boolean
-Test_ObjRef::check_validity (void)
-{
-  CORBA::Environment env;
-  char   // attribute names
-    *in,
-    *inout,
-    *out,
-    *ret;
-
-  in = this->in_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return 0;
-    }
-
-  inout = this->inout_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return 0;
-    }
-
-  out = this->out_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return 0;
-    }
-
-  ret = this->ret_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return 0;
-    }
-
-  // now compare them
-  if (!ACE_OS::strcmp (in, inout) &&
-      !ACE_OS::strcmp (in, out) &&
-      !ACE_OS::strcmp (in, ret))
-    return 1; // success
-  else
-    return 0;
-}
-
-CORBA::Boolean
-Test_ObjRef::check_validity (CORBA::Request_ptr req)
-{
-  CORBA::Environment env;
-  this->inout_ = Coffee::_narrow ((CORBA::Object_ptr) req->arguments ()->item
-                                  (1, env)->value ()->value (), env);
-  if (env.exception ())
-    {
-      env.print_exception ("_narrow from DII result");
-      return 0;
-    }
-
-  this->out_ = Coffee::_narrow ((CORBA::Object_ptr) req->arguments ()->item
-                                (2, env)->value ()->value (), env);
-  if (env.exception ())
-    {
-      env.print_exception ("_narrow from DII result");
-      return 0;
-    }
-
-  this->ret_ = Coffee::_narrow ((CORBA::Object_ptr)req->result ()->value
-                                ()->value (), env);
-  if (env.exception ())
-    {
-      env.print_exception ("_narrow from DII result");
-      return 0;
-    }
-
-  return this->check_validity ();
-}
-
-void
-Test_ObjRef::print_values (void)
-{
-  CORBA::Environment env;
-  char   // attribute names
-    *in,
-    *inout,
-    *out,
-    *ret;
-
-  in = this->in_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return;
-    }
-
-  inout = this->inout_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return;
-    }
-
-  out = this->out_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return;
-    }
-
-  ret = this->ret_->description (env)->name;
-  if (env.exception ())
-    {
-      env.print_exception ("retrieving description");
-      return;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n=*=*=*=*=*=*"
-              "in = %s, "
-              "inout = %s, "
-              "out = %s, "
-              "ret = %s*=*=*=*=*=\n",
-              in,
-              inout,
-              out,
-              ret));
-}
-
-// ************************************************************************
-//               Test_Any
-// ************************************************************************
-
-Test_Any::Test_Any (void)
-  : opname_ (CORBA::string_dup ("test_any"))
-{
-}
-
-Test_Any::~Test_Any (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Any::opname (void) const
-{
-  return this->opname_;
-}
-
-int
-Test_Any::init_parameters (Param_Test_ptr objref,
-                           CORBA::Environment &env)
-{
-  return 0;
-}
-
-int
-Test_Any::reset_parameters (void)
-{
-  return 0;
-}
-
-int
-Test_Any::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &env)
-{
-  return 0;
-}
-
-int
-Test_Any::add_args (CORBA::NVList_ptr &param_list,
-                      CORBA::NVList_ptr &retval,
-                      CORBA::Environment &env)
-{
-  return 0;
-}
-
-CORBA::Boolean
-Test_Any::check_validity (void)
-{
-  return 0;
-}
-
-CORBA::Boolean
-Test_Any::check_validity (CORBA::Request_ptr req)
-{
-  return this->check_validity ();
-}
-
-void
-Test_Any::print_values (void)
-{
-}
diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h
deleted file mode 100644
index 1dab45fed8a..00000000000
--- a/TAO/tests/Param_Test/tests.h
+++ /dev/null
@@ -1,552 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    tests.h
-//
-// = DESCRIPTION
-//    All the test objects defined here
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TESTS_H)
-#define TESTS_H
-
-#include "param_testC.h"
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test shorts
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Short
-{
-public:
-  Test_Short (void);
-  // ctor
-
-  ~Test_Short (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  CORBA::Short in_;
-  // in parameter
-
-  CORBA::Short inout_;
-  // inout parameter
-
-  CORBA::Short out_;
-  // out parameter
-
-  CORBA::Short ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test unbounded strings
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Unbounded_String
-{
-public:
-  Test_Unbounded_String (void);
-  // ctor
-
-  ~Test_Unbounded_String (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  char *in_;
-  // in parameter
-
-  char *inout_;
-  // inout parameter
-
-  char *out_;
-  // out parameter
-
-  char *ret_;
-  // return value
-};
-
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test fixed structs
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Fixed_Struct
-{
-public:
-  Test_Fixed_Struct (void);
-  // ctor
-
-  ~Test_Fixed_Struct (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  Param_Test::Fixed_Struct in_;
-  // in parameter
-
-  Param_Test::Fixed_Struct inout_;
-  // inout parameter
-
-  Param_Test::Fixed_Struct out_;
-  // out parameter
-
-  Param_Test::Fixed_Struct ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//           test typedefed sequences (in our case, sequences of strings)
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-
-class Test_String_Sequence
-{
-public:
-  Test_String_Sequence (void);
-  // ctor
-
-  ~Test_String_Sequence (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  Param_Test::StrSeq_var in_;
-  // in parameter
-
-  Param_Test::StrSeq_var inout_;
-  // inout parameter
-
-  Param_Test::StrSeq_var out_;
-  // out parameter
-
-  Param_Test::StrSeq_var ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//           test variable sized structs
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-
-class Test_Var_Struct
-{
-public:
-  Test_Var_Struct (void);
-  // ctor
-
-  ~Test_Var_Struct (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  Param_Test::Var_Struct in_;
-  // in parameter
-
-  // these need memory management
-  Param_Test::Var_Struct_var inout_;
-  // inout parameter
-
-  Param_Test::Var_Struct_var out_;
-  // out parameter
-
-  Param_Test::Var_Struct_var ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//           test nested structs
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-
-class Test_Nested_Struct
-{
-public:
-  Test_Nested_Struct (void);
-  // ctor
-
-  ~Test_Nested_Struct (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  Param_Test::Nested_Struct in_;
-  // in parameter
-
-  // these need memory management
-  Param_Test::Nested_Struct_var inout_;
-  // inout parameter
-
-  Param_Test::Nested_Struct_var out_;
-  // out parameter
-
-  Param_Test::Nested_Struct_var ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//           test sequence of structs
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-
-class Test_Struct_Sequence
-{
-public:
-  Test_Struct_Sequence (void);
-  // ctor
-
-  ~Test_Struct_Sequence (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-protected:
-  CORBA::Boolean compare (const Param_Test::StructSeq &s1,
-                          const Param_Test::StructSeq &s2);
-  // compare
-
-  void print_sequence (const Param_Test::StructSeq &s);
-  // print individual sequence
-private:
-  char *opname_;
-  // operation name
-
-  Param_Test::StructSeq in_;
-  // in parameter
-
-  // these need memory management
-  Param_Test::StructSeq_var inout_;
-  // inout parameter
-
-  Param_Test::StructSeq_var out_;
-  // out parameter
-
-  Param_Test::StructSeq_var ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test objrefs
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_ObjRef
-{
-public:
-  Test_ObjRef (void);
-  // ctor
-
-  ~Test_ObjRef (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  Coffee_var in_;
-  // in parameter
-
-  Coffee_var inout_;
-  // inout parameter
-
-  Coffee_var out_;
-  // out parameter
-
-  Coffee_var ret_;
-  // return value
-};
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test Anys
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Any
-{
-public:
-  Test_Any (void);
-  // ctor
-
-  ~Test_Any (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr &nvlist,
-                CORBA::NVList_ptr &retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-private:
-  char *opname_;
-  // operation name
-
-  CORBA::Any in_;
-  // in parameter
-
-  CORBA::Any inout_;
-  // inout parameter
-
-  CORBA::Any_var out_;
-  // out parameter
-
-  CORBA::Any_var ret_;
-  // return value
-};
-
-#endif /* if !defined */
diff --git a/TAO/tests/Param_Test/tmplinst.cpp b/TAO/tests/Param_Test/tmplinst.cpp
deleted file mode 100644
index 494026a84ea..00000000000
--- a/TAO/tests/Param_Test/tmplinst.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "param_testC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-template class TAO_Bounded_Sequence<CORBA::Long,32>;
-template class TAO_Bounded_String_Sequence<32>;
-template class TAO_Unbounded_Sequence<Param_Test::Fixed_Struct>;
-template class TAO_Bounded_Sequence<Param_Test::Fixed_Struct,32>;
-template class TAO_Unbounded_Object_Sequence<Coffee>;
-template class TAO_Bounded_Object_Sequence<Coffee,32>;
-template class TAO_Object_Manager<Coffee>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#pragma instantiate TAO_Bounded_Sequence<CORBA::Long,32>
-#pragma instantiate TAO_Bounded_String_Sequence<32>
-#pragma instantiate TAO_Unbounded_Sequence<Param_Test::Fixed_Struct>
-#pragma instantiate TAO_Bounded_Sequence<Param_Test::Fixed_Struct,32>
-#pragma instantiate TAO_Unbounded_Object_Sequence<Coffee>
-#pragma instantiate TAO_Bounded_Object_Sequence<Coffee,32>
-#pragma instantiate TAO_Object_Manager<Coffee>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/Quoter/FactoryFinder.cpp b/TAO/tests/Quoter/FactoryFinder.cpp
deleted file mode 100644
index 9770d1d6241..00000000000
--- a/TAO/tests/Quoter/FactoryFinder.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder.cpp
-//
-// = DESCRIPTION
-//    A Factory Finder for the Quoter example. This example conforms
-//    to the CosLifeCycle Factory Finder notion.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "FactoryFinder.h"
-
-
-static const char usage [] = 
-"[-? |\n[-O[RBport] ORB port number]]";
-
-QuoterFactoryFinder_Server::QuoterFactoryFinder_Server () 
-{
-}
-
-QuoterFactoryFinder_Server::~QuoterFactoryFinder_Server () 
-{
-  TAO_TRY
-    {
-      // Unbind the Quoter Factory Finder.
-      CosNaming::Name factory_name (2);
-      factory_name.length (2);
-      factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
-      factory_name[1].id = CORBA::string_dup ("QuoterFactoryFinder");
-      this->quoterNamingContext_var_->unbind (factory_name,TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-    }
-  TAO_ENDTRY;
-}
-
-QuoterFactoryFinder_Server::init (int argc, char *argv[], CORBA::Environment& env)
-{
-  if (this->orb_manager_.init (argc,
-                               argv,
-                               env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "init"),
-                      -1);
-
-  // Copy them, because parse_args expects them there.
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-
-
-  ACE_NEW_RETURN (this->quoterFactoryFinderImpl_ptr_,
-                  QuoterFactoryFinderImpl(),
-                  -1);
-
-  // Activate the object.
-  CORBA::String_var str  =
-    this->orb_manager_.activate (this->quoterFactoryFinderImpl_ptr_,
-                                 env);
-
-  // Failure while activating the Quoter Factory Finder object
-  if (str == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "init: Failure while activating the Quoter Factory Finder Impl.\n"),
-                      -1);
-
-
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  // Register the Quoter Factory Finder with the Naming Service
-  TAO_TRY 
-    {
-      ACE_DEBUG ((LM_DEBUG,"Trying to get a reference to the Naming Service.\n"));
-
-      // Get the Naming Service object reference.
-      CORBA::Object_var namingObj_var = 
-        orb_manager_.orb()->resolve_initial_references ("NameService");
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (namingObj_var.in ())) 
-        ACE_ERROR ((LM_ERROR,
-                   " (%P|%t) Unable get the Naming Service.\n"));
-
-      // Narrow the object reference to a Naming Context.
-      CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG,"Have a proper reference to the Naming Service.\n"));
-
-      // Get the IDL_Quoter naming context.
-      CosNaming::Name quoterContextName (1);  // max = 1 
-      quoterContextName.length (1);
-      quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-
-      CORBA::Object_var quoterNamingObj_var = 
-        namingContext_var->resolve (quoterContextName, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      quoterNamingContext_var_ = 
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           TAO_TRY_ENV);
-       
-      ACE_DEBUG ((LM_DEBUG,"Have a proper reference to the Quoter Naming Context.\n"));
-
-      // Bind the QuoterFactory Finder to the IDL_Quoter naming
-      // context.
-      CosNaming::Name quoterFactoryFinderName_ (1);
-      quoterFactoryFinderName_.length (1);
-      quoterFactoryFinderName_[0].id = CORBA::string_dup ("QuoterFactoryFinder");
-
-      quoterNamingContext_var_->bind (quoterFactoryFinderName_,
-                                            this->quoterFactoryFinderImpl_ptr_->_this(TAO_TRY_ENV),
-                                            TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG,"Bound the Quoter Factory Finder to the Quoter Naming Context.\n"));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
-  
-
-  return 0;
-}
-
-int
-QuoterFactoryFinder_Server::run (CORBA::Environment& env)
-{
-  if (orb_manager_.orb()->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
-
-
-// Function get_options.
-
-unsigned int
-QuoterFactoryFinder_Server::parse_args ()
-{
-  // We need the 'O' in get_opt () because we also want to have ORB
-  // parameters, they all start with 'O'.
-  ACE_Get_Opt get_opt (this->argc_, this->argv_, "O?");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    switch (opt) 
-      {
-      case '?':
-        ACE_DEBUG ((LM_DEBUG,
-                    "Usage: %s %s\n",
-                    this->argv_[0], usage));
-        ACE_OS::exit (0);
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: unknown arg, -%c\n"
-                           "Usage: %s %s\n",
-                           this->argv_[0], char (opt),
-                           this->argv_[0],
-                           usage),
-                          1);
-      }
-  return 0;
-}
-
-// function main
-
-int
-main (int argc, char *argv [])
-{
-  QuoterFactoryFinder_Server quoterFactoryFinder_server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tIDL_Quoter:QuoterFactoryFinder \n \n"));
-  TAO_TRY
-    {
-      if (quoterFactoryFinder_server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          quoterFactoryFinder_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Quoter/FactoryFinder.dsp b/TAO/tests/Quoter/FactoryFinder.dsp
deleted file mode 100644
index 0cc3c2a755b..00000000000
--- a/TAO/tests/Quoter/FactoryFinder.dsp
+++ /dev/null
@@ -1,181 +0,0 @@
-# Microsoft Developer Studio Project File - Name="QuoterFactoryFinder" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=QuoterFactoryFinder - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "QuoterFactoryFinder.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "QuoterFactoryFinder.mak"\

- CFG="QuoterFactoryFinder - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "QuoterFactoryFinder - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "QuoterFactoryFinder - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "QuoterFactoryFinder - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "QuoterFactoryFinder - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib tao.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "QuoterFactoryFinder - Win32 Release"

-# Name "QuoterFactoryFinder - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\QuoterC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterFactoryFinder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterFactoryFinderImpl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h"

-# Begin Source File

-

-SOURCE=.\QuoterC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterFactoryFinder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterFactoryFinderImpl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.h

-# End Source File

-# End Group

-# Begin Group "Include Files"

-

-# PROP Default_Filter "i"

-# Begin Source File

-

-SOURCE=.\QuoterC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Quoter.idl

-

-!IF  "$(CFG)" == "QuoterFactoryFinder - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "QuoterFactoryFinder - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Quoter.idl

-InputName=Quoter

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Quoter/FactoryFinder.h b/TAO/tests/Quoter/FactoryFinder.h
deleted file mode 100644
index 7c7e60b3401..00000000000
--- a/TAO/tests/Quoter/FactoryFinder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinder.h
-//
-// = DESCRIPTION
-//    Server for the Quoter Factory Finder 
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/tao.h"
-#include "FactoryFinderImpl.h"
-
-#if !defined (QUOTER_FACTORY_FINDER_H)
-#define QUOTER_FACTORY_FINDER_H
-
-class QuoterFactoryFinder_Server
-{
-  // = TILE
-  //   Server object for the Quoter Factory Finder
-
-public:
-  QuoterFactoryFinder_Server (void);
-  // Default constructor
-
-  ~QuoterFactoryFinder_Server (void);
-  // Destructor
-
-  int init (int argc, char *argv[], CORBA::Environment& env);
-  // Initialize the Quoter_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb 
-
-  unsigned int parse_args ();
-  // parse the passed parameters
-
-private:
-  TAO_ORB_Manager orb_manager_;
-  // instance of the ORB Manager
-
-  QuoterFactoryFinderImpl *quoterFactoryFinderImpl_ptr_;
-  // instance of the Quoter Factory Finder
-  
-  CosNaming::NamingContext_var quoterNamingContext_var_;
-  // reference to the Quoter naming context
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* QUOTER_FACTORY_FINDER_H */
diff --git a/TAO/tests/Quoter/FactoryFinderImpl.cpp b/TAO/tests/Quoter/FactoryFinderImpl.cpp
deleted file mode 100644
index 4a8069fec5a..00000000000
--- a/TAO/tests/Quoter/FactoryFinderImpl.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinderImpl.cpp
-//
-// = DESCRIPTION
-//    A Factory Finder for the Quoter example. This example conforms
-//    to the CosLifeCycle Factory Finder notion.
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "FactoryFinderImpl.h"
-
-static const char usage [] = 
-"[-? |\n[-O[RBport] ORB port number]]";
-
-// Constructor
-QuoterFactoryFinderImpl::QuoterFactoryFinderImpl (void)
-{
-}
-
-// Destructor.
-QuoterFactoryFinderImpl::~QuoterFactoryFinderImpl (void)
-{
-}
-
-
-CosLifeCycle::Factories *
-QuoterFactoryFinderImpl::find_factories (const CosLifeCycle::Key &factory_key,
-                                       CORBA::Environment &_env_there)
-{
-  CORBA::Environment env_here;
-
-  // fill in the name of the Quoter Factory
-   CosNaming::Name factoryName (1);  // max = 1 
-   factoryName.length (1);
-   factoryName[0].id = CORBA::string_dup ("quoter_factory");
-  // or
-
-  // Get a reference to the ORB.
-  CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance ()->orb ();
-
-   // Get the Naming Service object reference.
-   CORBA::Object_var namingObj_var = 
-        orb_ptr->resolve_initial_references ("NameService");
-
-  if (CORBA::is_nil (namingObj_var.in ())) 
-        ACE_ERROR ((LM_ERROR,
-                   " (%P|%t) Unable get the Naming Service.\n"));
-
-  // Narrow the object reference to a Naming Context.
-  CosNaming::NamingContext_var namingContext_var =
-    CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                       env_here);
-
-  // see if there is an exception, if yes then throw the NoFactory exception
-  if (env_here.exception () != 0) {
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
-
-  // Get the IDL_Quoter naming context.
-  CosNaming::Name quoterContextName (1);  // max = 1 
-  quoterContextName.length (1);
-  quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-
-  CORBA::Object_var quoterNamingObj_var = 
-    namingContext_var->resolve (quoterContextName, env_here);
-
-  // see if there is an exception, if yes then throw the NoFactory exception
-  if (env_here.exception () != 0) {
-
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
-
-  CosNaming::NamingContext_var quoterNamingContext_var = 
-    CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           env_here);
-
-  // see if there is an exception, if yes then throw the NoFactory exception
-  if (env_here.exception () != 0) {
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
-  
-
-  // **  now a proper reference to the quoter naming context is available
-
-  // Take the key supplied to search for a Quoter Factory
-  //CosNaming::Name factoryName = (CosNaming::Name) factory_key;
-
-  // Try to get a reference to a Quoter Factory
-  CORBA::Object_var quoterFactoryObject_var =  
-    quoterNamingContext_var->resolve (factoryName, env_here);
-  
-  // see if there is an exception, if yes then throw the NoFactory exception
-  if (env_here.exception () != 0) {
-
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
-
-  // Check if it is a valid Quoter Factory reference
-  if (CORBA::is_nil (quoterFactoryObject_var.in())) {
-
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
-
-  // were able to get a reference to Quoter Factory
-  else { 
-
-    // create a sequence of factories object
-    CosLifeCycle::Factories *factories_ptr = new CosLifeCycle::Factories (1);      
-
-    // See if there is an exception, if yes then throw the NoFactory
-    // exception.
-    if (env_here.exception () != 0) 
-    {
-      // Throw a NoFactory exception.
-      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-      return 0;
-    }
-
-    // using the Naming Service only one reference is available
-    factories_ptr->length (1);      
-
-    // Check if it is a valid Quoter Factory reference.
-    if (CORBA::is_nil (quoterFactoryObject_var.in ())) 
-    {
-      // throw a NoFactory exception.
-      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-      return 0;
-    }
-
-    // insert the object reference 
-    (*factories_ptr)[0] = quoterFactoryObject_var;
-
-    ACE_DEBUG ((LM_DEBUG,"Have reference to a Quoter Factory.\n"));
-    return factories_ptr;
-  }
-}
diff --git a/TAO/tests/Quoter/FactoryFinderImpl.h b/TAO/tests/Quoter/FactoryFinderImpl.h
deleted file mode 100644
index 1081278372b..00000000000
--- a/TAO/tests/Quoter/FactoryFinderImpl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    FactoryFinderImpl.h
-//
-// = DESCRIPTION
-//    Factory Finder Implementation for the Quoter example
-//
-// = AUTHOR
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "quoterS.h"
-
-#if !defined (QUOTER_FACTORY_FINDER_IMPL_H)
-#define QUOTER_FACTORY_FINDER_IMPL_H
-
-class QuoterFactoryFinderImpl : public POA_Stock::QuoterFactoryFinder 
-{
-  // = TILE
-  //   A CosLifeCycle conforming Factory Finder for the Quoter
-  //   example. It uses the Naming Service to find a fitting factory.
-
-public:
-  QuoterFactoryFinderImpl (void);
-  ~QuoterFactoryFinderImpl (void);
-
-  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key & factory_key,
-                                                    CORBA::Environment &_tao_environment);
-  // Returns a squence of Factories if factories matching the
-  // factory_key were found. If no factory was found, then the
-  // NoFactory exception, defined in CosLifeCycle, is raised.
-
-private:
-  // CosNaming::NamingContext_var quoterNamingContext_var_;    
-  // Hold a reference to the Quoter example naming context.
-};
-
-#endif /* QUOTER_FACTORY_FINDER_IMPL_H */
diff --git a/TAO/tests/Quoter/Quoter.dsw b/TAO/tests/Quoter/Quoter.dsw
deleted file mode 100644
index 7b7ade71104..00000000000
--- a/TAO/tests/Quoter/Quoter.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "QuoterFactoryFinder"=.\FactoryFinder.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Quoter Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Quoter Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Quoter/Quoter.idl b/TAO/tests/Quoter/Quoter.idl
deleted file mode 100644
index be0fa4d28ae..00000000000
--- a/TAO/tests/Quoter/Quoter.idl
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    quoter.idl
-//
-// = DESCRIPTION
-//    Quoter example that illustrate the use of the global POA and
-//    the CosLifeCycle service.
-//
-// = AUTHOR
-//    Darrell Brunsch (brunsch@cs.wustl.edu)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-// @@ Is there a way to get TAO's IDL compiler to accept "relative
-// names" via the use of a command-line option?  It seems wrong to
-// hard-code the pathname here.
-#include "../../orbsvcs/orbsvcs/CosLifeCycle.idl"
-
-module Stock
-{
-  exception Invalid_Stock {};
-  exception Invalid_Quoter {};
-
-  interface Quoter : CosLifeCycle::LifeCycleObject
-    {
-      // = TITLE
-      //   Access Stock information.
-
-      long get_quote (in string stock_name) 
-        raises (Invalid_Stock, Invalid_Quoter);
-      // Returns the current stock value or throws and exception.
-
-      void destroy ();
-      // Destroy a Quoter session and release resources.
-
-      // LifeCycleObject copy(in FactoryFinder there, 
-      // 	   in Criteria the_criteria)
-      //     raises(NoFactory, NotCopyable, InvalidCriteria, CannotMeetCriteria);
-      // copies this object to a location "there" using the "the_criteria"
-  
-      // void move(in FactoryFinder there, 
-      //     in Criteria the_criteria)
-      //     raises(NoFactory, NotMovable, InvalidCriteria,  CannotMeetCriteria);
-      // moves this object to a location "there" using the "the_criteria"
-   
-      // void remove()
-      //     raises(NotRemovable);
-      // removes/deletes this object
-
-    };
-  
-  interface Quoter_Factory 
-    {
-      // = TITLE
-      //   Manage the lifecycle of a Quoter object.
-
-      Quoter create_quoter (in string name)
-        raises (Invalid_Quoter);
-      // Returns a new Quoter selected by name e.g., "Dow Jones,"
-      // "Reuters,", etc
-    };
-
-
-  interface QuoterFactoryFinder : CosLifeCycle::FactoryFinder
-    {
-      // = TITLE 
-      //   Wrapper for the CosLifeCycle FactoryFinder
-      //
-      // inherits: 
-      // Factories find_factories(in Key factory_key) raises(NoFactory);
-    };
-};
-
diff --git a/TAO/tests/Quoter/QuoterImpl.cpp b/TAO/tests/Quoter/QuoterImpl.cpp
deleted file mode 100644
index e79bbb73cdd..00000000000
--- a/TAO/tests/Quoter/QuoterImpl.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Quoter
-//
-// = FILENAME
-//    quoter_impl.cpp
-//
-// = AUTHOR
-//    Darrell Brunsch
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "QuoterImpl.h"
-#include "QuoterC.h"
-
-// Constructor
-
-Quoter_Factory_Impl::Quoter_Factory_Impl (void)
-{
-}
-
-// Destructor
-
-Quoter_Factory_Impl::~Quoter_Factory_Impl (void)
-{
-}
-
-Stock::Quoter_ptr  
-Quoter_Factory_Impl::create_quoter (const char *name,  
-                                    CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Quoter Created\n"));
-  ACE_UNUSED_ARG (name);
-  return my_quoter_._this (env);
-}
-
-// Constructor
-
-Quoter_Impl::Quoter_Impl (const char *)
-{
-}
-
-// Destructor
-
-Quoter_Impl::~Quoter_Impl (void)
-{
-}
-
-Quoter_Impl::get_quote (char const *stock_name,
-                        class CORBA_Environment &env)
-{
-  ACE_UNUSED_ARG (stock_name);
-  ACE_UNUSED_ARG (env);
- 
-  return 42;
-}
-
-// Shutdown.
-
-void Quoter_Impl::destroy (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "%s",
-	      "I have been asked to shut down "));
-	      
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
-CosLifeCycle::LifeCycleObject_ptr
-Quoter_Impl::copy (CosLifeCycle::FactoryFinder_ptr there,
-                   const CosLifeCycle::Criteria &the_criteria,
-                   CORBA::Environment &_env_there)
-{
-  TAO_TRY 
-    {
-      // The name of the Quoter Factory
-      CosLifeCycle::Key factoryKey (1);  // max = 1 
-      factoryKey.length(1);
-      factoryKey[0].id =
-        CORBA::string_dup ("quoter_factory");
-    
-      // Find an appropriate factory over there.
-      CosLifeCycle::Factories_ptr factories_ptr = 
-        there->find_factories (factoryKey, _env_there);
-
-      // Only a NoFactory exception might have occured, so if it
-      // occured, then go immediately back.
-      if (_env_there.exception() != 0) 
-        {
-          // _env_there contains already the exception.
-          return CosLifeCycle::LifeCycleObject::_nil();
-        }
-
-      // Now it is known that there is at least one factory.
-      Stock::Quoter_var quoter_var;
-
-      for (u_int i = 0; i < factories_ptr->length (); i++) 
-        {
-          // Get the first object reference to a factory.
-          CORBA::Object_var quoter_FactoryObj_var = (*factories_ptr)[i];
-
-          // Narrow it to a Quoter Factory.
-          Stock::Quoter_Factory_var quoter_Factory_var =
-            Stock::Quoter_Factory::_narrow (quoter_FactoryObj_var.in (),
-                                            TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          // Try to get a Quoter created by this factory.
-          quoter_var =
-            quoter_Factory_var->create_quoter ("quoter_copied", TAO_TRY_ENV);
-
-          // @@ mk1: The create_quoter should return an exception
-          TAO_CHECK_ENV;
-
-          if (CORBA::is_nil (quoter_var.in ())) 
-            {
-              // If we had already our last chance, then give up.
-              if (i == factories_ptr->length ()) 
-                {
-                  _env_there.exception (new CosLifeCycle::NoFactory (factoryKey));
-                  return CosLifeCycle::LifeCycleObject::_nil();
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "Quoter::copy: Factory did not create the Quoter properly.\n"));
-                  // Else tell what's wrong and try the next factory.
-                }
-            }
-          else 
-            break;
-            // if succeeded in creating a new Quoter over there, then stop trying
-        }
-
-      // Return an object reference to the newly created Quoter.
-      return (CosLifeCycle::LifeCycleObject_ptr) quoter_var;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-      return CosLifeCycle::LifeCycleObject::_nil();
-    }
-  TAO_ENDTRY;
-  return CosLifeCycle::LifeCycleObject::_nil();
-}
-
-void
-Quoter_Impl::move (CosLifeCycle::FactoryFinder_ptr there,
-                   const CosLifeCycle::Criteria &the_criteria,
-                   CORBA::Environment &_env_there) 
-{
-  // for later
-  // this->copy (there, the_criteria, _env_there);
-  
-  // the move operation is not implemented yet, because of the issue,
-  // that the object reference has to stay the same. But if it has
-  // to stay the same this object. the old object, has to forward
-  // further calls.
-
-  _env_there.exception (new CosLifeCycle::NotMovable());
-}
-
-void
-Quoter_Impl::remove (CORBA::Environment &_tao_environment) 
-{
-}
diff --git a/TAO/tests/Quoter/QuoterImpl.h b/TAO/tests/Quoter/QuoterImpl.h
deleted file mode 100644
index a548e52640d..00000000000
--- a/TAO/tests/Quoter/QuoterImpl.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Quoter
-// 
-// = FILENAME
-//    quoter_impl.h
-//
-// = AUTHOR
-//    Darrell Brunsch 
-// 
-// ============================================================================
-
-#if !defined (QUOTER_IMPL_H)
-#define	QUOTER_IMPL_H
-
-#include "quoterS.h"
-
-// Forward declarations.
-class Quoter_Impl;
-
-// Typedefs.
-typedef Quoter_Impl *Quoter_Impl_ptr;
-typedef Quoter_Impl_ptr Quoter_Impl_ref;
-
-class Quoter_Impl: public POA_Stock::Quoter
-{
-  // = TITLE
-  //   @@ Write
-  //
-  // = DESCRIPTION
-  //   @@ Write
-public:
-  Quoter_Impl (const char *obj_name = 0);
-  // Constructor
-
-  ~Quoter_Impl (void);
-  // Destructor
-
-  virtual CORBA::Long get_quote (const char *stock_name,
-                                 CORBA::Environment &env);
-  
-  virtual void destroy (CORBA_Environment &env);
-
-  virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
-                                                  const CosLifeCycle::Criteria &the_criteria,
-                                                  CORBA::Environment &_tao_environment);
-
-  virtual void move (CosLifeCycle::FactoryFinder_ptr there,
-                     const CosLifeCycle::Criteria &the_criteria,
-                     CORBA::Environment &_tao_environment);
-
-  virtual void remove (CORBA::Environment &_tao_environment);
-};
-
-class Quoter_Factory_Impl;
-
-typedef Quoter_Factory_Impl *Quoter_Factory_Impl_ptr;
-
-class Quoter_Factory_Impl: public POA_Stock::Quoter_Factory
-{
-  // = TITLE
-  //   Quoter_Factory_Impl
-  //
-  // = DESCRIPTION
-  //   Factory object returning the quoter_impl objrefs.
-public:
-  Quoter_Factory_Impl (void);
-  // Constructor.
-
-  ~Quoter_Factory_Impl (void);
-  // Destructor.
-
-  virtual Stock::Quoter_ptr  create_quoter (const char *name,  
-                                            CORBA::Environment &env);
-  // Return the quoter by the id <name>.
-
-private:
-  Quoter_Impl my_quoter_;
-  // @@ Do we just want one of these?!
-};
-
-#endif /* QUOTER_IMPL_H */
diff --git a/TAO/tests/Quoter/README b/TAO/tests/Quoter/README
deleted file mode 100644
index ffcf5896fcc..00000000000
--- a/TAO/tests/Quoter/README
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-Here is a Stock Quoter example that features the use of the TAO IDL
-compiler, the different types of configuration settings (global vs
-tss, etc), and the Life Cycle Service.
-
-For your convenience, the run_test.btm has been provided.  It is a
-batch file that runs under 4NT.  Work is in progress for a regular
-batch file that performs the same action.
-
-And we'll probably get it working on other platforms as soon as it
-is completed [since I've heard that some people actually use 
-platforms/opsystems besides NT ;-) ]
-
-
-run_test
-
-Name Server
------------
-
-Found under TAO\Orbsvcs, this is run for connections from the 
-server, client, and factory finder.  Plans to move this into the
-server are under consideration.
-
-To run with the default settings, use
-
-run_tests /ns
-
-Quoter Server
--------------
-
-To run with the default settings, use
-
-run_tests /sv
-
-
-Quoter Client
--------------
-
-To run with the default settings, use
-
-run_tests /cl
-
-Quoter Factory Finder
----------------------
-
-To run with the default settings, use
-
-run_tests /ff
-
diff --git a/TAO/tests/Quoter/client.conf b/TAO/tests/Quoter/client.conf
deleted file mode 100644
index 6eee002c688..00000000000
--- a/TAO/tests/Quoter/client.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Quoter/client.cpp b/TAO/tests/Quoter/client.cpp
deleted file mode 100644
index e783108696a..00000000000
--- a/TAO/tests/Quoter/client.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-// $Id$
-
-#include "ace/Read_Buffer.h"
-#include "orbsvcs/CosNamingC.h"
-#include "client.h"
-
-Quoter_Task::Quoter_Task (int argc, char **argv)
-  : argc_ (argc), argv_ (argv)
-{
-  // Nothing
-}
-
-int 
-Quoter_Task::svc (void)
-{
-  if (this->quoter_client.init (this->argc_, this->argv_) == -1)
-    return 1;
-  else
-    return this->quoter_client.run ();
-
-}
-
-// Constructor.
-Quoter_Client::Quoter_Client (void)
-  : quoter_factory_key_ (0),
-    quoter_key_ (ACE_OS::strdup ("key0")),
-    shutdown_ (0),
-    quoter_ (Stock::Quoter::_nil ()),
-    quoter_factory_ior_file_ (0),
-    f_handle_ (ACE_INVALID_HANDLE),
-    use_naming_service_ (1)
-{
-}
-
-// Reads the Quoter factory ior from a file
-
-int
-Quoter_Client::read_ior (char *filename)
-{
-  // Open the file for reading.
-  this->f_handle_ = ACE_OS::open (filename,0);
-  
-  if (this->f_handle_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-    "Unable to open %s for writing: %p\n",
-    filename),
-    -1);
-  ACE_Read_Buffer ior_buffer (this->f_handle_);
-  this->quoter_factory_key_ = ior_buffer.read ();
-  
-  if (this->quoter_factory_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                      -1);
-   return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Quoter_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:k:xs");
-  int c;
-  int result;
-  
-  while ((c = get_opts ()) != -1)
-    switch (c)
-    {   
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-          "Unable to read ior from %s : %p\n",
-          get_opts.optarg),
-          -1);
-        break;
-      case 'k': // read the quoter IOR from the command-line.
-        this->quoter_factory_key_ =
-          ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x': 
-        this->shutdown_ = 1;
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_ = 0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "usage:  %s"
-                          " [-d]"
-                          " [-f quoter_factory-obj-ref-key-file]"
-                          " [-k quoter-obj-ref-key]"
-                          " [-x]"
-                          " [-s]"
-                          "\n",
-                          this->argv_ [0]),
-                          -1);
-    }
-  
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Quoter_Client::run (void)
-{
-  CORBA::Long q = this->quoter_->get_quote ("ACE Hardware", this->env_);
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("with get_quote");
-      return -1;
-    }
-  else
-    { 
-      ACE_DEBUG ((LM_DEBUG, "ACE Hardware = %i\n", q));
-      return q;
-    }
-}
-
-Quoter_Client::~Quoter_Client (void)
-{
-  // Free resources
-  // Close the ior files
-  if (this->quoter_factory_ior_file_)
-    ACE_OS::fclose (this->quoter_factory_ior_file_);
-  if (this->f_handle_ != ACE_INVALID_HANDLE)
-    ACE_OS::close (this->f_handle_);
-
-  CORBA::release (this->quoter_);
-
-  if (this->quoter_factory_key_ != 0)
-    ACE_OS::free (this->quoter_factory_key_);
-  if (this->quoter_key_ != 0)
-    ACE_OS::free (this->quoter_key_);
-}
-
-int
-Quoter_Client::init_naming_service (void)
-{
-  TAO_TRY
-  {
-    // Resolve the Naming Service
-    CORBA::Object_var naming_obj = 
-      orb_->resolve_initial_references ("NameService");
-
-    if (CORBA::is_nil (naming_obj.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to resolve the Name Service.\n"),
-         -1);
-
-    CosNaming::NamingContext_var naming_context = 
-      CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Naming Service.\n"));
-
-    // ------------------------------------------- direct use of the Quoter Factory
-    /*
-    // Try to get the quoter_factory
-    CosNaming::Name quoter_factory_name (2);
-    quoter_factory_name.length (2);
-    quoter_factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
-    quoter_factory_name[1].id = CORBA::string_dup ("quoter_factory");
-
-    ACE_DEBUG ((LM_DEBUG, "Trying to resolve the Quoter Factory!\n"));
-
-    CORBA::Object_var factory_obj =
-      naming_context->resolve (quoter_factory_name,
-                               TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    ACE_DEBUG ((LM_DEBUG, "Resolved the Quoter Factory!\n"));
-    
-    this->factory_var_ =
-      Stock::Quoter_Factory::_narrow (factory_obj.in (), 
-                                      TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-   
-    if (CORBA::is_nil (this->factory_var_->in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-      " could not resolve quoter factory in Naming service <%s>\n"),
-      -1);*/
-    // -------------------------------------------- end of direct use
-
-    CosNaming::Name quoterFactoryFinderName (2);
-    quoterFactoryFinderName.length (2);
-    quoterFactoryFinderName[0].id = CORBA::string_dup ("IDL_Quoter");
-    quoterFactoryFinderName[1].id = CORBA::string_dup ("QuoterFactoryFinder");
-
-    ACE_DEBUG ((LM_DEBUG, "Trying to resolve the Quoter Factory Finder!\n"));
-
-    CORBA::Object_var factory_obj =
-      naming_context->resolve (quoterFactoryFinderName,
-                               TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    ACE_DEBUG ((LM_DEBUG, "Resolved the Quoter Factory Finder!\n"));
-    
-    Stock::QuoterFactoryFinder_var factoryFinder_var =
-      Stock::QuoterFactoryFinder::_narrow (factory_obj.in (), 
-                                      TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-   
-    if (CORBA::is_nil (factoryFinder_var.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-      " could not resolve quoter factory in Naming service <%s>\n"),
-      -1);
-
-    ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory Finder.\n"));
-
-    // The name of the Quoter Factory
-    CosLifeCycle::Key factoryName (1);  // max = 1 
-    factoryName.length(1);
-    factoryName[0].id =
-    CORBA::string_dup ("quoter_factory");
-    
-    // Find an appropriate factory over there.
-    CosLifeCycle::Factories_ptr factories_ptr = 
-        factoryFinder_var->find_factories (factoryName, TAO_TRY_ENV);
-
-    if (factories_ptr == 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
-      "Did not get a Quoter Factory.\n"),
-      -1);
-
-    // Get the first object reference to a factory.
-    CORBA::Object_var quoter_FactoryObj_var = (*factories_ptr)[0];
-
-
-      // Narrow it to a Quoter Factory.
-    factory_var_ = Stock::Quoter_Factory::_narrow (quoter_FactoryObj_var.in (),
-                                                   TAO_TRY_ENV);
-
-    TAO_CHECK_ENV;
-
-    if (CORBA::is_nil (this->factory_var_.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-      "Factory received is not valid.\n"),
-      -1);
-
-    ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory.\n"));
-  }
-  TAO_CATCH (CosLifeCycle::NoFactory, excpt)
-  {
-    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service: No Factory available!");
-  }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service");
-    return -1;
-  }
-  TAO_ENDTRY;
-  
-  return 0;
-}
-
-int
-Quoter_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-  
-  TAO_TRY
-  {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-    
-      if (this->use_naming_service_) 
-      {
-          int naming_result = this->init_naming_service ();
-          if (naming_result == -1)
-            return naming_result;
-      }
-      else
-        {
-          if (this->quoter_factory_key_ == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s: no quoter factory key specified\n",
-                               this->argv_[0]),
-                              -1);
-
-          CORBA::Object_var factory_object = 
-            this->orb_->string_to_object (this->quoter_factory_key_,
-                                          TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-      
-          this->factory_var_ = Stock::Quoter_Factory::_narrow (factory_object.in (), 
-                                                           TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-      
-          if (CORBA::is_nil (this->factory_var_.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,"invalid factory key <%s>\n",
-                                 this->quoter_factory_key_),
-                                -1);
-            }
-        }
-    
-      ACE_DEBUG ((LM_DEBUG, "Factory received OK\n"));
-    
-      // Now retrieve the Quoter obj ref corresponding to the key.
-      this->quoter_ =
-        this->factory_var_->create_quoter (this->quoter_key_,
-                                     TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "Quoter Created\n"));
-    
-      if (CORBA::is_nil (this->quoter_))
-      {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "null quoter objref returned by factory\n"),
-                            -1);
-      }
-    }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("Quoter::init");
-    return -1;
-  }
-  TAO_ENDTRY;
-  
-  return 0;
-}
-
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-//  Quoter_Client quoter_client;
-//
-//  ACE_DEBUG ((LM_DEBUG,"\n \t IDL_Quoter: client \n\n"));
-//
-//  if (quoter_client.init (argc, argv) == -1)
-//    return 1;
-//  else
-//    return quoter_client.run ();
-
-  ACE_Thread_Manager thr_mgr;
-
-  Quoter_Task client1 (argc, argv);
-//  Quoter_Task client2 (argc, argv);
-//  Quoter_Task client3 (argc, argv);
-
-  client1.activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
-//  client2.activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
-//  client3.activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
-
-  return ACE_Thread_Manager::instance ()->wait ();
-}
-
diff --git a/TAO/tests/Quoter/client.dsp b/TAO/tests/Quoter/client.dsp
deleted file mode 100644
index f0e515e13c8..00000000000
--- a/TAO/tests/Quoter/client.dsp
+++ /dev/null
@@ -1,171 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Quoter Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 tao.lib aced.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h"

-# Begin Source File

-

-SOURCE=.\client.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.h

-# End Source File

-# End Group

-# Begin Group "Include Files"

-

-# PROP Default_Filter "i"

-# Begin Source File

-

-SOURCE=.\QuoterC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Quoter.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Quoter.idl

-InputName=Quoter

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Quoter/client.h b/TAO/tests/Quoter/client.h
deleted file mode 100644
index af07ba1a69e..00000000000
--- a/TAO/tests/Quoter/client.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Quoter
-//
-// = FILENAME
-//    quoter_client.h
-//
-// = DESCRIPTION
-//    @@ Write this
-//
-// = AUTHORS
-//    Darrell Brunsch
-//
-// ============================================================================
-
-#if !defined (QUOTER_CLIENT_H)
-#define QUOTER_CLIENT_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "tao/corba.h"
-#include "quoterC.h"
-
-class Quoter_Client
-{
-  // = TITLE
-  //    @@ Write this
-  //
-  // = DESCRIPTION
-  //    @@ Write this
-public:
-  // = Constructor and destructor.
-  Quoter_Client (void);
-  ~Quoter_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int init_naming_service (void);
-  // Function to initialize the naming service.
-
-  int read_ior (char *filename);
-  // Function to read the Quoter factory ior from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *quoter_factory_key_;
-  // Key of factory obj ref.
-
-  char *quoter_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  int shutdown_;
-  // Flag to tell server to shutdown.
-
-  Stock::Quoter_Factory_var factory_var_;
-  // factory pointer for cubit.
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  Stock::Quoter_ptr quoter_;
-  // Quoter obj ref.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  FILE *quoter_factory_ior_file_;
-  // File from which to obtain the IOR.
-
-  ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
-
-  int use_naming_service_;
-  // Flag to tell client not to use Namingservice to find the cubit
-  // Factory.
-};
-
-class Quoter_Task : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //    @@ Write this
-  //
-  // = DESCRIPTION
-  //    @@ Write this
-public:
-  Quoter_Task (int argc, char **argv);
-
-  virtual int svc (void);
-
-private:
-  Quoter_Client quoter_client;
-  int argc_;
-  char **argv_;
-};
-
-#endif /* QUOTER_CLIENT_H */
diff --git a/TAO/tests/Quoter/ns.btm b/TAO/tests/Quoter/ns.btm
deleted file mode 100644
index ebe5b49ad5d..00000000000
--- a/TAO/tests/Quoter/ns.btm
+++ /dev/null
@@ -1,4 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM Naming Service must have been built or else this will fail
-start "Naming Service" /K ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport 10042 -ORBobjrefstyle url -o %nsiorfile
-
diff --git a/TAO/tests/Quoter/run_test.btm b/TAO/tests/Quoter/run_test.btm
deleted file mode 100644
index 904be1b4459..00000000000
--- a/TAO/tests/Quoter/run_test.btm
+++ /dev/null
@@ -1,122 +0,0 @@
-@echo off
-
-REM This is a 4NT Batch file.  To use, just type run_test and it will start the 
-REM server, wait for a second, and then start the client.  At the end, it will
-REM clean up.  
-
-setlocal
-
-set nsiorfile=%temp%\qns_ior
-set del=2
-
-REM variables for parameters
-
-set nsport=20002
-set clport=20003
-set svport=20004
-set ffport=20005
-set n=1
-set leave=/C
-set ior=0
-set done=
-
-:get_args
-
-if %1 == /h goto is_h
-if %1 == /? goto is_h
-goto no_h
-:is_h
-echo run_test [/n num] [/leave] [/h] [/ns|sv|ff|cl]
-echo.
-echo /n num          -- runs the client num times
-echo /leave          -- leaves the servers running and their windows open
-echo /h              -- prints this information
-echo /ns /sv /ff /cl -- Runs each separately
-quit
-:no_h
-
-if not %1 == /ns goto no_ns
-set done=quit
-goto run_name_server
-:no_ns
-
-if not %1 == /sv goto no_sv
-set done=quit
-goto run_server
-:no_sv
-
-if not %1 == /ff goto no_ff
-set done=quit
-goto run_finder
-:no_ff
-
-if not %1 == /cl goto no_cl
-set done=quit
-goto run_client
-:no_cl
-
-if not %1 == /n goto no_n
-set n=%2
-shift
-shift
-goto get_args
-:no_n
-
-if not %1 == /leave goto no_leave
-set leave=/K
-shift
-goto get_args
-:no_leave
-
-:run_name_server
-REM Naming Service must have been built or else this will fail
-start "Naming Service" %leave ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport %nsport -ORBobjrefstyle url -o %nsiorfile
-rem -ORBnameserviceior %temp\qns_ior
-
-%done
-
-REM Delay some to let the Naming Service get set up
-DELAY %del
-
-:run_server
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-start "Quoter Server" %leave server.exe -ORBport %svport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
-
-%done
-
-REM Delay some to let the server get set up
-DELAY %del
-
-:run_finder
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the factory finder
-start "Quoter Factory Finder" %leave QuoterFactoryFinder.exe -ORBport %ffport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf
-
-%done
-
-REM Delay some to let the Factory Finder get set up
-DELAY %del
-
-:run_client
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM And now start the client
-for /l %x in (1,1,%n) do client.exe -ORBobjrefstyle url -ORBport %clport -ORBnameserviceior %ior -ORBsvcconf client.conf
-
-%done
-
-REM We don't really need to delete this
-REM del %temp%\qns_ior
-
-REM Remove any running servers
-if %leave==/C activate "Naming Service" CLOSE
-if %leave==/C activate "Quoter Server" CLOSE
-if %leave==/C activate "Quoter Factory Finder" CLOSE
-
-endlocal
\ No newline at end of file
diff --git a/TAO/tests/Quoter/server.conf b/TAO/tests/Quoter/server.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Quoter/server.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Quoter/server.cpp b/TAO/tests/Quoter/server.cpp
deleted file mode 100644
index 75e88602fe1..00000000000
--- a/TAO/tests/Quoter/server.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//    Quoter_Server.cpp
-//
-// = DESCRIPTION
-//    The Server for the Quoter Factory 
-//
-// = AUTHOR
-//    Darrell Brunsch (brunsch@cs.wustl.edu)
-//    Michael Kircher (mk1@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "server.h"
-
-Quoter_Server::Quoter_Server (void)
-  : num_of_objs_ (1),
-    use_naming_service_ (1),
-    ior_output_file_ (0)
-{
-}
-
-int
-Quoter_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:o:s");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'n': // number of Quoter objects we export
-        this->num_of_objs_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_=0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of Quoter objects>"
-                           " [-o] <ior_output_file>"
-                           " [-s]"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Quoter_Server::init (int argc,
-                    char* argv[],
-                    CORBA::Environment& env)
-{
-  if (this->orb_manager_.init (argc,
-                               argv,
-                               env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
-                       "init"),
-                      -1);
-
-  // Copy them, because parse_args expects them there.
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-
-  // Activate the object.
-  CORBA::String_var str  =
-    this->orb_manager_.activate (&this->quoter_Factory_Impl_,
-                                 env);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-  {
-    ACE_OS::fprintf (this->ior_output_file_, "%s", str.in ());
-    ACE_OS::fclose (this->ior_output_file_);
-  }
-   
-  if (this->use_naming_service_)
-    return this->init_naming_service (env);
-
-  return 0;
-}
-
-// Initialisation of Naming Service and register IDL_Quoter Context
-// and Quoter_factory object.
-
-int
-Quoter_Server::init_naming_service (CORBA::Environment& env)
-{
-  TAO_TRY 
-  {
-    CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
-    TAO_CHECK_ENV;
-
-    CORBA::Object_var naming_obj = 
-      orb_ptr->resolve_initial_references ("NameService");
-
-    if (CORBA::is_nil (naming_obj.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to resolve the Name Service.\n"),
-         -1);
-
-    namingContext_var_ = 
-      CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-    
-  
-    CosNaming::Name quoterContextName (1);
-    quoterContextName.length (1);
-    quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-    CosNaming::NamingContext_var quoterNameContext =
-      namingContext_var_->bind_new_context (quoterContextName, env);
-    TAO_CHECK_ENV_RETURN (env, -1);
-
-    //Register the quoter_factory name with the IDL_quoter Naming
-    //Context...
-    CosNaming::Name quoterFactoryContextName (1);
-    quoterFactoryContextName.length (1);
-    quoterFactoryContextName[0].id = CORBA::string_dup ("quoter_factory");
-    quoterNameContext->bind (quoterFactoryContextName,
-                             quoter_Factory_Impl_._this(env),
-                             env);
-    TAO_CHECK_ENV_RETURN (env, -1);
-
-  }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service");
-    return -1;
-  }
-  TAO_ENDTRY;
-  
-  return 0;
-}
-
-int
-Quoter_Server::run (CORBA::Environment& env)
-{
-  //orb_manager_.poa_manager_->activate (env);
-  // TAO_CHECK_ENV_RETURN (env,1);
-
-  if (orb_manager_.orb()->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
-
-Quoter_Server::~Quoter_Server (void)
-{
-  TAO_TRY
-    {
-      // Unbind quoter factory context and name.
-      CosNaming::Name factory_name (2);
-      factory_name.length (2);
-      factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
-      factory_name[1].id = CORBA::string_dup ("quoter_factory");
-      this->namingContext_var_->unbind (factory_name,TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      factory_name.length (1);
-      this->namingContext_var_->unbind (factory_name,TAO_TRY_ENV);
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-    }
-  TAO_ENDTRY;
-}
-
-int
-main (int argc, char *argv[])
-{
-  Quoter_Server quoter_server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tIDL_Quoter:SERVER \n \n"));
-  TAO_TRY
-    {
-      if (quoter_server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          quoter_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Quoter/server.dsp b/TAO/tests/Quoter/server.dsp
deleted file mode 100644
index 9e81774e01e..00000000000
--- a/TAO/tests/Quoter/server.dsp
+++ /dev/null
@@ -1,181 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib tao.lib orbsvcs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-# SUBTRACT LINK32 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\QuoterC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterImpl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h"

-# Begin Source File

-

-SOURCE=.\QuoterC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterImpl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.h

-# End Source File

-# End Group

-# Begin Group "Include Files"

-

-# PROP Default_Filter "i"

-# Begin Source File

-

-SOURCE=.\QuoterC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\QuoterS.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Quoter.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Quoter.idl

-InputName=Quoter

-

-BuildCmds= \

-	..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Quoter/server.h b/TAO/tests/Quoter/server.h
deleted file mode 100644
index 3af8ee62b8d..00000000000
--- a/TAO/tests/Quoter/server.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-// -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Quoter
-//
-// = FILENAME
-//    quoter_server.h
-//
-// = DESCRIPTION
-//    @@ Working on it
-//
-// = AUTHORS
-//    Darrell Brunsch 
-//
-// ============================================================================
-
-#if !defined (QUOTER_SERVER_H)
-#define QUOTER_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "tao/tao.h"
-#include "QuoterImpl.h"
-#include "QuoterC.h"
-
-class Quoter_Server 
-{
-  // =TITLE
-  //   Defines a Quoter Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // =DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the quoter_server's state and then call run
-  //   to run the orb.
-public:
-
-  Quoter_Server (void);
-  // Default constructor
-
-  ~Quoter_Server (void);
-  // Destructor
-
-  int init (int argc, char *argv[], CORBA::Environment& env);
-  // Initialize the Quoter_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb 
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  int init_naming_service (CORBA::Environment &env);
-  // Initialises the name server and registers cubit factory with the
-  // name server.
-
-  int num_of_objs_;
-  // Number of cubit objects we export.
-
-  int use_naming_service_;
-  //Flag to tell server not to use the TAO Naming Service to register
-  //the cubit factory.
-
-  FILE* ior_output_file_;
-  // File to output the cubit factory IOR.
-
-  CosNaming::NamingContext_var namingContext_var_;
-  // Naming Service context
-
-  Quoter_Factory_Impl  quoter_Factory_Impl_;
-  // Instantiate the Quoter Factory
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
-  Quoter_Factory_Impl factory_impl_;
-  // Implementation object of the cubit factory.
-       
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* QUOTER_SERVER_H */
diff --git a/TAO/tests/Quoter/sv.btm b/TAO/tests/Quoter/sv.btm
deleted file mode 100644
index dff9cf19039..00000000000
--- a/TAO/tests/Quoter/sv.btm
+++ /dev/null
@@ -1,7 +0,0 @@
-set nsiorfile=%temp%\qns_ior
-REM read in the IOR from the file
-for %%d in (@%nsiorfile) do set ior=%%d
-
-REM Start the server
-echo %ior
-start "Quoter Server" /k Quoter_Server.exe -ORBport 10041 -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf 
diff --git a/TAO/tests/Quoter/svc.conf b/TAO/tests/Quoter/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Quoter/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/README b/TAO/tests/README
deleted file mode 100644
index 4ca004ca6da..00000000000
--- a/TAO/tests/README
+++ /dev/null
@@ -1,34 +0,0 @@
-The following tests of TAO are provided in this directory.
-The individual directories contain READMEs on how to run the tests.
-
-        . Cubit
-
-          Cubit example. The servant returns the cube of the number
-          sent to it by the client.
-
-        . Demux_test  (*NOTE* This is still under development)
-
-          This tests various demultiplexing strategies used in TAO.
-        . POA
-
-          Contains various small tests of POA features.
-
-        . NestedUpcall
-
-          Tests TAO's nested upcall feature, which allows
-          single-threaded clients and servers to perform callbacks on
-          each other without deadlocking.
-
-        . Param_Test
- 
-          Tests features of the typecode interpreter.
-
-        . Quoter
-        
-          Tests the use of the Global POA options with multiple threads.
-                      
-        . Thruput_test
-
-          Throughput tests for TAO, based on TTCP.
-
-
diff --git a/TAO/tests/Thruput/COOL/Makefile b/TAO/tests/Thruput/COOL/Makefile
deleted file mode 100644
index 235a4aaa66f..00000000000
--- a/TAO/tests/Thruput/COOL/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the CHORUS COOL Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-IDL_SRC = ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H 
-
-SRC = $(IDL_SRC) ttcp_i.cpp server.cpp client.cpp utils.cpp
-
-SVR_OBJS = ttcp_i.o server.o ttcp.o utils.o
-
-CLT_OBJS = client.o ttcp.o utils.o
-
-LDLIBS	 = -lm -lOrb-mt -lposix4 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	CHORUS related macros and target settings.
-#----------------------------------------------------------------------------
-
-CHORUS_BINDIR    = $(CHORUS_ROOT)/bin
-CHORUS_LIBDIR    = $(CHORUS_ROOT)/lib
-CHORUS_INCDIR    = $(CHORUS_ROOT)/include
-
-CPPFLAGS += -I$(CHORUS_INCDIR) -I$(CHORUS_ROOT)
-LDFLAGS  += -L$(CHORUS_LIBDIR) -R $(CHORUS_LIBDIR) -L$(ACE)/ace
-IDLFLAGS = --stub-header --stub-impl --skeleton-header --skeleton-impl --no-local --no-any --binding ttcp_sequence ttcp_sequence_i
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all:	$(IDL_SRC) server client
-
-$(IDL_SRC): ttcp.idl
-	$(CHORUS_BINDIR)/chic $(IDLFLAGS) ttcp.idl
-	-/bin/mv ttcp.C ttcp.cpp
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H server client
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-ttcp.o: ttcp.cpp ttcp.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/shortSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/longSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/doubleSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/charSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/octetSeq.H
-sk_ttcp.o: sk_ttcp.C
-ttcp_i.o: ttcp_i.cpp \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/ACE.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/OS.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/inc_user_config.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/config.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/streams.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Basic_Types.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Basic_Types.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/OS.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Trace.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Msg.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Record.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Priority.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Record.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Version.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/ACE.i ttcp_i.h ttcp.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/cool.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/shortSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/longSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/doubleSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/charSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/octetSeq.H \
- ttcp_decl.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Profile_Timer.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Time_Value.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/High_Res_Timer.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/High_Res_Timer.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Profile_Timer.i
-server.o: server.cpp \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/ACE.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/OS.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/inc_user_config.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/config.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/streams.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Basic_Types.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Basic_Types.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/OS.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Trace.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Msg.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Record.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Priority.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Log_Record.i \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Version.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/ACE.i ttcp_i.h ttcp.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/cool.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/shortSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/longSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/doubleSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/charSeq.H \
- /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/include/corba/octetSeq.H \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Get_Opt.h \
- /project/doc/sergio/ACE_wrappers/build/sunt/ace/Get_Opt.i sk_ttcp.H \
- sk_ttcp.C
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Thruput/COOL/README b/TAO/tests/Thruput/COOL/README
deleted file mode 100644
index f227cfeea21..00000000000
--- a/TAO/tests/Thruput/COOL/README
+++ /dev/null
@@ -1,117 +0,0 @@
-		TTCP Benchmark README file
-
-This directory contains a modified version of the TTCP benchmark that
-uses the TAO ORB. TTCP is used to measure the throughput of COOL
-for sending different data types. This code tests sequences of short,
-long, octet, char, double, and richly-typed data such as a struct.
-
-Organization
-------------
-
-client.cpp		Client main program
-server.cpp		Server main program
-ttcp.cpp		Client & Server side stub
-ttcp.H                  Client & Server side stub header file
-sk_ttcp.C               Server skeleton implementation file
-sk_ttcp.H               Server skeleton implementation header file
-ttcp_i.cpp		Implementation of the interface
-ttcp_i.h		Header for the implementation
-utils.cpp		Utilities to calculate throughput
-ttcp_decl.h		Common declarations
-
-Results
--------
-Throughput results are displayed on stdout.
-
-Running the test
------------------
-   Server
-   ------
-     Usage: 
-        server [COOL options] [Common options] 
-
- 	[COOL options] ** these are required **
- 	   cool-tcp://<THIS_HOSTNAME>:<THIS_HOST_PORT> -cool-tcp -cool-iiop
- 		   
- 	   THIS_HOSTNAME : the name of the host that the server will be running on.  This is useful 
- 		   if you want to specifya different interface (e.g. ATM, 100Mbit Ethernet)
-   
- 	   THIS_HOST_PORT: is the port number at which the server will start the high
- 		   priority servant. The low priority servant will be created at
- 		   (THIS_HOST_PORT+1).
-   
- 	[Common options]:
- 	   -l ##   length of bufs read from or written to network (default 8192)
- 	   -v      verbose: print more statistics
- 	   -d ##   set debug level 
- 	   -f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga
- 	   -L ##   Output file name to store results
-   
-     Example:
-
-        server cool-tcp://tango.cs.wustl.edu:3000 -cool-tcp -cool-iiop -d 1
-
-     The Output might look like this:
-	stringified obj reference = IOR:000000000000001649444C3A747463705F73657175656E63653A312E3000000000000002000000000000004900010000000000103132382E3235322E3136352E313430000BB80000000000290000000001000000010000001C0073193B00000002EFFFED98000000000000000A80FCA58C00000BB8000000434F4F4C000000290000000001000000010000001C0073193B00000002EFFFED98000000000000000A80FCA58C00000BB8
-	Entering boa->run ().
-
-
-   Client
-   ------
-     
-     Usage: 
-	client -cool-tcp -cool-iiop [Common options] 
-
-   	[Common options]:
-   	   -l ##   length of bufs read from or written to network (default 8192)
-   	   -v      verbose: print more statistics
-   	   -d ##   debug level
-   	   -f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga
-   	   -h ##   Remote host to send data to
-   	   -p ##   Port number"
-   	   -S ##   Total Data Size to be sent
-   	   -L ##   Output file name to store results
-   	   -q <type> Send Sequence: Enumeration for various data types:
-   		   s = short, l = long,  d = double, c = char
-   		   o = octet, S = BinStruct 
-   
-     Example:
-
-            # The following example will send 10Mb of data, using a megabyte rate, 
-              in 1024 byte chunks, to host tango.cs.wustl.edu, to port 3000, and will send shorts
-            
-            client -cool-tcp -cool-iiop -S 10240000 -f m -l 1024 -h tango.cs.wustl.edu -p 3000 -q s
-            
-     The Output might look like this:
-
-            Composed IOR string as: cool-tcp://tango.cs.wustl.edu:3000
-            data size = 10240000, buflen = 1024, nbuf = 10000
-            ttcp-t: 10240000 bytes in 2.81 real seconds = 27.82 Mbit/sec +++
-            ttcp-t: 10000 Server Method calls, msec/call = 0.29, calls/sec = 3561.29
-            ttcp-r: 10236928 bytes in 2.81 real seconds = 3560.03 KB/sec +++
-            ttcp-r: 9993 Server Method calls, msec/call = 0.29, calls/sec = 3558.60
-            ttcp-t: 176224.1user -1.-2674sys 0:02real 6261769% 0i+0d 101622maxrss -268440216+-277460652pf 10002+458757csw
-            ttcp-r: -268441649.-103user 728.0sys 0:02real -194852% 0i+0d 420maxrss -280679408+0pf -268441576+-277738728csw
-            
-
-Compiling
----------
-
-Setup the CHORUS COOL environment variables before compiling, the
-following is an example.  You would typically want this in the shells'
-resource file (e.g. .cshrc.mine).  The example provided is for a C
-shell.
-
-   setenv CHORUS_ROOT /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt
-   set path = ($path /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/bin)
-   setenv LD_LIBRARY_PATH /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/lib:$LD_LIBRARY_PATH
-   setenv MANPATH /project/doc/miniCOOL/minicool.r4.3/solaris2.5-CC-mt/man:$MANPATH
- 
-Makefiles are provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-
--Sergio Flores-Gaitan
-(sergio@cs.wustl.edu)
\ No newline at end of file
diff --git a/TAO/tests/Thruput/COOL/client.cpp b/TAO/tests/Thruput/COOL/client.cpp
deleted file mode 100644
index 730362648ae..00000000000
--- a/TAO/tests/Thruput/COOL/client.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// ============================================================================
-//
-// = Chorus COOL tests
-//    Throughput measurement using the TTCP benchmark adapted to work using COOL
-//
-// = FILENAME
-//   client.cpp
-//
-//   Main program for the client
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//    Sergio Flores        Ported code to use Chorus COOL ORB
-//
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/ACE.h"
-#include "ace/Get_Opt.h"
-#include "ttcp.H"
-#include "ttcp_decl.h"
-
-#include "api/api.H"
-
-int print_usage (void);
-
-char Usage[] =
-     "Usage: client -cool-tcp -cool-iiop [Common options] \n"
-     "[Common options]:\n"
-     "  -l ##   length of bufs read from or written to network (default 8192)\n"
-     "  -v      verbose: print more statistics\n"
-     "  -d ##   debug level\n"
-     "  -f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n"
-     "  -h ##   Remote host to send data to\n"
-     "  -p ##   Port number"
-     "  -L ##   Output file name to store results\n"
-     "  -S ##   Total Data Size to be sent\n"
-     "  -q <type> Send Sequence: Enumeration for various data types:\n"
-     "         s = short, l = long,  d = double, c = char\n"
-     "         o = octet, S = BinStruct \n";
-
-CORBA::Long trans = 1;          // we are a client - used for debugging purposes
-CORBA::Long buflen = 8 * 1024;	// length of buffer, default 8,192 bytes
-char *buf;		// ptr to dynamic buffer
-CORBA::Long nbuf;	        // number of buffers to send in sinkmode
-CORBA::Short port = 3000;	// default TCP port number
-char *host = "localhost";              // ptr to name of host
-CORBA::Long verbose = 0;	// 0=print basic info, 1=print cpu
-                                // rate, proc resource usage.
-CORBA::Char fmt = 'K';		// output
-                                // format:k=kilobits,K=kilobytes, m = megabits,
-                                // M = megabytes, g = gigabits, G = gigabytes
-CORBA::String title = 0;        // title of file to gather statistics
-char stats[128];                // gathering the statistics
-unsigned long srcDataSize;	// Total amount of source data
-unsigned long nbytes;		// bytes on net
-unsigned long numCalls;		// # of I/O system calls
-double cput, realt;		// user, real time (seconds)
-unsigned long	dt;             // data type
-
-u_int debug_level = 0;
-
-// declare variables for various message types
-ttcp_sequence::ShortSeq		*sseq;
-ttcp_sequence::LongSeq		*lseq;
-ttcp_sequence::OctetSeq		*oseq;
-ttcp_sequence::DoubleSeq	*dseq;
-ttcp_sequence::CharSeq		*cseq;
-ttcp_sequence::StructSeq	*Sseq;
-
-int
-main (int argc, char *argv[])
-{
-
-  int c;
-  CORBA_ORB_ptr        orb_ptr;   // underlying ORB
-  CORBA::Object_ptr     objref = CORBA::Object::_nil(); // object reference
-  ttcp_sequence_ptr     ttcp_seq = 0;  // obj reference to TTCP object
-  CORBA::Environment	env;       // environment
-  CORBA::String str;               // holds the IOR
-
-  fstream iorfile;
-
-  // parse the arguments
-  ACE_Get_Opt get_opt (argc, argv, "d:vh:p:f:l:L:S:q:", 3); // Command line options
-  debug_level = 0;
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'h':
-	  host = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'L':
-	  title = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'p':
-	  port = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'd':
-	  debug_level = ACE_OS::atoi (get_opt.optarg);
-	  if (debug_level > 10)
-	    debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'f':
-	  fmt = *get_opt.optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  srcDataSize = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*get_opt.optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
-	default:
-	  return print_usage ();
-	}
-    }
-
-  //
-  // Transmitter
-  //
-
-  // get a handle to the ORB
-  orb_ptr = CORBA_ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB initialization\n"));
-      //env.print_exception ("ORB initialization", stdout);
-      return -1;
-    }
-
-  // allocate storage to read the IOR string
-  str = CORBA::string_alloc (500);
-
-  sprintf (str, "cool-tcp://%s:%d", host, port);
-
-  ACE_DEBUG ((LM_DEBUG, "Composed IOR string as: %s\n" , str));
-
-  COOL::EOABindingData bindingData (str);
-  ttcp_seq = ttcp_sequence::_bind(bindingData, env);
-
-  CORBA::string_free (str);
-
-  if (!CORBA::is_nil (ttcp_seq))
-    {
-      // the number of iterations is based on the total data size and the
-      // individual buffer size sent
-      nbuf = srcDataSize/buflen;
-      ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n",
-		  srcDataSize, buflen, nbuf));
-
-      //
-      // Prepare the Message to be sent
-      //
-
-
-      // first allocate a buffer of the desired size and alignment
-      errno = 0;
-      if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
-	err ("malloc");
-
-      // fill the buffer with the data type to be sent
-      FillPattern (buf, buflen, dt);
-
-      //
-      // Start the timers on the client and server sides
-      //
-
-      prep_timer ();  // start our time
-      ttcp_seq->start_timer (env); // ask the server to start its timer
-      if (env.exception () != 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "start_timer operation\n"));
-	  //env.print_exception ("start_timer operation", stdout);
-	  return -1;
-	}
-
-#if defined (USE_QUANTIFY)
-      /* start recording quantify data from here */
-      quantify_clear_data ();
-      quantify_start_recording_data ();
-#endif
-      // send the same buffer nbuf times
-      while (nbuf--)
-	{
-	  switch (dt){
-	  case SEND_SHORT:
-	    ttcp_seq->sendShortSeq (*sseq, env);
-	    nbytes += sseq->length () * sizeof (CORBA::Short);
-	    break;
-	  case SEND_LONG:
-	    ttcp_seq->sendLongSeq (*lseq, env);
-	    nbytes += lseq->length () * sizeof (CORBA::Long);
-	    break;
-	  case SEND_OCTET:
-	    ttcp_seq->sendOctetSeq (*oseq, env);
-	    nbytes += oseq->length () * sizeof (CORBA::Octet);
-	    break;
-	  case SEND_DOUBLE:
-	    ttcp_seq->sendDoubleSeq (*dseq, env);
-	    nbytes += dseq->length () * sizeof (CORBA::Double);
-	    break;
-	  case SEND_CHAR:
-	    ttcp_seq->sendCharSeq (*cseq, env);
-	    nbytes += cseq->length () * sizeof (CORBA::Char);
-	    break;
-	  case SEND_STRUCT:
-	    ttcp_seq->sendStructSeq (*Sseq, env);
-	    nbytes += Sseq->length () * sizeof (BinStruct);
-	    break;
-	  }
-	  numCalls++; // nbytes and numCalls are used in the thruput
-	  // measurement
-	  if (env.exception () != 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "send operation\n"));
-	      //env.print_exception ("send operation", stdout);
-	      return -1;
-	    }
-	}
-#if defined (USE_QUANTIFY)
-      quantify_stop_recording_data();
-#endif
-      //
-      // Stop the timer
-      //
-      // stop the timer on the server side
-      ttcp_seq->stop_timer (env);
-      if (env.exception () != 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "stop_timer operation\n"));
-	  //env.print_exception ("stop_timer operation", stdout);
-	  return -1;
-	}
-      // stop our timer
-      (void) read_timer (stats, sizeof (stats));
-
-      // print results
-      PrintStats();
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "error: objref is nil\n"));
-    }
-    
-
-  CORBA::release (ttcp_seq);
-  CORBA::release (objref);
-
-  return (0);
-}
-
-int print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Usage error\n"));
-  ACE_ERROR ((LM_ERROR, "%s\n", Usage));
-  return -1;
-}
diff --git a/TAO/tests/Thruput/COOL/server.cpp b/TAO/tests/Thruput/COOL/server.cpp
deleted file mode 100644
index 6d3cc0e9b39..00000000000
--- a/TAO/tests/Thruput/COOL/server.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = Chorus COOL tests
-//    Throughput measurement using the TTCP benchmark adapted to work using 
-//    Chorus COOL
-//
-// = FILENAME
-//   server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//    Sergio Flores      Ported from TAO
-//
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/ACE.h"
-#include "ace/Get_Opt.h"
-
-#include "ttcp_i.h"
-
-#include <api/binding.H>
-#include <api/api.H>
-#include <api/coolThreadPool.H>
-#include <corba/eoa.H>
-#include <corba/eorb.H>
-
-#include "ttcp.H"
-#include "sk_ttcp.H"
-#include "sk_ttcp.C"
-
-char Usage[] = "\
-Usage: server [COOL options] [Common options] \n\
-  [COOL options] ** these are required ** \n\
-    cool-tcp://<THIS_HOSTNAME>:<THIS_HOST_PORT> -cool-tcp -cool-iiop \n\n\
-      THIS_HOSTNAME : the name of the host that the server will be running on. \n\
-  	 This is useful if you want to specify a different interface (e.g. ATM, \n\
-  	 100Mbit Ethernet)\n\n\
-      THIS_HOST_PORT: is the port number at which the server will start the high\n\
-  		  priority servant. The low priority servant will be created at\n\
-  		  (THIS_HOST_PORT+1).\n\n\
-  [Common options]:\n\
-    -l ##   length of bufs read from or written to network (default 8192)\n\
-    -v      verbose: print more statistics\n\
-    -d ##   set debug level \n\
-    -f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
-    -L ##   Output file name for the data type used\n\n\
-";
-
-CORBA::Long trans = 0;            // we are the receiver
-CORBA::Long buflen = 8 * 1024;	  // length of buffer
-CORBA::Char *buf;		          // ptr to dynamic buffer
-CORBA::Long nbuf;		          // number of buffers to send in sinkmode
-CORBA::Long verbose = 0;	  // 0=print basic info, 1=print cpu rate, proc
-                                  // resource usage.
-CORBA::Char fmt = 'K';		  // output format:k=kilobits,K=kilobytes, m =
-                                  // megabits, M = megabytes, g = gigabits, G =
-                                  // gigabytes
-u_int debug_level = 0;
-
-CORBA::String title = 0;           // results filename
-
-CORBA::Char stats[128];       // gathering the statistics
-CORBA::ULong srcDataSize;	  // Total amount of source data
-CORBA::ULong nbytes;		  // bytes on net
-CORBA::ULong numCalls;		  // # of I/O system calls
-CORBA::Double cput, realt;	  // user, real time (seconds)
-CORBA::ULong dt;              // data type
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;
-ttcp_sequence::LongSeq		*lseq;
-ttcp_sequence::OctetSeq		*oseq;
-ttcp_sequence::DoubleSeq	*dseq;
-ttcp_sequence::CharSeq		*cseq;
-ttcp_sequence::StructSeq	*Sseq;
-
-// main program - Driver
-int
-main (int argc, char **argv)
-{
-
-  int c;                      // option
-  CORBA::Environment env;     // environment
-  CORBA_ORB_ptr     orb_ptr; // handle to the ORB
-  CORBA_BOA_ptr      oa_ptr;  // Object adapter
-  CORBA::String      str; // for stringified representation of the object reference
-  ttcp_sequence_i my_ttcp_i ("TTCP_IIOP_test");  // instance of the target object
-  ttcp_sequence_ptr my_ttcp;
-
-  COOL::EOA::bind(argv[1], env);
-  if (env.exception() != 0) 
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			 "Impossible to bind the ORB to the description:%s\n", 
-			 argv[1]), -1);
-    }
-  
-  // initialize the underlying ORB and get a handle to it
-  orb_ptr = CORBA_ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      ACE_DEBUG ((LM_ERROR, "ORB_init failed..\n"));
-      CORBA::SystemException* ex;
-      
-      ex = CORBA::SystemException::_narrow(env.exception());
-      if (ex) 
-	{
-	  CORBA::String_var msg = ex->message();
-	  fprintf(stderr, "%s.\n", (const char*) msg);
-	} 
-      else 
-	{
-	  fprintf(stderr, "Unknown user exception.\n");
-	}
-      return -1;
-    }
-
-  // now get a handle to the object adapter
-  oa_ptr = orb_ptr->OA_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      CORBA::SystemException* ex;
-	
-      ex = CORBA::SystemException::_narrow(env.exception());
-      if (ex) 
-	{
-	  CORBA::String_var msg = ex->message();
-	  fprintf(stderr, "%s.\n", (const char*) msg);
-	} 
-      else 
-	{
-	  fprintf(stderr, "Unknown user exception.\n");
-	}
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			 " (%P|%t) Unable to initialize the POA.\n"), 
-			-1);
-    }
-    
-  // for parsing the arguments
-  ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:", 2, 1);
-  debug_level = 0;
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'L':
-	  // title of output file that stores result
-	  title = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'd':
-	  // debugging level
-	  debug_level = ACE_OS::atoi (get_opt.optarg);
-	  if (debug_level > 10)
-	    debug_level = 10;
-	  break;
-	case 'f':
-	  // output format i.e., Mbps, Kbps, etc
-	  fmt = *get_opt.optarg;
-	  break;
-	default:
-	  ACE_ERROR ((LM_ERROR, "Usage error\n"));
-	  ACE_ERROR ((LM_ERROR, "%s\n", Usage));
-	  return -1;
-	}
-    }
-    
-  //
-  // Receiver
-  //
-    
-  COOL::EOABindingData bindingData;
-    
-  COOL_bind (my_ttcp_i, my_ttcp, bindingData, env);
-    
-  if (env.exception ()) 
-    {
-      ACE_DEBUG ((LM_ERROR, "Bind failed.\n"));
-      return -1;
-    }
-    
-  if (debug_level > 0)
-    {
-      // get a stringified representation of the object reference created above
-      str = orb_ptr->object_to_string (my_ttcp, env);
-      if (env.exception() != 0)
-        {
-	  CORBA::SystemException* ex;
-	  
-	  ex = CORBA::SystemException::_narrow(env.exception());
-	  if (ex) 
-	    {
-	      CORBA::String_var msg = ex->message();
-	      fprintf(stderr, "%s.\n", (const char*) msg);
-	    } 
-	  else 
-	    {
-	      fprintf(stderr, "Unknown user exception.\n");
-	    }
-          return -1;
-        }
-      ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
-    }
-
-#if defined (USE_QUANTIFY)
-  // gather profile data
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  ACE_DEBUG ((LM_DEBUG, "Entering boa->run ().\n"));
-  oa_ptr->run ();
-
-  return 0;
-}
diff --git a/TAO/tests/Thruput/COOL/ttcp.idl b/TAO/tests/Thruput/COOL/ttcp.idl
deleted file mode 100644
index 02f382f3d29..00000000000
--- a/TAO/tests/Thruput/COOL/ttcp.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- C++ -*- */
-struct BinStruct
-{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  //  octet pad[8];  // to make it 32 bytes
-  // commented out until IDL support for arrays is added
-};
-
-// Richly typed data
-interface ttcp_sequence
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<BinStruct> StructSeq;
-
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/tests/Thruput/COOL/ttcp_decl.h b/TAO/tests/Thruput/COOL/ttcp_decl.h
deleted file mode 100644
index ba8b22769f7..00000000000
--- a/TAO/tests/Thruput/COOL/ttcp_decl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ace/OS.h"
-#include "ace/Profile_Timer.h"
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-/* define the data types to be sent */
-#define SEND_SHORT ((CORBA::ULong)(1))
-#define SEND_LONG ((CORBA::ULong)(2))
-#define SEND_CHAR ((CORBA::ULong)(3))
-#define SEND_OCTET ((CORBA::ULong)(4))
-#define SEND_DOUBLE ((CORBA::ULong)(5))
-#define SEND_STRUCT ((CORBA::ULong)(6))
-#define SEND_COMPOSITE ((CORBA::ULong)(7))
- 
-/**************
-// Prototypes
-***************/
-int err (char *s);
-void mes (CORBA::Char *s);
-CORBA::String outfmt (CORBA::Double b);
-void prep_timer (void);
-CORBA::Double read_timer (char *str, CORBA::Long len);
-void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
-void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-void psecs (CORBA::Long l, register char *cp);
-void delay (CORBA::Long us);
-void FillPattern (register char *cp, register CORBA::Long bufLen, CORBA::ULong dt);
-void PrintStats (void);
-
-/* Global variables defined here as extern */
-extern ACE_Svc_Export CORBA::Long trans;        // whether we are transmitter
-                                                // or receiver 
-extern ACE_Svc_Export CORBA::Long buflen;		/* length of buffer */
-extern ACE_Svc_Export char *buf;		/* ptr to dynamic buffer */
-extern ACE_Svc_Export CORBA::Long nbuf;		/* number of buffers to send in sinkmode */
-extern ACE_Svc_Export CORBA::Short port;		/* TCP port number */
-extern ACE_Svc_Export char *host;              /* ptr to name of host */
-extern ACE_Svc_Export CORBA::Long verbose;			/* 0=print basic info, 1=prCORBA::Long cpu rate, proc
-				 * resource usage. */
-extern ACE_Svc_Export CORBA::Char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern ACE_Svc_Export char *title;
-
-extern ACE_Svc_Export char stats[128];
-extern ACE_Svc_Export CORBA::ULong srcDataSize;	/* Total amount of source data */
-extern ACE_Svc_Export CORBA::ULong nbytes;		/* bytes on net */
-extern ACE_Svc_Export CORBA::ULong numCalls;		/* # of I/O system calls */
-extern ACE_Svc_Export CORBA::Double cput, realt;		/* user, real time (seconds) */
-extern ACE_Svc_Export CORBA::ULong	dt;
-
-/* declare struct variables for various message types */
-extern ACE_Svc_Export ttcp_sequence::ShortSeq		*sseq;	
-extern ACE_Svc_Export ttcp_sequence::LongSeq		*lseq;	
-extern ACE_Svc_Export ttcp_sequence::OctetSeq		*oseq;	
-extern ACE_Svc_Export ttcp_sequence::DoubleSeq	        *dseq;	
-extern ACE_Svc_Export ttcp_sequence::CharSeq		*cseq;	
-extern ACE_Svc_Export ttcp_sequence::StructSeq	        *Sseq;
-
-#endif
diff --git a/TAO/tests/Thruput/COOL/ttcp_i.cpp b/TAO/tests/Thruput/COOL/ttcp_i.cpp
deleted file mode 100644
index c898103c5ae..00000000000
--- a/TAO/tests/Thruput/COOL/ttcp_i.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//#include <iostream.h>
-#include "ace/ACE.h"
-#include "ace/streams.h"
-#include "ttcp_i.h"
-#include "ttcp_decl.h"
-
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i (const char *obj_name)
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-}
-
-void
-ttcp_sequence_i::start_timer (CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  this->nbytes_ = 0;
-  ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-#if defined (USE_PURIFY)
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-			       CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-			       CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-				CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-				CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(BinStruct) ;
-#ifdef DEBUG
-  //    cout << "Bytes received so far = " << this->nbytes_ << endl;
-#endif
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/Thruput/COOL/ttcp_i.h b/TAO/tests/Thruput/COOL/ttcp_i.h
deleted file mode 100644
index 9fd00170270..00000000000
--- a/TAO/tests/Thruput/COOL/ttcp_i.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// ============================================================================
-//
-// = COOL tests
-//    Throughput measurement using the TTCP benchmark adapted to work using COOL
-// 
-// = FILENAME
-//   ttcp_i.h 
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//    Sergio Flores-Gaitan   Ported to COOL
-// 
-// ============================================================================
-
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include "ttcp.H"
-
-class ttcp_sequence_i
-{
-public:
-  ttcp_sequence_i (const char *obj_name = 0);
-
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-			     CORBA::Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-			    CORBA::Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-			    CORBA::Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-			      CORBA::Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-			     CORBA::Environment &IT_env);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (CORBA::Environment &IT_env);
-  virtual void stop_timer (CORBA::Environment &IT_env);
-
-private:
-  unsigned long nbytes_;
-};
-
-#endif // defined (TTCP_I_H)
-
diff --git a/TAO/tests/Thruput/COOL/utils.cpp b/TAO/tests/Thruput/COOL/utils.cpp
deleted file mode 100644
index cbdd3a811ce..00000000000
--- a/TAO/tests/Thruput/COOL/utils.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-// 
-// = FILENAME
-//   utils.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-// This file has all the helper functions that do the computation of
-// throughput, system time used, user time, etc based on data collected.
-
-#include "ttcp.H"
-#include "ttcp_decl.h"
-
-// the error function. 
-// displays the error message and exits
-int err (char * s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  ACE_OS::perror (s);
-  ACE_OS::fprintf (stderr, "errno=%d\n", errno);
-  return -1;
-}
-
-// prints a message indicating if it is a transmitter or a receiver
-void mes (CORBA::String s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-// does the formatting for the desired units in which the result is to be
-// displayed 
-CORBA::String
-outfmt (CORBA::Double b)
-{
-  static char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      ACE_OS::sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      ACE_OS::sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      ACE_OS::sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      ACE_OS::sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      ACE_OS::sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      ACE_OS::sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-static struct itimerval itime0;	/* Time at which timing started */
-static struct rusage ru0;	/* Resource utilization at the start */
-
-/*
- *                    P R E P _ T I M E R
- */
-// this is in fact the internals of the "start_timer" operation
-void
-prep_timer (void)
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- * 
- */
-// This implements the internals of the "stop_timer" method
-double
-read_timer (char *str, CORBA::Long len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-// prints the rusage stats
-void
-prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-	*outp++ = *cp;
-      else if (cp[1])
-	switch (*++cp)
-	  {
-
-	  case 'U':
-	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'S':
-	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'E':
-	    psecs (ms / 100, outp);
-	    END (outp);
-	    break;
-
-	  case 'P':
-	    ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
-	    break;
-
-#if !defined(SYSV)
-	  case 'W':
-	    i = r1->ru_nswap - r0->ru_nswap;
-	    ACE_OS::sprintf (outp, "%d", i);
-	    END (outp);
-	    break;
-
-	  case 'X':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-	    END (outp);
-	    break;
-
-	  case 'D':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-		     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'K':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-		     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-		      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'M':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_maxrss / 2);
-	    END (outp);
-	    break;
-
-	  case 'F':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-	    END (outp);
-	    break;
-
-	  case 'R':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-	    END (outp);
-	    break;
-
-	  case 'I':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-	    END (outp);
-	    break;
-
-	  case 'O':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-	    END (outp);
-	    break;
-	  case 'C':
-	    ACE_OS::sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-		     r1->ru_nivcsw - r0->ru_nivcsw);
-	    END (outp);
-	    break;
-#endif /* !SYSV */
-	  }
-    }
-  *outp = '\0';
-}
-
-// adds two "timeval" structures
-void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-// finds difference between two timevals
-void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-// print in seconds
-void
-psecs (CORBA::Long l, register char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      ACE_OS::sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      ACE_OS::sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      ACE_OS::sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  ACE_OS::sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-// generate the specified delay in microseconds
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-// fill up a buffer with a data type that we want to send
-void
-FillPattern (register char *cp, register CORBA::Long bufLen, CORBA::ULong dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = (short)lrand48(); 
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    } 
-    break;
-  case SEND_LONG:
-    {
-       register long *SeqPtr = (long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = lrand48(); 
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = drand48(); 
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA::Char *SeqPtr = (CORBA::Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_STRUCT:
-    {
-       register BinStruct *SeqPtr = (BinStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(BinStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
- 
-    } 
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA::Octet *SeqPtr = (CORBA::Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA::Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-
-// print all the statistics
-void PrintStats (void)
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-  if (title != 0)
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
- 
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      ACE_OS::fprintf (outFile, "\n%ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      ACE_OS::fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  ACE_OS::fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
diff --git a/TAO/tests/Thruput/CORBAplus/Makefile b/TAO/tests/Thruput/CORBAplus/Makefile
deleted file mode 100644
index e0ca022532e..00000000000
--- a/TAO/tests/Thruput/CORBAplus/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Thruput benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lcorba -lunixsvc -lpbroker -lboadc -lnaming -llifecycl -lfsstream
-
-IDL_SRC		= ttcp.cpp ttcp_s.cpp
-PROG_SRCS 	= $(IDL_SRC) client.cpp ttcp_i.cpp server.cpp utils.cpp
-
-LSRC = $(PROG_SRCS)
-
-TTCP_CLIENT_OBJS = ttcp.o client.o utils.o
-
-TTCP_SERVER_OBJS = ttcp.o ttcp_s.o server.o ttcp_i.o utils.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-exceptions = 1
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-DCFLAGS = -g 
-LDFLAGS += -L$(PBHOME)/lib
-CPPFLAGS += -I$(PBHOME)/include
-
-$(IDL_SRC): ttcp.idl
-	$(PBHOME)/bin/idlc ttcp.idl
-	-/bin/mv ttcp.C ttcp.cpp
-	-/bin/mv ttcp_s.C ttcp_s.cpp
-
-server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
-#patch on the previous line to allow reading from an environment variable
-#the host (interface) I would like the server to bind to. 
-#The patch is "$(PBHOME)/lib/iiop_s.o"
-
-client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf ttcp.cpp ttcp.h ttcp_s.cpp ttcp_s.h
diff --git a/TAO/tests/Thruput/CORBAplus/README b/TAO/tests/Thruput/CORBAplus/README
deleted file mode 100644
index 14ffcd4e0e3..00000000000
--- a/TAO/tests/Thruput/CORBAplus/README
+++ /dev/null
@@ -1,47 +0,0 @@
-		CORBAplus TTCP Benchmark README file
-
-This directory contains a modified version of the TTCP benchmark that
-uses the TAO ORB. TTCP is used to measure the throughput of CORBAplus
-for sending different data types. This code tests sequences of short,
-long, octet, char, double, and richly-typed data such as a struct.
-
-Organization
-------------
-
-client.cpp		Client main program
-server.cpp		Server main program
-ttcp.cpp		Client side stubs
-ttcp_s.cpp		Server side skeletons
-ttcp.h			Header file for stubs
-ttcp_s.h		Header file for the skeletons
-ttcp_i.cpp		Implementaion of the interface
-ttcp_i.h		Header for the implementation
-utils.cpp		Utilities to calculate throughput
-ttcp_decls.h		Common declarations
-
-Results
--------
-//Throughput results are stored under the results directory. If testing
-//for REMOTE transfers, use the ./results/REMOTE directory.
-
-Running the tests
------------------
-Three scripts are provided
-
-(0) run_tests  : run several clients sequentially.  transmits 10Mb
-
-(1) run_server : runs the server. Be sure to change the host name
-(2) run_client : runs tests for various data types
-(3) run_test : called by run_client
-
-Compiling
----------
-
-Type make
-
-To provide for 2way tests (no data is sent in the reverse
-direction. Sender blocks for a minimal ACK), comment out the -DONEWAY
-flag from the CPPFLAGS
-
--Aniruddha Gokhale
-(gokhale@cs.wustl.edu)
diff --git a/TAO/tests/Thruput/CORBAplus/client.cpp b/TAO/tests/Thruput/CORBAplus/client.cpp
deleted file mode 100644
index 82b50008bd6..00000000000
--- a/TAO/tests/Thruput/CORBAplus/client.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-//
-// = FILENAME
-//   client.cpp
-//
-//   Main program for the client
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/request.h"
-#include "pbroker/corba/environ.h"
-#include "ace/ACE.h"
-#include "ace/Get_Opt.h"
-#include "ttcp.h"
-#include "ttcp_decl.h"
-
-int print_usage (void);
-
-char Usage[] =
-     "Usage: client [-options] \n"
-     "Common options:\n"
-     "-l ##   length of bufs read from or written to network (default 8192)\n"
-     "-v      verbose: print more statistics\n"
-     "-d ##   debug level\n"
-     "-f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n"
-     "-h ##   Remote host to send data to\n"
-     "-p ##   Port number"
-     "-L ##   Output file name to store results\n"
-     "-S ##   Total Data Size to be sent\n"
-     "-q <type> Send Sequence: Enumeration for various data types:\n"
-     "s = short, l = long,  d = double, c = char\n"
-     "o = octet, S = BinStruct \n";
-
-u_int _debug_level = 0;
-
-CORBA::Long trans = 1;          // we are a client - used for debugging purposes
-CORBA::Long buflen = 8 * 1024;	// length of buffer, default 8,192 bytes
-char *buf;		// ptr to dynamic buffer
-CORBA::Long nbuf;	        // number of buffers to send in sinkmode
-CORBA::Short port = ACE_DEFAULT_SERVER_PORT;	// TCP port number
-char *host = "localhost";              // ptr to name of host
-CORBA::Long verbose = 0;	// 0=print basic info, 1=print cpu
-                                // rate, proc resource usage.
-CORBA::Char fmt = 'K';		// output
-                                // format:k=kilobits,K=kilobytes, m = megabits,
-                                // M = megabytes, g = gigabits, G = gigabytes
-char *title = 0;        // title of file to gather statistics
-char stats[128];                // gathering the statistics
-unsigned long srcDataSize;	// Total amount of source data
-unsigned long nbytes;		// bytes on net
-unsigned long numCalls;		// # of I/O system calls
-double cput, realt;		// user, real time (seconds)
-unsigned long	dt;             // data type
-
-// declare variables for various message types
-ttcp_sequence::ShortSeq		*sseq;
-ttcp_sequence::LongSeq		*lseq;
-ttcp_sequence::OctetSeq		*oseq;
-ttcp_sequence::DoubleSeq	*dseq;
-ttcp_sequence::CharSeq		*cseq;
-ttcp_sequence::StructSeq	*Sseq;
-
-int
-main (int argc, char *argv[])
-{
-  try {
-  int c;
-  CORBA::ORB_ptr        orb_ptr;   // underlying ORB
-  CORBA::String  objkey = "TTCP_IIOP_test"; // name of the TTCP object on the
-                                            // server
-  CORBA::Object_ptr     objref = CORBA::Object::_nil(); // object reference
-  ttcp_sequence_ptr     ttcp_seq = 0;  // obj reference to TTCP object
-  CORBA::Environment	env;       // environment
-  CORBA::String str;               // holds the IOR
-
-  fstream iorfile;
-
-  ACE_UNUSED_ARG (objkey);
-
-  // parse the arguments
-  ACE_Get_Opt get_opt (argc, argv, "d:vh:f:l:L:S:q:"); // Command line options
-  _debug_level = 0;
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'h':
-	  host = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'L':
-	  title = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'd':
-	  _debug_level = ACE_OS::atoi (get_opt.optarg);
-	  if (_debug_level > 10)
-	    _debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'f':
-	  fmt = *get_opt.optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  srcDataSize = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*get_opt.optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
-	  //	default:
-          //return print_usage ();
-	}
-    }
-
-  //
-  // Transmitter
-  //
-
-  // get a handle to the ORB
-  orb_ptr = CORBA::ORB_init (argc, 
-			     argv);
-  if (env.exception () != 0)
-    {
-      //      env.print_exception ("ORB initialization", stdout);
-      return -1;
-    }
-
-  // Retrieve a factory objref.
-  objref = orb_ptr->resolve_initial_references ("TTCP_IIOP_test");
-  //  @@ put exception handling here !!
-  
-  if (CORBA::is_nil (objref) == CORBA_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "resolve_initial_references returned null object for ttcp_sequence\n"),
-                      -1);
-
-
-  if (!CORBA::is_nil (objref))
-    {
-      // if it is a valid obj ref, narrow it to a ttcp_sequence CORBA object
-      ttcp_seq = ttcp_sequence::_narrow (objref);
-
-      if (!CORBA::is_nil (ttcp_seq))
-        {
-
-          // the number of iterations is based on the total data size and the
-          // individual buffer size sent
-          nbuf = srcDataSize/buflen;
-          ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n",
-                      srcDataSize, buflen, nbuf));
-
-          //
-          // Prepare the Message to be sent
-          //
-
-          // first allocate a buffer of the desired size and alignment
-          errno = 0;
-          if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
-            err ("malloc");
-
-          // fill the buffer with the data type to be sent
-          FillPattern (buf, buflen, dt);
-
-          //
-          // Start the timers on the client and server sides
-          //
-          prep_timer ();  // start our time
-          ttcp_seq->start_timer (); // ask the server to start its timer
-          if (env.exception () != 0)
-            {
-	      //              env.print_exception ("start_timer operation", stdout);
-              return -1;
-            }
-
-#if defined (USE_QUANTIFY)
-          /* start recording quantify data from here */
-          quantify_clear_data ();
-          quantify_start_recording_data ();
-#endif
-          // send the same buffer nbuf times
-          while (nbuf--)
-            {
-              switch (dt){
-              case SEND_SHORT:
-                ttcp_seq->sendShortSeq (*sseq);
-                nbytes += sseq->length () * sizeof (CORBA::Short);
-                break;
-              case SEND_LONG:
-                ttcp_seq->sendLongSeq (*lseq);
-                nbytes += lseq->length () * sizeof (CORBA::Long);
-                break;
-              case SEND_OCTET:
-                ttcp_seq->sendOctetSeq (*oseq);
-                nbytes += oseq->length () * sizeof (CORBA::Octet);
-                break;
-              case SEND_DOUBLE:
-                ttcp_seq->sendDoubleSeq (*dseq);
-                nbytes += dseq->length () * sizeof (CORBA::Double);
-                break;
-              case SEND_CHAR:
-                ttcp_seq->sendCharSeq (*cseq);
-                nbytes += cseq->length () * sizeof (CORBA::Char);
-                break;
-              case SEND_STRUCT:
-                ttcp_seq->sendStructSeq (*Sseq);
-                nbytes += Sseq->length () * sizeof (BinStruct);
-                break;
-              }
-
-              numCalls++; // nbytes and numCalls are used in the thruput
-                          // measurement
-            }
-#if defined (USE_QUANTIFY)
-          quantify_stop_recording_data();
-#endif
-          //
-          // Stop the timer
-          //
-          // stop the timer on the server side
-          ttcp_seq->stop_timer ();
-
-          if (env.exception () != 0)
-            {
-	      //              env.print_exception ("stop_timer operation", stdout);
-              return -1;
-            }
-          // stop our timer
-          (void) read_timer (stats, sizeof (stats));
-
-          // print results
-          PrintStats();
-        }
-    }
-
-  CORBA::release (ttcp_seq);
-  CORBA::release (objref);
-  CORBA::release (orb_ptr);
-  }
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): client.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: client.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-  		  "Exception caught: client.cpp\n\n"));
-    }
-
-  return (0);
-}
-
-int print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Usage error\n"));
-  ACE_ERROR ((LM_ERROR, "%s\n", Usage));
-  return -1;
-}
diff --git a/TAO/tests/Thruput/CORBAplus/extract b/TAO/tests/Thruput/CORBAplus/extract
deleted file mode 100644
index f0fc2947b92..00000000000
--- a/TAO/tests/Thruput/CORBAplus/extract
+++ /dev/null
@@ -1,4 +0,0 @@
-rm -f outfile
-touch outfile 
-grep "Mbit/sec\|Send" results.CP | head -20 > outfile
-grep "msec/call\|Send" results.CP | head -20 >> outfile
diff --git a/TAO/tests/Thruput/CORBAplus/run b/TAO/tests/Thruput/CORBAplus/run
deleted file mode 100644
index 009677fdcde..00000000000
--- a/TAO/tests/Thruput/CORBAplus/run
+++ /dev/null
@@ -1 +0,0 @@
-client -S 67108864 -f m -l $1 -L temp -q $2 -d $3
diff --git a/TAO/tests/Thruput/CORBAplus/run_client b/TAO/tests/Thruput/CORBAplus/run_client
deleted file mode 100644
index 9e6932f8ae6..00000000000
--- a/TAO/tests/Thruput/CORBAplus/run_client
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/csh -f
-# All ATM tests: 64k socket Queue Size
-#
-# shorts
-run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 s $2
-sleep 5
-# longs
-run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 l $2 
-sleep 5
-# octets
-run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 o $2
-sleep 5
-# doubles
-run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 d $2
-sleep 5
-# chars
-#run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 c $2
-#sleep 5
-# structures
-run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 S $2
-sleep 5
-# Composite Structs
-#run_test 67108864 128 $1 ./results/REMOTE/$1/sun-iiop.atm.64 C $2
-#sleep 5
-#
diff --git a/TAO/tests/Thruput/CORBAplus/run_server b/TAO/tests/Thruput/CORBAplus/run_server
deleted file mode 100644
index e4faa5331e4..00000000000
--- a/TAO/tests/Thruput/CORBAplus/run_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/csh
-#
-# Usage: server <switches>
-# -u : use IOR 
-# -f m : output results in Mbps
-# -b <sock Q size> ** not implemented **
-# -OAhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
-#
-server -f m -ORBhost mambo.cs.wustl.edu #-OAthread
diff --git a/TAO/tests/Thruput/CORBAplus/run_test b/TAO/tests/Thruput/CORBAplus/run_test
deleted file mode 100644
index 622b0b4fee6..00000000000
--- a/TAO/tests/Thruput/CORBAplus/run_test
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/csh -f
-echo $*
-if ($#argv < 3) then
-	echo "Usage: sclt <Total Data Size> <Max msg size> <destination> <TitleOfThisTest> <seq type> <destination-port>"
-	exit 1
-endif
-#
-@ msize=1024
-@ limit= ($argv[2] * 1024)
-#echo $limit
-#echo $msize 
-test -d $4 || mkdir $4
-echo "Iteration#" 1 ": client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S $1 -f m -l $msize -h $3 -L $4 -q $5
-set flag=0
-while ($msize <= $limit)
-  if ($flag == 0) goto label
-	echo "Iteration#" 1 ": client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S" $1 "-D -f m -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-	client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S $1 -f m -l $msize -h $3 -L $4 -q $5
- label:
-  set flag=1
-  sleep 5
-  foreach i (2)
-	echo "Iteration#" $i ": client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L " $4 "-q" $5 -b 65536
-	client -pbtrace -pbinit TTCP_IIOP_test iiop://$3:$6/TTCP_IIOP_test -S $1 -f m -l $msize -h $3 -L $4 -q $5
-  end
-	echo "---------------------------"
-	@ msize = ($msize * 2)
-	sleep 5
-end 
-
-echo " "
-echo "Done at:" 
-date
diff --git a/TAO/tests/Thruput/CORBAplus/run_tests b/TAO/tests/Thruput/CORBAplus/run_tests
deleted file mode 100644
index 0cbf595fe84..00000000000
--- a/TAO/tests/Thruput/CORBAplus/run_tests
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/csh
-#
-# Usage: run_tests <arguments>
-# <host> : remote hostname server
-# <port> : remote port to send requests.
-#
-
-rm -f results.CP
-touch results.CP
-
-echo "CORBAplus throughput test"
-echo "========================="
-echo "CORBAplus throughput test" >>& results.CP
-echo "=========================" >>& results.CP
-
-
-echo "Send Struct --------------------------------------------------------"  >>& results.CP
-   ./client -S 10485760 -f m -l 1024 -q S -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 2048 -q S -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP 
-   ./client -S 10485760 -f m -l 4096 -q S  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 8192 -q S  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 16384 -q S -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 32768 -q S -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 65536 -q S -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 131072 -q S  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 262144 -q S  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-
-echo "Send Short ---------------------------------------------------------"  >>& results.CP
-   ./client -S 10485760 -f m -l 1024 -q s -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 2048 -q s -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP 
-   ./client -S 10485760 -f m -l 4096 -q s  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 8192 -q s  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 16384 -q s -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 32768 -q s -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 65536 -q s -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 131072 -q s  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
-   ./client -S 10485760 -f m -l 262144 -q s  -pbtrace -pbinit TTCP_IIOP_test iiop://$1:$2/TTCP_IIOP_test >>& results.CP
- 
-
-grep "Mbit/sec\|Send" results.CP
- 
diff --git a/TAO/tests/Thruput/CORBAplus/server.cpp b/TAO/tests/Thruput/CORBAplus/server.cpp
deleted file mode 100644
index 4d54a181ebc..00000000000
--- a/TAO/tests/Thruput/CORBAplus/server.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-//
-// = FILENAME
-//   server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include <pbroker/corba/xpsorb.h>
-#include <pbroker/corba/xpsboa.h>
-#include <pbroker/corba/boad/boafull.h>   // will force usage of "Full" BOA API
-#include <pbroker/unixsvc/unixsvc.h>
-
-#include "ace/ACE.h"
-#include "ttcp_i.h"
-#include "ace/Get_Opt.h"
-
-char Usage[] = "\
-Usage: server [TAO options] [options] \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--v      verbose: print more statistics\n\
--d ##   set debug level \n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--L ##	Output file name for the data type used\n\n\
-";
-
-CORBA::Long trans = 0;            // we are the receiver
-CORBA::Long buflen = 8 * 1024;	  // length of buffer
-CORBA::Char *buf;		          // ptr to dynamic buffer
-CORBA::Long nbuf;		          // number of buffers to send in sinkmode
-CORBA::Long verbose = 0;	  // 0=print basic info, 1=print cpu rate, proc
-                                  // resource usage.
-CORBA::Char fmt = 'K';		  // output format:k=kilobits,K=kilobytes, m =
-                                  // megabits, M = megabytes, g = gigabits, G =
-                                  // gigabytes
-
-char *title = 0;           // results filename
-
-CORBA::Char stats[128];       // gathering the statistics
-CORBA::ULong srcDataSize;	  // Total amount of source data
-CORBA::ULong nbytes;		  // bytes on net
-CORBA::ULong numCalls;		  // # of I/O system calls
-CORBA::Double cput, realt;	  // user, real time (seconds)
-CORBA::ULong dt;              // data type
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;
-ttcp_sequence::LongSeq		*lseq;
-ttcp_sequence::OctetSeq		*oseq;
-ttcp_sequence::DoubleSeq	*dseq;
-ttcp_sequence::CharSeq		*cseq;
-ttcp_sequence::StructSeq	*Sseq;
-
-ttcp_sequence_i *my_ttcp;  // instance of the target object
-
-u_int _debug_level = 0;
-
-// main program - Driver
-int
-main (int argc, char **argv)
-{
-
-  int c;                      // option
-  CORBA::Environment env;     // environment
-  XpsORB_ptr         orb_ptr = XpsORB::_nil (); // handle to the ORB
-  XpsBOA *           oa_ptr  = XpsBOA::_nil ();  // Object adapter
-  CORBA::String      key = (CORBA::String) "key0"; // key assigned to our
-  // target object
-  CORBA::String      str; // for stringified representation of the object reference
-
-  ACE_UNUSED_ARG (key);
-
-  try
-    {
-      // initialize the underlying ORB and get a handle to it
-      orb_ptr = XpsORB::init (argc, argv);
-      
-      // now get a handle to the object adapter
-      oa_ptr = XpsBOA::init (argc, argv);
-
-      if (CORBA::is_nil(orb_ptr) || CORBA::is_nil(oa_ptr))
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR, 
-			     " (%P|%t) Unable to initialize the ORB and/or the BOA\n"),
-			    1);
-	}
-  
-      // for parsing the arguments
-      ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:");
-
-      _debug_level = 0;
-      for (; (c = get_opt ()) != EOF;)
-	{
-	  switch (c)
-	    {
-	    case 'L':
-	      // title of output file that stores result
-	      title = ACE_OS::strdup (get_opt.optarg);
-	      break;
-	    case 'd':
-	      // debugging level
-	      _debug_level = ACE_OS::atoi (get_opt.optarg);
-	      if (_debug_level > 10)
-		_debug_level = 10;
-	      break;
-	    case 'f':
-	      // output format i.e., Mbps, Kbps, etc
-	      fmt = *get_opt.optarg;
-	      break;
-	    }
-	}
-
-      //
-      // Receiver
-      //
-
-  // create an instance of an object implementing the "ttcp" interface
-      my_ttcp = new ttcp_sequence_i ("TTCP_IIOP_test"); // this is its name
-
-      if (1)//_debug_level > 0)
-	{
-	  // get a stringified representation of the object reference created above
-	  str = orb_ptr->object_to_url (my_ttcp);
-	  ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
-	}
-
-#if defined (USE_QUANTIFY)
-      // gather profile data
-      quantify_clear_data();
-      quantify_start_recording_data();
-#endif
-      
-      oa_ptr->obj_is_ready (my_ttcp, nil);
-      oa_ptr->registerAlias (my_ttcp, "TTCP_IIOP_test");
-
-      // Handle requests for this object until we're killed, or one of the
-      // methods asks us to exit.
-      XpsEventService  eventService;
-      eventService.mainloop();   // control will not return to this point
-    
-    } /* end of try() */
-  catch(const CORBA::SystemException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): server.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
-    }
-  catch(const CORBA::UserException& exc)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: server.cpp\n\n",
-		  exc._repository_id ()));
-    }
-  catch(...)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: server.cpp\n\n"));
-    }
-
-  return 0;
-
-  // usage:
-  // fprintf (stderr, Usage);
-  // return(1);
-}
diff --git a/TAO/tests/Thruput/CORBAplus/ttcp.idl b/TAO/tests/Thruput/CORBAplus/ttcp.idl
deleted file mode 100644
index 02f382f3d29..00000000000
--- a/TAO/tests/Thruput/CORBAplus/ttcp.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- C++ -*- */
-struct BinStruct
-{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  //  octet pad[8];  // to make it 32 bytes
-  // commented out until IDL support for arrays is added
-};
-
-// Richly typed data
-interface ttcp_sequence
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<BinStruct> StructSeq;
-
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/tests/Thruput/CORBAplus/ttcp_decl.h b/TAO/tests/Thruput/CORBAplus/ttcp_decl.h
deleted file mode 100644
index 199580ed30d..00000000000
--- a/TAO/tests/Thruput/CORBAplus/ttcp_decl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ace/OS.h"
-#include "ace/Profile_Timer.h"
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-/* define the data types to be sent */
-#define SEND_SHORT ((CORBA::ULong)(1))
-#define SEND_LONG ((CORBA::ULong)(2))
-#define SEND_CHAR ((CORBA::ULong)(3))
-#define SEND_OCTET ((CORBA::ULong)(4))
-#define SEND_DOUBLE ((CORBA::ULong)(5))
-#define SEND_STRUCT ((CORBA::ULong)(6))
-#define SEND_COMPOSITE ((CORBA::ULong)(7))
- 
-/**************
-// Prototypes
-***************/
-int err (char *s);
-void mes (CORBA::Char *s);
-char *outfmt (CORBA::Double b);
-void prep_timer (void);
-CORBA::Double read_timer (char *str, CORBA::Long len);
-void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
-void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-void psecs (CORBA::Long l, register char *cp);
-void delay (CORBA::Long us);
-void FillPattern (register char *cp, register CORBA::Long bufLen, CORBA::ULong dt);
-void PrintStats (void);
-
-/* Global variables defined here as extern */
-extern ACE_Svc_Export CORBA::Long trans;        // whether we are transmitter
-                                                // or receiver 
-extern ACE_Svc_Export CORBA::Long buflen;		/* length of buffer */
-extern ACE_Svc_Export char *buf;		/* ptr to dynamic buffer */
-extern ACE_Svc_Export CORBA::Long nbuf;		/* number of buffers to send in sinkmode */
-extern ACE_Svc_Export CORBA::Short port;		/* TCP port number */
-extern ACE_Svc_Export char *host;              /* ptr to name of host */
-extern ACE_Svc_Export CORBA::Long verbose;			/* 0=print basic info, 1=prCORBA::Long cpu rate, proc
-				 * resource usage. */
-extern ACE_Svc_Export CORBA::Char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern ACE_Svc_Export char *title;
-
-extern ACE_Svc_Export char stats[128];
-extern ACE_Svc_Export CORBA::ULong srcDataSize;	/* Total amount of source data */
-extern ACE_Svc_Export CORBA::ULong nbytes;		/* bytes on net */
-extern ACE_Svc_Export CORBA::ULong numCalls;		/* # of I/O system calls */
-extern ACE_Svc_Export CORBA::Double cput, realt;		/* user, real time (seconds) */
-extern ACE_Svc_Export CORBA::ULong	dt;
-
-/* declare struct variables for various message types */
-extern ACE_Svc_Export ttcp_sequence::ShortSeq		*sseq;	
-extern ACE_Svc_Export ttcp_sequence::LongSeq		*lseq;	
-extern ACE_Svc_Export ttcp_sequence::OctetSeq		*oseq;	
-extern ACE_Svc_Export ttcp_sequence::DoubleSeq	        *dseq;	
-extern ACE_Svc_Export ttcp_sequence::CharSeq		*cseq;	
-extern ACE_Svc_Export ttcp_sequence::StructSeq	        *Sseq;
-
-#endif
diff --git a/TAO/tests/Thruput/CORBAplus/ttcp_i.cpp b/TAO/tests/Thruput/CORBAplus/ttcp_i.cpp
deleted file mode 100644
index 8f8afaaeee9..00000000000
--- a/TAO/tests/Thruput/CORBAplus/ttcp_i.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/environ.h"
-#include <pbroker/corba/xpsboa.h>
-#include <pbroker/corba/lifecycl/impldecl.h>
-#include <iostream.h>
-#include "ace/ACE.h"
-#include "ttcp_i.h"
-#include "ttcp_decl.h"
-
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i(const char *obj_name)
-  : key_(obj_name)
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-}
-
-const char *
-ttcp_sequence_i::_get_name (void)
-{
-  return key_;
-}
-
-void
-ttcp_sequence_i::start_timer (void)
-{
-  this->nbytes_ = 0;
-  ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (void)
-{
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-#if defined (USE_PURIFY)
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq)
-{
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(BinStruct) ;
-#ifdef DEBUG
-  //    cout << "Bytes received so far = " << this->nbytes_ << endl;
-#endif
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/Thruput/CORBAplus/ttcp_i.h b/TAO/tests/Thruput/CORBAplus/ttcp_i.h
deleted file mode 100644
index 507c414349e..00000000000
--- a/TAO/tests/Thruput/CORBAplus/ttcp_i.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using 
-//    CORBAplus PowerBroker from Expersoft
-// = FILENAME
-//   ttcp_i.h 
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include <pbroker/corba/lifecycl/actvtr.h>
-#include <pbroker/corba/lifecycl/impldecl.h>
-#include "pbroker/corba/orb.h"
-#include "pbroker/corba/request.h"
-#include "pbroker/corba/environ.h"
-
-#include "ace/OS.h"
-#include "ttcp_s.h"
-
-class ttcp_sequence_i: public ttcp_sequence_base_impl
-{
-public:
-  //  XPS_CAST1_DECL(ttcp_sequence_i,ttcp_sequence_base_impl)
-  //  XPS_DEFINE_IMPLEMENTATION(ttcp_sequence_decl)
-
-  ttcp_sequence_i(const char *obj_name);
-
-  ttcp_sequence_i (void) 
-    { ttcp_sequence_i ("keyone");}
-  
-  ttcp_sequence_i (const CORBA_ReferenceData & refData) 
-    { ttcp_sequence_i ("keyone");}
-  
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (void);
-  virtual void stop_timer (void);
-
-  const char *_get_name (void);
-  // get the key of the object.
-private:
-  unsigned long nbytes_;
-  const char *key_;
-};
-
-#endif // defined (TTCP_I_H)
-
diff --git a/TAO/tests/Thruput/CORBAplus/utils.cpp b/TAO/tests/Thruput/CORBAplus/utils.cpp
deleted file mode 100644
index 3538bf2acb5..00000000000
--- a/TAO/tests/Thruput/CORBAplus/utils.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-// 
-// = FILENAME
-//   utils.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-// This file has all the helper functions that do the computation of
-// throughput, system time used, user time, etc based on data collected.
-
-#include "ttcp.h"
-#include "ttcp_decl.h"
-
-// the error function. 
-// displays the error message and exits
-int err (char *s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  ACE_OS::perror (s);
-  ACE_OS::fprintf (stderr, "errno=%d\n", errno);
-  return -1;
-}
-
-// prints a message indicating if it is a transmitter or a receiver
-void mes (CORBA::String s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-// does the formatting for the desired units in which the result is to be
-// displayed 
-char *
-outfmt (CORBA::Double b)
-{
-  static char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      ACE_OS::sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      ACE_OS::sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      ACE_OS::sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      ACE_OS::sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      ACE_OS::sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      ACE_OS::sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-static struct itimerval itime0;	/* Time at which timing started */
-static struct rusage ru0;	/* Resource utilization at the start */
-
-/*
- *                    P R E P _ T I M E R
- */
-// this is in fact the internals of the "start_timer" operation
-void
-prep_timer (void)
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- * 
- */
-// This implements the internals of the "stop_timer" method
-double
-read_timer (char *str, CORBA::Long len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-// prints the rusage stats
-void
-prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-	*outp++ = *cp;
-      else if (cp[1])
-	switch (*++cp)
-	  {
-
-	  case 'U':
-	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'S':
-	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'E':
-	    psecs (ms / 100, outp);
-	    END (outp);
-	    break;
-
-	  case 'P':
-	    ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
-	    break;
-
-#if !defined(SYSV)
-	  case 'W':
-	    i = r1->ru_nswap - r0->ru_nswap;
-	    ACE_OS::sprintf (outp, "%d", i);
-	    END (outp);
-	    break;
-
-	  case 'X':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-	    END (outp);
-	    break;
-
-	  case 'D':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-		     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'K':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-		     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-		      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'M':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_maxrss / 2);
-	    END (outp);
-	    break;
-
-	  case 'F':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-	    END (outp);
-	    break;
-
-	  case 'R':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-	    END (outp);
-	    break;
-
-	  case 'I':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-	    END (outp);
-	    break;
-
-	  case 'O':
-	    ACE_OS::sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-	    END (outp);
-	    break;
-	  case 'C':
-	    ACE_OS::sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-		     r1->ru_nivcsw - r0->ru_nivcsw);
-	    END (outp);
-	    break;
-#endif /* !SYSV */
-	  }
-    }
-  *outp = '\0';
-}
-
-// adds two "timeval" structures
-void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-// finds difference between two timevals
-void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-// print in seconds
-void
-psecs (CORBA::Long l, register char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      ACE_OS::sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      ACE_OS::sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      ACE_OS::sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  ACE_OS::sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-// generate the specified delay in microseconds
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-// fill up a buffer with a data type that we want to send
-void
-FillPattern (register char *cp, register CORBA::Long bufLen, CORBA::ULong dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = (short)lrand48(); 
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    } 
-    break;
-  case SEND_LONG:
-    {
-       register long *SeqPtr = (long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = lrand48(); 
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = drand48(); 
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA::Char *SeqPtr = (CORBA::Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_STRUCT:
-    {
-       register BinStruct *SeqPtr = (BinStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(BinStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
- 
-    } 
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA::Octet *SeqPtr = (CORBA::Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA::Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-
-// print all the statistics
-void PrintStats (void)
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-  if (title != 0)
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
- 
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      ACE_OS::fprintf (outFile, "\n%ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      ACE_OS::fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  ACE_OS::fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
diff --git a/TAO/tests/Thruput/Makefile b/TAO/tests/Thruput/Makefile
deleted file mode 100644
index 50d889896c9..00000000000
--- a/TAO/tests/Thruput/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO thruput tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS = TAO
-
-# DIRS  = CORBAplus \
-#	Orbix \
-#	TAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Thruput/Orbix/Client.cpp b/TAO/tests/Thruput/Orbix/Client.cpp
deleted file mode 100644
index c804af59aaa..00000000000
--- a/TAO/tests/Thruput/Orbix/Client.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-#include "ttcp_decl.h"
-
-char Usage[] = "\
-Usage: client [-options] [ORBeline options] host \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--A      align the start of buffers to this modulus (default 16384)\n\
--o      start buffers at this offset from the modulus (default 0)\n\
--v      verbose: print more statistics\n\
--d      set SO_DEBUG socket option\n\
--b ##   set socket buffer size (if supported)\n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--n ##    number of source bufs written to network (default 2048)\n\
--x	Use new lines after each entry in output file\n\
--h ##	Remote host to send data to\n\
--D      don't buffer TCP writes (sets TCP_NODELAY socket option)\n\
--L ##	Output file name for the data type used\n\
--S      <Total Data Size>\n\
--q      <type> Send Sequence: Enumeration for various data types:\n\
-s = short, l = long,  d = double, c = char\n\
-o = octet, S = struct, C = composite\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-    void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans =1;			/* 0=receive, !0=transmit mode */
-int sinkmode = 1;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-* resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-*  m = megabits, M = megabytes, 
-*  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-ttcp_sequence::CompositeSeq	*Cseq;
-
-
-int
-main (int argc, char *argv[])
-{
-    
-    unsigned long addr_tmp;
-    unsigned short done = 0;
-    int c;
-    
-    CORBA::Environment env;
-    CORBA::Object_ptr target;  // will hold handle to proxy
-    ttcp_sequence_ptr ttcp_seq;
-    
-    if (argc < 2)
-	goto usage;
-    
-    
-    while (!done && ((c = getopt (argc, argv, "dvDb:h:f:l:n:A:o:L:xS:q:O")) != -1))
-	{
-	    switch (c)
-		{
-		case 'h':
-		    host = optarg;
-		    break;
-		case 'x':
-		    new_line = 1;
-		    break;
-		case 'L':
-		    title = optarg;
-		    break;
-		case 'd':
-		    options |= SO_DEBUG;
-		    break;
-		case 'D':
-#ifdef TCP_NODELAY
-		    nodelay = 1;
-#else
-		    fprintf (stderr,
-			     "ttcp: -D option ignored: TCP_NODELAY socket option not supported\n");
-#endif
-		    break;
-		case 'n':
-		    nbuf = atoi (optarg);
-		    break;
-		case 'l':
-		    buflen = atoi (optarg);
-		    break;
-		case 'v':
-		    verbose = 1;
-		    break;
-		case 'A':
-		    bufalign = atoi (optarg);
-		    break;
-		case 'o':
-		    bufoffset = atoi (optarg);
-		    break;
-		case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-		    sockbufsize = atoi (optarg);
-#else
-		    fprintf (stderr,
-			     "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-		    break;
-		case 'f':
-		    fmt = *optarg;
-		    break;
-		case 'S':       /* total source data to send. */
-		    /* modify nbuf accordingly */
-		    srcDataSize = atoi(optarg);
-		    break;
-		case 'q':       /* Send sequence of desired data type */
-		    switch(*optarg){
-		    case 's':
-			dt = SEND_SHORT;
-			break;
-		    case 'l':
-			dt = SEND_LONG;
-			break;
-		    case 'd':
-			dt = SEND_DOUBLE;
-			break;
-		    case 'c':
-			dt = SEND_CHAR;
-			break;
-		    case 'o':
-			dt = SEND_OCTET;
-			break;
-		    case 'S':
-			dt = SEND_STRUCT;
-			break;
-		    case 'C':
-			dt = SEND_COMPOSITE;
-			break;
-		    }
-		    break;
-		case 'O':
-		case '?':
-		    done = 1;
-		    break;
-		default:
-		    goto usage;
-		}
-	}
-
-    //
-    // Transmitter
-    //
-    
-    // now bind to server
-    try {
-	char *service_name = new char[15];
-	strcpy(service_name,":SII_ttcp"); // server object's name
-
-	target = ttcp_sequence::_bind (service_name, host);
-	if (!CORBA::is_nil(target)){
-	    ttcp_seq = ttcp_sequence::_narrow(target);
-
-	    if (!CORBA::is_nil(ttcp_seq)){
-		/* start recording quantify data from here */
-		if (sockbufsize)
-		    {
-			/* file descriptor of a proxy is obtained using the _fd() method */
-			if (setsockopt (ttcp_seq->_fd (), SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize,
-					sizeof sockbufsize) < 0)
-			    err ("setsockopt: sndbuf");
-			mes ("sndbuf");
-		    }
-		
-		if (nodelay)
-		    {
-			struct protoent *p;
-			p = getprotobyname ("tcp");
-			if (setsockopt (ttcp_seq->_fd (),
-					p->p_proto,
-					TCP_NODELAY,
-					(char *)& one,
-					sizeof (one)))
-			    err ("setsockopt: nodelay");
-			mes ("nodelay");
-		    }
-
-		/* modify nbuf according to Total data size */
-		nbuf = srcDataSize/buflen;
-		fprintf(stderr, "data size = %d, buflen = %d, nbuf = %d\n",srcDataSize, buflen, nbuf);
-
-		// 
-		// Prepare the Message to be sent
-		//
-		
-		errno = 0;
-		if ((buf = (char *) malloc (buflen + bufalign)) == (char *) NULL)
-		    err ("malloc");
-		if (bufalign != 0)
-		    buf += (bufalign - ((int) buf % bufalign) + bufoffset) % bufalign;
-		
-
-		// fill the appropriate buffers
-		FillPattern (buf, buflen, dt);
-		//
-		// Start the timers on the client and server sides
-		//
-		
-		prep_timer ();
-		ttcp_seq->start_timer ();
-#if defined (USE_QUANTIFY)
-		quantify_clear_data();
-		quantify_start_recording_data();
-#endif
-		while (nbuf--)
-		    {
-			switch(dt){
-			case SEND_SHORT:
-			    ttcp_seq->sendShortSeq(*sseq);
-			    nbytes += sseq->length()*sizeof(CORBA::Short);
-			    break;
-			case SEND_LONG:
-			    ttcp_seq->sendLongSeq(*lseq);
-			    nbytes += lseq->length()*sizeof(CORBA::Long);
-			    break;
-			case SEND_OCTET:
-			    ttcp_seq->sendOctetSeq(*oseq);
-			    nbytes += oseq->length()*sizeof(CORBA::Octet);
-			    break;
-			case SEND_DOUBLE:
-			    ttcp_seq->sendDoubleSeq(*dseq);
-			    nbytes += dseq->length()*sizeof(CORBA::Double);
-			    break;
-			case SEND_CHAR:
-			    ttcp_seq->sendCharSeq(*cseq);
-			    nbytes += cseq->length()*sizeof(CORBA::Char);
-			    break;
-			case SEND_STRUCT:
-			    ttcp_seq->sendStructSeq(*Sseq);
-			    nbytes += Sseq->length()*sizeof(PerfStruct);
-			    break;
-			case SEND_COMPOSITE:
-			    ttcp_seq->sendCompositeSeq(*Cseq);
-			    nbytes += Cseq->length()*sizeof(CompositeStruct);
-			    break;
-			}
-			numCalls++;
-		    }
-#if defined(USE_QUANTIFY)
-		quantify_stop_recording_data();
-#endif
-		//
-		// Stop the timer
-		//
-		ttcp_seq->stop_timer();
-		(void) read_timer (stats, sizeof (stats));
-		
-		// print results
-		PrintStats(); 
-
-	    }
-	}
-    }
-    catch(CORBA::SystemException &se){
-	// an error occurred while trying to bind to the object.
-	cerr << "Bind to object failed" << endl;
-	cerr << "System exception " << &se << endl;
-	return -1;
-    }
-    catch(...) 
-	{
-	    // an error occurred while trying to bind to the object.
-	    cerr << "Bind to object failed" << endl;
-	    cerr << "Unexpected exception " << endl;
-	    return -1;
-	};
-
-    CORBA::release(ttcp_seq);
-    return(0);
-  usage:
-    fprintf (stderr, Usage);
-    return 1;
-}
diff --git a/TAO/tests/Thruput/Orbix/Makefile b/TAO/tests/Thruput/Orbix/Makefile
deleted file mode 100644
index e000b894469..00000000000
--- a/TAO/tests/Thruput/Orbix/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-include orbixsol2s4.mk
-
-all:	client server
-	@echo
-
-	@echo "\"client\" and \"server\" have been compiled."
-	@echo
-	@echo "To run tests, check the how_to_run_tests file."
-	@echo
-
-C++FLAGS += -DSYSV -DWANT_ORBIX_FDS -DLM_RESULTS #-DUSE_TIE
-SERVER_OBJS	= ttcpS.o ttcp_i.o utils.o Srv_Main.o
-CLIENT_OBJS	= ttcpC.o utils.o Client.o
-
-ifdef unpad
-C++FLAGS += -DUNPAD
-endif
-
-ifeq ($(OSRELEASE),5.4)
-C++FLAGS	+= -DSUNOS54
-endif
- 
-ifdef quantify
-#QDIR    = /pkg/purify/quantify-2.1-solaris2
-QDIR    = /pkg/purify/quantify-3.0-solaris2
-QUANTIFY	= $(QDIR)/quantify -cache-dir=/project/mambo/gokhale/cache -record-register-window-traps
-C++FLAGS += -g -DUSE_QUANTIFY -I$(QDIR)
-#CLIENT_OBJS    += $(QDIR)/quantify_stubs.a
-#SERVER_OBJS    += $(QDIR)/quantify_stubs.a
-LDFLAGS         += -L$(QDIR) -lquantify_stubs
-else
-ifdef purify
-QUANTIFY	= purify -cache-dir=/project/mambo/gokhale/cache
-else
-ifdef debug
-QUANTIFY	=
-C++FLAGS	+= -g
-LDFLAGS		+= -g
-else
-QUANTIFY	=
-C++FLAGS += -O4
-LDFLAGS	+= -O4
-endif
-endif
-endif
-
-client: $(CLIENT_OBJS)
-	$(QUANTIFY) $(C++) $(C++FLAGS) -o client $(CLIENT_OBJS) $(LDFLAGS) $(ITSRV) $(SYSLIBS)
-
-server: $(SERVER_OBJS)
-	$(QUANTIFY) $(C++) $(C++FLAGS) -o server $(SERVER_OBJS) $(LDFLAGS) $(ITSRV) $(SYSLIBS)
-
-ttcp.h ttcpC.$(C++SUFFIX) ttcpS.$(C++SUFFIX):ttcp.idl        
-	$(IDL) $(IDLFLAGS) $< 
-
-.PHONY:	clean
-
-clean:
-	rm -f core *.o *~ client server *C.cpp *S.cpp ttcp.h
-
-checkin:
-	ci ttcp.idl
-	ci ttcp_i.h
-	ci ttcp_i.cpp
-	ci Srv_Main.cpp
-	ci Client.cpp
-	ci ttcp_decl.h
-	ci utils.cpp
-	rm -f core *.o *~ client server *C.cpp *S.cpp ttcp.h
-
-checkout:
-	co -l ttcp.idl
-	co -l ttcp_i.h
-	co -l ttcp_i.cpp
-	co -l Srv_Main.cpp
-	co -l Client.cpp
-	co -l ttcp_decl.h
-	co -l utils.cpp
-
-release:
-	test -d $(RDIR)/SII/1way/Orbix || mkdir -p $(RDIR)/SII/1way/Orbix
-	cp *.idl *.cpp *.h Makefile run* README* $(RDIR)/SII/1way/Orbix/.
-
diff --git a/TAO/tests/Thruput/Orbix/README b/TAO/tests/Thruput/Orbix/README
deleted file mode 100644
index 21e58670e48..00000000000
--- a/TAO/tests/Thruput/Orbix/README
+++ /dev/null
@@ -1,40 +0,0 @@
-This directory contains code that has a modified version of the TTCP benchmark that uses
-Orbix. Our intent is to test the performance of Orbix over ATM using the CORBA IDL "sequence"
-data type.
-
-We define sequences of "short", "long", "double", "octet", "char", a user-defined
-"struct" and a composite struct.
-
-We run our server program using the following command line: (this is
-an example)
-
-putit SII_ttcp "/project/mambo/gokhale/TTCP-testbed/SII/1way/Orbix/server -f m -b 65536"
-
-The client program is run using the following command line:
-client -S <data size> -f m -l <chunk size> -h <host> -L <filename> -q <data type> -b <socketQ>
-
-<data type> implies what sequence type you want to send:
-s	short
-c	chars
-o	octet
-d	double
-l	long
-S	user defined struct
-C	composite struct
-<filename> will store the result that indicates the thruput observed in Mbps (because
-we chose -f m as the option).
-
-An example is given from the "run" script
-
-client -S 67108864 -f m -l $1 -h encip1-merengue.cs.wustl.edu -L temp -q $2 -b 65536
-
-
-The following files are used:
-
-ttcp.idl	This file is the CORBA IDL declaration for the TTCP benchmark.
-Srv_main.cpp	Server program.
-Client.cpp	Client program.
-ttcp_i.cpp	Implementation of various methods of the ttcp_sequence object.
-ttcp_i.h	Implementation header
-utils.cpp	Lots of functions that came along with the original TTCP benchmark.
-ttcp_decl.h	Prototypes, extern decls, etc...
diff --git a/TAO/tests/Thruput/Orbix/Srv_Main.cpp b/TAO/tests/Thruput/Orbix/Srv_Main.cpp
deleted file mode 100644
index 8678c72debc..00000000000
--- a/TAO/tests/Thruput/Orbix/Srv_Main.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-#include "ttcp_i.h"
-
-
-char Usage[] = "\
-Usage: server [options] \n\
-Common options:\n\
-        -l ##   length of bufs read from or written to network (default 8192)\n\
-        -A      align the start of buffers to this modulus (default 16384)\n\
-        -O      start buffers at this offset from the modulus (default 0)\n\
-        -v      verbose: print more statistics\n\
-        -d      set SO_DEBUG socket option\n\
-        -b ##   set socket buffer size (if supported)\n\
-        -f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
-	-L ##	Output file name for the data type used\n\
-Options specific to -r:\n\
-        -B      for -s, only output full blocks as specified by -l (for TAR)\n\
-        -T      \"touch\": access each byte as it's read\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans;			/* 0=receive, !0=transmit mode */
-int sinkmode = 0;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-ttcp_sequence::CompositeSeq	*Cseq;
-
-unsigned short isDone = 0;
-
-int
-main (int argc, char *argv[])
-{
-    
-    unsigned long addr_tmp;
-    int c;
-    unsigned short done = 0;
-
-    
-    if (argc < 2)
-      goto usage;
-    
-    // Now process the options other than Orbix specific options
-    while (!done && ((c = getopt (argc, argv, "dvb:f:l:L:O")) != -1))
-      {
-	  switch (c)
-	    {
-	    case 'L':
-		title = optarg;
-		break;
-	    case 'd':
-		options |= SO_DEBUG;
-		break;
-	    case 'l':
-		buflen = atoi (optarg);
-		break;
-	    case 'v':
-		verbose = 1;
-		break;
-	    case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-		sockbufsize = atoi (optarg);
-#else
-		fprintf (stderr,
-			 "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-		break;
-	    case 'f':
-		fmt = *optarg;
-		break;
-	    case 'O':
-	    case '?':
-		done = 1;
-		break;
-	    default:
-		goto usage;
-	    }
-      }
-    
-    ttcp_sequence_i *my_ttcp;
-    //
-    // Receiver
-    //
-    try {
-	    char *service_name = new char[15];
-	    strcpy(service_name,"SII_ttcp");
-
-#if defined (USE_TIE)
-	    // TIE approach
-	    my_ttcp = new ttcp_sequence_i;
-	    _tie_ttcp_sequence<ttcp_sequence_i> *my_ttcp_tmpl = new
-	      _tie_ttcp_sequence<ttcp_sequence_i> (*my_ttcp);
-
-#else
-	    my_ttcp = new ttcp_sequence_i;
-#endif	
-
-#if defined (USE_QUANTIFY)
-    quantify_clear_data();
-    quantify_start_recording_data();
-#endif
-	    CORBA::Orbix.impl_is_ready(service_name);
-    }
-    catch(CORBA::SystemException &se) {
-	// an error occured calling impl_is_ready() - output the error.
-	cout << "System Exception getting the implementation ready " << &se << endl;
-	return -1;
-    }
-    catch(...) {
-	// an error occured calling obj_is_ready() - output the error.
-	cout << "Undefined Exception getting the implementation ready " << endl;
-	return -1;
-    }
-    CORBA::release(my_ttcp);
-    return (0);
-usage:
-    fprintf (stderr, Usage);
-    return(1);
-}
-
-
-
-
-
diff --git a/TAO/tests/Thruput/Orbix/extract b/TAO/tests/Thruput/Orbix/extract
deleted file mode 100644
index 9cce54ca390..00000000000
--- a/TAO/tests/Thruput/Orbix/extract
+++ /dev/null
@@ -1,4 +0,0 @@
-rm -f outfile
-touch outfile 
-grep "Mbit/sec\|Send" results.TAO | head -20 > outfile
-grep "msec/call\|Send" results.TAO | head -20 >> outfile
diff --git a/TAO/tests/Thruput/Orbix/loop64 b/TAO/tests/Thruput/Orbix/loop64
deleted file mode 100644
index 102c2afd209..00000000000
--- a/TAO/tests/Thruput/Orbix/loop64
+++ /dev/null
@@ -1,24 +0,0 @@
-# All ATM tests: 64k socket Queue Size
-#
-# shorts
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 s 
-sleep 2
-# longs
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 l 
-sleep 2
-# octets
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 o
-sleep 2
-# doubles
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 d 
-sleep 2
-# chars
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 c 
-sleep 2
-# structures
-run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 S 
-sleep 2
-# Composite Structs
-#run_test 67108864 1024 encip1-merengue.cs.wustl.edu ./results/LOOPBACK/orbix.atm.64 C 
-#sleep 2
-#
diff --git a/TAO/tests/Thruput/Orbix/orbixsol2s4.mk b/TAO/tests/Thruput/Orbix/orbixsol2s4.mk
deleted file mode 100644
index 01fd92b98c8..00000000000
--- a/TAO/tests/Thruput/Orbix/orbixsol2s4.mk
+++ /dev/null
@@ -1,148 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-C++             = CC
-C++FLAGS        = -I$(ORBIX_INCDIR) -I.
-C++SUFFIX       = cpp
-CXX		= CC
-CPPFLAGS        += -I$(ORBIX_INCDIR) -I.
-CPPSUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-ITCLT           = -Bdynamic -lorbix
-ITSRV		= -Bdynamic -lorbix
-IRCLT           = -Bdynamic -lIRclt
-ITIIOP		= -Bdynamic -liiop
-ITDSI		= -Bdynamic -lDSI 
-ITIFR           = -Bdynamic -lifr
-
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         = -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        = -h .h -c C.cpp -s S.cpp -B -A -m interOp
-#------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-#%.hh: %.idl
-%.h: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/tests/Thruput/Orbix/run b/TAO/tests/Thruput/Orbix/run
deleted file mode 100644
index 7af22c9407b..00000000000
--- a/TAO/tests/Thruput/Orbix/run
+++ /dev/null
@@ -1 +0,0 @@
-client -S 67108864 -f m -D -l $1 -h mambo-atm.wustl.edu -L temp -q $2 -b 65536
diff --git a/TAO/tests/Thruput/Orbix/run_client b/TAO/tests/Thruput/Orbix/run_client
deleted file mode 100644
index 0de2a604e31..00000000000
--- a/TAO/tests/Thruput/Orbix/run_client
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/csh -f
-# All ATM tests: 64k socket Queue Size
-#
-# shorts
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 s 
-sleep 2
-# longs
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 l 
-sleep 2
-# octets
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 o
-sleep 2
-# doubles
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 d 
-sleep 2
-# chars
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 c 
-sleep 2
-# structures
-run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 S 
-sleep 2
-# Composite Structs
-#run_test 67108864 1024 mambo-atm.wustl.edu ./results/REMOTE/orbix.atm.64 C 
-#sleep 2
-#
diff --git a/TAO/tests/Thruput/Orbix/run_server b/TAO/tests/Thruput/Orbix/run_server
deleted file mode 100644
index 1dad6e9c600..00000000000
--- a/TAO/tests/Thruput/Orbix/run_server
+++ /dev/null
@@ -1,4 +0,0 @@
-rmit SII_ttcp
-putit SII_ttcp "/project/mambo/gokhale/TTCP-testbed/SII/1way/Orbix/server -f m -b 65536 -l 131072"
-#putit SII_ttcp -persistent
-#truss -f server -f m -b 65536 -l 131072
diff --git a/TAO/tests/Thruput/Orbix/run_test b/TAO/tests/Thruput/Orbix/run_test
deleted file mode 100644
index 9ca15639427..00000000000
--- a/TAO/tests/Thruput/Orbix/run_test
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/csh -f
-if ($#argv < 3) then
-	echo "Usage: sclt <Total Data Size> <Max msg size> <destination> <TitleOfThisTest> <seq type>"
-	exit 1
-endif
-#
-@ msize=1024
-@ limit= ($argv[2] * 1024)
-#echo $limit
-#echo $msize 
-echo "Iteration#" 1 ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-set flag=0
-while ($msize <= $limit)
-  if ($flag == 0) goto label
-	echo "Iteration#" 1 ": client -S" $1 "-D -f m -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
- label:
-  set flag=1
-  sleep 2
-  foreach i (2 3)
-	echo "Iteration#" $i ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L " $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-  end
-	echo "---------------------------"
-	@ msize = ($msize * 2)
-end 
-
-echo " "
-echo "Done at:" 
-date
diff --git a/TAO/tests/Thruput/Orbix/run_tests b/TAO/tests/Thruput/Orbix/run_tests
deleted file mode 100644
index 96245b9fbc8..00000000000
--- a/TAO/tests/Thruput/Orbix/run_tests
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/csh
-
-rm -f results.TAO
-touch results.TAO
-
-echo "TAO throughput test"
-echo "TAO throughput test" >>results.TAO
-echo "==================="
-echo "===================" >>results.TAO
-
-
-echo "Send Struct --------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q S  >>& results.TAO
-
-echo "Send Short ---------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q s  >>& results.TAO
- 
-echo "Send Long ----------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q l  >>& results.TAO
- 
-echo "Send Octet ---------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q o  >>& results.TAO
-
-echo "Send Double --------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q d  >>& results.TAO
-
-echo "Send Char ----------------------------------------------------------" >>results.TAO
-   ./client -S 10485760 -f m -l 1024 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c >>& results.TAO
-   ./client -S 10485760 -f m -l 2048 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c >>& results.TAO 
-   ./client -S 10485760 -f m -l 4096 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c  >>& results.TAO
-   ./client -S 10485760 -f m -l 8192 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c  >>& results.TAO
-   ./client -S 10485760 -f m -l 16384 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c >>& results.TAO
-   ./client -S 10485760 -f m -l 32768 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c >>& results.TAO
-   ./client -S 10485760 -f m -l 65536 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c >>& results.TAO
-   ./client -S 10485760 -f m -l 131072 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c  >>& results.TAO
-   ./client -S 10485760 -f m -l 262144 -h merengue-atm1 -L ./results/REMOTE/sun-iiop.atm.64 -q c  >>& results.TAO
- 
-grep "Mbit/sec\|Send" results.TAO
diff --git a/TAO/tests/Thruput/Orbix/ttcp.idl b/TAO/tests/Thruput/Orbix/ttcp.idl
deleted file mode 100644
index c0b3cb10c75..00000000000
--- a/TAO/tests/Thruput/Orbix/ttcp.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- C++ -*- */
-struct PerfStruct{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  //padding
-  long pad[2];
-};
-
-struct CompositeStruct{
-	PerfStruct	ps;
-};
-
-// Richly typed data
-interface ttcp_sequence 
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<PerfStruct> StructSeq;
-  typedef sequence<CompositeStruct>	CompositeSeq;
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-  oneway void sendCompositeSeq (in  CompositeSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/tests/Thruput/Orbix/ttcp_decl.h b/TAO/tests/Thruput/Orbix/ttcp_decl.h
deleted file mode 100644
index 298bf9c20a2..00000000000
--- a/TAO/tests/Thruput/Orbix/ttcp_decl.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ttcp.h"
-
-/* #define BSD43 */
-/* #define BSD42 */
-/* #define BSD41a */
-
-
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/time.h>		/* struct itimerval */
-#include <limits.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <iostream.h>
-#include <sys/resource.h>
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-#if defined(SYSV)
-#define bcopy(b1,b2,n)  memcpy(b2,b1,n)
-#define bzero(b1,n)             memset(b1,0,n)
-#include <sys/times.h>
-#include <sys/param.h>
-#endif
-
-#if defined(SUNOS54)
-struct rusage
-  {
-    struct timeval ru_utime, ru_stime;
-  };
-#define RUSAGE_SELF 0
-#else
-#include <sys/resource.h>
-#endif
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-#define SEND_COMPOSITE ((unsigned long)(7))
- 
-/**************
-// Prototypes
-***************/
-void err (char *s);
-void mes (char *s);
-char *outfmt (double b);
-static void getrusage (int ignored, register struct rusage *ru);
-static void gettimeofday (struct timeval *tp, struct timezone *zp);
-void prep_timer (void);
-double read_timer (char *str, int len);
-static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
-static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-static void psecs (long l, register char *cp);
-void delay (int us);
-int mread (int fd, register char *bufp, unsigned n);
-int Nread (int fd, void *buf, int count);
-int Nwrite (int fd, void *buf, int count);
-void FillPattern(register char *cp, register int bufLen, unsigned long dt);
-void PrintStats();
-int SetSocketBufferSize(int size, unsigned short isTrans);
-int SetNoDelay();
-void ProcessArguments(int argc, char **argv, unsigned short isTrans);
-
-/* Global variables defined here as extern */
-extern int fromlen;
-extern int domain;           	/* Default is to use Internet domain sockets. */
-extern char *domainname;	/* Rendezvous address for UNIX domain sockets. */
-extern int fd;			/* fd of network socket */
-
-extern int buflen;		/* length of buffer */
-extern char *buf;		/* ptr to dynamic buffer */
-extern int nbuf;		/* number of buffers to send in sinkmode */
-
-extern int bufoffset;		/* align buffer to this */
-extern int bufalign;		/* modulo this */
-
-extern int udp;			/* 0 = tcp, !0 = udp */
-extern int options;		/* socket options */
-extern int one;			/* for 4.3 BSD style setsockopt() */
-extern short port;		/* TCP port number */
-extern char *host;              /* ptr to name of host */
-extern int trans;		/* 0=receive, !0=transmit mode */
-extern int sinkmode;		/* 0=normal I/O, !0=sink/source mode */
-extern int verbose;			/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-extern int nodelay;		/* set TCP_NODELAY socket option */
-extern int b_flag;		/* use mread() */
-extern int sockbufsize;		/* socket buffer size to use */
-extern int new_line;            /* This is a special flag */
-extern int write_to_file;       /* indecates writing to file (default)*/
-extern char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern int touchdata;		/* access data after reading */
-
-extern struct hostent *addr;
-extern int errno;
-extern int optind;
-extern char *optarg;
-extern char *title;
-
-extern char stats[128];
-extern unsigned long srcDataSize;	/* Total amount of source data */
-extern unsigned long nbytes;		/* bytes on net */
-extern unsigned long numCalls;		/* # of I/O system calls */
-extern double cput, realt;		/* user, real time (seconds) */
-extern unsigned long	dt;
-
-extern unsigned short isDone;
-
-/* declare struct variables for various message types */
-extern ttcp_sequence::ShortSeq		*sseq;	
-extern ttcp_sequence::LongSeq		*lseq;	
-extern ttcp_sequence::OctetSeq		*oseq;	
-extern ttcp_sequence::DoubleSeq	        *dseq;	
-extern ttcp_sequence::CharSeq		*cseq;	
-extern ttcp_sequence::StructSeq	        *Sseq;
-extern ttcp_sequence::CompositeSeq	*Cseq;
-
-#endif
diff --git a/TAO/tests/Thruput/Orbix/ttcp_i.cpp b/TAO/tests/Thruput/Orbix/ttcp_i.cpp
deleted file mode 100644
index 0dc8ca364d3..00000000000
--- a/TAO/tests/Thruput/Orbix/ttcp_i.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "ttcp_i.h"
-
-/* callback routine that will change the size of the socket queue */
-static void
-SD_Ready (int io_descriptor)
-{
-  if (sockbufsize)
-    {
-      if (setsockopt (io_descriptor, SOL_SOCKET, SO_RCVBUF,
-                (char *) &sockbufsize, sizeof sockbufsize) < 0)
-        perror ("setsockopt: rcvbuf"), exit (1);
-  }
-}
- 
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i()
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-  // register a callback so we can manipulate the descriptor
-  // being used by orbix.
- 
-  if (CORBA::Orbix.registerIOCallback (OrbixIOCallback(SD_Ready),
-        FD_OPEN_CALLBACK) != 0)
-    perror ("can't register callback"), exit (1);
-}
-
-
-void
-ttcp_sequence_i::start_timer (CORBA::Environment &IT_env)
-{
-    this->nbytes_ = 0;
-    ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (CORBA::Environment &IT_env)
-{
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    exit(0);
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(PerfStruct) ;
-}
-
-void
-ttcp_sequence_i::sendCompositeSeq(const ttcp_sequence::CompositeSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CompositeStruct) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/Thruput/Orbix/ttcp_i.h b/TAO/tests/Thruput/Orbix/ttcp_i.h
deleted file mode 100644
index a187c2725ee..00000000000
--- a/TAO/tests/Thruput/Orbix/ttcp_i.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-
-// ttcp_i.h
-// 
-// This header file provides facility to use it either as a BOA approach or as
-// a TIE approach.
-//
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include "ttcp.h"
-#include "ttcp_decl.h"
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-#define SEND_COMPOSITE ((unsigned long)(7))
-
-
-#if defined(USE_TIE)
-class ttcp_sequence_i 
-#else	// use BOA 
-class ttcp_sequence_i 
-  	: public virtual ttcp_sequenceBOAImpl
-#endif
-{
-public:
-  ttcp_sequence_i();
-
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-  virtual void sendCompositeSeq (const ttcp_sequence::CompositeSeq& ttcp_seq, 
-	CORBA::Environment &IT_env=CORBA::default_environment);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (CORBA::Environment &IT_env=
-	CORBA::default_environment);
-  virtual void stop_timer (CORBA::Environment &IT_env=
-	CORBA::default_environment);
-private:
-  unsigned long nbytes_;
-};
-
-#if defined(USE_TIE)
-// ttcp_sequence_i implements ttcp_sequence
-DEF_TIE(ttcp_sequence, ttcp_sequence_i);
-#endif
-
-#endif // defined (TTCP_I_H)
diff --git a/TAO/tests/Thruput/Orbix/utils.cpp b/TAO/tests/Thruput/Orbix/utils.cpp
deleted file mode 100644
index 9b6c8e3a77c..00000000000
--- a/TAO/tests/Thruput/Orbix/utils.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-#include "ttcp_decl.h"
-
-void
-err (char *s)
-{
-  fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  perror (s);
-  fprintf (stderr, "errno=%d\n", errno);
-  exit (1);
-}
-
-void
-mes (char *s)
-{
-  fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-char *
-outfmt (double b)
-{
-  static char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-static struct itimerval itime0;	/* Time at which timing started */
-static struct rusage ru0;	/* Resource utilization at the start */
-
-#if defined(SYSV)
-/*ARGSUSED */
-static void
-getrusage (int ignored, register struct rusage *ru)
-{
-  struct tms buf;
-
-  times (&buf);
-
-  /* Assumption: HZ <= 2147 (LONG_MAX/1000000) */
-  ru->ru_stime.tv_sec = buf.tms_stime / HZ;
-  ru->ru_stime.tv_usec = ((buf.tms_stime % HZ) * 1000000) / HZ;
-  ru->ru_utime.tv_sec = buf.tms_utime / HZ;
-  ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ;
-}
-
-/*ARGSUSED */
-static void
-gettimeofday (struct timeval *tp, struct timezone *zp)
-{
-  tp->tv_sec = time (0);
-  tp->tv_usec = 0;
-}
-#endif /* SYSV */
-/*
- *                    P R E P _ T I M E R
- */
-void
-prep_timer ()
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- * 
- */
-double
-read_timer (char *str, int len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-static void
-prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-	*outp++ = *cp;
-      else if (cp[1])
-	switch (*++cp)
-	  {
-
-	  case 'U':
-	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'S':
-	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'E':
-	    psecs (ms / 100, outp);
-	    END (outp);
-	    break;
-
-	  case 'P':
-	    sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
-	    break;
-
-#if !defined(SYSV)
-	  case 'W':
-	    i = r1->ru_nswap - r0->ru_nswap;
-	    sprintf (outp, "%d", i);
-	    END (outp);
-	    break;
-
-	  case 'X':
-	    sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-	    END (outp);
-	    break;
-
-	  case 'D':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'K':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-		      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'M':
-	    sprintf (outp, "%d", r1->ru_maxrss / 2);
-	    END (outp);
-	    break;
-
-	  case 'F':
-	    sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-	    END (outp);
-	    break;
-
-	  case 'R':
-	    sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-	    END (outp);
-	    break;
-
-	  case 'I':
-	    sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-	    END (outp);
-	    break;
-
-	  case 'O':
-	    sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-	    END (outp);
-	    break;
-	  case 'C':
-	    sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-		     r1->ru_nivcsw - r0->ru_nivcsw);
-	    END (outp);
-	    break;
-#endif /* !SYSV */
-	  }
-    }
-  *outp = '\0';
-}
-
-static void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-static void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-static void
-psecs (long l, register char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-/*
- *                    N R E A D
- */
-int
-Nread (int fd, void *buf, int count)
-{
-  struct sockaddr_in from;
-  int len = sizeof (from);
-  register int cnt;
-  if (udp)
-    {
-      cnt = recvfrom (fd, (char *) buf, count, 0, (struct sockaddr *) &from, &len);
-      numCalls++;
-    }
-  else
-    {
-      if (b_flag)
-	cnt = mread (fd, (char *) buf, count);	/* fill buf */
-      else
-	{
-	  cnt = read (fd, buf, count);
-	  numCalls++;
-	}
-      if (touchdata && cnt > 0)
-	{
-	  register int c = cnt, sum;
-	  register char *b = (char *) buf;
-	  while (c--)
-	    sum += *b++;
-	}
-    }
-  return (cnt);
-}
-
-
-/*
- *                    N W R I T E
- */
-int
-Nwrite (int fd, void *buf, int count)
-{
-  return 0;
-}
-
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-/*
- *                    M R E A D
- *
- * This function performs the function of a read(II) but will
- * call read(II) multiple times in order to get the requested
- * number of characters.  This can be necessary because
- * network connections don't deliver data with the same
- * grouping as it is written with.  Written by Robert S. Miles, BRL.
- */
-int
-mread (int fd, register char *bufp, unsigned n)
-{
-  register unsigned count = 0;
-  register int nread;
-
-  do
-    {
-      nread = read (fd, bufp, n - count);
-      numCalls++;
-      if (nread < 0)
-	{
-	  perror ("ttcp_mread");
-	  return (-1);
-	}
-      if (nread == 0)
-	return ((int) count);
-      count += (unsigned) nread;
-      bufp += nread;
-    }
-  while (count < n);
-
-  return ((int) count);
-}
-
-void
-FillPattern (register char *cp, register int bufLen, unsigned long dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = (short)lrand48(); 
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    } 
-    break;
-  case SEND_LONG:
-    {
-       register long *SeqPtr = (long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = lrand48(); 
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = drand48(); 
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA::Char *SeqPtr = (CORBA::Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_STRUCT:
-    {
-       register PerfStruct *SeqPtr = (PerfStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(PerfStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
- 
-    } 
-    break;
-  case SEND_COMPOSITE:
-    {
-       register CompositeStruct *SeqPtr =  (CompositeStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CompositeStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].ps.s = (short)lrand48();
-           SeqPtr[i].ps.l = lrand48();
-           SeqPtr[i].ps.d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].ps.c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].ps.o = (unsigned char)(c++ & 0x7f);
-       }
-       Cseq = new ttcp_sequence::CompositeSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA::Octet *SeqPtr = (CORBA::Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA::Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-void PrintStats()
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-//#if defined (LM_RESULTS)
-  if (trans && (title != 0))
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
- 
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      if (new_line)
-        fprintf (outFile, "\n  -l %ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-//#endif
-
-  fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
diff --git a/TAO/tests/Thruput/TAO/Makefile b/TAO/tests/Thruput/TAO/Makefile
deleted file mode 100644
index 5e88e47d1ce..00000000000
--- a/TAO/tests/Thruput/TAO/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO_TTCP benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS     	= -lTAO
-
-IDL_SRC		= ttcpC.cpp ttcpS.cpp
-PROG_SRCS 	= $(IDL_SRC) client.cpp ttcp_i.cpp server.cpp utils.cpp tmplinst.cpp
-
-LSRC = $(PROG_SRCS)
-
-TTCP_CLIENT_OBJS = ttcpC.o client.o utils.o tmplinst.o ttcpS.o
-
-TTCP_SERVER_OBJS = ttcpC.o ttcpS.o server.o ttcp_i.o utils.o tmplinst.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat
-
-$(IDL_SRC): ttcp.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl ttcp.idl
-
-server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf ttcpC.* ttcpS.*
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Thruput/TAO/README b/TAO/tests/Thruput/TAO/README
deleted file mode 100644
index 0203d8604c1..00000000000
--- a/TAO/tests/Thruput/TAO/README
+++ /dev/null
@@ -1,47 +0,0 @@
-		TAO_TTCP Benchmark README file
-
-This directory contains a modified version of the TTCP benchmark that
-uses the TAO ORB. TAO_TTCP is used to measure the throughput of TAO
-for sending different data types. This code tests sequences of short,
-long, octet, char, double, and richly-typed data such as a struct.
-This benchmark uses an interpretive form of marshaling the data by
-using the dynamic invocation interfaces provided by the TAO ORB.
-
-Organization
-------------
-
-client.cpp		Client main program
-server.cpp		Server main program
-ttcpC.cpp		Client side stubs
-ttcpS.cpp		Server side skeletons
-ttcpC.h			Header file for stubs
-ttcpS.h			Header file for the skeletons
-ttcp_i.cpp		Implementaion of the interface
-ttcp_i.h		Header for the implementation
-utils.cpp		Utilities to calculate throughput
-ttcp_decls.h		Common declarations
-
-Results
--------
-Throughput results are stored under the results directory. If testing
-for REMOTE transfers, use the ./results/REMOTE directory.
-
-Running the tests
------------------
-Three scripts are provided
-
-(1) run_server : runs the server. Be sure to change the host name
-(2) run_client : runs tests for various data types
-(3) run_test : called by run_client
-
-Compiling
----------
-
-Type make
-
-To provide for 2way tests (no data is sent in the reverse
-direction. Sender blocks for a minimal ACK), comment out the -DONEWAY
-flag from the CPPFLAGS
-
--Aniruddha Gokhale
-(gokhale@cs.wustl.edu)
diff --git a/TAO/tests/Thruput/TAO/client.cpp b/TAO/tests/Thruput/TAO/client.cpp
deleted file mode 100644
index c8e652b11b3..00000000000
--- a/TAO/tests/Thruput/TAO/client.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-//
-// = FILENAME
-//   client.cpp
-//
-//   Main program for the client
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/ACE.h"
-#include "ttcpC.h"
-#include "ttcp_decl.h"
-
-int print_usage (void);
-
-char Usage[] =
-     "Usage: client [-options] \n"
-     "Common options:\n"
-     "-i <ior> Object reference string that the server outputs when started\n"
-     "-l ##    length of bufs read from or written to network (default 8192)\n"
-     "-v       verbose: print more statistics\n"
-     "-d ##    debug level\n"
-     "-f X     format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n"
-     "-L ##    Output file name to store results\n"
-     "-S ##    Total Data Size to be sent\n"
-     "-q <type> Send Sequence: Enumeration for various data types:\n"
-     "          s = short, l = long,  d = double, c = char\n"
-     "          o = octet, S = BinStruct \n";
-
-CORBA::Long trans = 1;          // we are a client - used for debugging purposes
-CORBA::Long buflen = 8 * 1024;	// length of buffer, default 8,192 bytes
-CORBA::Char *buf;		// ptr to dynamic buffer
-CORBA::Long nbuf;	        // number of buffers to send in sinkmode
-CORBA::Short port = TAO_DEFAULT_SERVER_PORT;	// TCP port number
-CORBA::Char *host = "localhost";              // ptr to name of host
-CORBA::Long verbose = 0;	// 0=print basic info, 1=print cpu
-                                // rate, proc resource usage.
-CORBA::Char fmt = 'K';		// output
-                                // format:k=kilobits,K=kilobytes, m = megabits,
-                                // M = megabytes, g = gigabits, G = gigabytes
-CORBA::String title = 0;        // title of file to gather statistics
-char stats[128];                // gathering the statistics
-unsigned long srcDataSize;	// Total amount of source data
-unsigned long nbytes;		// bytes on net
-unsigned long numCalls;		// # of I/O system calls
-double cput, realt;		// user, real time (seconds)
-unsigned long	dt;             // data type
-char * ior = 0;
-
-// declare variables for various message types
-ttcp_sequence::ShortSeq		*sseq;
-ttcp_sequence::LongSeq		*lseq;
-ttcp_sequence::OctetSeq		*oseq;
-ttcp_sequence::DoubleSeq	*dseq;
-ttcp_sequence::CharSeq		*cseq;
-ttcp_sequence::StructSeq	*Sseq;
-
-int
-main (int argc, char *argv[])
-{
-
-  int c;
-  CORBA::ORB_ptr        orb_ptr;   // underlying ORB
-  CORBA::String  objkey = "TTCP_IIOP_test"; // name of the TTCP object on the
-                                            // server
-  CORBA::Object_ptr     objref = CORBA::Object::_nil(); // object reference
-  ttcp_sequence_ptr     ttcp_seq = 0;  // obj reference to TTCP object
-  CORBA::Environment	env;       // environment
-
-  fstream iorfile;
-
-  ACE_UNUSED_ARG (objkey);
-
-  // parse the arguments
-  ACE_Get_Opt get_opt (argc, argv, "d:vf:l:L:S:q:i:"); // Command line options
-  TAO_debug_level = 0;
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'i':
-	  ior = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'L':
-	  title = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'd':
-	  TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'f':
-	  fmt = *get_opt.optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  srcDataSize = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*get_opt.optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
-	default:
-          return print_usage ();
-	}
-    }
-
-  //
-  // Transmitter
-  //
-
-  // get a handle to the ORB
-  orb_ptr = CORBA::ORB_init (argc, argv, "internet", env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB initialization", stdout);
-      return -1;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "Read IOR string as: %s\n" , ior));
-
-  // retrieve an object reference out of the stringified IOR
-  objref = orb_ptr->string_to_object (ior, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("string_to_object", stdout);
-      return -1;
-    }
-
-  if (!CORBA::is_nil (objref))
-    {
-      // if it is a valid obj ref, narrow it to a ttcp_sequence CORBA object
-      ttcp_seq = ttcp_sequence::_narrow (objref, env);
-
-      if (!CORBA::is_nil (ttcp_seq))
-        {
-
-          // the number of iterations is based on the total data size and the
-          // individual buffer size sent
-          nbuf = srcDataSize/buflen;
-          ACE_DEBUG ((LM_DEBUG, "data size = %d, buflen = %d, nbuf = %d\n",
-                      srcDataSize, buflen, nbuf));
-
-          //
-          // Prepare the Message to be sent
-          //
-
-
-          // first allocate a buffer of the desired size and alignment
-          errno = 0;
-          if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
-            err ("malloc");
-
-          // fill the buffer with the data type to be sent
-          FillPattern (buf, buflen, dt);
-
-          //
-          // Start the timers on the client and server sides
-          //
-
-          prep_timer ();  // start our time
-          ttcp_seq->start_timer (env); // ask the server to start its timer
-          if (env.exception () != 0)
-            {
-              env.print_exception ("start_timer operation", stdout);
-              return -1;
-            }
-
-#if defined (USE_QUANTIFY)
-          /* start recording quantify data from here */
-          quantify_clear_data ();
-          quantify_start_recording_data ();
-#endif
-          // send the same buffer nbuf times
-          while (nbuf--)
-            {
-              switch (dt){
-              case SEND_SHORT:
-                ttcp_seq->sendShortSeq (*sseq, env);
-                nbytes += sseq->length () * sizeof (CORBA::Short);
-                break;
-              case SEND_LONG:
-                ttcp_seq->sendLongSeq (*lseq, env);
-                nbytes += lseq->length () * sizeof (CORBA::Long);
-                break;
-              case SEND_OCTET:
-                ttcp_seq->sendOctetSeq (*oseq, env);
-                nbytes += oseq->length () * sizeof (CORBA::Octet);
-                break;
-              case SEND_DOUBLE:
-                ttcp_seq->sendDoubleSeq (*dseq, env);
-                nbytes += dseq->length () * sizeof (CORBA::Double);
-                break;
-              case SEND_CHAR:
-                ttcp_seq->sendCharSeq (*cseq, env);
-                nbytes += cseq->length () * sizeof (CORBA::Char);
-                break;
-              case SEND_STRUCT:
-                ttcp_seq->sendStructSeq (*Sseq, env);
-                nbytes += Sseq->length () * sizeof (BinStruct);
-                break;
-              }
-              numCalls++; // nbytes and numCalls are used in the thruput
-                          // measurement
-              if (env.exception () != 0)
-                {
-                  env.print_exception ("send operation", stdout);
-                  return -1;
-                }
-            }
-#if defined (USE_QUANTIFY)
-          quantify_stop_recording_data();
-#endif
-          //
-          // Stop the timer
-          //
-          // stop the timer on the server side
-          ttcp_seq->stop_timer (env);
-          if (env.exception () != 0)
-            {
-              env.print_exception ("stop_timer operation", stdout);
-              return -1;
-            }
-          // stop our timer
-          (void) read_timer (stats, sizeof (stats));
-
-          // print results
-          PrintStats();
-        }
-    }
-
-  CORBA::release (ttcp_seq);
-  CORBA::release (objref);
-  CORBA::release (orb_ptr);
-  return (0);
-}
-
-int print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Usage error\n"));
-  ACE_ERROR ((LM_ERROR, "%s\n", Usage));
-  return -1;
-}
diff --git a/TAO/tests/Thruput/TAO/run b/TAO/tests/Thruput/TAO/run
deleted file mode 100644
index 009677fdcde..00000000000
--- a/TAO/tests/Thruput/TAO/run
+++ /dev/null
@@ -1 +0,0 @@
-client -S 67108864 -f m -l $1 -L temp -q $2 -d $3
diff --git a/TAO/tests/Thruput/TAO/run_client b/TAO/tests/Thruput/TAO/run_client
deleted file mode 100644
index ee845fcce8c..00000000000
--- a/TAO/tests/Thruput/TAO/run_client
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/csh -f
-# All ATM tests: 64k socket Queue Size
-#
-# Arguments:
-#   $1  <Test_Name> 
-#   $2  <obj_reference_From_Server> 
-
-if ($#argv < 2) then
-	echo "Usage: run_client <Test_Name> <obj_reference_From_Server>"
-	exit 1
-endif
-
-# shorts
-run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 s $2
-sleep 5		      
-# longs		      
-run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 l $2
-sleep 5		      
-# octets	      
-run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 o $2
-sleep 5		      
-# doubles	      
-run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 d $2
-sleep 5		      
-# chars		      
-#run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 c $2
-#sleep 5	      
-# structures	      
-run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 S $2
-sleep 5		      
-# Composite Structs   
-#run_test 67108864 128 ./results/REMOTE/$1/sun-iiop.atm1.64 C $2
-#sleep 5
-#
diff --git a/TAO/tests/Thruput/TAO/run_server b/TAO/tests/Thruput/TAO/run_server
deleted file mode 100644
index 50fdce5df97..00000000000
--- a/TAO/tests/Thruput/TAO/run_server
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/csh -x
-#
-# Usage: server <switches>
-# -u : use IOR 
-# -f m : output results in Mbps
-# -b <sock Q size> ** not implemented **
-# -OAhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
-#
-
-server -d 1 -f m -ORBhost `hostname` -ORBobjrefstyle url #-OAthread
diff --git a/TAO/tests/Thruput/TAO/run_test b/TAO/tests/Thruput/TAO/run_test
deleted file mode 100644
index e60f3296371..00000000000
--- a/TAO/tests/Thruput/TAO/run_test
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/csh -f
-
-#   $1  <Total_Data_Size> 
-#   $2  <Max_msg_size_in_Kb?> <-- currently not used? $2 == $argv[2] ??
-#   $3  <Title_Of_This_Test> 
-#   $4  <seq_type>
-#   $5  <ior_from_server>
-
-# e.g. 
-# % run_test 10000 512 mambo\! s iiop:1.0//128.252.165.144:10015/P350892cc000ad963RootPOA/RootPOA_is_BAD/TTCP_IIOP_test
-#
-
-if ($#argv < 5) then
-	echo "Usage: run_test <Total_Data_Size> <Max_msg_size> <Title_Of_This_Test> <seq_type> <ior_from_server>"
-	exit 1
-endif
-#
-@ msize=1024
-@ limit= ($argv[2] * 1024)
-#echo $limit
-#echo $msize 
-	echo "-->"
-	echo "--> ITERATION #" 1 
-	echo "  client -S" $1 "-f m -l" $msize "-L" $3 "-q" $4 "-i" $5
-	echo "-->"
-client -S $1 -f m -l $msize -L $3 -q $4 -i $5
-set flag=0
-while ($msize <= $limit)
-  if ($flag == 0) goto label
-	echo "-->"
-	echo "--> ITERATION #" 1 
-        echo "  client -S" $1 "-f m -l" $msize "-L" $3 "-q" $4 "-i" $5
-	echo "-->"
-	client -S $1 -f m -l $msize -L $3 -q $4 -i $5
- label:
-  set flag=1
-  sleep 5
-  foreach i (2)
-	echo "-->"
-	echo "--> ITERATION #" $i 
-        echo "  client -S" $1 "-f m -l" $msize "-L" $3 "-q" $4 "-i" $5
-	echo "-->"
-	client -S $1 -f m -l $msize -L $3 -q $4 -i $5
-  end
-	echo "---------------------------"
-	@ msize = ($msize * 2)
-	sleep 5
-end 
-
-echo " "
-echo "Done at:" 
-date
diff --git a/TAO/tests/Thruput/TAO/server.cpp b/TAO/tests/Thruput/TAO/server.cpp
deleted file mode 100644
index 3c1fd293442..00000000000
--- a/TAO/tests/Thruput/TAO/server.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-//
-// = FILENAME
-//   server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "ace/ACE.h"
-#include "ace/Get_Opt.h"
-
-#include "ttcp_i.h"
-
-char Usage[] = "\
-Usage: server [TAO options] [options] \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--v      verbose: print more statistics\n\
--d ##   set debug level \n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--L ##   Output file name for the data type used\n\n\
-";
-
-CORBA::Long trans = 0;            // we are the receiver
-CORBA::Long buflen = 8 * 1024;    // length of buffer
-CORBA::Char *buf;                         // ptr to dynamic buffer
-CORBA::Long nbuf;                         // number of buffers to send in sinkmode
-CORBA::Long verbose = 0;          // 0=print basic info, 1=print cpu rate, proc
-                                  // resource usage.
-CORBA::Char fmt = 'K';            // output format:k=kilobits,K=kilobytes, m =
-                                  // megabits, M = megabytes, g = gigabits, G =
-                                  // gigabytes
-
-CORBA::Char *title = 0;           // results filename
-
-CORBA::Char stats[128];       // gathering the statistics
-CORBA::ULong srcDataSize;         // Total amount of source data
-CORBA::ULong nbytes;              // bytes on net
-CORBA::ULong numCalls;            // # of I/O system calls
-CORBA::Double cput, realt;        // user, real time (seconds)
-CORBA::ULong dt;              // data type
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq         *sseq;
-ttcp_sequence::LongSeq          *lseq;
-ttcp_sequence::OctetSeq         *oseq;
-ttcp_sequence::DoubleSeq        *dseq;
-ttcp_sequence::CharSeq          *cseq;
-ttcp_sequence::StructSeq        *Sseq;
-
-ttcp_sequence_i *my_ttcp;  // instance of the target object
-
-// main program - Driver
-int
-main (int argc, char **argv)
-{
-
-  int c;                      // option
-  CORBA::Environment env;     // environment
-  CORBA::ORB_var     orb_var; // handle to the ORB
-  PortableServer::POA_var root_poa; // Object adapter
-  CORBA::String      key = (CORBA::String) "key0"; // key assigned to our
-                                                   // target object
-  CORBA::Object_var obj_var;
-  char              *oa_name = "RootPOA"; // name of our OA
-  char              *orb_name = "internet"; // name of our ORB
-  CORBA::String      str; // for stringified representation of the object reference
-
-  ACE_UNUSED_ARG (key);
-
-  // initialize the underlying ORB and get a handle to it
-  orb_var = CORBA::ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  obj_var = orb_var->resolve_initial_references(oa_name);
-
-  if (CORBA::is_nil(obj_var.in()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to initialize the POA.\n"),
-                      -1);
-  
-  root_poa = PortableServer::POA::_narrow (obj_var.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("POA init");
-      return 1;
-    }
-
-  PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("POA manager");
-      return 1;
-    }
-
-  PortableServer::PolicyList policies (2);
-  policies.length (2);  
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                           env);
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                      env);
-
-  // We use a different POA, otherwise the user would have to
-  // change the object key each time it invokes the server.
-  PortableServer::POA_var good_poa =
-    root_poa->create_POA ("RootPOA_is_BAD",
-                          poa_manager.in (),
-                          policies,
-                          env);  
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("create good poa");
-      return 1;
-    }
-
-  // for parsing the arguments
-  ACE_Get_Opt get_opt (argc, argv, "l:vd:f:L:");
-
-  TAO_debug_level = 0;
-  for (; (c = get_opt ()) != EOF;)
-    {
-      switch (c)
-        {
-        case 'L':
-          // title of output file that stores result
-          title = ACE_OS::strdup (get_opt.optarg);
-          break;
-        case 'd':
-          // debugging level
-          TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
-          if (TAO_debug_level > 10)
-            TAO_debug_level = 10;
-          break;
-        case 'f':
-          // output format i.e., Mbps, Kbps, etc
-          fmt = *get_opt.optarg;
-          break;
-        }
-    }
-
-  //
-  // Receiver
-  //
-
-  // create an instance of an object implementing the "ttcp" interface
-  my_ttcp = new ttcp_sequence_i; // this is its name
-
-  PortableServer::ObjectId_var id = 
-    PortableServer::string_to_ObjectId ("TTCP_IIOP_test");
-  good_poa->activate_object_with_id (id.in (),
-                                     my_ttcp,
-                                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("string_to_ObjectId");
-      return 1;
-    }
-
-  obj_var = good_poa->id_to_reference (id.in (), env);
- 
-  if (env.exception () != 0)
-    {
-      env.print_exception ("id_to_reference");
-      return 1;
-    }
-
-  poa_manager->activate (env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("id_to_reference");
-      return 1;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      // get a stringified representation of the object reference created above
-      str = orb_var->object_to_string (obj_var.in (),
-                                       env);
-      if (env.exception () != 0)
-        {
-          env.print_exception ("object_to_string");
-          return 1;
-        }
-       
-      ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
-    }
-
-#if defined (USE_QUANTIFY)
-  // gather profile data
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_var->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  return 0;
-}
diff --git a/TAO/tests/Thruput/TAO/svc.conf b/TAO/tests/Thruput/TAO/svc.conf
deleted file mode 100644
index df32a6c3b41..00000000000
--- a/TAO/tests/Thruput/TAO/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() ""
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Thruput/TAO/tmplinst.cpp b/TAO/tests/Thruput/TAO/tmplinst.cpp
deleted file mode 100644
index e162ad7422e..00000000000
--- a/TAO/tests/Thruput/TAO/tmplinst.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// $Id$
-//
-
-// The contents of this file REALLY should be generated by the IDL
-// compiler, but that functionality isn't available yet.
-
-#include "ttcpC.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<CORBA::Double>;
-template class TAO_Unbounded_Sequence<BinStruct>;
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-template class TAO_Unbounded_Sequence<CORBA::Char>;
-template class TAO_Unbounded_Sequence<CORBA::Short>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Double>
-#pragma instantiate TAO_Unbounded_Sequence<BinStruct>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Char>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Short>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tests/Thruput/TAO/ttcp.idl b/TAO/tests/Thruput/TAO/ttcp.idl
deleted file mode 100644
index 02f382f3d29..00000000000
--- a/TAO/tests/Thruput/TAO/ttcp.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- C++ -*- */
-struct BinStruct
-{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  //  octet pad[8];  // to make it 32 bytes
-  // commented out until IDL support for arrays is added
-};
-
-// Richly typed data
-interface ttcp_sequence
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<BinStruct> StructSeq;
-
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/tests/Thruput/TAO/ttcp_decl.h b/TAO/tests/Thruput/TAO/ttcp_decl.h
deleted file mode 100644
index 8ff6e8b0730..00000000000
--- a/TAO/tests/Thruput/TAO/ttcp_decl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ace/OS.h"
-#include "ace/Profile_Timer.h"
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-/* define the data types to be sent */
-#define SEND_SHORT ((CORBA::ULong)(1))
-#define SEND_LONG ((CORBA::ULong)(2))
-#define SEND_CHAR ((CORBA::ULong)(3))
-#define SEND_OCTET ((CORBA::ULong)(4))
-#define SEND_DOUBLE ((CORBA::ULong)(5))
-#define SEND_STRUCT ((CORBA::ULong)(6))
-#define SEND_COMPOSITE ((CORBA::ULong)(7))
- 
-/**************
-// Prototypes
-***************/
-int err (CORBA::Char *s);
-void mes (CORBA::Char *s);
-CORBA::String outfmt (CORBA::Double b);
-void prep_timer (void);
-CORBA::Double read_timer (CORBA::Char *str, CORBA::Long len);
-void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, CORBA::Char *outp);
-void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-void psecs (CORBA::Long l, register CORBA::Char *cp);
-void delay (CORBA::Long us);
-void FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong dt);
-void PrintStats (void);
-
-/* Global variables defined here as extern */
-extern ACE_Svc_Export CORBA::Long trans;        // whether we are transmitter
-                                                // or receiver 
-extern ACE_Svc_Export CORBA::Long buflen;		/* length of buffer */
-extern ACE_Svc_Export CORBA::Char *buf;		/* ptr to dynamic buffer */
-extern ACE_Svc_Export CORBA::Long nbuf;		/* number of buffers to send in sinkmode */
-extern ACE_Svc_Export CORBA::Short port;		/* TCP port number */
-extern ACE_Svc_Export CORBA::Char *host;              /* ptr to name of host */
-extern ACE_Svc_Export CORBA::Long verbose;			/* 0=print basic info, 1=prCORBA::Long cpu rate, proc
-				 * resource usage. */
-extern ACE_Svc_Export CORBA::Char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern ACE_Svc_Export CORBA::Char *title;
-
-extern ACE_Svc_Export CORBA::Char stats[128];
-extern ACE_Svc_Export unsigned long srcDataSize;	/* Total amount of source data */
-extern ACE_Svc_Export unsigned long nbytes;		/* bytes on net */
-extern ACE_Svc_Export unsigned long numCalls;		/* # of I/O system calls */
-extern ACE_Svc_Export CORBA::Double cput, realt;		/* user, real time (seconds) */
-extern ACE_Svc_Export unsigned long dt;
-
-/* declare struct variables for various message types */
-extern ACE_Svc_Export ttcp_sequence::ShortSeq		*sseq;	
-extern ACE_Svc_Export ttcp_sequence::LongSeq		*lseq;	
-extern ACE_Svc_Export ttcp_sequence::OctetSeq		*oseq;	
-extern ACE_Svc_Export ttcp_sequence::DoubleSeq	        *dseq;	
-extern ACE_Svc_Export ttcp_sequence::CharSeq		*cseq;	
-extern ACE_Svc_Export ttcp_sequence::StructSeq	        *Sseq;
-
-#endif
diff --git a/TAO/tests/Thruput/TAO/ttcp_i.cpp b/TAO/tests/Thruput/TAO/ttcp_i.cpp
deleted file mode 100644
index 9fd7bf1ed37..00000000000
--- a/TAO/tests/Thruput/TAO/ttcp_i.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <iostream.h>
-#include "ace/ACE.h"
-#include "ttcp_i.h"
-#include "ttcp_decl.h"
-
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i()
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-}
-
-void
-ttcp_sequence_i::start_timer (CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  this->nbytes_ = 0;
-  ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-#if defined (USE_PURIFY)
-    ACE_Service_Config::end_reactor_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(CORBA::Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-  numCalls++;
-  this->nbytes_ += ttcp_seq.length()*sizeof(BinStruct) ;
-#ifdef DEBUG
-  //    cout << "Bytes received so far = " << this->nbytes_ << endl;
-#endif
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/Thruput/TAO/ttcp_i.h b/TAO/tests/Thruput/TAO/ttcp_i.h
deleted file mode 100644
index 08a44318065..00000000000
--- a/TAO/tests/Thruput/TAO/ttcp_i.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-// 
-// = FILENAME
-//   ttcp_i.h 
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include "ttcpS.h"
-
-class ttcp_sequence_i: public POA_ttcp_sequence 
-{
-public:
-  ttcp_sequence_i();
-
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA::Environment &IT_env);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (CORBA::Environment &IT_env);
-  virtual void stop_timer (CORBA::Environment &IT_env);
-
-private:
-  unsigned long nbytes_;
-};
-
-#endif // defined (TTCP_I_H)
-
diff --git a/TAO/tests/Thruput/TAO/utils.cpp b/TAO/tests/Thruput/TAO/utils.cpp
deleted file mode 100644
index 3185221a778..00000000000
--- a/TAO/tests/Thruput/TAO/utils.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
-//
-// = FILENAME
-//   utils.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-// This file has all the helper functions that do the computation of
-// throughput, system time used, user time, etc based on data collected.
-
-#include "ttcpC.h"
-#include "ttcp_decl.h"
-
-// the error function.
-// displays the error message and exits
-int err (CORBA::String s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  ACE_OS::perror (s);
-  ACE_OS::fprintf (stderr, "errno=%d\n", errno);
-  return -1;
-}
-
-// prints a message indicating if it is a transmitter or a receiver
-void mes (CORBA::String s)
-{
-  ACE_OS::fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-// does the formatting for the desired units in which the result is to be
-// displayed
-CORBA::String
-outfmt (CORBA::Double b)
-{
-  static CORBA::Char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      ACE_OS::sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      ACE_OS::sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      ACE_OS::sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      ACE_OS::sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      ACE_OS::sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      ACE_OS::sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-#if defined (VXWORKS) || defined (CHORUS)
-// Just so this file will compile.
-inline
-int
-lrand48 ()
-{
-  return ::rand ();
-}
-
-inline
-double
-drand48 ()
-{
-  return ::rand ();
-}
-#endif /* VXWORKS || CHORUS */
-
-// fill up a buffer with a data type that we want to send
-void
-FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-                SeqPtr[i] = (short)lrand48();
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    }
-    break;
-  case SEND_LONG:
-    {
-       register CORBA::Long *SeqPtr = (CORBA::Long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-                SeqPtr[i] = lrand48();
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    }
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-                SeqPtr[i] = drand48();
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    }
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA::Char *SeqPtr = (CORBA::Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    }
-    break;
-  case SEND_STRUCT:
-    {
-       register BinStruct *SeqPtr = (BinStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(BinStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
-
-    }
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA::Octet *SeqPtr = (CORBA::Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA::Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-
-// print all the statistics
-void PrintStats (void)
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-  if (title != 0)
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
-
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      ACE_OS::fprintf (outFile, "\n%ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      ACE_OS::fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  ACE_OS::fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  ACE_OS::fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      ACE_OS::fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
-
-// generate the specified delay in microseconds
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-#if defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)
-// Mon Apr 06 09:50:16 1998  David L. Levine  <levine@cs.wustl.edu>
-// @@ This file should be updated to use ACE_Profile_Timer instead of
-//    using rusage directly.
-
-static struct itimerval itime0; /* Time at which timing started */
-static struct rusage ru0;       /* Resource utilization at the start */
-
-/*
- *                    P R E P _ T I M E R
- */
-// this is in fact the internals of the "start_timer" operation
-void
-prep_timer (void)
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = (ACE_INT32) LONG_MAX / 22;   /* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- *
- */
-// This implements the internals of the "stop_timer" method
-double
-read_timer (CORBA::Char *str, CORBA::Long len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  ACE_OS::getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-// prints the rusage stats
-void
-prusage (register struct rusage *r0, struct rusage *r1,
-         struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)                /* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-        *outp++ = *cp;
-      else if (cp[1])
-        switch (*++cp)
-          {
-
-          case 'U':
-            tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-            ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-            END (outp);
-            break;
-
-          case 'S':
-            tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-            ACE_OS::sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-            END (outp);
-            break;
-
-          case 'E':
-            psecs (ms / 100, outp);
-            END (outp);
-            break;
-
-          case 'P':
-            ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-            END (outp);
-            break;
-
-#if !defined(SYSV)
-          case 'W':
-            i = r1->ru_nswap - r0->ru_nswap;
-            ACE_OS::sprintf (outp, "%d", i);
-            END (outp);
-            break;
-
-          case 'X':
-            ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-            END (outp);
-            break;
-
-          case 'D':
-            ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-                     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-            END (outp);
-            break;
-
-          case 'K':
-            ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-                     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-                      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-            END (outp);
-            break;
-
-          case 'M':
-            ACE_OS::sprintf (outp, "%d", r1->ru_maxrss / 2);
-            END (outp);
-            break;
-
-          case 'F':
-            ACE_OS::sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-            END (outp);
-            break;
-
-          case 'R':
-            ACE_OS::sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-            END (outp);
-            break;
-
-          case 'I':
-            ACE_OS::sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-            END (outp);
-            break;
-
-          case 'O':
-            ACE_OS::sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-            END (outp);
-            break;
-          case 'C':
-            ACE_OS::sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-                     r1->ru_nivcsw - r0->ru_nivcsw);
-            END (outp);
-            break;
-#endif /* !SYSV */
-          }
-    }
-  *outp = '\0';
-}
-
-// adds two "timeval" structures
-void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-// finds difference between two timevals
-void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-// print in seconds
-void
-psecs (CORBA::Long l, register CORBA::Char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      ACE_OS::sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      ACE_OS::sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      ACE_OS::sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  ACE_OS::sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-#else /* ! ACE_HAS_PRUSAGE_T || ! ACE_HAS_GETRUSAGE */
-
-void
-prep_timer (void)
-{
-  ACE_ERROR ((LM_ERROR, "%s:%d; not supported\n", __FILE__, __LINE__));
-  errno = ENOTSUP;
-}
-
-double
-read_timer (CORBA::Char *str, CORBA::Long len)
-{
-  ACE_NOTSUP_RETURN (0.0);
-}
-
-#endif /* ! ACE_HAS_PRUSAGE_T || ! ACE_HAS_GETRUSAGE */
diff --git a/TAO/tests/VCAUTO.MAK b/TAO/tests/VCAUTO.MAK
deleted file mode 100644
index 35f2523a7e5..00000000000
--- a/TAO/tests/VCAUTO.MAK
+++ /dev/null
@@ -1,5 +0,0 @@
-# TAO/tests/
-
-DIR_LIST = Cubit.dir Param_Test.dir
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>
diff --git a/WindozeCE/ACEApp.cpp b/WindozeCE/ACEApp.cpp
deleted file mode 100644
index 3d7ab6722ca..00000000000
--- a/WindozeCE/ACEApp.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "stdafx.h"
-#include "ace/OS.h"
-#include "ACEApp.h"
-
-#if 0
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  Sleep (500);
-  for (int i = 0; i < argc; i++, Sleep (700))
-    ACE_DEBUG ((LM_DEBUG, TEXT ("The %d command arg is \"%s\""),
-                i, argv [i]));
-  return 0;
-}
-#endif
diff --git a/WindozeCE/ACEApp.h b/WindozeCE/ACEApp.h
deleted file mode 100644
index 6d5107dedbf..00000000000
--- a/WindozeCE/ACEApp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#if !defined (ACE_APP_H)
-#define ACE_APP_H
-
-#if !defined (NC_ACE_NOTIRY)
-#define NC_ACE_NOTIFY 2
-#define INC_ACE_LOGMSG 0
-#endif
-
-#endif /* ACE_APP_H */
-
-  
-
diff --git a/WindozeCE/README b/WindozeCE/README
deleted file mode 100644
index 9d5d184e3db..00000000000
--- a/WindozeCE/README
+++ /dev/null
@@ -1,35 +0,0 @@
-        CE specific files, may not run on 95/NT.
-
-What is this directory:
-
-        This directory contains a collection of files for a template
-        windows program.  It is written with Microsoft's MFC classes.
-        They also demonstrate a simple method to pass ACE_Log_Msg's
-        output to a window program with PostMessage.
-
-How to use this directory:
-
-        I was planning to make this a DLL so that we can integrate CE
-        project files with the current Win32 project files.  However,
-        the CE toolkit still seems very rudimentary and, certainly, I
-        am not familiar with it.  
-
-        To use these files, simply include all .cpp and .rc files in
-        your original text-based program.  Compile them with "using
-        Shared MFC library" set (important.)
-
-Running the programs:
-        
-        Start the program.  Key in command line parameters in the edit
-        box and tap on start button.  The button displays "Running.."
-        when the program is executing and "Stopped" after the ACE
-        program has finished execution.
-
-Future works:
-     
-        * We need to allow scrollable output.
-
-        * Make this a DLL?
-
-        * Get the command line automatically.  (This may need to
-          rewrite the program using native Win32 APIs.)
diff --git a/WindozeCE/StdAfx.cpp b/WindozeCE/StdAfx.cpp
deleted file mode 100644
index 411e7cbf607..00000000000
--- a/WindozeCE/StdAfx.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-// stdafx.cpp : source file that includes just the standard includes
-//	WinAdapter.pch will be the pre-compiled header
-//	stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
diff --git a/WindozeCE/StdAfx.h b/WindozeCE/StdAfx.h
deleted file mode 100644
index e9d1feff454..00000000000
--- a/WindozeCE/StdAfx.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__5088F84A_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)
-#define AFX_STDAFX_H__5088F84A_CE8B_11D1_9621_0040054CF0F0__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__5088F84A_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)
diff --git a/WindozeCE/WinAdapter.aps b/WindozeCE/WinAdapter.aps
deleted file mode 100644
index 1fd97572fe9..00000000000
--- a/WindozeCE/WinAdapter.aps
+++ /dev/null
diff --git a/WindozeCE/WinAdapter.cfg b/WindozeCE/WinAdapter.cfg
deleted file mode 100644
index 80c479b3205..00000000000
--- a/WindozeCE/WinAdapter.cfg
+++ /dev/null
@@ -1 +0,0 @@
-WCE_CFG=WCE200;
\ No newline at end of file
diff --git a/WindozeCE/WinAdapter.clw b/WindozeCE/WinAdapter.clw
deleted file mode 100644
index e2c28626ab3..00000000000
--- a/WindozeCE/WinAdapter.clw
+++ /dev/null
@@ -1,41 +0,0 @@
-; CLW file contains information for the MFC ClassWizard

-

-[General Info]

-Version=1

-LastClass=CWinAdapterDlg

-LastTemplate=CDialog

-NewFileInclude1=#include "stdafx.h"

-NewFileInclude2=#include "WinAdapter.h"

-

-ClassCount=2

-Class1=CWinAdapterApp

-Class2=CWinAdapterDlg

-

-ResourceCount=3

-Resource2=IDR_MAINFRAME

-Resource3=IDD_WinAdapter_DIALOG

-

-[CLS:CWinAdapterApp]

-Type=0

-HeaderFile=WinAdapter.h

-ImplementationFile=WinAdapter.cpp

-Filter=N

-

-[CLS:CWinAdapterDlg]

-Type=0

-HeaderFile=WinAdapterDlg.h

-ImplementationFile=WinAdapterDlg.cpp

-Filter=D

-BaseClass=CDialog

-VirtualFilter=dWC

-LastObject=IDC_TEXT_DISP

-

-

-[DLG:IDD_WinAdapter_DIALOG]

-Type=1

-Class=CWinAdapterDlg

-ControlCount=3

-Control1=IDC_TEXT_DISP,static,1342308352

-Control2=IDC_CMDLINE,edit,1350631552

-Control3=IDC_START,button,1342242817

-

diff --git a/WindozeCE/WinAdapter.cpp b/WindozeCE/WinAdapter.cpp
deleted file mode 100644
index dfa7eed8919..00000000000
--- a/WindozeCE/WinAdapter.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$

-// WinAdapter.cpp : Defines the class behaviors for the application.

-//

-

-#include "stdafx.h"

-#include "WinAdapter.h"

-#include "WinAdapterDlg.h"

-#include "ACEApp.h"

-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterApp

-

-BEGIN_MESSAGE_MAP(CWinAdapterApp, CWinApp)

-	//{{AFX_MSG_MAP(CWinAdapterApp)

-		// NOTE - the ClassWizard will add and remove mapping macros here.

-		//    DO NOT EDIT what you see in these blocks of generated code!

-	//}}AFX_MSG

-END_MESSAGE_MAP()

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterApp construction

-

-CWinAdapterApp::CWinAdapterApp(LPCTSTR lpszAppName)

-	: CWinApp(lpszAppName)

-{

-	// TODO: add construction code here,

-	// Place all significant initialization in InitInstance

-}

-

-/////////////////////////////////////////////////////////////////////////////

-// The one and only CWinAdapterApp object

-

-// WCE MFC apps require the application name to be specified in the CWinApp 

-// constructor. A help contents filename may also be specified.

-

-CWinAdapterApp theApp(_T("WinAdapter"));

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterApp initialization

-

-BOOL CWinAdapterApp::InitInstance()

-{

-	// Standard initialization

-	// If you are not using these features and wish to reduce the size

-	//  of your final executable, you should remove from the following

-	//  the specific initialization routines you do not need.

-

-	CWinAdapterDlg dlg;

-	m_pMainWnd = &dlg;

-	int nResponse = dlg.DoModal();

-	if (nResponse == IDOK)

-	{

-		// TODO: Place code here to handle when the dialog is

-		//  dismissed with OK

-	}

-	else if (nResponse == IDCANCEL)

-	{

-		// TODO: Place code here to handle when the dialog is

-		//  dismissed with Cancel

-	}

-

-	// Since the dialog has been closed, return FALSE so that we exit the

-	//  application, rather than start the application's message pump.

-	return FALSE;

-}

diff --git a/WindozeCE/WinAdapter.h b/WindozeCE/WinAdapter.h
deleted file mode 100644
index abf7d256aff..00000000000
--- a/WindozeCE/WinAdapter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$

-// WinAdapter.h : main header file for the WinAdapter application

-//

-

-#if !defined(AFX_WinAdapter_H__5088F846_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)

-#define AFX_WinAdapter_H__5088F846_CE8B_11D1_9621_0040054CF0F0__INCLUDED_

-

-#if _MSC_VER >= 1000

-#pragma once

-#endif // _MSC_VER >= 1000

-

-#ifndef __AFXWIN_H__

-	#error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "resource.h"		// main symbols

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterApp:

-// See WinAdapter.cpp for the implementation of this class

-//

-

-class CWinAdapterApp : public CWinApp

-{

-public:

-	CWinAdapterApp(LPCTSTR lpszAppName);

-

-// Overrides

-	// ClassWizard generated virtual function overrides

-	//{{AFX_VIRTUAL(CWinAdapterApp)

-	public:

-	virtual BOOL InitInstance();

-	//}}AFX_VIRTUAL

-

-// Implementation

-

-	//{{AFX_MSG(CWinAdapterApp)

-		// NOTE - the ClassWizard will add and remove member functions here.

-		//    DO NOT EDIT what you see in these blocks of generated code !

-	//}}AFX_MSG

-	DECLARE_MESSAGE_MAP()

-};

-

-

-/////////////////////////////////////////////////////////////////////////////

-

-//{{AFX_INSERT_LOCATION}}

-// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

-

-#endif // !defined(AFX_WinAdapter_H__5088F846_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)

diff --git a/WindozeCE/WinAdapter.rc b/WindozeCE/WinAdapter.rc
deleted file mode 100644
index 7e182239ad9..00000000000
--- a/WindozeCE/WinAdapter.rc
+++ /dev/null
@@ -1,175 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

-    "#define _AFX_NO_OLE_RESOURCES\r\n"

-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

-    "\r\n"

-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

-    "#ifdef _WIN32\r\n"

-    "LANGUAGE 9, 1\r\n"

-    "#pragma code_page(1252)\r\n"

-    "#endif\r\n"

-    "#include ""res\\WinAdapter.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

-    "#include ""afxres.rc""         // Standard components\r\n"

-    "#include ""wceres.rc""         // WCE-specific components\r\n"

-    "#endif\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_WinAdapter_DIALOG DIALOGEX 0, 0, 185, 92

-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_APPWINDOW | WS_EX_CAPTIONOKBTN

-CAPTION "ACE Test"

-FONT 8, "MS Sans Serif"

-BEGIN

-    LTEXT           "Arguments:",IDC_TEXT_DISP,7,7,171,64

-    EDITTEXT        IDC_CMDLINE,7,71,118,14,ES_AUTOHSCROLL

-    DEFPUSHBUTTON   "Start",IDC_START,128,71,50,14

-END

-

-

-#ifndef _MAC

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,0,0,1

- PRODUCTVERSION 1,0,0,1

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x1L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904B0"

-        BEGIN

-            VALUE "CompanyName", "\0"

-            VALUE "FileDescription", "WinAdapter WCE MFC Application\0"

-            VALUE "FileVersion", "1, 0, 0, 1\0"

-            VALUE "InternalName", "WinAdapter\0"

-            VALUE "LegalCopyright", "Copyright (C) 1998\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "WinAdapter.EXE\0"

-            VALUE "ProductName", "WinAdapter Application\0"

-            VALUE "ProductVersion", "1, 0, 0, 1\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // !_MAC

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

-BEGIN

-    IDD_WinAdapter_DIALOG, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 178

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 85

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\WinAdapter.ico"

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-#define _AFX_NO_SPLITTER_RESOURCES

-#define _AFX_NO_OLE_RESOURCES

-#define _AFX_NO_TRACKER_RESOURCES

-#define _AFX_NO_PROPERTY_RESOURCES

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE 9, 1

-#pragma code_page(1252)

-#endif

-#include "res\WinAdapter.rc2"  // non-Microsoft Visual C++ edited resources

-#include "afxres.rc"         // Standard components

-#include "wceres.rc"         // WCE-specific components

-#endif

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/WindozeCE/WinAdapterDlg.cpp b/WindozeCE/WinAdapterDlg.cpp
deleted file mode 100644
index de603c72ad5..00000000000
--- a/WindozeCE/WinAdapterDlg.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$

-// WinAdapterDlg.cpp : implementation file

-//

-

-#include "stdafx.h"

-#include "WinAdapter.h"

-#include "WinAdapterDlg.h"

-#include "ace/ARGV.h" 

-#include "ACEApp.h"

-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

-static CWnd *host_window_ = 0;

-

-UINT worker (void * arg)

-{

-  ACE_ARGV cmd_line ((TCHAR *) arg);

-  extern int ace_ce_main (int, ASYS_TCHAR *[]);

-

-  int retv =  ace_ce_main (cmd_line.argc (), cmd_line.argv ());

-  host_window_->SetDlgItemText (IDC_START, TEXT ("Stopped"));

-

-  return retv;

-

-//   Sleep (500);

-//   for (size_t i = 0; i < cmd_line.argc (); i++, Sleep (500))

-//     ACE_DEBUG ((LM_DEBUG, TEXT ("The %d command arg is \"%s\""),

-//                 i, cmd_line.argv ()[i]));

-

-//   return 0;

-//   CString *msg = 0;

-//   while (1)

-//     {

-//       Sleep (500);

-//       msg = new CString;

-//       SYSTEMTIME curtime;

-//       GetLocalTime (&curtime);

-//       msg->Format (TEXT ("Time: %02d:%02d:%02d.%03d"), curtime.wHour,

-//                    curtime.wMinute, curtime.wSecond,

-//                    curtime.wMilliseconds);

-//       ACE_DEBUG ((LM_DEBUG, TEXT ("(%P|%t) Test logging: %s\n"), *msg));

-//       delete msg;

-//     }

-//   return 0;

-}

-                 

-  

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterDlg dialog

-

-CWinAdapterDlg::CWinAdapterDlg(CWnd* pParent /*=NULL*/)

-	: CDialog(CWinAdapterDlg::IDD, pParent)

-{

-	//{{AFX_DATA_INIT(CWinAdapterDlg)

-		// NOTE: the ClassWizard will add member initialization here

-	//}}AFX_DATA_INIT

-	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32

-	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

-}

-

-void CWinAdapterDlg::DoDataExchange(CDataExchange* pDX)

-{

-	CDialog::DoDataExchange(pDX);

-	//{{AFX_DATA_MAP(CWinAdapterDlg)

-		// NOTE: the ClassWizard will add DDX and DDV calls here

-	//}}AFX_DATA_MAP

-}

-

-BEGIN_MESSAGE_MAP(CWinAdapterDlg, CDialog)

-	//{{AFX_MSG_MAP(CWinAdapterDlg)

-	ON_WM_TIMER()

-	ON_BN_CLICKED(IDC_START, OnStart)

-	//}}AFX_MSG_MAP

-END_MESSAGE_MAP()

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterDlg message handlers

-

-BOOL CWinAdapterDlg::OnInitDialog()

-{

-  CDialog::OnInitDialog();

-

-  // Set the icon for this dialog.  The framework does this automatically

-  //  when the application's main window is not a dialog

-  SetIcon(m_hIcon, TRUE);       // Set big icon

-  SetIcon(m_hIcon, FALSE);      // Set small icon

-	

-  this->SetDlgItemText (IDC_TEXT_DISP, 

-                        TEXT ("A really long string that will hopefully show whether this kind of string can be fit and wrap around a simple TEXT object within a Dialog box.  If this doesn't work, we'll see what to do next."));

-  CenterWindow(GetDesktopWindow()); // center to the hpc screen

-

-  this->ace.set_window (this, NC_ACE_NOTIFY, INC_ACE_LOGMSG);

-  this->ace.set_self_default ();

-  host_window_ = this;

-  return TRUE;  // return TRUE  unless you set the focus to a control

-}

-

-void CWinAdapterDlg::OnTimer(UINT nIDEvent) 

-{

-//   CWnd *text = this->GetDlgItem (IDC_TEXT_DISP);

-//   text->ModifyStyle (WS_VISIBLE, SS_CENTER, 0);

-//   this->UpdateWindow ();

-}

-

-BOOL CWinAdapterDlg::OnCommand(WPARAM wParam, LPARAM lParam) 

-{

-  static BOOL got_cmd = FALSE;

-  int notify = HIBYTE (wParam);

-  int id = LOBYTE (wParam);

-

-  if (notify == NC_ACE_NOTIFY && id == INC_ACE_LOGMSG)

-    {

-      CString *msg = (CString *) lParam ;

-      this->SetDlgItemText (IDC_TEXT_DISP, *msg);

-      delete msg;

-      return TRUE;

-    }

-  return CDialog::OnCommand(wParam, lParam);

-}

-

-void CWinAdapterDlg::OnStart() 

-{

-  static BOOL once = FALSE;

-

-  if (! once)

-    {

-      CString cmdline;

-      this->GetDlgItemText (IDC_CMDLINE, cmdline);

-      AfxBeginThread (worker, (void *) (LPCTSTR) cmdline);

-      this->SetDlgItemText (IDC_START, TEXT ("Running..."));

-      once = TRUE;

-    }

-}

diff --git a/WindozeCE/WinAdapterDlg.h b/WindozeCE/WinAdapterDlg.h
deleted file mode 100644
index 85ed45d6429..00000000000
--- a/WindozeCE/WinAdapterDlg.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$

-// WinAdapterDlg.h : header file

-//

-

-#include "ace/OS.h"

-

-#if !defined(AFX_WinAdapterDLG_H__5088F848_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)

-#define AFX_WinAdapterDLG_H__5088F848_CE8B_11D1_9621_0040054CF0F0__INCLUDED_

-

-#if _MSC_VER >= 1000

-#pragma once

-#endif // _MSC_VER >= 1000

-

-/////////////////////////////////////////////////////////////////////////////

-// CWinAdapterDlg dialog

-

-class CWinAdapterDlg : public CDialog

-{

-  // Construction

-public:

-  CWinAdapterDlg(CWnd* pParent = NULL);	// standard constructor

-

-  // Dialog Data

-  //{{AFX_DATA(CWinAdapterDlg)

-  enum { IDD = IDD_WinAdapter_DIALOG };

-  // NOTE: the ClassWizard will add data members here

-  //}}AFX_DATA

-  

-  // ClassWizard generated virtual function overrides

-  //{{AFX_VIRTUAL(CWinAdapterDlg)

-protected:

-  virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support

-  virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);

-  //}}AFX_VIRTUAL

-

-  // Implementation

-protected:

-  HICON m_hIcon;

-

-  ACE_CE_Bridge ace;

-

-  // Generated message map functions

-  //{{AFX_MSG(CWinAdapterDlg)

-  virtual BOOL OnInitDialog();

-  afx_msg void OnTimer(UINT nIDEvent);

-	afx_msg void OnStart();

-	//}}AFX_MSG

-  DECLARE_MESSAGE_MAP()

-};

-

-//{{AFX_INSERT_LOCATION}}

-// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

-

-#endif // !defined(AFX_WinAdapterDLG_H__5088F848_CE8B_11D1_9621_0040054CF0F0__INCLUDED_)

diff --git a/WindozeCE/res/WinAdapter.ico b/WindozeCE/res/WinAdapter.ico
deleted file mode 100644
index b9204c1c06d..00000000000
--- a/WindozeCE/res/WinAdapter.ico
+++ /dev/null
diff --git a/WindozeCE/res/WinAdapter.rc2 b/WindozeCE/res/WinAdapter.rc2
deleted file mode 100644
index bbdbdf0135f..00000000000
--- a/WindozeCE/res/WinAdapter.rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-//

-// WinAdapter.RC2 - resources Microsoft Visual C++ does not edit directly

-//

-

-#ifdef APSTUDIO_INVOKED

-	#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-// Add manually edited resources here...

-

-/////////////////////////////////////////////////////////////////////////////

diff --git a/WindozeCE/resource.h b/WindozeCE/resource.h
deleted file mode 100644
index 994bd3e4f6c..00000000000
--- a/WindozeCE/resource.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by WinAdapter.rc
-//
-#define IDD_WinAdapter_DIALOG           102
-#define IDR_MAINFRAME                   128
-#define IDC_TEXT_DISP                   1001
-#define IDC_CMDLINE                     1005
-#define IDC_START                       1007
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        129
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1008
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/WindozeCE/windoze.cfg b/WindozeCE/windoze.cfg
deleted file mode 100644
index 80c479b3205..00000000000
--- a/WindozeCE/windoze.cfg
+++ /dev/null
@@ -1 +0,0 @@
-WCE_CFG=WCE200;
\ No newline at end of file
diff --git a/WindozeCE/windoze.dsp b/WindozeCE/windoze.dsp
deleted file mode 100644
index dd0b416b1bb..00000000000
--- a/WindozeCE/windoze.dsp
+++ /dev/null
@@ -1,413 +0,0 @@
-# Microsoft Developer Studio Project File - Name="windoez" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (WCE SH) Static Library" 0x0904

-# TARGTYPE "Win32 (WCE MIPS) Static Library" 0x0a04

-# TARGTYPE "Win32 (WCE x86em) Static Library" 0x0b04

-

-CFG=windoez - Win32 (WCE x86em) Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "windoez.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "windoez.mak" CFG="windoez - Win32 (WCE x86em) Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "windoez - Win32 (WCE x86em) Release" (based on\

- "Win32 (WCE x86em) Static Library")

-!MESSAGE "windoez - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Static Library")

-!MESSAGE "windoez - Win32 (WCE MIPS) Release" (based on\

- "Win32 (WCE MIPS) Static Library")

-!MESSAGE "windoez - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Static Library")

-!MESSAGE "windoez - Win32 (WCE SH) Release" (based on\

- "Win32 (WCE SH) Static Library")

-!MESSAGE "windoez - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "windoez - Win32 (WCE x86em) Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "x86emRel"

-# PROP BASE Intermediate_Dir "x86emRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "x86emRel"

-# PROP Intermediate_Dir "x86emRel"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /O2 /D "UNDER_CE" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=200 /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

-# ADD CPP /nologo /MT /W3 /O2 /I "..\\" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /YX /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE x86em) Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "x86emDbg"

-# PROP BASE Intermediate_Dir "x86emDbg"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "x86emDbg"

-# PROP Intermediate_Dir "x86emDbg"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Z7 /Od /D "UNDER_CE" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=200 /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

-# ADD CPP /nologo /MTd /W3 /Z7 /Od /I "..\\" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /YX /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "WMIPSRel"

-# PROP BASE Intermediate_Dir "WMIPSRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "WMIPSRel"

-# PROP Intermediate_Dir "WMIPSRel"

-# PROP Target_Dir ""

-CPP=clmips.exe

-# ADD BASE CPP /nologo /ML /W3 /O2 /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /QMRWCE /c

-# ADD CPP /nologo /MT /W3 /O2 /I "..\\" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /YX /QMRWCE /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "WMIPSDbg"

-# PROP BASE Intermediate_Dir "WMIPSDbg"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "WMIPSDbg"

-# PROP Intermediate_Dir "WMIPSDbg"

-# PROP Target_Dir ""

-CPP=clmips.exe

-# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /YX /QMRWCE /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "WCESHRel"

-# PROP BASE Intermediate_Dir "WCESHRel"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "WCESHRel"

-# PROP Intermediate_Dir "WCESHRel"

-# PROP Target_Dir ""

-CPP=shcl.exe

-# ADD BASE CPP /nologo /ML /W3 /O2 /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /c

-# ADD CPP /nologo /MT /W3 /O2 /I "..\\" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /YX /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "WCESHDbg"

-# PROP BASE Intermediate_Dir "WCESHDbg"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "WCESHDbg"

-# PROP Intermediate_Dir "WCESHDbg"

-# PROP Target_Dir ""

-CPP=shcl.exe

-# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "DEBUG" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /D "DEBUG" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_MFC=1 /D ACE_HAS_WINCE=1 /D "_AFXDLL" /c

-# SUBTRACT CPP /Gy /YX

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "windoez - Win32 (WCE x86em) Release"

-# Name "windoez - Win32 (WCE x86em) Debug"

-# Name "windoez - Win32 (WCE MIPS) Release"

-# Name "windoez - Win32 (WCE MIPS) Debug"

-# Name "windoez - Win32 (WCE SH) Release"

-# Name "windoez - Win32 (WCE SH) Debug"

-# Begin Source File

-

-SOURCE=.\ACEApp.cpp

-

-!IF  "$(CFG)" == "windoez - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE x86em) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Debug"

-

-DEP_CPP_ACEAP=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\Basic_Types.h"\

-	"..\ace\Basic_Types.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config-WinCE.h"\

-	"..\ace\config.h"\

-	"..\ace\inc_user_config.h"\

-	"..\ace\iosfwd.h"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\streams.h"\

-	"..\ace\sys_conf.h"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\ACEApp.h"\

-	".\stdafx.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\StdAfx.cpp

-

-!IF  "$(CFG)" == "windoez - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE x86em) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Debug"

-

-DEP_CPP_STDAF=\

-	".\stdafx.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WinAdapter.cpp

-

-!IF  "$(CFG)" == "windoez - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE x86em) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Debug"

-

-DEP_CPP_WINAD=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\Basic_Types.h"\

-	"..\ace\Basic_Types.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config-WinCE.h"\

-	"..\ace\config.h"\

-	"..\ace\inc_user_config.h"\

-	"..\ace\iosfwd.h"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\streams.h"\

-	"..\ace\sys_conf.h"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\ACEApp.h"\

-	".\stdafx.h"\

-	".\WinAdapter.h"\

-	".\WinAdapterDlg.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WinAdapter.rc

-# End Source File

-# Begin Source File

-

-SOURCE=.\WinAdapterDlg.cpp

-

-!IF  "$(CFG)" == "windoez - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE x86em) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Release"

-

-!ELSEIF  "$(CFG)" == "windoez - Win32 (WCE SH) Debug"

-

-DEP_CPP_WINADA=\

-	"..\ace\ACE.h"\

-	"..\ace\ACE.i"\

-	"..\ace\ARGV.h"\

-	"..\ace\ARGV.i"\

-	"..\ace\Atomic_Op.i"\

-	"..\ace\Auto_Ptr.cpp"\

-	"..\ace\Auto_Ptr.h"\

-	"..\ace\Auto_Ptr.i"\

-	"..\ace\Basic_Types.h"\

-	"..\ace\Basic_Types.i"\

-	"..\ace\config-win32-common.h"\

-	"..\ace\config-win32.h"\

-	"..\ace\config-WinCE.h"\

-	"..\ace\config.h"\

-	"..\ace\Containers.cpp"\

-	"..\ace\Containers.h"\

-	"..\ace\Containers.i"\

-	"..\ace\Event_Handler.h"\

-	"..\ace\Event_Handler.i"\

-	"..\ace\Free_List.cpp"\

-	"..\ace\Free_List.h"\

-	"..\ace\Free_List.i"\

-	"..\ace\inc_user_config.h"\

-	"..\ace\iosfwd.h"\

-	"..\ace\Log_Msg.h"\

-	"..\ace\Log_Priority.h"\

-	"..\ace\Log_Record.h"\

-	"..\ace\Log_Record.i"\

-	"..\ace\Malloc.h"\

-	"..\ace\Malloc.i"\

-	"..\ace\Malloc_T.cpp"\

-	"..\ace\Malloc_T.h"\

-	"..\ace\Malloc_T.i"\

-	"..\ace\Managed_Object.cpp"\

-	"..\ace\Managed_Object.h"\

-	"..\ace\Managed_Object.i"\

-	"..\ace\Mem_Map.h"\

-	"..\ace\Mem_Map.i"\

-	"..\ace\Memory_Pool.h"\

-	"..\ace\Memory_Pool.i"\

-	"..\ace\Object_Manager.h"\

-	"..\ace\Object_Manager.i"\

-	"..\ace\OS.h"\

-	"..\ace\OS.i"\

-	"..\ace\Signal.h"\

-	"..\ace\Signal.i"\

-	"..\ace\SString.h"\

-	"..\ace\SString.i"\

-	"..\ace\streams.h"\

-	"..\ace\SV_Semaphore_Complex.h"\

-	"..\ace\SV_Semaphore_Complex.i"\

-	"..\ace\SV_Semaphore_Simple.h"\

-	"..\ace\SV_Semaphore_Simple.i"\

-	"..\ace\Synch.h"\

-	"..\ace\Synch.i"\

-	"..\ace\Synch_T.cpp"\

-	"..\ace\Synch_T.h"\

-	"..\ace\Synch_T.i"\

-	"..\ace\sys_conf.h"\

-	"..\ace\Thread.h"\

-	"..\ace\Thread.i"\

-	"..\ace\Trace.h"\

-	"..\ace\Version.h"\

-	"..\ace\ws2tcpip.h"\

-	".\ACEApp.h"\

-	".\stdafx.h"\

-	".\WinAdapter.h"\

-	".\WinAdapterDlg.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# End Target

-# End Project

diff --git a/WindozeCE/windoze.dsw b/WindozeCE/windoze.dsw
deleted file mode 100644
index 22278507ca8..00000000000
--- a/WindozeCE/windoze.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "windoez"=.\windoez.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/apps/Gateway/Gateway/Channel.cpp b/apps/Gateway/Gateway/Channel.cpp
deleted file mode 100644
index 99699a6ee87..00000000000
--- a/apps/Gateway/Gateway/Channel.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-// $Id$
-
-#include "Routing_Entry.h"
-#include "Channel_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MUTEX
-
-// = The total number of bytes sent/received on this channel.
-size_t 
-Channel::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-Channel::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-Channel::Channel (ROUTING_TABLE *rt,
-                  Channel_Connector *cc,
-		  ACE_Thread_Manager *thr_mgr,
-		  int socket_queue_size)
-  : ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH> (thr_mgr),
-    routing_table_ (rt),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (Channel::IDLE),
-    connector_ (cc),
-    timeout_ (1),
-    max_timeout_ (Channel::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-Channel::active (int a)
-{
-  this->state (a == 0 ? Channel::IDLE : Channel::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-Channel::active (void)
-{
-  return this->state () == Channel::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-Channel::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-Channel::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-Channel::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-Channel::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-Channel::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-Channel::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-Channel::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect Channel %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-Channel::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of Channel %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, 
-						   this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the Channel object.
-
-int
-Channel::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down Channel %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-Channel::state (Channel::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-Channel::initialize_connection (void)
-{
-  this->state_ = Channel::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_ROUTING_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), -1);
-#endif /* ASSIGN_ROUTING_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-Channel::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'I' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific Channel.
-
-int
-Channel::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Channel's fd = %d\n", this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-Channel::State
-Channel::state (void)
-{
-  return this->state_;
-}
-
-void
-Channel::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-Channel::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-Channel::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-Channel::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-Channel::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the routing table pointer.
-
-Output_Channel::Output_Channel (ROUTING_TABLE *rt,
-                                Channel_Connector *cc,
-				ACE_Thread_Manager *thr_mgr,
-				int socket_queue_size)
-  : Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'O';
-  this->msg_queue ()->high_water_mark (Output_Channel::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the Channel as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Output_Channel::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (Channel::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output Channel %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-int 
-Output_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Output_Channel!\n"), -1);
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-queued at the *front* of
-// the Message_List.
-
-int
-Output_Channel::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (Channel::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-int
-Output_Channel::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;    
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the buffer.
-      // Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending a message when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Output_Channel::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  int           status = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) in handle_output on handle %d\n", this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire message (or we did not fail
-          // due to EWOULDBLOCK) then check if there are more messages on the Message_List.
-          // If there aren't, tell the ACE_Reactor not to notify us anymore (at least
-          // until there are new messages queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may queue if necessary).
-
-int 
-Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control 
-    // then just enqueue and return.
-    return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the routing table pointer and the connector pointer.
-
-Input_Channel::Input_Channel (ROUTING_TABLE *rt,
-                              Channel_Connector *cc,
-			      ACE_Thread_Manager *thr_mgr,
-			      int socket_queue_size)
-  : msg_frag_ (0), 
-    Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'I';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-int 
-Input_Channel::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) put should not be called on Input_Channel!\n"), -1);
-}
-
-int 
-Input_Channel::svc (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "(%t) svc should not be called on Input_Channel!\n"), -1);
-}
-
-// Receive a Peer message from peerd.  Handles fragmentation.
-//
-// The routing message returned from recv_peer consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the message structure.
-
-int
-Input_Channel::recv_peer (ACE_Message_Block *&route_addr)
-{ 
-  Peer_Message *peer_msg;
-  size_t len;
-  ssize_t n = 0;
-  ssize_t m = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Peer_Message)), 
-		    -1);
-
-  peer_msg = (Peer_Message *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Peer_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, "attempted to read %d\n", header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire message.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof peer_msg->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  // Try to receive the remainder of the message
-
-  switch (m = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole message.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the message.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the message.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate a routing message header and chain the data portion 
-          // onto its continuation field.
-          ACE_NEW_RETURN (route_addr,
-			  ACE_Message_Block (sizeof (Peer_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Peer_Addr peer_addr (this->id (), peer_msg->header_.routing_id_, 0);
-          // Copy the routing address from the Peer_Message into routing_addr.
-          route_addr->copy ((char *) &peer_addr, sizeof (Peer_Addr));
-
-          // Reset the pointer to indicate we've got an entire message.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 peer_addr.conn_id_, peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		 peer_msg->header_.len_, peer_msg->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 peer_msg->header_.routing_id_, peer_msg->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the 
-// gatewayd, as well as stdio).
-
-int 
-Input_Channel::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *route_addr = 0;
-
-  switch (this->recv_peer (route_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (Channel::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input Channel %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (Channel::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input Channel %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->route_message (route_addr);
-    }
-}
-
-// Route a message to its appropriate destination.
-
-int
-Input_Channel::route_message (ACE_Message_Block *route_addr)
-{
-  // We got a valid message, so determine its virtual routing id,
-  // which is stored in the first of the two message blocks chained together.
-	
-  Peer_Addr *routing_key = (Peer_Addr *) route_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = route_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Routing_Entry *re = 0;
-	
-  if (this->routing_table_->find (*routing_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this message currently\n"));
-	    
-      else		// There are destinations, so forward the message.
-	{
-	  Routing_Entry::ENTRY_SET *esp = re->destinations ();
-	  Routing_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (Channel **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the message portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping messages"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete route_addr;
-	  return 0;
-	}
-    }
-  delete route_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     routing_key->conn_id_, routing_key->logical_id_, routing_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Iterator<Peer_Addr, Routing_Entry *, MUTEX>;
-template class ACE_Map_Entry<Peer_Addr, Routing_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Channel.h b/apps/Gateway/Gateway/Channel.h
deleted file mode 100644
index 339716bc55a..00000000000
--- a/apps/Gateway/Gateway/Channel.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL)
-#define _CHANNEL
-
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Routing_Table.h"
-#include "Routing_Entry.h"
-#include "Peer_Message.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MUTEX;
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#else /* ACE_HAS_THREADS */
-
-// Select communication mechanisms.
-#if 0 // defined (ACE_HAS_TLI)
-// Note that due to inconsistencies between the semantics of sockets
-// and TLI with respect to establishing non-blocking connections it's
-// not a good idea to use TLI...
-#include "ace/TLI_Connector.h"
-#define CHANNEL_PEER_STREAM ACE_TLI_STREAM
-#define CHANNEL_PEER_CONNECTOR ACE_TLI_CONNECTOR 
-#else
-#define CHANNEL_PEER_STREAM ACE_SOCK_STREAM 
-#define CHANNEL_PEER_CONNECTOR ACE_SOCK_CONNECTOR 
-#endif /* 0 */
-
-// Note that we only need to make the ACE_Task thread-safe if we
-// are using the multi-threaded Thr_Output_Channel...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH ACE_MT_SYNCH
-#else
-#define SYNCH ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Input_Channel...
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MUTEX;
-#else
-typedef ACE_Null_Mutex MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// Typedef for the routing table.
-typedef Routing_Table<Peer_Addr, Routing_Entry, MUTEX>
-	ROUTING_TABLE;
-
-// Forward declaration.
-class Channel_Connector;
-
-class Channel : public ACE_Svc_Handler<CHANNEL_PEER_STREAM, SYNCH>
-  // = TITLE
-  //    Channel contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The Channel classes process messages sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. Channel_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, Channel_Connector
-  //    creates an Channel object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Channels are used by gatewayd
-  //    that to receive, route, and forward messages from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  Channel (ROUTING_TABLE *, 
-	   Channel_Connector *, 
-	   ACE_Thread_Manager * = 0,
-	   int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded Channel (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the Channel.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // Channel is established and active.
-    DISCONNECTING, // Channel is in the process of connecting.
-    FAILED	   // Channel has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get Channel activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based Channel reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform Channel termination.
-
-  ROUTING_TABLE *routing_table_;
-  // Pointer to table that maps a Peer_Addr
-  // to a Set of Channel *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  Channel_Connector *connector_;
-  // Back pointer to Channel_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Input_Channel : public Channel
-  // = TITLE
-  //     Handle reception of Peer messages arriving as events.
-{
-public:
-  Input_Channel (ROUTING_TABLE *, 
-		 Channel_Connector *, 
-		 ACE_Thread_Manager * = 0,
-		 int socket_queue_size = 0);
-  // Constructor sets the routing table pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer messages.
-
-protected:
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive a message from a peer.
-
-  int route_message (ACE_Message_Block *);
-  // Action that receives messages from peerd.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from
-  // peers.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-
-private:
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);  
-  // This methods should not be called to handle input.
-};
-
-class Output_Channel : public Channel
-  // = TITLE
-  //     Handle transmission of messages to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Output_Channel (ROUTING_TABLE *, 
-		  Channel_Connector *, 
-		  ACE_Thread_Manager * = 0,
-		  int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from peer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // This method is not used since we are single-threaded.
-};
-
-#endif /* _CHANNEL */
diff --git a/apps/Gateway/Gateway/Channel_Connector.cpp b/apps/Gateway/Gateway/Channel_Connector.cpp
deleted file mode 100644
index a5394e8b013..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "Channel_Connector.h"
-// $Id$
-
-
-Channel_Connector::Channel_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-Channel_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  Channel *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the Channel.
-
-int
-Channel_Connector::initiate_connection (Channel *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (Channel::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (Channel::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (Channel::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (Channel::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/Channel_Connector.h b/apps/Gateway/Gateway/Channel_Connector.h
deleted file mode 100644
index 3e27f37355a..00000000000
--- a/apps/Gateway/Gateway/Channel_Connector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Channel_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CHANNEL_CONNECTOR)
-#define _CHANNEL_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_Channel.h"
-
-class Channel_Connector : public ACE_Connector<Channel, CHANNEL_PEER_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new Channel object to do the dirty work...
-{
-public:
-  Channel_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the Channel.
-  int initiate_connection (Channel *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _CHANNEL_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Concurrency_Strategies.h b/apps/Gateway/Gateway/Concurrency_Strategies.h
deleted file mode 100644
index 28e59a4b2e6..00000000000
--- a/apps/Gateway/Gateway/Concurrency_Strategies.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Concurrency_strategies.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONCURRENCY_STRATEGIES)
-#define _CONCURRENCY_STRATEGIES
-
-#include "ace/Synch.h"
-
-// The following typedefs are used in order to parameterize the
-// synchronization policies without changing the source code!
-
-// If we don't have threads then use the single-threaded synchronization.
-#if !defined (ACE_HAS_THREADS)
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-typedef ACE_Null_Mutex MAP_MUTEX;
-#else /* ACE_HAS_THREADS */
-
-// Note that we only need to make the ACE_Task thread-safe if we are
-// using the multi-threaded Thr_Consumer_Proxy...
-#if defined (USE_OUTPUT_MT) 
-#define SYNCH_STRATEGY ACE_MT_SYNCH
-#else
-#define SYNCH_STRATEGY ACE_NULL_SYNCH
-#endif /* USE_OUTPUT_MT || USE_INPUT_MT */
-
-// Note that we only need to make the ACE_Map_Manager thread-safe if
-// we are using the multi-threaded Thr_Supplier_Proxy.  In this
-// case, we use an RW_Mutex since we'll lookup Consumers far more
-// often than we'll update them.
-#if defined (USE_INPUT_MT)
-typedef ACE_RW_Mutex MAP_MUTEX;
-#else
-typedef ACE_Null_Mutex MAP_MUTEX;
-#endif /* USE_INPUT_MT */
-#endif /* ACE_HAS_THREADS */
-
-// = Forward decls
-class Thr_Consumer_Proxy;
-class Thr_Supplier_Proxy;
-class Consumer_Proxy;
-class Supplier_Proxy;
-
-#if defined (ACE_HAS_THREADS) && (defined (USE_OUTPUT_MT) || defined (USE_INPUT_MT))
-#if defined (USE_OUTPUT_MT)
-typedef Thr_Consumer_Proxy CONSUMER_PROXY;
-#else
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* USE_OUTPUT_MT */
-
-#if defined (USE_INPUT_MT)
-typedef Thr_Supplier_Proxy SUPPLIER_PROXY;
-#else
-typedef Supplier_Proxy SUPPLIER_PROXY;
-#endif /* USE_INPUT_MT */
-#else
-// Instantiate a non-multi-threaded Gateway.
-typedef Supplier_Proxy SUPPLIER_PROXY;
-typedef Consumer_Proxy CONSUMER_PROXY;
-#endif /* ACE_HAS_THREADS */
-
-#endif /* _CONCURRENCY_STRATEGIES */
diff --git a/apps/Gateway/Gateway/Consumer_Entry.cpp b/apps/Gateway/Gateway/Consumer_Entry.cpp
deleted file mode 100644
index c3dcd96ebbf..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Defines an entry in the Consumer Map.
-// $Id$
-
-#include "Consumer_Entry.h"
-
-Consumer_Entry::Consumer_Entry (void)
-{
-  ACE_NEW (this->destinations_, Consumer_Entry::ENTRY_SET);
-}
-
-Consumer_Entry::~Consumer_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Consumer_Entry::ENTRY_SET *
-Consumer_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Consumer_Entry::destinations (Consumer_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
diff --git a/apps/Gateway/Gateway/Consumer_Entry.h b/apps/Gateway/Gateway/Consumer_Entry.h
deleted file mode 100644
index fe502991514..00000000000
--- a/apps/Gateway/Gateway/Consumer_Entry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class IO_Handler;
-
-class Consumer_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Consumer_Map.
-public:
-  Consumer_Entry (void);
-  ~Consumer_Entry (void);
-
-  typedef ACE_Unbounded_Set<IO_Handler *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<IO_Handler *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Consumer_Map.cpp b/apps/Gateway/Gateway/Consumer_Map.cpp
deleted file mode 100644
index 6d16601f949..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#if !defined (_CONSUMER_MAP_C)
-#define _CONSUMER_MAP_C
-
-#include "Consumer_Map.h"
-
-// Bind the Event_Addr to the INT_ID.
-
-int
-Consumer_Map::bind (Event_Addr event_addr, 
-		    Consumer_Entry *Consumer_Entry)
-{
-  return this->map_.bind (event_addr, Consumer_Entry);
-}
-
-// Find the Consumer_Entry corresponding to the Event_Addr.
-
-int
-Consumer_Map::find (Event_Addr event_addr, 
-		    Consumer_Entry *&Consumer_Entry)
-{
-  return this->map_.find (event_addr, Consumer_Entry);
-}
-
-// Unbind (remove) the Event_Addr from the map.
-
-int
-Consumer_Map::unbind (Event_Addr event_addr)
-{
-  return this->map_.unbind (event_addr);
-}
-
-Consumer_Map_Iterator::Consumer_Map_Iterator (Consumer_Map &rt)
-  : map_iter_ (rt.map_)
-{
-}
-
-int
-Consumer_Map_Iterator::next (Consumer_Entry *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<Event_Addr, Consumer_Entry *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-int
-Consumer_Map_Iterator::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _CONSUMER_MAP_C */
diff --git a/apps/Gateway/Gateway/Consumer_Map.h b/apps/Gateway/Gateway/Consumer_Map.h
deleted file mode 100644
index fd392afaf6e..00000000000
--- a/apps/Gateway/Gateway/Consumer_Map.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Consumer_Map.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_CONSUMER_MAP_H)
-#define _CONSUMER_MAP_H
-
-#include "ace/Map_Manager.h"
-#include "Concurrency_Strategies.h"
-#include "Event.h"
-#include "Consumer_Entry.h"
-
-class Consumer_Map
-{
-  // = TITLE
-  //    Define a generic consumer map based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    This class makes it easier to use the Map_Manager.
-public:
-  int bind (Event_Addr event, Consumer_Entry *Consumer_Entry);
-  // Associate Event with the Consumer_Entry.
-
-  int find (Event_Addr event, Consumer_Entry *&Consumer_Entry);
-  // Break any association of EXID.
-
-  int unbind (Event_Addr event);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_;
-  // Map that associates Event Addrs (external ids) with Consumer_Entry *'s
-  // <internal IDs>.
-};
-
-class Consumer_Map_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Consumer Map.
-public:
-  Consumer_Map_Iterator (Consumer_Map &mm);
-  int next (Consumer_Entry *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX> map_iter_;
-  // Map we are iterating over.
-};
-#endif /* _CONSUMER_MAP_H */
diff --git a/apps/Gateway/Gateway/Dispatch_Set.h b/apps/Gateway/Gateway/Dispatch_Set.h
deleted file mode 100644
index a867f1ca5ff..00000000000
--- a/apps/Gateway/Gateway/Dispatch_Set.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Dispatch_Set.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_DISPATCH_SET)
-#define _DISPATCH_SET
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Proxy_Handler;
-
-typedef ACE_Unbounded_Set<Proxy_Handler *> Dispatch_Set;
-typedef ACE_Unbounded_Set_Iterator<Proxy_Handler *> Dispatch_Set_Iterator;
-
-#endif /* _DISPATCH_SET */
diff --git a/apps/Gateway/Gateway/IO_Handler.cpp b/apps/Gateway/Gateway/IO_Handler.cpp
deleted file mode 100644
index ba1b355b3ba..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-// $Id$
-
-#include "Consumer_Entry.h"
-#include "IO_Handler_Connector.h"
-
-// Convenient short-hands.
-#define CO CONDITION
-#define MU MAP_MUTEX
-
-// The total number of bytes sent/received on this channel.
-
-size_t 
-IO_Handler::total_bytes (void)
-{
-  return this->total_bytes_;
-}
-
-void 
-IO_Handler::total_bytes (size_t bytes)
-{
-  this->total_bytes_ += bytes;
-}
-
-IO_Handler::IO_Handler (Consumer_Map *consumer_map,
-			IO_Handler_Connector *ioc,
-			ACE_Thread_Manager *thr_mgr,
-			int socket_queue_size)
-  : ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY> (thr_mgr),
-    consumer_map_ (consumer_map),
-    id_ (-1),
-    total_bytes_ (0),
-    state_ (IO_Handler::IDLE),
-    connector_ (ioc),
-    timeout_ (1),
-    max_timeout_ (IO_Handler::MAX_RETRY_TIMEOUT), 
-    socket_queue_size_ (socket_queue_size)
-{
-}
-
-// Set the associated channel.
-
-void
-IO_Handler::active (int a)
-{
-  this->state (a == 0 ? IO_Handler::IDLE : IO_Handler::ESTABLISHED);
-}
-
-// Get the associated channel.
-
-int
-IO_Handler::active (void)
-{
-  return this->state () == IO_Handler::ESTABLISHED;
-}
-
-// Set the direction.
-
-void
-IO_Handler::direction (char d)
-{
-  this->direction_ = d;
-}
-
-// Get the direction.
-
-char
-IO_Handler::direction (void)
-{
-  return this->direction_;
-}
-
-// Sets the timeout delay.
-
-void
-IO_Handler::timeout (int to)
-{
-  if (to > this->max_timeout_)
-    to = this->max_timeout_;
-
-  this->timeout_ = to;
-}
-
-// Recalculate the current retry timeout delay using exponential
-// backoff.  Returns the original timeout (i.e., before the
-// recalculation).
-
-int
-IO_Handler::timeout (void)
-{
-  int old_timeout = this->timeout_;
-  this->timeout_ *= 2;
-  
-  if (this->timeout_ > this->max_timeout_)
-    this->timeout_ = this->max_timeout_;
-
-  return old_timeout;
-}
-
-// Sets the max timeout delay.
-
-void
-IO_Handler::max_timeout (int mto)
-{
-  this->max_timeout_ = mto;
-}
-
-// Gets the max timeout delay.
-
-int
-IO_Handler::max_timeout (void)
-{
-  return this->max_timeout_;
-}
-
-// Restart connection asynchronously when timeout occurs.
-
-int
-IO_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	     "(%t) attempting to reconnect IO_Handler %d with timeout = %d\n", 
-             this->id (), this->timeout_));
-  return this->connector_->initiate_connection (this, ACE_Synch_Options::asynch);
-}
-
-// Restart connection (blocking_semantics dicates whether we
-// restart synchronously or asynchronously).
-
-int
-IO_Handler::reinitiate_connection (void)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Make sure to close down peer to reclaim descriptor.
-      this->peer ().close ();
-
-#if 0
-//      if (this->state () == FAILED)
-//        {
-      // Reinitiate timeout to improve reconnection time.
-//          this->timeout (1);
-#endif
-      
-      ACE_DEBUG ((LM_DEBUG, 
-		 "(%t) scheduling reinitiation of IO_Handler %d\n",
-		 this->id ()));
-
-      // Reschedule ourselves to try and connect again.
-      if (ACE_Service_Config::reactor ()->schedule_timer 
-	  (this, 0, this->timeout ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			  "schedule_timer"), -1);
-    }
-  return 0;
-}
-
-// Handle shutdown of the IO_Handler object.
-
-int
-IO_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) shutting down IO_Handler %d on handle %d\n", 
-	     this->id (), this->get_handle ()));
-  
-  return this->reinitiate_connection ();
-}
-
-// Set the state of the channel.
-
-void
-IO_Handler::state (IO_Handler::State s)
-{
-  this->state_ = s;
-}
-
-// Perform the first-time initiation of a connection to the peer.
-
-int
-IO_Handler::initialize_connection (void)
-{
-  this->state_ = IO_Handler::ESTABLISHED;
-
-  // Restart the timeout to 1.
-  this->timeout (1);
-
-#if defined (ASSIGN_SUPPLIER_ID)
-  // Action that sends the route id to the peerd.
-
-  CONN_ID id = htons (this->id ());
-
-  ssize_t n = this->peer ().send ((const void *) &id, sizeof id);
-
-  if (n != sizeof id)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      n == 0 ? "gatewayd has closed down unexpectedly" : "send"), 
-		      -1);
-#endif /* ASSIGN_SUPPLIER_ID */
-  return 0;
-}
-
-// Set the size of the socket queue.
-
-void
-IO_Handler::socket_queue_size (void)
-{
-  if (this->socket_queue_size_ > 0)
-    {
-      int option = this->direction_ == 'S' ? SO_RCVBUF : SO_SNDBUF;
-
-      if (this->peer ().set_option (SOL_SOCKET, option,
-				  &this->socket_queue_size_, sizeof (int)) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "set_option"));
-    }
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that
-// delegates control to our application-specific IO_Handler.
-
-int
-IO_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) IO_Handler's fd = %d\n", 
-	      this->peer ().get_handle ()));
-
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn on non-blocking I/O.
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call down to the base class to activate and register this handler.
-  if (this->ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "activate"), -1);
-
-  return this->initialize_connection ();
-}
-
-// Return the current state of the channel.
-
-IO_Handler::State
-IO_Handler::state (void)
-{
-  return this->state_;
-}
-
-void
-IO_Handler::id (CONN_ID id)
-{
-  this->id_ = id;
-}
-
-CONN_ID
-IO_Handler::id (void)
-{
-  return this->id_;
-}
-
-// Set the peer's address information.
-int 
-IO_Handler::bind (const ACE_INET_Addr &remote_addr, 
-	       const ACE_INET_Addr &local_addr,
-	       CONN_ID id)
-{
-  this->remote_addr_ = remote_addr;
-  this->local_addr_ = local_addr;
-  this->id_ = id;
-  return 0;
-}
-
-ACE_INET_Addr &
-IO_Handler::remote_addr (void)
-{
-  return this->remote_addr_;
-}
-
-ACE_INET_Addr &
-IO_Handler::local_addr (void)
-{
-  return this->local_addr_;
-}
-
-// Constructor sets the consumer map pointer.
-
-Consumer_Handler::Consumer_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'C';
-  this->msg_queue ()->high_water_mark (Consumer_Handler::QUEUE_SIZE);
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method simply marks the IO_Handler as 
-// having failed so that handle_close () can reconnect.
-
-int 
-Consumer_Handler::handle_input (ACE_HANDLE)
-{
-  char buf[1];
-
-  this->state (IO_Handler::FAILED);
-
-  switch (this->peer ().recv (buf, sizeof buf))
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has failed unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer has shutdown unexpectedly for Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-			"(%t) Peer is sending input on Output IO_Handler %d\n",
-			this->id ()), -1);
-      /* NOTREACHED */
-    }
-}
-
-// Perform a non-blocking put() of event MB.  If we are unable to
-// send the entire event  the remainder is re-queued at the *front* of
-// the Event_List.
-
-int
-Consumer_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the event.  If we don't send it all (e.g., due to
-  // flow control), then re-queue the remainder at the head of the
-  // Event_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again. 
-
-  ssize_t n = this->send (mb);
-
-  if (n == -1)
-    {
-      // Things have gone wrong, let's try to close down and set up a new reconnection.
-      this->state (IO_Handler::FAILED);
-      this->handle_close ();
-      return -1;
-    }
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n",
-                 this->get_handle (), this->id ()));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      else if (ACE_Service_Config::reactor ()->
-	       schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-ssize_t
-Consumer_Handler::send (ACE_Message_Block *mb)
-{
-  ssize_t len = mb->length ();
-  ssize_t n = this->peer ().send (mb->rd_ptr (), len);
-
-  if (n <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < len)
-    // Re-adjust pointer to skip over the part we did send.
-    mb->rd_ptr (n);
-  else /* if (n == length) */
-    {
-      // The whole event is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      delete mb;
-      errno = 0;
-    }
-  this->total_bytes (n);
-  return n;
-}
-
-// Finish sending an event when flow control conditions abate.
-// This method is automatically called by the ACE_Reactor.
-
-int 
-Consumer_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) in handle_output on handle %d\n", 
-	      this->get_handle ()));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-        {
-        case 0:           // Partial send.
-          ACE_ASSERT (errno == EWOULDBLOCK);
-          // Didn't write everything this time, come back later...
-          break;
-
-        case -1:
-          // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-          delete mb;
-          ACE_ERROR ((LM_ERROR, "(%t) %p\n", "transmission failure"));
-
-          /* FALLTHROUGH */
-        default: // Sent the whole thing.
-          
-          // If we succeed in writing the entire event (or we did not
-          // fail due to EWOULDBLOCK) then check if there are more
-          // events on the Event_List.  If there aren't, tell the
-          // ACE_Reactor not to notify us anymore (at least until
-          // there are new events queued up).
-
-          if (this->msg_queue ()->is_empty ())
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) queueing deactivated on handle %d to routing id %d\n",
-                         this->get_handle (), this->id ()));
-
-
-              if (ACE_Service_Config::reactor ()->
-		  cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1)
-                ACE_ERROR ((LM_ERROR, "(%t) %p\n", "cancel_wakeup"));
-            }
-        }
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send an event to a peer (may queue if necessary).
-
-int 
-Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the event *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up events due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Constructor sets the consumer map pointer and the connector
-// pointer.
-
-Supplier_Handler::Supplier_Handler (Consumer_Map *consumer_map,
-				    IO_Handler_Connector *ioc,
-				    ACE_Thread_Manager *thr_mgr,
-				    int socket_queue_size)
-  : msg_frag_ (0), 
-    IO_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-  this->direction_ = 'S';
-  this->msg_queue ()->high_water_mark (0);
-}
-
-// Receive a Peer event from peerd.  Handles fragmentation.
-//
-// The routing event returned from recv consists of two parts:
-// 1. The Address part, contains the virtual routing id.
-// 2. The Data part, which contains the actual data to be routed.
-// 
-// The reason for having two parts is to shield the higher layers
-// of software from knowledge of the event structure.
-
-int
-Supplier_Handler::recv (ACE_Message_Block *&forward_addr)
-{ 
-  Event *event;
-  ssize_t len;
-  ssize_t n = 0;
-  size_t offset = 0;
-
-  if (this->msg_frag_ == 0)
-    // No existing fragment...
-    ACE_NEW_RETURN (this->msg_frag_, 
-		    ACE_Message_Block (sizeof (Event)), 
-		    -1);
-
-  event = (Event *) this->msg_frag_->rd_ptr ();
-
-  const ssize_t HEADER_SIZE = sizeof (Event_Header);
-  ssize_t header_bytes_left_to_read = HEADER_SIZE - this->msg_frag_->length ();
-
-  if (header_bytes_left_to_read > 0)
-    {
-      n = this->peer ().recv (this->msg_frag_->wr_ptr (), 
-			      header_bytes_left_to_read);
-
-      if (n == -1 /* error */
-	  || n == 0  /* EOF */)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "Recv error during header read "));
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "attempted to read %d\n", 
-		      header_bytes_left_to_read));
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-
-      // Bump the write pointer by the amount read.
-      this->msg_frag_->wr_ptr (n);
-
-      // At this point we may or may not have the ENTIRE header.
-      if (this->msg_frag_->length () < HEADER_SIZE)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "Partial header received: only %d bytes\n",
-		     this->msg_frag_->length ()));
-	  // Notify the caller that we didn't get an entire event.
-	  errno = EWOULDBLOCK;
-	  return -1;
-	}
-    }
-
-  // At this point there is a complete, valid header in msg_frag_
-  len = sizeof event->buf_ + HEADER_SIZE - this->msg_frag_->length ();
-
-  ssize_t m = this->peer ().recv (event->buf_ + offset, len);
-
-  // Try to receive the remainder of the event
-
-  switch (m)
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-        {
-          // This shouldn't happen since the ACE_Reactor
-          // just triggered us to handle pending I/O!
-          ACE_DEBUG ((LM_DEBUG, "(%t) unexpected recv failure\n"));
-          errno = EWOULDBLOCK;
-          return -1;
-        }
-      else
-        /* FALLTHROUGH */;
-
-    case 0: // Premature EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return 0;
-
-    default:
-      if (m != len)
-        // Re-adjust pointer to skip over the part we've read.
-        {
-          this->msg_frag_->wr_ptr (m);
-          errno = EWOULDBLOCK;
-          return -1; // Inform caller that we didn't get the whole event.
-        }
-      else
-        {
-          // Set the write pointer at 1 past the end of the event.
-          this->msg_frag_->wr_ptr (m);
-
-          // Set the read pointer to the beginning of the event.
-          this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-          // Allocate an event forwarding header and chain the data
-          // portion onto its continuation field.
-          ACE_NEW_RETURN (forward_addr,
-			  ACE_Message_Block (sizeof (Event_Addr), 
-					     ACE_Message_Block::MB_PROTO, 
-					     this->msg_frag_),
-			  -1);
-
-          Event_Addr event_addr (this->id (), event->header_.routing_id_, 0);
-          // Copy the forwarding address from the Event_Addr into
-          // forward_addr.
-          forward_addr->copy ((char *) &event_addr, sizeof (Event));
-
-          // Reset the pointer to indicate we've got an entire event.
-          this->msg_frag_ = 0; 
-        }
-      this->total_bytes (m + n);
-#if defined (VERBOSE)
-      ACE_DEBUG ((LM_DEBUG, "(%t) channel id = %d, route id = %d, len = %d, payload = %*s",
-		 event_addr.conn_id_, event->header_.routing_id_, event->header_.len_,
-		 event->header_.len_, event->buf_));
-#else
-      ACE_DEBUG ((LM_DEBUG, "(%t) route id = %d, cur len = %d, total bytes read = %d\n",
-		 event->header_.routing_id_, event->header_.len_, this->total_bytes ()));
-#endif
-      return m + n;
-    }
-}
-
-// Receive various types of input (e.g., Peer event from the 
-// gatewayd, as well as stdio).
-
-int 
-Supplier_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_Message_Block *forward_addr = 0;
-
-  switch (this->recv (forward_addr))
-    {
-    case 0:
-      // Note that a peer should never initiate a shutdown.
-      this->state (IO_Handler::FAILED);
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			"(%t) Peer has closed down unexpectedly for Input IO_Handler %d\n", 
-                        this->id ()), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-        // A short-read, we'll come back and finish it up later on!
-        return 0;
-      else // A weird problem occurred, shut down and start again.
-        {
-          this->state (IO_Handler::FAILED);
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p for Input IO_Handler %d\n", 
-			    "Peer has failed unexpectedly",
-                           this->id ()), -1);
-        }
-      /* NOTREACHED */
-    default:
-      return this->forward (forward_addr);
-    }
-}
-
-// Route an event to its appropriate destination.
-
-int
-Supplier_Handler::forward (ACE_Message_Block *forward_addr)
-{
-  // We got a valid event, so determine its virtual routing id,
-  // which is stored in the first of the two event blocks chained
-  // together.
-	
-  Event_Addr *forwarding_key = (Event_Addr *) forward_addr->rd_ptr ();
-	
-  // Skip over the address portion.
-  const ACE_Message_Block *const data = forward_addr->cont ();
-	
-  // RE points to the routing entry located for this routing id.
-  Consumer_Entry *re = 0;
-	
-  if (this->consumer_map_->find (*forwarding_key, re) != -1)
-    {
-      // Check to see if there are any destinations.
-      if (re->destinations ()->size () == 0)
-	ACE_DEBUG ((LM_WARNING, 
-		   "there are no active destinations for this event currently\n"));
-	    
-      else		// There are destinations, so forward the event.
-	{
-	  Consumer_Entry::ENTRY_SET *esp = re->destinations ();
-	  Consumer_Entry::ENTRY_ITERATOR si (*esp);
-		
-	  for (IO_Handler **channel = 0; si.next (channel) != 0; si.advance ())
-	    {
-	      // Only process active channels.
-	      if ((*channel)->active ())
-		{
-		  // Clone the event portion (should be doing reference counting here...)
-		  ACE_Message_Block *newmsg = data->clone (); 
-		    
-		  ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer %d\n", (*channel)->id ()));
-		    
-		  if ((*channel)->put (newmsg) == -1)
-		    {
-		      if (errno == EWOULDBLOCK) // The queue has filled up!
-			ACE_ERROR ((LM_ERROR, "(%t) %p\n", 
-				   "gateway is flow controlled, so we're dropping events"));
-		      else
-			ACE_ERROR ((LM_ERROR, "(%t) %p transmission error to route %d\n",
-				   "put", (*channel)->id ()));
-			
-		      // Caller is responsible for freeing a ACE_Message_Block if failures occur.
-		      delete newmsg;
-		    }
-		}
-	    }
-	  // Will become superfluous once we have reference counting...
-	  delete forward_addr;
-	  return 0;
-	}
-    }
-  delete forward_addr;
-  // Failure return.
-  ACE_ERROR ((LM_DEBUG, "(%t) find failed on conn id = %d, logical id = %d, payload = %d\n", 
-	     forwarding_key->conn_id_, forwarding_key->logical_id_, forwarding_key->payload_));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Map_Manager<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Iterator<Event_Addr, Consumer_Entry *, MAP_MUTEX>;
-template class ACE_Map_Entry<Event_Addr, Consumer_Entry *>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/IO_Handler.h b/apps/Gateway/Gateway/IO_Handler.h
deleted file mode 100644
index 7bda073f09b..00000000000
--- a/apps/Gateway/Gateway/IO_Handler.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER)
-#define _IO_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "Consumer_Map.h"
-#include "Consumer_Entry.h"
-#include "Event.h"
-
-// Forward declaration.
-class IO_Handler_Connector;
-
-class IO_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, SYNCH_STRATEGY>
-  // = TITLE
-  //    IO_Handler contains info about connection state and addressing.
-  //
-  // = DESCRIPTION
-  //     The IO_Handler classes process events sent from the peers to the
-  //     gateway.  These classes works as follows:
-  //   
-  // 1. IO_Handler_Connector creates a number of connections with the set of 
-  //    peers specified in a configuration file.  
-  //
-  // 2. For each peer that connects successfully, IO_Handler_Connector
-  //    creates an IO_Handler object.  Each object assigns a unique routing
-  //    id to its associated peer.  The Handlers are used by gatewayd
-  //    that to receive, route, and forward events from source peer(s)
-  //    to destination peer(s).
-{
-public:
-  IO_Handler (Consumer_Map *, 
-	      IO_Handler_Connector *, 
-	      ACE_Thread_Manager * = 0,
-	      int socket_queue_size = 0);
-
-  virtual int open (void * = 0);
-  // Initialize and activate a single-threaded IO_Handler (called by
-  // ACE_Connector::handle_output()).
-
-  int bind (const ACE_INET_Addr &remote_addr, 
-	    const ACE_INET_Addr &local_addr, 
-	    CONN_ID);
-  // Set the peer's addressing and routing information.
-
-  ACE_INET_Addr &remote_addr (void);
-  // Returns the peer's routing address.
-
-  ACE_INET_Addr &local_addr (void);
-  // Returns our local address.
-
-  // = Set/get routing id.
-  CONN_ID id (void);
-  void id (CONN_ID);
-
-  // = Set/get the current state of the IO_Handler.
-  enum State
-  {
-    IDLE = 1,      // Prior to initialization.
-    CONNECTING,    // During connection establishment.
-    ESTABLISHED,   // IO_Handler is established and active.
-    DISCONNECTING, // IO_Handler is in the process of connecting.
-    FAILED	   // IO_Handler has failed.
-  };
-
-  // = Set/get the current state.
-  State state (void);
-  void state (State);
-
-  // = Set/get the current retry timeout delay.
-  int timeout (void);
-  void timeout (int);
-
-  // = Set/get the maximum retry timeout delay.
-  int max_timeout (void);
-  void max_timeout (int);
-
-  // = Set/get IO_Handler activity status.
-  int active (void);
-  void active (int);
-
-  // = Set/get direction (necessary for error checking).
-  char direction (void);
-  void direction (char);
-
-  // = The total number of bytes sent/received on this channel.
-  size_t total_bytes (void);
-  void total_bytes (size_t bytes);
-  // Increment count by <bytes>.
-
-  virtual int handle_timeout (const ACE_Time_Value &, const void *arg);
-  // Perform timer-based IO_Handler reconnection.
-
-protected:
-  enum
-  {
-    MAX_RETRY_TIMEOUT = 300 // 5 minutes is the maximum timeout.
-  };
-
-  int initialize_connection (void);
-  // Perform the first-time initiation of a connection to the peer.
-
-  int reinitiate_connection (void);
-  // Reinitiate a connection asynchronously when peers fail.
-
-  void socket_queue_size (void);
-  // Set the socket queue size.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform IO_Handler termination.
-
-  Consumer_Map *consumer_map_;
-  // Pointer to table that maps an event
-  // to a Set of IO_Handler *'s for output.
-
-  ACE_INET_Addr remote_addr_;
-  // Address of peer.
-
-  ACE_INET_Addr local_addr_;
-  // Address of us.
-
-  CONN_ID id_;  
-  // The assigned routing ID of this entry.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received on this channel.
-
-  State state_;
-  // The current state of the channel.
-
-  IO_Handler_Connector *connector_;
-  // Back pointer to IO_Handler_Connector to reestablish broken
-  // connections.
-
-  int timeout_;
-  // Amount of time to wait between reconnection attempts.
-
-  int max_timeout_;
-  // Maximum amount of time to wait between reconnection attempts.
-
-  char direction_;
-  // Indicates which direction data flows through the channel ('O' ==
-  // output and 'I' == input).
-
-  int socket_queue_size_;
-  // Size of the socket queue (0 means "use default").
-};
-
-class Supplier_Handler : public IO_Handler
-  // = TITLE
-  //     Handle reception of Peer events arriving as events.
-{
-public:
-  Supplier_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-  // Constructor sets the consumer map pointer.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Receive and process peer events.
-
-protected:
-  virtual int recv (ACE_Message_Block *&);
-  // Receive an event from a Supplier.
-
-  int forward (ACE_Message_Block *event);
-  // Forward the Event to a Consumer.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of event fragment to handle non-blocking recv's from
-  // Suppliers.
-};
-
-class Consumer_Handler : public IO_Handler
-  // = TITLE
-  //     Handle transmission of events to other Peers using a
-  //     single-threaded approach.
-{
-public:
-  Consumer_Handler (Consumer_Map *, 
-		    IO_Handler_Connector *, 
-		    ACE_Thread_Manager * = 0,
-		    int socket_queue_size = 0);
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send an event to a Consumer (may be queued if necessary).
-
-protected:
-  // = We'll allow up to 16 megabytes to be queued per-output
-  // channel.
-  enum {QUEUE_SIZE = 1024 * 1024 * 16};
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process shutdowns from a Consumer.
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending event when flow control conditions abate.
-
-  int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual ssize_t send (ACE_Message_Block *);
-  // Send an event to a Consumer.
-};
-
-#endif /* _IO_HANDLER */
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.cpp b/apps/Gateway/Gateway/IO_Handler_Connector.cpp
deleted file mode 100644
index 712b348951d..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "IO_Handler_Connector.h"
-// $Id$
-
-
-IO_Handler_Connector::IO_Handler_Connector (void)
-{
-}
-
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-IO_Handler_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate channel %d in map, %p\n",
-		      sd, "find"), -1);
-
-  IO_Handler *channel = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that channel uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer (channel, 0, 
-					       channel->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
-// Initiate (or reinitiate) a connection to the IO_Handler.
-
-int
-IO_Handler_Connector::initiate_connection (IO_Handler *channel,
-					ACE_Synch_Options &synch_options)
-{
-  char buf[MAXHOSTNAMELEN];
-
-  // Mark ourselves as idle so that the various iterators 
-  // will ignore us until we are reconnected.
-  channel->state (IO_Handler::IDLE);
-
-  if (channel->remote_addr ().addr_to_string (buf, sizeof buf) == -1
-      || channel->local_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "can't obtain peer's address"), -1);
-
-  // Try to connect to the Peer.
-
-  if (this->connect (channel, channel->remote_addr (), 
-		     synch_options, channel->local_addr ()) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	{
-	  channel->state (IO_Handler::FAILED);
-	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", buf));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (channel, 0, channel->timeout ()) == 0)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
-	}
-      else
-	{
-	  channel->state (IO_Handler::CONNECTING);
-	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", buf));
-	}
-    }
-  else 
-    {
-      channel->state (IO_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 buf, channel->get_handle ()));
-    }
-  return 0;
-}
diff --git a/apps/Gateway/Gateway/IO_Handler_Connector.h b/apps/Gateway/Gateway/IO_Handler_Connector.h
deleted file mode 100644
index 585428c88ee..00000000000
--- a/apps/Gateway/Gateway/IO_Handler_Connector.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    IO_Handler_Connector.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_IO_HANDLER_CONNECTOR)
-#define _IO_HANDLER_CONNECTOR
-
-#include "ace/Connector.h"
-#include "Thr_IO_Handler.h"
-
-class IO_Handler_Connector : public ACE_Connector<IO_Handler, ACE_SOCK_CONNECTOR>
-  // = TITLE
-  //    A concrete factory class that setups connections to peerds 
-  //    and produces a new IO_Handler object to do the dirty work...
-{
-public:
-  IO_Handler_Connector (void);
-
-  // Initiate (or reinitiate) a connection on the IO_Handler.
-  int initiate_connection (IO_Handler *, 
-			   ACE_Synch_Options & = ACE_Synch_Options::synch);
-
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
-};
-
-#endif /* _IO_HANDLER_CONNECTOR */
diff --git a/apps/Gateway/Gateway/Peer_Message.h b/apps/Gateway/Gateway/Peer_Message.h
deleted file mode 100644
index d9e65650095..00000000000
--- a/apps/Gateway/Gateway/Peer_Message.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Peer_Message.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// This is the unique connection identifier that denotes a particular
-// Channel in the Gateway.
-typedef short CONN_ID;
-
-class Peer_Addr
-  // = TITLE
-  //     Peer address is used to identify the source/destination of a 
-  //     routing message.
-{
-public:
-  Peer_Addr (CONN_ID cid = -1, u_char lid = 0, u_char pay = 0)
-    : conn_id_ (cid), logical_id_ (lid), payload_ (pay) {}
-
-  int operator== (const Peer_Addr &pa) const
-  {
-    return this->conn_id_ == pa.conn_id_ 
-      && this->logical_id_ == pa.logical_id_
-      && this->payload_ == pa.payload_;
-  }
-
-  CONN_ID conn_id_;
-  // Unique connection identifier that denotes a particular Channel.
-
-  u_char logical_id_;
-  // Logical ID.
-
-  u_char payload_;
-  // Payload type.
-};
-
-
-class Peer_Header
-  // = TITLE
-  //    Fixed sized header.
-{
-public:
-  typedef u_short ROUTING_ID;
-  // Type used to route messages from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  ROUTING_ID routing_id_;
-  // Source ID.
-
-  size_t  len_;
-  // Length of the message in bytes.
-};
-
-class Peer_Message
-  // = TITLE
-  //    Variable-sized message (buf_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Peer message (see Peer protocol specs for
-  // exact #).
-
-  Peer_Header header_;
-  // Message header.
-
-  char buf_[MAX_PAYLOAD_SIZE];
-  // Message payload.
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/Gateway/Gateway/Routing_Entry.cpp b/apps/Gateway/Gateway/Routing_Entry.cpp
deleted file mode 100644
index cc270cfac3a..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Defines an entry in the Routing Table.
-// $Id$
-
-#include "Routing_Entry.h"
-
-Routing_Entry::Routing_Entry (int validity_interval)
-  : validity_interval_ (validity_interval)
-{
-  ACE_NEW (this->destinations_, Routing_Entry::ENTRY_SET);
-}
-
-Routing_Entry::~Routing_Entry (void)
-{
-  delete this->destinations_;
-}
-
-// Get the associated set of destinations.
-
-Routing_Entry::ENTRY_SET *
-Routing_Entry::destinations (void)
-{
-  return this->destinations_;
-}
-
-// Set the associated set of destinations.
-
-void 
-Routing_Entry::destinations (Routing_Entry::ENTRY_SET *s)
-{
-  this->destinations_ = s;
-}
-
-// Get the current validity interval for this route.
-
-int
-Routing_Entry::validity_interval (void)
-{
-  return this->validity_interval_;
-}
-
-// Set the current validity interval for this route.
-
-void
-Routing_Entry::validity_interval (int vi)
-{
-  this->validity_interval_ = vi;
-}
diff --git a/apps/Gateway/Gateway/Routing_Entry.h b/apps/Gateway/Gateway/Routing_Entry.h
deleted file mode 100644
index ab8e0eee53d..00000000000
--- a/apps/Gateway/Gateway/Routing_Entry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Entry.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_ENTRY)
-#define _ROUTING_ENTRY
-
-#include "ace/Set.h"
-
-// Forward reference.
-class Channel;
-
-class Routing_Entry
-{
-  // = TITLE
-  //    Defines an entry in the Routing_Table.
-public:
-  Routing_Entry (int validity_interval = 0);
-  ~Routing_Entry (void);
-
-  typedef ACE_Unbounded_Set<Channel *> ENTRY_SET;
-  typedef ACE_Unbounded_Set_Iterator<Channel *> ENTRY_ITERATOR;
-
-  // = Set/get the associated set of destinations.
-  ENTRY_SET *destinations (void);
-  void destinations (ENTRY_SET *);
-
-  // = Set/get current validity interval for this routing entry.
-  int validity_interval (void);
-  void validity_interval (int);
-
-protected:
-  ENTRY_SET *destinations_;
-  // The set of destinations;
-
-  int validity_interval_;
-  // The current validity interval of this link.
-};
-
-#endif /* _ROUTING_ENTRY */
diff --git a/apps/Gateway/Gateway/Routing_Table.cpp b/apps/Gateway/Gateway/Routing_Table.cpp
deleted file mode 100644
index 3ef2f21bc1f..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-#if !defined (_ROUTING_TABLE_C)
-#define _ROUTING_TABLE_C
-
-
-#include "Routing_Table.h"
-
-/* Bind the EXT_ID to the INT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::bind (EXT_ID ext_id, INT_ID *int_id)
-{
-  return this->map_.bind (ext_id, int_id);
-}
-
-/* Find the INT_ID corresponding to the EXT_ID. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Table<EXT_ID, INT_ID, LOCK>::find (EXT_ID ext_id, INT_ID *&int_id)
-{
-  return this->map_.find (ext_id, int_id);
-}
-
-/* Unbind (remove) the EXT_ID from the map. */
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Table<EXT_ID, INT_ID, LOCK>::unbind (EXT_ID ext_id)
-{
-  return this->map_.unbind (ext_id);
-}
-
-template <class EXT_ID, class INT_ID, class LOCK>
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::Routing_Iterator (Routing_Table<EXT_ID, 
-							  INT_ID, LOCK> &rt,
-							  int ignore_inactive)
-  : map_iter_ (rt.map_), 
-    ignore_inactive_ (ignore_inactive)
-{
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int 
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::next (INT_ID *&ss)
-{
-  // Loop in order to skip over inactive entries if necessary.
-
-  for (ACE_Map_Entry<EXT_ID, INT_ID *> *temp = 0;
-       this->map_iter_.next (temp) != 0; 
-       this->advance ())
-    {
-      // Skip over inactive entries if necessary.
-      if (temp->int_id_->active () == 0 && this->ignore_inactive_)
-	continue;
-
-      // Otherwise, return the next item.
-      ss = temp->int_id_;
-      return 1;
-    }
-  return 0;
-}
-
-template <class EXT_ID, class INT_ID, class LOCK> int
-Routing_Iterator<EXT_ID, INT_ID, LOCK>::advance (void)
-{
-  return this->map_iter_.advance ();
-}
-#endif /* _ROUTING_TABLE_C */
diff --git a/apps/Gateway/Gateway/Routing_Table.h b/apps/Gateway/Gateway/Routing_Table.h
deleted file mode 100644
index 84194f13e49..00000000000
--- a/apps/Gateway/Gateway/Routing_Table.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Routing_Table.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_ROUTING_TABLE_H)
-#define _ROUTING_TABLE_H
-
-#include "ace/Map_Manager.h"
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Table
-{
-  // = TITLE
-  //    Define a generic routing table based on the ACE Map_Manager.  
-  //
-  // = DESCRIPTION
-  //    We need to have this table, rather than just using the Map_Manager
-  //    directly in order to ignore "inactive" routing entries...
-public:
-  int bind (EXT_ID ext_id, INT_ID *int_id);
-  // Associate EXT_ID with the INT_ID.
-
-  int find (EXT_ID ext_id, INT_ID *&int_id);
-  // Break any association of EXID.
-
-  int unbind (EXT_ID ext_id);
-  // Locate EXID and pass out parameter via INID.  If found,
-  // return 0, else -1.
-
-public:
-  ACE_Map_Manager<EXT_ID, INT_ID *, LOCK> map_;
-  // Map external IDs to internal IDs.
-};
-
-template <class EXT_ID, class INT_ID, class LOCK>
-class Routing_Iterator
-{
-  // = TITLE
-  //    Define an iterator for the Routing Table.
-public:
-  Routing_Iterator (Routing_Table<EXT_ID, INT_ID, LOCK> &mm, 
-		    int ignore_inactive = 1);
-  int next (INT_ID *&);
-  int advance (void);
-
-private:
-  ACE_Map_Iterator<EXT_ID, INT_ID *, LOCK> map_iter_;
-  int ignore_inactive_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Routing_Table.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#endif /* _ROUTING_TABLE_H */
diff --git a/apps/Gateway/Gateway/Thr_Channel.cpp b/apps/Gateway/Gateway/Thr_Channel.cpp
deleted file mode 100644
index 26e385e2727..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_Channel.h"
-// $Id$
-
-#include "Channel_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Output_Channel::Thr_Output_Channel (ROUTING_TABLE *rt,
-					Channel_Connector *cc,
-					ACE_Thread_Manager *thr_mgr,
-					int socket_queue_size)
-  : Output_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the Channel as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Output_Channel::handle_input (ACE_HANDLE h)
-{
-  this->Output_Channel::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Output_Channel object and spawn a new
-// thread.
-
-int 
-Thr_Output_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Input_Channels are single-threaded).
-
-int 
-Thr_Output_Channel::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Output_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Output_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send_peer (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Output_Channel %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Input_Channel::Thr_Input_Channel (ROUTING_TABLE *rt,
-				      Channel_Connector *cc,
-				      ACE_Thread_Manager *thr_mgr,
-				      int socket_queue_size)
-  : Input_Channel (rt, cc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Input_Channel::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Input_Channel::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Input_Channel's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Input_Channel %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Channel.h b/apps/Gateway/Gateway/Thr_Channel.h
deleted file mode 100644
index a1dc91b1619..00000000000
--- a/apps/Gateway/Gateway/Thr_Channel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Channel.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_CHANNEL)
-#define _THR_CHANNEL
-
-#include "Channel.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Output_Channel : public Output_Channel
-  // = TITLE
-  //    Runs each Output Channel in a separate thread.
-{
-public:
-  Thr_Output_Channel (ROUTING_TABLE *, 
-		      Channel_Connector *, 
-		      ACE_Thread_Manager *,
-		      int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Output_Channel object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Input_Channel : public Input_Channel
-  // = TITLE
-  //    Runs each Input Channel in a separate thread.
-{
-public:
-  Thr_Input_Channel (ROUTING_TABLE *, 
-		     Channel_Connector *, 
-		     ACE_Thread_Manager *,
-		     int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_CHANNEL */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.cpp b/apps/Gateway/Gateway/Thr_IO_Handler.cpp
deleted file mode 100644
index 109cfad9c3f..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "Thr_IO_Handler.h"
-// $Id$
-
-#include "IO_Handler_Connector.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Handler::Thr_Consumer_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Consumer_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-// This method should be called only when the peer shuts down
-// unexpectedly.  This method marks the IO_Handler as having failed and
-// deactivates the ACE_Message_Queue (to wake up the thread blocked on
-// <dequeue_head> in svc()).  Thr_Output_Handler::handle_close () will
-// eventually try to reconnect...
-
-int 
-Thr_Consumer_Handler::handle_input (ACE_HANDLE h)
-{
-  this->Consumer_Handler::handle_input (h);
-  ACE_Service_Config::reactor ()->remove_handler (h,
-					   ACE_Event_Handler::RWE_MASK
-					   | ACE_Event_Handler::DONT_CALL);
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Handler object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Peer has shut down unexpectedly).
-  if (ACE_Service_Config::reactor ()->register_handler (this,
-						 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// ACE_Queue up a message for transmission (must not block since all
-// Supplier_Handlers are single-threaded).
-
-int 
-Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit messages to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Consumer_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; )
-	if (this->send (mb) == -1)
-	  ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-
-	ACE_ASSERT (errno == ESHUTDOWN);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) shutting down threaded Consumer_Handler %d on handle %d\n", 
-		   this->id (), this->get_handle ()));
-
-	this->peer ().close ();
-
-	for (this->timeout (1);
-	     // Default is to reconnect synchronously.
-	     this->connector_->initiate_connection (this) == -1; )
-	  {
-	    ACE_Time_Value tv (this->timeout ());
-	    ACE_ERROR ((LM_ERROR, 
-			"(%t) reattempting connection, sec = %d\n", 
-			tv.sec ()));
-	    ACE_OS::sleep (tv);
-	  }
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Handler::Thr_Supplier_Handler (Consumer_Map *consumer_map,
-					    IO_Handler_Connector *ioc,
-					    ACE_Thread_Manager *thr_mgr,
-					    int socket_queue_size)
-  : Supplier_Handler (consumer_map, ioc, thr_mgr, socket_queue_size)
-{
-}
-
-int 
-Thr_Supplier_Handler::open (void *)
-{
-  // Set the size of the socket queue.
-  this->socket_queue_size ();
-
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  if (this->initialize_connection ())
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "initialize_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // messages to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive messages from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Handler::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected! Thr_Supplier_Handler's fd = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes
-      // messages for one connection it is OK to block on input and
-      // output.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Handler %d on handle %d\n", 
-		 this->id (), 
-		 this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->connector_->initiate_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_IO_Handler.h b/apps/Gateway/Gateway/Thr_IO_Handler.h
deleted file mode 100644
index ee056b35361..00000000000
--- a/apps/Gateway/Gateway/Thr_IO_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_IO_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "IO_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Handler : public Consumer_Handler
-  // = TITLE
-  //    Runs each Output IO_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Handler object and spawn a new
-  // thread.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Handler : public Supplier_Handler
-  // = TITLE
-  //    Runs each Input IO_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Handler (Consumer_Map *, 
-			IO_Handler_Connector *, 
-			ACE_Thread_Manager *,
-			int socket_queue_size);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp b/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
deleted file mode 100644
index f316e4e82bf..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// $Id$
-
-#include "Event_Channel.h"
-#include "Thr_Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-Thr_Consumer_Proxy::Thr_Consumer_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Consumer_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-// This method should be called only when the Consumer shuts down
-// unexpectedly.  This method marks the Proxy_Handler as having failed
-// and deactivates the ACE_Message_Queue (to wake up the thread
-// blocked on <dequeue_head> in svc()).
-// Thr_Output_Handler::handle_close () will eventually try to
-// reconnect...
-
-int 
-Thr_Consumer_Proxy::handle_input (ACE_HANDLE h)
-{
-  // Call down to the <Consumer_Proxy> to handle this first.
-  this->Consumer_Proxy::handle_input (h);
-
-  ACE_Service_Config::reactor ()->remove_handler 
-    (h, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL);
-
-  // Deactivate the queue while we try to get reconnected.
-  this->msg_queue ()->deactivate ();
-  return 0;
-}
-
-// Initialize the threaded Consumer_Proxy object and spawn a new
-// thread.
-
-int 
-Thr_Consumer_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Register ourselves to receive input events (which indicate that
-  // the Consumer has shut down unexpectedly).
-  else if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to Consumers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Queue up an event for transmission (must not block since
-// Supplier_Proxys may be single-threaded).
-
-int 
-Thr_Consumer_Proxy::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  // Perform non-blocking enqueue.
-  return this->msg_queue ()->enqueue_tail 
-    (mb, (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// Transmit events to the peer (note simplification resulting from
-// threads...)
-
-int 
-Thr_Consumer_Proxy::svc (void)
-{
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Consumer_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread it is OK to block on
-      // output.
-
-      for (ACE_Message_Block *mb = 0; 
-	   this->msg_queue ()->dequeue_head (mb) != -1; 
-	   )
-	{
-	  if (this->send (mb) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "send failed"));
-	}
-
-      ACE_ASSERT (errno == ESHUTDOWN);
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Consumer_Proxy %d on handle %d\n", 
-		  this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-
-	  ACE_OS::sleep (tv);
-	}
-    }
-
-  return 0;
-}
-
-Thr_Supplier_Proxy::Thr_Supplier_Proxy (ACE_Event_Channel &ec, 
-					const ACE_INET_Addr &remote_addr,
-					const ACE_INET_Addr &local_addr,
-					ACE_INT32 conn_id)
-  : Supplier_Proxy (ec, remote_addr, local_addr, conn_id)
-{
-}
-
-int 
-Thr_Supplier_Proxy::open (void *)
-{
-  // Turn off non-blocking I/O.
-  if (this->peer ().disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "enable"), -1);
-
-  // Call back to the <Event_Channel> to complete our initialization.
-  else if (this->event_channel_.complete_proxy_connection (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "complete_proxy_connection"), -1);
-
-  // Reactivate message queue.  If it was active then this is the
-  // first time in and we need to spawn a thread, otherwise the queue
-  // was inactive due to some problem and we've already got a thread.
-  else if (this->msg_queue ()->activate () == ACE_Message_Queue<SYNCH_STRATEGY>::WAS_ACTIVE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) spawning new thread\n"));
-      // Become an active object by spawning a new thread to transmit
-      // events to peers.
-      return this->activate (THR_NEW_LWP | THR_DETACHED);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) reusing existing thread\n"));
-      return 0;
-    }
-}
-
-// Receive events from a Peer in a separate thread (note reuse of
-// existing code!).
-
-int 
-Thr_Supplier_Proxy::svc (void)
-{
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) connected! Thr_Supplier_Proxy's handle = %d\n", 
-		 this->peer ().get_handle ()));
-
-      // Since this method runs in its own thread and processes events
-      // for one connection it is OK to call down to the
-      // <Supplier_Proxy::handle_input> method, which blocks on input.
-
-      while (this->handle_input () != -1)
-	continue;
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) shutting down threaded Supplier_Proxy %d on handle %d\n", 
-		 this->id (), this->get_handle ()));
-
-      this->peer ().close ();
-
-      // Deactivate the queue while we try to get reconnected.
-      this->msg_queue ()->deactivate ();
-
-      for (this->timeout (1);
-	   // Default is to reconnect synchronously.
-	   this->event_channel_.initiate_proxy_connection (this) == -1; )
-	{
-	  ACE_Time_Value tv (this->timeout ());
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) reattempting connection, sec = %d\n", 
-		      tv.sec ()));
-	  ACE_OS::sleep (tv);
-	}
-    }
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Thr_Proxy_Handler.h b/apps/Gateway/Gateway/Thr_Proxy_Handler.h
deleted file mode 100644
index 275bc87b320..00000000000
--- a/apps/Gateway/Gateway/Thr_Proxy_Handler.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Thr_Proxy_Handler.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (_THR_IO_HANDLER)
-#define _THR_IO_HANDLER
-
-#include "Proxy_Handler.h"
-
-#if defined (ACE_HAS_THREADS)
-class Thr_Consumer_Proxy : public Consumer_Proxy
-  // = TITLE
-  //    Runs each Output Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Consumer_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the threaded Consumer_Proxy object and spawn a new
-  // thread.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0);
-  // Send a message to a peer.
-
-protected:
-  virtual int handle_input (ACE_HANDLE);
-  // Called when Peer shutdown unexpectedly.
-
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-
-class Thr_Supplier_Proxy : public Supplier_Proxy
-  // = TITLE
-  //    Runs each Input Proxy_Handler in a separate thread.
-{
-public:
-  Thr_Supplier_Proxy (ACE_Event_Channel &, 
-		      const ACE_INET_Addr &remote_addr,
-		      const ACE_INET_Addr &local_addr,
-		      ACE_INT32 conn_id);
-
-  virtual int open (void *);
-  // Initialize the object and spawn a new thread.
-
-protected:
-  virtual int svc (void);
-  // Transmit peer messages.
-};
-#endif /* ACE_HAS_THREADS */
-#endif /* _THR_IO_HANDLER */
diff --git a/apps/Gateway/Gateway/cc_config b/apps/Gateway/Gateway/cc_config
deleted file mode 100644
index 96f9ebdedd7..00000000000
--- a/apps/Gateway/Gateway/cc_config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Conn ID  Hostname     Remote Port  Direction  Max Retry Delay  Local Port
-# -------  --------	----         ---------  ---------------  ----------
-   1       tango.cs	10004	     I          32		 20000
-#  2       tango.cs	10004	     O          32               
-   3       merengue.cs	10004	     O          32		 20001
-#  4       mambo.cs	10004	     O          32		 20000
-#  5       lambada.cs	10004	     O          32		 20000
-#  6       tango.cs	10004	     O          32		 20000
-#  7       tango.cs	5001	     I          32               
-#  8       tango.cs	5002	     O          32               
diff --git a/apps/Gateway/Gateway/rt_config b/apps/Gateway/Gateway/rt_config
deleted file mode 100644
index e951a0f09be..00000000000
--- a/apps/Gateway/Gateway/rt_config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Conn ID  Logical ID  Payload  Destinations
-# -------  ----------  -------  ------------  
-# 1        1           0	3,4,5
-  1        1           0	3
-  3        1           0	3           
-#  4        1           0	4
-#  5	   1	       0	5
diff --git a/apps/Gateway/Peer/Event.h b/apps/Gateway/Peer/Event.h
deleted file mode 100644
index 5e288edf910..00000000000
--- a/apps/Gateway/Peer/Event.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    Event.h
-//
-// = AUTHOR
-//    Doug Schmidt 
-// 
-// ============================================================================
-
-#if !defined (EVENT)
-#define EVENT
-
-#include "ace/OS.h"
-
-// This is the unique connection identifier that denotes a particular
-// Proxy_Handler in the Gateway.
-typedef ACE_INT32 ACE_INT32;
-
-class Event_Key
-  // = TITLE
-  //     Address used to identify the source/destination of an event.
-  //
-  // = DESCRIPTION
-  //     This is really a "virtual forwarding address" thatis used to
-  //     decouple the filtering and forwarding logic of the Event
-  //     Channel from the format of the data.
-{
-public:
-  Event_Key (ACE_INT32 cid = -1, 
-	      u_char sid = 0, 
-	      u_char type = 0)
-    : conn_id_ (cid), 
-      supplier_id_ (sid), 
-      type_ (type) {}
-
-  int operator== (const Event_Key &event_addr) const
-  {
-    return this->conn_id_ == event_addr.conn_id_ 
-      && this->supplier_id_ == event_addr.supplier_id_
-      && this->type_ == event_addr.type_;
-  }
-
-  ACE_INT32 conn_id_;
-  // Unique connection identifier that denotes a particular
-  // Proxy_Handler.
-
-  ACE_INT32 supplier_id_;
-  // Logical ID.
-
-  ACE_INT32 type_;
-  // Event type.
-};
-
-class Event_Header
-  // = TITLE
-  //     Fixed sized header.
-  //
-  // = DESCRIPTION
-  //     This is designed to have a sizeof (16) to avoid alignment
-  //     problems on most platforms.
-{
-public:
-  typedef ACE_INT32 SUPPLIER_ID;
-  // Type used to forward events from gatewayd.
-
-  enum
-  {
-    INVALID_ID = -1 // No peer can validly use this number.
-  };
-
-  void decode (void)
-    {
-      this->len_ = ntohl (this->len_);
-      this->supplier_id_ = ntohl (this->supplier_id_);
-      this->type_ = ntohl (this->type_);
-      this->priority_ = ntohl (this->priority_);
-    }
-  // Decode from network byte order to host byte order.
-
-  void encode (void)
-    {
-      this->len_ = htonl (this->len_);
-      this->supplier_id_ = htonl (this->supplier_id_);
-      this->type_ = htonl (this->type_);
-      this->priority_ = htonl (this->priority_);
-    }
-  // Encode from host byte order to network byte order.
-
-  size_t len_;
-  // Length of the data_ payload, in bytes.
-
-  SUPPLIER_ID supplier_id_;
-  // Source ID.
-
-  ACE_INT32 type_;
-  // Event type.
-
-  ACE_INT32 priority_;
-  // Event priority.
-};
-
-class Event
-  // = TITLE
-  //    Variable-sized event (data_ may be variable-sized between
-  //    0 and MAX_PAYLOAD_SIZE).
-{
-public:
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-  // The maximum size of an Event.
-
-  Event_Header header_;
-  // Event header.
-
-  char data_[MAX_PAYLOAD_SIZE];
-  // Event data.
-};
-
-#endif /* EVENT */
diff --git a/apps/Gateway/Peer/Gateway_Handler.cpp b/apps/Gateway/Peer/Gateway_Handler.cpp
deleted file mode 100644
index cfc9a7dad6f..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "ace/Get_Opt.h"
-// $Id$
-
-
-#include "Gateway_Handler.h"
-
-Gateway_Handler::Gateway_Handler (ACE_Thread_Manager *)
-  : routing_id_ (0),
-    msg_frag_ (0),
-    total_bytes_ (0)
-{
-  this->msg_queue ()->high_water_mark (Gateway_Handler::QUEUE_SIZE);
-}
-
-int
-Gateway_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %S\n", signum));
-
-  // Shut down the main event loop.
-  ACE_Service_Config::end_reactor_event_loop ();
-  return 0;
-}
-
-// Cache a binding to the HANDLER_MAP.
-
-void
-Gateway_Handler::map (HANDLER_MAP *m)
-{
-  this->map_ = m;
-}
-
-// Upcall from the ACE_Acceptor::handle_input() that turns control
-// over to our application-specific Gateway handler.
-
-int
-Gateway_Handler::open (void *a)
-{
-  ACE_DEBUG ((LM_DEBUG, "Gateway handler's fd = %d\n", 
-	     this->peer ().get_handle ()));
-
-  // Call down to the base class to activate and register this
-  // handler.
-  if (this->inherited::open (a) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enable"), -1);    
-
-  Gateway_Handler *this_ = this;
-
-  // Add ourselves to the map so we can be removed later on.
-  if (this->map_->bind (this->get_handle (), this_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "bind"), -1);    
-
-  char *to = ACE_OS::getenv ("TIMEOUT");
-  int timeout = to == 0 ? 100000 : ACE_OS::atoi (to);
-
-  // Schedule the time between disconnects.  This should really be a
-  // "tunable" parameter.
-  if (ACE_Service_Config::reactor ()->schedule_timer (this, 0, timeout) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
-
-  // If there are messages left in the queue, make sure we 
-  // enable the ACE_Reactor appropriately to get them sent out.
-  if (this->msg_queue ()->is_empty () == 0
-      && ACE_Service_Config::reactor ()->schedule_wakeup (this, 
-							  ACE_Event_Handler::WRITE_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-
-  // First action is to wait to be notified of our routing id.
-  this->do_action_ = &Gateway_Handler::await_route_id;
-  return 0;
-}
-
-// Read messages from stdin and send them to the gatewayd.
-
-int
-Gateway_Handler::xmit_stdin (void)
-{
-  if (this->routing_id_ != -1)
-    {
-      ssize_t n;
-      ACE_Message_Block *mb;
-
-      ACE_NEW_RETURN (mb, 
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      Event *peer_msg = (Event *) mb->rd_ptr ();
-      peer_msg->header_.routing_id_ = this->routing_id_;
-
-      n = ACE_OS::read (ACE_STDIN, peer_msg->buf_, sizeof peer_msg->buf_);
-
-      switch (n)
-	{
-	case 0:
-	  ACE_DEBUG ((LM_DEBUG, "stdin closing down\n"));
-
-	  // Take stdin out of the ACE_Reactor so we stop trying to
-	  // send messages.
-	  if (ACE_Service_Config::reactor ()->remove_handler 
-	      (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n", "remove_handler"));
-	  delete mb;
-	  break;
-	case -1:
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-	  break;
-	default:
-	  peer_msg->header_.len_ = htonl (n);
-	  mb->wr_ptr (sizeof (Peer_Header) + n);
-
-	  if (this->put (mb) == -1)
-	    {
-	      if (errno == EWOULDBLOCK) // The queue has filled up!
-		ACE_ERROR ((LM_ERROR, "%p\n", 
-			   "gateway is flow controlled, so we're dropping messages"));
-	      else
-		ACE_ERROR ((LM_ERROR, "%p\n", "transmission failure in xmit_stdin"));
-	      
-	      // Caller is responsible for freeing a ACE_Message_Block
-	      // if failures occur.
-	      delete mb;
-	    }
-	}
-    }
-  return 0;
-}
-
-// Perform a non-blocking put() of message MB.  If we are unable to
-// send the entire message  the remainder is re-Taskd at the *front* of
-// the Message_List.
-
-int
-Gateway_Handler::nonblk_put (ACE_Message_Block *mb)
-{
-  // Try to send the message.  If we don't send it all (e.g., due to
-  // flow control), then re-ACE_Task the remainder at the head of the
-  // Message_List and ask the ACE_Reactor to inform us (via
-  // handle_output()) when it is possible to try again.
-
-  ssize_t n;
-
-  if ((n = this->send_peer (mb)) == -1)
-    return -1;
-  else if (errno == EWOULDBLOCK) // Didn't manage to send everything.
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "queueing activated on handle %d to routing id %d\n",
-		 this->get_handle (), this->routing_id_));
-
-      // ACE_Queue in *front* of the list to preserve order.
-      if (this->msg_queue ()->enqueue_head 
-	  (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "enqueue_head"), -1);
-      
-      // Tell ACE_Reactor to call us back when we can send again.
-      if (ACE_Service_Config::reactor ()->schedule_wakeup
-	  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_wakeup"), -1);
-      return 0;
-    }
-  else
-    return n;
-}
-
-// Finish sending a message when flow control conditions abate.  This
-// method is automatically called by the ACE_Reactor.
-
-int 
-Gateway_Handler::handle_output (ACE_HANDLE)
-{
-  ACE_Message_Block *mb = 0;
-  
-  ACE_DEBUG ((LM_DEBUG, "in handle_output\n"));
-  // The list had better not be empty, otherwise there's a bug!
-
-  if (this->msg_queue ()->dequeue_head 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) != -1)
-    {
-      switch (this->nonblk_put (mb))
-	{
-	case 0: 	  // Partial send.
-	  ACE_ASSERT (errno == EWOULDBLOCK);
-	  // Didn't write everything this time, come back later...
-	  break;
-
-	case -1:
-	  // Caller is responsible for freeing a ACE_Message_Block if
-	  // failures occur.
-	  delete mb;
-	  ACE_ERROR ((LM_ERROR, "%p\n", 
-		      "transmission failure in handle_output"));
-
-	  /* FALLTHROUGH */
-	default: // Sent the whole thing.
-	  
-	  // If we succeed in writing the entire message (or we did
-	  // not fail due to EWOULDBLOCK) then check if there are more
-	  // messages on the Message_List.  If there aren't, tell the
-	  // ACE_Reactor not to notify us anymore (at least until
-	  // there are new messages queued up).
-
-	  if (this->msg_queue ()->is_empty ())
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "queue now empty on handle %d to routing id %d\n",
-			  this->get_handle (), 
-			  this->routing_id_));
-
-	      if (ACE_Service_Config::reactor ()->cancel_wakeup
-		  (this, ACE_Event_Handler::WRITE_MASK) == -1)
-		ACE_ERROR ((LM_ERROR, "%p\n", "cancel_wakeup"));
-	    }
-	}
-    }
-  else 
-    ACE_ERROR ((LM_ERROR, "%p\n", "dequeue_head"));
-  return 0;      
-}
-
-// Send a message to a peer (may ACE_Task if necessary).
-
-int 
-Gateway_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *)
-{
-  if (this->msg_queue ()->is_empty ())
-    // Try to send the message *without* blocking!
-    return this->nonblk_put (mb); 
-  else
-    // If we have queued up messages due to flow control then just
-    // enqueue and return.
-    return this->msg_queue ()->enqueue_tail 
-      (mb, (ACE_Time_Value *) &ACE_Time_Value::zero); 
-}
-
-// Send an Peer message to gatewayd.
-
-int
-Gateway_Handler::send_peer (ACE_Message_Block *mb)
-{
-  ssize_t n;	
-  size_t len = mb->length ();
-
-  if ((n = this->peer ().send (mb->rd_ptr (), len)) <= 0)
-    return errno == EWOULDBLOCK ? 0 : n;
-  else if (n < (ssize_t) len)
-    {
-      // Re-adjust pointer to skip over the part we did send.
-      mb->rd_ptr (n);
-      this->total_bytes_ += n;
-    }
-  else /* if (n == length) */
-    {
-      // The whole message is sent, we can now safely deallocate the
-      // buffer.  Note that this should decrement a reference count...
-      this->total_bytes_ += n;
-      delete mb;
-      errno = 0;
-    }
-  ACE_DEBUG ((LM_DEBUG, "sent %d bytes, total bytes sent = %d\n",
-	     n, this->total_bytes_));
-  return n;
-}
-
-// Receive an Peer message from gatewayd.  Handles fragmentation.
-
-int
-Gateway_Handler::recv_peer (ACE_Message_Block *&mb)
-{ 
-  Event *peer_msg;
-  size_t       len;
-  ssize_t      n;
-  size_t       offset = 0;
-
-  if (this->msg_frag_ == 0)
-    {
-      ACE_NEW_RETURN (this->msg_frag_,
-		      ACE_Message_Block (sizeof (Event)),
-		      -1);
-
-      // No existing fragment...
-      if (this->msg_frag_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "out of memory\n"), -1);
-
-      peer_msg = (Event *) this->msg_frag_->rd_ptr ();
-
-      switch (n = this->peer ().recv (peer_msg, sizeof (Peer_Header)))
-	{
-	case sizeof (Peer_Header):
-	  len = ntohl (peer_msg->header_.len_);
-	  if (len <= sizeof peer_msg->buf_)
-	    {
-	      this->msg_frag_->wr_ptr (sizeof (Peer_Header));
-	      break; // The message is within the maximum size range.
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "message too long = %d\n", len));
-	  /* FALLTHROUGH */
-	default:
-	  ACE_ERROR ((LM_ERROR, "invalid length = %d\n", n));
-	  n = -1;
-	  /* FALLTHROUGH */
-	case -1:
-	  /* FALLTHROUGH */
-	case 0:
-	  // Make sure to free up memory on error returns.
-	  delete this->msg_frag_;
-	  this->msg_frag_ = 0;
-	  return n;
-	}
-    }
-  else
-    {
-      offset = this->msg_frag_->length () - sizeof (Peer_Header);
-      len    = peer_msg->header_.len_ - offset;
-    }
-
-  switch (n = this->peer ().recv (peer_msg->buf_ + offset, len))
-    {
-    case -1:
-      if (errno == EWOULDBLOCK) 
-	{
-          // This shouldn't happen since the ACE_Reactor
-	  // just triggered us to handle pending I/O!
-	  ACE_DEBUG ((LM_DEBUG, "unexpected recv failure\n"));
-	  // Since ACE_DEBUG might change errno, we need to reset it
-	  // here.
-	  errno = EWOULDBLOCK;
-	  return -1;
-        }
-      else
-	/* FALLTHROUGH */;
-
-    case 0: // EOF.
-      delete this->msg_frag_;
-      this->msg_frag_ = 0;
-      return n;
-
-    default:
-      if (n != (ssize_t) len)
-	// Re-adjust pointer to skip over the part we've read.
-	{
-	  this->msg_frag_->wr_ptr (n);
-	  errno = EWOULDBLOCK;
-	  // Inform caller that we didn't get the whole message.
-	  return -1; 
-	}
-      else
-	{
-	  // Set the write pointer at 1 past the end of the message.
-	  this->msg_frag_->wr_ptr (n);
-
-	  // Set the read pointer to the beginning of the message.
-	  this->msg_frag_->rd_ptr (this->msg_frag_->base ());
-
-	  mb = this->msg_frag_;
-
-	  // Reset the pointer to indicate we've got an entire
-	  // message.
-	  this->msg_frag_ = 0; 
-	}
-      return n;
-    }
-}
-
-// Receive various types of input (e.g., Peer message from the
-// gatewayd, as well as stdio).
-
-int 
-Gateway_Handler::handle_input (ACE_HANDLE sd)
-{
-  ACE_DEBUG ((LM_DEBUG, "in handle_input, sd = %d\n", sd));
-  if (sd == ACE_STDIN) // Handle message from stdin.
-    return this->xmit_stdin ();
-  else
-    // Perform the appropriate action depending on the state we are
-    // in.
-    return (this->*do_action_) ();
-}
-
-// Action that receives the route id.  
-
-int
-Gateway_Handler::await_route_id (void)
-{
-  ssize_t n = this->peer ().recv (&this->routing_id_, 
-				  sizeof this->routing_id_);
-
-  if (n != sizeof this->routing_id_)
-    {
-      if (n == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "gatewayd has closed down unexpectedly\n"), -1);
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "%p, bytes received on handle %d = %d\n", 
-			  "recv", this->get_handle (), n), -1);
-    }
-  else
-    ACE_DEBUG ((LM_DEBUG, "assigned routing id %d\n", 
-		this->routing_id_));
-
-  // Transition to the action that waits for Peer messages.
-  this->do_action_ = &Gateway_Handler::await_messages;
-
-  // Reset standard input.
-  ACE_OS::rewind (stdin);
-
-  // Register this handler to receive test messages on stdin.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (ACE_STDIN, this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Action that receives messages.
-
-int
-Gateway_Handler::await_messages (void)
-{
-  ACE_Message_Block *mb = 0;
-  ssize_t n = this->recv_peer (mb);
-
-  switch (n)
-    {
-    case 0:
-      ACE_ERROR_RETURN ((LM_ERROR, "gatewayd has closed down\n"), -1);
-      /* NOTREACHED */
-    case -1:
-      if (errno == EWOULDBLOCK)
-	// A short-read, we'll come back and finish it up later on!
-	return 0;
-      else
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv_peer"), -1);
-      /* NOTREACHED */
-    default:
-      {
-	// We got a valid message, so let's process it now!  At the
-	// moment, we just print out the message contents...
-
-	Event  *peer_msg = (Event *) mb->rd_ptr ();
-	this->total_bytes_ += mb->length ();
-
-#if defined (VERBOSE)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, len = %d, payload = %*s",
-		   peer_msg->header_.routing_id_, peer_msg->header_.len_,
-		   peer_msg->header_.len_, peer_msg->buf_));
-#else
-	ACE_DEBUG ((LM_DEBUG, 
-		    "route id = %d, cur len = %d, total len = %d\n",
-		    peer_msg->header_.routing_id_, 
-		    peer_msg->header_.len_, 
-		    this->total_bytes_));
-#endif
-	delete mb;
-	return 0;
-      }
-    }
-}
-
-// Periodically send messages via ACE_Reactor timer mechanism.
-
-int
-Gateway_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-{
-  // Skip over deactivated descriptors.
-  if (this->get_handle () != -1)
-    {
-      // Unbind ourselves from the map.
-      if (this->map_->unbind (this->get_handle ()) == -1)
-	ACE_ERROR ((LM_ERROR, "%p\n", "unbind"));
-
-      // Shut down the handler.
-      this->handle_close ();
-    }
-  return 0;
-}
-
-// Handle shutdown of the Gateway_Handler object.
-
-int
-Gateway_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutting down Gateway_Handler on handle %d\n", 
-		 this->get_handle ()));
-
-      // Explicitly remove ourselves for handle 0 (the ACE_Reactor
-      // removes this->handle (), note that
-      // ACE_Event_Handler::DONT_CALL instructs the ACE_Reactor *not*
-      // to call this->handle_close(), which would otherwise lead to
-      // recursion!).
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (0, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK) == -1)
-	ACE_ERROR ((LM_ERROR, "handle = %d: %p\n", 
-		   0, "remove_handler"));
-
-      // Deregister this handler with the ACE_Reactor.
-      if (ACE_Service_Config::reactor ()->remove_handler 
-	  (this, ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::RWE_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "handle = %d: %p\n", 
-			  this->get_handle (), "remove_handler"), -1);
-
-      // Close down the peer.
-      this->peer ().close ();
-    }
-  return 0;
-}
-
-Gateway_Acceptor::Gateway_Acceptor (Gateway_Handler *handler)
-  : gateway_handler_ (handler)
-{
-  this->gateway_handler_->map (&this->map_);
-}
-
-// Note how this method just passes back the pre-allocated
-// Gateway_Handler instead of having the ACE_Acceptor allocate a new
-// one each time!
-
-Gateway_Handler *
-Gateway_Acceptor::make_svc_handler (void)
-{
-  return this->gateway_handler_;
-}
-
-int 
-Gateway_Acceptor::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal %S occurred\n", signum));
-  return 0;
-}
-
-/* Returns information on the currently active service. */
-
-int
-Gateway_Acceptor::info (char **strp, size_t length) const
-{
-  char buf[BUFSIZ];
-  char addr_str[BUFSIZ];
-
-  ACE_INET_Addr addr;
-
-  if (this->acceptor ().get_local_addr (addr) == -1)
-    return -1;
-  else if (addr.addr_to_string (addr_str, sizeof addr) == -1)
-    return -1;
-
-  ACE_OS::sprintf (buf, "%s\t %s/%s %s",
-	     "Gateway peer daemon", addr_str, "tcp",
-	     "# IRIDIUM SRP traffic generator and data sink\n");
-
-  if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
-    return -1;
-  else
-    ACE_OS::strncpy (*strp, buf, length);
-  return ACE_OS::strlen (buf);
-}
-
-// Hook called by the explicit dynamic linking facility to terminate
-// the peer.
-
-int
-Gateway_Acceptor::fini (void)
-{
-  HANDLER_ITERATOR mi (this->map_);
-  
-  for (MAP_ENTRY *me = 0;
-       mi.next (me) != 0; 
-       mi.advance ())
-    {
-      if (me->int_id_->get_handle () != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "closing down handle %d\n", 
-		      me->int_id_->get_handle ()));
-	  me->int_id_->handle_close ();
-	}
-      else
-	ACE_DEBUG ((LM_DEBUG, "already closed %d\n"));
-      me->int_id_->destroy (); // Will trigger a delete.
-    }
-
-  this->gateway_handler_->destroy (); // Will trigger a delete.
-  return inherited::fini ();
-}
-
-// Hook called by the explicit dynamic linking facility to initialize
-// the peer.
-
-int
-Gateway_Acceptor::init (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "dp:", 0);
-  ACE_INET_Addr addr;
-
-  for (int c; (c = get_opt ()) != -1; )
-    {
-      switch (c)
-	{
-	case 'p': 
-	  addr.set (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'd':
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  if (ACE_Service_Config::reactor ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
-    
-  if (this->open (addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Service_Config::reactor ()->register_handler 
-	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
-
-  ACE_Sig_Set sig_set;
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-
-  // Register ourselves to receive SIGINT and SIGQUIT so we can shut
-  // down gracefully via signals.
-  
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, 
-						 this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_handler"), -1);
-  return 0;
-}
-
-// Dynamically linked factory function that dynamically allocates a
-// new Gateway_Acceptor object.
-
-ACE_Service_Object *
-_alloc_peerd (void)
-{
-  // This function illustrates how we can associate a ACE_Svc_Handler
-  // with the ACE_Acceptor at initialization time.
-  Gateway_Handler *handler;
-  
-  ACE_NEW_RETURN (handler, Gateway_Handler, 0);
-  ACE_Service_Object *temp;
-  
-  ACE_NEW_RETURN (temp, Gateway_Acceptor (handler), 0);
-  return temp;
-}
diff --git a/apps/Gateway/Peer/Gateway_Handler.h b/apps/Gateway/Peer/Gateway_Handler.h
deleted file mode 100644
index 6dc4539e6b7..00000000000
--- a/apps/Gateway/Peer/Gateway_Handler.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-/* These Gateway handler classes process Peer messages sent from the
-   communication gateway daemon (gatewayd) to its various peers, e.g.,
-   CF and ETS, (represented collectively in this prototype as peerd).
-   .  These classes works as follows:
-   
-   1. Gateway_Acceptor creates a listener endpoint and waits passively
-      for gatewayd to connect with it.
-
-   2. When gatewayd connects, Gateway_Acceptor creates an
-      Gateway_Handler object that sends/receives messages from
-      gatewayd.
-
-   3. Gateway_Handler waits for gatewayd to inform it of its routing
-      ID, which is prepended to all outgoing messages send from peerd.
-
-   4. Once the routing ID is set, peerd periodically sends messages to
-      gatewayd.  Peerd also receives and "processes" messages
-      forwarded to it from gatewayd.  In this program, peerd
-      "processes" messages by writing them to stdout. */
-
-#if !defined (GATEWAY_HANDLER)
-#define GATEWAY_HANDLER
-
-#include "ace/Service_Config.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/INET_Addr.h"
-#include "ace/Map_Manager.h"
-#include "Peer_Message.h"
-
-// Forward declaration.
-class Gateway_Handler;
-
-// Maps a ACE_HANDLE onto a Gateway_Handler *.
-typedef ACE_Map_Manager <ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_MAP;
-typedef ACE_Map_Iterator<ACE_HANDLE, Gateway_Handler *, ACE_Null_Mutex> HANDLER_ITERATOR;
-typedef ACE_Map_Entry <ACE_HANDLE, Gateway_Handler *> MAP_ENTRY;
-
-// Handle Peer messages arriving as events. 
-
-class Gateway_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  Gateway_Handler (ACE_Thread_Manager * = 0);
-
-  virtual int open (void * = 0);
-  // Initialize the handler (called by ACE_Acceptor::handle_input())
-
-  virtual int handle_input (ACE_HANDLE);
-  // Receive and process peer messages.
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  // Send a message to a gateway (may be queued if necessary).
-
-  virtual int handle_output (ACE_HANDLE);
-  // Finish sending a message when flow control conditions abate.
-
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-  // Periodically send messages via ACE_Reactor timer mechanism.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, 
-			    ACE_Reactor_Mask = ACE_Event_Handler::RWE_MASK);
-  // Perform object termination.
-
-  void map (HANDLER_MAP *);
-  // Cache a binding to the HANDLER_MAP.
-
-protected:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> inherited;
-
-  // We'll allow up to 16 megabytes to be queued per-output
-  // channel!!!!  This is clearly a policy in search of refinement...
-  enum { QUEUE_SIZE = 1024 * 1024 * 16 };
-
-  int handle_signal (int signum, siginfo_t *, ucontext_t *);
-
-  Peer_Header::ROUTING_ID routing_id_;
-  // Routing ID of the peer (obtained from gatewayd).
-
-  virtual int nonblk_put (ACE_Message_Block *mb);
-  // Perform a non-blocking put().
-
-  virtual int recv_peer (ACE_Message_Block *&);
-  // Receive an Peer message from gatewayd.
-
-  virtual int send_peer (ACE_Message_Block *);
-  // Send an Peer message to gatewayd.
-
-  int xmit_stdin (void);
-  // Receive a message from stdin and send it to the gateway.
-
-  int (Gateway_Handler::*do_action_) (void);
-  // Pointer-to-member-function for the current action to run in this state.
-
-  int await_route_id (void);
-  // Action that receives the route id.  
-
-  int await_messages (void);
-  // Action that receives messages.
-
-  ACE_Message_Block *msg_frag_;
-  // Keep track of message fragment to handle non-blocking recv's from gateway.
-
-  size_t total_bytes_;
-  // The total number of bytes sent/received to the gateway.
-
-  HANDLER_MAP *map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-};
-
-// A factory class that accept connections from gatewayd and
-// dynamically creates a new Gateway_Handler object to do the dirty work.
-
-class Gateway_Acceptor : public ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR>
-{
-public:  
-  // = Initialization methods, called when dynamically linked.
-  Gateway_Acceptor (Gateway_Handler *handler);
-  virtual int init (int argc, char *argv[]);
-  // Initialize the acceptor.
-
-  virtual int info (char **, size_t) const;
-  // Return info about this service.
-
-  virtual int fini (void);
-  // Perform termination.
-
-  virtual Gateway_Handler *make_svc_handler (void);
-  // Factory method that creates the Gateway_Handler once.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Handle various signals (e.g., SIGPIPE)
-
-  HANDLER_MAP map_;
-  // Maps the ACE_HANDLE onto the Gateway_Handler *.
-  
-  Gateway_Handler *gateway_handler_;
-  // Pointer to memory allocated exactly once.
-
-  typedef ACE_Acceptor<Gateway_Handler, ACE_SOCK_ACCEPTOR> inherited;
-};
-
-// Factory function that allocates a new Peer daemon.
-extern "C" ACE_Service_Object *_alloc_peerd (void);
-
-#endif /* GATEWAY_HANDLER */
-
diff --git a/apps/Gateway/Peer/Peer_Message.h b/apps/Gateway/Peer/Peer_Message.h
deleted file mode 100644
index 67f57f148cb..00000000000
--- a/apps/Gateway/Peer/Peer_Message.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Define the Peer message schema (this may change).
-
-#if !defined (PEER_MESSAGE)
-#define PEER_MESSAGE
-
-// Fixed sized header.
-
-class Peer_Header
-{
-public:
-// Type used to route messages from gatewayd.
-  typedef short ROUTING_ID;
-
-  enum
-  {
-    INVALID_ID = -1 // No peer may use this number.
-  };
-
-  // Source ID.
-  ROUTING_ID routing_id_;
-
-  // Length of the message in bytes.
-  size_t  len_;
-};
-
-// Variable-sized message (buf_ may be variable-sized between
-// 0 and MAX_PAYLOAD_SIZE).
-
-class Peer_Message
-{
-public:
-  // The maximum size of an Peer message (see Peer protocol specs for exact #).
-  enum { MAX_PAYLOAD_SIZE = 1024 };
-
-  Peer_Header header_;
-
-  // Message payload
-  char buf_[MAX_PAYLOAD_SIZE];
-};
-
-#endif /* PEER_MESSAGE */
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10.cpp b/apps/JAWS/PROTOTYPE/HTTP_10.cpp
deleted file mode 100644
index e4644c78fdf..00000000000
--- a/apps/JAWS/PROTOTYPE/HTTP_10.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#include "JAWS/HTTP_10.h"
-
-JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task (void)
-{
-}
-
-JAWS_HTTP_10_Read_Task::~JAWS_HTTP_10_Read_Task (void)
-{
-}
-
-int
-JAWS_HTTP_10_Read_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
-{
-  JAWS_Dispatch_Policy *policy = data->policy ();
-  JAWS_IO_Handler *handler = data->handler ();
-  JAWS_Pipeline_Handler *task = data->task ();
-
-  JAWS_IO *io = policy->io ();
-}
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10.h b/apps/JAWS/PROTOTYPE/HTTP_10.h
deleted file mode 100644
index acf174e2aa7..00000000000
--- a/apps/JAWS/PROTOTYPE/HTTP_10.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_HTTP_10_H)
-#define JAWS_HTTP_10_H
-
-#include "JAWS/Data_Block.h"
-
-class JAWS_HTTP_10_Read_Task : public JAWS_Pipeline_Handler
-{
-public:
-  JAWS_HTTP_10_Read_Task (void);
-  virtual ~JAWS_HTTP_10_Read_Task (void);
-
-  virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv)
-
-private:
-};
-
-#endif /* !defined (JAWS_HTTP_10_H) */
diff --git a/apps/JAWS/PROTOTYPE/HTTP_Policy.cpp b/apps/JAWS/PROTOTYPE/HTTP_Policy.cpp
deleted file mode 100644
index 9b8d3dd36a6..00000000000
--- a/apps/JAWS/PROTOTYPE/HTTP_Policy.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-#include "HTTP_Policy.h"
-
-HTTP_Policy::HTTP_Policy (JAWS_Concurrency *concurrency)
-  : concurrency_ (concurrency)
-{
-}
-
-JAWS_Concurrency_Base *
-HTTP_Policy update (void *)
-{
-  /* for now, we always return the same concurrency strategy */
-  returh this->concurrency_;
-}
diff --git a/apps/JAWS/PROTOTYPE/HTTP_Policy.h b/apps/JAWS/PROTOTYPE/HTTP_Policy.h
deleted file mode 100644
index 38e4314b272..00000000000
--- a/apps/JAWS/PROTOTYPE/HTTP_Policy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (HTTP_POLICY_H)
-#define HTTP_POLICY_H
-
-#include "JAWS/Concurrency.h"
-
-/* create a policy */
-class HTTP_Policy : public JAWS_Dispatch_Policy
-{
-public:
-  HTTP_Policy (JAWS_Concurrency_Base *concurrency);
-  virtual JAWS_Concurrency_Base * update (void *state = 0);
-
-private:
-  JAWS_Concurrency_Base *concurrency_;
-};
-
-
-#endif /* !defined (HTTP_POLICY_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.cpp b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.cpp
deleted file mode 100644
index 107ce4a68dc..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// $Id$
-
-#include "JAWS/Concurrency.h"
-#include "JAWS/Pipeline.h"
-#include "JAWS/Policy.h"
-#include "JAWS/Data_Block.h"
-
-JAWS_Concurrency_Base::JAWS_Concurrency_Base (void)
-{
-}
-
-int
-JAWS_Concurrency_Base::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{
-  return this->putq (mb, tv);
-}
-
-int
-JAWS_Concurrency_Base::svc (void)
-{
-  int result = 0;
-
-  for (;;)
-    {
-      ACE_Message_Block *mb;
-
-      // At this point we could set a timeout value so that the
-      // threading strategy can delete a thread if there is nothing to
-      // do.  Carefully think how to implement it so you don't leave
-      // yourself with 0 threads.
-
-      result = this->getq (mb);
-
-      // Use a NULL message block to indicate that the thread should shut
-      // itself down
-      if (result == -1 || mb == 0)
-        break;
-
-      do
-        {
-          JAWS_Data_Block *db;
-          JAWS_Pipeline_Task *task;
-
-          db = ACE_dynamic_cast (JAWS_Data_Block *, mb->data_block ());
-          task = db->task ();
-
-          // Use a NULL task to make the thread recycle now
-          if (task == 0)
-            break;
-
-          result = task->put (mb);
-          if (result == -1)
-            ACE_ERROR ((LM_ERROR, "%p\n", "JAWS_Concurrency_Base::svc"));
-        }
-      while (result == 0);
-    }
-  return 0;
-}
-
-JAWS_Dispatcher::JAWS_Dispatcher (void)
-  : policy_(0)
-{
-}
-
-int
-JAWS_Dispatcher::dispatch (ACE_Message_Block *mb)
-{
-  return this->policy ()->concurrency ()->put (mb);
-}
-
-JAWS_Dispatch_Policy *
-JAWS_Dispatcher::policy (void)
-{
-  return this->policy_;
-}
-
-JAWS_Dispatch_Policy *
-JAWS_Dispatcher::policy (JAWS_Dispatch_Policy *p)
-{
-  this->policy_ = p;
-  return this->policy_;
-}
-
-int
-JAWS_Thread_Pool_Task::open (long flags, int nthreads, int maxthreads)
-{
-  this->nthreads_ = nthreads;
-  this->maxthreads_ = maxthreads;
-
-  if (this->activate (flags, nthreads) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "JAWS_Thread_Pool_Task::activate"),
-                      -1);
-}
-
-int
-JAWS_Thread_Per_Task::open (long flags, int maxthreads)
-{
-  this->flags_ = flags;
-  this->maxthreads_ = maxthreads;
-  return 0;
-}
-
-int
-JAWS_Thread_Per_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{
-  const int force_active = 1;
-  const int nthreads = 1;
-
-  if (this->activate (this->flags_, nthreads, force_active) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "JAWS_Thread_Pool_Task::activate"),
-                      -1);
-
-  this->putq (mb, tv);
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Dispatcher, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Thread_Pool_Task, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Thread_Per_Task, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Dispatcher, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_Thread_Pool_Task, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_Thread_Per_Task, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h
deleted file mode 100644
index 50c8e3f8e28..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_CONCURRENCY_H)
-#define JAWS_CONCURRENCY_H
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-
-#include "JAWS/IO.h"
-
-class JAWS_Dispatch_Policy;
-
-class JAWS_Concurrency_Base : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Base class for different concurrency models
-  //
-  // = DESCRIPTION
-  //     Provides a default implementaion of the virtual put() method
-  //     which calls putq(), but can be overloaded to do something
-  //     synchronously, such as call put_next().
-
-{
-public:
-  JAWS_Concurrency_Base (void);
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-};
-
-class JAWS_Dispatcher
-  // = TITLE
-  //     The class that is responsible to delivering events to the
-  //     appropriate concurrency mechanism.
-  //
-  // = DESCRIPTION
-  //     JAWS_IO_Handler calls into the dispatcher so that the completed
-  //     IO can find a thread to take care of it.
-{
-public:
-  JAWS_Dispatcher (void);
-
-  int dispatch (ACE_Message_Block *mb);
-  JAWS_Dispatch_Policy *policy (void);
-  JAWS_Dispatch_Policy *policy (JAWS_Dispatch_Policy *p);
-
-private:
-  JAWS_Dispatch_Policy *policy_;
-};
-
-class JAWS_Thread_Pool_Task : public JAWS_Concurrency_Base
-  // = TITLE
-  //     Used to implement Thread Pool Concurrency Strategy
-  //
-  // = DESCRIPTION
-  //     This task is created to hold a pool of threads that receive
-  //     requests through the message queue.
-{
-public:
-  virtual int open (long flags = THR_NEW_LWP,
-                    int nthreads = 5, int maxthreads = 20);
-  // Initiate the thread_pool task
-
-private:
-  int nthreads_;
-  int maxthreads_;
-};
-
-class JAWS_Thread_Per_Task : public JAWS_Concurrency_Base
-  // = TITLE
-  //     Used to implement Thread Per Request Concurrency Strategy
-  //
-  // = DESCRIPTION
-  //     As each new message arrives from the queue, a new thread is
-  //     spawned to handle it.  This is done by overloading put to call
-  //     activate.
-{
-public:
-  JAWS_Thread_Per_Task (long flags = THR_NEW_LWP, int maxthreads = 20);
-
-  virtual int open (long flags = THR_NEW_LWP, int maxthreads = 20);
-  // Initiate the thread_per task
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-
-private:
-  long flags_;
-  int maxthreads_;
-};
-
-typedef ACE_Singleton<JAWS_Dispatcher, ACE_SYNCH_MUTEX>
-        JAWS_Dispatcher_Singleton;
-
-typedef ACE_Singleton<JAWS_Thread_Pool_Task, ACE_SYNCH_MUTEX>
-        JAWS_Thread_Pool_Singleton;
-
-typedef ACE_Singleton<JAWS_Thread_Per_Task, ACE_SYNCH_MUTEX>
-        JAWS_Thread_Per_Singleton;
-
-#endif /* !defined (JAWS_CONCURRENCY_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.cpp b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.cpp
deleted file mode 100644
index 4225659b5c0..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-
-#include "JAWS/Data_Block.h"
-#include "JAWS/Policy.h"
-
-JAWS_Pipeline_Handler *
-JAWS_Data_Block::task (void)
-{
-  return this->task_;
-}
-
-JAWS_IO_Handler *
-JAWS_Data_Block::io_handler (void)
-{
-  return this->io_handler_;
-}
-
-JAWS_Dispatch_Policy *
-JAWS_Data_Block::policy (void)
-{
-  return this->policy_;
-}
-
-void
-JAWS_Data_Block::task (JAWS_Pipeline_Handler *taskp)
-{
-  this->task_ = taskp;
-}
-
-void
-JAWS_Data_Block::io_handler (JAWS_IO_Handler *handlerp)
-{
-  this->io_handler_ = handlerp;
-}
-
-void
-JAWS_Data_Block::policy (JAWS_Dispatch_Policy *policyp)
-{
-  this->policy_ = policyp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h
deleted file mode 100644
index 62dcdf0a66b..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_DATA_BLOCK_H)
-#define JAWS_DATA_BLOCK_H
-
-#include "ace/Singleton.h"
-#include "JAWS/Pipeline.h"
-
-class JAWS_IO_Handler;
-class JAWS_Dispatch_Policy;
-class JAWS_Data_Block;
-
-typedef JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-        JAWS_Pipeline_Handler;
-
-class JAWS_Data_Block : public ACE_Data_Block
-// = TITLE
-//   Defines the communication unit between pipeline components
-{
-public:
-  JAWS_Pipeline_Handler *task (void);
-  JAWS_IO_Handler *io_handler (void);
-  JAWS_Dispatch_Policy *policy (void);
-
-  void task (JAWS_Pipeline_Handler *taskp);
-  void io_handler (JAWS_IO_Handler * handlerp);
-  void policy (JAWS_Dispatch_Policy * policyp);
-
-private:
-  JAWS_IO_Handler *io_handler_;
-  JAWS_Dispatch_Policy *policy_;
-  JAWS_Pipeline_Handler *task_;
-};
-
-#endif /* !defined (JAWS_DATA_BLOCK_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
deleted file mode 100644
index b499e459448..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-// $Id$
-
-#include "JAWS/IO.h"
-#include "JAWS/IO_Handler.h"
-#include "JAWS/IO_Acceptor.h"
-
-// #include "HTTP_Helpers.h"
-
-#include "ace/Message_Block.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Filecache.h"
-
-JAWS_IO::JAWS_IO (void)
-  : handle_ (ACE_INVALID_HANDLE),
-    handler_ (0),
-    inet_addr_ (0),
-    acceptor_ (0)
-{
-}
-
-JAWS_IO::~JAWS_IO (void)
-{
-}
-
-#if 0
-ACE_HANDLE
-JAWS_IO::handle (void)
-{
-  return this->handle_;
-}
-
-void
-JAWS_IO::handle (ACE_HANDLE handle)
-{
-  this->handle_ = handle;
-}
-
-void
-JAWS_IO::handler (JAWS_IO_Handler *handler)
-{
-  this->handler_ = handler;
-}
-
-void
-JAWS_IO::acceptor (JAWS_IO_Acceptor *acceptor)
-{
-  this->acceptor_ = acceptor;
-}
-#endif /* 0 */
-
-JAWS_Synch_IO::JAWS_Synch_IO (void)
-{
-  this->acceptor_ = JAWS_IO_Synch_Acceptor_Singleton::instance ();
-}
-
-JAWS_Synch_IO::~JAWS_Synch_IO (void)
-{
-  ACE_OS::closesocket (this->handle_);
-}
-
-void
-JAWS_Synch_IO::accept (JAWS_IO_Handler *ioh)
-{
-  ACE_SOCK_Stream new_stream;
-  if (this->acceptor_->accept (new_stream) == -1)
-    ioh->accept_error ();
-  else
-    ioh->accept_complete (new_stream.get_handle ());
-}
-
-void
-JAWS_Synch_IO::read (JAWS_IO_Handler *ioh,
-                     ACE_Message_Block &mb,
-                     int size)
-{
-  ACE_SOCK_Stream stream;
-
-  stream.set_handle (ioh->handle ());
-  int result = stream.recv (mb.wr_ptr (), size);
-
-  if (result <= 0)
-    ioh->read_error ();
-  else
-    {
-      mb.wr_ptr (result);
-      ioh->read_complete (mb);
-    }
-}
-
-void
-JAWS_Synch_IO::receive_file (JAWS_IO_Handler *ioh,
-                             const char *filename,
-                             void *initial_data,
-                             int initial_data_length,
-                             int entire_length)
-{
-  ACE_Filecache_Handle handle (filename, entire_length);
-
-  int result = handle.error ();
-
-  if (result == ACE_Filecache_Handle::SUCCESS)
-    {
-      ACE_SOCK_Stream stream;
-      stream.set_handle (ioh->handle ());
-
-      int bytes_to_memcpy = ACE_MIN (entire_length, initial_data_length);
-      ACE_OS::memcpy (handle.address (), initial_data, bytes_to_memcpy);
-
-      int bytes_to_read = entire_length - bytes_to_memcpy;
-
-      int bytes = stream.recv_n ((char *)
-                                 handle.address () + initial_data_length,
-                                 bytes_to_read);
-      if (bytes == bytes_to_read)
-        ioh->receive_file_complete ();
-      else
-        result = -1;
-    }
-
-  if (result != ACE_Filecache_Handle::SUCCESS)
-    ioh->receive_file_error (result);
-}
-
-void
-JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
-                              const char *filename,
-                              const char *header,
-                              int header_size,
-                              const char *trailer,
-                              int trailer_size)
-{
-  ACE_Filecache_Handle handle (filename);
-
-  int result = handle.error ();
-
-  if (result == ACE_Filecache_Handle::SUCCESS)
-    {
-#if defined (ACE_JAWS_BASELINE)
-      ACE_SOCK_Stream stream;
-      stream.set_handle (ioh->handle ());
-
-      if ((stream.send_n (header, header_size) == header_size)
-          && ((u_long) stream.send_n (handle.address (), handle.size ())
-              == handle.size ())
-          && (stream.send_n (trailer, trailer_size) == trailer_size))
-        this->handler_->transmit_file_complete ();
-      else
-        result = -1;
-#else
-      // Attempting to use writev
-      // Is this faster?
-      struct iovec iov[3];
-      int iovcnt = 0;
-      if (header_size > 0)
-        {
-          iov[iovcnt].iov_base = (char *) header;
-          iov[iovcnt].iov_len = header_size;
-          iovcnt++;
-        }
-      if (handle.size () > 0)
-        {
-          iov[iovcnt].iov_base = (char *) handle.address ();
-          iov[iovcnt].iov_len = handle.size ();
-          iovcnt++;
-        }
-      if (trailer_size > 0)
-        {
-          iov[iovcnt].iov_base = (char *) trailer;
-          iov[iovcnt].iov_len = trailer_size;
-          iovcnt++;
-        }
-      if (ACE_OS::writev (ioh->handle (), iov, iovcnt) < 0)
-        result = -1;
-      else
-        ioh->transmit_file_complete ();
-#endif /* ACE_JAWS_BASELINE */
-    }
-
-  if (result != ACE_Filecache_Handle::SUCCESS)
-    ioh->transmit_file_error (result);
-}
-
-void
-JAWS_Synch_IO::send_confirmation_message (JAWS_IO_Handler *ioh,
-                                          const char *buffer,
-                                          int length)
-{
-  this->send_message (ioh, buffer, length);
-  ioh->confirmation_message_complete ();
-}
-
-void
-JAWS_Synch_IO::send_error_message (JAWS_IO_Handler *ioh,
-                                   const char *buffer,
-                                   int length)
-{
-  this->send_message (ioh, buffer, length);
-  ioh->error_message_complete ();
-}
-
-void
-JAWS_Synch_IO::send_message (JAWS_IO_Handler *ioh,
-                             const char *buffer,
-                             int length)
-{
-  ACE_SOCK_Stream stream;
-  stream.set_handle (ioh->handle ());
-  stream.send_n (buffer, length);
-}
-
-// This only works on Win32
-#if defined (ACE_WIN32)
-
-JAWS_Asynch_IO::JAWS_Asynch_IO (void)
-{
-}
-
-JAWS_Asynch_IO::~JAWS_Asynch_IO (void)
-{
-  ACE_OS::closesocket (this->handle_);
-}
-
-void
-JAWS_Asynch_IO::read (ACE_Message_Block& mb,
-                      int size)
-{
-  ACE_Asynch_Read_Stream ar;
-
-  if (ar.open (*this, this->handle_) == -1
-      || ar.read (mb, size) == -1)
-    this->handler_->read_error ();
-}
-
-// This method will be called when an asynchronous read completes on a
-// stream.
-
-void
-JAWS_Asynch_IO::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
-{
-  // This callback is for this->receive_file()
-  if (result.act () != 0)
-    {
-      int code = 0;
-      if (result.success () && result.bytes_transferred () != 0)
-        {
-          if (result.message_block ().length () == result.message_block ().size ())
-            code = ACE_Filecache_Handle::SUCCESS;
-          else
-            {
-              ACE_Asynch_Read_Stream ar;
-              if (ar.open (*this, this->handle_) == -1
-                  || ar.read (result.message_block (),
-                              result.message_block ().size () - result.message_block ().length (),
-                              result.act ()) == -1)
-                code = -1;
-              else
-                return;
-            }
-        }
-      else
-        code = -1;
-
-      if (code == ACE_Filecache_Handle::SUCCESS)
-        this->handler_->receive_file_complete ();
-      else
-        this->handler_->receive_file_error (code);
-
-      delete &result.message_block ();
-      delete (ACE_Filecache_Handle *) result.act ();
-    }
-  else
-    {
-      // This callback is for this->read()
-      if (result.success ()
-          && result.bytes_transferred () != 0)
-        this->handler_->read_complete (result.message_block ());
-      else
-        this->handler_->read_error ();
-    }
-}
-
-void
-JAWS_Asynch_IO::receive_file (const char *filename,
-                              void *initial_data,
-                              int initial_data_length,
-                              int entire_length)
-{
-  ACE_Message_Block *mb = 0;
-  ACE_Filecache_Handle *handle;
-
-  ACE_NEW (handle, ACE_Filecache_Handle (filename, entire_length, NOMAP));
-
-  int result = handle->error ();
-
-  if (result == ACE_Filecache_Handle::SUCCESS)
-    {
-      ACE_OS::memcpy (handle->address (),
-                      initial_data,
-                      initial_data_length);
-
-      int bytes_to_read = entire_length - initial_data_length;
-
-      ACE_NEW (mb, ACE_Message_Block ((char *)handle->address ()
-                                      + initial_data_length, bytes_to_read));
-
-      if (mb == 0)
-        {
-          errno = ENOMEM;
-          result = -1;
-        }
-      else
-        {
-          ACE_Asynch_Read_Stream ar;
-
-          if (ar.open (*this, this->handle_) == -1
-              || ar.read (*mb, mb->size () - mb->length (), handle) == -1)
-            result = -1;
-        }
-    }
-
-  if (result != ACE_Filecache_Handle::SUCCESS)
-    {
-      this->handler_->receive_file_error (result);
-      delete mb;
-      delete handle;
-    }
-}
-
-void
-JAWS_Asynch_IO::transmit_file (const char *filename,
-                               const char *header,
-                               int header_size,
-                               const char *trailer,
-                               int trailer_size)
-{
-  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
-  ACE_Filecache_Handle *handle = new ACE_Filecache_Handle (filename, NOMAP);
-
-  int result = handle->error ();
-
-  if (result == ACE_Filecache_Handle::SUCCESS)
-    {
-      ACE_Message_Block header_mb (header, header_size);
-      ACE_Message_Block trailer_mb (trailer, trailer_size);
-
-      header_and_trailer = new ACE_Asynch_Transmit_File::Header_And_Trailer
-        (&header_mb, header_size, &trailer_mb, trailer_size);
-
-      ACE_Asynch_Transmit_File tf;
-
-      if (tf.open (*this, this->handle_) == -1
-          || tf.transmit_file (handle->handle (), // file handle
-                               header_and_trailer, // header and trailer data
-                               0,  // bytes_to_write
-                               0,  // offset
-                               0,  // offset_high
-                               0,  // bytes_per_send
-                               0,  // flags
-                               handle // act
-                               ) == -1)
-        result = -1;
-    }
-
-  if (result != ACE_Filecache_Handle::SUCCESS)
-    {
-      this->handler_->transmit_file_error (result);
-      delete header_and_trailer;
-      delete handle;
-    }
-}
-
-
-// This method will be called when an asynchronous transmit file completes.
-void
-JAWS_Asynch_IO::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result)
-{
-  if (result.success ())
-    this->handler_->transmit_file_complete ();
-  else
-    this->handler_->transmit_file_error (-1);
-
-  delete result.header_and_trailer ();
-  delete (ACE_Filecache_Handle *) result.act ();
-}
-
-void
-JAWS_Asynch_IO::send_confirmation_message (const char *buffer,
-                                           int length)
-{
-  this->send_message (buffer, length, CONFORMATION);
-}
-
-void
-JAWS_Asynch_IO::send_error_message (const char *buffer,
-                                    int length)
-{
-  this->send_message (buffer, length, ERROR_MESSAGE);
-}
-
-void
-JAWS_Asynch_IO::send_message (const char *buffer,
-                              int length,
-                              int act)
-{
-  ACE_Message_Block *mb;
-  ACE_NEW (mb, ACE_Message_Block (buffer, length));
-
-  if (mb == 0)
-    {
-      this->handler_->error_message_complete ();
-      return;
-    }
-
-  ACE_Asynch_Write_Stream aw;
-  if (aw.open (*this, this->handle_) == -1
-      || aw.write (*mb, length, (void *) act) == -1)
-    {
-      mb->release ();
-
-      if (act == CONFORMATION)
-        this->handler_->confirmation_message_complete ();
-      else
-        this->handler_->error_message_complete ();
-    }
-}
-
-void
-JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
-{
-  result.message_block ().release ();
-
-  if (result.act () == (void *) CONFORMATION)
-    this->handler_->confirmation_message_complete ();
-  else
-    this->handler_->error_message_complete ();
-}
-
-#endif /* ACE_WIN32 */
-
-// #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// template class ACE_Singleton<JAWS_VFS, ACE_SYNCH_MUTEX>;
-// #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// #pragma instantiate ACE_Singleton<JAWS_VFS, ACE_SYNCH_MUTEX>
-// #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.h b/apps/JAWS/PROTOTYPE/JAWS/IO.h
deleted file mode 100644
index e25d29a07ee..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- c++ -*- */
-// Hey, Emacs!  This is a C++ file!
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   jaws
-//
-// = FILENAME
-//    IO.h
-//
-// = AUTHOR
-//    James Hu
-//
-// ============================================================================
-
-#if !defined (JAWS_IO_H)
-#define JAWS_IO_H
-
-class ACE_Message_Block;
-class JAWS_IO_Handler;
-class JAWS_IO_Acceptor;
-
-#include "ace/ACE.h"
-#include "ace/Asynch_IO.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Singleton.h"
-
-class JAWS_IO
-  // = TITLE
-  //
-  //     This class defines the abstract interface for an I/O class in
-  //     the context of Web-likes servers
-  //
-  // = DESCRIPTION
-  //
-  //     An I/O class should have the following interface. Derived
-  //     classes will define the exactly how the I/O will take place
-  //     (Asynchronous, Synchronous, Reactive)
-{
-public:
-  JAWS_IO (void);
-  virtual ~JAWS_IO (void);
-
-  //  void acceptor (JAWS_IO_Acceptor *acceptor);
-  //  void handler (JAWS_IO_Handler *handler);
-  //  void handle (ACE_HANDLE h);
-  //  ACE_HANDLE handle (void);
-
-  // James, please add documentation here.
-
-  virtual void accept (JAWS_IO_Handler *ioh) = 0;
-  // accept a passive connection
-
-  virtual void read (JAWS_IO_Handler *ioh,
-                     ACE_Message_Block& mb,
-                     int size) = 0;
-  // read from the handle size bytes into the message block.
-
-  virtual void transmit_file (JAWS_IO_Handler *ioh,
-                              const char *filename,
-                              const char *header,
-                              int header_size,
-                              const char *trailer,
-                              int trailer_size) = 0;
-  // send header, filename, trailer to the handle.
-
-  virtual void receive_file (JAWS_IO_Handler *ioh,
-                             const char *filename,
-                             void *initial_data,
-                             int initial_data_length,
-                             int entire_length) = 0;
-  // read data from the handle and store in filename.
-
-  virtual void send_confirmation_message (JAWS_IO_Handler *ioh,
-                                          const char *buffer,
-                                          int length) = 0;
-  // send a confirmation message to the handle.
-
-  virtual void send_error_message (JAWS_IO_Handler *ioh,
-                                   const char *buffer,
-                                   int length) = 0;
-  // send an error message to the handle.
-
-protected:
-  ACE_HANDLE handle_;
-  JAWS_IO_Handler *handler_;
-  ACE_INET_Addr *inet_addr_;
-  JAWS_IO_Acceptor *acceptor_;
-};
-
-class JAWS_Synch_IO : public JAWS_IO
-  // = TITLE
-  //
-  //     This class defines the interface for a Synchronous I/O class.
-  //
-  // = DESCRIPTION
-{
-public:
-  JAWS_Synch_IO (void);
-
-  ~JAWS_Synch_IO (void);
-
-  virtual void accept (JAWS_IO_Handler *ioh);
-
-  void read (JAWS_IO_Handler *ioh, ACE_Message_Block& mb, int size);
-
-  void transmit_file (JAWS_IO_Handler *ioh,
-                      const char *filename,
-                      const char *header,
-                      int header_size,
-                      const char *trailer,
-                      int trailer_size);
-
-  void receive_file (JAWS_IO_Handler *ioh,
-                     const char *filename,
-                     void *initial_data,
-                     int initial_data_length,
-                     int entire_length);
-
-  void send_confirmation_message (JAWS_IO_Handler *ioh,
-                                  const char *buffer,
-                                  int length);
-
-  void send_error_message (JAWS_IO_Handler *ioh,
-                           const char *buffer,
-                           int length);
-
-protected:
-  virtual void send_message (JAWS_IO_Handler *ioh,
-                             const char *buffer,
-                             int length);
-};
-
-typedef ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
-        JAWS_Synch_IO_Singleton;
-
-// This only works on Win32
-#if defined (ACE_WIN32)
-
-class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler
-  // = TITLE
-  //
-  //     This class defines the interface for a Asynchronous I/O class.
-  //
-  // = DESCRIPTION
-{
-public:
-  JAWS_Asynch_IO (void);
-
-  ~JAWS_Asynch_IO (void);
-
-  void read (ACE_Message_Block& mb, int size);
-
-  void transmit_file (const char *filename,
-                      const char *header,
-                      int header_size,
-                      const char *trailer,
-                      int trailer_size);
-
-  void receive_file (const char *filename,
-                     void *initial_data,
-                     int initial_data_length,
-                     int entire_length);
-
-  void send_confirmation_message (const char *buffer,
-                                  int length);
-
-  void send_error_message (const char *buffer,
-                           int length);
-
-protected:
-  enum Message_Types
-  {
-    CONFORMATION,
-    ERROR_MESSAGE
-  };
-
-  virtual void send_message (const char *buffer,
-                             int length,
-                             int act);
-
-  virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
-  // This method will be called when an asynchronous read completes on
-  // a stream.
-
-  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
-  // This method will be called when an asynchronous write completes
-  // on a stream.
-
-  virtual void handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result);
-  // This method will be called when an asynchronous transmit file
-  // completes.
-};
-
-#endif /* ACE_WIN32 */
-#endif /* JAWS_IO_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
deleted file mode 100644
index 9453c16693d..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#include "JAWS/IO_Acceptor.h"
-
-int
-JAWS_IO_Acceptor::open (const ACE_INET_Addr &)
-{
-  return -1;
-}
-
-int
-JAWS_IO_Acceptor::accept (ACE_SOCK_Stream &, ACE_Addr *, ACE_Time_Value *,
-                          int, int) const
-{
-  return -1;
-}
-
-int
-JAWS_IO_Acceptor::accept (size_t)
-{
-  return -1;
-}
-
-int
-JAWS_IO_Synch_Acceptor::open (const ACE_INET_Addr &local_sap)
-{
-  return this->acceptor_->open (local_sap, 0, PF_INET, 5, 0);
-}
-
-int
-JAWS_IO_Synch_Acceptor::accept (ACE_SOCK_Stream &new_stream,
-                                ACE_Addr *remote_addr,
-                                ACE_Time_Value *timeout,
-                                int restart,
-                                int reset_new_handle) const
-{
-  return this->acceptor_->accept (new_stream, remote_addr, timeout,
-                                  restart, reset_new_handle);
-}
-
-
-#if defined (ACE_WIN32)
-// This only works on Win32 platforms
-
-int
-JAWS_IO_Asynch_Acceptor::open (const ACE_INET_Addr &address);
-{
-  return -1;
-}
-
-int
-JAWS_IO_Asynch_Acceptor::accept (size_t bytes_to_read)
-{
-  return this->acceptor_->accept (bytes_to_read);
-}
-
-
-
-#endif /* defined (ACE_WIN32) */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
-#pragma instantiate  ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h
deleted file mode 100644
index 36b7b4fabb0..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_IO_ACCEPTOR_H)
-#define JAWS_IO_ACCEPTOR_H
-
-// Use the Adapter pattern to encapsulate either a LOCK_SOCK_Acceptor or
-// an ACE_Asynch_Acceptor
-
-#include "ace/Asynch_Acceptor.h"
-#include "ace/LOCK_SOCK_Acceptor.h"
-#include "ace/Singleton.h"
-
-#include "JAWS/IO.h"
-
-// Forward declaration.
-class ACE_Proactor;
-class ACE_Reactor;
-
-#if defined (ACE_HAS_THREAD_SAFE_ACCEPT)
-typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX> JAWS_IO_SOCK_Acceptor;
-#else
-typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX> JAWS_IO_SOCK_Acceptor;
-#endif /* ACE_HAS_THREAD_SAFE_ACCEPT */
-
-class JAWS_IO_Acceptor
-{
-public:
-
-  JAWS_IO_Acceptor (void);
-  virtual ~JAWS_IO_Acceptor (void);
-
-  virtual int open (const ACE_INET_Addr &address);
-  // Initiate a passive mode socket.
-
-  virtual int accept (ACE_SOCK_Stream &new_stream,
-                      ACE_Addr *remote_addr = 0,
-                      ACE_Time_Value *timeout = 0,
-                      int restart = 1,
-                      int reset_new_handle = 0) const;
-  // Synchronously accept the connection
-
-  virtual int accept (size_t bytes_to_read = 0);
-  // This initiates a new asynchronous accept through the AcceptEx call.
-
-  enum { ASYNC = 0, SYNCH = 1 };
-  // identify if this is being used for aynchronous or synchronous
-  // accept calls
-
-private:
-
-};
-
-class JAWS_IO_Synch_Acceptor : public JAWS_IO_Acceptor
-{
-public:
-
-  virtual int open (const ACE_INET_Addr &local_sap);
-  // Initiate a passive mode socket.
-
-  virtual int accept (ACE_SOCK_Stream &new_stream,
-                      ACE_Addr *remote_addr = 0,
-                      ACE_Time_Value *timeout = 0,
-                      int restart = 1,
-                      int reset_new_handle = 0) const;
-  // Accept the connection
-
-private:
-  JAWS_IO_SOCK_Acceptor *acceptor_;
-};
-
-
-class JAWS_IO_Asynch_Acceptor : public JAWS_IO_Acceptor
-{
-public:
-
-  virtual int open (const ACE_INET_Addr &address);
-  // Initiate an asynchronous passive connection
-
-  virtual int accept (size_t bytes_to_read = 0);
-  // This initiates a new asynchronous accept through the AcceptEx call.
-
-private:
-
-#if defined (ACE_WIN32)
-// This only works on Win32 platforms
-  ACE_Asynch_Acceptor<JAWS_IO_Handler> *acceptor_;
-#else
-  void *acceptor_;
-#endif /* defined (ACE_WIN32) */
-};
-
-typedef ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
-        JAWS_IO_Synch_Acceptor_Singleton;
-
-typedef ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>
-        JAWS_IO_Asynch_Acceptor_Singleton;
-
-#endif /* !defined (JAWS_IO_ACCEPTOR_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
deleted file mode 100644
index 8dfca3ca02b..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "JAWS/IO.h"
-#include "JAWS/IO_Handler.h"
-#include "JAWS/Data_Block.h"
-
-JAWS_IO_Handler_Factory::~JAWS_IO_Handler_Factory (void)
-{
-}
-
-JAWS_Synch_IO_Handler::JAWS_Synch_IO_Handler (JAWS_IO_Handler_Factory *factory)
-  : status_ (0),
-    mb_ (0),
-    handle_ (ACE_INVALID_HANDLE),
-    task_ (0),
-    factory_ (factory)
-{
-  // this->io_->handler (this);
-}
-
-JAWS_Synch_IO_Handler::~JAWS_Synch_IO_Handler (void)
-{
-  if (this->mb_)
-    this->mb_->release ();
-  this->mb_ = 0;
-}
-
-void
-JAWS_Synch_IO_Handler::accept_complete (ACE_HANDLE handle)
-{
-  // callback into pipeline task, notify that the accept has completed
-  this->handle_ = handle;
-}
-
-void
-JAWS_Synch_IO_Handler::accept_error (void)
-{
-  // callback into pipeline task, notify that the accept has failed
-}
-
-void
-JAWS_Synch_IO_Handler::read_complete (ACE_Message_Block &data)
-{
-  ACE_UNUSED_ARG (data);
-  // We can call back into the pipeline task at this point
-  // this->pipeline_->read_complete (data);
-}
-
-void
-JAWS_Synch_IO_Handler::read_error (void)
-{
-  // this->pipeline_->read_error ();
-}
-
-void
-JAWS_Synch_IO_Handler::transmit_file_complete (void)
-{
-  // this->pipeline_->transmit_file_complete ();
-}
-
-void
-JAWS_Synch_IO_Handler::transmit_file_error (int result)
-{
-  ACE_UNUSED_ARG (result);
-  // this->pipeline_->transmit_file_complete (result);
-}
-
-void
-JAWS_Synch_IO_Handler::receive_file_complete (void)
-{
-}
-
-void
-JAWS_Synch_IO_Handler::receive_file_error (int result)
-{
-  ACE_UNUSED_ARG(result);
-}
-
-void
-JAWS_Synch_IO_Handler::write_error (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) error in writing response\n"));
-
-  this->done ();
-}
-
-void
-JAWS_Synch_IO_Handler::confirmation_message_complete (void)
-{
-}
-
-void
-JAWS_Synch_IO_Handler::error_message_complete (void)
-{
-}
-
-JAWS_IO_Handler_Factory *
-JAWS_Synch_IO_Handler::factory (void)
-{
-  return this->factory_;
-}
-
-ACE_HANDLE
-JAWS_Synch_IO_Handler::handle (void)
-{
-  return this->handle_;
-}
-
-void
-JAWS_Synch_IO_Handler::done (void)
-{
-  this->factory ()->destroy_io_handler (this);
-}
-
-int
-JAWS_Synch_IO_Handler::status (void)
-{
-  return this->status_;
-}
-
-JAWS_IO_Handler *
-JAWS_Synch_IO_Handler_Factory::create_io_handler (void)
-{
-  JAWS_Synch_IO *io;
-  JAWS_Synch_IO_Handler *handler;
-
-  io = new JAWS_Synch_IO;
-  if (io == 0) return 0;
-
-  handler = new JAWS_Synch_IO_Handler (this);
-  if (handler == 0) delete io;
-
-  return handler;
-}
-
-void
-JAWS_Synch_IO_Handler_Factory::destroy_io_handler (JAWS_IO_Handler *handler)
-{
-  delete handler;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate  ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
deleted file mode 100644
index 6b22e88609a..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- c++ -*- */
-// Hey, Emacs!  This is a C++ file!
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   jaws
-//
-// = FILENAME
-//    IO.h
-//
-// = AUTHOR
-//    James Hu
-//
-// ============================================================================
-
-#if !defined (JAWS_IO_HANDLER_H)
-#define JAWS_IO_HANDLER_H
-
-#include "ace/Asynch_IO.h"
-#include "ace/Singleton.h"
-
-// #include "JAWS/IO.h"
-class JAWS_IO;
-class JAWS_Synch_IO;
-class JAWS_Asynch_IO;
-class JAWS_IO_Handler;
-class JAWS_Synch_IO_Handler;
-class JAWS_Asynch_IO_Handler;
-class JAWS_IO_Handler_Factory;
-class JAWS_Synch_IO_Handler_Factory;
-class JAWS_Asynch_IO_Handler_Factory;
-class JAWS_Data_Block;
-
-template <class TYPE> class JAWS_Pipeline_Abstract_Handler;
-typedef JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-        JAWS_Pipeline_Handler;
-
-class JAWS_IO_Handler
-  // = TITLE
-  //
-  //     This class defines the abstract interface for an I/O handler
-  //     class in the context of Web-likes servers
-  //
-  // = DESCRIPTION
-{
-public:
-  virtual void accept_complete (ACE_HANDLE handle) = 0;
-  // This method is called by the IO class when new passive connection has
-  // been established.
-
-  virtual void accept_error (void) = 0;
-  // This method is called by the IO class when new passive connection has
-  // been established.
-
-#if 0
-  virtual void connect_complete (ACE_Message_Block &) = 0;
-  // This method is called by the IO class when new active connection has
-  // been established.
-
-  virtual void connect_error (ACE_Message_Block &) = 0;
-  // This method is called by the IO class when new active connection has
-  // been established.
-#endif
-
-  virtual void read_complete (ACE_Message_Block &data) = 0;
-  // This method is called by the IO class when new client data shows
-  // up.
-
-  virtual void read_error (void) = 0;
-  // This method is called by the IO class when there was an error in
-  // reading new data from the client.
-
-  virtual void transmit_file_complete (void) = 0;
-  // This method is called by the IO class when the requested file has
-  // been successfully transmitted to the client.
-
-  virtual void transmit_file_error (int result) = 0;
-  // This method is called by the IO class when there was an error in
-  // transmitting the requested file to the client.
-
-  virtual void receive_file_complete (void) = 0;
-  // This method is called by the IO class when the requested file has
-  // been successfully received from the client.
-
-  virtual void receive_file_error (int result) = 0;
-  // This method is called by the IO class when there was an error in
-  // receiving the requested file from the client.
-
-  virtual void write_error (void) = 0;
-  // This method is called by the IO class when there was an error in
-  // writing data to the client.
-
-  virtual void confirmation_message_complete (void) = 0;
-  // This method is called by the IO class when the confirmation
-  // message has been delivered to the client.
-
-  virtual void error_message_complete (void) = 0;
-  // This method is called by the IO class when the error message has
-  // been delivered to the client.
-
-  virtual JAWS_IO_Handler_Factory *factory (void) = 0;
-  // Returns the factory for this IO handler
-
-  virtual ACE_HANDLE handle (void) = 0;
-  // Returns the socket handle for this handler
-
-  virtual int status (void) = 0;
-
-  enum { IDLE = 0,
-         ACCEPT_OK, ACCEPT_ERROR,
-         READ_OK, READ_ERROR,
-         WRITE_OK, WRITE_ERROR,
-         TRANSMIT_OK, TRANSMIT_ERROR,
-         RECEIVE_OK, RECEIVE_ERROR };
-};
-
-class JAWS_IO_Handler_Factory
-#if defined (ACE_WIN32)
- : public ACE_Service_Handler
-#endif
-{
-public:
-  virtual ~JAWS_IO_Handler_Factory (void);
-  // Destructor
-
-  virtual JAWS_IO_Handler *create_io_handler (void) = 0;
-  // This creates a new HTTP_Handler
-
-  virtual void destroy_io_handler (JAWS_IO_Handler *handler) = 0;
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-class JAWS_Synch_IO_Handler : protected JAWS_IO_Handler
-{
-friend class JAWS_Synch_IO;
-friend class JAWS_Synch_IO_Handler_Factory;
-
-public:
-  JAWS_Synch_IO_Handler (JAWS_IO_Handler_Factory *factory);
-  virtual ~JAWS_Synch_IO_Handler (void);
-
-protected:
-  // Inherited from JAWS_IO_Handler
-
-  virtual void accept_complete (ACE_HANDLE handle);
-  virtual void accept_error (void);
-  virtual void read_complete (ACE_Message_Block &data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
-  virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
-  virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
-
-  virtual JAWS_IO_Handler_Factory *factory (void);
-  virtual ACE_HANDLE handle (void);
-
-  virtual void done (void);
-  virtual int status (void);
-
-private:
-  int status_;
-  // The state of the handler.
-
-  ACE_Message_Block *mb_;
-  // This maintains the state of the request.
-
-  ACE_HANDLE handle_;
-  // The socket handle returned from accept.
-
-  JAWS_Pipeline_Handler *task_;
-  // This is a reference to the next stage of the pipeline when the IO
-  // request completes.
-
-  JAWS_IO_Handler_Factory *factory_;
-};
-
-class JAWS_Synch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
-{
-public:
-  JAWS_IO_Handler *create_io_handler (void);
-  // This creates a new HTTP_Handler
-
-  void destroy_io_handler (JAWS_IO_Handler *handler);
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-typedef ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
-        JAWS_Synch_IO_Handler_Factory_Singleton;
-
-// This only works on Win32
-#if defined (ACE_WIN32)
-
-class JAWS_Asynch_IO_Handler : protected JAWS_IO_Handler
-{
-public:
-  JAWS_Asynch_IO_Handler (void);
-  virtual ~JAWS_Asynch_IO_Handler (void);
-
-protected:
-  // Inherited from JAWS_IO_Handler
-
-  virtual void accept_complete (void);
-  virtual void accept_error (void);
-  virtual void read_complete (ACE_Message_Block &data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
-  virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
-  virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
-  virtual JAWS_Handler_Factory *factory (void);
-
-private:
-  ACE_Message_Block *state_;
-  // This maintains the state of the request.
-
-  JAWS_IO *io_;
-  // The reference to our IO interface (synch vs. asynch)
-
-  JAWS_Pipeline *pipeline_;
-  // This is a reference to the next stage of the pipeline when the IO
-  // request completes.
-
-  JAWS_IO_Handler_Factory *factory_;
-};
-
-class JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
-{
-public:
-  JAWS_IO_Handler *create_io_handler (void);
-  // This creates a new HTTP_Handler
-
-  void destroy_io_handler (JAWS_IO_Handler *handler);
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-#endif /* ACE_WIN32 */
-#endif /* JAWS_IO_HANDLER_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_State.h b/apps/JAWS/PROTOTYPE/JAWS/IO_State.h
deleted file mode 100644
index 18648f71613..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_State.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- c++ -*- */
-// Hey, Emacs!  This is a C++ file!
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   jaws
-//
-// = FILENAME
-//    IO.h
-//
-// = AUTHOR
-//    James Hu
-//
-// ============================================================================
-
-#if !defined (JAWS_IO_STATE_H)
-#define JAWS_IO_STATE_H
-
-#include "ace/Asynch_IO.h"
-
-// #include "JAWS/IO.h"
-class JAWS_IO;
-class JAWS_Synch_IO;
-class JAWS_Asynch_IO;
-class JAWS_IO_Handler;
-class JAWS_Synch_IO_Handler;
-class JAWS_Asynch_IO_Handler;
-class JAWS_IO_Handler_Factory;
-class JAWS_Synch_IO_Handler_Factory;
-class JAWS_Asynch_IO_Handler_Factory;
-class JAWS_Pipeline;
-
-class JAWS_IO_Handler
-  // = TITLE
-  //
-  //     This class defines the abstract interface for an I/O handler
-  //     class in the context of Web-likes servers
-  //
-  // = DESCRIPTION
-{
-public:
-  virtual void accept_complete (void) = 0;
-  // This method is called by the IO class when new passive connection has
-  // been established.
-
-  virtual void accept_error (void) = 0;
-  // This method is called by the IO class when new passive connection has
-  // been established.
-
-#if 0
-  virtual void connect_complete (ACE_Message_Block &) = 0;
-  // This method is called by the IO class when new active connection has
-  // been established.
-
-  virtual void connect_error (ACE_Message_Block &) = 0;
-  // This method is called by the IO class when new active connection has
-  // been established.
-#endif
-
-  virtual void read_complete (ACE_Message_Block &data) = 0;
-  // This method is called by the IO class when new client data shows
-  // up.
-
-  virtual void read_error (void) = 0;
-  // This method is called by the IO class when there was an error in
-  // reading new data from the client.
-
-  virtual void transmit_file_complete (void) = 0;
-  // This method is called by the IO class when the requested file has
-  // been successfully transmitted to the client.
-
-  virtual void transmit_file_error (int result) = 0;
-  // This method is called by the IO class when there was an error in
-  // transmitting the requested file to the client.
-
-  virtual void receive_file_complete (void) = 0;
-  // This method is called by the IO class when the requested file has
-  // been successfully received from the client.
-
-  virtual void receive_file_error (int result) = 0;
-  // This method is called by the IO class when there was an error in
-  // receiving the requested file from the client.
-
-  virtual void write_error (void) = 0;
-  // This method is called by the IO class when there was an error in
-  // writing data to the client.
-
-  virtual void confirmation_message_complete (void) = 0;
-  // This method is called by the IO class when the confirmation
-  // message has been delivered to the client.
-
-  virtual void error_message_complete (void) = 0;
-  // This method is called by the IO class when the error message has
-  // been delivered to the client.
-
-  virtual JAWS_IO_Handler_Factory *factory (void) = 0;
-  // Returns the factory for this IO handler
-};
-
-class JAWS_IO_Handler_Factory
-#if defined (ACE_WIN32)
- : public ACE_Service_Handler
-#endif
-{
-public:
-  virtual ~JAWS_IO_Handler_Factory (void);
-  // Destructor
-
-  virtual JAWS_IO_Handler *create_io_handler (void) = 0;
-  // This creates a new HTTP_Handler
-
-  virtual void destroy_io_handler (JAWS_IO_Handler *handler, JAWS_IO *io) = 0;
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-class JAWS_Synch_IO_Handler : protected JAWS_IO_Handler
-{
-friend class JAWS_Synch_IO;
-friend class JAWS_Synch_IO_Handler_Factory;
-
-public:
-  JAWS_Synch_IO_Handler (JAWS_IO *io, JAWS_IO_Handler_Factory *factory);
-  virtual ~JAWS_Synch_IO_Handler (void);
-
-protected:
-  // Inherited from JAWS_IO_Handler
-
-  virtual void accept_complete (void);
-  virtual void accept_error (void);
-  virtual void read_complete (ACE_Message_Block &data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
-  virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
-  virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
-  virtual JAWS_IO_Handler_Factory *factory (void);
-
-  virtual void done (void);
-
-private:
-  ACE_Message_Block *state_;
-  // This maintains the state of the request.
-
-  JAWS_IO *io_;
-  // The reference to our IO interface (synch vs. asynch)
-
-  JAWS_Pipeline *pipeline_;
-  // This is a reference to the next stage of the pipeline when the IO
-  // request completes.
-
-  JAWS_IO_Handler_Factory *factory_;
-};
-
-class JAWS_Synch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
-{
-public:
-  JAWS_IO_Handler *create_io_handler (void);
-  // This creates a new HTTP_Handler
-
-  void destroy_io_handler (JAWS_IO_Handler *handler, JAWS_IO *io);
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-// This only works on Win32
-#if defined (ACE_WIN32)
-
-class JAWS_Asynch_IO_Handler : protected JAWS_IO_Handler
-{
-public:
-  JAWS_Asynch_IO_Handler (void);
-  virtual ~JAWS_Asynch_IO_Handler (void);
-
-protected:
-  // Inherited from JAWS_IO_Handler
-
-  virtual void accept_complete (void);
-  virtual void accept_error (void);
-  virtual void read_complete (ACE_Message_Block &data);
-  virtual void read_error (void);
-  virtual void transmit_file_complete (void);
-  virtual void transmit_file_error (int result);
-  virtual void receive_file_complete (void);
-  virtual void receive_file_error (int result);
-  virtual void write_error (void);
-  virtual void confirmation_message_complete (void);
-  virtual void error_message_complete (void);
-  virtual JAWS_Handler_Factory *factory (void);
-
-private:
-  ACE_Message_Block *state_;
-  // This maintains the state of the request.
-
-  JAWS_Dispatch_Policy *policy_;
-  // The reference to our IO interface (synch vs. asynch)
-
-  JAWS_Pipeline *pipeline_;
-  // This is a reference to the next stage of the pipeline when the IO
-  // request completes.
-
-  JAWS_IO_Handler_Factory *factory_;
-};
-
-class JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
-{
-public:
-  JAWS_IO_Handler *create_io_handler (void);
-  // This creates a new HTTP_Handler
-
-  void destroy_io_handler (JAWS_IO_Handler *handler, JAWS_IO *io);
-  // The HTTP handler will call this method from HTTP_Handler::done to
-  // tell the factory to reap up the handler as it is now done with
-  // the protocol
-};
-
-#endif /* ACE_WIN32 */
-#endif /* JAWS_IO_STATE_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile b/apps/JAWS/PROTOTYPE/JAWS/Makefile
deleted file mode 100644
index 5bb95561f9f..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile
+++ /dev/null
@@ -1,1087 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for the ACE Adapter Web Server (JAWS)
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-#BIN   	= main
-
-LIB = libJAWS.a
-
-MYFILES  	= \
-	Pipeline \
-	Pipeline_Tasks \
-	Data_Block \
-	Policy \
-	Concurrency \
-	Server \
-	IO_Acceptor \
-	IO_Handler \
-	IO
-
-LSRC	= $(addsuffix .cpp,$(MYFILES))
-LOBJ	= $(addsuffix .o,$(MYFILES))
-
-#CFLAGS += -I$(ACE_ROOT)/apps/JAWS/server/PROTOTYPE
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#LDLIBS	= -lJAWS
-
-BUILD	= $(VOBJS) $(VLIB) #$(VBIN)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-# The contents of rules.bin.GNU are expanded in Local targets, below.
-# include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-# include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-# Expand rules.bin.GNU, but without the $(VOBJS) dependencies.
-VBIN    = $(BIN:%=%$(VAR))
-
-$(BIN): %: $(VDIR)%.o
-	$(LINK.cc) -o $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK)
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Pipeline.o .obj/Pipeline.so .shobj/Pipeline.o .shobj/Pipeline.so: Pipeline.cpp JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/Pipeline_Handler.h JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp
-.obj/Pipeline_Tasks.o .obj/Pipeline_Tasks.so .shobj/Pipeline_Tasks.o .shobj/Pipeline_Tasks.so: Pipeline_Tasks.cpp JAWS/Pipeline_Tasks.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- JAWS/JAWS/Data_Block.h JAWS/JAWS/JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/JAWS/Pipeline.h \
- JAWS/Data_Block.h JAWS/Policy.h JAWS/JAWS/Concurrency.h \
- JAWS/JAWS/JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i
-.obj/Data_Block.o .obj/Data_Block.so .shobj/Data_Block.o .shobj/Data_Block.so: Data_Block.cpp JAWS/Data_Block.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- JAWS/JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/Policy.h \
- JAWS/JAWS/Concurrency.h JAWS/JAWS/JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i
-.obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: Policy.cpp JAWS/Policy.h JAWS/JAWS/Concurrency.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- JAWS/JAWS/JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i JAWS/Concurrency.h \
- JAWS/IO_Handler.h JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- JAWS/JAWS/IO.h
-.obj/Concurrency.o .obj/Concurrency.so .shobj/Concurrency.o .shobj/Concurrency.so: Concurrency.cpp JAWS/Concurrency.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp JAWS/JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/Pipeline_Handler.h JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/Policy.h \
- JAWS/JAWS/Concurrency.h JAWS/Data_Block.h JAWS/JAWS/Pipeline.h
-.obj/Server.o .obj/Server.so .shobj/Server.o .shobj/Server.so: Server.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i JAWS/Server.h \
- JAWS/JAWS/Data_Block.h $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- JAWS/JAWS/JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/Data_Block.h \
- JAWS/Concurrency.h JAWS/JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i JAWS/IO_Handler.h \
- JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp
-.obj/IO_Acceptor.o .obj/IO_Acceptor.so .shobj/IO_Acceptor.o .shobj/IO_Acceptor.so: IO_Acceptor.cpp JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp JAWS/JAWS/IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h
-.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp JAWS/IO.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- JAWS/IO_Handler.h JAWS/Data_Block.h JAWS/JAWS/Pipeline.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp \
- JAWS/JAWS/JAWS/Pipeline_Handler.h JAWS/JAWS/JAWS/JAWS/Pipeline.h \
- JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.cpp \
- JAWS/JAWS/JAWS/JAWS/JAWS/Pipeline_Handler.h
-.obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp JAWS/IO.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- JAWS/IO_Handler.h JAWS/IO_Acceptor.h \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- JAWS/JAWS/IO.h $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Filecache.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp
deleted file mode 100644
index 5c8c7464882..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#include "JAWS/Pipeline.h"
-
-JAWS_Pipeline::JAWS_Pipeline (void)
-{
-}
-
-int
-JAWS_Pipeline::open (void *)
-{
-  // Simply call into the virtual svc() method.
-  if (this->svc () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "JAWS_Pipeline::svc"),
-                      -1);
-  return 0;
-}
-
-int
-JAWS_Pipeline::close (u_long)
-{
-  return 0;
-}
-
-#include "JAWS/Pipeline_Handler.cpp"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
deleted file mode 100644
index 16bcc62cdf5..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_PIPELINE_H)
-#define JAWS_PIPELINE_H
-
-#include "ace/Synch.h"
-#include "ace/Service_Config.h"
-#include "ace/Stream.h"
-#include "ace/Module.h"
-#include "ace/Task.h"
-
-typedef ACE_Stream<ACE_NULL_SYNCH> JAWS_Pipeline_Stream;
-typedef ACE_Module<ACE_NULL_SYNCH> JAWS_Pipeline_Module;
-typedef ACE_Task<ACE_NULL_SYNCH> JAWS_Pipeline_Task;
-
-class JAWS_IO_Handler;
-class JAWS_Dispatch_Policy;
-
-class JAWS_Pipeline : public JAWS_Pipeline_Task
-  // = TITLE
-  //   Methods that are common to pipeline components
-{
-public:
-  JAWS_Pipeline (void);
-  // ACE_Task hooks
-
-  virtual int open (void * = 0);
-  virtual int close (u_long = 0);
-};
-
-#include "JAWS/Pipeline_Handler.h"
-
-#endif /* !defined (JAWS_PIPELINE_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp
deleted file mode 100644
index 64c904c3f96..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#if !defined (JAWS_PIPELINE_HANDLER_CPP)
-#define JAWS_PIPELINE_HANDLER_CPP
-
-#include "JAWS/Pipeline_Handler.h"
-
-template <class TYPE>
-JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler (void)
-{
-}
-
-template <class TYPE>
-JAWS_Pipeline_Abstract_Handler<TYPE>::~JAWS_Pipeline_Abstract_Handler (void)
-{
-}
-
-template <class TYPE> int
-JAWS_Pipeline_Abstract_Handler<TYPE>::put (ACE_Message_Block *mb,
-                                           ACE_Time_Value *tv)
-{
-  TYPE *data = ACE_dynamic_cast (TYPE *,
-                                 mb->data_block ());
-
-  int status = this->handle_put (data, tv);
-
-  // If handle_put() is successful, we continue to the next stage of the
-  // pipeline.  Otherwise, we return.
-  return (status != -1) ? this->put_next (mb, tv) : -1;
-}
-
-#endif /* !defined (JAWS_PIPELINE_HANDLER_CPP) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
deleted file mode 100644
index fb68d07f107..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_PIPELINE_HANDLER_H)
-#define JAWS_PIPELINE_HANDLER_H
-
-#include "JAWS/Pipeline.h"
-
-template <class TYPE>
-class JAWS_Pipeline_Abstract_Handler : public JAWS_Pipeline_Task
-  // = TITLE
-  //   Methods that are common to pipeline components
-{
-public:
-  JAWS_Pipeline_Abstract_Handler (void);
-  virtual ~JAWS_Pipeline_Abstract_Handler (void);
-  // ACE_Task hooks
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  // inherited from ACE_Task
-
-  virtual int handle_put (TYPE *data, ACE_Time_Value *tv) = 0;
-  // Callback hook for specialized data processing
-
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Pipeline_Handler.cpp"
-#endif
-
-#endif /* !defined (JAWS_PIPELINE_HANDLER_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp
deleted file mode 100644
index 57bae126682..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "JAWS/Pipeline_Tasks.h"
-#include "JAWS/Data_Block.h"
-#include "JAWS/IO_Handler.h"
-#include "JAWS/Policy.h"
-
-int
-JAWS_Pipeline_Accept_Task::handle_put (JAWS_Data_Block *data,
-                                       ACE_Time_Value *)
-{
-  int result = -1;
-
-  // JAWS_Data_Block should contain an INET_Addr and an IO
-  JAWS_IO_Handler *handler = data->io_handler ();
-  JAWS_Dispatch_Policy *policy = data->policy ();
-
-  // data->policy ()->update (handler);
-
-  JAWS_IO *io = policy->io ();
-  io->accept (handler);
-
-  // When accept returns, the resulting handle should be stored into
-  // the JAWS_DATA_BLOCK somewhere.
-
-  // Check the handler for status of the io call
-  switch (handler->status ())
-    {
-    case JAWS_IO_Handler::ACCEPT_OK:
-      result = 0;
-      // At this point need to move to the next task in the pipeline!
-      // The framework will automatically call the next stage.
-      break;
-    case JAWS_IO_Handler::ACCEPT_ERROR:
-      result = -1;
-      // Should recycle the thread
-      break;
-    default:
-      result = -1;
-      // Should mean that the IO is asynchronous, and the word isn't out
-      // yet
-      break;
-    }
-
-  // In asynchronous and synchronous models, we can --
-  //   have the io_handler set the new task in the data_block
-
-  // In asynchronous model, we can --
-  //   insert a wait task into the task queue
-
-  return result;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>;
-template class ACE_Singleton<JAWS_Pipeline_Accept_Task, ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-#pragma instantiate ACE_Singleton<JAWS_Pipeline_Accept_Task, ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
deleted file mode 100644
index 200ab5eadc0..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_PIPELINE_TASKS_H)
-#define JAWS_PIPELINE_TASKS_H
-
-#include "ace/Singleton.h"
-
-#include "JAWS/Pipeline.h"
-
-class JAWS_Data_Block;
-
-typedef JAWS_Pipeline_Abstract_Handler<JAWS_Data_Block>
-        JAWS_Pipeline_Handler;
-
-class JAWS_Pipeline_Accept_Task : public JAWS_Pipeline_Handler
-{
-public:
-  virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv);
-};
-
-typedef ACE_Singleton<JAWS_Pipeline_Accept_Task, ACE_SYNCH_MUTEX>
-        JAWS_Pipeline_Accept_Task_Singleton;
-
-#endif /* !defined (JAWS_DATA_BLOCK_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Policy.cpp b/apps/JAWS/PROTOTYPE/JAWS/Policy.cpp
deleted file mode 100644
index c4263b86b8e..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Policy.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-#include "JAWS/Policy.h"
-#include "JAWS/Concurrency.h"
-#include "JAWS/IO_Handler.h"
-#include "JAWS/IO_Acceptor.h"
-
-JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void)
-{
-}
-
-JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy (void)
-{
-}
-
-JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy (void)
-  : concurrency_ (JAWS_Thread_Pool_Singleton::instance ()),
-    ioh_factory_ (JAWS_Synch_IO_Handler_Factory_Singleton::instance ()),
-    acceptor_ (JAWS_IO_Synch_Acceptor_Singleton::instance ()),
-    io_ (JAWS_Synch_IO_Singleton::instance ())
-{
-}
-
-JAWS_Default_Dispatch_Policy::~JAWS_Default_Dispatch_Policy (void)
-{
-}
-
-JAWS_IO *
-JAWS_Default_Dispatch_Policy::io (void)
-{
-  return this->io_;
-}
-
-JAWS_IO_Handler_Factory *
-JAWS_Default_Dispatch_Policy::ioh_factory (void)
-{
-  return this->ioh_factory_;
-}
-
-JAWS_IO_Acceptor *
-JAWS_Default_Dispatch_Policy::acceptor (void)
-{
-  return this->acceptor_;
-}
-
-JAWS_Concurrency_Base *
-JAWS_Default_Dispatch_Policy::concurrency (void)
-{
-  return this->concurrency_;
-}
-
-void
-JAWS_Default_Dispatch_Policy::io (JAWS_IO *)
-{
-}
-
-void
-JAWS_Default_Dispatch_Policy::ioh_factory (JAWS_IO_Handler_Factory *)
-{
-}
-
-void
-JAWS_Default_Dispatch_Policy::acceptor (JAWS_IO_Acceptor *)
-{
-}
-
-void
-JAWS_Default_Dispatch_Policy::concurrency (JAWS_Concurrency_Base *concp)
-{
-  this->concurrency_ = concp;
-}
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Policy.h b/apps/JAWS/PROTOTYPE/JAWS/Policy.h
deleted file mode 100644
index e4556169a6b..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Policy.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_POLICY_H)
-#define JAWS_POLICY_H
-
-#include "JAWS/Concurrency.h"
-
-class JAWS_IO;
-class JAWS_IO_Handler;
-class JAWS_IO_Handler_Factory;
-
-class JAWS_Dispatch_Policy
-  // = TITLE
-  //     Policy mechanism for choosing different concurrency models.
-  //
-  // = DESCRIPTION
-  //     Given some (unspecified) state, decides what the concurrency
-  //     model should be.  (For now, we always return the same model.)
-{
-public:
-  JAWS_Dispatch_Policy (void);
-  virtual ~JAWS_Dispatch_Policy (void);
-
-  virtual JAWS_IO * io (void) = 0;
-  virtual JAWS_IO_Handler_Factory *ioh_factory (void) = 0;
-  virtual JAWS_IO_Acceptor *acceptor (void) = 0;
-  virtual JAWS_Concurrency_Base * concurrency (void) = 0;
-
-  virtual void io (JAWS_IO *iop) = 0;
-  virtual void ioh_factory (JAWS_IO_Handler_Factory *factoryp) = 0;
-  virtual void acceptor (JAWS_IO_Acceptor *acceptorp) = 0;
-  virtual void concurrency (JAWS_Concurrency_Base *concp) = 0;
-};
-
-class JAWS_Default_Dispatch_Policy : public JAWS_Dispatch_Policy
-{
-public:
-  JAWS_Default_Dispatch_Policy (void);
-  virtual ~JAWS_Default_Dispatch_Policy (void);
-
-  virtual JAWS_IO *io (void);
-  virtual JAWS_IO_Handler_Factory *ioh_factory (void);
-  virtual JAWS_IO_Acceptor *acceptor (void);
-  virtual JAWS_Concurrency_Base *concurrency (void);
-
-  virtual void io (JAWS_IO *iop);
-  virtual void ioh_factory (JAWS_IO_Handler_Factory *factoryp);
-  virtual void acceptor (JAWS_IO_Acceptor *acceptorp);
-  virtual void concurrency (JAWS_Concurrency_Base *concp);
-
-private:
-  JAWS_Concurrency_Base *concurrency_;
-  JAWS_IO_Handler_Factory *ioh_factory_;
-  JAWS_IO_Acceptor *acceptor_;
-  JAWS_IO *io_;
-};
-
-#endif /* !defined (JAWS_POLICY_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Server.cpp b/apps/JAWS/PROTOTYPE/JAWS/Server.cpp
deleted file mode 100644
index 1aa003f5c7c..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Server.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-
-#include "JAWS/Server.h"
-#include "JAWS/Data_Block.h"
-#include "JAWS/Concurrency.h"
-#include "JAWS/IO_Handler.h"
-#include "JAWS/IO_Acceptor.h"
-#include "JAWS/Pipeline_Tasks.h"
-
-JAWS_Server::JAWS_Server (void)
-  : port_ (5432),
-    concurrency_ (0),
-    dispatch_ (0),
-    nthreads_ (5),
-    maxthreads_ (20),
-    flags_ (THR_NEW_LWP)
-{
-}
-
-JAWS_Server::JAWS_Server (int argc, char *argv[])
-  : port_ (5432),
-    concurrency_ (0),
-    dispatch_ (0),
-    nthreads_ (5),
-    maxthreads_ (20),
-    flags_ (THR_NEW_LWP)
-{
-  this->init (argc, argv);
-}
-
-void
-JAWS_Server::init (int argc, char *argv[])
-{
-  this->parse_args (argc, argv);
-
-  JAWS_Thread_Pool_Singleton::instance ()->open (this->flags_,
-                                                 this->nthreads_,
-                                                 this->maxthreads_);
-
-  JAWS_Thread_Per_Singleton::instance ()->open (this->flags_,
-                                                this->maxthreads_);
-
-}
-
-int
-JAWS_Server::open (JAWS_Pipeline_Handler *protocol)
-{
-  JAWS_Synch_IO_Handler_Factory synch_factory;
-#if defined (ACE_WIN32)
-  JAWS_Asynch_IO_Handler_Factory asynch_factory;
-#else
-  JAWS_Synch_IO_Handler_Factory &asynch_factory = synch_factory;
-#endif /* defined (ACE_WIN32) */
-
-  JAWS_IO_Handler_Factory *factory;
-  JAWS_IO_Handler *handler;
-  JAWS_Data_Block *db;
-
-  ACE_INET_Addr inet_addr (this->port_);
-  JAWS_IO_Synch_Acceptor_Singleton::instance ()->open (inet_addr);
-  JAWS_IO_Asynch_Acceptor_Singleton::instance ()->open (inet_addr);
-
-  // initialize an IO_Handler
-  factory = (this->dispatch_ == 0) ? &synch_factory : &asynch_factory;
-  handler = factory->create_io_handler ();
-  if (handler == 0)
-    {
-      factory->destroy_io_handler (handler);
-      ACE_DEBUG ((LM_DEBUG, "JAWS_Server::open, can't create handler\n"));
-      return -1;
-    }
-  // handler->task (protocol);
-
-  // initialize data block
-  db = new JAWS_Data_Block;
-  if (db == 0)
-    {
-      factory->destroy_io_handler (handler);
-      ACE_DEBUG ((LM_DEBUG, "JAWS_Server::open, can't create data block\n"));
-      return -1;
-    }
-
-  db->io_handler (handler);
-  db->task (JAWS_Pipeline_Accept_Task_Singleton::instance ());
-
-  // The message block should contain an INET_Addr, and call the
-  // io->accept (INET_Addr) method!
-
-  ACE_Message_Block mb (db);
-
-  JAWS_Concurrency_Base *concurrency;
-  concurrency = (this->concurrency_ == 0)
-    ? JAWS_Thread_Pool_Singleton::instance ()
-    : JAWS_Thread_Per_Singleton::instance ()
-    ;
-
-  concurrency->put (&mb);
-
-  while (ACE_OS::thr_join (0, NULL) != -1)
-    ;
-
-  return 0;
-}
-
-void
-JAWS_Server::parse_args (int argc, char *argv[])
-{
-  int c;
-
-  ACE_Get_Opt getopt (argc, argv, "p:c:d:n:m:f:");
-  while ((c = getopt ()) != -1)
-    switch (c)
-      {
-      case 'p':
-        this->port_ = ACE_OS::atoi (getopt.optarg);
-        break;
-      case 'c':
-        if (ACE_OS::strcmp (getopt.optarg, "PER_REQUEST") == 0)
-          this->concurrency_ = 1;
-        else this->concurrency_ = 0;
-        break;
-      case 'd':
-        if (ACE_OS::strcmp (getopt.optarg, "ASYNCH") == 0)
-          this->dispatch_ = 1;
-        else this->dispatch_ = 0;
-        break;
-      case 'n':
-        this->nthreads_ = ACE_OS::atoi (getopt.optarg);
-        break;
-      case 'm':
-        this->maxthreads_ = ACE_OS::atoi (getopt.optarg);
-        break;
-      case 'f':
-        if (ACE_OS::strcmp (getopt.optarg, "THR_BOUND") == 0)
-          this->flags_ |= THR_BOUND;
-        else if (ACE_OS::strcmp (getopt.optarg, "THR_DAEMON") == 0)
-          this->flags_ |= THR_DAEMON;
-        else if (ACE_OS::strcmp (getopt.optarg, "THR_DETACHED") == 0)
-          this->flags_ |= THR_DETACHED;
-        break;
-      }
-
-  if (this->port_ == 0) this->port_ = 5432;
-  if (this->nthreads_ == 0) this->nthreads_ = 5;
-  if (this->maxthreads_ == 0) this->maxthreads_ = 20;
-}
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Server.h b/apps/JAWS/PROTOTYPE/JAWS/Server.h
deleted file mode 100644
index e2405e4b360..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Server.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#if !defined (JAWS_SERVER_H)
-#define JAWS_SERVER_H
-
-#include "JAWS/Data_Block.h"
-
-class JAWS_IO_Handler_Factory;
-
-class JAWS_Server
-{
-public:
-  JAWS_Server (void);
-  JAWS_Server (int argc, char *argv[]);
-
-  void init (int argc, char *argv[]);
-  int open (JAWS_Pipeline_Handler *ph);
-
-private:
-  void parse_args (int argc, char *argv[]);
-  // Parse arguments
-
-private:
-  int port_;            // port to listen on
-  int concurrency_;     // 0 => pool, 1 => per request
-  int dispatch_;        // 0 => synch, 1 => asynch
-  int nthreads_;        // number of threads
-  int maxthreads_;      // maximum number of threads
-  long flags_;          // thread creation flags
-
-  JAWS_IO_Handler_Factory *factory_;
-};
-
-
-#endif /* !defined (JAWS_SERVER_H) */
diff --git a/apps/JAWS/PROTOTYPE/Makefile b/apps/JAWS/PROTOTYPE/Makefile
deleted file mode 100644
index cc09a073937..00000000000
--- a/apps/JAWS/PROTOTYPE/Makefile
+++ /dev/null
@@ -1,355 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for the ACE Adapter Web Server (JAWS)
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN   	= main
-
-LIB = libJAWS.a
-
-MYFILES  	= \
-	HTTP_Server \
-	HTTP_Config \
-	HTTP_Handler \
-	HTTP_Helpers \
-	JAWS_Pipeline \
-	JAWS_Concurrency \
-	HTTP_Request \
-	HTTP_Response \
-	Parse_Headers \
-	IO_Acceptor \
-	IO
-
-LSRC	= $(addsuffix .cpp,$(MYFILES))
-LOBJ	= $(addsuffix .o,$(MYFILES))
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-LDLIBS	= -lJAWS
-
-BUILD	= $(VOBJS) $(VLIB) $(VBIN)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-# The contents of rules.bin.GNU are expanded in Local targets, below.
-# include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-# include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-# Expand rules.bin.GNU, but without the $(VOBJS) dependencies.
-VBIN    = $(BIN:%=%$(VAR))
-
-$(BIN): %: $(VDIR)%.o
-	$(LINK.cc) -o $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK)
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/HTTP_Server.o .obj/HTTP_Server.so .shobj/HTTP_Server.o .shobj/HTTP_Server.so: HTTP_Server.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Asynch_Acceptor.h \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h IO.h \
- HTTP_Server.h $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Acceptor.i HTTP_Handler.h \
- HTTP_Request.h Parse_Headers.h HTTP_Response.h
-.obj/HTTP_Config.o .obj/HTTP_Config.so .shobj/HTTP_Config.o .shobj/HTTP_Config.so: HTTP_Config.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i HTTP_Config.h
-.obj/HTTP_Handler.o .obj/HTTP_Handler.so .shobj/HTTP_Handler.o .shobj/HTTP_Handler.so: HTTP_Handler.cpp \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Filecache.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h HTTP_Handler.h \
- $(ACE_ROOT)/ace/Asynch_IO.h HTTP_Request.h \
- Parse_Headers.h HTTP_Response.h IO.h HTTP_Helpers.h
-.obj/HTTP_Helpers.o .obj/HTTP_Helpers.so .shobj/HTTP_Helpers.o .shobj/HTTP_Helpers.so: HTTP_Helpers.cpp HTTP_Helpers.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h
-.obj/Pipeline.o .obj/Pipeline.so .shobj/Pipeline.o .shobj/Pipeline.so: Pipeline.cpp Pipeline.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h
-.obj/HTTP_Request.o .obj/HTTP_Request.so .shobj/HTTP_Request.o .shobj/HTTP_Request.so: HTTP_Request.cpp \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Mem_Map.h HTTP_Request.h \
- Parse_Headers.h HTTP_Helpers.h HTTP_Config.h
-.obj/HTTP_Response.o .obj/HTTP_Response.so .shobj/HTTP_Response.o .shobj/HTTP_Response.so: HTTP_Response.cpp \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Mem_Map.h HTTP_Response.h \
- HTTP_Request.h Parse_Headers.h HTTP_Helpers.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h HTTP_Config.h \
- IO.h $(ACE_ROOT)/ace/Asynch_IO.h
-.obj/Parse_Headers.o .obj/Parse_Headers.so .shobj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp Parse_Headers.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp IO.h $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Asynch_IO.h HTTP_Helpers.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Filecache.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/PROTOTYPE/main.cpp b/apps/JAWS/PROTOTYPE/main.cpp
deleted file mode 100644
index 01af87928f0..00000000000
--- a/apps/JAWS/PROTOTYPE/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#include "JAWS/Server.h"
-#include "HTTP_10.h"
-
-int
-main (int argc, char *argv[])
-{
-  JAWS_Server server (argc, argv);
-  HTTP_Pipeline HTTP;
-
-  if (server.open (&HTTP) == -1)
-    ACE_DEBUG ((LM_DEBUG, "JAWS: Error openning server\n"));
-
-  return 0;
-}
diff --git a/docs/ACE-inheritance.pdf.gz b/docs/ACE-inheritance.pdf.gz
deleted file mode 100644
index 0ffe032045c..00000000000
--- a/docs/ACE-inheritance.pdf.gz
+++ /dev/null
diff --git a/docs/ACE-inheritance.ps.gz b/docs/ACE-inheritance.ps.gz
deleted file mode 100644
index 7c59a095620..00000000000
--- a/docs/ACE-inheritance.ps.gz
+++ /dev/null
diff --git a/docs/CE-status.txt b/docs/CE-status.txt
deleted file mode 100644
index 7088989fbc4..00000000000
--- a/docs/CE-status.txt
+++ /dev/null
@@ -1,594 +0,0 @@
--*- mode: outline; outline-regexp: " *\\[" -*-
-
-[Hints on writing portable code using ACE]
-
-  [Testing Non-Window based ACE programs]
-     Rumor has it that Microsoft will provide a DOS shell in their
-     next release of CE.  Oh well, I made it up and there'll probably
-     no DOS prompt in the future CE.  All current ACE programs are
-     text-based.  They all need a shell to start from.  
-
-     [Dialog Based]
-        This is a collection of files that combined with any ACE
-     program to run on CE.  To use this template, compile your main
-     project with all the cpp and rc files under $ACE_ROOT/windoezCE/.
-     
-     The program will start by asking you the command line argument
-     that you want to pass to the original ACE program.  We should be
-     able to get this infomation automatically if we execute the
-     program from "Start -> Run...".  However, that'll require us to
-     implement this window using Win32 API (it's written with MFC
-     classes now.)  Notice that GetCommandLine is not available on
-     CE.
-
-        [Future Improvement]
-           
-            Get the command line argument automatically.
-
-            Buffered keyboard input (stdin.)
-
-            Scrollable output.
-
-  [Unicode Trivia]
-        Since most APIs take wide char strings as their arguments when
-        strings are needed, some pre-cautions must be taken...
-
-        Here are some macros that help converting string types back
-        and forth based on your platform settings.  Here, under CE is
-        equivalent to have ACE_HAS_MOSTLY_UNICODE_APIS defined.
-
-    [ASYS_TCHAR] Defined as wchar_t under CE, but as char under all
-        other paltforms.
-
-    [ASYS_TEXT] A macro that converts a char text to a wchar text
-        only under CE. 
-
-    [ASYS_WIDE_STRING] A macro that converts char strings to wchar
-        strings using ACE_WString only when
-        ACE_HAS_MOSTLY_UNICODE_APIS is defined.
-
-    [ASYS_MULTIBYTE_STRING] A macro that converts wchar strings to
-        char strings using ACE_WString while
-        ACE_HAS_MOSTLY_UNICODE_APIS is not defined but UNICODE is
-        defined.
-
-    [ASYS_ONLY_MULTIBYTE_STRING] Like ASYS_MULTIBYTE_STRING but only
-        convert a string when ACE_HAS_MOSTLY_UNICODE_APIS defined and
-        UNICODE not defined. 
-
-    [ACE_TRACE] When using ACE_TRACE macros, you don't need to use
-        wide char string in it.  ACE converts the char string to wchar
-        string for you.  
-
-
-[ACE File list]
-  Here is a trace of ACE files about their status on CE.
-  [Legend]
-           (.)    Defered.
-           (x)    Compiled successfully. (Doesn't mean it will run. ;-)
-           (@)    Not compile yet.
-           (T)    Template codes.
-           (N)    Not planning to support
-           ( )    ???
-
-  [ACE]
-          [CORBA]
-   (.)            CORBA_Handler.cpp
-   (.)            CORBA_Handler.h
-   (.)            CORBA_Handler.i
-   (.)            CORBA_Ref.cpp
-   (.)            CORBA_Ref.h
-   (.)            CORBA_Ref.i
-          [Collections]
-   (x)            Array.cpp
-   (x)            Array.h
-   (x)            Array.i
-   (T)            Containers.cpp
-   (T)            Containers.i
-   (T)            Containers.h
-   (T)            Hash_Map_Manager.cpp
-   (T)            Hash_Map_Manager.h
-   (T)            Filecache.cpp
-   (T)            Filecache.h
-   (T)            Free_List.cpp
-   (T)            Free_List.i
-   (T)            Free_List.h
-   (T)            Managed_Object.cpp
-   (T)            Managed_Object.h
-   (T)            Managed_Object.i
-   (T)            Map_Manager.cpp
-   (T)            Map_Manager.h
-   (T)            Map_Manager.i
-   (x)            Object_Manager.cpp
-   (x)            Object_Manager.i
-   (x)            Object_Manager.h
-   (x)            SString.cpp
-   (x)            SString.h
-   (x)            SString.i
-          [Concurrency]
-   (x)            Activation_Queue.h
-   (x)            Activation_Queue.cpp
-   (x)            Atomic_Op.i
-   (.)            Future.h
-   (.)            Future.cpp
-   (x)            Method_Object.h
-   (x)            Method_Object.cpp
-   (x)            Process.cpp
-   (x)            Process.h
-   (x)            Process.i
-   (x)            Process_Manager.cpp
-   (x)            Process_Manager.h
-   (x)            Process_Manager.i
-   (x)            Sched_Params.cpp
-   (x)            Sched_Params.h
-   (x)            Sched_Params.i
-   (x)            Synch.cpp
-   (x)            Synch.h
-   (x)            Synch.i
-   (x)            Synch_Options.cpp
-   (x)            Synch_Options.h
-   (x)            Synch_Options.i
-   (T)            Synch_T.cpp
-   (T)            Synch_T.h
-   (T)            Synch_T.i
-   (x)            Thread.cpp
-   (x)            Thread.h
-   (x)            Thread.i
-   (x)            Thread_Manager.cpp
-   (x)            Thread_Manager.h
-   (x)            Thread_Manager.i
-   (x)            Token.cpp
-   (x)            Token.h
-   (x)            Token.i
-          [Config]
-   (x)            config.h
-   (x)            Basic_Types.cpp
-   (x)            Basic_Types.h
-   (x)            Basic_Types.i
-   (x)            Version.h
-          [Connection]
-   (T)            Acceptor.cpp
-   (T)            Acceptor.h
-   (T)            Acceptor.i
-   (.)            Asynch_Acceptor.cpp
-   (.)            Asynch_Acceptor.h
-   (.)            Asynch_Acceptor.i
-   (x)            Asynch_IO.cpp
-   (x)            Asynch_IO.h
-   (x)            Asynch_IO.i
-   (T)            Connector.cpp
-   (T)            Connector.h
-   (T)            Connector.i
-   (T)            Dynamic_Service.cpp
-   (T)            Dynamic_Service.h
-   (T)            Dynamic_Service.i
-   (x)            Strategies.cpp
-   (x)            Strategies.h
-   (x)            Strategies.i
-   (T)            Strategies_T.cpp
-   (T)            Strategies_T.h
-   (T)            Strategies_T.i
-   (T)            Svc_Handler.cpp
-   (T)            Svc_Handler.h
-   (T)            Svc_Handler.i
-          [IPC]
-                  [IO_SAP]
-   (x)                    IO_SAP.cpp
-   (x)                    IO_SAP.h
-   (x)                    IO_SAP.i
-                          [DEV_SAP]
-   (N)                            DEV.cpp
-   (N)                            DEV.h
-   (N)                            DEV.i
-   (N)                            DEV_Connector.cpp
-   (N)                            DEV_Connector.h
-   (N)                            DEV_Connector.i
-   (N)                            DEV_IO.cpp
-   (N)                            DEV_IO.h
-   (N)                            DEV_IO.i
-   (N)                            TTY_IO.cpp
-   (N)                            TTY_IO.h
-                          [FILE_SAP]
-   (.)                            FILE.cpp
-   (.)                            FILE.h
-   (.)                            FILE.i
-   (.)                            FILE_Connector.cpp
-   (.)                            FILE_Connector.h
-   (.)                            FILE_Connector.i
-   (.)                            FILE_IO.cpp
-   (.)                            FILE_IO.h
-   (.)                            FILE_IO.i
-                  [IPC_SAP]
-   (x)                    IPC_SAP.cpp
-   (x)                    IPC_SAP.h
-   (x)                    IPC_SAP.i
-                          [Addr]
-   (x)                            Addr.cpp
-   (x)                            Addr.h
-   (x)                            Addr.i
-   (N)                            DEV_Addr.cpp
-   (N)                            DEV_Addr.h
-   (N)                            DEV_Addr.i
-   (.)                            FILE_Addr.cpp
-   (.)                            FILE_Addr.h
-   (.)                            FILE_Addr.i
-   (x)                            INET_Addr.cpp
-   (x)                            INET_Addr.h
-   (x)                            INET_Addr.i
-   (.)                            SPIPE_Addr.cpp
-   (.)                            SPIPE_Addr.h
-   (.)                            SPIPE_Addr.i
-   (N)                            UNIX_Addr.cpp
-   (N)                            UNIX_Addr.h
-   (N)                            UNIX_Addr.i
-   (.)                            UPIPE_Addr.h
-                          [FIFO_SAP]
-   (.)                            FIFO.cpp
-   (.)                            FIFO.h
-   (.)                            FIFO.i
-   (.)                            FIFO_Recv.cpp
-   (.)                            FIFO_Recv.h
-   (.)                            FIFO_Recv.i
-   (.)                            FIFO_Recv_Msg.cpp
-   (.)                            FIFO_Recv_Msg.h
-   (.)                            FIFO_Recv_Msg.i
-   (.)                            FIFO_Send.cpp
-   (.)                            FIFO_Send.h
-   (.)                            FIFO_Send.i
-   (.)                            FIFO_Send_Msg.cpp
-   (.)                            FIFO_Send_Msg.h
-   (.)                            FIFO_Send_Msg.i
-                          [SOCK_SAP]
-   ( )                            LOCK_SOCK_Acceptor.cpp
-   ( )                            LOCK_SOCK_Acceptor.h
-   ( )                            LSOCK.cpp
-   ( )                            LSOCK.h
-   ( )                            LSOCK.i
-   ( )                            LSOCK_Acceptor.cpp
-   ( )                            LSOCK_Acceptor.h
-   ( )                            LSOCK_Acceptor.i
-   ( )                            LSOCK_CODgram.cpp
-   ( )                            LSOCK_CODgram.h
-   ( )                            LSOCK_CODgram.i
-   ( )                            LSOCK_Connector.cpp
-   ( )                            LSOCK_Connector.h
-   ( )                            LSOCK_Connector.i
-   ( )                            LSOCK_Dgram.cpp
-   ( )                            LSOCK_Dgram.h
-   ( )                            LSOCK_Dgram.i
-   ( )                            LSOCK_Stream.cpp
-   ( )                            LSOCK_Stream.h
-   ( )                            LSOCK_Stream.i
-   (x)                            SOCK.cpp
-   (x)                            SOCK.h
-   (x)                            SOCK.i
-   (x)                            SOCK_Acceptor.cpp
-   (x)                            SOCK_Acceptor.h
-   (x)                            SOCK_Acceptor.i
-   (x)                            SOCK_CODgram.cpp
-   (x)                            SOCK_CODgram.h
-   (x)                            SOCK_CODgram.i
-   (x)                            SOCK_Connector.cpp
-   (x)                            SOCK_Connector.h
-   (x)                            SOCK_Connector.i
-   (x)                            SOCK_Dgram.cpp
-   (x)                            SOCK_Dgram.h
-   (x)                            SOCK_Dgram.i
-   (x)                            SOCK_Dgram_Bcast.cpp
-   (x)                            SOCK_Dgram_Bcast.h
-   (x)                            SOCK_Dgram_Bcast.i
-   (x)                            SOCK_Dgram_Mcast.cpp
-   (x)                            SOCK_Dgram_Mcast.h
-   (x)                            SOCK_Dgram_Mcast.i
-   (x)                            SOCK_IO.cpp
-   (x)                            SOCK_IO.h
-   (x)                            SOCK_IO.i
-   (x)                            SOCK_Stream.cpp
-   (x)                            SOCK_Stream.h
-   (x)                            SOCK_Stream.i
-                          [SPIPE_SAP]
-   (.)                            SPIPE.cpp
-   (.)                            SPIPE.h
-   (.)                            SPIPE.i
-   (.)                            SPIPE_Acceptor.cpp
-   (.)                            SPIPE_Acceptor.h
-   (.)                            SPIPE_Acceptor.i
-   (.)                            SPIPE_Connector.cpp
-   (.)                            SPIPE_Connector.h
-   (.)                            SPIPE_Connector.i
-   (.)                            SPIPE_Stream.cpp
-   (.)                            SPIPE_Stream.h
-   (.)                            SPIPE_Stream.i
-                          [TLI_SAP]
-   (N)                            TLI.cpp
-   (N)                            TLI.h
-   (N)                            TLI.i
-   (N)                            TLI_Acceptor.cpp
-   (N)                            TLI_Acceptor.h
-   (N)                            TLI_Acceptor.i
-   (N)                            TLI_Connector.cpp
-   (N)                            TLI_Connector.h
-   (N)                            TLI_Connector.i
-   (N)                            TLI_Stream.cpp
-   (N)                            TLI_Stream.h
-   (N)                            TLI_Stream.i
-                  [UPIPE_SAP]
-   (N)                    UPIPE_Acceptor.cpp
-   (N)                    UPIPE_Acceptor.h
-   (N)                    UPIPE_Acceptor.i
-   (N)                    UPIPE_Connector.cpp
-   (N)                    UPIPE_Connector.h
-   (N)                    UPIPE_Connector.i
-   (N)                    UPIPE_Stream.cpp
-   (N)                    UPIPE_Stream.h
-   (N)                    UPIPE_Stream.i
-                  [Utils]
-   (N)                    IOStream.cpp      // CE doesn't have iostream stuff
-   (N)                    IOStream.h
-   (N)                    IOStream_T.cpp
-   (N)                    IOStream_T.h
-   (N)                    IOStream_T.i
-   (x)                    Pipe.cpp
-   (x)                    Pipe.h
-   (x)                    Pipe.i
-   (x)                    Signal.cpp
-   (x)                    Signal.h
-   (x)                    Signal.i
-          [Logging and Tracing]
-   (x)            Dump.cpp
-   (x)            Dump.h
-   (x)            Dump_T.cpp
-   (T)            Dump_T.h
-   (T)            Log_Msg.cpp
-   (x)            Log_Msg.h
-   (x)            Log_Msg.i
-   (x)            Log_Priority.h
-   (x)            Log_Record.cpp
-   (x)            Log_Record.h
-   (x)            Log_Record.i
-   (x)            Trace.cpp
-   (x)            Trace.h
-   (x)            Trace.i
-          [Memory]
-                  [Mem_Map]
-   (x)                    Mem_Map.cpp
-   (x)                    Mem_Map.h
-   (x)                    Mem_Map.i
-                  [Shared_Malloc]
-   (x)                    Malloc.cpp
-   (x)                    Malloc.h
-   (x)                    Malloc.i
-   (T)                    Malloc_T.cpp
-   (T)                    Malloc_T.h
-   (T)                    Malloc_T.i
-   (x)                    Memory_Pool.cpp
-   (x)                    Memory_Pool.h
-   (x)                    Memory_Pool.i
-                  [Shared_Memory]
-   ( )                    Shared_Memory.h
-   ( )                    Shared_Memory_MM.cpp
-   ( )                    Shared_Memory_MM.h
-   ( )                    Shared_Memory_MM.i
-   ( )                    Shared_Memory_SV.cpp
-   ( )                    Shared_Memory_SV.h
-   ( )                    Shared_Memory_SV.i
-                  [Utils]
-   (x)                    Obstack.cpp
-   (x)                    Obstack.h
-   (@)                    Read_Buffer.cpp
-   (@)                    Read_Buffer.h
-   (@)                    Read_Buffer.i
-          [Misc]
-   (x)            ARGV.cpp
-   (x)            ARGV.h
-   (x)            ARGV.i
-   (T)            Auto_Ptr.cpp
-   (T)            Auto_Ptr.h
-   (T)            Auto_Ptr.i
-   (x)            Dynamic.cpp
-   (x)            Dynamic.h
-   (x)            Dynamic.i
-   (x)            Get_Opt.cpp
-   (x)            Get_Opt.h
-   (x)            Get_Opt.i
-   (.)            Registry.cpp
-   (.)            Registry.h
-   (T)            Singleton.cpp
-   (T)            Singleton.h
-   (T)            Singleton.i
-   (x)            System_Time.cpp
-   (x)            System_Time.h
-          [Name_Service]
-   (.)            Local_Name_Space.cpp
-   (.)            Local_Name_Space.h
-   (.)            Local_Name_Space_T.cpp
-   (.)            Local_Name_Space_T.h
-   (.)            Name_Options.cpp
-   (.)            Name_Options.h
-   (.)            Name_Proxy.cpp
-   (.)            Name_Proxy.h
-   (.)            Name_Request_Reply.cpp
-   (.)            Name_Request_Reply.h
-   (.)            Name_Space.cpp
-   (.)            Name_Space.h
-   (.)            Naming_Context.cpp
-   (.)            Naming_Context.h
-   (.)            Registry_Name_Space.cpp
-   (.)            Registry_Name_Space.h
-   (.)            Remote_Name_Space.cpp
-   (.)            Remote_Name_Space.h
-          [OS Adapters]
-   (x)            ACE.cpp
-   (x)            ACE.h
-   (x)            ACE.i
-   (x)            OS.cpp
-   (x)            OS.h
-   (x)            OS.i
-          [Reactor]
-   (x)            Event_Handler.cpp
-   (x)            Event_Handler.h
-   (x)            Event_Handler.i
-   (T)            Event_Handler_T.cpp
-   (T)            Event_Handler_T.h
-   (T)            Event_Handler_T.i
-   (x)            Handle_Set.cpp
-   (x)            Handle_Set.h
-   (x)            Handle_Set.i
-   ( )            Priority_Reactor.cpp
-   ( )            Priority_Reactor.i
-   ( )            Priority_Reactor.h
-   ( )            Proactor.h
-   ( )            Proactor.i
-   ( )            Proactor.cpp
-   (x)            Reactor.cpp
-   (x)            Reactor.h
-   (x)            Reactor.i
-   (x)            Reactor_Impl.h
-   (x)            Select_Reactor.cpp
-   (x)            Select_Reactor.h
-   (x)            Select_Reactor.i
-   (@)            WFMO_Reactor.cpp
-   (@)            WFMO_Reactor.h
-   (@)            WFMO_Reactor.i
-   (x)            XtReactor.cpp
-   (x)            XtReactor.h
-          [Service_Configurator]
-   (x)            Parse_Node.cpp
-   (x)            Parse_Node.h
-   (x)            Parse_Node.i
-   (x)            Service_Config.cpp
-   (x)            Service_Config.h
-   (x)            Service_Config.i
-   ( )            Service_Main.cpp
-   (x)            Service_Manager.cpp
-   (x)            Service_Manager.h
-   (x)            Service_Manager.i
-   (x)            Service_Object.cpp
-   (x)            Service_Object.h
-   (x)            Service_Object.i
-   (x)            Service_Repository.cpp
-   (x)            Service_Repository.h
-   (x)            Service_Repository.i
-   (x)            Service_Types.cpp
-   (x)            Service_Types.i
-   (x)            Service_Types.h
-   (x)            Shared_Object.cpp
-   (x)            Shared_Object.h
-   (x)            Shared_Object.i
-   (x)            Svc_Conf.h
-   (x)            Svc_Conf_l.cpp
-   (x)            Svc_Conf_y.cpp
-          [Streams]
-   (x)            IO_Cntl_Msg.cpp
-   (x)            IO_Cntl_Msg.h
-   (x)            IO_Cntl_Msg.i
-   (x)            Message_Block.cpp
-   (x)            Message_Block.h
-   (x)            Message_Block.i
-   (T)            Message_Queue.cpp
-   (T)            Message_Queue.h
-   (T)            Message_Queue.i
-   (T)            Module.cpp
-   (T)            Module.h
-   (T)            Module.i
-   (.)            Multiplexor.cpp
-   (.)            Multiplexor.h
-   (.)            Multiplexor.i
-   (T)            Stream.cpp
-   (T)            Stream.h
-   (T)            Stream.i
-   (T)            Stream_Modules.cpp
-   (T)            Stream_Modules.h
-   (T)            Stream_Modules.i
-   (x)            Task.cpp
-   (x)            Task.h
-   (x)            Task.i
-   (T)            Task_T.cpp
-   (T)            Task_T.h
-   (T)            Task_T.i
-          [System_V_IPC]
-                  [System_V_Message_Queues]
-   ( )                    SV_Message.cpp
-   ( )                    SV_Message.h
-   ( )                    SV_Message.i
-   ( )                    SV_Message_Queue.cpp
-   ( )                    SV_Message_Queue.h
-   ( )                    SV_Message_Queue.i
-   ( )                    Typed_SV_Message.cpp
-   ( )                    Typed_SV_Message.h
-   ( )                    Typed_SV_Message.i
-   ( )                    Typed_SV_Message_Queue.cpp
-   ( )                    Typed_SV_Message_Queue.h
-   ( )                    Typed_SV_Message_Queue.i
-                  [System_V_Semaphores]
-   ( )                    SV_Semaphore_Complex.cpp
-   ( )                    SV_Semaphore_Complex.h
-   ( )                    SV_Semaphore_Complex.i
-   ( )                    SV_Semaphore_Simple.cpp
-   ( )                    SV_Semaphore_Simple.h
-   ( )                    SV_Semaphore_Simple.i
-                  [System_V_Shared_Memory]
-   ( )                    SV_Shared_Memory.cpp
-   ( )                    SV_Shared_Memory.h
-   ( )                    SV_Shared_Memory.i
-          [Timers]
-
-   (x)            High_Res_Timer.cpp
-   (x)            High_Res_Timer.h
-   (x)            High_Res_Timer.i
-   (x)            Profile_Timer.cpp
-   (x)            Profile_Timer.h
-   (x)            Profile_Timer.i
-   (.)            Time_Request_Reply.cpp
-   (.)            Time_Request_Reply.h
-   (x)            Time_Value.h
-   (x)            Timer_Hash.cpp
-   (x)            Timer_Hash.h
-   (T)            Timer_Hash_T.cpp
-   (T)            Timer_Hash_T.h
-   (x)            Timer_Heap.cpp
-   (x)            Timer_Heap.h
-   (x)            Timer_Heap.i
-   (T)            Timer_Heap_T.cpp
-   (T)            Timer_Heap_T.h
-   (T)            Timer_Heap_T.i
-   (x)            Timer_List.cpp
-   (x)            Timer_List.h
-   (x)            Timer_List.i
-   (T)            Timer_List_T.cpp
-   (T)            Timer_List_T.h
-   (T)            Timer_List_T.i
-   (x)            Timer_Queue.cpp
-   (x)            Timer_Queue.h
-   (x)            Timer_Queue.i
-   (T)            Timer_Queue_Adapters.cpp
-   (T)            Timer_Queue_Adapters.h
-   (T)            Timer_Queue_Adapters.i
-   (T)            Timer_Queue_T.cpp
-   (T)            Timer_Queue_T.h
-   (T)            Timer_Queue_T.i
-   (x)            Timer_Wheel.cpp
-   (x)            Timer_Wheel.h
-   (x)            Timer_Wheel.i
-   (T)            Timer_Wheel_T.cpp
-   (T)            Timer_Wheel_T.h
-   (T)            Timer_Wheel_T.i
-          [Token_Service]
-   (x)            Local_Tokens.cpp
-   (x)            Local_Tokens.h
-   (x)            Local_Tokens.i
-   (.)            Remote_Tokens.cpp
-   (.)            Remote_Tokens.h
-   (.)            Remote_Tokens.i
-   (.)            Token_Collection.cpp
-   (.)            Token_Collection.h
-   (.)            Token_Collection.i
-   (x)            Token_Manager.cpp
-   (x)            Token_Manager.h
-   (x)            Token_Manager.i
-   (.)            Token_Request_Reply.cpp
-   (.)            Token_Request_Reply.h
-   (.)            Token_Request_Reply.i
-   (.)            Token_Invariants.h
-   (.)            Token_Invariants.i
-   (.)            Token_Invariants.cpp
diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp
deleted file mode 100644
index 37613f14f38..00000000000
--- a/examples/Reactor/Misc/signal_tester.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Perform an extensive test of the ACE_Reactor's event dispatching
-// $Id$
-
-// mechanisms.  These mechanisms illustrate how signals, I/O, and
-// timeout events can all be handled within the same framework.  In
-// addition, this example illustrates how to use the ACE_Reactor for
-// devices that perform I/O via signals (such as SVR4 message queues).
-
-
-#include "ace/Service_Config.h"
-
-// Used to shut down the event loop.
-static sig_atomic_t done = 0;
-
-// This class illustrates how to handle signal-driven I/O using the
-// ACE_Reactor framework.  Note that signals may be caught and
-// processed without requiring the use of global signal handler
-// functions or global signal handler data.
-
-class Sig_Handler : public ACE_Event_Handler
-{
-public:
-  Sig_Handler (void);
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE);
-  virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_signal (ACE_HANDLE signum, siginfo_t * = 0, 
-			     ucontext_t * = 0);
-
-private:
-  ACE_HANDLE handle_;
-};
-
-// A dummy_handle is required to reserve a slot in the ACE_Reactor's
-// descriptor table.
-
-Sig_Handler::Sig_Handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-  ACE_Sig_Set sig_set;
-
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-  sig_set.sig_add (SIGALRM);  
-
-  // Register the signal handler object to catch the signals.
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-}
-
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-// In a real application, this method would be where the read on the
-// signal-driven I/O device would occur asynchronously.  For now we'll
-// just print a greeting to let you know that everything is working
-// properly!
-
-int 
-Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "handling asynchonrous input...\n"));
-  return 0;
-}
-
-// In a real application, this method would do any cleanup activities
-// required when shutting down the I/O device.
-
-int 
-Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Rearm the alarm.
-      ACE_OS::alarm (4);
-      break;
-    case SIGINT:
-      // Tell the ACE_Reactor to enable the ready bit for
-      // this->handle_.  The ACE_Reactor will subsequently call the
-      // Sig_Handler::handle_input method from within its event loop.
-      return ACE_Service_Config::reactor ()->ready_ops 
-	(this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK);
-    case SIGQUIT:
-      ACE_DEBUG ((LM_DEBUG, "%S: shutting down signal tester\n", signum));
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-		  "%S: not handled, returning to program\n", signum));
-      break;
-    }
-  return 0;
-}
-
-// This class illustrates that the ACE_Reactor can handle signals,
-// STDIO, and timeouts using the same mechanisms.
-
-class STDIN_Handler : public ACE_Event_Handler
-{
-public:
-  STDIN_Handler (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-};
-
-STDIN_Handler::STDIN_Handler (void)
-{
-  if (ACE::register_stdin_handler (this,
-				   ACE_Service_Config::reactor (),
-				   ACE_Service_Config::thr_mgr ()) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
-
-  // Register the STDIN_Handler to be dispatched once every second.
-  else if (ACE_Service_Config::reactor ()->schedule_timer
-	   (this, 0, ACE_Time_Value (1), ACE_Time_Value (1)) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1));
-}
-
-int 
-STDIN_Handler::handle_timeout (const ACE_Time_Value &tv,
-			       const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, "timeout occurred at %d sec, %d usec\n",
-	      tv.sec (), tv.usec ()));
-  return 0;
-}
-
-// Read from input descriptor and write to stdout descriptor.
-
-int 
-STDIN_Handler::handle_input (ACE_HANDLE handle)
-{
-  ssize_t n;
-  char buf[BUFSIZ];
-
-  switch (n = ACE_OS::read (handle, buf, sizeof buf))
-    {
-    case -1:
-      if (errno == EINTR)
-	return 0;
-        /* NOTREACHED */
-      else
-	ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-      /* FALLTHROUGH */
-    case 0:
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default:
-      {
-	ssize_t result = ACE::write_n (ACE_STDOUT, buf, n);
-
-	if (result != n)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write"), 
-			    result == -1 && errno == EINTR ? 0 : -1);
-      }
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv [0]);
-
-  // Signal handler.
-  Sig_Handler sh;
-
-  // Define an I/O handler object.
-  STDIN_Handler ioh;
-
-  // Optionally start the alarm.
-  if (argc > 1)
-    ACE_OS::alarm (4);
-
-  // Loop handling signals and I/O events until SIGQUIT occurs.
-
-  while (daemon.reactor_event_loop_done () == 0)
-    daemon.run_reactor_event_loop ();
-
-  return 0;
-}
diff --git a/examples/Reactor/Misc/test_signals.cpp b/examples/Reactor/Misc/test_signals.cpp
deleted file mode 100644
index 6493667de12..00000000000
--- a/examples/Reactor/Misc/test_signals.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// Test the ability of the Reactor/Signal_Handler to register multiple
-// $Id$
-
-// handler per-signal.
-
-/* This test works as follows:
-	
-	1. To test the "original" semantics of ACE (i.e., only one
-	   ACE_Event_Handler can be registered per signal), you don't
-	   need to do anything special.  Existing programs work the
-	   same since giving the Reactor's constructor a 0 value
-	   (which is the default argument, BTW) instructs it to behave
-	   as before.  When a 0 is given, the ACE_Reactor's
-	   constructor/open method creates an instance of
-	   ACE_Sig_Handler and assigns this to an internal pointer.
-	   This pointer is then used to dispatch all signal-related
-	   methods within the Reactor.  The default ACE_Sig_Handler
-	   only allows *one* ACE_Event_Handler to be registered
-	   per-signal.
-
-	   To run this version of the test do the following:
-  
-	   % ./test-signal
-	   ./test_signals
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_2 (fruity, 0, 0) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 0, 0)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           Note that in this test only one handler (the last one --
-	   "Sig_Handler_2 (fruity)") is actually registered.  BTW, the
-	   core dump is the expected behavior since the default
-	   disposition is restored when there are no more handlers
-	   (see the code below).
-
-	2. To test the "multiple handlers per-signal semantics", you
-	   need to pass the constructor/open method of the ACE_Reactor
-	   a pointer to a an instance of ACE_Sig_Handlers (note the
-	   plural "s").  ACE_Sig_Handlers is a class that derives from
-	   ACE_Sig_Handler.  The difference between these two classes
-	   is that (1) ACE_Sig_Handlers::register_signal allows
-	   multiple ACE_Event_Handlers to be registered per-signal and
-	   (2) it enables SA_RESTART by default.  This class also
-	   implements Detlef Becker's algorithm for integrating ACE
-	   signal handling with 3rd party libraries.
-
-	   To run this version of the test do the following:
-  
-	   % ./test_signals 1
-
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_1 (howdy, 3, 1) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Interrupt occurred in Sig_Handler_1 (doody, 5, 4) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (doody, 5, 4)
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 1
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_1 (howdy, 3, 1) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Quit occurred in Sig_Handler_1 (doody, 5, 4) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (doody, 5, 4)
-	   signal Quit occurred in Sig_Handler_2 (tutty, 7, 6) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (tutty, 7, 6)
-	   signal Quit occurred in Sig_Handler_2 (fruity, 9, 8) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 9, 8)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 3
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           When this test begins all four handlers are registered and
-           dispatched when a SIGINT or SIGQUIT occurs.  After the
-           first SIGINT, the handle_signal method of the Sig_Handler_1
-           objects unregister themselves.  At that point there are 4
-           SIGQUIT handlers left, but only 2 of our SIGINT handlers
-           left (and the 1 external handler).  After the first
-           SIGQUIT, there are no SIGQUIT handlers left since they all
-           deregister themselves (which restores the "SIG_DFL"
-           disposition).  On the second SIGINT there are only 3
-           handlers left (2 of ours and 1 external).  Finally, on the
-           second SIGQUIT we exit and dump core since that's what
-           happens with the default disposition for SIGQUIT. */
-
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-
-class Sig_Handler_1 : public ACE_Event_Handler
-{
-public:
-  Sig_Handler_1 (ACE_Reactor &reactor, char *msg)
-    : msg_ (msg),
-      count_ (0),
-      reactor_ (reactor)
-  {
-    // Register the signal handlers.
-    this->quit_sigkey_ = reactor.register_handler (SIGQUIT, this);
-    this->int_sigkey_ = reactor.register_handler (SIGINT, this);
-
-    if (this->quit_sigkey_ == -1 || this->int_sigkey_ == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_1 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 1 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else if (this->count_ != 2 && signum == SIGINT)
-      {
-	if (this->reactor_.remove_handler (SIGINT, 0, 0,
-					   this->int_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    return 0;
-  }
-
-protected:
-  char *msg_;
-  int count_;
-  int int_sigkey_;
-  int quit_sigkey_;
-  ACE_Reactor &reactor_;
-};
-
-class Sig_Handler_2 : public Sig_Handler_1
-{
-public:
-  Sig_Handler_2 (ACE_Reactor &reactor, char *msg)
-    : Sig_Handler_1 (reactor, msg)
-  {
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_2 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 0 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_2 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else
-      return 0;
-  }
-};
-
-static void
-external_handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nsignal %S occurred in external handler!", signum));
-}
-
-#if !defined (HPUX)
-int 
-main (int argc, char *argv)
-{
-  // If argc > 1 then allow multiple handlers per-signal, else just
-  // allow 1 handler per-signal.
-  ACE_Sig_Handlers multi_handlers;
-
-  ACE_Reactor reactor (argc > 1 ? &multi_handlers: 0);
-
-  if (argc > 1)
-    {
-      // Register an "external" signal handler so that the
-      // ACE_Sig_Handlers code will have something to incorporate!
-      ACE_SignalHandler eh = ACE_SignalHandler (external_handler);
-      ACE_Sig_Action sa (eh);
-
-      sa.register_action (SIGINT);
-    }
-
-  // Create a bevy of handlers.
-  Sig_Handler_1 h1 (reactor, "howdy"), h2 (reactor, "doody");
-  Sig_Handler_2 h3 (reactor, "tutty"), h4 (reactor, "fruity");
-
-  // Wait for user to type SIGINT and SIGQUIT.
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "\nwaiting for SIGINT or SIGQUIT\n"));
-      reactor.handle_events ();
-    }
-  return 0;
-}
-#else
-int
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), -1);
-}
-#endif /* HPUX */
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
deleted file mode 100644
index b7fe34725e7..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Client.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "Semaphore_Test.h"
-// $Id$
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-
-int
-main (void)
-{
-  ACE_SV_Shared_Memory shm_client (SHM_KEY, 
-				   SHMSZ, 
-				   ACE_SV_Shared_Memory::ACE_OPEN);
-  ACE_SV_Semaphore_Simple sem (SEM_KEY_1, 
-			       ACE_SV_Semaphore_Simple::ACE_OPEN, 0, 2);
-
-  char *s = (char *) shm_client.get_segment_ptr ();
-
-  if (sem.acquire (0) < 0)
-    ACE_OS::perror ("client sem.acquire"), ACE_OS::exit (1);
-
-  while (*s != '\0')
-    putchar (*s++);
-
-  putchar ('\n');
-
-  if (sem.release (1) < 0)
-    ACE_OS::perror ("client sem.release"), ACE_OS::exit (1);
-
-  return 0;
-}
-
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
deleted file mode 100644
index f9931705c26..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-
-#include "ace/SV_Shared_Memory.h"
-#include "ace/SV_Semaphore_Simple.h"
-#include "ace/Signal.h"
-#include "Semaphore_Test.h"
-
-static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
-static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
-
-extern "C" void 
-cleanup (int)
-{
-  if (shm_server.remove () < 0 || sem.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1));
-  ACE_OS::exit (0);
-}
-
-int
-main (void)
-{
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT);
-
-  char *s = (char *) shm_server.get_segment_ptr ();
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (sem.release (0) < 0)
-    ESD ("server sem.release", done);
-
-  if (sem.acquire (1) < 0)
-    ESD ("server sem.acquire", done);
-
-done:
-  cleanup ();
-  return 0;
-}
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h b/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
deleted file mode 100644
index 72aab815ff8..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Test.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Log_Msg.h"
-
-#define SHMSZ 27
-#define SEM_KEY_1 2345
-#define SEM_KEY_2 4321
-#define SHM_KEY 5678
-
-#define ESD(MSG,LABEL) do { ACE_ERROR ((LM_ERROR, MSG)); goto LABEL; } while (0)
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
deleted file mode 100644
index b98c664883b..00000000000
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Illustrates the use of the Semaphore_Complex class.  Note that it
-// $Id$
-
-// doesn't matter whether the parent or the child creates the
-// semaphore since Semaphore_Complex will correctly serialize the
-// intialization of the mutex and synch objects.
-#include "ace/Malloc.h"
-#include "ace/SV_Semaphore_Complex.h"
-#include "Semaphore_Test.h"
-
-ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple> allocator;
-ACE_SV_Semaphore_Complex *mutex = 0; 
-ACE_SV_Semaphore_Complex *synch = 0; 
-
-/* Pointer to memory shared by both the client and server. */
-static char *shm;
-
-static int
-do_parent (void)
-{
-  char *s = shm;
-
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  if (mutex->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server mutex.release"), 1);
-
-  if (synch->acquire () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "server synch.acquire"), 1);
-  return 0;
-}
-
-static int
-do_child (void)
-{
-  mutex = new ACE_SV_Semaphore_Complex (SEM_KEY_1, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-  synch = new ACE_SV_Semaphore_Complex (SEM_KEY_2, ACE_SV_Semaphore_Complex::ACE_CREATE, 0);
-
-  while (mutex->tryacquire () == -1)
-    if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, "spinning in client!\n"));
-    else
-      ACE_ERROR_RETURN ((LM_ERROR, "client mutex.tryacquire"), 1);
-
-  for (char *s = (char *) shm; *s != '\0'; s++)
-    putchar (*s);
-
-  putchar ('\n');
-
-  if (synch->release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "client synch.release"), 1);
-  return 0;
-}
-
-int
-main (void)
-{
-  shm = (char *) allocator.malloc (27);
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "fork failed\n"), -1);
-      /* NOTREACHED */
-    case 0:
-      return do_child ();
-    default:
-      {
-	int result = do_parent ();
-
-	if (wait (0) == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "wait"), -1);
-
-	allocator.remove ();
-
-	if (mutex->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mutex.remove"), -1);
-	else if (synch->remove () == -1)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "synch.remove"), -1);
-	return result;
-      }
-    }
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Malloc<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
diff --git a/examples/Threads/test_auto_event.cpp b/examples/Threads/test_auto_event.cpp
deleted file mode 100644
index 4f83d50db71..00000000000
--- a/examples/Threads/test_auto_event.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-// This test shows the use of an ACE_Auto_Event as a signaling
-// mechanism. Two threads are created (one a reader, the other a
-// writer). The reader waits till the writer has completed
-// calculations. Upon waking up the reader prints the data calculated
-// by the writer. The writer thread calculates the value and signals
-// the reader when the calculation completes.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-// Shared event between reader and writer.  The ACE_Thread_Mutex is
-// necessary to make sure that only one ACE_Auto_Event is created.
-// The default constructor for ACE_Auto_Event sets it initially into
-// the non-signaled state.
-
-typedef ACE_Singleton <ACE_Auto_Event, ACE_Thread_Mutex> EVENT;
-
-// work time for writer
-static int work_time;
-
-// Reader thread.
-static void *
-reader (void *arg)
-{
-  // Shared data via a reference.
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Wait for writer to complete.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting...... \n"));
-
-  if (EVENT::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-
-  // Read shared data.
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d \n", data));
-
-  return 0;
-}
-
-// Writer thread.
-static void *
-writer (void *arg)
-{
-  int& data = *(int *) arg;
-
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  
-  // Calculate (work).
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: working for %d secs\n", work_time));
-  ACE_OS::sleep (work_time);
-
-  // Write shared data.
-  data = 42;
-
-  // Wake up reader.
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer: calculation complete, waking reader\n"));
-
-  if (EVENT::instance ()->signal () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "thread wait failed"));
-      ACE_OS::exit (0);  
-    }
-  
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  // Shared data: set by writer, read by reader.
-  int data;
-
-  // Work time for writer.
-  work_time = argc == 2 ? atoi (argv[1]) : 5;
-
-  // threads manager
-  ACE_Thread_Manager& tm = *ACE_Service_Config::thr_mgr ();
-
-  // Create reader thread.
-  if (tm.spawn (reader, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for reader failed"), -1);
-  
-  // Create writer thread.
-  if (tm.spawn (writer, (void *) &data) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread create for writer failed"), -1);
-  
-  // Wait for both.
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier1.cpp b/examples/Threads/test_barrier1.cpp
deleted file mode 100644
index 6b213819ca0..00000000000
--- a/examples/Threads/test_barrier1.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-struct Tester_Args
-  // = TITLE
-  //     These arguments are passed into each test thread.
-{
-  Tester_Args (ACE_Barrier &tb, int i)
-    : tester_barrier_ (tb), 
-      n_iterations_ (i) {}
-
-  ACE_Barrier &tester_barrier_;
-  // Reference to the tester barrier.  This controls each miteration of
-  // the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-};
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-static void *
-tester (Tester_Args *args)
-{
-  // Keeps track of thread exit.
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int iterations = 1; 
-       iterations <= args->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      args->tester_barrier_.wait ();
-    }
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Barrier tester_barrier (n_threads);
-  
-  Tester_Args args (tester_barrier, n_iterations);
-
-  if (ACE_Service_Config::thr_mgr ()->spawn_n 
-      (n_threads, ACE_THR_FUNC (tester), 
-       (void *) &args, THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_barrier2.cpp b/examples/Threads/test_barrier2.cpp
deleted file mode 100644
index 30190ace443..00000000000
--- a/examples/Threads/test_barrier2.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-// generic_worker_task.cpp
-//
-// This test program illustrates how the ACE task workers/barrier
-// synchronization mechanisms work in conjunction with the ACE_Task
-// and the ACE_Thread_Manager.  The manual flag not set simulates
-// user input, if set input comes from stdin until RETURN only is
-// entered which stops all workers via a message block of length
-// 0. This is an alernative shutdown of workers compared to queue
-// deactivate.  The delay_put flag simulates a delay between the
-// shutdown puts. All should work with this flag disabled!  The
-// BARRIER_TYPE is supposed to enable/disable barrier sync on each svc
-// a worker has done.
-
-#include <iostream.h>
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#define BARRIER_TYPE ACE_Null_Barrier
-//#define BARRIER_TYPE ACE_Barrier
-//#ifdef delay_put
-//#define manual
-
-template <class BARRIER>
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-
-  Worker_Task (ACE_Thread_Manager *thr_mgr, 
-	       int n_threads, 
-	       int inp_serialize = 1);
-  
-  virtual int Producer (void);
-  // produce input for workers
-
-  virtual int input (ACE_Message_Block *mb);
-  // Fill one message block via a certain input strategy.
-
-  virtual int output (ACE_Message_Block *mb);
-  // Forward one message block via a certain output strategy to the
-  // next task if any.
-
-  virtual int service (ACE_Message_Block *mb, int iter);
-  // Perform one message block dependant service.
-
-private:
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) {ACE_DEBUG ((LM_DEBUG,"(%t) in close of worker\n")); return 0; }
-  
-  int nt_;
-  // Number of worker threads to run.
-  int inp_serialize_;
-
-  BARRIER barrier_;
-};
-
-template <class BARRIER>
-Worker_Task<BARRIER>::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-				   int n_threads, 
-				   int inp_serialize) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads)
-{
-  nt_ = n_threads;
-  // Create worker threads.
-  inp_serialize_ = inp_serialize;
-
-  // Use the task's message queue for serialization (default) or run
-  // service in the context of the caller thread.
-
-  if (nt_ > 0 && inp_serialize == 1)
-    if (this->activate (THR_NEW_LWP, n_threads) == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-
-// Simply enqueue the Message_Block into the end of the queue.
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  int result;
-  if (this->inp_serialize_)
-    result = this->putq (mb, tv); 
-  else
-    {
-      static int iter = 0;
-      result = this->service (mb, iter++);
-
-      if (this->output (mb) < 0)
-	ACE_DEBUG ((LM_DEBUG, "(%t) output not connected!\n"));
-
-      delete mb;
-    }
-  return result;
-}
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::service (ACE_Message_Block *mb, int iter) 
-{
-  int length = mb->length ();
-
-  if (length > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,"(%t) in iteration %d len=%d text got:\n",iter,length));
-      ACE_OS::write (ACE_STDOUT, mb->rd_ptr (), length);
-      ACE_DEBUG ((LM_DEBUG,"\n"));
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-template <class BARRIER> int 
-Worker_Task<BARRIER>::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us
-  // to the Thread_Manager when the thread begins.
-
-  // Keep looping, reading a message out of the queue, until we get a
-  // message with a length == 0, which signals us to quit.
-
-  for (int iter = 1; ;iter++)
-    {       
-      ACE_Message_Block *mb = 0;
-
-      int result = this->getq (mb);
-
-      if (result == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d\n", "error waiting for message in iteration", iter));
-	  break;
-	}
-
-      int length = mb->length ();
-      this->service (mb,iter);
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d got quit, exit!\n", iter));
-	  delete mb;
-	  break;
-	}
-
-      this->barrier_.wait ();
-      this->output (mb);
-
-      delete mb;
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-template <class BARRIER> int
-Worker_Task<BARRIER>::Producer (void)
-{
-  // Keep reading stdin, until we reach EOF.
-
-  for (;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-      if (this->input (mb) == -1)
-	return -1;
-    }
-
-  return 0; 
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::output (ACE_Message_Block *mb)
-{
-  return this->put_next (mb);
-}
-
-template <class BARRIER>int
-Worker_Task<BARRIER>::input (ACE_Message_Block *mb)
-{
-  ACE_Message_Block *mb1;
-
-#ifndef manual
-  static int l= 0;
-  char str[]="kalle";
-  strcpy (mb->rd_ptr (),str);
-  int n=strlen (str);
-  if (l==1000)
-    n=1;
-  l++;
-  if (l==0 || (l%100 == 0)) ACE_OS::sleep (5);
-  if (n <= 1)
-#else
-    ACE_DEBUG ((LM_DEBUG,"(%t) press chars and enter to put a new message into task queue ...\n"));
-  if ((n = read (0, mb->rd_ptr (), mb->size ())) <= 1) 
-#endif // manual
-    {
-      // Send a shutdown message to the waiting threads and exit.
-      // cout << "\nvor loop, dump of task msg queue:\n" << endl;
-      // this->msg_queue ()->dump ();
-      for (int i=0;i<nt_;i++)
-	{
-	  ACE_DEBUG ((LM_DEBUG,"(%t) eof, sending block for thread=%d\n",i+1));
-	  mb1 = new ACE_Message_Block (2);
-	  mb1->length (0);
-	  if (this->put (mb1) == -1)
-	    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-#ifdef delay_put
-	  ACE_OS::sleep (1); // this sleep helps to shutdown correctly -> was an error!
-#endif /* delay_put */
-	}
-      //          cout << "\nnach loop, dump of task msg queue:\n" << endl;
-      //          this->msg_queue ()->dump ();
-      return (-1);
-    }
-  else
-    {
-      // Send a normal message to the waiting threads and continue producing.
-      mb->wr_ptr (n);
-      if (this->put (mb) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put"));
-    }
-  return 0; 
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  
-  ACE_DEBUG ((LM_DEBUG,"(%t) worker threads running=%d\n",n_threads));
-
-  
-  Worker_Task<BARRIER_TYPE> *worker_task = 
-    new Worker_Task<BARRIER_TYPE> (ACE_Service_Config::thr_mgr (), 
-				   /*n_threads*/ 0,0); 
-  
-  worker_task->Producer ();
-
-  // Wait for all the threads to reach their exit point.
-  ACE_DEBUG ((LM_DEBUG,"(%t) waiting with thread manager ...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-  ACE_DEBUG ((LM_DEBUG,"(%t) delete worker task ...\n"));
-
-  delete worker_task;
-  ACE_DEBUG ((LM_DEBUG,"(%t) done correct!\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_cancel.cpp b/examples/Threads/test_cancel.cpp
deleted file mode 100644
index a9d12bea579..00000000000
--- a/examples/Threads/test_cancel.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Test out the cooperative thread cancellation mechanisms provided by
-// $Id$
-
-// the ACE_Thread_Manager.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static void *
-worker (int iterations)
-{
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 10) == 0 
-	  && (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0))
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) has been cancelled before iteration!\n", i));
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 2 seconds and then suspend every thread in the group.
-  ACE_OS::sleep (2);
-  thr_mgr->suspend_grp (grp_id);
-
-  // Wait for 2 more seconds and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->resume_grp (grp_id);
-
-  // Wait for 2 more seconds and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (2));
-  thr_mgr->kill_grp (grp_id, SIGINT);
-
-  // Wait for 2 more seconds and then exit (which should kill all the
-  // threads)!
-  ACE_OS::sleep (ACE_Time_Value (2));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future1.cpp b/examples/Threads/test_future1.cpp
deleted file mode 100644
index 79cf0a42b36..00000000000
--- a/examples/Threads/test_future1.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-// 
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT task_count (0);
-
-// a counter for the futures..
-static ATOMIC_INT future_count (0);
-static ATOMIC_INT future_no (0);
-
-// a counter for the capsules..
-static ATOMIC_INT capsule_count (0);
-static ATOMIC_INT capsule_no (0);
-
-// a counter for the method objects...
-static ATOMIC_INT methodobject_count (0);
-static ATOMIC_INT methodobject_no (0);
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  friend class Method_ObjectWork;
-public:
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<const char*> name (void);
-  void end (void);
-
-  float work_i (float, int);
-  const char *name_i (void);
-
-private:
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  :   scheduler_ (new_Scheduler),
-      param_ (new_param),
-      count_ (new_count),
-      future_result_ (new_result)
-{ 
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_work created\n"));
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Method_Object_work will be deleted.\n"));
-}
-
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<const char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<const char*> future_result_;
-};
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<const char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-// open
-int 
-Scheduler::open (void *)
-{
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-// close
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s close\n", this->name_));
-  task_count--;
-  return 0;
-}
-
-// put... ??
-int 
-Scheduler::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-// service..
-int 
-Scheduler::svc (void)
-{
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Destructor automatically deletes it.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  // @@ We should probably do something fun here, like compute the
-  // Fibonacci sequence or something.
-
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-const char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<const char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the Scheduler.
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<const char*> new_future;
-
-      // @@ What happens if new fails here?
-      this->activation_queue_.enqueue 
-	(new Method_Object_name (this, new_future));
-
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) {
-    return this->scheduler_->work (newparam, newcount);
-  }
-  else {
-    ACE_Future<float> new_future;
-
-    this->activation_queue_.enqueue
-      (new Method_Object_work (this, newparam, newcount, new_future));
-    return new_future;
-  }
-}
-
-// @@ These values should be set by the command line options!
-
-// Total number of iterations to <work>
-static int n_iterations = 50000;
-
-// Total number of loops.
-static int n_loops = 100;
-
-int
-main (int, char *[]) 
-{
-  Scheduler *andres, *peter, *helmut, *matias;
-
-  // Create active objects..  
-  // @@ Should "open" be subsumed within the constructor of
-  // Scheduler()?
-  andres = new Scheduler ("andres");
-  andres->open ();
-  peter = new Scheduler ("peter");
-  peter->open ();
-  helmut = new Scheduler ("helmut");
-  helmut->open ();
-
-  // Matias passes all asynchronous method calls on to Andres...
-  matias = new Scheduler ("matias", andres);
-  matias->open ();
-
-  for (int i = 0; i < n_loops; i++) 
-    {
-      {
-	ACE_Future<float> fresulta, fresultb, fresultc, fresultd, fresulte;
-	ACE_Future<const char*> fname;
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) going to do a non-blocking call\n"));
-
-	fresulta = andres->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultb = peter->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultc = helmut->work (0.01, 100 + (n_iterations * (i % 2)));
-	fresultd = matias->work (0.02, 100 + (n_iterations * (i % 2)));
-	fname = andres->name ();
-
-	// see if the result is available...
-	if (fresulta.ready ())
-	  ACE_DEBUG ((LM_DEBUG, "(%t) wow.. work is ready.....\n"));
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) non-blocking call done... now blocking...\n"));
-
-	// Save the result of fresulta.
-
-	fresulte = fresulta;
-
-	if (i % 3 == 0) 
-	  {
-	    // Every 3rd time... disconnect the futures...
-	    // but "fresulte" should still contain the result...
-	    fresulta.cancel (10.0);
-	    fresultb.cancel (20.0);
-	    fresultc.cancel (30.0);
-	    fresultd.cancel (40.0);
-	  }
-
-	float resulta = 0, resultb = 0, resultc = 0, resultd = 0, resulte = 0;
-
-	fresulta.get (resulta);
-	fresultb.get (resultb);
-	fresultc.get (resultc);
-	fresultd.get (resultd);
-	fresulte.get (resulte);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) result a %f\n", resulte));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result b %f\n", resulta));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result c %f\n", resultb));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result d %f\n", resultc));
-	ACE_DEBUG ((LM_DEBUG, "(%t) result e %f\n", resultd));
-
-	const char *name;
-
-	fname.get (name);
-
-	ACE_DEBUG ((LM_DEBUG, "(%t) name %s\n", name));
-
-      }
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-		  (u_long) task_count,
-		  (u_long) future_count,
-		  (u_long) capsule_count,
-		  (u_long) methodobject_count));
-    }
-
-  // Close things down.
-  andres->end ();
-  peter->end ();
-  helmut->end ();
-  matias->end ();
-
-  ACE_OS::sleep (2);
-  
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%t) task_count %d future_count %d capsule_count %d methodobject_count %d\n",
-	      (u_long) task_count,
-	      (u_long) future_count,
-	      (u_long) capsule_count,
-	      (u_long) methodobject_count));
-
-  ACE_DEBUG ((LM_DEBUG,"(%t) th' that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_future2.cpp b/examples/Threads/test_future2.cpp
deleted file mode 100644
index 19431072202..00000000000
--- a/examples/Threads/test_future2.cpp
+++ /dev/null
@@ -1,524 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Test_Future.cpp
-//
-// = DESCRIPTION
-//    This example tests the ACE Future.
-//
-// = AUTHOR
-//    Andres Kruse <Andres.Kruse@cern.ch> and Douglas C. Schmidt
-//    <schmidt@cs.wustl.edu> 
-//
-// Modification History
-// Aug. 96; A.Kruse; dev.
-// Aug. 96; D.Schmidt; complete workover
-// 08/27/96; A.Kruse; - the friends of Scheduler are "Method_Object_name"
-//                      and "Method_Object_work".
-//                    - make the methods "work_i" and "name_i" private
-// 09/2/96; D.Schmidt; Integrate with new ACE_Future API and rearrange
-//                     the tests so they are more modular.
-// ============================================================================
-
-#include <math.h>
-#include "ace/Task.h"
-
-#include "ace/Synch.h"
-#include "ace/Message_Queue.h"
-#include "ace/Future.h"
-#include "ace/Method_Object.h"
-#include "ace/Activation_Queue.h"
-#include "ace/Auto_Ptr.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-// a counter for the tasks..
-static ATOMIC_INT scheduler_open_count (0);
-
-// forward declarations
-class Method_Object_work;
-class Method_Object_name;
-
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //     Active Object Scheduler.
-{
-  // Every method object has to be able to access the private methods.
-
-  friend class Method_Object_work; 
-  friend class Method_Object_name;
-  friend class Method_Object_end;
-public:
-
-  Scheduler (const char *, Scheduler * = 0);
-  ~Scheduler (void);
-
-  virtual int open (void *args = 0);
-  // The method that is used to start the active object.
-
-  // = Here are the methods exported by the class. They return an
-  // <ACE_Future>.
-  ACE_Future<float> work (float param, int count);
-  ACE_Future<char*> name (void);
-  void end (void);
-
-private:
-  virtual int close (u_long flags = 0);
-  // Should not be accessible from outside...  (use end () instead).
-
-  virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0)
-    { return 0; };
-  // Doesn't have any use for this example.
-
-  virtual int svc (void);
-  // Here the actual servicing of all requests is happening..
-
-  // = Implementation methods.
-  float work_i (float, int);
-  char *name_i (void);
-
-  char *name_;
-  ACE_Activation_Queue activation_queue_;
-  Scheduler *scheduler_;
-};
-
-class Method_Object_work : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <work> method.
-{
-public:
-  Method_Object_work (Scheduler *, float, int, ACE_Future<float> &);
-  ~Method_Object_work (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  float param_;
-  int count_;
-  ACE_Future<float> future_result_;
-};
-
-Method_Object_work::Method_Object_work (Scheduler* new_Scheduler,
-				        float new_param, 
-				        int new_count, 
-					ACE_Future<float> &new_result)
-  : scheduler_ (new_Scheduler),
-    param_ (new_param),
-    count_ (new_count),
-    future_result_ (new_result)
-{ 
-}
-
-Method_Object_work::~Method_Object_work (void)
-{
-}
-
-int
-Method_Object_work::call (void)
-{
-  return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_));
-}
-
-class Method_Object_name : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <name> method.
-{
-public:
-  Method_Object_name (Scheduler *, ACE_Future<char*> &);
-  ~Method_Object_name (void);
-  virtual int call (void);
-
-private:
-  Scheduler *scheduler_;
-  ACE_Future<char*> future_result_;
-};
-
-
-Method_Object_name::Method_Object_name (Scheduler *new_scheduler,
-					ACE_Future<char*> &new_result)
-  : scheduler_ (new_scheduler),
-    future_result_ (new_result)
-{
-  ACE_DEBUG ((LM_DEBUG,
-	      " (%t) Method_Object_name created\n"));
-};
-
-Method_Object_name::~Method_Object_name (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      " (%t) Method_Object_name will be deleted.\n"));
-}
-
-int
-Method_Object_name::call (void)
-{
-  return future_result_.set (scheduler_->name_i ());
-}
-
-class Method_Object_end : public ACE_Method_Object
-  // = TITLE
-  //     Reification of the <end> method.
-{
-public:
-  Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
-
-private:
-  Scheduler *scheduler_;
-};
-
-// constructor
-Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler)
-{
-  ACE_NEW (this->name_, char[ACE_OS::strlen (newname) + 1]);
-  ACE_OS::strcpy ((char *) this->name_, newname);
-  this->scheduler_ = new_Scheduler;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s created\n", this->name_));
-}
-
-// Destructor
-Scheduler::~Scheduler (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_));
-}
-
-int 
-Scheduler::open (void *)
-{
-  scheduler_open_count++;
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s open\n", this->name_));
-  return this->activate (THR_BOUND);
-}
-
-int 
-Scheduler::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s close\n", this->name_));
-  scheduler_open_count--;
-  return 0;
-}
-
-int 
-Scheduler::svc (void)
-{
-  // Main event loop for this active object.
-  for (;;) 
-    {
-      // Dequeue the next method object (we use an auto pointer in
-      // case an exception is thrown in the <call>).
-      ACE_Auto_Ptr<ACE_Method_Object> mo (this->activation_queue_.dequeue ());
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
-      // Call it.
-      if (mo->call () == -1)
-	break;
-      // Smart pointer destructor automatically deletes mo.
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-void 
-Scheduler::end (void)
-{
-  this->activation_queue_.enqueue (new Method_Object_end (this));
-}
-
-// Here's where the Work takes place.
-float 
-Scheduler::work_i (float param, 
-		   int count)
-{
-  float x = 0, y = 0;
-  
-  for (int j = 0; j < count; j++) 
-    {
-      x = x + param;
-      y = y + ::sin (x);
-    }
-
-  return y;
-}
-
-char *
-Scheduler::name_i (void)
-{
-  char *the_name;
-
-  the_name = new char[ACE_OS::strlen (this->name_) + 1];
-  ACE_OS::strcpy (the_name, this->name_);
-
-  return the_name;
-}
-
-ACE_Future<char *> 
-Scheduler::name (void)
-{
-  if (this->scheduler_) 
-    // Delegate to the other scheduler
-    return this->scheduler_->name ();
-  else 
-    {
-      ACE_Future<char*> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  // This scheduler is inactive... so we execute the user
-	  // request right away...
-	
-	  ACE_Auto_Ptr<ACE_Method_Object> mo (new Method_Object_name (this, new_future));
-
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes mo.
-	}
-      else
-	// @@ What happens if new fails here?
-	this->activation_queue_.enqueue
-	  (new Method_Object_name (this, new_future));
-	
-      return new_future;
-    }
-}
-
-ACE_Future<float> 
-Scheduler::work (float newparam, int newcount)
-{
-  if (this->scheduler_) 
-    return this->scheduler_->work (newparam, newcount);
-  else 
-    {
-      ACE_Future<float> new_future;
-
-      if (this->thr_count () == 0) 
-	{
-	  ACE_Auto_Ptr<ACE_Method_Object> mo 
-	    (new Method_Object_work (this, newparam, newcount, new_future));
-	  mo->call ();
-	  // Smart pointer destructor automatically deletes it.
-	}
-      else
-	this->activation_queue_.enqueue
-	  (new Method_Object_work (this, newparam, newcount, new_future));
-
-      return new_future;
-    }
-}
-
-static int 
-determine_iterations (void)
-{
-  int n_iterations;
-
-  ACE_DEBUG ((LM_DEBUG," (%t) determining the number of iterations...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-
-  ACE_Time_Value tstart (ACE_OS::gettimeofday ());
-  ACE_Time_Value tend (ACE_OS::gettimeofday ());
-
-  // Determine the number of iterations... we want so many that the
-  // work () takes about 1 second...
-
-  for (n_iterations = 1;
-       (tend.sec () - tstart.sec ()) < 1;
-       n_iterations *= 2)
-    {
-      tstart = ACE_OS::gettimeofday ();
-
-      worker_a->work (0.1, n_iterations);
-
-      tend = ACE_OS::gettimeofday ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG," (%t) n_iterations %d\n", 
-	      (u_long) n_iterations));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-  return n_iterations;
-}
-
-static void
-test_active_object (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing active object pattern...\n"));
-  // A simple example for the use of the active object pattern and
-  // futures to return values from an active object.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  Scheduler *worker_b = new Scheduler ("worker B");
-
-  // Have worker_c delegate his work to worker_a.
-  Scheduler *worker_c = new Scheduler ("worker C", worker_a);
-
-  // loop 0:
-  // test the Schedulers when they are not active.
-  // now the method objects will be created but since
-  // there is no active thread they will also be
-  // immediately executed, in the "main" thread.
-  // loop 1:
-  // do the same test but with the schedulers
-  // activated
-  for (int i = 0; i < 2; i++)
-    {
-      if (i == 1) 
-	{
-	  worker_a->open ();
-	  worker_b->open ();
-	  worker_c->open ();
-	}
-
-      ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-      ACE_Future<float> fresultb = worker_b->work (0.02, n_iterations);
-      ACE_Future<float> fresultc = worker_c->work (0.03, n_iterations);
-
-      if (i == 0) 
-	{
-	  if (!fresulta.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker A is should be ready!!!\n"));
-	  if (!fresultb.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker B is should be ready!!!\n"));
-	  if (!fresultc.ready ())
-	    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: worker C is should be ready!!!\n"));
-	}
-
-      // When the workers are active we will block here until the
-      // results are available.
-
-      float resulta = fresulta;
-      float resultb = fresultb;
-      float resultc = fresultc;
-
-      ACE_Future<char *> fnamea = worker_a->name ();
-      ACE_Future<char *> fnameb = worker_b->name ();
-      ACE_Future<char *> fnamec = worker_c->name ();
-
-      char *namea = fnamea;
-      char *nameb = fnameb;
-      char *namec = fnamec;
-
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namea, resulta));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  nameb, resultb));
-      ACE_DEBUG ((LM_DEBUG, " (%t) result from %s %f\n",
-		  namec, resultc));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d before end ()\n",
-	      (u_long) scheduler_open_count));
-
-  worker_a->end ();
-  worker_b->end ();
-  worker_c->end ();
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d immediately after end ()\n",
-	      (u_long) scheduler_open_count));
-
-  ACE_OS::sleep (2);
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) scheduler_open_count %d after waiting\n",
-	      (u_long) scheduler_open_count));
-  // @@ Can we safely delete worker_a, worker_b, and worker_c?
-}
-
-static void
-test_cancellation (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing cancellation of a future...\n"));
-
-  // Now test the cancelling a future.
-
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, n_iterations);
-
-  // save the result by copying the future
-  ACE_Future<float> fresultb = fresulta;
-
-  // now we cancel the first future.. but the
-  // calculation will still go on...
-  fresulta.cancel (10.0);
-
-  if (!fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should be ready!!!\n"));
-
-  float resulta = fresulta;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result %f\n", resulta));
-
-  if (resulta != 10.0)
-    ACE_DEBUG ((LM_DEBUG, " (%t) cancelled result should be 10.0!!\n", resulta));
-
-  resulta = fresultb;
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) true result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-static void
-test_timeout (int n_iterations)
-{
-  ACE_DEBUG ((LM_DEBUG," (%t) testing timeout on waiting for the result...\n"));
-  Scheduler *worker_a = new Scheduler ("worker A");
-  worker_a->open ();
-
-  ACE_Future<float> fresulta = worker_a->work (0.01, 2 * n_iterations);
-
-  // Should immediately return... and we should see an error...
-  ACE_Time_Value *delay = new ACE_Time_Value (1);
-
-  float resulta;
-  fresulta.get (resulta, delay);
-
-  if (fresulta.ready ())
-    ACE_DEBUG ((LM_DEBUG," (%t) ERROR: future A is should not be ready!!!\n"));
-  else
-    ACE_DEBUG ((LM_DEBUG," (%t) timed out on future A\n"));
-
-  // now we wait until we are done...
-  fresulta.get (resulta);
-  ACE_DEBUG ((LM_DEBUG, " (%t) result %f\n", resulta));
-
-  worker_a->end ();
-  // @@ Can we safely delete worker_a here?
-}
-
-int
-main (int, char *[]) 
-{
-  int n_iterations = determine_iterations ();
-
-  test_active_object (n_iterations);
-  test_cancellation (n_iterations);
-  test_timeout (n_iterations);
-
-  ACE_DEBUG ((LM_DEBUG," (%t) that's all folks!\n"));
-
-  ACE_OS::sleep (5);
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_manual_event.cpp b/examples/Threads/test_manual_event.cpp
deleted file mode 100644
index 26d477fabc0..00000000000
--- a/examples/Threads/test_manual_event.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// The test shows the use of an ACE_Manual_Event to create a
-// $Id$
-
-// Pseudo_Barrier. Multiple threads are created which do the
-// following:
-//
-//	1. work 
-//	2. synch with other threads
-//	3. more work
-// 
-// ACE_Manual_Event is use to synch with other
-// threads. ACE_Manual_Event::signal() is used for broadcasting.
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-static ACE_Atomic_Op <ACE_Thread_Mutex, u_long> amount_of_work = (u_long) 0;
-
-class Pseudo_Barrier
-  // = TITLE
-  //    A barrier class using ACE manual-reset events.
-  //
-  // = DESCRIPTION
-  //    This is *not* a real barrier. 
-  //    Pseudo_Barrier is more like a ``one shot'' barrier.
-  //    All waiters after the Nth waiter are allowed to go. 
-  //    The barrier does not reset after the Nth waiter.
-  //    For an example of a real barrier, please see class ACE_Barrier.
-{
-public:
-  Pseudo_Barrier (u_long count);
-
-  int wait (void);
-
-private: 
-  ACE_Atomic_Op <ACE_Thread_Mutex, u_long> counter_; 
-  ACE_Manual_Event event_;
-};
-
-Pseudo_Barrier::Pseudo_Barrier (u_long count)
-  : counter_ (count)
-{
-}
-
-int 
-Pseudo_Barrier::wait (void)
-{
-  if (--this->counter_ == 0)
-    return this->event_.signal ();
-  else 
-    return this->event_.wait ();
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  Pseudo_Barrier &barrier = *(Pseudo_Barrier *) arg;
-  
-  // work
-  ACE_DEBUG ((LM_DEBUG, "(%t) working (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (::amount_of_work);
-
-  // synch with everybody else
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others \n"));
-  barrier.wait ();
-
-  // more work
-  ACE_DEBUG ((LM_DEBUG, "(%t) more work (%d secs)\n", ++::amount_of_work));
-  ACE_OS::sleep (amount_of_work);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) dying \n"));
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  int n_threads = argc == 2 ? atoi (argv[1]) : 5;
-
-  ACE_Thread_Manager &tm = *ACE_Service_Config::thr_mgr ();
-  
-  // synch object shared by all threads
-  Pseudo_Barrier barrier (n_threads);
-
-  // create workers
-  if (tm.spawn_n (n_threads, worker, &barrier) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread creates for worker failed"), -1);
-
-  // wait for all workers to exit
-  if (tm.wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "thread wait failed"), -1);
-  else 
-    ACE_DEBUG ((LM_ERROR, "graceful exit\n"));
-
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_mutex.cpp b/examples/Threads/test_process_mutex.cpp
deleted file mode 100644
index fb23c8b73be..00000000000
--- a/examples/Threads/test_process_mutex.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Mutexes.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static sig_atomic_t done;
-
-extern "C" void 
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc > 1 ? argv[1] : "hello";
-  int iterations =  argc > 2 ? ACE_OS::atoi (argv[2]) : 100;
-
-  ACE_Process_Mutex pm (name);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < iterations && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_process_semaphore.cpp b/examples/Threads/test_process_semaphore.cpp
deleted file mode 100644
index d7933897f8e..00000000000
--- a/examples/Threads/test_process_semaphore.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-// This program tests ACE_Process_Semaphore.  To run it, open 3 or 4
-// windows and run this program in each window...
-
-#include "ace/Synch.h"
-#include "ace/Signal.h"
-
-static sig_atomic_t done;
-
-extern "C" void
-handler (int)
-{
-  done = 1;
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *name = argc == 1 ? "hello" : argv[1];
-
-  ACE_Process_Semaphore pm (1, name);
-
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  for (int i = 0; i < 100 && !done; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquiring\n"));
-      if (pm.acquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "acquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = acquired\n"));
-
-      ACE_OS::sleep (3);
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-
-      if (pm.tryacquire () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "tryacquire failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = tryacquire\n"));
-
-      if (pm.release () == -1)
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = %p\n", "release failed"));
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) = released\n"));
-    }
-
-  if (argc > 2)
-    pm.remove ();
-  return 0;
-}
-
diff --git a/examples/Threads/test_reader_writer.cpp b/examples/Threads/test_reader_writer.cpp
deleted file mode 100644
index ef888133d83..00000000000
--- a/examples/Threads/test_reader_writer.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// This test program verifies the functionality of the ACE_OS
-// $Id$
-
-// implementation of readers/writer locks on Win32 and Posix pthreads.
-
-
-#include "ace/Synch.h"
-#include "ace/Thread.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Default number of iterations.
-static size_t n_iterations = 1000;
-
-// Default number of loops.
-static size_t n_loops = 100;
-
-// Default number of readers.
-static size_t n_readers = 6;
-
-// Default number of writers.
-static size_t n_writers = 2;
-
-// Thread id of last writer.
-volatile static int shared_data;  
-
-// Lock for shared_data.
-static ACE_RW_Mutex rw_mutex;     
-
-// Count of the number of readers and writers.
-ACE_Atomic_Op<ACE_Thread_Mutex, int> current_readers, current_writers;
-
-// Thread manager
-static ACE_Thread_Manager thr_mgr;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "r:w:n:l:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-    {
-    case 'r':
-      n_readers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'w':
-      n_writers = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'n':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
-      break;
-    case 'l':
-      n_loops = ACE_OS::atoi (get_opt.optarg);
-      break;
-    default:
-      print_usage_and_die ();
-      break;
-  }
-}
-
-// Iterate <n_iterations> each time checking that nobody modifies the data
-// while we have a read lock.
-
-static void *
-reader (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) reader starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Read_Guard<ACE_RW_Mutex> g(rw_mutex);
-      int n = ++current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) I'm reader number %d\n", n));
-
-      if (current_writers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) writers found!!!\n"));
-	
-      int data = shared_data;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != data)
-            ACE_DEBUG ((LM_DEBUG, 
-			"(%t) somebody changed %d to %d\n", 
-			data, shared_data));
-        }
-
-      --current_readers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with reading guarded data\n"));
-
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Iterate <n_iterations> each time modifying the global data
-// and checking that nobody steps on it while we can write it.
-
-static void *
-writer (void *)
-{
-  ACE_Thread_Control tc (&thr_mgr);
-  ACE_DEBUG ((LM_DEBUG, "(%t) writer starting\n"));
-  
-  for (int iterations = 1; iterations <= n_iterations; iterations++)
-    {
-      ACE_Write_Guard<ACE_RW_Mutex> g(rw_mutex);
-
-      ++current_writers;
-      //ACE_DEBUG ((LM_DEBUG, "(%t) writing to guarded data\n"));
-
-      if (current_writers > 1)
-        ACE_DEBUG ((LM_DEBUG, "(%t) other writers found!!!\n"));
-
-      if (current_readers > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%t) readers found!!!\n"));
-	
-      int self = (int) ACE_Thread::self ();
-      shared_data = self;
-
-      for (int loop = 1; loop <= n_loops; loop++)
-        {
-	  ACE_Thread::yield();
-	  if (shared_data != self)
-            ACE_DEBUG ((LM_DEBUG, "(%t) somebody wrote on my data %d\n", shared_data));
-        }
-
-      --current_writers;
-
-      //ACE_DEBUG ((LM_DEBUG, "(%t) done with guarded data\n"));
-      ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-// Spawn off threads.
-
-int main (int argc, char *argv[])
-{
-  ACE_LOG_MSG->open (argv[0]);
-  parse_args (argc, argv);
-
-  current_readers = 0; // Possibly already done
-  current_writers = 0; // Possibly already done
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) main thread starting\n"));
-
-  if (thr_mgr.spawn_n (n_readers, reader, 0, THR_NEW_LWP) == -1 ||
-      thr_mgr.spawn_n (n_writers, writer, 0, THR_NEW_LWP) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
-
-  thr_mgr.wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting main thread\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
-
diff --git a/examples/Threads/test_recursive_mutex.cpp b/examples/Threads/test_recursive_mutex.cpp
deleted file mode 100644
index 1cc2892b2a8..00000000000
--- a/examples/Threads/test_recursive_mutex.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-// This test program verifies the functionality of the ACE_OS
-// implementation of recursive mutexes on Win32 and Posix pthreads.
-
-#include "ace/Service_Config.h"
-#include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Total number of iterations.
-static size_t n_iterations = 1000;
-static size_t n_threads = 4;
-
-// Explain usage and exit.
-static void 
-print_usage_and_die (void)
-{
-  ACE_DEBUG ((LM_DEBUG, 
-	      "usage: %n [-t n_threads] [-n iteration_count]\n"));
-  ACE_OS::exit (1);
-}
-
-// Parse the command-line arguments and set options.
-
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "n:t:");
-
-  int c; 
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'n':
-	n_iterations = ACE_OS::atoi (get_opt.optarg);
-	break;
-      case 't':
-	n_threads = ACE_OS::atoi (get_opt.optarg);
-	break;
-      default:
-	print_usage_and_die ();
-	break;
-      }
-}
-
-static void
-recursive_worker (size_t nesting_level, 
-		  ACE_Recursive_Thread_Mutex *rm)
-{
-  if (nesting_level < n_iterations)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%P|%t) = trying to acquire, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-      {
-	// This illustrates the use of the ACE_Guard<LOCK> with an
-	// ACE_Recursive_Thread_Mutex.
-	ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *rm);
-	ACE_DEBUG ((LM_DEBUG,
-		    "(%P|%t) = acquired, nesting = %d, thread id = %u\n",
-		    rm->get_nesting_level (), rm->get_thread_id ()));
-
-	recursive_worker (nesting_level + 1, rm);
-      }
-      ACE_DEBUG ((LM_DEBUG,
-      		  "(%P|%t) = released, nesting = %d, thread id = %u\n",
-		  rm->get_nesting_level (), rm->get_thread_id ()));
-    }
-}
-
-static void *
-worker (void *arg)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  ACE_Recursive_Thread_Mutex *rm = (ACE_Recursive_Thread_Mutex *) arg;
-
-  recursive_worker (0, rm);
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv[0]);
-
-  parse_args (argc, argv);
-  ACE_Recursive_Thread_Mutex rm;
-
-  ACE_Service_Config::thr_mgr ()->spawn_n (n_threads, 
-					   ACE_THR_FUNC (worker), 
-					   (void *) &rm);
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support process mutexes on this platform (yet)\n"), 
-		    -1);
-}
-#endif /* ACE_WIN32 */
diff --git a/examples/Threads/test_task.cpp b/examples/Threads/test_task.cpp
deleted file mode 100644
index 7cd7976d2bb..00000000000
--- a/examples/Threads/test_task.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-#include "ace/Log_Msg.h"
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_four.cpp b/examples/Threads/test_task_four.cpp
deleted file mode 100644
index 64209cb3430..00000000000
--- a/examples/Threads/test_task_four.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// $Id$
-
-// The following test was written by Hamutal Yanay & Ari Erev's
-// (Ari_Erev@comverse.com). 
-//
-// This test program test enhancements to the thread_manager and task
-// classes.  The purpose of these enhancements was to allow the
-// thread_manager to recognize the concept of an ACE_Task and to be
-// able to group ACE_Tasks in groups.
-//
-// There are two main ACE_Tasks in this sample:
-//
-// Invoker_Task - is run from main (). It's purpose is to run a number of 
-//                ACE_Tasks of type Worker_Task. The number can be specified
-//                on the command line.
-//                After starting the tasks, the Invoker_Task groups all the tasks
-//                in one group and then uses the
-//                num_tasks_in_group () to find out if the real number of tasks
-//                that are now running (should be the same as the number of tasks
-//                started).
-//                It also, suspends and resumes all the threads in the group to
-//                test the suspend_grp () and resume_grp () methods.
-//                Then it waits for all the tasks to end.
-// Worker_Task  - ACE_Tasks that are started by the Invoker_Task.
-//                Each Worker_Task can start a number of threads.
-//                The Worker_Task threads perform some work (iteration). The number
-//                of the iterations can be specified on the command line.
-//
-// The command line syntax is:
-//
-// test_task   [num_tasks] [num_threads] [num_iterations]
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Invoker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Invoker_Task (ACE_Thread_Manager *thr_mgr,
-		int n_tasks,
-		int n_threads,
-		int n_iterations);
-  virtual int svc (void);
-  // creats <n_tasks> and wait for them to finish
-
-private:
-  int n_tasks_;
-  // Number of tasks to start.
-  int n_threads_;
-  // Number of threads per task.
-  int n_iterations_;
-  // Number of iterations per thread.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-class Worker_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Worker_Task (ACE_Thread_Manager *thr_mgr,
-	       int n_threads,
-	       int n_iterations);  
-  virtual int svc (void);
-  // Does a small work...
-  virtual int open (void * = NULL);
-private:
-  static int workers_count_;
-  int index_;
-  int n_threads_;
-  int n_iterations_;
-
-  // = Not needed for this test.
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-int Worker_Task::workers_count_ = 1;
-
-Worker_Task::Worker_Task (ACE_Thread_Manager *thr_mgr, 
-                          int n_threads,
-                          int n_iterations)
-  : n_threads_ (n_threads), 
-    n_iterations_ (n_iterations), 
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  index_ = workers_count_++;
-}
- 
-int 
-Worker_Task::open (void *)
-{
-  // Create worker threads.
-  int rc = this->activate (THR_NEW_LWP, n_threads_, 0, 0, -1, this);
-
-  if (rc == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
-  return rc;
-}
-
-int 
-Worker_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", index_));
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in iteration %d\n", iterations));
-      ACE_OS::sleep (0);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) worker %d ends\n", index_));
-
-  return 0;
-}
-
-Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_tasks,
-			    int n_threads,
-			    int n_iterations)           
-  : n_tasks_ (n_tasks), 
-    n_threads_ (n_threads), 
-    n_iterations_ (n_iterations),
-    ACE_Task<ACE_MT_SYNCH> (thr_mgr)
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, 1, 0, 0, -1, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Invoker_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-  Worker_Task **pTask = new Worker_Task* [n_tasks_];
-   
-  for (int task = 0; 
-       task < this->n_tasks_;
-       task++)
-    {
-      ACE_DEBUG ((LM_DEBUG, " (%t) in task %d\n", task+1));
-      pTask[task] = new Worker_Task (thr_mgr, n_threads_, n_iterations_);
-      pTask[task]->open ();  
-    }
-
-  // Set all tasks to be one group
-  ACE_DEBUG ((LM_DEBUG, " (%t) setting tasks group id\n"));
-  for (task = 0; 
-       task < this->n_tasks_;
-       task++)
-    if (thr_mgr->set_grp (pTask[task], 1) == -1)
-      ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "set_grp"));
-
-  int nTasks = thr_mgr->num_tasks_in_group (1);
-  cout << "Number of tasks in group 1: " << nTasks << endl;
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_grp"));
-
-  // Wait for 5 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (5));
-  
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming group\n"));
-  if (thr_mgr->resume_grp (1) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_grp"));
-
-
-  // Wait for all the tasks to reach their exit point.
-  thr_mgr->wait ();
-
-  // Note that the ACE_Task::svc_run () method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of tasks and iterations.
-static const int DEFAULT_TASKS = 4;
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_tasks = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_TASKS;
-  int n_threads = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : DEFAULT_ITERATIONS;
-
-  // Since ACE_Thread_Manager can only wait for all threads, we'll have
-  // special manager for the Invoker_Task.
-  ACE_Thread_Manager invoker_manager;
-
-  Invoker_Task invoker (&invoker_manager, 
-			n_tasks, 
-			n_threads,
-			n_iterations); 
-
-  // Wait for 1 second and then suspend the invoker task
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, " (%t) suspending invoker task\n"));
-
-  if (invoker_manager.suspend_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "suspend_task"));
-
-  // Wait for 5 more second and then resume the invoker task.
-  ACE_OS::sleep (ACE_Time_Value (5));
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) resuming invoker task\n"));
-  if (invoker_manager.resume_task (&invoker) == -1)
-    ACE_ERROR ((LM_DEBUG, " (%t) %p\n", "resume_task"));
-
-
-  // Wait for all the threads to reach their exit point.
-  invoker_manager.wait ();
-
-  // @QTSK  This ACE_DEBUG statement blows us away! can't understand why
-  ACE_DEBUG ((LM_DEBUG, " (%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_one.cpp b/examples/Threads/test_task_one.cpp
deleted file mode 100644
index d0a8a12e6c4..00000000000
--- a/examples/Threads/test_task_one.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// This test program illustrates how the ACE barrier synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  It is instructive to compare this with the
-// test_barrier.cpp test to see how they differ.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-#include "ace/Task.h"
-
-class Barrier_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Barrier_Task (ACE_Thread_Manager *thr_mgr,
-		int n_threads, 
-		int n_iterations);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-private:
-  ACE_Barrier barrier_;
-  // Reference to the tester barrier.  This controls each
-  // iteration of the tester function running in every thread.
-
-  int n_iterations_;
-  // Number of iterations to run.
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-};
-
-Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, 
-			    int n_threads, 
-			    int n_iterations)
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr), 
-    barrier_ (n_threads), 
-    n_iterations_ (n_iterations) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Barrier_Task::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run() method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  for (int iterations = 1; 
-       iterations <= this->n_iterations_;
-       iterations++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d\n", iterations));
-
-      // Block until all other threads have waited, then continue.
-      this->barrier_.wait ();
-    }
-
-  // Note that the ACE_Task::svc_run() method automatically removes us
-  // from the Thread_Manager when the thread exits.
-
-  return 0;
-}
-
-// Default number of threads to spawn.
-static const int DEFAULT_ITERATIONS = 5;
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
-			     n_threads, 
-			     n_iterations);
-
-  // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_three.cpp b/examples/Threads/test_task_three.cpp
deleted file mode 100644
index c6ad69511b5..00000000000
--- a/examples/Threads/test_task_three.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This also shows off some
-// Interesting uses of the ACE Log_Msg's ability to print to ostreams.
-// BTW, make sure that you set the out_stream in *every* thread that
-// you want to have write to the output file, i.e.:
-//
-//
-//  if (out_stream)
-//    {
-//      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-//      ACE_LOG_MSG->msg_ostream (out_stream);
-//    }
-
-#include <fstream.h>
-#include "ace/Reactor.h"
-#include "ace/Service_Config.h"
-#include "ace/Task.h"
-
-
-#if defined (ACE_HAS_THREADS)
-
-static ofstream *out_stream = 0;
-
-static const int NUM_INVOCATIONS = 100;
-static const int TASK_COUNT = 130;
-
-class Test_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Test_Task (void);
-  ~Test_Task (void);
-
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-  virtual int handle_input (ACE_HANDLE fd);
-
-  ACE_Reactor *r_;
-  int handled_;
-  static int current_count_;
-  static int done_cnt_;
-};
-
-int Test_Task::current_count_ = 0;
-int Test_Task::done_cnt_ = 0;
-
-static ACE_Thread_Mutex lock_;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  this->handled_ = 0;
-  Test_Task::current_count_++;
-  ACE_DEBUG ((LM_DEBUG, 
-	      "Test_Task constructed, current_count_ = %d\n", 
-	      Test_Task::current_count_));
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  ACE_DEBUG ((LM_DEBUG, "Test_Task destroyed, current_count_ = %d\n",
-	      Test_Task::current_count_));
-}
-
-int 
-Test_Task::open (void *args)
-{
-  r_ = (ACE_Reactor *) args;
-  return ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP);
-}
-
-int 
-Test_Task::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-  Test_Task::current_count_--;
-  ACE_DEBUG ((LM_DEBUG, "Test_Task::close () current_count_ = %d.\n", 
-	      Test_Task::current_count_));
-  return 0;
-}
-
-int 
-Test_Task::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-Test_Task::svc (void)
-{
-  // Every thread must register the same stream to write to file.
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  for (int index = 0; index < NUM_INVOCATIONS; index++)
-    {
-      ACE_OS::thr_yield ();
-
-      if (r_->notify (this, ACE_Event_Handler::READ_MASK))
-	{
-	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-
-	  ACE_DEBUG ((LM_DEBUG, "Test_Task: error notifying reactor!\n"));
-	}
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) returning from svc ()\n"));
-  return 0;
-}
-
-int 
-Test_Task::handle_input (ACE_HANDLE)
-{
-  this->handled_++;
-
-  if (this->handled_ == NUM_INVOCATIONS)
-    {
-      ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-      Test_Task::done_cnt_++;
-      ACE_DEBUG ((LM_DEBUG, 
-		  " (%t) Test_Task: handle_input! done_cnt_ = %d.\n",
-		  Test_Task::done_cnt_));
-    }
-
-  ACE_OS::thr_yield ();
-  return -1;
-}
-
-static void *
-dispatch (void *arg)
-{
-  // every thread must register the same stream to write to file
-  if (out_stream)
-    {
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, " (%t) Dispatcher Thread started!\n"));
-  ACE_Reactor *r = (ACE_Reactor *) arg;
-  int result;
-
-  r->owner (ACE_OS::thr_self ());
-
-  while (1)
-    {
-      result = r->handle_events ();
-      if (result <= 0)
-	ACE_DEBUG ((LM_DEBUG, "Dispatch: handle_events (): %d", result));
-    }
-
-  return 0;
-}
-
-extern "C" void 
-handler (int)
-{
-  *out_stream << flush;
-  out_stream->close ();
-  ACE_OS::exit (42);
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc > 1)
-    {
-      // Send output to file.
-      out_stream = new ofstream ("test_task_three.out", ios::trunc|ios::out);
-      ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (out_stream);
-    }
-
-  // Register a signal handler.
-  ACE_Sig_Action sa (ACE_SignalHandler (handler), SIGINT);
-
-  ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
-  ACE_Reactor *reactor2 = new ACE_Reactor ();
-
-  Test_Task t1[TASK_COUNT];
-  Test_Task t2[TASK_COUNT];
-
-  ACE_Thread::spawn (ACE_THR_FUNC (dispatch), reactor2);
-
-  reactor1->owner (ACE_OS::thr_self ());
-
-  for (int index = 0; index < TASK_COUNT; index++)
-    {
-      t1[index].open (reactor1);
-      t2[index].open (reactor2);
-    }
-
-  ACE_OS::sleep (3);
-
-  for (;;)
-    {
-      ACE_Time_Value timeout (2);
-
-      if (reactor1->handle_events (timeout) <= 0)
-	{
-	  if (errno == ETIME)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "no activity within 2 seconds, shutting down\n"));
-	      break;
-	    }
-	  else
-	    ACE_ERROR ((LM_ERROR, "%p error handling events\n", "main"));
-	}
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_task_two.cpp b/examples/Threads/test_task_two.cpp
deleted file mode 100644
index 9f25962c795..00000000000
--- a/examples/Threads/test_task_two.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-// Exercise more tests for the ACE Tasks.  This test can spawn off
-// zillions of tasks and then wait for them using both polling and the
-// ACE Thread Manager.
-
-#include "ace/Task.h"
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-typedef ACE_Atomic_Op<ACE_Thread_Mutex, u_long> ATOMIC_INT;
-
-static u_long zero = 0;
-static ATOMIC_INT task_count (zero);
-static ATOMIC_INT max_count (zero);
-static ATOMIC_INT wait_count (zero);
-
-static u_long n_threads = 0;
-
-// Default number of tasks.
-static const int default_threads = ACE_DEFAULT_THREADS;
-
-// Default number of times to run the test.
-static const int default_iterations = 1000;
-
-class Task_Test : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
-
-private:
-  static ACE_Thread_Mutex lock_;
-};
-
-ACE_Thread_Mutex Task_Test::lock_;
-
-int 
-Task_Test::open (void *)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count++;
-  ACE_DEBUG ((LM_DEBUG, "(%t) creating Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-
-  return this->activate (THR_BOUND);
-}
-
-int 
-Task_Test::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Task_Test::lock_, -1);
-
-  task_count--;
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying Task_Test, task count = %d\n", 
-	      (u_long) task_count));
-  wait_count--;
-// delete this;
-  return 0;
-}
-
-int 
-Task_Test::put (ACE_Message_Block *,
-		ACE_Time_Value *)
-{
-  return 0;
-}
-
-int 
-Task_Test::svc (void)
-{
-  wait_count++;
-  max_count++;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: waiting\n"));
-
-  for (;;)
-    if (max_count >= n_threads)
-      break;
-    else
-      ACE_Thread::yield ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc: finished waiting\n"));
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : default_threads;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : default_iterations;
-
-  Task_Test **task_array = new Task_Test *[n_threads];
-
-  for (int i = 1; i <= n_iterations; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration = %d, max_count %d\n", 
-		  i, (u_long) max_count));
-      max_count = 0;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) starting %d task%s\n", 
-		  n_threads, n_threads == 1 ? "" : "s"));
-
-      // Launch the new tasks.
-      for (int j = 0; j < n_threads; j++)
-	{
-	  task_array[j] = new Task_Test;
-	  // Activate the task, i.e., make it an active object.
-	  task_array[j]->open ();
-	}
-
-      // Wait for initialization to kick in.
-      while (max_count == 0)
-	ACE_Thread::yield ();
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t) waiting for threads to finish\n"));
-
-      // Wait for the threads to finish this iteration.
-      while (max_count != n_threads && wait_count != 0)
-	ACE_Thread::yield ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d finished, max_count %d, wait_count %d, waiting for tasks to exit\n",
-		  i, (u_long) max_count, (u_long) wait_count));
-
-      // Wait for all the tasks to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-
-      // Delete the existing tasks.
-      for (int k = 0; k < n_threads; k++)
-	delete task_array[k];
-    }
-
-  delete [] task_array;
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the test\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_manager.cpp b/examples/Threads/test_thread_manager.cpp
deleted file mode 100644
index 73029d70d88..00000000000
--- a/examples/Threads/test_thread_manager.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-// Test out the group management mechanisms provided by the
-// ACE_Thread_Manager, including the group signal handling, group
-// suspension and resumption, and cooperative thread cancellation
-// mechanisms.
-
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#if defined (ACE_HAS_THREADS)
-
-extern "C" void
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) received signal %d\n", signum));
-}
-
-static void *
-worker (int iterations)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-
-  for (int i = 0; i < iterations; i++)
-    {
-      if ((i % 1000) == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) checking cancellation before iteration %d!\n", 
-		      i));
-	
-	  if (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) has been cancelled before iteration %d!\n", 
-			  i));
-	      break;
-	    }
-	}
-    }
-
-  // Destructor removes thread from Thread_Manager.
-  return 0;
-}
-
-static const int DEFAULT_THREADS = ACE_DEFAULT_THREADS;
-static const int DEFAULT_ITERATIONS = 100000;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon;
-
-  daemon.open (argv[0]);
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
-  int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
-
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
-
-  int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 (void *) n_iterations,
-				 THR_NEW_LWP | THR_DETACHED);
-
-  // Wait for 1 second and then suspend every thread in the group.
-  ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG, "(%t) suspending group\n"));
-  if (thr_mgr->suspend_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "suspend_grp"));
-
-  // Wait for 1 more second and then resume every thread in the
-  // group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) resuming group\n"));
-  if (thr_mgr->resume_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "resume_grp"));
-
-  // Wait for 1 more second and then send a SIGINT to every thread in
-  // the group.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) signaling group\n"));
-  if (thr_mgr->kill_grp (grp_id, SIGINT) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "kill_grp"));
-
-  // Wait for 1 more second and then cancel all the threads.
-  ACE_OS::sleep (ACE_Time_Value (1));
-  ACE_DEBUG ((LM_DEBUG, "(%t) cancelling group\n"));
-  if (thr_mgr->cancel_grp (grp_id) == -1)
-    ACE_ERROR ((LM_DEBUG, "(%t) %p\n", "cancel_grp"));
-
-  // Perform a barrier wait until all the threads have shut down.
-  thr_mgr->wait ();
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_pool.cpp b/examples/Threads/test_thread_pool.cpp
deleted file mode 100644
index 68741156b83..00000000000
--- a/examples/Threads/test_thread_pool.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// This test program illustrates how the ACE task synchronization
-// $Id$
-
-// mechanisms work in conjunction with the ACE_Task and the
-// ACE_Thread_Manager.  If the manual flag is not set input comes from
-// stdin until the user enters a return only.  This stops all workers
-// via a message block of length 0. This is an alternative shutdown of
-// workers compared to queue deactivate.
-//
-// This code is original based on a test program written by Karlheinz
-// Dorn.  It was modified to utilize more "ACE" features by Doug Schmidt.
-
-#include "ace/Task.h"
-#include "ace/Service_Config.h"
-
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Number of iterations to run the test.
-static size_t n_iterations = 100;
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  Thread_Pool (ACE_Thread_Manager *thr_mgr, int n_threads);
-  
-  virtual int svc (void);
-  // Iterate <n_iterations> time printing off a message and "waiting"
-  // for all other threads to complete this iteration.
-
-  virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
-  // This allows the producer to pass messages to the <Thread_Pool>.
-
-private:
-  virtual int close (u_long);
-
-  // = Not needed for this test.
-  virtual int open (void *) { return 0; }
-};
-
-int 
-Thread_Pool::close (u_long) 
-{ 
-  ACE_DEBUG ((LM_DEBUG, "(%t) close of worker\n"));
-  return 0;
-}
-
-Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, 
-			  int n_threads) 
-  : ACE_Task<ACE_MT_SYNCH> (thr_mgr) 
-{
-  // Create worker threads.
-  if (this->activate (THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-  
-// Simply enqueue the Message_Block into the end of the queue.
-
-int
-Thread_Pool::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
-{ 
-  return this->putq (mb, tv); 
-}
-
-// Iterate <n_iterations> time printing off a message and "waiting"
-// for all other threads to complete this iteration.
-
-int 
-Thread_Pool::svc (void) 
-{  
-  // Note that the ACE_Task::svc_run () method automatically adds us to
-  // the Thread_Manager when the thread begins.
-
-  int result = 0;
-  int count = 1;
-
-  // Keep looping, reading a message out of the queue, until we get a
-  // message with a length == 0, which signals us to quit.
-
-  for (;; count++)
-    {       
-      ACE_Message_Block *mb;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d before getq ()\n", count));
-
-      if (this->getq (mb) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, 
-		      "(%t) in iteration %d, got result -1, exiting\n", count));
-	    break;
-	}
-
-      int length = mb->length ();
-
-      if (length > 0)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "(%t) in iteration %d, length = %d, text = \"%*s\"\n",
-		    count, length, length - 1, mb->rd_ptr ()));
-
-      // We're responsible for deallocating this.
-      delete mb;
-
-      if (length == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) in iteration %d, got NULL message, exiting\n",
-		      count));
-	  break;
-	}
-    }
-
-  // Note that the ACE_Task::svc_run () method automatically removes
-  // us from the Thread_Manager when the thread exits.
-  return 0;
-}
-
-static void 
-produce (Thread_Pool &thread_pool)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) producer start, dumping the Thread_Pool\n"));
-  thread_pool.dump ();
-
-  for (int n;;)
-    {
-      // Allocate a new message.
-      ACE_Message_Block *mb = new ACE_Message_Block (BUFSIZ);
-
-#if defined (manual)
-      ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) press chars and enter to put a new message into task queue..."));
-      n = ACE_OS::read (ACE_STDIN, mb->rd_ptr (), mb->size ());
-#else // Automatically generate messages.
-      static int count = 0;
-
-      ACE_OS::sprintf (mb->rd_ptr (), "%d\n", count);
-
-      n = ACE_OS::strlen (mb->rd_ptr ());
-
-      if (count == n_iterations)
-	n = 1; // Indicate that we need to shut down.
-      else
-	count++;
-
-      if (count == 0 || (count % 20 == 0))
-	ACE_OS::sleep (1);
-#endif /* manual */
-      if (n > 1)
-        {
-	  // Send a normal message to the waiting threads and continue
-	  // producing.
-	  mb->wr_ptr (n);
-
-	  // Pass the message to the Thread_Pool.
-	  if (thread_pool.put (mb) == -1)
-            ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	}
-      else
-	{
-          // Send a shutdown message to the waiting threads and exit.
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) start loop, dump of task:\n"));
-	  thread_pool.dump ();
-
-	  for (int i = thread_pool.thr_count (); i > 0; i--)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "(%t) EOF, enqueueing NULL block for thread = %d\n", 
-			  i));
-
-	      // Enqueue a NULL message to flag each consumer to
-	      // shutdown.
-	      if (thread_pool.put (new ACE_Message_Block) == -1)
-		ACE_ERROR ((LM_ERROR, " (%t) %p\n", "put"));
-	    }
-
-	  ACE_DEBUG ((LM_DEBUG, "\n(%t) end loop, dump of task:\n"));
-	  thread_pool.dump ();
-          break;
-	}
-    }
-}
-
-int 
-main (int argc, char *argv[])
-{
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : n_iterations;
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) argc = %d, threads = %d\n", 
-	      argc, n_threads));
-
-  // Create the worker tasks.
-  Thread_Pool thread_pool (ACE_Service_Config::thr_mgr (), 
-			   n_threads);
-
-  // Create work for the worker tasks to process in their own threads.
-  produce (thread_pool);
-
-  // Wait for all the threads to reach their exit point.
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) waiting with thread manager...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) destroying worker tasks and exiting...\n"));
-  return 0;
-}
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_thread_specific.cpp b/examples/Threads/test_thread_specific.cpp
deleted file mode 100644
index f7a4f6dccf3..00000000000
--- a/examples/Threads/test_thread_specific.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "ace/Service_Config.h"
-// $Id$
-
-#include "ace/Synch.h"
-
-#if defined (ACE_HAS_THREADS)
-
-// Define a class that will be stored in thread-specific data.  Note
-// that as far as this class is concerned it's just a regular C++
-// class.  The ACE_TSS wrapper transparently ensures that
-// objects of this class will be placed in thread-specific storage.
-// All calls on ACE_TSS::operator->() are delegated to the
-// appropriate method in the Errno class.
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) 
-  { 
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1);
-
-    return Errno::flags_;
-  }
-
-  void flags (int f)
-  {
-    ACE_GUARD (ACE_Thread_Mutex, ace_mon, Errno::lock_);
-
-    Errno::flags_ = f;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-static void 
-cleanup (void *ptr)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) in cleanup, ptr = %x\n", ptr));
-
-  delete ptr;
-}
-
-// This worker function is the entry point for each thread.
-
-static void *
-worker (void *c)
-{
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int count = int (c);
-
-  ACE_thread_key_t key = 0;
-  int *ip = 0;
-
-  // Make one key that will be available when the thread exits so that
-  // we'll have something to cleanup!
-
-  if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-  ip = new int;
-
-  if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-  for (int i = 0; i < count; i++)
-    {
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 1, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-
-      // Cause an error.
-      ACE_OS::read (ACE_INVALID_HANDLE, 0, 0);
-
-      // The following two lines set the thread-specific state.
-      TSS_Error->error (errno);
-      TSS_Error->line (__LINE__);
-
-      // This sets the static state (note how C++ makes it easy to do
-      // both).
-      TSS_Error->flags (count);
-
-      {
-	// Use the guard to serialize access to cout...
-	ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock, 0);
-
-	cout << "(" << ACE_Thread::self ()
-	     << ") errno = "  << TSS_Error->error () 
-	     << ", lineno = " << TSS_Error->line ()
-	     << ", flags = " << TSS_Error->flags () 
-	     << endl;
-      }
-      key = 0;
-
-      if (ACE_OS::thr_keycreate (&key, cleanup) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keycreate"));
-
-      ip = new int;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) in worker 2, key = %d, ip = %x\n", key, ip));
-
-      if (ACE_OS::thr_setspecific (key, (void *) ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_getspecific (key, (void **) &ip) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      if (ACE_OS::thr_setspecific (key, (void *) 0) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_setspecific"));
-
-      delete ip;
-
-      if (ACE_OS::thr_keyfree (key) == -1)
-	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "ACE_OS::thr_keyfree"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) exiting\n"));
-  return 0;
-}
-
-extern "C" void 
-handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "signal = %S\n", signum));
-  ACE_Service_Config::thr_mgr ()->exit (0);
-}
-
-int 
-main (int argc, char *argv[])
-{
-  // The Service_Config must be the first object defined in main...
-  ACE_Service_Config daemon (argv[0]);
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
-  int threads = argc > 1 ? ACE_OS::atoi (argv[1]) : 4;
-  int count = argc > 2 ? ACE_OS::atoi (argv[2]) : 10000;
-
-  // Register a signal handler.
-  ACE_Sig_Action sa ((ACE_SignalHandler) (handler), SIGINT);
-
-#if defined (ACE_HAS_THREADS)
-  if (ACE_Service_Config::thr_mgr ()->spawn_n (threads, 
-					       ACE_THR_FUNC (&worker), 
-					       (void *) count,
-					       THR_BOUND | THR_DETACHED) == -1)
-    ACE_OS::perror ("ACE_Thread_Manager::spawn_n");
-
-  ACE_Service_Config::thr_mgr ()->wait ();
-#else
-  worker ((void *) count);
-#endif /* ACE_HAS_THREADS */
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_token.cpp b/examples/Threads/test_token.cpp
deleted file mode 100644
index 5a51496d011..00000000000
--- a/examples/Threads/test_token.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Test out the ACE Token class.
-// $Id$
-
-#include "ace/Token.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class My_Task : public ACE_Task<ACE_MT_SYNCH>
-{
-public:
-  My_Task (int n);
-  virtual int open (void *) { return 0; }
-  virtual int close (u_long) { return 0; }
-  virtual int put (ACE_Message_Block *, ACE_Time_Value *) { return 0; }
-  virtual int svc (void);
-
-  static void sleep_hook (void *);
-
-private:
-  ACE_Token token_;
-};
-
-My_Task::My_Task (int n)
-{
-  // Make this Task into an Active Object.
-  this->activate (THR_BOUND | THR_DETACHED, n);
-
-  // Wait for all the threads to exit.
-  this->thr_mgr ()->wait ();
-}
-
-void 
-My_Task::sleep_hook (void *)
-{
-  cerr << '(' << ACE_Thread::self () << ')'
-       << " blocking, My_Task::sleep_hook () called" << endl;
-}
-
-// Test out the behavior of the ACE_Token class.
-
-int 
-My_Task::svc (void)
-{
-  for (int i = 0; i < 10000; i++)
-    {
-      // Wait for up to 1 millisecond past the current time to get the token.
-      ACE_Time_Value timeout (ACE_OS::time (0), 1000);
-
-      if (this->token_.acquire (&My_Task::sleep_hook, 0, &timeout) == 1)
-	{
-	  this->token_.acquire ();
-	  this->token_.renew ();
-	  this->token_.release ();
-	  this->token_.release ();
-	}
-      else
-	ACE_Thread::yield ();
-    }
-  return 0;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  My_Task tasks (argc > 1 ? atoi (argv[1]) : 4);
-
-  return 0;
-}
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "your platform doesn't support threads\n"), -1);
-}
-#endif /* */
diff --git a/examples/Threads/test_tss.cpp b/examples/Threads/test_tss.cpp
deleted file mode 100644
index c81ca41c429..00000000000
--- a/examples/Threads/test_tss.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// Torture test ACE thread-specific storage...
-// $Id$
-
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int        count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void* svc (void *arg);
-
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-int Test_Task::open (void *arg)
-{
-
-  ACE_Thread::spawn (Test_Task::svc, arg);
-
-  return 0;
-}
-
-
-void * 
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss1.cpp b/examples/Threads/test_tss1.cpp
deleted file mode 100644
index 7efdc9dc3ef..00000000000
--- a/examples/Threads/test_tss1.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Detlef Becker
-// 
-// ============================================================================
-
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static int iterations = 100;
-
-class Errno
-{
-public:
-  int error (void) { return this->errno_; }
-  void error (int i) { this->errno_ = i; }
-  
-  int line (void) { return this->lineno_; }
-  void line (int l) { this->lineno_ = l; }
-
-  // Errno::flags_ is a static variable, so we've got to protect it
-  // with a mutex since it isn't kept in thread-specific storage.
-  int flags (void) { 
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, Errno::lock_, -1));
-
-    return Errno::flags_;
-  }
-  int flags (int f)
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1));
-
-    Errno::flags_ = f;
-    return 0;
-  }
-
-private:
-  // = errno_ and lineno_ will be thread-specific data so they don't
-  // need a lock.  
-  int errno_;
-  int lineno_;
-
-  static int flags_;
-#if defined (ACE_HAS_THREADS)
-  // flags_ needs a lock. 
-  static ACE_Thread_Mutex lock_;
-#endif /* ACE_HAS_THREADS */
-};
-
-// Static variables.
-ACE_MT (ACE_Thread_Mutex Errno::lock_);
-int Errno::flags_;
-
-// This is our thread-specific error handler...
-static ACE_TSS<Errno> TSS_Error;
-
-#if defined (ACE_HAS_THREADS)
-// Serializes output via cout.
-static ACE_Thread_Mutex lock;
-
-typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD;
-#else
-// Serializes output via cout.
-static ACE_Null_Mutex lock;
-
-typedef ACE_Guard<ACE_Null_Mutex> GUARD;
-#endif /* ACE_HAS_THREADS */
-
-// Keeps track of whether Tester::close () has started.
-static int close_started = 0;
-
-template <ACE_SYNCH_1>
-class Tester: public ACE_Task<ACE_SYNCH_2>
-{
-public:
-  Tester (void) {}
-  ~Tester (void) {}
-
-  virtual int open (void *theArgs = 0);
-  virtual int close (u_long theArg = 0);
-  virtual int put (ACE_Message_Block *theMsgBlock,
-		   ACE_Time_Value *theTimeVal = 0);
-  virtual int svc (void);
-};
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::open (void *)
-{
-  return this->activate ();
-}
-
-template <ACE_SYNCH_1>
-int Tester<ACE_SYNCH_2>::close (u_long)
-{
-  ACE_DEBUG ((LM_DEBUG, "close running\n!"));
-  close_started = 1;
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "close: trying to log error code 7!\n"));
-  TSS_Error->error (7);
-  ACE_DEBUG ((LM_DEBUG, "close: logging succeeded!\n"));
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::put (ACE_Message_Block *, ACE_Time_Value *)
-{
-  return 0;
-}
-
-template <ACE_SYNCH_1> int 
-Tester<ACE_SYNCH_2>::svc (void)
-{
-  return 0;
-}
-
-int 
-main (int, char *[])
-{
-  Tester<ACE_MT_SYNCH> tester;
-
-  tester.open ();
-
-  while (!close_started)
-    continue;
-
-  ACE_DEBUG ((LM_DEBUG, "main: trying to log error code 7!\n"));
-
-  TSS_Error->error (3);
-
-  ACE_DEBUG ((LM_DEBUG, "main: logging succeeded!\n"));
-  return 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS<Errno>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
-
-#else
-int 
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "ACE doesn't support support threads on this platform (yet)\n"),
-		    -1);
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/test_tss2.cpp b/examples/Threads/test_tss2.cpp
deleted file mode 100644
index 24a8d958e91..00000000000
--- a/examples/Threads/test_tss2.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    TSS_Test.cpp
-//
-// = DESCRIPTION
-//     This program tests thread specific storage of data. The ACE_TSS
-//     wrapper transparently ensures that the objects of this class
-//     will be placed in thread-specific storage. All calls on
-//     ACE_TSS::operator->() are delegated to the appropriate method
-//     in the Errno class. 
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/Task.h"
-#include "ace/Token.h"
-
-#if defined (ACE_HAS_THREADS)
-
-class TSS_Obj
-{
-public:
-
-  TSS_Obj (void);
-  ~TSS_Obj (void);
-
-private:
-  static int count_;
-  static ACE_Thread_Mutex  lock_;
-};
-
-int TSS_Obj::count_ = 0;
-ACE_Thread_Mutex TSS_Obj::lock_;
-
-TSS_Obj::TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_++;
-  cout << "TO+ : " << count_ << endl;
-}
-
-TSS_Obj::~TSS_Obj (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
-
-  count_--;
-  cout << "TO- : " << count_ << endl;
-}
-
-class Test_Task
-{
-public:
-
-  Test_Task (void);
-  ~Test_Task (void);
-
-  int open (void *arg);
-
-  static void *svc (void *arg);
-  static int wait_count_;
-  static int max_count_;
-
-private:
-  static int count_;
-};
-
-int Test_Task::count_ = 0;
-int Test_Task::wait_count_ = 0;
-int Test_Task::max_count_ = 0;
-int num_threads_ = 0;
-
-ACE_Token token;
-
-Test_Task::Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_++;
-  cout << "Test_Task+ : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Token, ace_mon, token);
-
-  count_--;
-  cout << "Test_Task- : " 
-       << count_ << " (" 
-       << ACE_OS::thr_self () 
-       << ")" << endl;
-
-  wait_count_--;
-}
-
-void *
-Test_Task::svc (void *arg)
-{
-  ACE_TSS<TSS_Obj> tss (new TSS_Obj);
-
-  {
-    ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-    wait_count_++;
-    max_count_++;
-    cout << "svc: waiting (" << ACE_OS::thr_self () << ")" << endl;
-  }
-
-  while (1)
-    {   
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	if (max_count_ >= num_threads_)
-	  break;
-	else
-	  {
-	    ace_mon.release ();
-	    ACE_Thread::yield ();
-	    ace_mon.acquire ();
-	  }
-      }
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, 0);
-
-	cout << "svc: waiting (" << ACE_OS::thr_self () << ") finished" << endl;
-      }
-    }
-
-  delete (Test_Task *) arg;
-
-  return 0;
-}
-
-int 
-Test_Task::open (void *arg)
-{
-  if (ACE_Thread::spawn (Test_Task::svc, arg) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread::spawn"), 0);
-
-  return 0;
-}
-
-int 
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    {
-      cout << "Missing parameters!" << endl;
-      return 1;
-    }
-
-  int num_Tasks = atoi (argv[1]);
-
-  num_threads_ = num_Tasks;
-
-  Test_Task **task_arr = (Test_Task**) new char[sizeof (Test_Task*) * num_Tasks];
-
-  while (1)
-    {
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "ReseTest_Tasking Test_Task::max_count_ from: " 
-	     << Test_Task::max_count_ << endl;
-
-	Test_Task::max_count_ = 0;
-      }
-
-      for (int i = 0; i < num_Tasks; i++)
-	{
-          task_arr[i] = new Test_Task;
-	  task_arr[i]->open (task_arr[i]);
-	}
-
-      cout << "Waiting for first thread started..." << endl;
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (Test_Task::max_count_ != 0 )
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      break;
-	    }
-	  ace_mon.release ();
-	  ACE_Thread::yield ();
-	  ace_mon.acquire ();
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	cout << "First thread started!" << endl 
-	     << "Waiting for all threads finished..." << endl;
-      }
-
-      for (;;)
-	{
-	  ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-
-	  if (!(Test_Task::max_count_ == num_threads_ 
-		&& Test_Task::wait_count_ == 0))
-	    {
-	      ace_mon.release ();
-	      ACE_Thread::yield ();
-	      ace_mon.acquire ();
-	      continue;
-	    }
-
-	  cout << "Test_Task::max_count_ = " 
-	       << Test_Task::max_count_ 
-	       << " Test_Task::wait_count_ = " 
-	       << Test_Task::wait_count_ 
-	       << endl;
-	  break;
-	}
-
-      {
-	ACE_GUARD_RETURN (ACE_Token, ace_mon, token, -1);
-	cout << "All threads finished..." << endl;
-      }
-
-      ACE_OS::sleep (2);
-    }
-
-  return 0;
-}
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/java/ChangeLog b/java/ChangeLog
deleted file mode 100644
index ca378adee1f..00000000000
--- a/java/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-Mon Dec 22 23:06:00 CST 1997  Edward Everett Anderson <eea1@cs.wustl.edu>
-
-* java/examples/Logger/simple-server/LogRecord.java:
-
-	* Made the message size constant a static so the client
-	will compile.
-
-	* Made sure the netsvcs directory is in the release archive,
-	incremented the version number to 1.4.2 to clear up this mistake.
-
-Mon Jan 19 13:45:04 CST 1998  Edward Everett Anderson <eea1@cs.wustl.edu>
-
-* java/classes/README.TXT
-
-	* Added a readme file to the classes directory so WinZip
-	creates the directory correctly on NT.
diff --git a/java/ImageProcessing/ImageProcessing.dsp b/java/ImageProcessing/ImageProcessing.dsp
deleted file mode 100644
index bbf76fb7bd2..00000000000
--- a/java/ImageProcessing/ImageProcessing.dsp
+++ /dev/null
@@ -1,253 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ImageProcessing" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ImageProcessing - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ImageProcessing.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ImageProcessing.mak"\

- CFG="ImageProcessing - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ImageProcessing - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ImageProcessing - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ImageProcessing - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ImageProcessing - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ImageProcessing - Java Virtual Machine Release"

-# Name "ImageProcessing - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\filters\Assert.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\BaseButton.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\BenchmarkApplet.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\BleachFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\BlurFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\DarkenFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\DeSpeckleFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\DialogManager.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\DialogType.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\DissolveFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\EdgeDetectFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\EmbossFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\FileBrowser.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\FilePanel.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\GifEncoder.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\GIFHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\Hierarchy.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\HierarchyAdapter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\Icon.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageApp.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageByteCounter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageCanvas.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageEncoder.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageProcessor.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ImageSender.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\IntHashtable.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ListFiles.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\LoadURLFrame.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\MedFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\OilPaintFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\Options.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\PixelizeFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\RandomizeFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\RotateFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\SaveURLFrame.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\Separator.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ServerHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\ServerTest.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\SharpenFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\SpatialFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\SpreadFilter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\StatusDisplay.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\StatusIndicator.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\Tester.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\framework\TestHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\filters\Timer.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/ImageProcessing/ImageProcessing.dsw b/java/ImageProcessing/ImageProcessing.dsw
deleted file mode 100644
index 27a4e2acd15..00000000000
--- a/java/ImageProcessing/ImageProcessing.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "ImageProcessing"=.\ImageProcessing.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/java/ImageProcessing/filters/Assert.java b/java/ImageProcessing/filters/Assert.java
deleted file mode 100644
index c83f9ca94c0..00000000000
--- a/java/ImageProcessing/filters/Assert.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package imaging.filters;
-
-/**
- * A simple assertion mechanism for asserting validity of
- * arguments.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-class Assert {
-    static public void notFalse(boolean b) 
-                       throws IllegalArgumentException {
-        if(b == false) 
-            throw new IllegalArgumentException(
-                            "boolean expression false");
-    }
-    static public void notNull(Object obj) 
-                       throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException("null argument");
-    }
-
-    static public void notFalse(boolean b, String s) 
-                               throws IllegalArgumentException {
-        if(b == false)
-            throw new IllegalArgumentException(s);
-    }
-    static public void notNull(Object obj, String s) 
-                               throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException(s);
-    }
-}
diff --git a/java/ImageProcessing/filters/BleachFilter.java b/java/ImageProcessing/filters/BleachFilter.java
deleted file mode 100644
index e9d6a0b9e0e..00000000000
--- a/java/ImageProcessing/filters/BleachFilter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-/**
- * A derivation of RGBImageFilter that bleaches an image.<p>
- *
- * Extent of the bleaching effect is controlled by the only 
- * constructor argument: an integer representing the percentage 
- * of bleaching.  The percentage of bleaching may also be 
- * controlled after instantiation by invoking the 
- * void percent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class BleachFilter extends RGBImageFilter implements MedFilter
-{
-  private int percent;
-
-  public BleachFilter()
-    {
-      this(25);
-    }
-  
-  public BleachFilter(int percent) 
-  {
-    Assert.notFalse(percent >= 0 && percent <= 100);
-    this.percent = percent;
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Bleaches/Lightens an image";
-  }
-
-    public int  percent()            { return percent;    }
-    public void percent(int percent) { percent = percent; }
-
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-
-        int    alpha = cm.getAlpha(rgb);
-        int    red   = cm.getRed  (rgb);
-        int    green = cm.getGreen(rgb);
-        int    blue  = cm.getBlue (rgb);
-        double percentMultiplier = (double)percent/100;
-
-        red   = Math.min((int)
-                (red + (red * percentMultiplier)), 255);
-        green = Math.min((int)
-                (green + (green * percentMultiplier)), 255);
-        blue  = Math.min((int)
-                (blue  + (blue  * percentMultiplier)), 255);
-
-        alpha = alpha << 24;
-        red   = red   << 16;
-        green = green << 8;
-
-        return alpha | red | green | blue;
-    }
-}
diff --git a/java/ImageProcessing/filters/BlurFilter.java b/java/ImageProcessing/filters/BlurFilter.java
deleted file mode 100644
index e071324e491..00000000000
--- a/java/ImageProcessing/filters/BlurFilter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class BlurFilter extends SpatialFilter
-{
-  private int[][] mean_filter;     
-  private int degree_ = 3;
-  
-  public BlurFilter()
-    {
-    }
-
-  public BlurFilter(int degree)
-    {
-      degree_ = degree;
-    }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0, count = 0;
-    int red, green, blue, index;
-    int alpha, n2 = degree_/2;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	   
-	for (int y = 0, i = 0; y < rows_; y++)
-	  {
-	    for (int x = 0; x < columns_; x++, i++)
-	      {	    
-		red = 0; green = 0; blue = 0; count = 0;
-		alpha = (raster_[i] >> 24) & 0xff;
-		
-		for (int y1 = y - n2; y1 < y + n2; y1++)
-		  {
-		    index = y1*columns_;
-		    if (y1 >= 0 && y1 < rows_)
-		      {		
-			for (int x1 = x - n2; x1 < x + n2; x1++)
-			  {
-			    if (x1 >= 0 && x1 < columns_)
-			      {
-				pixel = raster_[index + x1];
-				
-				red += (pixel >> 16) & 0xff;
-				green += (pixel >> 8) & 0xff;
-				blue += (pixel) & 0xff;
-				count++;
-			      }
-			  }
-		      }
-		  }
-		
-		red /= count;
-		green /= count;
-		blue /= count;
-		
-		if (red < 0) red = 0;
-		if (green < 0) green = 0;
-		if (blue < 0) blue = 0 ;
-		
-		if (red > 255) red = 255;
-		if (green > 255) green = 255;
-		if (blue > 255) blue = 255;
-		
-		pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-	      }       
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    System.out.println("Finished altering image");
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-  
-  public String info ()
-    {
-      return "Blurs an image.";
-    }
-}
diff --git a/java/ImageProcessing/filters/DarkenFilter.java b/java/ImageProcessing/filters/DarkenFilter.java
deleted file mode 100644
index ea20d15a46b..00000000000
--- a/java/ImageProcessing/filters/DarkenFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class DarkenFilter extends RGBImageFilter implements MedFilter
-{
-  private int percent_;
-
-  public DarkenFilter ()
-  {  
-    percent_ = 50;
-    canFilterIndexColorModel = true;
-  }
-
-  public DarkenFilter(int percent)
-  {  
-    Assert.notFalse(percent >= 0 && percent <= 100);
-    percent_ = percent;
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Darkens an image.";
-  }
-
-  public int filterRGB(int x, int y, int rgb)
-  {
-    DirectColorModel cm = 
-      (DirectColorModel)ColorModel.getRGBdefault();
-    
-    int    alpha = cm.getAlpha(rgb);
-    int    red   = cm.getRed  (rgb);
-    int    green = cm.getGreen(rgb);
-    int    blue  = cm.getBlue (rgb);
-    double percentMultiplier = (double)((double)1.0 - (double)percent_/100);
-
-    red   *=  percentMultiplier;
-    blue   *= percentMultiplier;
-    green  *= percentMultiplier;
-    
-    alpha = alpha << 24;
-    red   = red   << 16;
-    green = green << 8;
-    
-    return alpha | red | green | blue;
-  }
-}
diff --git a/java/ImageProcessing/filters/DeSpeckleFilter.java b/java/ImageProcessing/filters/DeSpeckleFilter.java
deleted file mode 100644
index d9bff1de3b5..00000000000
--- a/java/ImageProcessing/filters/DeSpeckleFilter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class DeSpeckleFilter extends SpatialFilter
-{
-  private int degree_ = 3;
-  
-  public DeSpeckleFilter()
-    {
-    }
-
-  public DeSpeckleFilter(int degree)
-    {
-      degree_ = degree;
-    }
-  
-  public String info ()
-  {
-    return "Removes speckles from an image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("DeSpeckleFilter Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int rsum, bsum, gsum, r, g, b, a;
-    int count, n2, nsq, c2, lcv, lcv2, index;
-    int[] rtab, gtab, btab;
-    int[] pixels = new int[columns_*rows_];
-
-    profile_timer_.start();
-    
-    n2 = degree_/2;
-    nsq = degree_ * degree_;
-
-    rtab = new int[nsq];
-    gtab = new int[nsq];
-    btab = new int[nsq];
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {    
-	for (int y = 0, k = 0; y < rows_; y++)
-	  {
-	    lcv = y + n2;
-	    for (int x = 0; x < columns_; x++, k++)
-	      {	    
-		rsum = gsum = bsum = 0;
-		count = 0;
-		
-		lcv2 = x + n2;
-		for (int y1 = y - n2; y1 < lcv; y1++)
-		  {
-		    index = y1*columns_; 
-		    if (y1 >= 0 && y1 < rows_)
-		      {
-			for (int x1 = x - n2; x1 < lcv2; x1++)
-			  {
-			    if (x1 >= 0 && x1 < columns_)
-			      {
-				int pixel = raster_[index + x1];
-				rtab[count] = (pixel >> 16) & 0xff;
-				gtab[count] = (pixel >> 8) & 0xff;
-				btab[count] = (pixel) & 0xff;
-				count++;
-			      }
-			  }
-		      }
-		  }
-		
-		for (int d = count >> 1; d > 0; d >>= 1)
-		  {
-		    for (int i = d; i < count; i++)
-		      {		    
-			for (int j = i - d; j >= 0 && rtab[j] > rtab[j+d]; j -= d)
-			  {
-			    int t = rtab[j];
-			    rtab[j] = rtab[j + d];
-			    rtab[j + d] = t;			
-			  }
-			
-			for (int j = i - d; j >= 0 && gtab[j] > gtab[j+d]; j -= d)
-			  {
-			    int t = gtab[j];
-			    gtab[j] = gtab[j + d];
-			    gtab[j + d] = t;			
-			  }
-			
-			for (int j = i - d; j >= 0 && btab[j] > btab[j+d]; j -= d)
-			  {
-			    int t = btab[j];
-			    btab[j] = btab[j + d];
-			    btab[j + d] = t;			
-			  }
-		      }
-		  }
-		
-		c2 = count >> 1;
-		
-		a = (raster_[k] >> 24) & 0xff;
-		r = ( (count % 2 == 0) ? (rtab[c2] + rtab[c2 - 1]) >> 1 : rtab[c2]);
-		g = ( (count % 2 == 0) ? (gtab[c2] + gtab[c2 - 1]) >> 1 : gtab[c2]);
-		b = ( (count % 2 == 0) ? (btab[c2] + btab[c2 - 1]) >> 1 : btab[c2]);
-		
-		pixels[k] = (a << 24) | (r << 16) | (g << 8) | b;
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);	
-    consumer.imageComplete(status);
-  }
-
-}
diff --git a/java/ImageProcessing/filters/DissolveFilter.java b/java/ImageProcessing/filters/DissolveFilter.java
deleted file mode 100644
index 0225aad6ad1..00000000000
--- a/java/ImageProcessing/filters/DissolveFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-/**
- * A derivation of RGBImageFilter that partially or wholly
- * dissolves an image.<p>
- *
- * Extent of dissolving is set by the setOpacity(int) method,
- * which is passed an integer between 0 and 255 (inclusive).
- * The integer represents the alpha value to be applied to
- * every color in the image.<p>
- *
- * An alpha value of 255 signifies an opaque color, while an
- * alpha value of 0 signifies a translucent color.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class DissolveFilter extends RGBImageFilter implements MedFilter
-{
-  private int opacity;
-
-  public DissolveFilter() {
-        this(0);
-    }
-    public DissolveFilter(int opacity) {
-        canFilterIndexColorModel = true;
-        setOpacity(opacity);
-    }
-  public String info ()
-  {
-    return "Dissolves an image";
-  }  
-  public void setOpacity(int opacity) {
-        Assert.notFalse(opacity >= 0 && opacity <= 255);
-        this.opacity = opacity;
-    }
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-        int alpha = cm.getAlpha(rgb);
-        int red   = cm.getRed  (rgb);
-        int green = cm.getGreen(rgb);
-        int blue  = cm.getBlue (rgb);
-
-        alpha = opacity;
-
-        return alpha << 24 | red << 16 | green << 8 | blue;
-    }
-}
diff --git a/java/ImageProcessing/filters/EdgeDetectFilter.java b/java/ImageProcessing/filters/EdgeDetectFilter.java
deleted file mode 100644
index 87cc88d475d..00000000000
--- a/java/ImageProcessing/filters/EdgeDetectFilter.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class EdgeDetectFilter extends SpatialFilter
-{
-  public EdgeDetectFilter()
-  {
-  }
-  
-  public String info ()
-  {
-    return "Edge detection filter.";
-  }
-
-  public void imageComplete(int status)
-    {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3;
-    int new_red1 = 0, new_green1 = 0, new_blue1 = 0,
-      new_red2 = 0, new_green2 = 0, new_blue2 = 0;
-    int ul, um, ur, ll, lm, lr, ml, mr;
-    int alpha, lcv, lcv2;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	lcv = rows_ - 1;
-	lcv2 = columns_ - 1;
-	for (int x = 1, index = 0; x < lcv; x++, index += columns_)
-	  {
-	    for (int y = 1; y < lcv2; y++)
-	      {
-		row1 = index + y;
-		row2 = row1 + columns_;
-		row3 = row2 + columns_;
-		
-		ul = raster_[row1 - 1];
-		um = raster_[row1];
-		ur = raster_[row1 + 1];
-		ml = raster_[row2 - 1];
-		mr = raster_[row2 + 1];
-		ll = raster_[row3 - 1];
-		lm = raster_[row3];
-		lr = raster_[row3 + 1];
-		
-		alpha = (raster_[row2] >> 24) & 0xff;
-		
-		new_red1 =
-		  (((ul >> 16) & 0xff)
-		   + (((um >> 16) & 0xff) << 1)
-		   + ((ur >> 16) & 0xff)
-		   - ((ll >> 16) & 0xff)
-		   - (((lm >> 16) & 0xff) << 1)
-		   - ((lr >> 16) & 0xff));
-		
-		new_green1 =
-		  (((ul >> 8) & 0xff)
-		   + (((um >> 8) & 0xff) << 1)
-		   + ((ur >> 8) & 0xff)
-		   - ((ll >> 8) & 0xff)
-		   - (((lm >> 8) & 0xff) << 1)
-		   - ((lr >> 8) & 0xff));
-		
-		new_blue1 =
-		  (((ul) & 0xff)
-		   + (((um) & 0xff) << 1)
-		   + ((ur) & 0xff)
-		   - ((ll) & 0xff)
-		   - (((lm) & 0xff) << 1)
-		   - ((lr) & 0xff));
-		
-		new_red2 =
-		  (- ((ul >> 16) & 0xff)
-		   + ((ur >> 16) & 0xff)
-		   - (((ml >> 16) & 0xff) << 1)
-		   + (((mr >> 16) & 0xff) << 1)
-		   - ((ll >> 16) & 0xff)
-		   + ((lr >> 16) & 0xff));
-		
-		new_green2 =
-		  (- ((ul >> 8) & 0xff)
-		   + ((ur >> 8) & 0xff)
-		   - (((ml >> 8) & 0xff) << 1)
-		   + (((mr >> 8) & 0xff) << 1)
-		   - ((ll >> 8) & 0xff)
-		   + ((lr >> 8) & 0xff));
-		
-		new_blue2 =
-		  (- ((ul) & 0xff)
-		   + ((ur) & 0xff)
-		   - (((ml) & 0xff) << 1)
-		   + (((mr) & 0xff) << 1)
-		   - ((ll) & 0xff)
-		   + ((lr) & 0xff));
-		
-		
-		new_red1 = (int)Math.sqrt(new_red1*new_red1 + new_red2*new_red2);
-		new_green1 = (int)Math.sqrt(new_green1*new_green1 + new_green2*new_green2);
-		new_blue1 = (int)Math.sqrt(new_blue1*new_blue1 + new_blue2*new_blue2);
-		
-		if (new_red1 < 0) red = 0;
-		if (new_green1 < 0) green = 0;
-		if (new_blue1 < 0) blue = 0 ;
-		
-		
-		if (new_red1 > 255)
-		  new_red1 = 255;
-		
-		if (new_green1 > 255)
-		  new_green1 = 255;
-		
-		if (new_blue1 > 255)
-		  new_blue1 = 255;
-		
-		pixels[row2] = (alpha << 24) | (new_red1 << 16) | (new_green1 << 8) | new_blue1;		
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-
-  /*
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-    
-    int[][] pixels = new int[rows_*columns_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3, row4, row5;
-    int a, b, c, d, rsum, gsum, bsum, v, maxv = 0;
-    int ul, um, ur, ml, mr, ll, lm, lr, lcv, lcv2;
-    int alpha;
-
-    lcv = rows_ -1;
-    for (int y = 1; y < lcv; y++)
-      {
-	lcv2 = columns_ -1;
-	for (int x = 1; x < lcv2; x++)
-	  {
-	    row1 = columns_*(y-1) + x;
-	    row2 = row1 + columns_;
-	    row3 = row2 + columns_;
-	    ul = raster_[row1 - 1];
-	    um = raster_[row1];
-	    ur = raster_[row1 + 1];
-	    ml = raster_[row2 - 1];
-	    mr = raster_[row2 + 1];
-	    ll = raster_[row3 - 1];
-	    lm = raster_[row3];
-	    lr = raster_[row3 + 1];
-
-	    alpha = defaultRGB_.getAlpha(raster_[row2]);
-
-	    a = ((lr >> 16) & 0xff) - ((ul >> 16) & 0xff);
-	    b = ((mr >> 16) & 0xff) - ((ml >> 16) & 0xff);
-	    c = ((ur >> 16) & 0xff) - ((ll >> 16) & 0xff);
-	    d = ((um >> 16) & 0xff) - ((lm >> 16) & 0xff);
-
-	    rsum = a + b + c;
-	    if (rsum < 0) rsum = -rsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (rsum > a) rsum = a;
-	    rsum /= 3;
-	    
-	    a = ((lr >> 8) & 0xff) - ((ul >> 8) & 0xff);
-	    b = ((mr >> 8) & 0xff) - ((ml >> 8) & 0xff);
-	    c = ((ur >> 8) & 0xff) - ((ll >> 8) & 0xff);
-	    d = ((um >> 8) & 0xff) - ((lm >> 8) & 0xff);
-
-	    gsum = a + b + c;
-	    if (gsum < 0) gsum = -gsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (gsum > a) gsum = a;
-	    gsum /= 3;
-	    
-	    a = ((lr) & 0xff) - ((ul) & 0xff);
-	    b = ((mr) & 0xff) - ((ml) & 0xff);
-	    c = ((ur) & 0xff) - ((ll) & 0xff);
-	    d = ((um) & 0xff) - ((lm) & 0xff);
-
-	    bsum = a + b + c;
-	    if (bsum < 0) bsum = -bsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (bsum > a) bsum = a;
-	    bsum /= 3;
-
-	    pixels[row2] = (alpha << 24) | (rsum << 16) | (gsum << 8) | bsum;
-
-	    v = (((int)(rsum)*11 + ((int)(gsum) << 4) + (int)(bsum)*5) >> 5);
-	    
-	    if (maxv < v)
-	      maxv = v;
-	  }
-	
-      }
-
-    for (int y = 1; y < rows_ - 1; y++)
-      {
-	for (int x = 1; x < columns_ - 1; x++)
-	  {
-	    pixel = pixels[y][x];
-	    alpha = (pixel >> 24) & 0xff;
-	    red = (((pixel >> 16) & 0xff) * 255) / maxv;
-	    green = (((pixel >> 8) & 0xff) * 255) / maxv;
-	    blue = ((pixel & 0xff) * 255) / maxv;
-
-	    if (red < 0) red = 0;
-	    if (green < 0) green = 0;
-	    if (blue < 0) blue = 0 ;
-
-	    if (red > 255) red = 255;
-	    if (green > 255) green = 255;
-	    if (blue > 255) blue = 255;
-
-	    pixels[y*x] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-	  }
-
-	consumer.setPixels(0, y, columns_, 1, defaultRGB_, pixels[y], 0, columns_);
-	}
-      
-    consumer.imageComplete(status);
-  }
-  */
-}
diff --git a/java/ImageProcessing/filters/EmbossFilter.java b/java/ImageProcessing/filters/EmbossFilter.java
deleted file mode 100644
index e6d5833ee39..00000000000
--- a/java/ImageProcessing/filters/EmbossFilter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class EmbossFilter extends SpatialFilter
-{
-  
-  public EmbossFilter()
-  {
-  }
-    
-  public String info ()
-  {
-    return "Embosses an image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Emboss: Image Error: " + status);
-	return;
-      }
-
-    System.out.println("Beginning to emboss an image.");
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3, ul, um, ml, mr, lm, lr;
-    int new_grey = 0, lcv, lcv2;
-    int alpha;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {    
-	lcv = rows_ -1;
-	for (int x = 1, index = 0; x < lcv; x++, index += columns_)
-	  {
-	    lcv2 = columns_ - 1;
-	    for (int y = 1; y < lcv2; y++)
-	      {
-		
-		row1 = index + y;
-		row2 = row1 + columns_;
-		row3 = row2 + columns_;
-		
-		ul = raster_[row1 - 1];
-		um = raster_[row1];
-		ml = raster_[row2 - 1];
-		mr = raster_[row2 + 1];
-		lm = raster_[row3];
-		lr = raster_[row3 + 1];
-		
-		alpha = (raster_[row2] >> 24) & 0xff;
-		
-		red = ((- (((ul >> 16) & 0xff) << 1) - ((um >> 16) & 0xff) -
-			((ml >> 16) & 0xff) + ((mr >> 16) & 0xff) +
-			((lm >> 16) & 0xff) + (((lr >> 16) & 0xff) << 1)) >> 3) + 128;
-		
-		green = ((- (((ul >> 8) & 0xff) << 1) - ((um >> 8) & 0xff) -
-			  ((ml >> 8) & 0xff) + ((mr >> 8) & 0xff) +
-			  ((lm >> 8) & 0xff) + (((lr >> 8) & 0xff) << 1)) >> 3) + 128;
-		
-		blue = ((- ((ul & 0xff) << 1) - (um & 0xff) -
-			 (ml & 0xff) + (mr & 0xff) +
-			 (lm & 0xff) + ((lr & 0xff) << 1)) >> 3) + 128;
-		
-		new_grey = (((int)(red)*11 + ((int)(green) << 4) + (int)(blue)*5) >> 5);
-		
-		pixels[row2] = (alpha << 24) | (new_grey << 16) | (new_grey << 8) | new_grey;
-		
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-	
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    //    System.out.println(timer);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/Makefile b/java/ImageProcessing/filters/Makefile
deleted file mode 100644
index 253bc9b5c22..00000000000
--- a/java/ImageProcessing/filters/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-DOCDIR = $(JACE_WRAPPER)/doc
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-
-clean:
-	rm -rf *~
-
-realclean: clean  
-	rm -rf $(JACE_WRAPPER)/classes/imaging/filters/*.class
-
-files =	MedFilter.java \
-	Assert.java \
-	BleachFilter.java \
-	BlurFilter.java \
-	DarkenFilter.java \
-	DeSpeckleFilter.java \
-	DissolveFilter.java \
-	EdgeDetectFilter.java \
-	EmbossFilter.java \
-	OilPaintFilter.java \
-	PixelizeFilter.java \
-	RotateFilter.java \
-	SharpenFilter.java \
-	SpatialFilter.java \
-	SpreadFilter.java \
-	Timer.java 
-
diff --git a/java/ImageProcessing/filters/MedFilter.java b/java/ImageProcessing/filters/MedFilter.java
deleted file mode 100644
index def0bd2075a..00000000000
--- a/java/ImageProcessing/filters/MedFilter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package imaging.filters;
-
-public interface MedFilter
-{
-  String info ();
-}
diff --git a/java/ImageProcessing/filters/OilPaintFilter.java b/java/ImageProcessing/filters/OilPaintFilter.java
deleted file mode 100644
index 68bcf79e5c2..00000000000
--- a/java/ImageProcessing/filters/OilPaintFilter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package imaging.filters; 
-
-import java.awt.image.*; 
-
-public class OilPaintFilter extends SpatialFilter 
-{
-  private int degree_ = 3; 
-
-  public OilPaintFilter() 
-    {
-    }
-
-  public OilPaintFilter(int degree)
-    {
-      degree_ = degree;
-    }
-
-  public String info ()
-  {
-    return "Converts an image into an oil painting.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Oil Paint FilterImage Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int[] nnrect = new int[degree_*degree_];
-    int offset = degree_/2, cnt = 0, maxcnt = 0, col = 0, tmp;
-    int lcv1 = rows_,
-      lcv2 = columns_,
-      lcv3 = degree_*degree_;
-    
-    profile_timer_.start();
-    
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	for (int y = 0, index = 0; y < lcv1; y++)
-	  {
-	    for (int x = 0; x < lcv2; x++, index++)
-	      {
-		cnt = 0;
-		for (int i = y - offset; i < y + offset; i++)
-		  {
-		    tmp = i*columns_;
-		    for (int j = x - offset; j < x + offset; j++, cnt++)
-		      {
-			if (i >= 0 && i < lcv1 && j >= 0 && j < lcv2)
-			  nnrect[cnt] = raster_[tmp + j];
-			else
-			  nnrect[cnt] = -1;
-		      }		    
-		  }
-		
-		maxcnt = 0;
-		col = 0;
-		cnt = 0;
-		for (int i = 0; i < lcv3; i++)
-		  {
-		    if (nnrect[i] != -1)
-		      {
-			cnt = 1;
-			
-			for (int j = i+1; j < lcv3; j++)
-			  {
-			    if (nnrect[i] == nnrect[j])
-			      cnt++;
-			  } 
-			
-			if (cnt > maxcnt)
-			  {
-			    col = nnrect[i];
-			    maxcnt = cnt;
-			  }
-		      }
-		  }
-		
-		pixels[index] = col;
-	      }
-	  }
-      }
-
-    System.err.println("Oil Paint should be finished.");
-    
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/PixelizeFilter.java b/java/ImageProcessing/filters/PixelizeFilter.java
deleted file mode 100644
index cdfe768789a..00000000000
--- a/java/ImageProcessing/filters/PixelizeFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class PixelizeFilter extends SpatialFilter
-{
-  private int pwidth_ = 4;
-  private int pheight_ = 4;
-
-  public PixelizeFilter()
-    {
-    }
-  
-  public PixelizeFilter(int pwidth, int pheight)
-    {
-      pwidth_ = pwidth;
-      pheight_ = pheight;
-    }
-
-  public String info ()
-  {
-    return "Pixelizes the image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Pixelize Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int pixel;
-    int nsum, asum, rsum, gsum, bsum, nwide, nhigh, stx, sty, x, y;
-    int x_offset, y_offset, x_extent, y_extent, lcv, lcv2, lcv3, index;
-    int[] results = new int[rows_*columns_];
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	lcv3 = pwidth_*pheight_;
-	nwide = (columns_ + pwidth_ - 1) / pwidth_;
-	nhigh = (rows_ + pheight_ - 1) / pheight_;
-	
-	stx = -(nwide*pwidth_ - columns_)/2;
-	sty = -(nhigh*pheight_ - rows_)/2;
-	
-	y = sty;
-	for (int i = 0; i < nhigh; i++, y += pheight_)
-	  {
-	    x = stx;	    
-	    for (int j = 0; j < nwide; j++, x += pwidth_)
-	      {
-		nsum = asum = rsum = bsum = gsum = 0;
-		
-		lcv = y + pheight_;
-		lcv2 = x + pwidth_;
-		for (int y1 = y; y1 < lcv; y1++)
-		  {
-		    index = y1*columns_;
-		    for (int x1 = x; x1 < lcv2; x1++)
-		      {
-			if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-			  {
-			    nsum++;
-			    pixel = raster_[index + x1];
-			    
-			    asum += (pixel >> 24) & 0xff;
-			    rsum += (pixel >> 16) & 0xff;
-			    gsum += (pixel >> 8 ) & 0xff;
-			    bsum += pixel & 0xff;
-			  }
-		      }
-		  }
-		
-		if (nsum > 0)
-		  {
-		    rsum /= nsum;
-		    gsum /= nsum;
-		    bsum /= nsum;
-		    
-		    if (asum < 0) asum = 0;
-		    if (rsum < 0) rsum = 0;
-		    if (gsum < 0) gsum = 0;
-		    if (bsum < 0) bsum = 0;
-
-		    if (asum > 255) asum = 255;
-		    if (rsum > 255) rsum = 255;
-		    if (gsum > 255) gsum = 255;
-		    if (bsum > 255) bsum = 255;
-		    
-		  }
-		
-		for (int y1 = y; y1< lcv; y1++)
-		  {
-		    index = y1*columns_;
-		    for (int x1 = x; x1 < lcv2; x1++)
-		      {
-			if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-			  results[index + x1]
-			    = (asum << 24) | (rsum << 16) | (gsum << 8) | bsum;
-		      }
-		  }	    
-	      }	
-	  }
-      }
-    
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, results, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/RandomizeFilter.java b/java/ImageProcessing/filters/RandomizeFilter.java
deleted file mode 100644
index 438f79e01c0..00000000000
--- a/java/ImageProcessing/filters/RandomizeFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import java.util.Random;
-
-public class RandomizeFilter extends RGBImageFilter implements MedFilter
-{
-  private static Random rand = new Random(System.currentTimeMillis());
-  
-  public RandomizeFilter ()
-  {  
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Randomizes an image.";
-  }
-
-  public int filterRGB(int x, int y, int rgb)
-  {
-    DirectColorModel cm = 
-      (DirectColorModel)ColorModel.getRGBdefault();
-    
-    int    alpha = cm.getAlpha(rgb);
-    int    red   = rand.nextInt() % 255;
-    int    green = rand.nextInt() % 255;
-    int    blue  = rand.nextInt() % 255;
-    
-    alpha = alpha << 24;
-    red   = red   << 16;
-    green = green << 8;
-    
-    return alpha | red | green | blue;
-  }
-}
diff --git a/java/ImageProcessing/filters/RotateFilter.java b/java/ImageProcessing/filters/RotateFilter.java
deleted file mode 100644
index 39551017a4b..00000000000
--- a/java/ImageProcessing/filters/RotateFilter.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class RotateFilter extends SpatialFilter
-{
-  private double angle_;
-  private int rotx_, roty_;
-  private int rotheight_, rotwidth_;
-  
-  public RotateFilter ()
-  {
-    this.angle_ = 90.0;
-  }
-
-  public RotateFilter(double angle)
-    {
-      this.angle_ = angle;
-    }
-
-  public String info ()
-    {
-      return "Rotates an image";
-    }
-
-    public void setDimensions(int width, int height)
-    {
-      DoublePoint temp;
-
-      rows_ = height;
-      columns_ = width;
-      
-      // Convert the angle into radians
-      double rotrad = angle_ * Math.PI / (double)180.0;
-      
-      // Compute the corner points after rotation
-      double center_x = (double)(columns_ - 1) / (double)2.0;
-      double center_y = (double)(rows_ - 1) / (double)2.0;
-      
-      // The new top left corner
-      temp = rotatePoint(0, 0, center_x, center_y, rotrad);
-      int rtl_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rtl_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new top right corner
-      temp = rotatePoint(0, rows_, center_x, center_y, rotrad);
-      int rtr_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rtr_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new bottom left corner
-      temp = rotatePoint(columns_, 0, center_x, center_y, rotrad);
-      int rbl_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rbl_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new bottom right corner
-      temp = rotatePoint(columns_, rows_, center_x, center_y, rotrad);
-      int rbr_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rbr_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-
-      //System.out.println(" ( " + center_x + "," + center_y + " ) ");
-      //System.out.println(" ( " + rtl_x + "," + rtl_y + " ) ");
-      //System.out.println(" ( " + rtr_x + "," + rtr_y + " ) ");
-      //System.out.println(" ( " + rbr_x + "," + rbr_y + " ) ");
-      //System.out.println(" ( " + rbl_x + "," + rbl_y + " ) ");       
-      
-      // rotated bounding box
-      int rbbx1, rbby1;
-      int rbbx = rbbx1 = rtl_x;
-      int rbby = rbby1 = rtl_y;
-      
-      if (rtr_x < rbbx) rbbx = rtr_x;
-      if (rtr_x > rbbx1) rbbx1 = rtr_x;
-      if (rtr_y < rbby) rbby = rtr_y;
-      if (rtr_y > rbby1) rbby1 = rtr_y;
-      
-      if (rbl_x < rbbx) rbbx = rbl_x;
-      if (rbl_x > rbbx1) rbbx1 = rbl_x;
-      if (rbl_y < rbby) rbby = rbl_y;
-      if (rbl_y > rbby1) rbby1 = rbl_y;
-      
-      if (rbr_x < rbbx) rbbx = rbr_x;
-      if (rbr_x > rbbx1) rbbx1 = rbr_x;
-      if (rbr_y < rbby) rbby = rbr_y;
-      if (rbr_y > rbby1) rbby1 = rbr_y;
-      
-      int rbbw = rbbx1 - rbbx;
-      int rbbh = rbby1 - rbby;
-
-      //System.out.println("(rbbx, rbby): " + rbbx + " " + rbby);
-      //System.out.println("(rbbx1, rbby1): " + rbbx1 + " " + rbby1);
-      //System.out.println("(rbbw, rbbh): " + rbbw + " " + rbbh);
-
-      
-      //rbbx--; rbby--; rbbw+=2; rbbh+=2;
-
-      
-      // Ensure we haven't increased the size of the image
-
-      /*
-      int x = rbbx + rbbw - 1, y = rbby + rbbh - 1;
-      if (rbbx < 0) rbbx = 0;
-      if (rbbx > columns_ - 1 ) rbbx = columns_ - 1;
-      if (rbby < 0) rbby = 0;
-      if (rbby > rows_ - 1) rbby = rows_ - 1;
-      */
-      
-      /*
-      
-      if (x < 0) x = 0;
-      if (x > columns_ - 1) x = columns_ - 1;
-      if (y < 0) y = 0;
-      if (y > rows_ - 1) y = rows_ - 1;
-
-      if (x < rbbx) x = rbbx;
-      if (y < rbby) y = rbby;
-      rbbw = (x - rbbx) + 1;
-      rbbh = (y - rbby) + 1;
-
-      */
-      
-      rotx_ = rbbx;
-      roty_ = rbby;
-      rotheight_ = rbbh;
-      rotwidth_ = rbbw;
-
-      //System.out.println("(rotx,roty): " + rotx_ + " " +
-      //		 roty_);
-      //System.out.println("(rotwidth,rotheight): " + rotwidth_ + " " +
-      //		 rotheight_);
-      //System.out.println("(columns,rows): " + columns_ +
-      //		 " " + rows_);
-	    
-      
-      raster_ = new int[columns_*rows_];
-      consumer.setDimensions(rotwidth_, rotheight_);
-    }
-
-  
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error: " + status);
-	return;
-      }
-
-    // For each pixel in the dimensions of the rotated image, if the
-    // inverse rotation falls in the bounds of the original image. If
-    // it does, compute and store an appropriate color, otherwise skip
-    // it.
-
-    System.gc();
-    
-    double xf, yf, px, py, apx, apy;
-    int[] pixels = new int[rotwidth_*rotheight_];
-    int ox, oy, ox1, oy1, index, pixel;
-    double cx = (columns_ - 1) / 2;
-    double cy = (rows_ - 1) / 2;
-    double rotrad = angle_ * Math.PI / 180.0, ang, d;
-    int p0r = 0, p0g = 0, p0b = 0,
-      p1r = 0, p1g = 0,p1b = 0,
-      p2r = 0, p2g = 0, p2b = 0,
-      p3r = 0, p3g = 0, p3b = 0, lcv, lcv2;
-    int rv,gv,bv, alpha;
-    double rd,gd,bd, p0wgt = 0,
-      p1wgt = 0, p2wgt = 0, p3wgt = 0, xfrac, yfrac;
-
-    profile_timer_.start();
-
-    lcv = roty_ + rotheight_;
-    lcv2 = rotx_ + rotwidth_;
-    for (int y = roty_, i = 0; y < lcv; y++)
-      {
-	for (int x = rotx_; x < lcv2; x++, i++)
-	  {
-	    // Inverse rotate the point (x,y)
-	    // Inlining the call to rotatePoint
-	    xf = (double)x;
-	    yf = (double)y;
-	    d = Math.sqrt((xf - cx) * (xf - cx) + (yf - cy) * (yf - cy));
-	    
-	    if ((xf - cx) != 0.0)
-	      {
-		ang = Math.atan((cy-yf)/(xf-cx));
-		if ((xf - cx) < 0)
-		  ang += Math.PI;
-	      }
-	    else
-	      {
-		if ((yf - cy) > 0.0)
-		  ang = (Math.PI * 3.0) / 2;
-		else
-		  ang = Math.PI / 2;
-	      }
-
-	    xf = cx + (d * Math.cos(ang - rotrad));
-	    yf = cy - (d * Math.sin(ang - rotrad));
-	    // end inline
-	    
-	    // Cheat a little
-	    if (xf < 0.0 && xf > -0.5) xf = 0.0;
-	    if (yf < 0.0 && yf > -0.5) yf = 0.0;
-
-	    ox = (int)Math.floor(xf);
-	    oy = (int)Math.floor(yf);
-
-	    if ((ox >= 0) && (oy >= 0) &&
-		(ox < columns_) && (oy < rows_) )
-	      {
-		// The color will be a linear combination of the colors of
-		// the center pixel, its left or right neighbor, its top
-		// or bottom neighbor, and its corner neighbor. Which
-		// neighbors are used is determined by the position of
-		// the fractional part of xf, xy within the 1-unit square
-		// of the pixel.
-
-		/* compute px,py: fractional offset from center of pixel (x.5,y.5) */
-		xfrac = xf - ox;        /* 0 - .9999 */
-		yfrac = yf - oy;
-		px = ((xfrac >= .5) ? (xfrac - .5) : (-.5 + xfrac));
-		py = ((yfrac >= .5) ? (yfrac - .5) : (-.5 + yfrac));
-		apx = ((px < 0) ? -px : px);
-		apy = ((py < 0) ? -py : py);
-		
-		/* get neighbor colors:  p0col, p1col, p2col, p3col */
-		ox1 = ox + ((px < 0.0) ? -1 : 1);
-		oy1 = oy + ((py < 0.0) ? -1 : 1);
-
-		index = oy * columns_ + ox;
-		pixel = raster_[index];
-		alpha = (pixel >> 24) & 0xff;
-		p0r = (pixel >> 16) & 0xff;
-		p0g = (pixel >> 8) & 0xff;
-		p0b = pixel & 0xff;
-
-		if (ox1 >= 0 && ox1 < columns_)
-		  {
-		    index = oy*columns_ + ox1;
-		    pixel = raster_[index];
-		    p1r = (pixel >> 16) & 0xff;
-		    p1g = (pixel >> 8) & 0xff;
-		    p1b = pixel & 0xff;
-		    p1wgt = apx * (1.0 - apy);
-		  }
-		else { p1r=p1g=p1b=0;  p1wgt = 0.0; }
-		
-		if (oy1 >= 0 && oy1 < rows_)
-		  {
-		    index = oy1*columns_ + ox;
-		    pixel = raster_[index];
-		    p2r = (pixel >> 16) & 0xff;
-		    p2g = (pixel >> 8) & 0xff;
-		    p2b = pixel & 0xff;
-		    p2wgt = apx * (1.0 - apy);
-		  }
-		else { p2r=p2g=p2b=0;  p2wgt = 0.0; }
-		
-		if (ox1 >= 0 &&  ox1 < columns_ &&
-		    oy1 >= 0 && oy1 < rows_)
-		  {
-		    index = oy1 * columns_ + ox1;
-		    pixel = raster_[index];
-		    p3r = (pixel >> 16) & 0xff;
-		    p3g = (pixel >> 8) & 0xff;
-		    p3b = pixel & 0xff;
-		    p3wgt = apx * (1.0 - apy);
-		  }
-		else { p3r=p3g=p3b=0;  p3wgt = 0.0; }
-
-		p1wgt = p1wgt * .7;        /* black art */
-		p2wgt = p2wgt * .7;
-		p3wgt = p3wgt * .7;
-		
-		p0wgt = 1.0 - (p1wgt + p2wgt + p3wgt);
-		
-		/* okay, compute and store resulting color */
-		rd = p0r * p0wgt + p1r * p1wgt + p2r * p2wgt + p3r * p3wgt;
-		gd = p0g * p0wgt + p1g * p1wgt + p2g * p2wgt + p3g * p3wgt;
-		bd = p0b * p0wgt + p1b * p1wgt + p2b * p2wgt + p3b * p3wgt;
-		
-		rv = (int) (rd + 0.5);
-		gv = (int) (gd + 0.5);
-		bv = (int) (bd + 0.5);
-		
-		if (rv < 0) rv = 0;
-		if (gv < 0) gv = 0;
-		if (bv < 0) bv = 0 ;
-		
-		if (rv > 255) rv = 255;
-		if (gv > 255) gv = 255;
-		if (bv > 255) bv = 255;
-
-		pixels[i] = (alpha << 24) | (rv << 16) | (gv << 8) | bv;
-	      }	       
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, rotwidth_, rotheight_, defaultRGB_,
-		       pixels, 0, rotwidth_);
-
-    consumer.imageComplete(status);
-  }
-
-  private final static DoublePoint rotatePoint(int x, int y,
-				  double cx, double cy, double rad)
-    {
-      /* rotate point x, y 'rad' radians around cx, cy, return rx, ry */
-      double d, xf, yf, ang, rx, ry;
-
-      xf = (double)x;
-      yf = (double)y;
-
-      // d = distance from the point to the center
-      d = Math.sqrt((xf - cx) * (xf - cx) + (yf - cy) * (yf - cy));
-
-      if ((xf - cx) != 0.0)
-	{
-	  // Compute the angle between the axis and the point in radians
-	  // using the inverse tangent function.
-	  ang = Math.atan((cy-yf)/(xf-cx));
-
-	  // If the x value falls below the axis the angle is between
-	  // PI and 2*PI.
-	  if ((xf - cx) < 0)
-	    ang += Math.PI;
-	}
-      else
-	{
-	  // The point is on the positive y-axis so its angle is 3/2*PI
-	  // I'm guessing this the cooridnate system is flipped in
-	  // screen graphics.
-	  if ((yf - cy) > 0.0)
-	    ang = (Math.PI * 3.0) / 2;
-	  else
-	    ang = Math.PI / 2;
-	}
-
-      rx = cx + (d * Math.cos(ang + rad));
-      ry = cy - (d * Math.sin(ang + rad));
-      
-      return new DoublePoint(rx, ry);
-    }
-}
-
-class DoublePoint
-{
-  public double x_;
-  public double y_;
-
-  DoublePoint(double x, double y)
-    {
-      x_ = x;
-      y_ = y;
-    }
-}
diff --git a/java/ImageProcessing/filters/SharpenFilter.java b/java/ImageProcessing/filters/SharpenFilter.java
deleted file mode 100644
index fcb6f03c7ac..00000000000
--- a/java/ImageProcessing/filters/SharpenFilter.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package imaging.filters;
-
-import java.awt.Color;
-import java.awt.image.*;
-import java.util.*;
-
-public class SharpenFilter extends SpatialFilter
-{
-  float percentage_ = (float)75.0;
-  
-  public SharpenFilter()
-    {
-    }
-  
-  public SharpenFilter(float percentage)
-    {
-      percentage_ = percentage;
-    }
-  
-  public String info ()
-    {
-      return "Sharpens an image.";
-    }
-
-
-  public void imageComplete(int status) 
-    {
-      System.out.println("Image Complete called"); 
-    
-      if (status == IMAGEERROR || status == IMAGEABORTED)  
-	{
-	  consumer.imageComplete(status);  
-	  System.out.println("Image Error"); 
-	  return; 
-	}
-
-      System.gc();
-      
-      float[] hsv = new float[3];
-      int rgb, red, green, blue;
-      int pixel, alpha, lcv, lcv2, lcv3;
-      int[] pixels = new int[columns_*rows_];
-      float fact, ifact, hue, sat, val, vsum;
-      float[] line0 = new float[columns_], 
-	linep1 = new float[columns_],
-	linem1 = new float[columns_],
-	tmpptr;
-      
-      profile_timer_.start();
-      
-      for (int z = 0; z < SpatialFilter.iterations_; z++)
-	{          
-	  fact = percentage_/(float)100.0;
-	  ifact = (float)1.0 - fact;
-	  
-	  for (int x = 0; x < columns_; x++)
-	    {
-	      pixel = raster_[x];
-	      hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff),hsv);
-	      line0[x] = hsv[2];
-	    }
-	  
-	  lcv = columns_ << 1;
-	  for (int x = columns_, index = 0; x < lcv; x++, index++)
-	    {
-	      pixel = raster_[x];
-	      hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff),hsv);
-	      linep1[index] = hsv[2];
-	    }
-	  
-	  lcv = columns_ - 1;
-	  lcv2 = rows_ - 1;
-	  for (int y = 1, i = columns_; y < lcv2; y++)
-	    {
-	      tmpptr = linem1;
-	      linem1 = line0;
-	      line0 = linep1;
-	      linep1 = tmpptr;
-	      
-	      lcv3 = columns_*(y+2);
-	      for (int x = columns_*(y+1), index= 0; x < lcv; x++, index++)
-		{
-		  pixel = raster_[x];
-		  // Note hsv is only instantiated once
-		  hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff), hsv);
-		  linep1[index] = hsv[2];			   
-		}
-	      
-	      i++;
-	      for (int x = 1; x < lcv; x++, i++)
-		{
-		  vsum = (float)0.0;
-		  vsum = linem1[x-1] + linem1[x] + linem1[x+1] +
-		    line0[x-1] + line0[x] + line0[x + 1] + 
-		    linep1[x-1] + linep1[x] + linep1[x + 1];
-		  
-		  pixel = raster_[i];
-		  alpha = (pixel >> 24) & 0xff;
-		  hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff), hsv);
-		  
-		  val = ((hsv[2] - (fact * vsum) / 9) / ifact);	      
-		  if (val < 1.0)
-		    {
-		      if (val < 0.0)
-			val = (float)0.0;
-		    }
-		  else
-		    val = (float)1.0;
-		  
-		  hsv[2] = val;
-		  rgb = getRGB(hsv[0], hsv[1], hsv[2]);
-		  
-		  red = (rgb >> 16) & 0xff;
-		  green = (rgb >> 8) & 0xff;
-		  blue = rgb & 0xff;
-		  
-		  if (red < 0) red = 0;
-		  if (green < 0) green = 0;
-		  if (blue < 0) blue = 0 ;
-		  
-		  if (red > 255) red = 255;
-		  if (green > 255) green = 255;
-		  if (blue > 255) blue = 255;
-		  
-		  pixels[i] =
-		    (alpha << 24) | (red << 16) | (green << 8) | blue;
-		}
-	      i++;
-	    }
-	}
-      
-      profile_timer_.stop();
-
-      consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-      
-      System.out.println("Finished altering image");
-      consumer.imageComplete(status);
-    }
-  
-  
-  static private float[] getHSV(int red, int green, int blue, float[] hsv)
-    {
-      float rd, gd, bd, max, min, del, rc, gc, bc, hue, sat;
-      if (hsv == null)
-	hsv = new float[3];
-      
-      /* convert RGB to HSV */ 
-      rd = red / (float)255.0;            /* rd,gd,bd range 0-1 instead of 0-255 */
-      gd = green / (float)255.0; 
-      bd = blue / (float)255.0; 
-
-      /* compute maximum of rd,gd,bd */
-      if (rd >= gd)
-	{
-	  if (rd >= bd)
-	    max = rd;
-	  else
-	    max = bd;
-	}
-      else
-	{
-	  if (gd >= bd)
-	    max = gd;
-	  else
-	    max = bd;
-	}
-      
-      /* compute minimum of rd,gd,bd */
-      if (rd<=gd)
-	{
-	  if (rd<=bd)
-	    min = rd;
-	  else
-	    min = bd;
-	}
-      else 
-	{
-	  if (gd<=bd)
-	    min = gd;
-	  else
-	    min = bd;
-	}
-
-      del = max - min;
-      hsv[2] = max;
-
-      if (max != 0.0)
-	sat = (del) / max;
-      else
-	sat = (float)0.0;
-      
-      hue = -1;
-      
-      if (sat != 0.0)
-	{
-	  rc = (max - rd) / del;
-	  gc = (max - gd) / del;
-	  bc = (max - bd) / del;
-
-	  if (rd == max)
-	    hue = bc - gc;
-	  else
-	    if (gd == max)
-	      hue = 2 + rc - bc;
-	    else
-	      if (bd == max)
-		hue = 4 + gc - rc;
-
-	  hue *= 60;
-	  if (hue<0)
-	    hue += 360;
-	}
-
-      hsv[0] = hue;
-      hsv[1] = sat;
-      return hsv;
-    }
-
-  static private int getRGB(float hue, float sat, float val)
-    {
-      int    j, r, g, b;
-      float rd, gd, bd;
-      float f, p, q, t;
-      
-      /* convert HSV back to RGB */
-      if (hue == -1 || sat == 0.0)
-	{
-	  rd = val;  gd = val;  bd = val;
-	}
-      else
-	{
-	  if (hue==(float)360.0) hue = (float)0.0;
-	  hue = hue / (float)60.0;
-	  j = (int) hue;
-	  if (j<0) j=0;          /* either hue or floor seem to go neg on some sys */
-	  f = hue - j;
-	  p = val * (1-sat); // val - sat* val
-	  q = val * (1 - (sat*f)); // val - val*sat*f
-	  t = val * (1 - (sat*(1 - f)));
-	  
-	  switch (j) {
-	  case 0:  rd = val;  gd = t;  bd = p;  break;
-	  case 1:  rd = q;  gd = val;  bd = p;  break;
-	  case 2:  rd = p;  gd = val;  bd = t;  break;
-	  case 3:  rd = p;  gd = q;  bd = val;  break;
-	  case 4:  rd = t;  gd = p;  bd = val;  break;
-	  case 5:  rd = val;  gd = p;  bd = q;  break;
-	  default: rd = val;  gd = t;  bd = p;  break;  /* never happen */
-	  }
-	}
-      r = (int)(rd * 255.0 + 0.5);
-      g = (int)(gd * 255.0 + 0.5);
-      b = (int)(bd * 255.0 + 0.5);
-      
-      return 0xff000000 | (r << 16) | (g << 8) | b;
-    }
-}  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/ImageProcessing/filters/SpatialFilter.java b/java/ImageProcessing/filters/SpatialFilter.java
deleted file mode 100644
index ad56164819e..00000000000
--- a/java/ImageProcessing/filters/SpatialFilter.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import JACE.Timers.ProfileTimer;
-
-public class SpatialFilter extends ImageFilter implements MedFilter
-{
-  public SpatialFilter()
-  {
-  }
-  
-  public SpatialFilter(int[][] matrix, int degree)
-  {
-    this(matrix, degree, 1, 0);
-  }
-  
-  public SpatialFilter(int[][] matrix, int degree, int div_factor, int offset)
-  {
-    matrix_ = matrix;
-    div_factor_ = div_factor;
-    offset_ = offset;
-    degree_ = degree;
-  }
-
-  public void setFilter(int[][] matrix, int degree, int div_factor)
-    {
-      matrix_ = matrix;
-      degree_ = degree;
-      div_factor_ = div_factor;
-    }
-  
-  public String info ()
-  {
-    return "Base Filter class. Doesn't do much";
-  }
-
-  public long filterTime()
-    {
-      return profile_timer_.elapsedTime();
-    }
-
-  public static void setTimer(int internal_iterations)
-    {
-      iterations_ = internal_iterations;
-    }
-  
-  public void setDimensions(int width, int height)
-  {
-    rows_ = height;
-    columns_ = width;
-    raster_ = new int[width * height];
-    consumer.setDimensions(width, height);
-  }
-  
-  public void setPixels(int x, int y, int w, int h, ColorModel model,
-                          byte pixels[], int off, int scansize)
-  {
-    int source_offset = off;
-    int dest_offset = y * columns_ + x;
-
-    for (int y_ind = 0; y_ind < h; y_ind++)
-      {
-	for (int x_ind = 0; x_ind < w; x_ind++)
-	  {
-	    raster_[dest_offset] = model.getRGB(pixels[source_offset] & 0xff);
-	    dest_offset++;
-	    source_offset++;
-	  }
-
-	source_offset += (scansize - w);
-	dest_offset += (columns_ - w);
-      }
-  }
-
-  public void setPixels(int x, int y, int w, int h, ColorModel model,
-                          int pixels[], int off, int scansize)
-  {
-    int source_offset = off;
-    int dest_offset = y * columns_ + x;
-    
-    if (model == defaultRGB_)
-      {
-	for (int yc = 0; yc < h; yc++)
-	  {
-	    System.arraycopy(pixels, source_offset, raster_, dest_offset, w);
-	    source_offset += scansize;
-	    dest_offset += columns_;
-	  }
-      }
-    else
-      {
-
-	for (int yc = 0; yc < h; yc++)
-	  {
-	    for (int xc = 0; xc < w; xc++)
-	      {
-		raster_[dest_offset] = model.getRGB(pixels[source_offset]);
-		dest_offset++;
-		source_offset++;
-	      }
-	    source_offset += (scansize - w);
-	    dest_offset += (columns_ - w);
-	  }
-      }
-  }
-  
-  public void setColorModel(ColorModel model)
-  {
-    consumer.setColorModel(defaultRGB_);
-  }
-
-  public void setHints(int hintflags)
-  {
-    consumer.setHints(TOPDOWNLEFTRIGHT
-		      | COMPLETESCANLINES
-		      | SINGLEPASS
-		      | (hintflags & SINGLEFRAME));
-  }
-
-
-  public void imageComplete(int status)
-  {
-    System.out.println("Image Complete called");
-    
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-    
-    int[] pixels = new int[columns_];
-    int[][] new_raster= expandRaster();
-    int pixel = 0;
-    int red, green, blue;
-    int new_red = 0, new_green = 0, new_blue = 0;
-    int alpha;
-
-    for (int x = raster_offset_; x < rows_; x++)
-      {
-	for (int y = raster_offset_; y < columns_; y++)
-	  {
-	    new_red = 0; new_green = 0; new_blue = 0;
-	    alpha = defaultRGB_.getAlpha(new_raster[x][y]);
-	    for (int i = 0; i < degree_; i++)
-	      {
-		for (int j = 0; j < degree_; j++)
-		  {
-		    pixel = new_raster[x + (i - raster_offset_)][y + (j - raster_offset_)];
-		    
-		    red = defaultRGB_.getRed(pixel) * matrix_[i][j];
-		    blue = defaultRGB_.getBlue(pixel) * matrix_[i][j];
-		    green = defaultRGB_.getGreen(pixel) * matrix_[i][j];
-		    
-		    new_red += red;
-		    new_green += green;
-		    new_blue += blue;
-		  }
-	      }
-	    
-	    new_red /= div_factor_;
-	    new_green /= div_factor_;
-	    new_blue /= div_factor_;
-	    
-	    new_red = Math.min(Math.abs(new_red), 255);
-	    new_green = Math.min(Math.abs(new_green), 255);
-	    new_blue = Math.min(Math.abs(new_blue), 255);
-
-	    pixels[y - raster_offset_] =
-	      (alpha << 24) | (new_red << 16) | (new_green << 8) | new_blue;
-	  }
-	
-	consumer.setPixels(0, x - raster_offset_, columns_, 1, defaultRGB_, pixels, 0, columns_);
-      }
-
-    System.out.println("Finished altering image");
-    consumer.imageComplete(status);
-  }
-
-  protected int[][] expandRaster()
-  {
-    int[][] new_raster;
-    int index = 0;
-
-    raster_offset_ = degree_ / 2;
-    new_raster = new int[rows_ + raster_offset_*2][columns_ + raster_offset_*2];
-    
-    for (int x = 0; x < rows_; x++)
-      {
-	for (int y = 0; y < columns_; y++)
-	  {
-	    new_raster[x + raster_offset_][y + raster_offset_] = raster_[index];
-	    index++;
-	  }
-      }
-
-    return new_raster;
-  }
-
-  protected static final int intensity(int rd, int gn, int bl)
-    {
-      return (((int)(rd)*11 + (int)(gn)*16 + (int)(bl)*5) >> 5);
-    }
-
-  protected static int iterations_ = 1;
-  protected static final  ColorModel defaultRGB_ = ColorModel.getRGBdefault();
-  protected int[][] matrix_;
-  protected int[] raster_;
-  protected int rows_ = 0, columns_ = 0;
-  protected int div_factor_ = 1, offset_, degree_;
-  protected int raster_offset_ = 0;
-  protected final ProfileTimer profile_timer_ = new ProfileTimer();
-}
diff --git a/java/ImageProcessing/filters/SpreadFilter.java b/java/ImageProcessing/filters/SpreadFilter.java
deleted file mode 100644
index c78790c9235..00000000000
--- a/java/ImageProcessing/filters/SpreadFilter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import java.util.Random;
-
-public class SpreadFilter extends SpatialFilter
-{
-  private int pwidth_ = 5;
-  private int pheight_ = 5;
-
-  public SpreadFilter()
-    {
-    }
-  
-  public SpreadFilter(int pwidth, int pheight)
-    {
-      pwidth_ = pwidth;
-      pheight_ = pheight;
-    }
-
-  public String info ()
-  {
-    return "Spreads an image (an effect of being under water).";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Spread Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    Random rand = new Random();
-    int[] pixels = new int[columns_*rows_];
-    int d, dx, dy, x1, y1, xrng, xoff, yrng, yoff;
-    int minx, maxx, miny, maxy, rdist, tmp;
-
-    profile_timer_.start();
-
-    for (int z = 0; z < SpatialFilter.iterations_; z++)
-      {    
-	for (int y = 0, i=0; y < rows_; y++)
-	  {
-	    for (int x = 0; x < columns_; x++, i++)
-	      {
-		if (pwidth_ < 0)
-		  {
-		    d = (pwidth_ < 0 ? -pwidth_ : pwidth_);
-		    
-		    minx = x - d;
-		    if (minx < 0)
-		      minx = 0;
-		    
-		    maxx = x + d;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    x1 = minx + tmp % ((maxx - minx) + 1);
-		    
-		    miny = y - d;
-		    if (miny < 0)
-		      miny = 0;
-		    
-		    maxy = y + d;
-		    if (maxy >= rows_)
-		      maxy = rows_ - 1;
-		    
-		    rdist = d - (x1 < x ? -(x1 - x) : x1 - x);
-		    if (y - miny > rdist)
-		      miny = (y - rdist);
-		    if (maxy - y > rdist)
-		      maxy = (y + rdist);
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    y1 = miny + tmp % ((maxy - miny) + 1);
-		  }
-		else
-		  {
-		    minx = x - pwidth_;
-		    if (minx < 0)
-		      minx = 0;
-		    
-		    maxx = x + pwidth_;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    x1 = minx + tmp % ((maxx - minx) + 1);
-		    
-		    miny = y - pheight_;
-		    if (miny < 0)
-		      miny = 0;
-		    
-		    maxy = y + pheight_;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    y1 = miny + tmp % ((maxy - miny) + 1);
-		  }
-		
-		if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-		  {
-		    int pixel = raster_[i];
-		    int alpha = (pixel >> 24) & 0xff;
-		    int red = (pixel >> 16) & 0xff;
-		    int green = (pixel >> 8) & 0xff;
-		    int blue = pixel & 0xff;
-		    
-		    pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-		  }
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/Timer.java b/java/ImageProcessing/filters/Timer.java
deleted file mode 100644
index 609ec8aa366..00000000000
--- a/java/ImageProcessing/filters/Timer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package imaging.filters;
-
-public class Timer
-{
-  long start_time_;
-  long stop_time_;
-  
-  public void start()
-  {
-    start_time_ = System.currentTimeMillis();
-  }
-
-  public void stop()
-  {
-    stop_time_ = System.currentTimeMillis();
-  }
-
-  public String toString()
-  {
-    long total = stop_time_ - start_time_;
-    return "Total Time:" + total + " ms";
-  }
-}
diff --git a/java/ImageProcessing/framework/BaseButton.java b/java/ImageProcessing/framework/BaseButton.java
deleted file mode 100644
index 794670b2f3f..00000000000
--- a/java/ImageProcessing/framework/BaseButton.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import imaging.filters.*;
-
-public class BaseButton extends Panel
-{
-  public BaseButton (String title, String description, ImageApp parent)
-  {
-    this.setLayout (new BorderLayout ());
-    this.button_ = new Button (title);
-    this.add ("Center", this.button_);
-    this.resize (100, 100);
-    this.description_ = description;
-    this.parent_ = parent;
-  }
-
-  public boolean mouseEnter(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus (this.description_);
-    return true;
-  }
-
-  public boolean mouseExit(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus ("");
-    return true;
-  }
-
-  protected ImageApp parent_;
-  private String description_;
-  private Button button_;
-}
-
-class URLDialogButton extends BaseButton
-{
-  public URLDialogButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-    this.openURLFrame_ = new LoadURLFrame ("Open URL <2>", this.parent_);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.openURLFrame_.show ();
-    return true;
-  }
-  private LoadURLFrame openURLFrame_;
-}
-
-// ******************
-// Should continue to remember the password
-// ******************
-class SaveButton extends BaseButton
-{
-  public SaveButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-    this.openURLFrame_ = new SaveURLFrame ("Save Image <2>", this.parent_);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.openURLFrame_.show ();
-    return true;
-  }
-  private SaveURLFrame openURLFrame_;
-}
-
-class ReloadButton extends BaseButton
-{
-  public ReloadButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.reloadFilters ();
-    return true;
-  }
-}
-
-class ApplyButton extends BaseButton
-{
-  public ApplyButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.apply ();
-    return true;
-  }
-}
-
-class ResetButton extends BaseButton
-{
-  public ResetButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.resetImage ();
-    return true;
-  }
-}
-
-class ZoomInButton extends BaseButton
-{
-  public ZoomInButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.zoomFactor (1.6);
-    return true;
-  }
-}
-
-class ZoomOutButton extends BaseButton
-{
-  public ZoomOutButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.zoomFactor (0.625);
-    return true;
-  }
-}
-
-
-class AboutButton extends BaseButton
-{
-  public AboutButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    DialogManager.popDialog (DialogType.ABOUT, null);
-    return true;
-  }
-}
-
-class HelpButton extends BaseButton
-{
-  public HelpButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    DialogManager.popDialog (DialogType.HELP, null);
-    return true;
-  }
-}
-
-class ChoicePanel extends Panel
-{
-  public ChoicePanel (String desc, ImageApp parent)
-  {
-    this.description_ = desc;
-    this.parent_ = parent;
-
-    this.loadFilters ();
-    // Set the layout of the Choice Panel. Note that the Choice Panel
-    // holds the choice button of filters.
-    this.setLayout (new FlowLayout ());
-    this.resize (150, 100);
-  }
-
-  public void choice (Choice choice)
-  {
-    this.choice_ = choice;
-  }
-
-  public Choice choice ()
-  {
-    return this.choice_;
-  }
-
-  public void loadFilters ()
-  {
-    // First remove all components of the panel including the
-    // choices of filters
-    this.removeAll ();
-
-    // Now create new choices
-    this.choice_ = this.parent_.getFilters ();
-
-    // Add the choices to our choice panel
-    this.add (this.choice_);
-  }
-
-  public boolean mouseEnter(Event evt, int x, int y)
-  {
-    MedFilter filter = null;
-    String displayString = null;
-    String filterName = this.choice_.getSelectedItem ();
-
-    if (filterName.compareTo ("Filters:") == 0)
-      displayString = "No filter selected";
-    else
-      {
-	filter = (MedFilter) this.parent_.getFilter (filterName);
-	displayString = filter.info ();
-      }
-    this.parent_.displayStatus (displayString);
-    //    this.parent_.displayStatus (this.description_);
-    return true;
-  }
-
-  public boolean mouseExit(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus ("");
-    return true;
-  }
-  
-  private Choice choice_;
-  private ImageApp parent_;
-  String description_;
-}
-
diff --git a/java/ImageProcessing/framework/BenchmarkApplet.java b/java/ImageProcessing/framework/BenchmarkApplet.java
deleted file mode 100644
index ac125a1d9de..00000000000
--- a/java/ImageProcessing/framework/BenchmarkApplet.java
+++ /dev/null
@@ -1,622 +0,0 @@
-package imaging.framework;
-
-import JACE.Timers.ProfileTimer;
-import imaging.filters.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.applet.*;
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import gjt.*;
-
-public class BenchmarkApplet extends Applet implements Runnable
-{
-  public static final Font GLOBAL_FONT = new Font("Dialog", Font.BOLD, 10);
-  private static final String NEW_LINE = System.getProperty("line.separator");
-  private static final String WELCOME = "Welcome to MedJava Image Processing Benchmarking Tool";
-  private static final String COPYRIGHT = "(c) 1997 Distributed Object Computing Group, Washington Univesity";
-  private static final String ABORT = "Image Processing Tests Aborted";
-  private static final String STOP = "Stop";
-  private static final String START= "Start";
-  private static final String CLEAR= "Clear";
-  private static final String RANDOM= "Create Random Image";
-  private static final int INTERNAL_ITERATIONS = 10;
-  private static final int TRIALS = 1;
-  
-  private List images_, filters_;
-  private TextArea console_;
-  private TextField new_image_;
-  private Button start_button_;
-  private Button stop_button_;
-  private Button clear_button_;
-  private Button random_button_;
-  private ButtonPanel button_panel_ = new ButtonPanel();
-  private Hashtable filter_table_ = new Hashtable();
-  private Hashtable image_table_ = new Hashtable();
-  private Thread benchmarker_;
-  private long elapsed_time_;
-  private SpatialFilter filter_;
-  private Object monitor_ = new Object();
-  
-  public void init()
-    {
-      Panel control_panel = new Panel();
-      Panel sub_panel1 = new Panel();
-      Panel filter_panel = new Panel();
-      Panel image_panel = new Panel();
-      Label image_panel_label = new Label("Images");
-      Label filter_panel_label = new Label("Filters");
-
-      new_image_ = new TextField();
-      console_ = new TextArea();
-      images_ = new List();
-      filters_ = new List();
-
-      console_.setEditable(false);
-      images_.setMultipleSelections(true);
-      filters_.setMultipleSelections(true);
-      console_.setFont(GLOBAL_FONT);
-      images_.setFont(GLOBAL_FONT);
-      filters_.setFont(GLOBAL_FONT);
-      image_panel_label.setFont(GLOBAL_FONT);
-      filter_panel_label.setFont(GLOBAL_FONT);
-      
-      console_.appendText(WELCOME + NEW_LINE);
-      console_.appendText(COPYRIGHT + NEW_LINE);
-      
-      image_panel.setLayout(new BorderLayout());
-      image_panel.add("North", image_panel_label);
-      image_panel.add("Center", images_);
-      image_panel.add("South", new_image_);
-
-      filter_panel.setLayout(new BorderLayout());
-      filter_panel.add("North", filter_panel_label);
-      filter_panel.add("Center", filters_);
-
-      sub_panel1.setLayout(new GridLayout(1, 2, 5, 5));
-      sub_panel1.add(filter_panel);
-      sub_panel1.add(image_panel);
-
-      control_panel.setLayout(new GridLayout(2, 1, 5, 5));
-      control_panel.add(sub_panel1);
-      control_panel.add(console_);
-      
-      setLayout(new BorderLayout());
-
-      stop_button_ = button_panel_.add(STOP);
-      start_button_ = button_panel_.add(START);
-      clear_button_ = button_panel_.add(CLEAR);
-      random_button_ = button_panel_.add(RANDOM);
-
-      stop_button_.disable();
-      add("Center", control_panel);
-      add("South", button_panel_);
-
-      getFilters();
-      getImages();      
-    }
-  
-  synchronized public void run()
-    {
-      Image image;
-      String image_name, filter_name;
-      int image_height, image_width;
-      String[] image_list = images_.getSelectedItems();
-      String[] filter_list = filters_.getSelectedItems();
-      ImageProducer image_source;
-      FilteredImageSource filtered_image;
-      //      BenchmarkFrame bframe = BenchmarkFrame.instance();
-      
-      double cumulative_time;
-      double best_time;
-
-      SpatialFilter.setTimer(INTERNAL_ITERATIONS);
-      console_.appendText(NEW_LINE);
-      console_.appendText("Benchmark tests:  [mem=" +
-			  Runtime.getRuntime().freeMemory() +"/" +
-			  Runtime.getRuntime().totalMemory() +"]"
-			  + NEW_LINE);
-      
-      for (int i = 0; i < image_list.length; i++)
-	{
-
-	  image_name = image_list[i];
-	  image = (Image)image_table_.get(image_name);
-	  
-	  image_width = image.getWidth(this);
-	  image_height = image.getHeight(this);
-	  
-	  console_.appendText("Begining tests for image " + image_name);
-	  console_.appendText(" (size " + image_width + "x" + image_height +
-			      " = " +  image_height*image_width*4 + " bytes )");
-	  console_.appendText(NEW_LINE);
-
-	  console_.appendText(NEW_LINE + " ********** " + NEW_LINE);
-	  //	  bframe.init("Begining tests for image " + image_name, image, image_width, image_height);
-
-	  //	  if (! bframe.isShowing())
-	  //	    bframe.show();
-	  
-	  for (int j = 0; j < filter_list.length; j++)
-	    {
-	      filter_name = filter_list[j];
-	      filter_ = (SpatialFilter)filter_table_.get(filter_name);
-
-	      if (filter_ == null)
-		System.err.println(filter_name + " is null");
-	      
-	      best_time = Double.MAX_VALUE;
-	      cumulative_time = 0;
-	      image_source = image.getSource();
-	      filtered_image = new FilteredImageSource(image.getSource(), filter_);
-
-	      for (int l = 0; l < TRIALS; l++)
-		{
-		  elapsed_time_ = 0;
-		  prepareImage(createImage(filtered_image), this);
-
-		  try
-		    {
-		      //		      synchronized(monitor_)
-		      //			{
-			  while (elapsed_time_ == 0)
-			    {
-			      System.out.println("Waiting for image loading to complete.");
-			      //			      monitor_.wait();
-			      wait();
-			    }
-
-			  System.out.println("Image loading has completed.");
-			  //			}
-		    }
-		  catch(Exception excp)
-		    {
-		      System.out.println(excp);
-		      stop();
-		    }
-		  
-		  cumulative_time = (double)elapsed_time_ / (double)INTERNAL_ITERATIONS;		      
-		  System.out.println(image_name + " " + filter_name + " " +  elapsed_time_);
-
-		  if (best_time > cumulative_time)
-		    best_time = cumulative_time;
-		}
-	      
-	      console_.appendText(filter_name + ": best time from " +
-				  TRIALS + " trials of " + INTERNAL_ITERATIONS +
-				  " iterations equals: " + best_time + " ms");
-	      console_.appendText(NEW_LINE);
-	      Thread.yield();
-	    }
-	  
-	  console_.appendText(NEW_LINE);
-	}
-
-      console_.appendText("Tests concluded." + NEW_LINE);
-
-      //      if (bframe.isShowing())
-      //	bframe.hide();
-      
-      stop_button_.disable();
-      start_button_.enable();
-    }
-
-  synchronized public boolean imageUpdate(Image img, int infoflags, int x, int y,
-			     int width, int height)
-    {
-      System.out.println("Image Update called");
-      
-      boolean return_value = false;
-      try
-	{
-	  if ((infoflags & ALLBITS) != 0 ||
-	      (infoflags & SOMEBITS) != 0)
-	    {
-	      System.out.println("notify called" + width + " " + height);
-	      elapsed_time_ = filter_.filterTime();
-	      return_value = true;
-	      //	      monitor_.notify();
-	      notifyAll();
-	    }
-	  else if ((infoflags & ImageObserver.ABORT) != 0 ||
-		   (infoflags & ERROR) != 0)
-	    {
-	      System.out.println("image error!");
-	      //	      stop();
-	      return_value = true;
-	    }
-	}
-      catch(SecurityException excp)
-	{
-	  System.err.println(excp);
-	}
-
-      return return_value;
-    }
-  
-  public void stop()
-    {
-      try
-	{
-	  if (benchmarker_.isAlive())
-	    {
-	      BenchmarkFrame bframe = BenchmarkFrame.instance();
-
-	      if (bframe.isShowing())
-		bframe.hide();
-	      
-	      System.out.println("Stopping tests...");
-	      benchmarker_.stop();
-	      console_.appendText(NEW_LINE + ABORT + NEW_LINE);	      
-	    }
-	  
-	  start_button_.enable();
-	  stop_button_.disable();
-	}
-      catch(SecurityException exception)
-	{
-	  console_.appendText(NEW_LINE + "Stop Failed." + NEW_LINE);
-	}      
-    }
-
-  public boolean action(Event evt, Object what)
-    {
-      if (what.equals(START))
-	{
-	  boolean proceed = ! (benchmarker_ != null && benchmarker_.isAlive());
-	  
-	  stop_button_.enable();
-	  
-	  if (proceed &&
-	      images_.getSelectedIndexes() != null &&
-	      filters_.getSelectedIndexes() != null)
-	    {
-	      System.out.println("Starting tests...");
-	      start_button_.disable();
-	      benchmarker_ = new Thread(this);
-	      benchmarker_.setPriority(Math.min(Thread.currentThread().getPriority() + 2,
-						Thread.MAX_PRIORITY - 1));
-	      benchmarker_.start();
-	    }
-	}
-      else if (what.equals(STOP))
-	{
-	  stop();
-	}
-      else if (what.equals(CLEAR))
-	{
-	  console_.setText("");
-	  console_.appendText(WELCOME + NEW_LINE);
-	  console_.appendText(COPYRIGHT + NEW_LINE);	  
-	}
-      else if (what.equals(RANDOM))
-	{
-	  RandomImageDialog.instance(this).show();
-	}	
-      else if (evt.target == new_image_)
-	{
-	  getSingleImage(new_image_.getText());
-	}
-	
-
-      return true;
-    }
-
-  private void getSingleImage(String image_url)
-    {
-      Image image;
-      MediaTracker tracker = new MediaTracker(this);
-
-      try
-	{
-	  image = getImage(new URL(image_url));
-	  tracker.addImage(image, 0);
-	  tracker.waitForID(0);
-	      
-	  if (image != null)
-	    {
-	      int index = image_url.lastIndexOf('/');
-	      
-	      if (index != -1)
-		image_url = image_url.substring(index + 1);
-	      
-	      image_table_.put(image_url, image);
-	      images_.addItem(image_url);
-	    }
-	}
-      catch(MalformedURLException e)
-	{
-	  System.err.println(e);
-	}
-      catch(InterruptedException excp)
-	{
-	  System.err.println(excp);
-	}
-
-    }
-  
-  private void getImages()
-    {
-      Image image;
-      String image_list = getParameter("images"), image_url;
-      StringTokenizer str_tok = new StringTokenizer(image_list, ",");
-
-      while (str_tok.hasMoreTokens())
-	{
-	  image_url = str_tok.nextToken();
-	  getSingleImage(image_url);
-	}
-    }
-  
-  private void getFilters()
-    {
-      URL url;
-      Object download;
-      String config_file;
-      String configInfo= null;
-      Choice choice = new Choice ();
-      ImageFilter filter;
-      
-      config_file = getParameter ("configFile");
-      
-      if (config_file == null)
-	config_file = "http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/filter.conf";
-      
-      try
-	{
-	  System.out.println ("Configuration File: " + config_file);
-	  // Create a new URL
-	  url = new URL (config_file);
-	  
-	  // Get the input stream and pipe it to a DataInputStream
-	  DataInputStream iStream = new DataInputStream (url.openStream ());
-	  
-	  // Create a buffer to hold all the data we get
-	  StringBuffer tempBuf = new StringBuffer ();
-	  // Keep reading the data until we are done
-	  String tempString = iStream.readLine ();
-	  while (tempString != null)
-	    {
-	      tempBuf.append (tempString);
-	      tempBuf.append (" ");
-	      tempString = iStream.readLine ();
-	    }
-	  
-	  configInfo = tempBuf.toString ();	  
-	  System.out.println(configInfo);
-	  
-	  if (configInfo != null)
-	    {
-	      StringTokenizer tokens = new StringTokenizer (configInfo);
-	      String fullFilterName = null;
-	      String filterName = null;
-	      // Now parse the string, picking up filter names. Use these
-	      // names to load the actual filters as well add new choices to
-	      // the filter choices.
-	      while (tokens.hasMoreTokens ())
-		{
-		  // Get the next token
-		  fullFilterName = tokens.nextToken ();
-		  filterName = this.extractFilterName (fullFilterName);
-		  
-		  System.out.println ("Loading: " + fullFilterName);
-		  // Load the filter class
-		  Class c = Class.forName (fullFilterName);
-		  //		Class c = this.filterRepository_.load (filter);
-
-		  filter = (ImageFilter)c.newInstance();
-
-		  if (filter instanceof SpatialFilter)
-		    {
-		      // Add the filter to the Filter Repository
-		      filter_table_.put(filterName, filter);
-		      
-		      // Add filter name to the list of filter choices
-		      filters_.addItem (filterName);
-		    }
-		}
-	    }	  
-	}
-      catch (Exception e)
-	{
-	  System.err.println ("Filter not found: " + e);
-	}      
-  }
-
-  private String extractFilterName (String s)
-  {
-    String filterName = null;
-    StringTokenizer tokens = new StringTokenizer (s, ".");
-    while (tokens.hasMoreTokens ())
-      filterName = tokens.nextToken ();
-    return filterName;
-  }
-
-  public void generateRandomImage(String name, int width, int height)
-    {
-      Image image = createImage(width, height);
-      Graphics g = image.getGraphics();
-      FilteredImageSource filtered_image;
-
-      if (g != null)
-	{
-	  ImageFilter filter = new RandomizeFilter();
-	  g.fillRect(0, 0, width, height);
-	  filtered_image = new FilteredImageSource(image.getSource(), filter);
-	  image_table_.put(name, createImage(filtered_image));
-	  images_.addItem(name);
-	}
-    }
-}
-
-class RandomImageDialog extends Frame
-{
-  private static String GENERATE = "Generate";
-  private static String CANCEL = "Cancel";
-  
-  private TextField name_ = new TextField(30),
-  width_ = new TextField(5),
-    height_= new TextField(5);
-  private BenchmarkApplet applet_;
-  private Button generate_button_;
-  private Button cancel_button_;
-  private ButtonPanel button_panel_ = new ButtonPanel();
-  
-  private static RandomImageDialog instance_;  
-
-  public static RandomImageDialog instance(BenchmarkApplet applet)
-    {
-      if (instance_ == null)
-	instance_ = new RandomImageDialog(applet);
-      
-      return instance_;	  
-    }
-
-  protected RandomImageDialog(BenchmarkApplet applet)
-    {
-      super("Generate Random Image");
-      applet_ = applet;
-
-      Panel controls = new Panel();
-      GridBagLayout gb = new GridBagLayout();
-      GridBagConstraints gc = new GridBagConstraints();
-      Label width = new Label("Width: "),
-	height = new Label("Height: "),
-	name = new Label("Name: ");
-
-      reshape (0, 0, 300, 200);
-      
-      controls.setLayout(gb);
-      gc.gridx = 0;
-      gc.gridy = 0;
-      gc.gridwidth = 1;
-      gc.insets = new Insets(5,5,5,5);
-      gc.anchor = GridBagConstraints.WEST;
-      width.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(width, gc);
-      controls.add(width);
-
-      gc.gridx = 1;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(width_, gc);
-      controls.add(width_);
-      
-      gc.gridx = 2;
-      gc.anchor = GridBagConstraints.WEST;
-      gc.fill = GridBagConstraints.NONE;
-      height.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(height, gc);
-      controls.add(height);
-
-      gc.gridx = 3;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(height_, gc);
-      controls.add(height_);
-
-      gc.gridx = 0;
-      gc.gridy = 1;
-      gc.gridwidth = 1;
-      gc.fill = GridBagConstraints.NONE;
-      gc.anchor = GridBagConstraints.WEST;
-      name.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(name, gc);
-      controls.add(name);
-
-      gc.gridx = 1;
-      gc.gridwidth = GridBagConstraints.REMAINDER;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(name_, gc);
-      controls.add(name_);
-      
-      setLayout(new BorderLayout());
-      generate_button_ = button_panel_.add(GENERATE);
-      cancel_button_ = button_panel_.add(CANCEL);
-      add("Center", controls);
-      add("South", button_panel_);
-
-    }
-
-  public boolean action(Event evt, Object what)
-    {
-      if (what.equals(GENERATE))
-	{
-	  String width = width_.getText(),
-	    height = height_.getText(),
-	    name = name_.getText();
-	  
-	  try
-	    {
-	      int width_num = Integer.parseInt(width),
-		height_num = Integer.parseInt(height);
-
-	      applet_.generateRandomImage(name, width_num, height_num);
-	      dispose();		      	      
-	    }
-	  catch(NumberFormatException nfe)
-	    {
-	      width_.setText("");
-	      height_.setText("");
-	    }
-	}
-      else if (what.equals(CANCEL))
-	dispose();
-
-      return true;
-    }  
-}
-
-class BenchmarkFrame extends Frame
-{
-  private String desc_;
-  private Image image_;
-  private int height_, width_;
-  private static BenchmarkFrame instance_;
-  private static final Font FONT = new Font("Dialog", Font.BOLD, 12);
-  
-  public static BenchmarkFrame instance()
-    {
-      if (instance_ == null)
-	instance_ = new BenchmarkFrame();
-      
-      return instance_;	  
-    }
-  
-  public void init(String desc, Image image, int width, int height)
-    {
-      reshape(0, 0, width, height + 50);
-      setImage(desc, image);
-    }
-  
-  public void setImage(String desc, Image image)
-    {/*
-      try
-	{
-	  MediaTracker tracker = new MediaTracker(this);
-	  tracker.addImage(image, 0);
-	  tracker.waitForID(0);
-	}
-      catch(InterruptedException excp)
-	{
-	}
-	*/     
-      desc_ = desc;
-      image_ = image;
-    }
-
-  public void paint(Graphics g)
-    {
-      g.setColor(Color.black);
-      g.setFont(FONT);
-      g.drawImage(image_, 0, 50, this);      
-      g.drawString(desc_, 5, 40);
-    }
-  
-  protected BenchmarkFrame()
-    {
-      super("Benchmark Frame");
-    }
-}
diff --git a/java/ImageProcessing/framework/DialogManager.java b/java/ImageProcessing/framework/DialogManager.java
deleted file mode 100644
index cca0c037af1..00000000000
--- a/java/ImageProcessing/framework/DialogManager.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.applet.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-
-class DialogManager
-{
-  public static void initialize (Applet parent)
-  {
-    codeBase_ = parent.getCodeBase ().toString ();
-    aboutFrame_ = new AboutFrame ();
-    helpFrame_ = new HelpFrame (codeBase_);
-  }
-
-  public static void popDialog (int type, String message)
-  {
-    Frame frame = null;
-    
-    switch (type)
-      {
-      case DialogType.ABOUT:
-	aboutFrame_.show ();
-	break;
-      case DialogType.HELP:
-	helpFrame_.show ();
-	break;
-      case DialogType.MALFORMED_URL:
-      case DialogType.NOT_SUPPORTED:
-      case DialogType.URL_NOT_FOUND:
-	frame = new MessageFrame ("Error", message);
-	break;
-      case DialogType.NOT_YET_IMPLEMENTED:
-	frame = new MessageFrame ("", message);
-	break;
-      }
-    Dimension d = Toolkit.getDefaultToolkit ().getScreenSize ();
-    frame.move ((d.width - frame.size ().width)/2,
-		(d.height - frame.size ().height)/2);
-    frame.show ();
-  }
-
-  private static String codeBase_ = "";
-  private static AboutFrame aboutFrame_;
-  private static HelpFrame helpFrame_;
-}
-
-class MessageFrame extends Frame
-{
-  public MessageFrame (String title, String message)
-  {
-    super (title);
-
-    this.resize (message.length () * 8, 100);
-    this.setLayout (new BorderLayout ());
-
-    this.text_ = new TextField (message);
-    this.text_.setEditable (false);
-
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    okButtonPanel.resize (100, 100);
-    
-    this.add ("Center", this.text_);
-    this.add ("South", okButtonPanel);
-  }
-
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.dispose ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.dispose ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Button okButton_ = new Button (" ok ");
-  private TextField text_ = null;
-}
-
-class AboutFrame extends Frame
-{
-  public AboutFrame ()
-  {
-    super ("About");
-    this.resize (300,300);
-    this.setLayout (new BorderLayout ());
-
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    AboutFrameTextPanel textPanel = new AboutFrameTextPanel ();
-
-    this.add ("Center", textPanel);    
-    this.add ("South", okButtonPanel);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.hide ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.hide ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-  private Button okButton_ = new Button (" ok ");
-}
-
-class AboutFrameTextPanel extends Panel
-{
-  public void paint (Graphics g)
-  {
-    int width = this.size ().width;
-    int height = this.size ().height;
-
-    g.clearRect (0, 0, width, height);
-    this.setBackground (Color.cyan);
-
-    // First draw the title
-    g.setFont (new Font ("TimesRoman", Font.BOLD | Font.ITALIC, 48));
-    FontMetrics fontMetrics = g.getFontMetrics ();
-    int x = (width - fontMetrics.stringWidth (title_))/2;
-    int y = 100;
-
-    Color color = g.getColor ();
-    g.setColor (Color.orange);
-    g.drawString(title_, x+2, y+2);
-    g.setColor (color);
-    g.drawString(title_, x, y);
-
-    // Then draw author's name
-    g.setFont (new Font ("TimesRoman", Font.ITALIC, 24));
-    fontMetrics = g.getFontMetrics ();
-    x = (width - fontMetrics.stringWidth (by_))/2;
-    y += 50;
-    g.drawString(by_, x, y);
-
-    x = (width - fontMetrics.stringWidth (author_))/2;
-    y += 50;
-    g.drawString(author_, x, y);
-
-    // Finally draw other information -- version number etc.
-    g.setFont (new Font ("TimesRoman", Font.ITALIC, 18));
-    fontMetrics = g.getFontMetrics ();
-    x = (width - fontMetrics.stringWidth (info_))/2;
-    y += 50;
-    g.drawString(info_, x, y);
-  }
-
-  private String title_ = "MedJava";
-  private String by_ = "by";
-  private String author_ = "Prashant Jain";
-  private String info_ = "Version 1.0";
-}
-
-class HelpFrame extends Frame
-{
-  public HelpFrame (String codeBase)
-  {
-    super ("Help");
-    this.setBackground (Color.white);
-    this.text_.setEditable (false);
-    Font defaultFont = new Font ("TimesRoman", Font.PLAIN, 14);
-    this.text_.setFont (defaultFont);
-
-    try
-      {
-	URL url = new URL (codeBase + "../ImageProcessing/framework/help.conf");
-	String delim = "\n";
-	
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (url.openStream ());
-	
-	// Keep reading the data until we are done
-	String tempString = iStream.readLine ();
-	while (tempString != null)
-	  {
-	    if (tempString.startsWith ("<START>"))
-	      delim = "";
-	    else if (tempString.startsWith ("<END>"))
-	      delim = "\n";
-	    else if (tempString.startsWith ("<TAB>"))
-	      this.text_.appendText ("\t");
-	    else if (tempString.startsWith ("<P>"))
-	      this.text_.appendText ("\n");
-	    else
-	      {
-		this.text_.appendText (tempString);
-		this.text_.appendText (delim);
-	      }
-	    tempString = iStream.readLine ();		
-	  }
-      }
-    catch (MalformedURLException e)
-      {
-	System.err.println (e);
-      }
-    catch (IOException e)
-      {
-	System.err.println (e);
-      }
-    
-    this.resize (600,700);
-    this.setLayout (new BorderLayout ());
-    
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    this.add ("South", okButtonPanel);
-    this.add ("Center", this.text_);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.hide ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.hide ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Vector helpInfo_ = new Vector ();
-  private Button okButton_ = new Button (" ok ");
-  private TextArea text_ = new TextArea ();
-}
-
diff --git a/java/ImageProcessing/framework/DialogType.java b/java/ImageProcessing/framework/DialogType.java
deleted file mode 100644
index c95372c08e1..00000000000
--- a/java/ImageProcessing/framework/DialogType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package imaging.framework;
-
-public class DialogType
-{
-  public static final int ABOUT = 0;
-  public static final int MALFORMED_URL = 1;
-  public static final int URL_NOT_FOUND = 2;
-  public static final int NOT_SUPPORTED = 3;
-  public static final int HELP = 4;
-  public static final int NOT_YET_IMPLEMENTED = 10;
-}
diff --git a/java/ImageProcessing/framework/FileBrowser.java b/java/ImageProcessing/framework/FileBrowser.java
deleted file mode 100644
index 27245b1f2f4..00000000000
--- a/java/ImageProcessing/framework/FileBrowser.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.applet.*;
-import gjt.Separator;
-import gjt.ComponentScroller;
-
-class FileNode extends HierarchyAdapter
-{
-  public FileNode (String name, 
-		   Icon icon, 
-		   boolean root,
-		   ImageApp app)
-  {
-    super (name, icon, root);
-    this.app_ = app;
-  }
-
-  public FileNode (String name, 
-		   Icon icon, 
-		   ListFiles list,
-		   ImageApp app)
-  {
-    super (name, icon);
-    this.list_ = list;
-    this.app_ = app;
-  }
-
-  public ImageApp app ()
-  {
-    return this.app_;
-  }
-
-  public void handleEvent ()
-  {
-    String s = null;
-    String pString = "";
-    Hierarchy p = this.getHierarchyParent ();
-
-    while (p != null)
-      {
-	pString = p.getName () + pString;
-	p = p.getHierarchyParent ();
-      }
-
-    if (pString.endsWith ("/"))
-      s = "http://" +  pString + this.getName ();
-    else
-      s = "http://" + pString + "/" + this.getName ();
-
-    System.out.println ("Opening: " + s);
-
-    // If list is null, then it is a file, else it is a directory and
-    // use list to get the rest of the directory.
-    if (this.list_ == null)
-      this.app_.openURL (s);            // It is a file
-    else
-      this.list_.listFiles (s, this);	// It is a directory. 
-  }
-
-  private ListFiles list_ = null;
-  private ImageApp app_ = null;
-}
-
-class BrowserPanel extends Panel
-{
-  public BrowserPanel (ImageApp parent)
-  {
-    this.resize (300, 300);
-    this.parent_ = parent;
-    this.setLayout (new BorderLayout ());
-  }
-
-  public int initialize (String url, ListFiles list)
-  {
-    String directory = null;
-    int index = -1;
-
-    String pString = list.stripProtocolHeader (url);
-    if (!pString.endsWith ("/"))
-      pString = pString + "/";
-
-    try
-      {
-	Icon dirIcon = new Icon (this.parent_.getCodeBase () + 
-				 "../ImageProcessing/framework/" +
-				 "file03.gif", (Applet) this.parent_);
-	System.out.println (this.parent_.getCodeBase () + 
-			    "../ImageProcessing/framework/" +
-			    "file03.gif");
-	this.root_ = new FileNode (pString,
-				   dirIcon, true, this.parent_);
-      }
-    catch (MalformedURLException e)
-      {
-      }
-
-    int count = list.listFiles (url, this.root_);
-    //    System.out.println ("Count: " + count);
-    if (count > 0)
-      {
-	// Add the root to the component scroller and then add the
-	// component scroller to the panel.
-	this.scroller_ = new ComponentScroller (this.root_);
-	this.add ("Center", this.scroller_);
-      }
-    return count;
-  }
-
-  private FileNode root_ = null;
-  private ImageApp parent_;
-  private ComponentScroller scroller_;
-}
-
-class FileBrowser extends Frame
-{
-  public FileBrowser (String title, ImageApp parent)
-  {
-    super (title);
-    this.resize (300, 300);
-    this.browser_ = new BrowserPanel (parent);
-    this.setLayout (new BorderLayout ());
-
-    this.cancelButton_ = new Button (" cancel ");
-    Panel buttonPanel = new Panel ();
-    buttonPanel.add (this.cancelButton_);
-    buttonPanel.resize (100, 100);
-
-    Panel southPanel = new Panel ();
-    southPanel.setLayout (new BorderLayout ());
-    southPanel.add ("North", new Separator ());
-    southPanel.add ("South", buttonPanel);
-    this.add ("South", southPanel);
-    this.add ("Center", this.browser_);
-  }
-
-  public int initialize (String url, ListFiles list)
-  {
-    return this.browser_.initialize (url, list);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.dispose ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.cancelButton_)
-	  {
-	    this.dispose ();
-	  }
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Button cancelButton_;;
-  private BrowserPanel browser_;
-}
diff --git a/java/ImageProcessing/framework/FilePanel.java b/java/ImageProcessing/framework/FilePanel.java
deleted file mode 100644
index f8ffc7dbca8..00000000000
--- a/java/ImageProcessing/framework/FilePanel.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-// Create a panel for all the buttons
-class FilePanel extends Panel
-{
-  FilePanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create all the buttons
-    this.URLDialogButton_ = new URLDialogButton ("Open URL", "Download an image", this.parent_);
-    this.saveButton_ = new SaveButton ("Save", "Upload an image", this.parent_);
-
-    // Place the created buttons in the panel
-    this.add (this.URLDialogButton_);
-    this.add (this.saveButton_);
-
-    // Disable the save button for now
-    this.disableSaveButton ();
-    this.resize (400, 400);
-  }
-
-  public void enableSaveButton ()
-  {
-    this.saveButton_.enable ();
-  }
-
-  public void disableSaveButton ()
-  {
-    this.saveButton_.disable ();
-  }
-
-  // All the created buttons
-  private URLDialogButton URLDialogButton_;
-  private SaveButton saveButton_;
-
-  private ImageApp parent_;
-}
-
-// Create a panel for all the buttons
-class ResetPanel extends Panel
-{
-  ResetPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create all the buttons
-    this.reloadButton_ = new ReloadButton ("Reload Filters", "Reload all filters", this.parent_);
-
-    // **********************
-    // Disable this until it works
-    // **********************
-    this.reloadButton_.disable();
-
-
-    this.resetButton_ = new ResetButton ("Reset", "Reset the image", this.parent_);
-
-
-    // Place the created buttons in the panel
-    this.add (this.resetButton_);
-    this.add (this.reloadButton_);
-
-    this.resize (400, 400);
-  }
-
-  // All the created buttons
-  private ReloadButton reloadButton_;
-  private ResetButton resetButton_;
-
-  private ImageApp parent_;
-}
-
-
-class ZoomPanel extends Panel
-{
-  ZoomPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create the two zoom buttons
-    this.zoomInButton_ = new ZoomInButton ("<< Zoom in", "Zoom into the image", this.parent_);
-    this.zoomOutButton_ = new ZoomOutButton ("Zoom out >>", "Zoom out of the image", this.parent_);
-
-    // Now add the buttons to the panel
-    this.add (this.zoomInButton_);
-    this.add (this.zoomOutButton_);
-
-    this.resize (100, 100);
-  }
-
-  private ZoomInButton zoomInButton_;
-  private ZoomOutButton zoomOutButton_;
-
-  private ImageApp parent_;
-}
-
-
-class FilterPanel extends Panel
-{
-  FilterPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-    this.applyButton_ = new ApplyButton ("Apply", "Apply the selected filter", this.parent_);
-
-    // Set the layout of the Choice Panel. Note that the Choice Panel
-    // holds the choice button of filters.
-    this.choicePanel_ = new ChoicePanel ("Select filter", this.parent_);
-
-    this.add (this.applyButton_);
-    this.add (this.choicePanel_);
-    this.resize (200,200);
-  }
-
-  public Choice choice ()
-  {
-    return this.choicePanel_.choice ();
-  }
-
-  public void loadFilters ()
-  {
-    this.choicePanel_.loadFilters ();
-  }
-
-  private ChoicePanel choicePanel_;
-  private ApplyButton applyButton_;
-  private ImageApp parent_;
-}
-
-class HelpPanel extends Panel
-{
-  HelpPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    this.aboutButton_ = new AboutButton ("About", "About the applet", this.parent_);
-    this.helpButton_ = new HelpButton ("Help", "Help on how to use the applet", this.parent_);
-
-    // Now add the buttons to the panel
-    this.add (this.aboutButton_);
-    this.add (this.helpButton_);
-
-    this.resize (100, 100);
-  }
-
-  private AboutButton aboutButton_;
-  private HelpButton helpButton_;
-
-  private ImageApp parent_;
-}
diff --git a/java/ImageProcessing/framework/FilterTest.java b/java/ImageProcessing/framework/FilterTest.java
deleted file mode 100644
index b1e33482be9..00000000000
--- a/java/ImageProcessing/framework/FilterTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import imaging.filters.Timer;
-
-public class FilterTest
-{
-  public static void main(String[] args)
-  {
-    Timer timer = new Timer();
-    ImageProcessor ip = new ImageProcessor();
-    ImageFilterFactory iff = new ImageFilterFactory();
-    Frame frame = new Frame("Rotate Example");
-    Toolkit tk = Toolkit.getDefaultToolkit();
-    Dimension d = tk.getScreenSize();
-    Image old_image = tk.getImage("myphoto.gif"), image;
-    int image_x, image_y, x = 50, y = 50;
-    Graphics g;
-
-    frame.reshape(d.width/4, d.height/8, d.width/2, 3*d.height/4);
-    frame.show();
-    g = frame.getGraphics();
-    d = frame.size();
-
-    MediaTracker tracker = new MediaTracker(frame);
-    tracker.addImage(old_image, 0);
-    try { tracker.waitForID(0); } catch(InterruptedException excp) {}
-    g.drawImage(old_image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createMeanImageFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createSobelFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x = 50;
-    y += old_image.getHeight(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createEmbossFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    image = ip.processImage(old_image, iff.createSharpenFilter(), frame);
-    g.drawImage(image, x, y, frame);
-    x = 50;
-    y += old_image.getHeight(frame) + 50;
-    
-    image = ip.processImage(old_image, iff.createRotateImageFilter(), frame);
-    g.drawImage(image, x, y, frame);
-  }
-}
diff --git a/java/ImageProcessing/framework/GIFHandler.java b/java/ImageProcessing/framework/GIFHandler.java
deleted file mode 100644
index 3d099ba294c..00000000000
--- a/java/ImageProcessing/framework/GIFHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.io.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-
-public class GIFHandler extends BlobWriter
-{
-  public GIFHandler (String filename, Image image, int length)
-  {
-    super (null, length, 0, filename);
-    this.image_ = image;
-  }
-
-  /******************************
-   * Used for HTTP 1.1 PUT authorization
-   *****************************/
-  public GIFHandler (String filename, Image image, int length, String authentication)
-    {
-      super (null, length, 0, filename, authentication);
-      this.image_ = image;
-    }
-  
-  protected int sendRequest ()
-  {
-    if (this.sendHeader () == -1)
-      {
-	ACE.ERROR ("GIFHandler::sendHeader failed.");
-	return -1;
-      }
-    else
-      if (this.sendData () == -1)
-	{
-	  ACE.ERROR ("GIFHandler::sendData failed.");
-	  return -1;
-	}
-    return 0;
-  }
-
-  // Send the data
-  protected int sendData ()
-  {
-
-
-    try
-      {
-	if (this.length_ > 0)
-	  {
-	    OutputStream ostream = this.peer ().outputStream ();
-
-	    this.encoder_ = new GifEncoder (this.image_, ostream);
-
-	    this.encoder_.encode ();
-
-	    ostream.flush();
-
-	    //	this.encoder_ = new GIFEncoder (this.image_);
-	    //	this.encoder_.Write (ostream);
-	  }
-	this.bytesWritten_ = this.length_;
-	  
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Error writing to server");
-      }
-    return 0;
-  }
-
-  GifEncoder encoder_ = null;
-  //  GIFEncoder encoder_ = null;
-  Image image_ = null;
-}
diff --git a/java/ImageProcessing/framework/GifEncoder.java b/java/ImageProcessing/framework/GifEncoder.java
deleted file mode 100644
index 91a3927d95d..00000000000
--- a/java/ImageProcessing/framework/GifEncoder.java
+++ /dev/null
@@ -1,693 +0,0 @@
-// GifEncoder - write out an image as a GIF
-//
-// Transparency handling and variable bit size courtesy of Jack Palevich.
-//
-// Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-import java.io.*;
-import java.awt.Image;
-import java.awt.image.*;
-
-/// Write out an image as a GIF.
-// <P>
-// <A HREF="/resources/classes/Acme/JPM/Encoders/GifEncoder.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see ToGif
-
-public class GifEncoder extends ImageEncoder
-    {
-
-    private boolean interlace = false;
-
-    /// Constructor from Image.
-    // @param img The image to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( Image img, OutputStream out ) throws IOException
-	{
-	super( img, out );
-	}
-
-    /// Constructor from Image with interlace setting.
-    // @param img The image to encode.
-    // @param out The stream to write the GIF to.
-    // @param interlace Whether to interlace.
-    public GifEncoder( Image img, OutputStream out, boolean interlace ) throws IOException
-	{
-	super( img, out );
-	this.interlace = interlace;
-	}
-
-    /// Constructor from ImageProducer.
-    // @param prod The ImageProducer to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( ImageProducer prod, OutputStream out ) throws IOException
-	{
-	super( prod, out );
-	}
-
-    /// Constructor from ImageProducer with interlace setting.
-    // @param prod The ImageProducer to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( ImageProducer prod, OutputStream out, boolean interlace ) throws IOException
-	{
-	super( prod, out );
-	this.interlace = interlace;
-	}
-
-
-    int width, height;
-    int[][] rgbPixels;
-
-    void encodeStart( int width, int height ) throws IOException
-	{
-	this.width = width;
-	this.height = height;
-	rgbPixels = new int[height][width];
-	}
-
-    void encodePixels(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException
-	{
-	// Save the pixels.
-	for ( int row = 0; row < h; ++row )
-	    System.arraycopy(
-		rgbPixels, row * scansize + off,
-		this.rgbPixels[y + row], x, w );
-
-	}
-
-    IntHashtable colorHash;
-
-    void encodeDone() throws IOException
-	{
-	int transparentIndex = -1;
-	int transparentRgb = -1;
-        // Put all the pixels into a hash table.
-        colorHash = new IntHashtable();
-	int index = 0;
-        for ( int row = 0; row < height; ++row )
-            {
-            int rowOffset = row * width;
-            for ( int col = 0; col < width; ++col )
-                {
-                int rgb = rgbPixels[row][col];
-		boolean isTransparent = ( ( rgb >>> 24 ) < 0x80 );
-		if ( isTransparent )
-		    {
-		    if ( transparentIndex < 0 )
-			{
-			// First transparent color; remember it.
-			transparentIndex = index;
-			transparentRgb = rgb;
-			}
-		    else if ( rgb != transparentRgb )
-			{
-			// A second transparent color; replace it with
-			// the first one.
-			rgbPixels[row][col] = rgb = transparentRgb;
-			}
-		    }
-                GifEncoderHashitem item =
-		    (GifEncoderHashitem) colorHash.get( rgb );
-                if ( item == null )
-		    {
-		    if ( index >= 256 )
-			throw new IOException( "too many colors for a GIF" );
-                    item = new GifEncoderHashitem(
-			rgb, 1, index, isTransparent );
-		    ++index;
-		    colorHash.put( rgb, item );
-		    }
-                else
-                    ++item.count;
-                }
-            }
-
-	// Figure out how many bits to use.
-	int logColors;
-	if ( index <= 2 )
-	    logColors = 1;
-	else if ( index <= 4 )
-	    logColors = 2;
-	else if ( index <= 16 )
-	    logColors = 4;
-	else
-	    logColors = 8;
-
-	// Turn colors into colormap entries.
-	int mapSize = 1 << logColors;
-	byte[] reds = new byte[mapSize];
-	byte[] grns = new byte[mapSize];
-	byte[] blus = new byte[mapSize];
-	for ( Enumeration e = colorHash.elements(); e.hasMoreElements(); )
-	    {
-	    GifEncoderHashitem item = (GifEncoderHashitem) e.nextElement();
-	    reds[item.index] = (byte) ( ( item.rgb >> 16 ) & 0xff );
-	    grns[item.index] = (byte) ( ( item.rgb >>  8 ) & 0xff );
-	    blus[item.index] = (byte) (   item.rgb         & 0xff );
-	    }
-
-	GIFEncode(
-	    out, width, height, interlace, (byte) 0, transparentIndex,
-	    logColors, reds, grns, blus );
-	}
-
-    byte GetPixel( int x, int y ) throws IOException
-	{
-	GifEncoderHashitem item =
-	    (GifEncoderHashitem) colorHash.get( rgbPixels[y][x] );
-	if ( item == null )
-	    throw new IOException( "color not found" );
-	return (byte) item.index;
-	}
-
-    static void writeString( OutputStream out, String str ) throws IOException
-        {
-        int len = str.length();
-        byte[] buf = new byte[len];
-        str.getBytes( 0, len, buf, 0 );
-        out.write( buf );
-        }
-
-    // Adapted from ppmtogif, which is based on GIFENCOD by David
-    // Rowley <mgardi@watdscu.waterloo.edu>.  Lempel-Zim compression
-    // based on "compress".
-
-    int Width, Height;
-    boolean Interlace;
-    int curx, cury;
-    int CountDown;
-    int Pass = 0;
-
-    void GIFEncode(
-	OutputStream outs, int Width, int Height, boolean Interlace, byte Background, int Transparent, int BitsPerPixel, byte[] Red, byte[] Green, byte[] Blue )
-	throws IOException
-	{
-	byte B;
-	int LeftOfs, TopOfs;
-	int ColorMapSize;
-	int InitCodeSize;
-	int i;
-
-	this.Width = Width;
-	this.Height = Height;
-	this.Interlace = Interlace;
-	ColorMapSize = 1 << BitsPerPixel;
-	LeftOfs = TopOfs = 0;
-
-	// Calculate number of bits we are expecting
-	CountDown = Width * Height;
-
-	// Indicate which pass we are on (if interlace)
-	Pass = 0;
-
-	// The initial code size
-	if ( BitsPerPixel <= 1 )
-	    InitCodeSize = 2;
-	else
-	    InitCodeSize = BitsPerPixel;
-
-	// Set up the current x and y position
-	curx = 0;
-	cury = 0;
-
-	// Write the Magic header
-	writeString( outs, "GIF89a" );
-
-	// Write out the screen width and height
-	Putword( Width, outs );
-	Putword( Height, outs );
-
-	// Indicate that there is a global colour map
-	B = (byte) 0x80;		// Yes, there is a color map
-	// OR in the resolution
-	B |= (byte) ( ( 8 - 1 ) << 4 );
-	// Not sorted
-	// OR in the Bits per Pixel
-	B |= (byte) ( ( BitsPerPixel - 1 ) );
-
-	// Write it out
-	Putbyte( B, outs );
-
-	// Write out the Background colour
-	Putbyte( Background, outs );
-
-	// Pixel aspect ratio - 1:1.
-	//Putbyte( (byte) 49, outs );
-	// Java's GIF reader currently has a bug, if the aspect ratio byte is
-	// not zero it throws an ImageFormatException.  It doesn't know that
-	// 49 means a 1:1 aspect ratio.  Well, whatever, zero works with all
-	// the other decoders I've tried so it probably doesn't hurt.
-	Putbyte( (byte) 0, outs );
-
-	// Write out the Global Colour Map
-	for ( i = 0; i < ColorMapSize; ++i )
-	    {
-	    Putbyte( Red[i], outs );
-	    Putbyte( Green[i], outs );
-	    Putbyte( Blue[i], outs );
-	    }
-
-	// Write out extension for transparent colour index, if necessary.
-	if ( Transparent != -1 )
-	    {
-	    Putbyte( (byte) '!', outs );
-	    Putbyte( (byte) 0xf9, outs );
-	    Putbyte( (byte) 4, outs );
-	    Putbyte( (byte) 1, outs );
-	    Putbyte( (byte) 0, outs );
-	    Putbyte( (byte) 0, outs );
-	    Putbyte( (byte) Transparent, outs );
-	    Putbyte( (byte) 0, outs );
-	    }
-
-	// Write an Image separator
-	Putbyte( (byte) ',', outs );
-
-	// Write the Image header
-	Putword( LeftOfs, outs );
-	Putword( TopOfs, outs );
-	Putword( Width, outs );
-	Putword( Height, outs );
-
-	// Write out whether or not the image is interlaced
-	if ( Interlace )
-	    Putbyte( (byte) 0x40, outs );
-	else
-	    Putbyte( (byte) 0x00, outs );
-
-	// Write out the initial code size
-	Putbyte( (byte) InitCodeSize, outs );
-
-	// Go and actually compress the data
-	compress( InitCodeSize+1, outs );
-
-	// Write out a Zero-length packet (to end the series)
-	Putbyte( (byte) 0, outs );
-
-	// Write the GIF file terminator
-	Putbyte( (byte) ';', outs );
-	}
-
-    // Bump the 'curx' and 'cury' to point to the next pixel
-    void BumpPixel()
-	{
-	// Bump the current X position
-	++curx;
-
-	// If we are at the end of a scan line, set curx back to the beginning
-	// If we are interlaced, bump the cury to the appropriate spot,
-	// otherwise, just increment it.
-	if ( curx == Width )
-	    {
-	    curx = 0;
-
-	    if ( ! Interlace )
-		++cury;
-	    else
-		{
-		switch( Pass )
-		    {
-		    case 0:
-		    cury += 8;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 4;
-			}
-		    break;
-
-		    case 1:
-		    cury += 8;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 2;
-			}
-		    break;
-
-		    case 2:
-		    cury += 4;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 1;
-			}
-		    break;
-
-		    case 3:
-		    cury += 2;
-		    break;
-		    }
-		}
-	    }
-	}
-
-    static final int EOF = -1;
-
-    // Return the next pixel from the image
-    int GIFNextPixel() throws IOException
-	{
-	byte r;
-
-	if ( CountDown == 0 )
-	    return EOF;
-
-	--CountDown;
-
-	r = GetPixel( curx, cury );
-
-	BumpPixel();
-
-	return r & 0xff;
-	}
-
-    // Write out a word to the GIF file
-    void Putword( int w, OutputStream outs ) throws IOException
-	{
-	Putbyte( (byte) ( w & 0xff ), outs );
-	Putbyte( (byte) ( ( w >> 8 ) & 0xff ), outs );
-	}
-
-    // Write out a byte to the GIF file
-    void Putbyte( byte b, OutputStream outs ) throws IOException
-	{
-	outs.write( b );
-	}
-
-
-    // GIFCOMPR.C       - GIF Image compression routines
-    //
-    // Lempel-Ziv compression based on 'compress'.  GIF modifications by
-    // David Rowley (mgardi@watdcsu.waterloo.edu)
-
-    // General DEFINEs
-
-    static final int BITS = 12;
-
-    static final int HSIZE = 5003;		// 80% occupancy
-
-    // GIF Image compression - modified 'compress'
-    //
-    // Based on: compress.c - File compression ala IEEE Computer, June 1984.
-    //
-    // By Authors:  Spencer W. Thomas      (decvax!harpo!utah-cs!utah-gr!thomas)
-    //              Jim McKie              (decvax!mcvax!jim)
-    //              Steve Davies           (decvax!vax135!petsd!peora!srd)
-    //              Ken Turkowski          (decvax!decwrl!turtlevax!ken)
-    //              James A. Woods         (decvax!ihnp4!ames!jaw)
-    //              Joe Orost              (decvax!vax135!petsd!joe)
-
-    int n_bits;				// number of bits/code
-    int maxbits = BITS;			// user settable max # bits/code
-    int maxcode;			// maximum code, given n_bits
-    int maxmaxcode = 1 << BITS; // should NEVER generate this code
-
-    final int MAXCODE( int n_bits )
-	{
-	return ( 1 << n_bits ) - 1;
-	}
-
-    int[] htab = new int[HSIZE];
-    int[] codetab = new int[HSIZE];
-
-    int hsize = HSIZE;		// for dynamic table sizing
-
-    int free_ent = 0;			// first unused entry
-
-    // block compression parameters -- after all codes are used up,
-    // and compression rate changes, start over.
-    boolean clear_flg = false;
-
-    // Algorithm:  use open addressing double hashing (no chaining) on the
-    // prefix code / next character combination.  We do a variant of Knuth's
-    // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
-    // secondary probe.  Here, the modular division first probe is gives way
-    // to a faster exclusive-or manipulation.  Also do block compression with
-    // an adaptive reset, whereby the code table is cleared when the compression
-    // ratio decreases, but after the table fills.  The variable-length output
-    // codes are re-sized at this point, and a special CLEAR code is generated
-    // for the decompressor.  Late addition:  construct the table according to
-    // file size for noticeable speed improvement on small files.  Please direct
-    // questions about this implementation to ames!jaw.
-
-    int g_init_bits;
-
-    int ClearCode;
-    int EOFCode;
-
-    void compress( int init_bits, OutputStream outs ) throws IOException
-	{
-	int fcode;
-	int i /* = 0 */;
-	int c;
-	int ent;
-	int disp;
-	int hsize_reg;
-	int hshift;
-
-	// Set up the globals:  g_init_bits - initial number of bits
-	g_init_bits = init_bits;
-
-	// Set up the necessary values
-	clear_flg = false;
-	n_bits = g_init_bits;
-	maxcode = MAXCODE( n_bits );
-
-	ClearCode = 1 << ( init_bits - 1 );
-	EOFCode = ClearCode + 1;
-	free_ent = ClearCode + 2;
-
-	char_init();
-
-	ent = GIFNextPixel();
-
-	hshift = 0;
-	for ( fcode = hsize; fcode < 65536; fcode *= 2 )
-	    ++hshift;
-	hshift = 8 - hshift;			// set hash code range bound
-
-	hsize_reg = hsize;
-	cl_hash( hsize_reg );	// clear hash table
-
-	output( ClearCode, outs );
-
-	outer_loop:
-	while ( (c = GIFNextPixel()) != EOF )
-	    {
-	    fcode = ( c << maxbits ) + ent;
-	    i = ( c << hshift ) ^ ent;		// xor hashing
-
-	    if ( htab[i] == fcode )
-		{
-		ent = codetab[i];
-		continue;
-		}
-	    else if ( htab[i] >= 0 )	// non-empty slot
-		{
-		disp = hsize_reg - i;	// secondary hash (after G. Knott)
-		if ( i == 0 )
-		    disp = 1;
-		do
-		    {
-		    if ( (i -= disp) < 0 )
-			i += hsize_reg;
-
-		    if ( htab[i] == fcode )
-			{
-			ent = codetab[i];
-			continue outer_loop;
-			}
-		    }
-		while ( htab[i] >= 0 );
-		}
-	    output( ent, outs );
-	    ent = c;
-	    if ( free_ent < maxmaxcode )
-		{
-		codetab[i] = free_ent++;	// code -> hashtable
-		htab[i] = fcode;
-		}
-	    else
-		cl_block( outs );
-	    }
-	// Put out the final code.
-	output( ent, outs );
-	output( EOFCode, outs );
-	}
-
-    // output
-    //
-    // Output the given code.
-    // Inputs:
-    //      code:   A n_bits-bit integer.  If == -1, then EOF.  This assumes
-    //              that n_bits =< wordsize - 1.
-    // Outputs:
-    //      Outputs code to the file.
-    // Assumptions:
-    //      Chars are 8 bits long.
-    // Algorithm:
-    //      Maintain a BITS character long buffer (so that 8 codes will
-    // fit in it exactly).  Use the VAX insv instruction to insert each
-    // code in turn.  When the buffer fills up empty it and start over.
-
-    int cur_accum = 0;
-    int cur_bits = 0;
-
-    int masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
-		    0x001F, 0x003F, 0x007F, 0x00FF,
-		    0x01FF, 0x03FF, 0x07FF, 0x0FFF,
-		    0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-    void output( int code, OutputStream outs ) throws IOException
-	{
-	cur_accum &= masks[cur_bits];
-
-	if ( cur_bits > 0 )
-	    cur_accum |= ( code << cur_bits );
-	else
-	    cur_accum = code;
-
-	cur_bits += n_bits;
-
-	while ( cur_bits >= 8 )
-	    {
-	    char_out( (byte) ( cur_accum & 0xff ), outs );
-	    cur_accum >>= 8;
-	    cur_bits -= 8;
-	    }
-
-	// If the next entry is going to be too big for the code size,
-	// then increase it, if possible.
-       if ( free_ent > maxcode || clear_flg )
-	    {
-	    if ( clear_flg )
-		{
-		maxcode = MAXCODE(n_bits = g_init_bits);
-		clear_flg = false;
-		}
-	    else
-		{
-		++n_bits;
-		if ( n_bits == maxbits )
-		    maxcode = maxmaxcode;
-		else
-		    maxcode = MAXCODE(n_bits);
-		}
-	    }
-
-	if ( code == EOFCode )
-	    {
-	    // At EOF, write the rest of the buffer.
-	    while ( cur_bits > 0 )
-		{
-		char_out( (byte) ( cur_accum & 0xff ), outs );
-		cur_accum >>= 8;
-		cur_bits -= 8;
-		}
-
-	    flush_char( outs );
-	    }
-	}
-
-    // Clear out the hash table
-
-    // table clear for block compress
-    void cl_block( OutputStream outs ) throws IOException
-	{
-	cl_hash( hsize );
-	free_ent = ClearCode + 2;
-	clear_flg = true;
-
-	output( ClearCode, outs );
-	}
-
-    // reset code table
-    void cl_hash( int hsize )
-	{
-	for ( int i = 0; i < hsize; ++i )
-	    htab[i] = -1;
-	}
-
-    // GIF Specific routines
-
-    // Number of characters so far in this 'packet'
-    int a_count;
-
-    // Set up the 'byte output' routine
-    void char_init()
-	{
-	a_count = 0;
-	}
-
-    // Define the storage for the packet accumulator
-    byte[] accum = new byte[256];
-
-    // Add a character to the end of the current packet, and if it is 254
-    // characters, flush the packet to disk.
-    void char_out( byte c, OutputStream outs ) throws IOException
-	{
-	accum[a_count++] = c;
-	if ( a_count >= 254 )
-	    flush_char( outs );
-	}
-
-    // Flush the packet to disk, and reset the accumulator
-    void flush_char( OutputStream outs ) throws IOException
-	{
-	if ( a_count > 0 )
-	    {
-	    outs.write( a_count );
-	    outs.write( accum, 0, a_count );
-	    a_count = 0;
-	    }
-	}
-
-    }
-
-class GifEncoderHashitem
-    {
-
-    public int rgb;
-    public int count;
-    public int index;
-    public boolean isTransparent;
-
-    public GifEncoderHashitem( int rgb, int count, int index, boolean isTransparent )
-	{
-	this.rgb = rgb;
-	this.count = count;
-	this.index = index;
-	this.isTransparent = isTransparent;
-	}
-
-    }
diff --git a/java/ImageProcessing/framework/Hierarchy.java b/java/ImageProcessing/framework/Hierarchy.java
deleted file mode 100644
index 41b1825ef4d..00000000000
--- a/java/ImageProcessing/framework/Hierarchy.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.util.Vector;
-
-public class Hierarchy extends Canvas
-{
-  // Attributes
-  private String name_;
-  private Hierarchy root_;
-  private Hierarchy parent_;
-  private Icon icon_ = null;
-  
-  // State
-  private boolean collapsed_ = true;
-  private boolean deadend_ = true;
-  private Vector contained_ = new Vector();
-  private Rectangle self_;
-  private Rectangle scope_;
-  
-  // Constants
-  private Color COLOR = Color.black;
-  private Font FONT = new Font("Dialog", Font.BOLD, 12);
-  private static int TRI_HEIGHT = 8;
-  private int SPACE = 15;
-
-  static Hierarchy last_lit_ = null;
-  
-  public Hierarchy(String name, boolean root)
-  {
-    name_ = name;
-    
-    if (root)
-      {
-	deadend_ = false;
-	root_ = this;
-	parent_ = null;
-      }
-  }
-  
-  public Hierarchy(String name, Icon icon, boolean root)
-  {
-    this(name, root);
-    icon_ = icon;
-  }
-
-  public Hierarchy(String name)
-  {
-    this(name, false);
-  }
-  
-  public Hierarchy(String name, Icon icon)
-  {
-    this(name, icon, false);
-  }
-
-  public void setExpandable(boolean expandable)
-  {
-    deadend_ = ! expandable;
-
-    /*
-    if (root_ != null)
-      root_.repaint();
-      */
-  }
-
-  public void setCollapsed(boolean collapsed)
-  {
-    collapsed_ = collapsed;
-
-    if (root_ != null)
-      root_.repaint();
-  }
-
-  public void addEntry(Hierarchy entry)
-  {
-    deadend_ = false;
-    entry.parent_ = this;
-    entry.root_ = root_;
-    entry.FONT = FONT;
-    entry.COLOR = COLOR;
-    entry.SPACE = SPACE;
-
-    contained_.addElement(entry);
-  }
-
-  public boolean removeEntry(String name)
-  {
-    if (contained_.size() == 1)
-      deadend_ = true;
-    
-    return contained_.removeElement(name);
-  }
-
-  public String getName()
-  {
-    return name_;
-  }
-
-  public void setName(String name)
-  {
-    name_ = name;
-  }
-
-  public Hierarchy getHierarchyParent()
-  {
-    return parent_;
-  }
-
-  public void setFont(Font font)
-  {
-    FONT = font;
-  }
-
-  public void setColor(Color color)
-  {
-    COLOR = color;
-  }
-
-  public void setSpace(int space)
-  {
-    SPACE = space;
-  }
-
-  public void handleEvent() {}
-
-  public boolean mouseDown(Event evt, int x, int y)
-  {
-    Hierarchy value = mouseInside(x, y);
-
-    if (value != null)
-      {
-	if (! value.deadend_)
-	  {
-	    if (x < value.self_.x + TRI_HEIGHT + SPACE)
-	      {
-		value.collapsed_ = ! value.collapsed_;
-		if (value.contained_.isEmpty())
-		  value.handleEvent();
-		repaint();
-	      }
-	  }
-	else
-	  {
-	    if (value.contained_.isEmpty())
-	      value.handleEvent();
-	  }
-      }
-    
-    return false;
-  }
-  
-  public boolean mouseMove(Event evt, int x, int y)
-  {
-    Hierarchy value = mouseInside(x, y);
-
-    if ((value != last_lit_) && (last_lit_ != null))
-      last_lit_.highlight(getGraphics(), false);
-    
-    if (value != null && value.deadend_)
-      value.highlight(getGraphics(), true);
-    
-    last_lit_ = value;
-    
-    return false;
-  }
-
-  public void paint(Graphics g)
-  {
-    Dimension d = size();
-
-    drawLevel(g, SPACE, SPACE);
-
-    if (d.width < scope_.width || d.height < scope_.height ||
-	d.width > scope_.width || d.height > scope_.height)
-	resize(scope_.width, scope_.height);
-  }
-
-  
-  private Point drawLevel(Graphics g, int x, int y)
-  {
-    g.setFont(FONT);
-    FontMetrics font_metrics = g.getFontMetrics();
-    int string_height = font_metrics.getHeight();
-    int string_width = font_metrics.stringWidth(name_); 
-    int entry_height = string_height;
-    int entry_width = string_width + 2*SPACE + TRI_HEIGHT;
-    int total_height, total_width, initial_x = x, initial_y = y;
-    int indent = SPACE + TRI_HEIGHT/2;
-    int temp_x = x;
-    Point place_marker;
-    Hierarchy entry;
-
-    if (icon_ != null)
-      {
-	entry_height = Math.max(string_height, icon_.iconSize().height);
-	entry_width += icon_.iconSize().width + SPACE;
-	indent += icon_.iconSize().width/2;
-	if (! deadend_)
-	  drawShape(g, x, y + (entry_height - TRI_HEIGHT)/2, deadend_, collapsed_);
-      }
-    else
-      drawShape(g, x, y + (entry_height - TRI_HEIGHT)/2, deadend_, collapsed_);
-    
-    self_ = new Rectangle(initial_x, initial_y, entry_width, entry_height);
-
-    temp_x += TRI_HEIGHT + SPACE;
-
-    if (icon_ != null)
-      {
-	icon_.drawIcon(g, temp_x, y, root_);
-	temp_x += SPACE + icon_.iconSize().width;
-      }
-
-    g.setColor(COLOR);
-   
-    g.drawString(name_, temp_x, y + (entry_height + string_height)/2);
-
-    total_width = entry_width;
-    y += entry_height + SPACE;
-    
-    if (! (deadend_ || collapsed_))
-      {	
-	x += indent;
-	for (int i = 0; i < contained_.size(); i++)
-	  {
-	    entry = (Hierarchy)contained_.elementAt(i);
-	    place_marker = entry.drawLevel(g, x, y);
-	    total_width = Math.max(total_width, entry.scope_.width + indent + SPACE);
-	    x = place_marker.x;
-	    y = place_marker.y;
-	  }
-	x -= indent;
-      }     
-
-    total_height = y - initial_y;
-    scope_ = new Rectangle(initial_x, initial_y, total_width, total_height);
-    
-    return new Point(x, y);
-  }
-
-  private Hierarchy mouseInside(int x, int y)
-  {
-    Hierarchy entry;
-    Hierarchy return_value = null;
-
-    if (self_.inside(x, y))
-      {
-	return_value = this;
-      }
-    else
-      {
-	if (scope_.inside(x, y) && (! collapsed_))
-	  {
-	    for (int i = 0; i < contained_.size(); i++)
-	      {
-		entry = (Hierarchy)contained_.elementAt(i);
-		if ((return_value = entry.mouseInside(x, y)) != null)
-		  break;		
-	      }
-	  }
-	else
-	  return_value =  null;
-      }
-
-    return return_value;
-  }
-
-  private void highlight(Graphics g, boolean lit)
-  {  
-    g.setFont(FONT);
-    FontMetrics fm = g.getFontMetrics();
-    int string_height = fm.getHeight();
-    int x = self_.x + SPACE + TRI_HEIGHT;
-    int y = self_.y;
-
-    if (icon_ != null)
-      x += icon_.iconSize().width + SPACE;
-    
-    if (lit) 
-      g.setColor(Color.magenta);
-    else
-      g.setColor(COLOR);
-    
-    g.drawString(name_, x, y + (self_.height + string_height)/2);
-  } 
-
-  
-  private static void drawShape(Graphics g, int x, int y, boolean dead_end, boolean collapsed)   
-  {
-    int xpoints[] = new int[3];
-    int ypoints[] = new int[3];
-
-    xpoints[0] = x;
-    ypoints[0] = y;
-
-    if (dead_end)
-      {
-	g.fillOval(x, y, TRI_HEIGHT, TRI_HEIGHT);
-      }
-    else
-      {
-	// Draw a small collapsed triangle: |>
-	if (collapsed)
-	  {
-	    xpoints[1] = x;
-	    xpoints[2] = x + TRI_HEIGHT;
-	    ypoints[1] = y + TRI_HEIGHT;
-	    ypoints[2] = y + TRI_HEIGHT/2;
-	    g.fillPolygon(xpoints, ypoints, 3);
-	  }
-	//Draw a small uncollapsed triangle
-	else
-	  {
-	    xpoints[1] = x + TRI_HEIGHT;
-	    xpoints[2] = x + TRI_HEIGHT/2;
-	    ypoints[1] = y;
-	    ypoints[2] = y + TRI_HEIGHT;
-	    g.fillPolygon(xpoints, ypoints, 3);
-	  }
-      }
-  }
-
- private static void drawVertHashedLine(Graphics g, int x, int y1, int y2, int hashsize)
-  {
-    for (int ytemp = y1; ytemp < y2; ytemp += hashsize*3)
-      {
-	if (y2 - hashsize < ytemp)
-	  g.drawLine(x, ytemp, x, y2);
-	else
-	  g.drawLine(x, ytemp, x, ytemp + hashsize);
-      }
-  }
-  
-  private static void drawHoroHashedLine(Graphics g, int y, int x1, int x2, Color color, int hashsize)
-  {
-    for (int xtemp = x1; xtemp < x2; xtemp += hashsize*3)
-      {
-	if (x2 - hashsize < xtemp)
-	  g.drawLine(xtemp, y, x1, y);
-	else
-	  g.drawLine(xtemp, y, xtemp + hashsize, y);
-      }
-  }
-}
-
-
diff --git a/java/ImageProcessing/framework/HierarchyAdapter.java b/java/ImageProcessing/framework/HierarchyAdapter.java
deleted file mode 100644
index a265be656ea..00000000000
--- a/java/ImageProcessing/framework/HierarchyAdapter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-class HierarchyAdapter extends Hierarchy
-{
-  public HierarchyAdapter(String name, boolean root)
-  {
-    super(name, root);
-  }
-  
-  public HierarchyAdapter(String name, Icon icon, boolean root)
-  {
-    super(name, icon, root);
-  }
-
-  public HierarchyAdapter(String name)
-  {
-    super(name);
-  }
-  
-  public HierarchyAdapter(String name, Icon icon)
-  {
-    super(name, icon);
-  }
-
-  public void paint(Graphics g)
-    {
-      super.paint(g);
-      
-      Container p = getParent().getParent();
-      p.getLayout ().layoutContainer (p);
-    }
-}
diff --git a/java/ImageProcessing/framework/Icon.java b/java/ImageProcessing/framework/Icon.java
deleted file mode 100644
index eed91ed55c7..00000000000
--- a/java/ImageProcessing/framework/Icon.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.applet.*;
-import java.net.*;
-
-public class Icon
-{
-  protected Image icon_;
-  protected Dimension iconSize_;
-  
-  Icon()
-  {
-    super();
-  }
-  
-  Icon(String file_name, Component comp)
-  {
-    this.icon_ = Toolkit.getDefaultToolkit().getImage(file_name);
-    this.loadImage(comp);
-  }
-  
-  Icon(Image icon_image, Component comp)
-  {
-    this.icon_ = icon_image;
-    this.loadImage(comp);
-  }
-
-  Icon(String url, Applet applet) throws MalformedURLException
-  {
-    this.icon_ = applet.getImage(new URL(url));
-    loadImage(applet);
-  }
-  
-  public void drawIcon(Graphics g, int x, int y, Component comp)
-  {
-    g.drawImage(this.icon_, x, y, comp);
-  }
-  
-  private void loadImage(Component comp)
-  {
-    try
-      {
-	MediaTracker tracker = new MediaTracker(comp);
-	tracker.addImage(this.icon_, 0);
-        tracker.waitForID(0);
-
-	this.iconSize_ = new Dimension(this.icon_.getWidth(comp), this.icon_.getHeight(comp));
-      }
-    catch (InterruptedException excp)
-      {
-        System.err.println("Icon::getIcon image failed to load");
-      }
-  }
-
-  public Dimension iconSize()
-  {
-    return this.iconSize_;
-  }
-
-  public Image getIconImage()
-  {
-    return this.icon_;
-  }
-
-}
-
-
-
-
diff --git a/java/ImageProcessing/framework/ImageApp.java b/java/ImageProcessing/framework/ImageApp.java
deleted file mode 100644
index 486f45b9afb..00000000000
--- a/java/ImageProcessing/framework/ImageApp.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package imaging.framework;
-
-import java.util.*;
-import java.awt.*;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import java.applet.*;
-import gjt.Separator;
-import gjt.Util;
-
-public class ImageApp extends Applet
-{
-  public void init ()
-  {
-    // Use BorderLayout for our applet frame
-    this.setLayout (new BorderLayout ());
-
-    // Now load all the filters specified in the config file
-    //    this.loadFilters ();
-    this.setupButtonPanel ();
-    this.add ("Center", this.imageCanvas_);
-    // Check if we are running in test mode
-    String testFile = getParameter ("testFile");
-    if (testFile != null)
-      {
-	this.tester_ = new Tester (testFile, this);
-	this.tester_.initialize ();
-      }
-    // Initialize the DialogManager
-    DialogManager.initialize (this);
-  }
-
-  private void setupButtonPanel ()
-  {
-    Panel southPanel = new Panel ();
-    southPanel.setLayout (new BorderLayout ());
-    
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new GridLayout (1, 5));
-
-    this.statusDisplay_ = new StatusDisplay ();
-    // Create a panel for all the buttons
-    this.filePanel_ = new FilePanel (this);
-    this.resetPanel_ = new ResetPanel (this);
-    this.zoomPanel_ = new ZoomPanel (this);
-    this.filterPanel_ = new FilterPanel (this);
-    this.helpPanel_ = new HelpPanel (this);
-
-    buttonPanel.add (this.filePanel_);
-    buttonPanel.add (this.resetPanel_);
-    buttonPanel.add (this.zoomPanel_);
-    buttonPanel.add (this.filterPanel_);
-    buttonPanel.add (this.helpPanel_);
-
-    southPanel.add ("North", new Separator ());
-    southPanel.add ("Center", buttonPanel);
-    southPanel.add ("South", this.statusDisplay_);
-
-    southPanel.resize (400, 400);
-  
-    // Now add all these components to the main frame
-    this.add ("South", southPanel);
-    this.add ("North", new Panel ()); // Empty panel (for aesthetics)
-    //    this.add ("East", new Panel ()); // Empty panel (for aesthetics)
-    //    this.add ("West", new Panel ()); // Empty panel (for aesthetics)
-  }
-
-  public void displayStatus (String s)
-  {
-    this.statusDisplay_.setText (s);
-  }
-
-  // Handle all action events
-  public void zoomFactor (double zoomFactor)
-  {
-    this.imageCanvas_.zoomFactor (zoomFactor);
-  }
-
-  public void reloadFilters ()
-  {
-    this.filterPanel_.loadFilters ();
-    repaint ();
-  }
-  
-  public Hashtable filterTable ()
-  {
-    return this.filterTable_;
-  }
-
-  public ImageFilter getFilter (String s)
-  {
-    return (ImageFilter) this.filterTable_.get (s);
-  }
-
-  public void apply ()
-  {
-    ImageFilter filter = this.getFilter (this.filterPanel_.choice ().getSelectedItem ());
-    this.apply (filter);
-  }
-
-  public void apply (ImageFilter filter)
-  {
-    if (filter != null)
-      {
-	Util.getFrame (this).setCursor (Frame.WAIT_CURSOR);
-	this.imageCanvas_.applyFilter (filter);
-	Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-      }
-  }
-
-  public void resetImage ()
-  {
-    this.imageCanvas_.applyFilter (null);
-  }
-
-  public int openURL (String url)
-  {
-    if (url == null)
-      return -1;
-
-    Image image = null;
-    try
-      {
-	System.out.println("Getting image");
-	image = getImage (new URL (url));
-	System.out.println("Done");
-      }
-    catch (MalformedURLException e)
-      {
-	return -1;
-      }
-
-    if (image != null)
-      {
-	// Check if the image was actually loaded. Note that we have
-	// to wait for the potential image to finish loading before we
-	// know if it is a valid image.
-	if (this.imageCanvas_.setImage (image) == -1)
-	  return -1;
-	else
-	  this.filePanel_.enableSaveButton ();
-      }
-    else
-      return -1;
-    return 0;
-  }
-
-  // maintain compatibility
-  public void saveFile (String url)
-    {
-      this.saveFile (url, null);
-    }
-
-  public void saveFile (String url, String authentication)
-  {
-    ImageSender imageSender = new ImageSender (this);
-    imageSender.open (this.imageCanvas_.getImage (), url);
-    int bytesSent = imageSender.send (authentication);
-    if (bytesSent == -1)
-      DialogManager.popDialog (DialogType.NOT_SUPPORTED,
-			       "Server does not support uploading or URL not found");
-  }
-
-  public Choice getFilters () 
-  {
-    Choice choice = new Choice ();
-
-    // Add the default choice first
-    choice.addItem ("Filters:");
-
-    // Now do the file processing -- to determine which filters need
-    // to be loaded.
-
-    // Check if the filename has been previously specified and
-    // if not then check if the user has specified the name of the
-    // config file
-    if (this.configFile_ == null) 
-      this.configFile_ = getParameter ("configFile");
-
-      /*
-      if (this.configFile_ == null)
-	this.configFile_ = "http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/filter.conf";
-	*/
-
-    if (this.configFile_ == null)
-      this.configFile_ = this.getCodeBase().toString() + "../ImageProcessing/framework/filter.conf";
-
-    String configInfo = null;
-
-    // Only get the file as a URL if it was specified as an http style parameter!
-    if ((this.configFile_ != null) && ((this.configFile_.startsWith("http://")) ||
-				       (this.configFile_.startsWith("file://")) ||
-				       (this.configFile_.startsWith("ftp://")))) {
-
-      URL url;
-
-      try
-	{
-	  System.out.println ("Configuration File: " + this.configFile_);
-	  // Create a new URL
-	  url = new URL (this.configFile_);
-
-	  // Get the input stream and pipe it to a DataInputStream
-	  DataInputStream iStream = new DataInputStream (url.openStream ());
-
-	  // Create a buffer to hold all the data we get
-	  StringBuffer tempBuf = new StringBuffer ();
-	  // Keep reading the data until we are done
-	  String tempString = iStream.readLine ();
-	  while (tempString != null)
-	  {
-	    tempBuf.append (tempString);
-	    tempBuf.append (" ");
-	    tempString = iStream.readLine ();
-	  }
-	  configInfo = tempBuf.toString ();
-	}
-      catch (MalformedURLException e)
-	{
-	  System.err.println (e);
-	}
-      catch (IOException e)
-	{
-	  System.err.println (e);
-	}
-    }
-
-    if (configInfo != null)
-      {
-	try
-	  {
-	    StringTokenizer tokens = new StringTokenizer (configInfo);
-	    String fullFilterName = null;
-	    String filterName = null;
-	    // Now parse the string, picking up filter names. Use these
-	    // names to load the actual filters as well add new choices to
-	    // the filter choices.
-	    while (tokens.hasMoreTokens ())
-	      {
-		// Get the next token
-		fullFilterName = tokens.nextToken ();
-		filterName = this.extractFilterName (fullFilterName);
-		
-		System.out.println ("Loading: " + fullFilterName);
-		// Load the filter class
-		Class c = Class.forName (fullFilterName);
-		  //		Class c = this.filterRepository_.load (filter);
-		
-		// Add the filter to the Filter Repository
-		this.filterTable_.put (filterName, 
-				       (ImageFilter) c.newInstance ());
-	    
-		// Add filter name to the list of filter choices
-		choice.addItem (filterName);
-	      }
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-	catch (IllegalAccessException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-	catch (InstantiationException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-      }
-    return choice;
-  }
-
-  // Extract the short filter name from the full filter name. For
-  // example, this method returns "EmbossFilter" if it is given the
-  // string "imaging/filters/EmbossFilter" 
-  private String extractFilterName (String s)
-  {
-    String filterName = null;
-    StringTokenizer tokens = new StringTokenizer (s, ".");
-    while (tokens.hasMoreTokens ())
-      filterName = tokens.nextToken ();
-    return filterName;
-  }
-
-  private Panel centerPanel_ = new Panel ();
-  private String configFile_ = null;
-  private Choice choice_ = null;
-  private ImageCanvas imageCanvas_ = new ImageCanvas ();
-  private FilePanel filePanel_;
-  private ResetPanel resetPanel_;
-  private ZoomPanel zoomPanel_;
-  private FilterPanel filterPanel_;
-  private HelpPanel helpPanel_;
-
-  private StatusDisplay statusDisplay_;
-  private Hashtable filterTable_ = new Hashtable ();
-  private Tester tester_;
-  
-}
diff --git a/java/ImageProcessing/framework/ImageByteCounter.java b/java/ImageProcessing/framework/ImageByteCounter.java
deleted file mode 100644
index c907c9f1c92..00000000000
--- a/java/ImageProcessing/framework/ImageByteCounter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.awt.*;
-import java.applet.*;
-import java.net.*;
-import JACE.OS.*;
-
-public class ImageByteCounter
-{
-  public ImageByteCounter (String title, Image image, Applet parent)
-  {
-    this.image_ = image;
-    this.parent_ = parent;
-
-    Image im = null;
-    try
-      {
-	im = this.parent_.getImage (new URL (this.parent_.getCodeBase () + 
-					     "../ImageProcessing/framework/" +
-					     "10.gif"));
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    indicator_ = new StatusIndicator ("", im);
-  }
-
-  public int count ()
-  {
-    int length = 0;
-    try
-      {
-	GIFOutputStream ostream = new GIFOutputStream (indicator_);
-	//	GIFOutputStream ostream = new GIFOutputStream (null);
-	GifEncoder encoder = new GifEncoder (this.image_, ostream);
-	encoder.encode ();
-
-	length = ostream.count ();
-	System.out.println ("send: " + length);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Exception generating gif");
-      }
-    indicator_.dispose ();
-    return length;
-  }
-
-  Image image_ = null;
-  StatusIndicator indicator_ = null;
-  boolean done_ = false;
-  Applet parent_;
-}
-
-class GIFOutputStream extends OutputStream
-{
-  public GIFOutputStream (StatusIndicator indicator)
-  {
-    super ();
-    this.indicator_ = indicator;
-  }
-
-  public synchronized void write (int b) throws IOException 
-    {
-      bytesWritten_++;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public synchronized void write (byte buf[]) throws IOException 
-    {
-      bytesWritten_ += buf.length;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public synchronized void write (byte buf[], int offset, int length) throws IOException 
-    {
-      bytesWritten_ += length;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public int count ()
-    {
-      return this.bytesWritten_;
-    }
-
-  private int bytesWritten_ = 0;
-  private StatusIndicator indicator_ = null;
-}
diff --git a/java/ImageProcessing/framework/ImageCanvas.java b/java/ImageProcessing/framework/ImageCanvas.java
deleted file mode 100644
index 182bd54bf9b..00000000000
--- a/java/ImageProcessing/framework/ImageCanvas.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import gjt.Util;
-import JACE.OS.*;
-
-class ImageCanvas extends Canvas
-{
-  public static final double MAX_ZOOM = 4.0;
-  public static final double MIN_ZOOM = 0.5;
-
-  public int setImage (Image image)
-  {
-    int flags = 0;
-    if (image != null)
-      {
-	// Load the image
-	this.tracker_.addImage(image, 0);
-	try { this.tracker_.waitForID(0); } catch(InterruptedException excp) {}
-
-	// Check if the image was actually loaded. Note that we have
-	// to wait for the potential image to finish loading before we
-	// know if it is a valid image.
-	flags = this.checkImage (image, this);
-	if (ACE.BIT_ENABLED (flags, ImageObserver.ERROR))
-	  return -1;
-
-	// If we reached here, it means image was loaded successfully so cache it
-	this.image_ = image;
-	this.originalImage_ = this.image_;
-	
-	this.x_ = (this.size ().width - this.image_.getWidth (this))/2;
-	this.y_ = (this.size ().height - this.image_.getHeight (this))/2;
-	this.original_x_ = this.x_;
-	this.original_y_ = this.y_;
-	repaint ();
-      }
-    return 0;
-  }
-
-  public Image getImage ()
-  {
-    return this.image_;
-  }
-
-  public void paint (Graphics g)
-  {
-    this.setBackground (Color.white);
-    if (this.image_ != null)
-      g.drawImage(this.image_, 
-		  this.x_, this.y_,
-		  (int) (this.image_.getWidth (this) * this.zoom_),
-		  (int) (this.image_.getHeight (this) * this.zoom_),
-		  this);
-  }
-
-  public void applyFilter (ImageFilter filter)
-  {
-    if (this.image_ != null)
-      {
-	Image temp;
-	if (filter == null)
-	  {
-	    temp = this.originalImage_;
-	    this.x_ = this.original_x_;
-	    this.y_ = this.original_y_;
-	    this.zoom_ = 1.0;
-	  }
-	else
-	  temp = this.ip_.processImage(this.image_, filter, this);
-	
-	this.tracker_.addImage(temp, 0);
-	try { this.tracker_.waitForID(0); } catch(InterruptedException excp) {}
-	
-	this.image_ = temp;
-
-	// Originally I needed to flush the pixel data for the image to be
-	// drawn properly. When running the applet in appletviewer, the
-	// image used to jump around, but running in a browser seems to be
-	// ok.  
-	//this.image_.flush();
-	repaint ();
-      }
-  }
-
-  public void zoomFactor (double zoom)
-  {
-    this.zoom_ *= zoom;
-    if (this.zoom_ > ImageCanvas.MAX_ZOOM)
-      this.zoom_ = ImageCanvas.MAX_ZOOM;
-    else if (this.zoom_ < ImageCanvas.MIN_ZOOM)
-      this.zoom_ = ImageCanvas.MIN_ZOOM;
-
-    repaint ();
-  }
-
-  public boolean mouseDown (Event evt, int x, int y)
-  {
-    if (inBounds (x, y))
-      {
-	this.selected_ = true;
-	this.last_x_ = x;
-	this.last_y_ = y;
-      }
-    return true;
-  }
-
-  public boolean mouseUp (Event evt, int x, int y)
-  {
-    this.selected_ = false;
-    return true;
-  }
-
-  public boolean mouseDrag (Event evt, int x, int y)
-  {
-    if (this.selected_)
-      {
-	this.x_ = x - (this.last_x_ - this.x_);
-	this.y_ = y - (this.last_y_ - this.y_);
-	this.last_x_ = x;
-	this.last_y_ = y;
-	repaint ();
-      }
-    return true;
-  }
-
-  public boolean mouseMove (Event evt, int x, int y)
-  {
-    if (this.image_ != null && inBounds (x, y))
-      Util.getFrame (this).setCursor (Frame.HAND_CURSOR);
-    else
-      Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-    return true;	
-  }
-
-  public boolean mouseExit (Event evt, int x, int y)
-  {
-    Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-    return true;
-  }
-
-  // Check if  mouse is within the bounds of the image
-  private boolean inBounds (int x, int y)
-  {
-    if (this.image_ == null)
-      return false;
-    else
-      return (x >= this.x_) &&
-	     (y >= this.y_) &&
-             (x <= (this.x_ + this.zoom_ * this.image_.getWidth (this))) &&
-             (y <= (this.y_ + this.zoom_ * this.image_.getHeight (this)));
-  }
-
-  private MediaTracker tracker_ = new MediaTracker(this);
-  private Image image_, originalImage_;
-  private int x_ = 0, y_ = 0;
-  private int original_x_ = 0, original_y_ = 0;
-  private int width_ = 0, height_ = 0;
-  private ImageProcessor ip_ = new ImageProcessor ();
-  private boolean selected_ = false;
-  private int last_x_ = 0, last_y_ = 0;
-  private double zoom_ = 1.0;
-
-}
-
diff --git a/java/ImageProcessing/framework/ImageEncoder.java b/java/ImageProcessing/framework/ImageEncoder.java
deleted file mode 100644
index a0aac0d559f..00000000000
--- a/java/ImageProcessing/framework/ImageEncoder.java
+++ /dev/null
@@ -1,271 +0,0 @@
-// ImageEncoder - abstract class for writing out an image
-//
-// Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-import java.io.*;
-import java.awt.Image;
-import java.awt.image.*;
-
-/// Abstract class for writing out an image.
-// <P>
-// A framework for classes that encode and write out an image in
-// a particular file format.
-// <P>
-// This provides a simplified rendition of the ImageConsumer interface.
-// It always delivers the pixels as ints in the RGBdefault color model.
-// It always provides them in top-down left-right order.
-// If you want more flexibility you can always implement ImageConsumer
-// directly.
-// <P>
-// <A HREF="/resources/classes/Acme/JPM/Encoders/ImageEncoder.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see GifEncoder
-// @see PpmEncoder
-// @see Acme.JPM.Decoders.ImageDecoder
-
-public abstract class ImageEncoder implements ImageConsumer
-    {
-
-    protected OutputStream out;
-
-    private ImageProducer producer;
-    private int width = -1;
-    private int height = -1;
-    private int hintflags = 0;
-    private boolean started = false;
-    private boolean encoding;
-    private IOException iox;
-    private static final ColorModel rgbModel = ColorModel.getRGBdefault();
-    private Hashtable props = null;
-
-    /// Constructor.
-    // @param img The image to encode.
-    // @param out The stream to write the bytes to.
-    public ImageEncoder( Image img, OutputStream out ) throws IOException
-	{
-	this( img.getSource(), out );
-	}
-
-    /// Constructor.
-    // @param producer The ImageProducer to encode.
-    // @param out The stream to write the bytes to.
-    public ImageEncoder( ImageProducer producer, OutputStream out ) throws IOException
-	{
-	this.producer = producer;
-	this.out = out;
-	}
-
-
-    // Methods that subclasses implement.
-
-    /// Subclasses implement this to initialize an encoding.
-    abstract void encodeStart( int w, int h ) throws IOException;
-
-    /// Subclasses implement this to actually write out some bits.  They
-    // are guaranteed to be delivered in top-down-left-right order.
-    // One int per pixel, index is row * scansize + off + col,
-    // RGBdefault (AARRGGBB) color model.
-    abstract void encodePixels(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException;
-
-    /// Subclasses implement this to finish an encoding.
-    abstract void encodeDone() throws IOException;
-
-
-    // Our own methods.
-
-    /// Call this after initialization to get things going.
-    public synchronized void encode() throws IOException
-	{
-	encoding = true;
-	iox = null;
-	producer.startProduction( this );
-	while ( encoding )
-	    try
-		{
-		wait();
-		}
-	    catch ( InterruptedException e ) {}
-	if ( iox != null )
-	    throw iox;
-	}
-
-    private boolean accumulate = false;
-    private int[] accumulator;
-
-    private void encodePixelsWrapper(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException
-	{
-	if ( ! started )
-	    {
-	    started = true;
-	    encodeStart( width, height );
-	    if ( ( hintflags & TOPDOWNLEFTRIGHT ) == 0 )
-		{
-		accumulate = true;
-		accumulator = new int[width * height];
-		}
-	    }
-	if ( accumulate )
-	    for ( int row = 0; row < h; ++row )
-		System.arraycopy(
-		    rgbPixels, row * scansize + off,
-		    accumulator, ( y + row ) * width + x,
-		    w );
-	else
-	    encodePixels( x, y, w, h, rgbPixels, off, scansize );
-	}
-
-    private void encodeFinish() throws IOException
-	{
-	if ( accumulate )
-	    {
-	    encodePixels( 0, 0, width, height, accumulator, 0, width );
-	    accumulator = null;
-	    accumulate = false;
-	    }
-	}
-
-    private synchronized void stop()
-	{
-	encoding = false;
-	notifyAll();
-	}
-
-
-    // Methods from ImageConsumer.
-
-    public void setDimensions( int width, int height )
-	{
-	this.width = width;
-	this.height = height;
-	}
-
-    public void setProperties( Hashtable props )
-	{
-	this.props = props;
-	}
-
-    public void setColorModel( ColorModel model )
-	{
-	// Ignore.
-	}
-
-    public void setHints( int hintflags )
-	{
-	this.hintflags = hintflags;
-	}
-
-    public void setPixels(
-	int x, int y, int w, int h, ColorModel model, byte[] pixels,
-	int off, int scansize )
-	{
-	int[] rgbPixels = new int[w];
-	for ( int row = 0; row < h; ++row )
-	    {
-	    int rowOff = off + row * scansize;
-	    for ( int col = 0; col < w; ++col )
-		rgbPixels[col] = model.getRGB( pixels[rowOff + col] & 0xff );
-	    try
-		{
-		encodePixelsWrapper( x, y + row, w, 1, rgbPixels, 0, w );
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		stop();
-		return;
-		}
-	    }
-	}
-
-    public void setPixels(
-	int x, int y, int w, int h, ColorModel model, int[] pixels,
-	int off, int scansize )
-	{
-	if ( model == rgbModel )
-	    {
-	    try
-		{
-		encodePixelsWrapper( x, y, w, h, pixels, off, scansize );
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		stop();
-		return;
-		}
-	    }
-	else
-	    {
-	    int[] rgbPixels = new int[w];
-            for ( int row = 0; row < h; ++row )
-		{
-		int rowOff = off + row * scansize;
-                for ( int col = 0; col < w; ++col )
-                    rgbPixels[col] = model.getRGB( pixels[rowOff + col] );
-		try
-		    {
-		    encodePixelsWrapper( x, y + row, w, 1, rgbPixels, 0, w );
-		    }
-		catch ( IOException e )
-		    {
-		    iox = e;
-		    stop();
-		    return;
-		    }
-		}
-	    }
-	}
-
-    public void imageComplete( int status )
-	{
-	producer.removeConsumer( this );
-	if ( status == ImageConsumer.IMAGEABORTED )
-	    iox = new IOException( "image aborted" );
-	else
-	    {
-	    try
-		{
-		encodeFinish();
-		encodeDone();
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		}
-	    }
-	stop();
-	}
-
-    }
diff --git a/java/ImageProcessing/framework/ImageProcessor.java b/java/ImageProcessing/framework/ImageProcessor.java
deleted file mode 100644
index 422298d508f..00000000000
--- a/java/ImageProcessing/framework/ImageProcessor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.util.Vector;
-
-public class ImageProcessor
-{
-  private Vector pipeline_ = new Vector();
-
-  
-  public ImageProcessor()
-  {
-  }
-
-  public void addFilter(String filter_name, ImageFilter filter)
-  {
-    pipeline_.addElement(new FilterNode(filter_name, filter));
-  }
-
-  public boolean removeFilter(String name)
-  {
-    FilterNode filter_node;
-    
-    for (int i = 0; i < pipeline_.size(); i++)
-      {
-	filter_node =  (FilterNode)pipeline_.elementAt(i);
-	if (name.equals(filter_node.getName()))
-	  {
-	    pipeline_.removeElementAt(i);
-	    pipeline_.trimToSize();
-	    return true;
-	  }
-      }
-
-    return false;
-  }
-
-  public Image processImage(Image image, ImageFilter filter, Component component)
-  {
-    Image old_image = image, new_image = old_image;
-    MediaTracker tracker = new MediaTracker(component);
-
-    try
-      {
-	new_image = component.createImage(new FilteredImageSource(old_image.getSource(), filter));
-	tracker.addImage(new_image, 0);
-	tracker.waitForID(0);
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("ImageProcessor::processImage Image failed to load.");
-	System.out.println(excp);
-	return null;
-      }
-
-    return new_image;
-  }
-  
-  public Image processImage(Image image, Component component)
-  {
-    Image old_image = image, new_image = null;
-    ImageFilter image_filter;
-    FilterNode filter_node;
-    MediaTracker tracker = new MediaTracker(component);
-
-    try
-      {
-	for (int i = 0; i < pipeline_.size(); i++)
-	  {
-	    filter_node = (FilterNode) pipeline_.elementAt(i);
-	    image_filter = filter_node.getFilter();
-	    new_image = component.createImage(new FilteredImageSource(old_image.getSource(), image_filter));
-	    old_image = new_image;
-	    tracker.addImage(new_image, 0);
-	    tracker.waitForID(0);
-	  }
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("ImageProcessor::processImage Image failed to load.");
-	System.out.println(excp);
-	return null;
-      }
-
-    return new_image;
-  }
-}
-
-  
-class FilterNode
-{
-  private String name_;
-  private ImageFilter filter_;
-
-  FilterNode(String name, ImageFilter filter)
-  {
-    name_ = name;
-    filter_ = filter;
-  }
-
-  String getName()
-  {
-    return name_;
-  }
-
-  ImageFilter getFilter()
-  {
-    return filter_;
-  }
-}
diff --git a/java/ImageProcessing/framework/ImageSender.java b/java/ImageProcessing/framework/ImageSender.java
deleted file mode 100644
index c1659267537..00000000000
--- a/java/ImageProcessing/framework/ImageSender.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.net.*;
-import java.io.*;
-import java.applet.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ImageSender 
-{
-  public ImageSender (Applet parent)
-  {
-    this.parent_ = parent;
-  }
-
-  // ****************** 
-  // Currently bombs if it's not in an http or / format
-  //
-  public void open (Image image, String url)
-  {
-    this.image_ = image;
-
-    this.hostname_ = url;
-    if (this.hostname_.startsWith ("http://"))
-      this.hostname_ = this.hostname_.substring (7);
-
-    int index = -1;
-    if ((index = this.hostname_.indexOf (":")) != -1)
-      {
-	String temp = this.hostname_.substring (index + 1);
-	int i = -1;
-	if ((i = temp.indexOf ("/")) != -1)
-	  {
-	    this.port_ = (new Integer (temp.substring (0, i))).intValue ();
-	    this.filename_ = temp.substring (i);
-	  }
-	this.hostname_ = this.hostname_.substring (0, index);
-      }
-    else
-      {
-	int i = -1;
-	if ((i = this.hostname_.indexOf ("/")) != -1)
-	  {
-	    this.filename_ = hostname_.substring (i);
-	  }
-	this.hostname_ = this.hostname_.substring (0, i);
-	this.port_ = 80;
-      }
-  }
-
-  // Maintain compatibility 
-  public int send ()
-    {
-      return send(null);
-    }
-
-  /*******************************************
-   * The authenication string allows the PUT command to work if the server
-   * accepts the basic HTTP 1.1 encryption scheme
-   *******************************************/
-  public int send (String authentication)
-  {
-    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_, this.parent_);
-    //    StatusIndicator indicator = new StatusIndicator ("");
-    //    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_, indicator);
-    int length = byteCounter.count ();
-    //    indicator.dispose ();
-    // First determine how many bytes we will be sending
-    /*
-    try
-      {
-	GIFOutputStream ostream = new GIFOutputStream ();
-	GifEncoder encoder = new GifEncoder (this.image_, ostream);
-	encoder.encode ();
-
-	length = ostream.count ();
-	System.out.println ("send: " + length);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Exception generating gif");
-      }
-      */
-
-    GIFHandler gifHandler;
-    if (authentication == null)
-      gifHandler = new GIFHandler (this.filename_, this.image_, length);
-    else
-      gifHandler = new GIFHandler (this.filename_, this.image_, length, authentication);
-
-    try
-      {
-	// Connect to the server and send the image
-	this.connector_.open (this.hostname_, this.port_);
-	this.connector_.connect (gifHandler);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    if (gifHandler.returnCode () != -1)
-      return gifHandler.bytesWritten ();
-    else
-      return -1;
-  }
-
-  private Image image_ = null;
-  String filename_;
-  String hostname_;
-  int port_;
-  Connector connector_ = new Connector ();
-  Applet parent_;
-}
-
diff --git a/java/ImageProcessing/framework/IntHashtable.java b/java/ImageProcessing/framework/IntHashtable.java
deleted file mode 100644
index 95e6cbc25e0..00000000000
--- a/java/ImageProcessing/framework/IntHashtable.java
+++ /dev/null
@@ -1,396 +0,0 @@
-// IntHashtable - a Hashtable that uses ints as the keys
-//
-// This is 90% based on JavaSoft's java.util.Hashtable.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-
-/// A Hashtable that uses ints as the keys.
-// <P>
-// Use just like java.util.Hashtable, except that the keys must be ints.
-// This is much faster than creating a new Integer for each access.
-// <P>
-// <A HREF="/resources/classes/Acme/IntHashtable.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see java.util.Hashtable
-
-public class IntHashtable extends Dictionary implements Cloneable
-    {
-    /// The hash table data.
-    private IntHashtableEntry table[];
-
-    /// The total number of entries in the hash table.
-    private int count;
-
-    /// Rehashes the table when count exceeds this threshold.
-    private int threshold;
-
-    /// The load factor for the hashtable.
-    private float loadFactor;
-
-    /// Constructs a new, empty hashtable with the specified initial 
-    // capacity and the specified load factor.
-    // @param initialCapacity the initial number of buckets
-    // @param loadFactor a number between 0.0 and 1.0, it defines
-    //		the threshold for rehashing the hashtable into
-    //		a bigger one.
-    // @exception IllegalArgumentException If the initial capacity
-    // is less than or equal to zero.
-    // @exception IllegalArgumentException If the load factor is
-    // less than or equal to zero.
-    public IntHashtable( int initialCapacity, float loadFactor )
-	{
-	if ( initialCapacity <= 0 || loadFactor <= 0.0 )
-	    throw new IllegalArgumentException();
-	this.loadFactor = loadFactor;
-	table = new IntHashtableEntry[initialCapacity];
-	threshold = (int) ( initialCapacity * loadFactor );
-	}
-
-    /// Constructs a new, empty hashtable with the specified initial 
-    // capacity.
-    // @param initialCapacity the initial number of buckets
-    public IntHashtable( int initialCapacity )
-	{
-	this( initialCapacity, 0.75f );
-	}
-
-    /// Constructs a new, empty hashtable. A default capacity and load factor
-    // is used. Note that the hashtable will automatically grow when it gets
-    // full.
-    public IntHashtable()
-	{
-	this( 101, 0.75f );
-	}
-
-    /// Returns the number of elements contained in the hashtable. 
-    public int size()
-	{
-	return count;
-	}
-
-    /// Returns true if the hashtable contains no elements.
-    public boolean isEmpty()
-	{
-	return count == 0;
-	}
-
-    /// Returns an enumeration of the hashtable's keys.
-    // @see IntHashtable#elements
-    public synchronized Enumeration keys()
-	{
-	return new IntHashtableEnumerator( table, true );
-	}
-
-    /// Returns an enumeration of the elements. Use the Enumeration methods 
-    // on the returned object to fetch the elements sequentially.
-    // @see IntHashtable#keys
-    public synchronized Enumeration elements()
-	{
-	return new IntHashtableEnumerator( table, false );
-	}
-
-    /// Returns true if the specified object is an element of the hashtable.
-    // This operation is more expensive than the containsKey() method.
-    // @param value the value that we are looking for
-    // @exception NullPointerException If the value being searched 
-    // for is equal to null.
-    // @see IntHashtable#containsKey
-    public synchronized boolean contains( Object value )
-	{
-	if ( value == null )
-	    throw new NullPointerException();
-	IntHashtableEntry tab[] = table;
-	for ( int i = tab.length ; i-- > 0 ; )
-	    {
-	    for ( IntHashtableEntry e = tab[i] ; e != null ; e = e.next )
-		{
-		if ( e.value.equals( value ) )
-		    return true;
-		}
-	    }
-	return false;
-	}
-
-    /// Returns true if the collection contains an element for the key.
-    // @param key the key that we are looking for
-    // @see IntHashtable#contains
-    public synchronized boolean containsKey( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		return true;
-	    }
-	return false;
-	}
-
-    /// Gets the object associated with the specified key in the 
-    // hashtable.
-    // @param key the specified key
-    // @returns the element for the key or null if the key
-    // 		is not defined in the hash table.
-    // @see IntHashtable#put
-    public synchronized Object get( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		return e.value;
-	    }
-	return null;
-	}
-
-    /// A get method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object get( Object okey )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return get( key );
-	}
-
-    /// Rehashes the content of the table into a bigger table.
-    // This method is called automatically when the hashtable's
-    // size exceeds the threshold.
-    protected void rehash()
-	{
-	int oldCapacity = table.length;
-	IntHashtableEntry oldTable[] = table;
-
-	int newCapacity = oldCapacity * 2 + 1;
-	IntHashtableEntry newTable[] = new IntHashtableEntry[newCapacity];
-
-	threshold = (int) ( newCapacity * loadFactor );
-	table = newTable;
-
-	for ( int i = oldCapacity ; i-- > 0 ; )
-	    {
-	    for ( IntHashtableEntry old = oldTable[i] ; old != null ; )
-		{
-		IntHashtableEntry e = old;
-		old = old.next;
-
-		int index = ( e.hash & 0x7FFFFFFF ) % newCapacity;
-		e.next = newTable[index];
-		newTable[index] = e;
-		}
-	    }
-	}
-
-    /// Puts the specified element into the hashtable, using the specified
-    // key.  The element may be retrieved by doing a get() with the same key.
-    // The key and the element cannot be null. 
-    // @param key the specified key in the hashtable
-    // @param value the specified element
-    // @exception NullPointerException If the value of the element 
-    // is equal to null.
-    // @see IntHashtable#get
-    // @return the old value of the key, or null if it did not have one.
-    public synchronized Object put( int key, Object value )
-	{
-	// Make sure the value is not null.
-	if ( value == null )
-	    throw new NullPointerException();
-
-	// Makes sure the key is not already in the hashtable.
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		{
-		Object old = e.value;
-		e.value = value;
-		return old;
-		}
-	    }
-
-	if ( count >= threshold )
-	    {
-	    // Rehash the table if the threshold is exceeded.
-	    rehash();
-	    return put( key, value );
-	    } 
-
-	// Creates the new entry.
-	IntHashtableEntry e = new IntHashtableEntry();
-	e.hash = hash;
-	e.key = key;
-	e.value = value;
-	e.next = tab[index];
-	tab[index] = e;
-	++count;
-	return null;
-	}
-
-    /// A put method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object put( Object okey, Object value )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return put( key, value );
-	}
-
-    /// Removes the element corresponding to the key. Does nothing if the
-    // key is not present.
-    // @param key the key that needs to be removed
-    // @return the value of key, or null if the key was not found.
-    public synchronized Object remove( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index], prev = null ; e != null ; prev = e, e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		{
-		if ( prev != null )
-		    prev.next = e.next;
-		else
-		    tab[index] = e.next;
-		--count;
-		return e.value;
-		}
-	    }
-	return null;
-	}
-
-    /// A remove method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object remove( Object okey )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return remove( key );
-	}
-
-    /// Clears the hash table so that it has no more elements in it.
-    public synchronized void clear()
-	{
-	IntHashtableEntry tab[] = table;
-	for ( int index = tab.length; --index >= 0; )
-	    tab[index] = null;
-	count = 0;
-	}
-
-    /// Creates a clone of the hashtable. A shallow copy is made,
-    // the keys and elements themselves are NOT cloned. This is a
-    // relatively expensive operation.
-    public synchronized Object clone()
-	{
-	try
-	    {
-	    IntHashtable t = (IntHashtable) super.clone();
-	    t.table = new IntHashtableEntry[table.length];
-	    for ( int i = table.length ; i-- > 0 ; )
-		t.table[i] = ( table[i] != null ) ?
-		    (IntHashtableEntry) table[i].clone() : null;
-	    return t;
-	    }
-	catch ( CloneNotSupportedException e)
-	    {
-	    // This shouldn't happen, since we are Cloneable.
-	    throw new InternalError();
-	    }
-	}
-
-    /// Converts to a rather lengthy String.
-    public synchronized String toString()
-	{
-	int max = size() - 1;
-	StringBuffer buf = new StringBuffer();
-	Enumeration k = keys();
-	Enumeration e = elements();
-	buf.append( "{" );
-
-	for ( int i = 0; i <= max; ++i )
-	    {
-	    String s1 = k.nextElement().toString();
-	    String s2 = e.nextElement().toString();
-	    buf.append( s1 + "=" + s2 );
-	    if ( i < max )
-		buf.append( ", " );
-	    }
-	buf.append( "}" );
-	return buf.toString();
-	}
-    }
-
-
-class IntHashtableEntry
-    {
-    int hash;
-    int key;
-    Object value;
-    IntHashtableEntry next;
-
-    protected Object clone()
-	{
-	IntHashtableEntry entry = new IntHashtableEntry();
-	entry.hash = hash;
-	entry.key = key;
-	entry.value = value;
-	entry.next = ( next != null ) ? (IntHashtableEntry) next.clone() : null;
-	return entry;
-	}
-    }
-
-
-class IntHashtableEnumerator implements Enumeration
-    {
-    boolean keys;
-    int index;
-    IntHashtableEntry table[];
-    IntHashtableEntry entry;
-
-    IntHashtableEnumerator( IntHashtableEntry table[], boolean keys )
-	{
-	this.table = table;
-	this.keys = keys;
-	this.index = table.length;
-	}
-	
-    public boolean hasMoreElements()
-	{
-	if ( entry != null )
-	    return true;
-	while ( index-- > 0 )
-	    if ( ( entry = table[index] ) != null )
-		return true;
-	return false;
-	}
-
-    public Object nextElement()
-	{
-	if ( entry == null )
-	    while ( ( index-- > 0 ) && ( ( entry = table[index] ) == null ) )
-		;
-	if ( entry != null )
-	    {
-	    IntHashtableEntry e = entry;
-	    entry = e.next;
-	    return keys ? new Integer( e.key ) : e.value;
-	    }
-	throw new NoSuchElementException( "IntHashtableEnumerator" );
-	}
-    }
diff --git a/java/ImageProcessing/framework/ListFiles.java b/java/ImageProcessing/framework/ListFiles.java
deleted file mode 100644
index 7abe067341c..00000000000
--- a/java/ImageProcessing/framework/ListFiles.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package imaging.framework;
-
-import java.net.*;
-import java.io.*;
-import java.applet.*;
-
-public class ListFiles
-{
-  public ListFiles ()
-  {
-  }
-
-  public ListFiles (FileBrowser browser, Applet parent)
-  {
-    this.browser_ = browser;
-    try
-      {
-	this.fileIcon_ = new Icon (parent.getCodeBase () + 
-				   "../ImageProcessing/framework/" +
-				   "doc01.gif", 
-				   parent);
-	this.dirIcon_ = new Icon (parent.getCodeBase () + 
-				  "../ImageProcessing/framework/" +
-				  "file03.gif", 
-				  parent);
-      }
-    catch (MalformedURLException e)
-      {
-      }
-  }
-
-  public String stripProtocolHeader (String url)
-  {
-    if (url.startsWith ("http://"))
-      {
-	return url.substring (7);
-      }
-    else
-      return url;
-  }
-    
-  public int listFiles (String url, FileNode fileNode)
-  {
-    String s = this.stripProtocolHeader (url);
-    String hostname = s;
-    String directory = null;
-    int index = -1;
-
-    if ((index = s.indexOf ("/")) != -1)
-      {
-	hostname = s.substring (0, index);
-	directory = s.substring (index);
-      }
-    return this.listFiles (hostname, directory, fileNode);
-  }
-
-  public int listFiles (String url, String directory, FileNode fileNode)
-  {
-    boolean validDirectory = false;
-    int count = 0;
-    String hostname = this.stripProtocolHeader (url);
-    this.url_ = url;
-    this.directory_ = directory;
-    try
-      {
-	Socket sock = new Socket (hostname, 80);
-	PrintStream out = new PrintStream (sock.getOutputStream ());
-	DataInputStream in = new DataInputStream (sock.getInputStream ());
-	System.out.println ("Connected to: " + hostname);
-
-	String request = null;
-	if (directory.endsWith ("/"))
-	  request = "GET " + directory + "\n\n";
-	else
-	  request = "GET " + directory + "/\n\n";
-    
-	System.out.println ("Sending request: " + request);
-
-	// Send the request
-	out.println (request);
-	
-	String reply = null;
-	// Receive the reply
-
-	// Read all the data in a loop. Search for "Parent Directory"
-	// to verify that this indeed is a directory. If we encounter
-	// the string "<HTML>" then assume that this is an HTML page
-	// and therefore the directory contained "index.html"
-	while ((reply = in.readLine ()) != null)
-	  {
-	    if (validDirectory)
-	      this.parse (reply, fileNode);
-	    else 
-	      {
-		// Take a guess at the type of data we get back
-		if (reply.indexOf ("Parent Directory") != -1)
-		  validDirectory = true;
-		else if ((reply.toUpperCase ().indexOf ("<HTML>") != -1) ||
-			 (reply.toUpperCase ().indexOf ("<P>") != -1) ||
-			 (reply.toUpperCase ().indexOf ("<TABLE") != -1))
-		  return 0;
-	      }
-	  }
-      }
-    catch (MalformedURLException e)
-      {
-	System.err.println (e);
-      }
-    catch (IOException e)
-      {
-	System.err.println (e);
-      }
-    if (validDirectory == false)
-      return -1;
-    return 1;
-  }
-
-  private int parse (String s, FileNode fileNode)
-  {
-    int i= -1;
-    int j = -1;
-    int startIndex = -1;
-    int endIndex = -1;
-    boolean isFile = true;
-    String name = null;
-
-    if ((i = s.indexOf ("HREF=")) != -1)
-      startIndex = i + 6;
-    else
-      return -1;
-
-    if ((j = s.indexOf (">", i)) != -1)
-      endIndex = j - 1;
-    else
-      return -1;
-
-    // Check if this is a directory
-    if (s.charAt (endIndex - 1) == '/')
-      isFile = false;
-
-    if (endIndex >= startIndex)
-      {
-	name = s.substring (startIndex, endIndex);
-	if (browser_ != null)
-	  {
-	    //	    System.out.println (name);
-	    if (isFile)	      
-	      fileNode.addEntry (new FileNode (name, this.fileIcon_, null,
-					       fileNode.app ()));
-	    else
-	      {
-		FileNode f = new FileNode (name, this.dirIcon_, this,
-					   fileNode.app ());
-		fileNode.addEntry (f);
-		f.setExpandable (true);
-	      }
-	  }
-      }
-    return 0;
-  }
-
-  private FileBrowser browser_ = null;
-  private String url_ = null;
-  private String directory_ = null;
-  private Icon fileIcon_;
-  private Icon dirIcon_;
-}
diff --git a/java/ImageProcessing/framework/LoadURLFrame.java b/java/ImageProcessing/framework/LoadURLFrame.java
deleted file mode 100755
index 610d9eaafa8..00000000000
--- a/java/ImageProcessing/framework/LoadURLFrame.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-
-/******************************************************
- * Future idea:
- *
- * Create a smart button class with an invoke method that's
- * to be called when the button is pressed.
- *
- * Subclasses override the invoke method to define 
- * specific behavior.
- *
- * That would allow things like load and save frames
- * to be almost exactly the same -- one could inherit
- * from the other and override addButtons, etc
- *****************************************************/
-
-class LoadURLFrame extends Frame
-{
-  public LoadURLFrame (String title, ImageApp parent)
-  {
-    super (title);
-
-    this.parent_ = parent;
-    this.resize (500,130);
-    
-    this.addButtons();
-  }
-
-  private void addButtons()
-  {
-    this.setLayout (new BorderLayout ());
-
-    Panel textPanel = new Panel ();
-    textPanel.setLayout (new BorderLayout ());
-    textPanel.add ("North", new Label ("Image Location:"));
-    textPanel.add ("Center", this.openURLText_);
-
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new FlowLayout (FlowLayout.CENTER));
-
-    buttonPanel.add (this.openButton_);
-    
-    buttonPanel.add (this.clearButton_);
-    buttonPanel.add (this.cancelButton_);
-
-    this.add ("North", textPanel);
-    this.add ("South", buttonPanel);
-  }
-
-  private int browseFiles (String url)
-  {
-    fileBrowser_ = new FileBrowser ("Browse", this.parent_);
-    ListFiles list = new ListFiles (this.fileBrowser_, this.parent_);
-    return this.fileBrowser_.initialize (url, list);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.openButton_)
-	  {
-	    this.getURL ();
-	  }
-	else if (e.target == this.clearButton_)
-	  {
-	    this.openURLText_.setText (new String ());
-	    this.openURLText_.requestFocus ();
-	  }
-	else if (e.target == this.cancelButton_)
-	  this.dispose ();
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  public boolean keyDown (Event e, int key)
-  {
-    if (key == 10)
-      {
-	this.getURL ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private void getURL ()
-  {
-    this.hide ();
-    String url = this.openURLText_.getText ();
-    this.dispose ();
-
-    // The following is only for debugging
-    if (url.compareTo ("ru") == 0)
-      url = "http://www.cs/~pjain/gifs/";
-    else if (url.compareTo ("pj") == 0)
-      url = "http://www.cs/~pjain/myphoto.gif";
-
-    if (!url.endsWith ("/") &&
-	(this.parent_.openURL (url) != -1))  // Try to open it as an image
-      return;
-    else
-      {
-	ListFiles list = new ListFiles ();
-	switch (this.browseFiles (url))
-	  {
-	  case 1:
-	    this.fileBrowser_.show ();
-	    break;
-	  case 0:
-	    DialogManager.popDialog (DialogType.MALFORMED_URL,
-				     "Error: Directory contains index.html");
-	    break;
-	  default:
-	    DialogManager.popDialog (DialogType.MALFORMED_URL,
-				     "Error: Not a valid image or URL not found");
-	    break;
-	  }		
-      }
-  }
-
-  // Create the Open URL Frame and also the buttons which appear in
-  // it
-  private Button openButton_ = new Button ("Open");
-  private Button clearButton_ = new Button ("Clear");
-  private Button cancelButton_ = new Button ("Cancel");
-
-  private TextField openURLText_ = new TextField (40);
-
-  private FileBrowser fileBrowser_ = null;
-  private ImageApp parent_;
-
-}
diff --git a/java/ImageProcessing/framework/Makefile b/java/ImageProcessing/framework/Makefile
deleted file mode 100644
index 1187b8a88d7..00000000000
--- a/java/ImageProcessing/framework/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-DOCDIR = $(JACE_WRAPPER)/doc
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-
-clean:
-	rm -rf *~
-
-realclean: clean  
-	rm -rf $(JACE_WRAPPER)/classes/imaging/framework
-
-files =	ImageProcessor.java \
-	DialogType.java \
-	LoadURLFrame.java \
-	SaveURLFrame.java \
-	DialogManager.java \
-	ImageCanvas.java \
-	ImageApp.java \
-	BaseButton.java \
-	FilePanel.java \
-	StatusDisplay.java \
-	Icon.java \
-	Hierarchy.java \
-	HierarchyAdapter.java \
-	FileBrowser.java \
-	ListFiles.java \
-	IntHashtable.java \
-	ImageEncoder.java \
-	GifEncoder.java \
-	ImageByteCounter.java \
-	StatusIndicator.java \
-	GIFHandler.java \
-	ImageSender.java \
-	ServerTest.java \
-	ServerHandler.java \
-	Tester.java \
-	TestHandler.java
diff --git a/java/ImageProcessing/framework/MedJava.html b/java/ImageProcessing/framework/MedJava.html
deleted file mode 100644
index a073413bfbb..00000000000
--- a/java/ImageProcessing/framework/MedJava.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<HTML>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#888888">
-
-<HR>
-<APPLET CODEBASE="/classes/" CODE="imaging.framework.ImageApp.class" width=700 height=700>
-<param name=filename value="myphoto.gif">
-
-</APPLET>
-<HR>
-
-</HTML>
diff --git a/java/ImageProcessing/framework/Options.java b/java/ImageProcessing/framework/Options.java
deleted file mode 100644
index edbe90ba904..00000000000
--- a/java/ImageProcessing/framework/Options.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-class Options
-{
-  // Set GridBagConstraints
-  public static void constrain (Container container, Component component,
-				int gridx, int gridy, 
-				int gridwidth, int gridheight,
-				int fill, int anchor)
-  {
-    GridBagConstraints c = new GridBagConstraints ();
-    GridBagLayout gbl = (GridBagLayout) container.getLayout ();
-
-    c.gridx = gridx;
-    c.gridy = gridy;
-    c.gridwidth = gridwidth;
-    c.gridheight = gridheight;
-    c.fill = fill;
-    c.anchor = anchor;
-    gbl.setConstraints (component, c);
-    container.add (component);
-  }
-}
diff --git a/java/ImageProcessing/framework/SaveURLFrame.java b/java/ImageProcessing/framework/SaveURLFrame.java
deleted file mode 100755
index c3b6adf3490..00000000000
--- a/java/ImageProcessing/framework/SaveURLFrame.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-
-/******************************************************
- * Future idea:
- *
- * Create a smart button class with an invoke method that's
- * to be called when the button is pressed.
- *
- * Subclasses override the invoke method to define 
- * specific behavior.
- *
- * That would allow things like load and save frames
- * to be almost exactly the same -- one could inherit
- * from the other and override addButtons, etc
- *****************************************************/
-
-
-class SaveURLFrame extends Frame
-{
-  public SaveURLFrame (String title, ImageApp parent)
-  {
-    super (title);
-
-    this.parent_ = parent;
-    this.resize (500,200);
- 
-    this.addButtons();
-  }
-
-  private void addButtons()
-  {
-    this.setLayout (new BorderLayout ());
-
-    Panel textPanels = new Panel();
-    textPanels.setLayout(new BorderLayout());
-
-    Panel URLPanel = new Panel ();
-    URLPanel.setLayout (new BorderLayout ());
-    URLPanel.add ("North", new Label ("Image Location:"));
-    URLPanel.add ("Center", this.openURLText_);
-
-    // Password panel
-    Panel pwPanel = new Panel();
-    pwPanel.setLayout (new BorderLayout ());
-    pwPanel.add ("North", new Label ("Authentication:"));
-    pwPanel.add ("Center", this.passwordText_);
-
-    textPanels.add("North", URLPanel);
-    textPanels.add("South", pwPanel);
-
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new FlowLayout (FlowLayout.CENTER));
-
-    buttonPanel.add (this.saveButton_);
-    buttonPanel.add (this.clearButton_);
-    buttonPanel.add (this.cancelButton_);
-
-    this.add ("North", textPanels);
-    this.add ("South", buttonPanel);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.saveButton_)
-	  {
-	    this.saveFile ();
-	  }
-	else if (e.target == this.clearButton_)
-	  {
-	    this.openURLText_.setText (new String ());
-	    this.openURLText_.requestFocus ();
-	  }
-	else if (e.target == this.cancelButton_)
-	  this.dispose ();
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  public boolean keyDown (Event e, int key)
-  {
-    if (key == 10)
-      {
-	this.saveFile ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private void saveFile ()
-  {
-    String url = this.openURLText_.getText ();
-    String password = this.passwordText_.getText();
-    this.hide ();
-    this.dispose ();
-
-    // The following is only for debugging
-    if (url.startsWith ("#"))
-      url = "http://merengue.cs:5432/" + url.substring (1);
-
-    if ((password != null) && (password.length() > 0))
-      this.parent_.saveFile (url, password);
-    else
-      this.parent_.saveFile (url);
-  }
-
-
-  // Create the Open URL Frame and also the buttons which appear in
-  // it
-  private Button saveButton_ = new Button ("Save");
-  private Button clearButton_ = new Button ("Clear");
-  private Button cancelButton_ = new Button ("Cancel");
-
-  private TextField openURLText_ = new TextField (40);
-  private TextField passwordText_ = new TextField (40);
-
-  private ImageApp parent_;
-
-  // Flag indicating if this is a load window or a save window
-  private boolean open_ = true;
-
-}
diff --git a/java/ImageProcessing/framework/Separator.java b/java/ImageProcessing/framework/Separator.java
deleted file mode 100644
index 6bd610e1ad9..00000000000
--- a/java/ImageProcessing/framework/Separator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A separator that is drawn either vertically or horizontally 
- * depending upon how it is laid out.  Can be drawn either 
- * etched-in or etched-out, with varying thicknesses.  Both 
- * thickness and etching are settable at construction time 
- * only.<p>
- *
- * Default thickness is 2 pixels and default etching is 
- * Etching.IN.  Note that thicknesses greater than 4 loose the 
- * etching effect.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Etching
- * @see     gjt.test.SeparatorTest
- */
-public class Separator extends Canvas {
-    static private Etching _defaultEtching   = Etching.IN;
-    static private int     _defaultThickness = 2;
-
-    private Etching etching;
-    private int     thickness;
-
-    public Separator() {
-        this(_defaultThickness, _defaultEtching);
-    }
-    public Separator(int thickness) {
-        this(thickness, _defaultEtching);
-    }
-    public Separator(Etching etching) {
-        this(_defaultThickness, etching);
-    }
-    public Separator(int thickness, Etching etching) {
-        this.etching   = etching;
-        this.thickness = thickness;
-        resize(thickness, thickness);
-    }
-    public Dimension minimumSize() {
-        return preferredSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(thickness, thickness);
-    }
-    public void paint(Graphics g) {
-        Dimension size     = size();
-        Color brighter = getBackground().brighter().brighter();
-        Color darker   = getBackground().darker().darker();
-
-        if(etching == Etching.IN) {
-            if(size.width > size.height)
-                paintHorizontal(g, size, darker, brighter);
-            else
-                paintVertical(g, size, darker, brighter);
-        }
-        else {
-            if(size.width > size.height)
-                paintHorizontal(g, size, brighter, darker);
-            else
-                paintVertical(g, size, brighter, darker);
-        }
-    }
-    public String paramString() {
-        Dimension   size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        return super.paramString() + "thickness=" + 
-               thickness + "," + etching + "," + orient;
-    }
-    private void paintHorizontal(Graphics g, Dimension size, 
-                                 Color top, Color bottom) {
-        g.setColor(top);
-        g.fillRect(0, (size.height/2) - (thickness/2), 
-                       size.width, thickness/2);
-        g.setColor(bottom);
-        g.fillRect(0, size.height/2, size.width, thickness/2); 
-    }
-    private void paintVertical(Graphics g, Dimension size, 
-                               Color left, Color right) {
-        g.setColor(left);
-        g.fillRect((size.width/2) - (thickness/2), 
-                    0, thickness/2, size.height);
-        g.setColor(right);
-        g.fillRect(size.width/2, 0, thickness/2, size.height);
-    }
-}
diff --git a/java/ImageProcessing/framework/ServerHandler.java b/java/ImageProcessing/framework/ServerHandler.java
deleted file mode 100644
index 88da64d6328..00000000000
--- a/java/ImageProcessing/framework/ServerHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerHandler extends SvcHandler
-{
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      int msg_len;
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msg_len = this.peer ().recv (msg);
-	      if (msg_len == 0)
-		break;
-	      System.out.println (msg);
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/ImageProcessing/framework/ServerTest.java b/java/ImageProcessing/framework/ServerTest.java
deleted file mode 100644
index b5ab00596ea..00000000000
--- a/java/ImageProcessing/framework/ServerTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: ServerTest [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  Acceptor acceptor = new Acceptor (Class.forName ("imaging.framework.ServerHandler"));
-	  acceptor.open (port);
-	  while (true)
-	    {
-	      acceptor.accept ();
-	    }
-	}
-      catch (ClassNotFoundException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR ("Dang!" + e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ServerTest server = new ServerTest ();
-
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      server.print_usage_and_die ();
-	    }
-	}
-      server.init (port);
-    }
-}
diff --git a/java/ImageProcessing/framework/StatusDisplay.java b/java/ImageProcessing/framework/StatusDisplay.java
deleted file mode 100644
index e20e9b8384d..00000000000
--- a/java/ImageProcessing/framework/StatusDisplay.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import gjt.Separator;
-
-class StatusDisplay extends Panel
-{
-  public StatusDisplay ()
-  {
-    this.setLayout (new BorderLayout ());
-    this.textField_.setEditable (false);
-    this.add ("North", new Separator ());
-    this.add ("Center", this.textField_);
-    this.add ("South", new Separator ());
-  }
-
-  public void setText (String s)
-  {
-    this.textField_.setText (s);
-  }
-
-  private TextField textField_ = new TextField ();
-}
diff --git a/java/ImageProcessing/framework/StatusIndicator.java b/java/ImageProcessing/framework/StatusIndicator.java
deleted file mode 100644
index 0f13a71c016..00000000000
--- a/java/ImageProcessing/framework/StatusIndicator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.awt.*;
-
-public class StatusIndicator extends Frame
-{
-  public StatusIndicator (String title, Image image)
-  {
-    super (title);
-    this.image_ = image;
-    //    statusCanvas_ = new CounterCanvas (image);
-    this.setLayout (new BorderLayout ());
-    this.text_ = new TextField ();
-    this.label_ = new TextField ("Generating");
-
-    this.add ("North", this.label_);
-    this.add ("Center", text_);
-    //    this.add ("Center", statusCanvas_);
-    //    this.add ("Center", new Button ("Hello"));
-    //    this.add ("South", new Button ("Hello"));
-    this.resize (300,200);
-    this.show ();
-  }
-
-  public void update (int count)
-  {
-    //    this.label_.setText ("Generating...");
-    this.text_.setText ((new Integer (count++)).toString ());
-    //    statusCanvas_.update ();
-    //    textCanvas_.setCount (count);
-  }
-
-  TextField text_;
-  TextField label_;
-  Image image_;
-  //  CounterCanvas statusCanvas_ = null;
-}
-
-class CounterCanvas extends Canvas
-{
-  public CounterCanvas (Image image)
-  {
-    this.image_ = image;
-  }
-
-  public void paint (Graphics g)
-  {
-    g.clearRect (0, 0, this.size ().width, this.size ().height);
-    this.setBackground (Color.white);
-
-    if (this.image_ != null)
-      g.drawImage(this.image_, 
-		  40, 40,
-		  this.image_.getWidth (this),
-		  this.image_.getHeight (this),
-		  this);
-
-    g.setFont (new Font ("TimesRoman", Font.PLAIN, 18));
-    g.drawString ("Generating GIF format: ", 120, 120);
-  }
-
-  public void update ()
-  {
-    repaint ();
-  }
-
-  Image image_ = null;
-}
-
diff --git a/java/ImageProcessing/framework/TestHandler.java b/java/ImageProcessing/framework/TestHandler.java
deleted file mode 100644
index 5a97ae6f8b2..00000000000
--- a/java/ImageProcessing/framework/TestHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Timers.*;
-
-public class TestHandler extends SvcHandler
-{
-  public TestHandler (String imageList,
-		      String JAWSServer, int JAWSPort,
-		      ImageApp parent)
-  {
-    this.imageList_ = imageList;
-    this.JAWSServer_ = JAWSServer;
-    this.JAWSPort_ = JAWSPort;
-    this.parent_ = parent;
-    this.filterTable_ = this.parent_.filterTable();
-  }
-
-  public int open (Object obj)
-  {
-    // We got called by the Connector so assume connection was set up
-    // fine and therfore do not use standard output
-    stdOut = false;
-
-    doTesting ();
-    return 0;
-  }
-
-  public void doTesting ()
-  {
-    if (imageList_ != null)
-      {
-	StringTokenizer tokens = new StringTokenizer (imageList_);
-	String image = null;
-	
-	// Now parse the string, picking up image names. 
-	while (tokens.hasMoreTokens ())
-	  {
-	    // Get the next token
-	    image = tokens.nextToken ();
-	    this.process (image);
-	  }
-      }
-  }
-
-  private void write (String data)
-  {
-    try
-      {
-	// If we are connected to the server then send the data to the
-	// server, otherwise write it to standard out.
-	if (stdOut)
-	  System.out.print (data);
-	else
-	  this.peer ().send (data);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-  private void process (String image)
-  {
-    this.write ("Image: " + image + "\n");
-
-    this.loadImage (image);
-    this.processImage (image);
-    this.uploadImage (image);
-  }
-
-  private void loadImage (String image)
-  {
-    this.write ("\tLoading...");
-    
-    // Start the timer
-    timer_.start ();
-    
-    // Load the image
-    parent_.openURL (image);
-    
-    // Stop the timer
-    timer_.stop ();
-    long time = timer_.elapsedTime ();
-
-    this.write ("done (" + ((double) time)/1000 + " seconds).\n");
-  }
-
-  private void processImage (String image)
-  {
-    this.write ("\tProcessing...\n");
-
-    for (Enumeration e = filterTable_.keys (); e.hasMoreElements (); )
-      {
-	String filterName = (String) e.nextElement ();
-
-	this.write ("\t\t" + filterName + "...");
-	
-	ImageFilter filter = (ImageFilter) filterTable_.get (filterName);
-	    
-	// Reset the image -- in case it was modified earlier
-	this.parent_.resetImage ();
-
-	// Start the timer
-	timer_.start ();
-	
-	this.parent_.apply (filter);
-	
-	// Stop the timer
-	timer_.stop ();
-	long time = timer_.elapsedTime ();
-	
-	this.write ("done (" + ((double) time)/1000 + " seconds).\n");
-      }
-  }
-   
-  private void uploadImage (String image)
-  {
-    int index = image.lastIndexOf ("/");
-    String imageName = image.substring (index+1);
-    String url = "http://" + this.JAWSServer_ + ":" + this.JAWSPort_ + "/" + imageName;
-    this.write ("\tUploading " + url + "...");
-
-    // Start the timer
-    timer_.start ();
-
-    this.parent_.saveFile (url);
-
-    // Stop the timer
-    timer_.stop ();
-    long time = timer_.elapsedTime ();
-
-    this.write ("done (" + ((double) time)/1000 + " seconds).\n");		       
-  }
-
-  private ImageApp parent_ = null;
-  private ProfileTimer timer_ = new ProfileTimer ();
-  private String imageList_ = null;
-  private boolean stdOut = true;
-  private Hashtable filterTable_ = null;
-  private String JAWSServer_ = null;
-  private int JAWSPort_ = 5432;
-}
diff --git a/java/ImageProcessing/framework/Tester.java b/java/ImageProcessing/framework/Tester.java
deleted file mode 100644
index 79204bb4c5a..00000000000
--- a/java/ImageProcessing/framework/Tester.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-
-public class Tester implements Runnable
-{
-  public static final String DEFAULT_TEST_SERVER = "siesta.cs.wustl.edu";
-  public static final int DEFAULT_TEST_SERVER_PORT = 7787;
-  public static final String DEFAULT_JAWS_SERVER = "siesta.cs.wustl.edu";
-  public static final int DEFAULT_JAWS_SERVER_PORT = 5432;
-
-  public Tester (String testInFile, 
-		 ImageApp parent)
-  {
-    this.testInFile_ = testInFile;
-    this.parent_ = parent;
-  }
-
-  public void initialize ()
-  {
-    System.out.println ("Initializing tester...");
-
-    // Get the hostname of the test server
-    this.server_ = this.parent_.getParameter ("testServer");
-    if (this.server_ == null)
-      this.server_ = DEFAULT_TEST_SERVER;
-
-    // Get the port number of the test server
-    String testPortString = this.parent_.getParameter ("testPort");
-    if (testPortString == null)
-      this.port_ = DEFAULT_TEST_SERVER_PORT;
-    else
-      this.port_ = (new Integer (testPortString)).intValue ();
-
-    // Get the hostname of the JAWS server
-    this.JAWSServer_ = this.parent_.getParameter ("JAWSServer");
-    if (this.JAWSServer_ == null)
-      this.JAWSServer_ = DEFAULT_JAWS_SERVER;
-
-    // Get the port number of the JAWS server
-    String JAWSPortString = this.parent_.getParameter ("JAWSPort");
-    if (JAWSPortString == null)
-      this.JAWSServerPort_ = DEFAULT_JAWS_SERVER_PORT;
-    else
-      this.JAWSServerPort_ = (new Integer (JAWSPortString)).intValue ();
-
-    System.out.println ("Test Input File: " + this.testInFile_);
-    System.out.println ("Test Server: " + this.server_ + "\tPort: " + this.port_);
-    System.out.println ("JAWS Server: " + this.JAWSServer_ + "\tPort: " + this.JAWSServerPort_);
-
-    // Run in your own thread of control
-    (new Thread (this)).start ();
-  }
-
-  public void run ()
-  {
-    this.setupConnection (this.getImages ());
-  }
-
-  private String getImages ()
-  {
-    URL inputURL;
-    String imageList = null;
-    try
-      {
-	// Create input URL
-	inputURL = new URL (this.testInFile_);
-
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (inputURL.openStream ());
-
-	// Create a buffer to hold all the data we get
-	StringBuffer tempBuf = new StringBuffer ();
-	// Keep reading the data until we are done
-	String tempString = iStream.readLine ();
-	while (tempString != null)
-	  {
-	    tempBuf.append (tempString);
-	    tempBuf.append (" ");
-	    tempString = iStream.readLine ();
-	  }
-	imageList = tempBuf.toString ();
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    return imageList;
-  }
-
-  private void setupConnection (String imageList)
-  {
-    // First try to connect to the server. If the server is not
-    // running then we will write to standard output.
-
-    // Create a handler which will handle our connection.
-    TestHandler handler = new TestHandler (imageList, 
-					   this.JAWSServer_, this.JAWSServerPort_,
-					   this.parent_);
-    try
-      {
-	Connector connector = new Connector ();
-	connector.open (server_, port_);
-	connector.connect (handler);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	System.out.println ("Test Server not running! Writing to standard out...");
-	// The server is not running so write all the output to screen
-	handler.doTesting ();
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-  private String testInFile_ = null;
-  private ImageApp parent_ = null;
-  private String server_ = "siesta.cs.wustl.edu";
-  private int port_ = 7787;
-
-  private String JAWSServer_ = "siesta.cs.wustl.edu";
-  private int JAWSServerPort_ = 5432;
-}
-
diff --git a/java/ImageProcessing/framework/doc01.gif b/java/ImageProcessing/framework/doc01.gif
deleted file mode 100644
index 51262529f6d..00000000000
--- a/java/ImageProcessing/framework/doc01.gif
+++ /dev/null
diff --git a/java/ImageProcessing/framework/file03.gif b/java/ImageProcessing/framework/file03.gif
deleted file mode 100644
index c98654c604b..00000000000
--- a/java/ImageProcessing/framework/file03.gif
+++ /dev/null
diff --git a/java/ImageProcessing/framework/filter.conf b/java/ImageProcessing/framework/filter.conf
deleted file mode 100644
index 2e90ea136ce..00000000000
--- a/java/ImageProcessing/framework/filter.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-imaging.filters.EmbossFilter
-imaging.filters.BleachFilter
-imaging.filters.BlurFilter
-imaging.filters.DarkenFilter
-imaging.filters.DeSpeckleFilter
-imaging.filters.EdgeDetectFilter
-imaging.filters.OilPaintFilter
-imaging.filters.PixelizeFilter
-imaging.filters.RotateFilter
-imaging.filters.SharpenFilter
-imaging.filters.SpreadFilter
-
-
-
-
diff --git a/java/ImageProcessing/framework/help.conf b/java/ImageProcessing/framework/help.conf
deleted file mode 100644
index 8a07e2867d9..00000000000
--- a/java/ImageProcessing/framework/help.conf
+++ /dev/null
@@ -1,216 +0,0 @@
-			MedJava
-			~~~~~~~
-
-Overview
---------
-
-MedJava is a prototype of a large scale distributed medical imaging
-system.  It has been developed using Java, in particular, several
-components of Java ACE.
-
-Here are the key features of the MedJava toolkit:
-
-* Images can be both downloaded and uploaded across the network.
-* Images can be uploaded to Web servers that support HTTP PUT
-  functionality (for example, JAWS).
-* The tool contains more than a dozen image filters to do image
-  processing.
-* The image filters can be configured into the system dynamically
-  using the Service Configurator pattern.
-
-Please send comments/suggestions to Prashant Jain (pjain@cs.wustl.edu).
-
-======================================================================
-Getting Started
----------------
-
-MedJava applet can be configured with several (optional) parameters
-via the HTML file from which the applet is invoked.  Here is a list of
-the parameters:
-
-Note:
- 1) * indicates test-mode parameters
- 2) All Default URLs begin with 
-     http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/
-
-<START>
-Name  
-<TAB>
-<TAB>
-Description                  
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-Default
-<P>
---------------------------------------------------------------
-<P>
-configFile
-<TAB>
-<TAB>
-Specifies a URL that points to the filter
-<P>
-<TAB>
-<TAB>
-configuration file.
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-filter.conf
-<P>
-<P>
-*testFile
-<TAB>
-<TAB>
-Specifies a URL that points to the file that contains 
-<P>
-<TAB>
-<TAB>
-a list of images that need to be tested.
-<TAB>
-<TAB>
-<TAB>
-testImages.conf
-<P>
-<P>
-*testServer
-<TAB>
-Specifies the name of the test server.
-<TAB>
-<TAB>
-<TAB>
-siesta.cs.wustl.edu
-<P>
-<P>
-*testPort
-<TAB>
-<TAB>
-Specifies the port number of the test server.
-<TAB>
-<TAB>
-<TAB>
-7789
-<P>
-<P>
-*JAWSServer
-<TAB>
-Specifies the name of the server to use in
-<P>
-<TAB>
-<TAB>
-doing image uploading during testing.
-<TAB>
-<TAB>
-<TAB>
-siesta.cs.wustl.edu
-<P>
-<P>
-*JAWSPort
-<TAB>
-Specifies the port number of the server to use 
-<P>
-<TAB>
-<TAB>
-in doing image uploading during testing.
-<TAB>
-<TAB>
-<TAB>
-5432
-<P>
-======================================================================
-<END>
-
-Menu
-----
-
-o Open URL
-
-  Allows user to specify a URL.  If the URL points to an image that is
-  readable, then the image is downloaded and displayed in the view
-  panel. 
-
-  If the URL points to a directory that is readable then a window
-  appears displaying a list of files in that directory.  The user can
-  then click on an image file in this window to fetch an image. 
-
-  IMPORTANT NOTE: If the URL points to a directory, the directory must
-		  not contain an "index.html" file! If it does, the
-		  query will fail and no list of files will appear.
-
-o Save
-
-  Allows user to specify a URL to save the currently loaded image to.
-  All images are saved in GIF format.  Note that saving/uploading a
-  file can take a while depending upon the size of the image.  This is
-  because, the tool first generates the GIF format and then sends the
-  bytes across the network.
-
-  IMPORTANT NOTE: The Web server must support image uploading, that is
-		  HTTP PUT functionality. Also, due to applet
-		  restrictions, the server MUST be running on the same
-		  host from which the applet was downloaded from.
-
-o Reset
-
-  Resets the image to the original.  Note that the effects of any
-  filters that were applied to the image will be lost.
-
-o Reload Filters
-
-  Reads the filter configuration file again and reloads all the image
-  filters.  Note that this serves as the trigger of the Service
-  Configurator pattern allowing the tool to reconfigure based on new
-  configuration information.
-
-  The filters are specified in filter.conf.  To add/remove filters,
-  change this file and then select "Reload Filters".
-
-  To specify a different configuration file, please see "Getting Started".
-
-o Zoom In
-
-  Zooms in to the currently displayed image.  Note that the applet only
-  allows to zoom in 4 x times.
-
-o Zoom Out
-
-  Zooms out of the currently displayed image.  Note that the applet
-  only allows to zoom out 1/4 x times.
-
-o Apply
-
-  Apply the currently selected filter.  By default no filter is
-  selected.  Note that applying a filter to an image can taken
-  anywhere between a few seconds to a few minutes depending upon the
-  image size, the filter type, and the speed of the machine on which
-  the applet is running.
-
-o Filters:
-
-  Allows the user to select a filter from the ones that have been
-  configured into the applet.  Note that this is a choice menu and its
-  entries depend upon the filters that were specified in the filter
-  configuration file.
-
-  For more information, on how to specify the filters, please see
-  "Getting Started".
-
-o About
-
-  Displays the "About" dialog containing the version of the MedJava
-  applet.
-
-o Help
-
-  Displays this window
-
-======================================================================
-
-Limitations
------------
-
-In several browsers, for images larger than 100 KB, the Java virtual
-machine may run out of memory while doing image processing.
diff --git a/java/ImageProcessing/framework/test.html b/java/ImageProcessing/framework/test.html
deleted file mode 100644
index 7a9acf34e38..00000000000
--- a/java/ImageProcessing/framework/test.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#888888">
-
-<HR>
-<APPLET CODEBASE="../../classes" CODE="imaging.framework.ImageApp.class" width=700 height=700>
-<param name=configFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/testFilter.conf">
-<param name=testFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/testImages.conf">
-<param name=testServer value="siesta.cs.wustl.edu">
-<param name=testPort value="7789">
-<param name=JAWSServer value="siesta.cs.wustl.edu">
-<param name=JAWSPort value="5432">
-</APPLET>
-<HR>
-
-</HTML>
\ No newline at end of file
diff --git a/java/ImageProcessing/framework/testFilter.conf b/java/ImageProcessing/framework/testFilter.conf
deleted file mode 100644
index 2e90ea136ce..00000000000
--- a/java/ImageProcessing/framework/testFilter.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-imaging.filters.EmbossFilter
-imaging.filters.BleachFilter
-imaging.filters.BlurFilter
-imaging.filters.DarkenFilter
-imaging.filters.DeSpeckleFilter
-imaging.filters.EdgeDetectFilter
-imaging.filters.OilPaintFilter
-imaging.filters.PixelizeFilter
-imaging.filters.RotateFilter
-imaging.filters.SharpenFilter
-imaging.filters.SpreadFilter
-
-
-
-
diff --git a/java/VERSION b/java/VERSION
deleted file mode 100644
index d3eb3b2efcc..00000000000
--- a/java/VERSION
+++ /dev/null
@@ -1,5 +0,0 @@
-This is Java ACE version 1.4.2, released Monday, December 22, 1997
-
-If you have any problems, please send email to Douglas C. Schmidt
-at (schmidt@cs.wustl.edu)
-
diff --git a/java/apps/NexusII/README b/java/apps/NexusII/README
deleted file mode 100644
index 60a630cef5a..00000000000
--- a/java/apps/NexusII/README
+++ /dev/null
@@ -1,58 +0,0 @@
-Nexus II - A chat application in Java with image support
---------------------------------------------------------
-
-        Rajeev Bector (rajeev@cs.wustl.edu)
-        Aravind Gopalan (aravind@cs.wustl.edu)
-        Sumedh Mungee (sumedh@cs.wustl.edu)
-
-This is the README file. This distribution contains the NexusII
-server, which is a java application that can be started by a command
-similar to the one contained in the sample "start" shell-script.
-
-It also contains a "start.html" file, which serves as an example on how
-a client applet can be included within a .html file.
-
-A sample use of this, alongwith a simple users manual, can be found at
-http://cumbia.cs.wustl.edu/NexusII/
-
-Compiling (optional, all the class files are already present)
--------------------------------------------------------------
-
-All the source .java files, alongwith the makefile should be placed in
-the  same directory, and can then be compiled using make. 
-
-The client/server use the following packages:
-
-        awtCommand: This package provides a GUI toolkit for the applet
-        ACE:        This is used both by the client/server for
-                    networking. ACE documentation can be found at:
-                    http://www.cs.wustl.edu/~schmidt/ACE.html
-                
-Running
--------
-
-See the "start" and "start.html" files for examples on how to run the
-server and client applet, respectively. The "mywebaddress" variable is
-the "temporary" URL of the server, and the "mywebdir" variable is the
-temporary directory in which images are cached by the server. Make
-sure that both these exist and are world-readable. The "mywebdir"
-should be writable to by the server. The "mywebdir" and "mywebaddress"
-variables should thus point to the same location, of which mywebdir
-contains the path, and mywebaddress contains the URL. 
-
-See "start" for an example on how to do this.
-
-If you only want to use an existing running server, all you need to
-know is the server host-name and port number, and you can directly run
-the start.html file via appletviewer.
-
-Notes
------
-
-1. You can compile the client and server using the same makefile.
-2. The client applet MUST reside on the same host as the server is running on.
-4. run the server using start script. Change the paramters in the start script,
-   suitable to your configurations. The start script contains further
-   information on this.
-
-
diff --git a/java/apps/NexusII/classes/ClientHandler.class b/java/apps/NexusII/classes/ClientHandler.class
deleted file mode 100644
index c6bf722c54f..00000000000
--- a/java/apps/NexusII/classes/ClientHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/FrameHandler.class b/java/apps/NexusII/classes/FrameHandler.class
deleted file mode 100644
index 72d0c67ce70..00000000000
--- a/java/apps/NexusII/classes/FrameHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/ImageCanvas.class b/java/apps/NexusII/classes/ImageCanvas.class
deleted file mode 100644
index eefcfe0f323..00000000000
--- a/java/apps/NexusII/classes/ImageCanvas.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/NexusClientApplet.class b/java/apps/NexusII/classes/NexusClientApplet.class
deleted file mode 100644
index 8157ac32759..00000000000
--- a/java/apps/NexusII/classes/NexusClientApplet.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/NexusIIserver.class b/java/apps/NexusII/classes/NexusIIserver.class
deleted file mode 100644
index f8e566ce282..00000000000
--- a/java/apps/NexusII/classes/NexusIIserver.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/Room.class b/java/apps/NexusII/classes/Room.class
deleted file mode 100644
index a9d0d4f97bb..00000000000
--- a/java/apps/NexusII/classes/Room.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomFactory.class b/java/apps/NexusII/classes/RoomFactory.class
deleted file mode 100644
index c1f92d83728..00000000000
--- a/java/apps/NexusII/classes/RoomFactory.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomFrame.class b/java/apps/NexusII/classes/RoomFrame.class
deleted file mode 100644
index 4b648e1a8cc..00000000000
--- a/java/apps/NexusII/classes/RoomFrame.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomThread.class b/java/apps/NexusII/classes/RoomThread.class
deleted file mode 100644
index 829fa4175cb..00000000000
--- a/java/apps/NexusII/classes/RoomThread.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CApplet.class b/java/apps/NexusII/classes/awtCommand/CApplet.class
deleted file mode 100644
index 3af0361de76..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CApplet.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CApplet.java b/java/apps/NexusII/classes/awtCommand/CApplet.java
deleted file mode 100644
index a8680d9abf3..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CApplet.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-import java.applet.*;
-
-public class CApplet extends Applet {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-
-    /**
-     * Constructs a new CApplet.
-     */
-    public CApplet() {
-	super();
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CButton.class b/java/apps/NexusII/classes/awtCommand/CButton.class
deleted file mode 100644
index b64fecd5bbf..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CButton.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CButton.java b/java/apps/NexusII/classes/awtCommand/CButton.java
deleted file mode 100644
index ff0f3385bad..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CButton.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-package awtCommand;
-
-import java.lang.*;
-import java.awt.*;
-
-public class CButton extends java.awt.Button {
-    protected Command actionCommand = null;
-
-    /**
-     * Constructs a CButton.
-     */
-    public CButton() {
-	super();
-    }
-
-    /**
-     * Constructs a CButton with the given name.
-     */
-    public CButton(String name) {
-	super(name);
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Called when the button is selected..
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the button's label.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CCanvas.class b/java/apps/NexusII/classes/awtCommand/CCanvas.class
deleted file mode 100644
index 5d697017b5b..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CCanvas.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CCanvas.java b/java/apps/NexusII/classes/awtCommand/CCanvas.java
deleted file mode 100644
index 837b6f56f7a..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CCanvas.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CCanvas extends Canvas {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-
-    /**
-     * Constructs a new CCanvas.
-     */
-    public CCanvas() {
-	super();
-    }
-
-    /**
-     * Handles the event.
-     * Calls methods for variousL events and passes
-     * others to its superclass method.
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CFrame.class b/java/apps/NexusII/classes/awtCommand/CFrame.class
deleted file mode 100644
index 66f25773c76..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CFrame.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CFrame.java b/java/apps/NexusII/classes/awtCommand/CFrame.java
deleted file mode 100644
index f63d3ce8b9a..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CFrame.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CFrame extends Frame {
-
-    protected Command destroyCommand = null,
-		      deiconifyCommand = null,
-		      iconifyCommand = null,
-		      movedCommand = null;
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-    /**
-     * Constructs a new, initially invisible CFrame.
-     */
-    public CFrame() {
-	super();
-    }
-
-    /**
-     * Constructs a new, initially invisible CFrame with the
-     * specified title.
-     */
-    public CFrame(String title) {
-	super(title);
-    }
-
-    /** 
-     * Handles the event
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.WINDOW_DESTROY:
-		return windowDestroy(evt);
-	    case Event.WINDOW_DEICONIFY:
-		return windowDeiconify(evt);
-	    case Event.WINDOW_ICONIFY:
-		return windowIconify(evt);
-	    case Event.WINDOW_MOVED:
-		return windowMoved(evt);
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /** 
-     * Called if the dialog's window is destroyed. This results in a call to
-     * the destroyCommand object with <code>what</code> set to null
-     */
-    public boolean windowDestroy(Event evt) {
-	if (destroyCommand != null)
-	    destroyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog's window is deiconified. This results in a call to
-     * the deiconifyCommand object with <code>what</code> set to null 
-     */
-    public boolean windowDeiconify(Event evt) {
-	if (deiconifyCommand != null)
-	    deiconifyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog is iconified. This results in a call to
-     * the iconifyCommand object with <code>what</code> set to null 
-     */
-    public boolean windowIconify(Event evt) {
-	if (iconifyCommand != null)
-	    iconifyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog's window is moved. This results in a call to
-     * the movedCommand object with <code>what</code> set to Point(x, y) 
-     */
-    public boolean windowMoved(Event evt) {
-	if (movedCommand != null)
-	    movedCommand.execute(this, evt, new Point(evt.x, evt.y));
-	return false;
-    }
-
-    /*
-     * I don't know where what objects this next set should belong
-     * to. Putting them at the top is ok for now
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-    /**
-     * Sets the destroyCommand object.
-     */
-    public void setDestroyCommand(Command c) {
-	destroyCommand = c;
-    }
-
-    /**
-     * Sets the deiconifyCommand object.
-     */
-    public void setDeiconifyCommand(Command c) {
-	deiconifyCommand = c;
-    }
-
-    /**
-     * Sets the iconifyCommand object.
-     */
-    public void setIconifyCommand(Command c) {
-	iconifyCommand = c;
-    }
-
-    /**
-     * Sets the movedCommand object.
-     */
-    public void setMovedCommand(Command c) {
-	movedCommand = c;
-    }
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    public void setGotFocusCommand(Command c) { 
-	 gotFocusCommand = c ; 
-    } 
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/classes/awtCommand/CList.class b/java/apps/NexusII/classes/awtCommand/CList.class
deleted file mode 100644
index c595ce7786b..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CList.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CList.java b/java/apps/NexusII/classes/awtCommand/CList.java
deleted file mode 100644
index 110e6a01db2..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CList.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CList extends List {
-    protected Command selectCommand 	= null;
-    protected Command deselectCommand 	= null;
-    protected Command actionCommand 	= null;
-
-    /** 
-     * Handles the event
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-
-    /** 
-     * Called if the Enter key is pressed. 
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the selected item.
-     */
-    public boolean action(Event evt, Object what) {
-        if (actionCommand != null)
-            actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /**
-     * Sets the actionCommand.
-     */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CPanel.class b/java/apps/NexusII/classes/awtCommand/CPanel.class
deleted file mode 100644
index d00477a30f5..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CPanel.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CPanel.java b/java/apps/NexusII/classes/awtCommand/CPanel.java
deleted file mode 100644
index 1c8d39f8537..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CPanel.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CPanel extends Panel {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-    /**
-     * Constructs a new CPanel.
-     */
-    public CPanel() {
-	super();
-    }
-
-
-    /**
-     * Handles the event.
-     * Calls methods for variousL events and passes
-     * others to its superclass method.
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /*
-     * set...Command methods
-     */ 
-
-
- 
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CTextArea.class b/java/apps/NexusII/classes/awtCommand/CTextArea.class
deleted file mode 100644
index 9ec6e238cdf..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextArea.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CTextArea.java b/java/apps/NexusII/classes/awtCommand/CTextArea.java
deleted file mode 100644
index eacaf526929..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextArea.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CTextArea extends TextArea {
-    
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-
-    /**
-     * Constructs a new TextArea.
-     */
-    public CTextArea() {
-	super();
-    }
-
-    /**
-     * Constructs a new TextArea with the specified number of rows and columns.
-     * @param rows the number of rows
-     * @param cols the number of columns
-     */
-    public CTextArea(int rows, int cols) {
-	super(rows, cols);
-    }
-
-    /**
-     * Constructs a new TextArea with the specified text displayed.
-     * @param text the text to be displayed 
-     */
-    public CTextArea(String text) {
-        super(text);
-    }
-
-    /**
-     * Constructs a new TextArea with the specified text and the 
-     * specified number of rows 
-     * and columns.
-     * @param text the text to be displayed
-     * @param rows the number of rows
-     * @param cols the number of cols
-     */
-    public CTextArea(String text, int rows, int cols) {
-	super(text, rows, cols);
-    }
-
-
-    /**
-     * Called when the text area gains the focus.
-     * This results in a call to the gotFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-            gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text area loses the focus.
-     * This results in a call to the lostFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-            lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-   /**
-    * Sets the gotFocusCommand object.
-    */
-    public void setGotFocusCommand(Command c) {
-	gotFocusCommand = c;
-    }
-
-    /**
-     * Sets the lostFocusCommand object.
-     */
-    public void setLostFocusCommand(Command c) {
-	lostFocusCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CTextField.class b/java/apps/NexusII/classes/awtCommand/CTextField.class
deleted file mode 100644
index 6f298a43348..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextField.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CTextField.java b/java/apps/NexusII/classes/awtCommand/CTextField.java
deleted file mode 100644
index 146f13206e5..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextField.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CTextField extends TextField {
-
-    protected Command actionCommand = null,
-		      gotFocusCommand = null,
-		      lostFocusCommand = null;
-
-    /**
-     * Constructs a new CTextField.
-     */
-    public CTextField() {
-	super();
-    }
-
-    /**
-     * Constructs a new CTextField initialized with the specified columns.
-     * @param cols the number of columns
-     */
-    public CTextField(int cols) {
-	super(cols);
-    }
-
-    /**
-     * Constructs a new CTextField initialized with the specified text.
-     * @param text the text to be displayed
-     */
-    public CTextField(String text) {
-	super(text);
-    }
-
-
-    /**
-     * Constructs a new CTextField initialized with the specified text and columns.
-     * @param text the text to be displayed
-     * @param cols the number of columns
-     */
-    public CTextField(String text, int cols) {
-	super(text, cols);
-    }
-
-
-    /**
-     * Called when Enter is pressed in the text field.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the text contents.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-            actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text field gains the focus.
-     * This results in a call to the gotFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-            gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text field loses the focus.
-     * This results in a call to the lostFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-            lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command c) {
-	actionCommand = c;
-    }
-
- 
-   /**
-    * Sets the gotFocusCommand object.
-    */
-    public void setGotFocusCommand(Command c) {
-	gotFocusCommand = c;
-    }
-
-    /**
-     * Sets the lostFocusCommand object.
-     */
-    public void setLostFocusCommand(Command c) {
-	lostFocusCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/Command.class b/java/apps/NexusII/classes/awtCommand/Command.class
deleted file mode 100644
index 6b3c12c24f7..00000000000
--- a/java/apps/NexusII/classes/awtCommand/Command.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/Command.java b/java/apps/NexusII/classes/awtCommand/Command.java
deleted file mode 100644
index 373c7a363cf..00000000000
--- a/java/apps/NexusII/classes/awtCommand/Command.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-
-
-package awtCommand;
-
-import java.awt.*;
-
-public interface Command {
-
-    /**
-     * Executes application logic.
-     * Called by events occurring in associated objects
-     */
-    public abstract void execute(Object target, Event evt, Object what); 
-}
diff --git a/java/apps/NexusII/classes/commandHandler.class b/java/apps/NexusII/classes/commandHandler.class
deleted file mode 100644
index 53033fb6b6b..00000000000
--- a/java/apps/NexusII/classes/commandHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/commandParser.class b/java/apps/NexusII/classes/commandParser.class
deleted file mode 100644
index 62da40871e6..00000000000
--- a/java/apps/NexusII/classes/commandParser.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/connectionHandler.class b/java/apps/NexusII/classes/connectionHandler.class
deleted file mode 100644
index 8708229c0eb..00000000000
--- a/java/apps/NexusII/classes/connectionHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/joinHandler.class b/java/apps/NexusII/classes/joinHandler.class
deleted file mode 100644
index 7669e7faed7..00000000000
--- a/java/apps/NexusII/classes/joinHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/roomHandler.class b/java/apps/NexusII/classes/roomHandler.class
deleted file mode 100644
index 9eaa6cc0899..00000000000
--- a/java/apps/NexusII/classes/roomHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/textHandler.class b/java/apps/NexusII/classes/textHandler.class
deleted file mode 100644
index c52764a236b..00000000000
--- a/java/apps/NexusII/classes/textHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/src/Consumer.java b/java/apps/NexusII/src/Consumer.java
deleted file mode 100644
index 84df9b3a3ae..00000000000
--- a/java/apps/NexusII/src/Consumer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// This class encapsulates a Consumer. The consumer dq's from the queue 
-// Supports both a timed and blocking consumer. 
-// Each instance of this class creates a different thread of control. 
-// On timeout, the producer returns. 
-// The producer tries to dq "iteration" number of times, unless it times out
-
-//package NexusII.util ; 
-
-public class Consumer extends Thread 
-{
-public static final int DEFAULT_ITERATIONS = 1 ; 
-public Consumer(MT_Bounded_Queue queue)
-  {
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS); 
-    this.time_out_ = -1 ; 
-  }
-
-public Consumer(MT_Bounded_Queue queue, String name)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS); 
-    this.time_out_ = -1 ; 
-  }
-
-
-public Consumer(MT_Bounded_Queue queue, String name, Integer iterations)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = iterations ; 
-    this.time_out_ = -1 ; 
-  }
-
-
-public Consumer(MT_Bounded_Queue queue, String name, Integer iterations, long msec_timeout)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = iterations ; 
-    this.time_out_ = msec_timeout ; 
-  }
-
-
-
-public void run()
-  {	
-    for(int i=0;i<iterations_.intValue();i++)
-      {
-	if(time_out_ < 0)
-	  System.out.println(getName() + ": dequeued " + queue_.dq());
-	else
-	  {
-	    Object err = queue_.dq(time_out_); 
-	    if(err == null)
-	      {
-		System.out.println(getName() + ": Timedout\n");
-		return ; 
-	      }
-	    
-	    else
-	      System.out.println(getName() + ": dequeued " + err);
-	  }
-      }
-  }
-  
-
-protected MT_Bounded_Queue queue_ ; 
-private Integer iterations_ ; 
-private long time_out_ ; 
-}
-  
diff --git a/java/apps/NexusII/src/MT_Bounded_Queue.java b/java/apps/NexusII/src/MT_Bounded_Queue.java
deleted file mode 100644
index a9b493fa263..00000000000
--- a/java/apps/NexusII/src/MT_Bounded_Queue.java
+++ /dev/null
@@ -1,226 +0,0 @@
-
-// package NexusII.util ; 
-
-// The minimun functionality to be associated with a queue 
-interface Queue 
-{
-public void nq(Object item);
-public Object dq();
-public boolean is_full();
-public boolean is_empty();
-public static final int DEF_SIZE = 1; 
-}; 
-
-// Specific Conditions associated with MT_Bounded_Queue 
-// Is true if there is space in the queue 
-
-class Not_Full_Condition extends Timed_Wait 
-{
-
-public Not_Full_Condition(MT_Bounded_Queue q)
-  {
-   super(q);
-  }
-  
-public synchronized boolean condition()
-  {
-    MT_Bounded_Queue mq_ = (MT_Bounded_Queue) object_;
-    return !mq_.is_full ();
-  }
-  
-}
-
-// Is true if there's something in the queue 
-
-class Not_Empty_Condition extends Timed_Wait
-{
-
-public Not_Empty_Condition(MT_Bounded_Queue q)
-  {
-    super(q); 
-  }
-  
-public synchronized boolean condition()
-  {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    MT_Bounded_Queue mq_ = (MT_Bounded_Queue) object_;
-    return !mq_.is_empty ();
-  }
-
-private MT_Bounded_Queue mq_ ; 
-}
-
-
-
-
-// Encapsulates a bounded - synchronized queue 
-
-public class MT_Bounded_Queue implements Queue 
-{
-
-
-private Object[] queue_ ; 
-private int front_  ; 
-private int back_   ; 
-private int max_size_ ; 
-private int size_ ; 
-private Not_Empty_Condition not_empty_condition_ ; 
-private Not_Full_Condition not_full_condition_ ; 
-private int nq_count_ ; 
-private int dq_count_ ; 
-
-// The counters counts the number of nq's and dq's operations made on this
-// instance of the queue 
-
-public int dq_count()
-{
-  return dq_count_ ; 
-}
-
-public int nq_count()
-{
-  return nq_count_ ; 
-}
-
-public MT_Bounded_Queue()
-  {
-    // 	call the other constructor with DEF_SIZE 
-    this(DEF_SIZE);
-  }
-  
-public MT_Bounded_Queue(int max_size)
-  {
-    this.front_ = 0 ; 
-    this.back_  = 0 ; 
-    this.max_size_  = max_size ; 
-    this.size_ = 0 ; 
-    // these are included for STATISTICS 
-    this.nq_count_ = 0 ; 
-    this.dq_count_ = 0 ; 
-    this.queue_ = new Object[this.max_size_];
-    not_full_condition_  = new Not_Full_Condition(this);
-    not_empty_condition_ = new Not_Empty_Condition(this);
-  }
-
-// Blocking nq 
-public synchronized void nq(Object item)
-  {
-    // Wait till the queue has space 
-    while(is_full())
-      {
-	try {
-	  wait();
-	} catch (InterruptedException e) {}
-      }
-
-    // enqueue here 
-    queue_[back_] = item ; 
-    back_ = (back_ + 1) % max_size_  ; 
-    size_++ ; 
-    // One more enqueue operation has occured 
-    nq_count_ ++ ; 
-    // wakeup the sleeping guys 
-    notifyAll();
-  }
-
-  // Timed nq 
-// returns -1 if timed_out 
-public synchronized int nq(Object item,long msec_timeout)
-  {
-    // Wait till the queue has space 
-    try {
-      not_full_condition_.timed_wait(msec_timeout);
-    } catch (InterruptedException e) {}
-    catch (TimeoutException t) 
-      { 
-	return -1 ; 
-      }
-  
-  // enqueue here 
-  queue_[back_] = item ; 
-  back_ = (back_ + 1) % max_size_  ; 
-  size_++ ; 
-  	
-  // One more enqueue operation has occured 
-  nq_count_ ++ ; 	
-  // wakeup the sleeping consumers 
-  not_empty_condition_.broadcast ();
-  return 0 ; 
-  }
-
-
-
-
-  // Blockin dq 
-public synchronized Object dq()
-  {
-    // wait till the queue has something in it 
-    while(is_empty())
-      {
-	try {
-	  wait();
-	} catch (InterruptedException e) {}
-      }
-
-    // dequeue here 
-    Object return_object = queue_[front_] ; 
-    front_ = (front_ + 1) % max_size_ ; 
-    size_ -- ; 
-    // One more enqueue operation has occured 
-    dq_count_ ++ ; 
-    //wake up the sleeping producers
-    notifyAll(); 
-    return return_object ; 
-  }
-
-
-  // Timed dq 
-
-public synchronized Object dq(long msec_timeout)
-  {
-    // wait till the queue has something in it 
-    try {
-      not_empty_condition_.timed_wait(msec_timeout);
-    } catch (InterruptedException e) {}
-    catch (TimeoutException t)
-      {
-	return null; 
-      }
-
-    // dequeue here 
-    Object return_object = queue_[front_] ; 
-    front_ = (front_ + 1) % max_size_ ; 
-    size_ -- ; 
-    
-    // One more enqueue operation has occured 
-    dq_count_ ++ ; 
-
-    //wake up the sleeping guys 
-    not_full_condition_.broadcast(); 
-    return return_object ; 
-  }
-
-public boolean is_empty()
-  {
-    if (size_ == 0)
-      return true ;
-    else
-      return false ; 
-  
-  } 
-
-public boolean is_full()
-  {
-    if (size_ == max_size_)
-      return true ; 
-    else
-      return false ; 
-  }
-
-}
-
-
-
-
-
diff --git a/java/apps/NexusII/src/MT_Bounded_Queue_Group.java b/java/apps/NexusII/src/MT_Bounded_Queue_Group.java
deleted file mode 100644
index 734dc51a84b..00000000000
--- a/java/apps/NexusII/src/MT_Bounded_Queue_Group.java
+++ /dev/null
@@ -1,79 +0,0 @@
-//package NexusII.server;
-
-//import NexusII.util.*;
-import java.util.*;
-
-
-public class MT_Bounded_Queue_Group {
-
-  public Vector q_group_ = new Vector();
-
-  public MT_Bounded_Queue_Group(int num) { 
-  
-    q_group_ = new Vector(num);
-  
-  }
-
-  public MT_Bounded_Queue_Group() {
-
-    //  q_group_ = new Vector();
-
-  }
-
-  public String toString() {
-  
-    return q_group_.toString();
-
-  }
-
-  // always returns true
-  public boolean addToGroup(MT_Bounded_Queue q) {
-  
-    q_group_.addElement(q);
-    return true; // for now
-  
-  }
-  
-
-  // returns false if the q was not part of the group
-  public boolean delFromGroup(MT_Bounded_Queue q) {
-
-    return q_group_.removeElement(q);
-
-  }
-
-
-  public boolean checkInGroup(MT_Bounded_Queue q) {
-
-    return q_group_.contains(q);
-
-  }
-
-
-    // returns number of q's on which data was successfully enqueued
-  public int nq(Object o) {
-    
-    if(q_group_.isEmpty() ) 
-      return 0;
-    
-    Enumeration e = q_group_.elements();
-    
-      int i = 0;
-      while(e.hasMoreElements()) {
-	
-	MT_Bounded_Queue q = (MT_Bounded_Queue) e.nextElement();
-	q.nq(o);
-	i++;
-	
-      }
-      
-      return i;
-  }
-  
-}
-
-
-
-
-
-  
diff --git a/java/apps/NexusII/src/NexusClientApplet.java b/java/apps/NexusII/src/NexusClientApplet.java
deleted file mode 100644
index 58b26930718..00000000000
--- a/java/apps/NexusII/src/NexusClientApplet.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:10:59  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.3  1996/12/06  07:25:29  rajeev
-# Got SetRoomName to work -- needed for LROOMS
-#
-# Revision 1.2  1996/12/06  04:48:21  rajeev
-# added handling for l_users and L_room packets from  server
-#
-# Revision 1.1  1996/12/06  03:37:22  rajeev
-# Initial revision
-#
-
-   This is the client applet 
-   Part of Nexus-II project !!
-   Copyright : Aravind Gopalan, Rajeev Bector, Sumedh Mungee
-*/
-
-// package NexusII; 
-
-// I hate packages
-
-import java.applet.Applet;
-import java.awt.* ; 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-//import NexusII.networking.* ; 
-//import NexusII.client.* ;
-//import NexusII.util.* ; 
-
-// get the awtCommand package now 
-import awtCommand.* ; 
-
-// The applet runs the root thread -- easy access to graphics now ... 
-
-public class NexusClientApplet extends CApplet implements consts,Runnable {
-
-  // Who am I  -- will be modified if the /nick command is given 
-  public static String myName = new String("anonymous"); 
-
-  /* All Event Handlers */ 
-
-  // To check if applet is connected
-  boolean connected = false;
-
-  // The connector handler  
-  connectionHandler nexusConnector ;  
-
-  // join handler 
-  joinHandler  nexusJoiner ; 
-
-  // command handler 
-  commandParser nexusParser ; 
-
-  commandHandler commandLineHandler ; 
-  // Streams for writing and reading from Socket 
-  DataOutputStream outStream;
-  DataInputStream  inStream;
-
-  // Thread which does everything for the applet 
-  Thread mainThread ; 
-
-  // this is just a visit 
-  // host where I live actually ;-)
-  String host;
-  
-  // Which server to connect to 
-  Integer serverPort ; 
-
-  // Where are the queues for reading and writing
-  // reader and writers will access these and also the interpretor and dep.
-
-  MT_Bounded_Queue read_q ; 
-  MT_Bounded_Queue write_q ; 
-  MT_Bounded_Queue root_q  ; 
-  // Where Aravind writes his commands 
-  MT_Bounded_Queue command_q ; 
-
-
-
-
-  // ***********************************************************
-  // Graphics objects
-  // ***********************************************************
-
-  // Total applet size
-  int minWidth_ = 500;
-  int minHeight_ = 450;
-
-  // State variables needed to be maintained
-  boolean connected_ = false;
-  int numRooms_ = 0;
-
-  // Buttons
-  private CButton bConn; 
-  private CButton bJoin; 
-  private CButton bLeave; 
-  private CButton bRooms;
-  private CButton bUsers;
-
-  private CTextField tfCommandLine = new CTextField(80);
-  private CTextField tfRoomName = new CTextField(16);
-  private List lRooms = new List(10,false);
-  private Label roomLabel = new Label("Rooms:");
-  private List lUsers = new List(10,false);
-  private Label userLabel = new Label("Users:");
-
-//  private RoomSpace roomspace = new RoomSpace();
-  private Panel roomspace = new Panel();
-    
-  public Dimension preferredSize() {
-      return minimumSize();
-  }
-
-  public Dimension minimumSize() {
-      return new Dimension(minWidth_, minHeight_);
-  }
-
-  // -----------------------------------------------------------------
-  // Basically draws up all the components (not sub-components) of the
-  // Applet window ...
-  // Pretty much straightforward barring quirks of AWT -- ArGo
-  void SetUpButtons(GridBagLayout gbl, GridBagConstraints gbc) { 
-    // The Connect Button
-    gbc.weightx = 1.0;
-    gbc.weighty = 0.5;
-    gbc.gridx = 2;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.ipady = 5;
-    bConn = new CButton("Connect");
-    bConn.setActionCommand(nexusConnector); 
-    gbl.setConstraints(bConn, gbc);
-    add(bConn);
-    gbc.ipady = 0;
-
-    // The remaining buttons
-    gbc.fill = GridBagConstraints.BOTH;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.weightx = 1.0;
-    gbc.weighty = 0.5;
-    gbc.insets = new Insets(2,2,2,2);
-    gbc.ipadx = 2;
-    gbc.ipady = 2;
-
-    // Join Button
-    gbc.gridx = 0;
-    gbc.gridy = 3;
-    bJoin = new CButton("Join");
-    gbl.setConstraints(bJoin,gbc);
-    add(bJoin);
-
-    // Leave Button
-    gbc.gridx = 1;
-    gbc.gridy = 3;
-    bLeave = new CButton("Leave");
-    gbl.setConstraints(bLeave,gbc);
-    add(bLeave);
-
-    // List Rooms Button
-    gbc.gridx = 0;
-    gbc.gridy = 4;
-    bRooms = new CButton("List Rooms");
-    gbl.setConstraints(bRooms,gbc);
-    add(bRooms);
-
-    // List Users Button
-    gbc.gridx = 1;
-    gbc.gridy = 4;
-    bUsers = new CButton("List Users");
-    gbl.setConstraints(bUsers,gbc);
-    add(bUsers);
-
-  }   // of SetUpButtons 
-
-  void SetUpGraphics() { 
-    
-    resize(preferredSize());
-
-    GridBagLayout gbl = new GridBagLayout();
-    GridBagConstraints gbc = new GridBagConstraints();
-    setFont(new Font("Helvetica", Font.PLAIN, 14));
-    setLayout (gbl);
-
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-
-    // For the list of rooms
-    // First the Room list label 
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridx = 0;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.SOUTHWEST;
-    gbc.fill = GridBagConstraints.NONE;
-    gbl.setConstraints(roomLabel,gbc);
-    add(roomLabel);
-    // Now the Room combo -- list + text field
-    // the actual list
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.VERTICAL;
-    gbc.anchor = GridBagConstraints.NORTH;
-    // gbc.insets = new Insets(0,2,0,2);
-    gbl.setConstraints(lRooms,gbc);
-    add(lRooms);
-    if (DEBUG)
-      lRooms.addItem("Room_1");
-    // The text field
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridy = 2;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbc.insets = new Insets(0,0,0,0);
-    gbl.setConstraints(tfRoomName,gbc);
-    add(tfRoomName);
-
-    // Similarly for the list of users
-    // label
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridx = 1;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.SOUTHWEST;
-    gbc.fill = GridBagConstraints.NONE;
-    gbc.insets = new Insets(0,0,0,0);
-    gbl.setConstraints(userLabel,gbc);
-    add(userLabel);
-    // The list
-    gbc.weightx = 1;
-    gbc.weighty = 1;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.VERTICAL;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbl.setConstraints(lUsers,gbc);
-    add(lUsers);
-    if (DEBUG)
-      lUsers.addItem("USer #1");
-
-    // Setup all the buttons
-    SetUpButtons(gbl,gbc) ; 
-
-    // The command line
-    gbc.gridx = 0;
-    gbc.gridy = 5;
-    gbc.ipadx = 0;
-    gbc.ipady = 0;
-    gbc.insets = new Insets(0,0,0,0);
-    gbc.gridwidth = GridBagConstraints.REMAINDER;
-    gbc.fill = GridBagConstraints.NONE;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbl.setConstraints(tfCommandLine,gbc);
-    add(tfCommandLine);
-
-
-    // We are done -- startup with all buttons except connect disabled
-    OnDisconnect(); 
-    return;
-  }
-
-  public void init() {
-    //Get the address of the host the applet was downloaded from 
-    host = getCodeBase().getHost();
-    // Get servers portnumber from the home page 
-    serverPort = Integer.valueOf(getParameter("serverport")); 
-    
-
-    // Create the nexusconnector object whose execute will be called later
-    // on pressing the connect button 
-    nexusConnector = new connectionHandler(host,serverPort,this); 
-
-    if(DEBUG){
-      System.out.println("Server Portnumber is " + serverPort + "\n");
-    }
-
-    // initialize the graphics 
-    SetUpGraphics(); 
-  } // of method init 
-
-  public synchronized void start() { 
-    // Aravind will create the "connect" button here and register an instance
-
-    if (DEBUG) {
-      System.out.println("In start() method.");
-    }
-  }
-
-
-  //  Here is the stop for the applet
-  //  Called when the user goes away from the page 
-  public synchronized void stop() {
-    if (!DEBUG) { 
-      showStatus("Stop has been called ");
-    }
-
-    if (connected) {
-      nexusConnector.execute(null,null,null);
-    }
-  }
-
-
-
-    
-  // -----------------------------------------------------------------------
-  // Public Access functions
-  public Hashtable Mapper() {
-    return nexusJoiner.Mapper();
-  }
-  
-  public String GetRoomName() { 
-    StringTokenizer t = new StringTokenizer(tfRoomName.getText()); 
-    if(t.hasMoreTokens()) { 
-      return  t.nextToken(); 
-    }
-    else
-      return "" ; 
-  }
-  
-  public void AddRoomName(String name) {
-    int count = lRooms.countItems(); 
-    for (int i=0;i<count;i++) 
-      if (lRooms.getItem(i).equalsIgnoreCase(name))
-	return;
-    lRooms.addItem(name);
-  }
- 
-  public void SetRoomName(String name) { 
-    int count = lRooms.countItems(); 
-    for(int i=0;i<count;i++) { 
-      if(lRooms.getItem(i).equalsIgnoreCase(name)) { 
-	// Have to simulate a select event by doing the selection ourselves
-	lRooms.select(i);
-	tfRoomName.setText(lRooms.getSelectedItem());
-	tfRoomName.selectAll();
-	break ; 
-      } 
-    } 
-  } 
-  
-  public void  sendNickToServer(String name) { 
-    nexusJoiner.sendTestPacket("ROOT","NICK",name,nexusConnector.writer_q());
-  }
-
-
-  // will run the mainthread 
-  public void run() { 
-    if(DEBUG) { 
-      System.out.println("Root thread is starting -- ");
-    }
-
-    root_q = new MT_Bounded_Queue(QUEUE_SIZE);
-    nexusJoiner.Mapper().put("ROOT",root_q);
-    // continously wait for something to read and then update the graphics
-    // objects ----
-    if(DEBUG) { 
-      nexusJoiner.sendTestPacket("ROOT","LROOMS","a b c d",root_q);
-    }
- 
-    for(;;) { 
-      dataPacket rootPacket = (dataPacket)root_q.dq(); 
-      if(DEBUG) { 
-	System.out.println("Root got a packet --- ");
-      }
-      if(rootPacket.contentType().equalsIgnoreCase("LROOMS")) { 
-	update_lrooms(rootPacket.content()); 
-      } 
-      else if(rootPacket.contentType().equalsIgnoreCase("LUSERS")) { 
-	update_lusers(rootPacket.destination(),rootPacket.content()); 
-      } 
-    } 
-    
-  }
-  
-
-  
-  // This method will update the graphics of lrooms 
-  void update_lrooms(String data) { 
-    lRooms.disable(); 
-    tfRoomName.disable(); 
-    lRooms.clear(); 
-    
-    StringTokenizer t = new StringTokenizer(data);
-    while(t.hasMoreTokens()) { 
-      lRooms.addItem(t.nextToken()); 
-    }
-    if (lRooms.countItems() != 0) {
-      lRooms.select(0);
-      tfRoomName.setText(lRooms.getItem(0));
-    }
-    tfRoomName.enable(); 
-    lRooms.enable(); 
-    repaint(); 
-  } 
-
-  void update_lusers(String name,String data) { 
-    lUsers.disable(); 
-    userLabel.setText("Users: "+ name);
-    lUsers.clear();
-    StringTokenizer t = new StringTokenizer(data);
-    while(t.hasMoreTokens()) { 
-      lUsers.addItem(t.nextToken()); 
-    }
-    lUsers.enable(); 
-    repaint(); 
-  } 
-    
-  // -----------------------------------------------------------------------
-  // User Input handling -- ArGo
-
-  // Function to handle Connect button being pressed
-  public void OnConnect(){
-    // Create the event handlers -- 
-    nexusJoiner    = new joinHandler(nexusConnector.writer_q(),this); 
-    nexusParser    = new commandParser(nexusConnector.writer_q(),this); 
-    commandLineHandler = new commandHandler(this); 
-    // start the main thread in the applets context 
-    mainThread  =  new Thread(this); 
-    mainThread.start(); 
-    // test 
-      // Graphics here -- 
-    bJoin.enable();
-    bJoin.setActionCommand(nexusJoiner); 
-    bLeave.enable(); 
-    bLeave.setActionCommand(nexusJoiner); 
-    bRooms.enable();
-    bRooms.setActionCommand(nexusParser); 
-    bUsers.enable();
-    bUsers.setActionCommand(nexusParser); 
-    tfCommandLine.enable();
-    tfCommandLine.setActionCommand(commandLineHandler); 
-    tfRoomName.enable();
-    lRooms.enable();
-    lUsers.enable();
-    // Change the name to "Disconnect" and ensure that update happens
-    bConn.setLabel("Disconnect");
-    validate();	// Don't know if this is necessary
-    connected = true; // Applet is now connected
-  }
-
-  // Function to handle Connect button being pressed
-  public void OnDisconnect(){
-    bJoin.disable();
-    bLeave.disable();
-    bRooms.disable();
-    bUsers.disable();
-    tfCommandLine.disable();
-    tfRoomName.disable();
-    lRooms.disable();
-    lUsers.disable();
-    // Change the name back to "Connect" and ensure update happens
-    bConn.setLabel("Connect");
-    validate();
-    // Stop the ROOT room thread
-    if (connected) {
-      mainThread.stop();
-      connected = false;  // Applet is disconnected
-    }
-  }
-
-  // Basically take care of the inputs
-  public boolean handleEvent(Event event) {
-    if (event.target == lRooms) {
-      if (event.id == Event.LIST_SELECT) {	// selected the item
-	tfRoomName.setText(lRooms.getSelectedItem());
-	tfRoomName.selectAll();
-	if (DEBUG)
-	  System.out.println("Actually handling the select event");
-	return true;
-      }
-    }
-    return super.handleEvent(event);
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-} // of class NexusClientApplet 
-
-
-  
diff --git a/java/apps/NexusII/src/NexusIIserver.java b/java/apps/NexusII/src/NexusIIserver.java
deleted file mode 100644
index e3b5a52acd5..00000000000
--- a/java/apps/NexusII/src/NexusIIserver.java
+++ /dev/null
@@ -1,280 +0,0 @@
-// The Nexus II server.
-// Sumedh Mungee <sumedh@cs.wustl.edu>
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import ACE.OS.*;
-import ACE.SOCK_SAP.*;
-
-public class NexusIIserver implements consts {
-
-  // Entry point into the server
-  public static void main(String args[]) throws IOException {
-    
-    if(args.length != 1) {
-      System.out.println("Usage: java NexusIIserver <port_num>");
-      return;
-    }
-
-    // Create a "Hotel", which is a factory to generate Rooms
-    // as and when required.
-    RoomFactory Hotel = new RoomFactory();
-
-    System.out.println("NexusII server booting");
-    SOCKAcceptor sacceptor = new SOCKAcceptor( (new Integer(args[0])).intValue());
-
-    System.out.println("NexusII is now accepting connections on port " + (new Integer(args[0])).intValue());
-    
-    for(;;) { 
-      
-      SOCKStream s = new SOCKStream();
-      sacceptor.accept(s);
-      // Accepted connection
-      // construct a client handler..
-      // Pass in the connected socket as an argument,
-      // and a reference to the Hotel, in case it needs
-      // to create rooms..
-      // and away you go..
-      new Thread(new ClientHandler(s, Hotel)).start();
-      
-    }
-  }
-}  
-
-
-// This thread handles the clients..
-// It uses 2 additional threads for read/write network operations 
-// These threads are dedicated to read/write from the
-// respective read/write queues.. 
-class ClientHandler implements Runnable,consts {
-  
-  private SOCKStream s_;
-  private RoomFactory Hotel_;
-  private MT_Bounded_Queue rq_ = new MT_Bounded_Queue(QUEUE_SIZE);
-  private MT_Bounded_Queue wq_ = new MT_Bounded_Queue(QUEUE_SIZE);
-  private String my_name_;
-  private Vector roomlist_ = new Vector();
-  private boolean finished_ = false;
-  private String init_image_;
-  
-  public ClientHandler(SOCKStream s, RoomFactory h) {
-    s_ = s;
-    Hotel_ = h;
-    init_image_ = new String(System.getProperty("mywebaddress") + NEXUS_LOGO);
-  }
-  
-  public void run()  {
-      // Construct the reader/writer threads with the queues and the
-      // corresponding socket data streams as parameters.
-      Thread r_ = new socketReaderThread(rq_, new DataInputStream(s_.inputStream()));
-      Thread w_ = new socketWriterThread(wq_, new DataOutputStream(s_.outputStream()));
-      r_.start();
-      w_.start(); 
-      
-      // now start parsing the messages, and take action..
-      // todo: optimize the below..
-
-      while(!finished_) {
-	dataPacket d = (dataPacket) rq_.dq();
-	if(d.contentType().startsWith("INIT"))
-	  nexus_init(d);
-	if(d.contentType().startsWith("JOIN"))
-	  nexus_join(d);
-	if(d.contentType().startsWith("LEAVE"))
-	  nexus_leave(d);
-	if(d.contentType().startsWith("QUIT"))
-	  nexus_quit(d);
-	if(d.contentType().startsWith("TEXT"))
-	  nexus_text(d);
-	if(d.contentType().startsWith("LUSERS"))
-	  nexus_lusers(d);
-	if(d.contentType().startsWith("LROOMS"))
-	  nexus_lrooms(d);
-	if(d.contentType().startsWith("NICK"))
-	  nexus_nick(d);
-	if(d.contentType().startsWith("URL"))
-	  nexus_url(d);
-      }
-  }
-  
-  // The following classes implement the server functions..
-  
-  private void nexus_init(dataPacket packet) {
-    my_name_ = new String(packet.clientName());
-    wq_.nq(packet);
-  }
-
-  private void nexus_join(dataPacket packet) {
-    Room r = Hotel_.getRoom(packet.content());
-    if(r.checkClient(this)) 
-      return;
-    r.addClient(this);
-    roomlist_.addElement(r);
-    writeRoom(r, my_name_ + " has joined the room ");
-    String contenttype = new String("url");
-    dataPacket d = new dataPacket(my_name_, packet.content(), contenttype, (new Integer(init_image_.length())).toString() , init_image_);
-    wq_.nq(d);
-  }
-
-  private void nexus_text(dataPacket packet) {
-    Room r = Hotel_.getRoom(packet.destination());
-    r.getQ().nq(packet);
-  }
-  
-  private void nexus_lusers(dataPacket packet) {
-
-    Room r = Hotel_.getRoom(packet.content());
-    Enumeration e = r.clientList();
-    StringBuffer sb = new StringBuffer();
-    while(e.hasMoreElements()) 
-      sb.append(" " + ((ClientHandler)e.nextElement()).getName() + " ");
-    dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(sb.length())).toString(), sb.toString());
-    wq_.nq(d);
-  }
-  
-  private void nexus_lrooms(dataPacket packet) {
-    String s = Hotel_.listRooms();
-    dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(s.length())).toString(), s.toString());
-    wq_.nq(d);
-  }
-    
-  private void nexus_nick(dataPacket packet) {
-    Enumeration e = roomlist_.elements();
-    while(e.hasMoreElements()) 
-      writeRoom((Room)e.nextElement(), my_name_ + " is now known as " + packet.content());
-
-    my_name_ = new String(packet.content());
-  }
-
-  private void nexus_leave(dataPacket packet) {
-    
-    Room r = Hotel_.getRoom(packet.content());
-    writeRoom(r, my_name_ + " has left the room " + packet.content());
-    if(r.delClient(this)) Hotel_.delRoom(r);
-    roomlist_.removeElement(r);
-  }      
-  
-  private void nexus_quit(dataPacket packet) {
-    
-    Enumeration e = roomlist_.elements();
-    while(e.hasMoreElements()) {
-      Room r = (Room)e.nextElement();
-      writeRoom(r, my_name_ + " has quit " );
-      r.delClient(this);
-    }
-    finished_ = true;
-  }
-
-  private void nexus_url(dataPacket packet) {
-    try {
-      URL u = new URL(packet.content());
-
-      // first extract the filename stripped of its path.
-      int index = u.getFile().lastIndexOf("/");
-      String infilename = u.getFile().substring(index + 1);
-
-      // next construct the name of the temporary file
-      String outfilename = (System.getProperty("mywebdir") + "_" + packet.destination() + "." + infilename);
-
-      // now the temporary URL assigned to this request
-      String imageURL = new String(System.getProperty("mywebaddress") + "_" + packet.destination() + "." + infilename);
-
-      // Open temporary file for writing
-      FileOutputStream fout = new FileOutputStream(outfilename);
-
-      // Now contact alien ship
-      InputStream i = u.openStream();
-      byte[] buffer = new byte[1024];
-      
-      // And download the image
-      for(;;) {
-	int num = i.read(buffer);
-	if(num < 0) 
-	  break;
-	fout.write(buffer, 0, num);
-      }
-
-      fout.close();
-      i.close();
-      
-      // Get room for which this request was issued
-      Room r = Hotel_.getRoom(packet.destination());
-      
-      // invalidate previous entry
-      File f = new File(r.getLastImageName());
-      if(f.exists()) f.delete();
-
-      // add new image name
-      r.putNextImageName(outfilename);
-      writeRoom(r,"Asynchronously transferring image " + packet.content() + " from " + my_name_ );
-      dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(imageURL.length())).toString(), imageURL);
-      r.getQ().nq(d); // multicast this imageURL onto the room..
-    
-    }
-    catch(java.net.MalformedURLException ue) {
-      System.out.println("warning:Invalid URL requested");
-    }
-    catch(java.io.IOException e) {
-      System.out.println("warning: IOException occurred");
-    }
-    
-  }
-
-  // Sends a "system" message msg onto room r
-  private void writeRoom(Room r, String msg) {
-    StringBuffer sb = new StringBuffer();
-    sb.append("==>");
-    sb.append(msg);
-    dataPacket d = new dataPacket(my_name_, r.getName() , "TEXT" , (new Integer(sb.length())).toString(), sb.toString());
-    r.getQ().nq(d);
-  }
-
-  public String getName() {
-    return my_name_;
-  }
-
-  public MT_Bounded_Queue getQ() {
-    return wq_;
-  }
-  
-}
-// ----------------------------------------------------------------------
-/** This class implements a room factory. getRoom returns an existing room,
-  or else creates it and returns a reference to a new room.
-  
-**/ 
-class RoomFactory implements consts {
-
-  private Vector Hotel_; 
-  public RoomFactory() { 
-    Hotel_ = new Vector(); 
-  } 
-  public synchronized Room getRoom(String name) {
-    Enumeration e = Hotel_.elements();
-    while(e.hasMoreElements()) {
-      Room r = (Room) e.nextElement();
-      if(r.getName().equals(name)) 
- 	return r;
-    }
-    addRoom(name);
-    return getRoom(name);
-  } 
-  
-  private synchronized void addRoom(String name) {
-    Room r = new Room(name);
-    Hotel_.addElement(r);
-  }
-  public synchronized void delRoom(Room r) {
-    Hotel_.removeElement(r);
-  }
-  public synchronized String listRooms() {
-    Enumeration e = Hotel_.elements();
-    StringBuffer sb = new StringBuffer();
-    while(e.hasMoreElements())
-      sb.append(" " + ((Room)e.nextElement()).getName() + " ");
-    return sb.toString();
-  }
-}  
-
-
diff --git a/java/apps/NexusII/src/Producer.java b/java/apps/NexusII/src/Producer.java
deleted file mode 100644
index 4153f7d79df..00000000000
--- a/java/apps/NexusII/src/Producer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// This class encapsulates a Producer. Each new instance of this class 
-// creates a different thread which tries to nq into the queue 
-// Currently queues random values generated by the Random class 
-// If timeout expires, the Producer instance returns 
-
-//package NexusII.util ; 
-
-import java.util.Random ; 
-
-public class Producer extends Thread 
-{
-
-// If no time out is desired, timeout value is set to one. so the run method
-// knows which nq to call 
-
-public Producer(MT_Bounded_Queue queue) 
-  {
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS);
-    this.time_out_ = -1 ; 
-  }
-
-// Include the name of the thread as a parameter   
-public Producer(MT_Bounded_Queue queue, String name)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS);
-    this.time_out_ = -1 ; 
-  }
-
-// If the number of iterations are also included -- 
-public Producer(MT_Bounded_Queue queue, String name, Integer iterations)
-  {
-    super(name);
-    this.queue_ = queue ; 
-    iterations_ = iterations ; 
-    this.time_out_ = -1 ; 
-  }
-
-// Finally, if the timeout period is also included 
-	  
-public Producer(MT_Bounded_Queue queue, String name, Integer iterations, long msec_timeout)
-  {
-    super(name);
-    this.queue_ = queue ; 
-    iterations_ = iterations ; 
-    this.time_out_ = msec_timeout ;     
-  }
-  
-// The  hook method called by start()
-
-public void run()
-  {
-    // Initialize the random number generator
-    Random rand = new Random();	
-    for(int i=0;i<iterations_.intValue();i++)
-      {
-	int err = 0 ; 
-	// Get the next random value for insertion into queue 
-	Integer new_item = new Integer(rand.nextInt()) ; 
-
-	// Doesnt make sense to have a negative timeout -- default 
-	if(time_out_ < 0)
-	  queue_.nq(new_item);
-	else
-	  err = queue_.nq(new_item,time_out_);
-
-	// If timedout stop this thread 
-	if(err == -1)
-	  {
-	    System.out.println(getName() + ": Timed Out \n");
-	    return ; 
-	  }
-
-	System.out.println(getName() + ": enqueued " + new_item.intValue());
-      }
-    
-  }
-
-private static final int DEFAULT_ITERATIONS = 1 ; 
-protected MT_Bounded_Queue queue_ ; 
-private Integer iterations_ ; 
-private long time_out_ ; 
-}
-
-
diff --git a/java/apps/NexusII/src/Room.java b/java/apps/NexusII/src/Room.java
deleted file mode 100644
index 4a9a294c653..00000000000
--- a/java/apps/NexusII/src/Room.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// RoomThread and Room implement the concept of a chat "room"
-// Sumedh Mungee <sumedh@cs.wustl.edu>
-
-
-import java.util.*;
-import java.io.File;
-
-// This class(&thread) is responsible for multicasting
-// packets on its incoming "client" queues, onto one or
-// more outgoing queues, which are picked up by the client.
-class RoomThread implements Runnable, consts {
-
-  private MT_Bounded_Queue rq_;
-  private Vector clientlist_;
-
-  public RoomThread(MT_Bounded_Queue rq, Vector clientlist) {
-    rq_ = rq;
-    clientlist_ = clientlist;
-  }
-  
-  public void run() {
-    for(;;) {
-      dataPacket d = (dataPacket) rq_.dq(); // Extract packet
-      Enumeration e = clientlist_.elements(); // Iterate over clients
-      while(e.hasMoreElements()) 
-        ((ClientHandler)e.nextElement()).getQ().nq(d); // Enqueue packet
-    }
-  }
-}
-
-
-public class Room implements consts {
-  
-  private String name_;         // name of this "room" 
-  private String last_image_ = new String("NexusII.gif"); // filename of the last image broadcast
-  private Thread roomthread_;
-  private  MT_Bounded_Queue rq_ = new MT_Bounded_Queue();
-  private Vector clientlist_ = new Vector();
-  
-  // Constructors
-  public Room(String name) {
-    int i;
-    name_ = new String(name);
-    roomthread_ = new Thread(new RoomThread(rq_, clientlist_));
-    roomthread_.start();
-  } 
- 
-  // Client management methods follow..
-
-  public synchronized void addClient(ClientHandler client) {
-    clientlist_.addElement(client);
-  }
-  // Returns true if this room has now become empty
-  public synchronized boolean delClient(ClientHandler client) {
-    clientlist_.removeElement(client);
-    return clientlist_.isEmpty();
-  }
-  
-  public synchronized boolean checkClient(ClientHandler client) {
-    return clientlist_.contains(client);
-  }
-  
-  public synchronized Enumeration clientList() {
-    return clientlist_.elements();
-  }
-
-  public String getName() {
-    return name_;
-  }
-
-  public MT_Bounded_Queue getQ() {
-    return rq_;
-  }
-
-  public synchronized String getLastImageName() {
-    return last_image_;
-  }
-
-  public synchronized void putNextImageName(String s) {
-    last_image_ = s;
-  }
-
-  protected void finalize() {
-    roomthread_.stop();
-    File f = new File(last_image_);
-    if(f.exists()) 
-      f.delete();
-    roomthread_ = null;
-  }
-}
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/RoomFrame.java b/java/apps/NexusII/src/RoomFrame.java
deleted file mode 100644
index e9da19b31d6..00000000000
--- a/java/apps/NexusII/src/RoomFrame.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:02  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.2  1996/12/07  06:25:18  rajeev
-# backup
-#
-# Revision 1.1  1996/12/07  06:15:12  rajeev
-# Initial revision
-#
-
-
-*/
-import java.awt.*;
-import awtCommand.*;
-import java.util.* ;
-
-//import NexusII.client.* ;
-//import NexusII.util.* ;
-//import NexusII.networking.*;
-
-class RoomFrame extends CFrame implements consts {
-  private static String rcsId = new String("$Id$");
-
-  // Graphics Objects
-  private CTextField tfInput ; 
-  private CTextArea taOutput ;
-  private CButton bLeave ;
-  private ImageCanvas icOutput;
-  private Font normalFont = new Font("Helvetica", Font.PLAIN, 14);
-  private Font boldFont = new Font("Helvetica", Font.BOLD, 14);
-  private Font italicFont = new Font("Helvetica", Font.ITALIC, 14);
-  private static final int LINE_LENGTH = 70;
-
-  // Other required objects
-  private MT_Bounded_Queue write_q_ ; 
-  private NexusClientApplet applet_ ; 
-  private String myName_ ; 
-
-  public RoomFrame(MT_Bounded_Queue write_q,
-		   NexusClientApplet applet,
-		   String name) {
-    super(name);
-    write_q_ = write_q ; 
-    applet_  = applet ; 
-    myName_  = name ; 
-    SetUpGraphics();
-    this.pack();
-    this.show();
-  }
-
-  void SetUpGraphics() {
-    // Initialize the graphics objects
-    // The input text line
-    tfInput = new CTextField(LINE_LENGTH);
-    textHandler handlerT = new textHandler(write_q_,applet_,myName_);
-    tfInput.setActionCommand(handlerT);
-    // The leave button
-    bLeave = new CButton(LEAVE_STR);
-    bLeave.setActionCommand(applet_.nexusJoiner);
-	
-    icOutput = new ImageCanvas(myName_);
-    taOutput = new CTextArea(10,LINE_LENGTH);
-
-    GridBagLayout gbl = new GridBagLayout();
-    GridBagConstraints gbc = new GridBagConstraints();
-    setFont(normalFont);
-    setLayout (gbl);
-
-    gbc.insets = new Insets(5,5,5,5);
-    gbc.ipadx  = 5;
-    gbc.ipady  = 5;
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-
-    // First the Image so that sizes are fixed
-    gbc.gridx = 1;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.fill = GridBagConstraints.BOTH;
-    gbl.setConstraints(icOutput, gbc);
-    add(icOutput);
-
-    // The Text Output Area
-    gbc.gridx = 0;
-    gbc.gridy = 0;
-    gbc.weighty = 0.0;
-    gbc.anchor = GridBagConstraints.SOUTH;
-    gbc.fill = GridBagConstraints.BOTH;
-    gbl.setConstraints(taOutput,gbc);
-    taOutput.setEditable(false);
-    add(taOutput);
-
-    // The Text Input Field
-    gbc.gridx = 0;
-    gbc.gridy = 1;
-    gbc.weighty = 0.0;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbl.setConstraints(tfInput,gbc);
-    add(tfInput);
-
-    // The Leave Button
-    gbc.gridx = 1;
-    gbc.gridy = 1;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbl.setConstraints(bLeave,gbc);
-    add(bLeave);
-
-    resize(800,280);
-    setResizable(true);	// Allow the user to resize
-    validate();
-  }
-
-  public boolean handleEvent(Event event) {
-    if (event.id == Event.WINDOW_DESTROY)
-      dispose();
-    return super.handleEvent(event);
-  }
-
-  // This function will be called by the RoomHandler when it receives
-  // anything for this room and will add the data 
-  public  void addText(String tobeadded) {
-    if (false) {
-      String speaker = null;
-      String msg = null;
-      int pos = tobeadded.indexOf(':');
-      if (pos >= 0)
-        speaker = tobeadded.substring(0,pos+1);
-      else
-        speaker = new String("");
-      msg = tobeadded.substring(pos+1);
-      Font oldf = taOutput.getFont();
-      taOutput.setFont(boldFont);
-      taOutput.appendText(speaker);
-      taOutput.setFont(italicFont);
-      taOutput.appendText(msg+"\n");
-      taOutput.setFont(oldf);
-    }
-    else {
-      taOutput.appendText(tobeadded+"\n");
-    }
-    return;
-  }
-
-  // This function will also be called by the RoomHandler whenit receives
-  // Image data for this room. 
-  public void 	updateImage(Image im) { 
-    if(DEBUG) { 
-      System.out.println("Room : I got an image");
-    }
-    icOutput.setImage(im);
-  } 
-  
-  
-}
-
-
-
-/**
- * The ImageCanvas Class -- for the image in the class
- */
-class ImageCanvas extends Canvas implements consts {
-
-  Image image_ = null;
-  int defWidth_ = 128;
-  int defHeight_ = 128;
-  int margin = 5;
-
-  String name_ = new String("Nexus Room");
-  Font nameFont = new Font("Helvetica",0,14);
-
-  public ImageCanvas(String s) 
-  {
-    name_ = s;
-  }
-
-  public Dimension preferredSize() {
-    return minimumSize();
-  }
-  public Dimension minimumSize() {
-    return new Dimension(defWidth_, defHeight_);
-  }
-
-  public void setImage(Image newIm) {
-    image_ = newIm;
-    repaint();
-  }
-  public Image getImage() {
-    return image_;
-  }
-
-  public void name(String n) {
-    name_ = n;
-  }
-  public String name() {
-    return name_;
-  }
-
-  public void paint(Graphics g) {
-    Dimension d = size();
-    int width = d.width;
-    int height = d.height;
-
-    if (DEBUG)
-      System.out.println("ImageCanvas:: width = "+width+ " height="+height);
-
-    g.setColor(Color.black);
-    g.fillRect(0,0,width-1,height-1);
-    g.setColor(Color.white);
-    g.fillRect(margin,margin,width-2*margin,height-2*margin);
-    // Create image if reqd
-    if (image_ == null)
-      image_ = createImage(width-2*margin,height-2*margin);
-
-    g.drawImage(image_, margin, margin,
-		width-2*margin, height-2*margin, Color.white, this);
-    g.setColor(Color.blue);
-    g.setFont(nameFont);
-    FontMetrics fm = g.getFontMetrics();
-    g.drawString(name_,(width - fm.stringWidth(name_))/2,
-		 (int)(height*0.9 - fm.getMaxDescent()));
-    validate();
-    return;
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-
-} // End of the Image Canvas Class
-
-
-
-// this is the event handler for the textfield -- whenever anything is typed 
-class textHandler implements Command,consts,Runnable { 
-  private MT_Bounded_Queue write_q_ ; 
-  private NexusClientApplet applet_ ; 
-  private String name_ ; 
-  Object what_ ; 
-
-  public textHandler(MT_Bounded_Queue write_q,
-		     NexusClientApplet applet,
-		     String name) { 
-    write_q_ = write_q ;
-    applet_   = applet ; 
-    name_ = name ; 
-  }
-
-  public void execute(Object target, Event evt, Object what) { 
-    // get the string and send it across in a different thread 
-    what_ = what ; 
-    // clear the field in the gui 
-    ((TextField)target).setText("");
-    // send it off 
-    new Thread(this).start(); 
-  }
-
-  // send off the string in a different thread 
-  public void run() {
-    String data = (String)what_; 
-    // check if data begins with / and is followed by url 
-    if(!data.startsWith("/url")) { 
-      
-      String user = NexusClientApplet.myName ;
-      String command = user + ":" + data ; 
-      String len = Integer.toString(command.length());
-      dataPacket packet  = new dataPacket(NexusClientApplet.myName,name_,
-					  "TEXT",len,command);
-      write_q_.nq(packet);
-    }
-    else { 
-      // it is /url 
-      StringTokenizer t  = new StringTokenizer(data); 
-      // take out the /url from here 
-      String ur = t.nextToken(); 
-      // data now 
-      String command = t.nextToken(); 
-      String len = Integer.toString(command.length());
-      dataPacket packet  = new dataPacket(NexusClientApplet.myName,name_,
-					  "URL",len,command);
-      write_q_.nq(packet);
-    }
-  }
-} // end of class   
-	
-	
-
diff --git a/java/apps/NexusII/src/RoomSpace.java b/java/apps/NexusII/src/RoomSpace.java
deleted file mode 100644
index 9afb78ddff1..00000000000
--- a/java/apps/NexusII/src/RoomSpace.java
+++ /dev/null
@@ -1,110 +0,0 @@
-import java.awt.*;
-
-class RoomFrame extends Frame // implements Runnable
-{
-
-  // Graphics Objects
-    private Panel  panel = new Panel();
-    private TextField tfInput = new TextField(80);
-    private TextArea taOutput = new TextArea(80,10);
-    Button bLeave = new Button("Leave");
-    ImageCanvas icOutput = new ImageCanvas();
-
-  void InitGraphics()
-  {
-      GridBagLayout gbl = new GridBagLayout();
-      GridBagConstraints gbc = new GridBagConstraints();
-      setFont(new Font("Helvetica", Font.PLAIN, 14));
-      panel.setLayout (gbl);
-
-      gbc.weightx = 1.0;
-      gbc.weighty = 1.0;
-
-      // First the Image so that sizes are fixed
-      gbc.gridx = 1;
-      gbc.gridy = 0;
-      gbc.anchor = GridBagConstraints.CENTER;
-      gbc.fill = GridBagConstraints.NONE;
-      gbl.setConstraints(icOutput, gbc);
-      panel.add(icOutput);
-
-      // The Text Output Area
-      gbc.gridx = 0;
-      gbc.gridy = 0;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(taOutput,gbc);
-      taOutput.setEditable(false);
-      panel.add(taOutput);
-
-      // The Text Input Field
-      gbc.gridx = 0;
-      gbc.gridy = 1;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(tfInput,gbc);
-      panel.add(tfInput);
-
-      // The Leave Button
-      gbc.gridx = 1;
-      gbc.gridy = 1;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(bLeave,gbc);
-      panel.add(bLeave);
-  }
-      
-      
-  public RoomFrame()
-  {
-      this("Anonymous");
-  }
-
-  public RoomFrame(String s)
-  {
-      InitGraphics();
-      super(s);
-      this.pack();
-      this.show();
-  }
-
-  public boolean handleEvent(Event event)
-  {
-      if (event.id == Event.WINDOW_DESTROY)
-	  dispose();
-      return super.handleEvent(event);
-  }
-
-}
-
-class ImageCanvas extends Canvas {
-
-  Image image_;
-  int imgWidth_ = 128;
-  int imgHeight_ = 128;
-
-  public Dimension preferredSize() {
-      return minimumSize();
-  }
-
-  public Dimension minimumSize() {
-      return new Dimension(imgWidth_, imgHeight_);
-  }
-
-  public void image(Image newIm) {
-      image_ = newIm;
-  }
-
-  public Image image() {
-      return image_;
-  }
-
-  public void paint(Graphics g) {
-      g.drawImage(image_,0,0,this);
-  }
-
-  public void update() {
-      paint();
-  }
-  
-} // End of the Image Canvas Class
diff --git a/java/apps/NexusII/src/Timed_Wait.java b/java/apps/NexusII/src/Timed_Wait.java
deleted file mode 100644
index 792db39ceb9..00000000000
--- a/java/apps/NexusII/src/Timed_Wait.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// package NexusII.util ; 
-
- 
-// Subclass the Exception class to get TimeoutException 
-  
-class TimeoutException extends Exception
-{
-  public TimeoutException()
-  {
-    super();
-  }
-  
-  public TimeoutException(String s)
-  {
-    super(s);
-  }
-
-}
-
-// Timed_wait class. This can used by enq and deq to do timed_waits 
-public abstract class Timed_Wait
-{
-  // By default the object is itself 
-public Timed_Wait ()
-  {	
-    object_  = this;
-  }
-  // If the calling class specifies objects, delegate to it. 
-public Timed_Wait (Object obj)
-  {
-    object_ = obj;
-  }
-
-  // This is the object we delegate to if a 
-  // subclass gives us a particular object, 
-  // otherwise, we ``delegate'' to ourself 
-  // (i.e., to this).
-protected Object object_;
-  
-  // This hook method must be overridden 
-  // by a subclass to provide the condition.
-
-public abstract boolean condition ();
-
-  // This will borrow the monitor lock from the calling class 
-
-public final void timed_wait(long msec_timeout) 
-throws InterruptedException, TimeoutException 
-  {
-    // wait if the condition is false 
-    if (!condition())
-      {
-	long start = System.currentTimeMillis() ; 
-	long wait_time = msec_timeout ; 
-	
-	for(;;)
-	  {
-	    // anyway have to wait atleast till waittime 
-	    object_.wait(wait_time);
-	    
-	    // on coming out check for the condition again 
-	    if(!condition())
-	      {
-		long now = System.currentTimeMillis() ; 
-		long time_so_far = now - start ; 
-
-		// if timed out 
-		if(time_so_far >= msec_timeout)
-		  throw new TimeoutException() ; 
-		else
-		  // retry !! we have some time left 
-		  wait_time = msec_timeout - time_so_far ; 
-	      }
-	    else // the condition is true here 
-	      break ; 
-	  }
-      }
-  }
-  
-  // Notify all threads waiting on the object_.
-public final void broadcast () 
-  {
-    object_.notifyAll ();
-  }
-}
-
diff --git a/java/apps/NexusII/src/Timer.java b/java/apps/NexusII/src/Timer.java
deleted file mode 100644
index df781274913..00000000000
--- a/java/apps/NexusII/src/Timer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// This class encapsulates a Timer  mechanism 
-// Can be used for Profiling of parts of code and gathering statistics 
-
-package NexusII ; 
-
-public class Timer { 
-
-public Timer()
-{
-  start_ = 0 ; 		
-}
-
-public void start()
-
-{
-  start_ = System.currentTimeMillis(); 
-}
-
-public  long elapsed_time()
-{
-  return System.currentTimeMillis() - start_ ; 
-}
-
-public void stop()
-{
-  start_ = 0 ; 
-}
-
-private long start_ = 0 ; 
-
-}
diff --git a/java/apps/NexusII/src/commandHandler.java b/java/apps/NexusII/src/commandHandler.java
deleted file mode 100644
index 4cf80d04235..00000000000
--- a/java/apps/NexusII/src/commandHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// To handle the events generated by command-line. The user will be saying
-// /nick <nick-name> 
-
-import java.awt.* ; 
-import java.util.* ; 
-
-//import NexusII.client.* ; 
-
-import awtCommand.* ; 
-
-
-public class commandHandler implements Command,consts { 
-  NexusClientApplet applet_ ; 
-  // will handle the /nick command for now -- urgent 
-  public commandHandler(NexusClientApplet applet ) { 
-    applet_ = applet ; 
-  } 
-
-  public void execute(Object target,Event evt,Object what) { 
-    // Right now assume that it is just a nick command 
-    if(DEBUG) { 
-      System.out.println("Nick typed in ---- ");
-    }
-    StringTokenizer t = new StringTokenizer((String)what) ; 
-    // string for holding /nick and <nickname>
-    String command = null  ; 
-    if(t.hasMoreTokens()) { 
-      command = t.nextToken();
-    } 
-
-    if(command.equalsIgnoreCase("/nick")) { 
-      if(t.hasMoreTokens()) { 
-	// have to send a nick packet to server 
-	applet_.myName  = new String(t.nextToken()); 
-	applet_.sendNickToServer(applet_.myName);
-
-      } 
-    }
-    // clear the field in the gui 
-    ((TextField)target).setText(""); 
-
-  }
-}
-// of class 
diff --git a/java/apps/NexusII/src/commandParser.java b/java/apps/NexusII/src/commandParser.java
deleted file mode 100644
index 64e6da66122..00000000000
--- a/java/apps/NexusII/src/commandParser.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:06  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:05:08  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// why not use java utilities !! 
-
-import java.util.* ; 
-import java.lang.* ; 
-import java.awt.* ; 
-
-
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-//import NexusII.networking.* ; 
-
-
-
-import awtCommand.* ; 
-
-// This class takes a command parses it and packetizes it and puts it in the
-// global send queue. It works in its own thread of control and after nqing
-// its run() method falls off. It does its work and dies 
-// Will act as an eventHandler for TextField most probably 
-
-public class commandParser implements Command,consts,Runnable { 
-
-  String command ; 
-  MT_Bounded_Queue q_ ; 
-  NexusClientApplet applet_ ; 
-  // constructor
-
-  public commandParser(MT_Bounded_Queue write_q,NexusClientApplet applet) {
-    // create a reference to the write_q 
-    q_ = write_q ; 
-    // note the applet name 
-    applet_ = applet ; 
-    
-  }
-  
-
-  public void execute(Object target, Event evt, Object what) { 
-    // Get the text which was entered there -- 
-      command = new String((String) what) ; 
-      // run in a separate thread 
-      Thread main = new Thread(this); 
-      main.start(); 
-  }
-
-  // The parser etc. run here 
-  public synchronized void run() { 
-    String actual_command = new String(); 
-    String data = new String(); 
-    String data_len = new String(); 
-    if(DEBUG) { 
-      System.out.println("commandParser thread running --- \n");
-    }
-     
-    // Do the parsing first 
-    if(command.equalsIgnoreCase(LUSERS_STR)) { 
-      actual_command = new String("LUSERS") ; 
-      data = applet_.GetRoomName() ; 
-      data_len = new String(String.valueOf(data.length()));  
-      if(data.length() == 0)
-	return ; 
-    }
-
-    else if(command.equalsIgnoreCase(LROOMS_STR)) { 
-	actual_command = new String("LROOMS") ; 
-	data = new String("") ; 
-	data_len = new String("0") ; 
-    }
-	
-    String room = new String("ROOT"); 
-
-    if(DEBUG) { 
-      System.out.println("The room  is " + room + "\n");
-    }
-
-    /* 
-       StringBuffer databuffer = new StringBuffer();
-       
-       // Get the data 
-       while(t.hasMoreTokens()) { 
-       databuffer.append(t.nextToken());
-       }
-       String data = new String(databuffer); 
-       if(DEBUG) { 
-       System.out.println("The data  is " + data + "\n");
-       }
-
-    // data length 
-    String data_len =  String.valueOf(data.length());
-    // Now make a packet 
-    */ 
-
-    dataPacket pack = new dataPacket(NexusClientApplet.myName,room,actual_command,data_len,data);
-    // enqueue it now 
-    q_.nq(pack); 
-
-  } // my job is over 
-  
-}
-// of class 
-
diff --git a/java/apps/NexusII/src/connectionHandler.java b/java/apps/NexusII/src/connectionHandler.java
deleted file mode 100644
index 5e9d3823a68..00000000000
--- a/java/apps/NexusII/src/connectionHandler.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:07  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:05:30  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// This class will handle the event generated when user presses "connect/dis
-// connect" button. It will maintain all the state associated with a 
-// connection ; 
-// In particular, it will create reader,writer and demux threads and stop
-// them when user pressed disconnect. It also sends the init and quit
-// packet to the server 
-// -- Rajeev Bector 11/26/96 
-
-// package NexusII.networking ; 
-
-import awtCommand.* ; 
-
-import java.net.* ;
-import java.awt.* ; 
-import java.io.* ; 
-import java.util.* ; 
-import ACE.OS.*;
-import ACE.SOCK_SAP.*;
-
-public class connectionHandler implements Command,consts,Runnable { 
-
-  // The socket for reading and writing 
-  // private Socket nexusSocket;
-  private SOCKConnector nexusConnector_ = new SOCKConnector();
-  private SOCKStream nexusStream_  = new SOCKStream();
-
-  // Threads which will do reading and writing from Socket 
-  private Thread readerThread ; 
-  private Thread writerThread ; 
-
-  // Threads which demuxes the data from Write Queue 
-  private Thread demuxThread; 
-
-  // The socket
-  // private Socket nexusSocket_ ; 
-
-  // Data Streams which flow the data out 
-  private DataInputStream is_ ; 
-  private DataOutputStream os_ ; 
-
-  // links to the outside world 
-  private MT_Bounded_Queue read_q_ ; 
-  private MT_Bounded_Queue write_q_ ; 
-  
-  Integer port_ ; 
-  String  host_ ; 
-
-  NexusClientApplet applet_ ; 
-  // Constructor 
-  public connectionHandler(String host,Integer port,NexusClientApplet applet) { 
-    host_ = host ; 
-    port_ = port ; 
-    applet_ = applet ; 
-  } // of constructor 
-
-  // This will be called when the "connect/disconnet" button is pressed 
-
-  public void execute(Object target, Event evt, Object what) { 
-    // run in a separate thread 
-    new Thread(this).start(); 
-  }
-
-  public synchronized void run() { 
-    
-    // If not connected -- then connect 
-    if(!applet_.connected) { 
-
-      // Initialize the queues now 
-      read_q_ = new MT_Bounded_Queue(QUEUE_SIZE);
-      write_q_ = new MT_Bounded_Queue(QUEUE_SIZE);
-
-      // Try to connect to the server now 
-	// nexusSocket_ = new Socket(host_,port_.intValue());
-      try {
-        nexusConnector_.connect(nexusStream_, host_, port_.intValue());
-      }
-      catch(SocketException s) { }
-      catch(IOException i) { }
-      // Attach Streams to read and write end os socket 
-	os_ = new DataOutputStream(nexusStream_.outputStream());
-	is_  = new DataInputStream(nexusStream_.inputStream());
-      
-      // do something now 
-      
-      // create and start the socket reader  first 
-      readerThread = new socketReaderThread(read_q_,is_); 
-      readerThread.start(); 
-      
-      // now create the writer also -- subclass of consumer 
-      writerThread = new socketWriterThread(write_q_,os_);
-      writerThread.start(); 
-      // Have to send the init packet to the server 
-      sayHelloToServer(); 
-
-      
-      // Do all the graphics needed and also init the join handlers etc.
-      applet_.OnConnect();
-	
-      // make sure that when demux is created -- joinHandler is there ... !!
-
-      // Create the demux here -- he'll spawn off the rooms 
-      demuxThread = new nexusDemuxThread(read_q_,applet_.Mapper()); 
-      demuxThread.start(); 
-    
-    } // of if !connected
-
-    // if  connected already then I have to disconnect --- have to 
-    // write code for this 
-    else { 
-      
-      // first leave all the rooms 
-      for(Enumeration e = applet_.Mapper().keys(); e.hasMoreElements();) { 
-	String name = (String) e.nextElement() ; 
-	applet_.SetRoomName(name); 
-	applet_.nexusJoiner.execute(null,null,LEAVE_STR); 
-      } 
-      // send a quit packet to the server 
-      sayByeToServer();
-      
-      // Have to send a leave for all the rooms and leave all the rooms 
-      
-      // stop the running threads
-      readerThread.stop(); 
-      demuxThread.stop(); 
-
-      // Again meddle with graphics
-      applet_.OnDisconnect();
-      return ; 
-    }
-  } // of run 
-
-  // This method returns the underlying socket descriptor 
-  public Socket handle() {
-    return nexusStream_.socket(); 
-  }
-  
-  public DataInputStream getinStream() {
-    return is_ ; 
-  }
-  
-  public DataOutputStream getoutStream() {
-    return os_ ;
-  }
-  
-  public MT_Bounded_Queue reader_q() { 
-    return read_q_ ; 
-  }
-
-
-  public MT_Bounded_Queue writer_q() { 
-    if(write_q_ == null)
-      System.out.println("Sending a null write_q");
-    return write_q_ ; 
-  }
-
-  // This method will compose a hello packet and send it off -- cannot run 
-  // this in a separate thread. Has to send this first surely to our TCP 
-  // Connection 
-
-  public void sayHelloToServer() {
-    // hello doesnt have any body 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("INIT");
-    String contentLength  = new String("0");
-    
-    // Make a proper packet out of it 
-    dataPacket initPacket = new dataPacket(clientID,roomID,contentType,contentLength); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(initPacket);
-    
-  }
-  
-  // This method send a Quit command to the server -- to say that it is 
-  // pushing off 
-  public void sayByeToServer() { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("null");
-    String contentType = new String("QUIT");
-    String contentLength  = new String("0");
-    
-    // Make a proper packet out of it 
-    dataPacket quitPacket = new dataPacket(clientID,roomID,contentType,contentLength); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(quitPacket);
-  } // of sayByeToServer 
-  
-} // of class 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/consts.java b/java/apps/NexusII/src/consts.java
deleted file mode 100644
index 304ec41a41e..00000000000
--- a/java/apps/NexusII/src/consts.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// package NexusII.client ; 
-
-// An interface for all the public constants shared by clientApplet
-// All classes that need to access constants will implement this 
-
-public interface consts { 
-  // Length of each field in the header 
-  public static final int FIELD_LENGTH = 32 ; 
-
-  // Total length of header 
-  public static final int PACKET_HEADER_LENGTH = 128; 
-  
-  // Offset where we can find the data length 
-  public static final int DATA_LEN_OFFSET = 96; 
-	
-  // Size of Queues where reader and writer work 
-  public static final int QUEUE_SIZE = 20 ; 
-
-  // Separator used by tokens in the packet 
-  public static final String SEPARATOR = " " ; 
-
-  // End of message 
-  public static final String END_OF_DATA = "\n" ; 
-
-  // Useful for debugging -- set to false for release version (demo) -- Aravind
-  public static final boolean DEBUG = false; 
-	
-  // Size of hash tables 
-  public static final int HASH_SIZE = 16 ; 
-
-  public static final String JOIN_STR = "Join" ;
-  public static final String LEAVE_STR = "Leave" ;
-  public static final String LUSERS_STR = "List Users" ;
-  public static final String LROOMS_STR = "List Rooms" ;
-  
-  public static final int SERVER_PORT   = 42429 ; 
-  public static final String NEXUS_LOGO = "Nexus_Logo.gif";
-} 
-
-  
diff --git a/java/apps/NexusII/src/dataPacket.java b/java/apps/NexusII/src/dataPacket.java
deleted file mode 100644
index 1bd2dfeb6ab..00000000000
--- a/java/apps/NexusII/src/dataPacket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:08  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.2  1996/12/07  06:27:38  rajeev
-# yaah paranoid backup ...
-#
-# Revision 1.1  1996/12/06  18:23:45  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:07:53  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// This class encapsulates a dataPacket 
-// Will encapsulate the byteStream as a characterStream into a single thing
-// no packets for now 
-// package NexusII.networking ; 
-
-//import NexusII.client.* ; 
-
-public class dataPacket implements consts, Cloneable{
-
-  private String clientName ; 
-  private String roomName ; 
-  private String contentType ; 
-  private String contentLength ; 
-  private String content ; 
-
-  // constructor -- will create the data packet 
-  public dataPacket(byte[] header, byte[] body) { 
-    int len = FIELD_LENGTH ; 
-    clientName = new String(header,0,0,len);
-    roomName   = new String(header,0,1*len,len);
-    contentType = new String(header,0,2*len,len);
-    contentLength = new String(header,0,3*len,len);
-    content = new String(body,0);
-    if(DEBUG) 
-      System.out.println("datapacket: Constructed packet with header " + header + " and body " + body);
-  }
-
-  // another constructor for length 0 packets 
-  public dataPacket(String client, String room, String type,String len)
-  {
-    clientName = new String(client);
-    roomName   = new String(room);
-    contentType = new String(type);
-    contentLength = new String(len); 
-    content       = new String();
-  }
-
-  // another one for some data also 
-  public dataPacket(String client, String room, String type,String len,String data)
-  {
-    this(client,room,type,len);
-    content = new String(data);
-  }
-
-  // return the data in bytized header and body 
-  public  void bytize(byte[] header, byte[] body)
-  {
-    // clear the header and body -- fill them with whitespace 
-    String white_space = new String(" "); 
-    
-    if(DEBUG) { 
-      System.out.println("dataPacket: length is " + new Integer(contentLength.trim()).intValue() + "\n");
-    }
-
-    int len = FIELD_LENGTH ; 
-    // copy the header
-    clientName.getBytes(0,clientName.length(),header,0); 
-    roomName.getBytes(0,roomName.length(),header,len*1);
-    contentType.getBytes(0,contentType.length(),header,len*2);
-    contentLength.getBytes(0,contentLength.length(),header,len*3);
-
-    int body_len = (new Integer(contentLength.trim())).intValue(); 
-    // copy the body also 
-    content.getBytes(0,body_len,body,0);
-  }
-
-  public int contentLength() {
-    return new Integer(contentLength.trim()).intValue();
-  }
-
-  // Returns the destination for the current packet 
-  public String destination(){ 
-    return roomName.trim() ; 
-  }
-
-  public String contentType() { 
-    return contentType.trim() ; 
-  }
-
-
-  public String content() { 
-    return content.trim() ; 
-  }
-
- public String clientName() { 
-    return clientName.trim() ; 
- } 
-
-}
-// of class datapacket     
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/joinHandler.java b/java/apps/NexusII/src/joinHandler.java
deleted file mode 100644
index 3ff071c26ed..00000000000
--- a/java/apps/NexusII/src/joinHandler.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:09  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:06:22  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-
-// This class will handle the event generated when user presses "join/leave"
-// button. It will maintain all the state associated with all the rooms
-// It'll also create and maintain the rooms 
-// -- Rajeev Bector 11/26/96 
-
-// package NexusII.networking ; 
-
-// This is a SINGLETON 
-
-
-import java.net.* ;
-import java.util.* ; 
-import java.awt.* ; 
-import java.io.* ; 
-
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-//import NexusII.networking.* ; 
-
-import awtCommand.* ; 
-
-public class joinHandler implements Command,consts { 
-  MT_Bounded_Queue write_q_ ; 
-  Hashtable name_to_q_ ; 
-  Hashtable name_to_handler_ ; 
-  NexusClientApplet applet_ ; 
-
-  // This will be called when the "join/leave" button is pressed 
-  public joinHandler(MT_Bounded_Queue writer_q,NexusClientApplet applet) { 
-    write_q_ = writer_q ; 
-    applet_ = applet ; 
-    // init. the Hashtables 
-    name_to_q_ = new Hashtable(HASH_SIZE);
-    name_to_handler_ = new Hashtable(HASH_SIZE); 
-
-  } 
-
-  public Hashtable Mapper() { 
-    return name_to_q_ ; 
-  }
-  
-  public void execute(Object target, Event evt, Object what) { 
-    
-    String roomName = applet_.GetRoomName() ; 
-    if(roomName.length()==0) { 
-      return ; 
-    } 
-
-    // if it is the join button
-    if(((String)what).equalsIgnoreCase(JOIN_STR)) { 
-      //if already joined -- return 
-      if(name_to_q_.get(roomName) != null)
-	return ; 
-      
-      // room doesnt exist 
-      // Just in case the room name isn't listed
-      applet_.AddRoomName(roomName);
-      // create a new queue for the room to use 
-	
-      MT_Bounded_Queue q_ = new MT_Bounded_Queue(QUEUE_SIZE); 
-      if(DEBUG) { 
-	System.out.println("joinHandler: inserted the queue in hash ");
-      }
-      name_to_q_.put(roomName,q_); 
-      roomHandler handler = new roomHandler(roomName,q_,write_q_,applet_);
-      name_to_handler_.put(roomName,handler); 
-      
-      // send a request to the server 
-      sayJoinToServer(roomName); 
-      //  sendTestPacket(roomName,"URL","http://cumbia.cs.wustl.edu:4242/~sumedh/NexusII/NexusII.gif",q_);
-    } // of join 
-
-    else { 
-      // its a "leave packet" 
-      if(name_to_q_.get(roomName) == null)
-	return ; 
-      // remove the entry from the queue 
-      name_to_q_.remove(roomName); 
-      
-      roomHandler handle = (roomHandler) name_to_handler_.get(roomName); 
-      if(DEBUG)
-	System.out.println("joinHandler:Stopiing the room thread" + roomName);
-      handle.mystop();
-      //    handle = null ; 
-
-      // remove the entry from the queue 
-      name_to_handler_.remove(roomName); 
-      sayLeaveToServer(roomName); 
-    } // of else 
-  } // of  execute 
-  
-  private void sayJoinToServer(String roomName) { 
-    //if (DEBUG)
-    // System.out.println("In the say J to server...");
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("JOIN");
-    String contentLength  = String.valueOf(roomName.length());
-    String  content       = new String(roomName); 
-    // Make a proper packet out of it 
-    dataPacket joinPacket = new dataPacket(clientID,roomID,contentType,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(joinPacket);
-  } 
-  
-  private void sayLeaveToServer(String roomName) { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("LEAVE");
-    String contentLength  = new String(Integer.toString(roomName.length()));
-    String  content       = new String(roomName);     
-
-    // Make a proper packet out of it 
-    dataPacket leavePacket = new dataPacket(clientID,roomID,contentType,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(leavePacket);
-  } 
-
-
-  public void sendTestPacket(String roomName,String type,String content,MT_Bounded_Queue readq) { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String contentLength  = new String(Integer.toString(content.length()));
-
-
-    // Make a proper packet out of it 
-    dataPacket testPacket = new dataPacket(clientID,roomName,type,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    readq.nq(testPacket);
-  } 
-  
-  
-}
-
-// of class 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/makefile b/java/apps/NexusII/src/makefile
deleted file mode 100644
index c3cff521511..00000000000
--- a/java/apps/NexusII/src/makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all: client server
-
-client: ../classes/NexusClientApplet.class
-
-../classes/NexusClientApplet.class:
-	javac -d ../classes -depend -g NexusClientApplet.java 
-
-server: ../classes/NexusIIserver.class
-
-../classes/NexusIIserver.class: 
-	javac -d ../classes -depend -g NexusIIserver.java
-
-clean:
-	rm -f ../classes/*.class *~
-
diff --git a/java/apps/NexusII/src/nexusDemuxThread.java b/java/apps/NexusII/src/nexusDemuxThread.java
deleted file mode 100644
index 96d0fdd06e1..00000000000
--- a/java/apps/NexusII/src/nexusDemuxThread.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:10  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.2  1996/12/05  05:39:47  sumedh
-# ok
-#
-# Revision 1.1  1996/12/02  06:08:20  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-
-// Will take the packets from the input queue 
-// Parse the packet 
-// Call the room handler thread which Aravind will provide 
-
-// Mapper object is the one which returns the room_q reference if you pass
-// it the room number. Aravind has to implement this object called roomMapper
-// which has an instance called mapper in the Applet context. This will be
-// referred by nexusDemuxThread whenever it has anything to put in the room_q
-
-// package NexusII.networking ; 
-
-//import NexusII.util.*  ; 
-//import NexusII.client.* ;
-
-import java.util.* ; 
- 
-public class nexusDemuxThread extends Thread implements consts { 
-  MT_Bounded_Queue q_ ; 
-  dataPacket packet ; 
-  Hashtable mapper_ ; 
-
-  // constructor 
-  public nexusDemuxThread(MT_Bounded_Queue read_q,Hashtable mapper) { 
-    q_ = read_q ; 
-    mapper_ = mapper ; 
-  }
-
-  public void run() { 
-    // run till infinity 
-    for(;;) { 
-      if(DEBUG) { 
-	System.out.println("Demux running ---- ");
-      }
-      // take out packets from the queue 
-      // parse to find out which room they belong to 
-      packet = ((dataPacket)q_.dq()); 
-      if(DEBUG) { 
-	System.out.println("Demux got something ---- ");
-      } 
-      
-      String roomName = packet.destination().trim(); 
-      if(DEBUG) {
-        System.out.println("demux: destination is : " + roomName);
-      }
-      if(DEBUG) { 
-	System.out.println("Hashtable size is " + new Integer(mapper_.size())); 
-      } 
-      // Get a reference to which queue to put it in 
-      MT_Bounded_Queue room_q = (MT_Bounded_Queue)mapper_.get(roomName);
-      
-      // nq the packet on the room q 
-      if(room_q != null) { 
-	room_q.nq(packet); 
-	System.out.println("deMux: I have enqueued it successfully");
-      }	
-      else
-	{
-	  System.out.println("demux: room_q was null: i couldnt do much");
-	}
-    } 
-  }
-  // of run 
-}
-// of class 
-      
-  
-
-  
-
-// 11/24/96 -- Rajeev Bector 
diff --git a/java/apps/NexusII/src/roomHandler.java b/java/apps/NexusII/src/roomHandler.java
deleted file mode 100644
index bd125631b74..00000000000
--- a/java/apps/NexusII/src/roomHandler.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:11  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.4  1996/12/07  06:22:49  rajeev
-# taking a backup !
-#
-# Revision 1.3  1996/12/06  06:20:07  rajeev
-# Changes to include leave handler
-#
-# Revision 1.2  1996/12/06  04:49:44  rajeev
-# working now hopefully !
-#
-# Revision 1.1  1996/12/06  03:44:32  rajeev
-# Initial revision
-#
-
-*/
-
-// per room 
-import java.awt.* ; 
-import awtCommand.* ; 
-import java.io.* ; 
-import java.net.* ; 
-//import NexusII.client.* ;
-//import NexusII.util.* ; 
-//import NexusII.networking.*;
-
-public class roomHandler implements Runnable,consts{ 
-  
-  String roomName_ ; 
-  MT_Bounded_Queue read_q_ ; 
-  MT_Bounded_Queue write_q_ ; 
-  RoomFrame rf_;
-  Thread  mainThread ; 
-  NexusClientApplet applet_ ; 
-
-  // I dont know what to do currently 
-  public roomHandler(String roomName, MT_Bounded_Queue reader_q,MT_Bounded_Queue writer_q,NexusClientApplet applet) { 
-    roomName_ = roomName ; 
-    read_q_   = reader_q ; 
-    write_q_  = writer_q ; 
-    applet_ = applet ; 
-    rf_ = new RoomFrame(write_q_,applet_,roomName_);
-    // whenever this frame gets the mouse focus, handler will be called 
-    FrameHandler fh_ = new FrameHandler(applet_); 
-    rf_.setGotFocusCommand(fh_); 
-    mainThread = new Thread(this); 
-    mainThread.start(); 
-  }
-
-
-  public void mystop() { 
-    // dispose the graphics part here 
-    if(DEBUG)
-      System.out.println("Roomhandlers stop called \n");
-    rf_.hide(); 
-    rf_.dispose();
-    // no longer need the roomframe
-    rf_ = null ; 
-    mainThread.stop(); 
-  }
-
-  public void run() {
-    if(DEBUG) {
-      System.out.println("Room receiver running ---- ");
-    }
-    while(Thread.currentThread() == mainThread) { 
-      // get the data packet
-      dataPacket packet = (dataPacket)(read_q_.dq()) ; 
-      if(DEBUG)
-	System.out.println("Room - I got something\n");
-      
-      // if the packet is of text type -- display it 
-      if(packet.contentType().trim().equalsIgnoreCase("TEXT")) { 
-	rf_.addText(packet.content()); 
-      } 
-      // if the packet is a url address -- pull the image across 
-      // this url has to be an image  as of now 
-      if(packet.contentType().equalsIgnoreCase("URL")) { 
-	Image im = null ; 
-	try { 
-	  im = applet_.getImage(new URL(packet.content())); 
-	} catch (MalformedURLException i) { 
-	  // nothing as of now 
-	}
-	// display the image
-	rf_.updateImage(im); 
-	
-      }
-      
-      if (DEBUG)
-	System.out.println("roomhandler" + roomName_ + " got data");
-    }
-  }
-  
-  public String toString() { 
-    return roomName_ ; 
-  }
-
-}  // of class roomHandler 
-
-// is executed when the room frame gets mouse focus 
-
-class FrameHandler implements Command { 
-  NexusClientApplet applet_ ;
-  public FrameHandler(NexusClientApplet applet) { 
-    applet_ = applet ; 
-  } 
-
-  public void execute(Object target, Event evt, Object what) { 
-    if(target instanceof Frame) { 
-    applet_.SetRoomName(((RoomFrame)target).getTitle()); 
-    } 
-  } 
-}
-
diff --git a/java/apps/NexusII/src/socketReaderThread.java b/java/apps/NexusII/src/socketReaderThread.java
deleted file mode 100644
index 35679c504b4..00000000000
--- a/java/apps/NexusII/src/socketReaderThread.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:11  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.3  1996/12/03  01:35:37  rajeev
-# fixed a big bug with respect to trim()
-#
-# Revision 1.2  1996/12/03  01:01:27  rajeev
-# // fixed the bug at line 76
-#
-# Revision 1.1  1996/12/02  06:08:56  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// The socketReaderThread is like a Producer who reads from the socket and
-// nqs it onto the queue. Thats it ... Big Deal. huh ! 
-
-// This threads task is
-// 1. Take things from SocketBuffer.
-// 2. Ensure that Full Packets are read 
-// 3. Put the packet onto the queue 
-
-//package NexusII.networking ; 
-
-// get hold of java classes
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-
-import java.io.* ; 
-
-
-public class socketReaderThread extends Producer implements Runnable,consts
-{
-  DataInputStream is_ ; 
-  
-  // new constructor 
-  // Pass the queue and socketid to the constructor 
-
-  public socketReaderThread(MT_Bounded_Queue q, DataInputStream is) {
-    // call the super constructor 
-    super(q);
-    is_ = is ; 
-  }
-
-  // This will just override the run method and thats it 
-  // I want to have my own run !
-
-  public void run()  {
-    // run indefinitely  -- i am a daemon anyway 
-    if(DEBUG) {
-      System.out.println("--- This is socketReaderThread --- \n");
-    }
-    
-    for(;;) {
-
-      // read header bytes from stream 
-      int field_len = FIELD_LENGTH ; 
-      byte[] packetHeader = new byte[PACKET_HEADER_LENGTH];
-      try {
-	is_.readFully(packetHeader,0,PACKET_HEADER_LENGTH);
-      } 
-      catch (IOException e) {
-	// do something here 
-	System.out.println("socketReader: I/O exception in read: I am quitting");
-	// what to do here -- right now quit
-	return ; 
-      }
-      if(DEBUG){
-	System.out.println("socketReader read:" + new String(packetHeader,0));
-      }
-      
-      // take out the length field from this 
-      String length = new String(packetHeader,0,DATA_LEN_OFFSET,field_len);
-      
-      // Read this much more from the socket 
-      if(DEBUG) { 
-	System.out.println("The length of packet is " + length);
-      }
-
-      Integer Test = new Integer(length.trim());
-      int len = Test.intValue();
-      if(DEBUG) {
-	System.out.println("srt: attempting to read " + Test + " bytes ");
-      }
-
-      byte[] packetBody = new byte[len] ; 
-      try {
-	if(len != 0) 
-	  is_.readFully(packetBody,0,len);
-      }
-      catch (IOException e) {
-	// do something here 
-	System.out.println("socketReader: I/O exception in read: I am quitting");
-	// what to do here -- right now quit
-	return ; 
-      }
-      
-      // The header and the body are there now -- so make a packet
-      dataPacket packet = new dataPacket(packetHeader,packetBody);
-      if(DEBUG)
-	System.out.println("srt: Now nq'ing item body " + packet.content() );
-      queue_.nq(packet);
-      if(DEBUG)
-	System.out.println("srt: Done nq'ing..");
-      
-      // go back to reading the socket now 
-    }
-    // of for(;;)
-  } 
-  // of method run 
-}
diff --git a/java/apps/NexusII/src/socketWriterThread.java b/java/apps/NexusII/src/socketWriterThread.java
deleted file mode 100644
index 395449b6a53..00000000000
--- a/java/apps/NexusII/src/socketWriterThread.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:12  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:09:22  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// The socketWriterThread is like a Consumer who reads from the write_q and
-// puts it onto the socket. Thats it ... Big Deal. huh ! 
-
-// This threads task is
-// 1. Write things to SocketBuffer.
-// 2. Ensure that Full Packets are sent 
-// 3. Read the packet off the queue 
-
-//package NexusII.networking ; 
-
-// get hold of java classes
-
-import java.io.* ; 
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-
-public class socketWriterThread extends Consumer implements Runnable,consts
-{
-  DataOutputStream os_ ; 
-
-  // new constructor 
-  // Pass the queue and outstream to the constructor 
-
-  public socketWriterThread(MT_Bounded_Queue q, DataOutputStream os) {
-    // call the super constructor 
-    super(q);
-    os_ = os ; 
-  }
-
-  // This will just override the run method and thats it 
-  // I want to have my own run !
-
-  public void run()  {
-    // run indefinitely  -- i am a daemon anyway 
-    if(DEBUG) {
-      System.out.println("--- This is socketWriterThread --- \n");
-    }
-    boolean bye_sent = false ; 
-    while(!bye_sent) { 
-
-      // read the packet from the queue 
-      dataPacket packet = (dataPacket) queue_.dq(); 
-      if(DEBUG){
-	System.out.println("socketWriterThread: I got something -- \n");
-      }
-       
-      // read length bytes from packet 
-      int len = packet.contentLength() ; 
-      if(DEBUG) {
-	System.out.println("socketWriterThread: length is " + new Integer(len));
-      }
-
-	
-      int field_len = FIELD_LENGTH ; 
-
-      // Allocate storage for holding the fields 
-
-      byte[] packetHeader = new byte[PACKET_HEADER_LENGTH]; 
-      byte[] packetBody = new byte[len] ;
-      
-      // Fill them 
-      packet.bytize(packetHeader,packetBody); 
-
-      // put it on the wire now -- 
-
-      try {
-	os_.write(packetHeader,0,PACKET_HEADER_LENGTH);
-      } 
-      catch (IOException e) {
-	// do something here 
-      }
-      if(DEBUG){
-	System.out.println("I wrote:" + new String(packetHeader,0));
-      }
-
-       try {
-	os_.write(packetBody,0,len);
-      }
-      catch (IOException e) {
-	// do something here 
-      }
-      if(DEBUG){
-	System.out.println("I wrote:" + new String(packetBody,0));
-      }
-      // this is to handle if the user presses disconnect without leaving the
-      // room 
-      if(packet.contentType().equalsIgnoreCase("QUIT")) 
-	 bye_sent = true ; 
-      // go back to reading the queue now 
-    }
-    // of for(;;)
-  } 
-  // of method run 
-  
-}
diff --git a/java/apps/NexusII/src/url_to_url.java b/java/apps/NexusII/src/url_to_url.java
deleted file mode 100644
index 0fe08ab6db3..00000000000
--- a/java/apps/NexusII/src/url_to_url.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// This method takes in a url and a prefix name and pulls that url across the
-// network, stores it in a local file named prefix
-
-// for now it assumes that the url is an image only ! 
-
-import java.net.* ; 
-import java.io.* ; 
-import java.awt.* ; 
-public class url_to_url { 
-  Image im ; 
-
-  public url_to_url(URL url,String prefix) { 
-    try { 
-      im = (Image)url.getContent();
-    } catch (IOException i) {}
-    String www_path = System.getProperty("www-path");
-    String home_dir = System.getProperty("user.home");
-    String dir = home_dir + www_path ; 
-    System.out.println("web dir is this : " + dir);
-    
-  } 
-  
-  public static void main(String[] argv) { 
-  URL test = null ; 
-    try { 
-    test = new URL("http://www.cs.wustl.edu/~rajeev/images/sand.jpg");
-    } catch ( MalformedURLException e) {} 
-
-    url_to_url t = new url_to_url(test,"root") ; 
-
-  } 
-  
-}
diff --git a/java/apps/NexusII/start b/java/apps/NexusII/start
deleted file mode 100755
index c699c96da60..00000000000
--- a/java/apps/NexusII/start
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-## This is an example script to launch the server.
-
-# the mywebaddress variable should point to a URL which is world-readable
-# the mywebdir variable should point to the actual pathname of the URL
-# which is specified by the mywebaddress variable
-# The server needs to have write access to the mywebdir directory.
-# Thus, the server saves images into the "mywebdir", and clients
-# can access them via the "mywebaddress" URL.
-
-# the 222222 number is the port number on which the server is to be launched
-# the same port number should appear in the html document containing
-# the client applet (see start.html for an example)
-
-# while running the server, the ./classes should be part of the CLASSPATH.
-# while running the client, the client classes as well as the awtCommand
-# toolkit should be world-readable. (The awtcommand toolkit is included
-# in this toolkit, under the classes directory.)
-
-
-umask 022
-java -Dmywebaddress=http://cumbia.cs.wustl.edu/NexusII/tmp/ -Dmywebdir=/project/cumbia/sumedh/web/apache/root/NexusII/tmp/ NexusIIserver 222222
-
-
-
-
diff --git a/java/apps/NexusII/start.html b/java/apps/NexusII/start.html
deleted file mode 100644
index cd591295b4a..00000000000
--- a/java/apps/NexusII/start.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<applet code=NexusClientApplet.class width=550 height=500>
-  	<param name=serverport value="222222">
-</applet> 
diff --git a/java/classes/README.TXT b/java/classes/README.TXT
deleted file mode 100644
index ba771e6615d..00000000000
--- a/java/classes/README.TXT
+++ /dev/null
@@ -1,2 +0,0 @@
-The .class files are not included in the release archive.  When properly
-setup and built, a JACE subdirectory will be here. 
diff --git a/java/doc/images/GridBagEx.gif b/java/doc/images/GridBagEx.gif
deleted file mode 100644
index 16c326d88ca..00000000000
--- a/java/doc/images/GridBagEx.gif
+++ /dev/null
diff --git a/java/doc/images/OpenBookIcon.gif b/java/doc/images/OpenBookIcon.gif
deleted file mode 100644
index 86384f7733f..00000000000
--- a/java/doc/images/OpenBookIcon.gif
+++ /dev/null
diff --git a/java/doc/images/blue-ball-small.gif b/java/doc/images/blue-ball-small.gif
deleted file mode 100644
index d4c5cde5b00..00000000000
--- a/java/doc/images/blue-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/blue-ball.gif b/java/doc/images/blue-ball.gif
deleted file mode 100644
index edc29b786ce..00000000000
--- a/java/doc/images/blue-ball.gif
+++ /dev/null
diff --git a/java/doc/images/class-index.gif b/java/doc/images/class-index.gif
deleted file mode 100644
index 7f276bcb242..00000000000
--- a/java/doc/images/class-index.gif
+++ /dev/null
diff --git a/java/doc/images/constructor-index.gif b/java/doc/images/constructor-index.gif
deleted file mode 100644
index 435cac42386..00000000000
--- a/java/doc/images/constructor-index.gif
+++ /dev/null
diff --git a/java/doc/images/constructors.gif b/java/doc/images/constructors.gif
deleted file mode 100644
index d1a6ae507ca..00000000000
--- a/java/doc/images/constructors.gif
+++ /dev/null
diff --git a/java/doc/images/cyan-ball-small.gif b/java/doc/images/cyan-ball-small.gif
deleted file mode 100644
index 7f74357443a..00000000000
--- a/java/doc/images/cyan-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/cyan-ball.gif b/java/doc/images/cyan-ball.gif
deleted file mode 100644
index 97ca1f2b6e3..00000000000
--- a/java/doc/images/cyan-ball.gif
+++ /dev/null
diff --git a/java/doc/images/error-index.gif b/java/doc/images/error-index.gif
deleted file mode 100644
index 22835ff8c64..00000000000
--- a/java/doc/images/error-index.gif
+++ /dev/null
diff --git a/java/doc/images/exception-index.gif b/java/doc/images/exception-index.gif
deleted file mode 100644
index e3830d9c52e..00000000000
--- a/java/doc/images/exception-index.gif
+++ /dev/null
diff --git a/java/doc/images/green-ball-small.gif b/java/doc/images/green-ball-small.gif
deleted file mode 100644
index 17fea5b32bb..00000000000
--- a/java/doc/images/green-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/green-ball.gif b/java/doc/images/green-ball.gif
deleted file mode 100644
index 71e1b2ec2db..00000000000
--- a/java/doc/images/green-ball.gif
+++ /dev/null
diff --git a/java/doc/images/interface-index.gif b/java/doc/images/interface-index.gif
deleted file mode 100644
index bf93dda9e35..00000000000
--- a/java/doc/images/interface-index.gif
+++ /dev/null
diff --git a/java/doc/images/magenta-ball-small.gif b/java/doc/images/magenta-ball-small.gif
deleted file mode 100644
index bd0584b3c67..00000000000
--- a/java/doc/images/magenta-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/magenta-ball.gif b/java/doc/images/magenta-ball.gif
deleted file mode 100644
index 5da03b84d2b..00000000000
--- a/java/doc/images/magenta-ball.gif
+++ /dev/null
diff --git a/java/doc/images/method-index.gif b/java/doc/images/method-index.gif
deleted file mode 100644
index a05e7051160..00000000000
--- a/java/doc/images/method-index.gif
+++ /dev/null
diff --git a/java/doc/images/methods.gif b/java/doc/images/methods.gif
deleted file mode 100644
index 949e01b8a33..00000000000
--- a/java/doc/images/methods.gif
+++ /dev/null
diff --git a/java/doc/images/package-index.gif b/java/doc/images/package-index.gif
deleted file mode 100644
index f894d4210d7..00000000000
--- a/java/doc/images/package-index.gif
+++ /dev/null
diff --git a/java/doc/images/red-ball-small.gif b/java/doc/images/red-ball-small.gif
deleted file mode 100644
index f6b3c372ca1..00000000000
--- a/java/doc/images/red-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/red-ball.gif b/java/doc/images/red-ball.gif
deleted file mode 100644
index dca92960148..00000000000
--- a/java/doc/images/red-ball.gif
+++ /dev/null
diff --git a/java/doc/images/variable-index.gif b/java/doc/images/variable-index.gif
deleted file mode 100644
index 65cc029e722..00000000000
--- a/java/doc/images/variable-index.gif
+++ /dev/null
diff --git a/java/doc/images/variables.gif b/java/doc/images/variables.gif
deleted file mode 100644
index e8a735399a6..00000000000
--- a/java/doc/images/variables.gif
+++ /dev/null
diff --git a/java/doc/images/yellow-ball-small.gif b/java/doc/images/yellow-ball-small.gif
deleted file mode 100644
index 8e5f57cdfcb..00000000000
--- a/java/doc/images/yellow-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/yellow-ball.gif b/java/doc/images/yellow-ball.gif
deleted file mode 100644
index 2b8c0bb3d6b..00000000000
--- a/java/doc/images/yellow-ball.gif
+++ /dev/null
diff --git a/java/examples/Logger/README b/java/examples/Logger/README
deleted file mode 100644
index 1da7dbcbb19..00000000000
--- a/java/examples/Logger/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This directory contains a simple client/server Java implementation of the
-distributed logging server described in several papers in the C++
-Report (which can be obtained via the following WWW URLs:
-http://www.cs.wustl.edu/~schmidt/{Reactor1-93.ps.gz,Reactor2-93.ps.gz}).
-
-The example consists of the following two directories:
-
-	. client
-		NOT YET CONVERTED
-		This program talks directly to the server logging
-		daemon.  The server daemon must be started before you
-		can run this test. 
-
-	. simple-server
-
-		This program runs a simple
-		implementation of the
-		distributed logging server daemon.  It also contains
-		code for a simple client as well.
-
-	. Acceptor-server
-		NOT YET CONVERTED
-		This program runs templated, Acceptor-based
-		single-threaded Reactive implementation of the
-		distributed logging server daemon.
-
-The server implemented in "simple" is completely compatible with the
-client defined in the C++ version of ACE.
-
diff --git a/java/examples/Logger/simple-server/LogRecord.java b/java/examples/Logger/simple-server/LogRecord.java
deleted file mode 100644
index e29ed6e32b9..00000000000
--- a/java/examples/Logger/simple-server/LogRecord.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Class used to communicate logging information; compatible with
- * the C++ ACE ACE_Log_Record class.
- *
- * @author Chris Cleeland
- */
-
-//package ACE.SimpleLogger;
-
-import java.util.Date;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.PrintStream;
-import java.io.IOException;
-
-public class LogRecord
-{
-  final public static int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private int timeStamp_;
-  private int pid_;
-  private byte[] msgData_ = new byte[MAXLOGMSGLEN];
-  private final static int numIntMembers = 4;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    this(0, (int) ((new Date()).getTime()/1000), 0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param time_stamp time attached to the log entry in Unix <pre>time_t</pre> format
-   * @param pid the process ID; not currently used
-   */
-  public LogRecord(int priority,
-		   int timeStamp,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(timeStamp);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    return new String(msgData_, 0);
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * @param hostname name of the host generating this record
-   * @param verbose if <b>true</b>, print information in the form, (give example)
-   * @param ps A PrintStream instance to which the output should go.
-   * @see PrintStream,String
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	long cur = (long)timeStamp() * (long)1000;
-	Date now = new Date(cur);
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Streaming methods
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    // This, of course, is VERY fragile, and ought not be used as
-    // a model for anything except how NOT to do anything.
-    type(dis.readInt());
-    length(dis.readInt());
-    timeStamp(dis.readInt());
-    pid(dis.readInt());
-
-    // Does readFully() allocate space for the buffer?  Either
-    // way, we won't have memory leaks :-)
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    msgData_ = new byte[dataLength];
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(type());
-    dos.writeInt(length());
-    dos.writeInt(timeStamp());
-    dos.writeInt(pid());
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    dos.write(msgData_, 0, dataLength);
-  }
-
-  /**
-   * Accessor methods
-   */
-  public int type()            { return type_; }
-  public void type(int t)      { type_ = t; }
-
-  public int length()          { return length_;  }
-  public void length(int l)    { length_ = l; }
-  private void setLen(int msgLen)
-  { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  public int timeStamp()      { return timeStamp_; }
-  public void timeStamp(int t){ timeStamp_ = t; }
-
-  public int pid()             { return pid_; }
-  public void pid(int p)       { pid_ = p; }
-
-  public byte[] msgData()      { return msgData_; }
-  public void msgData(byte[] m){ msgData_ = m; setLen(m.length); }
-  public void msgData(String m)
-  {
-    m.getBytes(0, m.length(), msgData_, 0);
-    setLen(m.length());
-  }
-};
-
diff --git a/java/examples/Logger/simple-server/LoggerConstants.java b/java/examples/Logger/simple-server/LoggerConstants.java
deleted file mode 100644
index db62d2fff6e..00000000000
--- a/java/examples/Logger/simple-server/LoggerConstants.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// package ACE.Logger;
-
-public class LoggerConstants
-{
-  final public static int DEFAULT_SERVER_PORT = 4000;
-  final public static String DEFAULT_SERVER_HOSTNAME = "localhost";
-}
diff --git a/java/examples/Logger/simple-server/LoggingAcceptor.java b/java/examples/Logger/simple-server/LoggingAcceptor.java
deleted file mode 100644
index 7925e3d5a15..00000000000
--- a/java/examples/Logger/simple-server/LoggingAcceptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package ACE.SimpleLogger;
-
-import JACE.SOCK_SAP.*;
-import java.io.IOException;
-
-public class LoggingAcceptor extends Thread
-{
-  private SOCKAcceptor peerAcceptor_;
-
-  public LoggingAcceptor(int port) throws IOException
-  {
-    peerAcceptor_ = new SOCKAcceptor(port);
-    this.setName("LoggingAcceptor");
-    System.err.println("Waiting for connection on port " +
-		       port);
-  }
-
-  public void run()
-  {
-    try
-      {
-	while (true)
-	  {
-	    LoggingHandler handler = new LoggingHandler();
-	    peerAcceptor_.accept(handler.stream());
-	    handler.open();
-	  }
-      }
-    catch (IOException e)
-      {
-      }
-  }
-};
diff --git a/java/examples/Logger/simple-server/LoggingClient.java b/java/examples/Logger/simple-server/LoggingClient.java
deleted file mode 100644
index e6ea986c011..00000000000
--- a/java/examples/Logger/simple-server/LoggingClient.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Main class that acts as an example logging client.
- */
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import LogRecord;
-import LoggerConstants;
-
-public class LoggingClient implements Runnable
-{
-  private String loggerHost_;
-  private int port_;
-  private int maxIter_;
-  private static final int DEFAULT_ITERATIONS = 10;
-  
-  public static void main(String[] args)
-  {
-    // Really need to put code in here to parse options
-    int iter;
-    int port;
-    String host;
-
-	iter = (args.length > 0) ? Integer.parseInt(args[0])
-          : DEFAULT_ITERATIONS;
-	port = (args.length > 1) ? Integer.parseInt(args[1])
-	  : LoggerConstants.DEFAULT_SERVER_PORT;
-	host = (args.length > 2) ? args[2]
-	  : LoggerConstants.DEFAULT_SERVER_HOSTNAME;
-
-    LoggingClient lc = new LoggingClient(iter, port, host);
-    lc.run();
-  }
-
-  public LoggingClient()
-  {
-
-    this(DEFAULT_ITERATIONS,
-	 LoggerConstants.DEFAULT_SERVER_PORT,
-	 LoggerConstants.DEFAULT_SERVER_HOSTNAME);
-  }
-
-  public LoggingClient(int iterations, int thePort, String theHost)
-  {
-    maxIter_ = iterations;
-    port_ = thePort;
-    loggerHost_ = theHost;
-  }
-
-  public void run()
-  {
-    SOCKStream logger = new SOCKStream();
-    SOCKConnector connector = new SOCKConnector();
-    // INETAddr addr = new INETAddr(port_, loggerHost_);
-
-    LogRecord rec = new LogRecord(9, 2, 0);
-
-    try
-      {
-        connector.connect(logger, loggerHost_, port_);
-
-	int oneSecond = 1000;
-	// Currently SOCKStream uses DataInputStream for its input stream,
-	// and PrintStream for its output stream.  It probably ought to use
-	// DataOutputStream for the output stream for symmetry, or at least
-	// provide a mechanism for changing the type of the filter stream
-	// used (which might be better in the long run...give it the class
-	// id).
-	BufferedOutputStream bos = new BufferedOutputStream((OutputStream) logger.outputStream(), LogRecord.MAXLOGMSGLEN);
-	DataOutputStream dos = new DataOutputStream(bos);
-
-	for (int i = 0; i < maxIter_; i++)
-	  {
-	    // Need to overload LogRecord.msgData to take a String
-	    // argument so that it's easy to create instances with text
-	    // inside.
-	    rec.msgData("message = " + i);
-	    try
-	      {
-		dos.writeInt(rec.length());
-		rec.streamOutTo(dos);
-		bos.flush();
-		rec.print("localhost", true, System.err);
-	      }
-	    catch (IOException ex) { }
-
-	    try
-	      {
-		Thread.sleep(oneSecond);
-	      }
-	    catch (InterruptedException ex) { }
-	  }
-
-	try { logger.close(); } catch (IOException ex) { }
-
-      }
-    catch (SocketException ex)
-      {
-        System.err.println("socket exception: " + ex);
-      }
-    catch (IOException ex)
-      {
-        System.err.println("io exception: " + ex);
-      }
-
-  }
-}
diff --git a/java/examples/Logger/simple-server/LoggingHandler.java b/java/examples/Logger/simple-server/LoggingHandler.java
deleted file mode 100644
index aeffc991ac3..00000000000
--- a/java/examples/Logger/simple-server/LoggingHandler.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************
- *
- *@author Chris Cleeland
- *
- * What we really need to define is a run() (or whatever
- * the Thread class has as its method to execute code), and
- * have that do the usual delegated work of handle_input.
- * We also need to figure out the best place to close the
- * the socket, which probably ISN'T the finalizer.
- *
- *************************************************/
-
-//package ACE.SimpleLogger;
-
-import JACE.SOCK_SAP.*;
-import java.util.*;
-import java.io.*;
-
-// Should this extend or simply be handed to a Thread instance to
-// be run?
-public class LoggingHandler extends Thread
-{
-  private SOCKStream cliStream_;
-
-  /**
-   * Create a default Logging Handler
-   */
-  public  LoggingHandler()
-  {
-    this(new SOCKStream());
-  }
-
-  /**
-   * Create a LoggingHandler with an existing stream
-   */
-  public LoggingHandler(SOCKStream aStream)
-  {
-    cliStream_ = aStream;
-    setName();
-  }
-
-  private void setName()
-  {
-    int portnum = ((cliStream_.socket() == null)
-		   ? 0
-		   : cliStream_.socket().getLocalPort());
-    this.setName("LoggingHandler#" + portnum);
-  }
-
-  /**
-   * Start
-   */ 
-  public void open()
-  {
-    this.start();
-  }
-
-  /**
-   */
-  public SOCKStream stream()
-  {
-    return cliStream_;
-  }
-
-  /**
-   * Handle logging events
-   */
-  public void run()
-  {
-    DataInputStream dis = (DataInputStream) cliStream_.inputStream();
-
-    for (;;)
-      {
-	// Messages arrive in the following format:
-	// o 4 byte length (network format)
-	// o message, in ACE.LogRecord format
-	//
-	// Hey!  We need exception catching in here too!
-	try
-	  {
-	    // Reconstitute a log message from the wire
-	    LogRecord rec = new LogRecord();
-
-	    // We don't really need this, because
-	    // the object already knows how to
-	    // extract itself properly.  However,
-	    // in order to interoperate with the
-	    // C++ version, this must be extracted.
-	    // Plus, it makes a convenient way to
-	    // check everything.
-	    int length = dis.readInt();
-	
-	    rec.streamInFrom(dis);
-	
-	    if (rec.length() == length)
-	      {
-		rec.print(cliStream_.socket().getInetAddress().getHostName(),
-			  true, System.out);
-		System.out.flush();
-	      }
-	    else
-	      {
-		System.err.println("Logging_Handler: Length error receiving logging message\n");
-	      }
-	  }
-	catch (EOFException eof)
-	  {
-	    System.err.println(Thread.currentThread().getName()
-			       + ": end-of-file condition found; terminating.");
-	    try { cliStream_.close(); } catch (IOException n) { }
-	    this.stop();
-	  }
-	catch (IOException ioe)
-	  {
-	    System.err.println(Thread.currentThread().getName()
-			       + ": IOException received -- "
-			       + ioe.getMessage());
-	  }
-      }
-  }
-};
diff --git a/java/examples/Logger/simple-server/Makefile b/java/examples/Logger/simple-server/Makefile
deleted file mode 100644
index 5be1b0d048e..00000000000
--- a/java/examples/Logger/simple-server/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-.SUFFIXES: .java .class
-
-CLASSDIR = .
-DOCDIR = .
-
-JC = javac_g
-JCOPTS = -g -d $(CLASSDIR)
-JD = javadoc
-JDOPTS = -d $(DOCDIR)
-
-COMPILE.java = $(JC) $(JCOPTS) $<
-DOCCOMP.java = $(JD) $(JDOPTS) $<
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-CLASSES = LoggerConstants LogRecord LoggingHandler \
-          LoggingAcceptor SimpleLogger LoggingClient
-CLASSFILES = $(addsuffix .class,$(CLASSES))
-DOCFILES = $(addsuffix .html,$(CLASSES))
-
-%.class:	%.java
-	$(COMPILE.java)
-
-%.html:		%.java
-	$(DOCCOMP.java)
-
-all:	classes doc
-
-classes:	$(CLASSFILES)
-doc:		$(DOCFILES)
-
-clean:
-	$(RM) *~ $(CLASSFILES) $(DOCFILES)
-
diff --git a/java/examples/Logger/simple-server/README b/java/examples/Logger/simple-server/README
deleted file mode 100644
index 90393c1aae8..00000000000
--- a/java/examples/Logger/simple-server/README
+++ /dev/null
@@ -1,25 +0,0 @@
-======
-BASICS
-======
-
-This directory contains both the client (LoggingClient.java) and the
-server (SimpleLogger.java).  To compile, use GNU make with no specific
-target.
-
-To execute, use "java <classname>" where <classname> is from the
-following table:
-
-	Application		<classname>
-	===========================================
-	client			LoggingClient
-	server			SimpleLogger
-
-
-==============
-KNOWN PROBLEMS
-==============
-
-Interoperability between the C++ client and the Java server
-implementation is fine.  Interoperability between the C++ server and
-the Java client seems to work right now.  See the CVS information on
-LoggingClient.java for details.
diff --git a/java/examples/Logger/simple-server/SimpleLogger.java b/java/examples/Logger/simple-server/SimpleLogger.java
deleted file mode 100644
index f562689e283..00000000000
--- a/java/examples/Logger/simple-server/SimpleLogger.java
+++ /dev/null
@@ -1,44 +0,0 @@
-//package ACE.SimpleLogger;
-
-import java.io.IOException;
-
-class SimpleLogger implements Runnable
-{
-  private LoggingAcceptor la;
-  private int port;
-
-  public static void main(String[] args)
-  {
-    SimpleLogger sl = new SimpleLogger();
-    sl.run();
-  }
-
-  public SimpleLogger()
-  {
-    this(LoggerConstants.DEFAULT_SERVER_PORT);
-  }
-
-  public SimpleLogger(int port)
-  {
-    try
-      {
-	la = new LoggingAcceptor(port);
-      }
-    catch (IOException ioe)
-      {
-	System.err.println("SimpleLogger: unable to create LoggingAcceptor ("
-			   + ioe.getMessage() + ")");
-      }
-  }
-
-  public void run()
-  {
-    la.run();
-    try
-      {
-	la.join();
-      }
-    catch (InterruptedException ie)
-      { }
-  }
-};
diff --git a/java/gjt/Assert.java b/java/gjt/Assert.java
deleted file mode 100644
index b704be9ff3c..00000000000
--- a/java/gjt/Assert.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gjt;
-
-/**
- * A simple assertion mechanism for asserting validity of
- * arguments.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class Assert {
-    static public void notFalse(boolean b) 
-                       throws IllegalArgumentException {
-        if(b == false) 
-            throw new IllegalArgumentException(
-                            "boolean expression false");
-    }
-    static public void notNull(Object obj) 
-                       throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException("null argument");
-    }
-
-    static public void notFalse(boolean b, String s) 
-                               throws IllegalArgumentException {
-        if(b == false)
-            throw new IllegalArgumentException(s);
-    }
-    static public void notNull(Object obj, String s) 
-                               throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException(s);
-    }
-}
diff --git a/java/gjt/Bargauge.java b/java/gjt/Bargauge.java
deleted file mode 100644
index 27be8afad7b..00000000000
--- a/java/gjt/Bargauge.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A bargauge which can be filled (wholly or partially) with a 
- * client-specified color.  Fill color is specified at 
- * construction time; both fill color and fill percent may be 
- * set after construction time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     gjt.test.BargaugeTest
- */
-public class Bargauge extends Canvas {
-    private double          percentFill = 0;
-    private ThreeDRectangle border = new ThreeDRectangle(this);
-    private Color           fillColor;
-
-    public Bargauge(Color fillColor) {
-        setFillColor(fillColor);
-    }
-    public void setFillColor(Color fillColor) {
-        this.fillColor = fillColor;
-    }
-    public void setFillPercent(double percentage) {
-        Assert.notFalse(percentage >= 0 && percentage <= 100);
-        percentFill = percentage;
-    }
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) { 
-        super.reshape(x,y,w,h);
-        border.resize(w,h); 
-    }
-    public Dimension minimumSize() { return preferredSize(); }
-
-    public Dimension preferredSize() {
-        int w = border.getThickness() * 3;
-        return new Dimension(w, w*4);
-    }
-    public void paint(Graphics g) {
-        border.raise();
-        border.paint();
-        fill();
-    }
-    public void fill() {
-        Graphics g = getGraphics();
-
-        if((g != null) && (percentFill > 0)) {
-            Rectangle b       = border.getInnerBounds();
-            int       fillw   = b.width; 
-            int       fillh   = b.height;
-
-            if(b.width > b.height) fillw *= percentFill/100;
-            else                   fillh *= percentFill/100;
-
-            g.setColor(fillColor);
-            border.clearInterior();
-
-            if(b.width > b.height) 
-                g.fillRect(b.x, b.y, fillw, b.height);
-            else                   
-                g.fillRect(b.x, b.y + b.height - fillh, 
-                           b.width, fillh);
-        }
-    }
-    protected String paramString() {
-        Dimension size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        String    str  = "fill percent=" + percentFill + "," + 
-                         "orientation="  + orient      + "," +
-                         "color"         + fillColor;
-        return str;
-    }
-}
diff --git a/java/gjt/Border.java b/java/gjt/Border.java
deleted file mode 100644
index ba80ef2e76a..00000000000
--- a/java/gjt/Border.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A panel containing a single component, around which a border 
- * is drawn.  Of course, the single component may be a 
- * container which may contain other components, so a Border
- * can surround multiple components.<p>
- * 
- * Thickness of the border, and the gap between the Component 
- * and the border are specified at time of construction.
- * Default border thickness is 2 - default gap is 0.<p>
- *
- * Border color may be set via setLineColor(Color).<p>
- *
- * Border employs a DrawnRectangle to paint the border.  Derived 
- * classes are free to override DrawnRectangle border() if they 
- * wish to use an extension of DrawnRectangle for drawing their 
- * border.<p>
- *
- * The following code snippet, from gjt.test.BorderTest creates
- * and AWT Button, and embeds the button in a border.  That
- * border is then embedded in another border.  The AWT Button
- * winds up inside of a cyan border with a pixel width of 7,
- * inside of a black border (pixel width 2):<p>
- *
- * <pre>
- *      private Border makeBorderedAWTButton() {
- *          Button button;
- *          Border cyanBorder, blackBorder;
- *
- *          button = new Button("Button Inside Two Borders");
- *          cyanBorder = new Border(button, 7);
- *          cyanBorder.setLineColor(Color.cyan);
- *
- *          blackBorder = new Border(cyanBorder);
- *
- *          return blackBorder;
- *      }
- *</pre>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     ThreeDBorder
- * @see     EtchedBorder
- * @see     gjt.test.BorderTest
- */
-public class Border extends Panel {
-    protected int            thickness;
-    protected int            gap;
-    protected DrawnRectangle border;
-
-    protected static int _defaultThickness = 2;
-    protected static int _defaultGap       = 0;
-
-    public Border(Component borderMe) { 
-        this(borderMe, _defaultThickness, _defaultGap);
-    }
-    public Border(Component borderMe, int thickness) {
-        this(borderMe, thickness, _defaultGap);
-    }
-    public Border(Component borderMe, int thickness, int gap) {
-        this.thickness = thickness;
-        this.gap       = gap;
-
-        setLayout(new BorderLayout());
-        add("Center", borderMe);
-    }
-    public Insets insets() {
-        return new Insets(thickness+gap, thickness+gap, 
-                          thickness+gap, thickness+gap);
-    }
-    public Rectangle getInnerBounds() { 
-        return border().getInnerBounds(); 
-    }
-    public void setLineColor(Color c) { 
-        border().setLineColor(c);         
-    }
-    public Color getLineColor()        { 
-        return border().getLineColor();   
-    }
-    public void paint(Graphics g) { 
-        border().paint();                 
-    }
-    public void resize(int w, int h) {
-        Point location = location();
-        reshape(location.x, location.y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x, y, w, h);
-        border().resize(w, h);
-    }
-    protected String paramString() {
-        return super.paramString() + ",border=" + 
-               border().toString() + ",thickness=" + thickness 
-               + ",gap=" + gap;
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new DrawnRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/Box.java b/java/gjt/Box.java
deleted file mode 100644
index 8feda366942..00000000000
--- a/java/gjt/Box.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Panel containing a single component; an etched rectangle is 
- * drawn around the component, and a Label is centered at the top
- * of the rectangle. Of course, the single component may be
- * a container, and therefore a Box may surround many components.
- * <p>
- * 
- * Both the Component around which the box is drawn, and the 
- * String drawn at the top of the box are specified at 
- * construction time.<p>
- *
- * Etching of the box is controlled by etchedIn() and 
- * etchedOut().  Default etching is etched in.<p>
- *
- * <em>Note: AWT 1.0.2 contains a bug which causes the 
- * Label.CENTER argument of the Label created for the title
- * to be ignored, under Win95.  Therefore, under Win95, the
- * title will be off-center.</em><p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     EtchedRectangle
- * @see     gjt.test.BoxTest
- */
-public class Box extends Panel {
-    private EtchedRectangle box = new EtchedRectangle(this);
-    private Label           titleLabel;
-
-    public Box(Component surrounded, String title) {
-        this(surrounded, new Label(title, Label.CENTER));
-    }
-    public Box(Component surrounded, Label label) {
-        Assert.notNull(surrounded);
-        Assert.notNull(label);
-
-        titleLabel = label;
-
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        setLayout(gbl);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbl.setConstraints(titleLabel, gbc);
-        add(titleLabel);
-
-        gbc.insets  = new Insets(0,10,10,10);
-        gbc.anchor  = GridBagConstraints.CENTER;
-        gbc.weighty = 1.0;
-        gbc.weightx = 1.0;
-        gbc.fill    = GridBagConstraints.BOTH;
-        gbl.setConstraints(surrounded,gbc); 
-        add(surrounded);
-    }
-    public void etchedIn ()           { box.etchedIn (); }
-    public void etchedOut()           { box.etchedOut(); }
-    public void paint    (Graphics g) { box.paint();     }
-
-    public void resize(int w, int h) {
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x,y,w,h);
-
-        FontMetrics fm   = titleLabel.getFontMetrics(
-                                titleLabel.getFont());
-        int         top  = insets().top + fm.getAscent();
-        Dimension   size = size();
-
-        box.reshape(0, top, size.width-1, size.height-top-1);
-    }
-    protected String paramString() {
-        return super.paramString() + ",etching=" +
-        (box.isEtchedIn() ? Etching.IN : Etching.OUT) +
-        ",title=" + titleLabel;
-    }
-}
diff --git a/java/gjt/BulletinLayout.java b/java/gjt/BulletinLayout.java
deleted file mode 100644
index 848a280de03..00000000000
--- a/java/gjt/BulletinLayout.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Lays out components as though they were pinned to 
- * a bulletin board.<p>
- *
- * Components are simply reshaped to their location and their
- * preferred size.  BulletinLayout is preferrable to setting
- * a container's layout manager to null and explicitly positioning
- * and sizing components.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class BulletinLayout implements LayoutManager {
-    public BulletinLayout() {
-    }
-    public void addLayoutComponent(String name, Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) {
-    }
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-        Rectangle preferredBounds = new Rectangle(0,0);
-        Rectangle compPreferredBounds;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-                compPreferredBounds = 
-                    new Rectangle(comp.location());
-                compPreferredBounds.width  = d.width;
-                compPreferredBounds.height = d.height;
-
-                preferredBounds = 
-                    preferredBounds.union(compPreferredBounds);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-        Rectangle minimumBounds = new Rectangle(0,0);
-        Rectangle compMinimumBounds;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-                compMinimumBounds = 
-                    new Rectangle(comp.location());
-                compMinimumBounds.width  = d.width;
-                compMinimumBounds.height = d.height;
-
-                minimumBounds = 
-                    minimumBounds.union(compMinimumBounds);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets      = target.insets();
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension ps;
-        Point loc;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                ps  = comp.preferredSize();    
-                loc = comp.location();
-
-                comp.reshape(insets.left + loc.x, 
-                             insets.top + loc.y,
-                             ps.width, ps.height);
-            }
-        }
-    }
-}
diff --git a/java/gjt/ButtonPanel.java b/java/gjt/ButtonPanel.java
deleted file mode 100644
index 6fc72ecaab2..00000000000
--- a/java/gjt/ButtonPanel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Button panel employs a BorderLayout to lay out a Separator in 
- * the north, and a Panel to which Buttons are added in the 
- * center.<p>
- *
- * Buttons may be added to the panel via two methods:
- * <dl>
- * <dd> void   add(Button)
- * <dd> Button add(String)
- * </dl>
- * <p>
- *
- * Button add(String) creates a Button and adds it to the
- * panel, then returns the Button created, as a convenience to
- * clients so that they do not have to go through the pain
- * and agony of creating an ImageButton.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     gjt.test.DialogTest
- * @see     gjt.test.ComponentScrollerTest
- */
-public class ButtonPanel extends Panel {
-    Panel     buttonPanel = new Panel();
-    Separator separator   = new Separator();
-
-    public ButtonPanel() {
-        setLayout(new BorderLayout(0,5));
-        add("North",  separator);
-        add("Center", buttonPanel);
-    }
-    public void add(Button button) {
-        buttonPanel.add(button);
-    }
-    public Button add(String buttonLabel) {
-        Button addMe = new Button(buttonLabel);
-        buttonPanel.add(addMe);
-        return addMe;
-    }
-    protected String paramString() {
-        return super.paramString() + "buttons=" +
-        countComponents();
-    }
-}
diff --git a/java/gjt/CardPanel.java b/java/gjt/CardPanel.java
deleted file mode 100644
index c2ab1a9033c..00000000000
--- a/java/gjt/CardPanel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * CardPanel employs a BorderLayout to lay out North and Center 
- * panels; extensions of CardPanel must implement 
- * Component viewSelector().  The component returned from 
- * Component viewSelector() is centered in the North panel, and 
- * should contain UI controls that allow selection of the 
- * component to be displayed in the Center panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     IconCardPanel
- * @see     ChoiceCardPanel
- * @see     gjt.test.ChoiceCardPanelTest
- * @see     gjt.test.IconCardPanelTest
- */
-public abstract class CardPanel extends Panel {
-    private Panel       north, center;
-    private CardLayout  cards;
-
-    abstract public Component viewSelector();
-
-    public CardPanel() {
-        center = new Panel();
-        north  = new Panel();
-        
-        setLayout(new BorderLayout());
-        center.setLayout(cards = new CardLayout());
-        north.setLayout (new BorderLayout());
-
-        add("North",  north);
-        add("Center", center);
-    }
-    public void addNotify() {
-        super.addNotify();
-        north.add("Center", viewSelector());
-        north.add("South",  new Separator());
-    }
-    protected void addView(String name, Component component) {
-        center.add(name, component);
-    }
-    protected void showView(String name) {
-        cards.show(center, name); 
-    }
-}
diff --git a/java/gjt/ChoiceCardPanel.java b/java/gjt/ChoiceCardPanel.java
deleted file mode 100644
index 6273e03a5aa..00000000000
--- a/java/gjt/ChoiceCardPanel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * ChoiceCardPanel is an extension of CardPanel which presents
- * an awt.Choice for selecting the panel to be displayed
- * in the center panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CardPanel
- * @see     IconCardPanel
- * @see     gjt.test.IconCardPanelTest
- * @see     gjt.test.ChoiceCardPanelTest
- */
-public class ChoiceCardPanel extends CardPanel {
-    private ChoiceViewSelector viewSelector;
-
-    public ChoiceCardPanel() {
-        viewSelector = new ChoiceViewSelector(this);
-    }
-    public Component viewSelector() {
-        return viewSelector;
-    }
-    public void addChoice(String    name, 
-                          Component component) {
-        viewSelector.addItem(name);
-        super.addView(name, component);
-    }
-}
-
-class ChoiceViewSelector extends Panel {
-    private ChoiceCardPanel mvp;
-    private Choice          choice;
-
-    public ChoiceViewSelector(ChoiceCardPanel panel) {
-        setLayout(new FlowLayout());
-        add(choice = new Choice());
-        mvp = panel;
-    }
-    public void addItem(String name) {
-        choice.addItem(name);
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.ACTION_EVENT) {
-            if(event.target instanceof Choice) {
-                mvp.showView(choice.getSelectedItem());
-            }
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/ColumnLayout.java b/java/gjt/ColumnLayout.java
deleted file mode 100644
index bc51b44e456..00000000000
--- a/java/gjt/ColumnLayout.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * ColumnLayout lays out components in a column.  At 
- * construction time, both horizontal orientation and vertical 
- * orientation may be specified, along with the gap to use 
- * between components.<p>
- *
- * Horizontal orientation must be one of the following:
- * <dl>
- * <dd> LEFT 
- * <dd> CENTER  
- * <dd> RIGHT
- * </dl>
- *
- * Vertical orientation must be one of the following:
- * <dl>
- * <dd> TOP
- * <dd> CENTER  
- * <dd> BOTTOM
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Orientation
- * @see     RowLayout
- */
-public class ColumnLayout implements LayoutManager {
-    static private int _defaultGap = 5;
-
-    private int         gap;
-    private Orientation horizontalOrientation;
-    private Orientation verticalOrientation;
-
-    public ColumnLayout() {
-        this(Orientation.CENTER, 
-             Orientation.CENTER, _defaultGap);
-    }
-    public ColumnLayout(int gap) {
-        this(Orientation.CENTER, Orientation.CENTER, gap);
-    }
-    public ColumnLayout(Orientation horizontalOrient, 
-                        Orientation verticalOrient) {
-        this(horizontalOrient, verticalOrient, _defaultGap);
-    }
-    public ColumnLayout(Orientation horizontalOrient, 
-                        Orientation verticalOrient, int gap) {
-        Assert.notFalse(gap >= 0);
-        Assert.notFalse(
-            horizontalOrient == Orientation.LEFT   ||
-            horizontalOrient == Orientation.CENTER ||
-            horizontalOrient == Orientation.RIGHT);
-        Assert.notFalse(
-            verticalOrient   == Orientation.TOP    ||
-            verticalOrient   == Orientation.CENTER ||
-            verticalOrient   == Orientation.BOTTOM);
-
-        this.gap                   = gap;
-        this.verticalOrientation   = verticalOrient;
-        this.horizontalOrientation = horizontalOrient;
-    }
-
-    public void addLayoutComponent(String name, 
-                                   Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) { 
-    }
-
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-                if(i > 0) 
-                    dim.height += gap;
-
-                dim.height += d.height;
-                dim.width   = Math.max(d.width, dim.width);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top  + insets.bottom;
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-
-                dim.width  = Math.max(d.width, dim.width);
-                dim.height += d.height;
-
-                if(i > 0) dim.height += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top  + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets        = target.insets();
-        int       top           = insets.top;
-        int       left          = 0;
-        int       ncomponents   = target.countComponents();
-        Dimension preferredSize = target.preferredSize();
-        Dimension targetSize    = target.size();
-        Component comp;
-        Dimension ps;
-
-        if(verticalOrientation == Orientation.CENTER)
-            top += (targetSize.height/2) - 
-                   (preferredSize.height/2);
-        else if(verticalOrientation == Orientation.BOTTOM)
-            top = targetSize.height - preferredSize.height + 
-                  insets.top;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-            left = insets.left;
-
-            if(comp.isVisible()) {
-                ps = comp.preferredSize();
-
-                if(horizontalOrientation == Orientation.CENTER)
-                    left = (targetSize.width/2) - (ps.width/2);
-                else if(
-                  horizontalOrientation == Orientation.RIGHT) {
-                    left = targetSize.width - ps.width - 
-                           insets.right;
-                }
-                comp.reshape(left,top,ps.width,ps.height);
-                top += ps.height + gap;
-            }
-        }
-    }
-}
diff --git a/java/gjt/ComponentScroller.java b/java/gjt/ComponentScroller.java
deleted file mode 100644
index 3aef71c4ea2..00000000000
--- a/java/gjt/ComponentScroller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Scrolls any component.  Component to be scrolled may be a
- * container, so ultimately many components may be scrolled
- * at once.<p>
- *
- * Component to be scrolled may be specified at construction
- * time, or may be set after construction via 
- * void setComponent(Component).<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     BulletinLayout
- * @see     Scroller
- * @see     ScrollerLayout
- * @see     ImageScroller
- * @see     gjt.test.ComponentScrollerTest
- */
-public class ComponentScroller extends Scroller {
-    private Component scrollMe;
-
-    public ComponentScroller() {
-    }
-    public ComponentScroller(Component component) {
-        setComponent(component);
-    }
-    public void setComponent(Component component) {
-        scrollMe = component;
-        viewport.setLayout(new BulletinLayout());
-        viewport.add      (scrollMe);
-        viewport.move     (0,0);
-    }
-    public void scrollTo(int x, int y) {
-        scrollMe.move(-x,-y);
-    }
-    public Dimension getScrollAreaSize() {
-        return scrollMe.preferredSize();
-    }
-}
diff --git a/java/gjt/DialogClient.java b/java/gjt/DialogClient.java
deleted file mode 100644
index 7e67cea758e..00000000000
--- a/java/gjt/DialogClient.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gjt;
-
-import java.awt.Dialog;
-
-/**
- * DialogClients are notified when the Dialog with which they 
- * are associated is dismissed.  A reference to the dismissed 
- * Dialog is passed as a parameter of dialogDismissed() in case 
- * a DialogClient is a client of more than one Dialog.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     gjt.test.DialogTest
- */
-public interface DialogClient {
-    abstract public void dialogDismissed(Dialog d); 
-}
diff --git a/java/gjt/DrawingPanel.java b/java/gjt/DrawingPanel.java
deleted file mode 100644
index cda3fd69431..00000000000
--- a/java/gjt/DrawingPanel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import gjt.rubberband.*;
-
-/**
- * An extension of gjt.rubberband.RubberbandPanel which serves
- * as a panel used for drawing simple shapes (lines, rectangles,
- * and ellipses).  The shapes may be filled (except for lines,
- * of course), and the color of the shapes may be specified.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.rubberband.RubberbandPanel
- * @see     gjt.rubberband.RubberbandEllipse
- * @see     gjt.rubberband.RubberbandLine
- * @see     gjt.rubberband.RubberbandRectangle
- * @see     gjt.test.RubberbandTest
- * @see     gjt.test.ToolbarTest
- */
-public class DrawingPanel extends RubberbandPanel {
-    private Rubberband rbLine, rbRect, rbEllipse;
-    private Color   color;
-    private boolean fill;
-
-    public DrawingPanel() {
-        rbLine    = new RubberbandLine     (this);
-        rbRect    = new RubberbandRectangle(this);
-        rbEllipse = new RubberbandEllipse  (this);
-
-        setRubberband(rbLine);
-    }
-    public void drawLines     () { setRubberband(rbLine);    } 
-    public void drawRectangles() { setRubberband(rbRect);    } 
-    public void drawEllipses  () { setRubberband(rbEllipse); } 
-    
-    public void  setColor(Color color) { this.color = color; }
-    public Color getColor()            { return color;       }
-
-    public void    setFill(boolean b) { fill = b;    }
-    public boolean getFill()          { return fill; }
-
-    public boolean mouseUp(Event event, int x, int y) {
-        Rubberband rb = getRubberband();
-        Graphics   g  = getGraphics();
-
-        super.mouseUp(event, x, y);
-        g.setColor(color);
-
-        if(rb == rbLine)         drawLine     (rb, g);
-        else if(rb == rbRect)    drawRectangle(rb, g);
-        else if(rb == rbEllipse) drawEllipse  (rb, g);
-
-        return true;
-    }
-    protected void drawLine(Rubberband rb, Graphics g) {
-        Point anchor = rb.getAnchor(), end = rb.getEnd();
-        g.drawLine(anchor.x, anchor.y, end.x, end.y);
-    }
-    protected void drawRectangle(Rubberband rb, Graphics g) {
-        Rectangle r = rb.bounds();
-
-        if(fill) g.fillRect(r.x, r.y, r.width, r.height);
-        else     g.drawRect(r.x, r.y, r.width, r.height);
-    }
-    protected void drawEllipse(Rubberband rb, Graphics g) {
-        Rectangle r = rb.bounds();
-
-        if(fill) g.fillArc(r.x, r.y, r.width, r.height, 0, 360);
-        else     g.drawArc(r.x, r.y, r.width, r.height, 0, 360);
-    }
-}
diff --git a/java/gjt/DrawnRectangle.java b/java/gjt/DrawnRectangle.java
deleted file mode 100644
index e96fd8d3673..00000000000
--- a/java/gjt/DrawnRectangle.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Rectangle which draws itself inside of a Component.<p>
- * 
- * DrawnRectangles may have their thickness and line color set, 
- * and are capable of reporting their inner bounds (the area 
- * inside the lines).<p>
- *
- * Default thickness is 2.<p>
- *
- * If not set explicitly, the line color used is three shades 
- * darker than the background color of the Component being 
- * drawn into.<p>
- * 
- * DrawnRectangles may be clear()ed, which clears both the 
- * exterior (the lines) and the interior (the area inside of 
- * the lines) of the DrawnRectangle.<p>
- *
- * DrawnRectangles may also be fill()ed with a specified color 
- * by calling fill(Color), or by calling setFillColor(Color) 
- * followed by fill().<p>
- *
- * By default, the fill Color is the background color of the 
- * Component drawn into.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     EtchedRectangle
- * @see     Border
- * @see     EtchedBorder
- * @see     ThreeDBorder
- * @see     gjt.test.DrawnRectangleTest
- */
-public class DrawnRectangle extends Rectangle {
-    protected static int    _defaultThickness = 2;
-
-    protected Component drawInto;
-    private   int       thick;
-    private   Color     lineColor, fillColor;
-
-    public DrawnRectangle(Component drawInto) {
-        this(drawInto, _defaultThickness, 0, 0, 0, 0);
-    }
-    public DrawnRectangle(Component drawInto, int thick) {
-        this(drawInto, thick, 0, 0, 0, 0);
-    }
-    public DrawnRectangle(Component drawInto, int x, int y, 
-                                              int w, int h) {
-        this(drawInto, _defaultThickness, x, y, w, h);
-    }
-    public DrawnRectangle(Component drawInto, int thick,
-                          int x, int y, int w, int h) {
-        Assert.notNull(drawInto);
-        Assert.notFalse(thick > 0);
-
-        this.drawInto = drawInto;
-        this.thick    = thick;
-        reshape(x,y,w,h);
-    }
-    public Component component()          {return drawInto;    }
-    public int  getThickness  ()          {return thick;       }
-    public void setThickness  (int thick) {this.thick = thick; }
-
-    public void setLineColor(Color lineColor) {
-        this.lineColor = lineColor;
-    }
-    public void setFillColor(Color fillColor) {
-        this.fillColor = fillColor;
-    }
-    public void fill() {
-        fill(getFillColor());      
-    }
-    public Color getLineColor() {
-        if(lineColor == null)
-            lineColor = 
-            drawInto.getBackground().darker().darker().darker();
-        return lineColor;
-    }
-    public Color getFillColor() {
-        if(fillColor == null)
-            fillColor = drawInto.getBackground();
-        return fillColor;
-    }
-    public Rectangle getInnerBounds() {
-        return new Rectangle(x+thick, y+thick, 
-                             width-(thick*2), height-(thick*2));
-    }
-    public void paint() {
-        Graphics g = drawInto.getGraphics();
-        paintFlat(g, getLineColor()); 
-    }
-    private void paintFlat(Graphics g, Color color) {
-        if(g != null) {
-            g.setColor(color);
-            for(int i=0; i < thick; ++i)
-                g.drawRect(x+i, y+i, 
-                           width-(i*2)-1, height-(i*2)-1);
-        }
-    }
-    public void clearInterior() {
-        fill(drawInto.getBackground());
-    }
-    public void clearExterior() {
-        paintFlat(drawInto.getGraphics(), 
-                  drawInto.getBackground());
-    }
-    public void clear() { 
-        clearExterior(); 
-        clearInterior(); 
-    }
-    public void fill(Color color) {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            Rectangle r = getInnerBounds();
-            g.setColor(color);
-            g.fillRect(r.x, r.y, r.width, r.height);
-            setFillColor(color);
-        }
-    }
-    public String toString() {
-        return super.toString() + "[" + paramString() + "]";
-    }
-    public String paramString() {
-        return "color=" + getLineColor() + ",thickness=" + 
-                thick + ",fillColor=" + getFillColor();
-    }
-    protected Color brighter() {
-        return 
-    getLineColor().brighter().brighter().brighter().brighter();
-    }
-}
diff --git a/java/gjt/EtchedBorder.java b/java/gjt/EtchedBorder.java
deleted file mode 100644
index 09ff845014b..00000000000
--- a/java/gjt/EtchedBorder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * An extension of Border that draws an etched border.
- * 
- * Drawn etchedIn by default, drawing style used by paint() is 
- * controlled by etchedIn() and etchedOut().  Note that 
- * etchedIn() and etchedOut() do not result in anything being 
- * painted, but only set the state for the next call to paint().
- * To set the state and paint in one operation, use 
- * paintEtchedIn() and paintEtchedOut().<p>
- *
- * The current state of the border may be obtained by calling 
- * isEtchedIn().<p>
- *
- * @version 1.0, Apr 1 1996 
- * @author  David Geary   
- * @see     Border
- * @see     ThreeDRectangle
- * @see     gjt.test.BorderTest
- */ 
-public class EtchedBorder extends Border {
-    public EtchedBorder(Component borderMe) {
-        this(borderMe, _defaultThickness, _defaultGap); 
-    }
-    public EtchedBorder(Component borderMe, 
-                        int borderThickness) {
-        this(borderMe, borderThickness, _defaultGap);
-    }
-    public EtchedBorder(Component borderMe, 
-                        int borderThickness, int gap) {
-        super(borderMe, borderThickness, gap);
-    }
-    public void etchedIn() {
-        ((EtchedRectangle)border()).etchedIn();      
-    }
-    public void etchedOut() {
-        ((EtchedRectangle)border()).etchedOut();     
-    }
-    public void paintEtchedIn() {
-        ((EtchedRectangle)border()).paintEtchedIn ();
-    }
-    public void paintEtchedOut() {
-        ((EtchedRectangle)border()).paintEtchedOut();
-    }
-    public boolean isEtchedIn() { 
-        return ((EtchedRectangle)border()).isEtchedIn();
-    }
-    protected String paramString() {
-        return super.paramString() + (EtchedRectangle)border();
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new EtchedRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/EtchedRectangle.java b/java/gjt/EtchedRectangle.java
deleted file mode 100644
index b8026d42f8d..00000000000
--- a/java/gjt/EtchedRectangle.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A DrawnRectangle that draws an etched border.<p>
- * 
- * Drawn etched in by default, drawing style used by paint() is 
- * controlled by etchedIn() and etchedOut().  Note that 
- * etchedIn() and etchedOut() do not result in anything being 
- * painted, but only set the state for the next call to paint(). 
- * To set the state and paint in one operation, use 
- * paintEtchedIn() and paintEtchedOut().<p>
- * 
- * Although it is permissible to set the thickness of 
- * EtchedRectangles, they tend to loose the etching effect 
- * if thickness is greater than 4.<p>
- *
- * The current state of the rectangle may be obtained by 
- * calling isEtchedIn().
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     ThreeDRectangle
- * @see     gjt.test.DrawnRectangleTest
- */
-public class EtchedRectangle extends DrawnRectangle {
-    protected static Etching _defaultEtching = Etching.IN;
-    private Etching etching;
-
-    public EtchedRectangle(Component drawInto) {
-        this(drawInto, _defaultEtching, 
-             _defaultThickness, 0, 0, 0, 0);
-    }
-    public EtchedRectangle(Component drawInto, int thickness) {
-        this(drawInto, _defaultEtching, thickness, 0, 0, 0, 0);
-    }
-    public EtchedRectangle(Component drawInto, int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultEtching, 
-             _defaultThickness, x, y, w, h);
-    }
-    public EtchedRectangle(Component drawInto, int thickness,
-                                               int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultEtching, thickness, x, y, w, h);
-    }
-    public EtchedRectangle(Component drawInto, Etching etching, 
-                           int thickness, int x, int y, 
-                           int w, int h) {
-        super(drawInto, thickness, x, y, w, h);
-        this.etching = etching;
-    }
-    public void    etchedIn  () { etching = Etching.IN;        }
-    public void    etchedOut () { etching = Etching.OUT;       }
-    public boolean isEtchedIn() { return etching == Etching.IN;}
-
-    public void paint() {
-        if(etching == Etching.IN) paintEtchedIn();
-        else                      paintEtchedOut();
-    }
-    public void paintEtchedIn() {
-        Graphics g = drawInto.getGraphics();
-        if(g != null)
-            paintEtched(g, getLineColor(), brighter());
-
-        etchedIn();
-    }
-    public void paintEtchedOut() {
-        Graphics g = drawInto.getGraphics();
-        if(g != null)
-            paintEtched(g, brighter(), getLineColor());
-
-        etchedOut();
-    }
-    public String paramString() { 
-        return super.paramString() + "," + etching;
-    }
-    private void paintEtched(Graphics g, 
-                             Color topLeft, 
-                             Color bottomRight) {
-        int  thickness = getThickness();
-        int  w = width  - thickness;
-        int  h = height - thickness;
-
-        g.setColor(topLeft);
-        for(int i=0; i < thickness/2; ++i) 
-            g.drawRect(x+i, y+i, w, h);
-
-        g.setColor(bottomRight);
-
-        for(int i=0; i < thickness/2; ++i) 
-            g.drawRect(x+(thickness/2)+i, 
-                       y+(thickness/2)+i, w, h);
-    }
-}
diff --git a/java/gjt/Etching.java b/java/gjt/Etching.java
deleted file mode 100644
index ad40d9caaea..00000000000
--- a/java/gjt/Etching.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gjt;
-
-/**
- * Constants for Etching.
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class Etching {
-    public static final Etching OUT = new Etching();
-    public static final Etching IN  = new Etching();
-
-    public String toString() {
-        if(this == Etching.OUT) 
-            return getClass().getName() + "=OUT";
-        else                    
-            return getClass().getName() + "=IN";
-    }
-    private Etching() { }
-}
diff --git a/java/gjt/ExclusiveImageButtonPanel.java b/java/gjt/ExclusiveImageButtonPanel.java
deleted file mode 100644
index f1d0878a499..00000000000
--- a/java/gjt/ExclusiveImageButtonPanel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt;
-
-import java.awt.Image;
-
-/**
- * An ImageButtonPanel which fits all of its ImageButtons with 
- * a StickyImageButtonController.  ExclusiveImageButtonPanel 
- * relies upon its superclass' controller:  a 
- * RadioImageButtonPanelController, which ensures that only one 
- * of the ImageButtons is selected at a time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-public class ExclusiveImageButtonPanel extends 
-                                       ImageButtonPanel {
-    public ExclusiveImageButtonPanel(Orientation orient) {
-        this(orient, 5);
-    }
-    public ExclusiveImageButtonPanel(Orientation orient, 
-                                     int gap) {
-        super(orient, gap);
-    }
-    public ExclusiveImageButtonPanel(Orientation orient, 
-                                     Orientation horient,
-                                     Orientation vorient,
-                                     int gap) {
-        super(orient, horient, vorient, gap);
-    }
-    public void add(ImageButton button) {
-        super.add(button);
-        new StickyImageButtonController(button);
-    }
-    public ImageButton add(Image image) {
-        ImageButton button = super.add(image);
-        new StickyImageButtonController(button);
-        return button;
-    }
-    public ImageButton add(Image image, String name) {
-        ImageButton button = super.add(image, name);
-        new StickyImageButtonController(button);
-        return button;
-    }
-}
diff --git a/java/gjt/FontDialog.java b/java/gjt/FontDialog.java
deleted file mode 100644
index 182ca582884..00000000000
--- a/java/gjt/FontDialog.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog used for selecting a font.  FontDialog is 
- * constructed with a Frame, DialogClient, initial font to 
- * display, and boolean that indicates modality.<p>
- *
- * FontDialog contains a preview panel which previews the 
- * currently selected font.  Updating of the preview panel is 
- * triggered by a preview button at the bottom of the dialog.<p>
- *
- * FontDialog contains 3 methods which define the labels for 
- * the buttons it contains:
- * <dl>
- * <dd> String getPreviewButtonLabel()
- * <dd> String getOkButtonLabel()
- * <dd> String getCancelButtonLabel()
- * </dl><p>
- * 
- * By default the 3 methods return "Preview", "Ok" and "Cancel" 
- * respectively.  FontDialog may be extended and the 3 methods 
- * overridden to customize the labels displayed in the 
- * buttons.<p>
- * 
- * FontDialog uses Toolkit to get a list of fonts by invoking
- * Toolkit.getFontList().  This is done in the getFontNames() 
- * method, which may be overridden by extensions of FontDialog 
- * in case the standard set of font names are inadequate.<p>
- *
- * Finally, font sizes are obtained by the getFontSizes() 
- * method.  FontDialog defines 8 sizes by default:  8, 12, 14, 
- * 16, 18, 24, 48 and 64. Extensions of FontDialog may override 
- * getFontSizes() to provide a different list of sizes.<p>
- *
- * See gjt.test.FontDialogTest for an example of an extension 
- * of FontDialog which overrides the methods discussed above.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     java.awt.Dialog
- * @see     java.awt.Toolkit
- * @see     DialogClient
- * @see     gjt.test.FontDialogTest
- */
-public class FontDialog extends Dialog {
-    private static String _defaultSizes[] = 
-        { "8",  "12", "14", "16", "18", "24", "48", "64" };
-
-    private FontPanel    fontPanel;
-    private Font         fontSelected;
-    private DialogClient client;
-
-    public FontDialog(Frame        frame, 
-                      DialogClient client, 
-                      Font         font,    // initial font
-                      boolean      modal) {
-        super(frame, "Select A Font", modal);
-        this.client = client;
-        
-        setLayout(new BorderLayout());
-        add("Center", fontPanel = new FontPanel(this, font));
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.WINDOW_DESTROY)
-            done(null);
-
-        return super.handleEvent(event);
-    }
-    public String[] getFontNames() { 
-        return getToolkit().getFontList(); 
-    }
-    public String[] getFontSizes() { 
-        return _defaultSizes;   
-    }
-
-    public String getPreviewButtonLabel() { return "Preview"; }
-    public String getOkButtonLabel     () { return "Ok";      }
-    public String getCancelButtonLabel () { return "Cancel";  }
-
-    public void show() {
-        Point frameLoc = getParent().location();
-        reshape(frameLoc.x + 50, frameLoc.x + 50, 550, 450);
-        super.show();
-    }
-    public void done(Font font) {
-        fontSelected = font;
-        client.dialogDismissed(this);
-        hide   ();
-        dispose();
-    }
-    public Font getFontSelected() {
-        return fontSelected;
-    }
-    public void listSelectedInPicker() {
-        fontPanel.getPreviewButton().requestFocus();
-    }
-}
-
-class FontPanel extends Panel {
-    private static Font defaultFont = 
-        new Font("TimesRoman", Font.PLAIN, 12);
-
-    private FontPreviewPanel   preview;
-    private FontSelectionPanel fsp;
-
-    public FontPanel(FontDialog dialog, Font f) {
-        Font font = f == null ? defaultFont : f;
-
-        setLayout(new BorderLayout());
-        add("North",  preview = new FontPreviewPanel  ());
-        add("Center", fsp     = 
-            new FontSelectionPanel(dialog, preview, font));
-    }
-    public Button getPreviewButton() {
-        return fsp.getPreviewButton();
-    }
-}
-
-class FontPreviewPanel extends Panel {
-    TextField textField = new TextField();
-    Box       box       = new Box(textField, "Preview");
-
-    public FontPreviewPanel() {
-        textField.setEditable(false);
-
-        setLayout(new BorderLayout());
-        add("Center", box);
-    }
-    public void setPreviewFont(Font font) {
-        String name  = font.getName();
-        String size  = String.valueOf(font.getSize());
-        String style = new String();
-
-        if(font.isPlain () == true) style = "Plain";
-        else {
-            if(font.isBold  () == true) style += "Bold";
-            if(font.isItalic() == true) style += "Italic";
-        }
-        textField.setFont(font);
-        textField.setText(name + " " + style + " " + size);
-        retrofitPreviewPanel();
-    }
-    private void retrofitPreviewPanel() {
-        Dimension tfps, tfs;
-        FontPanel fontPanel = (FontPanel)getParent();
-
-        tfps = textField.preferredSize();
-        tfs  = textField.size();
-
-        if(tfps.width != tfs.width || 
-           tfps.height != tfs.height) {
-            fontPanel.invalidate();
-            fontPanel.getParent().validate();
-            box.repaint();           // Only necessary on Win95
-        }
-    }
-}
-
-class FontSelectionPanel extends Panel {
-    private FontPickerPanel  picker;
-    private FontButtonsPanel buttons;
-    private FontPreviewPanel preview;
-    private Font             initialFont;
-
-    public FontSelectionPanel(FontDialog       dialog,
-                              FontPreviewPanel preview, 
-                              Font initialFont) {
-        this.preview     = preview;
-        this.initialFont = initialFont;
-
-        picker  = new FontPickerPanel (dialog, initialFont);
-        buttons = new FontButtonsPanel(dialog, picker, preview);
-
-        setLayout(new BorderLayout());
-        add("Center", picker);
-        add("South",  buttons);
-    }
-    public void addNotify() {
-        super.addNotify();
-        preview.setPreviewFont(initialFont);
-    }
-    public Button getPreviewButton() {
-        return buttons.getPreviewButton();
-    }
-}
-
-class FontPickerPanel extends Panel {
-    private FontDialog dialog;
-    private Button     previewButton;
-    private List       fonts  = new List();
-    private List       styles = new List();
-    private List       sizes  = new List();
-    private Font       initialFont;
-
-    public FontPickerPanel(FontDialog dialog, 
-                           Font       initialFont) {
-        GridBagLayout      gbl    = new GridBagLayout();
-        GridBagConstraints gbc    = new GridBagConstraints();
-        Label              family = new Label("Family");
-        Label              style  = new Label("Style");
-        Label              size   = new Label("Size");
-
-        this.initialFont = initialFont;
-        this.dialog      = dialog;
-        
-        populateFonts ();
-        populateStyles();
-        populateSizes ();
-
-        setLayout(gbl);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = 1;
-        gbl.setConstraints(family, gbc); add(family);
-        gbl.setConstraints(style,  gbc); add(style);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(size,   gbc); add(size);
-
-        gbc.gridwidth = 1;
-        gbc.weighty   = 1.0;
-        gbc.weightx   = 1.0;
-        gbc.fill      = GridBagConstraints.BOTH;
-        gbl.setConstraints(fonts,  gbc); add(fonts);
-        gbl.setConstraints(styles, gbc); add(styles);
-        gbl.setConstraints(sizes,  gbc); add(sizes);
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id  == Event.LIST_SELECT) {
-            dialog.listSelectedInPicker();
-            return true;
-        }
-        return false;
-    }
-    public void addNotify() {
-        super.addNotify();
-        String initialFamily = initialFont.getName();
-        int    initialSize   = initialFont.getSize();
-        int    initialStyle  = initialFont.getStyle();
-
-        styles.select(initialStyle);
-
-        for(int i=0; i < fonts.countItems(); ++i) {
-            String nextFamily = fonts.getItem(i);
-            if(nextFamily.equals(initialFamily))
-                fonts.select(i);
-        }
-        for(int i=0; i < sizes.countItems(); ++i) {
-            String nextSize = sizes.getItem(i);
-            if(nextSize.equals(String.valueOf(initialSize)))
-                sizes.select(i);
-        }
-    }
-    public String fontSelected() { 
-        return fonts.getSelectedItem (); 
-    }
-    public String styleSelected() { 
-        return styles.getSelectedItem(); 
-    }
-    public int sizeSelected() {
-        String szstring = sizes.getSelectedItem();
-
-        if(szstring != null) {
-            Integer integer = new Integer(szstring);
-            return integer.intValue();
-        }
-        else
-            return 0;
-    }
-    private void populateFonts() {
-        String names[] = dialog.getFontNames();
-
-        for(int i=0; i < names.length; ++i) {
-            fonts.addItem(names[i]);
-        }
-    }
-    private void populateSizes() {
-        String sizeArray[] = dialog.getFontSizes();
-
-        for(int i=0; i < sizeArray.length; ++i) {
-            sizes.addItem(sizeArray[i]);
-        }
-    }
-    private void populateStyles() {
-        styles.addItem("Plain");
-        styles.addItem("Bold");
-        styles.addItem("Italic");
-        styles.addItem("BoldItalic");
-    }
-}
-
-class FontButtonsPanel extends Panel {
-    private FontDialog       dialog;
-    private FontPickerPanel  picker;
-    private FontPreviewPanel preview;
-    private Button           previewButton, 
-                             okButton, 
-                             cancelButton;
-
-    public FontButtonsPanel(FontDialog       dialog,
-                            FontPickerPanel  picker, 
-                            FontPreviewPanel preview) {
-        this.picker  = picker;
-        this.preview = preview;
-        this.dialog  = dialog;
-
-        add(previewButton = 
-            new Button(dialog.getPreviewButtonLabel()));
-        add(cancelButton  = 
-            new Button(dialog.getCancelButtonLabel()));
-        add(okButton      = 
-            new Button(dialog.getOkButtonLabel()));
-    }
-    public void addNotify() {
-        super.addNotify();
-        cancelButton.requestFocus();
-    }
-    public boolean action(Event event, Object object) {
-        Button  button = (Button)event.target;
-        boolean handledEvent = true;
-
-        if(event.target == previewButton) {
-            Font selectedFont = fontSelected();
-
-            if(selectedFont != null) {
-                preview.setPreviewFont(selectedFont);
-                okButton.requestFocus();
-            }
-        }
-        else if(event.target == okButton)     
-            dialog.done(fontSelected());
-        else if(event.target == cancelButton) 
-            dialog.done(null);
-        else                                  
-            handledEvent = false;
-
-        return handledEvent;
-    }
-    public Button getPreviewButton() {
-        return previewButton;
-    }
-    private Font fontSelected() {
-        String font   = picker.fontSelected ();
-        String style  = picker.styleSelected();
-        int    size   = picker.sizeSelected ();
-        int    istyle = Font.PLAIN;
-
-        if(font != null && style != null && size > 0) {
-            if(style.equals("Bold"))   istyle = Font.BOLD;
-            if(style.equals("Plain"))  istyle = Font.PLAIN;
-            if(style.equals("Italic")) istyle = Font.ITALIC;
-
-            if(style.equals("BoldItalic")) 
-                istyle = Font.BOLD + Font.ITALIC;
-
-            return new Font(font, istyle, size);
-        }
-        else
-            return null;
-    }
-}
diff --git a/java/gjt/GJT.DSP b/java/gjt/GJT.DSP
deleted file mode 100644
index e2060a0ad72..00000000000
--- a/java/gjt/GJT.DSP
+++ /dev/null
@@ -1,456 +0,0 @@
-# Microsoft Developer Studio Project File - Name="GJT" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Java Virtual Machine Java Project" 0x0809
-
-CFG=GJT - Java Virtual Machine Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GJT.MAK".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GJT.MAK" CFG="GJT - Java Virtual Machine Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GJT - Java Virtual Machine Release" (based on\
- "Java Virtual Machine Java Project")
-!MESSAGE "GJT - Java Virtual Machine Debug" (based on\
- "Java Virtual Machine Java Project")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-JAVA=jvc.exe
-
-!IF  "$(CFG)" == "GJT - Java Virtual Machine Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\classes-r"
-# PROP Intermediate_Dir ""
-# PROP Target_Dir ""
-# ADD BASE JAVA /O
-# ADD JAVA /O
-
-!ELSEIF  "$(CFG)" == "GJT - Java Virtual Machine Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\classes"
-# PROP Intermediate_Dir ""
-# PROP Target_Dir ""
-# ADD BASE JAVA /g
-# ADD JAVA /g
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GJT - Java Virtual Machine Release"
-# Name "GJT - Java Virtual Machine Debug"
-# Begin Source File
-
-SOURCE=.\Assert.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\AttributesPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Bargauge.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\BargaugeTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\image\BleachImageFilter.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\BleachImageFilterTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Border.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\BorderTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Box.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\BoxTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\BulletinLayout.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\BumpAnimationTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ButtonPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\CardPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ChoiceCardPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ChoiceCardPanelTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\CollisionArena.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\CollisionDetector.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ColumnLayout.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ColumnLayoutTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ComponentScroller.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ComponentScrollerTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ConnectionsPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\DialogClient.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\DialogTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\image\DissolveFilter.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\DrawingPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\DrawnRectangle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\DrawnRectangleTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\EdgeCollisionDetector.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\EtchedBorder.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\EtchedRectangle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Etching.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ExclusiveImageButtonPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\FontDialog.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\FontDialogTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\GJTDialog.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\IconCardPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\IconCardPanelTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageButton.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageButtonController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageButtonEvent.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageButtonPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageButtonPanelController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ImageButtonTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageCanvas.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\image\ImageDissolver.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ImageDissolverTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImageScroller.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ImageScrollerTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\LabelCanvas.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\LabelCanvasTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\MessageDialog.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\MessageDialogTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\MouseController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\OccupationOracle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Orientation.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\Playfield.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProgressDialog.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\QuestionDialog.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\RadioImageButtonPanelController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\RowLayout.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\RowLayoutTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\rubberband\Rubberband.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\rubberband\RubberbandEllipse.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\rubberband\RubberbandLine.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\rubberband\RubberbandPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\rubberband\RubberbandRectangle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\RubberbandTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Scroller.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScrollerLayout.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\SelectionEvent.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Separator.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\SeparatorTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\Sequence.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\SimpleAnimationTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\SimpleBargaugeTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\SpringyImageButtonController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\Sprite.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\animation\SpriteCollisionDetector.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\StateButton.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\StateButtonController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\StateButtonTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\StickyImageButtonController.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Stopwatch.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\StopwatchClient.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\TenPixelBorder.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ThreeDBorder.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ThreeDBorderStyle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\ThreeDRectangle.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\TitledPanel.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Toolbar.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\ToolbarTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\TwoDrinkersAnimationTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\test\UnitTest.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\Util.java
-# End Source File
-# Begin Source File
-
-SOURCE=.\YesNoDialog.java
-# End Source File
-# End Target
-# End Project
diff --git a/java/gjt/GJT.DSW b/java/gjt/GJT.DSW
deleted file mode 100644
index fb82e10ad55..00000000000
--- a/java/gjt/GJT.DSW
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "GJT"=.\GJT.DSP - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/java/gjt/GJTDialog.java b/java/gjt/GJTDialog.java
deleted file mode 100644
index 7fc0bd39f40..00000000000
--- a/java/gjt/GJTDialog.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A base class for gjt dialog classes, this concrete class 
- * establishes the relationship between a dialog and its 
- * client (DialogClient).<p>
- *
- * Note that show() is overridden to ensure that the dialog is 
- * centered in the frame which is specified as its parent.  This
- * is necessary due to a bug in the Win95 implementation of the 
- * AWT (version 1.0.2) that causes dialogs to be displayed at 
- * a screen coordinate of 0,0.  While the overridden show() is 
- * not necessary under non-Win95 Java implementations, it 
- * alleviates the Win95 bug and results in no dire consequences 
- * on other platforms.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     ProgressDialog
- * @see     gjt.test.DialogTest
- */
-public class GJTDialog extends Dialog {
-    protected DialogClient client;
-
-    public GJTDialog(Frame        frame, 
-                     String       title, 
-                     DialogClient client, 
-                     boolean      modal) {
-        super(frame, title, modal); 
-        setClient(client);
-    }
-    public void setClient(DialogClient client) {
-        this.client = client;
-    }
-    public void show() {  // Fixes bug under Win95
-        Dimension frameSize = getParent().size();
-        Point     frameLoc  = getParent().location();
-        Dimension mySize    = size();
-        int       x,y;
-
-        x = frameLoc.x + (frameSize.width/2) -(mySize.width/2); 
-        y = frameLoc.y + (frameSize.height/2)-(mySize.height/2); 
-        reshape(x,y,size().width,size().height);
-        super.show();
-    }
-}
diff --git a/java/gjt/IconCardPanel.java b/java/gjt/IconCardPanel.java
deleted file mode 100644
index 78940bf8f4f..00000000000
--- a/java/gjt/IconCardPanel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A CardPanel whose Component viewSelector() returns
- * a panel with image buttons to control the selection of the
- * panel to be displayed beneath the view selector panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CardPanel
- * @see     ChoiceCardpanel
- * @see     gjt.test.IconCardPanelTest
- */
-public class IconCardPanel extends CardPanel {
-    private ImageButtonPanel viewSelector;
-
-    public IconCardPanel() {
-        viewSelector = new IconViewSelector(this);
-    }
-    public Component viewSelector() {
-        return viewSelector;
-    }
-    public void addImageButton(Image     image, 
-                               String    name, 
-                               Component component) {
-        ImageButton newButton;
-
-        viewSelector.add(
-            newButton = new ImageButton(image), name);
-        newButton.setController(
-            new StickyImageButtonController(newButton));
-        super.addView(name, component);
-    }
-}
-
-class IconViewSelector extends ImageButtonPanel {
-    private IconCardPanel mvp;
-
-    public IconViewSelector(IconCardPanel panel) {
-        super(Orientation.HORIZONTAL);
-        setLayout(new FlowLayout());
-        mvp = panel;
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.MOUSE_DOWN) {
-            if(event.target instanceof ImageButton) {
-                ImageButton ib = (ImageButton)event.target;
-                    mvp.showView(getButtonName(ib)); 
-            }
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/ImageButton.java b/java/gjt/ImageButton.java
deleted file mode 100644
index 07bdeff0ef8..00000000000
--- a/java/gjt/ImageButton.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.image.BleachImageFilter;
-
-/**
- * An Image painted in a Canvas, bordered by a ThreeDRectangle.
- * <p>
- *
- * ImageButtons have two constructors, both of which take an 
- * Image.  The Image passed to the constructor must not be null;
- * this is enforced by an assertion.<p>
- *
- * Default border thickness is 2 pixels - thickness may be set 
- * at construction time only.<p>
- *
- * Event handling is delegated to an ImageButtonController.  By 
- * default, all ImageButtons are fitted with an instance of 
- * SpringyImageButtonController, however, 
- * setController(ImageButtonController) may be used to fit an
- * ImageButton with a different derivation of 
- * ImageButtonController after construction.<p>
- *
- * ImageButtons ensure that their Images are completely loaded 
- * before they are displayed.<p>
- * 
- * Drawn either raised or inset, current state may be queried 
- * via the isRaised() method.<p>
- *
- * disable() disables response to input and repaints the image 
- * with a bleached version.  enable() restores the original 
- * image and enables response to input.  The intensity of the 
- * bleaching effect may be controlled (for all ImageButtons) 
- * via the static setBleachPercent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     ImageButtonController
- * @see     ImageButtonEvent
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     BleachImageFilter
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageButton extends Canvas {
-    private static BleachImageFilter _bleachFilter;
-    private static int               _bleachPercent    = 50;
-    private static int               _offset           = 1;
-    private static int               _defaultThickness = 2;
-
-    private ThreeDRectangle border  = new ThreeDRectangle(this);
-    private boolean         isDisabled    = false;
-    private Dimension       preferredSize = new Dimension(0,0);
-    private int             thickness;
-    private Image           image, disabledImage;
-    private ImageButtonController controller;
-
-    public static int setBleachPercent() { 
-        return _bleachPercent; 
-    }
-    public static void getBleachPercent(int p) { 
-        _bleachPercent = p;    
-    }
-    public ImageButton(Image image) {
-        this(image, _defaultThickness, null);
-    }
-    public ImageButton(Image image, 
-                       ImageButtonController controller) {
-        this(image, _defaultThickness, controller);
-    }
-    public ImageButton(Image image, int thickness, 
-                       ImageButtonController controller) {
-        Assert.notNull(image);
-        Assert.notFalse(thickness > 0);
-
-        if(controller == null) 
-            this.controller = 
-                new SpringyImageButtonController(this);
-        else                   
-            this.controller = controller;
-
-        border.setThickness(this.thickness = thickness);  
-        setImage(image);
-    }
-    public void setImage(Image image) {
-        Util.waitForImage(this, this.image = image);
-
-        preferredSize.width  = image.getWidth (this) + 
-                               (2*thickness);
-        preferredSize.height = image.getHeight(this) + 
-                               (2*thickness);
-    }
-    public Dimension minimumSize() { 
-        return preferredSize; 
-    }
-    public Dimension preferredSize() { 
-        return preferredSize;                
-    }
-    public boolean isRaised  () { return border.isRaised();    }
-    public boolean isDisabled() { return isDisabled;           }
-
-    public void enable() { 
-        isDisabled = false; 
-        repaint();
-    }
-    public void disable() { 
-        isDisabled = true;  
-
-        if(disabledImage == null) 
-            createDisabledImage();
-
-        repaint();       
-    }
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) { 
-        super.reshape(x,y,w,h);
-        border.resize(w,h);
-    }
-    public void paint(Graphics g) {
-        if(isRaised()) paintRaised();
-        else           paintInset ();
-    }
-    public void paintInset() {
-        Point     upperLeft = findUpperLeft();
-        Graphics  g         = getGraphics();
-        Image     image     = isDisabled() ? 
-                              disabledImage : this.image;
-        Dimension size      = size();
-
-        if(g != null) {
-            border.clearInterior();
-            g.drawImage(image, 
-                        upperLeft.x + thickness + _offset, 
-                        upperLeft.y + thickness + _offset,this);
-
-            g.setColor(getBackground().darker());
-            for(int i=0; i < _offset; ++i) {
-                g.drawLine(thickness+i,thickness+i,
-                           size.width-thickness-i,thickness+i);
-                g.drawLine(thickness+i,thickness+i,
-                           thickness+i,size.height-thickness-i);
-            }
-            border.paintInset();
-        }
-    }
-    public void paintRaised() {
-        Point    upperLeft = findUpperLeft();
-        Graphics g         = getGraphics();
-        Image    image     = isDisabled() ? 
-                             disabledImage : this.image;
-
-        if(g != null) {
-            border.clearInterior();
-            g.drawImage(image, upperLeft.x + thickness, 
-                               upperLeft.y + thickness, this);
-            border.paintRaised();
-        }
-    }
-    public boolean isInside(int x, int y) {
-      Dimension size = size();
-      return x >= 0 && x < size.width && y >= 0 && 
-             y < size.height;
-    }
-    public void setController(ImageButtonController controller){
-        this.controller = controller;
-    }
-    public ImageButtonController getController() {
-        return controller;
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseDown(event,x,y);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseUp(event,x,y);
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseDrag(event,x,y);
-    }
-
-    private void createDisabledImage() {
-        if(_bleachFilter == null)
-            _bleachFilter = 
-                new BleachImageFilter(_bleachPercent);
-
-        if(_bleachPercent != _bleachFilter.percent())
-            _bleachFilter.percent(_bleachPercent);
-
-        FilteredImageSource fis = 
-            new FilteredImageSource(image.getSource(), 
-                                    _bleachFilter);
-
-        Util.waitForImage(this, disabledImage=createImage(fis));
-    }
-    private Point findUpperLeft() {
-        Dimension size = size();
-        return new Point((size.width/2) - 
-                         (preferredSize.width/2), 
-                         (size.height/2) - 
-                         (preferredSize.height/2));
-    }
-}
diff --git a/java/gjt/ImageButtonController.java b/java/gjt/ImageButtonController.java
deleted file mode 100644
index 0f6aa6f4add..00000000000
--- a/java/gjt/ImageButtonController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package gjt;
-import java.awt.Event;
-
-/**
- * A controller for an ImageButton, this abstract class 
- * establishes the association between itself and an ImageButton
- * and delivers events to its ImageButton.<p>
- *
- * ImageButtonControllers must be constructed with an 
- * ImageButton; the ImageButton's controller gets set by 
- * ImageButtonController's constructor.<p>
- *
- * The ImageButton passed into the constructor must not be null; 
- * this is enforced by an assertion.<p>
- *
- * Methods defined in the MouseController interface are left 
- * for subclasses to implement.  ImageButtonController defines
- * mouseMove(), mouseEnter() and mouseExit() as no-ops, so
- * that extensions of ImageButtonController only have to
- * implement mouseDown(), mouseUp() and mouseDrag().  Note
- * that extensions are still free to override mouseMove(),
- * mouseEnter() and mouseExit() if desired.<p>
- *
- * Subclasses should also call the protected XXXButton(Event)
- * methods below, where XXX is either arm, disarm, activate, or
- * deactivate as appropriate.  SpringyImageButtonController is
- * a good example of this (so is StickyImageButtonController,
- * but it is more complicated than it's springy sibling).<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MouseController
- * @see     ImageButton
- * @see     ImageButtonEvent
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     gjt.test.ImageButtonTest
- */
-public abstract class ImageButtonController 
-         implements MouseController {
-    private ImageButton button;
-
-    ImageButtonController(ImageButton button) {
-        Assert.notNull(button);
-        this.button = button;
-        button.setController(this);
-    }
-    public ImageButton getButton() {
-        return button;
-    }
-    public boolean mouseEnter(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseExit (Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseMove (Event event, int x, int y) {
-        return false;
-    }
-
-    protected void armButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.ARM));
-    }
-    protected void disarmButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.DISARM));
-    }
-    protected void activateButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.ACTIVATE));
-    }
-}
diff --git a/java/gjt/ImageButtonEvent.java b/java/gjt/ImageButtonEvent.java
deleted file mode 100644
index bb7f196698f..00000000000
--- a/java/gjt/ImageButtonEvent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An extension of java.awt.Event, specifically designed for
- * ImageButton events.<p>
- *
- * ImageButtonEvents are constructed with 3 arguments:
- * <dl>
- * <dd> ImageButton in which the event occurred
- * <dd> The AWT event that triggered the image button event
- * <dd> The id of the event.
- * </dl>
- *
- * An ImageButtonEvent's id (the constructor's 3rd argument),
- * must be one of the following:
- *
- * <dl>
- * <dd> ImageButtonEvent.ARM
- * <dd> ImageButtonEvent.DISARM
- * <dd> ImageButtonEvent.ACTIVATE
- * </dl>
- *
- * ImageButtonEvent has only a constructor and a paramString() 
- * method.  Containers that contain ImageButtons should check 
- * for ImageButtonEvents like so: <p>
- * 
- * <pre>
- *      // handleEvent(Event) method of a container that
- *      // contains ImageButtons.
- *
- *      public boolean handleEvent(Event event) {
- *              if(event instanceof ImageButtonEvent) {
- *                  ImageButtonEvent ibevent = 
- *                  (ImageButtonEvent)event;
- *
- *                  if(ibevent.isArmed()) {
- *                      // do something for arming
- *                  }
- *                  if(ibevent.isDisarmed()) {
- *                      // do something for disarming
- *                  }
- *                  if(ibevent.isActivated()) {
- *                      // do something for activation
- *                  }
- *              }
- *      }
- * </pre>
- *
- * ImageButtonController is the only GJT class that creates
- * ImageButtonEvents.
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageButtonEvent extends Event {
-    public static final int ARM      = 1;
-    public static final int DISARM   = 2;
-    public static final int ACTIVATE = 3;
-
-    private int eventType;
-
-    public ImageButtonEvent(ImageButton button,
-                            Event       event, 
-                            int         type) {
-        super(button, event.when, event.id, event.x, event.y,
-                      event.key,  event.modifiers, event.arg);
-
-        Assert.notFalse(type == ARM    ||
-                        type == DISARM ||
-                        type == ACTIVATE);
-
-        eventType = type;
-        id = -1;
-    }
-    public boolean isArmed() {
-        return eventType == ARM;
-    }
-    public boolean isDisarmed() {
-        return eventType == DISARM;
-    }
-    public boolean isActivated() {
-        return eventType == ACTIVATE;
-    }
-    protected String paramString() {
-        String str = new String();
-
-        if(eventType == ImageButtonEvent.ARM)         
-            str = "ARM";
-        else if(eventType == ImageButtonEvent.DISARM) 
-            str = "DISARM";
-        else if(eventType == ImageButtonEvent.ACTIVATE) 
-            str = "ACTIVATE";
-
-        return super.paramString() + str;
-    }
-}
diff --git a/java/gjt/ImageButtonPanel.java b/java/gjt/ImageButtonPanel.java
deleted file mode 100644
index 0d033b7967b..00000000000
--- a/java/gjt/ImageButtonPanel.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * A panel which contains a collection of ImageButtons, 
- * arranged either horizontally or vertically.<p>
- *
- * Handling of mouse events is delegated to an image button 
- * panel controller.  By default, an image button panel is 
- * outfitted with an instance of RadioImageButtonPanelController
- * which implements mutually exclusive selection behavior.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     RadioImageButtonPanelController
- * @see     gjt.test.ToolbarTest
- */
-public class ImageButtonPanel extends Panel {
-    static private int _defaultGap = 5;
-
-    private Hashtable nameAndButtonPairs = new Hashtable();
-    private ImageButtonPanelController controller;
-
-    public ImageButtonPanel(Orientation orient) { 
-        this(orient, Orientation.CENTER, 
-                     Orientation.CENTER, _defaultGap); 
-    }
-    public ImageButtonPanel(Orientation orient, int gap) {
-        this(orient, Orientation.CENTER, 
-                     Orientation.CENTER, gap);
-    }
-    public ImageButtonPanel(Orientation orient, 
-                            Orientation horient, 
-                            Orientation vorient, int gap) {
-        Assert.notFalse(orient == Orientation.HORIZONTAL || 
-                        orient == Orientation.VERTICAL);
-
-        if(orient == Orientation.VERTICAL) 
-            setLayout(new ColumnLayout(horient, vorient, gap));
-        else                               
-            setLayout(new RowLayout(horient, vorient, gap));
-
-        setController(
-            new RadioImageButtonPanelController(this));
-    }
-    public void setController(ImageButtonPanelController c) {
-        this.controller = c;
-    }
-    public Insets insets() { return new Insets(10,10,10,10); }
-
-    public ImageButton add(Image image, String name) {
-        ImageButton button = new ImageButton(image);
-        add(button);
-        nameAndButtonPairs.put(name, button);
-        return button;
-    }   
-    public ImageButton add(Image image) { 
-        return add(image, "noname"); 
-    }
-    public void add(ImageButton button) { 
-        add(button, "noname");       
-    }
-    public void add(ImageButton button, String name) {
-        nameAndButtonPairs.put(name, button);
-        super.add(button);
-    }
-    public ImageButton getButtonByName(String name) {
-        return (ImageButton)nameAndButtonPairs.get(name);
-    }
-    public String getButtonName(ImageButton button) {
-        Enumeration e = nameAndButtonPairs.keys();
-        ImageButton nbutt;
-        String nstr;
-
-        while(e.hasMoreElements()) {
-            nstr = (String)e.nextElement();
-            nbutt = (ImageButton)nameAndButtonPairs.get(nstr);
-
-            if(nbutt.equals(button))
-              return nstr;
-        }
-        return null;
-    }
-    public void addSpacer(int sizeInPixels) {
-        Assert.notFalse(sizeInPixels > 0);
-        Canvas spacer = new Canvas();
-        spacer.resize(sizeInPixels, sizeInPixels);
-        add(spacer);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseDown(event,x,y) : false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseDrag(event,x,y) : false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseUp(event,x,y) : false;
-    }
-}
diff --git a/java/gjt/ImageButtonPanelController.java b/java/gjt/ImageButtonPanelController.java
deleted file mode 100644
index 74f900001b6..00000000000
--- a/java/gjt/ImageButtonPanelController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for an ImageButtonPanel, this abstract class 
- * does nothing more than establish the association between an 
- * ImageButton and its controller.<p>
- *
- * ImageButtonControllers must be constructed with an 
- * ImageButtonPanel; the ImageButtonPanels' controller gets set 
- * by the constructor.<p>
- *
- * The ImageButton passed into the constructor must not be null; 
- * this is enforced by an assertion.<p>
- *
- * Methods defined in the MouseController interface are left 
- * for subclasses to implement.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MouseController
- * @see     ImageButtonPanel
- * @see     gjt.test.Toolbar
- */
-abstract class ImageButtonPanelController implements 
-                                          MouseController {
-    private ImageButtonPanel panel;
-
-    ImageButtonPanelController(ImageButtonPanel panel) {
-        Assert.notNull(panel);
-        this.panel = panel;
-        panel.setController(this);
-    }
-    public ImageButtonPanel panel() {
-        return panel;
-    }
-    public boolean mouseEnter(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseExit (Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseMove (Event event, int x, int y) {
-        return false;
-    }
-}
diff --git a/java/gjt/ImageCanvas.java b/java/gjt/ImageCanvas.java
deleted file mode 100644
index 49e3bc72f3f..00000000000
--- a/java/gjt/ImageCanvas.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Canvas that displays an image.<p>
- *
- * update() is overridden to call paint() directly, thus 
- * bypassing the default implementation of update() which 
- * erases the background of the canvas before calling paint().
- * This eliminates nasty flashing.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Util
- */
-class ImageCanvas extends Canvas {
-    private Image image;
-
-    public ImageCanvas(Image image) {
-        this.image = image;
-        Util.waitForImage(this, image);
-        resize(image.getWidth(this), image.getHeight(this));
-    }
-    public void paint(Graphics g) {
-        g.drawImage(image, 0, 0, this);
-    }
-    public void update(Graphics g) {
-        paint(g);
-    }
-}
diff --git a/java/gjt/ImageScroller.java b/java/gjt/ImageScroller.java
deleted file mode 100644
index 79fdc86ea3c..00000000000
--- a/java/gjt/ImageScroller.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * An extension of Scroller that smoothly scrolls an Image.<p>
- *
- * An Image must be supplied at construction time.  The image 
- * may be reset any time after construction.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Scroller
- * @see     ImageCanvas
- * @see     gjt.test.ScrollerTest
- */
-public class ImageScroller extends Scroller {
-    private Image  image;
-    private ScrollerImageCanvas canvas;
-
-    public ImageScroller(Image image) {
-        viewport.setLayout(new BorderLayout());
-        setImage(image);
-    }
-    public void resetImage(Image image) {
-        viewport.remove(canvas);
-        setImage(image);
-        invalidate();
-        validate();
-    }
-    public void scrollTo(int x, int y) {
-        Graphics g = canvas.getGraphics();
-        if(g != null) {
-            g.translate(-x,-y);
-            g.drawImage(image, 0, 0, this);
-        }
-    }
-    public Dimension getScrollAreaSize() {
-        return new Dimension(image.getWidth(this), 
-                             image.getHeight(this));
-    }
-    private void setImage(Image image) {
-        this.image = image;
-        hbar.setValue(0);
-        vbar.setValue(0);
-        viewport.add("Center", 
-            canvas = new ScrollerImageCanvas(this, image));
-    }
-}
-
-class ScrollerImageCanvas extends ImageCanvas {
-    private ImageScroller scroller;
-
-    public ScrollerImageCanvas(ImageScroller scroller, 
-                               Image         image) {
-        super(image);
-        this.scroller = scroller;
-    }
-    public void paint(Graphics g) {
-        scroller.repaint(); 
-    }
-}
diff --git a/java/gjt/LabelCanvas.java b/java/gjt/LabelCanvas.java
deleted file mode 100644
index ba733249b76..00000000000
--- a/java/gjt/LabelCanvas.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A selectable label.  Clients can set the insets around the 
- * label via setInsets(Insets).
- *
- * LabelCanvases generate SelectionEvents when they are
- * selected or deselected.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     SelectionEvent
- * @see     gjt.test.LabelCanvasTest
- */
-public class LabelCanvas extends Canvas {
-    private String  label;
-    private boolean selected = false;
-    private Insets  insets   = new Insets(2,2,2,2);
-    private Point   labelLoc = new Point(0,0);
-
-    public LabelCanvas(String label) {
-        this.label = label;
-    }
-    public void paint(Graphics g) {
-        if(selected == true) paintSelected(g);
-        else                 
-            g.drawString(label, labelLoc.x, labelLoc.y);
-    }
-    public void setInsets(Insets insets) { 
-        this.insets = insets;   
-        repaint();
-    }
-    public String  getLabel  () { return label;                }
-    public boolean isSelected() { return selected;             }
-    public void    select    () { selected = true;  repaint(); }
-    public void    deselect  () { selected = false; repaint(); }
-
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h); 
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x, y, w, h);
-        labelLoc = labelLocation(getGraphics());
-    }
-    public Dimension minimumSize() { 
-        return preferredSize(); 
-    }
-    public Dimension preferredSize() {
-        FontMetrics fm = getFontMetrics(getFont());
-            return new Dimension(
-                     insets.left + fm.stringWidth(label) + 
-                     insets.right, 
-                     insets.top  + fm.getHeight() + 
-                     insets.bottom);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(selected) deselect();
-        else         select  ();
-
-        int eventType = isSelected() ? 
-                        SelectionEvent.SELECT : 
-                        SelectionEvent.DESELECT;
-
-        Event newEvent = new SelectionEvent(this, 
-                                            event, 
-                                            eventType);
-        deliverEvent(newEvent);
-
-        return true;
-    }
-    protected void paintSelected(Graphics g) {
-        Point labelLoc = labelLocation(g);
-
-        g.setColor(getForeground());
-        g.fillRect(0,0,size().width,size().height);
-        g.setColor(getBackground());
-        g.drawString(label, labelLoc.x, labelLoc.y);
-    }
-    protected String paramString() {
-        return super.paramString() + ",text=" + label;
-    }
-    private Point labelLocation(Graphics g) {
-        Dimension   size = size();
-        FontMetrics fm   = g.getFontMetrics();
-
-        int x = (size.width/2) - (fm.stringWidth(label)/2);
-        int y = (size.height/2) + (fm.getAscent()/2) - 
-                                   fm.getLeading();
-        return new Point(x,y);
-    }
-}
diff --git a/java/gjt/Makefile b/java/gjt/Makefile
deleted file mode 100644
index ef6e80748a7..00000000000
--- a/java/gjt/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ..
-CLASSDIR = $(JACE_WRAPPER)/classes
-DOCDIR = $(JACE_WRAPPER)/doc
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-
-clean:
-	rm -rf *~
-
-realclean: clean  
-	rm -rf $(JACE_WRAPPER)/classes/gjt
-
-files =	Assert.java \
-	Border.java \
-	BulletinLayout.java \
-	CardPanel.java \
-	ChoiceCardPanel.java \
-	ColumnLayout.java \
-	ComponentScroller.java \
-	DialogClient.java \
-	DrawingPanel.java \
-	DrawnRectangle.java \
-	EtchedBorder.java \
-	EtchedRectangle.java \
-	Etching.java \
-	ExclusiveImageButtonPanel.java \
-	FontDialog.java \
-	GJTDialog.java \
-	IconCardPanel.java \
-	ImageButton.java \
-	ImageButtonController.java \
-	ImageButtonEvent.java \
-	ImageButtonPanel.java \
-	ImageButtonPanelController.java \
-	ImageCanvas.java \
-	ImageScroller.java \
-	LabelCanvas.java \
-	MessageDialog.java \
-	MouseController.java \
-	Orientation.java \
-	ProgressDialog.java \
-	QuestionDialog.java \
-	RadioImageButtonPanelController.java \
-	RowLayout.java \
-	Scroller.java \
-	ScrollerLayout.java \
-	SelectionEvent.java \
-	Separator.java \
-	SpringyImageButtonController.java \
-	StateButton.java \
-	StateButtonController.java \
-	StickyImageButtonController.java \
-	Stopwatch.java \
-	StopwatchClient.java \
-	ThreeDBorder.java \
-	ThreeDBorderStyle.java \
-	ThreeDRectangle.java \
-	Toolbar.java \
-	Util.java \
-	YesNoDialog.java
diff --git a/java/gjt/MessageDialog.java b/java/gjt/MessageDialog.java
deleted file mode 100644
index 4b00bc7033f..00000000000
--- a/java/gjt/MessageDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that displays a message and comes equipped with an 
- * Ok button with which the dialog is dismissed.<p>
- *
- * Note that there is only one MessageDialog, that gets
- * reused.  Clients must call getMessageDialog() in order to
- * access the one and only MessageDialog.<p>
- *
- * <em>Note:  The 1.0.2 version of the AWT seems to have
- * introduced a bug that causes pack() to work incorrectly
- * under Win95.</em>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     gjt.test.MessageDialogTest
- * @see     gjt.test.DialogTest
- */
-public class MessageDialog extends GJTDialog {
-    static private MessageDialog _theMessageDialog;
-
-    private Button      okButton;
-    private String      message;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    static public MessageDialog getMessageDialog(Frame frame,
-                                  DialogClient client,
-                                  String       title,
-                                  String       message) {
-        if(_theMessageDialog == null) 
-            _theMessageDialog = new MessageDialog(frame,
-                                                  client,
-                                                  title,
-                                                  message);
-        else {
-            _theMessageDialog.setClient (client);
-            _theMessageDialog.setTitle  (title);
-            _theMessageDialog.setMessage(message);
-        }
-        return _theMessageDialog;
-    }
-    private MessageDialog(Frame  frame, DialogClient client, 
-                          String title, String       message) {
-        super(frame, title, client, true);
-        okButton = buttonPanel.add("Ok");
-
-        setLayout(new BorderLayout());
-        add("Center", new MessagePanel(message));
-        add("South", buttonPanel);
-        pack();
-    }
-    public void show() {
-        okButton.requestFocus();
-        super.show();
-    }
-    public boolean action(Event event, Object what) {
-        hide();
-        client.dialogDismissed(this);
-        return true;
-    }
-    private void setMessage(String message) {
-        this.message = message;
-    }
-}
-
-class MessagePanel extends Panel {
-    public MessagePanel(String message) {
-        add("Center", new Label(message, Label.CENTER));
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/MouseController.java b/java/gjt/MouseController.java
deleted file mode 100644
index f044adee5ba..00000000000
--- a/java/gjt/MouseController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An interface for handling mouse events.<p>
- *
- * Components delegate handling of mouse events to a 
- * MouseController derivation.<p>
- *
- * For instance:<p>
- *<pre> 
- *      mouseDown(Event event, int x, int y) {
- *          return controller.mouseDown(event,x,y);
- *      }
- *</pre>
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- */
-public interface MouseController {
-    public boolean mouseEnter(Event event, int x, int y);
-    public boolean mouseExit (Event event, int x, int y);
-
-    public boolean mouseMove (Event event, int x, int y);
-    public boolean mouseDown (Event event, int x, int y);
-    public boolean mouseUp   (Event event, int x, int y);
-    public boolean mouseDrag (Event event, int x, int y);
-}
diff --git a/java/gjt/Orientation.java b/java/gjt/Orientation.java
deleted file mode 100644
index f83b27451da..00000000000
--- a/java/gjt/Orientation.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt;
-
-/**
- * Constants for orientations (and alignments).<p>
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class Orientation {
-    public static final Orientation BAD    = new Orientation();
-    public static final Orientation NORTH  = new Orientation();
-    public static final Orientation SOUTH  = new Orientation();
-    public static final Orientation EAST   = new Orientation();
-    public static final Orientation WEST   = new Orientation();
-    public static final Orientation CENTER = new Orientation();
-    public static final Orientation TOP    = new Orientation();
-    public static final Orientation LEFT   = new Orientation();
-    public static final Orientation RIGHT  = new Orientation();
-    public static final Orientation BOTTOM = new Orientation();
-
-    public static final Orientation HORIZONTAL = 
-        new Orientation();
-    public static final Orientation VERTICAL   = 
-        new Orientation();
-
-    static public Orientation fromString(String s) {
-        Orientation o = BAD;
-
-        if(s.equals("NORTH") || s.equals("north"))    o = NORTH;
-        else if(s.equals("SOUTH") || s.equals("south"))    
-            o = SOUTH;
-        else if(s.equals("EAST")  || s.equals("east"))     
-            o = EAST;
-        else if(s.equals("WEST")  || s.equals("west"))     
-            o = WEST;
-        else if(s.equals("CENTER") || s.equals("center"))   
-            o = CENTER;
-        else if(s.equals("TOP")   || s.equals("top"))      
-            o = TOP;
-        else if(s.equals("LEFT")  || s.equals("left"))     
-            o = LEFT;
-        else if(s.equals("RIGHT")  || s.equals("right"))    
-            o = RIGHT;
-        else if(s.equals("BOTTOM") || s.equals("bottom"))   
-            o = BOTTOM;
-        else if(s.equals("VERTICAL") || s.equals("vertical")) 
-            o = VERTICAL;
-        else if(s.equals("HORIZONTAL") || 
-                s.equals("horizontal"))
-          o = HORIZONTAL;
-
-        return o;
-    }
-    public String toString() {
-        String s = new String();
-
-        if(this == Orientation.NORTH) 
-            s = getClass().getName() + "=NORTH";
-        else if(this == Orientation.SOUTH)
-            s = getClass().getName() + "=SOUTH";
-        else if(this == Orientation.EAST)
-            s = getClass().getName() + "=EAST";
-        else if(this == Orientation.WEST)
-            s = getClass().getName() + "=WEST";
-        else if(this == Orientation.CENTER)
-            s = getClass().getName() + "=CENTER";
-        else if(this == Orientation.TOP)
-            s = getClass().getName() + "=TOP";
-        else if(this == Orientation.LEFT)
-            s = getClass().getName() + "=LEFT";
-        else if(this == Orientation.RIGHT)
-            s = getClass().getName() + "=RIGHT";
-        else if(this == Orientation.BOTTOM)
-            s = getClass().getName() + "=BOTTOM";
-        else if(this == Orientation.HORIZONTAL)
-            s = getClass().getName() + "=HORIZONTAL";
-        else if(this == Orientation.VERTICAL)
-            s = getClass().getName() + "=VERTICAL";
-        else if(this == Orientation.BAD)
-            s = getClass().getName() + "=BAD";
-
-        return s;
-    }
-    private Orientation() { }  // Defeat instantiation
-}
diff --git a/java/gjt/ProgressDialog.java b/java/gjt/ProgressDialog.java
deleted file mode 100644
index de7d4be1674..00000000000
--- a/java/gjt/ProgressDialog.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that uses a bargauge to indicate progress made on a
- * task that presumably takes some time to complete.
- *
- * ProgressDialog implements the singleton pattern:  clients
- * may only access the one and only ProgressDialog through the
- * static getProgressDialog() method.<p>
- *
- * <em>Note:  The 1.0.2 version of the AWT has introduced a
- * bug that breaks the ProgressDialog under Motif - the 
- * bargauge does not function.  This worked fine in 1.0.1.<em>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     Bargauge
- * @see     gjt.test.DialogTest
- */
-public class ProgressDialog extends GJTDialog {
-    static private ProgressDialog _theProgressDialog;
-    static private int     _preferredWidth  = 400;
-    static private int     _preferredHeight = 75;
-    static private Color   _color;
-    static private boolean _dialogUp;
-
-    private Bargauge bargauge;
-
-    static public ProgressDialog getProgressDialog(
-                                   Frame  frame,
-                                   String title,
-                                   Color  color){
-        if(_theProgressDialog == null) 
-            _theProgressDialog = new ProgressDialog(frame, 
-                                                    title, 
-                                                    color);
-        else {
-            _theProgressDialog.setTitle (title);
-            _theProgressDialog.reset    ();
-        }
-        return _theProgressDialog;
-    }
-    private ProgressDialog(Frame frame, 
-                           String title, 
-                           Color color) {
-        super(frame, title, null, true);
-        setLayout(new BorderLayout());
-        add("Center", bargauge = new Bargauge(color));
-        pack();
-    }
-    public void setPercentComplete(double percent) {
-        bargauge.setFillPercent(percent);
-        bargauge.fill();
-
-        if(percent == 100)
-            hide();
-    }
-    public void reset() {
-        bargauge.setFillPercent(0);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(_preferredWidth, _preferredHeight);
-    }
-}
diff --git a/java/gjt/QuestionDialog.java b/java/gjt/QuestionDialog.java
deleted file mode 100644
index 042b491e178..00000000000
--- a/java/gjt/QuestionDialog.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that presents a prompt and a TextField into which 
- * a reply may be entered.  Comes complete with an Ok button 
- * and a Cancel button, whose uses will be left to the 
- * imagination.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     gjt.test.DialogTest
- */
-public class QuestionDialog extends GJTDialog {
-    static private int  _defaultTextFieldSize = 20;
-    private Button      okButton;
-    private Button      cancelButton;
-    private String      question;
-    private TextField   textField;
-    private boolean     wasCancelled;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question,
-                          String initialResponse) {
-        this(frame, client, title, question, initialResponse, 
-             _defaultTextFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question) {
-        this(frame, client, title,
-             question, null, _defaultTextFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question, 
-                          int    textFieldSize) {
-        this(frame, client, title, 
-             question, null, textFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client, 
-                          String title, String       question,
-                          String initialResponse, 
-                          int textFieldSize) {
-        super(frame, title, client, true);
-
-        QuestionPanel questionPanel;
-
-        okButton     = buttonPanel.add("Ok");
-        cancelButton = buttonPanel.add("Cancel");
-
-        setLayout(new BorderLayout());
-        add("North", questionPanel = 
-            new QuestionPanel(this, question, 
-                              initialResponse, textFieldSize));
-        add("South", buttonPanel);
-        textField = questionPanel.getTextField();
-        pack();
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == cancelButton) wasCancelled = true;
-        else                             wasCancelled = false;
-
-        hide();
-        dispose();
-        client.dialogDismissed(this);
-        return true;
-    }
-    public void show() {
-        textField.requestFocus();
-        super.show();
-    }
-    public void returnInTextField() {
-        okButton.requestFocus();
-    }
-    public TextField getTextField() {
-        return textField;
-    }
-    public String getAnswer() {
-        return textField.getText();
-    }
-    public boolean wasCancelled() {
-        return wasCancelled;
-    }
-    private void setQuestion(String question) {
-        this.question = question;
-    }
-}
-
-class QuestionPanel extends Panel {
-    private TextField      field;
-    private QuestionDialog dialog;
-
-    public QuestionPanel(QuestionDialog dialog, 
-                         String question) {
-        this(dialog, question, null, 0);
-    }
-    public QuestionPanel(QuestionDialog dialog, String question,
-                         int columns) {
-        this(dialog, question, null, columns);
-    }
-    public QuestionPanel(QuestionDialog dialog, String question,
-                         String initialResponse, int cols) {
-        this.dialog = dialog;
-        setLayout(new RowLayout());
-        add(new Label(question));
-
-        if(initialResponse != null) {
-            if(cols != 0) 
-                add(field=new TextField(initialResponse, cols));
-            else          
-                add(field=new TextField(initialResponse));
-        }
-        else {
-            if(cols != 0) add(field = new TextField(cols));
-            else          add(field = new TextField());
-        }
-    }
-    public TextField getTextField() {
-        return field;
-    }
-    public boolean action(Event event, Object what) {
-        dialog.returnInTextField();
-        return false;
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/RadioImageButtonPanelController.java b/java/gjt/RadioImageButtonPanelController.java
deleted file mode 100644
index 8dc34d25bff..00000000000
--- a/java/gjt/RadioImageButtonPanelController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for an ImageButtonPanel that ensures that only 
- * one ImageButton in its associated ImageButtonPanel is 
- * selected at a time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButtonPanelController
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-class RadioImageButtonPanelController 
-                 extends ImageButtonPanelController {
-    ImageButton down;
-
-    public RadioImageButtonPanelController(
-                ImageButtonPanel panel) {
-        super(panel);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        ImageButton button;
-
-        if(event.target instanceof ImageButton) {
-            button = (ImageButton)event.target;
-            if(down == button) return false;
-
-            if(down != null)
-                down.paintRaised();
-
-            down = button;
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        return false;
-    }
-}
diff --git a/java/gjt/RowLayout.java b/java/gjt/RowLayout.java
deleted file mode 100644
index eecd074c34f..00000000000
--- a/java/gjt/RowLayout.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * RowLayout lays out components in a row.  At construction 
- * time, both horizontal orientation and vertical orientation 
- * may be specified, along with the gap to use between 
- * components.<p>
- *
- * Horizontal orientation must be one of the following:
- * <dl>
- * <dd> LEFT 
- * <dd> CENTER  
- * <dd> RIGHT
- * </dl>
- *
- * Vertical orientation must be one of the following:
- * <dl>
- * <dd> TOP
- * <dd> CENTER  
- * <dd> BOTTOM
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ColumnLayout
- * @see     Orientation
- */
-public class RowLayout implements LayoutManager {
-    static private int _defaultGap = 5;
-
-    private int gap;
-    private Orientation verticalOrientation;
-    private Orientation horizontalOrientation;
-
-    public RowLayout() {
-        this(Orientation.CENTER, 
-             Orientation.CENTER, _defaultGap);
-    }
-    public RowLayout(int gap) {
-        this(Orientation.CENTER, Orientation.CENTER, gap);
-    }
-    public RowLayout(Orientation horizontalOrient, 
-                     Orientation verticalOrient) {
-        this(horizontalOrient, verticalOrient, _defaultGap);
-    }
-    public RowLayout(Orientation horizontalOrient, 
-                     Orientation verticalOrient, int gap) {
-        Assert.notFalse(gap >= 0);
-        Assert.notFalse(
-            horizontalOrient == Orientation.LEFT   ||
-            horizontalOrient == Orientation.CENTER ||
-            horizontalOrient == Orientation.RIGHT);
-        Assert.notFalse(
-            verticalOrient   == Orientation.TOP    ||
-            verticalOrient   == Orientation.CENTER ||
-            verticalOrient   == Orientation.BOTTOM);
-
-        this.gap                   = gap;
-        this.verticalOrientation   = verticalOrient;
-        this.horizontalOrientation = horizontalOrient;
-    }
-
-    public void addLayoutComponent(String name, Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) {
-    }
-
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-
-                dim.width  += d.width;
-                dim.height  = Math.max(d.height, dim.height);
-
-                if(i > 0) dim.width += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-
-                dim.width  += d.width;
-                dim.height  = Math.max(d.height, dim.height);
-
-                if(i > 0) dim.width += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets      = target.insets();
-        int       ncomponents = target.countComponents();
-        int       top         = 0;
-        int       left        = insets.left;
-        Dimension tps         = target.preferredSize();
-        Dimension targetSize  = target.size();
-        Component comp;
-        Dimension ps;
-
-        if(horizontalOrientation == Orientation.CENTER)
-            left = left + (targetSize.width/2) - (tps.width/2);
-        if(horizontalOrientation == Orientation.RIGHT)
-            left = left + targetSize.width - tps.width;
-        
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                ps  = comp.preferredSize();
-
-                if(verticalOrientation == Orientation.CENTER)
-                    top = (targetSize.height/2) - (ps.height/2);
-                else if(verticalOrientation == Orientation.TOP)
-                    top = insets.top;
-                else if(
-                    verticalOrientation == Orientation.BOTTOM)
-                    top = targetSize.height - 
-                          ps.height - insets.bottom;
-
-                comp.reshape(left,top,ps.width,ps.height);
-                left += ps.width + gap;
-            }
-        }
-    }
-}
diff --git a/java/gjt/Scroller.java b/java/gjt/Scroller.java
deleted file mode 100644
index 61d6e5f55e5..00000000000
--- a/java/gjt/Scroller.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Each Scroller contains a Panel (viewport) and two Scrollbars 
- * (horizontal and vertical).  Works in conjunction with a 
- * ScrollerLayout, that lays out the viewport and two 
- * scrollbars.<p>
- * 
- * Subclasses must override:<p>
- * <dl>
- * <dd> abstract public void      scrollTo(int x, int y)
- * <dd> abstract public Dimension getScrollAreaSize()
- * </dl>
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ComponentScroller
- * @see     ImageScroller
- * @see     ScrollerLayout
- * @see     gjt.test.ComponentScrollerTest
- * @see     gjt.test.ImageScrollerTest
- */
-public abstract class Scroller extends Panel {
-    protected Panel     viewport;
-    protected Scrollbar hbar, vbar;
-
-    abstract public void      scrollTo(int x, int y);
-    abstract public Dimension getScrollAreaSize();
-
-    public Scroller() {
-        setLayout(new ScrollerLayout(this));
-        add("Scroll", viewport = new Panel());
-        add("East", vbar = new Scrollbar(Scrollbar.VERTICAL));
-        add("South",hbar = new Scrollbar(Scrollbar.HORIZONTAL));
-    }
-    public Scrollbar getHorizontalScrollbar() {return hbar;    }
-    public Scrollbar getVerticalScrollbar  () {return vbar;    }
-    public Panel     getViewport           () {return viewport;}
-
-    public boolean handleEvent(Event event) {
-        boolean handledEvent;
-
-        switch(event.id) {
-            case Event.SCROLL_LINE_UP:   scrollLineUp(event); 
-            break;
-            case Event.SCROLL_LINE_DOWN: scrollLineDown(event); 
-            break;
-            case Event.SCROLL_PAGE_UP:   scrollPageUp  (event); 
-            break;
-            case Event.SCROLL_PAGE_DOWN: scrollPageDown(event); 
-            break;
-            case Event.SCROLL_ABSOLUTE:  scrollAbsolute(event); 
-            break;
-        }
-        handledEvent = event.id == Event.SCROLL_LINE_UP   ||
-                       event.id == Event.SCROLL_LINE_DOWN ||
-                       event.id == Event.SCROLL_PAGE_UP   ||
-                       event.id == Event.SCROLL_PAGE_DOWN ||
-                       event.id == Event.SCROLL_ABSOLUTE;
-
-        if(handledEvent) return true;
-        else             return super.handleEvent(event);
-    }
-    public void paint (Graphics g) { scroll(); }
-    public void update(Graphics g) { paint(g); }
-
-    public void manageScrollbars() { 
-        manageHorizontalScrollbar();
-        manageVerticalScrollbar  ();
-    }
-    protected void manageHorizontalScrollbar() {
-        Dimension size           = size();
-        Dimension scrollAreaSize = getScrollAreaSize();
-
-        if(vbar.isVisible())
-            size.width -= vbar.size().width;
-
-        if(scrollAreaSize.width > size.width) {
-            if( ! hbar.isVisible())
-                hbar.show();
-        }
-        else if(hbar.isVisible()) {
-            hbar.hide();
-            hbar.setValue(0);
-            repaint();
-        }
-    }
-    protected void manageVerticalScrollbar() {
-        Dimension size           = size();
-        Dimension scrollAreaSize = getScrollAreaSize();
-
-        if(hbar.isVisible())
-            size.height -= hbar.size().height;
-
-        if(scrollAreaSize.height > size.height) {
-            if( ! vbar.isVisible())
-                vbar.show();
-        }
-        else if(vbar.isVisible()) {
-            vbar.hide();
-            vbar.setValue(0);
-            repaint();
-        }
-    }
-    public void setScrollbarValues() {
-        if(hbar.isVisible()) setHorizontalScrollbarValues();
-        if(vbar.isVisible()) setVerticalScrollbarValues();
-    }
-    protected void setHorizontalScrollbarValues() {
-        Dimension vsize          = viewport.size();
-        Dimension scrollAreaSize = getScrollAreaSize(); 
-        int max = scrollAreaSize.width - vsize.width;
-
-        hbar.setValues(hbar.getValue(), // value
-                       vsize.width,     // amt visible/page
-                       0,               // minimum
-                       max);            // maximum
-
-        setHorizontalLineAndPageIncrements();
-    }
-    protected void setVerticalScrollbarValues() {
-        Dimension vsize          = viewport.size();
-        Dimension scrollAreaSize = getScrollAreaSize(); 
-        int max = scrollAreaSize.height - vsize.height;
-
-        vbar.setValues(vbar.getValue(), // value
-                       vsize.height,    // amt visible/page
-                       0,               // minimum
-                       max);            // maximum
-
-        setVerticalLineAndPageIncrements();
-    }
-    protected void scrollLineUp  (Event event) { scroll(); }
-    protected void scrollLineDown(Event event) { scroll(); }
-    protected void scrollPageUp  (Event event) { scroll(); }
-    protected void scrollPageDown(Event event) { scroll(); }
-    protected void scrollAbsolute(Event event) { scroll(); }
-
-    protected void setHorizontalLineAndPageIncrements() {
-        Dimension size = getScrollAreaSize();
-        hbar.setLineIncrement(size.width/10);
-        hbar.setPageIncrement(size.width/5);
-    }
-    protected void setVerticalLineAndPageIncrements() {
-        Dimension size = getScrollAreaSize();
-        vbar.setLineIncrement(size.height/10);
-        vbar.setPageIncrement(size.height/5);
-    }
-    protected void scroll() {
-        scrollTo(hbar.getValue(), vbar.getValue());
-    }
-}
diff --git a/java/gjt/ScrollerLayout.java b/java/gjt/ScrollerLayout.java
deleted file mode 100644
index 21012fd5688..00000000000
--- a/java/gjt/ScrollerLayout.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Layout manager for a Scroller.<p>
- *
- * Lays out 3 Components:  a horizontal scrollbar, a vertical 
- * scrollbar and a viewport (Panel).<p>
- *
- * Valid names/Component pairs that can be added via 
- * addLayoutComponent(String, Component):<p>
- * <dl>
- * <dd> "East"   Scrollbar (vertical)
- * <dd> "West"   Scrollbar (vertical)
- * <dd> "North"  Scrollbar (horizontal)
- * <dd> "South"  Scrollbar (horizontal)
- * <dd> "Scroll" Panel (viewport)
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Scroller
- */
-public class ScrollerLayout implements LayoutManager {
-    private Scroller  scroller;
-    private Scrollbar hbar, vbar;
-    private String    hbarPosition, vbarPosition;
-    private Component viewport;
-    private int       top, bottom, right, left;
-
-    public ScrollerLayout(Scroller scroller) {
-        this.scroller = scroller;
-    }
-
-    public void addLayoutComponent(String name, 
-                                   Component comp) {
-        Assert.notFalse(comp != null);
-
-        if(comp instanceof Scrollbar) {
-            Scrollbar sbar = (Scrollbar)comp;
-
-            if(sbar.getOrientation() == Scrollbar.VERTICAL) {
-                Assert.notFalse("East".equals(name) == true ||
-                                "West".equals(name) == true);
-                vbar         = sbar;
-                vbarPosition = name;
-            }
-            else {
-                Assert.notFalse("North".equals(name) == true ||
-                                "South".equals(name) == true);
-                hbar         = sbar;
-                hbarPosition = name;
-            }
-        }
-        else {
-            Assert.notFalse("Scroll".equals(name) == true);
-            viewport = comp;
-        }
-    }
-    public void removeLayoutComponent(Component comp) {
-        if(comp == vbar)     vbar     = null;
-        if(comp == hbar)     hbar     = null;
-        if(comp == viewport) viewport = null;
-    }
-    public Dimension preferredLayoutSize(Container parent) {
-        Dimension dim = new Dimension(0,0);
-
-        if(vbar != null && vbar.isVisible()) {
-            Dimension d = vbar.preferredSize();
-            dim.width += d.width;
-            dim.height = d.height;
-        }
-        if(hbar != null && hbar.isVisible()) {
-            Dimension d = hbar.preferredSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        if(viewport != null && viewport.isVisible()) {
-            Dimension d = viewport.preferredSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container parent) {
-        Dimension dim = new Dimension(0,0);
-
-        if(vbar != null && vbar.isVisible()) {
-            Dimension d = vbar.minimumSize();
-            dim.width += d.width;
-            dim.height = d.height;
-        }
-        if(hbar != null && hbar.isVisible()) {
-            Dimension d = hbar.minimumSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        if(viewport != null && viewport.isVisible()) {
-            Dimension d = viewport.minimumSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets insets        = target.insets();
-        Dimension targetSize = target.size();
-
-        top    = insets.top;
-        bottom = targetSize.height - insets.bottom;
-        left   = insets.left;
-        right  = targetSize.width - insets.right;
-
-        scroller.manageScrollbars();
-
-        reshapeHorizontalScrollbar();
-        reshapeVerticalScrollbar  ();
-        reshapeViewport           ();
-
-        scroller.setScrollbarValues();
-    }
-    private void reshapeHorizontalScrollbar() {
-        if(hbar != null && hbar.isVisible()) {
-            if("North".equals(hbarPosition)) {
-                Dimension d = hbar.preferredSize();
-                hbar.reshape(left, top, right - left, d.height);
-                top += d.height;
-            }
-            else {  // South
-                Dimension d = hbar.preferredSize();
-                hbar.reshape(left, bottom - d.height,
-                            right - left,d.height);
-                bottom -= d.height;
-            }
-        }
-    }
-    private void reshapeVerticalScrollbar() {
-        if(hbar != null && vbar.isVisible()) {
-            if("East".equals(vbarPosition)) {
-                Dimension d = vbar.preferredSize();
-                vbar.reshape(right - d.width, top, 
-                             d.width, bottom - top);
-                right -= d.width;
-            }
-            else { // West
-                Dimension d = vbar.preferredSize();
-                vbar.reshape(left, top, 
-                             d.width, bottom - top);
-                left += d.width;
-            }
-        }
-    }
-    private void reshapeViewport() {
-        if(viewport != null && viewport.isVisible()) {
-            viewport.reshape(left, top, 
-                             right - left, bottom - top);
-        }
-    }
-}
diff --git a/java/gjt/SelectionEvent.java b/java/gjt/SelectionEvent.java
deleted file mode 100644
index 4bcab59cd0a..00000000000
--- a/java/gjt/SelectionEvent.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An extension of java.awt.Event, specifically designed for
- * selection events.<p>
- *
- * SelectionEvents are constructed with arguments:<p>
- * <dl>
- * <dd> The AWT event that triggered the image button event
- * <dd> The id of the event.
- * </dl>
- *
- * An SelectionEvent's id (the constructor's 3rd argument),
- * must be one of the following:<p>
- * <dl>
- * <dd> SelectionEvent.SELECT
- * <dd> SelectionEvent.DESELECT
- * </dl>
- *
- * SelectionEvent has only a constructor and a paramString() 
- * method.  Containers that contain objects which are capable
- * of generating SelectionEvents should check the events
- * like so:
- * 
- * <pre>
- *      // handleEvent(Event) method of a container that
- *      // contain objects that generate SelectionEvents
- *
- *      public boolean handleEvent(Event event) {
- *              if(event instanceof SelectionEvent) {
- *                  SelectionEvent sevent = 
- *                  (SelectionEvent)event;
- *
- *                  if(sevent.isSelected()) {
- *                      // do something for selection
- *                  }
- *                  else {
- *                      // do something for deselection
- *                  }
- *              }
- *      }
- * </pre>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     LabelCanvas
- * @see     ImageButtonEvent
- * @see     gjt.test.LabelCanvasTest
- */
-public class SelectionEvent extends Event {
-    public static final int SELECT   = 1;
-    public static final int DESELECT = 2;
-
-    private int eventType;
-
-    public SelectionEvent(Object target,
-                          Event  event, 
-                          int    type) {
-        super(target, event.when, event.id, event.x, event.y,
-                      event.key,  event.modifiers, event.arg);
-
-        Assert.notFalse(type == SELECT || type == DESELECT);
-
-        eventType = type;
-        id = -1;
-    }
-    public boolean isSelected() {
-        return eventType == SELECT;
-    }
-    protected String paramString() {
-        String typeString = new String();
-
-        if(eventType == SelectionEvent.SELECT)    
-            typeString = "SELECT";
-        else if(eventType == SelectionEvent.DESELECT) 
-            typeString = "DESELECT";
-
-        return super.paramString() + typeString;
-    }
-}
diff --git a/java/gjt/Separator.java b/java/gjt/Separator.java
deleted file mode 100644
index 6bd610e1ad9..00000000000
--- a/java/gjt/Separator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A separator that is drawn either vertically or horizontally 
- * depending upon how it is laid out.  Can be drawn either 
- * etched-in or etched-out, with varying thicknesses.  Both 
- * thickness and etching are settable at construction time 
- * only.<p>
- *
- * Default thickness is 2 pixels and default etching is 
- * Etching.IN.  Note that thicknesses greater than 4 loose the 
- * etching effect.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Etching
- * @see     gjt.test.SeparatorTest
- */
-public class Separator extends Canvas {
-    static private Etching _defaultEtching   = Etching.IN;
-    static private int     _defaultThickness = 2;
-
-    private Etching etching;
-    private int     thickness;
-
-    public Separator() {
-        this(_defaultThickness, _defaultEtching);
-    }
-    public Separator(int thickness) {
-        this(thickness, _defaultEtching);
-    }
-    public Separator(Etching etching) {
-        this(_defaultThickness, etching);
-    }
-    public Separator(int thickness, Etching etching) {
-        this.etching   = etching;
-        this.thickness = thickness;
-        resize(thickness, thickness);
-    }
-    public Dimension minimumSize() {
-        return preferredSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(thickness, thickness);
-    }
-    public void paint(Graphics g) {
-        Dimension size     = size();
-        Color brighter = getBackground().brighter().brighter();
-        Color darker   = getBackground().darker().darker();
-
-        if(etching == Etching.IN) {
-            if(size.width > size.height)
-                paintHorizontal(g, size, darker, brighter);
-            else
-                paintVertical(g, size, darker, brighter);
-        }
-        else {
-            if(size.width > size.height)
-                paintHorizontal(g, size, brighter, darker);
-            else
-                paintVertical(g, size, brighter, darker);
-        }
-    }
-    public String paramString() {
-        Dimension   size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        return super.paramString() + "thickness=" + 
-               thickness + "," + etching + "," + orient;
-    }
-    private void paintHorizontal(Graphics g, Dimension size, 
-                                 Color top, Color bottom) {
-        g.setColor(top);
-        g.fillRect(0, (size.height/2) - (thickness/2), 
-                       size.width, thickness/2);
-        g.setColor(bottom);
-        g.fillRect(0, size.height/2, size.width, thickness/2); 
-    }
-    private void paintVertical(Graphics g, Dimension size, 
-                               Color left, Color right) {
-        g.setColor(left);
-        g.fillRect((size.width/2) - (thickness/2), 
-                    0, thickness/2, size.height);
-        g.setColor(right);
-        g.fillRect(size.width/2, 0, thickness/2, size.height);
-    }
-}
diff --git a/java/gjt/SpringyImageButtonController.java b/java/gjt/SpringyImageButtonController.java
deleted file mode 100644
index 3559e040459..00000000000
--- a/java/gjt/SpringyImageButtonController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-import java.awt.Graphics;
-
-/**
- * An ImageButtonController that reacts to mouseDown/mouseUp 
- * events exactly as a java.awt.Button does.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     StickyImageButtonController
- */
-public class SpringyImageButtonController 
-                extends ImageButtonController {
-    public SpringyImageButtonController(ImageButton ib) {
-        super(ib);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(event.modifiers == 0) {
-            getButton().paintInset();
-            armButton(event);
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(event.modifiers == 0) { 
-            if(getButton().isRaised() == false) {
-                getButton().paintRaised();
-                activateButton(event);
-            }
-        }
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        if(event.modifiers == 0) { 
-            if(getButton().isInside(x,y)) {
-                if(getButton().isRaised()) {
-                    getButton().paintInset();
-                    armButton(event);
-                }
-            }
-            else {
-                if(getButton().isRaised() == false) {
-                    getButton().paintRaised();
-                    disarmButton(event);
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/java/gjt/StateButton.java b/java/gjt/StateButton.java
deleted file mode 100644
index 6de20a76f98..00000000000
--- a/java/gjt/StateButton.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt;
-
-import java.awt.Image;
-
-/**
- * An ImageButton that cycles through a series of images.  The 
- * image advances to the next image in the series every time 
- * the button is activated.<p>
- *
- * Note that the cycling is actually performed by the buttons' 
- * controller - a StateButtonController.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     StateButtonController
- * @see     gjt.test.StateButtonTest
- */
-public class StateButton extends ImageButton {
-    private Image[] images;
-    private int     state = 0;
-    private int     numStates;
-
-    public StateButton(Image[] images) {
-        super(images[0]);
-
-        this.images = images;
-        numStates   = images.length;
-        setController(new StateButtonController(this));
-        waitForImages();
-    }
-    public Image nextImage() {
-        if(state + 1 < numStates) state++;
-        else                      state = 0;
-
-        return images[state];
-    }
-    public int state() {
-        return state;
-    }
-    private void waitForImages() {
-        for(int i=0; i < images.length; ++i)
-            Util.waitForImage(this, images[i]);
-    }
-}
diff --git a/java/gjt/StateButtonController.java b/java/gjt/StateButtonController.java
deleted file mode 100644
index d6fc83830a6..00000000000
--- a/java/gjt/StateButtonController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for a StateButton, that cycles through a 
- * series of images which reside in the StateButton class.  
- * Each time a mouse up is detected in the StateButton, the 
- * buttons image is set to the next image in the array.
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     StateButton
- * @see     SpringyImageButtonController
- * @see     gjt.test.StateButtonTest
- */
-class StateButtonController extends SpringyImageButtonController {
-    public StateButtonController(StateButton button) {
-        super(button);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        StateButton button = (StateButton)getButton();
-        button.setImage(button.nextImage());
-        activateButton(event);
-        return super.mouseUp(event, x, y);
-    }
-}
diff --git a/java/gjt/StickyImageButtonController.java b/java/gjt/StickyImageButtonController.java
deleted file mode 100644
index c459e5cdae1..00000000000
--- a/java/gjt/StickyImageButtonController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-import java.awt.Graphics;
-
-/**
- * An ImageButtonController that causes its associated 
- * ImageButton to "stick" when activated.  If the ImageButton 
- * is raised it depresses<b>[1]</b> upon a mouse down and stays 
- * down upon a subsequent mouse up event.  The same "sticky" 
- * behaviour occurs when a depressed ImageButton encounters a 
- * mouse down followed by a subsequent mouse up.<p>
- *
- * Note that false is returned from mouse event handlers; 
- * therefore mouse events will be propagated to the 
- * ImageButton's container.  While this is not always 
- * desirable, it was deemed a better default than swallowing 
- * the event here.  Subclasses may, of course, modify this 
- * behavior.<p>
- * 
- * <b>[1]</b> No psychiatric consultation is necessary.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- */
-public class StickyImageButtonController 
-                    extends ImageButtonController {
-    private boolean buttonUpOnLastMouseDown = true;
-
-    public StickyImageButtonController(ImageButton ib) {
-        super(ib);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        ImageButton button = getButton();
-
-        if(event.modifiers == 0) {  
-            if(button.isRaised()) button.paintInset();
-            else                  button.paintRaised();
-
-            buttonUpOnLastMouseDown = getButton().isRaised();
-            armButton(event);
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        activateButton(event);
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        ImageButton button = getButton();
-
-        if(event.modifiers == 0) {  
-            if(button.isInside(x,y)) {
-                if(buttonUpOnLastMouseDown) {
-                    if(button.isRaised() == false) {
-                        button.paintRaised();
-                        armButton(event);
-                    }
-                }
-                else {
-                    if(button.isRaised()) {
-                        button.paintInset();
-                        armButton(event);
-                    }
-                }
-            }
-            else {
-                if(buttonUpOnLastMouseDown) {
-                    if(button.isRaised()) {
-                        button.paintInset();
-                        disarmButton(event);
-                    }
-                }
-                else {
-                    if(button.isRaised() == false) {
-                        button.paintRaised();
-                        disarmButton(event);
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/java/gjt/Stopwatch.java b/java/gjt/Stopwatch.java
deleted file mode 100644
index fc8963e88a1..00000000000
--- a/java/gjt/Stopwatch.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Thread that acts as a stopwatch.<p>
- *
- * Stopwatch starts running when it is constructed, and may be 
- * reset by the reset() method.  getHour(), getMinute(), 
- * getSecond(), and getMillisecond() are used to get the 
- * elapsed time since construction, or since the last reset.<p>
- *
- * toString() returns the elapsed time in the form of 
- * HH:MM:SS:mm, where HH == hours, MM == minutes, SS == seconds 
- * and mm == milliseconds.<p>
- *
- * Each Stopwatch may have a StopwatchClient associated with it.
- * If the StopwatchClient is non-null, the StopwatchClients' 
- * tick() method is invoked every 50 milliseconds.<p>
- *
- * @version 1.0, Apr 21 1996
- * @author  David Geary
- * @see     StopwatchClient
- * @see     gjt.animation.Sequence
- * @see     gjt.animation.Sprite
- */
-public class Stopwatch extends Thread {
-    private StopwatchClient client;
-    private long            start, now, elapsed;
-    private long            hour, minute, second, millisecond;
-
-    public Stopwatch() {
-        this(null);
-    }
-    public Stopwatch(StopwatchClient client) {
-        start       = System.currentTimeMillis();
-        this.client = client;
-    }
-    public void update() {
-        now     = System.currentTimeMillis();
-        elapsed = now - start;
-        hour    = minute = second = millisecond = 0;
-
-        second = elapsed / 1000;
-        millisecond  = elapsed % 1000;
-        millisecond  = (millisecond == 0) ? 0 : millisecond/10;
-
-        if(second > 59) {
-            minute = second / 60;
-            second = second - (minute*60);
-        }
-        if(minute > 59) {
-            hour   = minute / 60;
-            minute = minute - (hour*60);
-        }
-    }
-    public String toString() {
-        update();
-        return new String(stringValueOf(hour)   + ":" + 
-                          stringValueOf(minute) + ":" + 
-                          stringValueOf(second) + ":" +
-                          stringValueOf(millisecond));
-    }
-    public long getHour        () { return hour;        }
-    public long getMinute      () { return minute;      }
-    public long getSecond      () { return second;      }
-    public long getMillisecond () { return millisecond; }
-
-    public long elapsedTime() { 
-        update();
-        return elapsed;
-    }
-    public void reset() {
-        start = System.currentTimeMillis();
-    }
-    public void run() {
-        while(true) {
-            try {
-                Thread.currentThread().sleep(50, 0);
-                update();
-                if(client != null)
-                    client.tick();
-            }
-            catch(InterruptedException e) {
-                Assert.notFalse(false);
-            }
-        }
-    }
-    private String stringValueOf(long l) {
-        if(l < 10) return "0" + String.valueOf(l);
-        else       return String.valueOf(l);
-
-    }
-}
diff --git a/java/gjt/StopwatchClient.java b/java/gjt/StopwatchClient.java
deleted file mode 100644
index c2eb5fb0460..00000000000
--- a/java/gjt/StopwatchClient.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gjt;
-
-/**
- * Client of a Stopwatch.  Stopwatches that have non-null 
- * clients, call their clients' tick() method every 50 
- * milliseconds.<p>
- *
- * @version 1.0, Apr 21 1996
- * @author  David Geary
- * @see     Stopwatch
- */
-public interface StopwatchClient {
-    public void tick();
-}
diff --git a/java/gjt/ThreeDBorder.java b/java/gjt/ThreeDBorder.java
deleted file mode 100644
index 0441fdf3052..00000000000
--- a/java/gjt/ThreeDBorder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Extension of Border that draws a 3D border.
- * 
- * Drawn raised by default, drawing style used by paint() is 
- * controlled by raise() and inset().  Note that raise() and 
- * inset() do not result in anything being painted, but only set
- * the state for the next call to paint().  To set the state and
- * paint in one operation, use paintRaised() and paintInset().
- * <p>
- *
- * The current state of the border may be obtained by calling 
- * isRaised().<p>
- *
- * @version 1.0, Apr 1 1996 
- * @author  David Geary   
- * @see     Border
- * @see     EtchedRectangle
- * @see     gjt.test.BorderTest
- */ 
-public class ThreeDBorder extends Border {
-    public ThreeDBorder(Component borderMe) {
-        this(borderMe, _defaultThickness, _defaultGap); 
-    }
-    public ThreeDBorder(Component borderMe, 
-                        int borderThickness) {
-        this(borderMe, borderThickness, _defaultGap);
-    }
-    public ThreeDBorder(Component borderMe, 
-                        int borderThickness, int gap) {
-        super(borderMe, borderThickness, gap);
-    }
-    public void inset() { ((ThreeDRectangle)border()).inset(); }
-    public void raise() { ((ThreeDRectangle)border()).raise(); }
-
-    public void paintRaised() { 
-        ((ThreeDRectangle)border()).paintRaised(); 
-    }
-    public void paintInset() { 
-        ((ThreeDRectangle)border()).paintInset (); 
-    }
-    public boolean isRaised() { 
-        return ((ThreeDRectangle)border()).isRaised();
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new ThreeDRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/ThreeDBorderStyle.java b/java/gjt/ThreeDBorderStyle.java
deleted file mode 100644
index b0e1b7d8ab8..00000000000
--- a/java/gjt/ThreeDBorderStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gjt;
-
-/**
- * Constants for 3D border styles.
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class ThreeDBorderStyle {
-    public static final ThreeDBorderStyle RAISED = 
-                            new ThreeDBorderStyle();
-    public static final ThreeDBorderStyle INSET  = 
-                            new ThreeDBorderStyle();
-
-    public String toString() {
-        if(this == ThreeDBorderStyle.RAISED) 
-            return getClass().getName() + "=RAISED";
-        else                      
-            return getClass().getName() + "=INSET";
-    }
-    private ThreeDBorderStyle() { }  // defeat instantiation
-}
diff --git a/java/gjt/ThreeDRectangle.java b/java/gjt/ThreeDRectangle.java
deleted file mode 100644
index 647129190c5..00000000000
--- a/java/gjt/ThreeDRectangle.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A DrawnRectangle which draws in 3D.<p>
- *
- * Drawn raised by default, drawing style used by paint() is 
- * controlled by raise() and inset().  Note that raise() and 
- * inset() do not result in anything being painted, but only set
- * the state for the next call to paint().  To set the state and
- * paint in one operation, use paintRaised() and paintInset().
- * <p>
- *
- * The current state of the rectangle may be obtained by 
- * calling isRaised().<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     EtchedRectangle
- * @see     gjt.test.DrawnRectangleTest
- */
-public class ThreeDRectangle extends DrawnRectangle {
-    protected static ThreeDBorderStyle 
-                      _defaultState = ThreeDBorderStyle.RAISED;
-
-    private ThreeDBorderStyle state;
-
-    public ThreeDRectangle(Component drawInto) {
-        this(drawInto, _defaultState, 
-             _defaultThickness, 0, 0, 0, 0);
-    }
-    public ThreeDRectangle(Component drawInto, int thickness) {
-        this(drawInto, _defaultState, thickness, 0, 0, 0, 0);
-    }
-    public ThreeDRectangle(Component drawInto, 
-                           int x, int y, int w, int h) {
-        this(drawInto, 
-             _defaultState, _defaultThickness, x, y, w, h);
-    }
-    public ThreeDRectangle(Component drawInto, int thickness,
-                                               int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultState, thickness, x, y, w, h);
-    }
-    public ThreeDRectangle(Component drawInto, 
-                           ThreeDBorderStyle state, 
-                           int thickness, int x, int y, 
-                           int w, int h) {
-        super(drawInto, thickness, x, y, w, h);
-        this.state = state;
-    }
-    public void paint() {
-        if(state == ThreeDBorderStyle.RAISED) paintRaised();
-        else                                  paintInset ();
-    }
-    public void raise() { state = ThreeDBorderStyle.RAISED; }
-    public void inset() { state = ThreeDBorderStyle.INSET;  }
-
-    public boolean isRaised() { 
-        return state == ThreeDBorderStyle.RAISED; 
-    }
-    public String paramString() {
-        return super.paramString() + "," + state;
-    }
-    public void paintRaised() {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            raise               ();
-            drawTopLeftLines    (g, brighter());
-            drawBottomRightLines(g, getLineColor());
-        }
-    }    
-    public void paintInset() {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            inset               ();
-            drawTopLeftLines    (g, getLineColor());
-            drawBottomRightLines(g, brighter());
-        }
-    }
-    private void drawTopLeftLines(Graphics g, Color color) {
-        int thick = getThickness();
-        g.setColor(color);
-
-        for(int i=0; i < thick; ++i) {
-            g.drawLine(x+i, y+i,   x + width-(i+1), y+i);
-            g.drawLine(x+i, y+i+1, x+i, y + height-(i+1));  
-        }
-    }
-    private void drawBottomRightLines(Graphics g, Color color) {
-        int thick = getThickness();
-        g.setColor(color);
-
-        for(int i=1; i <= thick; ++i) {
-            g.drawLine(x+i-1, y + height-i, 
-                       x + width-i, y + height-i);
-            g.drawLine(x + width-i, y+i-1,        
-                       x + width-i, y + height-i);
-        }
-    }
-}
diff --git a/java/gjt/Toolbar.java b/java/gjt/Toolbar.java
deleted file mode 100644
index 4d6ebddc217..00000000000
--- a/java/gjt/Toolbar.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A toolbar containing image buttons which are laid out to the
- * north of (horizontal) separator.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-public class Toolbar extends Panel {
-    static private int _defaultGap       = 0;
-    static private int _defaultLeftInset = 0;
-
-    private ToolbarButtonPanel buttonPanel;
-
-    public Toolbar() {
-        this(_defaultLeftInset, _defaultGap);
-    }
-    public Toolbar(int leftInset, int gap) {
-        buttonPanel = new ToolbarButtonPanel(leftInset, gap);
-        
-        setLayout(new BorderLayout());
-        add      ("North", buttonPanel);
-        add      ("South", new Separator());
-    }
-    public ImageButton add(Image image) {
-        return buttonPanel.add(image);
-    }
-    public void add(ImageButton button) {
-        buttonPanel.add(button);      
-    }
-    public void addSpacer(int sizeInPixels) {
-        Assert.notFalse(sizeInPixels > 0);
-        buttonPanel.addSpacer(sizeInPixels);
-    }
-}
-
-class ToolbarButtonPanel extends ImageButtonPanel {
-    private int leftInset;
-
-    public ToolbarButtonPanel(int leftInset, int gap) {
-        super(Orientation.HORIZONTAL,
-              Orientation.LEFT,         
-              Orientation.CENTER,
-              gap);
-
-        this.leftInset = leftInset;
-        setController(null);
-    }
-    public Insets insets() {
-        return new Insets(5,leftInset,5,5);
-    }
-}
diff --git a/java/gjt/Util.java b/java/gjt/Util.java
deleted file mode 100644
index 0970a6fd488..00000000000
--- a/java/gjt/Util.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package gjt;
-
-import java.applet.Applet;
-import java.awt.*;
-
-/**
- * A handy collection of methods for getting a component's 
- * frame, getting a component's applet, waiting for a 
- * component's image, and wallpapering a components background.
- * <p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class Util {
-    public static Frame getFrame(Component component) {
-        Component c = component;
-
-        if(c instanceof Frame)
-            return (Frame)c;
-
-        while((c = c.getParent()) != null) {
-            if(c instanceof Frame)
-                return (Frame)c;
-        }
-        return null;
-    }
-    public static Applet getApplet(Component component) {
-        Component c = component;
-
-        if(c instanceof Applet)
-            return (Applet)c;
-
-        while((c = c.getParent()) != null) {
-            if(c instanceof Applet)
-                return (Applet)c;
-        }
-        return null;
-    }
-    public static void waitForImage(Component component, 
-                                    Image image) {
-        MediaTracker tracker = new MediaTracker(component);
-        try {
-            tracker.addImage(image, 0);
-            tracker.waitForID(0);
-        }
-        catch(InterruptedException e) { Assert.notNull(null); }
-    }
-    public static void wallPaper(Component component, 
-                                 Graphics  g, 
-                                 Image     image) {
-        Dimension compsize = component.size();
-        Util.waitForImage(component, image);
-
-        int patchW = image.getWidth(component);
-        int patchH = image.getHeight(component);
-
-        Assert.notFalse(patchW != -1 && patchH != -1);
-
-        for(int r=0; r < compsize.width; r += patchW) {
-            for(int c=0; c < compsize.height; c += patchH)
-            g.drawImage(image, r, c, component);
-        }
-    }
-    public static void setCursor(int cursor, 
-                                 Component component) {
-        getFrame(component).setCursor(cursor);      
-    }
-}
diff --git a/java/gjt/YesNoDialog.java b/java/gjt/YesNoDialog.java
deleted file mode 100644
index 2db64ea6e4b..00000000000
--- a/java/gjt/YesNoDialog.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Similar in fuction to the MessageDialog, YesNoDialog poses 
- * a question, that is answered by selection of either a Yes 
- * button or a No button.<p>
- *
- * Note that the YesNoDialog is a singleton - meaning there is
- * only one YesNoDialog in existence per applet.  Clients
- * may obtain the YesNoDialog by invoking getYesNoDialog().<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     MessageDialog
- * @see     gjt.test.DialogTest
- */
-public class YesNoDialog extends GJTDialog {
-    static private YesNoDialog _theYesNoDialog;
-    private Button      yesButton;
-    private Button      noButton;
-    private String      message;
-    private boolean     answer      = false;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    static public YesNoDialog getYesNoDialog( Frame frame,
-                                  DialogClient client,
-                                  String       title,
-                                  String       message) {
-        if(_theYesNoDialog == null) 
-            _theYesNoDialog = new YesNoDialog(frame,client,
-                                              title,message);
-        else {
-            _theYesNoDialog.setClient (client);
-            _theYesNoDialog.setTitle  (title);
-            _theYesNoDialog.setMessage(message);
-        }
-        return _theYesNoDialog;
-    }
-    private YesNoDialog(Frame  frame, DialogClient client, 
-                        String title, String       message) {
-        super(frame, title, client, true);
-        yesButton = buttonPanel.add("Yes");
-        noButton  = buttonPanel.add("No");
-
-        setLayout(new BorderLayout());
-        add("Center", new YesNoPanel(message));
-        add("South", buttonPanel);
-        pack();
-    }
-    public void show() {
-        yesButton.requestFocus();
-        super.show();
-    }
-    public boolean answeredYes() {
-        return answer;
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == yesButton) answer = true;
-        else                          answer = false;
-
-        hide();
-        client.dialogDismissed(this);
-        return true;
-    }
-    private void setMessage(String message) {
-        this.message = message;
-    }
-}
-
-class YesNoPanel extends Panel {
-    public YesNoPanel(String question) {
-        add("Center", new Label(question, Label.CENTER));
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/animation/CollisionArena.java b/java/gjt/animation/CollisionArena.java
deleted file mode 100644
index defb1a6d86b..00000000000
--- a/java/gjt/animation/CollisionArena.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package gjt.animation;
-
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionArena is defined as an arena in which collisions
- * may take place.<p>
- *
- * CollisionArenas must be able to report their size and 
- * insets, and return a Vector of the Sprites contained in the 
- * arena.<p>
- *
- * CollisionArenas must also implement two methods for handling
- * sprite and edge collisions, respectively.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Playfield
- * @see     CollisionDetector
- * @see     EdgeCollisionDetector
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public interface CollisionArena {
-    abstract public Vector    getSprites();
-    abstract public Dimension getSize   ();
-    abstract public Insets    getInsets ();
-
-    abstract public void spriteCollision(Sprite sprite, 
-                                         Sprite other);
-
-    abstract public void edgeCollision(Sprite      sprite, 
-                                       Orientation orient); 
-}
diff --git a/java/gjt/animation/CollisionDetector.java b/java/gjt/animation/CollisionDetector.java
deleted file mode 100644
index ff05f16c6d3..00000000000
--- a/java/gjt/animation/CollisionDetector.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gjt.animation;
-
-/**
- * Collision detectors detect collisions that take place within
- * a CollisionArena.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     EdgeCollisionDetector
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-abstract public class CollisionDetector {
-    protected CollisionArena arena;
-
-    abstract public void detectCollisions();
-
-    public CollisionDetector(CollisionArena arena) {
-        this.arena = arena;
-    }
-}
diff --git a/java/gjt/animation/EdgeCollisionDetector.java b/java/gjt/animation/EdgeCollisionDetector.java
deleted file mode 100644
index 8624b7c2f28..00000000000
--- a/java/gjt/animation/EdgeCollisionDetector.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionDetector that detects collisions between Sprites
- * and the edges of the CollisionArena in which they reside.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionDetector
- * @see     Sprite
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class EdgeCollisionDetector extends CollisionDetector {
-    public EdgeCollisionDetector(CollisionArena arena) {
-        super(arena);
-    }
-    public void detectCollisions() {
-        Enumeration sprites     = arena.getSprites().elements();
-        Dimension   arenaSize   = arena.getSize();
-        Insets      arenaInsets = arena.getInsets();
-        Sprite      sprite;
-
-        while(sprites.hasMoreElements()) {
-            sprite = (Sprite)sprites.nextElement();
-            
-            Point nl = sprite.nextLocation ();
-            Point mv = sprite.getMoveVector();
-            int   nextRightEdge   = nl.x + sprite.width();
-            int   nextBottomEdge  = nl.y + sprite.height();
-            int   arenaBottomEdge = arenaSize.height - 
-                                    arenaInsets.bottom;
-            int   arenaRightEdge  = arenaSize.width - 
-                                    arenaInsets.right;
-
-            if(nextRightEdge > arenaRightEdge) 
-                arena.edgeCollision(sprite, Orientation.LEFT);
-            else if(nl.x < arenaInsets.left)
-                arena.edgeCollision(sprite, Orientation.RIGHT);
-
-            if(nextBottomEdge > arenaBottomEdge) 
-                arena.edgeCollision(sprite, Orientation.BOTTOM);
-            else if(nl.y < arenaInsets.top)
-                arena.edgeCollision(sprite, Orientation.TOP);
-        }
-    }
-}
diff --git a/java/gjt/animation/Playfield.java b/java/gjt/animation/Playfield.java
deleted file mode 100644
index 386c0fb24c4..00000000000
--- a/java/gjt/animation/Playfield.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Util;
-
-/**
- * A surface upon which Sprites are animated.  Playfields are 
- * responsible for animating the sprites.<p>
- *
- * Each Playfield comes complete with two collision detectors:
- * an edge collision detector and a sprite collision detector.
- *
- * Playfield is an abstract class:  extensions must implement
- * the following methods:
- * <dl>
- * <dd> void paintBackground(Graphics)
- * <dd> void void spriteCollision(Sprite sprite, Sprite other)
- * <dd> void void edgeCollision  (Sprite sprite, Sprite other)
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     Sprite
- * @see     SpriteCollisionDetector
- * @see     EdgeCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public abstract class Playfield extends    Canvas 
-                                implements Runnable, 
-                                           CollisionArena {
-    protected Vector    sprites = new Vector();
-    private   boolean   running = false;
-    private   Insets    insets  = new Insets(0,0,0,0);
-
-    private   Thread                  animationThread;
-    private   Image                   bgoffscreen, 
-                                      workplaceBuffer;
-    private   Dimension               offscreenSize;
-    private   EdgeCollisionDetector   edgeCollisionDetector;
-    private   SpriteCollisionDetector spriteCollisionDetector;
-
-    abstract public void paintBackground(Graphics g);
-
-    public Playfield() {
-        edgeCollisionDetector   = 
-            new EdgeCollisionDetector(this);
-        spriteCollisionDetector =
-            new SpriteCollisionDetector(this);
-    }
-    public void      stop      ()  { running = false;  }
-    public boolean   running   ()  { return running;   }
-    public Dimension getSize   ()  { return size();    }
-    public Insets    getInsets ()  { return insets;    }
-    public Vector    getSprites()  { return sprites;   }
-
-    public void addSprite(Sprite sprite) { 
-        sprites.addElement(sprite); 
-    }
-    public void setInsets(Insets insets) {
-        this.insets = insets;
-    }
-    public void start() {
-        animationThread = new Thread(this);
-        running = true;
-        animationThread.start();
-    }
-    public void paint(Graphics g) {
-        if(needNewOffscreenBuffer()) {
-            workplaceBuffer   = createOffscreenImage(size());
-            bgoffscreen = createOffscreenImage(size());
-            paintBackground(bgoffscreen.getGraphics());
-        }
-        g.drawImage(bgoffscreen, 0, 0, this);
-        paintSprites();
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x,y,w,h);
-        repaint();
-    }
-    public void run() {
-        while(running == true) {
-            edgeCollisionDetector.detectCollisions  ();
-            spriteCollisionDetector.detectCollisions();
-
-            animateSprites();
-            Thread.currentThread().yield();
-        }
-        animationThread = null;
-    }
-    private boolean needNewOffscreenBuffer() {
-        return (workplaceBuffer == null              || 
-                bgoffscreen     == null              ||
-                size().width  != offscreenSize.width ||
-                size().height != offscreenSize.height);
-    }
-    private Image createOffscreenImage(Dimension size) {
-        Image image = createImage(size.width, size.height);
-        Util.waitForImage(this, image);
-        offscreenSize = size;
-        return image;
-    }
-    protected void animateSprites() {
-        Sprite      nextSprite;
-        Enumeration e = sprites.elements();
-
-        while(e.hasMoreElements()) {
-            nextSprite = (Sprite)e.nextElement();
-            nextSprite.animate();
-        }
-    }
-    protected void paintSprites() {
-        Sprite      nextSprite;
-        Enumeration e = sprites.elements();
-
-        while(e.hasMoreElements()) {
-            nextSprite = (Sprite)e.nextElement();
-            paintSprite(nextSprite);
-        }
-    }
-    protected void paintSprite(Sprite sprite) {
-        Graphics  g    = getGraphics();
-        Graphics  wpg  = workplaceBuffer.getGraphics();
-        Rectangle clip = sprite.clipRect();
-
-        wpg.clipRect(clip.x, clip.y, clip.width, clip.height);
-        wpg.drawImage(bgoffscreen, 0, 0, this);
-        sprite.paint(wpg);
-
-        g.clipRect (clip.x, clip.y, clip.width, clip.height);
-        g.drawImage(workplaceBuffer, 0, 0, this);
-
-        g.dispose();
-        wpg.dispose();
-    }
-}
diff --git a/java/gjt/animation/Sequence.java b/java/gjt/animation/Sequence.java
deleted file mode 100644
index 7b777ecd0d8..00000000000
--- a/java/gjt/animation/Sequence.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gjt.animation;
-
-import java.util.Vector;
-import java.awt.*;
-import java.awt.image.ImageObserver;
-import gjt.Util;
-import gjt.Stopwatch;
-
-/**
- * A sequence of images used in an animation.  Each sequence
- * keeps track of the number of cycles the sequence is to run,
- * and reports whether or not the cycles have been completed
- * via the boolean animationOver() method.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Sprite
- * @see     Playfield
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class Sequence {
-    private static long infiniteCycle = -1;
-
-    private Vector    cells               = new Vector();
-    private Point     lastPaintLocation   = new Point(0,0);
-    private Stopwatch cellAdvanceTimer    = new Stopwatch();
-    private Image     currentImage, lastImagePainted;
-    private long      cellAdvanceInterval = 0,
-                      currentCycle        = 0, 
-                      cyclesPerAnimation  = 0;
-
-    public Sequence() { }
-
-    public Sequence(Component component, Image[] images) {
-        for(int i=0; i < images.length; ++i) {
-            addImage(component, images[i]);
-        }
-        cyclesPerAnimation = infiniteCycle;
-    }
-    public void  start          () { cellAdvanceTimer.start(); }
-    public Image getLastImage   () { return lastImagePainted;  }
-    public Point getLastLocation() { return lastPaintLocation; }
-    public int   getNumImages   () { return cells.size();      } 
-
-    public long getCurrentCycle()       { return currentCycle; }
-    public void setCurrentCycle(long c) { currentCycle = c;    }
-
-    public long getCyclesPerAnimation() { 
-        return currentCycle;            
-    }
-    public void setCyclesPerAnimation(long cyclesPerAnimation) { 
-        this.cyclesPerAnimation = cyclesPerAnimation;
-    }
-    public Image getFirstImage() {
-        return (Image)cells.firstElement();
-    }
-    public Image getCurrentImage() { 
-        return currentImage;      
-    }
-    public int getCurrentImagePosition() { 
-        return cells.indexOf(currentImage); 
-    }
-    public Image getNextImage() {
-        int   index = cells.indexOf(currentImage);
-        Image image;
-
-        if(index == cells.size() - 1)   
-            image = (Image)cells.elementAt(0);
-        else                                
-            image = (Image)cells.elementAt(index + 1); 
-
-        return image;
-    }
-    public void setAdvanceInterval(long interval) {
-        cellAdvanceInterval = interval;
-    }
-    public void addImage(Component component, Image image) {
-        if(currentImage == null)
-            currentImage = image;
-
-        Util.waitForImage(component, image);
-        cells.addElement(image);
-    }
-    public void removeImage(Image image) {
-        cells.removeElement(image);
-    } 
-    public boolean needsRepainting(Point point) {
-        return (lastPaintLocation.x != point.x ||
-                lastPaintLocation.y != point.y ||
-                lastImagePainted    != currentImage);
-    }
-    public void paint(Graphics g, int x, int y, 
-                      ImageObserver observer) {
-        g.drawImage(currentImage, x, y,  observer);
-        lastPaintLocation.x = x;
-        lastPaintLocation.y = y;
-        lastImagePainted    = currentImage;
-    }
-    public boolean isAtLastImage() {
-        return getCurrentImagePosition() == (cells.size() - 1);
-    }
-    public boolean timeToAdvanceCell() {
-        return 
-          cellAdvanceTimer.elapsedTime() > cellAdvanceInterval;
-    }
-    public boolean animationOver() {
-        return (cyclesPerAnimation != infiniteCycle) &&
-               (currentCycle >= cyclesPerAnimation);
-    }
-    public void advance() {
-        if(isAtLastImage())
-            ++currentCycle;
-
-        currentImage = getNextImage();
-        cellAdvanceTimer.reset();
-    }
-}
diff --git a/java/gjt/animation/Sprite.java b/java/gjt/animation/Sprite.java
deleted file mode 100644
index e7840b7615b..00000000000
--- a/java/gjt/animation/Sprite.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Vector;
-import gjt.Assert;
-import gjt.Stopwatch;
-import gjt.Util;
-
-/**
- * A sequence of images which are animated and moved about on
- * a Playfield.<p>
- *
- * Each Sprite is constructed with a reference to it's 
- * Playfield, a Sequence, and a beginning position for it's 
- * upper left hand corner.<p>
- *
- * A Sprite's animation is controlled by invoking the following
- * methods:
- *<dl>
- *<dd> setMoveVector(Point)
- *<dd> setMoveInterval(long)
- *<dd> setImageChangeInterval(long)
- *<dd> setMainSequence(Sequence)
- *<dd> setSequence(Sequence)
- *</dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Sequence
- * @see     Playfield
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class Sprite {
-    private Playfield field;
-    private Sequence currentSequence, mainSequence;
-    private Stopwatch moveTimer = new Stopwatch();
-
-    private Point ulhc       = new Point(0,0); 
-    private Point start      = new Point(0,0);
-    private Point moveVector = new Point(1,1);
-
-    private Rectangle clip = new Rectangle(0,0);
-    private Rectangle curBounds, lastBounds; 
-
-    private int  width, height;
-    private long moveInterval = 0;
-
-    public Sprite(Playfield field, 
-                  Sequence  sequence, 
-                  Point     ulhc) {
-        Assert.notNull(field);
-        Assert.notNull(sequence);
-        Assert.notNull(ulhc);
-
-        this.field = field;
-        this.ulhc  = ulhc;
-        start.x    = ulhc.x;
-        start.y    = ulhc.y;
-
-        setSequence(sequence);
-        setMainSequence(sequence);
-
-        initializeBounds();
-        moveTimer.start();
-        currentSequence.start();
-    }
-    public Playfield getPlayfield() { return field;            }
-    public Rectangle clipRect    () { return clip;             }
-    public Rectangle curBounds   () { return curBounds;        }
-
-    public int   width    () { return width;                   }
-    public int   height   () { return height;                  }
-    public void  reverseX () { moveVector.x = 0-moveVector.x;  }
-    public void  reverseY () { moveVector.y = 0-moveVector.y;  }
-    public void  reverse  () { reverseX(); reverseY();         }
-    public Point start    () { return start;                   }
-
-    public void  setMoveVector (Point p) { moveVector = p;     }
-    public Point getMoveVector()         { return moveVector;  }
-
-    public void play(Sequence sequence, long cycles) {
-        setSequence(sequence);
-        sequence.setCyclesPerAnimation(cycles);
-        sequence.setCurrentCycle(0);
-    }
-    public void animate() {
-        if(currentSequence.animationOver())
-            currentSequence = mainSequence;
-
-        if(timeToChangeImage()) currentSequence.advance();
-        if(timeToMove())        move();
-        if(needsRepainting())   field.paintSprite(this); 
-    }
-    public void setMainSequence(Sequence sequence) {
-        mainSequence = sequence;
-    }
-    public Sequence getMainSequence() { 
-        return mainSequence; 
-    }
-    public void setSequence(Sequence sequence) {
-        currentSequence = sequence;
-
-        if(curBounds != null)
-            updateBounds();
-    }
-    public Sequence getSequence() { 
-        return currentSequence; 
-    }
-    public boolean intersects(Sprite otherSprite) {
-        return curBounds().intersects(otherSprite.curBounds());
-    }
-    public boolean willIntersect(Sprite otherSprite) {
-        return 
-          nextBounds().intersects(otherSprite.nextBounds());
-    }
-    public boolean timeToMove() {
-        return moveTimer.elapsedTime() > moveInterval;
-    }
-    public boolean timeToChangeImage() {
-        return currentSequence.timeToAdvanceCell();
-    }
-    public void moveTo(Point p) {
-        ulhc = p;
-        moveTimer.reset();
-    }
-    public boolean needsRepainting() {
-        return currentSequence.needsRepainting(ulhc);
-    }
-    public void setMoveInterval(long interval) {
-        moveInterval = interval;
-    }
-    public void setImageChangeInterval(long interval) {
-        currentSequence.setAdvanceInterval(interval);
-    }
-    public void move() {
-        ulhc.x += moveVector.x;
-        ulhc.y += moveVector.y;
-        updateBounds();
-        moveTimer.reset();
-    }
-    public Point location() {
-        return ulhc;
-    }
-    public Point nextLocation() {
-        return new Point(ulhc.x + moveVector.x, 
-                         ulhc.y + moveVector.y);
-    }
-    public Rectangle nextBounds() {
-        Image nextImage = currentSequence.getNextImage();
-        Point nextLoc   = nextLocation();
-
-        return new Rectangle(
-                        nextLoc.x, nextLoc.y, width, height);
-    }
-    public void paint(Graphics g) {
-        currentSequence.paint(g, ulhc.x, ulhc.y, field);
-    }
-    private void initializeBounds() {
-        Image curImage = currentSequence.getCurrentImage();
-
-        width  = curImage.getWidth (field); 
-        height = curImage.getHeight(field);
-
-        curBounds = 
-          new Rectangle(ulhc.x, ulhc.y, width, height);
-
-        lastBounds = new Rectangle(curBounds.x, 
-                                   curBounds.y,
-                                   curBounds.width, 
-                                   curBounds.height);
-
-        clip = lastBounds.union(curBounds);
-    }
-    private void updateBounds() {
-        Image curImage = currentSequence.getCurrentImage();
-
-        lastBounds.width  = curBounds.width;
-        lastBounds.height = curBounds.height;
-
-        curBounds.width  = width  = curImage.getWidth(field);
-        curBounds.height = height = curImage.getHeight(field);
-
-        lastBounds.move(curBounds.x, curBounds.y);
-        curBounds.move (ulhc.x, ulhc.y);
-
-        clip = lastBounds.union(curBounds);
-    }
-}
diff --git a/java/gjt/animation/SpriteCollisionDetector.java b/java/gjt/animation/SpriteCollisionDetector.java
deleted file mode 100644
index 2ef37d79208..00000000000
--- a/java/gjt/animation/SpriteCollisionDetector.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionDetector that detects collisions between Sprites
- * residing in a CollisionArena.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     CollisionDetector
- * @see     Sprite
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class SpriteCollisionDetector extends CollisionDetector {
-    public SpriteCollisionDetector(CollisionArena arena) {
-        super(arena);
-    }
-    public void detectCollisions() {
-        Enumeration sprites = arena.getSprites().elements();
-        Sprite      sprite;
-
-        while(sprites.hasMoreElements()) {
-            sprite = (Sprite)sprites.nextElement();
-
-            Enumeration otherSprites = 
-                            arena.getSprites().elements();
-            Sprite otherSprite;
-
-            while(otherSprites.hasMoreElements()) {
-                otherSprite=(Sprite)otherSprites.nextElement();
-
-                if(otherSprite != sprite) 
-                    if(sprite.willIntersect(otherSprite))
-                      arena.spriteCollision(sprite,otherSprite);
-            }
-        }
-    }
-}
diff --git a/java/gjt/image/BleachImageFilter.java b/java/gjt/image/BleachImageFilter.java
deleted file mode 100644
index f698a218284..00000000000
--- a/java/gjt/image/BleachImageFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt.image;
-
-import java.awt.image.*;
-import gjt.Assert;
-
-/**
- * A derivation of RGBImageFilter that bleaches an image.<p>
- *
- * Extent of the bleaching effect is controlled by the only 
- * constructor argument: an integer representing the percentage 
- * of bleaching.  The percentage of bleaching may also be 
- * controlled after instantiation by invoking the 
- * void percent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class BleachImageFilter extends RGBImageFilter {
-    private int percent;
-
-    public BleachImageFilter(int percent) {
-        Assert.notFalse(percent >= 0 && percent <= 100);
-        this.percent = percent;
-        canFilterIndexColorModel = true;
-    }
-    public int  percent()            { return percent;    }
-    public void percent(int percent) { percent = percent; }
-
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-
-        int    alpha = cm.getAlpha(rgb);
-        int    red   = cm.getRed  (rgb);
-        int    green = cm.getGreen(rgb);
-        int    blue  = cm.getBlue (rgb);
-        double percentMultiplier = (double)percent/100;
-
-        red   = Math.min((int)
-                (red + (red * percentMultiplier)), 255);
-        green = Math.min((int)
-                (green + (green * percentMultiplier)), 255);
-        blue  = Math.min((int)
-                (blue  + (blue  * percentMultiplier)), 255);
-
-        alpha = alpha << 24;
-        red   = red   << 16;
-        green = green << 8;
-
-        return alpha | red | green | blue;
-    }
-}
diff --git a/java/gjt/image/DissolveFilter.java b/java/gjt/image/DissolveFilter.java
deleted file mode 100644
index 027455b39b6..00000000000
--- a/java/gjt/image/DissolveFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gjt.image;
-
-import java.awt.image.*;
-import gjt.Assert;
-
-/**
- * A derivation of RGBImageFilter that partially or wholly
- * dissolves an image.<p>
- *
- * Extent of dissolving is set by the setOpacity(int) method,
- * which is passed an integer between 0 and 255 (inclusive).
- * The integer represents the alpha value to be applied to
- * every color in the image.<p>
- *
- * An alpha value of 255 signifies an opaque color, while an
- * alpha value of 0 signifies a translucent color.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class DissolveFilter extends RGBImageFilter {
-    private int opacity;
-
-    public DissolveFilter() {
-        this(0);
-    }
-    public DissolveFilter(int opacity) {
-        canFilterIndexColorModel = true;
-        setOpacity(opacity);
-    }
-    public void setOpacity(int opacity) {
-        Assert.notFalse(opacity >= 0 && opacity <= 255);
-        this.opacity = opacity;
-    }
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-        int alpha = cm.getAlpha(rgb);
-        int red   = cm.getRed  (rgb);
-        int green = cm.getGreen(rgb);
-        int blue  = cm.getBlue (rgb);
-
-        alpha = opacity;
-
-        return alpha << 24 | red << 16 | green << 8 | blue;
-    }
-}
diff --git a/java/gjt/image/ImageDissolver.java b/java/gjt/image/ImageDissolver.java
deleted file mode 100644
index 5d0e6a2daf6..00000000000
--- a/java/gjt/image/ImageDissolver.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package gjt.image;
-
-import java.awt.*;
-import java.awt.image.*;
-import gjt.Util;
-
-/**
- * Given an image, an ImageDissolver produces an array of
- * images of varying opacity that are used in the fadeIn()
- * and fadeOut() methods for fading the image in and out
- * respectively.<p>
- *
- * As a convenience, ImageDissolver has a static method:
- * Image[] createImages() that creates the array of images
- * mentioned above, in case clients would like to create their
- * own array of images instead of using an ImageDissolver
- * directly.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDBorder
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     BleachImageFilter
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageDissolver {
-    private static int _defaultNumImages = 10, 
-                       _defaultPause = 50;
-    Component comp;
-    int       numImages, pauseInterval;
-    Image     image, offscreen;
-    Image[]   dissolvedImages;
-
-    static public Image[] createImages(Image image, 
-                                       int numImages,
-                                       Component component) {
-        Image        images[] = new Image[numImages];
-        MediaTracker tracker  = new MediaTracker(component);
-
-        DissolveFilter      filter;
-        FilteredImageSource fis;
-
-        for(int i=0; i < numImages; ++i) {
-            filter = new DissolveFilter((255/(numImages-1))*i);
-            fis    = new FilteredImageSource(image.getSource(), 
-                                             filter);
-
-            images[i] = component.createImage(fis);
-            tracker.addImage(images[i], i);
-        }
-        try { tracker.waitForAll(); }
-        catch(InterruptedException e) { }
-
-        return images;
-    }
-
-    public ImageDissolver(Component comp, Image image) {
-        this(comp, image, _defaultNumImages, _defaultPause);
-    }
-    public ImageDissolver(Component comp, Image im, 
-                          int numImages, int pause) {
-        this.image      = im;
-        this.comp       = comp;
-        this.numImages  = numImages;
-        dissolvedImages = new Image[numImages];
-        pauseInterval   = pause;
-
-        Util.waitForImage(comp, im);
-        dissolvedImages = createImages(image, numImages, comp);
-    }
-    public void fadeIn(int x, int y) {
-        if(offscreen == null) 
-            offscreen = comp.createImage(image.getWidth(comp), 
-                                         image.getHeight(comp));
-
-        Graphics offg  = offscreen.getGraphics();
-        Graphics compg = comp.getGraphics();
-
-        if(offg != null && compg != null) {
-            clearComponent(compg, x, y);
-            for(int i=0; i < numImages; ++i) {
-                blitImage(compg, offg, x, y, i);
-                pause    ();
-            }
-            blitOpaqueImage(compg, offg, x, y);
-        }
-    }
-    public void fadeOut(int x, int y) {
-        if(offscreen == null) 
-            offscreen = comp.createImage(image.getWidth(comp), 
-                                         image.getHeight(comp));
-
-        Graphics offg  = offscreen.getGraphics();
-        Graphics compg = comp.getGraphics();
-
-        if(offg != null && compg != null) {
-            blitOpaqueImage(compg, offg, x, y);
-            for(int i=numImages-1; i >= 0; --i) {
-                clearOffscreen();
-                blitImage     (compg, offg, x, y, i);
-                pause         ();
-            }
-        }
-    }
-    private void blitImage(Graphics compg, Graphics offg, 
-                           int x, int y, int index) {
-        offg.drawImage (dissolvedImages[index], 0, 0, comp);
-        compg.drawImage(offscreen,              x, y, comp);
-    }
-    private void blitOpaqueImage(Graphics compg, Graphics offg, 
-                                 int x, int y) {
-        offg.drawImage(image, 0, 0, comp);
-        compg.drawImage(offscreen, x, y, comp);
-    }
-    private void clearComponent(Graphics compg, int x, int y) {
-        clearOffscreen();
-        compg.drawImage(offscreen, x, y, comp);
-    }
-    private void clearOffscreen() {
-        Graphics offg = offscreen.getGraphics();
-
-        offg.setColor(comp.getBackground());
-        offg.fillRect(0, 0, 
-                image.getWidth(comp), image.getHeight(comp));
-    }
-    private void pause() {
-        try { Thread.currentThread().sleep(pauseInterval); }
-        catch(InterruptedException e) { }       
-    }
-}
diff --git a/java/gjt/rubberband/Rubberband.java b/java/gjt/rubberband/Rubberband.java
deleted file mode 100644
index be4b1b6ac05..00000000000
--- a/java/gjt/rubberband/Rubberband.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.*;
-
-/** 
- * A abstract base class for rubberbands.<p>
- *
- * Rubberbands do their rubberbanding inside of a Component, 
- * which must be specified at construction time.<p>
- * 
- * Subclasses are responsible for implementing 
- * <em>void drawLast(Graphics g)</em> and 
- * <em>void drawNext(Graphics g)</em>.  
- *
- * drawLast() draws the appropriate geometric shape at the last 
- * rubberband location, while drawNext() draws the appropriate 
- * geometric shape at the next rubberband location.  All of the 
- * underlying support for rubberbanding is taken care of here, 
- * including handling XOR mode setting; extensions of Rubberband
- * need not concern themselves with anything but drawing the 
- * last and next geometric shapes.<p>
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     RubberbandLine
- * @see     RubberbandRectangle
- * @see     RubberbandEllipse
- * @see     gjt.test.RubberbandTest
- */
-abstract public class Rubberband {
-    protected Point anchor    = new Point(0,0); 
-    protected Point stretched = new Point(0,0);
-    protected Point last      = new Point(0,0); 
-    protected Point end       = new Point(0,0);
-
-    private Component component;
-    private boolean   firstStretch = true;
-
-    abstract public void drawLast(Graphics g);
-    abstract public void drawNext(Graphics g);
-
-    public Rubberband(Component component) {
-        this.component = component;
-    }
-    public Point getAnchor   () { return anchor;    }
-    public Point getStretched() { return stretched; }
-    public Point getLast     () { return last;      }
-    public Point getEnd      () { return end;       }
-
-    public void anchor(Point p) {
-        firstStretch = true;
-        anchor.x = p.x;
-        anchor.y = p.y;
-
-        stretched.x = last.x = anchor.x;
-        stretched.y = last.y = anchor.y;
-    }
-    public void stretch(Point p) {
-        last.x      = stretched.x;
-        last.y      = stretched.y;
-        stretched.x = p.x;
-        stretched.y = p.y;
-
-        Graphics g = component.getGraphics();
-        if(g != null) {
-            g.setXORMode(component.getBackground());
-
-            if(firstStretch == true) firstStretch = false;
-            else                     drawLast(g);
-
-            drawNext(g);
-        }
-    }
-    public void end(Point p) {
-        last.x = end.x = p.x;
-        last.y = end.y = p.y;
-
-        Graphics g = component.getGraphics();
-        if(g != null) {
-            g.setXORMode(component.getBackground());
-            drawLast(g);
-        }
-    }
-    public Rectangle bounds() {
-      return new Rectangle(stretched.x < anchor.x ? 
-                           stretched.x : anchor.x,
-                           stretched.y < anchor.y ? 
-                           stretched.y : anchor.y,
-                           Math.abs(stretched.x - anchor.x),
-                           Math.abs(stretched.y - anchor.y));
-    }
-
-    public Rectangle lastBounds() {
-      return new Rectangle(
-                  last.x < anchor.x ? last.x : anchor.x,
-                  last.y < anchor.y ? last.y : anchor.y,
-                  Math.abs(last.x - anchor.x),
-                  Math.abs(last.y - anchor.y));
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandEllipse.java b/java/gjt/rubberband/RubberbandEllipse.java
deleted file mode 100644
index 50ddb0cdd6b..00000000000
--- a/java/gjt/rubberband/RubberbandEllipse.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-/** 
- *  A Rubberband that does ellipses.
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandEllipse extends Rubberband {
-    private final int startAngle = 0;
-    private final int endAngle   = 360;
-
-    public RubberbandEllipse(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        Rectangle r = lastBounds();
-        graphics.drawArc(r.x, r.y, 
-            r.width, r.height, startAngle, endAngle);
-    }
-    public void drawNext(Graphics graphics) {
-        Rectangle r = bounds();
-        graphics.drawArc(r.x, r.y, 
-            r.width, r.height, startAngle, endAngle);
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandLine.java b/java/gjt/rubberband/RubberbandLine.java
deleted file mode 100644
index 95daafa32a6..00000000000
--- a/java/gjt/rubberband/RubberbandLine.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-
-/** 
- * A Rubberband that does lines.
- *
- * @version 1.0, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandLine extends Rubberband {
-    public RubberbandLine(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        graphics.drawLine(anchor.x, anchor.y, last.x, last.y);
-    }
-    public void drawNext(Graphics graphics) {
-        graphics.drawLine(anchor.x, anchor.y, 
-                          stretched.x, stretched.y);
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandPanel.java b/java/gjt/rubberband/RubberbandPanel.java
deleted file mode 100644
index e4c25f4efb5..00000000000
--- a/java/gjt/rubberband/RubberbandPanel.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.*;
-
-/**
- * An extension of Panel which is fitted with a Rubberband.  
- * Handling of mouse events is automatically handled for 
- * rubberbanding.<p>
- *
- * Clients may set or get the Rubberband at any time.<p>
- *
- * @version 1.0, Dec 27 1995
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandPanel extends Panel {
-    private Rubberband rubberband;
-
-    public void setRubberband(Rubberband rubberband) {
-        this.rubberband = rubberband;
-    }
-    public Rubberband getRubberband() {
-        return rubberband;
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        rubberband.anchor(new Point(x,y));
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        rubberband.stretch(new Point(x,y));
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        rubberband.end(new Point(x,y));
-        return false;
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandRectangle.java b/java/gjt/rubberband/RubberbandRectangle.java
deleted file mode 100644
index bfcb1bfc32c..00000000000
--- a/java/gjt/rubberband/RubberbandRectangle.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-/** 
- * A Rubberband that does rectangles.
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandRectangle extends Rubberband {
-    public RubberbandRectangle(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        Rectangle rect = lastBounds();
-        graphics.drawRect(rect.x, rect.y, 
-                          rect.width, rect.height);
-    }
-    public void drawNext(Graphics graphics) {
-        Rectangle rect = bounds();
-        graphics.drawRect(rect.x, rect.y, 
-                          rect.width, rect.height);
-    }
-}
diff --git a/java/gjt/test/AttributesPanel.java b/java/gjt/test/AttributesPanel.java
deleted file mode 100644
index 535a12edaeb..00000000000
--- a/java/gjt/test/AttributesPanel.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.*;
-
-class AttributesPanel extends Panel {
-    private Applet applet;
-    private Box    iconbox, labelbox, checkboxbox;
-    private Panel  panelInLabelbox    = new Panel(); 
-    private Panel  panelInCheckboxbox = new Panel();
-    private ExclusiveImageButtonPanel panelInIconbox;
-
-    public AttributesPanel(Applet applet) {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        this.applet    = applet;
-        panelInIconbox = new ExclusiveImageButtonPanel(
-                                Orientation.HORIZONTAL);
-
-        populateIconPanel    ();
-        populateLabelPanel   ();
-        populateCheckboxPanel();
-
-        iconbox     = new Box(panelInIconbox, 
-                              "Meaningless Images");
-        labelbox    = new Box(panelInLabelbox,    "Labels");
-        checkboxbox = new Box(panelInCheckboxbox, "Fruits");
-        iconbox.etchedOut();
-
-        setLayout(gbl);
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weighty   = 0.50;
-        gbl.setConstraints(iconbox,  gbc); 
-        add(iconbox);
-        gbl.setConstraints(labelbox, gbc); 
-        add(labelbox);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.weighty   = 0;
-        gbl.setConstraints(panelInCheckboxbox, gbc); 
-        add(checkboxbox);
-    }
-    private void populateIconPanel() {
-        Image ballot, film, ticket;
-
-        ballot  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/ballot_box.gif");
-        ticket  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/movie_ticket.gif");
-        film    = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/filmstrip.gif");
-
-        panelInIconbox.add(ballot);
-        panelInIconbox.add(ticket);
-        panelInIconbox.add(film);
-    }   
-    private void populateLabelPanel() {
-        panelInLabelbox.add(new Label("Label One"));
-        panelInLabelbox.add(new Label("Label Two"));
-        panelInLabelbox.add(new Label("Label Three"));
-        panelInLabelbox.add(new Label("Label Four"));
-        panelInLabelbox.add(new Label("Label Five"));
-    }
-    private void populateCheckboxPanel() {
-        CheckboxGroup group = new CheckboxGroup();
-
-        panelInCheckboxbox.setLayout(new GridLayout(3,0));
-        panelInCheckboxbox.add(new Checkbox("apples",  
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("oranges", 
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("pears",   
-                                            group, true));
-    }
-}
diff --git a/java/gjt/test/BargaugeTest.java b/java/gjt/test/BargaugeTest.java
deleted file mode 100644
index 47733d6b0bf..00000000000
--- a/java/gjt/test/BargaugeTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.*;
-import gjt.Bargauge;
-
-/**
- * An array of either horizontal or vertical animated bargauges.
- * The orientation of the bargauges is controlled by a parameter
- * passed into the applet.<p>
- *
- * <em>
- * Warning:  An AWT bug causes this test to be a gluttenous 
- * consumer of resources (especially under Win95). A mouse down 
- * will halt the animation thread along with its consumption of 
- * resources.<p>
- * </em>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Bargauge
- */
-public class BargaugeTest extends UnitTest {
-    private Bargauge[] gauges = new Bargauge[10];
-    private Thread     animatorThread;
-    private boolean    running;
-
-    public String title() { 
-        return "Bargauge Test"; 
-    }
-    public Panel  centerPanel() { 
-        return new BargaugeTestPanel(
-                    gauges, getParameter("orientation"));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running == true) { 
-            animatorThread.suspend(); 
-            running = false; 
-        }
-        else { 
-            animatorThread.resume (); 
-            running = true;  
-        }
-        return true;
-    }
-    public void start() {
-        super.start();
-        animatorThread = new BargaugeAnimator(gauges);
-        animatorThread.start();
-        running = true;
-    }
-    public void stop() {
-        super.stop();
-        animatorThread.suspend();
-        running = false;
-    }
-}
-
-class BargaugeTestPanel extends Panel {
-    public BargaugeTestPanel(Bargauge[] gauges, String orient) {
-        Panel bargaugePanel = new Panel();
-
-        setLayout(new BorderLayout());
-        add("North",  
-            new Label("Mouse Down Starts/Stops",Label.CENTER));
-        add("Center", bargaugePanel);
-
-        bargaugePanel.add(new BargaugeGridPanel(gauges,orient));
-    }
-}
-
-class BargaugeGridPanel extends Panel {
-    private Dimension  preferredSize = new Dimension(200, 250);
-
-    public BargaugeGridPanel(Bargauge[] gauges, String orient) {
-        Bargauge nextGauge;
-        Color    color = Color.gray;
-
-        if("horizontal".equals(orient))
-            setLayout(new GridLayout(gauges.length,0,5,5));
-        else
-            setLayout(new GridLayout(0,gauges.length,5,5));
-
-        for(int i=0; i < gauges.length; ++i) {
-            switch(i) {
-                case 1:  color = Color.darkGray;    break;
-                case 2:  color = Color.blue;        break;
-                case 3:  color = Color.magenta;     break;
-                case 4:  color = Color.yellow;      break;
-                case 5:  color = Color.green;       break;
-                case 6:  color = Color.cyan;        break;
-                case 7:  color = Color.orange;      break;
-                case 8:  color = Color.pink;        break;
-                case 9:  color = Color.red;         break;
-                case 10: color = Color.yellow;      break;
-            }
-            nextGauge = new Bargauge(color);
-            gauges[i] = nextGauge;
-            add(nextGauge);
-        }
-    }
-    public Dimension preferredSize() { return preferredSize; }
-    public Dimension minimumSize  () { return preferredSize; }
-}
-
-class BargaugeAnimator extends Thread {
-    private Bargauge[] gauges;
-    private boolean    firstAnimation = true;
-
-    public BargaugeAnimator(Bargauge[] gauges) {
-        this.gauges = gauges;
-    }
-    public void run() {
-        int count = gauges.length;
-
-        while(true) {
-            try { Thread.currentThread().sleep(500,0); }
-            catch(InterruptedException e) { }
-            for(int i=0; i < count; ++i) {
-                gauges[i].setFillPercent(Math.random() * 100);
-                gauges[i].fill();
-
-                if(firstAnimation)
-                    System.out.println(gauges[i].toString());
-            }
-            firstAnimation = false;
-        }
-    }
-}
diff --git a/java/gjt/test/BleachImageFilterTest.java b/java/gjt/test/BleachImageFilterTest.java
deleted file mode 100644
index 08fda725a08..00000000000
--- a/java/gjt/test/BleachImageFilterTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.Util;
-import gjt.image.BleachImageFilter;
-
-/**
- * Initially displays an unbleached image.  Subsequent mouse
- * clicks in the canvas containing the image toggle between
- * a bleached version of the image and an unbleached version.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.image.BleachImageFilter
- */
-public class BleachImageFilterTest extends UnitTest {
-    public String title() { 
-        return "BleachImageFilter Test " + 
-               "(Click below to Bleach/Unbleach Picture)";
-    }
-    public Panel centerPanel() { 
-        return new BleachImageFilterTestPanel(this); 
-    }
-}
-
-class BleachImageFilterTestPanel extends Panel {
-    BleachImageFilterTestCanvas canvas;
-
-    public BleachImageFilterTestPanel(Applet applet) {
-        add(canvas = new BleachImageFilterTestCanvas(applet));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        canvas.toggleBleaching();
-        canvas.repaint();
-        return true;
-    }
-}
-
-class BleachImageFilterTestCanvas extends Canvas {
-    private Image   im;
-    private Image   bleached;
-    private boolean showingBleached = false;
-
-    public BleachImageFilterTestCanvas(Applet applet) {
-        int    bp;
-        String bleachPercent = 
-                applet.getParameter("bleachPercent");
-
-        if(bleachPercent != null) 
-            bp = new Integer(bleachPercent).intValue();
-        else                      
-            bp = 50;
-        
-        im = applet.getImage(applet.getCodeBase(), 
-                             "gifs/saint.gif");
-        Util.waitForImage(this, im);
-
-        FilteredImageSource source = 
-            new FilteredImageSource(im.getSource(), 
-                                    new BleachImageFilter(bp));
-
-        bleached = createImage(source);
-        Util.waitForImage(this, bleached);
-        
-        showImageSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(im.getWidth(this), 
-                             im.getHeight(this));
-    }
-    public void paint(Graphics g) {
-        if(showingBleached) g.drawImage(bleached,0,0,this);
-        else                g.drawImage(im,      0,0,this);
-    }
-    public void toggleBleaching() {
-        showingBleached = showingBleached ? false : true;
-    }
-    private void showImageSize() {
-        System.out.print  ("Image width=" + im.getWidth(this));
-        System.out.println(" height=" + im.getHeight(this));
-    }
-}
diff --git a/java/gjt/test/BorderTest.java b/java/gjt/test/BorderTest.java
deleted file mode 100644
index 450b5ffc7ea..00000000000
--- a/java/gjt/test/BorderTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Border;
-import gjt.Box;
-import gjt.EtchedBorder;
-import gjt.ImageButton;
-import gjt.ThreeDBorder;
-
-/**
- * Creates 10 bordered Components:
- * <dl>
- * <dd> A Canvas (click in canvas to depress/raise the border).
- * <dd> A Label with an etched out border. 
- * <dd> A TextField with an inset 3D border.
- * <dd> A CheckBox with a default border.
- * <dd> A List with a raised 3D border.
- * <dd> A Choice with an etched in border.
- * <dd> A Box with a raised 3D border.
- * <dd> An ImageButton with a thick, red border.
- * <dd> An AWT Button with a cyan border.
- * <dd> A TextArea with a blue default-width border.
- * </dl>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Border
- * @see     gjt.ThreeDBorder
- * @see     gjt.EtchedBorder
- */
-public class BorderTest extends UnitTest {
-    public String title() { 
-        return "Border Test";             
-    }
-    public Panel  centerPanel() { 
-        return new BorderTestPanel(this); 
-    }
-}
-
-class BorderTestPanel extends Panel {
-    TextField tf = new TextField(
-            "Inset TextField: border 5 pixels, gap 5 pixels ");
-    ThreeDBorder threeDBorder;
-    EtchedBorder etchedLabel;
-    Border       border;
-
-    public BorderTestPanel(Applet applet) {
-        setLayout(new FlowLayout(FlowLayout.CENTER, 10, 10));
-
-        add(new BorderedCanvas());
-        add(etchedLabel = 
-                new EtchedBorder(new Label("Etched Label")));
-        add(threeDBorder = new ThreeDBorder(tf, 5, 5));
-        add(new Border(new Checkbox("Check Me Out")));
-        add(makeThreeDBorderedList      ());
-        add(makeEtchedBorderedChoice    ());
-        add(makeThreeDBorderedCheckboxes());
-        add(makeBorderedImageButton     (applet));
-        add(makeBorderedAWTButton       ());
-        add(makeBorderedTextArea        ());
-
-        threeDBorder.inset();
-        etchedLabel.etchedOut();
-    }
-    private Border makeThreeDBorderedList() {
-        List list = new List(10, true);
-
-        list.addItem("One");
-        list.addItem("Two");
-        list.addItem("Three");
-        list.addItem("Four");
-        list.addItem("Five");
-        list.addItem("Six");
-        list.addItem("Seven");
-        list.addItem("Eight");
-        list.addItem("Nine");
-        list.addItem("Ten");
-        list.addItem("Eleven");
-        list.addItem("Twelve");
-        list.addItem("Thirteen");
-        list.addItem("Fourteen");
-        list.addItem("Fiveteen");
-        list.addItem("Sixteen");
-        list.addItem("Seventeen");
-        list.addItem("Eightteen");
-        list.addItem("Nineteen");
-        list.addItem("Twenty");
-
-        return new ThreeDBorder(list);
-    }
-    private Border makeEtchedBorderedChoice() {
-        Choice choice = new Choice();
-
-        choice.addItem("Toadies");
-        choice.addItem("SilverChair");
-        choice.addItem("Rug Burns");
-        choice.addItem("Cracker");
-        choice.addItem("Seven Mary Three");
-        choice.addItem("Dishwalla");
-        choice.addItem("Blues Traveler");
-        choice.addItem("BottleRockets");
-        choice.addItem("SpaceHog");
-        
-        return new EtchedBorder(choice);
-    }
-    private Border makeBorderedImageButton(Applet applet) {
-        Image  snail;
-        Border border;
-
-        snail = applet.getImage(applet.getCodeBase(),
-                                   "gifs/snail.gif");
-        border  = new Border(new ImageButton(snail), 10);
-        border.setLineColor(Color.red);
-
-        return border;
-    }
-    private Border makeBorderedAWTButton() {
-        Button button;
-        Border cyanBorder, blackBorder;
-
-        button = new Button("Button Inside Two Borders");
-        cyanBorder = new Border(button, 7);
-        cyanBorder.setLineColor(Color.cyan);
-
-        blackBorder = new Border(cyanBorder);
-
-        return blackBorder;
-    }
-    private Border makeThreeDBorderedCheckboxes() {
-        Panel         panel = new Panel();
-        Box           box   = new Box(panel, "Options");
-        CheckboxGroup group = new CheckboxGroup();
-
-        panel.setLayout(new GridLayout(3,0));
-        panel.add(new Checkbox("bordered",    group, false));
-        panel.add(new Checkbox("transparent", group, false));
-        panel.add(new Checkbox("continuous",  group, true));
-
-        return new ThreeDBorder(box, 4);
-    }
-    private Border makeBorderedTextArea() {
-        Border border;
-
-        border = new Border(
-                 new TextArea("Blue Bordered TextArea", 5, 30));
-        border.setLineColor(Color.blue);
-
-        return border;
-    }
-}
-
-class BorderedCanvas extends ThreeDBorder {
-    public BorderedCanvas() {
-        super(new TestCanvas());
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(isRaised()) paintInset ();
-        else           paintRaised();
-        return true;
-    }
-}
-
-class TestCanvas extends Canvas {
-    private boolean centeredShowing = false;
-    private String  centered = new String ("Red Centered Text");
-
-    public void paint(Graphics g) {
-        String      canvas = "Canvas";
-        String      click  = "Click Me";
-        Dimension   size   = size();
-        FontMetrics fm     = g.getFontMetrics();
-
-        g.drawString(canvas, (size.width/2) - 
-                             (fm.stringWidth(canvas)/2),
-                             fm.getHeight() - fm.getDescent());
-
-        g.drawString(click, (size.width/2) - 
-                             (fm.stringWidth(click)/2),
-                             size.height - fm.getHeight() + 
-                             fm.getAscent());
-        
-        if(centeredShowing == true) {
-            g.setColor(Color.red);
-            g.drawString(centered, 
-                size.width/2-(fm.stringWidth(centered)/2),
-                size.height/2 - (fm.getHeight()/2) + 
-                fm.getAscent());
-        }
-    }
-    public Dimension preferredSize() {
-        FontMetrics fm = getGraphics().getFontMetrics();
-        return new Dimension(fm.stringWidth(centered)+10, 100);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(centeredShowing == false) centeredShowing = true;
-        else                         centeredShowing = false;
-        repaint();
-        return true;
-    }
-}
diff --git a/java/gjt/test/BoxTest.java b/java/gjt/test/BoxTest.java
deleted file mode 100644
index 24e3de9213e..00000000000
--- a/java/gjt/test/BoxTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Box;
-import gjt.ExclusiveImageButtonPanel;
-import gjt.Orientation;
-
-/**
- * Three Boxes, each of which surrounds either:  ImageButtons, 
- * Labels or Checkboxes.  The Box surrounding the ImageButtons 
- * is etched out, while the other two Boxes are etched in.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class BoxTest extends UnitTest {
-    public String title() { 
-        return "Box Test";             
-    }
-    public Panel centerPanel() { 
-        return new BoxTestPanel(this); 
-    }
-}
-
-class BoxTestPanel extends Panel {
-    private Applet applet;
-    private Box    iconbox, labelbox, checkboxbox;
-    private Panel  panelInLabelbox    = new Panel(); 
-    private Panel  panelInCheckboxbox = new Panel();
-    private ExclusiveImageButtonPanel panelInIconbox;
-
-    public BoxTestPanel(Applet applet) {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        this.applet    = applet;
-        panelInIconbox = new ExclusiveImageButtonPanel(
-                                Orientation.HORIZONTAL);
-
-        populateIconPanel    ();
-        populateLabelPanel   ();
-        populateCheckboxPanel();
-
-        iconbox     = new Box(panelInIconbox, 
-                              "Meaningless Images");
-        labelbox    = new Box(panelInLabelbox,    "Labels");
-        checkboxbox = new Box(panelInCheckboxbox, "Fruits");
-        iconbox.etchedOut();
-
-        setLayout(gbl);
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weighty   = 0.50;
-        gbl.setConstraints(iconbox,  gbc); 
-        add(iconbox);
-        gbl.setConstraints(labelbox, gbc); 
-        add(labelbox);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.weighty   = 0;
-        gbl.setConstraints(checkboxbox, gbc); 
-        add(checkboxbox);
-    }
-    private void populateIconPanel() {
-        Image ballot, film, ticket;
-
-        ballot  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/ballot_box.gif");
-        ticket  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/movie_ticket.gif");
-        film    = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/filmstrip.gif");
-
-        panelInIconbox.add(ballot);
-        panelInIconbox.add(ticket);
-        panelInIconbox.add(film);
-    }   
-    private void populateLabelPanel() {
-        panelInLabelbox.add(new Label("Label One"));
-        panelInLabelbox.add(new Label("Label Two"));
-        panelInLabelbox.add(new Label("Label Three"));
-        panelInLabelbox.add(new Label("Label Four"));
-        panelInLabelbox.add(new Label("Label Five"));
-    }
-    private void populateCheckboxPanel() {
-        CheckboxGroup group = new CheckboxGroup();
-
-        panelInCheckboxbox.setLayout(new GridLayout(3,0));
-        panelInCheckboxbox.add(new Checkbox("apples",  
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("oranges", 
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("pears",   
-                                            group, true));
-    }
-}
diff --git a/java/gjt/test/BumpAnimationTest.java b/java/gjt/test/BumpAnimationTest.java
deleted file mode 100644
index 81b6fb5ce8e..00000000000
--- a/java/gjt/test/BumpAnimationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * A simple animation playfield with one sprite that bounces
- * off the boundaries of the playfield.<p>
- *
- * When the sprite bounces off the left wall, it plays a
- * bump sequence once; when it bounces off the right wall
- * it plays the bump sequence twice.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class BumpAnimationTest extends UnitTest {
-    public String title() { 
-        return "Bump Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new BumpAnimationTestPanel(this); 
-    }
-}
-
-class BumpAnimationTestPanel extends Panel {
-    public BumpAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new BumpPlayfield(applet)); 
-    }
-}
-
-class BumpPlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   javaDrinker;
-    private Sequence spinSequence, bumpSequence;
-
-    public BumpPlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        // Nothing to do:  only 1 sprite!
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT) {
-            if(sprite.getSequence() != bumpSequence) {
-                sprite.reverseX();
-
-                if(orientation == Orientation.RIGHT)
-                    sprite.play(bumpSequence, 1);
-                else
-                    sprite.play(bumpSequence, 2);
-            }
-        }   
-        else 
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Point   startLoc   = new Point(10, 10);
-        Image[] spinImages = new Image[19];
-        Image[] bumpImages = new Image[6];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        for(int i=0; i < bumpImages.length; ++i) {
-            file = "gifs/bump0" + i + ".gif";
-            bumpImages[i] = applet.getImage(cb, file);
-        }
-        spinSequence = new Sequence(this, spinImages);
-        bumpSequence = new Sequence(this, bumpImages);
-        javaDrinker  = new Sprite(this, spinSequence, startLoc);
-
-        spinSequence.setAdvanceInterval(100);
-        bumpSequence.setAdvanceInterval(200);
-
-        javaDrinker.setMoveVector(new Point(2,2));
-        addSprite(javaDrinker);
-    }
-}
diff --git a/java/gjt/test/ChoiceCardPanelTest.java b/java/gjt/test/ChoiceCardPanelTest.java
deleted file mode 100644
index 4ec27ac8945..00000000000
--- a/java/gjt/test/ChoiceCardPanelTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.ChoiceCardPanel;
-
-/**
- * A ChoiceCardPanel that controls three Panels.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ChoiceCardPanel
- */
-public class ChoiceCardPanelTest extends UnitTest {
-    public String title() { return "Choice CardPanel Test"; }
-    public Panel centerPanel() {
-        return new ChoiceCardPanelTestPanel(this);
-    }
-}
-
-class ChoiceCardPanelTestPanel extends Panel {
-    private ChoiceCardPanel mvp = new ChoiceCardPanel();
-
-    public ChoiceCardPanelTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-
-        mvp.addChoice("Attributes",  
-                        new AttributesPanel(applet));
-        mvp.addChoice("Connections", new ConnectionsPanel());
-        mvp.addChoice("Oracle",      new OccupationOracle());
-        add("Center", mvp);
-    }
-}
diff --git a/java/gjt/test/ColumnLayoutTest.java b/java/gjt/test/ColumnLayoutTest.java
deleted file mode 100644
index fcef2151a25..00000000000
--- a/java/gjt/test/ColumnLayoutTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.net.URL;
-import java.awt.*;
-import gjt.*;
-
-/**
- * Lays out 3 image buttons, and provides controls for setting
- * orientations and gaps on the fly.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class ColumnLayoutTest extends UnitTest {
-    public String title() { 
-        return "ColumnLayout Test"; 
-    }
-    public Panel centerPanel() {
-        ColumnButtonPanel buttonPanel;
-        Panel panel = new Panel();
-
-        buttonPanel = new ColumnButtonPanel(this);
-
-        panel.setLayout(new BorderLayout());
-        panel.add("Center", buttonPanel);
-        panel.add("North", new Box(new ColumnPicker(buttonPanel),
-                           "Column Layout Settings"));
-        return panel;
-    }
-}
-
-class ColumnButtonPanel extends Panel implements DialogClient {
-    private ImageButton    one, two, three;
-    private Panel          panel  = new Panel();
-    private TenPixelBorder border = new TenPixelBorder(panel);
-
-    public ColumnButtonPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        one   = new ImageButton(applet.getImage(cb, 
-                                        "gifs/one.gif"));
-        two   = new ImageButton(applet.getImage(cb, 
-                                        "gifs/two.gif"));
-        three = new ImageButton(applet.getImage(cb, 
-                                        "gifs/three.gif"));
-
-        panel.setLayout(new ColumnLayout(0));
-        panel.add(one);   
-        panel.add(two);   
-        panel.add(three); 
-
-        setLayout(new BorderLayout());
-        add      ("Center", border);
-    }
-    public void updateOrientations(Orientation horient, 
-                                   Orientation vorient,
-                                   int gap) {
-        panel.setLayout(new ColumnLayout(horient, vorient, gap));
-        border.validate();
-    }
-    public void dialogDismissed(Dialog d) { }
-}
-
-class ColumnPicker extends Panel {
-    private Label  horientLabel = new Label("Horizontal:");
-    private Label  vorientLabel = new Label("Vertical:");
-    private Label  gapLabel     = new Label("Gap:");
-
-    private Choice hchoice   = new Choice();
-    private Choice vchoice   = new Choice();
-    private Choice gapChoice = new Choice();
-
-    private ColumnButtonPanel buttonPanel;
-
-    public ColumnPicker(ColumnButtonPanel buttonPanel) {
-        Panel orientations = new Panel();
-        Panel gap          = new Panel();
-
-        this.buttonPanel = buttonPanel;
-        hchoice.addItem("left");
-        hchoice.addItem("center");
-        hchoice.addItem("right");
-        hchoice.select(1);
-
-        vchoice.addItem("top");
-        vchoice.addItem("center");
-        vchoice.addItem("bottom");
-        vchoice.select(1);
-
-        gapChoice.addItem("0");
-        gapChoice.addItem("5");
-        gapChoice.addItem("10");
-        gapChoice.addItem("15");
-        gapChoice.addItem("20");
-
-        orientations.add(horientLabel);  
-        orientations.add(hchoice);
-        orientations.add(vorientLabel);  
-        orientations.add(vchoice);
-
-        gap.add(gapLabel);               
-        gap.add(gapChoice);
-
-        add(new Box(orientations, "Orientations"));
-        add(new Box(gap,          "Gap"));
-    }
-    public boolean action(Event event, Object what) {
-        String horient, vorient;
-        int    gap;
-
-        horient = hchoice.getSelectedItem();
-        vorient = vchoice.getSelectedItem();
-        gap     = 
-        (new Integer(gapChoice.getSelectedItem())).intValue();
-
-        buttonPanel.updateOrientations(
-            Orientation.fromString(horient), 
-            Orientation.fromString(vorient), gap);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/ComponentScrollerTest.java b/java/gjt/test/ComponentScrollerTest.java
deleted file mode 100644
index 4f0e4a2ec70..00000000000
--- a/java/gjt/test/ComponentScrollerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.util.Vector;
-import java.applet.Applet;
-import java.net.URL;
-
-import gjt.Border;
-import gjt.ButtonPanel;
-import gjt.ColumnLayout;
-import gjt.ComponentScroller;
-import gjt.EtchedBorder;
-import gjt.ImageButton;
-import gjt.RowLayout;
-import gjt.Separator;
-import gjt.StickyImageButtonController;
-
-/**
- * A phony image store, where you can purchase images.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     Border
- * @see     ButtonPanel
- * @see     ImageButton
- * @see     Separator
- * @see     StickyImageButtonController
- * @see     ComponentScroller
- */
-public class ComponentScrollerTest extends UnitTest {
-    public String title() { 
-        return "ComponentScroller Test"; 
-    }
-    public Panel  centerPanel() { 
-        return new ComponentScrollerTestPanel(this);
-    }
-}
-
-class ComponentScrollerTestPanel extends Panel {
-    private ComponentScroller scroller;
-    private Panel             purchasePanel;
-    private ImageButtonRow    nextRow;
-    private String[][]        imageNames = {
-        { "gifs/ballot_box.gif",  "gifs/filmstrip.gif",
-          "gifs/fly.gif",         "gifs/eagle.gif",
-          "gifs/bullet_hole.gif" },
-        { "gifs/mad_hacker.gif",  "gifs/tricycle.gif",
-          "gifs/light_bulb1.gif", "gifs/scissors.gif",
-          "gifs/palette.gif" },
-        { "gifs/frog.gif",        "gifs/gear.gif",
-          "gifs/wrench.gif",      "gifs/www.gif",
-          "gifs/Dining.gif" },
-        { "gifs/ant.gif",         "gifs/abomb.gif",
-          "gifs/basketball.gif",  "gifs/soccer.gif",
-          "gifs/skelly.gif" },
-    };
-    public ComponentScrollerTestPanel(Applet applet) {
-        URL    base = applet.getCodeBase();
-        Image  nextImage;
-        Border border, blackBorder;
-
-        purchasePanel = new Panel();
-        purchasePanel.setLayout(new ColumnLayout());
-
-        for(int r=0; r < imageNames.length; ++r) {
-            nextRow = new ImageButtonRow();
-            nextRow.setLayout(new RowLayout());
-
-            for(int c=0; c < imageNames[r].length; ++c) {
-                nextImage = applet.getImage(base, 
-                                            imageNames[r][c]);
-                nextRow.add(nextImage);
-            }
-            purchasePanel.add(nextRow);
-        }
-        purchasePanel.add(new ButtonPurchaseForm());
-
-        scroller    = new ComponentScroller();
-        border      = new Border(purchasePanel, 3, 2);
-        blackBorder = new Border(border, 1, 0);
-
-        border.setLineColor(Color.gray);
-        blackBorder.setLineColor(Color.black);
-        scroller.setComponent(blackBorder);
-
-        setLayout(new BorderLayout());
-        add("Center", scroller);
-    }
-}
-
-class ButtonPurchaseForm extends Panel {
-    TextField nameField    = new TextField(25);
-    TextField addressField = new TextField(25);
-    TextField cityField    = new TextField(15);
-    TextField stateField   = new TextField(2);
-
-    Choice    paymentChoice = new Choice();
-
-    Button    paymentButton = new Button("Purchase");
-    Button    cancelButton   = new Button("Cancel");
-
-    public ButtonPurchaseForm() {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        Separator sep = new Separator();
-        Label title   = 
-            new Label("Purchase A Fine Image Today");
-        Label name    = new Label("Name:");
-        Label address = new Label("Address:");
-        Label payment = new Label("Purchase Method:");
-        Label phone   = new Label("Phone:");
-        Label city    = new Label("City:");
-        Label state   = new Label("State:");
-
-        setLayout(gbl);
-
-        paymentChoice.addItem("Visa");
-        paymentChoice.addItem("MasterCard");
-        paymentChoice.addItem("COD");
-
-        title.setFont(new Font("Times-Roman", 
-                               Font.BOLD + Font.ITALIC,
-                               16));
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(title, gbc);
-        add(title);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill      = GridBagConstraints.HORIZONTAL;
-        gbc.insets    = new Insets(0,0,10,0);
-        gbl.setConstraints(sep, gbc);
-        add(sep);
-
-        gbc.anchor    = GridBagConstraints.WEST;
-        gbc.gridwidth = 1;
-        gbc.insets    = new Insets(0,0,0,10);
-        gbl.setConstraints(name, gbc);
-        add(name);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(nameField, gbc);
-        add(nameField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(address, gbc);
-        add(address);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-        gbl.setConstraints(addressField, gbc);
-        add(addressField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(city, gbc);
-        add(city);
-
-        gbl.setConstraints(cityField, gbc);
-        add(cityField);
-
-        gbl.setConstraints(state, gbc);
-        add(state);
-
-        gbl.setConstraints(stateField, gbc);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(stateField, gbc);
-        add(stateField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(payment, gbc);
-        gbc.insets = new Insets(5,0,5,0);
-        add(payment);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill      = GridBagConstraints.NONE;
-        gbl.setConstraints(paymentChoice, gbc);
-        add(paymentChoice);
-
-        ButtonPanel buttonPanel = new ButtonPanel();
-
-        buttonPanel.add(paymentButton);
-        buttonPanel.add(cancelButton);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.insets    = new Insets(5,0,0,0);
-        gbc.fill      = GridBagConstraints.HORIZONTAL;
-        gbc.gridwidth = 4;
-        gbl.setConstraints(buttonPanel, gbc);
-        add(buttonPanel);
-    }
-}
-class ImageButtonRow extends Panel {
-    public ImageButtonRow() {
-        setLayout(new RowLayout());
-    }
-    public void add(Image image) {
-        ImageButton button = new ImageButton(image);
-        add(button);
-        button.setController(
-                new StickyImageButtonController(button));
-    }
-}
diff --git a/java/gjt/test/ConnectionsPanel.java b/java/gjt/test/ConnectionsPanel.java
deleted file mode 100644
index 7790d0709b1..00000000000
--- a/java/gjt/test/ConnectionsPanel.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-class ConnectionsPanel extends Panel {
-    public ConnectionsPanel() {
-        add(new Label("Connections"));
-    }
-}
diff --git a/java/gjt/test/DialogTest.java b/java/gjt/test/DialogTest.java
deleted file mode 100644
index f92069b7c49..00000000000
--- a/java/gjt/test/DialogTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-
-import gjt.Util;
-import gjt.DialogClient;
-import gjt.MessageDialog;
-import gjt.ProgressDialog;
-import gjt.QuestionDialog;
-import gjt.YesNoDialog;
-
-/**
- * Tests 4 gjt custom dialogs:
- * <dl>
- * <dd> MessageDialog  (a dialog which displays a message)
- * <dd> QuestionDialog (a dialog which asks a question)
- * <dd> YesNoDialog    (a dialog with yes/no buttons)
- * <dd> ProgressDialog (a dialog which records progress of task)
- * </dl>
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DialogClient
- * @see     gjt.MessageDialog
- * @see     gjt.ProgressDialog;
- * @see     gjt.QuestionDialog;
- * @see     gjt.YesNoDialog;
- */
-public class DialogTest extends UnitTest {
-    public String title() { 
-        return "Graphic Java Toolkit Dialog Test"; 
-    }
-    public Panel centerPanel() { 
-        return new DialogLauncher();
-    }
-}
-
-class DialogLauncher extends Panel implements DialogClient {
-    private MessageDialog  messageDialog;
-    private QuestionDialog questionDialog;
-    private YesNoDialog    yesNoDialog;
-    private ProgressDialog progressDialog;
-
-    private Button messageDialogButton, questionDialogButton,
-                   yesNoDialogButton,   progressDialogButton;
-
-    public DialogLauncher() {
-        setLayout(new GridLayout(0,1));
-
-        add(messageDialogButton  = 
-            new Button("Message Dialog"));
-
-        add(questionDialogButton = 
-            new Button("Question Dialog"));
-
-        add(yesNoDialogButton    = 
-            new Button("YesNo Dialog"));
-
-        add(progressDialogButton = 
-                new Button("Progress Dialog"));
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == messageDialogButton) {
-            messageDialog = MessageDialog.getMessageDialog(
-                Util.getFrame(this), this, 
-                "Example Message Dialog", 
-                "This is an example of a message dialog.");
-
-            messageDialog.show();
-        }
-        else if(event.target == questionDialogButton) {
-            questionDialog = 
-                new QuestionDialog(Util.getFrame(this), this, 
-                                   "Example Question Dialog", 
-                                   "Name:  ", "Gumby", 45);
-            questionDialog.show();
-        }
-        else if(event.target == yesNoDialogButton) {
-            yesNoDialog = 
-                YesNoDialog.getYesNoDialog(Util.getFrame(this), 
-                                       this, 
-                                       "Example YesNo Dialog",
-                                       "Another cup of Java?");
-            yesNoDialog.show();
-        }
-        else if(event.target == progressDialogButton) {
-            progressDialog = 
-                ProgressDialog.getProgressDialog(
-                    Util.getFrame(this), 
-                    "Example Progress Dialog",
-                    Color.blue);
-
-            progressDialog.show();
-
-            ProgressThread thread = 
-                new ProgressThread(progressDialog);
-            thread.start();
-        }
-
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        if(d == messageDialog)  {
-            System.out.println("MessageDialog Down");
-        }
-        if(d == questionDialog) {
-            if(questionDialog.wasCancelled())
-                System.out.println("CANCELLED"); 
-            else 
-            System.out.println(
-                "Name:  " + 
-                questionDialog.getTextField().getText());
-        }
-        if(d == yesNoDialog) {
-            if(yesNoDialog.answeredYes())
-                System.out.println("YES");
-            else
-                System.out.println("NO");
-        }
-    }
-}
-
-class ProgressThread extends Thread {
-    private ProgressDialog dialog;
-    private double         percentComplete = 0;
-
-    public ProgressThread(ProgressDialog dialog) {
-        this.dialog = dialog;
-    }
-    public void run() {
-        while(percentComplete <= 100) {
-            try { Thread.currentThread().sleep(500); }
-            catch(InterruptedException e) { }
-
-            dialog.setPercentComplete(percentComplete);
-            percentComplete += 10;
-        }
-    }
-}
diff --git a/java/gjt/test/DrawnRectangleTest.java b/java/gjt/test/DrawnRectangleTest.java
deleted file mode 100644
index 19e3c195f7c..00000000000
--- a/java/gjt/test/DrawnRectangleTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.DrawnRectangle;
-import gjt.EtchedRectangle;
-import gjt.ThreeDRectangle;
-
-/**
- * 9 DrawnRectangles (some of which are EtchedRectangles
- * and ThreeDRectangles) with varying characteristics such
- * as line widths and colors.<p>
- *
- * A mouse down (any mouse button) in any of the rectangles 
- * causes information about the rectangle to be printed to 
- * System.out. (Output will go to Java Console in Netscape).<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DrawnRectangle
- * @see     gjt.EtchedRectangle
- * @see     gjt.ThreeDRectangle
- */
-public class DrawnRectangleTest extends UnitTest {
-    public String title() { 
-        return "Drawn Rectangle Test";  
-    }
-    public Panel centerPanel() { 
-        return new DrawnRectangleTestPanel();
-    }
-}
-
-class DrawnRectangleTestPanel extends Panel {
-    private DrawnRectangle  drawnFilledOrange, 
-                            drawnFilledBlue, drawnBlue;
-    private EtchedRectangle etchedOut, 
-                            etchedIn, etchedFilledCyan;
-    private ThreeDRectangle thinRaised, 
-                            thinInset, thickRaised, thickInset;
-
-    public DrawnRectangleTestPanel() {
-        drawnFilledOrange = 
-            new DrawnRectangle (this, 10,  10,  100, 100);
-        drawnFilledBlue = 
-            new DrawnRectangle (this, 135, 135, 100, 100);
-        drawnBlue = 
-            new DrawnRectangle (this, 505, 135, 100, 100);
-        etchedFilledCyan = 
-            new EtchedRectangle(this, 10,  135, 100, 100);
-
-        etchedIn = new EtchedRectangle(this, 385, 10, 100, 100);
-        etchedOut= new EtchedRectangle(this, 505, 10, 100, 100);
-
-        thinRaised = 
-            new ThreeDRectangle(this, 135, 10,  100, 100);
-        thinInset  = 
-            new ThreeDRectangle(this, 260, 10,  100, 100);
-        thickRaised = 
-            new ThreeDRectangle(this, 385, 135, 100, 100);
-        thickInset = 
-            new ThreeDRectangle(this, 260, 135, 100, 100);
-
-        drawnFilledOrange.setLineColor(Color.black);
-
-        drawnFilledBlue.setLineColor(Color.yellow);
-        drawnFilledBlue.setThickness(3);
-
-        drawnBlue.setLineColor(Color.blue);
-        drawnBlue.setThickness(5);
-
-        thickRaised.setThickness(5);
-        thickInset.setThickness (5);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(610, 270);
-    }
-    public void paint(Graphics g) {
-        drawnFilledOrange.paint();
-        drawnFilledOrange.fill (Color.orange);
-
-        drawnFilledBlue.paint  ();
-        drawnFilledBlue.fill   (Color.blue);
-
-        drawnBlue.paint         ();
-
-        etchedIn.paintEtchedIn  ();
-        etchedOut.paintEtchedOut();
-
-        etchedFilledCyan.paintEtchedIn();
-        etchedFilledCyan.fill(Color.cyan);
-
-        thinRaised.paintRaised  ();
-        thinInset.paintInset    ();
-
-        thickRaised.paintRaised ();
-
-        thickInset.paintInset  ();
-        thickInset.fill      (Color.red);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(drawnFilledOrange.inside(x,y)) 
-            show(drawnFilledOrange);
-
-        if(drawnFilledBlue.inside(x,y))  show(drawnFilledBlue);
-        if(drawnBlue.inside(x,y))        show(drawnBlue);
-        if(etchedIn.inside(x,y))         show(etchedIn);
-        if(etchedOut.inside(x,y))        show(etchedOut);
-        if(etchedFilledCyan.inside(x,y)) show(etchedFilledCyan);
-        if(thinRaised.inside(x,y))       show(thinRaised);
-        if(thickRaised.inside(x,y))      show(thickRaised);
-        if(thinInset.inside(x,y))        show(thinInset);
-        if(thickInset.inside(x,y))       show(thickInset);
-
-        return true;
-    }
-    private void show(DrawnRectangle drawnRectangle) {
-        System.out.println(drawnRectangle);
-    }
-}
diff --git a/java/gjt/test/FontDialogTest.java b/java/gjt/test/FontDialogTest.java
deleted file mode 100644
index d0b535c27f9..00000000000
--- a/java/gjt/test/FontDialogTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-import gjt.FontDialog;
-import gjt.DialogClient;
-import gjt.Util;
-
-/**
- * Activating the button causes the FontDialog to be displayed.  
- * Selecting a font from the FontDialog causes the button to 
- * use the selected font.<p>
- *
- * This unit test overrides FontDialog to reset the labels 
- * displayed in the buttons, and to reset the list of font 
- * sizes displayed.  See FontDialog for a discussion of the 
- * overridden methods.<p>
- *
- *<em>Note:  The FontDialog takes forever to come up in 
- * Netscape.</em>
- *
- * @version 1.0, Apr 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Util
- * @see     gjt.FontDialog
- * @see     gjt.DialogClient
- */
-class LotsOfSizesFontDialog extends FontDialog {
-    private static String _defaultSizes[] = 
-        { "8", "10", "12", "14", "16", 
-          "18", "20", "22", "24",
-          "26", "28", "30", "32", "34",
-          "36", "38", "40", "42", "44",
-          "46", "48", "50", "52", "54",
-          "56", "58", "60", "62", "64",
-          "66", "68", "70", "72", "74",
-          "76", "78", "80", "82", "84",
-          "86", "88", "90", "92", "94",
-          "96", "98", "100" };
-
-    public LotsOfSizesFontDialog(Frame        frame, 
-                                 DialogClient client, 
-                                 Font         font) {
-        super(frame, client, font, true);
-    }
-    public String getPreviewButtonLabel() { 
-        return "Preview Selected Font";
-    }
-    public String getOkButtonLabel     () { 
-        return "I'll Take It";         
-    }
-    public String getCancelButtonLabel () { 
-        return "Nevermind";            
-    }
-    public String[] getFontSizes         () { 
-        return _defaultSizes;          
-    }
-}
-
-public class FontDialogTest extends UnitTest {
-    public String title() { return "Font Dialog Test"; }
-    public Panel centerPanel() { 
-        return new FontDialogTestPanel(); 
-    }
-}
-
-class FontDialogTestPanel extends    Panel 
-                          implements DialogClient {
-    private Button fontButton;
-
-    public FontDialogTestPanel() {
-        setLayout(new BorderLayout());
-        add("Center", fontButton = new Button("Fonts ..."));
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.ACTION_EVENT) {
-            LotsOfSizesFontDialog d;
-            d = new LotsOfSizesFontDialog(Util.getFrame(this), 
-                                          this,
-                                          fontButton.getFont());
-            d.show();
-        }
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        FontDialog fontDialog   = (FontDialog)d;
-        Font       fontSelected = fontDialog.getFontSelected();
-
-        if(fontSelected != null)
-            fontButton.setFont(fontSelected);
-
-        fontButton.requestFocus();
-    }
-}
diff --git a/java/gjt/test/IconCardPanelTest.java b/java/gjt/test/IconCardPanelTest.java
deleted file mode 100644
index 33a65e1939c..00000000000
--- a/java/gjt/test/IconCardPanelTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.net.URL;
-import gjt.IconCardPanel; 
-
-/**
- * A gjt.IconCardPanel that controls 3 Panels.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.IconCardPanel
- */
-public class IconCardPanelTest extends UnitTest {
-    public String title() { return "IconCardPanel Test"; }
-    public Panel centerPanel() { 
-        return new CardPanelTestPanel(this); 
-    }
-}
-class CardPanelTestPanel extends Panel {
-    IconCardPanel mvp = new IconCardPanel();
-
-    public CardPanelTestPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        setLayout(new BorderLayout());
-
-        Image folks = applet.getImage(cb,"gifs/cell_phone.gif");
-        Image pencil = applet.getImage(cb,"gifs/clipboard.gif");
-        Image library =
-                applet.getImage(cb, "gifs/mad_hacker.gif");
-
-        mvp.addImageButton(folks, 
-                           "Attributes", 
-                           new AttributesPanel(applet));
-        mvp.addImageButton(pencil, 
-                           "Connections", 
-                           new ConnectionsPanel());
-        mvp.addImageButton(library, 
-                           "Oracle", 
-                           new OccupationOracle());
-
-        add("Center", mvp);
-    }
-}
diff --git a/java/gjt/test/ImageButtonTest.java b/java/gjt/test/ImageButtonTest.java
deleted file mode 100644
index 52df6efeba0..00000000000
--- a/java/gjt/test/ImageButtonTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Box;
-import gjt.ImageButton;
-import gjt.ImageButtonEvent;
-import gjt.SpringyImageButtonController;
-import gjt.StickyImageButtonController;
-
-/**
- * 2 ImageButtons, one springy and the other sticky, both 
- * crabby.<p>
- *
- * Both ImageButtons come with an awt.Button that is used to 
- * enable/disable the ImageButton it's associated with.<p>
- *
- * ImageButtonEvents, along with mouse enter and mouse exit
- * events for the two image buttons are printed out.<p>
- *
- * @version 1.0, Apr 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.ImageButtonEvent
- * @see     gjt.SpringyImageButtonController
- * @see     gjt.StickyImageButtonController
- */
-public class ImageButtonTest extends UnitTest {
-    public String title() { 
-        return "ImageButton Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ImageButtonTestPanel(this); 
-    }
-}
-
-class ImageButtonTestPanel extends Panel {
-    private ImageButton springyButton;
-    private Button      springyButtonEnabler;
-    private ImageButton stickyButton;
-    private Button      stickyButtonEnabler;
-
-    public ImageButtonTestPanel(Applet applet) {
-        Image              image;
-        Box                springyBox, stickyBox;
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        image = 
-        applet.getImage(applet.getCodeBase(), "gifs/crab.gif");
-
-        springyButton        = new ImageButton(image);
-        springyButtonEnabler = new Button     ("Disable");
-        stickyButton         = new ImageButton(image);
-        stickyButtonEnabler  = new Button     ("Disable");
-
-        stickyButton.setController(
-			new StickyImageButtonController(stickyButton));
-
-        setLayout(gbl);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        springyBox    = new Box(springyButton, "Springy");
-        gbc.insets    = new Insets(10,0,0,0);
-        gbl.setConstraints(springyBox, gbc); add(springyBox);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.insets    = new Insets(45,10,0,0);
-        gbl.setConstraints(springyButtonEnabler, gbc); 
-        add(springyButtonEnabler);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = 1;
-        stickyBox     = new Box(stickyButton, "Sticky");
-        gbc.insets    = new Insets(10,0,0,0);
-        gbc.weighty   = 1.0;
-        gbl.setConstraints(stickyBox, gbc); add(stickyBox);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.insets    = new Insets(45,10,0,0);
-        gbl.setConstraints(stickyButtonEnabler, gbc); 
-        add(stickyButtonEnabler);
-    }
-    public boolean action(Event event, Object what) {
-        Button button = (Button)event.target;
-        String label  = (String)what;
-
-        if(button == stickyButtonEnabler) {
-            if(label.equals("Disable")) stickyButton.disable();
-            else                        stickyButton.enable();
-        }
-        else {
-            if(label.equals("Disable")) springyButton.disable();
-            else                        springyButton.enable();
-        }
-        if(label.equals("Disable")) button.setLabel("Enable");
-        else                        button.setLabel("Disable");
-
-        return true;
-    }
-    public boolean handleEvent(Event event) {
-        boolean eventHandled = false;
-        
-        if(event instanceof ImageButtonEvent) {
-            System.out.println("ImageButton " + event);
-            eventHandled = true;
-        }
-        if(event.id == Event.MOUSE_ENTER) {
-            if(event.target == stickyButton)
-                System.out.println("Sticky Button Entered");
-
-            else if(event.target == springyButton)
-                System.out.println("Springy Button Entered");
-
-            eventHandled = true;
-        }
-        if(event.id == Event.MOUSE_EXIT) {
-            if(event.target == stickyButton)
-                System.out.println("Sticky Button Exited");
-
-            else if(event.target == springyButton)
-                System.out.println("Springy Button Exited");
-
-            eventHandled = true;
-        }
-        if(eventHandled) return true;
-        else             return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/test/ImageDissolverTest.java b/java/gjt/test/ImageDissolverTest.java
deleted file mode 100644
index c157408d2af..00000000000
--- a/java/gjt/test/ImageDissolverTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.Util;
-import gjt.image.ImageDissolver;
-
-/**
- * Initially displays an image.  Subsequent mouse clicks in the 
- * canvas containing the image cause the image to fade in or 
- * fade out, depending upon it's current state.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.image.DissolveFilter
- * @see     gjt.image.ImageDissolver
- */
-public class ImageDissolverTest extends UnitTest {
-    public String title() { 
-        return "ImageDissolver Test " + 
-               "(Click Below to Fade Picture In/Out)";     
-    }
-    public Panel centerPanel() { 
-        return new ImageDissolverTestPanel(this); 
-    }
-}
-
-class ImageDissolverTestPanel extends Panel {
-    ImageDissolverTestCanvas canvas;
-
-    public ImageDissolverTestPanel(Applet applet) {
-        add(canvas = new ImageDissolverTestCanvas(applet));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        canvas.doFade();
-        return true;
-    }
-}
-
-class ImageDissolverTestCanvas extends Canvas {
-    private boolean         isFaded = false;
-    private Image           image;
-    private ImageDissolver  dissolver;
-
-    public ImageDissolverTestCanvas(Applet applet) {
-        image = 
-        applet.getImage(applet.getCodeBase(),"gifs/saint.gif");
-
-        Util.waitForImage(this, image);
-        dissolver = new ImageDissolver(this, image);
-    }
-    public void paint(Graphics g) {
-        if( ! isFaded)
-            g.drawImage(image, 0, 0, this);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(image.getWidth(this), 
-                             image.getHeight(this));
-    }
-    public void doFade() {
-        if(isFaded) dissolver.fadeIn (0,0);
-        else        dissolver.fadeOut(0,0);
-
-        isFaded = isFaded ? false : true;
-    }
-}
diff --git a/java/gjt/test/ImageScrollerTest.java b/java/gjt/test/ImageScrollerTest.java
deleted file mode 100644
index 0476682eb6d..00000000000
--- a/java/gjt/test/ImageScrollerTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-import java.net.URL;
-
-import gjt.ImageScroller;
-import gjt.Util;
-
-/**
- * Four images are loaded; subsequent mouse clicks cycle 
- * through the images, that are displayed in an ImageScroller.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Scroller
- * @see     gjt.ImageScroller
- */
-public class ImageScrollerTest extends UnitTest {
-    public String title() { 
-        return "ImageScroller Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ImageScrollerTestPanel(this); 
-    }
-}
-
-class ImageScrollerTestPanel extends Panel {
-    private Image[]       images     = new Image[4];         
-    private int           imageIndex = 0;
-    private ImageScroller scroller;
-
-    public ImageScrollerTestPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        images[0]=applet.getImage(cb,"gifs/ashleyAndRoy.gif"); 
-        images[1]=applet.getImage(cb,"gifs/ashleyAndSabre.gif");
-        images[2]=applet.getImage(cb,"gifs/anjinAndMariko.gif");
-        images[3]=applet.getImage(cb,"gifs/ashleyAndAnjin.gif");
-
-        setLayout(new BorderLayout());
-        add("Center", scroller = new ImageScroller(images[0]));
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(imageIndex == images.length-1) imageIndex = 0;
-        else                              imageIndex++;
-
-        Util.setCursor(Frame.WAIT_CURSOR, this);
-        scroller.resetImage(images[imageIndex]);
-        Util.setCursor(Frame.DEFAULT_CURSOR, this);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/LabelCanvasTest.java b/java/gjt/test/LabelCanvasTest.java
deleted file mode 100644
index cb4c0a857ae..00000000000
--- a/java/gjt/test/LabelCanvasTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package gjt.test;
-import java.applet.Applet;
-import java.awt.Event;
-import java.awt.Panel;
-import java.awt.Insets;
-import java.awt.Graphics;
-import gjt.LabelCanvas;
-import gjt.SelectionEvent;
-import gjt.Util;
-
-/**
- * Four LabelCanvases, each with different insets.  The leftmost
- * LabelCanvas has standard insets (2 all around), while the
- * other three were constructed as follows:
- * <pre>
- *      insetFive.setInsets   (new Insets(5,5,5,5));
- *      insetTen.setInsets    (new Insets(10,10,10,10));
- *      insetFifteen.setInsets(new Insets(15,15,15,15));
- * </pre><p>
- *
- * LabelCanvases generate SelectionEvents, that we watch
- * for in our handleEvent() method, and print out.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.LabelCanvas
- */
-public class LabelCanvasTest extends UnitTest {
-    public String title() { return "LabelCanvas Test"; }
-    public Panel centerPanel() { 
-        return new LabelCanvasTestPanel(this); 
-    }
-}
-
-class LabelCanvasTestPanel extends Panel {
-    Applet applet;
-    public LabelCanvasTestPanel(Applet applet) {
-        this.applet = applet;
-        LabelCanvas standard = 
-            new LabelCanvas("Standard Insets");
-        LabelCanvas insetFive = 
-            new LabelCanvas("Insets = Five");
-        LabelCanvas insetTen = 
-            new LabelCanvas("Insets = Ten");
-        LabelCanvas insetFifteen = 
-            new LabelCanvas("Insets = Fifteen");
-
-        insetFive.setInsets   (new Insets(5,5,5,5));
-        insetTen.setInsets    (new Insets(10,10,10,10));
-        insetFifteen.setInsets(new Insets(15,15,15,15));
-        
-        add(standard);
-        add(insetFive);
-        add(insetTen);
-        add(insetFifteen);
-    }
-    public boolean handleEvent(Event event) {
-        if(event instanceof SelectionEvent) {
-            SelectionEvent sevent = (SelectionEvent)event;
-            LabelCanvas    canvas = (LabelCanvas)event.target;
-
-            if(sevent.isSelected())
-                System.out.println("LabelCanvas "    + 
-                                   canvas.getLabel() + 
-                                   " selected");
-            else
-                System.out.println("LabelCanvas "    + 
-                                   canvas.getLabel() +
-                                   " deselected");
-            return true;
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/test/MessageDialogTest.java b/java/gjt/test/MessageDialogTest.java
deleted file mode 100644
index 6efddd08cb4..00000000000
--- a/java/gjt/test/MessageDialogTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-
-import gjt.MessageDialog;
-import gjt.DialogClient;
-import gjt.Util;
-
-/**
- * Simple unit test that exercises gjt.MessageDialog.  This 
- * unit test serves to illustrate the use of gjt.DialogClient.  
- * For a unit test which covers all of the gjt dialogs, 
- * see gjt.test.DialogTest.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DialogClient
- * @see     gjt.MessageDialog
- */
-public class MessageDialogTest extends UnitTest {
-    public String title() { 
-        return "Message Dialog Test"; 
-    }
-    public Panel centerPanel() { 
-        return new MessageDialogLauncher();  
-    }
-}
-
-class MessageDialogLauncher extends Panel 
-                            implements DialogClient {
-    private MessageDialog  messageDialog;
-
-    public MessageDialogLauncher() {
-        add(new Button("Show Message Dialog"));
-    }
-    public boolean action(Event event, Object what) {
-        messageDialog = MessageDialog.getMessageDialog(
-                     Util.getFrame(this), this, 
-                     "Example Message Dialog", 
-                     "This is an example of a message dialog.");
-        messageDialog.show();
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        System.out.println("MessageDialog Down");
-    }
-}
diff --git a/java/gjt/test/OccupationOracle.java b/java/gjt/test/OccupationOracle.java
deleted file mode 100644
index a34c2ad2064..00000000000
--- a/java/gjt/test/OccupationOracle.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-
-// The OccupationOracle class makes a guess at a person's occupation 
-// within an engineering organization based on a few "key" traits.
-// Invalid entries in numeric fields result in an "Unknown" occupation.
-// This applet uses the awt.GridBagLayout class to structure the
-// occupation form.  The awt.GridBagLayout class allows fields to
-// be placed in rows and columns within a form.  Each component
-// is given a "display area" based on the constraints in effect
-// when it is added to the layout.
-
-// Author:  Jerry Jackson (thanks, sifu)
-
-public class OccupationOracle extends Panel {
-
-    // Construct the form.  Create each component of the form and
-    // add it to the layout.  Initialize the occupation to "Unknown". 
-
-    public OccupationOracle() {
-
-    // Use the GridBagLayout layout to construct rows and
-    // columns.
-
-    GridBagLayout      gridbag     = new GridBagLayout();
-
-    // Create a new set of constraints to use when adding
-    // a component to the layout.  The constraint values
-    // in effect when a component is added to the layout
-    // are cloned and stored in conjunction with the component 
-    // by the layout.
-
-    GridBagConstraints constraints = new GridBagConstraints();
-
-    // Set the font for the form.
-
-    //setFont(new Font("TimesRoman", Font.BOLD, 12));
-
-    // Associate the GridBagLayout object with the applet.
-
-    setLayout(gridbag);
-
-    // The "anchor" constraint determines how a component
-    // is justified within its display area.
-
-    constraints.anchor  = GridBagConstraints.WEST;
-
-    // Determines how much space should be given to this component.
-    // if left at 0.0, all components clump up in the middle as the
-    // padding is applied to the outside.
-
-    constraints.weightx = 1.0;
-
-    // Create a name label and text field.
-
-    makeNameField();
-
-    // Setting the "gridwidth" constraint to 1  will
-    // cause the component to take up the minimum 
-    // horizontal space in its row.
-    
-    constraints.gridwidth = 1;
-
-    // "addFormComponent" will associate the current constraints 
-    // with a component and add the component to the form.
-
-    addFormComponent(gridbag, nameLabel, constraints);
-
-    // Setting the "gridwidth" constraint to REMAINDER will
-    // cause the component to fill up the remainder of its row. 
-    // i.e. it will be the last entry in the row.
-
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-
-    // The "fill" constraint tells what to do if the item is in
-    // a area larger than it is.  In this case we want to fill
-    // any extra horizontal space.
-
-    constraints.fill      = GridBagConstraints.HORIZONTAL;
-
-    addFormComponent(gridbag, nameField, constraints);
-
-    // Create and add an age label and text field.
-
-    makeAgeField();
-
-    constraints.gridwidth = 1;
-    constraints.fill      = GridBagConstraints.NONE;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, ageLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, ageField, constraints);
-
-    // Create and add a world view label and a single checkbox
-    // for a true/false value.
-
-    makeWorldViewField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, worldViewLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, worldViewField, constraints);
-
-
-    // Create and add a coffee consumption label and text field.
-
-    makeCoffeeField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, coffeeLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, coffeeField, constraints);
-
-
-    // Create and add a fashion sense label and a checkbox
-    // group that has three mutually exclusive values.
-
-    makeFashionField();
-
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 0.0;
-    constraints.weighty   = 0.0;
-    addFormComponent(gridbag, fashionLabel, constraints);
-
-    // The three checkboxes that represent fashion sense.
-
-    addFormComponent(gridbag, low, constraints);
-    addFormComponent(gridbag, medium, constraints);
-    addFormComponent(gridbag, high, constraints);
-
-    // The Occupation field is output only.
-
-    makeOccupationField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    constraints.weighty   = 1.0;
-    constraints.fill      = GridBagConstraints.NONE;
-    addFormComponent(gridbag, occupationLabel, constraints);
-    constraints.fill      = GridBagConstraints.HORIZONTAL;
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, occupationField, constraints);
-
-    // Display the initial "Unknown" occupation.
-
-    recalculateOccupation();
-
-    resize(400, 250);
-    }
-
-    // The paint() method for this applet just calls the paintComponents()
-    // method which is defined by the Container class.  It causes all
-    // the components visible within the Container to get painted.
-
-    public void paint(Graphics g) {
-    paintComponents(g);
-    }
-
-    // When any action occurs within the form we do the same thing:
-    // recalculate the person's occupation.
-
-    public boolean action(Event event, Object arg) {
-    recalculateOccupation();
-    return true;
-    }
-
-    // A helper function that associates constraints with a component
-    // and adds it to the form.
-
-    private void addFormComponent(GridBagLayout grid, Component comp, 
-                  GridBagConstraints c) {
-    grid.setConstraints(comp, c);
-    add(comp);
-    }
-
-
-    // recalculateOccupation() fetches the values of each component
-    // and computes an occupation based on some truly stupid heuristics. 
-
-    private void recalculateOccupation() {
-
-    // If we don't have a name yet we might incorrectly categorize
-    // the CEO!
-
-    if (nameField.getText() == "") {
-        occupationField.setText("Unknown");
-    }
-
-    // Fetch other important values that we'll use in our 
-    // calculations.
-
-    int     age;
-    int     coffeeConsumption;
-    boolean binaryView = worldViewField.getState();
-
-
-    // Try to fetch integer values for age and coffeeConsumption.
-    // If the values in the fields can't be parsed as integers,
-    // set the occupation to "Unknown".
-
-    try {
-        age               = Integer.parseInt(ageField.getText());
-        coffeeConsumption = Integer.parseInt(coffeeField.getText());
-    } catch (Exception e) {
-        occupationField.setText("Unknown");
-        return;
-    }
-
-    // Check for the CEO.
-
-    String name = nameField.getText();
-
-    if (name.endsWith("II")  || 
-        name.endsWith("III") || 
-        name.endsWith("IV")) {
-
-        if (age < 35 || coffeeConsumption < 4) {
-        occupationField.setText("Junior Executive");
-        } else {
-        occupationField.setText("CEO");
-        }
-
-        return;
-    }
-
-    // Fashion sense is a critical piece of information.  
-    // The getCurrent() method of CheckboxGroup returns whichever
-    // Checkbox in the group is currently selected.  Only one
-    // can be selected at a time.
-
-    Checkbox fashionValue = fashionGroup.getCurrent();
-
-    if (fashionValue == low || fashionValue == medium) {
-
-        // There are two kinds of people in the world: those who
-        // divide people into two kinds and those who don't.
-
-        if (binaryView && coffeeConsumption >= 4) {
-        occupationField.setText("Engineer");
-
-        } else if ((age > 40 && binaryView) || 
-               (age < 40 && coffeeConsumption >= 4)) {
-        occupationField.setText("Engineering Manager");
-
-        } else {
-        occupationField.setText("Product Manager");
-        }
-
-    } else {
-
-        // High fashion sense.  Not an engineer!
-
-        if (binaryView || coffeeConsumption >= 4) {
-        occupationField.setText("Vice President");
-
-        } else {
-        occupationField.setText("Product Marketing");
-        }
-    }
-    }
-
-    // Helper functions to create form components.
-
-    private void makeNameField() {
-    nameLabel = new Label("Name: ");
-    nameField = new TextField(40);
-    }
-
-    private void makeAgeField() {
-    ageLabel = new Label("Age: ");
-    ageField = new TextField(3);
-    }
-
-    private void makeOccupationField() {
-    occupationLabel = new Label("Occupation: ");
-    occupationField = new TextField(40);
-    }
-
-    private void makeWorldViewField() {
-    worldViewLabel = new Label("Binary World View: ");
-    worldViewField = new Checkbox();
-    }
-
-    private void makeCoffeeField() {
-    coffeeLabel = new Label("Coffee consumption: ");
-    coffeeField = new TextField(3);
-    }
-
-    private void makeFashionField() {
-    fashionLabel = new Label("Fashion sense:");
-
-    fashionGroup = new CheckboxGroup();
-    low      = new Checkbox("Low   ", fashionGroup, false);
-    medium       = new Checkbox("Medium", fashionGroup, true);
-    high         = new Checkbox("High  ", fashionGroup, false);
-    }
-
-    // Text fields.
-
-    private TextField     nameField;
-    private TextField     ageField;
-    private TextField     coffeeField;
-    private TextField     occupationField;
-
-    // Labels.
-
-    private Label         nameLabel;
-    private Label         ageLabel;
-    private Label         coffeeLabel;
-    private Label         fashionLabel;
-    private Label         worldViewLabel;
-    private Label         occupationLabel;
-
-    // Checkboxes.
-
-    private Checkbox      worldViewField;
-    private Checkbox      low;
-    private Checkbox      medium;
-    private Checkbox      high;
-
-    // The fashion sense checkbox group.
-
-    private CheckboxGroup fashionGroup;
-}
-
-    
diff --git a/java/gjt/test/RowLayoutTest.java b/java/gjt/test/RowLayoutTest.java
deleted file mode 100644
index eb7b419ca17..00000000000
--- a/java/gjt/test/RowLayoutTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.net.URL;
-import java.awt.*;
-import gjt.*;
-
-/**
- * Lays out 3 image buttons, and provides controls for setting
- * orientations and gaps on the fly.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class RowLayoutTest extends UnitTest {
-    public String title() { 
-        return "RowLayout Test";
-    }
-    public Panel centerPanel() {
-        RowButtonPanel buttonPanel = new RowButtonPanel(this);
-        Panel panel = new Panel();
-
-        panel.setLayout(new BorderLayout());
-        panel.add("Center", buttonPanel);
-        panel.add("North",  new Box(new RowPicker(buttonPanel),
-                            "Row Layout Settings"));
-        return panel;
-    }
-}
-
-class RowButtonPanel extends Panel implements DialogClient {
-    private ImageButton    one, two, three;
-    private Panel          panel  = new Panel();
-    private TenPixelBorder border = new TenPixelBorder(panel);
-
-    public RowButtonPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        one   = new ImageButton(applet.getImage(cb, 
-                                            "gifs/one.gif"));
-        two   = new ImageButton(applet.getImage(cb, 
-                                            "gifs/two.gif"));
-        three = new ImageButton(applet.getImage(cb, 
-                                            "gifs/three.gif"));
-
-        panel.setLayout(new RowLayout(0));
-        panel.add(one);   
-        panel.add(two);   
-        panel.add(three); 
-
-        setLayout(new BorderLayout());
-        add      ("Center", border);
-    }
-    public void updateOrientations(Orientation horient, 
-                                   Orientation vorient,
-                                   int gap) {
-        panel.setLayout(new RowLayout(horient, vorient, gap));
-        border.validate();
-    }
-    public void dialogDismissed(Dialog d) { }
-}
-
-class RowPicker extends Panel {
-    private Label  horientLabel = new Label("Horizontal:");
-    private Label  vorientLabel = new Label("Vertical:");
-    private Label  gapLabel     = new Label("Gap:");
-
-    private Choice hchoice   = new Choice();
-    private Choice vchoice   = new Choice();
-    private Choice gapChoice = new Choice();
-
-    private RowButtonPanel buttonPanel;
-
-    public RowPicker(RowButtonPanel buttonPanel) {
-        Panel orientations = new Panel();
-        Panel gap          = new Panel();
-
-        this.buttonPanel = buttonPanel;
-        hchoice.addItem("left");
-        hchoice.addItem("center");
-        hchoice.addItem("right");
-        hchoice.select(1);
-
-        vchoice.addItem("top");
-        vchoice.addItem("center");
-        vchoice.addItem("bottom");
-        vchoice.select(1);
-
-        gapChoice.addItem("0");
-        gapChoice.addItem("5");
-        gapChoice.addItem("10");
-        gapChoice.addItem("15");
-        gapChoice.addItem("20");
-
-        orientations.add(horientLabel);  
-        orientations.add(hchoice);
-        orientations.add(vorientLabel);  
-        orientations.add(vchoice);
-
-        gap.add(gapLabel);               
-        gap.add(gapChoice);
-
-        add(new Box(orientations, "Orientations"));
-        add(new Box(gap,          "Gap"));
-    }
-    public boolean action(Event event, Object what) {
-        String horient, vorient;
-        int    gap;
-
-        horient = hchoice.getSelectedItem();
-        vorient = vchoice.getSelectedItem();
-        gap     = 
-        (new Integer(gapChoice.getSelectedItem())).intValue();
-
-        buttonPanel.updateOrientations(
-                    Orientation.fromString(horient), 
-                    Orientation.fromString(vorient), gap);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/RubberbandTest.java b/java/gjt/test/RubberbandTest.java
deleted file mode 100644
index ae256fb2c3a..00000000000
--- a/java/gjt/test/RubberbandTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.DrawingPanel;
-import gjt.Separator;
-import gjt.RowLayout;
-import gjt.rubberband.*;
-
-/**
- * A simple drawing applet that demonstrates the utility of 
- * the gjt.rubberband package.<p>
- *
- * Note that this unit test also serves as the unit test for
- * gjt.DrawingPanel.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DrawingPanel
- * @see     gjt.rubberband.Rubberband
- * @see     gjt.rubberband.RubberbandLine
- * @see     gjt.rubberband.RubberbandRectangle
- * @see     gjt.rubberband.RubberbandEllipse
- * @see     gjt.rubberband.RubberbandPanel
- */
-public class RubberbandTest extends UnitTest {
-    public String title() { 
-        return "Rubberband Test"; 
-    }
-    public Panel centerPanel() { 
-        return new RubberbandTestPanel(); 
-    }
-}
-
-class RubberbandTestPanel extends Panel {
-    private DrawingPanel drawingPanel;
-    private ChoicePanel  choicePanel;
-
-    public RubberbandTestPanel() {
-        drawingPanel = new DrawingPanel();
-        choicePanel  = new ChoicePanel(drawingPanel);
-
-        setLayout(new BorderLayout());
-        add("North",  choicePanel);
-        add("Center", drawingPanel);
-    }
-}
-
-class ChoicePanel extends Panel {
-    private DrawingPanel drawingPanel;
-    private Color        color;
-    private Checkbox     fillCheckbox = new Checkbox();
-
-    public ChoicePanel(DrawingPanel drawingPanel) {
-        Panel    choicePanel     = new Panel();
-        Choice   geometricChoice = new Choice();
-        Choice   colorChoice     = new Choice();
-
-        this.drawingPanel = drawingPanel;
-    
-        geometricChoice.addItem("Lines");
-        geometricChoice.addItem("Rectangles");
-        geometricChoice.addItem("Ellipses");
-
-        colorChoice.addItem("Black");
-        colorChoice.addItem("Red");
-        colorChoice.addItem("Blue");
-        colorChoice.addItem("Gray");
-        colorChoice.addItem("White");
-
-        choicePanel.setLayout(new RowLayout(10));
-        choicePanel.add(new Label("Shape:"));
-        choicePanel.add(geometricChoice);
-        choicePanel.add(new Label("Color:"));
-        choicePanel.add(colorChoice);
-        choicePanel.add(new Label("Fill:"));
-        choicePanel.add(fillCheckbox);
-
-        setLayout(new BorderLayout());
-        add("Center", choicePanel);
-        add("South",  new Separator());
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target instanceof Checkbox) {
-            drawingPanel.setFill(fillCheckbox.getState());
-        }
-        else if(event.target instanceof Choice) {
-            if(((String)what).equals("Lines")) {     
-                fillCheckbox.setState(false);
-                drawingPanel.drawLines();
-            }
-            else if(((String)what).equals("Rectangles")) {
-                System.out.println("Rectangles");
-                drawingPanel.drawRectangles();
-            }
-            else if(((String)what).equals("Ellipses"))   
-                drawingPanel.drawEllipses  ();
-            else if(((String)what).equals("Black")) 
-                drawingPanel.setColor(Color.black);
-            else if(((String)what).equals("Red"))   
-                drawingPanel.setColor(Color.red);
-            else if(((String)what).equals("Blue"))  
-                drawingPanel.setColor(Color.blue);
-            else if(((String)what).equals("Gray"))  
-                drawingPanel.setColor(Color.gray);
-            else if(((String)what).equals("White")) 
-                drawingPanel.setColor(Color.white);
-        }
-        return true;
-    }
-    public Insets insets() { return new Insets(5,0,5,0); }
-}
diff --git a/java/gjt/test/SeparatorTest.java b/java/gjt/test/SeparatorTest.java
deleted file mode 100644
index 3dd80173ea3..00000000000
--- a/java/gjt/test/SeparatorTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.Etching;
-import gjt.Separator;
-
-/**
- * Two Separators, one horizontal and the other vertical, the 
- * former etched in, and the latter etched out are laid out with 
- * an adorning Label for each.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.UnitTest
- * @see     gjt.Separator
- */
-public class SeparatorTest extends UnitTest {
-    public String title      () { return "Separator Test"; }
-    public Panel  centerPanel() { 
-        return new SeparatorTestPanel(); 
-    }
-}
-
-class SeparatorTestPanel extends Panel {
-    public SeparatorTestPanel() {
-        setLayout(new BorderLayout());
-        add("North",  new SeparatorTestNorthPanel ());
-        add("Center", new SeparatorTestCenterPanel());
-    }
-}
-
-class SeparatorTestNorthPanel extends Panel {
-    Separator separator = new Separator();
-
-    public SeparatorTestNorthPanel() {
-        setLayout(new BorderLayout());
-        add("North", new Label("North Of Etched-In Separator"));
-        add("South", separator);
-    }
-}
-
-class SeparatorTestCenterPanel extends Panel {
-    Separator separator = new Separator(Etching.OUT);
-    
-    public SeparatorTestCenterPanel() {
-        GridBagConstraints gbc = new GridBagConstraints();
-        GridBagLayout      gbl = new GridBagLayout();
-        Label label = new Label("West Of Etched-Out Separator");
-
-        setLayout(gbl);
-        gbc.anchor  = GridBagConstraints.WEST;
-        gbc.insets  = new Insets(0,0,0,10);
-        gbl.setConstraints(label, gbc);
-        add(label);
-
-        gbc.insets  = new Insets(0,0,0,0);
-        gbc.weightx = 1.0;
-        gbc.weighty = 1.0;
-        gbc.fill    = GridBagConstraints.VERTICAL;
-        gbl.setConstraints(separator, gbc);
-        add(separator);
-
-    }
-}
diff --git a/java/gjt/test/SimpleAnimationTest.java b/java/gjt/test/SimpleAnimationTest.java
deleted file mode 100644
index faf0c7c611c..00000000000
--- a/java/gjt/test/SimpleAnimationTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * An animation playfield containing a lone sprite that bounces
- * off the boundaries of the playfield.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.AnimationTest
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class SimpleAnimationTest extends UnitTest {
-    public String title() { 
-        return "Simple Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new SimpleAnimationTestPanel(this); 
-    }
-}
-
-class SimpleAnimationTestPanel extends Panel {
-    public SimpleAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new SimplePlayfield(applet)); 
-    }
-}
-
-class SimplePlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   javaDrinker;
-    private Sequence spinSequence;
-
-    public SimplePlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        // Nothing to do:  only 1 sprite!
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT)
-            sprite.reverseX();
-        else
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Point   startLoc   = new Point(10, 10);
-        Image[] spinImages = new Image[19];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        spinSequence = new Sequence(this, spinImages);
-        javaDrinker  = new Sprite(this, spinSequence, startLoc);
-
-        javaDrinker.setMoveVector(new Point(2,2));
-        addSprite(javaDrinker);
-    }
-}
diff --git a/java/gjt/test/SimpleBargaugeTest.java b/java/gjt/test/SimpleBargaugeTest.java
deleted file mode 100644
index 57eb464f4b1..00000000000
--- a/java/gjt/test/SimpleBargaugeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.Bargauge;
-
-/**
- * A lone Barguage which animates.  This unit test is meant to 
- * illustrate that a Bargauge can cope with having its 
- * orientation chanaged from horizontal to vertical or 
- * vice-versa.  This test is best run in appletviewer, so that
- * the window may be resized such that the Bargauge changes its 
- * orientation.<p>
- *
- * <em>
- * Warning:  An AWT bug causes this test to be a gluttenous 
- * consumer of resources (especially under Win95). A mouse down 
- * will halt the animation thread along with its consumption of 
- * resources.<p>
- * </em>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Bargauge
- */
-public class SimpleBargaugeTest extends UnitTest {
-    public String title() { 
-        return "Simple Bargauge Test"; 
-    }
-    public Panel centerPanel() { 
-        return new SimpleBargaugeTestPanel(); 
-    }
-}
-
-class SimpleBargaugeTestPanel extends Panel implements Runnable {
-    private Bargauge gauge = new Bargauge(Color.blue);
-    private boolean  running = true;
-    private Thread   t;
-
-    public SimpleBargaugeTestPanel() {
-        setLayout(new BorderLayout());
-        add("Center", gauge);
-
-        t = new Thread(this);
-        t.start();
-    }
-    public void run() {
-        while(true) {
-            try { Thread.currentThread().sleep(500,0); }
-            catch(InterruptedException e) { }
-
-            gauge.setFillPercent(Math.random() * 100);
-            gauge.fill();
-        }
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running)  { t.suspend(); running = false; }
-        else         { t.resume (); running = true;  }
-        return true;
-    }
-}
diff --git a/java/gjt/test/StateButtonTest.java b/java/gjt/test/StateButtonTest.java
deleted file mode 100644
index 508aee1682e..00000000000
--- a/java/gjt/test/StateButtonTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.net.URL;
-import gjt.StateButton;
-import gjt.ImageButtonEvent;
-
-/**
- * A StateButton which cycles through a fascinating series of 
- * Images.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.StateButton
- */
-public class StateButtonTest extends UnitTest {
-    public String title      () { return "StateButton Test";  }
-    public Panel  centerPanel() { 
-        return new StateButtonTestPanel(this); 
-    }
-}
-
-class StateButtonTestPanel extends Panel {
-    private URL         codeBase;
-    private Image[]     images;
-    private StateButton button;
-
-    public StateButtonTestPanel(Applet applet) {
-        codeBase  = applet.getCodeBase();
-        images    = new Image[3];
-        images[0] = applet.getImage(codeBase, "gifs/fly.gif");
-        images[1] = applet.getImage(codeBase, "gifs/frog.gif");
-        images[2] = applet.getImage(codeBase, "gifs/eagle.gif");
-        button    = new StateButton(images);
-
-        setLayout(new FlowLayout(FlowLayout.CENTER, 20, 20));
-        add      (button);
-    }
-}
diff --git a/java/gjt/test/TenPixelBorder.java b/java/gjt/test/TenPixelBorder.java
deleted file mode 100644
index bab694d0fb1..00000000000
--- a/java/gjt/test/TenPixelBorder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-public class TenPixelBorder extends Panel {
-	public TenPixelBorder(Component borderMe) { 
-		setLayout(new BorderLayout());
-		add("Center", borderMe);
-	}
-	public void paint(Graphics g) {
-		Dimension mySize   = size();
-		Insets    myInsets = insets();
-
-		g.setColor(Color.gray);
-
-		// Top Inset area
-		g.fillRect(0,
-		           0, 
-				   mySize.width,  
-				   myInsets.top);
-
-		// Left Inset area
-		g.fillRect(0, 
-		           0, 
-				   myInsets.left, 
-				   mySize.height);
-
-		// Right Inset area
-		g.fillRect(mySize.width - myInsets.right, 
-		           0, 
-		           myInsets.right, 
-				   mySize.height);
-
-		// Bottom Inset area
-		g.fillRect(0, 
-		           mySize.height - myInsets.bottom, 
-				   mySize.width,
-				   mySize.height);
-	}
-	public Insets insets() { 
-		return new Insets(10,10,10,10); 
-	}
-	
-}
diff --git a/java/gjt/test/TitledPanel.java b/java/gjt/test/TitledPanel.java
deleted file mode 100644
index cb8d054e888..00000000000
--- a/java/gjt/test/TitledPanel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gjt.test;
-
-import java.awt.BorderLayout;
-import java.awt.Label;
-import java.awt.Panel;
-import gjt.Separator;
-
-/**
- * A Panel fitted with a BorderLayout that contains a Label 
- * (title) in the North, and a Separator in the South.
- *
- * @version 1.0, Apr 2 1996
- * @author  David Geary
- */
-
-public class TitledPanel extends Panel {
-    public TitledPanel(String title) {
-        setLayout(new BorderLayout());
-        add("North", new Label(title, Label.CENTER));
-        add("South", new Separator());
-    }   
-}
diff --git a/java/gjt/test/ToolbarTest.java b/java/gjt/test/ToolbarTest.java
deleted file mode 100644
index f739ce96236..00000000000
--- a/java/gjt/test/ToolbarTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.awt.*;
-import java.applet.Applet;
-import gjt.ExclusiveImageButtonPanel;
-import gjt.ImageButton;
-import gjt.ImageButtonEvent;
-import gjt.Orientation;
-import gjt.Toolbar;
-import gjt.Separator;
-
-/**
- * A Toolbar to the north, and an ExclusiveImageButtonPanel on 
- * the west give this little applet its own unique charm.  
- * Owner is motivated.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ExclusiveImageButtonPanel
- * @see     gjt.ImageButton
- * @see     gjt.Toolbar
- */
-public class ToolbarTest extends UnitTest {
-    public String title() { 
-        return "Toolbar/ImageButtonPanel Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ToolbarTestPanel(this);      
-    }
-}
-
-class ToolbarTestPanel extends Panel {
-    ImageButton     newButton,   openButton, diskButton, 
-                    printButton, cutButton,  copyButton,
-                    pasteButton;
-
-    public ToolbarTestPanel(Applet app) {
-        setLayout(new BorderLayout());  
-        add("North", makeToolbar(app, app.getCodeBase()));
-        add("West",  makePalette(app, app.getCodeBase()));
-    }
-    public boolean handleEvent(Event event) {
-        if(event instanceof ImageButtonEvent) {
-            ImageButtonEvent ibevent = (ImageButtonEvent)event;
-          
-            if(ibevent.isActivated()) {
-                if(event.target == newButton)
-                    System.out.println("New Button Activated");
-                if(event.target == openButton)
-                    System.out.println("Open Button Activated");
-                if(event.target == diskButton)
-                    System.out.println("Disk Button Activated");
-                if(event.target == printButton)
-                    System.out.println("Print Button Activated");
-                if(event.target == cutButton)
-                    System.out.println("Cut Button Activated");
-                if(event.target == copyButton)
-                    System.out.println("Copy Button Activated");
-                if(event.target == pasteButton)
-                    System.out.println("Paste Button Activated");
-            
-                return true;
-            }
-        }
-
-        return super.handleEvent(event);
-    }
-    private Toolbar makeToolbar(Applet app, URL cb) {
-        Toolbar tb  = new Toolbar(10, 0);
-
-        newButton   = tb.add(app.getImage(cb, "gifs/new.gif"));
-        openButton  = tb.add(app.getImage(cb, "gifs/open.gif"));
-        diskButton  = tb.add(app.getImage(cb, "gifs/disk.gif"));
-
-        tb.addSpacer(newButton.preferredSize().width);
-
-        printButton = tb.add(app.getImage(cb, "gifs/print.gif"));
-
-        tb.addSpacer(newButton.preferredSize().width);
-
-        cutButton   = tb.add(app.getImage(cb, "gifs/cut.gif"));
-        copyButton  = tb.add(app.getImage(cb, "gifs/copy.gif"));
-        pasteButton = tb.add(app.getImage(cb, "gifs/paste.gif"));
-
-        return tb;
-    }
-    private Panel makePalette(Applet app, URL cb) {
-        ExclusiveImageButtonPanel iconPalette;
-        Panel                     iconPalettePanel = new Panel();
-
-        iconPalette = new ExclusiveImageButtonPanel(
-                              Orientation.VERTICAL,
-                              Orientation.CENTER,
-                              Orientation.TOP, 10);
-
-        iconPalette.add(app.getImage(cb,"gifs/ballot_box.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/palette.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/light_bulb1.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/Dining.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/scissors.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/tricycle.gif"));
-
-        iconPalettePanel = new Panel();
-        iconPalettePanel.setLayout(new BorderLayout());
-        iconPalettePanel.add      ("Center", iconPalette);
-        iconPalettePanel.add      ("East",   new Separator());
-        return iconPalettePanel;
-    }
-}
diff --git a/java/gjt/test/TwoDrinkersAnimationTest.java b/java/gjt/test/TwoDrinkersAnimationTest.java
deleted file mode 100644
index ae4041b9eb6..00000000000
--- a/java/gjt/test/TwoDrinkersAnimationTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.Panel;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * An animation playfield containing two "java drinkers", that
- * both bounce off the sides of the playfield.<p>
- *
- * One of the java drinkers moves slow and spins fast, while
- * the other java drinker moves fast and spins slow.  When
- * the two java drinkers collide, they both play a bump
- * sequence - at different speeds.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.AnimationTest
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class TwoDrinkersAnimationTest extends UnitTest {
-    public String title() { 
-        return 
-            "TwoDrinkers Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new TwoDrinkersAnimationTestPanel(this); 
-    }
-}
-
-class TwoDrinkersAnimationTestPanel extends Panel {
-    public TwoDrinkersAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new TwoDrinkersPlayfield(applet)); 
-    }
-}
-
-class TwoDrinkersPlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   moveFastSpinSlow, moveSlowSpinFast;
-    private Sequence fastSpinSequence, 
-                     slowSpinSequence,
-                     fastBumpSequence,
-                     slowBumpSequence;
-
-    public TwoDrinkersPlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        if(moveSlowSpinFast.getSequence() != fastBumpSequence) {
-            sprite.reverse();
-            sprite2.reverse();
-
-            moveSlowSpinFast.play(fastBumpSequence, 3);
-            moveFastSpinSlow.play(slowBumpSequence, 3);
-        }   
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT) 
-            sprite.reverseX();
-        else 
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Image[] spinImages = new Image[19];
-        Image[] bumpImages = new Image[6];
-        Image[] volleyball = new Image[4];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        for(int i=0; i < bumpImages.length; ++i) {
-            file = "gifs/bump0" + i + ".gif";
-            bumpImages[i] = applet.getImage(cb, file);
-        }
-        fastSpinSequence = new Sequence(this, spinImages);
-        slowSpinSequence = new Sequence(this, spinImages);
-
-        fastBumpSequence = new Sequence(this, bumpImages);
-        slowBumpSequence = new Sequence(this, bumpImages);
-
-        moveFastSpinSlow = 
-            new Sprite(this, 
-                slowSpinSequence, new Point(25, 75));
-
-        moveSlowSpinFast = 
-            new Sprite(this, 
-                fastSpinSequence, new Point(250,250));
-
-        fastSpinSequence.setAdvanceInterval(50);
-        slowSpinSequence.setAdvanceInterval(300);
-
-        fastBumpSequence.setAdvanceInterval(25);
-        slowBumpSequence.setAdvanceInterval(200);
-
-        moveFastSpinSlow.setMoveVector(new Point(2,3));
-        moveSlowSpinFast.setMoveVector(new Point(-1,-1));
-
-        moveSlowSpinFast.setMoveInterval(100);
-
-        addSprite(moveFastSpinSlow);
-        addSprite(moveSlowSpinFast);
-    }
-}
diff --git a/java/gjt/test/UnitTest.java b/java/gjt/test/UnitTest.java
deleted file mode 100644
index 1fa262d5629..00000000000
--- a/java/gjt/test/UnitTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package gjt.test;
-
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.Panel;
-import java.applet.Applet;
-import gjt.*;
-
-/**
- * An (abstract) Applet fitted with a BorderLayout that 
- * contains a TitledPanel in the North, and a Panel created by 
- * derived classes in the Center.<p>
- *
- * Since some Applets take awhile to load, UnitTest changes the 
- * cursor to a wait cursor in init(), changing it back to the 
- * default cursor in start().  Derived classes must be sure to 
- * call super.init() if they override init(); likewise for 
- * start().<p>
- *
- * Subclasses must implement: 
- * <dl>
- * <dd>String title()
- * <dd>Panel centerPanel()
- * </dl>
- * Subclasses should populate the Panel returned from 
- * centerPanel() with whatever makes sense for their unit test.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     TitledPanel
- */
-abstract public class UnitTest extends Applet {
-    abstract public String title();
-    abstract public Panel  centerPanel();
-
-    public void init() {
-        Util.getFrame(this).setCursor(Frame.WAIT_CURSOR);
-        Panel titledPanel = new TitledPanel(title());
-        setLayout(new BorderLayout());
-        add("North",  titledPanel);
-        add("Center", centerPanel());
-    }
-    public void start() {
-        Util.getFrame(this).setCursor(Frame.DEFAULT_CURSOR);
-    }
-}
diff --git a/java/java_cup/java_cup.dsp b/java/java_cup/java_cup.dsp
deleted file mode 100644
index 8da88f40928..00000000000
--- a/java/java_cup/java_cup.dsp
+++ /dev/null
@@ -1,224 +0,0 @@
-# Microsoft Developer Studio Project File - Name="java_cup" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=java_cup - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "java_cup.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "java_cup.mak" CFG="java_cup - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "java_cup - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "java_cup - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "java_cup - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "java_cup - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "../"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "java_cup - Java Virtual Machine Release"

-# Name "java_cup - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\action_part.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\action_production.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\char_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\double_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\emit.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\float_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\int_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\internal_error.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lalr_item.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lalr_item_set.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lalr_state.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lalr_transition.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lexer.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\long_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\lr_item_core.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\lr_parser.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Main.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\non_terminal.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parse_action.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parse_action_row.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parse_action_table.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parse_reduce_row.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parse_reduce_table.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parser.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\production.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\production_part.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\reduce_action.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\shift_action.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\str_token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\sym.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\symbol.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\symbol.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\symbol_part.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\symbol_set.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\terminal.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\terminal_set.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\version.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\runtime\virtual_parse_stack.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/java_cup/java_cup.dsw b/java/java_cup/java_cup.dsw
deleted file mode 100644
index be87e846db8..00000000000
--- a/java/java_cup/java_cup.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "java_cup"=.\java_cup.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/java/netsvcs/Logger/DefaultLMR.java b/java/netsvcs/Logger/DefaultLMR.java
deleted file mode 100644
index 19e319de015..00000000000
--- a/java/netsvcs/Logger/DefaultLMR.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    DefaultLMR.java
- *
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-class DefaultLMR implements LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record)
-    {
-      record.print(hostname, true, System.err);
-    }
-}
diff --git a/java/netsvcs/Logger/LogMessageReceiver.java b/java/netsvcs/Logger/LogMessageReceiver.java
deleted file mode 100644
index c001e06f2bd..00000000000
--- a/java/netsvcs/Logger/LogMessageReceiver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogMessageReceiver.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  Other implementations of this interface can be built and
- * given to the ServerLoggingAcceptor to change the result.
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-public interface LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record);
-};
diff --git a/java/netsvcs/Logger/LogRecord.java b/java/netsvcs/Logger/LogRecord.java
deleted file mode 100644
index 721341cb252..00000000000
--- a/java/netsvcs/Logger/LogRecord.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogRecord.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.util.Date;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.PrintStream;
-import java.io.IOException;
-import JACE.OS.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Communicates logging information.  Compatible with the C++ ACE
- * ACE_Log_Record class.
- *
- */
-public class LogRecord
-{
-  final public int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private long msec_;
-  private int pid_;
-  private byte[] msgData_;
-  private final static int numIntMembers = 5;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    this(0, (int)new Date().getTime(), 0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param milliseconds time attached to the log entry in Unix <pre>time_t</pre> format 
-   * @param pid the process ID; not currently used
-   */
-  public LogRecord(int priority,
-		   long milliseconds,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(milliseconds);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    return new String(msgData_);
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * @param hostname name of the host generating this record
-   * @param verbose if <b>true</b>, print information in the form, (give example)
-   * @param ps A PrintStream instance to which the output should go.
-   * @see PrintStream,String
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	Date now = new Date(this.timeStamp());
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Streaming methods
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    // This, of course, is VERY fragile, and ought not be used as
-    // a model for anything except how NOT to do anything.
-    type(dis.readInt());
-    length(dis.readInt());
-    this.timeStamp((long)dis.readInt() * 1000);
-
-    // Skip smaller time resolution info since we're lucky if Java's
-    // timer can handle more than millisecond precision, anyway
-    dis.skipBytes(4); 
-
-    pid(dis.readInt());
-
-    // Does readFully() allocate space for the buffer?  Either
-    // way, we won't have memory leaks :-)
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    msgData_ = new byte[dataLength];
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(length());
-    dos.writeInt(type());
-    dos.writeInt(length());
-    dos.writeInt((int)(this.msec_ / 1000));
-    dos.writeInt(0);  
-    dos.writeInt(pid());
-
-    dos.write(msgData_);
-  }
-
-  /**
-   * Accessor methods
-   */
-  public int type()            { return type_; }
-  public void type(int t)      { type_ = t; }
-
-  public int length()          { return length_;  }
-  public void length(int l)    { length_ = l; }
-  private void setLen(int msgLen)
-       { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  public long timeStamp()      { return this.msec_; }
-  public void timeStamp(long msec){ this.msec_ = msec; }
-
-  public int pid()             { return pid_; }
-  public void pid(int p)       { pid_ = p; }
-
-  public byte[] msgData()      { return msgData_; }
-  public void msgData(byte[] m)
-    { 
-      int size = m.length;
-
-      if (size > MAXLOGMSGLEN) 
-	size = MAXLOGMSGLEN;
-
-      this.msgData_ = new byte[size];
- 
-      System.arraycopy(m, 0, msgData_, 0, size);
-
-      setLen(size);
-    }
-
-  public void msgData(String m)
-  {
-    byte temp[] = m.getBytes();
-    if (temp.length > MAXLOGMSGLEN) {
-      this.msgData_ = new byte[MAXLOGMSGLEN];
-      
-      System.arraycopy(temp, 0, msgData_, 0, MAXLOGMSGLEN);
-    } else
-      this.msgData_ = temp;
-    
-    setLen(msgData_.length);
-  }
-};
-
diff --git a/java/netsvcs/Logger/Makefile b/java/netsvcs/Logger/Makefile
deleted file mode 100644
index 0f024034839..00000000000
--- a/java/netsvcs/Logger/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = $(WRAPPER_ROOT)/java
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files = LogMessageReceiver.java \
-	DefaultLMR.java \
-	LogRecord.java \
-	ServerLoggingAcceptor.java \
-	ServerLoggingHandler.java
-
-packages = netsvcs \
-	   netsvcs.Logger
-
-realclean: 
-	/bin/rm -rf ${JACE_WRAPPER}/classes/netsvcs/Logger
-
diff --git a/java/netsvcs/Logger/ServerLoggingAcceptor.java b/java/netsvcs/Logger/ServerLoggingAcceptor.java
deleted file mode 100644
index d5d4ae5220d..00000000000
--- a/java/netsvcs/Logger/ServerLoggingAcceptor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingAcceptor.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.io.*;
-import java.net.*;
-import JACE.Misc.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Acceptor:  Listens on a specified port and launches ServerLoggingHandlers
- * in response to requests.  A LogMessageReceiver can be specified on the
- * command line to change the way the logging service processes messages.
- *
- * @see netsvcs.Logger.ServerLoggingHandler, netsvcs.Logger.LogMessageReceiver
- */
-public class ServerLoggingAcceptor extends Acceptor implements Runnable
-{
-  /** Main function to bootstrap the process
-   *
-   *  Command line arguments:
-   *
-   *  -p <port>         Select a port for listening for requests
-   *  -r <class name>   Specify a LogMessageReceiver (make sure it's a full class name)
-   * 
-   */
-  public static void main (String [] args)
-    {
-      ServerLoggingAcceptor sla = new ServerLoggingAcceptor();
-
-      sla.init(args);
-    }
-
-  /** 
-   * Receives the command line and launches its own thread
-   */
-  public int init (String [] args)
-    {
-      this.parseArgs(args);
-
-      // If the user didn't specify a LogMessageReceiver, use the default
-      // (which just calls a print method on LogMessage)
-      if (this.receiver_ == null)
-	this.receiver_ = new DefaultLMR();
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   * Specify what LogMessageReceiver to use 
-   */
-  public void setLMR(LogMessageReceiver receiver)
-    {
-      this.receiver_ = receiver;
-    }
-
-  /** 
-   * Accessor for the LogMessageReceiver
-   */
-  public LogMessageReceiver getLMR ()
-    {
-      return this.receiver_;
-    }
-
-  /** 
-   * Create a new ServerLoggingHandler 
-   */
-  protected SvcHandler makeSvcHandler ()
-    throws InstantiationException, IllegalAccessException
-    {
-      return new netsvcs.Logger.ServerLoggingHandler (this.receiver_);
-    }
-
-  /**
-   * Run forever accepting new connections
-   */
-  public void run ()
-    {
-      try {
-
-	this.open (this.port_);
-	while (true) 
-	  this.accept();  
-
-      } catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-
-      ACE.ERROR("ServerLoggingAcceptor has exited");
-    }
-
-  /**
-   * Process the command line
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:r:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'r':
-	    // Load the LMR with the given name
-	    s = new String(opt.optarg ());
-	    Class LMRfactory;
-	    try {
-	      LMRfactory = Class.forName(s);
-
-	      receiver_ = (LogMessageReceiver)LMRfactory.newInstance();
-
-	    } catch (ClassNotFoundException e) {
-	      ACE.ERROR("Unable to find LMR factory: " + e);
-	    } catch (InstantiationException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    } catch (IllegalAccessException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    }
-	    // Any of the above exceptions will result in just using the
-	    // default LMR
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    ACE.ERROR ("Valid args: -p <port> -r <LogMessageReceiver name>");
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = ACE.DEFAULT_SERVER_PORT;
-  private LogMessageReceiver receiver_ = null;
-};
-
-
-
-
-
-
diff --git a/java/netsvcs/Logger/ServerLoggingHandler.java b/java/netsvcs/Logger/ServerLoggingHandler.java
deleted file mode 100644
index 9088e17d9d1..00000000000
--- a/java/netsvcs/Logger/ServerLoggingHandler.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingHandler.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.util.*;
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Created by ServerLoggingAcceptor every time a client connects.  This reads 
- * a logging statement passes it to the LogMessageReceiver for processing.
- * </blockquote>
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- */
-public class ServerLoggingHandler extends SvcHandler
-{
-  // Processes log messages
-  private LogMessageReceiver receiver_;
-
-  /**
-   * Constructor
-   *
-   *@param receiver    LogMessageReceiver that handles what to do with a message
-   */
-  public ServerLoggingHandler (LogMessageReceiver receiver)
-  {
-    super();
-    this.receiver_ = receiver;
-  }
-
-  /**
-   * Start this handler in its own thread
-   */
-  public int open(Object obj)
-  {
-    new Thread (this).start();
-    return 0;
-  }
-
-  /**
-   * Accessor: get the host name of the connected client
-   */
-  protected String hostName ()
-  {
-    return new String(this.peer().socket().getInetAddress().getHostName());
-  }
-
-  /**
-   * Receive input from the client, and send it to the LMR.  This is the
-   * main loop for this thread.
-   */
-  public void run()
-  {
-    DataInputStream dis = new DataInputStream(this.peer().inputStream());
-
-    for (;;)
-      {
-	// Messages arrive in the following format:
-	// o 4 byte length (network format)
-	// o message, in ACE.LogRecord format
-	//
-	// Hey!  We need exception catching in here too!
-	try
-	  {
-	    // Reconstitute a log message from the wire
-	    LogRecord rec = new LogRecord();
-
-	    // We don't really need this, because
-	    // the object already knows how to
-	    // extract itself properly.  However,
-	    // in order to interoperate with the
-	    // C++ version, this must be extracted.
-	    // Plus, it makes a convenient way to
-	    // check everything.
-	    int length = dis.readInt();
-	
-	    rec.streamInFrom(dis);
-	
-	    if (rec.length() == length)
-	      {
-		// Give the record to the log processor
-		this.receiver_.logRecord(this.hostName(),
-					   rec);
-	      }
-	    else
-	      {
-		ACE.ERROR(Thread.currentThread().getName() + ": Length error");
-	      }
-	  }
-	catch (EOFException eof)
-	  {
-	    try { 
-	      this.stream_.close(); 
-	    } catch (IOException n) { }
-
-	    return;
-	  }
-	catch (IOException ioe)
-	  {
-	    ACE.ERROR(Thread.currentThread().getName()
-			       + ": "
-			       + ioe);
-	  }
-      }
-  }
-};
-
diff --git a/java/netsvcs/Time/Clerk.java b/java/netsvcs/Time/Clerk.java
deleted file mode 100755
index f29e08e06f8..00000000000
--- a/java/netsvcs/Time/Clerk.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Clerk.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time server clerk
-public class Clerk
-{
-  public static void main (String [] args)
-    {
-      TSClerkProcessor clerk = new TSClerkProcessor ();
-      clerk.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/Makefile b/java/netsvcs/Time/Makefile
deleted file mode 100755
index b6dc6dd02ea..00000000000
--- a/java/netsvcs/Time/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = $(WRAPPER_ROOT)/java
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files =  TSClerkProcessor.java \
-	 TSClerkHandler.java \
-	 TSRequestAcceptor.java \
-	 TSRequestHandler.java \
-	 TSServerAcceptor.java \
-	 TSServerHandler.java \
-	 Clerk.java \
-	 Server.java
-
-packages = netsvcs \
-	   netsvcs.Time
-
-realclean: 
-	/bin/rm -rf ${JACE_WRAPPER}/classes/netsvcs/Time
-
diff --git a/java/netsvcs/Time/Server.java b/java/netsvcs/Time/Server.java
deleted file mode 100755
index 6b44ddf8d9f..00000000000
--- a/java/netsvcs/Time/Server.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Server.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time service server
-public class Server
-{
-  public static void main (String [] args)
-    {
-      TSServerAcceptor server = new TSServerAcceptor ();
-      server.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/TSClerkHandler.java b/java/netsvcs/Time/TSClerkHandler.java
deleted file mode 100755
index fc89b69c45c..00000000000
--- a/java/netsvcs/Time/TSClerkHandler.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Clerk_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Requests the remote time on a server at regular
- * intervals.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>TSClerkHandlers are created by a TSClerkProcessor.  There
- * is one handler for each server that the Clerk Processor factors into
- * its calculations.</blockquote>
- */
-public class TSClerkHandler extends SvcHandler
-{
-  /**
-   * Constructor.  TSClerkProcessor specifies the server machine and
-   * port, as well as the interval at which to make the query.
-   */
-  public TSClerkHandler (String hostname, 
-			 int port,
-			 TimerQueue tq, 
-			 int timeout,
-			 TSClerkProcessor parent)
-  {
-
-    this.hostname_ = hostname;
-    this.port_ = port;
-    this.tq_ = tq;
-    this.timeout_ = timeout;
-
-    this.initialTimeout_ = timeout;
-    this.processor_ = parent;
-
-    this.sendMsg_ = new String ("TIME_UPDATE_REQUEST");
-  }
-  
-  /**
-   * Called to start this handler in a new thread.  This only
-   * does it when the state of the handler is INITIALIZING.
-   */
-  public int open (Object obj)
-  {
-    if (this.state_ != RECONNECTING) {
-
-      Thread test = new Thread(this);
-
-      new Thread (this).start ();
-
-    }
-    return 0;
-  }
-
-  /**
-   * Accessor - return the host name of the server
-   */
-  public String hostname ()
-  {
-    return this.hostname_;
-  }
-
-  /**
-   * Accessor - return the port used to contact the server
-   */
-  public int port ()
-  {
-    return this.port_;
-  }
-
-  /**
-   * Accessor - returns the difference between the local time and
-   * the remote server. 
-   */
-  public long delta ()
-  {
-    return this.delta_;
-  }
-
-  /**
-   * Called when the thread starts.  Schedules itself with the
-   * timer queue.
-   */
-  public void run ()
-  {
-    this.timerId_ = this.tq_.scheduleTimer (this,
-					    null,
-					    new TimeValue (this.timeout_),
-					    new TimeValue (this.timeout_));
-
-  }
-
-  /**
-   * Accessor - return the state
-   */
-  public int state() 
-  {
-    return this.state_;
-  }
-
-  /**
-   * Sets the state of the handler
-   */
-  public void state(int newState)
-  {
-    this.state_ = newState;
-  }
-
-  /**
-   * Provides a new time out interval (exponentially increasing) so
-   * that if the server doesn't respond, we don't keep trying to
-   * reconnect as often.  Maximum value is 5 minutes.
-   */
-  public int recalculateTimeout() 
-  {
-    this.timeout_ *= 2;
-
-    if (this.timeout_ > this.max_timeout_)
-      this.timeout_ = max_timeout_;
-
-    return this.timeout_;
-  }
-
-  /**
-   * Start the recovery from a server disconnection by closing the
-   * port and recalculating the timeout value.
-   */
-  protected void errorRecovery()
-  {
-    ACE.DEBUG("Time Service failure with server " + this.hostname_);
-
-    this.timeout_ = this.recalculateTimeout();
-
-    this.reschedule();
-  }
-
-  /**
-   * Removes this handler from the timer queue, and reschedules it
-   * (presumably with a new timeout value)
-   */
-  public void reschedule()
-    {
-      this.tq_.cancelTimer(this);
-
-      this.timerId_ = this.tq_.scheduleTimer (this,
-					      null,
-					      new TimeValue (this.timeout_),
-					      new TimeValue (this.timeout_));
-    }
-
-  /**
-   * Called back by the timer queue.  If the handler isn't connected,
-   * it tries to reconnect to the server.  Otherwise, it requests
-   * the remote time.  The server is said to have disconnected when
-   * an exception is thrown in the socket system, or the result is
-   * a string with length <= 0.
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    if (this.state_ != CONNECTED) {
-
-      this.processor_.initiateConnection(this);
-
-      // If still not connected
-      if (this.state_ != CONNECTED) { 
-
-	// used to set state to reconnecting here
-	this.state_ = RECONNECTING;
-
-	// Reschedule to try again later
-	this.errorRecovery();
-	return 0;
-      } 
-
-      // If connected, poll the server at the requested intervals
-      this.resetTimeout();
-    }
-
-    StringBuffer ack = new StringBuffer ();
-    int ackLen;
-    try
-      {
-	// Used to calculate the turn-around time
-	long sendTime = System.currentTimeMillis();
-
-	this.peer ().send(this.sendMsg_);
-	ackLen = this.peer ().recv (ack);
-
-	long recvTime = System.currentTimeMillis();
-
-	if (ackLen <= 0) {
-
-	  this.state_ = DISCONNECTED;
-	  return -1;
-
-	} else {   
-
-	  long delta = (new Long(ack.toString())).longValue() - recvTime;
-
-	  delta += (recvTime - sendTime) / 2;
-
-	  this.delta_ = delta;
-
-          System.err.println("Delta: " + this.delta_);
-	}
-
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("connection reset by peer");
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-
-    return 0;
-  }
-  
-  /**
-   * Resets the timer interval to be the one supplied to the
-   * constructor.
-   */
-  public void resetTimeout()
-    {
-      this.timeout_ = this.initialTimeout_;
-
-      this.reschedule();
-    }
-    
-  private TSClerkProcessor processor_;
-  // Reference used to re-establish connections
-
-  public static final int MAX_RETRY_TIMEOUT = 300;
-  // Wait at most 5 minutes before trying to reconnect
-
-  // States
-  public static final int CONNECTED = 0;
-  public static final int DISCONNECTED = 1;
-  public static final int RECONNECTING = 2;
-
-  // If there has been a failure, try reconnecting
-  // at least every MAX_RETRY_TIMEOUT seconds
-  private int max_timeout_ = MAX_RETRY_TIMEOUT;
-
-  // State of the handler
-  private int state_ = DISCONNECTED;
-
-  // Difference between the remote time and the local time.
-  private long delta_ = 0;
-
-  // Name of the remote host
-  private String hostname_;
-
-  // Port used for the connection
-  private int port_;
-
-  // Current timer interval
-  private int timeout_;
-
-  // Reference to the Clerk Processor's timer queue
-  private TimerQueue tq_;
-
-  // Message to send for a time update
-  private String sendMsg_;
-
-  // ID of the handler in the queue
-  private int timerId_;
-
-  // Desired time interval to receive updates
-  private int initialTimeout_;
-
-}
diff --git a/java/netsvcs/Time/TSClerkProcessor.java b/java/netsvcs/Time/TSClerkProcessor.java
deleted file mode 100755
index d7b1773cc9e..00000000000
--- a/java/netsvcs/Time/TSClerkProcessor.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSClerkProcessor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- *
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7989) and launches
- * TSClerkHandlers when connections are made.  The handlers communicate
- * with servers and calculate the difference between the server time
- * and local time.  The Clerk Processor averages these differences
- * and reports them to clients.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>This doesn't actually change the system clock, but it
- * provides the average of the differences of the local and server
- * times.  A client could use this information to adjust the clock, or
- * just use the midpoint to determine the correct network time.</blockquote>
- *
- */
-public class TSClerkProcessor extends Connector implements Runnable
-{
-  /**
-   * Default constructor
-   */
-  public TSClerkProcessor ()
-  {
-    this.serverArray_ = new Vector ();
-
-  }
-
-  /**
-   * Parse the command line, setup the TSRequestAcceptor, and run
-   * the Clerk Processor in its own thread.
-   */
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-      
-      TSRequestAcceptor ra = new TSRequestAcceptor (this);
-      ra.init (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-
-  /**
-   * Makes connections to the servers, schedules itself for intervals
-   * to update the delta time.
-   */
-  public void run ()
-  {
-
-    // Set up connections with all servers
-    Enumeration table = this.serverArray_.elements ();
-    while (table.hasMoreElements ())
-      {
-	this.initiateConnection((TSClerkHandler)table.nextElement());
-      }
-
-    // Set up timer
-    this.timer_id_ = this.tq_.scheduleTimer (this,
-					     null,
-					     new TimeValue (this.timeout_),
-					     new TimeValue (this.timeout_));
-  }
-
-  /**
-   * Makes connections to the servers.
-   */
-  public void initiateConnection (TSClerkHandler handler)
-  {
-    this.open (handler.hostname(), handler.port());
-
-    try
-      {
-	// Connect to the server
-	this.connect (handler);
-
-	// Set the state of the Clerk Handler so it queries the
-	// server at intervals.
-	handler.state(TSClerkHandler.CONNECTED);
-	
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Connection refused");
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-
-  /**
-   *
-   * Called by the timer queue.  Calls updateTime().
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return this.updateTime ();
-  }
-
-  /**
-   * Calculates the delta time by averaging the results from
-   * Clerk Handler delta()'s.  It only includes handlers whose
-   * state is currently CONNECTED.  If they're not connected, it
-   * reschedules them to begin the error correction process of
-   * trying to reconnect to the server (possible synch problems?).
-   */
-  protected int updateTime ()
-  {
-    TSClerkHandler handler;
-    int count = 0;
-    long totalDeltaTime = 0;
-
-    Enumeration table = this.serverArray_.elements ();
-
-    while (table.hasMoreElements ())
-      {
-	handler = (TSClerkHandler) table.nextElement ();
-
-	if (handler.state() != TSClerkHandler.CONNECTED) {
-
-	  // Reconnecting state means we don't need to put
-	  // it in the timer queue again
-	  if (handler.state() == TSClerkHandler.RECONNECTING)
-	    continue;
-	  else
-	  if (handler.state() == TSClerkHandler.DISCONNECTED) 
-	    handler.state(TSClerkHandler.RECONNECTING);
-
-	  handler.errorRecovery();
-	  continue;
-	}
-
-	long delta = handler.delta();
-
-	ACE.DEBUG(handler.hostname() + ": " + delta);
-
-	totalDeltaTime += delta;
-	count++;
-      }
-
-    if (count > 0) {
-
-      this.timeDelta_ = totalDeltaTime / count;
-
-      ACE.DEBUG("Average deviation: " + totalDeltaTime/count);
-
-    } else
-
-      this.timeDelta_ = 0;
-
-    return 0;
-  }
-
-  /**
-   * Return the delta time.
-   */
-  public long getDelta()
-    {
-      return this.timeDelta_;
-    }
-
-  /**
-   * Parse the command line.  Watches for -t <time> and
-   * -h <machine:port> switches.  Must specify time
-   * value before host switches!
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "t:h:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 't':
-	    s = opt.optarg ();
-	    this.timeout_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'h':
-	    s = opt.optarg ();
-	    this.addNewHandler (s);
-	    break;
-	  default:
-	    ACE.ERROR ("Bad command line argument: " + c);
-
-	    ACE.ERROR ("Valid arguments: -t <timeout> -h <hostname>:<port> -h ...");
-	    break;
-	  }
-      }
-  }
-  
-  /**
-   *
-   * Creates a new Clerk Handler and adds it to the serverArray_
-   */
-  private void addNewHandler (String s)
-  {
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    String hostname = tokens.nextToken ();
-
-    int port = (new Integer (tokens.nextToken ())).intValue ();
-    
-    // Create new handler and add it to array of servers
-    this.serverArray_.addElement (new TSClerkHandler (hostname, 
-						      port,
-						      this.tq_,
-						      this.timeout_,
-						      this));
-  }
-  
-  // Vector of TSClerkHandlers, one for each server
-  private Vector serverArray_;
-
-  // Default interval at which to update the time
-  private int timeout_ = 1000;
-
-  // Timer queue which calls handleTimeout when the Clerk Processor
-  // is supposed to update the time.
-  private TimerQueue tq_ = new TimerQueue (true);
-
-  // Clerk Processor ID in the timer queue
-  private int timer_id_;
-
-  // Average of the differences of the local and server times.
-  private long timeDelta_;
-}
diff --git a/java/netsvcs/Time/TSRequestAcceptor.java b/java/netsvcs/Time/TSRequestAcceptor.java
deleted file mode 100755
index e02b0b261ba..00000000000
--- a/java/netsvcs/Time/TSRequestAcceptor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestAcceptor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7990) and launches 
- * TSRequestHandlers when connections are made.  The handlers
- * report the average deviation from the local time when input
- * is received to their sockets.</blockquote>
- * 
- * <p><h2>DESCRIPTION</h2>
- * <blockquote>This is in place of the shared memory system used in C++ ACE.  
- * The clients need to request the correct time range from the Clerk, so
- * they can do it with <a href="ACE.SOCK_SAP.SOCKStream.html#_top_">
- * <tt>sockets</tt></a>.  An instance of TSRequestAcceptor is created
- * and initialized in TSClerkProcessor init().  This should be the
- * only place it's used.</blockquote>
- *
- * @see ACE.SOCK_SAP.SOCKAcceptor,ACE.netsvcs.Time.TSClerkProcessor
- */
-
-public class TSRequestAcceptor extends Acceptor implements Runnable
-{
-  /**
-   * Create an instance of TSRequestAcceptor.  Default constructor.
-   */
-  public TSRequestAcceptor (TSClerkProcessor parent) 
-    {
-      this.parent_ = parent;
-    }
-
-  /**
-   *
-   * Process command line arguments (port), and start this instance
-   * in its own thread.
-   *
-   */
-  public int init(String [] args)
-    {
-      this.parseArgs (args);
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   *
-   * Called when the thread starts.  Open the port and accept
-   * connections.
-   */
-  public void run ()
-    {
-      try {
-	this.open (this.port_);
-	while (true)
-	  this.accept();
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-    }
-
-  /**
-   *
-   * Parse the command line.  This only looks for -p <port number>.
-   *
-   */
-  protected void parseArgs (String args[])
-    {
-      String s;
-      GetOpt opt = new GetOpt (args, "p:");
-
-      for (int c; (c = opt.next ()) != -1; )
-	{
-	  switch (c)
-	    {
-	    case 'p':
-	      s = opt.optarg ();
-	      this.port_ = (new Integer (s)).intValue ();
-	      break;
-	    default:
-	      ACE.ERROR("Invalid argument: " + c);
-	      break;
-	    }
-	}
-    }
-
-  /**
-   *
-   * Modifies to behavior of Acceptor accept() so the TSClerkProcessor
-   * reference can be passed to the TSRequestHandler.
-   *
-   */
-
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    return (SvcHandler) new TSRequestHandler(parent_);
-  }
-
-  // Port to monitor
-  private int port_ = 7990;
-
-  // Reference to the Clerk Processor (which holds the time value)
-  private TSClerkProcessor parent_;
-};
-     
diff --git a/java/netsvcs/Time/TSRequestHandler.java b/java/netsvcs/Time/TSRequestHandler.java
deleted file mode 100755
index dbeded22250..00000000000
--- a/java/netsvcs/Time/TSRequestHandler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package netsvcs.Time;
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestHandler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Handles giving the client the average difference between
- * the local time and the server times.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>Whenever the RequestHandler receives input to the port, it
- * sends the current delta (average difference time) in return as a string.
- * Instances of this class are created by TSRequestAcceptor.</blockquote>
- */
-public class TSRequestHandler extends SvcHandler
-{
-  /**
-   * Constructor.  Takes in a reference to the Clerk Processor
-   * so it can call TSClerkProcessor getDelta().
-   */
-  public TSRequestHandler (TSClerkProcessor processor)
-  {
-    this.processor_ = processor;
-  }
-  
-  /**
-   *
-   * Run this in a separate thread.
-   */
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  /**
-   *
-   * Called when the thread starts.  This is the main code -- whenever
-   * input comes to the socket, it sends out the current delta time
-   * as a string.
-   */
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    StringBuffer msg = new StringBuffer ();
-	    
-	    msgLen = this.peer ().recv (msg);
-
-	    if (msgLen < 0)
-	      break;
-	    else {
-	      
-	      // No matter what was sent in, send the average difference back
-
-	      String msgOut = new String("" + this.processor_.getDelta() + '\n');
-	      this.peer ().send (msgOut);
-
-	    }
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	    ACE.ERROR (e);
-	  }
-      }
-  }
-  
-
-  // Reference to the Clerk Processor to call getDelta()
-  TSClerkProcessor processor_;
-}
diff --git a/java/netsvcs/Time/TSServerAcceptor.java b/java/netsvcs/Time/TSServerAcceptor.java
deleted file mode 100755
index 2d54f7b740b..00000000000
--- a/java/netsvcs/Time/TSServerAcceptor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *
- * Acceptor: listens to a port and launches TSServerHandlers
- * when connections are made.
- *
- * @see netsvcs.Time.TSServerHandler, JACE.Connection.Acceptor
- */
-public class TSServerAcceptor extends Acceptor implements Runnable
-{
-  // Run this in its own thread
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-  // Create a TSServerHandler for each client that wants to connect
-  public void run ()
-  {
-    try
-      {
-	this.setHandlerFactory (Class.forName ("netsvcs.Time.TSServerHandler"));
-	this.open (this.port_);
-	while (true)
-	  this.accept ();
-      }
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Socket Exception: " + e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-  }
-
-  // Process the command line
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = 7989;
-}
-
diff --git a/java/netsvcs/Time/TSServerHandler.java b/java/netsvcs/Time/TSServerHandler.java
deleted file mode 100755
index 4ee700254ed..00000000000
--- a/java/netsvcs/Time/TSServerHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *     
- * <blockquote>Handles requests from a TSClerkHandler and sends
- * back the current local time.</blockquote>
- *
- * @see netsvcs.Time.TSClerkHandler. netsvcs.Time.TSServerAcceptor
- */
-
-public class TSServerHandler extends SvcHandler
-{
-  // Constructor
-  public TSServerHandler ()
-  {
-  }
-  
-  // Start this handler in its own thread
-  public int open (Object obj)
-  {
-
-    new Thread (this).start ();
-    return 0;
-  }
-
-  // Wait for messages from the Client and send the current local
-  // time back as a string.
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    // Use a new one each time since recv appends
-	    StringBuffer msg = new StringBuffer ();
-
-	    // Get the message from the client (blocks)
-	    msgLen = this.peer ().recv (msg);
-
-	    // Just keep waiting if there's a problem
-	    if (msgLen <= 0)
-	      break;
-
-	    // Is the message for the right thing?
-	    if (msg.toString().compareTo ("TIME_UPDATE_REQUEST") != 0) {
-	      System.err.println("Unknown message: \"" + msg + '\"');
-	      this.peer().send("\n");  // send so other side isn't stuck
-	      break;
-	    }
-
-	    // Get local time
-	    long time = System.currentTimeMillis();
-
-	    // Send as a string
-	    this.peer ().send ("" + time);
-
-	    ACE.DEBUG("Time: " + new Date(time));
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	  }
-      }
-  }
-}
diff --git a/java/src/ACE.java b/java/src/ACE.java
deleted file mode 100644
index 8fa6e1823fa..00000000000
--- a/java/src/ACE.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    JACE.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- * <blockquote>Constants, utility "functions", etc.</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * Defines default constants for ACE. Many of these are used for the
- * ACE tests and applications. You may want to change some of these to
- * correspond to your environment. Also, routines for error handling,
- * debugging and bit manipulation are included.
- *</blockquote>
- *
- * <h2>NOTES</h2>
- *<blockquote>
- * This class is non-instantiable, and intended only to provide a constrained
- * namespace.
- *</blockquote>
- */
-public abstract class ACE
-{
-  /**
-   * Default port on which a server listens for connections.
-   */
-  public static final int DEFAULT_SERVER_PORT = 10002;
-
-  /** 
-   * Default name to use for a thread group.
-   */
-  public static final String DEFAULT_THREAD_GROUP_NAME = "ace_thread_group";
-
-  /**
-   * Disable debugging. Once debugging is disabled, all ACE.DEBUG
-   * statements would be ignored. 
-   */
-  public static final void disableDebugging ()
-  {
-    ACE.debug_ = false;
-  }
-
-  /**
-   * Enable debugging. Once debugging is enabled, all ACE.DEBUG
-   * statements get printed.
-   */
-  public static final void enableDebugging ()
-  {
-    ACE.debug_ = true;
-  }
-
-  /** 
-   * Print the string representation of Java Exception.
-   *@param e Java exception
-   */
-  public static final void ERROR (Exception e)
-    {
-      System.err.println (e);
-    }
-
-  /** 
-   * Print the string being passed in.
-   *@param s a Java String
-   */
-  public static final void ERROR (String s)
-    {
-      System.err.println (s);
-    }
-
-  /** 
-   * Print the string being passed in.
-   *@param s A Java String
-   *@return Error value passed in
-   */
-  public static final int ERROR_RETURN (String s, int errorVal)
-    {
-      System.err.println (s);
-      return errorVal;
-    }
-
-  /** 
-   * Print the string being passed in. Note the behavior will vary
-   * depending upon whether debugging is enabled or disabled.
-   *@param s a Java String
-   */
-  public static final void DEBUG (String s)
-    {
-      if (ACE.debug_)
-	System.out.println (s);
-    }
-
-  /** 
-   * Flush out any data that may be buffered.
-   */
-  public static final void FLUSH ()
-    {
-      System.out.flush ();
-    }
-
-  /** 
-   * Set the bits of WORD using BITS as the mask.
-   *@param WORD the bits to be set.
-   *@param BITS the mask to use.
-   *@return The value obtained after setting the bits.
-   */
-  public static final long SET_BITS (long WORD, long BITS)
-    {
-      return WORD | BITS;
-    }
-
-  /** 
-   * Clear the bits of WORD using BITS as the mask.
-   *@param WORD the bits to clear.
-   *@param BITS the mask to use.
-   *@return The value obtained after clearing the bits.
-   */
-  public static final long CLR_BITS (long WORD, long BITS)
-    {
-      return WORD & ~BITS;
-    }
-  
-  /** 
-   * Check if bits are enabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is enabled or not.
-   *@return true if bit is enabled, false otherwise.
-   */
-  public static final boolean BIT_ENABLED (long WORD, long BIT)
-    {
-      return (WORD & BIT) != 0;
-    }
-
-  /** 
-   * Check if bits are disabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is disabled or not.
-   *@return true if bit is disabled, false otherwise.
-   */
-  public static final boolean BIT_DISABLED (long WORD, long BIT)
-    {
-      return (WORD & BIT) == 0;
-    }
-  
-  // Debug flag (turn debugging on/off)
-  private static boolean debug_ = true;
-
-  // Default private constructor to avoid instantiation
-  private ACE ()
-  {
-  }
-}
-
-
diff --git a/java/src/AcceptStrategy.java b/java/src/AcceptStrategy.java
deleted file mode 100644
index 7b48510840e..00000000000
--- a/java/src/AcceptStrategy.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    AcceptStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Interface for specifying a passive connection
- * acceptance strategy for a 
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>
- * .
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *
- *<blockquote>
- * This class provides a strategy that manages passive
- * connection setup for an application, and can be extended
- * to define new strategies.
- *</blockquote>
- *
- * @see SvcHandler
- * @see Acceptor
- */
-
-public class AcceptStrategy
-{
-  /**
-   * Create an instance of Accept Strategy.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  AcceptStrategy (int port) throws IOException
-  {
-    this.open (port);
-  }
-
-  /**
-   * Initialize AcceptStrategy.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  public void open (int port) throws IOException
-  {
-    // Create a new SOCK_Acceptor to accept client connections
-    this.sockAcceptor_ = new SOCKAcceptor (port);
-  }
-
-  /**
-   * Accept connections into the SvcHandler. Note that subclasses
-   * should overwrite this method to provide a different accept
-   * strategy.
-   *@param sh Svc Handler in which to accept the connection
-   *@exception SocketException
-   *@exception IOException
-   *@return 0
-   */
-  public int acceptSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-    {
-      // Create a new stream
-      SOCKStream sockStream = new SOCKStream ();
-      
-      // Block in accept. Returns when a connection shows up
-      this.sockAcceptor_.accept (sockStream);
-      
-      // Set the streams for the new handler
-      sh.setHandle (sockStream);
-      return 0;
-    }
-
-  // Our connection acceptance factory
-  private SOCKAcceptor sockAcceptor_;
-
-}
diff --git a/java/src/Acceptor.java b/java/src/Acceptor.java
deleted file mode 100644
index 1db6e01f7b5..00000000000
--- a/java/src/Acceptor.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Abstract factory for creating a service handler
- * (<a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * accepting into the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>, and activating the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>Implements the basic strategy for passively establishing
- * connections with applications.  The <tt>Acceptor</tt>
- * is a factory for <tt>SvcHandler</tt> instances, and, by default
- * generates a new <tt>SvcHandler</tt> instance for each connection
- * esablished.</blockquote>
- *
- * <p>
- *
- * <blockquote> The user of this class <em>must</em> provide a
- * reference to a handler factory prior to calling <a
- * href="#accept()"><tt>accept</tt></a>, or an exception will be
- * thrown.  The handler factory is identified by the meta-class for
- * the <tt>SvcHandler</tt>, and is typically obtained by calling <a
- * href="java.lang.Class#classForName(java.lang.String)"><tt>Class.classForName("SvcHandler")</tt></a>.
- * </blockquote>
- *
- * <p>
- *
- * <blockquote> TCP is the transport mechanism used, via
- * <a href="ACE.SOCK_SAP.SOCKAcceptor.html#_top_"><tt>SOCKAcceptor</tt></a>,
- * <em>et.al.</em> The SvcHandler is instantiated with a concrete type
- * that performs the application-specific service. </blockquote>
- *
- * <h2>NOTES</h2>
- *
- * <blockquote> This class is not directly related to the
- * <tt>AcceptorStrategy</tt> class.</blockquote>
- *
- *
- * @see java.lang.Class,ACE.Connection.SvcHandler,ACE.SOCK_SAP.SOCKAcceptor */
-public class Acceptor extends ServiceObject
-{
-  /**
-   * Create an instance of Acceptor. Default constructor.  Note that if
-   * an instance is created via this method, <tt>setHandlerFactory</tt>
-   * must be called prior to using <tt>accept</tt>.
-   *
-   * @see ACE.Connection.Acceptor.setHandlerFactory
-   */
-  public Acceptor ()
-  {
-  }
-  
-  /**
-   * Create an instance of Acceptor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.classForName</tt>).
-   *
-   *@see java.lang.Class.classForName
-   */
-  public Acceptor (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Set the handler factory. This is provided to aid the default
-   * no-arg constructor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.classForName</tt>).
-   *
-   *@see java.lang.Class.classForName
-   */
-  public void setHandlerFactory (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Initialize the Acceptor.
-   *@param port TCP port number where the Acceptor will listen for connections
-   *@exception IOException socket level exception
-   */
-  public void open (int port) throws IOException
-  {
-    this.sockAcceptor_ = new SOCKAcceptor (port);
-  }
-
-  /**
-   * Template method for accepting connections. Delegates operational
-   * activities to the following bridge methods:
-   * <ul>
-   * <li><tt>makeSvcHandler</tt></li>
-   * <li><tt>acceptSvcHandler</tt></li>
-   * <li><tt>activateSvcHandler</tt></li>
-   * </ul>
-   *
-   * <p>
-   *
-   * The method first obtains a <tt>SvcHandler</tt> via
-   * <tt>makeSvcHandler</tt>, accepts the connection <q>into</q> the
-   * handler using <tt>acceptSvcHandler</tt>, and finally turns over
-   * control to the handler with <tt>activateSvcHandler</tt>.
-   *
-   *@exception SocketException socket level error
-   *@exception InstantiationException <tt>makeSvcHandler</tt> failure
-   *@exception IllegalAccessException <tt>makeSvcHandler</tt> failure
-   *@exception IOException socket level error
-   */
-  public void accept () throws SocketException, 
-    InstantiationException, 
-    IllegalAccessException,
-    IOException
-  {
-
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the SvcHandler using the appropriate
-    // Accept_Strategy 
-    this.acceptSvcHandler (sh);
-
-    // Activate the SvcHandler using the appropriate ActivationStrategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a <tt>SvcHandler</tt>. The default is to
-   * create a new <SvcHandler>.  However, subclasses can override this
-   * policy to perform <SvcHandler> creation in any way that they like
-   * (such as creating subclass instances of <SvcHandler>, using a
-   * singleton, etc.)
-   *@return a new instance of the SvcHandler
-   *@exception InstantiationException could not create new SvcHandler
-   *@exception IllegalAccessException no SvcHandler factory provided
-   */
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    // Create a new handler for the connection
-    return (SvcHandler) handlerFactory_.newInstance ();
-  }
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <tt>SvcHandler</tt>.  The default behavior delegates the work to
-   * <tt>SOCKAcceptor.accept</tt>. However, subclasses can override this
-   * strategy.
-   *@param sh SvcHandler in which to accept the connection
-   *@return 0
-   *@exception SocketException socket level error
-   *@exception IOException socket level error
-   */
-  protected int acceptSvcHandler (SvcHandler sh)
-       throws SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Block in accept. Returns when a connection shows up
-    this.sockAcceptor_.accept (sockStream);
-
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <tt>SvcHandler</tt>.  The default
-   * behavior of this method is to activate the <tt>SvcHandler</tt> by
-   * calling its open() method (which allows the <tt>SvcHandler</tt> to
-   * define its own concurrency strategy).  However, subclasses can
-   * override this strategy to do more sophisticated concurrency
-   * activations.
-   *@param sh SvcHandler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-  {
-    sh.open (null);
-    return 0;
-  }
-
-  // Handler class that should be instantiated when a connection is
-  // made with a client
-  private Class handlerFactory_;
-
-  // Our connection acceptance factory
-  protected SOCKAcceptor sockAcceptor_;
-}
diff --git a/java/src/ActivateStrategy.java b/java/src/ActivateStrategy.java
deleted file mode 100644
index 882203ad552..00000000000
--- a/java/src/ActivateStrategy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    ActivateStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-
-/**
- * <hr>
- *<h2>SYNOPSIS</h2>
- * Bridge supporting activation strategy used by
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- *
- *<h2>DESCRIPTION</h2>
- * Subclass and overload
- * <a href="#activateSvcHandler(ACE.Connection.SvcHandler)"><tt>activateSvcHandler</tt></a>
- * in order change the activation strategy.  Then, submit this subclass to 
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- * as the activation strategy.
- *
- *@see StrategyAcceptor
- */
-public class ActivateStrategy
-{
-  /**
-   * Activate the Svc Handler. Note that subclasses should overwrite
-   * this method to provide a different Activate strategy.
-   *@param sh Svc Handler to activate
-   *@return zero if success, non-zero for failure
-   */
-  public int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-}
diff --git a/java/src/AddServiceObjectNode.java b/java/src/AddServiceObjectNode.java
deleted file mode 100644
index 603b5b61098..00000000000
--- a/java/src/AddServiceObjectNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-class AddServiceObjectNode extends ParseNode
-{
-
-  public AddServiceObjectNode (int act_num)
-  {
-    super(act_num);
-
-    this.locator_ = new String();
-    this.params_ = new String();
-  }
-
-  /* String with possible locator information -- used when trying to load
-     old C++ format files */
-  public String locator ()
-  {
-    return this.locator_;
-  }
-
-  public String params ()
-  {
-    return this.params_;
-  }
-
-  public void params (String params)
-  {
-    this.params_ = params;
-  }
-
-  public boolean suspended ()
-  {
-    return this.suspended_;
-  }
-
-  public void init(String name, String locator, boolean suspended)
-  {
-    super.name_ = name;
-    this.locator_ = locator;
-    this.suspended_ = suspended;
-  }
-
-  public void apply ()
-  {
-    ACE.DEBUG("AddServiceObjectNode apply");
-
-    if (JACE.ServiceConfigurator.ServiceConfig.initialize(this) == -1)
-      ACE.ERROR("Error adding " + this.name_);
-  }
-
-  String params_;
-  String locator_;
-  boolean suspended_;
-};
diff --git a/java/src/Blob.java b/java/src/Blob.java
deleted file mode 100644
index 69feef248b3..00000000000
--- a/java/src/Blob.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Blob.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-public class Blob
-{
-  public int open (String filename, String hostname , int port) 
-  {
-    this.filename_ = filename;
-    this.hostname_ = hostname;
-    this.port_ = port;
-    return 0;
-  }
-
-  public MessageBlock read (int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      {
-	ACE.ERROR ("Blob::read(): Negative length or offset");
-	return null;
-      }
-    
-    // Create a Blob Reader
-    BlobReader blobReader = new BlobReader (length, offset, this.filename_, this.hostname_, this.port_);
-
-    // Receive data
-    MessageBlock mb = blobReader.receiveData ();
-    if (blobReader.bytesRead () != length)
-      return null;
-    else
-      return mb;
-  }
-
-  public int write (MessageBlock mb, int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      ACE.ERROR ("Blob::write(): Negative length or offset");
-    
-    // Create a Blob Writer
-    BlobWriter blobWriter = new BlobWriter (mb, length, offset, this.filename_);
-    
-    try
-      {
-	// Connect to the server
-	this.connector_.open (this.hostname_, this.port_);
-	this.connector_.connect (blobWriter);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    
-    return blobWriter.bytesWritten ();
-  }
-
-  public int close () 
-  {
-    return 0;
-  }
-
-  String filename_;
-  String hostname_;
-  int port_;
-  Connector connector_ = new Connector ();
-}
diff --git a/java/src/BlobHandler.java b/java/src/BlobHandler.java
deleted file mode 100644
index ec282bdeaa9..00000000000
--- a/java/src/BlobHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-public abstract class BlobHandler extends SvcHandler
-{
-  public BlobHandler (int length, int offset, String filename)
-  {
-    this.length_ = length;
-    this.offset_ = offset;
-    this.filename_ = filename;
-  }
-
-  public abstract int open (Object obj);
-
-  protected int length_ = 0;
-  protected int offset_ = 0;
-  protected String filename_ = null;
-}
-
diff --git a/java/src/BlobReader.java b/java/src/BlobReader.java
deleted file mode 100644
index 7209f3c721f..00000000000
--- a/java/src/BlobReader.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobReader.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-// Reader **************************************************
-
-public class BlobReader
-{
-  public BlobReader (int length, 
-		     int offset, 
-		     String filename,
-		     String hostname,
-		     int port)
-  {
-    this.length_ = length;
-    this.offset_= offset;
-    this.filename_ = filename;    
-    this.hostname_ = hostname;
-    this.port_ = port;
-  }
-
-
-  public MessageBlock receiveData ()
-  {
-    String hostname = this.hostname_;
-    String filename = this.filename_;
-
-    // Check if the filename begins with a "/" and if so, remove it
-    // since we are concatenating a "/" to the hostname.
-    if (this.filename_.startsWith ("/"))
-      filename = this.filename_.substring (1);
-    
-    hostname = hostname + ":" + this.port_ + "/";
-    //    System.out.println (hostname + filename);
-    
-    // Allocate a buffer to hold the offset worth of data
-    byte tempBuf [] = new byte [this.offset_];
-    // Allocate a buffer to hold the actual data
-    byte dataBuf [] = new byte [this.length_];
-
-    try
-      {
-	// Create a URL to fetch the file
-	URL url = new URL (this.protocol_ + hostname + filename);
-	
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (url.openStream ());
-
-	// Read the offset worth of bytes
-	iStream.readFully (tempBuf, 0, this.offset_);
-
-	// Read length worth of bytes
-	iStream.readFully (dataBuf, 0, this.length_);
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    // Cache number of bytes read
-    this.bytesRead_ = this.length_;
-    return new MessageBlock (new String (dataBuf, 0, this.length_));
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesRead ()
-  {
-    return this.bytesRead_;
-  }
-
-  private String protocol_ = "http://";
-
-  int length_ = 0;
-  int offset_= 0;
-  String filename_ = null;
-  String hostname_ = "localhost";
-  int port_ = 80;
-
-  int bytesRead_ = 0;
-}
-
-
diff --git a/java/src/BlobWriter.java b/java/src/BlobWriter.java
deleted file mode 100644
index 09cc88a1f9e..00000000000
--- a/java/src/BlobWriter.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobWriter.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-// Writer **************************************************
-
-public class BlobWriter extends BlobHandler
-{
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-
-  }
-
-  /*******************************
-   *  This constructor should be used when using the basic HTTP 1.1 
-   *  authentication scheme
-   *******************************/
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename,
-		     String authentication)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-    this.authentication_ = authentication;
-  }
-
-
-  public int open (Object obj)
-  {
-    if (this.sendRequest () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():sendRequest failed");
-	return -1;
-      }
-    else if (this.receiveReply () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():receiveReply failed");
-	return -1;
-      }
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesWritten ()
-  {
-    return this.bytesWritten_;;
-  }
-
-  protected int sendRequest ()
-  {
-    // Check for sanity -- check if we have any data to send.
-    if (this.offset_+ this.length_ > this.mb_.length ())
-      {
-	ACE.ERROR ("BlobWriter::sendRequest():Invalid offset/length");
-	return -1;
-      }
-
-    if (this.sendHeader () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendHeader failed.");
-	return -1;
-      }
-    else
-      if (this.sendData () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendData failed.");
-	return -1;
-      }
-    return 0;
-  }
-  
-  // Send the header
-  protected int sendHeader ()
-  {
-    String filename = this.filename_;
-    // Check if the filename begins with a "/" and if it doesn't, add it
-    if (!this.filename_.startsWith ("/"))
-      filename = "/" + this.filename_;
-
-    // Create the header, store the actual length in mesglen 
-    String mesg = this.requestPrefix_ + " " + filename + " " + this.requestSuffix_;
-
-    if (this.authentication_ != null) 
-      mesg += "Authorization: Basic " + JACE.Connection.HTTPHelper.EncodeBase64(this.authentication_) + '\n';
-
-    mesg += "Content-length: " + this.length_ + "\n";
-
-    try
-      {
-	if (this.peer ().send (mesg) < 0)
-	  {
-	    ACE.ERROR ("Error sending request");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    return 0;
-  }
-
-  // Send the data
-  protected int sendData ()
-  {
-    // Get the actual data to send
-    String data = this.mb_.base ().substring (this.offset_,
-					      this.offset_ + this.length_);
-
- 
-    try
-      {
-	//	System.out.println (data);
-	// Now send the data
-	if (this.peer ().send (data) != this.length_)
-	  {
-	    ACE.ERROR ("Error sending file");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    this.bytesWritten_ = this.length_;
-    return 0;
-  }
-
-
-  protected int receiveReply ()
-  {
-    System.out.println("Waiting for reply");
-
-    // Receive the reply from the server
-    StringBuffer reply = new StringBuffer (1024);
-    
-    try
-      {
-	if (this.peer ().recv (reply) < 0)
-	  {
-	    ACE.ERROR ("Error receiving reply from server");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    String s = reply.toString ();
-
-    int index = -1;
-    // Now parse the reply to see if it was a success or a failure
-    if ((index = s.indexOf (replyPrefix_)) == -1)
-      {
-	ACE.ERROR ("Error receiving reply from server");
-	return -1;
-      }
-
-    int codeIndex = index + replyPrefix_.length () + 1;
-
-    // Assume code is a 3 digit number
-    String codeString = s.substring (codeIndex, codeIndex + 3);
-
-    returnCode_ = (new Integer (codeString)).intValue ();
-    //    System.out.println (code);
-
-    if (returnCode_ >= 200 && returnCode_ < 300) {  // Check if everything went smoothly
-      System.out.println("We got the goodies!");
-      return 0;
-    } else 
-      return -1;
-  }
-
-  public int returnCode ()
-  {
-    return this.returnCode_;
-  }
-
-  protected String authentication_ = null;
-  protected String protocol_ = "http://";
-  protected int bytesWritten_ = 0;
-  protected MessageBlock mb_ = null;
-  protected String requestPrefix_ = "PUT";
-  protected String requestSuffix_ = "HTTP/1.0\n";
-  protected String replyPrefix_ = "HTTP/1.0";
-  protected int returnCode_;
-}
-
-
diff --git a/java/src/ClassNameGenerator.java b/java/src/ClassNameGenerator.java
deleted file mode 100644
index 0be175c5275..00000000000
--- a/java/src/ClassNameGenerator.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ClassNameGenerator.java
- * 
- * Given a locator string which may specify a class name, this generates as many possible locations for that
- * class file as possible.  This is needed when trying to infer a class name from a C++ DLL line in the
- * svc.conf file.  Implements the Enumeration interface.  A variety of questionable tactics are
- * used.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-
-public class ClassNameGenerator implements Enumeration
-{
-  /**
-   * Constructor
-   * @param locator    Locator string -- approximate class name
-   */
-  public ClassNameGenerator (String locator)
-  {
-    this.locator_ = locator;
-    this.current_ = 0;
-    this.suggestions_ = new Vector();
-  
-    this.makeSuggestions();
-  }
-
-  /** 
-   * More unseen possibilities?
-   */
-  public boolean hasMoreElements() 
-  {
-    return this.current_ < this.suggestions_.size();
-  }
-
-  /**
-   * Get the next string
-   */
-  public Object nextElement()
-  {
-    return this.suggestions_.elementAt(this.current_++);
-  }
-
-  /**
-   * Take away things underscores, adjust capitalization.  This
-   * makes a name more like a Java class name
-   */
-  String makeJavaName(String oldName)
-  {
-    StringTokenizer tok = new StringTokenizer(oldName, "_");
-    String result = new String();
-
-    while (tok.hasMoreTokens()) {
-      String token = tok.nextToken();
-      
-      if (token.length() > 0) {
-
-	result += (Character.toUpperCase(token.charAt(0)) + token.substring(1));
-      }
-    }
-
-    return result;
-  }
-
-
-  /**
-   * Generate the suggestions
-   */
-  void makeSuggestions() 
-  {
-    String slash = new String(System.getProperty("file.separator"));
-
-    // Discard things like .shobj
-    if ((this.locator_.charAt(0) == '.') && (this.locator_.charAt(1) != '.')) {
-      int firstslash = this.locator_.indexOf(slash);
-      if (firstslash > 0) 
-	this.locator_ = this.locator_.substring(firstslash + 1);
-    }
-
-    // Find the last directory separator and the colon (inbetween
-    // these two is the last directory name, and by our convention
-    // this should be the class name)
-    int lastSlash = this.locator_.lastIndexOf(slash);
-    int colon = this.locator_.lastIndexOf(":");
-
-    ACE.DEBUG("Working with " + this.locator_ + " " + 
-		       lastSlash + " " + colon);
-
-    // Best bet first:
-    // Locator string is a path, and the last directory name is the class
-    // name
-    String lastDir = new String(this.locator_.substring(lastSlash + 1,
-                                                        colon));
-
-    // Save any other path info for later tries
-    String path = null;
-    if (lastSlash >= 0) 
-      path = this.locator_.substring(0, lastSlash + 1);
-  
-    int tryNum = 0;
-
-    if (lastDir.length() > 0) {
-
-      // Add this try
-      this.suggestions_.addElement(lastDir);
-
-      if (path != null)
-	this.suggestions_.addElement(path + lastDir);
-
-      // Second try:
-      // Same as the first, but changed to the Java convention for class names:
-      // Begins with a capital letter, capital letters for new words rather
-      // than underscores.
-
-      String try2 = this.makeJavaName(lastDir);
-
-      this.suggestions_.addElement(try2);
-      if (path != null)
-	this.suggestions_.addElement(path + try2);
-    }
-
-    // Third try:
-    // After the colon, the name of the method that created instances of the
-    // class in C++ may contain the class name.  Maybe in the format of
-    // make_classname, etc.
-
-    String lastWord = new String(this.locator_.substring(colon + 1));
-
-    if (lastWord.length() > 0) {
-
-      // Try the word after the colon, too
-      this.suggestions_.addElement(lastWord);
-      if (path != null)
-	this.suggestions_.addElement(path + lastWord);
-
-      String try2 = this.makeJavaName(lastWord);
-      
-      this.suggestions_.addElement(try2);
-      if (path != null)
-	this.suggestions_.addElement(path + try2);
-
-      int make = lastWord.indexOf("make");
-      if (make >= 0) {
-
-	make += 4;
-	String makeTry = new String(lastWord.substring(make));
-
-	if (makeTry.length() > 0) {
-
-	  this.suggestions_.addElement(makeTry);
-	  if (path != null)
-	    this.suggestions_.addElement(path + makeTry);
-
-	  String try3 = this.makeJavaName(makeTry);
-
-	  this.suggestions_.addElement(try3);
-	  if (path != null)
-	    this.suggestions_.addElement(path + try3);
-	}
-      }
-    }
-
-  }
-
-  String locator_;
-  Vector suggestions_;
-
-  int current_;
-};
-
-
diff --git a/java/src/ClassReader.java b/java/src/ClassReader.java
deleted file mode 100644
index c10c00b061c..00000000000
--- a/java/src/ClassReader.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ClassReader.java
- *
- *@author Everett Anderson
- *
- *@see JACE.ServiceConfigurator
- *@see JACE.ServiceConfigurator.ServiceLoader
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import JACE.OS.*;
-import java.io.*;
-import java.util.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *    Given a classfile name, this determines the qualified class name
- *    of what's inside (pacakage and class name together).  It is necessary
- *    when users want to dynamically load classes, but don't provide the
- *    full name in svc.conf.
- */
-
-public class ClassReader 
-{
-  // Types found in classfiles
-  public static final byte CONSTANT_Class = 7;
-  public static final byte CONSTANT_Fieldref = 9;
-  public static final byte CONSTANT_Methodref = 10;
-  public static final byte CONSTANT_InterfaceMethodref = 11;
-  public static final byte CONSTANT_String = 8;
-  public static final byte CONSTANT_Integer = 3;
-  public static final byte CONSTANT_Float = 4;
-  public static final byte CONSTANT_Long = 5;
-  public static final byte CONSTANT_Double = 6;
-  public static final byte CONSTANT_NameAndType = 12;
-  public static final byte CONSTANT_Utf8 = 1;
-
-  /** Returns a string that is the qualified class name of the
-   *  given file.  It returns null if there are any problems.
-   *
-   *@param   fileName   File to examine
-   *
-   *@return  String that's the qualified class name of the
-   *         given file (null on error)
-   */
-  public static String getClassName(String fileName)
-  {
-    try { 
-
-      // Open the .class file
-      FileInputStream fis = new FileInputStream(fileName); 
-
-      DataInputStream dis = new DataInputStream(fis);
-
-      // Skip magic number and version numbers
-      dis.skipBytes(8);
-
-      // Find out how many entries are in the constant pool table
-      int count = dis.readUnsignedShort();
-
-      // Hash table to hold the text entries (possibilities for
-      // the class name)
-      Hashtable ht = new Hashtable();
-
-      // Vector that holds the index of the class name for each
-      // class record (the vector is indexed by placement in the
-      // table)
-      Vector vt = new Vector(count);
-      Integer noValue = new Integer(-1);
-      int type;
-
-      // Scan through all the entries
-      for (int i = 1; i < count; i++) {
-
-	// Read what type of entry this is
-	type = dis.readUnsignedByte();
-
-	switch (type) {
-
-	  case CONSTANT_Class:
-	    // Save the index of the class name
-	    vt.addElement(new Integer(dis.readUnsignedShort()));
-	    break;
-	  case CONSTANT_Fieldref:
-	  case CONSTANT_Methodref:
-	  case CONSTANT_InterfaceMethodref:
- 	  case CONSTANT_Integer:
-	  case CONSTANT_Float:
-  	  case CONSTANT_NameAndType:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(4);
-	    break;
-	  case CONSTANT_String:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(2);
-	    break;
-	  case CONSTANT_Long:
-	  case CONSTANT_Double:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(8);
-	    // These take up two spots in the table
-	    i++;
-	    break;
-	  case CONSTANT_Utf8:
-	    vt.addElement(noValue);
-	    // Save the text in the hash table
-	    ht.put(new Integer(i), new String(dis.readUTF()));
-	    break;
- 	  default:
-	    ACE.DEBUG("Unknown type: " + type);
-	    break;
-
-	}
-
-      }
-
-      // Skip the access flags
-      dis.skipBytes(2);
-
-      // Get index in table of this class
-      int classIdx = dis.readUnsignedShort();
-
-      // Get index in the table of the name of this class
-      Integer idx = (Integer)vt.elementAt(classIdx - 1);
-
-      // Put the result in period separated notation 
-      String result = new String(((String)ht.get(idx)).replace('/', '.'));
-
-      return result;
-
-    } catch (IOException e) {
-      ACE.ERROR("" + e);
-      return null;
-    }
-  }
-}
diff --git a/java/src/Condition.java b/java/src/Condition.java
deleted file mode 100644
index 59a97c9a1a7..00000000000
--- a/java/src/Condition.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Condition.java
- *
- *@author Irfan Pyarali
- *
- *************************************************/
-package JACE.Concurrency;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <h2>TITLE</h2>
- *<blockquote>
- *     Abstraction for <em>traditional</em> 
- *     condition variable
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This condition variable allows the use of one 
- *     mutex between multiple conditions. 
- *     This implementation is based on the C++ version of ACE.
- *</blockquote>
- */
-public class Condition
-{
-  /** 
-   * Default constructor
-   *@param Mutex for synchronization
-   */
-  public Condition (Mutex mutex)
-  {
-    mutex_ = mutex;
-  }
-  
-  /**
-   * Wait for condition to become signaled. 
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait () 
-    throws InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-	semaphore_.acquire ();
-	mutex_.acquire ();
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * TimedWait for condition to become signaled. 
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait (TimeValue tv) 
-    throws TimeoutException, InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-
-	TimeValue start = TimeValue.getTimeOfDay ();
-
-	semaphore_.acquire (tv);
-
-	TimeValue now = TimeValue.getTimeOfDay ();
-	tv.minusEquals (TimeValue.minus (now, start));
-
-	mutex_.acquire (tv);
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * Signal condition. Wake one waiter (if any).
-   */
-  public void signal ()
-  {
-    if (waiters_ > 0)
-      semaphore_.release ();
-  }
-
-  /**
-   * Signal condition. Wake up all waiters (if any).
-   */
-  public void broadcast ()
-  {
-    for (int i = waiters_; i > 0; i--)
-      semaphore_.release ();
-  }
-
-  /** 
-   * Accessor to lock
-   *@return Mutex
-   */
-  public Mutex mutex ()
-  {
-    return mutex_;
-  }
-
-  private int waiters_;  
-  private Semaphore semaphore_ = new Semaphore (0);
-  private Mutex mutex_;
-
-}
diff --git a/java/src/Connector.java b/java/src/Connector.java
deleted file mode 100644
index 81b701e7b4d..00000000000
--- a/java/src/Connector.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Connector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Abstract factory for connecting a
- * (<a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * to an application.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * Implements the basic strategy for actively establishing connections
- * with applications.  The <tt>Connector</tt> establishes the connection,
- * passing it on to a <tt>SvcHandler</tt> instance, and handing over
- * control to that instance.
- *<p>
- * TCP is the transport mechanism used, via
- * <a href="ACE.SOCK_SAP.SOCKConnector.html#_top_"><tt>SOCKConnector</tt></a>.
- *</blockquote>
- *
- *<h2>NOTES</h2>
- *<blockquote>
- * This class, as currently implemented, does not work like its C++ counterpart.
- * Future versions are expected to rectify this discrepancy.
- *</blockquote>
- *
- *@see SOCKConnector,SvcHandler
- */
-public class Connector extends ServiceObject
-{
-  /**
-   * Create a Connector. Do nothing constructor. Allows user to
-   * call <a href="#open(java.lang.String)">open</a>() later.
-   */
-  public Connector ()
-    {
-    }
-
-  /**
-   * Create a Connector passing in server hostname and port
-   * number, effectively shorthand for calling
-   * <a href="#open(java.lang.String)">open</a>().
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public Connector (String hostname, int port)
-    {
-      this.open (hostname, port);
-    }
-
-  /**
-   * Initialize the Connector passing in server hostname and port
-   * number.  Note that no connection attempt is made.
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public void open (String hostname, int port)
-    {
-      this.hostname_ = hostname;
-      this.port_ = port;
-    }
-
-  /**
-   * Connect to the server.
-   *@param sh Svc Handler to use to handle the connection
-   */
-  public void connect (SvcHandler sh) throws UnknownHostException, 
-      SocketException,
-      InstantiationException, 
-      IllegalAccessException, 
-      IOException
-  {
-    // Make a connection using the appropriate Connection_Strategy
-    this.connectSvcHandler (sh);
-
-    // Activate the Svc_Handler using the appropriate Activation_Strategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for making a new connection. The default behavior
-   * creates a new SOCKConnector and then calls setHandle() on the
-   * <SvcHandler> that was passed in. Subclasses can override this
-   * strategy, if needed.
-   *@param sh Svc Handler to use to handle the connection
-   *@return 0
-   */
-  protected int connectSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Create a SOCK_Connector (note the constructor does the connect for us)
-    this.sockConnector_ = new SOCKConnector (sockStream,
-					       this.hostname_,
-					       this.port_);
-    ACE.DEBUG ("Connected to " +
-	       sockStream.socket ().getInetAddress ());
-    
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The default
-   * behavior of this method is to activate the <SvcHandler> by
-   * calling its open() method (which allows the SVC_HANDLER to define
-   * its own concurrency strategy).  However, subclasses can override
-   * this strategy to do more sophisticated concurrency activations.
-   *@param sh Svc Handler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-
-  
-  // Port server is listening on
-  private int port_;
-
-  // Server hostname
-  private String hostname_;
-
-  // Our connection factory
-  private SOCKConnector sockConnector_;
-}
diff --git a/java/src/CreationStrategy.java b/java/src/CreationStrategy.java
deleted file mode 100644
index 219dc712668..00000000000
--- a/java/src/CreationStrategy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    CreationStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Defines the interface for specifying a creation strategy for a
- * <a href="ACE.Connection.SvcHandler.html#_top_"><tt>SvcHandler</tt></a> to the
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>.
- *</blockquote>
- *
- * <p><b>DESCRIPTION</b><br>
- *<blockquote>
- *     The default behavior is to make a new SvcHandler.  However,
- *     subclasses can override this strategy to perform SvcHandler
- *     creation in any way that they like (such as creating subclass
- *     instances of SvcHandler, using a singleton, dynamically
- *     linking the handler, etc.).
- *</blockquote>
- *
- *@see SvcHandler,StrategyAcceptor,AcceptStrategy,ActivateStrategy
- */
-public class CreationStrategy
-{
-  /**
-   * Create an instance of Creation Strategy.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler
-   */
-  public CreationStrategy (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Create a new SvcHandler. Note that subclasses should override
-   * this method to provide a new creation strategy.
-   *@return reference to a new instance of the SvcHandler (or subclass)
-   *@exception InstantiationException Unable to instantiate.
-   *@exception IllegalAccessException No handler factory available.
-   */
-  public SvcHandler makeSvcHandler () throws InstantiationException, 
-    IllegalAccessException
-    {
-      // Create a new Svc_Handler
-      return (SvcHandler) handlerFactory_.newInstance ();
-    }
-
-  private Class handlerFactory_;
-}
diff --git a/java/src/EventHandler.java b/java/src/EventHandler.java
deleted file mode 100644
index 53a9974bf08..00000000000
--- a/java/src/EventHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    EventHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Provides an abstract interface for handling timer events.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     Classes implementing this interface handle a timer's
- *     expiration.
- *</blockquote>
- *
- * <h2>NOTES</h2>
- *<blockquote>
- * Users of C++ ACE will notice that this defines a substantially
- * smaller interface than the C++ counterpart.  Signal events are
- * absent due to the complete absence of this feature from Java itself.
- * Moreover, at this point
- * there is still some question regarding whether or not the I/O
- * portion will make any sense or fit into the Java model for I/O.
- *</blockquote>
- *
- *@see TimerQueue,Reactor
- */
-public interface EventHandler
-{
-  /** 
-   * Called when timer expires.
-   *@param tv Time Value for which timer was set
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj);
-}
-
-// Note that more methods will be added as needed
diff --git a/java/src/GetOpt.java b/java/src/GetOpt.java
deleted file mode 100644
index 2bf5d27c406..00000000000
--- a/java/src/GetOpt.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Misc
- *
- * = FILENAME
- *    GetOpt.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Misc;
-
-import java.io.*;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Iterator for parsing command-line arguments.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This version of `get_opt' appears to the caller like standard
- *     Unix `get_opt' but it behaves differently for the user, since
- *     it allows the user to intersperse the options with the other
- *     arguments.
- * 
- * <p> As `get_opt' works, it permutes the elements of `argv' so that,
- *     when it is done, all the options precede everything else. Thus
- *     all application programs are extended to handle flexible argument
- *     order.
- *</blockquote>
- *
- */
-public class GetOpt
-{
-  /** 
-   * Constructor
-   *@param args command line arguments
-   *@param optstring string containing the legitimate option
-   * characters. A colon in optstring means that the previous character
-   * is an option that wants an argument which is then taken from the
-   * rest of the current args-element. Here is an example of what
-   * optstring might look like: "c:dP:p".
-   */
-  public GetOpt (String[] args, String optstring)
-  {
-    // Cache the arguments
-    this.args_ = args;
-    this.hasArg_ = false;
-
-    // Build the arg hashtable
-    this.buildArgTable (optstring);
-  }
-  
-  /** 
-   * Scan elements specified in optstring for next option flag.
-   *@return The character corresponding to the next flag.
-   */
-  public int next ()
-  {
-    if (this.args_ == null)
-      return -1;
-
-    if (this.index_ < this.args_.length) 
-      {
-	String arg = this.args_[this.index_++];
-
-	// Make sure flag starts with "-"
-	if (!arg.startsWith ("-"))
-	  return -1;
-	
-	// Check if there is more than one character specified as flag
-	if (arg.length () > 2)
-	  return -1;
-	
-	// So far so good
-	// Check if the flag is in the arg_table and if it is get the
-	// associated binding.
-	Character c = (Character) this.argTable_.get (new Character (arg.charAt (1)));
-	if (c == null)
-	  return -1;
-
-	if (c.charValue () == '#')
-	  {
-	    this.hasArg_ = false;
-	    return arg.charAt (1);
-	  }
-	else if (c.charValue () == ':')
-	  {
-	    this.hasArg_ = true;
-	    return arg.charAt (1);
-	  }
-	else   // This should not happen
-	  return -1; 
-      }
-    return -1;
-  }
-  
-  /**
-   * Get the argument (if any) associated with the flag.
-   *@return the argument associated with the flag.
-   */
-  public String optarg ()
-  {
-    if (this.hasArg_)
-      return this.args_[this.index_++];
-    else
-      return null;
-  }
-  
-  // Build the argument table
-  private void buildArgTable (String s)
-  {
-    this.argTable_ = new Hashtable ();
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    while (tokens.hasMoreTokens ())
-      {
-	// Get the next token
-	String t = tokens.nextToken ();
-
-	// First add all flags except the one with ":" after it
-	// Note "#" is an arbitrary character we use to distinguish
-	// the two cases
-	for (int i = 0; i < t.length () - 1; i++)
-	  this.argTable_.put (new Character (t.charAt (i)),
-			       new Character ('#'));
-
-	// Now Add the flag just before ":" to the arg_table
-	this.argTable_.put (new Character (t.charAt (t.length () - 1)),
-			     new Character (':'));
-      }
-  }
-  
-  private String [] args_;
-  // Copy of the args passed in
-  
-  private boolean hasArg_;
-  // Indicator that the flag has an argument following it
-
-  private int index_;
-  // Index into the array of arguments
-
-  private Hashtable argTable_;
-  // Table of flags that take arguments after them
-}
diff --git a/java/src/HTTPHelper.java b/java/src/HTTPHelper.java
deleted file mode 100644
index d946913693c..00000000000
--- a/java/src/HTTPHelper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package JACE.Connection;
-
-import JACE.OS.*;
-// Collection of various methods that have to do with HTTP
-
-public class HTTPHelper
-{
-  // Encoding and decoding yadda
-  public static String Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  // Basic encoding used in the HTTP 1.1 RFC.  This doesn't
-  // put the string "Basic " at the beginning of the return
-  // string.  Adapted from James' JAWS HTTP_Helpers code.
-  // Returns null on error.
-  public static String EncodeBase64 (String secret)
-    {
-      StringBuffer output = new StringBuffer();
-
-      // Index of the input string
-      int inidx = 0;
-
-      // character value
-      int c;
-
-      int char_count = 0;
-      int bits = 0;
-      boolean error = false;
-
-      while (inidx < secret.length())
-	{
-	  c = secret.charAt(inidx++);
-
-	  // This will mess up internationalization.  I wonder if it is really
-	  // necessary for HTTP?
-	  if (c > 255)
-	    {
-	      ACE.DEBUG ("encountered char > 255 (decimal %d): " + c);
-	      error = true;
-	      break;
-	    }
-
-	  bits += c;
-	  char_count++;
-
-          if (char_count == 3)
-	    {
-	      output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-	      output.append(HTTPHelper.Alphabet.charAt(bits & 0x3f));
-
-	      bits = 0;
-	      char_count = 0;
-	    }
-	  else
-	    bits <<= 8;
-	}
-
-      if (!error)
-	{
-	  if (char_count != 0)
-	    {
-	      bits <<= 16 - (8 * char_count);
-	      output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	      
-	      if (char_count == 1)
-		{
-		  output.append("==");
-		}
-	      else
-		{
-		  output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-		  output.append('=');
-		}
-	    }
-
-	  return output.toString();
-	}
-
-      // Returns null on error
-      return null;
-    }
-};
diff --git a/java/src/INETAddr.java b/java/src/INETAddr.java
deleted file mode 100644
index 8d16c46c6b3..00000000000
--- a/java/src/INETAddr.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    INETAddr.java
- *
- *@author Chris Cleeland
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines an endpoint of a connection, encapsulating host and port.
- * This is only a part-way implementation of C++ ACE's ACE_INET_Addr.
- *
- * <p><b>LIMITATIONS</b><br>
- *     Currently the class is very limited in its capabilities; it will
- * be expanded in future revisions of ACE.
- */
-public class INETAddr // extends Addr
-{
-  private InetAddress addr_;
-  private int port_ = 0;
-  /**
-   */
-  public INETAddr ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create an INETAddr from a port/hostname
-   *@param port port number to connect with server at
-   *@param hostname hostname of the server
-   */
-  public INETAddr (int port, String hostname) throws UnknownHostException
-  {
-    super();
-    port_ = port;
-    addr_ = InetAddress.getByName(hostname);
-				// Should really use getAllByName(),
-				// but I don't think we do that in
-				// C++ ACE, even.
-  }
-
-  /**
-   * Create an INETAddr from an address.
-   * @param address an address in the form "ip-number:port-number", <em>e.g.</em> <pre>tango.cs.wustl.edu:1234</pre> or <pre>128.252.166.57:1234</pre>; if no ':' is present address is assumed to be <b>INADDR_ANY</b> and address contains only the port number
-   * @throws UnknownHostException
-   */
-  public INETAddr (String address) throws UnknownHostException
-  {
-    int colon = address.indexOf(':');
-    if (colon != 0)
-      {
-	addr_ = InetAddress.getByName(address.substring(0, colon));
-	address = address.substring(colon+1);
-      }
-
-    port_ = Integer.parseInt(address);
-  }
-
-  /**
-   * Return the name of the host.
-   */
-  public String getHostName()
-  {
-    return addr_.getHostName();
-  }
-
-  /**
-   * Return the dotted Internet address.
-   */
-  public String getHostAddr()
-  {
-    return addr_.toString();
-  }
-
-  /**
-   * Return the port number.
-   */
-  public int getPortNumber()
-  {
-    return port_;
-  }
-
-  public String toString()
-  {
-    return getHostAddr() + Integer.toString(port_);
-  }
-}
diff --git a/java/src/IOCntlCmds.java b/java/src/IOCntlCmds.java
deleted file mode 100644
index 2469428a3a6..00000000000
--- a/java/src/IOCntlCmds.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class IOCntlCmds
-{
-  /**  Set the low water mark. */
-  public static final int SET_LWM    = 1;
-
-  /** Get the low water mark. */
-  public static final int GET_LWM    = 2; 
-
-  /**  Set the high water mark. */
-  public static final int SET_HWM    = 3;
-
-  /** Get the high water mark. */
-  public static final int GET_HWM    = 4;
-
-  /** Link modules */
-  public static final int MOD_LINK    = 5;
-
-  /** Unlink modules */
-  public static final int MOD_UNLINK    = 6;
-
-}
diff --git a/java/src/IOCntlMsg.java b/java/src/IOCntlMsg.java
deleted file mode 100644
index 8b69310c4f7..00000000000
--- a/java/src/IOCntlMsg.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    IOCntlMsg.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *      Data format for IOCTL messages 
- *</blockquote>
- */
-public class IOCntlMsg
-{
-
-  // = Initialization method.
-
-  /*
-   * Initialize the control message.
-   *@param c IOCntlCmd for the control message. Note that this should
-   * be of type IOCntlCmds
-   */
-  public IOCntlMsg (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  // = Get/set methods
-
-  /*
-   * Get the command.
-   *@return the command.
-   */
-  public int cmd () 
-  { 
-    return this.cmd_; 
-  }
-
-  /*
-   * Set the command.
-   *@param c the command.
-   */
-  public void cmd (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  /*
-   * Get the count.
-   *@return the count.
-   */
-  public int count () 
-  { 
-    return this.count_; 
-  }
-
-  /*
-   * Set the count.
-   *@param c the count.
-   */
-  public void count (int c) 
-  { 
-    this.count_ = c; 
-  }
-
-  /*
-   * Get the error.
-   *@return the error.
-   */
-  public int error () 
-  { 
-    return this.error_; 
-  }
-
-  /*
-   * Set the error.
-   *@param e the error.
-   */
-  public void error (int e) 
-  { 
-    this.error_ = e; 
-  }
-
-  /*
-   * Get the return value.
-   *@return the return value.
-   */
-  public int rval () 
-  { 
-    return this.rval_; 
-  }
-
-  /*
-   * Set the return value.
-   *@param r the return value.
-   */
-  public void rval (int r) 
-  { 
-    this.rval_ = r; 
-  }
-
-  public String toString ()
-  {
-    return (new Integer (this.cmd_)).toString ();
-  }
-
-  private int cmd_;
-  // Command.
-
-   private int count_;
-   // Count.
-
-   private int error_;
-   // Error.
-
-   private int rval_;
-   // Return value
-}
diff --git a/java/src/JACE.DSP b/java/src/JACE.DSP
deleted file mode 100644
index 34e23a71bc3..00000000000
--- a/java/src/JACE.DSP
+++ /dev/null
@@ -1,304 +0,0 @@
-# Microsoft Developer Studio Project File - Name="JACE" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=JACE - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "JACE.MAK".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "JACE.MAK" CFG="JACE - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "JACE - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "JACE - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "JACE - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\classes-r\"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "JACE - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\classes\"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "JACE - Java Virtual Machine Release"

-# Name "JACE - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\Acceptor.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\AcceptStrategy.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ActivateStrategy.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\AddServiceObjectNode.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Blob.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\BlobHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\BlobReader.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\BlobWriter.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ClassNameGenerator.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ClassReader.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Condition.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\CreationStrategy.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\EventHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\GetOpt.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\HTTPHelper.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\INETAddr.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOCntlCmds.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOCntlMsg.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessageBlock.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessageQueue.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessageType.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Module.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Mutex.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\OS.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ParseNode.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\parser.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ProfileTimer.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\RemoveNode.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ResumeNode.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\RWMutex.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Semaphore.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceConfig.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceLoader.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceObject.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceObjectRecord.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceRecord.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServiceRepository.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SOCKAcceptor.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SOCKConnector.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SOCKStream.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\StrategyAcceptor.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Stream.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\StreamHead.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\StreamTail.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SuspendNode.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SvcHandler.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\sym.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Task.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TaskFlags.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ThreadManager.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\ThruTask.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimedWait.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeoutException.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimerQueue.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeValue.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Token.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Yylex.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/src/JACE.DSW b/java/src/JACE.DSW
deleted file mode 100644
index 1adb106b259..00000000000
--- a/java/src/JACE.DSW
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "JACE"=.\JACE.DSP - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/java/src/MakeLexer b/java/src/MakeLexer
deleted file mode 100755
index 0dfa19a8ebb..00000000000
--- a/java/src/MakeLexer
+++ /dev/null
@@ -1,4 +0,0 @@
-# What to do to make the Lexer
-java JLex.Main Yylex.lex
-rm Yylex.java
-mv Yylex.lex.java Yylex.java
diff --git a/java/src/MakeParser b/java/src/MakeParser
deleted file mode 100755
index c0588972a19..00000000000
--- a/java/src/MakeParser
+++ /dev/null
@@ -1,2 +0,0 @@
-# What to do to make the parser
-java java_cup.Main < Svc_Conf.y
diff --git a/java/src/Makefile b/java/src/Makefile
deleted file mode 100644
index 2ca55c03c9c..00000000000
--- a/java/src/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-# Makefile
-# $Id$
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ..
-CLASSDIR = $(JACE_WRAPPER)/classes
-DOCDIR = $(JACE_WRAPPER)/doc
-
-JC = javac
-JCOPTS = -g -d $(CLASSDIR)
-JD = javadoc
-JDOPTS = -d $(DOCDIR)
-
-COMPILE.java = $(JC) $(JCOPTS) $(filter %.java,$?)
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-all:	asx os concurrency connection timers misc reactor svcconfig socksap
-
-pkg_all = $(pkg_asx_timestuff) $(pkg_asx) $(pkg_os) $(pkg_concurrency) \
-          $(pkg_connection) $(pkg_timers) $(pkg_misc) $(pkg_reactor) \
-          $(pkg_socksap) $(pkg_svcconfig)
-
-doc:
-	$(JD) $(JDOPTS) $(addsuffix .java,$(pkg_all)) $(packages)
-
-clean:
-	find ${JACE_WRAPPER}/classes/JACE -name '*.class' -print | xargs ${RM}
-
-docclean:
-	find ${JACE_WRAPPER}/doc -name '*.html' -print | xargs ${RM}
-
-realclean:	clean docclean
-
-
-pkg_asx_timestuff = \
-	TimeValue \
-	TimeoutException \
-	TimedWait
-
-asx_timestuff:	$(addsuffix .java,$(pkg_asx_timestuff))
-	$(COMPILE.java)
-
-pkg_asx = \
-	IOCntlCmds \
-	IOCntlMsg \
-	Task \
-	TaskFlags \
-	ThruTask \
-	Module \
-	MessageType \
-	MessageBlock \
-	MessageQueue \
-	StreamHead \
-	StreamTail \
-	Stream
-
-asx:	os asx_timestuff reactor concurrency $(addsuffix .java,$(pkg_asx))
-	$(COMPILE.java)
-
-pkg_os = \
-	OS \
-	ACE
-
-os:	$(addsuffix .java,$(pkg_os))
-	$(COMPILE.java)
-
-pkg_concurrency = \
-	Condition \
-	Mutex \
-	RWMutex \
-	Semaphore \
-	ThreadManager \
-	Token
-
-concurrency:	$(addsuffix .java,$(pkg_concurrency)) asx_timestuff os
-	$(COMPILE.java)
-
-pkg_connection = \
-	SvcHandler \
-	Acceptor \
-	Connector \
-	AcceptStrategy \
-	ActivateStrategy \
-	CreationStrategy \
-	StrategyAcceptor \
-	Blob \
-	BlobHandler \
-	BlobReader \
-	BlobWriter \
-	HTTPHelper
-
-connection:	os socksap svcconfig $(addsuffix .java,$(pkg_connection))
-	$(COMPILE.java)
-
-pkg_timers = \
-	ProfileTimer
-
-timers:	$(addsuffix .java,$(pkg_timers))
-	$(COMPILE.java)
-
-pkg_misc = \
-	GetOpt
-
-misc:	$(addsuffix .java,$(pkg_misc))
-	$(COMPILE.java)
-
-pkg_reactor = \
-	EventHandler \
-	TimerQueue
-
-reactor:	asx_timestuff $(addsuffix .java,$(pkg_reactor))
-	$(COMPILE.java)
-
-pkg_socksap = \
-	INETAddr \
-	SOCKStream \
-	SOCKAcceptor \
-	SOCKConnector
-
-socksap:	os $(addsuffix .java,$(pkg_socksap))
-	$(COMPILE.java)
-
-pkg_svcconfig = \
-        ServiceLoader \
-        ClassNameGenerator \
-        ClassReader \
-        parser \
-	sym \
-	ParseNode \
-	SuspendNode \
-	ResumeNode \
-	RemoveNode \
-	ServiceRecord \
-        ServiceObjectRecord \
-        Yylex \
-        AddServiceObjectNode \
-        ServiceObject \
-        ServiceConfig \
-	ServiceRepository
-
-svcconfig:	os reactor misc $(addsuffix .java,$(pkg_svcconfig))
-	$(COMPILE.java)
-
-packages = JACE \
-	   JACE.ASX \
-	   JACE.Connection \
-	   JACE.Concurrency \
-	   JACE.Misc \
-	   JACE.OS \
-	   JACE.Reactor \
-	   JACE.SOCK_SAP \
-	   JACE.Service_Configurator \
-	   JACE.Timers
-
-
diff --git a/java/src/MessageBlock.java b/java/src/MessageBlock.java
deleted file mode 100644
index 1741f9bef80..00000000000
--- a/java/src/MessageBlock.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageBlock.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Object used to store messages in the ASX framework.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     <tt>MessageBlock</tt> is modeled after the message data structures
- *     used in System V STREAMS. A <tt>MessageBlock</tt> is composed of
- *     one or more <tt>MessageBlock</tt>s that are linked together by <em>PREV</em>
- *     and <em>NEXT</em> pointers. In addition, a <tt>MessageBlock</tt> may also be
- *     linked to a chain of other <tt>MessageBlock</tt>s. This structure
- *     enables efficient manipulation of arbitrarily-large messages
- *     <em>without</em> incurring memory copying overhead.
- *</blockquote>
- *
- *@see MessageQueue
- */
-public class MessageBlock
-{
-  /**
-   * Create an empty Message Block
-   */
-  public MessageBlock ()
-    {
-      this (0);
-    }
-
-  /**
-   * Create an empty Message Block.
-   * Note that this assumes that type of MessageBlock is MB_DATA.
-   *@param size size of the Message Block to create.
-   */
-  public MessageBlock (int size)
-    {
-      // Note the explicit cast toString() is needed. For some strange
-      // reason, it fails otherwise if size == 0.
-      this ((new StringBuffer (size)).toString ());
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_DATA. 
-   *@param data initial data to create a Message Block with.
-   */
-  public MessageBlock (String data)
-    {
-      this (MessageType.MB_DATA,
-	    null,
-	    data);
-    }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data initial data to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       String data)
-    {
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-
-      this.init (type, cont, data);
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to create a Message Block with.
-   */
-  public MessageBlock (Object obj)
-  {
-    this (MessageType.MB_OBJECT,
-	  null,
-	  obj);
-  }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj initial object to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       Object obj)
-  {
-    this.init (type, cont, obj);
-  }
-
-  /* Initialize the Message Block
-   *@param data data to initialize Message Block with
-   */
-  public void init (String data)
-    {
-      this.base_ = new StringBuffer (data);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data data to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   String data)
-    {
-      if (data.length () == 0)
-	this.base_ = new StringBuffer (0);
-      else
-	this.base_ = new StringBuffer (data);
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Initialize a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to initialize a Message Block with.
-   */
-  public void init (Object obj)
-    {
-      this.init (MessageType.MB_OBJECT, null, obj);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj object to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   Object obj)
-    {
-      this.obj_ = obj;
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-    }
-
-  /**
-   * Set message flags. Note that the flags will be set on top of
-   * already set flags.
-   *@param moreFlags flags to set for the Message Block.
-   */
-  public long setFlags (long moreFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: more_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.SET_BITS (this.flags_, moreFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Unset message flags.
-   *@param lessFlags flags to unset for the Message Block.
-   */
-  public long clrFlags (long lessFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: less_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.CLR_BITS (this.flags_, lessFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Get the message flags.
-   *@return Message flags
-   */
-  public long flags ()
-    {
-      return this.flags_;
-    }
-
-  /**
-   * Get the type of the message.
-   *@return message type
-   */
-  public int msgType ()
-    {
-      return this.type_;
-    }
-
-  /**
-   * Set the type of the message.
-   *@param t type of the message
-   */
-  public void msgType (int t)
-    {
-      this.type_ = t;
-    }
-
-  /**
-   * Get the class of the message. Note there are two classes,
-   * <normal> messages and <high-priority> messages.
-   *@return message class
-   */
-  public int msgClass ()
-    {
-      return this.msgType () >= MessageType.MB_PRIORITY
-	? MessageType.MB_PRIORITY : MessageType.MB_NORMAL;
-    }
-
-  /**
-   * Find out if the message is a data message.
-   *@return true if message is a data message, false otherwise
-   */
-  public boolean isDataMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_DATA
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Find out if the message is an object message.
-   *@return true if message is an object message, false otherwise
-   */
-  public boolean isObjMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_OBJECT
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Get the priority of the message.
-   *@return message priority
-   */
-  public long msgPriority ()
-    {
-      return this.priority_;
-    }
-
-  /**
-   * Set the priority of the message.
-   *@param pri priority of the message
-   */
-  public void msgPriority (long pri)
-    {
-      this.priority_ = pri;
-    }
-
-  /**
-   * Get message data. This assumes that msgType is MB_DATA.
-   *@return message data
-   */
-  public String base () 
-    {
-      // Create a String object to return
-      char temp[] = new char [this.base_.length ()];
-      this.base_.getChars (0, this.base_.length (), temp, 0);
-      return new String (temp);
-    }
-
-  /**
-   * Set the message data. This assumes that msgType is MB_DATA.
-   *@param data message data
-   *@param msgFlags message flags
-   */
-  public void base (String data,
-		    long msgFlags)
-    {
-      this.base_ = new StringBuffer (data);
-      this.flags_ = msgFlags;
-    }
-
-  /**
-   * Get message object. This assumes that msgType is MB_OBJECT.
-   *@return message object
-   */
-  public Object obj () 
-    {
-      return this.obj_;
-    }
-
-  /**
-   * Set the message object. This assumes that msgType is MB_OBJECT.
-   *@param object message object
-   *@param msgFlags message flags
-   */
-  public void obj (Object obj,
-		   long msgFlags)
-    {
-      this.obj_ = obj;
-      this.flags_ = msgFlags;
-    }
-
-  // = The following four methods only make sense if the Message_Block
-  // is of type MB_DATA and not MB_OBJECT.
-
-  /**
-   * Get length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@return length of the message.
-   */
-  public int length ()
-    {
-      return this.base_.length ();
-    }
-
-  /**
-   * Set the length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n message length
-   */
-  public void length (int n)
-    {
-      this.base_.setLength (n);
-    }
-
-  /**
-   * Get size of the allocated buffer for the message. This method
-   * only makes sense if the MessageBlock is of type MB_DATA and not
-   * MB_OBJECT. 
-   *@return size of the message buffer
-   */
-  public int size ()
-    {
-      return this.base_.capacity ();
-    }
-
-  /**
-   * Set the total size of the buffer. This method will grow the
-   * buffer if need be. Also, this method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n size of message buffer
-   */
-  public void size (int n)
-    {
-      this.base_.ensureCapacity (n);
-    }
-
-
-  /**
-   * Get the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@return the continuation field
-   */
-  public MessageBlock cont ()
-    {
-      return this.cont_;
-    }
-
-  /**
-   * Set the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@param msgCont continuation field
-   */
-  void cont (MessageBlock msgCont)
-    {
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Get link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@return next message block
-   */
-  MessageBlock next ()
-    {
-      return this.next_;
-    }
-
-  /**
-   * Set link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@param msgBlock next message block
-   */
-  void next (MessageBlock msgBlock)
-    {
-      this.next_ = msgBlock;
-    }
-
-  /**
-   * Get link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@return previous message block
-   */
-  MessageBlock prev ()
-    {
-      return this.prev_;
-    }
-
-  /**
-   * Set link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@param msgBlock previous message block
-   */
-  void prev (MessageBlock msgBlock)
-    {
-      this.prev_ = msgBlock;
-    }
-
-  private int type_;		
-  // Type of message.
-
-  private long flags_;
-  // Misc flags.
-
-  private long priority_;
-  // Priority of message.
-
-  private StringBuffer base_;
-  // String data of message block (initialized to null).
-
-  private Object obj_;
-  // Object data of message block (initialized to null).
-
-  private MessageBlock cont_;
-  // Next message block in the chain.
-
-  private MessageBlock next_;	
-  // Next message in the list.
-
-  private MessageBlock prev_;	
-  // Previous message in the list.
-
-}
-
diff --git a/java/src/MessageQueue.java b/java/src/MessageQueue.java
deleted file mode 100644
index f71c91ca857..00000000000
--- a/java/src/MessageQueue.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Reactor.*;
-
-class NotFullCondition extends TimedWait
-{
-  public NotFullCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isFull ();
-  }
-  private MessageQueue mq_;
-}
-
-class NotEmptyCondition extends TimedWait
-{
-  public NotEmptyCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isEmpty ();
-  }
-  private MessageQueue mq_;
-}
-
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     A thread-safe message queueing facility, modeled after the
- *     queueing facilities in System V StreamS.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *</blockquote>
- *     <tt>MessageQueue</tt> is the central queueing facility for messages
- *     in the ASX framework. All operations are thread-safe, as it is intended
- * to be used for inter-thread communication (<em>e.g.</em>, a producer and
- * consumer thread joined by a <tt>MessageQueue</tt>).  The queue
- * consiste of <tt>MessageBlock</tt>s.
- *</blockquote>
- *
- *@see MessageBlock,TimeValue
- */
-public class MessageQueue
-{
-  /**
-   * Default constructor
-   */
-  public MessageQueue ()
-  {
-    this (DEFAULT_HWM, DEFAULT_LWM);
-  }
-
-  /**
-   * Create a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public MessageQueue (int hwm, int lwm)
-  {
-    if (this.open (hwm, lwm) == -1)
-      ACE.ERROR ("open");
-  }
-
-  /**
-   * Initialize a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public synchronized int open (int hwm, int lwm)
-  {
-    this.highWaterMark_ = hwm;
-    this.lowWaterMark_ = lwm;
-    this.deactivated_ = false;
-    this.currentBytes_	= 0;
-    this.currentCount_	= 0;
-    this.tail_ = null;
-    this.head_ = null;
-    return 0;
-  }
-
-  // = For enqueue, enqueueHead, enqueueTail, and dequeueHead if
-  // timeout is specified, the caller will wait for amount of time in
-  // tv.  Calls will return, however, when queue is closed,
-  // deactivated, or if the time specified in tv elapses.
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will block (unless the queue has been deactivated).
-   *@param newItem item to enqueue onto the Message Queue
-   *@return -1 on failure, else the number of items still on the queue.
-   */
-  public synchronized int enqueue (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueue (newItem, null);
-  }
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will return if <timeout> amount of time expires or if the
-   * queue has been deactivated.
-   *@param newItem item to enqueue onto the Message Queue
-   *@param tv amount of time (TimeValue) to wait before returning
-   * (unless operation completes before)
-   *@return -1 on failure, else the number of items still on the
-   * queue. 
-   */
-  public synchronized int enqueue (MessageBlock newItem, 
-				   TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     */
-  public synchronized int enqueueTail (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueTail (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will return if <timeout> amount of time expires or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv amount of time (TimeValue) to wait before returning
-     * (unless operation completes before)
-     *@return -1 on failure, else the number of items still on the queue.
-     */
-  public synchronized int enqueueTail (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueTailInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     */
-  public synchronized int enqueueHead (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueHead (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note
-     * that the call will return if <timeout> amount of time expires or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv amount of time (TimeValue) to wait before returning
-     * (unless operation completes before)
-     *@return -1 on failure, else the number of items still on the queue.
-     */
-  public synchronized int enqueueHead (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-    
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueHeadInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>. Note that the call will block (unless the queue
-     * has been deactivated). 
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     */
-  public synchronized MessageBlock dequeueHead () throws InterruptedException
-  {
-    return this.dequeueHead (null);
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>. Note that the call will return if <timeout>
-     * amount of time expires or if the queue has been deactivated.
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     */
-  public synchronized MessageBlock dequeueHead (TimeValue tv) throws InterruptedException
-  {
-    MessageBlock result = null;
-    if (this.deactivated_)
-      return null;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notEmptyCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notEmptyCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return null;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return null;
-    else
-      result = this.dequeueHeadInternal ();
-
-    // Tell any blocked threads that the queue has room for an item!
-    this.notFullCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Check if queue is full.
-     *@return true if queue is full, else false.
-     */
-  public synchronized boolean isFull ()
-  {
-    return this.isFullInternal ();
-  }
-
-  /**
-     * Check if queue is empty.
-     *@return true if queue is empty, else false.
-     */
-  public synchronized boolean isEmpty ()
-  {
-    return this.isEmptyInternal ();
-  }
-
-  /**
-     * Get total number of bytes on the queue.
-     *@return total number number of bytes on the queue
-     */
-  public int messageBytes ()
-  {
-    return this.currentBytes_;
-  }
-
-  /**
-     * Get total number of messages on the queue.
-     *@return total number number of messages on the queue
-     */
-  public int messageCount ()
-  {
-    return this.currentCount_;
-  }
-
-  // = Flow control routines 
-
-    /**
-     * Get high watermark.
-     *@return high watermark
-     */
-  public int highWaterMark ()
-  {
-    return this.highWaterMark_;
-  }
-
-  /**
-     * Set high watermark.
-     *@param hwm high watermark
-     */
-  public void highWaterMark (int hwm)
-  {
-    this.highWaterMark_ = hwm;
-  }
-
-  /**
-     * Get low watermark.
-     *@return low watermark
-     */
-  public int lowWaterMark ()
-  {
-    return this.lowWaterMark_;
-  }
-
-  /**
-     * Set low watermark.
-     *@param lwm low watermark
-     */
-  public void lowWaterMark (int lwm)
-  {
-    this.lowWaterMark_ = lwm;
-  }
-
-  // = Activation control methods.
-
-    /**
-     * Deactivate the queue and wakeup all threads waiting on the queue
-     * so they can continue.  No messages are removed from the queue,
-     * however.  Any other operations called until the queue is
-     * activated again will immediately return -1.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int deactivate ()
-  {
-    return this.deactivateInternal ();
-  }
-
-
-  /**
-     * Reactivate the queue so that threads can enqueue and dequeue
-     * messages again.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int activate ()
-  {
-    return this.activateInternal ();
-  }
-
-  protected boolean isEmptyInternal ()
-  {
-    // Not sure about this one!!!!
-    return this.currentBytes_ <= this.lowWaterMark_ && this.currentCount_ <= 0;
-  }
-
-  protected boolean isFullInternal ()
-  {
-    return this.currentBytes_ > this.highWaterMark_;
-  }
-
-  protected int deactivateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-      
-    this.notFullCondition_.broadcast ();
-    this.notEmptyCondition_.broadcast ();
-      
-    this.deactivated_ = true;
-    return currentStatus;
-  }
-
-  protected int activateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-    this.deactivated_ = false;
-
-    return currentStatus;
-  }
-
-  protected int enqueueTailInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    // List was empty, so build a new one.
-    if (this.tail_ == null)
-      {
-	this.head_     = newItem;
-	this.tail_     = newItem;
-	newItem.next (null);
-	newItem.prev (null);
-      }
-    // Link at the end.
-    else 
-      {
-	newItem.next (null);
-	this.tail_.next (newItem);
-	newItem.prev (this.tail_);
-	this.tail_ = newItem;
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!! 
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected int enqueueHeadInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    newItem.prev (null);
-    newItem.next (this.head_);
-
-    if (this.head_ != null)
-      this.head_.prev (newItem);
-    else
-      this.tail_ = newItem;
-
-    this.head_ = newItem;
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-
-    return this.currentCount_;
-  }
-
-  protected int enqueueInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    if (this.head_ == null)
-      // Check for simple case of an empty queue, where all we need to
-      // do is insert <newItem> into the head.
-      return this.enqueueHeadInternal (newItem);
-    else
-      {
-	MessageBlock temp;
-
-	// Figure out where the new item goes relative to its priority.
-
-	for (temp = this.head_;
-	     temp != null;
-	     temp = temp.next ())
-	  {
-	    if (temp.msgPriority () <= newItem.msgPriority ())
-	      // Break out when we've located an item that has lower
-	      // priority that <newItem>.
-	      break;
-	  }
-
-	if (temp == null)
-	  // Check for simple case of inserting at the end of the queue,
-	  // where all we need to do is insert <newItem> after the
-	  // current tail.
-	  return this.enqueueTailInternal (newItem);
-	else if (temp.prev () == null)
-	  // Check for simple case of inserting at the beginning of the
-	  // queue, where all we need to do is insert <newItem> before
-	  // the current head.
-	  return this.enqueueHeadInternal (newItem);
-	else
-	  {
-	    // Insert the message right before the item of equal or lower
-	    // priority.
-	    newItem.next (temp);
-	    newItem.prev (temp.prev ());
-	    temp.prev ().next (newItem);
-	    temp.prev (newItem);
-	  }
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {    
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected MessageBlock dequeueHeadInternal ()
-  {
-    MessageBlock firstItem = this.head_;
-    this.head_ = this.head_.next ();
-
-    if (this.head_ == null)
-      this.tail_ = null;
-
-    if (firstItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to subtract off all of the bytes associated with this
-	// message.
-	for (MessageBlock temp = firstItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ -= temp.size ();
-      }
-
-    this.currentCount_--;
-    return firstItem;
-  }
-
-  
-  /** Default high watermark (16 K). */
-  public final static int DEFAULT_HWM = 16 * 1024;
-
-  /** Default low watermark. */
-  public final static int DEFAULT_LWM = 0;
-
-  /** Message queue was active before activate() or deactivate(). */
-  public final static int WAS_ACTIVE = 1;
-  
-  /** Message queue was inactive before activate() or deactivate(). */
-  public final static int WAS_INACTIVE = 2;
-
-  private int highWaterMark_;
-  // Greatest number of bytes before blocking.
-
-  private int lowWaterMark_;
-  // Lowest number of bytes before unblocking occurs.
-
-  private boolean deactivated_;
-  // Indicates that the queue is inactive.
-
-  private int currentBytes_;
-  // Current number of bytes in the queue.
-
-  private int currentCount_;
-  // Current number of messages in the queue.
-
-  private MessageBlock head_;
-  // Head of Message_Block list.
-
-  private MessageBlock tail_;
-  // Tail of Message_Block list.
-
-  // The Delegated Notification mechanisms.
-  private NotFullCondition notFullCondition_ = new NotFullCondition (this);
-  private NotEmptyCondition notEmptyCondition_ = new NotEmptyCondition (this);
-
-}
diff --git a/java/src/MessageType.java b/java/src/MessageType.java
deleted file mode 100644
index 62c34455854..00000000000
--- a/java/src/MessageType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageType.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Message types used by ACE.MessageBlock.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     Defines bit masks used to identify various types of messages.
- *</blockquote>
- *
- *<h2>NOTES</h2>
- *<blockquote>
- * This class is not intended to be instantiable.
- *</blockquote>
- */
-public class MessageType
-{
-  // = Data and protocol messages (regular and priority)
-  /** regular data */
-  public static final int MB_DATA     = 0x01;
-
-  /** protocol control */
-  public static final int MB_PROTO    = 0x02;
-
-  /** regular data */
-  public static final int MB_OBJECT   = 0x09;
-
-
-  // = Control messages (regular and priority)
-  /** line break */
-  public static final int MB_BREAK    = 0x03;
-
-  /** pass file pointer */
-  public static final int MB_PASSFP   = 0x04;
-
-  /** post an event to an event queue */
-  public static final int MB_EVENT    = 0x05;
-
-  /** generate process signal */
-  public static final int MB_SIG      = 0x06;
-
-  /** ioctl; set/get params */
-  public static final int MB_IOCTL    = 0x07;
-
-  /** set various stream head options */
-  public static final int MB_SETOPTS  = 0x08; 
-
-
-  // = Control messages (high priority; go to head of queue)
-  /** acknowledge ioctl */
-  public static final int MB_IOCACK   = 0x81;
-
-  /** negative ioctl acknowledge */
-  public static final int MB_IOCNAK   = 0x82;
-
-  /** priority proto message */
-  public static final int MB_PCPROTO  = 0x83;
-
-  /** generate process signal */
-  public static final int MB_PCSIG    = 0x84;
-
-  /** generate read notification */
-  public static final int MB_READ     = 0x85;
-
-  /** flush your queues */
-  public static final int MB_FLUSH    = 0x86;
-
-  /** stop transmission immediately */
-  public static final int MB_STOP     = 0x87;
-
-  /** restart transmission after stop */
-  public static final int MB_START    = 0x88;
-
-  /** line disconnect */
-  public static final int MB_HANGUP   = 0x89;
-
-  /** fatal error used to set u.u_error */
-  public static final int MB_ERROR    = 0x8a;
-
-  /** post an event to an event queue */
-  public static final int MB_PCEVENT  = 0x8b; 
-
-
-  /** Normal priority messages */
-  public static final int MB_NORMAL   = 0x00;
-
-  /** High priority control messages */
-  public static final int MB_PRIORITY = 0x80; 
-
-  // Default private constructor to avoid instantiation
-  private MessageType ()
-  {
-  }
-}
-
diff --git a/java/src/Module.java b/java/src/Module.java
deleted file mode 100644
index 6eb56bcbf43..00000000000
--- a/java/src/Module.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Module.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Provides an abstraction for managing a bi-directional flow of
- * messages. 
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *   This is based on the Module concept in System V Streams,
- *   which contains a pair of Tasks, one for handling upstream
- *   processing, one for handling downstream processing.
- *</blockquote>
- */
-public class Module
-{
-  // = Initialization and termination methods.
-
-  /**
-   * Create an empty Module.
-   */
-  public Module ()
-  {
-    // Do nothing...
-    this.name ("<unknown>");
-  }
-
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public Module (String modName,
-		 Task writerQ,
-		 Task readerQ,
-		 Object flags)
-  {
-    this.open (modName, writerQ, readerQ, flags);
-  }
-		
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public void open (String modName,
-		   Task writerQ,
-		   Task readerQ,
-		   Object arg)
-  {
-    this.name (modName);
-    this.arg_ = arg;
-
-    if (writerQ == null)
-      writerQ = new ThruTask ();
-    if (readerQ == null)
-      readerQ = new ThruTask ();
-
-    this.reader (readerQ);
-    this.writer (writerQ);
-
-    // Setup back pointers.
-    readerQ.module (this);
-    writerQ.module (this);
-  }
-
-
-  /*
-   * Set the writer task.
-   *@param q the writer task
-   */
-  public void writer (Task q)
-  { 
-    this.qPair_[1] = q;
-    if (q != null)
-      q.flags (ACE.CLR_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Set the reader task.
-   *@param q the reader task
-   */
-  public void reader (Task q) 
-  {
-    this.qPair_[0] = q;
-    if (q != null)
-      q.flags (ACE.SET_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Link this Module on top of Module.
-   *@param m the module to link this on top of.
-   */
-  public void link (Module m)
-  {
-    this.next (m);
-    this.writer ().next (m.writer ());
-    m.reader ().next (this.reader ());
-  }
-
-  /*
-   * Set and get pointer to sibling Task in Module.
-   *@param orig the task to get the sibling for
-   *@return the sibling of the task
-   */
-  public Task sibling (Task orig)
-  {
-  if (this.qPair_[0] == orig)
-    return this.qPair_[1];
-  else if (this.qPair_[1] == orig)
-    return this.qPair_[0];
-  else
-    return null;
-  }
-
-  /*
-   * Close down the module and its tasks.
-   *@param flags Module flags
-   *@return 0 on success, -1 on failure
-   */
-  public int close (long flags)
-  {
-    Task readerQ = this.reader ();
-    Task writerQ = this.writer ();
-    int result = 0;
-
-    if (readerQ != null)
-      {
-	if (readerQ.close (flags) == -1)
-	  result = -1;
-	readerQ.flush (flags);
-	readerQ.next (null);
-      }
-
-    if (writerQ != null)
-      {
-	if (writerQ.close (flags) == -1)
-	  result = -1;
-	writerQ.flush (flags);
-	writerQ.next (null);
-      }
-
-    return result;
-  }
-
-  /* 
-   * Get the argument passed to tasks.
-   *@return the argument passed to tasks.
-   */
-  public Object arg ()
-  {
-    return this.arg_;
-  }
-
-  /* 
-   * Set the argument to be passed to tasks.
-   *@param a the argument to be passed to tasks.
-   */
-  public void arg (Object a)
-  {
-    this.arg_ = a;
-  }
-
-  /* 
-   * Get the name of the module.
-   *@return the name of the module.
-   */
-  public String name ()
-  {
-    return this.name_;
-  }
-
-  /* 
-   * Set the name of the module.
-   *@param n the name of the module.
-   */
-  public void name (String n)
-  {
-    this.name_ = n;
-  }
-
-  /* 
-   * Get the writer task of the module.
-   *@return the writer task of the module.
-   */
-  public Task writer ()
-  { 
-    return this.qPair_[1];
-  }
-
-  /* 
-   * Get the reader task of the module.
-   *@return the reader task of the module.
-   */
-  public Task reader ()
-  {
-    return this.qPair_[0];
-  }
-
-  /*
-   * Get the next pointer to the module above in the stream.
-   *@return the next pointer to the module above in the stream.
-   */
-  public Module next ()
-  {
-    return this.next_;
-  }
-
-  /*
-   * Set the next pointer to the module above in the stream.
-   *@param m the next pointer to the module above in the stream.
-   */
-  public void next (Module m) 
-  {
-    this.next_ = m;
-  }
-
-  private Task qPair_[] = new Task[2];
-  // Pair of Tasks that form the "read-side" and "write-side" of the
-  // ACE_Module partitioning.
-
-  private String name_ = null;
-  // Name of the ACE_Module.
-
-  private Module next_;
-  // Next ACE_Module in the stack.
-
-  private Object arg_;
-  // Argument passed through to the reader and writer task when they
-  // are opened.
-
-}
-
diff --git a/java/src/Mutex.java b/java/src/Mutex.java
deleted file mode 100644
index 8daab4ff9eb..00000000000
--- a/java/src/Mutex.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Mutex.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class TimedWaitMAdapter extends TimedWait
-{
-  TimedWaitMAdapter (Object obj)
-  {
-    super (obj);
-  }
-
-  // Check to see if the lock is currently held or not.
-  public boolean condition ()
-  {
-    return !this.inUse_;
-  }
-
-  // Acquire/Release the lock
-  public void inUse (boolean c)
-  {
-    this.inUse_ = c;
-  }
-
-  private boolean inUse_ = false;
-  // The actual lock
-}
-
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Value added abstraction for mutex variable creation.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     A timed mutex, <em>i.e.</em> a mutex whose operations do not
- * block forever and can <q>time out</q>.
- *</blockquote>
- */
-public class Mutex
-{
-  /**
-   * Acquire the mutex. Note that this will block.
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire () throws InterruptedException
-    {
-      this.monitor_.timedWait ();
-      this.monitor_.inUse (true);
-    }
-
-  /**
-   * Acquire the mutex. Note that the call will return if <timeout>
-   * amount of time expires.
-   *@param tv amount of time (TimeValue) to wait before returning
-   * (unless operation completes before)
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire (TimeValue tv) throws
-  TimeoutException, InterruptedException 
-    {
-      this.monitor_.timedWait (tv);
-      this.monitor_.inUse (true);
-    }
-
-  /**
-   * Release the mutex.
-   */
-  public synchronized void release ()
-    {
-      this.monitor_.inUse (false);
-      this.monitor_.signal ();
-    }
-
-  private TimedWaitMAdapter monitor_ = new TimedWaitMAdapter (this);
-  // The monitor (adapter) to wait on
-}
diff --git a/java/src/OS.java b/java/src/OS.java
deleted file mode 100644
index c17fd6d07f2..00000000000
--- a/java/src/OS.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    OS.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-import java.util.StringTokenizer;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Methods to extend the capabilities of the Java runtime system.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * This non-instantiable class contains little <q>utility functions</q>
- * that should have been in Java to begin with :-)
- *</blockquote>
- */
-public class OS
-{
-  /**
-   * Create an array of Strings from a single String using <delim> as
-   * the delimiter.
-   *@param args the String to break up to make an array of Strings
-   *@param delim the delimeter to use to break the String up
-   *@return an array containing the original String broken up
-   */
-  public static String [] createStringArray (String args, String delim)
-  {
-    // First determine the number of arguments
-    int count = 0;
-    StringTokenizer tokens = new StringTokenizer (args, delim);
-    while (tokens.hasMoreTokens ())
-      {
-	tokens.nextToken ();
-	count++;
-      }
-    if (count == 0)
-      return null;
-    
-    // Create argument array
-    String [] argArray = new String [count];
-    int index = 0;
-    tokens = new StringTokenizer (args, " ");
-    while (tokens.hasMoreTokens ())
-      {
-	argArray [index] = tokens.nextToken ();
-	index++;
-      }
-
-    // Assert index == count
-    if (index != count)
-      return null;
-    else
-      return argArray;    
-  }
-
-  // Default private constructor to avoid instantiation
-  private OS ()
-  {
-  }
-}
diff --git a/java/src/ParseNode.java b/java/src/ParseNode.java
deleted file mode 100644
index 6a4db754227..00000000000
--- a/java/src/ParseNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ParseNode.java
- *
- * Base class for the data types used in the parse tree for adjusting 
- * services.  Things like SuspendNode extend this.  They help connect
- * CUP/JLex with the service configurator system.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-public class ParseNode extends java_cup.runtime.symbol 
-{
-  /** 
-   * Constructor
-   *
-   */
-  public ParseNode (int number)
-  {
-    super(number);
-
-    this.name_ = new String("Uninitialized");
-  }
-
-  /**
-   * Initialize the service (subclasses
-   * may do more than set the name)
-   */
-  public void init (String name)
-  {
-    this.name_ = name;
-  }
-
-  /**
-   * Subclasses override to do real work, usually
-   * initiating a service or modifying one
-   */
-  public void apply () 
-  {
-    // Empty
-  }
-
-  /**
-    * Retrive the service name
-    */
-  public String name() 
-  {
-    return this.name_;
-  }
-
-  /**
-   * Set the name of the service
-   */
-  public void name(String newName)
-  {
-    this.name_ = newName;
-  }
-  
-  String name_;
-};
-
- 
-  
diff --git a/java/src/ProfileTimer.java b/java/src/ProfileTimer.java
deleted file mode 100644
index b7e9c908a13..00000000000
--- a/java/src/ProfileTimer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Timers
- *
- * = FILENAME
- *    ProfileTimer.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Timers;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     A Java wrapper for interval timers.
- */
-public class ProfileTimer
-{
-  /**
-   * Start the timer.
-   */
-  public void start ()
-    {
-      this.startTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Stop the timer.
-   */
-  public void stop ()
-    {
-      this.stopTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Determine elapsed time between start and stop.
-   *@return Total elapsed time (stop - start).
-   */
-  public long elapsedTime ()
-    {
-      return this.stopTime_ - this.startTime_;
-    }
-
-  private long startTime_;
-  private long stopTime_;
-}
diff --git a/java/src/RWMutex.java b/java/src/RWMutex.java
deleted file mode 100644
index 1161d9a8618..00000000000
--- a/java/src/RWMutex.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    RWMutex.java
- *
- *@author Ross Dargahi (rossd@krinfo.com), Prashant Jain, and Irfan Pyarali
- *
- *************************************************/
-
-package JACE.Concurrency;
-
-import JACE.OS.*;
-
-/*******************************************************************************
-* <HR>
-* <B> Description </B>
-* <BR>
-* This class increments a read/write lock. A read/write lock allows multiple
-* readers or a single writer to access the guarded element.
-* This implementation is based on the C++ version of ACE.
-* </PRE><P><HR>
-* <B> Notes </B>
-* <UL>
-* <LI> This class does not support recursive semantics
-* </UL>
-*******************************************************************************/
-public class RWMutex
-{
-  /**
-   * Acquires the write lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquire()
-    throws InterruptedException
-  {
-    acquireWrite();
-  }
-
-  /**
-   * Acquires the read lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquireRead()
-    throws InterruptedException
-  {
-    // make sure we start with no exception
-    InterruptedException exception_ = null;
-    
-    // grab lock
-    lock_.acquire ();
-    
-    // Give preference to writers who are waiting.
-    while (referenceCount_ < 0 || numberOfWaitingWriters_ > 0)
-      {
-	numberOfWaitingReaders_++;
-	try 
-	  {
-	    waitingReaders_.Wait ();
-	  }
-	catch (InterruptedException exception)
-	  {
-	    // cache exception
-	    exception_ = exception;
-	  }
-	numberOfWaitingReaders_--;
-      }
-    
-    if (exception_ == null)
-      // No errors
-      referenceCount_++;
-
-    // make sure this is released in all cases
-    lock_.release ();
-
-    if (exception_ != null)
-      // error: propogate
-      throw exception_;
-  }
-  
-  /**
-   * Acquires the write lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquireWrite()
-    throws InterruptedException
-  {
-    // make sure we start with no exception
-    InterruptedException exception_ = null;
-    
-    // grab lock
-    lock_.acquire ();
-    
-    // Give preference to writers who are waiting.
-    while (referenceCount_ != 0)
-      {
-	numberOfWaitingWriters_++;
-	try 
-	  {
-	    waitingWriters_.Wait ();
-	  }
-	catch (InterruptedException exception)
-	  {
-	    // cache exception
-	    exception_ = exception;
-	  }
-	numberOfWaitingWriters_--;
-      }
-    
-    if (exception_ == null)
-      // No errors
-      referenceCount_ = -1;
-
-    // make sure this is released in all cases
-    lock_.release ();
-
-    if (exception_ != null)
-      // error: propogate
-      throw exception_;
-  }
-
-  /**
-   * Release held lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void release()
-    throws InterruptedException
-  {
-    lock_.acquire ();
-    
-    // Releasing a reader.
-    if (referenceCount_ > 0) 
-      referenceCount_--;
-    else 
-      // Releasing a writer.
-      if (referenceCount_ == -1) 
-	referenceCount_ = 0;
-    
-    // Give preference to writers over readers...
-    if (numberOfWaitingWriters_ > 0)
-      {
-	waitingWriters_.signal ();
-      }
-    else if (numberOfWaitingReaders_ > 0)
-      {
-	waitingReaders_.broadcast ();
-      }
-	
-    
-    lock_.release ();
-  }
-
-  private Mutex lock_ = new Mutex (); 
-  // Serialize access to internal state.
- 
-  private Condition waitingReaders_ = new Condition (lock_);
-  // Reader threads waiting to acquire the lock.
- 
-  private int numberOfWaitingReaders_;
-  // Number of waiting readers.
- 
-  private Condition waitingWriters_ = new Condition (lock_);
-  // Writer threads waiting to acquire the lock.
- 
-  private int numberOfWaitingWriters_ = 0;
-  // Number of waiting writers.
- 
-  private int referenceCount_ = 0;
-  // Value is -1 if writer has the lock, else this keeps track of the
-  // number of readers holding the lock.
-}
-
diff --git a/java/src/RemoveNode.java b/java/src/RemoveNode.java
deleted file mode 100644
index 43744394a7b..00000000000
--- a/java/src/RemoveNode.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    RemoveNode.java
- *
- * Used when a service is specified to be removed based on a line
- * in a service configurator file.  Note:  Make sure to call the
- * prepareToReload method in ServiceConfig before reloading the
- * service that is being removed.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-class RemoveNode extends ParseNode
-{
-  public RemoveNode (int act_num)
-  {
-    super(act_num);
-  }  
-
-  public void apply () 
-  {
-    ACE.DEBUG("RemoveNode apply");
-
-    if (JACE.ServiceConfigurator.ServiceConfig.remove(this.name_) == -1)
-      ACE.ERROR("Error removing " + this.name_);
-  }
-};
diff --git a/java/src/ResumeNode.java b/java/src/ResumeNode.java
deleted file mode 100644
index 49b7f5a2b62..00000000000
--- a/java/src/ResumeNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ResumeNode.java
- *
- * Used when a service is specified to be resumed based on a line
- * in a service configurator file.  The actual implementation of the
- * service being resumed does the work.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-class ResumeNode extends ParseNode
-{
-  public ResumeNode (int act_num) 
-  {
-    super(act_num);
-  }
-
-  public void apply ()
-  {
-    ACE.DEBUG("ResumeNode apply: " + this.name_);
-
-    if (JACE.ServiceConfigurator.ServiceConfig.resume(this.name_) == -1)
-      ACE.ERROR("Error resuming " + this.name_);
-  }
-};
diff --git a/java/src/SOCKAcceptor.java b/java/src/SOCKAcceptor.java
deleted file mode 100644
index aaca725426a..00000000000
--- a/java/src/SOCKAcceptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines the format and interface for an ACE.SOCKAcceptor.
- */
-public class SOCKAcceptor
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKAcceptor. Do nothing constructor. Allows user to
-   * call open() later and pass in the port number.
-   */
-  public SOCKAcceptor ()
-    {
-    }
-
-  /**
-   * Create a SOCKAcceptor.
-   *@param port port number where the server will listen for connections
-   */
-  public SOCKAcceptor (int port) throws IOException
-    {
-      this.open (port);
-    }
-
-  /**
-   * Create socket to listen for connections on.
-   *@param port port number where the server will listen for connections
-   */
-  public void open(int port) throws IOException
-    {
-      // Close old socket (if there is one)
-      this.close ();
-
-      // Create a new server socket
-      this.listenSocket_ = new ServerSocket (port);
-      //      ACE.DEBUG ("Server listening on port " + port);
-    }
-
-  /**
-   * Close the socket and do any necessary cleanup.
-   */
-  public void close () throws IOException
-    {
-      if (this.listenSocket_ != null)
-	{
-	  this.listenSocket_.close ();
-	  this.listenSocket_ = null;
-	}
-    }
-
-  /**
-   * Accept a connection. The streams are set when the method returns.
-   *@param sockStream SOCK Stream to use for the connection
-   */
-  public void accept (SOCKStream sockStream) throws SocketException, IOException
-    {
-      // Block in accept. Returns when a connection shows up and sets
-      // the streams
-      sockStream.socket (this.listenSocket_.accept ());
-      ACE.DEBUG ("Accepted connection from " +
-		 sockStream.socket ().getInetAddress ());
-    }
-
-  /**
-   * Get the underlying listen socket.
-   *@return the underlying listen socket
-   */
-  public ServerSocket listenSocket ()
-  {
-    return this.listenSocket_;
-  }
-
-  /**
-   * Set the underlying listen socket.
-   *@param s the underlying listen socket
-   */
-  public void listenSocket (ServerSocket s)
-  {
-    this.listenSocket_ = s;
-  }
-
-  /**
-   * Clean up when the garbage collector gets run (if at all). Note
-   * that there is no guarantee that finalize () will get called.
-   */
-  protected void finalize () throws Throwable
-    {
-      super.finalize ();
-      this.close ();
-    }
-
-  // Socket on which listen for connections (by default initialized to
-  // null)
-  private ServerSocket listenSocket_;
-}
diff --git a/java/src/SOCKConnector.java b/java/src/SOCKConnector.java
deleted file mode 100644
index 98dfcaf6b3d..00000000000
--- a/java/src/SOCKConnector.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKConnector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines an active connection factory for the socket wrappers. 
- */
-public class SOCKConnector
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKConnector. Do nothing constructor. Allows user to
-   * call connect() later.
-   */
-  public SOCKConnector ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create a SOCKConnector and connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public SOCKConnector (SOCKStream sockStream,
-			 String hostname,
-			 int port) throws SocketException, IOException
-    {
-      this.connect (sockStream,
-		    hostname,
-		    port);
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public void connect (SOCKStream sockStream,
-		       String hostname,
-		       int port) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (hostname, port));
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param addr INETAddr instance specifying host/port
-   */
-  public void connect (SOCKStream sockStream,
-		       INETAddr addr) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (addr.getHostName(),
-				     addr.getPortNumber()));
-    }
-}
diff --git a/java/src/SOCKStream.java b/java/src/SOCKStream.java
deleted file mode 100644
index 638482d8e40..00000000000
--- a/java/src/SOCKStream.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKStream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines the methods in the ACE.SOCKStream abstraction.
- *     
- * <p><b>DESCRIPTION</b><br>
- *     This adds additional wrapper methods atop the java Socket class.
- */
-public class SOCKStream
-{
-  /**
-   * Create a default SOCK Stream. Do nothing constructor.
-   */
-  public SOCKStream ()
-    {
-    }
-
-  /**
-   * Create a SOCK Stream.
-   *@param s Socket to initialize SOCK Stream with.
-   */
-  public SOCKStream (Socket s) throws IOException
-    {
-      this.socket (s);
-    }
-
-  /**
-   * Set the socket and the underlying streams.
-   *@param s Socket associated with the SOCK Stream.
-   */
-  public void socket (Socket s) throws IOException
-  {
-    this.socket_ = s;
-    // Note that if s is not a valid socket or is null, the
-    // following calls will throw exceptions
-
-    // Create buffered, platform independent byte streams.  This hasn't been switched
-    // to the newer character streams since the change would break cross talk with
-    // non-Java sockets.
-
-    this.iStream_ = new DataInputStream(new BufferedInputStream(s.getInputStream()));
-
-    this.oStream_ = new PrintStream(new DataOutputStream(new BufferedOutputStream(s.getOutputStream())));
-  }
-
-  /* Get the underlying Socket.
-   *@return the underlying socket
-   */
-  public Socket socket ()
-    {
-      return this.socket_;
-    }
-
-  /**
-   * Close the streams and the underlying socket.
-   */
-  public void close () throws IOException
-    {
-      if (this.socket_ != null)
-	this.socket_.close ();
-      this.socket_ = null;
-    }
-  
-  // = The following send and recv methods are overloaded to provide a
-  // flexible interface
-
-  /**
-   * Send a StringBuffer. Note that the method blocks.
-   *@param s the StringBuffer to send
-   *@return the length of the StringBuffer
-   */
-  public int send (StringBuffer s) throws IOException
-    {
-      // Get the data out
-      String buf = s.toString ();
-
-      this.oStream_.println(buf);
-      this.oStream_.flush ();
-
-      return buf.length ();
-    }
-
-  /**
-   * Send a String. Note that the method blocks.
-   *@param s the String to send
-   *@return the length of the String
-   */
-  public int send (String s) throws IOException
-    {
-      this.oStream_.println(s);
-      this.oStream_.flush();
-
-      return s.length ();
-    }
-
-  /** 
-   * Send an array of bytes. Note that the method blocks.
-   *@param b array of bytes to send
-   *@param offset offset into the byte array to start sending from
-   *@param length number of bytes to send
-   *@return number of bytes sent
-   */
-  public int sendN (byte[] b, int offset, int length) throws IOException
-    {
-      this.oStream_.write (b, offset, length);
-      this.oStream_.flush ();
-      return length;
-    }
-
-  /**
-   * Receive data and append it to the StringBuffer that was passed
-   * in. Note that the method blocks.
-   *@param s the StringBuffer to append the result of the recv to
-   *@return the length of the String received
-   */
-  public int recv (StringBuffer s) throws IOException
-    {
-      String temp = this.iStream_.readLine ();
-      s.append (temp);
-
-      if (temp == null) // Possible if user sends just a line feed, but        
-        return -1;      // not checking would cause a null ptr exception       
-      else                    
-        return temp.length ();  
-    }
-
-  /**
-   * Receive an array of characters. This method blocks until either
-   * all the bytes are read, the end of the stream is detected, or
-   * an exception is thrown.
-   *@param b byte array to receive the data in
-   *@param offset the start offset of the data in the byte array.
-   *@param n number of bytes to receive
-   *@return n
-   */
-  public int recvN (byte[] b, int offset, int n) throws IOException
-    {
-      this.iStream_.readFully (b, offset, n);
-      return n;
-    }
-
-  /**
-   * Set the underlying input stream.
-   *@param iStream the input stream
-   */
-  public void inputStream (InputStream iStream)
-    {
-      this.iStream_ = new DataInputStream(new BufferedInputStream(iStream));
-    }
-
-  /**
-   * Get the underlying input stream.
-   *@return the underlying input stream
-   */
-  public InputStream inputStream ()
-    {
-      return this.iStream_;
-    }
-
-  /**
-   * Set the underlying output stream.
-   *@param iStream the output stream
-   */
-  public void outputStream (OutputStream oStream)
-    {    
-      this.oStream_ = new PrintStream(new DataOutputStream(new BufferedOutputStream(oStream)));
-    }
-
-  /**
-   * Get the underlying output stream.
-   *@return the underlying output stream
-   */
-  public OutputStream outputStream ()
-    {
-      return this.oStream_;
-    }
-
-  /**
-   * Cleanup when the SOCK Stream is garbage collected.
-   */
-  protected void finalize () throws Throwable
-    {
-      super.finalize ();
-      this.close ();
-    }
-  
-  private Socket socket_;
-
-  // = The input and output streams (by default null)
-  private DataInputStream iStream_;
-  private PrintStream oStream_;
-}
diff --git a/java/src/Semaphore.java b/java/src/Semaphore.java
deleted file mode 100644
index 4762712d722..00000000000
--- a/java/src/Semaphore.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Semaphore.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class TimedWaitSAdapter extends JACE.ASX.TimedWait
-{
-  TimedWaitSAdapter (Object obj)
-  {
-    super (obj);
-  }
-
-  // Check to see if there are any semaphores available.
-  public boolean condition ()
-  {
-    return this.count_ > 0;
-  }
-
-  // Increment the count by one
-  public void increment ()
-  {
-    this.count_++;
-  }
-
-  // Decrement the count by one
-  public void decrement ()
-  {
-    this.count_--;
-  }
-
-  // Set the count
-  public void count (int c)
-  {
-    this.count_ = c;
-  }
-
-  private int count_ = 0;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *     Implementation of Dijkstra's counting semaphore in java.
- */
-public class Semaphore
-{  
-  /**
-   * Create a Semaphore.
-   *@param count semaphore count
-   */
-  public Semaphore (int c)
-    {
-      this.monitor_.count (c);
-    }
-
-  /**
-   * Acquire the Semaphore. Note that this will block.
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire () throws InterruptedException
-    {
-      this.monitor_.timedWait ();
-      this.monitor_.decrement ();
-    }
-
-  /**
-   * Acquire the Semaphore.  Note that the call will return if <timeout>
-   * amount of time expires.
-   *@param tv amount of time (TimeValue) to wait before returning
-   * (unless operation completes before)
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire (TimeValue tv)
-      throws JACE.ASX.TimeoutException, InterruptedException 
-    {
-      this.monitor_.timedWait (tv);
-      this.monitor_.decrement ();
-    }
-
-  /**
-   * Release the Semaphore.
-   */
-  public synchronized void release ()
-    {
-      this.monitor_.increment ();
-      this.monitor_.signal ();
-    }
-
-  private TimedWaitSAdapter monitor_ = new TimedWaitSAdapter (this);
-  // The monitor (adapter) to wait on
-}
diff --git a/java/src/ServiceConfig.java b/java/src/ServiceConfig.java
deleted file mode 100644
index 11504527bdd..00000000000
--- a/java/src/ServiceConfig.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceConfig.java
- *
- * Services can be suspended, resumed, removed, and reloaded.  Reloading requires that
- * the user calls a prepareForReload method after removing a service.  You can't access
- * the ServiceObjects that are loaded directly -- anything loaded with a class loader
- * must be wrapped and have its methods called via reflection.  This is because a
- * loaded class doesn't exist in the same space as one loaded with the system loader.
- *
- *
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Provide the base class that supplies common server daemon
- *     operations.  Also provides a global point for interacting with
- *     the service repository.
- */
-public class ServiceConfig
-{
-  /** Begins the process of loading a service configurator file:
-   *  parses the command line and calls either loadOldConfigFile or
-   *  processDirectives depending on whether or not the user wants
-   *  to try to load a C++ svc.conf file.
-   */
-  public static int open (String [] args) throws FileNotFoundException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException
-   {
-     // Parse the command line
-    ServiceConfig.parseArgs (args);
-
-    // Create a repository and class loader
-    if (ServiceConfig.svcRep_ == null)
-      ServiceConfig.svcRep_ = new ServiceRepository ();
-    if (ServiceConfig.loader_ == null)
-      ServiceConfig.loader_ = new ServiceLoader();
-
-    if (ServiceConfig.oldConfigFormat_) 
-      return ServiceConfig.loadOldConfigFile();
-    else
-      return ServiceConfig.processDirectives ();
-    
-  }
-
-  /** Parses the command line
-    * Valid command line options:
-    * -b             Run as a daemon (not implemented yet)
-    * -d             Debug mode
-    * -n             No defaults
-    * -o             Attempt to load a C++ ACE service config file
-    * -f <filename>  Load services in the given file [see below for info]
-    *
-    */
-  protected static void parseArgs (String [] args)
-  {
-    GetOpt getopt = new GetOpt (args, "bdnf:o:");
-    for (int c; (c = getopt.next ()) != -1; )
-      switch (c)
-	{
-	case 'b':
-	  // Note: not supported yet!
-	  ServiceConfig.beADaemon_ = true;
-	  break;
-	case 'd': 
-	  ServiceConfig.debug_ = true;
-	  break;
-	case 'n':
-	  ServiceConfig.noDefaults_ = true;
-	  break;
-	case 'o':
-	  ServiceConfig.oldConfigFormat_ = true;
-	  break;
-	case 'f':
-	  ServiceConfig.serviceConfigFile_ = getopt.optarg ();
-	  break;
-	default:
-	  ACE.ERROR ((char ) c + " is not a ServiceConfig option");
-	  break;
-	}
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to spend a service
-   */
-  public static int suspend (String name)
-  {
-    return svcRep_.suspend(name);
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to resume a service
-   */
-  public static int resume (String name)
-  {
-    return svcRep_.resume(name);
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to remove a serivce
-   */
-  public static int remove (String name)
-  {
-    return svcRep_.remove(name);
-  }
-
-  /** Should be called before the user wants to reload
-   * a service.  This calls garbage collection to
-   * (hopefully) obliterate the names of any unused
-   * service classes, and creates a new instance
-   * of the ClassLoader so there won't be problems
-   * reloading.
-   */
-  public static void prepareForReload()
-  {
-    ServiceConfig.loader_ = new ServiceLoader();
-
-    System.gc();
-
-  }
-
-  /**
-   * Parse a service configurator file, creating classes as necessary
-   *
-   * This is getting too complicated -- since CUP and JLex are available, it would be nice to
-   * develop a grammar for this.  Unfortunately, there may be file problems when trying to get
-   * CUP and JLex to produce more than one parser per program.
-   *
-   * Current formats:
-   *
-   *    load <Service Name> <Full Class Name> Service_Object "<argument list>"
-   *
-   *    resume <Service Name>
-   *    suspend <Service Name>
-   *    remove <Service Name>
-   *
-   */
-  protected static int processDirectives () throws FileNotFoundException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException 
-  {
-    if (ServiceConfig.serviceConfigFile_ == null) 
-      ServiceConfig.serviceConfigFile_ = "svc.conf";
-
-    ACE.DEBUG("Processing directives in file " + ServiceConfig.serviceConfigFile_);
-
-    File configFile = new File (ServiceConfig.serviceConfigFile_);
-    
-    // Check if file exists and is a normal file
-    if (!configFile.exists () || !configFile.isFile ())
-      throw new FileNotFoundException ("File " + ServiceConfig.serviceConfigFile_ + " not found");
-    
-    // Check if the file is readable
-    if (!configFile.canRead ())
-      throw new IOException ("File " + ServiceConfig.serviceConfigFile_ + " not readable");
-
-    // Set up the stream
-    FileInputStream fileIn = new FileInputStream (configFile);
-
-    // Parse the file
-    StreamTokenizer in = new StreamTokenizer (fileIn);
-
-    // Set '#' as comment character to be ignored and set '/' as
-    // ordinary character (was original comment character) 
-    //    in.commentChar ('#');
-    in.ordinaryChar ('/');
-
-    // Set characters in ASCII range 33 to 47, ASCII range 91 to 96,
-    // and ASCII range 123 to 126 as ordinary characters
-    in.wordChars ('!', '/');  // ASCII range 33 to 47
-    in.wordChars (':', '@');  // ASCII range 58 to 64
-    in.wordChars ('[', '`');  // ASCII range 91 to 96
-    in.wordChars ('{', '~');  // ASCII range 123 to 126
-
-    String commandName = null;
-    String serviceName = null;
-    String className = null;
-    String classType = null;
-    String args = null;
-    // Create a state machine
-    int state = ServiceConfig.COMMAND_NAME;
-
-    // The apply() method on ParseNode starts the process of actually executing the
-    // desired action (suspend, load, etc)
-    ParseNode result = null;
-
-    while (in.nextToken () != StreamTokenizer.TT_EOF)
-      {
-	switch (state)
-	  {
-	  case ServiceConfig.COMMAND_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD) {
-	      commandName = in.sval;
-
-	      // This is a hack, but it should work until CUP is easier
-	      // to deal with when multiple parsers are needed
-	      if (commandName.equals("load"))
-		result = new AddServiceObjectNode(0);
-	      else
-	      if (commandName.equals("remove"))
-		result = new RemoveNode(0);
-	      else
-	      if (commandName.equals("suspend"))
-		result = new SuspendNode(0);
-	      else
-	      if (commandName.equals("resume"))
-		result = new ResumeNode(0);
-	      else
-		throw new IOException ("COMMAND NAME missing or invalid: " + commandName);
-
-	      ACE.DEBUG("Command node type: " + ((Object)result).getClass().getName());
-
-
-	    } else
-	      throw new IOException ("Illegal COMMAND NAME argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.SERVICE_NAME;
-	    break;
-	  case ServiceConfig.SERVICE_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      serviceName = in.sval;
-	    else
-	      throw new IOException ("Illegal SERVICE NAME argument in file " + ServiceConfig.serviceConfigFile_);
-
-
-	    if (!commandName.equals("load")) {
-	        result.init(serviceName);
-		result.apply(); 
-		in.whitespaceChars (' ', ' ');
-		state = ServiceConfig.SERVICE_NAME;
-	    } else
-	      state = ServiceConfig.CLASS_NAME;
-	    break;
-	  case ServiceConfig.CLASS_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      className = in.sval;
-	    else
-	      throw new IOException ("Illegal CLASS NAME argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.CLASS_TYPE;
-	    break;
-	  case ServiceConfig.CLASS_TYPE:
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      classType = in.sval;
-	    else
-	      throw new IOException ("Illegal CLASS TYPE argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.ARGS;
-	    // Set space to be an ordinary character to allow
-	    // arguments to be parsed in
-	    in.wordChars (' ', ' ');
-	    break;
-	  case ServiceConfig.ARGS:
-	    ACE.DEBUG("Processing arguments");
-
-	    args = new String("");
-
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      {
-		args = in.sval;
-
-		// If just two double quotes, there are no args
-		if (args.length() == 2) {
-		  args = new String("");
-		} else
-		  args = args.substring(1, args.length() - 1);
-	      }
-
-	    // Quick hack until more parsing necessary -- set the needed data
-	    ((AddServiceObjectNode)result).init(serviceName, className, false);
-	    ((AddServiceObjectNode)result).params(args);
-
-	    result.apply();
-
-	    state = ServiceConfig.SERVICE_NAME;
-	    // Set space back to whitespace-character to extract the
-	    // next token
-	    in.whitespaceChars (' ', ' ');
-	    break;
-	  default:
-	    throw new IOException ("Illegal argument in file " + ServiceConfig.serviceConfigFile_);
-	  }
-      }
-    return 0;
-  }
-
-  /** Parses the svc.conf file, treating it as a C++ ACE svc.conf file.
-    * This will involve attempts to infer the class name from
-    * the service initializer path, and isn't very accurate.
-    */
-  public static int loadOldConfigFile ()
-  {
-    parser ps = new parser();
-
-    try {
-
-      ps.parse();
-
-    } catch (Exception e) {
-      ACE.ERROR("Error: " + e);
-      return -1;
-    }
-
-    return 0;
-  }
-
-
-  /**
-   * This is called when apply() is called on AddServiceObjectNodes.  Similar
-   * methods could be developed for later data types (AddStreamNode, etc).  This
-   * tries to load the ServiceObject and its classes.  When trying to find info
-   * from the C++ files, this generates possible file paths.
-   */
-  public static int initialize (AddServiceObjectNode son)
-  {
-     Class c = null;
-
-    if (ServiceConfig.oldConfigFormat_) {
-
-      // Generate a lot of possible file locations and names
-      ClassNameGenerator cng = new ClassNameGenerator(son.locator());
-      String attempt = null;
-      boolean ready = false;
- 
-
-      // Try to load the class based on the names we can infer from
-      // the C++ svc.conf line
-      while ((cng.hasMoreElements()) && (!ready)) {
-	try {
-	  
-	  attempt = (String)cng.nextElement();
-	  
-	  c = loader_.loadClass(attempt, true);
-
-	  ready = true;
-      
-	} catch (ClassNotFoundException e) { }
-      
-      }
-
-      // Couldn't find the class
-      if (!ready) {
-	ACE.ERROR("Can't find class with locator: " + son.locator());
-	return -1;
-      }
-
-    } else {
-
-      try {
-
-	c = loader_.loadClass(son.locator(), true);
-
-      } catch (ClassNotFoundException e) {
-	ACE.ERROR("Can't find class with locator: " + son.locator());
-	return 01;
-      }
-
-    }
-
-    try {
-
-      Object service = c.newInstance();
-      // Can't cast this to a ServiceObject, even though it will look just
-      // like one -- Java puts things loaded with a non-standard class loader
-      // in their own name space.  The ServiceObjectRecord is a wrapper that
-      // gets around this by using reflection.
-      ServiceObjectRecord svcObjRec = new ServiceObjectRecord(service, son.name());
-
-      // Split the argument array up into smaller pieces
-      String [] argArray = OS.createStringArray (son.params(), " ");
-
-      // Initialize the service -- start it running
-      svcObjRec.init(argArray);
-
-      // Put it in the service repository
-      svcRep_.insert((ServiceRecord)svcObjRec);
-
-    } catch (IllegalAccessException e) {
-        ACE.ERROR("Error " + e);
-	return -1;
-    } catch (InstantiationException e) {
-        ACE.ERROR("Error " + e);
-	return -1;
-    }
-
-    return 0;
-  }
-
-  // Set by command line options
-  private static boolean oldConfigFormat_ = false;
-  private static boolean beADaemon_ = false;
-  private static boolean debug_ = false;
-  private static boolean noDefaults_ = false;
-
-  public static String serviceConfigFile_ = "svc.conf";
-
-  private static ServiceRepository svcRep_ = null;
-  private static ServiceLoader loader_ = null;
-
-  // States for the state-machine used in parsing the config file
-  private final static int SERVICE_NAME = 0;
-  private final static int CLASS_NAME = 1;
-  private final static int CLASS_TYPE = 2;
-  private final static int ARGS = 3;
-  private final static int COMMAND_NAME = 4;
-
-
-}
-
-
-
diff --git a/java/src/ServiceLoader.java b/java/src/ServiceLoader.java
deleted file mode 100644
index 427428c5ae2..00000000000
--- a/java/src/ServiceLoader.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceLoader.java
- * 
- * Implementation of a ClassLoader  
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-public class ServiceLoader extends ClassLoader
-{
-  /**
-   * Constructor
-   */
-  public ServiceLoader ()
-  {
-    super ();
-    this.getClassPath ();
-  }
-
-  /**
-   * Searches the class path for a given file
-   *
-   *@param filename     File name to look for
-   *@return             Returns the absolute path to the file
-   *                    (useful for package name)
-   */
-  public String findFileInClasspath (String filename) 
-  {
-    // Checks for the given name across the classpath
-    StringTokenizer tokens = new StringTokenizer (this.classPath_,
-						  this.pathSeparator_);
-
-    while (tokens.hasMoreTokens()) 
-      {
-	String fn = tokens.nextToken() + this.fileSeparator_ + filename;
-
-	File f = new File (fn);
-
-	if (f.exists() && f.isFile() && f.canRead())
-	  return new String(f.getAbsolutePath());
-      }
-
-    return null;
-  }
-
-  /**
-   * Load a class from across the network 
-   */
-  public Class loadClass (URL url, boolean resolve) throws ClassNotFoundException
-  {
-    Class newClass = null;
-    // Try to load it the class by reading in the bytes.
-    // Note that we are not catching ClassNotFoundException here
-    // since our caller will catch it.
-    try
-      {
-	URLConnection urlConnection = url.openConnection ();
-
-	// Get the input stream associated with the URL connection and
-	// pipe it to a newly created DataInputStream
-	DataInputStream i = new DataInputStream (urlConnection.getInputStream ());
-
-	// Allocate a buffer big enough to hold the contents of the
-	// data we are about to read
-	byte [] buf = new byte [urlConnection.getContentLength ()];
-
-	// Now read all the data into the buffer
-	i.readFully (buf);
-
-	newClass = defineClass (buf, 0, buf.length);
-	//	    ACE.DEBUG ("Loaded class: "+ name);
-	    
-	// Check if we need to load other classes referred to by this class.
-	if (resolve)
-	  resolveClass (newClass);
-      }
-    catch (IOException e)
-      {
-	throw new ClassNotFoundException (e.toString ());
-      }
-    return newClass;
-  }
-
-
-  /**
-   * Load a class file:
-   *
-   * @param fn       A file name WITHOUT the .class extension
-   * @param resolve  Standard resolve flag -- user should set to true
-   *
-   * @return   A Class file capable of creating quasi-useful instances
-   *           of the loaded class.  They can't exist in the normal
-   *           Java space, though, so it's impossible to cast them
-   *           to something useful.  Use a wrapper and reflection
-   *           as in ServiceRecords.
-   */
-  public Class loadClass (String fn, boolean resolve) throws ClassNotFoundException
-  {
-    Class newClass;
-
-    // Load built-in java classes with the system loader
-    if (fn.startsWith("java")) {
-      newClass = findSystemClass(fn);
-      if (newClass == null)
-	throw (new ClassNotFoundException());
-      else
-	return newClass;
-    }
-
-    // If given a dot separated qualified name, put it in OS path format.
-    // This assumes the file separator is one char
-    String str = new String(fn);
-    if (str.indexOf('.') >= 0)
-      str = str.replace('.', this.fileSeparator_.charAt(0));
-    str = str + ".class";
-    
-    // Search the class path for the given file name
-    String fullname = this.findFileInClasspath(str);
-    if (fullname == null) {
-      
-      // If we can't find the class file, see if the
-      // system can
-      if ((newClass = findSystemClass(fn)) != null) {
-	return newClass;
-      } else 
-	throw (new ClassNotFoundException());
-    }
-
-    try
-      {
-	// Try to load it the class by reading in the bytes.
-	// Note that we are not catching ClassNotFoundException here
-	// since our caller will catch it.
-	try
-	  {
-	    byte[] buf = bytesForClass (fullname);
-
-	    // ***** Note *****
-	    // This looks inside the class file and digs up the true
-	    // fully qualified class name.  You need this to
-	    // load the class!
-	    String className = ClassReader.getClassName(fullname);
-
-	    if (className != null) {
-	      ACE.DEBUG("Defining class with name: " + className);
-	      newClass = defineClass (className, buf, 0, buf.length);
-	    } else {
-	      // Try it anyway
-	      newClass = defineClass (null, buf, 0, buf.length);
-	     
-	      ACE.ERROR("Unknown class name");
-	    }  
-
-	    // Check if we need to load other classes referred to by this class.
-	    if (resolve)
-	      resolveClass (newClass);
-	  	  
-	  } catch (ClassNotFoundException e) {
-	  
-	    ACE.DEBUG ("Using default loader for class: " + fn);
-
-	    if ((newClass = findSystemClass (fn)) != null)
-	      return newClass;
-	    else 
-	      throw (e);   // Rethrow the exception
-	  }
-      }
-    catch (IOException e)
-      {
-	throw new ClassNotFoundException (e.toString ());
-      }
-
-    return newClass;
-  }
-
-  /**
-   * Get system properties for later use
-   */
-  private void getClassPath ()
-  {
-    // Cache system properties that are needed when trying to find a
-    // class file
-    this.classPath_     = System.getProperty ("java.class.path", ".");
-    this.pathSeparator_ = System.getProperty ("path.separator", ":");
-    this.fileSeparator_ = System.getProperty ("file.separator", "/");
-  }
-
-  /**
-   * Read file into a byte array
-   */
-  private byte[] bytesForClass (String name) throws IOException, ClassNotFoundException
-  {
-    // Set up the stream
-    FileInputStream in = new FileInputStream (name);
-
-    // Get byte count
-    int length = in.available ();
-	    
-    if (length == 0)
-      throw new ClassNotFoundException (name);
-
-    // Create an array of bytes to read the file in
-    byte[] buf = new byte[length];
-
-    // Read the file
-    in.read (buf);
-
-    // Return byte array
-    return buf;
-  }
-
-  private String classPath_;
-  // Class path that is loaded at construction
-
-  private String pathSeparator_;
-  // Platform-dependent path separator (e.g., : or ;)
-
-  private String fileSeparator_;
-  // Platform-dependent file separator (e.g., / or \)
-
-  private String context_ = null;
-}
-
-
-
-
-
-
diff --git a/java/src/ServiceObject.java b/java/src/ServiceObject.java
deleted file mode 100644
index 1c420c08f3b..00000000000
--- a/java/src/ServiceObject.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceObject.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class ServiceObject implements EventHandler
-{
-  /**
-   * Initialize object when dynamic loading occurs. Overwrite this
-   * method to do anything useful. 
-   *@return -1 (default implementation)
-   */
-  public int init (String [] args)
-  {
-    return -1;
-  }
-
-  /** 
-   * Terminate the object. Note that an object can not be explicitly
-   * unloaded. Overwrite this method to do anything useful.
-   *@return -1 (default implementation)
-   */
-  public int fini ()
-  {
-    return -1;
-  }
-
-  /**
-   * Get information on an active object. Overwrite this method to do
-   * anything useful. 
-   *@return null (default implementation)
-   */
-  public String info ()
-  {
-    return null;
-  }
-
-  /** 
-   * Called when timer expires. Overwrite this method to do
-   * anything useful. 
-   *@param tv Time Value for which timer was set
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   *@return -1
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-
-  /**
-   * Request that this service suspend activity.  Overwrite this
-   * method to do anything useful.
-   */
-  public int suspend () 
-  {
-    return -1;
-  }
-
-  /**
-   * Request that this service resume activity.  Overwrite this
-   * method to do anything useful.
-   */
-  public int resume ()
-  {
-    return -1;
-  }
-}
diff --git a/java/src/ServiceObjectRecord.java b/java/src/ServiceObjectRecord.java
deleted file mode 100644
index 282d4360fbf..00000000000
--- a/java/src/ServiceObjectRecord.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceObjectRecord.java
- *
- * Provided to show future symmetry.  ServiceRecord currently
- * provides all the desired behavior necessary for a record
- * of a ServiceObject, but later there could be ModuleRecords,
- * etc.
- *
- *@see JACE.ServiceConfigurator.ServiceRecord;
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-public class ServiceObjectRecord extends ServiceRecord
-{
-  public ServiceObjectRecord (Object so, String name)
-  {
-    super (so, name);
-  }
-
-};
-
-
-
-
-
diff --git a/java/src/ServiceRecord.java b/java/src/ServiceRecord.java
deleted file mode 100644
index e0bd75a1405..00000000000
--- a/java/src/ServiceRecord.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceRecord.java
- *
- * This class structure is used in the ServiceRepository.  Each service
- * object, module, or stream in the repository should be wrapped by a
- * type of ServiceRecord.  The contained object does the real work.
- *
- * Modules and Streams will require records with more functionality.
- *
- * The caller should never be allowed to access the Object within the
- * record -- casting will result in a ClassCastException because of
- * the problem with loading classes with a ClassLoader.  To get
- * around this, all the method calls are made on the Object via
- * reflection.
- *
- *@see JACE.ServiceConfigurator.ServiceObject
- *@see JACE.ServiceConfigurator.ServiceRepository
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.lang.reflect.*;
-import JACE.OS.*;
-
-public class ServiceRecord
-{
-  /** 
-   * Constructor
-   *
-   *@param  service   A java Object, the service
-   *@param  name      Name of this service
-   */
-  ServiceRecord (Object service, String name) 
-  {
-    this.service_ = service;
-    this.name_ = name;
-    this.suspended_ = false;
-  }
-
-  /**
-   * Forward the call to suspend
-   * @return -1 error
-   */
-  public int suspend()
-  {
-    this.setSuspend(true);
-
-    Object result = this.invokeSimpleReflected("suspend");
-    
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-
-  /**
-   * Forward the call to resume
-   * @return -1 error
-   */
-  public int resume()
-  {
-    this.setSuspend(false);
-
-    Object result = this.invokeSimpleReflected("resume");
-
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-
-  /** 
-   *  Initialize the service, provide the given command line args to it.
-   *  
-   */
-  public int init(String [] args)
-  {
-    Class types[] = new Class[1];
-    if (args == null)
-      args = new String[0];
-
-    types[0] = args.getClass();
-
-    // Find the method we want to call
-    Method m;
-    try {
-      m = this.object().getClass().getMethod("init", types);
-    } catch (NoSuchMethodException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (SecurityException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    }
-
-    Class ptypes[] = m.getParameterTypes();
-    //for (int x = 0; x < ptypes.length; x++) 
-    //  System.err.println(ptypes[x].getName());
-    Object params[] = new Object[1];
-
-    params[0] = args;
-
-    int result = -1;
-    try {
-      result = ((Integer)m.invoke(this.object(), params)).intValue();
-    } catch (IllegalAccessException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (IllegalArgumentException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (InvocationTargetException e) {
-      ACE.ERROR("init(): " + e.getTargetException());
-      return -1;
-    }
-
-    return result;
-  }
-
-  /**
-   * Prepare to close it
-   */
-  public int fini()
-  {
-    Object result = this.invokeSimpleReflected("fini");
-
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-  /** 
-   * Obtain information about this service
-   */
-  public String info()
-  {
-    Object result = this.invokeSimpleReflected("info");
-
-    if (result == null)
-      return null;
-    else
-      return new String((String)result);  
-  }
-
-  /** Invokes the method with the given name on the ServiceObject.
-   * The invoked method must take no parameters for this to work.
-   * Could be adjusted to throw a generic exception.
-   */
-  private Object invokeSimpleReflected(String name) 
-  {
-    Method m;
-
-    // find the desired method
-    try {
-      m = this.object().getClass().getMethod(name, null);
-    } catch (NoSuchMethodException e) {
-      ACE.ERROR("" + e);
-      return null;
-    } catch (SecurityException e) {
-      ACE.ERROR("" + e);
-      return null;
-    }
-
-    // Invoke it
-    Object result = null;
-    
-    try {
-      result = m.invoke(this.object(), null);
-    } catch (IllegalAccessException e) {
-      ACE.ERROR("" + e);
-    } catch (IllegalArgumentException e) {
-      ACE.ERROR("" + e);
-    } catch (InvocationTargetException e) {
-      ACE.ERROR(name + "(): " + e.getTargetException());
-    }
-
-    return result;
-  }
-
-  /**
-   * Accessor for the name
-   */
-  public String name()
-  {
-    return new String(this.name_);
-  }
-
-  /** Set the name of the service
-   */
-  public void name(String name)
-  {
-    this.name_ = name;
-  }
-
-  /** Is this service suspended?
-   */
-  public boolean suspended() 
-  {
-    return this.suspended_;
-  }
-
-  /** Set the suspended flag
-   */
-  void setSuspend (boolean suspended)
-  {
-    this.suspended_ = suspended;
-  }
-
-  /** Accessor for the contained Object.  This should
-   *  never be available to the end user since they
-   *  might try casting the result.
-   */
-  Object object()
-  {
-    return this.service_;
-  }
-
-  /**
-   * Set the contained object
-   */
-  void object(Object service)
-  {
-    this.service_ = service;
-  }
-
-  Object service_;
-  String name_;
-  boolean suspended_;
-};
-
-
-/*
-class ModuleRecord extends ServiceRecord
-{
-};
-
-class StreamRecord extends ServiceRecord
-{
-};
-*/
-
-
diff --git a/java/src/ServiceRepository.java b/java/src/ServiceRepository.java
deleted file mode 100644
index 29c90a77313..00000000000
--- a/java/src/ServiceRepository.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceRepository.java
- *
- * The service repository stores the network services, allowing them to be removed, suspended,
- * resumed, etc.  To reload a service, the caller must remove it from the repository and then
- * call prepareForReload().
- *
- *@see JACE.ServiceConfigurator.ServiceRecord;
- *@see JACE.ServiceConfigurator.ServiceConfig;
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
- 
-public class ServiceRepository
-{
-  /**
-   * Constructor
-   */
-  public ServiceRepository ()
-  {
-    this.serviceVector_ = new Vector();
-  }
-
-  /**
-   * Constructor
-   *
-   *@param initialSize    Initial vector size for the repository
-   */
-  public ServiceRepository (int initialSize)
-  {
-    this.serviceVector_ = new Vector (initialSize);
-  }
-
-  /**
-   *  Shut down all the services, closing them in reverse order of insertion
-   *  
-   *  Maybe should be called by finalize?
-   */
-  public int close() 
-  { 
-    for (int i = this.size() - 1; i >= 0; i--) {
-      ServiceRecord  rec = (ServiceRecord)this.serviceVector_.elementAt(i);
-
-      rec.fini();
-
-      this.serviceVector_.removeElementAt(i);
-    }
-
-    return 0;
-  }
-
-  /**
-   * Insert a ServiceRecord into the repository.
-   * (If already in, calls fini() and replaces)
-   *
-   *@param srvRec      ServiceRecord to add
-   */
-  public void insert (ServiceRecord srvRec)
-  {
-    ServiceRecord alreadyIn = find(srvRec.name());
-
-    // Replace the service
-    if (alreadyIn != null) {
-      alreadyIn.fini();
-      this.serviceVector_.removeElement(alreadyIn);
-    }
-
-    this.serviceVector_.addElement(srvRec);
-  }
-
-  /**
-   * Finds the ServiceRecord associated with a given
-   * service name.  Note -- the user should not try to
-   * get a ServiceObject out of the ServiceRecord.
-   * Same as saying ignoreSuspended is false on the
-   * next method.
-   *
-   *@param name    Name of the service to find
-   */
-  public ServiceRecord find (String name)
-  {
-    return this.find(name, false);
-  }
-
-  /** Return the service record for the given service.  The caller
-    * should NOT try to access a ServiceObject (or Module or Stream)
-    * by taking it out of the ServiceRecord -- just make the calls
-    * through the record!
-    *
-    *@param   name             Name of the service to find
-    *@param   ignoreSuspended  Allow finding suspended services?
-    */
-  public ServiceRecord find (String name, boolean ignoreSuspended)
-  {
-    ServiceRecord rec;
-
-    for (int i = 0; i < this.size(); i++) {
-      rec = (ServiceRecord)this.serviceVector_.elementAt(i);
-
-      if ((rec.name().equals(name)) && ((!ignoreSuspended) || (!rec.suspended())))
-	return rec;
-    }
-
-    return null;
-  }
-
-  /** Take the given service out of the repository.  This also sets the
-   * reference in the repository to null to ensure there are no
-   * hidden references to the old ServiceObject.  To reload, the user must
-   * still run prepareToReload on ServiceConfig if they don't want any
-   * problems.
-   */
-  public int remove (String name)
-  {
-    ServiceRecord rec = this.find(name, false);
-
-    if (rec == null)
-      return -1;
-
-    int index = this.serviceVector_.indexOf(rec);
-
-    // Shut down the service
-    rec.fini();
-
-    // Make sure there are no hidden references left
-    this.serviceVector_.setElementAt(null, index);
-
-    this.serviceVector_.removeElementAt(index);
-
-    return 0;
-  }
-
-  /**
-   * Resume a suspended service
-   *@param name    Name of the service to resume
-   */
-  public int resume (String name)
-  {
-    ServiceRecord rec = this.find(name, false);
-
-    if (rec == null)
-      return -1;
-
-    return rec.resume();
-  }
-
-  /**
-   * Suspend a service
-   *@param name    Name of the service to suspend
-   */
-  public int suspend (String name)
-  {
-    ServiceRecord rec = this.find(name, false);
-
-    if (rec == null)
-      return -1;
-
-    return rec.suspend();
-  }
-
-  /**
-   * Returns the number of items in the repository
-   */
-  public int size ()
-  {
-    return this.serviceVector_.size();
-  }
-
-  // Vector representation
-  Vector serviceVector_;
-};
-  
-
-
-  
-
-  
-
-  
diff --git a/java/src/StrategyAcceptor.java b/java/src/StrategyAcceptor.java
deleted file mode 100644
index 07f81a8ad63..00000000000
--- a/java/src/StrategyAcceptor.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    StrategyAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class StrategyAcceptor
-{
-  /**
-   * Create an instance of StrategyAcceptor.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   */
-  public StrategyAcceptor (Class handlerFactory)
-    {
-      this (handlerFactory, null, null, null);
-    }
-
-  /**
-   * Create an instance of StrategyAcceptor. Use the creation
-   * strategy and the handlerFactory passed in to creae a new instance
-   * of the Svc Handler.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   *@param creStrategy Creation strategy to use to create a new
-   * instance of the Svc Handler.
-   *@param acceptStrategy Accept strategy to use to accept a new
-   * connection into the Svc Handler.
-   *@param activateStrategy Activate strategy to use to activate the
-   * instance of the Svc Handler.
-   */
-  public StrategyAcceptor (Class handlerFactory,
-			    CreationStrategy creStrategy,
-			    AcceptStrategy acceptStrategy,
-			    ActivateStrategy activateStrategy)
-    {
-      // Cache everything
-      this.handlerFactory_ = handlerFactory;
-      this.creStrategy_ = creStrategy;
-      this.acceptStrategy_ = acceptStrategy;
-      this.activateStrategy_ = activateStrategy;
-    }
-
-  /**
-   * Initialize the Strategy Acceptor. The method creates the
-   * appropriate strategies as needed.
-   *@param port port number where the server will listen for connections
-   */
-  public void open (int port) throws IOException
-    {
-      if (this.creStrategy_ == null)
-	this.creStrategy_ = new CreationStrategy (this.handlerFactory_);
-      if (this.acceptStrategy_ == null)
-	this.acceptStrategy_ = new AcceptStrategy (port);
-      else
-	this.acceptStrategy_.open (port);
-      if (this.activateStrategy_ == null)
-	this.activateStrategy_ = new ActivateStrategy ();
-    }
-
-  /**
-   * Accept a connection using the appropriate strategies.
-   */
-  public void accept () throws SocketException, 
-      InstantiationException, 
-      IllegalAccessException,
-      IOException
-  {
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the Svc_Handler
-    this.acceptSvcHandler (sh);
-
-    // Activate the Svc_Handler
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a SvcHandler.  The strategy for
-   * creating a SvcHandler is configured into the Acceptor via it's
-   * creStrategy_.  If no strategy is passed in, the default behavior
-   * of this method is to use the default CreationStrategy.
-   *@return a new instance of the Svc Handler
-   */
-  protected SvcHandler makeSvcHandler () throws InstantiationException, 
-    IllegalAccessException
-    {
-      // Create a new handler for the connection
-      return this.creStrategy_.makeSvcHandler ();
-    }
-
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <SvcHandler>.  The strategy for accepting into a SvcHandler is
-   * configured into the Acceptor via it's acceptStrategy_.  If no
-   * strategy is passed in, the default behavior of this method is to
-   * use the default AcceptStrategy. 
-   *@param sh Svc Handler in which to accept the connection
-   *@return result of accepting a connection using the accept strategy
-   */
-  protected int acceptSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-  {
-    // Delegate responsibility to the appropriate strategy
-    return this.acceptStrategy_.acceptSvcHandler (sh);
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The strategy for
-   * activating a SvcHandler is configured into the Acceptor via it's
-   * activateStrategy_. If no strategy is passed in, the default
-   * behavior of this method is to use the default ActivateStrategy.
-   *@param sh Svc Handler to activate
-   *@return result of activating the Svc Handler
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      // Delegate responsibility to the appropriate strategy
-      return this.activateStrategy_.activateSvcHandler (sh);
-    }
-
-  // Handler class that should be instantiated when a connection is
-  // made with a client
-  private Class handlerFactory_;
-
-  // Creation Strategy
-  private CreationStrategy creStrategy_;
-
-  // Accept Strategy
-  private AcceptStrategy acceptStrategy_;
-
-  // Activation Strategy
-  private ActivateStrategy activateStrategy_;
-}
diff --git a/java/src/Stream.java b/java/src/Stream.java
deleted file mode 100644
index 030114d092f..00000000000
--- a/java/src/Stream.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Stream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     This class is the primary abstraction for the ASX framework.
- *     It is moduled after System V Stream.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *   A Stream consists of a stack of <Modules>, each of which
- *   contains two <Tasks>.
- *</blockquote>
- */
-
-public class Stream
-{
-
-  public Stream ()
-  {
-    this (null, null, null);
-  }
-
-  // Create a Stream consisting of <head> and <tail> as the Stream
-  // head and Stream tail, respectively.  If these are 0 then the
-  // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
-  // <arg> is the value past in to the open() methods of the tasks.
-
-  public Stream (Object a,
-		 Module head,
-		 Module tail)
-  {
-    this.linkedUs_ = null;
-    // this.final_close_ = this.lock_;
-
-    if (this.open (a, head, tail) == -1)
-      ACE.ERROR ("open" + head.name () + " " +  tail.name ());
-  }
-
-  public int push (Module newTop)
-  {
-    if (this.pushModule  (newTop, 
-			  this.streamHead_.next (), 
-			  this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return this.streamHead_.writer ().put (mb, tv);
-  }
-
-  public MessageBlock get (TimeValue tv) throws InterruptedException
-  {
-    return this.streamHead_.reader ().getq (tv);
-  }
-
-// Return the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public Module top ()
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return null;
-    else
-      return this.streamHead_.next ();
-  }
-
-// Remove the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public int pop (long flags)
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return -1;
-    else
-      {
-	// Skip over the ACE_Stream head.
-	Module top = this.streamHead_.next ();
-	Module newTop = top.next ();
-
-	this.streamHead_.next (newTop);
-
-	// Close the top ACE_Module.
-
-	top.close (flags);
-
-	this.streamHead_.writer ().next (newTop.writer ());
-	newTop.reader ().next (this.streamHead_.reader ());
-
-	return 0;
-      }
-  }
-
-// Remove a named ACE_Module from an arbitrary place in the
-// ACE_Stream.
-
-  public int remove (String name, long flags)
-  {
-    Module prev = null;
-
-    for (Module mod = this.streamHead_; 
-	 mod != null; mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	{
-	  if (prev == null) // Deleting ACE_Stream Head
-	    this.streamHead_.link (mod.next ());
-	  else
-	    prev.link (mod.next ());
-	  
-	  mod.close (flags);
-	  return 0;
-	}
-      else
-	prev = mod;
-
-    return -1;
-  }
-
-  public Module find (String name)
-  {
-    for (Module mod = this.streamHead_; 
-	 mod != null; 
-	 mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	return mod;
-
-    return null;
-  }
-
-// Actually push a module onto the stack...
-
-  private int pushModule (Module newTop, 
-			  Module currentTop, 
-			  Module head)
-  {
-    Task ntReader = newTop.reader ();
-    Task ntWriter = newTop.writer ();
-    Task ctReader = null;
-    Task ctWriter = null;
-
-    if (currentTop != null)
-      {
-      ctReader = currentTop.reader ();
-      ctWriter = currentTop.writer ();
-      ctReader.next (ntReader);
-      }
-
-    ntWriter.next (ctWriter);
-
-    if (head != null)
-      {
-	if (head != newTop)
-	  head.link (newTop);
-      }
-    else
-      ntReader.next (null);
-
-    newTop.next (currentTop);
-
-    if (ntReader.open (newTop.arg ()) == -1)
-      return -1;
-
-    if (ntWriter.open (newTop.arg ()) == -1)
-      return -1;
-    return 0;
-  }
-
-  public synchronized int open (Object a, 
-				Module head, 
-				Module tail)
-  {
-    Task h1 = null, h2 = null;
-    Task t1 = null, t2 = null;
-
-    if (head == null)
-      {
-	h1 = new StreamHead ();
-	h2 = new StreamHead ();
-	head = new Module ("ACEStreamHead", h1, h2, a);
-      }
-
-    if (tail == null)
-      {
-	t1 = new StreamTail ();
-	t2 = new StreamTail ();
-	tail = new Module ("ACEStreamTail", 
-			   t1, t2, a);
-      }
-
-    // Make sure *all* the allocation succeeded!
-    if (h1 == null || h2 == null || head == null
-	|| t1 == null || t2 == null || tail == null)
-      {
-      // Close up!
-	head.close (0);
-	tail.close (0);
-	return -1;
-      }
-
-    this.streamHead_ = head;
-    this.streamTail_ = tail;
-
-    if (this.pushModule (this.streamTail_,
-			 null, null) == -1)
-      return -1;
-    else if (this.pushModule (this.streamHead_, 
-			      this.streamTail_, 
-			      this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-  public synchronized int close (long flags)
-  {
-    if (this.streamHead_ != null
-	&& this.streamTail_ != null)
-      {
-	// Don't bother checking return value here.
-	this.unlinkInternal ();
-
-	int result = 0;
-
-	// Remove and cleanup all the intermediate modules.
-
-	while (this.streamHead_.next () != this.streamTail_)
-	  {
-	    if (this.pop (flags) == -1)
-	      result = -1;
-	  }
-  
-	// Clean up the head and tail of the stream.
-	if (this.streamHead_.close (flags) == -1)
-	  result = -1;
-	if (this.streamTail_.close (flags) == -1)
-	  result = -1;
-
-	this.streamHead_ = null;
-	this.streamTail_ = null;
-
-	// Tell all threads waiting on the close that we are done.
-	//      this.final_close_.broadcast ();
-	return result;
-      }
-    return 0;
-  }
-
-  public int control (int cmd, Object a) throws InterruptedException
-  {
-    IOCntlMsg ioc = new IOCntlMsg (cmd);
-
-    // Create a data block that contains the user-supplied data.
-    MessageBlock db = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			null, 
-			a);
-
-    // Create a control block that contains the control field and a
-    // pointer to the data block.
-    MessageBlock cb = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			db, 
-			(Object) ioc);
-
-    int result = 0;
-
-    if (this.streamHead_.writer ().put (cb, new TimeValue ()) == -1)
-      result = -1;
-    else if ((cb = this.streamHead_.reader ().getq (new TimeValue ())) == null)
-      result = -1;
-    else
-      result = ((IOCntlMsg ) cb.obj ()).rval ();
-
-    return result;
-  }
-
-// Link two streams together at their bottom-most Modules (i.e., the
-// one just above the Stream tail).  Note that all of this is premised
-// on the fact that the Stream head and Stream tail are non-NULL...
-// This must be called with locks held.
-
-  private int linkInternal (Stream us)
-  {
-    this.linkedUs_ = us;
-    // Make sure the other side is also linked to us!
-    us.linkedUs_ = this;
-
-    Module myTail = this.streamHead_;
-
-    if (myTail == null)
-      return -1;
-
-    // Locate the module just above our Stream tail. 
-    while (myTail.next () != this.streamTail_)
-      myTail = myTail.next ();
-
-    Module otherTail = us.streamHead_;
-
-    if (otherTail == null)
-      return -1;
-
-  // Locate the module just above the other Stream's tail.
-    while (otherTail.next () != us.streamTail_)
-      otherTail = otherTail.next ();
-
-    // Reattach the pointers so that the two streams are linked!
-    myTail.writer ().next (otherTail.reader ());
-    otherTail.writer ().next (myTail.reader ());
-    return 0;
-  }
-
-  public synchronized int link (Stream us)
-  {
-    return this.linkInternal (us);
-  }  
-
-// Must be called with locks held...
-
-  private int unlinkInternal ()
-  {
-  // Only try to unlink if we are in fact still linked!
-    
-    if (this.linkedUs_ != null)
-    {
-      Module myTail = this.streamHead_;
-
-      // Only relink if we still exist!
-      if (myTail != null)
-	{
-	  // Find the module that's just before our stream tail.
-	  while (myTail.next () != this.streamTail_)
-	    myTail = myTail.next ();
-
-	  // Restore the writer's next() link to our tail.
-	  myTail.writer ().next (this.streamTail_.writer ());
-	}
-
-      Module otherTail = this.linkedUs_.streamHead_;
-
-      // Only fiddle with the other side if it in fact still remains.
-      if (otherTail != null)
-	{
-	  while (otherTail.next () != this.linkedUs_.streamTail_)
-	    otherTail = otherTail.next ();
-
-	  otherTail.writer ().next (this.linkedUs_.streamTail_.writer ());
-	  
-	}
-
-      // Make sure the other side is also aware that it's been unlinked!
-      this.linkedUs_.linkedUs_ = null;
-
-      this.linkedUs_ = null;
-      return 0;
-    }
-    else
-      return -1;
-  }
-
-  public synchronized int unlink ()
-  {
-    return this.unlinkInternal ();
-  }
-
-  public void dump ()
-  {
-    ACE.DEBUG ("-------- module links --------");
-
-    for (Module mp = this.streamHead_; ; mp = mp.next ())
-      {
-	ACE.DEBUG ("module name = " + mp.name ());
-	if (mp == this.streamTail_)
-	  break;
-      }
-    
-    ACE.DEBUG ("-------- writer links --------");
-    
-    Task tp;
-    
-    for (tp = this.streamHead_.writer (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("writer queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamTail_.writer ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.reader ()))
-	  break;
-      }
-
-    ACE.DEBUG ("-------- reader links --------\n");
-    for (tp = this.streamTail_.reader (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("reader queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamHead_.reader ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.writer ()))
-	  break;
-      }
-  }
-
-  Module streamHead_ = null;
-  // Pointer to the head of the stream.
-
-  Module streamTail_ = null;
-  // Pointer to the tail of the stream.
-
-  Stream linkedUs_ = null;
-  // Pointer to an adjoining linked stream.
-
-  // = Synchronization objects used for thread-safe streams.
-  //  ACE_SYNCH_MUTEX lock_;
-  // Protect the stream against race conditions.
-  
-  //  ACE_SYNCH_CONDITION final_close_;
-  // Use to tell all threads waiting on the close that we are done.
-
-}
-
-
diff --git a/java/src/StreamHead.java b/java/src/StreamHead.java
deleted file mode 100644
index 37d9c2af0c3..00000000000
--- a/java/src/StreamHead.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamHead.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as the head of a ustream.
- *</blockquote>
- */
-
-public class StreamHead extends Task
-{
-  // Module that acts as the head of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	this.waterMarks (cmd, mb.cont ().length ());
-	ioc.rval (0);
-      break;
-    default:
-      return 0;
-    }
-  return ioc.rval ();
-  }
-
-  /* Performs canonical flushing at the ACE_Stream Head */
-
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHR;
-      }
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      return this.reply (mb, new TimeValue ());
-    return 0;
-  }
-
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    int res = 0;
-    if (mb.msgType () == MessageType.MB_IOCTL
-	&& (res = this.control (mb)) == -1)
-      return res;
-    
-    if (this.isWriter ())
-      {
-	return this.putNext (mb, tv);
-      }
-    else /* this.isReader () */
-      {      
-	switch (mb.msgType ())
-	  {
-	  case MessageType.MB_FLUSH:
-	    return this.canonicalFlush (mb);
-	  default:
-	    break;
-	  }
-      
-	try
-	  {
-	    return this.putq (mb, tv);
-	  }
-	catch (InterruptedException e)
-	  {
-	    return -1;
-	  }
-      }
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/src/StreamTail.java b/java/src/StreamTail.java
deleted file mode 100644
index 44f9dde6634..00000000000
--- a/java/src/StreamTail.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamTail.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as the tail of a ustream.
- *</blockquote>
- */
-
-public class StreamTail extends Task
-{
-  // Module that acts as the tail of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	{
-	  int size = mb.cont ().length ();
-	  
-	  this.waterMarks (cmd, size);
-	  this.sibling ().waterMarks (cmd, size);
-	  ioc.rval (0);
-	  break;
-	}
-      default:
-	mb.msgType (MessageType.MB_IOCNAK);
-      }
-    return this.reply (mb, new TimeValue ());
-  }
-
-  // Perform flush algorithm as though we were the driver
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHW;
-      }
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.sibling ().flush (TaskFlags.ACE_FLUSHALL);
-	return this.reply (mb, new TimeValue ());
-      }
-    return 0;
-  }
-
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    if (this.isWriter ())
-    {
-      switch (mb.msgType ())
-	{
-	case MessageType.MB_IOCTL:
-	  return this.control (mb);
-	  /* NOTREACHED */
-	default:
-	  break;
-	}
-    }
-
-    return -1;
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/src/SuspendNode.java b/java/src/SuspendNode.java
deleted file mode 100644
index 52faab4ac05..00000000000
--- a/java/src/SuspendNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    SuspendNode.java
- *
- * Used when a service is specified to be suspended based on a line
- * in a service configurator file.  The actual implementation of the
- * service being suspended does the work.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-class SuspendNode extends ParseNode 
-{
-  public SuspendNode (int act_num)
-  {
-    super(act_num);
-  }
-
-  public void apply () 
-  {
-    ACE.DEBUG("Suspend Node apply: " + this.name_);
-
-    if (JACE.ServiceConfigurator.ServiceConfig.suspend(this.name_) == -1)
-      ACE.ERROR("Error suspending " + this.name_);
-  }
-};
diff --git a/java/src/SvcHandler.java b/java/src/SvcHandler.java
deleted file mode 100644
index cb9af5a3334..00000000000
--- a/java/src/SvcHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    SvcHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public abstract class SvcHandler extends Task
-{
-
-  /**
-   * Do nothing constructor. 
-   */
-  public SvcHandler ()
-  {
-  }
-  
-  /**
-   * Set the stream using the SOCKStream passed in. This sets the
-   * underlying peer
-   *@param s SOCK Stream to use for the connection
-   */
-  public void setHandle (SOCKStream s) throws IOException
-  {
-    this.stream_ = s;
-  }
-
-  /**
-   * Get the underlying peer
-   *@return the underlying peer
-   */
-  public SOCKStream peer ()
-  {
-    return this.stream_;
-  }
-
-  /**
-   * Abstract method that subclasses must define to allow
-   * initialization to take place.
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return 0
-   */
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return -1
-   */
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return -1;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@param tv Time Value for which timer was set
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-  
-  protected SOCKStream stream_;
-}
diff --git a/java/src/Svc_Conf.y b/java/src/Svc_Conf.y
deleted file mode 100644
index a11a18f9af0..00000000000
--- a/java/src/Svc_Conf.y
+++ /dev/null
@@ -1,208 +0,0 @@
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java_cup.runtime.*;
-import JACE.OS.*;
-
-parser code {: 
-  // Lexical Analyzer
-  private Yylex lexer_;
-
-  public void setLexer(Yylex lexer)
-    {
-      this.lexer_ = lexer;
-    }
-:};
-
-init with {: 
-      try {
-
-	FileInputStream fs = new FileInputStream(new String(ServiceConfig.serviceConfigFile_));
-
-        this.setLexer(new Yylex(fs));
-
-      } catch (FileNotFoundException fnf) {
-
-	ACE.ERROR("File not found: " + fnf);
-
-      } catch (SecurityException se) {
-
-	ACE.ERROR("Security: " + se);
-      }
-:};
-
-scan with {: return this.lexer_.yylex(); :};
-
-terminal token ACE_DYNAMIC, ACE_STATIC, ACE_SUSPEND, ACE_RESUME, ACE_REMOVE, ACE_STREAM;
-terminal token ACE_MODULE_T, ACE_STREAM_T, ACE_SVC_OBJ_T, ACE_ACTIVE, ACE_INACTIVE;
-terminal str_token ACE_PATHNAME, ACE_IDENT, ACE_STRING;
-terminal token ACE_LPAREN, ACE_RPAREN, ACE_LBRACE, ACE_RBRACE, ACE_STAR, ACE_COLON;
-terminal token ACE_USTREAM; 
-
-non terminal AddServiceObjectNode dynamic, svc_location; /* AddServiceObjectNode */
-non terminal SuspendNode suspend;  /* SuspendNode */
-non terminal ResumeNode resume;  /* ResumeNode */
-non terminal RemoveNode remove;  /* RemoveNode */
-non terminal ParseNode module_list, stream, svc_config_entry;
-non terminal ParseNode svc_config_entries, static;
-non terminal java_cup.runtime.str_token stream_modules, module;
-non terminal java_cup.runtime.int_token status;
-non terminal java_cup.runtime.str_token svc_initializer;
-non terminal java_cup.runtime.str_token pathname, parameters_opt;
-non terminal java_cup.runtime.str_token stream_ops, type;
-
-start with svc_config_entries;
-
-svc_config_entries ::= svc_config_entry:e1 svc_config_entries
-                       {: 
-			 if (e1 != null)
-			   e1.apply();
-                       :}
-                       |
-                       svc_config_entry:e1
-                       {:  
-			 if (e1 != null)
-			   e1.apply();
-		       :}
-                       ;
-
-svc_config_entry ::= dynamic
-                     {: 
-		       /* Empty -- result auto set to dynamic */
-		       /* CUP$result = (ParseNode)CUP$stack.elementAt(CUP$top-0); */
-		     :}
-                     | 
-                     static  
-                     {: 
-		       /* More graceful error system needed here */
-		       ACE.ERROR("Not implemented: static service loading"); :}
-                     | 
-                     suspend
-                     {: 
-		       /* Empty -- result auto set to suspend */
-		       /* CUP$result = (ParseNode)CUP$stack.elementAt(CUP$top-0); */
-		     :}
-                     | 
-                     resume
-                     {:  /* Empty -- result auto set to resume */ 
-		     :}
-                     | 
-                     remove
-                     {: 
-
-		     :}
-                     | 
-                     stream
-		     {: ACE.ERROR("Not implemented: stream loading"); :}
-                     ;
-
-dynamic ::= ACE_DYNAMIC svc_location:e1 parameters_opt:e2
-{:
-  RESULT.init(e1.name(), e1.locator(), e1.suspended());
-
-  RESULT.params(e2.str_val);
-:}
-     ;
-
-static ::= ACE_STATIC ACE_IDENT parameters_opt
-     ;
-
-suspend ::= ACE_SUSPEND ACE_IDENT:e1
-{:
-  RESULT.init(e1.str_val);
-:}
-     ;
-
-resume ::= ACE_RESUME ACE_IDENT:e1
-{:
-  RESULT.init(e1.str_val);
-:}
-     ;
-
-remove ::= ACE_REMOVE ACE_IDENT:e1
-{:
-  RESULT.init(e1.str_val);
-:}
-     ;
-
-stream ::= ACE_USTREAM stream_ops stream_modules
-           |
-           ACE_USTREAM ACE_IDENT stream_modules
-           ;
-
-stream_ops ::= dynamic
-               |
-               static
-               ;
-
-stream_modules ::= ACE_LBRACE 
-                   |
-                   module_list ACE_RBRACE
-                   ;
-
-module_list ::= module_list module
-                {: ACE.ERROR("Not implemented: module manipulation"); :}
-                | 
-                {: ACE.ERROR("Not implemented: module manipulation"); :}
-                ;
-
-module ::= dynamic
-           |
-           static
-           |
-           suspend
-           | 
-           resume
-           | 
-           remove
-           ;
-
-svc_location ::= ACE_IDENT:e1 type:e2 svc_initializer:e3 status:e4
-{:
-  boolean suspended = false;
-  if (e4.int_val == 1)
-    suspended = true;
-
-  RESULT.init(e1.str_val, e3.str_val, suspended);
-:}
-;
-
-status ::= ACE_ACTIVE
-           {: RESULT.int_val = 0; :}
-           |
-           ACE_INACTIVE
-           {: RESULT.int_val = 1; :}
-           |
-           {: // Default case
-              RESULT.int_val = 0; :} 
-           ;
-
-svc_initializer ::= pathname:e1 ACE_COLON ACE_IDENT:e2
-                    {: RESULT.str_val = new String(e1.str_val + ":" + e2.str_val); :}
-                    |
-                    pathname:e1 ACE_COLON ACE_IDENT:e2 ACE_LPAREN ACE_RPAREN
-                    {: RESULT.str_val = new String(e1.str_val + ":" + e2.str_val); :}
-                    ;
-
-type ::= ACE_MODULE_T ACE_STAR
-         |
-         ACE_SVC_OBJ_T ACE_STAR
-         {: RESULT.str_val = new String("Service Object"); :}
-         |
-         ACE_STREAM_T ACE_STAR
-         ;
-
-parameters_opt ::= ACE_STRING:e
-                   {: RESULT.str_val = new String(e.str_val); :}
-                   |
-                   ;
-
-pathname ::= ACE_PATHNAME:e
-             {: RESULT.str_val = new String(e.str_val); :}
-             | 
-             ACE_IDENT:e
-             {: RESULT.str_val = new String(e.str_val); :}
-             ;
-
-
-
diff --git a/java/src/Task.java b/java/src/Task.java
deleted file mode 100644
index 065e7869fef..00000000000
--- a/java/src/Task.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Task.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-import JACE.Reactor.*;
-import JACE.Concurrency.*;
-
-public abstract class Task implements Runnable, EventHandler
-{
-  // = Initialization/termination methods.
-
-  /**
-   * Initialize a Task. Note, we allocate a message queue ourselves.
-   */
-  public Task ()
-    {
-      this.msgQueue_ = new MessageQueue ();
-      this.thrMgr_ = null;
-    }
-
-  /**
-   * Initialize a Task. Note, we use the message queue and thread
-   * manager supplied by the user.
-   *@param mq Message Queue to hold list of messages on the Task
-   *@param thrMgr Thread Manager that manages all the spawned threads
-   */
-  public Task (MessageQueue mq,
-	       ThreadManager thrMgr)
-    {
-      this.msgQueue_ = mq;
-      this.thrMgr_ = thrMgr;
-    }
-
-  /**
-   * Not meant to be invoked by the user directly!. This needs to be
-   * in the public interface in order to get invoked by Thread
-   * class.
-   */
-  public void run ()
-    {
-      this.svc ();
-    }
-
-  // = Initialization and termination hooks (note that these *must* be
-  // defined by subclasses).
-
-  /**
-   * Hook called to open a Task. 
-   *@param obj used to pass arbitrary information
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Hook called to close a Task.
-   */
-  public abstract int close (long flags);
-
-  // = Immediate and deferred processing methods, respectively.
-
-  /**
-   * Transfer a message into the queue to handle immediate
-   * processing.
-   *@param mb Message Block to handle immediately
-   *@param tv amount of time to wait for
-   */
-  public abstract int put (MessageBlock mb, TimeValue tv);
-
-  /** 
-   * Run by a daemon thread to handle deferred processing. Note, that
-   * to do anything useful, this method should be overriden by the
-   * subclass.
-   *@return default implementation always returns 0.
-   */
-  public int svc ()
-    {
-      return 0;
-    }
-
-  /**
-   * Set the underlying Thread Manager.
-   *@param t Thread Manager to use
-   */
-  public synchronized void thrMgr (ThreadManager t)
-  {
-    this.thrMgr_ = t;
-  }
-
-  /**
-   * Get the Thread Manager.
-   *@return Underlying Thread Manager 
-   */
-  public synchronized ThreadManager thrMgr ()
-  {
-    return this.thrMgr_;
-  }
-
-  // = Active object method.
-
-  /**
-   * Turn the task into an active object. That is, having <nThreads>
-   * separate threads of control that all invoke Task::svc.
-   *@param flags Task Flags
-   *@param nThreads number of threads to spawn
-   *@param forceActive whether to force creation of new threads or not
-   *@return -1 if failure occurs, 1 if Task is already an active
-   * object and <forceActive> is false (doesn't *not* create a new
-   * thread in this case), and 0 if Task was not already an active
-   * object and a thread is created successfully or thread is an active
-   * object and <forceActive> is true.
-   */
-  public synchronized int activate (long flags, int nThreads, boolean forceActive)
-    {
-       // Create a Thread Manager if we do not already have one
-       if (this.thrMgr_ == null)
-	 this.thrMgr_ = new ThreadManager ();
-
-       if (this.thrCount () > 0 && forceActive == false)
-	 return 1; // Already active.
-       this.flags_ = flags;
-
-       if (ACE.BIT_ENABLED (flags, TaskFlags.THR_DAEMON))
-	 this.thrMgr_.spawnN (nThreads, this, true); // Spawn off all threads as daemon threads
-       else        // Spawn off all threads as normal threads
-	 this.thrMgr_.spawnN (nThreads, this, false);
-
-       return 0;
-    }
-  
-  // = Suspend/resume a Task
-
-  /**
-   * Suspend a task.
-   */
-  public synchronized void suspend ()
-    {
-      // Suspend all threads
-      if (this.thrMgr_ != null)
-	this.thrMgr_.thrGrp ().suspend ();
-    }
-
-  /** 
-   * Resume a suspended task.
-   */
-  public synchronized void resume ()
-    {
-      // Resume all threads
-      if (this.thrMgr_ != null)
-	this.thrMgr_.thrGrp ().resume ();
-    }
-
-  /**
-   * Get the current group name.
-   *@return name of the current thread group
-   */
-  public synchronized String grpName ()
-    {
-      if (this.thrMgr_ != null)
-	return this.thrMgr_.thrGrp ().getName ();
-      else
-	return null;
-    }
-
-  /**
-   * Get the message queue associated with this task.
-   *@return the message queue associated with this task.
-   */
-  public MessageQueue msgQueue ()
-    {
-      return this.msgQueue_;
-    }
-
-  /**
-   * Set the message queue associated with this task.
-   *@param mq Message Queue to use with this Task.
-   */
-  public void msgQueue (MessageQueue mq)
-    {
-      this.msgQueue_ = mq;
-    }
-
-  /**
-   * Get the number of threads currently running within the Task.
-   *@return the number of threads currently running within the Task.
-   * 0 if we're a passive object, else > 0.
-   */
-  public synchronized int thrCount ()
-    {
-      if (this.thrMgr_ != null)
-	return this.thrMgr_.thrGrp ().activeCount ();
-      else
-	return 0;
-    }
-
-  /**
-   * Set the Task flags
-   *@param flags Task Flags
-   */
-  public synchronized void flags (long flags)
-  {
-    this.flags_ = flags;
-  }
-
-  /**
-   * Get the Task flags
-   *@return Task Flags
-   */
-  public synchronized long flags ()
-  {
-    return this.flags_;
-  }
-
-  // = Message queue manipulation methods.
-
-
-  /*
-   * Dump debug information.
-   */
-  public void dump ()
-  {
-  }
-
-  /**
-   * Insert message into the message queue.
-   *@param mb Message Block to insert into the Message Queue
-   *@param tv amount of time to wait for
-   */
-  protected int putq (MessageBlock mb, TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.enqueueTail (mb, tv);
-    }
-
-  /**
-   * Extract the first message from the queue. Note that the call is blocking.
-   *@return the first Message Block from the Message Queue.
-   *@param tv amount of time to wait for
-   */
-  protected MessageBlock getq (TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.dequeueHead (tv);
-    }
-
-  /**
-   * Return a message back to the queue.
-   *@param mb Message Block to return back to the Message Queue
-   *@param tv amount of time to wait for
-   */
-  protected int ungetq (MessageBlock mb, TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.enqueueHead (mb, tv);
-    }
-
-  /**
-   * Transfer message to the adjacent ACETask in an ACEStream.
-   *@param mb Message Block to transfer to the adjacent Task
-   *@param tv amount of time to wait for
-   *@return -1 if there is no adjacent Task, else the return value of
-   * trying to put the Message Block on that Task's Message Queue.
-   */
-  protected int putNext (MessageBlock mb, TimeValue tv)
-    {
-      return this.next_ == null ? -1 : this.next_.put (mb, tv);
-    }
-
-  /**
-   * Turn the message back around. Puts the message in the sibling's
-   * Message Queue.
-   *@param mb Message Block to put into sibling's Message Queue
-   *@param tv amount of time to wait for
-   *@return -1 if there is no adjacent Task to the sibling, else the
-   * return value of trying to put the Message Block on sibling's
-   * Message Queue. 
-   */
-  protected int reply (MessageBlock mb, TimeValue tv)
-    {
-      return this.sibling ().putNext (mb, tv);
-    }
-
-  // = ACE_Task utility routines to identify names et al.
-
-  /**
-   * Get the name of the enclosing Module.
-   *@return the name of the enclosing Module if there's one associated
-   * with the Task, else null.
-   */
-  protected String name ()
-    {
-      if (this.mod_ == null)
-	return null;
-      else
-	return this.mod_.name ();
-    }
-
-  /**
-   * Get the Task's sibling.
-  *@return the Task's sibling if there's one associated with the
-  * Task's Module, else null.
-  */
-  protected Task sibling ()
-    {
-      if (this.mod_ == null)
-	return null;
-      else
-	return this.mod_.sibling (this);
-    }
-
-  /**
-   * Set the Task's module.
-  *@param mod the Task's Module.
-  */
-  protected void module (Module mod)
-  {
-    this.mod_ = mod;
-  }
-
-  /**
-   * Get the Task's module.
-  *@return the Task's Module if there is one, else null.
-  */
-  protected Module module ()
-  {
-    return this.mod_;
-  }
-
-  /**
-   * Check if queue is a reader.
-   *@return true if queue is a reader, else false.
-   */
-  protected boolean isReader ()
-    {
-      return (ACE.BIT_ENABLED (this.flags_, TaskFlags.ACE_READER));
-    }
-
-  /**
-   * Check if queue is a writer.
-   *@return true if queue is a writer, else false.
-   */
-  protected boolean isWriter ()
-    {
-      return (ACE.BIT_DISABLED (this.flags_, TaskFlags.ACE_READER));
-    }
-
-  // = Pointers to next ACE_Queue (if ACE is part of an ACE_Stream).
-
-  /**
-   * Get next Task pointer.
-   *@return pointer to the next Task
-   */
-  protected Task next ()
-    {
-      return this.next_;
-    }
-
-  /**
-   * Set next Task pointer.
-   *@param task next task pointer
-   */
-  protected void next (Task task)
-    {
-      this.next_ = task;
-    }
-
-  // Special routines corresponding to certain message types.
-
-  /**
-   * Flush the Message Queue
-   *@return 0 if Message Queue is null, 1 if flush succeeds, -1 if
-   * ACE_FLUSHALL bit is not enabled in flags.
-   */
-  protected int flush (long flag)
-    {
-      if (ACE.BIT_ENABLED (flag, TaskFlags.ACE_FLUSHALL))
-	return (this.msgQueue_ == null ? 0 : 1);
-      else
-	return -1;
-    }
-
-
-  /**
-   * Manipulate watermarks.
-   *@param cmd IOCntlCmd
-   *@param size watermark
-   */
-  protected void waterMarks (int cmd, int size)
-  {
-    if (cmd == IOCntlCmds.SET_LWM)
-      this.msgQueue_.lowWaterMark (size);
-    else /* cmd == IOCntlMsg.SET_HWM */
-      this.msgQueue_.highWaterMark (size);
-  }
-
-  private ThreadManager thrMgr_ = null;
-  // Thread_Manager that manages all the spawned threads
-
-  private long flags_;
-  // Task flags.
-
-  private MessageQueue msgQueue_;
-  // List of messages on the Task..
-
-  private Task next_;
-  // Adjacent ACE_Task.
-
-  private Module mod_;
-  // Back-pointer to the enclosing module.
-}
diff --git a/java/src/TaskFlags.java b/java/src/TaskFlags.java
deleted file mode 100644
index 590e514b5e2..00000000000
--- a/java/src/TaskFlags.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class TaskFlags
-{
-  /** Identifies a Task as being the "reader" in a Module. */
-  public static final int ACE_READER    = 01;
-
-  /** Just flush data messages in the queue. */
-  public static final int ACE_FLUSHDATA = 02;
-
-  /** Flush all messages in the Queue. */
-  public static final int ACE_FLUSHALL  = 04;
-
-  /** Flush read queue */
-  public static final int ACE_FLUSHR    = 010;
-
-  /** Flush write queue */
-  public static final int ACE_FLUSHW    = 020;
-
-  /** Flush both queues */
-  public static final int ACE_FLUSHRW   = 030;
-
-  /** Identifies a thread as suspended */
-  public static final int THR_SUSPENDED = 0x00000080;
-
-  /** Identifies a thread as a daemon thread */
-  public static final int THR_DAEMON    = 0x00000100;
-
-  // Default private constructor to avoid instantiation
-  private TaskFlags ()
-  {
-  }
-}
diff --git a/java/src/ThreadManager.java b/java/src/ThreadManager.java
deleted file mode 100644
index 5043d26511e..00000000000
--- a/java/src/ThreadManager.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    ThreadManager.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.OS.*;
-
-public class ThreadManager
-{ 
-  /**
-   * Default constructor
-   */
-  public ThreadManager ()
-    {
-      this (ACE.DEFAULT_THREAD_GROUP_NAME);
-    }
-
-  /**
-   * Create a Thread Manager.
-   *@param groupName name of the thread group that the Thread Manager
-   * will manage
-   */
-  public ThreadManager (String groupName)
-    {
-      this.thrGrp_ = new ThreadGroup (groupName);
-      if (this.thrGrp_ == null)
-	ACE.ERROR ("Thread group create failed");
-    }
-  
-  /** 
-   * Create a new thread.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-  /** 
-   * Create a new thread and also give it a name.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param threadName the name of the new thread
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     String threadName,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr, threadName);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-
-  /** 
-   * Create <n> new threads.
-   *@param n the number of threads to spawn
-   *@param thr the caller whose run method will be invoked by each of
-   * the <n> threads
-   *@param daemon flag indicating whether the threads should be
-   * spawned off as daemon threads 
-   */
-  public void spawnN (int n, 
-		      Runnable thr,
-		      boolean daemon)
-    {
-      // Spawn off all the threads.
-      for (int i = 0; i < n; i++)
-	{
-	  this.spawn (thr, daemon);
-	}
-    }
-
-  /**
-   * Get the thread group containing all the threads. Note that the
-   * thread group can be used to get information regarding number of
-   * active threads as well as to suspend/resume all the threads in
-   * the group. 
-   *@return the thread group that contains all the threads managed by
-   * the Thread Manager
-   */
-  public ThreadGroup thrGrp ()
-    {
-      return this.thrGrp_;
-    }
-
-  private ThreadGroup thrGrp_;
-  // Thread Group that contains all the spawned threads
-
-}
diff --git a/java/src/ThruTask.java b/java/src/ThruTask.java
deleted file mode 100644
index aebc8eb1f48..00000000000
--- a/java/src/ThruTask.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    ThruTask.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-    
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as a "no op", simply passing on all
- *     data to its adjacent neighbor.
- *</blockquote>
- */
-public class ThruTask extends Task
-{
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-  
-  public int put (MessageBlock msg, TimeValue tv)
-  {
-    return this.putNext (msg, tv);
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-}
diff --git a/java/src/TimeValue.java b/java/src/TimeValue.java
deleted file mode 100644
index 280f45ab0f1..00000000000
--- a/java/src/TimeValue.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimeValue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-//package JACE.Reactor;
-package JACE.ASX;
-
-public class TimeValue
-{
-  public final static TimeValue zero = new TimeValue (0,0);
-
-  /** 
-   * Default constructor
-   */
-  public TimeValue ()
-  {
-    this (0, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   */
-  public TimeValue (long sec)
-  {
-    this (sec, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public TimeValue (long sec, int nanos)
-  {
-    this.set (sec, nanos);
-  }
-
-  /** 
-   * Sets the seconds and nanoseconds of Time Value
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public void set (long sec, int nanos)
-  {
-    this.millisec_ = sec * 1000;
-    this.nanos_ = nanos;
-    this.normalize ();
-  }
-
-  /** 
-   * Get seconds
-   *@return Seconds
-   */
-  public long sec ()
-  {
-    return this.millisec_/1000;
-  }
-
-  /** 
-   * Get nanoseconds
-   *@return Nanoseconds
-   */
-  public int nanos ()
-  {
-    return this.nanos_;
-  }
-
-  /** 
-   * Get time in milliseconds.
-   *@return time in milliseconds
-   */
-  public long getMilliTime ()
-  {
-    return this.millisec_;
-  }
-
-  /**
-   * Get a String representation of the Time Value.
-   *@return String representation of the Time Value
-   */
-  public String toString ()
-  {
-    return (new Long (this.millisec_/1000)).toString () + ":" +
-      (new Integer (this.nanos_)).toString ();
-  }
-
-  /** 
-   * Get current time.
-   *@return the current system time
-   */
-  public static TimeValue getTimeOfDay ()
-  {
-    return new TimeValue (System.currentTimeMillis ()/1000);
-  }
-
-  /**
-   * Compare two Time Values for equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are equal, false otherwise
-   */
-  public boolean equals (TimeValue tv)
-  {
-    return this.millisec_ == (tv.sec () * 1000) && this.nanos_ == tv.nanos ();
-  }
-
-  /**
-   * Compare two Time Values for non-equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are not equal, false otherwise
-   */
-  public boolean notEquals (TimeValue tv)
-  {
-    return !this.equals (tv);
-  }
-
-  /**
-   * Add two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return sum of the two Time Values.
-   */
-  public static TimeValue plus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () + tv2.sec (), 
-				  tv1.nanos () + tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Subtract two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return difference of the two Time Values.
-   */
-  public static TimeValue minus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () - tv2.sec (), 
-				  tv1.nanos () - tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Add Time Value to "this".
-   *@param tv The Time Value to add to this.
-   */
-  public void plusEquals (TimeValue tv)
-  {
-    this.set (this.sec () + tv.sec (),
-	      this.nanos () + tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Subtract Time Value from "this".
-   *@param tv The Time Value to subtract from this.
-   */
-  public void minusEquals (TimeValue tv)
-  {
-    this.set (this.sec () - tv.sec (),
-	      this.nanos () - tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Compare two Time Values for less than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is less than tv, false otherwise
-   */
-  public boolean lessThan (TimeValue tv)
-  {
-    return tv.greaterThan (this);
-  }
-
-  /**
-   * Compare two Time Values for greater than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is greater than tv, false otherwise
-   */
-  public boolean greaterThan (TimeValue tv)
-  {
-    if (this.sec () > tv.sec ())
-      return true;
-    else if (this.sec () == tv.sec ()
-	     && this.nanos () > tv.nanos ()) 
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Compare two Time Values for <=.
-   *@param tv Time Value to compare with
-   *@return true if "this" <= tv, false otherwise
-   */
-  public boolean lessThanEqual (TimeValue tv)
-  {
-    return tv.greaterThanEqual (this);
-  }
-
-  /**
-   * Compare two Time Values for >=.
-   *@param tv Time Value to compare with
-   *@return true if "this" >= tv, false otherwise
-   */
-  public boolean greaterThanEqual (TimeValue tv)
-  {
-    return this.sec () >= tv.sec () && this.nanos () >= tv.nanos ();
-  }
-
-  private void normalize ()
-  {
-    if (this.nanos_ >= ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_++;
-	    this.nanos_ -= ONE_MILLISECOND;
-	  }
-	while (this.nanos_ >= ONE_MILLISECOND);
-      }
-    else if (this.nanos_ <= -ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_--;
-	    this.nanos_ += ONE_MILLISECOND;
-	  }
-	while (this.nanos_ <= -ONE_MILLISECOND);
-      }
-    
-    if (this.millisec_ >= 1 && this.nanos_ < 0)
-      {
-	this.millisec_--;
-	this.nanos_ += ONE_MILLISECOND;
-      }
-    else if (this.millisec_ < 0 && this.nanos_ > 0)
-      {
-	this.millisec_++;
-	this.nanos_ -= ONE_MILLISECOND;
-      }
-  }
-
-  private long millisec_;
-  private int nanos_;
-  private final static int ONE_MILLISECOND = 1000000;
-}
diff --git a/java/src/TimedWait.java b/java/src/TimedWait.java
deleted file mode 100644
index acf771dfca1..00000000000
--- a/java/src/TimedWait.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimedWait.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class TimedWait
-{
-  /**
-   * Default Constructor. Sets "this" to be used for the delegation of
-   * the wait() call to. 
-   */
-  public TimedWait ()
-  {
-    object_ = this;
-  }
-
-  /**
-   * Constructor. Allows subclasses to supply us with an Object that
-   * is delegated the wait() call.
-   *@param obj The Object that is delegated the wait() call.
-   */
-  public TimedWait (Object obj)
-  {
-    object_ = obj;
-  }
-
-  /**
-   * Hook method that needs to be implemented by subclasses.
-   */
-  public abstract boolean condition ();
-
-  /**
-   * Wait until condition becomes true. Note that the method
-   * blocks. Also note that this method is final to ensure that no one
-   * overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void timedWait () throws InterruptedException
-  {
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	// Only attempt to perform the wait if the condition isn't
-	// true initially.
-	for (;;) 
-	  {
-	    // Wait until we are notified.
-	    object_.wait ();
-
-	  // Recheck the condition.
-	  if (condition ()) 
-	    break; // Condition became true.
-	  // else we were falsely notified so go back into wait
-	  }
-      }
-  }
-
-  /**
-   * Template Method that implements the actual timed wait. Note that
-   * this method is final to ensure that no one overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   *@param tv Amount of time to do wait for.
-   */
-  public final void timedWait (TimeValue tv)
-    throws InterruptedException,
-           TimeoutException 
-  {
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	// Only attempt to perform the timed wait if the condition isn't
-	// true initially.
-	long start = System.currentTimeMillis ();
-	long waitTime = tv.getMilliTime ();
-
-	for (;;) {
-	  // Wait until we are notified.
-	  object_.wait (waitTime);
-
-	  // Recheck the condition.
-	  if (!condition ()) {
-	    long now = System.currentTimeMillis ();
-	    long timeSoFar = now - start;
-
-	    // Timed out!
-	    if (timeSoFar >= tv.getMilliTime ()) 
-	      throw new TimeoutException ();
-	    else 
-	      // We still have some time left to wait, so adjust the
-	      // wait_time.
-	      waitTime = tv.getMilliTime () - timeSoFar; 
-	  }
-	  else
-	    break;  // Condition became true.
-	}
-      }
-  }
-
-  /**
-   * Notify any one thread waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void signal () {
-    object_.notify ();
-  }
-
-  /**
-   * Notify all threads waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void broadcast () {
-    object_.notifyAll ();
-  }
-
-  /** 
-   * The object we delegate to. If a subclass gives us a particular
-   * object,  we use that to delegate to, otherwise, we ``delegate''
-   * to ourself (i.e., this).
-   */
-  protected Object object_;
-
-}
diff --git a/java/src/TimeoutException.java b/java/src/TimeoutException.java
deleted file mode 100644
index b55549938dc..00000000000
--- a/java/src/TimeoutException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimeoutException.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-public class TimeoutException extends Exception
-{ 
-  /**
-   * Default Constructor.
-   */
-  public TimeoutException ()
-  {
-    super ("Timed Out");
-  }
-
-  /**
-   * Constructor.
-   *@param timeout The timeout value which expired.
-   *@param desc Textual description of the exception
-   */
-  public TimeoutException (TimeValue timeout, String desc)
-  {
-    super ("Timed Out in " + timeout + ": " + desc);
-  }
-
-}
diff --git a/java/src/TimerQueue.java b/java/src/TimerQueue.java
deleted file mode 100644
index e3aa30d9472..00000000000
--- a/java/src/TimerQueue.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimerQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import java.util.*;
-import JACE.ASX.*;
-
-import JACE.OS.*;
-
-class TimerNode
-{
-  public TimerNode (EventHandler handler,
-		    Object arg,
-		    TimeValue timerValue,
-		    TimeValue interval,
-		    TimerNode next,
-		    int timerId)
-  {
-    this.handler_ = handler;
-    this.arg_ = arg;
-    this.timerValue_ = timerValue;
-    this.interval_ = interval;
-    this.next_ = next;
-    this.timerId_ = timerId;
-  }
-
-  public EventHandler handler_;
-  // Handler to invoke <handleTimeout> on when a timeout occurs.
-
-  public Object arg_;
-  // Argument to pass to <handleTimeout>.
-
-  public TimeValue timerValue_;
-  // Time until the timer expires.
-
-  public TimeValue interval_;
-  // If this is a periodic timer this holds the time until the next
-  // timeout.
-
-  public TimerNode next_;
-  // Pointer to next timer.
-  
-  public int timerId_;
-  // Id of this timer (used to cancel timers before they expire).
-}
-
-class WaitObject extends TimedWait
-{
-  public boolean condition ()
-  {
-    return this.condition_;
-  }
-  
-  public void condition (boolean c)
-  {
-    this.condition_ = c;
-  }
-
-  private boolean condition_ = false;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Class that provides an interface to timers. 
- *
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This is a simple implementation that keeps a linked list of
- *     absolute timers. It allows multiple timers to be scheduled
- *     and returns a timer id for each timer scheduled. In addition,
- *     it allows periodic timers to be scheduled.
- *</blockquote>
- */
-public class TimerQueue implements Runnable
-{
-  /**
-   * Constructor.
-   *@param createInternalThread flag specifying whether to create an
-   * internal thread that runs the event loop. If it is true, a thread
-   * is spawned and it runs the event loop, handling all timeout
-   * events. If it is false, the caller is then responsible for calling
-   * handleEvents () to run the event loop.
-   */
-  public TimerQueue (boolean createInternalThread)
-  {
-    this.eventLoopRunning_ = false;
-    if (createInternalThread)
-      new Thread (this).start ();
-  }
-  
-  /**
-   * The thread run method. Do *NOT* call this method! It gets called
-   * automatically. 
-   */
-  public void run ()
-  {
-    this.handleEvents ();
-  }
-
-  /**
-   * Handle timeout events. This forms the event loop and takes care
-   * of all scheduling. This method should only be called if the Timer
-   * Queue was constructed with the value of createInternalThread as
-   * false.
-   */
-  public void handleEvents ()
-  {
-    if (!this.eventLoopRunning_)
-      {
-	// Set the flag indicating that the event loop is now running
-	this.eventLoopRunning_ = true;
-
-	TimeValue timeout = null;
-	TimeValue earliest = null;
-
-	for (;;)
-	  {
-	    synchronized (this.obj_) 
-	      {
-		earliest = this.earliestTime ();
-		if (earliest != null)
-		  timeout = TimeValue.minus (earliest, TimeValue.getTimeOfDay ());
-		else
-		  timeout = new TimeValue ();
-		try
-		  {
-		    // Extract the earliest time from the queue and do a timed wait
-		    this.obj_.timedWait (timeout);
-		
-		    // We have been notified. Check to see if we need to
-		    // restart the wait with a different timeout
-		    if (this.reset_)
-		      {
-			this.reset_ = false;
-			this.obj_.condition (false);
-			timeout = TimeValue.minus (this.earliestTime (), TimeValue.getTimeOfDay ());
-		      }
-		  }
-		catch (TimeoutException e)
-		  {
-		    // Timeout occurred. Call handleTimeout on appropriate
-		    // Event Handlers
-		    this.dispatchHandlers ();
-		  }
-		catch (InterruptedException e)
-		  {
-		  }
-	      }
-	  }
-      }
-  }
-
-  /**
-   * Check if the queue is empty.
-   *@return true if queue is empty, else false.
-   */
-  boolean isEmpty ()
-  {
-    return this.head_ == null;
-  }
-
-  /**
-   * Get the node of the earliest node in the TimerQueue.
-   *@return the time of the earlier node in the TimerQueue.
-   */
-  TimeValue earliestTime ()
-  {
-    synchronized (this.obj_)
-      {
-	if (!this.isEmpty ())
-	  return this.head_.timerValue_;
-	else
-	  return null;
-      }
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method. This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param obj Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param delta amount of time for which to schedule the timer
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			     Object obj,
-			     TimeValue delta)
-  {
-    return this.scheduleTimer (handler, obj, delta, TimeValue.zero);
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method.  If
-   * <interval> is != to <TimeValue.zero> then it is used to
-   * reschedule the <EventHandler> automatically.  This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param arg Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param timeout amount of time for which to schedule the timer
-   *@param interval amount of time to use to reschedule the timer
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			    Object arg,
-			    TimeValue timeout,
-			    TimeValue interval)
-  {
-
-    // Increment the sequence number (it will wrap around).
-    this.timerId_++;
-
-    ACE.DEBUG("scheduleTimer (" + this.timerId_ + "): " + timeout + ", " + interval);
-
-
-    TimeValue futureTime = TimeValue.plus (timeout, TimeValue.getTimeOfDay ());
-    TimerNode node = new TimerNode (handler, 
-				    arg,
-				    futureTime,
-				    interval, 
-				    null,
-				    this.timerId_);
-    synchronized (this.obj_)
-      {
-	// Check if event loop is running. If it is not, then we can
-	// just place it at the appropriate place in the queue and
-	// don't need to do any notification. If event loop is
-	// running, then check if the node is the first node in the
-	// queue (either because the queue is empty or because the
-	// time for the node is earlier than the currently scheduled
-	// timer node).
-	if (this.eventLoopRunning_ &&
-	    (this.isEmpty () || futureTime.lessThan (this.earliestTime ())))
-	  {
-	    // Insert the node into (the beginning of) the queue to be
-	    // scheduled. 
-	    this.reschedule (node);
-
-	    // Notify the waiting thread so that it can reschedule
-	    // using the earliest timeout
-	    this.obj_.notify ();
-	  }
-	else // Place in the appropriate position in the queue.
-	  {
-	    this.reschedule (node);
-	  }
-      }
-    return this.timerId_;
-  }
-
-
-  /**
-   * Cancel the single timer associated with <timerId>.
-   *@param timerId id of the timer that needs to be cancelled.
-   *@return Object that was passed in when timer was scheduled
-   * (Asynchronous Completion Token). 
-   */
-  public Object cancelTimer (int timerId)
-  {
-    TimerNode prev = null;
-    TimerNode curr = null;
-
-    synchronized (this.obj_)
-      {
-	// Try to locate the TimerNode that matches the timerId.
-	for (curr = this.head_; 
-	     curr != null && curr.timerId_ != timerId;
-	     curr = curr.next_)
-	  prev = curr;
-
-	if (curr != null)
-	  {
-	    if (prev == null)
-	      this.head_ = curr.next_;
-	    else
-	      prev.next_ = curr.next_;
-
-	    return curr.arg_;
-	  }
-      }
-    return null;
-  }
-
-  /**
-   * Cancel all timers associated with <Event Handler>.
-   *@param handler Event Handler whose associated timers need to be cancelled.
-   */
-  public void cancelTimer (EventHandler handler)
-  {
-    TimerNode prev = null;
-    TimerNode curr = this.head_;
-
-    synchronized (this.obj_)
-      {
-	while (curr != null)
-	  {
-	    if (curr.handler_ == handler)
-	      {
-		if (prev == null)
-		  {
-		    this.head_ = curr.next_;
-		    curr = this.head_;
-		  }
-		else
-		  {
-		    prev.next_ = curr.next_;
-		    curr = prev.next_;
-		  }
-	      }
-	    else
-	      {
-		prev = curr;
-		curr = curr.next_;
-	      }
-	  }
-      }
-  }
-
-  // Call handleTimeout() on all handlers whose timers have expired.
-  private void dispatchHandlers ()
-  {
-    TimeValue currentTime = TimeValue.getTimeOfDay ();
-
-    for (;;)
-      {
-	if (this.isEmpty () || this.earliestTime ().greaterThan (currentTime))
-	  break; // There aren't any more timers eligible to expire.
-
-	TimerNode expired = this.head_;
-	EventHandler handler = expired.handler_;
-	Object arg = expired.arg_;
-	int result;
-	
-	this.head_ = this.head_.next_;
-	
-	// Check whether this is an interval timer.
-	if (expired.interval_.greaterThan (TimeValue.zero))
-	  {
-	    // Make sure that we skip past values that have already
-	    // "expired".
-	    do
-	      expired.timerValue_.plusEquals (expired.interval_);
-	    while (expired.timerValue_.lessThanEqual (currentTime));
-		   
-	    // Since this is an interval timer, we need to reschedule
-	    // it.
-	    this.reschedule (expired);
-	  }
-	
-	ACE.DEBUG("handleTimeout " + expired.timerId_);
-
-	// Perform the callback.
-	result = handler.handleTimeout (currentTime, arg);
-	
-	if (result == -1)
-	  this.cancelTimer (handler);
-      }
-  }
-
-  // Reschedule a TimerNode by inserting it at the appropriate
-  // position in the queue.
-  private void reschedule (TimerNode expired)
-  {
-    ACE.DEBUG("reschedule " + expired.timerId_ + " for " + expired.timerValue_);
-    // *** Shouldn't it use interval here?
-
-    if (this.isEmpty () || 
-	expired.timerValue_.lessThan (this.earliestTime ()))
-      {
-	expired.next_ = this.head_;
-	this.head_ = expired;
-	// Set the condition to true so that the waiting thread can be
-	// notified and it can reschedule.
-	this.obj_.condition (true);
-	this.reset_ = true;
-      }
-    else
-      {
-	TimerNode prev = this.head_;
-	TimerNode after  = this.head_.next_;
-
-	// Locate the proper position in the queue. 
-
-	while (after != null 
-	       && expired.timerValue_.greaterThan (after.timerValue_))
-	  {
-	    prev = after;
-	    after  = after.next_;
-	  }
-
-	expired.next_ = after;
-	prev.next_  = expired;
-      }
-  }
-
-  private WaitObject obj_ = new WaitObject ();
-  // Synchronization object (as well as object to use to do wait on)
-
-  private TimerNode head_; 
-  // Pointer to linked list of TimerHandles. 
-
-  private int timerId_;
-  // Keeps track of the timer id that uniquely identifies each timer.
-  // This id can be used to cancel a timer via the <cancel (int)>
-  // method.
-
-  private boolean reset_;
-  // Flag indicating whether to start the wait again
-
-  private boolean eventLoopRunning_;
-  // Flag indicating whether the event loop is running or not
-}
-
diff --git a/java/src/Token.java b/java/src/Token.java
deleted file mode 100644
index a17be013ad5..00000000000
--- a/java/src/Token.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Token.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class WaitObject extends TimedWait
-{
-  public boolean condition ()
-  {
-    return this.condition_;
-  }
-  
-  public void condition (boolean c)
-  {
-    this.condition_ = c;
-  }
-
-  private boolean condition_ = false;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Class that acquires, renews, and releases a synchronization
- *     token that is serviced in strict FIFO ordering.
- *
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This is a general-purpose synchronization mechanism that offers
- *     several benefits. For example, it implements "recursive mutex"
- *     semantics, where a thread that owns the token can reacquire it
- *     without deadlocking.  In addition, threads that are blocked
- *     awaiting the token are serviced in strict FIFO order as other
- *     threads release the token. The solution makes use of the
- *     Specific Notification pattern presented by Tom Cargill in
- *     "Specific Notification for Java Thread Synchronization," PLoP96.
- *</blockquote>
- */
-public class Token
-{
-  /**
-   * Acquire the token. Note that this will block. The method uses
-   * synchronized blocks internally to avoid race conditions.
-   *@return 0 if acquires without calling <sleepHook>
-   * 1 if <sleepHook> is called.
-   * -1 if failure occurs
-   *@exception InterruptedException exception during wait
-   */
-  public int acquire () throws InterruptedException
-    {
-      try
-	{
-	  return this.acquire (new TimeValue ());
-	}
-      catch (TimeoutException e)
-	{
-	  // This really shouldn't happen since we are supposed to
-	  // block.
-	  return -1;
-	}
-    }
-
-  /**
-   * Acquire the token. Wait for timeout amount of time. The method
-   * uses synchronized blocks internally to avoid race conditions. 
-   *@param timeout Amount of time to wait for in trying to acquire the
-   * token.
-   *@return 0 if acquires without calling <sleepHook>
-   * 1 if <sleepHook> is called.
-   * -1 if failure occurs
-   *@exception TimeoutException exception if timeout occurs
-   *@exception InterruptedException exception during wait
-   */
-  public int acquire (TimeValue timeout) throws InterruptedException, TimeoutException
-    {
-      int result = 0;
-      WaitObject snl = new WaitObject ();
-      boolean mustWait;
-      synchronized (snl)
-	{
-	  synchronized (this)
-	    {
-	      mustWait = !this.snq_.isEmpty ();
-	      if (mustWait &&
-		  Thread.currentThread ().toString ().compareTo (this.owner_) == 0)
-		{
-		  // I am the one who has the token. So just increment
-		  // the nesting level
-		  this.nestingLevel_++;
-		  return result;
-		}
-	      // Add local lock to the queue
-	      this.snq_.addElement (snl);
-	    }
-	  if (mustWait)
-	    {
-	      result = 1;
-	      // Call sleep hook
-	      sleepHook ();
-	      snl.timedWait (timeout);  // Do a blocking wait
-	    }
-	  // Set the owner of the token
-	  this.owner_ = Thread.currentThread ().toString ();
-	}
-      return result;
-    }
-
-  /**
-   * Try to acquire the token. Implements a non-blocking acquire.
-   *@return 0 if acquires without calling <sleepHook>
-   * 1 if <sleepHook> is called.
-   * -1 if failure occurs
-   */
-  public synchronized int tryAcquire ()
-    {
-      int result = 0;
-      if (!this.snq_.isEmpty ())
-	{
-	  // No one has the token, so acquire it
-	  this.snq_.addElement (new WaitObject ());
-	}
-      // Check if I am the one holding the token.
-      else if (Thread.currentThread ().toString ().compareTo (this.owner_) == 0)
-	{
-	  this.nestingLevel_++;
-	}
-      // Someone else has the token.
-      else
-	{
-	  // Will have to block to acquire the token, so call
-	  // sleepHook and return 
-	  sleepHook ();
-	  result = 1;
-	}
-      return result;
-    }
-
-  /**
-   * Method that is called before a thread goes to sleep in an
-   * acquire(). This should be overridden by a subclass to define 
-   * the appropriate behavior before acquire() goes to sleep.
-   * By default, this is a no-op.
-   */
-  public void sleepHook ()
-  {
-  }
-
-  /**
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   *@param requeuePosition Position in the queue where to insert the
-   * lock. If requeuePosition == -1 and there are other threads
-   * waiting to obtain the token we are queued at the end of the list
-   * of waiters.  If requeuePosition > -1 then it indicates how many
-   * entries to skip over before inserting our thread into the list of
-   * waiters (e.g.,requeuePosition == 0 means "insert at front of the
-   * queue"). 
-   *@exception InterruptedException exception during wait
-   */
-  public void renew (int requeuePosition) throws InterruptedException
-  {
-    try
-      {
-	this.renew (requeuePosition, new TimeValue ());
-      }
-    catch (TimeoutException e)
-      {
-	// This really shouldn't happen since we are supposed to
-	// block.
-      }
-  }
-
-  /**
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   *@param requeuePosition Position in the queue where to insert the
-   * lock. If requeuePosition == -1 and there are other threads
-   * waiting to obtain the token we are queued at the end of the list
-   * of waiters.  If requeuePosition > -1 then it indicates how many
-   * entries to skip over before inserting our thread into the list of
-   * waiters (e.g.,requeuePosition == 0 means "insert at front of the
-   * queue").
-   *@param timeout Amount of time to wait for in trying to acquire the
-   * token.
-   *@exception TimeoutException exception if timeout occurs
-   *@exception InterruptedException exception during wait
-   */
-  public void renew (int requeuePosition, TimeValue timeout) 
-    throws InterruptedException, TimeoutException
-  {
-    WaitObject snl = null;
-    int saveNestingLevel = 0;
-
-    synchronized (this)
-      {
-	// Check if there is a thread waiting to acquire the token. If
-	// not or if requeuePosition == 0, then we don't do anything
-	// and we simply keep the token. 
-	if (this.snq_.size () > 1 && requeuePosition != 0)
-	  {
-	    // Save the nesting level
-	    saveNestingLevel = this.nestingLevel_;
-	    this.nestingLevel_ = 0;
-
-	    // Reinsert ourselves at requeuePosition in the queue
-	    snl = (WaitObject) this.snq_.firstElement ();
-	    this.snq_.removeElementAt (0);
-
-	    if (requeuePosition < 0)
-	      this.snq_.addElement (snl);  // Insert at end
-	    else
-	      this.snq_.insertElementAt (snl, requeuePosition);
-
-	    synchronized (this.snq_.firstElement ())
-	      {
-		// Notify the first waiting thread in the queue
-		WaitObject obj = (WaitObject) this.snq_.firstElement ();
-		// Set its condition to be true so that it falls out
-		// of the for loop
-		obj.condition (true);
-		// Now signal the thread
-		obj.signal ();
-	      }    
-	  }
-      }
-    
-    // Check if we reinserted the lock in the queue and therefore need
-    // to do a wait 
-    if (snl != null)
-      {
-	synchronized (snl)
-	  {
-	    // Set the condition to be false so that we can begin the
-	    // wait 
-	    snl.condition (false);
-	    // Do a blocking wait
-	    snl.timedWait (timeout);
-	  }
-	// Restore the nesting level and current owner of the lock
-	this.nestingLevel_ = saveNestingLevel;
-	this.owner_ = Thread.currentThread ().toString ();
-      }
-  }
-
-  /**
-   * Release the token.
-   */
-  public synchronized void release ()
-  {
-    // Check if nestingLevel > 0 and if so, decrement it
-    if (this.nestingLevel_ > 0)
-      this.nestingLevel_--;
-    else
-      {
-	this.snq_.removeElementAt (0);
-	if (!this.snq_.isEmpty ())
-	  {
-	    synchronized (this.snq_.firstElement ())
-	      {
-		// Notify the first waiting thread in the queue
-		WaitObject obj = (WaitObject) this.snq_.firstElement ();
-		// Set its condition to be true so that it falls out
-		// of the for loop
-		obj.condition (true);
-		// Now signal the thread
-		obj.signal ();
-	      }
-	  }
-      }
-  }
-
-  private Vector snq_ = new Vector ();
-  // Vector of lock objects
-
-  private int nestingLevel_ = 0;
-  // Current Nesting Level
-
-  private String owner_ = null;
-  // Current owner of the token.
-}
diff --git a/java/src/Yylex.java b/java/src/Yylex.java
deleted file mode 100644
index 50e9d1173d3..00000000000
--- a/java/src/Yylex.java
+++ /dev/null
@@ -1,1315 +0,0 @@
-package JACE.ServiceConfigurator;
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-// This was written for JLex version 1.2
-
-
-class Yylex {
-	private final int YY_BUFFER_SIZE = 512;
-	private final int YY_F = -1;
-	private final int YY_NO_STATE = -1;
-	private final int YY_NOT_ACCEPT = 0;
-	private final int YY_START = 1;
-	private final int YY_END = 2;
-	private final int YY_NO_ANCHOR = 4;
-	private final byte YYEOF = -1;
-
-  // Used to assemble the parameter string for a service
-  private String params;  
-	private java.io.DataInputStream yy_instream;
-	private int yy_buffer_index;
-	private int yy_buffer_read;
-	private int yy_buffer_start;
-	private int yy_buffer_end;
-	private byte yy_buffer[];
-	private int yyline;
-	private int yy_lexical_state;
-	Yylex (java.io.InputStream instream) {
-		if (null == instream) {
-			throw (new Error("Error: Bad input stream initializer."));
-		}
-		yy_instream = new java.io.DataInputStream(instream);
-		yy_buffer = new byte[YY_BUFFER_SIZE];
-		yy_buffer_read = 0;
-		yy_buffer_index = 0;
-		yy_buffer_start = 0;
-		yy_buffer_end = 0;
-		yyline = 0;
-		yy_lexical_state = YYINITIAL;
-	}
-	private boolean yy_eof_done = false;
-	private final int COMMENT = 1;
-	private final int YYINITIAL = 0;
-	private final int PARAMS = 2;
-	private final int yy_state_dtrans[] = {
-		0,
-		23,
-		30
-	};
-	private void yybegin (int state) {
-		yy_lexical_state = state;
-	}
-	private byte yy_advance ()
-		throws java.io.IOException {
-		int next_read;
-		int i;
-		int j;
-
-		if (yy_buffer_index < yy_buffer_read) {
-			return yy_buffer[yy_buffer_index++];
-		}
-
-		if (0 != yy_buffer_start) {
-			i = yy_buffer_start;
-			j = 0;
-			while (i < yy_buffer_read) {
-				yy_buffer[j] = yy_buffer[i];
-				++i;
-				++j;
-			}
-			yy_buffer_end = yy_buffer_end - yy_buffer_start;
-			yy_buffer_start = 0;
-			yy_buffer_read = j;
-			yy_buffer_index = j;
-			next_read = yy_instream.read(yy_buffer,
-					yy_buffer_read,
-					yy_buffer.length - yy_buffer_read);
-			if (-1 == next_read) {
-				return YYEOF;
-			}
-			yy_buffer_read = yy_buffer_read + next_read;
-		}
-
-		while (yy_buffer_index >= yy_buffer_read) {
-			if (yy_buffer_index >= yy_buffer.length) {
-				yy_buffer = yy_double(yy_buffer);
-			}
-			next_read = yy_instream.read(yy_buffer,
-					yy_buffer_read,
-					yy_buffer.length - yy_buffer_read);
-			if (-1 == next_read) {
-				return YYEOF;
-			}
-			yy_buffer_read = yy_buffer_read + next_read;
-		}
-		return yy_buffer[yy_buffer_index++];
-	}
-	private void yy_move_start () {
-		if ((byte) '\n' == yy_buffer[yy_buffer_start]) {
-			++yyline;
-		}
-		++yy_buffer_start;
-	}
-	private void yy_pushback () {
-		--yy_buffer_end;
-	}
-	private void yy_mark_start () {
-		int i;
-		for (i = yy_buffer_start; i < yy_buffer_index; ++i) {
-			if ((byte) '\n' == yy_buffer[i]) {
-				++yyline;
-			}
-		}
-		yy_buffer_start = yy_buffer_index;
-	}
-	private void yy_mark_end () {
-		yy_buffer_end = yy_buffer_index;
-	}
-	private void yy_to_mark () {
-		yy_buffer_index = yy_buffer_end;
-	}
-	private java.lang.String yytext () {
-		return (new java.lang.String(yy_buffer,0,
-			yy_buffer_start,
-			yy_buffer_end - yy_buffer_start));
-	}
-	private int yylength () {
-		return yy_buffer_end - yy_buffer_start;
-	}
-	private byte[] yy_double (byte buf[]) {
-		int i;
-		byte newbuf[];
-		newbuf = new byte[2*buf.length];
-		for (i = 0; i < buf.length; ++i) {
-			newbuf[i] = buf[i];
-		}
-		return newbuf;
-	}
-	private final int YY_E_INTERNAL = 0;
-	private final int YY_E_MATCH = 1;
-	private java.lang.String yy_error_string[] = {
-		"Error: Internal error.\n",
-		"Error: Unmatched input.\n"
-	};
-	private void yy_error (int code,boolean fatal) {
-		java.lang.System.out.print(yy_error_string[code]);
-		java.lang.System.out.flush();
-		if (fatal) {
-			throw new Error("Fatal Error.\n");
-		}
-	}
-	private int yy_acpt[] = {
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NOT_ACCEPT,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NOT_ACCEPT,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR,
-		YY_NO_ANCHOR
-	};
-	private int yy_cmap[] = {
-		0, 0, 0, 0, 0, 0, 0, 0,
-		1, 1, 2, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0,
-		1, 0, 3, 4, 0, 0, 0, 0,
-		5, 6, 7, 0, 0, 8, 8, 8,
-		9, 9, 9, 9, 9, 9, 9, 9,
-		9, 9, 10, 0, 0, 0, 0, 0,
-		0, 11, 12, 12, 12, 13, 12, 12,
-		12, 12, 12, 12, 12, 14, 12, 15,
-		12, 12, 16, 17, 18, 12, 12, 12,
-		12, 12, 12, 0, 8, 0, 0, 19,
-		0, 20, 21, 22, 23, 24, 12, 12,
-		12, 25, 26, 12, 27, 28, 29, 30,
-		31, 12, 32, 33, 34, 35, 36, 12,
-		12, 37, 12, 38, 0, 39, 0, 0
-		
-	};
-	private int yy_rmap[] = {
-		0, 1, 1, 1, 1, 1, 1, 2,
-		1, 3, 1, 1, 3, 3, 3, 3,
-		3, 3, 3, 3, 3, 3, 3, 4,
-		1, 1, 1, 1, 5, 6, 7, 8,
-		9, 10, 11, 12, 13, 14, 15, 16,
-		17, 18, 19, 20, 21, 22, 23, 24,
-		25, 26, 27, 28, 29, 30, 31, 32,
-		33, 34, 35, 36, 37, 38, 39, 40,
-		41, 42, 43, 44, 45, 46, 47, 48,
-		49, 50, 51, 52, 53, 54, 55, 56,
-		57, 58, 59, 60, 61, 62, 63, 64,
-		65, 66, 67 
-	};
-	private int yy_nxt[][] = {
-		{ 1, 28, 28, 2, 3, 4, 5, 6,
-			7, 7, 8, 9, 9, 9, 72, 9,
-			9, 73, 9, 9, 74, 9, 9, 81,
-			9, 84, 9, 9, 9, 9, 9, 9,
-			75, 76, 9, 9, 9, 9, 10, 11
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 7, -1, 7, 7, 7, 7, 7,
-			7, 7, 7, 7, 7, 7, 7, 7,
-			7, 7, 7, 7, 7, 7, 7, 7,
-			7, 7, 7, 7, 7, 7, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ 24, 24, 25, 24, 24, 24, 24, 24,
-			24, 24, 24, 24, 24, 24, 24, 24,
-			24, 24, 24, 24, 24, 24, 24, 24,
-			24, 24, 24, 24, 24, 24, 24, 24,
-			24, 24, 24, 24, 24, 24, 24, 24
-			
-		},
-		{ -1, 28, 28, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			12, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ 26, 26, 27, 27, 26, 26, 26, 26,
-			26, 26, 26, 26, 26, 26, 26, 26,
-			26, 26, 26, 26, 26, 26, 26, 26,
-			26, 26, 26, 26, 26, 26, 26, 26,
-			26, 26, 26, 26, 26, 26, 26, 26
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 13, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			14, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			15, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			16, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 17, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 18, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 19, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 20,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			21, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 22, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 29, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 31, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 32, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 33, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 34, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 35, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 36, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 37, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 38, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 39, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 40, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 41, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 42, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 43, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 44, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 45, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 46, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			47, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 48, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			49, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 50, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			51, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 52,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			53, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 54, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 55, 9, 9, 9,
-			9, 56, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 57, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			58, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 59, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 60,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 61, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 62, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 63, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 64, 9, 9, 9, 9, 9,
-			90, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 65, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			66, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 67, 78, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 68, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 69, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 70, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 71, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 77, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 79, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 80,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 82, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 83, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			85, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 86, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 87, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 88, 9, -1, -1
-			
-		},
-		{ -1, -1, -1, -1, -1, -1, -1, -1,
-			7, 9, -1, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			9, 9, 9, 9, 9, 9, 9, 9,
-			89, 9, 9, 9, 9, 9, -1, -1
-			
-		}
-	};
-	public java_cup.runtime.token yylex ()
-		throws java.io.IOException {
-		byte yy_lookahead;
-		int yy_anchor = YY_NO_ANCHOR;
-		int yy_state = yy_state_dtrans[yy_lexical_state];
-		int yy_next_state = YY_NO_STATE;
-		int yy_last_accept_state = YY_NO_STATE;
-		boolean yy_initial = true;
-		int yy_this_accept;
-
-		yy_mark_start();
-		yy_this_accept = yy_acpt[yy_state];
-		if (YY_NOT_ACCEPT != yy_this_accept) {
-			yy_last_accept_state = yy_state;
-			yy_mark_end();
-		}
-		while (true) {
-			yy_lookahead = yy_advance();
-			yy_next_state = YY_F;
-			if (YYEOF != yy_lookahead) {
-				yy_next_state = yy_nxt[yy_rmap[yy_state]][yy_cmap[yy_lookahead]];
-			}
-			if (YY_F != yy_next_state) {
-				yy_state = yy_next_state;
-				yy_initial = false;
-				yy_this_accept = yy_acpt[yy_state];
-				if (YY_NOT_ACCEPT != yy_this_accept) {
-					yy_last_accept_state = yy_state;
-					yy_mark_end();
-				}
-			}
-			else {
-				if (YYEOF == yy_lookahead && true == yy_initial) {
- 
-  return new java_cup.runtime.token (sym.EOF);
-				}
-				else if (YY_NO_STATE == yy_last_accept_state) {
-					throw (new Error("Lexical Error: Unmatched Input."));
-				}
-				else {
-					yy_to_mark();
-					yy_anchor = yy_acpt[yy_last_accept_state];
-					if (0 != (YY_END & yy_anchor)) {
-						yy_pushback();
-					}
-					if (0 != (YY_START & yy_anchor)) {
-						yy_move_start();
-					}
-					switch (yy_last_accept_state) {
-					case 0:
-						{ /* Skip all white space */ }
-					case -2:
-						break;
-					case 1:
-						{ 
-  ACE.ERROR ("Unknown text, line " + (yyline + 1) + ": \"" + yytext() + "\""); 
-  return new java_cup.runtime.str_token (sym.error); 
-}
-					case -3:
-						break;
-					case 2:
-						{
-  yybegin(PARAMS);
-  params = new String();
-}
-					case -4:
-						break;
-					case 3:
-						{ yybegin(COMMENT); }
-					case -5:
-						break;
-					case 4:
-						{ return new java_cup.runtime.token (sym.ACE_LPAREN); }
-					case -6:
-						break;
-					case 5:
-						{ return new java_cup.runtime.token (sym.ACE_RPAREN); }
-					case -7:
-						break;
-					case 6:
-						{ return new java_cup.runtime.token (sym.ACE_STAR); }
-					case -8:
-						break;
-					case 7:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_PATHNAME, yytext()); 
-}
-					case -9:
-						break;
-					case 8:
-						{ return new java_cup.runtime.token (sym.ACE_COLON); }
-					case -10:
-						break;
-					case 9:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -11:
-						break;
-					case 10:
-						{ return new java_cup.runtime.token (sym.ACE_LBRACE); }
-					case -12:
-						break;
-					case 11:
-						{ return new java_cup.runtime.token (sym.ACE_RBRACE); }
-					case -13:
-						break;
-					case 12:
-						{ return new java_cup.runtime.token (sym.ACE_MODULE_T); }
-					case -14:
-						break;
-					case 13:
-						{ return new java_cup.runtime.token (sym.ACE_STREAM_T); }
-					case -15:
-						break;
-					case 14:
-						{ return new java_cup.runtime.token (sym.ACE_ACTIVE); }
-					case -16:
-						break;
-					case 15:
-						{ return new java_cup.runtime.token (sym.ACE_REMOVE); }
-					case -17:
-						break;
-					case 16:
-						{ return new java_cup.runtime.token (sym.ACE_RESUME); }
-					case -18:
-						break;
-					case 17:
-						{ return new java_cup.runtime.token (sym.ACE_STATIC); }
-					case -19:
-						break;
-					case 18:
-						{ return new java_cup.runtime.token (sym.ACE_USTREAM); }
-					case -20:
-						break;
-					case 19:
-						{return new java_cup.runtime.token (sym.ACE_DYNAMIC); }
-					case -21:
-						break;
-					case 20:
-						{ return new java_cup.runtime.token (sym.ACE_SUSPEND); }
-					case -22:
-						break;
-					case 21:
-						{ return new java_cup.runtime.token (sym.ACE_INACTIVE); }
-					case -23:
-						break;
-					case 22:
-						{ return new java_cup.runtime.token (sym.ACE_SVC_OBJ_T); }
-					case -24:
-						break;
-					case 24:
-						{ /* Skip everything on a comment line */ }
-					case -25:
-						break;
-					case 25:
-						{ yybegin(YYINITIAL); }
-					case -26:
-						break;
-					case 26:
-						{
-  params = params + yytext();
-}
-					case -27:
-						break;
-					case 27:
-						{
-  yybegin(YYINITIAL);
-  return new java_cup.runtime.str_token (sym.ACE_STRING, params);
-}
-					case -28:
-						break;
-					case 28:
-						{ /* Skip all white space */ }
-					case -29:
-						break;
-					case 29:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -30:
-						break;
-					case 31:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -31:
-						break;
-					case 32:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -32:
-						break;
-					case 33:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -33:
-						break;
-					case 34:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -34:
-						break;
-					case 35:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -35:
-						break;
-					case 36:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -36:
-						break;
-					case 37:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -37:
-						break;
-					case 38:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -38:
-						break;
-					case 39:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -39:
-						break;
-					case 40:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -40:
-						break;
-					case 41:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -41:
-						break;
-					case 42:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -42:
-						break;
-					case 43:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -43:
-						break;
-					case 44:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -44:
-						break;
-					case 45:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -45:
-						break;
-					case 46:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -46:
-						break;
-					case 47:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -47:
-						break;
-					case 48:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -48:
-						break;
-					case 49:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -49:
-						break;
-					case 50:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -50:
-						break;
-					case 51:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -51:
-						break;
-					case 52:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -52:
-						break;
-					case 53:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -53:
-						break;
-					case 54:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -54:
-						break;
-					case 55:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -55:
-						break;
-					case 56:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -56:
-						break;
-					case 57:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -57:
-						break;
-					case 58:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -58:
-						break;
-					case 59:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -59:
-						break;
-					case 60:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -60:
-						break;
-					case 61:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -61:
-						break;
-					case 62:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -62:
-						break;
-					case 63:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -63:
-						break;
-					case 64:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -64:
-						break;
-					case 65:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -65:
-						break;
-					case 66:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -66:
-						break;
-					case 67:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -67:
-						break;
-					case 68:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -68:
-						break;
-					case 69:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -69:
-						break;
-					case 70:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -70:
-						break;
-					case 71:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -71:
-						break;
-					case 72:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -72:
-						break;
-					case 73:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -73:
-						break;
-					case 74:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -74:
-						break;
-					case 75:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -75:
-						break;
-					case 76:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -76:
-						break;
-					case 77:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -77:
-						break;
-					case 78:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -78:
-						break;
-					case 79:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -79:
-						break;
-					case 80:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -80:
-						break;
-					case 81:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -81:
-						break;
-					case 82:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -82:
-						break;
-					case 83:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -83:
-						break;
-					case 84:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -84:
-						break;
-					case 85:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -85:
-						break;
-					case 86:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -86:
-						break;
-					case 87:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -87:
-						break;
-					case 88:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -88:
-						break;
-					case 89:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -89:
-						break;
-					case 90:
-						{ 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-					case -90:
-						break;
-					default:
-						yy_error(YY_E_INTERNAL,false);
-					case -1:
-					}
-					yy_initial = true;
-					yy_state = yy_state_dtrans[yy_lexical_state];
-					yy_next_state = YY_NO_STATE;
-					yy_last_accept_state = YY_NO_STATE;
-					yy_mark_start();
-					yy_this_accept = yy_acpt[yy_state];
-					if (YY_NOT_ACCEPT != yy_this_accept) {
-						yy_last_accept_state = yy_state;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/java/src/Yylex.lex b/java/src/Yylex.lex
deleted file mode 100644
index fc41453fbad..00000000000
--- a/java/src/Yylex.lex
+++ /dev/null
@@ -1,78 +0,0 @@
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-import java_cup.runtime.*;
-
-// This was written for JLex version 1.2
-
-%%
-
-// Return a java_cup.runtime.token instead of a Yytoken from yylex()
-%type java_cup.runtime.token
-%{
-  // Used to assemble the parameter string for a service
-  private String params;  
-%}
-
-%eofval{ 
-  return new java_cup.runtime.token (sym.EOF);
-%eofval}
-
-%line
-
-%state COMMENT
-%state PARAMS
-
-ALPHA=[A-Za-z_]
-DIGIT=[0-9]
-WHITE_SPACE=[\ \t\b\012]
-PATHNAME=[\.\\\/A-Za-z_\-0-9]
-NEWLINE=\n
-OTHER=.
-
-%%
-
-<YYINITIAL> dynamic {return new java_cup.runtime.token (sym.ACE_DYNAMIC); }
-<YYINITIAL> static { return new java_cup.runtime.token (sym.ACE_STATIC); }
-<YYINITIAL> suspend { return new java_cup.runtime.token (sym.ACE_SUSPEND); }
-<YYINITIAL> resume { return new java_cup.runtime.token (sym.ACE_RESUME); }
-<YYINITIAL> remove { return new java_cup.runtime.token (sym.ACE_REMOVE); }
-<YYINITIAL> stream { return new java_cup.runtime.token (sym.ACE_USTREAM); }
-<YYINITIAL> Module { return new java_cup.runtime.token (sym.ACE_MODULE_T); }
-<YYINITIAL> Service_Object { return new java_cup.runtime.token (sym.ACE_SVC_OBJ_T); }
-<YYINITIAL> STREAM { return new java_cup.runtime.token (sym.ACE_STREAM_T); }
-<YYINITIAL> active { return new java_cup.runtime.token (sym.ACE_ACTIVE); }
-<YYINITIAL> inactive { return new java_cup.runtime.token (sym.ACE_INACTIVE); }
-<YYINITIAL> ":" { return new java_cup.runtime.token (sym.ACE_COLON); }
-<YYINITIAL> \" {
-  yybegin(PARAMS);
-  params = new String();
-}
-<YYINITIAL> "#" { yybegin(COMMENT); }
-<YYINITIAL> "*" { return new java_cup.runtime.token (sym.ACE_STAR); }
-<YYINITIAL> "(" { return new java_cup.runtime.token (sym.ACE_LPAREN); }
-<YYINITIAL> ")" { return new java_cup.runtime.token (sym.ACE_RPAREN); }
-<YYINITIAL> "{" { return new java_cup.runtime.token (sym.ACE_LBRACE); }
-<YYINITIAL> "}" { return new java_cup.runtime.token (sym.ACE_RBRACE); }
-<YYINITIAL> {WHITE_SPACE}* { /* Skip all white space */ }
-<YYINITIAL> {ALPHA}({ALPHA}|{DIGIT}|_)* { 
-  return new java_cup.runtime.str_token (sym.ACE_IDENT, yytext()); 
-}
-<YYINITIAL> {PATHNAME}* { 
-  return new java_cup.runtime.str_token (sym.ACE_PATHNAME, yytext()); 
-}
-<YYINITIAL> {NEWLINE} { /* Empty */ }
-<YYINITIAL> {OTHER} { 
-  ACE.ERROR ("Unknown text, line " + (yyline + 1) + ": \"" + yytext() + "\""); 
-  return new java_cup.runtime.str_token (sym.error); 
-}
-<PARAMS> [\"\n] {
-  yybegin(YYINITIAL);
-  return new java_cup.runtime.str_token (sym.ACE_STRING, params);
-}
-<PARAMS> . {
-  params = params + yytext();
-}
-<COMMENT> {NEWLINE} { yybegin(YYINITIAL); }
-<COMMENT> {OTHER} { /* Skip everything on a comment line */ }
diff --git a/java/src/parser.java b/java/src/parser.java
deleted file mode 100644
index ab55b9a8a4e..00000000000
--- a/java/src/parser.java
+++ /dev/null
@@ -1,621 +0,0 @@
-
-//----------------------------------------------------
-// The following code was generated by CUP v0.9e
-// Fri Dec 19 15:46:53 CST 1997
-//----------------------------------------------------
-
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java_cup.runtime.*;
-import JACE.OS.*;
-
-public class parser extends java_cup.runtime.lr_parser {
-
-  /** constructor */
-  public parser() {super();}
-
-  /** production table */
-  protected static final short _production_table[][] = {
-        {0, 2},     {9, 2},     {9, 1},     {8, 1},     {8, 1}, 
-        {8, 1},     {8, 1},     {8, 1},     {8, 1},     {1, 3}, 
-        {10, 3},     {3, 2},     {4, 2},     {5, 2},     {7, 3}, 
-        {7, 3},     {17, 1},     {17, 1},     {11, 1},     {11, 2}, 
-        {6, 2},     {6, 0},     {12, 1},     {12, 1},     {12, 1}, 
-        {12, 1},     {12, 1},     {2, 4},     {13, 1},     {13, 1}, 
-        {13, 0},     {14, 3},     {14, 5},     {18, 2},     {18, 2}, 
-        {18, 2},     {16, 1},     {16, 0},     {15, 1},     {15, 1}
-      };
-
-  /** access to production table */
-  public short[][] production_table() {return _production_table;}
-
-  /** parse action table */
-  protected static final short[][] _action_table = {
-    /*0*/{2,6,3,10,4,15,5,11,6,3,22,2,-1,0},
-    /*1*/{2,6,3,10,14,47,-1,0},
-    /*2*/{14,44,-1,0},
-    /*3*/{0,-5,2,-5,3,-5,4,-5,5,-5,6,-5,22,-5,-1,0},
-    /*4*/{0,-7,2,-7,3,-7,4,-7,5,-7,6,-7,22,-7,-1,0},
-    /*5*/{14,24,-1,0},
-    /*6*/{0,-3,2,6,3,10,4,15,5,11,6,3,22,2,-1,0},
-    /*7*/{0,-9,2,-9,3,-9,4,-9,5,-9,6,-9,22,-9,-1,0},
-    /*8*/{0,-6,2,-6,3,-6,4,-6,5,-6,6,-6,22,-6,-1,0},
-    /*9*/{14,19,-1,0},
-    /*10*/{14,18,-1,0},
-    /*11*/{0,-8,2,-8,3,-8,4,-8,5,-8,6,-8,22,-8,-1,0},
-    /*12*/{0,17,-1,0},
-    /*13*/{0,-4,2,-4,3,-4,4,-4,5,-4,6,-4,22,-4,-1,0},
-    /*14*/{14,16,-1,0},
-    /*15*/{0,-12,2,-12,3,-12,4,-12,5,-12,6,-12,19,-12,22,-12,-1,0},
-    /*16*/{0,-1,-1,0},
-    /*17*/{0,-13,2,-13,3,-13,4,-13,5,-13,6,-13,19,-13,22,-13,-1,0},
-    /*18*/{0,-38,2,-38,3,-38,4,-38,5,-38,6,-38,15,20,18,-38,19,-38,22,-38,-1,0},
-    /*19*/{0,-37,2,-37,3,-37,4,-37,5,-37,6,-37,18,-37,19,-37,22,-37,-1,0},
-    /*20*/{0,-11,2,-11,3,-11,4,-11,5,-11,6,-11,18,-11,19,-11,22,-11,-1,0},
-    /*21*/{0,-2,-1,0},
-    /*22*/{0,-38,2,-38,3,-38,4,-38,5,-38,6,-38,15,20,18,-38,19,-38,22,-38,-1,0},
-    /*23*/{8,26,9,28,10,27,-1,0},
-    /*24*/{13,32,14,35,-1,0},
-    /*25*/{20,31,-1,0},
-    /*26*/{20,30,-1,0},
-    /*27*/{20,29,-1,0},
-    /*28*/{13,-36,14,-36,-1,0},
-    /*29*/{13,-35,14,-35,-1,0},
-    /*30*/{13,-34,14,-34,-1,0},
-    /*31*/{21,-39,-1,0},
-    /*32*/{0,-31,2,-31,3,-31,4,-31,5,-31,6,-31,11,42,12,41,15,-31,18,-31,19,-31,22,-31,-1,0},
-    /*33*/{21,36,-1,0},
-    /*34*/{21,-40,-1,0},
-    /*35*/{14,37,-1,0},
-    /*36*/{0,-32,2,-32,3,-32,4,-32,5,-32,6,-32,11,-32,12,-32,15,-32,16,38,18,-32,19,-32,22,-32,-1,0},
-    /*37*/{17,39,-1,0},
-    /*38*/{0,-33,2,-33,3,-33,4,-33,5,-33,6,-33,11,-33,12,-33,15,-33,18,-33,19,-33,22,-33,-1,0},
-    /*39*/{0,-28,2,-28,3,-28,4,-28,5,-28,6,-28,15,-28,18,-28,19,-28,22,-28,-1,0},
-    /*40*/{0,-30,2,-30,3,-30,4,-30,5,-30,6,-30,15,-30,18,-30,19,-30,22,-30,-1,0},
-    /*41*/{0,-29,2,-29,3,-29,4,-29,5,-29,6,-29,15,-29,18,-29,19,-29,22,-29,-1,0},
-    /*42*/{0,-10,2,-10,3,-10,4,-10,5,-10,6,-10,18,-10,19,-10,22,-10,-1,0},
-    /*43*/{0,-14,2,-14,3,-14,4,-14,5,-14,6,-14,19,-14,22,-14,-1,0},
-    /*44*/{2,-18,3,-18,4,-18,5,-18,6,-18,18,-18,19,-18,-1,0},
-    /*45*/{2,-22,3,-22,4,-22,5,-22,6,-22,18,50,19,-22,-1,0},
-    /*46*/{2,-22,3,-22,4,-22,5,-22,6,-22,18,50,19,-22,-1,0},
-    /*47*/{2,-17,3,-17,4,-17,5,-17,6,-17,18,-17,19,-17,-1,0},
-    /*48*/{2,6,3,10,4,15,5,11,6,3,19,54,-1,0},
-    /*49*/{0,-19,2,-19,3,-19,4,-19,5,-19,6,-19,22,-19,-1,0},
-    /*50*/{0,-16,2,-16,3,-16,4,-16,5,-16,6,-16,22,-16,-1,0},
-    /*51*/{2,-21,3,-21,4,-21,5,-21,6,-21,19,-21,-1,0},
-    /*52*/{2,-24,3,-24,4,-24,5,-24,6,-24,19,-24,-1,0},
-    /*53*/{0,-20,2,-20,3,-20,4,-20,5,-20,6,-20,22,-20,-1,0},
-    /*54*/{2,-26,3,-26,4,-26,5,-26,6,-26,19,-26,-1,0},
-    /*55*/{2,-25,3,-25,4,-25,5,-25,6,-25,19,-25,-1,0},
-    /*56*/{2,-27,3,-27,4,-27,5,-27,6,-27,19,-27,-1,0},
-    /*57*/{2,-23,3,-23,4,-23,5,-23,6,-23,19,-23,-1,0},
-    /*58*/{0,-15,2,-15,3,-15,4,-15,5,-15,6,-15,22,-15,-1,0},
-  };
-
-  /** access to parse action table */
-  public short[][] action_table() {return _action_table;}
-
-  /** reduce_goto table */
-  protected static final short[][] _reduce_table = {
-    /*0*/{1,13,3,8,4,4,5,11,7,7,8,6,9,12,10,3,-1,-1},
-    /*1*/{1,47,10,44,17,45,-1,-1},
-    /*2*/{-1,-1},
-    /*3*/{-1,-1},
-    /*4*/{-1,-1},
-    /*5*/{2,22,-1,-1},
-    /*6*/{1,13,3,8,4,4,5,11,7,7,8,6,9,21,10,3,-1,-1},
-    /*7*/{-1,-1},
-    /*8*/{-1,-1},
-    /*9*/{-1,-1},
-    /*10*/{-1,-1},
-    /*11*/{-1,-1},
-    /*12*/{-1,-1},
-    /*13*/{-1,-1},
-    /*14*/{-1,-1},
-    /*15*/{-1,-1},
-    /*16*/{-1,-1},
-    /*17*/{-1,-1},
-    /*18*/{16,20,-1,-1},
-    /*19*/{-1,-1},
-    /*20*/{-1,-1},
-    /*21*/{-1,-1},
-    /*22*/{16,42,-1,-1},
-    /*23*/{18,24,-1,-1},
-    /*24*/{14,32,15,33,-1,-1},
-    /*25*/{-1,-1},
-    /*26*/{-1,-1},
-    /*27*/{-1,-1},
-    /*28*/{-1,-1},
-    /*29*/{-1,-1},
-    /*30*/{-1,-1},
-    /*31*/{-1,-1},
-    /*32*/{13,39,-1,-1},
-    /*33*/{-1,-1},
-    /*34*/{-1,-1},
-    /*35*/{-1,-1},
-    /*36*/{-1,-1},
-    /*37*/{-1,-1},
-    /*38*/{-1,-1},
-    /*39*/{-1,-1},
-    /*40*/{-1,-1},
-    /*41*/{-1,-1},
-    /*42*/{-1,-1},
-    /*43*/{-1,-1},
-    /*44*/{-1,-1},
-    /*45*/{6,48,11,58,-1,-1},
-    /*46*/{6,48,11,50,-1,-1},
-    /*47*/{-1,-1},
-    /*48*/{1,57,3,55,4,54,5,56,10,52,12,51,-1,-1},
-    /*49*/{-1,-1},
-    /*50*/{-1,-1},
-    /*51*/{-1,-1},
-    /*52*/{-1,-1},
-    /*53*/{-1,-1},
-    /*54*/{-1,-1},
-    /*55*/{-1,-1},
-    /*56*/{-1,-1},
-    /*57*/{-1,-1},
-    /*58*/{-1,-1},
-  };
-
-  /** access to reduce_goto table */
-  public short[][] reduce_table() {return _reduce_table;}
-
-  /** instance of action encapsulation class */
-  protected CUP$actions action_obj;
-
-  /** action encapsulation object initializer */
-  protected void init_actions()
-    {
-      action_obj = new CUP$actions();
-    }
-
-  /** invoke a user supplied parse action */
-  public java_cup.runtime.symbol do_action(
-    int                        act_num,
-    java_cup.runtime.lr_parser parser,
-    java.util.Stack            stack,
-    int                        top)
-    throws java.lang.Exception
-  {
-    /* call code in generated class */
-    return action_obj.CUP$do_action(act_num, parser, stack, top);
-  }
-
-  /** start state */
-  public int start_state() {return 0;}
-  /** start production */
-  public int start_production() {return 0;}
-
-  /** EOF symbol index */
-  public int EOF_sym() {return 0;}
-
-  /** error symbol index */
-  public int error_sym() {return 1;}
-
-
-  /** user initialization */
-  public void user_init() throws java.lang.Exception
-    {
- 
-      try {
-
-	FileInputStream fs = new FileInputStream(new String(ServiceConfig.serviceConfigFile_));
-
-        this.setLexer(new Yylex(fs));
-
-      } catch (FileNotFoundException fnf) {
-
-	ACE.ERROR("File not found: " + fnf);
-
-      } catch (SecurityException se) {
-
-	ACE.ERROR("Security: " + se);
-      }
-
-    }
-
-  /** scan to get the next token */
-  public java_cup.runtime.token scan()
-    throws java.lang.Exception
-    {
- return this.lexer_.yylex(); 
-    }
-
- 
-  // Lexical Analyzer
-  private Yylex lexer_;
-
-  public void setLexer(Yylex lexer)
-    {
-      this.lexer_ = lexer;
-    }
-
-};
-
-/** Cup generated class to encapsulate user supplied action code.*/
-class CUP$actions {
-
-  /** Constructor */
-  CUP$actions() { }
-
-  /** Method with the actual generated action code. */
-  public final java_cup.runtime.symbol CUP$do_action(
-    int                        CUP$act_num,
-    java_cup.runtime.lr_parser CUP$parser,
-    java.util.Stack            CUP$stack,
-    int                        CUP$top)
-    throws java.lang.Exception
-    {
-      /* object for return from actions */
-      java_cup.runtime.symbol CUP$result;
-
-      /* select the action based on the action number */
-      switch (CUP$act_num)
-        {
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 39: // pathname ::= ACE_IDENT 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*pathname*/15);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String((/*e*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 38: // pathname ::= ACE_PATHNAME 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*pathname*/15);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String((/*e*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 37: // parameters_opt ::= 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*parameters_opt*/16);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 36: // parameters_opt ::= ACE_STRING 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*parameters_opt*/16);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String((/*e*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 35: // type ::= ACE_STREAM_T ACE_STAR 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*type*/18);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 34: // type ::= ACE_SVC_OBJ_T ACE_STAR 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*type*/18);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String("Service Object"); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 33: // type ::= ACE_MODULE_T ACE_STAR 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*type*/18);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 32: // svc_initializer ::= pathname ACE_COLON ACE_IDENT ACE_LPAREN ACE_RPAREN 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*svc_initializer*/14);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String((/*e1*/(java_cup.runtime.str_token)CUP$stack.elementAt(CUP$top-4)).str_val + ":" + (/*e2*/(str_token)CUP$stack.elementAt(CUP$top-2)).str_val); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 31: // svc_initializer ::= pathname ACE_COLON ACE_IDENT 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*svc_initializer*/14);
-               ((java_cup.runtime.str_token)CUP$result).str_val = new String((/*e1*/(java_cup.runtime.str_token)CUP$stack.elementAt(CUP$top-2)).str_val + ":" + (/*e2*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 30: // status ::= 
-            {
-              CUP$result = new java_cup.runtime.int_token(/*status*/13);
-               // Default case
-              ((java_cup.runtime.int_token)CUP$result).int_val = 0; 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 29: // status ::= ACE_INACTIVE 
-            {
-              CUP$result = new java_cup.runtime.int_token(/*status*/13);
-               ((java_cup.runtime.int_token)CUP$result).int_val = 1; 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 28: // status ::= ACE_ACTIVE 
-            {
-              CUP$result = new java_cup.runtime.int_token(/*status*/13);
-               ((java_cup.runtime.int_token)CUP$result).int_val = 0; 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 27: // svc_location ::= ACE_IDENT type svc_initializer status 
-            {
-              CUP$result = new AddServiceObjectNode(/*svc_location*/2);
-              
-  boolean suspended = false;
-  if ((/*e4*/(java_cup.runtime.int_token)CUP$stack.elementAt(CUP$top-0)).int_val == 1)
-    suspended = true;
-
-  ((AddServiceObjectNode)CUP$result).init((/*e1*/(str_token)CUP$stack.elementAt(CUP$top-3)).str_val, (/*e3*/(java_cup.runtime.str_token)CUP$stack.elementAt(CUP$top-1)).str_val, suspended);
-
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 26: // module ::= remove 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*module*/12);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 25: // module ::= resume 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*module*/12);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 24: // module ::= suspend 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*module*/12);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 23: // module ::= static 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*module*/12);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 22: // module ::= dynamic 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*module*/12);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 21: // module_list ::= 
-            {
-              CUP$result = new ParseNode(/*module_list*/6);
-               ACE.ERROR("Not implemented: module manipulation"); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 20: // module_list ::= module_list module 
-            {
-              CUP$result = new ParseNode(/*module_list*/6);
-               ACE.ERROR("Not implemented: module manipulation"); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 19: // stream_modules ::= module_list ACE_RBRACE 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*stream_modules*/11);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 18: // stream_modules ::= ACE_LBRACE 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*stream_modules*/11);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 17: // stream_ops ::= static 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*stream_ops*/17);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 16: // stream_ops ::= dynamic 
-            {
-              CUP$result = new java_cup.runtime.str_token(/*stream_ops*/17);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 15: // stream ::= ACE_USTREAM ACE_IDENT stream_modules 
-            {
-              CUP$result = new ParseNode(/*stream*/7);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 14: // stream ::= ACE_USTREAM stream_ops stream_modules 
-            {
-              CUP$result = new ParseNode(/*stream*/7);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 13: // remove ::= ACE_REMOVE ACE_IDENT 
-            {
-              CUP$result = new RemoveNode(/*remove*/5);
-              
-  ((RemoveNode)CUP$result).init((/*e1*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val);
-
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 12: // resume ::= ACE_RESUME ACE_IDENT 
-            {
-              CUP$result = new ResumeNode(/*resume*/4);
-              
-  ((ResumeNode)CUP$result).init((/*e1*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val);
-
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 11: // suspend ::= ACE_SUSPEND ACE_IDENT 
-            {
-              CUP$result = new SuspendNode(/*suspend*/3);
-              
-  ((SuspendNode)CUP$result).init((/*e1*/(str_token)CUP$stack.elementAt(CUP$top-0)).str_val);
-
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 10: // static ::= ACE_STATIC ACE_IDENT parameters_opt 
-            {
-              CUP$result = new ParseNode(/*static*/10);
-              
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 9: // dynamic ::= ACE_DYNAMIC svc_location parameters_opt 
-            {
-              CUP$result = new AddServiceObjectNode(/*dynamic*/1);
-              
-  ((AddServiceObjectNode)CUP$result).init((/*e1*/(AddServiceObjectNode)CUP$stack.elementAt(CUP$top-1)).name(), (/*e1*/(AddServiceObjectNode)CUP$stack.elementAt(CUP$top-1)).locator(), (/*e1*/(AddServiceObjectNode)CUP$stack.elementAt(CUP$top-1)).suspended());
-
-  ((AddServiceObjectNode)CUP$result).params((/*e2*/(java_cup.runtime.str_token)CUP$stack.elementAt(CUP$top-0)).str_val);
-
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 8: // svc_config_entry ::= stream 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-               ACE.ERROR("Not implemented: stream loading"); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 7: // svc_config_entry ::= remove 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-               
-
-		     
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 6: // svc_config_entry ::= resume 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-                /* Empty -- result auto set to resume */ 
-		     
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 5: // svc_config_entry ::= suspend 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-               
-		       /* Empty -- result auto set to suspend */
-		       /* CUP$result = (ParseNode)CUP$stack.elementAt(CUP$top-0); */
-		     
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 4: // svc_config_entry ::= static 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-               
-		       /* More graceful error system needed here */
-		       ACE.ERROR("Not implemented: static service loading"); 
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 3: // svc_config_entry ::= dynamic 
-            {
-              CUP$result = new ParseNode(/*svc_config_entry*/8);
-               
-		       /* Empty -- result auto set to dynamic */
-		       /* CUP$result = (ParseNode)CUP$stack.elementAt(CUP$top-0); */
-		     
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 2: // svc_config_entries ::= svc_config_entry 
-            {
-              CUP$result = new ParseNode(/*svc_config_entries*/9);
-                
-			 if ((/*e1*/(ParseNode)CUP$stack.elementAt(CUP$top-0)) != null)
-			   (/*e1*/(ParseNode)CUP$stack.elementAt(CUP$top-0)).apply();
-		       
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 1: // svc_config_entries ::= svc_config_entry svc_config_entries 
-            {
-              CUP$result = new ParseNode(/*svc_config_entries*/9);
-               
-			 if ((/*e1*/(ParseNode)CUP$stack.elementAt(CUP$top-1)) != null)
-			   (/*e1*/(ParseNode)CUP$stack.elementAt(CUP$top-1)).apply();
-                       
-            }
-          return CUP$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 0: // $START ::= svc_config_entries EOF 
-            {
-              CUP$result = new java_cup.runtime.token(/*$START*/0);
-              
-            }
-          /* ACCEPT */
-          CUP$parser.done_parsing();
-          return CUP$result;
-
-          /* . . . . . .*/
-          default:
-            throw new Exception(
-               "Invalid action number found in internal parse table");
-
-        }
-    }
-};
-
diff --git a/java/src/sym.java b/java/src/sym.java
deleted file mode 100644
index 8e9fc333d82..00000000000
--- a/java/src/sym.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-//----------------------------------------------------
-// The following code was generated by CUP v0.9e
-// Fri Dec 19 15:46:53 CST 1997
-//----------------------------------------------------
-
-package JACE.ServiceConfigurator;
-
-/** Cup generated class containing symbol constants. */
-public class sym {
-  /* terminals */
-  static final int ACE_STATIC = 3;
-  static final int ACE_ACTIVE = 11;
-  static final int EOF = 0;
-  static final int ACE_IDENT = 14;
-  static final int ACE_USTREAM = 22;
-  static final int ACE_LPAREN = 16;
-  static final int ACE_MODULE_T = 8;
-  static final int error = 1;
-  static final int ACE_DYNAMIC = 2;
-  static final int ACE_RESUME = 5;
-  static final int ACE_LBRACE = 18;
-  static final int ACE_REMOVE = 6;
-  static final int ACE_STREAM = 7;
-  static final int ACE_STRING = 15;
-  static final int ACE_RPAREN = 17;
-  static final int ACE_COLON = 21;
-  static final int ACE_PATHNAME = 13;
-  static final int ACE_STAR = 20;
-  static final int ACE_SVC_OBJ_T = 10;
-  static final int ACE_RBRACE = 19;
-  static final int ACE_SUSPEND = 4;
-  static final int ACE_STREAM_T = 9;
-  static final int ACE_INACTIVE = 12;
-};
-
diff --git a/java/tests/ASX/BufferStreamTest.dsp b/java/tests/ASX/BufferStreamTest.dsp
deleted file mode 100644
index b916aba58bb..00000000000
--- a/java/tests/ASX/BufferStreamTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="BufferStreamTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=BufferStreamTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "BufferStreamTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "BufferStreamTest.mak"\

- CFG="BufferStreamTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "BufferStreamTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "BufferStreamTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "BufferStreamTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "BufferStreamTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "BufferStreamTest - Java Virtual Machine Release"

-# Name "BufferStreamTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\BufferStreamTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ASX/BufferStreamTest.java b/java/tests/ASX/BufferStreamTest.java
deleted file mode 100644
index 9a696497562..00000000000
--- a/java/tests/ASX/BufferStreamTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    BufferStreamTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-// This short program copies stdin to stdout via the use of an ASX
-// STREAM.  It illustrates an implementation of the classic "bounded
-// buffer" program using an ASX STREAM containing two Modules.  Each
-// Module contains two Tasks.  
-
-class CommonTask extends Task
-{
-  // ACE_Task hooks
-  public int open (Object obj)
-  {
-    if (this.activate (0, 1, false) == -1)
-      ACE.ERROR ("spawn");
-    return 0;
-  }
-
-  public int close (long exitStatus)
-  {
-    ACE.DEBUG (Thread.currentThread () + " thread is exiting with status "  +
-	       exitStatus + " in module " + this.name () + "\n");
-    return 0;
-  }
-
-  public int put (MessageBlock mb, TimeValue tv) 
-  { 
-    return 0; 
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-}
-
-// Define the Producer interface. 
-
-class Producer extends CommonTask
-{
-  // Read data from stdin and pass to consumer.
-  // The Consumer reads data from the stdin stream, creates a message,
-  // and then queues the message in the message list, where it is
-  // removed by the consumer thread.  A 0-sized message is enqueued when
-  // there is no more data to read.  The consumer uses this as a flag to
-  // know when to exit.
-
-  public int svc ()
-  {
-    // Keep reading stdin, until we reach EOF. 
-
-      DataInputStream in = new DataInputStream (System.in);
-      String msg = null;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		{
-		  // Send a shutdown message to the other thread and exit.
-		  if (this.putNext (new MessageBlock (0), new TimeValue ()) == -1)
-		    ACE.ERROR ("putNext");
-		  break;
-		}
-	      else
-		{
-		  // Send the message to the other thread.
-		  if (this.putNext (new MessageBlock (msg), new TimeValue ()) == -1)
-		    ACE.ERROR ("putNext");
-		}
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-      return 0;
-  }
-}
-
-class Consumer extends CommonTask
-  // = TITLE
-  //    Define the Consumer interface. 
-{
-  // Enqueue the message on the MessageQueue for subsequent
-  // handling in the svc() method.
-  public int put (MessageBlock mb, TimeValue tv)
-    { 
-      try
-	{
-	  return this.putq (mb, tv);
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-
-  // The consumer dequeues a message from the ACE_Message_Queue, writes
-  // the message to the stderr stream, and deletes the message.  The
-  // Consumer sends a 0-sized message to inform the consumer to stop
-  // reading and exit.
-
-  public int svc ()
-    {
-      MessageBlock mb = null;
-
-      // Keep looping, reading a message out of the queue, until we
-      // timeout or get a message with a length == 0, which signals us to
-      // quit.
-      try
-	{
-	  while (true)
-	    {
-	      // Wait for upto 4 seconds
-	      mb = this.getq (new TimeValue (4));
-	  
-	      if (mb == null)
-		break;
-	  
-	      int length = mb.length ();
-	  
-	      if (length > 0)
-		System.out.println ("\n" + mb.base ());
-
-	      if (length == 0)
-		break;
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-      if (mb == null)
-	{
-	  ACE.ERROR ("timed out waiting for message");
-	  System.exit (1);
-	}
-      return 0;
-    }
-}
-
-// Spawn off a new thread.
-
-public class BufferStreamTest
-{
-  public static void main (String args[])
-  {
-    // Control hierachically-related active objects
-    Stream stream = new Stream ();
-    Module pm = new Module ("Consumer", new Consumer (), null, null);
-    Module cm = new Module ("Producer", new Producer (), null, null);
-
-    // Create Producer and Consumer Modules and push them onto the
-    // STREAM.  All processing is performed in the STREAM.
-
-    if (stream.push (pm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-    else if (stream.push (cm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-  }
-}
diff --git a/java/tests/ASX/Makefile b/java/tests/ASX/Makefile
deleted file mode 100644
index d097cbb0850..00000000000
--- a/java/tests/ASX/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 MessageQueueTest.java \
-	 TaskTest.java \
-	 PriorityBufferTest.java \
-	 ThreadPoolTest.java \
-	 BufferStreamTest.java
-
-packages = tests.ASX
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/ASX -name '*.class' -print | xargs ${RM}
-
diff --git a/java/tests/ASX/MessageQueueTest.dsp b/java/tests/ASX/MessageQueueTest.dsp
deleted file mode 100644
index 26796a1a80c..00000000000
--- a/java/tests/ASX/MessageQueueTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MessageQueueTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=MessageQueueTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "MessageQueueTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "MessageQueueTest.mak"\

- CFG="MessageQueueTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MessageQueueTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "MessageQueueTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "MessageQueueTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "MessageQueueTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MessageQueueTest - Java Virtual Machine Release"

-# Name "MessageQueueTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\MessageQueueTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ASX/MessageQueueTest.java b/java/tests/ASX/MessageQueueTest.java
deleted file mode 100644
index c22d2cf041d..00000000000
--- a/java/tests/ASX/MessageQueueTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    MessageQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class MessageQueueTest
-{
-  public static void main (String args[])
-    {
-      try
-	{
-	  MessageBlock conMb;
-	  MessageQueue msgQueue = new MessageQueue ();
-	  MessageBlock mb1 = new MessageBlock ("hello");
-	  MessageBlock mb2 = new MessageBlock ("world");
-	  mb1.msgPriority (5);
-	  mb2.msgPriority (7);
-
-	  // Enqueue in priority order.
-	  if (msgQueue.enqueue (mb1) == -1)
-	    ACE.ERROR ("put_next");
-
-	  if (msgQueue.enqueue (mb2) == -1)
-	    ACE.ERROR ("put_next");
-
-	  // Now try to dequeue
-	  if ((conMb = msgQueue.dequeueHead ()) == null)
-	    ACE.ERROR ("dequeueHead");
-	  else
-	    ACE.DEBUG ("Consumer: removed item " + conMb.base () + " of priority " + conMb.msgPriority ());
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-}
-  
diff --git a/java/tests/ASX/PriorityBufferTest.dsp b/java/tests/ASX/PriorityBufferTest.dsp
deleted file mode 100644
index 2a943487b04..00000000000
--- a/java/tests/ASX/PriorityBufferTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="PriorityBufferTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=PriorityBufferTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "PriorityBufferTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "PriorityBufferTest.mak"\

- CFG="PriorityBufferTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "PriorityBufferTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "PriorityBufferTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "PriorityBufferTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "PriorityBufferTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "PriorityBufferTest - Java Virtual Machine Release"

-# Name "PriorityBufferTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\PriorityBufferTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ASX/PriorityBufferTest.java b/java/tests/ASX/PriorityBufferTest.java
deleted file mode 100644
index 5cce32fa3b1..00000000000
--- a/java/tests/ASX/PriorityBufferTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    PriorityBufferTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-class consumer extends Thread
-{
-  public void run ()
-    {
-      MessageBlock mb = null;
-      long curPriority = 0;
-      int length = 0;
-
-      try
-	{
-	  // Keep looping, reading a message out of the queue, until we
-	  // get a message with a length == 0, which signals us to quit.
-	  for (;;)
-	    {
-	      if ((mb = PriorityBufferTest.msgQueue.dequeueHead ()) == null)
-		break;
-	      
-	      length = mb.length ();
-	      curPriority = mb.msgPriority ();
-	      
-	      if (length > 0)
-		ACE.DEBUG ("Consumer: removed item \"" + mb.base () + "\" of priority: " + curPriority);
-	      
-	      if (length == 0)
-		break;
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-}
-
-class producer extends Thread
-{
-  producer (int delay)
-    {
-      this.delay_ = delay;
-    }
-
-  public void run ()
-    {
-      try 
-	{
-	  long count = 0;
-	  for (char c = 'a'; c <= 'z'; c++)
-	    {
-	      count++;
-	      // Allocate a new message
-	      MessageBlock mb = new MessageBlock (new Character (c).toString ());
-	      // Set the priority
-	      mb.msgPriority (count);
-	  
-	      // Enqueue in priority order.
-	      if (PriorityBufferTest.msgQueue.enqueue (mb) == -1)
-		ACE.ERROR ("put_next");
-	      else
-		{
-		  ACE.DEBUG ("Producer: inserted item \"" + mb.base () + "\" of priority: " + count);
-		  if (this.delay_ > 0)
-		    this.sleep (this.delay_);
-		}
-	    }
-
-	  // Now send a 0-sized shutdown message to the other thread
-	  if (PriorityBufferTest.msgQueue.enqueueTail (new MessageBlock (0)) == -1)
-	    ACE.ERROR ("put_next");
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-
-  private int delay_;
-}
-
-public class PriorityBufferTest
-{
-  public static MessageQueue msgQueue = new MessageQueue ();
-
-  public static void main (String args[])
-    {
-      int delay = 0;
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      delay = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      ACE.ERROR ("Illegal argument.");
-	    }
-	}
-      new producer (delay).start ();
-      new consumer ().start ();      
-    }
-}
diff --git a/java/tests/ASX/TaskTest.dsp b/java/tests/ASX/TaskTest.dsp
deleted file mode 100644
index 7906e7b6fcd..00000000000
--- a/java/tests/ASX/TaskTest.dsp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TaskTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=TaskTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TaskTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TaskTest.mak" CFG="TaskTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TaskTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "TaskTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "TaskTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "TaskTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TaskTest - Java Virtual Machine Release"

-# Name "TaskTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\TaskTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ASX/TaskTest.java b/java/tests/ASX/TaskTest.java
deleted file mode 100644
index b26b48ea148..00000000000
--- a/java/tests/ASX/TaskTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    TaskTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TaskTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-
-  public TaskTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-      if (this.activate (0, nThreads, true) == -1)
-	ACE.ERROR ("activate failed");
-    }
-  
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      return 0;
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-  
-  public int svc ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  ACE.DEBUG (Thread.currentThread ().toString () + " in iteration " + i);
-	  // Allow other threads to run
-	  Thread.yield ();
-	}
-      return 0;
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 1;
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      TaskTest tt = new TaskTest (nThreads, nIterations);
-    }
-}
diff --git a/java/tests/ASX/ThreadPoolTest.dsp b/java/tests/ASX/ThreadPoolTest.dsp
deleted file mode 100644
index 0c7c3538a0d..00000000000
--- a/java/tests/ASX/ThreadPoolTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ThreadPoolTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ThreadPoolTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ThreadPoolTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ThreadPoolTest.mak"\

- CFG="ThreadPoolTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ThreadPoolTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ThreadPoolTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ThreadPoolTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ThreadPoolTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ThreadPoolTest - Java Virtual Machine Release"

-# Name "ThreadPoolTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\ThreadPoolTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ASX/ThreadPoolTest.java b/java/tests/ASX/ThreadPoolTest.java
deleted file mode 100644
index cfb20f87adb..00000000000
--- a/java/tests/ASX/ThreadPoolTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    ThreadPoolTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class ThreadPoolTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-  
-  public static int MAX_MB_SIZE = 1024;
-
-  public ThreadPoolTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-      if (this.activate (0, nThreads, true) == -1)
-	ACE.ERROR ("activate failed");
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      try
-	{
-	  return this.putq (mb, tv);
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-  
-  public int svc ()
-    {
-      int result = 0;
-      int count = 1;
-
-      // Keep looping, reading a message out of the queue, until we get a
-      // message with a length == 0, which signals us to quit.
-      try
-	{
-	  for (;; count++)
-	    {       
-	      MessageBlock mb = this.getq (new TimeValue ());
-	      if (mb == null)
-		{
-		  ACE.ERROR (Thread.currentThread ().toString () + " in iteration " + count + ", got result -1, exiting");
-		  break;
-		}
-	      int length = mb.length ();
-	      
-	      if (length > 0)
-		ACE.DEBUG (Thread.currentThread ().toString () +
-			   " in iteration " + count + ", length = " + 
-			   length + ", text = \"" + mb.base () + "\"");
-	      
-	      if (length == 0)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () +
-			     " in iteration " + count + 
-			     ", got NULL message, exiting");
-		  break;
-		}
-	      Thread.yield ();
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-
-  public static void produce (ThreadPoolTest threadPool, int nIterations)
-    {
-      int count = 0;
-      for (int n = 0;;)
-	{
-	  // Allocate a new message.
-	  MessageBlock mb = new MessageBlock (new Integer (count).toString ());
-	  
-	  if (count == nIterations)
-	    n = 1; // Indicate that we need to shut down.
-	  else
-	    count++;
-
-	  if (count == 0 || (count % 20 == 0))
-	    {
-	      try
-		{
-		  Thread.sleep (1);
-		}
-	      catch (InterruptedException e)
-		{
-		}
-	    }
-	  if (n != 1)
-	    {
-	      ACE.DEBUG ("Producing...");
-	      // Pass the message to the Thread_Pool.
-	      if (threadPool.put (mb, new TimeValue ()) == -1)
-		ACE.ERROR ("put");
-	    }
-	  else
-	    {
-	      // Send a shutdown message to the waiting threads and exit.
-	      ACE.DEBUG ("start loop, dump of task");
-
-	      for (int i = threadPool.thrCount (); i > 0; i--)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () + 
-			     "EOF, enqueueing NULL block for thread " + i);
-
-		  // Enqueue a NULL message to flag each consumer to
-		  // shutdown.
-		  if (threadPool.put (new MessageBlock (0), new TimeValue ()) == -1)
-		    ACE.ERROR ("put");
-		}
-
-	      break;
-	    }
-	}
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 100;
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      ACE.DEBUG ("Threads = " + nThreads + " Iterations = " + nIterations);
-
-      // Create the worker tasks.
-      ThreadPoolTest threadPool = new ThreadPoolTest (nThreads,
-						      nIterations);
-
-      // Create work for the worker tasks to process in their own threads.
-      produce (threadPool, nIterations);
-      ACE.DEBUG ("exiting...");
-    }
-}
-
-
diff --git a/java/tests/Concurrency/Condition/Condition.dsp b/java/tests/Concurrency/Condition/Condition.dsp
deleted file mode 100644
index 2775a9cded6..00000000000
--- a/java/tests/Concurrency/Condition/Condition.dsp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Condition" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=Condition - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Condition.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Condition.mak" CFG="Condition - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Condition - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "Condition - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "Condition - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "Condition - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Condition - Java Virtual Machine Release"

-# Name "Condition - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\Consumer.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\JoinableThreadGroup.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\Producer.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\QueueTest.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\SimpleMessageQueue.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Concurrency/Condition/Consumer.java b/java/tests/Concurrency/Condition/Consumer.java
deleted file mode 100644
index ff4f5ff4a4b..00000000000
--- a/java/tests/Concurrency/Condition/Consumer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//File: Consumer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to dequeue random elements
-//from a queue. If the queue is empty the thread waits until an element
-//has been enqueued and another thread has invoked the notify() method.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-import java.util.Random;
-
-public class Consumer implements Runnable
-{
-  //Maximum pause between dequeues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-  
-  public Consumer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Consumer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in
-    //milliseconds.
-
-    Random random = new Random(System.currentTimeMillis());
-    Integer element;
-
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    element = (Integer)queue_.dequeue(timeout_);
-	    if (element != null)
-	      {
-		
-		System.out.print("Consumer::run() " + name_ + " dequeued " + element.toString());
-		System.out.println(" Queue size: " + queue_.size());
-		
-		Thread.sleep(random.nextLong() % MAX_PAUSE);
-	      }
-	    else
-	      {
-		System.out.println ("Null");
-	      }
-	    i++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print ("Consumer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
diff --git a/java/tests/Concurrency/Condition/JoinableThreadGroup.java b/java/tests/Concurrency/Condition/JoinableThreadGroup.java
deleted file mode 100644
index c878eb026d3..00000000000
--- a/java/tests/Concurrency/Condition/JoinableThreadGroup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tests.Concurrency.Condition;
-
-public class JoinableThreadGroup extends ThreadGroup
-{
-  public JoinableThreadGroup(String name)
-  {
-    super(name);
-  }
-
-  public JoinableThreadGroup(ThreadGroup parent, String name)
-  {
-    super(parent, name);
-  }
-
-  public void join() throws InterruptedException
-  {
-    Thread list[] = new Thread[activeCount()];
-
-    enumerate(list, true);
-
-    for (int i = 0; i < list.length; i++)
-      list[i].join();
-  }
-}
diff --git a/java/tests/Concurrency/Condition/Makefile b/java/tests/Concurrency/Condition/Makefile
deleted file mode 100644
index fd1e6a93677..00000000000
--- a/java/tests/Concurrency/Condition/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files =	\
-	QueueTest.java \
-	JoinableThreadGroup.java \
-	SimpleMessageQueue.java \
-	Producer.java \
-	Consumer.java 
-
-packages = tests.Concurrency.Condition;
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/Concurrency/Condition -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/Concurrency/Condition/Producer.java b/java/tests/Concurrency/Condition/Producer.java
deleted file mode 100644
index ed6da2251ba..00000000000
--- a/java/tests/Concurrency/Condition/Producer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-//File: Producer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to enqueue random elements
-//into a queue. If the queue is full the thread waits until an element
-//has been dequeued and another thread has invoked the notify() method.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-import java.util.Random;
-
-public class Producer implements Runnable
-{
-  //Maximum pause between enqueues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-  
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-
-  public Producer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Producer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in milliseconds.
-    Random random = new Random(System.currentTimeMillis());
-    int element = 1;
-    
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    //	    element = random.nextInt();
-
-	    queue_.enqueue((Object)new Integer(element), timeout_);
-	    System.out.print("Producer::run() " + name_ + " enqueued " + element);
-	    System.out.println(" Queue size: " + queue_.size());
-	    
-	    Thread.sleep(random.nextLong() % MAX_PAUSE);
-	    i++;
-	    element++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print("Producer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
-
diff --git a/java/tests/Concurrency/Condition/QueueTest.java b/java/tests/Concurrency/Condition/QueueTest.java
deleted file mode 100644
index 87e7d57bbbd..00000000000
--- a/java/tests/Concurrency/Condition/QueueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//File: QueueTest.java
-//Seth Widoff, 8/8/96
-//This class is a test method for the Producer and Consumer classes.
-//The main method takes as arguments the number of producers, the
-//number of consumers and the number of elements in the queue. It then
-//spawn the specified threads and starts them.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-
-public class QueueTest
-{
-  public static void main(String[] args)
-  {
-    if (args.length < 5)
-      {
-	System.out.println("Usage: java QueueTest <# producers> <# consumers> <# elements> <#iterations> <#timeout secs> <#timeout nano secs>");
-	System.exit(1);
-      }
-    
-    int num_producers = Integer.parseInt(args[0]),
-      num_consumers = Integer.parseInt(args[1]),
-      num_elements = Integer.parseInt(args[2]),
-      num_iterations = Integer.parseInt(args[3]),
-      num_timeout_secs = Integer.parseInt(args[4]),
-      num_timeout_nano_secs = Integer.parseInt(args[5]);
-    
-    if (num_elements < 1 
-	|| num_consumers < 1 
-	|| num_producers < 1)
-      {
-	System.out.println("All the parameters must be larger than zero.");
-	System.exit(1);
-      }
-    
-    SimpleMessageQueue queue = new SimpleMessageQueue(num_elements);
-    Consumer[] consumers = new Consumer[num_consumers];
-    Producer[] producers = new Producer[num_producers];
-    JoinableThreadGroup thread_group = new JoinableThreadGroup("Producer Consumer");
-    
-    for (int i = 0; i < num_producers; i++)
-      {
-	producers[i] = new Producer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, producers[i]).start();
-      }
-
-    for (int i = 0; i < num_consumers; i++)
-      {
-	consumers[i] = new Consumer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, consumers[i]).start();
-      }
-
-    try
-      {
-	thread_group.join();
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("QueueTest::main");
-	System.out.println(excp);
-      }
-  }
-}
diff --git a/java/tests/Concurrency/Condition/SimpleMessageQueue.java b/java/tests/Concurrency/Condition/SimpleMessageQueue.java
deleted file mode 100644
index bb703516858..00000000000
--- a/java/tests/Concurrency/Condition/SimpleMessageQueue.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-import JACE.Concurrency.*;
-
-public class SimpleMessageQueue
-{
-  private int num_items_ = 0;
-  private int head_ = 0, tail_ = 0;
-  private Object[] queue_;
-
-  private Mutex lock_ = new Mutex ();
-  private Condition notFull_ = new Condition (lock_);
-  private Condition notEmpty_ = new Condition (lock_);
-  
-  public SimpleMessageQueue(int size)
-  {
-    queue_ = new Object[size];
-  }
- 
-   public void enqueue(Object element, TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    try 
-      {
-	lock_.acquire ();    
-	while (this.isFull ())
-	  notFull_.Wait (timeout);
-	
-	if (tail_ == queue_.length)
-	  tail_ = 0;
-	queue_[tail_] = element;
-	tail_++;
-
-	num_items_++;
-	notEmpty_.signal ();
-      }
-    finally
-      {
-	lock_.release ();
-      }
-  }
-
-  public Object dequeue (TimeValue timeout) 
-       throws TimeoutException, InterruptedException
-  {
-    Object return_value = null;
-	
-    try 
-      {
-	lock_.acquire ();
-	while (this.isEmpty ())
-	  notEmpty_.Wait (timeout);
-	
-	return_value = queue_[head_];
-	head_++;
-	if (head_ == queue_.length)
-	  head_ = 0;
-
-	num_items_--;    
-	notFull_.signal ();
-      }
-    finally 
-      {
-	lock_.release ();
-      }
-    return return_value;
-  }
-
-  public boolean isEmpty()
-  {
-    return num_items_ == 0;
-  }
-
-  public boolean isFull()
-  {
-    return num_items_ == queue_.length;
-  }
-
-  public int size()
-  {
-    return num_items_;
-  }
-}
-
diff --git a/java/tests/Concurrency/Makefile b/java/tests/Concurrency/Makefile
deleted file mode 100644
index f967dffb92f..00000000000
--- a/java/tests/Concurrency/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files =	 MutexTest.java \
-	 SemaphoreTest.java \
-	 RWMutexTest.java \
-	 TokenTest.java
-
-packages = tests.Concurrency
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/Concurrency -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/Concurrency/MutexTest.dsp b/java/tests/Concurrency/MutexTest.dsp
deleted file mode 100644
index 1d5e933af09..00000000000
--- a/java/tests/Concurrency/MutexTest.dsp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MutexTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=MutexTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "MutexTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "MutexTest.mak" CFG="MutexTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MutexTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "MutexTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "MutexTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "MutexTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "MutexTest - Java Virtual Machine Release"

-# Name "MutexTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\MutexTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Concurrency/MutexTest.java b/java/tests/Concurrency/MutexTest.java
deleted file mode 100644
index 680266ef071..00000000000
--- a/java/tests/Concurrency/MutexTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    MutexTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class MutexReader extends Thread
-{
-  MutexReader (int nIterations, Mutex mutex)
-    {
-      this.nIterations_ = nIterations;
-      this.mutex_ = mutex;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the mutex (will block until it gets it)
-	  try
-	    {
-	      this.mutex_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-
-	  MutexTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " reader acquired mutex in iteration " + i +
-		     ", count = " + MutexTest.count);
-
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-	  // Release the mutex
-	  this.mutex_.release ();
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Mutex mutex_;
-}
-
-class MutexWriter extends Thread
-{
-  MutexWriter (int nIterations, Mutex mutex)
-    {
-      this.nIterations_ = nIterations;
-      this.mutex_ = mutex;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the mutex (will block until it gets it)
-	  try
-	    {
-	      this.mutex_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  
-	  MutexTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " writer acquired mutex in iteration " + i +
-		     ", count = " + MutexTest.count);
-	  
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	  // Release the mutex
-	  this.mutex_.release ();
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Mutex mutex_;
-}
-
-public class MutexTest
-{
-  public static void main (String args[])
-    {
-      int nReaders = 1;
-      int nWriters = 1;
-      int nIterations = 100;
-      int i;
-      try
-	{
-	  if (args.length == 3)
-	    {
-	      nReaders = Integer.parseInt (args[0]);
-	      nWriters = Integer.parseInt (args[1]);
-	      nIterations = Integer.parseInt (args[2]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-
-      // Create a lock
-      Mutex mutex = new Mutex ();
-
-      // Now spawn off the readers and writers
-      for (i = 0; i < nReaders; i++)
-	new MutexReader (nIterations, mutex).start ();
-      
-      for (i = 0; i < nWriters; i++)
-	new MutexWriter (nIterations, mutex).start ();            
-    }
-  public static int count;
-}
diff --git a/java/tests/Concurrency/RWMutexTest.dsp b/java/tests/Concurrency/RWMutexTest.dsp
deleted file mode 100644
index 44602766c52..00000000000
--- a/java/tests/Concurrency/RWMutexTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="RWMutexTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=RWMutexTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "RWMutexTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "RWMutexTest.mak"\

- CFG="RWMutexTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "RWMutexTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "RWMutexTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "RWMutexTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "RWMutexTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "RWMutexTest - Java Virtual Machine Release"

-# Name "RWMutexTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\RWMutexTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Concurrency/RWMutexTest.java b/java/tests/Concurrency/RWMutexTest.java
deleted file mode 100644
index ab28c9a83fd..00000000000
--- a/java/tests/Concurrency/RWMutexTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    RWMutexTest.java
- *
- *@author Ross Dargahi (rossd@krinfo.com)
- *
- *************************************************/
-package tests.Concurrency;
-
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class TestThread extends Thread
-{
-  TestThread(String  name,
-	     boolean writer,
-	     RWMutex  lock)
-  {
-    super (name);
-    mWriter = writer;
-    mLock = lock;
-  }
-
-  public void run()
-  {
-    for (int i = 0; i < 10; i++)
-      {
-	try
-	  {
-	    if (!mWriter)
-	      {
-		mLock.acquireRead();
-		ACE.DEBUG (getName() + ": Acquired Read Lock");
-		
-		int sleepTime = i * 100;
-		sleep (sleepTime);
-
-		mLock.release ();
-		ACE.DEBUG (getName () + ": Released Read Lock");
-	      }
-	    else
-	      {
-		mLock.acquireWrite ();
-		ACE.DEBUG (getName () + ": Acquired Write Lock");
-					
-		int sleepTime = i * 100;
-		sleep (sleepTime);
-
-		mLock.release ();
-		ACE.DEBUG (getName () + ": Released Write Lock");
-	      }
-	  }
-	catch (InterruptedException ex)
-	  {
-	    ACE.ERROR ("InterruptedException");
-	  }
-      }
-  }
-
-  RWMutex  mLock;
-  boolean mWriter;
-}
-
-public class RWMutexTest
-{
-  public static void main(String [] args)
-  {
-    RWMutex lock = new RWMutex();
-    
-    TestThread t1 = new TestThread ("1", false, lock);
-    TestThread t2 = new TestThread ("2", false, lock);
-    TestThread t3 = new TestThread ("3", false, lock);
-    TestThread t4 = new TestThread ("4", true, lock);
-    TestThread t5 = new TestThread ("5", false, lock);
-    TestThread t6 = new TestThread ("6", false, lock);
-    TestThread t7 = new TestThread ("7", false, lock);
-    TestThread t8 = new TestThread ("8", true, lock);
-
-    t1.start ();
-    t2.start ();
-    t3.start ();
-    t4.start ();
-    t5.start ();
-    t6.start ();
-    t7.start ();
-    t8.start ();
-  }
-}
-
diff --git a/java/tests/Concurrency/SemaphoreTest.dsp b/java/tests/Concurrency/SemaphoreTest.dsp
deleted file mode 100644
index 546ad0e11be..00000000000
--- a/java/tests/Concurrency/SemaphoreTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SemaphoreTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=SemaphoreTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "SemaphoreTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "SemaphoreTest.mak"\

- CFG="SemaphoreTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "SemaphoreTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "SemaphoreTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "SemaphoreTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "SemaphoreTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "SemaphoreTest - Java Virtual Machine Release"

-# Name "SemaphoreTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\SemaphoreTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Concurrency/SemaphoreTest.java b/java/tests/Concurrency/SemaphoreTest.java
deleted file mode 100644
index b45929daa55..00000000000
--- a/java/tests/Concurrency/SemaphoreTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    SemaphoreTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class SemaphoreWriter extends Thread
-{
-  SemaphoreWriter (int nIterations, Semaphore s)
-    {
-      this.nIterations_ = nIterations;
-      this.s_ = s;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the semaphore (will block until it gets it)
-	  try
-	    {
-	      this.s_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  
-	  SemaphoreTest.counter++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " acquired semaphore in iteration " + i +
-		     ", counter = " + SemaphoreTest.counter);
-	  
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	  // Release the semaphore
-	  this.s_.release ();
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " released semaphore in iteration " + i);
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Semaphore s_;
-}
-
-public class SemaphoreTest
-{
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int count = 1;
-      int nIterations = 100;
-      int i;
-      try
-	{
-	  if (args.length == 3)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      count = Integer.parseInt (args[1]);
-	      nIterations = Integer.parseInt (args[2]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-
-      // Create a lock
-      Semaphore s = new Semaphore (count);
-
-      // Spawn off n_threads
-      for (i = 0; i < nThreads; i++)
-	new SemaphoreWriter (nIterations, s).start ();            
-    }
-  public static int counter;
-}
diff --git a/java/tests/Concurrency/TokenTest.dsp b/java/tests/Concurrency/TokenTest.dsp
deleted file mode 100644
index 2fd69ce5ee5..00000000000
--- a/java/tests/Concurrency/TokenTest.dsp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TokenTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=TokenTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TokenTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TokenTest.mak" CFG="TokenTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TokenTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "TokenTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "TokenTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "TokenTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TokenTest - Java Virtual Machine Release"

-# Name "TokenTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\TokenTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Concurrency/TokenTest.java b/java/tests/Concurrency/TokenTest.java
deleted file mode 100644
index ededed9fed9..00000000000
--- a/java/tests/Concurrency/TokenTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    TokenTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class MyToken extends Token
-{
-  public void sleepHook ()
-  {
-    ACE.DEBUG (Thread.currentThread () + " blocking, sleepHook called");
-  }  
-}
-
-public class TokenTest implements Runnable
-{
-  public void run ()
-  {
-    try
-      {
-	this.token_.acquire ();
-	ACE.DEBUG (Thread.currentThread () + " acquired token");
-	this.token_.acquire ();
-	ACE.DEBUG (Thread.currentThread () + " acquired token");
-	Thread.sleep (100);
-
-	this.token_.renew (1);
-
-	this.token_.release ();
-	ACE.DEBUG (Thread.currentThread () + " released token");
-	this.token_.release ();
-	ACE.DEBUG (Thread.currentThread () + " released token");
-      }
-    catch (InterruptedException e)
-      {
-	this.token_.release ();
-      }
-  }
-
-  public static void main (String args [])
-  {
-    ThreadManager tm = new ThreadManager ();
-    int n = 1;
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    tm.spawnN (n,
-	       new TokenTest (),
-	       false);
-  }
-
-  private MyToken token_ = new MyToken ();
-}
diff --git a/java/tests/Connection/AcceptorTest.dsp b/java/tests/Connection/AcceptorTest.dsp
deleted file mode 100644
index a53acd4a035..00000000000
--- a/java/tests/Connection/AcceptorTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AcceptorTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=AcceptorTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "AcceptorTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "AcceptorTest.mak"\

- CFG="AcceptorTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "AcceptorTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "AcceptorTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "AcceptorTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "AcceptorTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "AcceptorTest - Java Virtual Machine Release"

-# Name "AcceptorTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\AcceptorTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Connection/AcceptorTest.java b/java/tests/Connection/AcceptorTest.java
deleted file mode 100644
index 0f8877f52d9..00000000000
--- a/java/tests/Connection/AcceptorTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    AcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class AcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_server [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  Acceptor acceptor = new Acceptor (Class.forName ("tests.Connection.ServerHandler"));
-	  acceptor.open (port);
-	  while (true)
-	    {
-	      acceptor.accept ();
-	    }
-	}
-      catch (ClassNotFoundException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR ("Dang!" + e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      AcceptorTest acceptorTest = new AcceptorTest ();
-
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      acceptorTest.print_usage_and_die ();
-	    }
-	}
-      acceptorTest.init (port);
-    }
-}
diff --git a/java/tests/Connection/ClientHandler.dsp b/java/tests/Connection/ClientHandler.dsp
deleted file mode 100644
index e54b376c430..00000000000
--- a/java/tests/Connection/ClientHandler.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ClientHandler" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ClientHandler - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ClientHandler.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ClientHandler.mak"\

- CFG="ClientHandler - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ClientHandler - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ClientHandler - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ClientHandler - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ClientHandler - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ClientHandler - Java Virtual Machine Release"

-# Name "ClientHandler - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\ClientHandler.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Connection/ClientHandler.java b/java/tests/Connection/ClientHandler.java
deleted file mode 100644
index 702c633ceca..00000000000
--- a/java/tests/Connection/ClientHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ClientHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ClientHandler extends SvcHandler
-{
-  public ClientHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      DataInputStream in = new DataInputStream (System.in);
-      String msg;
-      StringBuffer ack = new StringBuffer ();
-      int ack_len;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		break;
-	      this.peer ().send (new StringBuffer (msg));
-	      System.out.println ("Waiting for ack...");
-	      ack_len = this.peer ().recv (ack);
-	      if (ack_len == 0)
-		break;
-	      else
-		System.out.println (ack);
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/tests/Connection/ConnectorTest.dsp b/java/tests/Connection/ConnectorTest.dsp
deleted file mode 100644
index 406f9c8f6cb..00000000000
--- a/java/tests/Connection/ConnectorTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ConnectorTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ConnectorTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ConnectorTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ConnectorTest.mak"\

- CFG="ConnectorTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ConnectorTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ConnectorTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ConnectorTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ConnectorTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ConnectorTest - Java Virtual Machine Release"

-# Name "ConnectorTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\ConnectorTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Connection/ConnectorTest.java b/java/tests/Connection/ConnectorTest.java
deleted file mode 100644
index 605d5e7a400..00000000000
--- a/java/tests/Connection/ConnectorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ConnectorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_Connector <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  public void init (String hostname, int port)
-    {
-      try
-	{
-	  Connector connector = new Connector ();
-	  connector.open (hostname, port);
-	  connector.connect (new ClientHandler ());
-	}
-      catch (UnknownHostException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Connection refused");
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ConnectorTest connectorTest = new ConnectorTest ();
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      connectorTest.print_usage_and_die ();
-	    }
-	}
-      connectorTest.init (args[0], port);
-    }
-}
diff --git a/java/tests/Connection/Makefile b/java/tests/Connection/Makefile
deleted file mode 100644
index de076f71237..00000000000
--- a/java/tests/Connection/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 ServerHandler.java \
-	 ClientHandler.java \
-	 ConnectorTest.java \
-	 AcceptorTest.java
-
-packages = tests.Connection
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/Connection -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/Connection/ServerHandler.dsp b/java/tests/Connection/ServerHandler.dsp
deleted file mode 100644
index e666e12b02b..00000000000
--- a/java/tests/Connection/ServerHandler.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ServerHandler" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ServerHandler - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ServerHandler.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ServerHandler.mak"\

- CFG="ServerHandler - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ServerHandler - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ServerHandler - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ServerHandler - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ServerHandler - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ServerHandler - Java Virtual Machine Release"

-# Name "ServerHandler - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\ServerHandler.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Connection/ServerHandler.java b/java/tests/Connection/ServerHandler.java
deleted file mode 100644
index 7cdd50d7d37..00000000000
--- a/java/tests/Connection/ServerHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ServerHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerHandler extends SvcHandler
-{
-  public ServerHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      int msg_len;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msg_len = this.peer ().recv (msg);
-	      if (msg_len == 0)
-		break;
-	      System.out.println ("Received: " + msg);
-	      this.peer ().send (new StringBuffer ("Got it!"));
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/tests/Misc/Makefile b/java/tests/Misc/Makefile
deleted file mode 100644
index 2ea3d10fba5..00000000000
--- a/java/tests/Misc/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 ParseArgsTest.java
-
-packages = tests.Misc
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/Misc -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/Misc/ParseArgsTest.dsp b/java/tests/Misc/ParseArgsTest.dsp
deleted file mode 100644
index 68a6823e1f2..00000000000
--- a/java/tests/Misc/ParseArgsTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ParseArgsTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ParseArgsTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ParseArgsTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ParseArgsTest.mak"\

- CFG="ParseArgsTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ParseArgsTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ParseArgsTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ParseArgsTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ParseArgsTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ParseArgsTest - Java Virtual Machine Release"

-# Name "ParseArgsTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\ParseArgsTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Misc/ParseArgsTest.java b/java/tests/Misc/ParseArgsTest.java
deleted file mode 100644
index 5baddd2745d..00000000000
--- a/java/tests/Misc/ParseArgsTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Misc
-// 
-// = FILENAME
-//    ParseArgsTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Misc;
-
-import JACE.OS.*;
-import JACE.Misc.*;
-
-public class ParseArgsTest
-{
-  public static void main (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:rs:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <p> selected with argument " + s);
-	    break;
-	  case 'r':
-	    ACE.DEBUG ("Option <r> selected");
-	    break;
-	  case 's':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <s> selected with argument " + s);
-	    break;
-	  default:
-	    ACE.DEBUG ("Usage: java tests.Misc.ParseArgsTest [-p arg1] [-r] [-s arg2]");
-	    break;
-	  }
-      }
-  }
-}
diff --git a/java/tests/Reactor/Makefile b/java/tests/Reactor/Makefile
deleted file mode 100644
index f55573a89cb..00000000000
--- a/java/tests/Reactor/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 TimeValueTest.java \
-	 TimerQueueTest.java
-
-packages = tests.Reactor
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/Reactor -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/Reactor/TimeValueTest.dsp b/java/tests/Reactor/TimeValueTest.dsp
deleted file mode 100644
index c476629894a..00000000000
--- a/java/tests/Reactor/TimeValueTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TimeValueTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=TimeValueTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TimeValueTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TimeValueTest.mak"\

- CFG="TimeValueTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TimeValueTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "TimeValueTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "TimeValueTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "TimeValueTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TimeValueTest - Java Virtual Machine Release"

-# Name "TimeValueTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\TimeValueTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Reactor/TimeValueTest.java b/java/tests/Reactor/TimeValueTest.java
deleted file mode 100644
index b4f3e420ae1..00000000000
--- a/java/tests/Reactor/TimeValueTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    ACE.Reactor
- *
- * = FILENAME
- *    TimeValueTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class TimeValueTest
-{
-  public void ASSERT (boolean expression, int i)
-  {
-    if (!expression)
-      ACE.DEBUG ("ASSERT failed for " + i);
-  }
-
-  public void runTest ()
-  {
-    TimeValue tv1 = new TimeValue ();
-    TimeValue tv2 = new TimeValue (2);
-    TimeValue tv3 = new TimeValue (100);  
-    TimeValue tv4 = new TimeValue (1, 1000000000);
-    TimeValue tv5 = new TimeValue (2);
-    TimeValue tv6 = new TimeValue (1, -1000000000);
-
-    this.ASSERT (tv1.equals (new TimeValue (0)), 1);
-    this.ASSERT (tv2.lessThan (tv3), 2);
-    this.ASSERT (tv2.lessThanEqual (tv2), 3);
-    this.ASSERT (tv2.greaterThanEqual (tv4), 4);
-    this.ASSERT (tv5.greaterThanEqual (tv6), 5);
-    this.ASSERT (tv2.equals (new TimeValue (1, 1000000000)), 6);
-    this.ASSERT (tv5.equals (tv4), 7);
-    this.ASSERT (tv2.equals (tv4), 8);
-    this.ASSERT (tv1.notEquals (tv2), 9);
-    this.ASSERT (tv6.equals (tv1), 10);
-  }
-
-  public static void main (String [] args)
-  {
-    new TimeValueTest ().runTest ();
-  }
-}
diff --git a/java/tests/Reactor/TimerQueueTest.dsp b/java/tests/Reactor/TimerQueueTest.dsp
deleted file mode 100644
index c6190ea3842..00000000000
--- a/java/tests/Reactor/TimerQueueTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TimerQueueTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=TimerQueueTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TimerQueueTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TimerQueueTest.mak"\

- CFG="TimerQueueTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TimerQueueTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "TimerQueueTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "TimerQueueTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "TimerQueueTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TimerQueueTest - Java Virtual Machine Release"

-# Name "TimerQueueTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\TimerQueueTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/Reactor/TimerQueueTest.java b/java/tests/Reactor/TimerQueueTest.java
deleted file mode 100644
index d34439dcf9b..00000000000
--- a/java/tests/Reactor/TimerQueueTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Reactor
-// 
-// = FILENAME
-//    TimerQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TimerQueueTest implements EventHandler
-{
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    ACE.DEBUG ("handleTimeout: " + tv.toString () + " " + (String) obj);
-    return 0;
-  }
-
-  public static void main (String args [])
-  {
-    TimerQueue tq = new TimerQueue (true);
-    TimerQueueTest th1 = new TimerQueueTest ();
-    int n = 5;
-
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    // Set a periodic timer
-    int id= tq.scheduleTimer (th1,
-			      "periodic",
-			      new TimeValue (2),
-			      new TimeValue (3));
-    
-    int i;
-    // Set a bunch of single timers
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th1,
-			   "A-timer-" + new Integer (i),
-			   new TimeValue (i*2));
-      }
-
-    TimerQueueTest th2 = new TimerQueueTest ();
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th2,
-			  "B-timer-" + new Integer (i),
-			  new TimeValue (i*3));
-      }
-    // Cancel all timers associated with this handler
-    tq.cancelTimer (th2);
-
-    try
-      {
-	Thread.sleep (30000);
-      }
-    catch (InterruptedException e)
-      {
-      }
-    tq.cancelTimer (id);
-    System.exit (0);
-  }
-}
diff --git a/java/tests/SOCK_SAP/Makefile b/java/tests/SOCK_SAP/Makefile
deleted file mode 100644
index 1481d8e566f..00000000000
--- a/java/tests/SOCK_SAP/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 SOCKConnectorTest.java \
-	 SOCKAcceptorTest.java
-
-packages = tests.SOCK_SAP
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/SOCK_SAP -name '*.class' -print | xargs ${RM}
diff --git a/java/tests/SOCK_SAP/SOCKAcceptorTest.dsp b/java/tests/SOCK_SAP/SOCKAcceptorTest.dsp
deleted file mode 100644
index 6d980b75b9b..00000000000
--- a/java/tests/SOCK_SAP/SOCKAcceptorTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SOCKAcceptorTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=SOCKAcceptorTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "SOCKAcceptorTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "SOCKAcceptorTest.mak"\

- CFG="SOCKAcceptorTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "SOCKAcceptorTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "SOCKAcceptorTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "SOCKAcceptorTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "SOCKAcceptorTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "SOCKAcceptorTest - Java Virtual Machine Release"

-# Name "SOCKAcceptorTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\SOCKAcceptorTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/SOCK_SAP/SOCKAcceptorTest.java b/java/tests/SOCK_SAP/SOCKAcceptorTest.java
deleted file mode 100644
index 34ab8ecb6c9..00000000000
--- a/java/tests/SOCK_SAP/SOCKAcceptorTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKAcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-class TestHandler extends Thread
-{
-  public TestHandler (SOCKStream stream)
-    {
-      this.stream_ = stream;
-      this.start ();
-    }
-
-  public void run ()
-    {
-      int msgLen;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msgLen = this.stream_.recv (msg);
-	      if (msgLen == 0)
-		break;
-	      ACE.DEBUG ("Received: " + msg);
-	      this.stream_.send ("Got it!");
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.stream_.close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-    }
-  SOCKStream stream_;
-}
-
-public class SOCKAcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      ACE.DEBUG ("Usage: SOCKAcceptorTest [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  SOCKAcceptor acceptor = new SOCKAcceptor (port);
-	  while (true)
-	    {
-	      SOCKStream stream = new SOCKStream ();
-	      acceptor.accept (stream);
-	      TestHandler handler = new TestHandler (stream);
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKAcceptorTest server = new SOCKAcceptorTest ();
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      server.print_usage_and_die ();
-	    }
-	}
-      server.init (port);
-    }
-}
diff --git a/java/tests/SOCK_SAP/SOCKConnectorTest.dsp b/java/tests/SOCK_SAP/SOCKConnectorTest.dsp
deleted file mode 100644
index 4f018c91580..00000000000
--- a/java/tests/SOCK_SAP/SOCKConnectorTest.dsp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SOCKConnectorTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=SOCKConnectorTest - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "SOCKConnectorTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "SOCKConnectorTest.mak"\

- CFG="SOCKConnectorTest - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "SOCKConnectorTest - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "SOCKConnectorTest - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "SOCKConnectorTest - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "SOCKConnectorTest - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "SOCKConnectorTest - Java Virtual Machine Release"

-# Name "SOCKConnectorTest - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\SOCKConnectorTest.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/SOCK_SAP/SOCKConnectorTest.java b/java/tests/SOCK_SAP/SOCKConnectorTest.java
deleted file mode 100644
index e0cf37091e6..00000000000
--- a/java/tests/SOCK_SAP/SOCKConnectorTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class SOCKConnectorTest
-{
-  static void print_usage_and_die ()
-    {
-      System.out.println ("Usage: SOCKConnectorTest <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  void processRequests (SOCKStream stream) throws IOException
-    {
-      // 1.0 JDK      DataInputStream in = new DataInputStream (System.in);
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-      String msg;
-      int ack_len;
-
-      while (true)
- {
-   StringBuffer ack = new StringBuffer ();
-   ACE.DEBUG ("Enter input: ");
-   ACE.FLUSH ();
-   msg = in.readLine ();
-   if (msg == null)
-     break;
-   stream.send (msg);
-   ACE.DEBUG ("Waiting for ack...");
-   ack_len = stream.recv (ack);
-   if (ack_len == 0)
-     break;
-   else
-     ACE.DEBUG (ack.toString ());
- }
-    }
-
-  public void init (String host, int port)
-    {
-      SOCKStream stream = new SOCKStream ();
-      SOCKConnector connector = new SOCKConnector ();
-      try
- {
-   connector.connect (stream,
-        host,
-        port);
-   processRequests (stream);
- }
-      catch (IOException e)
- {
-   ACE.ERROR (e);
- }
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKConnectorTest client = new SOCKConnectorTest ();
-
-      // check arg count 
-      if (args.length < 2 || args.length > 2) 
-         print_usage_and_die(); 
-
-      if (args.length == 2)
- {
-   try
-     {
-       port = Integer.parseInt (args[1]);
-     }
-   catch (NumberFormatException e)
-     {
-       client.print_usage_and_die ();
-     }
-          client.init (args[0], port);
- }
-    }
-}
diff --git a/java/tests/ServiceConfigurator/Makefile b/java/tests/ServiceConfigurator/Makefile
deleted file mode 100644
index b4e62f70997..00000000000
--- a/java/tests/ServiceConfigurator/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 TestService.java \
-	 reloadTest.java \
-	 suspendTest.java
-
-packages = tests.Service_Configurator
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/ServiceConfigurator -name '*.class' -print | xargs ${RM}
-
-
diff --git a/java/tests/ServiceConfigurator/ServiceConfigurator.dsp b/java/tests/ServiceConfigurator/ServiceConfigurator.dsp
deleted file mode 100644
index 02a511a336e..00000000000
--- a/java/tests/ServiceConfigurator/ServiceConfigurator.dsp
+++ /dev/null
@@ -1,81 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ServiceConfigurator" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Java Virtual Machine Java Project" 0x0809

-

-CFG=ServiceConfigurator - Java Virtual Machine Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ServiceConfigurator.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ServiceConfigurator.mak"\

- CFG="ServiceConfigurator - Java Virtual Machine Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ServiceConfigurator - Java Virtual Machine Release" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE "ServiceConfigurator - Java Virtual Machine Debug" (based on\

- "Java Virtual Machine Java Project")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-JAVA=jvc.exe

-

-!IF  "$(CFG)" == "ServiceConfigurator - Java Virtual Machine Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\classes-r"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /O

-# ADD JAVA /O

-

-!ELSEIF  "$(CFG)" == "ServiceConfigurator - Java Virtual Machine Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ""

-# PROP BASE Intermediate_Dir ""

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\classes"

-# PROP Intermediate_Dir ""

-# PROP Target_Dir ""

-# ADD BASE JAVA /g

-# ADD JAVA /g

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ServiceConfigurator - Java Virtual Machine Release"

-# Name "ServiceConfigurator - Java Virtual Machine Debug"

-# Begin Source File

-

-SOURCE=.\reloadTest.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\suspendTest.java

-# End Source File

-# Begin Source File

-

-SOURCE=.\TestService.java

-# End Source File

-# End Target

-# End Project

diff --git a/java/tests/ServiceConfigurator/TestService.java b/java/tests/ServiceConfigurator/TestService.java
deleted file mode 100644
index 7b34c181c60..00000000000
--- a/java/tests/ServiceConfigurator/TestService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    TestService.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-
-public class TestService extends ServiceObject
-{
-  public int init (String [] args)
-  {
-    System.out.println("TestService init with arguments: ");
-
-    if (args != null)
-      for (int i = 0; i < args.length; i++)
-        ACE.DEBUG (args[i]);
-
-    return 0;
-  }
-
-  public int suspend()
-  {
-    System.out.println("TestService suspend ----");
-
-    return 0;
-  }
-
-  public int resume()
-  {
-    System.out.println("TestService resume ----");
-
-    return 0;
-  }
-
-  public int fini()
-  {
-    System.out.println("TestService remove ----");
-
-    return 0;
-  }
-    
-}
-
diff --git a/java/tests/ServiceConfigurator/reloadTest.java b/java/tests/ServiceConfigurator/reloadTest.java
deleted file mode 100644
index 3e8ac599841..00000000000
--- a/java/tests/ServiceConfigurator/reloadTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    mainTest.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-import java.io.*;
-
-public class reloadTest
-{
-
-  public static void main (String args [])
-  {
-    ServiceConfig daemon = new ServiceConfig ();
-    try
-      {
-	daemon.open (args);
-	Thread.sleep (10000);
-
-	// ***** Note: reloading requires the user to remove the
-	// service and prepare for reload!  
-	daemon.remove("TimeService");
-	daemon.prepareForReload();
-
-	daemon.open (args);
-      }
-    catch (InterruptedException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (FileNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      } 
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e + "foo");
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);	
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("End of reloadTest");
-  }
-
-}
diff --git a/java/tests/ServiceConfigurator/suspendTest.java b/java/tests/ServiceConfigurator/suspendTest.java
deleted file mode 100644
index ab12d06f2f5..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    mainTest.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-import java.io.*;
-
-public class suspendTest
-{
-
-  public static void main (String args [])
-  {
-    ServiceConfig daemon = new ServiceConfig ();
-    ACE.enableDebugging();
-
-    try
-      {
-	String args1 = "-f suspendTest1.conf";
-	String[] argv1 = OS.createStringArray(args1, " ");
-
-	daemon.open (argv1);
-
-	Thread.sleep (10000);
-
-
-	System.err.println("Suspending");
-	String args2 = "-f suspendTest2.conf";
-	String[] argv2 = OS.createStringArray(args2, " ");
-	
-	daemon.open (argv2);
-
-	Thread.sleep (10000);
-
-	System.err.println("Resuming");
-	String args3 = "-f suspendTest3.conf";
-	String[] argv3 = OS.createStringArray(args3, " ");
-
-	daemon.open (argv3);
-
-	Thread.sleep(10000);
-      }
-    catch (InterruptedException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (FileNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      } 
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e + "foo");
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);	
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("End of suspendTest");
-  }
-
-}
diff --git a/java/tests/ServiceConfigurator/suspendTest1.conf b/java/tests/ServiceConfigurator/suspendTest1.conf
deleted file mode 100644
index 983af3234c1..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest1.conf
+++ /dev/null
@@ -1 +0,0 @@
-load TestService tests.ServiceConfigurator.TestService ServiceObject "-p 10002"
diff --git a/java/tests/ServiceConfigurator/suspendTest2.conf b/java/tests/ServiceConfigurator/suspendTest2.conf
deleted file mode 100644
index 5cd6cd0fc77..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest2.conf
+++ /dev/null
@@ -1 +0,0 @@
-suspend TestService
diff --git a/java/tests/ServiceConfigurator/suspendTest3.conf b/java/tests/ServiceConfigurator/suspendTest3.conf
deleted file mode 100644
index 71250c3acd7..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest3.conf
+++ /dev/null
@@ -1 +0,0 @@
-resume TestService
diff --git a/java/tests/ServiceConfigurator/svc.conf b/java/tests/ServiceConfigurator/svc.conf
deleted file mode 100644
index 983af3234c1..00000000000
--- a/java/tests/ServiceConfigurator/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-load TestService tests.ServiceConfigurator.TestService ServiceObject "-p 10002"
diff --git a/java/tests/Tests.dsw b/java/tests/Tests.dsw
deleted file mode 100644
index b7c2cb45af5..00000000000
--- a/java/tests/Tests.dsw
+++ /dev/null
@@ -1,257 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "AcceptorTest"=.\Connection\AcceptorTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "BufferStreamTest"=.\ASX\BufferStreamTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ClientHandler"=.\Connection\ClientHandler.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Condition"=.\Concurrency\Condition\Condition.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ConnectorTest"=.\Connection\ConnectorTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "MessageQueueTest"=.\ASX\MessageQueueTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "MutexTest"=.\Concurrency\MutexTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ParseArgsTest"=.\Misc\ParseArgsTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "PriorityBufferTest"=.\ASX\PriorityBufferTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "RWMutexTest"=.\Concurrency\RWMutexTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SOCKAcceptorTest"=.\SOCK_SAP\SOCKAcceptorTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SOCKConnectorTest"=.\SOCK_SAP\SOCKConnectorTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "SemaphoreTest"=.\Concurrency\SemaphoreTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ServerHandler"=.\Connection\ServerHandler.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ServiceConfigurator"=.\ServiceConfigurator\ServiceConfigurator.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TaskTest"=.\ASX\TaskTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ThreadPoolTest"=.\ASX\ThreadPoolTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TimeValueTest"=.\Reactor\TimeValueTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TimerQueueTest"=.\Reactor\TimerQueueTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "TokenTest"=.\Concurrency\TokenTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/java/tests/netsvcs/Logger/LoggerTest.java b/java/tests/netsvcs/Logger/LoggerTest.java
deleted file mode 100644
index 40ac903a1d3..00000000000
--- a/java/tests/netsvcs/Logger/LoggerTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************
- *
- * = FILENAME
- *    LoggerTest.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package tests.netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import java.io.*; 
-import java.net.*;
-import JACE.OS.*;
-import netsvcs.Logger.LogRecord;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * This is a simple test log client very similar to the direct_logging client of
- * C++ ACE.  The logging service should correctly receive messages from both
- * the C++ and Java version.
- * </blockquote>
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor, netsvcs.Logger.LogRecord
- */
-public class LoggerTest {
-
-  /** Command line:  <hostname> [<port>]
-   *
-   * Creates a "hello world" log message and sends it to the server logging service.
-   * If no command line arguments are given, it uses ACE.DEFAULT_SERVER_PORT, and the
-   * current machine for the service location.
-   *
-   */
-  public static void main(String args[])
-    {
-      if (args.length < 1) {
-	System.err.println("Use:  LoggerTest <host name> [<port>]");
-	System.exit(0);
-      }
-
-      // Set the port
-      int port = args.length > 1 ? (new Integer(args[1])).intValue() : ACE.DEFAULT_SERVER_PORT;
-
-      SOCKStream cli_stream = new SOCKStream();
-      INETAddr remote_addr;
-      String host;
-
-      // Try to find the host
-      try {
-
-	host = args[0];
-
-	remote_addr = new INETAddr(port, host);
-
-      } catch (UnknownHostException uhe) {
-	ACE.ERROR("UnknownHostException " + uhe);
-	return;
-      }
-
-      System.out.println("Connecting to " + host + " on port " + port);
-
-      SOCKConnector con = new SOCKConnector();
-
-      try {
-
-	// Connect to the service
-	con.connect(cli_stream, remote_addr);
-
-      } catch (SocketException se) {
-	
-	ACE.ERROR("Socket Exception " + se);
-	return;
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("IOException " + ie);
-	return;
-      }
-
-
-      // Send a message with priority 4, the current time,
-      // and 0 for the process ID.
-      LogRecord record = new LogRecord(4,
-				       System.currentTimeMillis(),
-				       0);
-
-      // Set the text of the message
-      record.msgData("hello world");
-
-      try {
-
-	// Get a transmission system from the socket
-	OutputStream os = cli_stream.socket().getOutputStream();
-	DataOutputStream dos = new DataOutputStream(os);
-
-	// Send it
-	record.streamOutTo(dos);
-
-	// Close the socket
-	cli_stream.close();
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("IOException, loop: " + ie);
-	return;
-      }
-    }
-};
-
-
-      
-
-	
-
-	
-
-	
-      
diff --git a/java/tests/netsvcs/Logger/Makefile b/java/tests/netsvcs/Logger/Makefile
deleted file mode 100644
index 56388abc47f..00000000000
--- a/java/tests/netsvcs/Logger/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = $(WRAPPER_ROOT)/java
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files = LoggerTest.java 
-
-packages = netsvcs \
-	   netsvcs.Logger
-
-realclean: 
-	/bin/rm -rf ${JACE_WRAPPER}/classes/tests/netsvcs/Logger
-
diff --git a/java/tests/netsvcs/Naming/ClientTest.java b/java/tests/netsvcs/Naming/ClientTest.java
deleted file mode 100644
index 64a87a2fe66..00000000000
--- a/java/tests/netsvcs/Naming/ClientTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package tests.netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.SOCK_SAP.*;
-import netsvcs.Naming.*;
-
-public class ClientTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: ClientTest <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  public SOCKStream init (SOCKStream socket, String hostname, int port)
-    {
-      try
-	{
-	  SOCKConnector sc = new SOCKConnector(socket, hostname, port);
-	}
-      catch (UnknownHostException e)
-	{
-	  ACE.ERROR (e);
-	  System.exit(0);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Connection refused");
-	  System.exit(0);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	  System.exit(0);
-	}
-
-      return socket;
-    }
-
-  public static void main (String [] args)
-    {
-      SOCKStream socket;
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ClientTest clientTest = new ClientTest ();
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      clientTest.print_usage_and_die ();
-	    }
-	}
-      System.out.println("Trying to open port " + port + " on " + args[0]);
-
-      socket = clientTest.init (new SOCKStream(), args[0], port);
-
-      NameProxy proxy = new NameProxy(socket);
-
-      System.out.println("---- Beginning tests ----");
-
-      try {
-
-	System.out.println("Binding (five, six, seven):  " + proxy.bind("five", "six", "seven"));
-	System.out.println("Binding (filth, rat, eats):  " + proxy.bind("filth", "rat", "eats"));
-
-	Vector res = proxy.resolve("five");
-
-	System.out.println("Resolve (five)            :  " + (String)res.elementAt(1) + " " 
-			                                   + (String)res.elementAt(2));
-
-	System.out.println("Binding (fish, words, him):  " + proxy.bind("fish", "words", "him"));
-
-	System.out.println("Unbind  (five, six, seven):  " + proxy.unbind("five"));
-
-	System.out.println("Resolve (five)            :  " + (String)res.elementAt(1) + " " 
-			                                   + (String)res.elementAt(2));
-	System.out.println("Binding (fiction, us, you):  " + proxy.bind("fiction", "us", "you"));
-
-	System.out.println("\nGetting all records whose names begin with fi:\n");
-	Vector res2 = proxy.listNameEntries("fi");
-
-	Enumeration iter = res2.elements();
-
-	while (iter.hasMoreElements()) {
-	  Vector res3 = (Vector)(iter.nextElement());
-
-	  System.out.println((String)res3.elementAt(0) + "\t" + (String)res3.elementAt(1) 
-			     + "\t" + (String)res3.elementAt(2));
-	}
-
-      } catch (IOException e) 
-	{
-	ACE.ERROR("" + e);
-	} 
-      finally 
-	{
-	  try {
-	    socket.close();
-	  } catch (IOException e) {
-	    ACE.ERROR("" + e);
-	  }
-	}
-
-    }
-
-};
-
diff --git a/java/tests/netsvcs/Naming/Makefile b/java/tests/netsvcs/Naming/Makefile
deleted file mode 100644
index be6e9c45848..00000000000
--- a/java/tests/netsvcs/Naming/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = ../../..
-CLASSDIR = $(JACE_WRAPPER)/classes
-
-CLASSPATH := $(CLASSDIR):$(CLASSPATH)
- 
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-
-files =	 ClientTest.java 
-
-packages = tests.netsvcs.Naming
-
-realclean:
-	find ${JACE_WRAPPER}/classes/tests/netsvcs/Naming -name '*.class' -print | xargs ${RM}
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp b/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
deleted file mode 100644
index fb9c71a5014..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "ace/Naming_Context.h"
-// $Id$
-
-#include "ace/Name_Options.h"
-#include "nametest.h"
-
-void 
-Nametest::listopt (void)
-{
-  cout << "serverport is " 
-       << ACE_Name_Options::instance ()->nameserver_port() 
-       << endl;
-  cout << "serverhost is " 
-       << ACE_Name_Options::instance ()->nameserver_host() 
-       << endl;
-  cout << "process_name is " 
-       << ACE_Name_Options::instance ()->process_name() 
-       << endl;
-  cout << "namespace_dir is " 
-       << ACE_Name_Options::instance ()->namespace_dir() 
-       << endl;
-}
-
-int 
-Nametest::init (int argc, char *argv[])
-{
-  ACE_Server_Record *sr;
-  ACE_Service_Config::svc_rep ()->find ("Name_Server_Proxy", &sr);
-  ACE_Service_Type *st = sr->type ();
-  ACE_Server_Object *so = st->object ();
-dynamic_cast<ACE_Name_Server_Proxy *> (so);
-
-  ACE_Name_Server_Proxy *ns_proxy = ACE_Service_Config::name_server_proxy ();
-  
-  ns_proxy->bind (...);
-
-  this->listopt ();
-
-  ACE_Naming_Context ns_context;
-
-  if (ns_context.open (ACE_Naming_Context::NET_LOCAL) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context.open"), -1);
-
-  const char *mykey = argv[0];
-  char *myvalue = argv[1];
-  char *ns_value = 0;
-  char *ns_type = 0;
-
-  if (ns_context.bind (mykey, myvalue, "ottotype") == -1)
-    cout << "bind failed" << endl;
-  else
-    cout << "bind succeeded" << endl;
-
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.rebind (mykey, myvalue, "newottotype") == -1)
-    cout << "rebind failed" << endl;
-  else
-    cout << "rebind succeeded" << endl;
-
-  if (ns_context.resolve (mykey, ns_value, ns_type) == -1)
-    cout << "resolve of " << mykey << " failed" << endl;
-  else
-    cout << "resolve of " << mykey << " succeeded, value = " 
-	 << ns_value << ", type = " << ns_type << endl;
-
-  delete [] ns_value;
-  delete [] ns_type;
-  ns_value = 0;
-  ns_type = 0;
-
-  if (ns_context.unbind (mykey) == -1)
-    cout << "unbind failed" << endl;
-  else
-    cout << "unbind succeeded" << endl;
-
-  return 0;
-}
-
-int 
-Nametest::fini (void)
-{
-  cout << "Nametest::fini called" << endl;
-  return 0;
-}
-
-int 
-Nametest::info (char **, unsigned) const
-{
-  cout << "Nametest::info called" << endl;
-  return 0;
-}
-
-extern "C" ACE_Service_Object *_alloc(void);
-
-// Factory function that is called automatically when the ACE
-// framework dynamically links this shared object file.
-
-ACE_Service_Object *_alloc (void) 
-{
-  return new Nametest;
-}
diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.h b/netsvcs/clients/Naming/Dump_Restore/nametest.h
deleted file mode 100644
index fa0cc5dc05c..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/nametest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Service_Object.h"
-
-class Nametest : public ACE_Service_Object
-{
-public:
-  virtual int init (int argc, char *argv[]);
-  virtual int fini (void);
-  virtual int info (char **, size_t) const;
-
-  void listopt (void);
-};
-
diff --git a/netsvcs/lib/Client_Logging_Handler.i b/netsvcs/lib/Client_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Client_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/lib/Server_Logging_Handler.i b/netsvcs/lib/Server_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Server_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/servers/cli.conf b/netsvcs/servers/cli.conf
deleted file mode 100644
index b2d8fbc8194..00000000000
--- a/netsvcs/servers/cli.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# UNIX version
-#
-# These are the services that can be linked into ACE.
-# Note that you can replace the hardcoded "../lib/libnet_svcs" with
-# a relative path if you set your LD search path correctly -- ACE will
-# locate this for you automatically by reading your LD search path!
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-# Activate the Client Logging Daemon.
-dynamic Client_Logging_Service Service_Object * ../lib/libnet_svcs:_make_ACE_Client_Logging_Connector() active "-p 20009 -h merengue"
diff --git a/netsvcs/servers/ntsvc.conf b/netsvcs/servers/ntsvc.conf
deleted file mode 100644
index 94ed5d78c2a..00000000000
--- a/netsvcs/servers/ntsvc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Windows NT version.
-#
-# These are the services that can be linked into ACE.
-# Note that your path needs to include the path for netsvcs.dll
-# In addition, you can replace the hardcoded "-p 20xxx" with "-p
-# $PORTxxx" if you set your environment variables correctly.
-
-dynamic Token_Service Service_Object * netsvcs.dll:_make_ACE_Token_Acceptor() "-p 20202"
-dynamic Name_Server Service_Object * netsvcs.dll:_make_ACE_Name_Acceptor() "-p 20012"
-#dynamic Client_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Client_Logging_Connector() active "-p 20008"
-#dynamic Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
-#dynamic Thr_Server_Logging_Service Service_Object * netsvcs.dll:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020"
diff --git a/os-patches/linux-patches.html b/os-patches/linux-patches.html
deleted file mode 100644
index e5f07f598df..00000000000
--- a/os-patches/linux-patches.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<html> <head>
-<title></title>
-</head>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-With RedHat 5.0 distributions of Linux, it's best to upgrade the
-distribution with these:
-<ul>
-  <li>egcs 1.0.1
-  <li>glibc-2.0.6 (from ftp://sunsite.unc.edu/pub/gnu plus Torbjörn's patch)
-  <li>linuxthreads 0.7? for the glibc-2.0.6 above
-</ul>
-
-In addition, you'll need to apply Torbjörn Lindgren's
-&lt;tl@funcom.com&gt; patch to glibc-2.0.6's LinuxThread:<p>
-
-<pre>
---- signals.c.old	Wed Jan 14 01:09:02 1998
-+++ signals.c	Wed Jan 14 01:11:37 1998
-@@ -82,7 +82,7 @@
-   pthread_mutex_lock(&sigwaited_mut);
-   /* Make sure no other thread is waiting on our signals */
- test_again:
--  for (s = 0; s &lt; NSIG; s++) {
-+  for (s = 1; s &lt; NSIG; s++) {
-     if (sigismember(set, s) && sigismember(&sigwaited, s)) {
-       pthread_cond_wait(&sigwaited_changed, &sigwaited_mut);
-       goto test_again;
-@@ -96,7 +96,7 @@
-   /* Install our signal handler on all signals in set,
-      and unblock them in mask.
-      Also mark those signals as being sigwaited on */
--  for (s = 1; s &lt;= NSIG; s++) {
-+  for (s = 1; s &lt; NSIG; s++) {
-     if (sigismember(set, s) && s != PTHREAD_SIG_CANCEL) {
-       sigdelset(&mask, s);
-       action.sa_handler = __pthread_sighandler;
-@@ -121,7 +121,7 @@
-   self-&gt;p_cancel_jmp = NULL;
-   /* The signals are now reblocked. Restore the sighandlers. */
-   pthread_mutex_lock(&sigwaited_mut);
--  for (s = 1; s &lt;= NSIG; s++) {
-+  for (s = 1; s &lt; NSIG; s++) {
-     if (sigismember(set, s) && s != PTHREAD_SIG_CANCEL) {
-       sigaction(s, &(saved_signals[s]), NULL);
-       sigdelset(&sigwaited, s);
-</pre>
-
-Thanks to James CE Johnson &lt;jjohnson@lads.com&gt;, Torbjörn
-Lindgren &lt;tl@funcom.com&gt;, and Oleg Krivosheev
-&lt;kriol@fnal.gov&gt; for this information; Torbjörn supplied the
-above patch.  With the above configuration, Jame and Torbjörn report
-that only ACE Thread_Manager_Test seg faults on Intel platforms!
-
-Without the following patch from Scott Snyder &lt;sss@d0linux01.fnal.gov&gt;,
-egcs 1.0.1 on Linux won't be able to compile
-netsvcs/lib/Server_Logging_Handler.cpp:
-
-<pre>
-1997-12-10  scott snyder  &lt;sss@d0linux01.fnal.gov&gt;
-
-	* method.c (make_thunk): Avoid name buffer overflow.
-
-
-Index: gcc/cp/method.c
-===================================================================
-RCS file: /d0sgi0/usr0/snyder/CVSROOT/egcs/gcc/cp/method.c,v
-retrieving revision 1.1.1.5
-diff -c -r1.1.1.5 method.c
-*** method.c    1997/12/08 21:06:03     1.1.1.5
---- method.c    1997/12/11 05:40:37
-***************
-*** 1811,1817 ****
-       tree function;
-       int delta;
-  {
-!   char buffer[250];
-    tree thunk_id;
-    tree thunk;
-    char *func_name;
---- 1811,1817 ----
-       tree function;
-       int delta;
-  {
-!   char *buffer;
-    tree thunk_id;
-    tree thunk;
-    char *func_name;
-***************
-*** 1822,1827 ****
---- 1822,1828 ----
-    if (TREE_CODE (func_decl) != FUNCTION_DECL)
-      abort ();
-    func_name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (func_decl));
-+   buffer = (char *)alloca (strlen (func_name) + 32);
-    if (delta&lt;=0)
-      sprintf (buffer, "__thunk_%d_%s", -delta, func_name);
-    else
-</pre>
-
-With RedHat 5.0 on Alpha CPUs, two system patches and one
-glibc-2.0.6/linuxthreads patch are necessary in addition to the above.
-The first patch is for the GNU assembler, gas.  It is only necessary
-on Alphas, and only when <code>-g</code> is used.  If you don't want
-to patch the assembler, you can enable the SUPPRESS_DASH_G option in
-the <code>platform_linux.GNu</code>.  Otherwise, this patch can be
-applied to the binutils gas source.  Then, rebuild and install as.
-The file to be patched is binutils-2.8.1/gas/config/tc-alpha.h:<p>
-
-<pre>
---- tc-alpha.h.orig	Mon May 26 12:32:38 1997
-+++ tc-alpha.h	Sat Feb 28 06:45:41 1998
-@@ -25,6 +25,8 @@
-
- #define TARGET_ARCH			bfd_arch_alpha
-
-+#define PAGE_SIZE 8192
-+
- #define TARGET_FORMAT (OUTPUT_FLAVOR == bfd_target_ecoff_flavour	\
- 		       ? "ecoff-littlealpha"				\
- 		       : OUTPUT_FLAVOR == bfd_target_elf_flavour	\
-</pre><p>
-
-In addition, you'll need to patch
-<code>/usr/src/linux/include/linux/posix_types.h</code> as follows
-to avoid compilation errors:<p>
-
-<pre>
---- posix_types.h.ORIGINAL	Wed Nov 12 12:01:56 1997
-+++ posix_types.h	Fri Feb 27 14:13:16 1998
-@@ -41,9 +41,14 @@
- #undef __FDMASK
- #define	__FDMASK(d)	(1UL &lt;&lt; ((d) % __NFDBITS))
-
-+#if defined (__KERNEL__)
- typedef struct fd_set {
- 	unsigned long fds_bits [__FDSET_LONGS];
- } __kernel_fd_set;
-+#else  /* ! __KERNEL__ */
-+#include &lt;gnu/types.h&gt;
-+typedef __fd_set __kernel_fd_set;
-+#endif /* ! __KERNEL__ */
-
- /* Type of a signal handler.  */
- typedef void (*__kernel_sighandler_t)(int);
-</pre><p>
-
-Finally, on Alpha only, I removed wrapsyscall from the LinuxThreads
-library by patching linuxthreads/Makefile:
-
-<pre>
-36c36
-&lt;                      semaphore wrapsyscall
----
-&gt;                      semaphore # wrapsyscall
-</pre>
-
-With that and the above configuration/pathes, all ACE tests run
-perfectly cleanly on Alpha!<p>
-
-<strong><blink><font color="#ff0000">WARNING:</font></blink></strong>
-There is a bug in <code>getsockname ()</code> on versions of Linux
-through 2.0.30, at least.  <code>getsockname ()</code> returns an
-Internet host address of 127.0.0.1 (localhost) instead of 0.0.0.0 for
-sockets that aren't connected.  This bug prevents TAO servers from
-working correctly.  To fix it, comment out these two lines in function
-<code>inet_getname ()</code> in
-<code>/usr/src/linux/net/ipv4/af_inet.c</code>:
-
-<pre>
-	} else {
-		__u32 addr = sk-&gt;rcv_saddr;
-		if (!addr) {
-			addr = sk-&gt;saddr;
-/* comment out this line:  if (!addr) */
-/* comment out this line:  	addr = ip_my_addr(); */
-		}
-		sin-&gt;sin_port = sk-&gt;dummy_th.source;
-		sin-&gt;sin_addr.s_addr = addr;
-	}
-</pre>
-
-and rebuild your kernel.  This fix has been implemented in 2.1.x
-versions of the kernel.<p>
-
-</body> </html>
diff --git a/os-patches/lynxos-patches.html b/os-patches/lynxos-patches.html
deleted file mode 100644
index 04275561610..00000000000
--- a/os-patches/lynxos-patches.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html> <head>
-<title></title>
-</head>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-     With LynxOS 2.5.0-FCS version: 012797-G, you'll need to apply this
-     patch:<p>
-     <pre>ftp://ftp.lynx.com/pub/patches/v2.5-patches/v2.5-on-x86/000134-00.tar.Z
-     </pre><p>
-
-     And, you'll need to apply the following four patches:
-     <ol>
-     <li><code>Patch /usr/include/netinet/in.h</code>:<p>
-<pre>
---- in.h.ORIGINAL	Sat Feb  8 09:58:28 1997
-+++ in.h	Wed Nov 26 15:41:04 1997
-@@ -278,8 +278,7 @@
- 	compiler, the macros are not defined:  Functions must be used.
- */
- static __inline__ unsigned short
--htons(arg)
--unsigned short arg;
-+htons(unsigned short arg)
- {
- 	unsigned short retval;
-
-@@ -292,8 +291,7 @@
- }
-
- static __inline__ unsigned long
--htonl(arg)
--unsigned long arg;
-+htonl(unsigned long arg)
- {
-	unsigned long retval;
-</pre><p>
-
-     <li><code>Patch /usr/include/name.h</code>:<p>
-<pre>
---- name.h.ORIGINAL	Sat Feb  8 11:57:36 1997
-+++ name.h	Wed Dec 24 11:00:57 1997
-@@ -112,7 +112,11 @@
- static __inline__ int _name_fchmod(int nsid, mode_t mode)
- { return _name_server(_NS_FCHMOD, nsid, mode); }
-
-+#if defined __cplusplus
-+static __inline__ int _name_fchown(int /* nsid */, uid_t owner, gid_t group)
-+#else
- static __inline__ int _name_fchown(int nsid, uid_t owner, gid_t group)
-+#endif /* __cplusplus */
- { return _name_server(_NS_FCHOWN, owner, group); }
-
- static __inline__ int _name_close(int nsid)
-</pre>
-
-     <li><code>Patch /usr/include/scsi.h</code>:<p>
-<pre>
---- scsi.h.ORIGINAL	Sat Feb  8 09:57:43 1997
-+++ scsi.h	Mon Dec  1 09:13:13 1997
-@@ -166,7 +166,7 @@
- ------------------------------------------------------------------------------
- */
- #define GET_DATA_BUFFER_STATUS          0x34	/* O     14.2.1 */
--#define GET WINDOW                      0x25	/* O     14.2.2 */
-+#define GET_WINDOW                      0x25	/* O     14.2.2 */
- #define OBJECT_POSITION                 0x31	/* O     14.2.3 */
- #define SCAN                            0x1B	/* O     14.2.5 */
- #define SET_WINDOW                      0x24	/* M     14.2.6 */
-</pre>
-
-     <li><code>Patch /usr/include/netdb.h</code>:<p>
-<pre>
---- netdb.h.ORIGINAL	Sat Feb  8 09:57:36 1997
-+++ netdb.h	Mon Dec  1 10:57:15 1997
-@@ -95,6 +95,8 @@
- extern struct protoent	*getprotobyname	_AP((char *));
- extern struct protoent  *getprotobynumber _AP((int));
- extern struct protoent  *getprotoent	_AP((void));
-+int sethostent _AP((int));
-+int endhostent _AP((void));
-
- /*
-  * Error return codes from gethostbyname() and gethostbyaddr()
-</pre>
-     </ol>
-
-</body> </html>
diff --git a/psosim/Makefile b/psosim/Makefile
deleted file mode 100644
index 0902651a0da..00000000000
--- a/psosim/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#	Makefile for the pSOSim system object files
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-CPU_FAMILY	= psosim
-CPU		= psosim
-CPU_TOOLS	= psosim
-BOARD		= psosim
-
-PSS_CFG_DIR     = $(ACE_ROOT)/psosim
-
-PSS_CFG_OBJS	= $(PSS_CFG_DIR)/drv_conf.o $(PSS_CFG_DIR)/prepccfg.o $(PSS_CFG_DIR)/psoscfg.o $(PSS_CFG_DIR)/sysinit.o
-                  
-PSS_CONFIG      = $(PSS_ROOT)/configs/std
-PSS_SYS_DIR	= $(PSS_ROOT)/sys/os
-PSS_SYS_LIBS	= $(PSS_SYS_DIR)/prepc.a $(PSS_SYS_DIR)/psos.a $(PSS_SYS_DIR)/pna.a
-PSS_BSP		= $(PSS_ROOT)/bsps/psosim
-PSS_BSP_LIB	= $(PSS_BSP)/bsp.a
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# To build multiple executables in the same directory on AIX, it works
-# best to wipe out any previously-created tempinc directory.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
-endif
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all : $(PSS_CFG_DIR)/acepsos.a
-
-$(PSS_CFG_DIR)/acepsos.a : $(PSS_CFG_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-
-$(PSS_CFG_DIR)/sysinit.o : $(PSS_CONFIG)/sysinit.c $(ACE_ROOT)/ace/sys_conf.h $(PSS_BSP)/bsp.h \
-	   $(PSS_ROOT)/include/bspfuncs.h $(PSS_ROOT)/include/configs.h
-	$(COMPILE.c) -o $@ $(PSS_CONFIG)/sysinit.c
-
-$(PSS_CFG_DIR)/prepccfg.o : $(PSS_CONFIG)/prepccfg.c $(ACE_ROOT)/ace/sys_conf.h $(PSS_BSP)/bsp.h \
-	   $(PSS_ROOT)/include/bspfuncs.h $(PSS_ROOT)/include/configs.h
-	$(COMPILE.c) -o $@ $(PSS_CONFIG)/prepccfg.c
-
-$(PSS_CFG_DIR)/psoscfg.o : $(PSS_CONFIG)/psoscfg.c $(ACE_ROOT)/ace/sys_conf.h $(PSS_BSP)/bsp.h \
-	   $(PSS_ROOT)/include/bspfuncs.h $(PSS_ROOT)/include/configs.h
-	$(COMPILE.c) -o $@ $(PSS_CONFIG)/psoscfg.c
-
-$(PSS_CFG_DIR)/drv_conf.o : $(PSS_CFG_DIR)/drv_conf.c $(ACE_ROOT)/ace/sys_conf.h $(PSS_BSP)/bsp.h \
-	   $(PSS_ROOT)/include/bspfuncs.h $(PSS_ROOT)/include/configs.h
-	$(COMPILE.c) -o $@ $(PSS_CFG_DIR)/drv_conf.c
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/psosim/drv_conf.c b/psosim/drv_conf.c
deleted file mode 100644
index 3228920df6a..00000000000
--- a/psosim/drv_conf.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/***********************************************************************/
-/*                                                                     */
-/*   MODULE:  drv_conf.c                                               */
-/*   DATE:    94/01/06                                                 */
-/*   PURPOSE: pSOSystem driver configuration and initialization        */
-/*                                                                     */
-/*            There is one function in this file:                      */
-/*                                                                     */
-/*            SetUpDrivers to setup drivers except for Network drivers */
-/*                                                                     */
-/*                                                                     */
-/*---------------------------------------------------------------------*/
-/*                                                                     */
-/*           Copyright 1991 - 1993, Integrated Systems, Inc.           */
-/*                      ALL RIGHTS RESERVED                            */
-/*                                                                     */
-/*   Permission is hereby granted to licensees of Integrated Systems,  */
-/*   Inc. products to use or abstract this computer program for the    */
-/*   sole purpose of implementing a product based on Integrated        */
-/*   Systems, Inc. products.   No other rights to reproduce, use,      */
-/*   or disseminate this computer program, whether in part or in       */
-/*   whole, are granted.                                               */
-/*                                                                     */
-/*   Integrated Systems, Inc. makes no representation or warranties    */
-/*   with respect to the performance of this computer program, and     */
-/*   specifically disclaims any responsibility for any damages,        */
-/*   special or consequential, connected with the use of this program. */
-/*                                                                     */
-/***********************************************************************/
-#include "sys_conf.h"
-#include "bsp.h"
-#include <bspfuncs.h>
-#include <configs.h>
-
-struct ioparms;
-#define NULLF ((void (*)(struct ioparms *)) 0)
-UCHAR *SetUpDrivers(UCHAR *FreeMemPtr)
-{
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem serial device driver                              */
-/*---------------------------------------------------------------------*/
-#if (SC_DEV_SERIAL && BSP_SERIAL)
-    InstallDriver(SC_DEV_SERIAL, CnslInit, NULLF, NULLF,CnslRead,
-                  CnslWrite, CnslCntrl, 0, 0);
-    FreeMemPtr = CnslSetup(FreeMemPtr, SD_DEF_BAUD, SC_APP_CONSOLE);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem tick timer                                        */
-/*---------------------------------------------------------------------*/
-#if SC_DEV_TIMER
-    InstallDriver(SC_DEV_TIMER, RtcInit, NULLF, NULLF, NULLF, NULLF,
-                  NULLF, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem ramdisk driver                                    */
-/*---------------------------------------------------------------------*/
-#if SC_DEV_RAMDISK
-    InstallDriver(SC_DEV_RAMDISK, RdskInit, NULLF, NULLF, RdskRead,
-                  RdskWrite, NULLF, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem TFTP driver                                       */
-/*---------------------------------------------------------------------*/
-#if (SC_DEV_TFTP)
-    InstallDriver(SC_DEV_TFTP, TftpInit, TftpOpen, TftpClose, TftpRead,
-                  NULLF, TftpCntl, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Add additional drivers to install here.                             */
-/*---------------------------------------------------------------------*/
-
-return(FreeMemPtr);
-}
-
diff --git a/rpc++/.dependencies b/rpc++/.dependencies
deleted file mode 100644
index 9afb79a0c0b..00000000000
--- a/rpc++/.dependencies
+++ /dev/null
@@ -1,131 +0,0 @@
-xdr++.o: xdr++.cc rpc++/xdr++.h /usr/include/rpc/rpc.h \
-  /usr/include/rpc/types.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/types.h \
-  /usr/include/sys/feature_tests.h /usr/include/sys/machtypes.h \
-  /usr/include/sys/select.h /usr/include/sys/time.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/time.h \
-  /usr/include/sys/siginfo.h /usr/include/sys/machsig.h \
-  /usr/include/tiuser.h /usr/include/sys/tiuser.h /usr/include/fcntl.h \
-  /usr/include/sys/fcntl.h /usr/include/memory.h /usr/include/rpc/xdr.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/byteorder.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/stdio.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/rpc/auth.h \
-  /usr/include/sys/cred.h /usr/include/sys/t_lock.h \
-  /usr/include/sys/machlock.h /usr/include/sys/dki_lkinfo.h \
-  /usr/include/sys/dl.h /usr/include/sys/sleepq.h \
-  /usr/include/sys/turnstile.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/param.h \
-  /usr/include/sys/unistd.h /usr/include/sys/pirec.h \
-  /usr/include/sys/mutex.h /usr/include/rpc/clnt.h \
-  /usr/include/rpc/rpc_com.h /usr/include/sys/netconfig.h \
-  /usr/include/rpc/rpc_msg.h /usr/include/rpc/auth_sys.h \
-  /usr/include/rpc/auth_des.h /usr/include/rpc/auth_kerb.h \
-  /usr/include/kerberos/krb.h /usr/include/kerberos/mit-copyright.h \
-  /usr/include/kerberos/des.h /usr/include/sys/socket.h \
-  /usr/include/netinet/in.h /usr/include/sys/stream.h \
-  /usr/include/sys/vnode.h /usr/include/sys/uio.h /usr/include/vm/seg_enum.h \
-  /usr/include/sys/poll.h /usr/include/sys/strmdep.h /usr/include/rpc/svc.h \
-  /usr/include/rpc/svc_auth.h /usr/include/rpc/rpcb_clnt.h \
-  /usr/include/rpc/rpcb_prot.h
-service.o: service.cc /pkg/gnu/sparc-sun-solaris2.3/include/assert.h \
-  /pkg/gnu/lib/g++-include/stream.h /pkg/gnu/lib/g++-include/iostream.h \
-  /pkg/gnu/lib/g++-include/streambuf.h /pkg/gnu/lib/g++-include/libio.h \
-  /pkg/gnu/lib/g++-include/_G_config.h /usr/include/memory.h \
-  /usr/include/errno.h /usr/include/sys/errno.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/stdlib.h \
-  /usr/include/sys/feature_tests.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/types.h \
-  /usr/include/sys/machtypes.h /usr/include/sys/select.h \
-  /usr/include/sys/time.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/time.h \
-  /usr/include/sys/siginfo.h /usr/include/sys/machsig.h \
-  /usr/include/sys/socket.h /usr/include/sys/netconfig.h \
-  /usr/include/netdb.h /usr/include/rpc/rpc.h /usr/include/rpc/types.h \
-  /usr/include/tiuser.h /usr/include/sys/tiuser.h /usr/include/fcntl.h \
-  /usr/include/sys/fcntl.h /usr/include/rpc/xdr.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/byteorder.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/stdio.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/rpc/auth.h \
-  /usr/include/sys/cred.h /usr/include/sys/t_lock.h \
-  /usr/include/sys/machlock.h /usr/include/sys/dki_lkinfo.h \
-  /usr/include/sys/dl.h /usr/include/sys/sleepq.h \
-  /usr/include/sys/turnstile.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/param.h \
-  /usr/include/sys/unistd.h /usr/include/sys/pirec.h \
-  /usr/include/sys/mutex.h /usr/include/rpc/clnt.h \
-  /usr/include/rpc/rpc_com.h /usr/include/rpc/rpc_msg.h \
-  /usr/include/rpc/auth_sys.h /usr/include/rpc/auth_des.h \
-  /usr/include/rpc/auth_kerb.h /usr/include/kerberos/krb.h \
-  /usr/include/kerberos/mit-copyright.h /usr/include/kerberos/des.h \
-  /usr/include/netinet/in.h /usr/include/sys/stream.h \
-  /usr/include/sys/vnode.h /usr/include/sys/uio.h /usr/include/vm/seg_enum.h \
-  /usr/include/sys/poll.h /usr/include/sys/strmdep.h /usr/include/rpc/svc.h \
-  /usr/include/rpc/svc_auth.h /usr/include/rpc/rpcb_clnt.h \
-  /usr/include/rpc/rpcb_prot.h rpc++/service.h \
-  /pkg/gnu/lib/g++-include/bool.h rpc++/request.h rpc++/xdr++.h \
-  rpc++/callback.h
-stub.o: stub.cc /pkg/gnu/lib/g++-include/stream.h \
-  /pkg/gnu/lib/g++-include/iostream.h /pkg/gnu/lib/g++-include/streambuf.h \
-  /pkg/gnu/lib/g++-include/libio.h /pkg/gnu/lib/g++-include/_G_config.h \
-  /usr/include/memory.h /pkg/gnu/sparc-sun-solaris2.3/include/assert.h \
-  rpc++/stub.h /pkg/gnu/lib/g++-include/bool.h \
-  /pkg/gnu/lib/g++-include/String.h /pkg/gnu/lib/g++-include/Regex.h \
-  /usr/include/sys/time.h /usr/include/sys/feature_tests.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/types.h \
-  /usr/include/sys/machtypes.h /usr/include/sys/select.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/time.h \
-  /usr/include/sys/siginfo.h /usr/include/sys/machsig.h rpc++/request.h \
-  rpc++/xdr++.h /usr/include/rpc/rpc.h /usr/include/rpc/types.h \
-  /usr/include/tiuser.h /usr/include/sys/tiuser.h /usr/include/fcntl.h \
-  /usr/include/sys/fcntl.h /usr/include/rpc/xdr.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/byteorder.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/stdio.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/rpc/auth.h \
-  /usr/include/sys/cred.h /usr/include/sys/t_lock.h \
-  /usr/include/sys/machlock.h /usr/include/sys/dki_lkinfo.h \
-  /usr/include/sys/dl.h /usr/include/sys/sleepq.h \
-  /usr/include/sys/turnstile.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/param.h \
-  /usr/include/sys/unistd.h /usr/include/sys/pirec.h \
-  /usr/include/sys/mutex.h /usr/include/rpc/clnt.h \
-  /usr/include/rpc/rpc_com.h /usr/include/sys/netconfig.h \
-  /usr/include/rpc/rpc_msg.h /usr/include/rpc/auth_sys.h \
-  /usr/include/rpc/auth_des.h /usr/include/rpc/auth_kerb.h \
-  /usr/include/kerberos/krb.h /usr/include/kerberos/mit-copyright.h \
-  /usr/include/kerberos/des.h /usr/include/sys/socket.h \
-  /usr/include/netinet/in.h /usr/include/sys/stream.h \
-  /usr/include/sys/vnode.h /usr/include/sys/uio.h /usr/include/vm/seg_enum.h \
-  /usr/include/sys/poll.h /usr/include/sys/strmdep.h /usr/include/rpc/svc.h \
-  /usr/include/rpc/svc_auth.h /usr/include/rpc/rpcb_clnt.h \
-  /usr/include/rpc/rpcb_prot.h
-request.o: request.cc rpc++/request.h rpc++/xdr++.h /usr/include/rpc/rpc.h \
-  /usr/include/rpc/types.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/types.h \
-  /usr/include/sys/feature_tests.h /usr/include/sys/machtypes.h \
-  /usr/include/sys/select.h /usr/include/sys/time.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/time.h \
-  /usr/include/sys/siginfo.h /usr/include/sys/machsig.h \
-  /usr/include/tiuser.h /usr/include/sys/tiuser.h /usr/include/fcntl.h \
-  /usr/include/sys/fcntl.h /usr/include/memory.h /usr/include/rpc/xdr.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/byteorder.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/stdio.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/rpc/auth.h \
-  /usr/include/sys/cred.h /usr/include/sys/t_lock.h \
-  /usr/include/sys/machlock.h /usr/include/sys/dki_lkinfo.h \
-  /usr/include/sys/dl.h /usr/include/sys/sleepq.h \
-  /usr/include/sys/turnstile.h \
-  /pkg/gnu/lib/gcc-lib/sparc-sun-solaris2.3/2.6.0/include/sys/param.h \
-  /usr/include/sys/unistd.h /usr/include/sys/pirec.h \
-  /usr/include/sys/mutex.h /usr/include/rpc/clnt.h \
-  /usr/include/rpc/rpc_com.h /usr/include/sys/netconfig.h \
-  /usr/include/rpc/rpc_msg.h /usr/include/rpc/auth_sys.h \
-  /usr/include/rpc/auth_des.h /usr/include/rpc/auth_kerb.h \
-  /usr/include/kerberos/krb.h /usr/include/kerberos/mit-copyright.h \
-  /usr/include/kerberos/des.h /usr/include/sys/socket.h \
-  /usr/include/netinet/in.h /usr/include/sys/stream.h \
-  /usr/include/sys/vnode.h /usr/include/sys/uio.h /usr/include/vm/seg_enum.h \
-  /usr/include/sys/poll.h /usr/include/sys/strmdep.h /usr/include/rpc/svc.h \
-  /usr/include/rpc/svc_auth.h /usr/include/rpc/rpcb_clnt.h \
-  /usr/include/rpc/rpcb_prot.h \
-  /pkg/gnu/sparc-sun-solaris2.3/include/assert.h
-callback.o: callback.cc rpc++/callback.h
diff --git a/rpc++/COPYING b/rpc++/COPYING
deleted file mode 100644
index eb685a5ec98..00000000000
--- a/rpc++/COPYING
+++ /dev/null
@@ -1,481 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/rpc++/Makefile b/rpc++/Makefile
deleted file mode 100644
index 6b4819d2b7a..00000000000
--- a/rpc++/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-TOP = .
-SUBDIRS = StdHdrs example
-
-INSTROOT = ../..
-
-CC = gcc
-CFLAGS = -ggdb
-C++FLAGS = $(CFLAGS)
-
-LIBHDRS = rpc++/xdr++.h rpc++/request.h rpc++/service.h rpc++/stub.h \
-	  rpc++/callback.h version.h
-LIBSRCS = xdr++.cc service.cc stub.cc request.cc callback.cc
-
-LIBOBJS = $(LIBSRCS:%.cc=%.o) $(GENSRCS:%.cc=%.o)
-
-all:: librpc++.a
-
-subdirs.all:: librpc++.a
-
-librpc++.a: $(LIBOBJS)
-	rm -f $@
-	ar cq $@ $(LIBOBJS)
-	if [ -x /bin/ranlib -o -x /usr/bin/ranlib ]; then ranlib $@; fi
-
-install:: librpc++.a
-	install -d $(INSTROOT)/lib
-	if cmp -s librpc++.a $(INSTROOT)/lib/librpc++.a; then : ; \
-	else rm -f $(INSTROOT)/lib/librpc++.a; \
-	  cp -p librpc++.a $(INSTROOT)/lib; \
-	  chmod 444 $(INSTROOT)/lib/librpc++.a; \
-	  for f in rpc++/*.h; do \
-	    rm -f $(INSTROOT)/include/$$f; done; fi
-	install -d $(INSTROOT)/include/rpc++
-	for f in rpc++/*.h; do \
-	  cmp -s $$f $(INSTROOT)/include/$$f \
-	  || install -c -m 444 $$f $(INSTROOT)/include/rpc++; done
-
-DISTLIST = Makefile README.ORIG README COPYING Proj.make rpc++.texi \
-	   gcc-2.2.2.fix $(LIBHDRS) $(LIBSRCS)
-
-clean::
-	rm -f $(CLEANWILDCARDS) librpc++.a
-
-include .dependencies
-
-.dependencies: $(LIBHDRS) $(LIBSRCS)
-	gcc -M $(CPPFLAGS) $(LIBSRCS) > .dependencies
-
-distlist::
-	@for f in *.[ch] *.cc; do \
-	  if expr " $(DISTLIST) " : ".* $$f " >/dev/null; then : ; \
-	  else echo 1>&2 "Warning: c- or h-file \"$$f\" not in DISTLIST"; fi; \
-	done
-
-include $(TOP)/Proj.make
diff --git a/rpc++/Proj.make b/rpc++/Proj.make
deleted file mode 100644
index af50f2f11bf..00000000000
--- a/rpc++/Proj.make
+++ /dev/null
@@ -1,68 +0,0 @@
-# These are included in every Makefile in the project
-
-CWDPATH = .
-CLEANWILDCARDS = core *~ *.o
-VERYCLEANWILDCARDS = core *~ *.o
-TEXCLEANWILDCARD = *~ *.aux *.log *.bbl *.blg *.toc *.idx *.ind
-TEXVERYCLEANWILDCARD = $(TEXCLEANWILDCARD) *.dvi
-ifndef SUBDIRS
-SUBDIRS =
-endif
-
-# Doing all always means doing the subdirs.
-# Make subdirs.all a target to allow forced processing
-ifneq ("$(SUBDIRS)", "")
-ifneq ("$(SUBDIRSALL)", "NO")
-all:: subdirs.all
-endif
-
-subdirs.all::
-	@for d in $(SUBDIRS); do \
-	  (cd $$d; \
-	   smflags=$(SUBMFLAGS); \
-	   echo "Making all in $$d with flags: $$smflags ..." ; \
-	   echo "cd `pwd`"; \
-	   $(MAKE) $$smflags all); done; \
-	echo "cd `pwd`"
-else
-all::;
-endif
-
-ifneq ("$(SUBDIRS)", "")
-clean:: subdirs.clean
-
-subdirs.clean::
-	@for d in $(SUBDIRS); do \
-	  echo "Cleaning all in $$d..." ; \
-	  (cd $$d; $(MAKE) clean); done
-else
-clean::;
-endif
-
-ifneq ("$(SUBDIRS)", "")
-veryclean:: subdirs.veryclean
-
-subdirs.veryclean::
-	@for d in $(SUBDIRS); do \
-	  echo "Verycleaning all in $$d..." ; \
-	  (cd $$d; $(MAKE) veryclean); done
-else
-veryclean::;
-endif
-
-# dist.list prints a list of files to be included in the distribution
-distlist::
-ifneq ("$(DISTLIST)", "")
-	@for f in $(DISTLIST); do \
-	  echo $(CWDPATH)/$$f; done
-endif
-ifneq ("$(SUBDIRS)", "")
-ifneq ("$(SUBDIRSDIST)", "NO")
-	@for d in $(SUBDIRS); do \
-	  (cd $$d; $(MAKE) distlist CWDPATH=$(CWDPATH)/$$d); done
-endif
-endif
-ifeq ("$(DISTLIST)$(SUBDIRS)","")
-	
-endif
-
diff --git a/rpc++/README b/rpc++/README
deleted file mode 100644
index bede31dd376..00000000000
--- a/rpc++/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This directory contains the sources for a C++ interface to Sun RPCs.
-
-As far as I remember, I got the original sources of the rpc++-library
-from some newsgroup, though I don't remember which one. I liked the
-basic idea but disliked several aspects of the interface details. So I
-adapted it to my likes. I intended some minor changes but soon found
-myself renaming classes, changing method parameters, introducing new
-classes, etc. The result is by no way compatible with the original
-version. It is, I hope, nevertheless useful.
-
-The current version 2.2 of the rpc++ library updates the version 2.1
-posted in March 1991. It is the reaction to gcc-2.2 that finally
-allows a sufficiently reliable use of templates (almost, see
-Installation in rpc++.texi)
-
-Michael Lipp
-
-<mnl@dtro.e-technik.th-darmstadt.de>
diff --git a/rpc++/README.ORIG b/rpc++/README.ORIG
deleted file mode 100644
index 60aa3f121e1..00000000000
--- a/rpc++/README.ORIG
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory contains a collection of classes that provide an
-interface to SUN's RPCs. I dubbed the collection the rpc++-library. It
-has been tested with gcc-1.40 on a SparcStation running SunOS 4.0.
-
-There is no documentation. Look at the example in ./example.
-
-Peter Berens
-
-
diff --git a/rpc++/StdHdrs/Makefile b/rpc++/StdHdrs/Makefile
deleted file mode 100644
index 404499ce0cc..00000000000
--- a/rpc++/StdHdrs/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP = ..
-SUBDIRS = rpc
-SUBDIRSALL = NO
-SUBDIRSDIST = NO
-
-all::
-
-clean::
-	rm -f $(CLEANWILDCARDS)
-
-DISTLIST = Makefile README $(wildcard rpc/*.h)
-
-include $(TOP)/Proj.make
diff --git a/rpc++/StdHdrs/README b/rpc++/StdHdrs/README
deleted file mode 100644
index c9f9f5e20e5..00000000000
--- a/rpc++/StdHdrs/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains some of Sun's rpc headers that have been fixed
-(though not thoroughly) to work with ANSI C and C++. I have installed
-them in my standard C include path.
diff --git a/rpc++/StdHdrs/rpc/auth.h b/rpc++/StdHdrs/rpc/auth.h
deleted file mode 100644
index 82b22c76b29..00000000000
--- a/rpc++/StdHdrs/rpc/auth.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* @(#)auth.h	2.3 88/08/07 4.0 RPCSRC; from 1.17 88/02/08 SMI */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * auth.h, Authentication interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The data structures are completely opaque to the client.  The client
- * is required to pass a AUTH * to routines that create rpc
- * "sessions".
- */
-
-
-#ifndef _rpc_auth_h
-#define	_rpc_auth_h
-
-#define	MAX_AUTH_BYTES	400
-#define	MAXNETNAMELEN	255	/* maximum length of network user's name */
-
-/*
- * Status returned from authentication check
- */
-enum auth_stat {
-	AUTH_OK=0,
-	/*
-	 * failed at remote end
-	 */
-	AUTH_BADCRED=1,			/* bogus credentials (seal broken) */
-	AUTH_REJECTEDCRED=2,		/* client should begin new session */
-	AUTH_BADVERF=3,			/* bogus verifier (seal broken) */
-	AUTH_REJECTEDVERF=4,		/* verifier expired or was replayed */
-	AUTH_TOOWEAK=5,			/* rejected due to security reasons */
-	/*
-	 * failed locally
-	*/
-	AUTH_INVALIDRESP=6,		/* bogus response verifier */
-	AUTH_FAILED=7			/* some unknown reason */
-};
-
-#if (__mc68000__ || __sparc__ || __vax__ || __i386__)
-typedef u_long u_int32;	/* 32-bit unsigned integers */
-#endif
-
-union des_block {
-	struct {
-		u_int32 high;
-		u_int32 low;
-	} key;
-	char c[8];
-};
-typedef union des_block des_block;
-extern bool_t xdr_des_block();
-
-/*
- * Authentication info.  Opaque to client.
- */
-struct opaque_auth {
-	enum_t	oa_flavor;		/* flavor of auth */
-	caddr_t	oa_base;		/* address of more auth stuff */
-	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
-};
-
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct {
-	struct	opaque_auth	ah_cred;
-	struct	opaque_auth	ah_verf;
-	union	des_block	ah_key;
-	struct auth_ops {
-		void	(*ah_nextverf)();
-		int	(*ah_marshal)();	/* nextverf & serialize */
-		int	(*ah_validate)();	/* validate varifier */
-		int	(*ah_refresh)();	/* refresh credentials */
-		void	(*ah_destroy)();	/* destroy this structure */
-	} *ah_ops;
-	caddr_t ah_private;
-} AUTH;
-
-
-/*
- * Authentication ops.
- * The ops and the auth handle provide the interface to the authenticators.
- *
- * AUTH	*auth;
- * XDR	*xdrs;
- * struct opaque_auth verf;
- */
-#define AUTH_NEXTVERF(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-#define auth_nextverf(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-
-#define AUTH_MARSHALL(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-#define auth_marshall(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-
-#define AUTH_VALIDATE(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-#define auth_validate(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-
-#define AUTH_REFRESH(auth)		\
-		((*((auth)->ah_ops->ah_refresh))(auth))
-#define auth_refresh(auth)		\
-		((*((auth)->ah_ops->ah_refresh))(auth))
-
-#define AUTH_DESTROY(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-#define auth_destroy(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-
-
-extern struct opaque_auth _null_auth;
-
-
-/*
- * These are the various implementations of client side authenticators.
- */
-
-/*
- * Unix style authentication
- * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
- *	char *machname;
- *	int uid;
- *	int gid;
- *	int len;
- *	int *aup_gids;
- */
-extern AUTH *authunix_create();
-extern AUTH *authunix_create_default();	/* takes no parameters */
-extern AUTH *authnone_create();		/* takes no parameters */
-extern AUTH *authdes_create();
-
-#define AUTH_NONE	0		/* no authentication */
-#define	AUTH_NULL	0		/* backward compatibility */
-#define	AUTH_UNIX	1		/* unix style (uid, gids) */
-#define	AUTH_SHORT	2		/* short hand unix style */
-#define	AUTH_DES	3		/* des style (encrypted timestamps) */
-
-#endif /*!_rpc_auth_h*/
diff --git a/rpc++/StdHdrs/rpc/c_types.h b/rpc++/StdHdrs/rpc/c_types.h
deleted file mode 100644
index eac882f1082..00000000000
--- a/rpc++/StdHdrs/rpc/c_types.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef _rpc_c_types_h_
-#define _rpc_c_types_h_
-
-#if defined(__cplusplus)
-    /*
-     * Definitions for C++ 2.0 and later require extern "C" { decl; }
-     */
-#   define EXTERN_FUNCTION( rtn, args ) extern "C" { rtn args; }
-#   define FUN_ARGS( args ) args
-#   define STRUCT_TAG( tag_name ) /* the tag disappears */
-#   define ENUM_BITFIELD( enum_type ) unsigned
-#   define ENUM_TYPE( enum_sp, enum_ty ) enum_ty
-
-#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
-#   define NAME_CONFLICT( name ) _##name
-#else
-#   define NAME_CONFLICT( name ) _/**/name
-#endif
-
-#   define DOTDOTDOT ...
-#   define _VOID_ /* anachronism */
-#   define CONST const
-
-/*
- * This is not necessary for 2.0 since 2.0 has corrected the void (*) () problem
- */
-typedef void (*_PFV_)();
-typedef int (*_PFI_)();
-
-#elif defined(c_plusplus)
-    /*
-     * Definitions for C++ 1.2
-     */
-#   define EXTERN_FUNCTION( rtn, args ) rtn args
-#   define FUN_ARGS( args ) args
-#   define STRUCT_TAG( tag_name )  /* the tag disappears */
-#   define ENUM_BITFIELD( enum_type ) unsigned
-#   define ENUM_TYPE( enum_sp, enum_ty ) enum_ty
-#   define NAME_CONFLICT( name ) _/**/name
-#   define DOTDOTDOT ...
-#   define _VOID_ /* anachronism */
-#   define CONST const 
-
-typedef void (*_PFV_)();
-typedef int (*_PFI_)();
-
-#elif defined(__STDC__)
-    /*
-     * Definitions for ANSI C
-     */
-#   define EXTERN_FUNCTION( rtn, args ) rtn args
-#   define FUN_ARGS( args ) args
-#   define STRUCT_TAG( tag_name ) tag_name
-#   define ENUM_BITFIELD( enum_type ) unsigned
-#   define ENUM_TYPE( enum_sp, enum_ty ) enum_sp enum_ty
-#   define NAME_CONFLICT( name ) name
-#   define DOTDOTDOT ...
-#   define _VOID_ void
-#   define CONST   
-
-#else
-    /*
-     * Definitions for Sun/K&R C -- ignore function prototypes,
-     * but preserve tag names and enum bitfield declarations.
-     */
-#   define EXTERN_FUNCTION( rtn, args ) rtn()
-#   define FUN_ARGS( args ) ()
-#   define STRUCT_TAG( tag_name ) tag_name
-#   define ENUM_BITFIELD( enum_type ) enum_type
-#   define ENUM_TYPE( enum_sp, enum_ty ) enum_sp enum_ty
-#   define NAME_CONFLICT( name ) name
-#   define DOTDOTDOT
-#   define _VOID_
-    /* VOID is only used where it disappears anyway */
-#   define CONST   
-
-#endif /* Which type of C/C++ compiler are we using? */
-
-#endif
diff --git a/rpc++/StdHdrs/rpc/clnt.h b/rpc++/StdHdrs/rpc/clnt.h
deleted file mode 100644
index 4cb303bc1eb..00000000000
--- a/rpc++/StdHdrs/rpc/clnt.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/* @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC; from 1.31 88/02/08 SMI*/
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * clnt.h - Client side remote procedure call interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _rpc_clnt_h
-#define	_rpc_clnt_h
-
-/*
- * Rpc calls return an enum clnt_stat.  This should be looked at more,
- * since each implementation is required to live with this (implementation
- * independent) list of errors.
- */
-enum clnt_stat {
-	RPC_SUCCESS=0,			/* call succeeded */
-	/*
-	 * local errors
-	 */
-	RPC_CANTENCODEARGS=1,		/* can't encode arguments */
-	RPC_CANTDECODERES=2,		/* can't decode results */
-	RPC_CANTSEND=3,			/* failure in sending call */
-	RPC_CANTRECV=4,			/* failure in receiving result */
-	RPC_TIMEDOUT=5,			/* call timed out */
-	/*
-	 * remote errors
-	 */
-	RPC_VERSMISMATCH=6,		/* rpc versions not compatible */
-	RPC_AUTHERROR=7,		/* authentication error */
-	RPC_PROGUNAVAIL=8,		/* program not available */
-	RPC_PROGVERSMISMATCH=9,		/* program version mismatched */
-	RPC_PROCUNAVAIL=10,		/* procedure unavailable */
-	RPC_CANTDECODEARGS=11,		/* decode arguments error */
-	RPC_SYSTEMERROR=12,		/* generic "other problem" */
-
-	/*
-	 * callrpc & clnt_create errors
-	 */
-	RPC_UNKNOWNHOST=13,		/* unknown host name */
-	RPC_UNKNOWNPROTO=17,		/* unkown protocol */
-
-	/*
-	 * _ create errors
-	 */
-	RPC_PMAPFAILURE=14,		/* the pmapper failed in its call */
-	RPC_PROGNOTREGISTERED=15,	/* remote program is not registered */
-	/*
-	 * unspecified error
-	 */
-	RPC_FAILED=16
-};
-
-
-/*
- * Error info.
- */
-struct rpc_err {
-	enum clnt_stat re_status;
-	union {
-		int RE_errno;		/* realated system error */
-		enum auth_stat RE_why;	/* why the auth error occurred */
-		struct {
-			u_long low;	/* lowest verion supported */
-			u_long high;	/* highest verion supported */
-		} RE_vers;
-		struct {		/* maybe meaningful if RPC_FAILED */
-			long s1;
-			long s2;
-		} RE_lb;		/* life boot & debugging only */
-	} ru;
-#define	re_errno	ru.RE_errno
-#define	re_why		ru.RE_why
-#define	re_vers		ru.RE_vers
-#define	re_lb		ru.RE_lb
-};
-
-
-/*
- * Client rpc handle.
- * Created by individual implementations, see e.g. rpc_udp.c.
- * Client is responsible for initializing auth, see e.g. auth_none.c.
- */
-typedef struct {
-	AUTH	*cl_auth;			/* authenticator */
-	struct clnt_ops {
-		enum clnt_stat	(*cl_call)(DOTDOTDOT);	/* call remote procedure */
-		void		(*cl_abort)(DOTDOTDOT);	/* abort a call */
-		void		(*cl_geterr)(DOTDOTDOT);	/* get specific error code */
-		bool_t		(*cl_freeres)(DOTDOTDOT); /* frees results */
-		void		(*cl_destroy)(DOTDOTDOT);/* destroy this structure */
-		bool_t          (*cl_control)(DOTDOTDOT);/* the ioctl() of rpc */
-	} *cl_ops;
-	caddr_t			cl_private;	/* private stuff */
-} CLIENT;
-
-
-/*
- * client side rpc interface ops
- *
- * Parameter types are:
- *
- */
-
-/*
- * enum clnt_stat
- * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
- * 	CLIENT *rh;
- *	u_long proc;
- *	xdrproc_t xargs;
- *	caddr_t argsp;
- *	xdrproc_t xres;
- *	caddr_t resp;
- *	struct timeval timeout;
- */
-#define	CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs)	\
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, argsp, xres, resp, secs))
-#define	clnt_call(rh, proc, xargs, argsp, xres, resp, secs)	\
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, argsp, xres, resp, secs))
-
-/*
- * void
- * CLNT_ABORT(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_ABORT(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-#define	clnt_abort(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-
-/*
- * struct rpc_err
- * CLNT_GETERR(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_GETERR(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-#define	clnt_geterr(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-
-
-/*
- * bool_t
- * CLNT_FREERES(rh, xres, resp);
- * 	CLIENT *rh;
- *	xdrproc_t xres;
- *	caddr_t resp;
- */
-#define	CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-#define	clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-
-/*
- * bool_t
- * CLNT_CONTROL(cl, request, info)
- *      CLIENT *cl;
- *      u_int request;
- *      char *info;
- */
-#define	CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-#define	clnt_control(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-
-/*
- * control operations that apply to both udp and tcp transports
- */
-#define CLSET_TIMEOUT       1   /* set timeout (timeval) */
-#define CLGET_TIMEOUT       2   /* get timeout (timeval) */
-#define CLGET_SERVER_ADDR   3   /* get server's address (sockaddr) */
-/*
- * udp only control operations
- */
-#define CLSET_RETRY_TIMEOUT 4   /* set retry timeout (timeval) */
-#define CLGET_RETRY_TIMEOUT 5   /* get retry timeout (timeval) */
-
-/*
- * void
- * CLNT_DESTROY(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_DESTROY(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-#define	clnt_destroy(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-
-
-/*
- * RPCTEST is a test program which is accessable on every rpc
- * transport/port.  It is used for testing, performance evaluation,
- * and network administration.
- */
-
-#define RPCTEST_PROGRAM		((u_long)1)
-#define RPCTEST_VERSION		((u_long)1)
-#define RPCTEST_NULL_PROC	((u_long)2)
-#define RPCTEST_NULL_BATCH_PROC	((u_long)3)
-
-/*
- * By convention, procedure 0 takes null arguments and returns them
- */
-
-#define NULLPROC ((u_long)0)
-
-/*
- * Below are the client handle creation routines for the various
- * implementations of client side rpc.  They can return NULL if a 
- * creation failure occurs.
- */
-
-/*
- * Memory based rpc (for speed check and testing)
- * CLIENT *
- * clntraw_create(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-EXTERN_FUNCTION(CLIENT *clntraw_create, (u_long prog, u_long vers));
-
-
-/*
- * Generic client creation routine. Supported protocols are "udp" and "tcp"
- */
-EXTERN_FUNCTION(CLIENT *
-clnt_create, (char* host, u_long prog, u_long vers, char* prot));
-/*
-	char *host; 	-- hostname
-	u_long prog;	-- program number
-	u_long vers;	-- version number
-	char *prot;	-- protocol
-*/
-
-
-
-
-/*
- * TCP based rpc
- * CLIENT *
- * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long prog;
- *	u_long version;
- *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-EXTERN_FUNCTION(CLIENT *clnttcp_create, (struct sockaddr_in *raddr,
-					 u_long prog,
-					 u_long version,
-					 register int *sockp,
-					 u_int sendsz,
-					 u_int recvsz));
-
-/*
- * UDP based rpc.
- * CLIENT *
- * clntudp_create(raddr, program, version, wait, sockp)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *
- * Same as above, but you specify max packet sizes.
- * CLIENT *
- * clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-EXTERN_FUNCTION(CLIENT *clntudp_create, (struct sockaddr_in *raddr,
-					 u_long program,
-					 u_long version,
-					 struct timeval wait,
-					 int *sockp));
-EXTERN_FUNCTION(CLIENT *clntudp_bufcreate, (struct sockaddr_in *raddr,
-					    u_long program,
-					    u_long version,
-					    struct timeval wait,
-					    int *sockp,
-					    u_int sendsz,
-					    u_int recvsz));
-
-/*
- * Print why creation failed
- */
-EXTERN_FUNCTION(void clnt_pcreateerror, (char *msg));	/* stderr */
-EXTERN_FUNCTION(char *clnt_spcreateerror, (char *msg));	/* string */
-
-/*
- * Like clnt_perror(), but is more verbose in its output
- */
-EXTERN_FUNCTION(void clnt_perrno, (enum clnt_stat num)); /* stderr */
-
-/*
- * Print an English error message, given the client error code
- */
-EXTERN_FUNCTION(void clnt_perror, (CLIENT *clnt, char *msg)); 	/* stderr */
-EXTERN_FUNCTION(char *clnt_sperror, (CLIENT *clnt, char *msg));	/* string */
-
-/* 
- * If a creation fails, the following allows the user to figure out why.
- */
-struct rpc_createerr {
-	enum clnt_stat cf_stat;
-	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
-};
-
-extern struct rpc_createerr rpc_createerr;
-
-
-
-/*
- * Copy error message to buffer.
- */
-EXTERN_FUNCTION(char *clnt_sperrno, (enum clnt_stat num));	/* string */
-
-
-
-#define UDPMSGSIZE	8800	/* rpc imposed limit on udp msg size */
-#define RPCSMALLMSGSIZE	400	/* a more reasonable packet size */
-
-#endif /*!_rpc_clnt_h*/
diff --git a/rpc++/StdHdrs/rpc/pmap_clnt.h b/rpc++/StdHdrs/rpc/pmap_clnt.h
deleted file mode 100644
index 0a209e4f00f..00000000000
--- a/rpc++/StdHdrs/rpc/pmap_clnt.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC; from 1.11 88/02/08 SMI */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * pmap_clnt.h
- * Supplies C routines to get to portmap services.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * Usage:
- *	success = pmap_set(program, version, protocol, port);
- *	success = pmap_unset(program, version);
- *	port = pmap_getport(address, program, version, protocol);
- *	head = pmap_getmaps(address);
- *	clnt_stat = pmap_rmtcall(address, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, port_ptr)
- *		(works for udp only.) 
- * 	clnt_stat = clnt_broadcast(program, version, procedure,
- *		xdrargs, argsp,	xdrres, resp, eachresult)
- *		(like pmap_rmtcall, except the call is broadcasted to all
- *		locally connected nets.  For each valid response received,
- *		the procedure eachresult is called.  Its form is:
- *	done = eachresult(resp, raddr)
- *		bool_t done;
- *		caddr_t resp;
- *		struct sockaddr_in raddr;
- *		where resp points to the results of the call and raddr is the
- *		address if the responder to the broadcast.
- */
-
-#ifndef _rpc_pmap_clnt_h
-#define	_rpc_pmap_clnt_h
-
-#include <rpc/c_types.h>
-
-EXTERN_FUNCTION(bool_t		pmap_set, (u_long prognum, u_long versnum, 
-					   int protocol, u_short port));
-EXTERN_FUNCTION(bool_t		pmap_unset, (u_long prognum, u_long versnum));
-EXTERN_FUNCTION(struct pmaplist	*pmap_getmaps, (struct sockaddr_in *addr));
-EXTERN_FUNCTION(enum clnt_stat pmap_rmtcall, (struct sockaddr_in *addr,
-					      u_long prognum, u_long versnum,
-					      u_long procnum,
-					      char *in, char *out,
-					      xdrproc_t inproc, 
-					      xdrproc_t outproc,
-					      struct timeval timeout,
-					      u_long *portp));
-EXTERN_FUNCTION(enum clnt_stat		clnt_broadcast, ());
-EXTERN_FUNCTION(u_short		pmap_getport, (struct sockaddr_in *addr,
-					       u_long prognum, u_long versnum,
-					       u_long protocol));
-
-#endif /*!_rpc_pmap_clnt_h*/
diff --git a/rpc++/StdHdrs/rpc/svc.h b/rpc++/StdHdrs/rpc/svc.h
deleted file mode 100644
index 4e551e55fd5..00000000000
--- a/rpc++/StdHdrs/rpc/svc.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* @(#)svc.h	2.2 88/07/29 4.0 RPCSRC; from 1.20 88/02/08 SMI */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * svc.h, Server-side remote procedure call interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _rpc_svc_h
-#define	_rpc_svc_h
-
-#include <rpc/pmap_clnt.h>
-
-/*
- * This interface must manage two items concerning remote procedure calling:
- *
- * 1) An arbitrary number of transport connections upon which rpc requests
- * are received.  The two most notable transports are TCP and UDP;  they are
- * created and registered by routines in svc_tcp.c and svc_udp.c, respectively;
- * they in turn call xprt_register and xprt_unregister.
- *
- * 2) An arbitrary number of locally registered services.  Services are
- * described by the following four data: program number, version number,
- * "service dispatch" function, a transport handle, and a boolean that
- * indicates whether or not the exported program should be registered with a
- * local binder service;  if true the program's number and version and the
- * port number from the transport handle are registered with the binder.
- * These data are registered with the rpc svc system via svc_register.
- *
- * A service's dispatch function is called whenever an rpc request comes in
- * on a transport.  The request's program and version numbers must match
- * those of the registered service.  The dispatch function is passed two
- * parameters, struct svc_req * and SVCXPRT *, defined below.
- */
-
-enum xprt_stat {
-	XPRT_DIED,
-	XPRT_MOREREQS,
-	XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct {
-	int		xp_sock;
-	u_short		xp_port;	 /* associated port number */
-	struct xp_ops {
-	    bool_t	(*xp_recv)(DOTDOTDOT);	 /* receive incomming requests */
-	    enum xprt_stat (*xp_stat)(DOTDOTDOT); /* get transport status */
-	    bool_t	(*xp_getargs)(DOTDOTDOT); /* get arguments */
-	    bool_t	(*xp_reply)(DOTDOTDOT);	 /* send reply */
-	    bool_t	(*xp_freeargs)(DOTDOTDOT);/* free mem allocated for args */
-	    void	(*xp_destroy)(DOTDOTDOT); /* destroy this struct */
-	} *xp_ops;
-	int		xp_addrlen;	 /* length of remote address */
-	struct sockaddr_in xp_raddr;	 /* remote address */
-	struct opaque_auth xp_verf;	 /* raw response verifier */
-	caddr_t		xp_p1;		 /* private */
-	caddr_t		xp_p2;		 /* private */
-} SVCXPRT;
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getcaller(x) (&(x)->xp_raddr)
-
-/*
- * Operations defined on an SVCXPRT handle
- *
- * SVCXPRT		*xprt;
- * struct rpc_msg	*msg;
- * xdrproc_t		 xargs;
- * caddr_t		 argsp;
- */
-#define SVC_RECV(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-#define svc_recv(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-
-#define SVC_STAT(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-#define svc_stat(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-
-#define SVC_GETARGS(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-#define svc_getargs(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-
-#define SVC_REPLY(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-#define svc_reply(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-
-#define SVC_FREEARGS(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-#define svc_freeargs(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-
-#define SVC_DESTROY(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-#define svc_destroy(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-
-
-/*
- * Service request
- */
-struct svc_req {
-	u_long		rq_prog;	/* service program number */
-	u_long		rq_vers;	/* service protocol version */
-	u_long		rq_proc;	/* the desired procedure */
-	struct opaque_auth rq_cred;	/* raw creds from the wire */
-	caddr_t		rq_clntcred;	/* read only cooked cred */
-	SVCXPRT	*rq_xprt;		/* associated transport */
-};
-
-
-/*
- * Service registration
- *
- * svc_register(xprt, prog, vers, dispatch, protocol)
- *	SVCXPRT *xprt;
- *	u_long prog;
- *	u_long vers;
- *	void (*dispatch)();
- *	int protocol;   like TCP or UDP, zero means do not register
- */
-EXTERN_FUNCTION(bool_t svc_register, (SVCXPRT *xprt, u_long prog, u_long vers,
-				      void (*dispatch)(struct svc_req *,
-						       SVCXPRT*),
-				      int protocol));
-
-/*
- * Service un-registration
- *
- * svc_unregister(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-EXTERN_FUNCTION(void* svc_unregister, (u_long prog, u_long vers));
-
-/*
- * Transport registration.
- *
- * xprt_register(xprt)
- *	SVCXPRT *xprt;
- */
-EXTERN_FUNCTION(void xprt_register, (SVCXPRT* xprt));
-
-/*
- * Transport un-register
- *
- * xprt_unregister(xprt)
- *	SVCXPRT *xprt;
- */
-EXTERN_FUNCTION(void xprt_unregister, (SVCXPRT* xprt));
-
-
-
-
-/*
- * When the service routine is called, it must first check to see if it
- * knows about the procedure;  if not, it should call svcerr_noproc
- * and return.  If so, it should deserialize its arguments via 
- * SVC_GETARGS (defined above).  If the deserialization does not work,
- * svcerr_decode should be called followed by a return.  Successful
- * decoding of the arguments should be followed the execution of the
- * procedure's code and a call to svc_sendreply.
- *
- * Also, if the service refuses to execute the procedure due to too-
- * weak authentication parameters, svcerr_weakauth should be called.
- * Note: do not confuse access-control failure with weak authentication!
- *
- * NB: In pure implementations of rpc, the caller always waits for a reply
- * msg.  This message is sent when svc_sendreply is called.  
- * Therefore pure service implementations should always call
- * svc_sendreply even if the function logically returns void;  use
- * xdr.h - xdr_void for the xdr routine.  HOWEVER, tcp based rpc allows
- * for the abuse of pure rpc via batched calling or pipelining.  In the
- * case of a batched call, svc_sendreply should NOT be called since
- * this would send a return message, which is what batching tries to avoid.
- * It is the service/protocol writer's responsibility to know which calls are
- * batched and which are not.  Warning: responding to batch calls may
- * deadlock the caller and server processes!
- */
-
-EXTERN_FUNCTION(bool_t svc_sendreply, (SVCXPRT *xprt,xdrproc_t outproc,
-				       char *out));
-EXTERN_FUNCTION(void	svcerr_decode, (SVCXPRT *xprt));
-EXTERN_FUNCTION(void	svcerr_weakauth, (SVCXPRT *xprt));
-EXTERN_FUNCTION(void	svcerr_noproc, (SVCXPRT *xprt));
-EXTERN_FUNCTION(void	svcerr_progvers, (SVCXPRT *xprt));
-EXTERN_FUNCTION(void	svcerr_auth, (SVCXPRT *xprt, enum auth_stat why));
-EXTERN_FUNCTION(void	svcerr_noprog, (SVCXPRT *xprt));
-EXTERN_FUNCTION(void	svcerr_systemerr, (SVCXPRT *xprt));
-
-/*
- * Lowest level dispatching -OR- who owns this process anyway.
- * Somebody has to wait for incoming requests and then call the correct
- * service routine.  The routine svc_run does infinite waiting; i.e.,
- * svc_run never returns.
- * Since another (co-existant) package may wish to selectively wait for
- * incoming calls or other events outside of the rpc architecture, the
- * routine svc_getreq is provided.  It must be passed readfds, the
- * "in-place" results of a select system call (see select, section 2).
- */
-
-/*
- * Global keeper of rpc service descriptors in use
- * dynamic; must be inspected before each call to select 
- */
-#ifdef FD_SETSIZE
-extern fd_set svc_fdset;
-#define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
-#else
-extern int svc_fds;
-#endif /* def FD_SETSIZE */
-
-/*
- * a small program implemented by the svc_rpc implementation itself;
- * also see clnt.h for protocol numbers.
- */
-EXTERN_FUNCTION(void rpctest_service, ());
-EXTERN_FUNCTION(void	svc_getreq, (int rdfds));
-EXTERN_FUNCTION(void	svc_getreqset, (fd_set *rdfdsp)); /* takes fdset instead of int */
-EXTERN_FUNCTION(void	svc_run, ());		/* never returns */
-
-/*
- * Socket to use on svcxxx_create call to get default socket
- */
-#define	RPC_ANYSOCK	-1
-
-/*
- * These are the existing service side transport implementations
- */
-
-/*
- * Memory based rpc for testing and timing.
- */
-EXTERN_FUNCTION(SVCXPRT *svcraw_create, ());
-
-/*
- * Udp based rpc.
- */
-EXTERN_FUNCTION(SVCXPRT *svcudp_create, (int sock));
-EXTERN_FUNCTION(SVCXPRT *svcudp_bufcreate, (int sock, u_int sendsz,
-					    u_int recvsz));
-
-/*
- * Tcp based rpc.
- */
-EXTERN_FUNCTION(SVCXPRT *svctcp_create, (int fd, u_int sendsz, u_int recvsz));
-
-
-
-#endif /*!_rpc_svc_h*/
diff --git a/rpc++/StdHdrs/rpc/xdr.h b/rpc++/StdHdrs/rpc/xdr.h
deleted file mode 100644
index 25fb07fe68a..00000000000
--- a/rpc++/StdHdrs/rpc/xdr.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*      @(#)xdr.h 1.19 87/04/22 SMI      */
-
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _rpc_xdr_h
-#define	_rpc_xdr_h
-
-#include <rpc/c_types.h>
-
-#include <rpc/types.h>
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation.  Library supplied
- * routines provide for the conversion on built-in C data types.  These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- *	bool_t
- *	xdrproc(xdrs, argresp)
- *		XDR *xdrs;
- *		<type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted.  argresp is a pointer to the structure to be
- * converted.  The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null.  This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations.  XDR_ENCODE causes the type to be encoded into the
- * stream.  XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-	XDR_ENCODE=0,
-	XDR_DECODE=1,
-	XDR_FREE=2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT	(4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
-		    * BYTES_PER_XDR_UNIT)
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the paticular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular impelementation.
- */
-typedef struct {
-	enum xdr_op	x_op;		/* operation; fast additional param */
-	struct xdr_ops {
-		bool_t	(*x_getlong)();	/* get a long from underlying stream */
-		bool_t	(*x_putlong)();	/* put a long to " */
-		bool_t	(*x_getbytes)();/* get some bytes from " */
-		bool_t	(*x_putbytes)();/* put some bytes to " */
-		u_int	(*x_getpostn)();/* returns bytes off from beginning */
-		bool_t  (*x_setpostn)();/* lets you reposition the stream */
-		long *	(*x_inline)();	/* buf quick ptr to buffered data */
-		void	(*x_destroy)();	/* free privates of this xdr_stream */
-	} *x_ops;
-	caddr_t 	x_public;	/* users' data */
-	caddr_t		x_private;	/* pointer to private data */
-	caddr_t 	x_base;		/* private used for position info */
-	int		x_handy;	/* extra private word */
-} XDR;
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded.  If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- * bool_t	(*xdrproc_t)(XDR *, caddr_t *);
- */
-typedef	bool_t (*xdrproc_t) FUN_ARGS((XDR*, void*));
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR		*xdrs;
- * long		*longp;
- * caddr_t	 addr;
- * u_int	 len;
- * u_int	 pos;
- */
-#define XDR_GETLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-
-#define XDR_GETBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define	XDR_INLINE(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define	xdr_inline(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define	XDR_DESTROY(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-#define	xdr_destroy(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer.  The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value.  If a match is found the associated xdr routine
- * is called to handle that part of the union.  If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-#define NULL_xdrproc_t ((xdrproc_t)0)
-struct xdr_discrim {
-	int	value;
-	xdrproc_t proc;
-};
-
-/*
- * In-line routines for fast encode/decode of primitve data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned.  The standard way to use these
- * is to say:
- *	if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- *		return (FALSE);
- *	<<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-#define IXDR_GET_LONG(buf)		((long)ntohl((u_long)*(buf)++))
-#define IXDR_PUT_LONG(buf, v)		(*(buf)++ = (long)htonl((u_long)v))
-
-#define IXDR_GET_BOOL(buf)		((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t)		((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_LONG(buf)		((u_long)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf)		((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf)		((u_short)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v)		IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_ENUM(buf, v)		IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_U_LONG(buf, v)		IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_SHORT(buf, v)		IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_U_SHORT(buf, v)	IXDR_PUT_LONG((buf), ((long)(v)))
-
-/*
- * These are the "generic" xdr routines.
- */
-EXTERN_FUNCTION(bool_t	xdr_void, ());
-EXTERN_FUNCTION(bool_t	xdr_int, ());
-EXTERN_FUNCTION(bool_t	xdr_u_int, ());
-EXTERN_FUNCTION(bool_t	xdr_long, ());
-EXTERN_FUNCTION(bool_t	xdr_u_long, ());
-EXTERN_FUNCTION(bool_t	xdr_short, ());
-EXTERN_FUNCTION(bool_t	xdr_u_short, ());
-EXTERN_FUNCTION(bool_t	xdr_bool, ());
-EXTERN_FUNCTION(bool_t	xdr_enum, ());
-EXTERN_FUNCTION(bool_t	xdr_array, ());
-EXTERN_FUNCTION(bool_t	xdr_bytes, ());
-EXTERN_FUNCTION(bool_t	xdr_opaque, ());
-EXTERN_FUNCTION(bool_t	xdr_string, ());
-EXTERN_FUNCTION(bool_t	xdr_union, ());
-EXTERN_FUNCTION(void	xdr_free, ());
-EXTERN_FUNCTION(bool_t	xdr_char, ());
-EXTERN_FUNCTION(bool_t	xdr_u_char, ());
-EXTERN_FUNCTION(bool_t	xdr_vector, ());
-EXTERN_FUNCTION(bool_t	xdr_float, ());
-EXTERN_FUNCTION(bool_t	xdr_double, ());
-EXTERN_FUNCTION(bool_t	xdr_reference, ());
-EXTERN_FUNCTION(bool_t	xdr_pointer, ());
-EXTERN_FUNCTION(bool_t	xdr_wrapstring, ());
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024 
-struct netobj {
-	u_int	n_len;
-	char	*n_bytes;
-};
-typedef struct netobj netobj;
-EXTERN_FUNCTION(bool_t	xdr_netobj, ());
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-EXTERN_FUNCTION(void	xdrmem_create, ());	/* XDR using memory buffers */
-EXTERN_FUNCTION(void	xdrstdio_create, ());	/* XDR using stdio library */
-EXTERN_FUNCTION(void	xdrrec_create, ());	/* XDR pseudo records for tcp */
-EXTERN_FUNCTION(bool_t	xdrrec_endofrecord, ());/* make end of xdr record */
-EXTERN_FUNCTION(int	xdrrec_readbytes, ());	/* like a read on a pipe */
-EXTERN_FUNCTION(bool_t	xdrrec_skiprecord, ());	/* move to beginning of next record */
-EXTERN_FUNCTION(bool_t	xdrrec_eof, ());	/* true if no more input */
-
-#endif /*!_rpc_xdr_h*/
diff --git a/rpc++/callback.cc b/rpc++/callback.cc
deleted file mode 100644
index 1758e8a0740..00000000000
--- a/rpc++/callback.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-static char _rpcpp_callback_cc_[]
-= "callback.cc,v 2.2 1992/06/15 19:12:37 mnl Exp";
-
-// callback.cc,v
-// Revision 2.2  1992/06/15  19:12:37  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:42  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "rpc++/callback.h"
-
diff --git a/rpc++/example/Makefile b/rpc++/example/Makefile
deleted file mode 100644
index 4abd7b4488f..00000000000
--- a/rpc++/example/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-TOP = ..
-SUBDIRS = 
-
-CC = gcc
-CPPFLAGS = -I..
-CFLAGS = -ggdb
-C++FLAGS = $(CFLAGS)
-# for Sun:
-#LOADLIBES = -L.. -lrpc++ -lg++
-# for ISC 2.2:
-LOADLIBES = -L.. -lrpc++ -lrpclib -lmisc -lg++ -linet -liberty
-
-HDRS = calcsvc.h
-SRCS = server.cc client.cc calcsvc.cc
-
-all:: server client
-
-server: server.o calcsvc.o
-	$(CC) -o $@ server.o calcsvc.o $(LOADLIBES)
-
-client: client.o calcsvc.o
-	$(CC) -o $@ client.o calcsvc.o ../request.o $(LOADLIBES)
-
-DISTLIST = Makefile $(HDRS) $(SRCS)
-
-clean::
-	rm -f $(CLEANWILDCARDS) server client
-
-include .dependencies
-
-.dependencies: $(HDRS) $(SRCS)
-	gcc -M $(CPPFLAGS) $(SRCS) > .dependencies
-
-distlist::
-	@for f in *.[ch] *.cc; do \
-	  if expr " $(DISTLIST) " : ".* $$f " >/dev/null; then : ; \
-	  else echo 1>&2 "Warning: c- or h-file \"$$f\" not in DISTLIST"; fi; \
-	done
-
-include $(TOP)/Proj.make
diff --git a/rpc++/example/calcsvc.cc b/rpc++/example/calcsvc.cc
deleted file mode 100644
index 6ed36594c61..00000000000
--- a/rpc++/example/calcsvc.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- c++ -*-
-static char _calcsvc_cc_[]
-= "calcsvc.cc,v 2.3 1992/06/15 19:13:13 mnl Exp";
-
-// calcsvc.cc,v
-// Revision 2.3  1992/06/15  19:13:13  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:28  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:45  mnl
-// Initial mnl version.
-//
-
-#include <stream.h>
-#include "calcsvc.h"
-
-XdrInfo& Xmyint = Xdr::Xint;
-
-RpcRequest CalcRequests::Add (1, &Xmyint, &Xdr::Xint, &Xdr::Xint);
-RpcRequest CalcRequests::Sub (2, &Xdr::Xint, &Xdr::Xint, &Xdr::Xint);
-RpcRequest CalcRequests::Times (3, &Xdr::Xint, &Xdr::Xint, &Xdr::Xint);
-RpcRequest CalcRequests::Div (4, &Xdr::Xint, &Xdr::Xint, &Xdr::Xint);
-RpcRequest CalcRequests::Inc (5, &Xdr::Xint, &Xdr::Xint);
-RpcRequest CalcRequests::IToA (6, &Xdr::Xwrapstring, &Xdr::Xint);
-RpcRequest CalcRequests::Reset (7, &Xdr::Xvoid);
-RpcRequest CalcRequests::Sleep (8, &Xdr::Xnull, &Xdr::Xint, RpcRequest::async);
-RpcRequest CalcRequests::Msg (9, &Xdr::Xvoid, &Xdr::Xwrapstring);
-RpcRequest CalcRequests::Invalid (100, &Xdr::Xvoid, &Xdr::Xvoid);
diff --git a/rpc++/example/calcsvc.h b/rpc++/example/calcsvc.h
deleted file mode 100644
index a70c10fadac..00000000000
--- a/rpc++/example/calcsvc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- c++ -*-
-#ifndef _CALCSERVICE_H_
-#define _CALCSERVICE_H_
-static char _calcsvc_h_[]
-= "calcsvc.h,v 2.3 1992/06/15 19:13:15 mnl Exp";
-
-// calcsvc.h,v
-// Revision 2.3  1992/06/15  19:13:15  mnl
-// Fixed a few bugs, clarified interface.
-//
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "rpc++/request.h"
-
-#define CALCSVC 0x20100001
-
-struct CalcRequests
-{
-  static RpcRequest Add;
-  static RpcRequest Sub;
-  static RpcRequest Times;
-  static RpcRequest Div;
-  static RpcRequest Inc;
-  static RpcRequest IToA;
-  static RpcRequest Reset; // for testing proc without args
-  static RpcRequest Sleep; // for testing async
-  static RpcRequest Msg;   // for testing string passing
-  static RpcRequest Invalid; // for testing error handling
-};
-
-#endif
diff --git a/rpc++/example/client.cc b/rpc++/example/client.cc
deleted file mode 100644
index f435de61da9..00000000000
--- a/rpc++/example/client.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- c++ -*-
-static char _client_cc_[]
-= "client.cc,v 2.3 1992/06/15 19:13:17 mnl Exp";
-
-// client.cc,v
-// Revision 2.3  1992/06/15  19:13:17  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:32  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:45  mnl
-// Initial mnl version.
-//
-
-#include <stream.h>
-#include "rpc++/stub.h"
-
-#include "calcsvc.h"
-
-class CalcStub : public RpcStub
-{
-public:
-  inline CalcStub (u_long prognum, u_long versnum,
-		   char* hostname = "localhost",
-		   timeval timeout = defaultTimeout, bool connect = TRUE)
-    : RpcStub (prognum, versnum, hostname, timeout, connect) {}
-
-  inline void Reset ()
-    { Call (CalcRequests::Reset); }
-  inline int Inc (int i)
-    { return *(int*)Call (CalcRequests::Inc, &i); }
-  inline char* IToA (int i)
-    { return *(char**)Call (CalcRequests::IToA, &i); }
-  inline int Add (int s1, int s2)
-    { return *(int*)Call (CalcRequests::Add, &s1, &s2); }
-
-  inline void Msg (char* msg)
-    { Call (CalcRequests::Msg, &msg); }
-  inline void Sleep (int secs)
-    { Call (CalcRequests::Sleep, &secs); }
-};
-
-main (int argc, char* argv[])
-{
-  char* server = argv[1];
-
-  CalcStub svc (CALCSVC, 1, server);
-  svc.Reset ();
-  svc.Msg ("Hello server.\n");
-  int i = 0, o;
-  while (i < 10)
-    {
-      o = svc.Inc (i);
-      cout << svc.IToA (o) << '\n';
-      i = o;
-    }
-  i = svc.Add (12, 23);
-  cout << "add (" << 12 << ", " << 23 << ") = " << i << endl;
-  cout << "Calling Sleep (5) asynchronously.\n";
-  svc.Sleep (5);
-  cout << "Sleep call completed.\n";
-  svc.Call (CalcRequests::Invalid);
-}
diff --git a/rpc++/example/server.cc b/rpc++/example/server.cc
deleted file mode 100644
index f57496c0674..00000000000
--- a/rpc++/example/server.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- c++ -*-
-static char _server_cc_[]
-= "server.cc,v 2.3 1992/06/15 19:13:18 mnl Exp";
-
-// server.cc,v
-// Revision 2.3  1992/06/15  19:13:18  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:33  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:45  mnl
-// Initial mnl version.
-//
-
-#include <unistd.h>
-#include <stream.h>
-#include <string.h>
-#include <malloc.h>
-
-#include "rpc++/service.h"
-#include "calcsvc.h"
-
-class Calc
-{
-public:
-  void* Add (void*, void*);
-  void* Sub (void*, void*);
-  void* Times (void*, void*);
-  void* Div (void*, void*);
-  void* Inc (void*);
-  void* IToA (void**);
-  void Reset (RpcService*);
-};
-
-void* Calc::Add (void* in1, void* in2)
-{
-  static int res;
-  res = *(int*)in1 + *(int*)in2;
-  return &res;
-}
-
-void* Calc::Sub (void* in1, void* in2)
-{
-  static int res;
-  res = *(int*)in1 - *(int*)in2;
-  return &res;
-}
-
-void* Calc::Times (void* in1, void* in2)
-{
-  static int res;
-  res = *(int*)in1 * *(int*)in2;
-  return &res;
-}
-
-void* Calc::Div (void* in1, void* in2)
-{
-  static int res;
-  res = *(int*)in1 / *(int*)in2;
-  return &res;
-}
-
-void* Calc::Inc (void* in)
-{
-  static int res;
-  res = *(int*)in + 1;
-  return &res;
-}
-
-void* Calc::IToA (void** in)
-{
-  static char *s = 0;
-  delete s;
-  char *t = form ("%d", *(int*)in[0]);
-  s = new char[strlen (t) + 1];
-  strcpy (s, t);
-  return &s;
-}
-
-void Calc::Reset (RpcService* svc)
-{
-  cout << "Received reset from " << svc->CallerName () << ".\n";
-}
-
-void printMessage (void* in)
-{
-  cout << *(char**)in;
-}
-
-void doSleep (void* in)
-{
-  cout << form ("Sleeping %d secs.\n", *(int*)in);
-  sleep (*(int*)in);
-  cout << "Woke up.\n";
-}
-
-main ()
-{
-  RpcService svc (CALCSVC, 1);
-  Calc calc;
-  svc.Register (CalcRequests::Add, RpcMethodCall<Calc> (&calc, &calc.Add));
-  svc.Register (CalcRequests::Sub, RpcMethodCall<Calc> (&calc, &calc.Sub));
-  svc.Register (CalcRequests::Times, RpcMethodCall<Calc> (&calc, &calc.Times));
-  svc.Register (CalcRequests::Div, RpcMethodCall<Calc> (&calc, &calc.Div));
-  svc.Register (CalcRequests::Inc, RpcMethodCall<Calc> (&calc, &calc.Inc));
-  svc.Register (CalcRequests::IToA,RpcMethodCall<Calc>(&calc, &calc.IToA));
-  svc.Register (CalcRequests::Reset, RpcMethodCall<Calc> (&calc, &calc.Reset));
-  svc.Register (CalcRequests::Msg, RpcCallback (printMessage));
-  svc.Register (CalcRequests::Sleep, RpcCallback (doSleep));
-  svc.Provide ();
-}
diff --git a/rpc++/gcc-2.2.fix b/rpc++/gcc-2.2.fix
deleted file mode 100644
index f684e5b128b..00000000000
--- a/rpc++/gcc-2.2.fix
+++ /dev/null
@@ -1,252 +0,0 @@
-To: bug-g++@prep.ai.mit.edu
-Subject: gcc-2.2 loops with template-local typedefs (bug&patch)
-BCC: mnl,ulf
---text follows this line--
-Hi,
-
-trying to translate the following fragment on a Sparc running SunOs 4.1.2
-with gcc-2.2 results in gcc infinitly looping.
-
----------------------------------------------------------------------------
-// -*- c++ -*-
-
-class AnyRpcCallback
-{
-protected:
-
-public:
-  inline virtual ~AnyRpcCallback () {}
-  inline virtual void Do (void* in, void* out) = 0;
-};
-
-template<class T> class RpcCallback : public AnyRpcCallback
-{
-  typedef void (T::*Method)(void*, void*);
-  typedef void (T::*MethodN)(void*, void**);
-  typedef void (T::*Method1)(void*, void*);
-  typedef void (T::*Method2)(void*, void*, void*);
-
-private:
-  T* object;
-  void (T::*method)(void*, void*);
-
-public:
-  inline RpcCallback (T* o, void* m)
-    { object = o; method = m; }
-  inline void Do (void* in, void* out)
-    { (object->*method)(in, out); }
-};
-
-class Test
-{
-public:
-  void m (void*, void*);
-};
-
-main ()
-{
-  Test o;
-  AnyRpcCallback* cb = new RpcCallback<Test> (&o, &Test::m);
-}
----------------------------------------------------------------------------
-
-PLEASE NOTE that you will get another loop due to a bug that I have
-reported together with a patch earlier (it's appended to this mail).
-So you won't be able to reproduce the bug reported in this mail unless
-you have my previous patch applied. I am, however, definitely sure
-(and the explanation below will confirm it) that the bug reported in
-this mail is *NOT* caused by my patch!
-
-The problem is, that the "chain" field of the tree-nodes used by gcc
-for its internal representation is used for various purposes, and in
-the case of this template-local typedef, someone lost track of its usage.
-
-After parsing, the TYPE_DECL-node created for the typedef is appended
-to the scope via "pushlevel". Types in the current scope are linked
-using the "chain" field. At the same time, however, all components of
-the template are linked together during parsing using the same "chain"
-field. Parsing the second typedef, "pushlevel" makes the first typedef
-a successor of the second typedef and the subsequent catenation of
-components makes the second typedef a successor of the first typedef
-thus creating a loop.
-
-The resulting list of all components is used in routine
-"finish_struct".
-
-I think the most proper approach would be to use TREE_LIST nodes in
-the list of components as indirect references to the typedef-nodes.
-This is easy to achieve, it is, however, very hard to modify
-finish_struct in a way that it handles these indirection properly.
-Actually, I gave up when I tried to understand & modify the routine
-that removes the duplicate declarations from the list of components.
-
-There are two easier approaches: (1) Don't include typedefs in the
-list of components, (2) use copies of the typedef-node which have an
-unused chain field. The first approach assumes that finish_struct
-doesn't do anything with typedefs, so it wouldn't be important if they
-are missing from the list of components. If this is the case, however,
-it can't hurt to use copies of the typedef-nodes (copies of the
-originals that are linked in the scope-list), so the second approach
-is safer. It can only fail if finish_struct modifies the typedef-nodes
-and this modification is significant for the typedef-nodes in the
-scope-list (which are, of course, not modified. Only the copies are).
-
-So I think the patch is pretty safe. It fixes the problem and doesn't
-seem to introduce new ones. I'm aware that typedefs that are local to
-templates stretch language features to the limits, but it makes my
-C++ interface to RPCs real nice (I'll post it one of these days).
-
-Michael
-
-*** .orig/cp-parse.y	Mon Jun 15 17:08:58 1992
---- cp-parse.y	Mon Jun 15 19:13:15 1992
-***************
-*** 2211,2217 ****
-  		      if (TREE_CODE (t) == ENUMERAL_TYPE && TREE_NONLOCAL_FLAG (t))
-  			$$ = grok_enum_decls (t, $2);
-  		      else
-! 			$$ = $2;
-  		    }
-  		  end_exception_decls ();
-  		}
---- 2211,2233 ----
-  		      if (TREE_CODE (t) == ENUMERAL_TYPE && TREE_NONLOCAL_FLAG (t))
-  			$$ = grok_enum_decls (t, $2);
-  		      else
-! 			{
-! 			  /* if a component is a typedef, it is inserted
-! 			     in the list of nodes that make up the valid
-! 			     types in the scope. Thus its chain field is
-! 			     used and can't be used a second time for linking
-! 			     the components of the struct. So, we make a copy
-! 			     here. This apparently works. The proper thing
-! 			     to do, however, would be to use a TREE_LIST
-! 			     node to reference the typedef. I tried to rewrite
-! 			     finish_struct accordingly (i.e., ``dereference''
-! 			     components TREE_LIST before use, but I gave up.
-! 			     mnl@dtro.e-technik.th-darmstadt.de */
-! 			  if (TREE_CODE ($2) == TYPE_DECL)
-! 			    $$ = copy_node ($2);
-! 			  else
-! 			    $$ = $2;
-! 			}
-  		    }
-  		  end_exception_decls ();
-  		}
-
-===========================================================================
-The previous bug:
----------------------------------------------------------------------------
-Return-Path: <mnl>
-Date: Wed, 10 Jun 92 19:31:13 +0200
-From: "Michael N. Lipp" <mnl>
-To: bug-g++@prep.ai.mit.edu
-Subject: gcc-2.2 bug&patch: typedef in template
-
-Hi,
-
-gcc-2.2 on a sparc running SunOS 4.1.2 enters an infinite loop when
-compiling this:
-
------------------------------------------------------------------------------
-// -*- c++ -*-
-
-class AnyRpcCallback
-{
-protected:
-
-public:
-  inline virtual ~AnyRpcCallback () {}
-  inline virtual void Do (void* in, void* out) = 0;
-};
-
-template<class T> class RpcCallback : public AnyRpcCallback
-{
-  typedef void (T::*Method)(void*, void*);
-
-private:
-  T* object;
-  void (T::*method)(void*, void*);
-
-public:
-  inline RpcCallback (T* o, void* m)
-    { object = o; method = m; }
-  inline void Do (void* in, void* out)
-    { (object->*method)(in, out); }
-};
-
-class Test
-{
-public:
-  void m (void*, void*);
-};
-
-main ()
-{
-  Test o;
-  AnyRpcCallback* cb = new RpcCallback<Test> (&o, &Test::m);
-}
------------------------------------------------------------------------------
-
-This is quite an improvement over gcc-2.1 which dumped core with this
-source.
-
-I tracked the cause down: grokdeclarator does a pushlevel(0), then
-calls start_decl, which in turn calls grokdeclarator again which does
-a poplevel_class. This poplevel_class pops the level pushed by
-pushlevel(0) and so the poplevel performed by grokdeclarator to match
-its pushlevel(0) pops quite a different level! This can easily be
-observed by compiling cp-decl.c with -DDEBUG_CP_BINDING_LEVELS.
-
-Here is a patch that fixes the bug. I don't think it hits the real
-cause of this problem, but it works.
-
-*** .orig/cp-decl.c	Wed Jun 10 14:06:26 1992
---- cp-decl.c	Wed Jun 10 15:20:38 1992
-***************
-*** 6874,6882 ****
---- 6874,6889 ----
-  	  tree loc_typedecl;
-  	  register int i = sizeof (struct lang_decl_flags) / sizeof (int);
-  	  register int *pi;
-+ 	  struct binding_level *local_binding_level;
-  
-  	  /* keep `grokdeclarator' from thinking we are in PARM context.  */
-  	  pushlevel (0);
-+ 	  /* poplevel_class may be called by grokdeclarator which is called in
-+ 	     start_decl which is called below. In this case, our pushed level
-+ 	     may vanish and poplevel mustn't be called. So remember what we
-+ 	     have pushed and pop only if that is matched by 
-+ 	     current_binding_level later. mnl@dtro.e-technik.th-darmstadt.de */
-+ 	  local_binding_level = current_binding_level;
-  	  loc_typedecl = start_decl (declarator, declspecs, initialized, NULL_TREE);
-  
-  	  pi = (int *) permalloc (sizeof (struct lang_decl_flags));
-***************
-*** 6883,6889 ****
-  	  while (i > 0)
-  	    pi[--i] = 0;
-  	  DECL_LANG_SPECIFIC (loc_typedecl) = (struct lang_decl *) pi;
-! 	  poplevel (0, 0, 0);
-  
-  #if 0
-  	  if (TREE_CODE (TREE_TYPE (loc_typedecl)) == ENUMERAL_TYPE)
---- 6890,6897 ----
-  	  while (i > 0)
-  	    pi[--i] = 0;
-  	  DECL_LANG_SPECIFIC (loc_typedecl) = (struct lang_decl *) pi;
-! 	  if (current_binding_level == local_binding_level)
-! 	    poplevel (0, 0, 0);
-  
-  #if 0
-  	  if (TREE_CODE (TREE_TYPE (loc_typedecl)) == ENUMERAL_TYPE)
-
-Michael
-
------------------,------------------------------,------------------------------
-Michael N. Lipp  !  Institut fuer Datentechnik  !  Phone: 49-6151-163776
-                 !  Merckstr. 25     ,----------'  Fax:   49-6151-164976
-                 !  D-6100 Darmstadt ! E-Mail:
-                 !  (Germany)        !     mnl@dtro.e-technik.th-darmstadt.de
------------------'-------------------'-----------------------------------------
-
diff --git a/rpc++/request.cc b/rpc++/request.cc
deleted file mode 100644
index c831bb531b0..00000000000
--- a/rpc++/request.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-static char _rpcpp_request_cc_[]
-= "request.cc,v 2.3 1992/06/15 19:12:39 mnl Exp";
-
-// request.cc,v
-// Revision 2.3  1992/06/15  19:12:39  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:01  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:42  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "rpc++/request.h"
-
-#include <assert.h>
-
-void RpcRequest::init (u_long req, int pars, int parsz,
-		       const XdrInfo* out, const XdrInfo** in, int rt)
-{
-  params = pars;
-  parmsz = parsz;
-  reqnum = req;
-  ininfo = in;
-  ininfo[params] = (XdrInfo*)0;
-  outinfo = out;
-  reqtype = rt;
-  assert (rt == normal || outinfo->Proc () == 0);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, int t)
-{
-  init (req, 0, 0, out, new XdrInfo*[1], t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in,
-		       int t)
-{
-  const XdrInfo** a = new XdrInfo*[2];
-  a[0] = in;
-  init (req, 1, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, int t)
-{
-  const XdrInfo** a = new XdrInfo*[3];
-  a[0] = in0;
-  a[1] = in1;
-  init (req, 2, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, const XdrInfo* in2, int t)
-{
-  const XdrInfo** a = new XdrInfo*[4];
-  a[0] = in0;
-  a[1] = in1;
-  a[2] = in2;
-  init (req, 3, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, const XdrInfo* in2,
-		       const XdrInfo* in3, int t)
-{
-  const XdrInfo** a = new XdrInfo*[5];
-  a[0] = in0;
-  a[1] = in1;
-  a[2] = in2;
-  a[3] = in3;
-  init (req, 4, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, const XdrInfo* in2,
-		       const XdrInfo* in3, const XdrInfo* in4, int t)
-{
-  const XdrInfo** a = new XdrInfo*[6];
-  a[0] = in0;
-  a[1] = in1;
-  a[2] = in2;
-  a[3] = in3;
-  a[4] = in4;
-  init (req, 5, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, const XdrInfo* in2,
-		       const XdrInfo* in3, const XdrInfo* in4,
-		       const XdrInfo* in5, int t)
-{
-  const XdrInfo** a = new XdrInfo*[7];
-  a[0] = in0;
-  a[1] = in1;
-  a[2] = in2;
-  a[3] = in3;
-  a[4] = in4;
-  a[5] = in5;
-  init (req, 6, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo* in0,
-		       const XdrInfo* in1, const XdrInfo* in2,
-		       const XdrInfo* in3, const XdrInfo* in4,
-		       const XdrInfo* in5, const XdrInfo *in6, int t)
-{
-  const XdrInfo** a = new XdrInfo*[8];
-  a[0] = in0;
-  a[1] = in1;
-  a[2] = in2;
-  a[3] = in3;
-  a[4] = in4;
-  a[5] = in5;
-  a[6] = in6;
-  init (req, 7, -1, out, a, t);
-}
-
-RpcRequest::RpcRequest(u_long req, const XdrInfo* out, const XdrInfo** ins,
-		       int t)
-{
-  int pars = 0;
-  for (XdrInfo** p = ins; *p; p++)
-    pars += 1;
-  const XdrInfo** a = new XdrInfo* [pars + 1];
-  memcpy (a, ins, (pars + 1) * sizeof (XdrInfo*));
-  init (req, pars, -1, out, a, t);
-}
-
-int RpcRequest::ParamSize ()
-{
-  if (parmsz < 0) // not yet calculated
-    {
-      parmsz = 0;
-      for (XdrInfo** ip = ininfo; *ip; ip++)
-	parmsz += (*ip)->Size ();
-    }
-  return parmsz;
-}
diff --git a/rpc++/rpc++.cp b/rpc++/rpc++.cp
deleted file mode 100644
index 38f1a39ff2d..00000000000
--- a/rpc++/rpc++.cp
+++ /dev/null
@@ -1,13 +0,0 @@
-\entry {Overview}{1}{Overview}
-\entry {Installation}{2}{Installation}
-\entry {XdrInfo}{3}{\code {XdrInfo}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {Callbacks}{7}{Callbacks}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {calling conventions}{10}{\code {calling conventions}}
-\entry {RpcService}{12}{\code {RpcService}}
-\entry {RpcStub}{16}{\code {RpcStub}}
-\entry {Caveats}{19}{Caveats}
-\entry {Global objects}{19}{Global objects}
-\entry {Destruction rules}{19}{Destruction rules}
diff --git a/rpc++/rpc++.fn b/rpc++/rpc++.fn
deleted file mode 100644
index 562055e0c07..00000000000
--- a/rpc++/rpc++.fn
+++ /dev/null
@@ -1,63 +0,0 @@
-\entry {XdrInfo}{3}{\code {XdrInfo}}
-\entry {Proc}{3}{\code {Proc}}
-\entry {Size}{3}{\code {Size}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcCallback}{8}{\code {RpcCallback}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{10}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{10}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{10}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{10}{\code {RpcMethodCall}}
-\entry {RpcMethodCall}{10}{\code {RpcMethodCall}}
-\entry {RpcService}{12}{\code {RpcService}}
-\entry {RpcService}{12}{\code {RpcService}}
-\entry {OK}{12}{\code {OK}}
-\entry {Program}{12}{\code {Program}}
-\entry {Register}{12}{\code {Register}}
-\entry {Provide}{13}{\code {Provide}}
-\entry {HandleError}{13}{\code {HandleError}}
-\entry {Caller}{15}{\code {Caller}}
-\entry {CallerName}{15}{\code {CallerName}}
-\entry {Reply}{15}{\code {Reply}}
-\entry {Reply}{15}{\code {Reply}}
-\entry {Interrupt}{15}{\code {Interrupt}}
-\entry {RpcStub}{16}{\code {RpcStub}}
-\entry {RpcStub}{16}{\code {RpcStub}}
-\entry {Reconnect}{16}{\code {Reconnect}}
-\entry {OK}{16}{\code {OK}}
-\entry {Service}{16}{\code {Service}}
-\entry {GetTimeout}{16}{\code {GetTimeout}}
-\entry {SetTimeout}{17}{\code {SetTimeout}}
-\entry {Call}{17}{\code {Call}}
-\entry {Call}{17}{\code {Call}}
-\entry {Call}{17}{\code {Call}}
-\entry {Call}{17}{\code {Call}}
-\entry {HandleError}{17}{\code {HandleError}}
diff --git a/rpc++/rpc++.ky b/rpc++/rpc++.ky
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/rpc++/rpc++.ky
+++ /dev/null
diff --git a/rpc++/rpc++.pg b/rpc++/rpc++.pg
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/rpc++/rpc++.pg
+++ /dev/null
diff --git a/rpc++/rpc++.texi b/rpc++/rpc++.texi
deleted file mode 100644
index 71ed33017b7..00000000000
--- a/rpc++/rpc++.texi
+++ /dev/null
@@ -1,1519 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@tex
-% They are redefined in texinfo, but I need them
-\gdef\`#1{{\accent18 #1}}
-\gdef\'#1{{\accent19 #1}}
-\gdef\[{{[}}
-\gdef\]{{]}}
-@end tex
-@comment %**start of header (This is for running Texinfo on a region.)
-@setfilename rpc++.info
-@settitle A C++ Interface to Remote Procedure Calls
-@setchapternewpage on
-@comment %**end of header (This is for running Texinfo on a region.)
-
-@c You'll have to define the following additional texinfo-formats to
-@c run texinfo on this file.
-@c
-@c   (put '\& 'texinfo-format 'texinfo-format-\&)
-@c   (defun texinfo-format-\& ()
-@c     (texinfo-discard-command)
-@c     (insert "&"))
-@c
-@c   (put '\[ 'texinfo-format 'texinfo-format-\[)
-@c   (defun texinfo-format-\[ ()
-@c     (texinfo-discard-command)
-@c     (insert "["))
-@c
-@c   (put '\] 'texinfo-format 'texinfo-format-\])
-@c   (defun texinfo-format-\] ()
-@c     (texinfo-discard-command)
-@c     (insert "]"))
-
-@ifinfo
-This file documents a C++ interface to Sun remote procedure calls.
-
-Copyright @copyright{} 1992 Michael N. Lipp
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through @TeX{} and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU Library General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU Library General Public License'' and
-this permission notice may be included in translations approved by the
-Free Software Foundation instead of in the original English.
-@end ifinfo
-
-@titlepage
-
-@title A C++ Interface
-@title to Sun Remote Procedure Calls
-@sp 1
-@subtitle @authorfont{by Michael N. Lipp}
-@sp 20
-@subtitle{for version 2.2}
-@subtitle{Technische Hochschule Darmstadt, Institut f@"ur Datentechnik}
-
-@comment  The following two commands start the copyright page.
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1992 Michael N. Lipp
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU Library General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU Library General Public License'' may be
-included in a translation approved by the author instead of in the original
-English.
-@end titlepage
-
-@node Top, Overview, (dir), (dir)
-
-@menu
-* Overview::                    Overview
-* Installation::                Installation
-* Classes::                     The Classes
-* Caveats::                     Caveats
-* References::                  References
-* Copying::                     GNU LIBRARY GENERAL PUBLIC LICENSE
-* Data Type Index::             Data Type Index
-* Function Index::              Function and Method Index
-* Concept Index::               Concept Index
-
- --- The Detailed Node Listing ---
-
-The classes
-
-* XdrInfo::                     @code{XdrInfo}
-* RpcRequest::                  @code{RpcRequest}
-* Callbacks::                   @code{Callbacks}
-* RpcService::                  @code{RpcService}
-* RpcStub::                     @code{RpcStub}
-
-Callbacks
-
-* RpcCallback::                 @code{RpcCallback}
-* RpcMethodCall::               @code{RpcMethodCall}
-* Calling Conventions::         @code{Calling Conventions}
-
-Caveats
-
-* Global objects::              Global objects
-* Destruction rules::           Destruction rules
-* Matching server and clients::  Matching server and clients
-@end menu
-
-@node    Overview, Installation, Top, Top
-@comment node-name,     next,           previous, up
-@chapter Overview
-@cindex Overview
-
-This document describes my C++ interface to Sun Remote Procedure Calls.
-It is based on sources from Peter Bersen that I got from some newsgroup,
-though I don't remember which one. I liked the basic idea but disliked
-several aspects of the interface details. So I adapted it to my likes. I
-intended some minor changes but soon found myself renaming classes,
-changing method parameters, introducing new classes, etc. The result is
-by no way compatible with the original version. It is, I hope,
-nevertheless useful.
-
-Basically, the interface defines six class: @code{XdrInfo},
-@code{RpcRequest}, @code{RpcCallback}/@code{RpcMethodCall},
-@code{RpcService} and @code{RpcStub}.
-
-@code{XdrInfo} objects describe the external data representation of a
-type. There are predefined @code{XdrInfo}s for the basic types.
-@code{RpcRequest} objects describe the available procedure calls. They
-are constructed from a unique request number, the @code{XdrInfo}s of the
-procedure's arguments and its return type. @code{RpcCallback} is an
-object that holds a pointer to a function and information about the
-number of its arguments. @code{RpcMethodCall} is a template that in a
-similar way holds a pointer to an object and one of its methods and
-Information about the number of its arguments.
-
-An @code{RpcRequest} and its matching @code{RpcCallback} or
-@code{RpcMethodCall} may be registered with an @code{RpcService}.
-Exactly one object of type @code{RpcService} may be instantiated in a
-program that implements an RPC server. Method @code{Provide ()} is a
-loop that waits for requests and dispatches them.
-
-A client program instantiates an object of type @code{RpcStub}.  The
-constructor establishes a connection to the server specified by its
-arguments. Procedures of the server may be invoked using method
-@code{Call (@dots{})}.
-
-@node    Installation, Classes, Overview, Top
-@comment node-name,     next,           previous, up
-@chapter Installation
-@cindex Installation
-
-The rpc++ library has successfully been tested using a patched gcc-2.2.2
-on a SparcStation running SunOS 4.1.[12] and a 386 system running
-Interactive Unix (a SYSV 3.2). Patching gcc-2.2.2 was necessary because
-the unpatched version can't handle typedefs that are local to templates.
-The bug report with patches can be found in the source directory in file
-@code{gcc-2.2.2.fix}.
-
-As a prerequisite to using RPCs with C++ you need ANSI-C/C++ conformant
-header files for RPC. I have provided such files in the directory
-@code{StdHdrs/rpc} of the source tree. To avoid any copyright conflicts,
-they are derived from the public available RPC source code rather than
-from the files that come with SunOS 4.1.X. The differences are minor.
-The SunOS 4.1.X files define some additional functions. You have to
-either copy the files from @code{StdHdrs/rpc} or patched files from your
-@code{/usr/include/rpc} to a directory where gcc can find them. If you
-don't want to install them globally in gcc's include directory, you can
-include them by using an additional ``@code{-I}'' flag during
-compilation.
-
-In SunOS you can simply type `@code{make install INSTROOT=@dots{}}'
-which will make the library and install it in @code{INSTROOT/lib} and
-the header files in @code{INSTROOT/include/rpc++}.  Other Unices will
-probably have problems with the `install' command. Type only `make' and
-copy the resulting @code{librpc++.a} to your local library directory and
-the files @code{rpc++/*} to an @code{rpc++}-subdirectory of your local
-include directory.
-
-@node    Classes, Caveats, Installation, Top
-@comment node-name,     next,           previous,	up
-@chapter The classes
-
-@menu
-* XdrInfo::                     @code{XdrInfo}
-* RpcRequest::                  @code{RpcRequest}
-* Callbacks::                   @code{Callbacks}
-* RpcService::                  @code{RpcService}
-* RpcStub::                     @code{RpcStub}
-@end menu
-
-@node    XdrInfo, RpcRequest,  , Classes
-@comment node-name,     next,           previous, up
-@section @code{XdrInfo}
-@cindex @code{XdrInfo}
-
-Declared in: @code{"rpc++/xdr++.h"}
-
-@deftp Class XdrInfo
-Class XdrInfo describes serializers. It combines the xdrproc_t with the
-size info (the size of the data to be converted) usually needed if you
-want to apply a serializer.
-@end deftp
-
-There is only one constructor for @code{XdrInfo}:
-
-@deftypefn Constructor {} XdrInfo (xdrproc_t @var{t}, size_t @var{s})
-Construct an @code{XdrInfo} for a type. The type can be converted to an
-external data representation (serielized) with function @var{t}. Its
-size (in bytes, from @code{sizeof (type)}), is @var{s}.
-@end deftypefn
-
-The methods query the information given to the constructor:
-
-@deftypefn Method xdrproc_t Proc () const
-Return the conversion function stored in an @code{XdrInfo}.
-@end deftypefn
-
-@deftypefn Method size_t Size () const
-Return the size of the type described by the @code{XdrInfo}.
-@end deftypefn
-
-There are a number of predefined @code{XdrInfo}s. They are defined as
-static members of a class @code{Xdr} for scoping reasons.
-
-@defvr XdrInfo Xdr::Xchar
-The conversion and size information for a character.
-@end defvr
-
-@defvr XdrInfo Xdr::Xshort
-The conversion and size information for a short integer.
-@end defvr
-
-@defvr XdrInfo Xdr::Xint
-The conversion and size information for an integer.
-@end defvr
-
-@defvr XdrInfo Xdr::Xlong
-The conversion and size information for a long integer.
-@end defvr
-
-@defvr XdrInfo Xdr::Xuchar
-The conversion and size information for an unsigned character.
-@end defvr
-
-@defvr XdrInfo Xdr::Xushort
-The conversion and size information for an unsigned short integer.
-@end defvr
-
-@defvr XdrInfo Xdr::Xulong
-The conversion and size information for an unsigned long integer.
-@end defvr
-
-@defvr XdrInfo Xdr::Xfloat
-The conversion and size information for a float.
-@end defvr
-
-@defvr XdrInfo Xdr::Xdouble
-The conversion and size information for a double.
-@end defvr
-
-@defvr XdrInfo Xdr::Xenum_t
-The conversion and size information for any enumeration type.
-@end defvr
-
-@defvr XdrInfo Xdr::Xbool_t
-The conversion and size information for a bool.
-@end defvr
-
-@defvr XdrInfo Xdr::Xvoid
-A special @code{XdrInfo} for the return type of a procedure that returns
-nothing.
-@end defvr
-
-@defvr XdrInfo Xdr::Xnull
-A special @code{XdrInfo} for the return type of a procedure that is to
-be executed batched or asynchronously (@pxref{RpcRequest}).
-@end defvr
-
-@page
-@node    RpcRequest, Callbacks, XdrInfo, Classes
-@comment node-name,     next,           previous, up
-@section @code{RpcRequest}
-@cindex @code{RpcRequest}
-
-Declared in: @code{"rpc++/request.h"}
-
-@deftp Class RpcRequest
-RpcRequest is a class that specifies a request for a procedure that is
-part of (registered with) a service.
-@end deftp
-
-There are several constructors for @code{RpcRequest}. They vary in the
-number of @code{XdrInfo}s used to describe the input parameters of the
-procedure.
-
-@deftypefn Constructor {} RpcRequest (u_long @var{reqid}, const XdrInfo* @var{out}, ReqType @var{t}=normal)
-@end deftypefn
-@deftypefn Constructor {} RpcRequest (u_long @var{reqid}, const XdrInfo* @var{out}, const XdrInfo* @var{in1}, ReqType @var{t}=normal)
-@end deftypefn
-@deftypefn Constructor {} RpcRequest (u_long @var{reqid}, const XdrInfo* @var{out}, const XdrInfo* @var{in1}, const XdrInfo* @var{in2}, ReqType @var{t}=normal)
-These constructors construct an @code{RpcRequest} for a procedure with
-zero, one or two arguments. Additional similar constructors are defined
-for procedures with up to seven arguments. @var{reqid} uniquely
-identifies the request (the procedure of the server). @var{reqid} may
-not be 0. The @code{XdrInfo*}s following @var{reqid} specify the types of
-the input parameters. They are followed by the @code{XdrInfo*} that
-describes the type of the value returned by the RPC. If no value is
-returned, @code{&Xdr::Xvoid} must be given as argument
-(@pxref{XdrInfo}). The final optional argument @var{t} specifies the
-call mode: @code{RpcRequest::normal}, @code{RpcRequest::batched} or
-@code{RpcRequest::async} (see below).
-@end deftypefn
-
-@deftypefn Constructor {} RpcRequest (u_long @var{reqid}, const XdrInfo* @var{out}, const XdrInfo** @var{intypes}, ReqType @var{t}=normal)
-This constructor can be used to construct an @code{RpcRequest} with an
-arbitrary number of arguments. The pointers to @code{XdrInfo} are passed
-in an array. The number of elements in the array must be one more than
-the number of parameters and the last element must be zero.
-@end deftypefn
-
-If the request type @var{t} is @code{RpcRequest::normal}, method
-@code{Call} (@pxref{RpcStub}) assembles the message to the server, sends
-it, waits for a reply and returns the result.
-
-If the request type is @code{RpcRequest::batched}, method
-@code{RpcStub::Call} assembles the message to the server and puts it in
-a buffer. Messages are only flushed if the buffer is full or
-@code{RpcStub::Call} is used with a @code{normal} or @code{async}
-request.
-
-If the request type is @code{RpcRequest::async}, method
-@code{RpcStub::Call} (@pxref{RpcStub}) assembles the message to the
-server and sends it, as with @code{normal}. It does, however, not wait
-for a result. Mode @code{async} is implemented by calling the underlying
-RPC--function @code{clnt_call} with a timeout of zero.
-
-As in both non--normal cases (@code{batched} and @code{async})
-@code{RpcStub::Call} does not wait for a return value from the server,
-the return type of the @code{RpcRequest} must be specified as
-@code{&Xdr::Xnull}.
-
-Note that requests that are registered for a service are stored in an
-array using the request identification as the index, so keep ids small.
-
-Normally, requests should be specified in a header file included by both
-the server and the client program (@pxref{Matching server and clients}).
-
-@page
-@node    Callbacks, RpcService, RpcRequest, Classes
-@comment node-name,     next,           previous, up
-@section Callbacks
-@cindex Callbacks
-
-If a server receives a request from a client, it needs to know how a
-particular procedure is to be invoked. This information is specified
-using objects @code{RpcCallback} or @code{RpcMethodCall} when the
-procedure resp.@ method is specified.
-
-The class
-@deftp Class AnyRpcCallback
-@end deftp
-serves as an abstract base class for the two kinds of callbacks.
-
-The following sections describe the constructors for @code{RpcCallback}
-and @code{RpcMethodCall} and the calling conventions for the functions
-or methods called back.
-
-@menu
-* RpcCallback::                 @code{RpcCallback}
-* RpcMethodCall::               @code{RpcMethodCall}
-* Calling Conventions::         @code{Calling Conventions}
-@end menu
-
-@node    RpcCallback, RpcMethodCall,  , Callbacks
-@comment node-name,     next,           previous, up
-@subsection @code{RpcCallback}
-@cindex @code{RpcCallback}
-
-Declared in: @code{"rpc++/callback.h"}
-
-@deftp Class RpcCallback
-An @code{RpcCallback} describes a function that is to be called by the
-server on request from the client.
-@end deftp
-
-@deftypefn Constructor {} RpcCallback (void* (*)() @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void*, void*) @var{proc})
-Construct an @code{RpcCallback} for a function that takes zero, one or
-two arguments and returns a result. Constructors for functions with
-up to seven arguments are defined.
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void**) @var{proc})
-Construct an @code{RpcCallback} for a function that takes an arbitrary
-number of arguments and returns a result.
-@end deftypefn
-
-@deftypefn Constructor {} RpcCallback (void (*)() @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void*, void*) @var{proc})
-Construct an @code{RpcCallback} for a function that takes zero, one or
-two arguments and returns no result. Constructors for functions with
-up to seven arguments are defined.
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void**) @var{proc})
-Construct an @code{RpcCallback} for a function that takes an arbitrary
-number of arguments and return no result.
-@end deftypefn
-
-@deftypefn Constructor {} RpcCallback (void* (*)(RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void*, RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void*, void*, RpcService*) @var{proc})
-Construct an @code{RpcCallback} for a function that takes zero, one or
-two arguments and returns a result. Constructors for functions with
-up to seven arguments are defined. Upon invocation, a pointer to the
-object of type @code{RpcService} that received the request and called
-the function is passed as an additional argument.
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void* (*)(void**) @var{proc})
-Construct an @code{RpcCallback} for a function that takes an arbitrary
-number of arguments and returns a result. Upon invocation, a pointer to the
-object of type @code{RpcService} that received the request and called
-the function is passed as an additional argument.
-@end deftypefn
-
-@deftypefn Constructor {} RpcCallback (void (*)(RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void*, RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void*, void*, RpcService*) @var{proc})
-Construct an @code{RpcCallback} for a function that takes zero, one or
-two arguments and returns a result. Constructors for functions with
-up to seven arguments are defined. Upon invocation, a pointer to the
-object of type @code{RpcService} that received the request and called
-the function is passed as an additional argument.
-@end deftypefn
-@deftypefn Constructor {} RpcCallback (void (*)(void**) @var{proc})
-Construct an @code{RpcCallback} for a function that takes an arbitrary
-number of arguments and returns a result. Upon invocation, a pointer to the
-object of type @code{RpcService} that received the request and called
-the function is passed as an additional argument.
-@end deftypefn
-
-@node    RpcMethodCall, Calling Conventions, RpcCallback, Callbacks
-@comment node-name,     next,           previous, up
-@subsection @code{RpcMethodCall}
-@cindex @code{RpcMethodCall}
-
-Declared in: @code{"rpc++/callback.h"}
-
-@deftp Class RpcMethodCall
-An @code{RpcMethodCall} describes a method of an object that is to be
-called by the server on request from the client.
-@end deftp
-
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)() @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void*, void*) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods that
-takes zero, one or two arguments and returns a result. Constructors for
-methods with up to seven arguments are defined.
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void**) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes an arbitrary number of arguments and returns a result.
-@end deftypefn
-
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)() @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void*, void*) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes zero, one or two arguments and returns no result.
-Constructors for methods with up to seven arguments are defined.
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void**) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes an arbitrary number of arguments and return no result.
-@end deftypefn
-
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void*, RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void*, void*, RpcService*) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes zero, one or two arguments and returns a result. Constructors
-for methods with up to seven arguments are defined. Upon invocation, a
-pointer to the object of type @code{RpcService} that received the
-request and called the method is passed as an additional argument.
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void* (T::*)(void**) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes an arbitrary number of arguments and returns a result. Upon
-invocation, a pointer to the object of type @code{RpcService} that
-received the request and called the method is passed as an additional
-argument.
-@end deftypefn
-
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void*, RpcService*) @var{proc})
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void*, void*, RpcService*) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes zero, one or two arguments and returns a result. Constructors
-for methods with up to seven arguments are defined. Upon invocation, a
-pointer to the object of type @code{RpcService} that received the
-request and called the method is passed as an additional argument.
-@end deftypefn
-@deftypefn Constructor {} RpcMethodCall <class T> (void (T::*)(void**) @var{proc})
-Construct an @code{RpcMethodCall} for an object and one of its methods
-that takes an arbitrary number of arguments and returns a result. Upon
-invocation, a pointer to the object of type @code{RpcService} that
-received the request and called the method is passed as an additional
-argument.
-@end deftypefn
-
-@node    Calling Conventions,  , RpcMethodCall, Callbacks
-@comment node-name,     next,           previous, up
-@subsection @code{Calling Conventions}
-@cindex @code{calling conventions}
-
-As could be seen from the parameter types in the constructors, functions
-and methods that are called in response to a request from a client know
-only about pointers to void as arguments and result values because their
-real type is coded in the @code{RpcRequest} and not known at compile
-time. The only way to avoid this is to implement some kind of rpcgen++.
-However, I never liked this kind of tools and I'm willing to risk a bit
-of type unsafeness in this case.
-
-When a procedure (or method) is called, its arguments point to values
-(the variants with an arbitrary number of arguments receive an array of
-pointers to values) of the types specified in the constructor of the
-@code{RpcRequest} that led to the invocation of the procedure. I
-recommend to access the values and assign them to local variables of the
-procedure in the first statements. E.g.:
-@example
-void* Add (void* s1p, void* s2p)
-@{
-  int s1 = *(int*)s1p;
-  int s2 = *(int*)s2p;
-  ...
-@end example
-
-The return value of the procedure is a pointer to the result. Therefore,
-results may never be put in automatic variables. They must be global or
-static. E.g.:
-@example
-  ...
-  static int sum;
-  sum = s1 + s2;
-  return (void*)&sum;
-@}
-@end example
-
-Note the special case of strings (defined as parameters or return values
-using @code{Xdr::Xwrapstring}, @pxref{XdrInfo}). If you think of a
-string as being defined as a type ``@code{typedef char* string}'', it is
-obvious that a string is passed as argument or returned as result by a
-@code{string*}, i.e., a @code{char**}. E.g.:
-@example
-void* Capitalize (void* strp)
-@{
-  static char* str;
-  str = *(char**)strp;
-  str[0] = toupper (str[0]);
-  return (void*)&str;
-@}
-@end example
-
-@page
-@node    RpcService, RpcStub, Callbacks, Classes
-@comment node-name,     next,           previous, up
-@section @code{RpcService}
-@cindex @code{RpcService}
-
-Declared in: @code{"rpc++/service.h"}
-
-@deftp Class RpcService
-An object of type @code{RpcService} provides the server capabilities
-within a program.
-@end deftp
-
-There are two constructors for @code{RpcService}:
-
-@deftypefn Constructor {} RpcService (u_long @var{prog}, u_long @var{vers})
-Construct an object representing the @var{vers}'th version of program
-(service) number @code{prog}.
-@end deftypefn
-@deftypefn Constructor {} RpcService (u_long @var{vers})
-Construct an object representing the @var{vers}'th version of a transient
-program (service).
-@end deftypefn
-
-@deftypefn Method bool OK ()
-Returns TRUE if the service is ready for operation, i.e., has successfully
-been established during construction.
-@end deftypefn
-
-The number of a service, especially a transient service, can be obtained
-with method @code{@w{Program ()}}:
-
-@deftypefn Method u_long Program ()
-Returns the number of the program (service). This is either the number
-passed as an argument to the constructor or a number from the transient
-program area.
-@end deftypefn
-
-The next step after the construction of an @code{RpcService} is to
-register the requests handled by the service:
-
-@deftypefn Method {virtual void} Register (const RpcRequest& @var{req}, const AnyRpcCallback& @var{cb})
-Associate request @var{req} with the procedure or object/method pair
-specified by @code{cb}. The usual way to call @code{Register} is
-@example
-@{
-  RpcService svc (...);
-  svc.register (addreq, RpcCallback (Add));
-  ...
-@}
-@end example
-@end deftypefn
-
-After all requests have been registered, the object of type
-@code{RpcService} can provide the service:
-@deftypefn Method void Provide ()
-Repeatedly wait for a request and handle it by calling the procedure or
-method registered for it.
-@end deftypefn
-
-@deftypefn Method {virtual void*} HandleError ()
-@code{HandleError} is a protected method that is called when an error
-occurs. The cause of the error is stored in a protected member variable
-@code{errorState}. If the default error handling (shown below) is not
-appropriate for your application, derive your own class from
-@code{RpcService} that implements a different error handling policy. If
-you consider an error recoverable, reset @code{errorState} to
-@code{RpcService::noError} in your error handler. Else, @code{OK ()}
-keeps returning FALSE.
-@example
-void RpcService::HandleError ()
-@{
-  switch (errorState)
-    @{
-    case reconstructionAttempt:
-      cerr << "rpc++: Attempt to construct another instance of RpcService.\n";
-      exit (1);
-    case cantCreateTCPService:
-      cerr << "rpc++: can't create tcp service.\n";
-      exit(1);
-    case cantRegisterService:
-      cerr << form ("rpc++: can't register (%d, %d, tcp).", prog, vers);
-      exit(1);
-    case cantSendReply:
-      cerr << "rpc++: can't reply to RPC call.\n";
-      break;
-    case invalidResult:
-      cerr << "rpc++: registered routine has return NULL pointer.\n";
-      abort ();
-    case notRegistered:
-      cerr << "rpc++: requested RPC routine not registered.\n";
-      break;
-    case cantGetArgs:
-      cerr << "rpc++: can't get procedure arguments.\n";
-      break;
-    case cantFreeArgs:
-      cerr << "rpc++: can't free XDR arguments.\n";
-      break;
-    @}
-  errorState = noError;
-@}
-@end example
-@end deftypefn
-
-If the program that provides the service has other things to do as well,
-i.e., does not only handle requests, it usually has its own main loop
-that handles events. This loop must be extended to handle RPC events,
-i.e., if anything happens on the RPC file descriptors, it must call
-@code{svc_getreqset} just as @code{Provide ()} does.
-@example
-void RpcService::Provide ()
-@{
-  int dtbsz = getdtablesize();
-  fd_set readfds;
-
-  for(;;)
-    @{
-      readfds = svc_fdset;
-      switch(select (dtbsz, &readfds, 0, 0, 0))
-        @{
-        case -1:
-          if (errno != EBADF)
-            continue;
-          cerr << "PRC++: select: " << sys_errlist[errno] << '\n';
-          return;
-          break;
-        case 0:
-          continue;
-        default:
-          svc_getreqset (&readfds);
-          break;
-        @}
-    @}
-@}
-@end example
-
-The following methods are only available during the execution of a
-callback, i.e., they can be applied to @code{RpcService} if a pointer to
-the invoking object has been declared as last parameter of a callback
-routine.
-
-@deftypefn Method {struct sockaddr_in*} Caller ()
-Return the socket address information of the calling host.
-@end deftypefn
-
-@deftypefn Method char* CallerName ()
-Return the name of the calling host.
-@end deftypefn
-
-@deftypefn Method void Reply ()
-@end deftypefn
-@deftypefn Method void Reply (void* @var{res})
-Normally, a request to the server terminates when the callback completes
-(either with or without returning a value, depending on the return
-type). In some cases it is desirable to reply to the client before all
-the actions related to the request have been completed. This allows the
-client to resume execution. The result (if any) must of course not
-depend on the functions still to be executed.
-@end deftypefn
-
-@deftypefn Method void Interrupt ()
-This is the proper way to terminate the loop entered by calling
-@code{Provide()}. After return from the callback that invoked
-@code{Interrupt()} method @code{Provide()} will return.
-@end deftypefn
-
-@page
-@node    RpcStub,  , RpcService, Classes
-@comment node-name,     next,           previous, up
-@section @code{RpcStub}
-@cindex @code{RpcStub}
-
-Declared in: @code{"rpc++/stub.h"}
-
-@deftp Class RpcStub
-An @code{RpcStub} represents the client side of a connection.
-@end deftp
-
-There are two constructors for @code{RpcStub} that vary in the position
-of their arguments only:
-
-@deftypefn Constructor {} RpcStub (u_long @code{prognum}, u_long @code{versnum}, char* @var{hostname}="localhost", timeval @var{timeout}=defaultTimeout, bool @var{connect}=TRUE)
-@end deftypefn
-@deftypefn Constructor {} RpcStub (u_long @code{prognum}, u_long @code{versnum}, char* @var{hostname}="localhost", bool @var{connect}=TRUE, timeval @var{timeout}=defaultTimeout)
-Construct an @code{RpcStub} that connects to the @var{versnum}'th
-version of program (service) @var{prognum} on host @var{hostname}. The
-timeout for successful completion of communication operations is
-@var{timeout} which defaults to 25 seconds. Unless @var{connect} is
-false, the constructor makes a connection attempt.
-@end deftypefn
-
-There are various methods:
-
-@deftypefn Method void Reconnect ()
-Connect to the server. Usually this method is called if the connection
-was not to be established by the constructor or if the connection
-attempt failed and is to be repeated.
-@end deftypefn
-
-@deftypefn Method bool OK ()
-Returns TRUE if the stub is ready for operation, i.e., connected to a
-server.
-@end deftypefn
-
-@deftypefn Method CLIENT* Service ()
-Access to the standard RPC level. Returns the handle that identifies the
-server.
-@end deftypefn
-
-@deftypefn Method timeval GetTimeout () const
-Returns the default timeout for network operations.
-@end deftypefn
-
-@deftypefn Method void SetTimeout (timeval& @var{timo})
-Sets the default timeout for network operations
-@end deftypefn
-
-@deftypefn Method void* Call (RpcRequest& @var{req}, bool @var{handle_errors}=TRUE)
-@end deftypefn
-@deftypefn Method void* Call (RpcRequest& @var{req}, void* @var{in1}, bool @var{handle_errors}=TRUE)
-@end deftypefn
-@deftypefn Method void* Call (RpcRequest& @var{req}, void* @var{in1}, @var{in2} bool @var{handle_errors}=TRUE)
-Request the operation specified by @var{req} from the server, passing
-zero, one or two arguments. There are declarations of this method for up
-two seven arguments. Arguments are passed as pointers to the argument
-values. The value returned by @code{Call} is a pointer to the result
-returned by the server. The result is valid until @code{Call} is called
-again. If @var{handle_errors} is FALSE and an error occurs, @code{Call}
-simply returns 0. Else, it calls method @code{HandleError} (see below).
-@end deftypefn
-@deftypefn Method void* Call (RpcRequest& @var{req}, void** @var{invals}, bool @var{handle_errors}=TRUE)
-The variant of @code{Call} that handles an arbitrary number of
-arguments.  Pointers to the arguments are passed in an array in
-parameter @var{invals}. The size of the array must match the number of
-arguments given to the constructor of @var{req}.
-@end deftypefn
-
-@deftypefn Method {virtual void*} HandleError ()
-@code{HandleError} is a protected method that is called when an error
-occurs. The cause of the error is stored in a protected member variable
-@code{errorState}. If the default error handling policy (shown below) is
-not appropriate for your application, derive your own class from
-@code{RpcStub} that implements a different one. If you consider an error
-recoverable, reset @code{errorState} to @code{RpcStub::noError} in your
-error handler. Else, @code{OK ()} keeps returning FALSE.  If an error
-occurs during a @code{Call} and parameter @var{handle_errors} is TRUE,
-@code{Call} invokes @code{HandleError} and returns its result as result
-of the call.
-@example
-void* RpcStub::HandleError ()
-@{
-  switch (errorState)
-    @{
-    case notConnected:
-      cerr << "rpc++: Stub has not been connected to server.\n";
-    case cantCreate:
-      cerr << clnt_spcreateerror ("rpc++") << '\n';
-      break;
-    case cantCall:
-      cerr << clnt_sperror (svc, "rpc++") << '\n';
-      exit (1);
-    @}
-  return 0;
-@}
-@end example
-@end deftypefn
-
-While no or little improvement of coding quality can be gained from
-deriving a service specific class from @code{RpcService}, the opposite
-is true for @code{RpcStub}.  A service specific derivation may define
-methods that have the ``real'' argument lists instead of pointers to
-void. These methods are simply implemented by casting the arguments and
-(inline) calling one of the @code{Call}--methods. Apart from better
-type checking, this has the advantage of keeping details like the
-available @code{RpcRequest}s local to the definition of the derived
-class (see the example in the @code{example}--directory).
-
-@node Caveats, References, Classes, Top
-@comment  node-name,  next,  previous,  up
-@chapter Caveats
-@cindex Caveats
-
-@menu
-* Global objects::              Global objects
-* Destruction rules::           Destruction rules
-* Matching server and clients::  Matching server and clients
-@end menu
-
-@node Global objects, Destruction rules,  , Caveats
-@comment  node-name,  next,  previous,  up
-@section Global objects
-@cindex Global objects
-
-As a general C++ rule, be careful with global objects. The sequence of
-constructor invocations for global objects is not defined. This is the
-reason, why @code{RpcRequests} are constructed from pointers to
-@code{XdrInfo}s rather than from @code{XdrInfo}s.
-
-Both @code{XdrInfo}s and @code{RpcRequest}s tend to be instantiated as
-global objects or static member variables. If the constructor of
-@code{RpcRequest} received @code{XdrInfo}s instead of pointers and
-copied the information contained in the @code{XdrInfo} (the solution I
-had preferred), it may happen that the @code{XdrInfo} has not been
-constructed yet and thus contains invalid data.
-
-The same problem occurs if you want to define a global
-``alias--@code{XdrInfo}'' matching a ``@code{typedef int myint}''.
-Don't use @code{XdrInfo Xmyint (Xdr::Xint)} as this may copy the
-uninitialized @code{Xdr::Xint}. Use @code{XdrInfo& Xmyint = Xdr::Xint}
-instead.
-
-@node Destruction rules, Matching server and clients, Global objects, Caveats
-@comment  node-name,  next,  previous,  up
-@section Destruction rules
-@cindex Destruction rules
-
-Objects of type @code{XdrInfo} are resources that can be used more than
-once, i.e., in different @code{RpcRequest}s. If they were handled
-properly, references to @code{XdrInfo} would be counted and the
-@code{XdrInfo} destructed automatically if the last reference is
-removed (unless it is the @code{XdrInfo} of a predefined type).
-
-Such a resource management for @code{XdrInfo}s has been considered
-unnecessary as @code{XdrInfo}s will rarely be dynamic objects. If the
-user allocates an @code{XdrInfo} on the stack or the heap, it is his
-responsibility to assure that the object is valid until the last
-@code{RpcResource} that uses it has been destructed.
-
-@node Matching server and clients,  , Destruction rules, Caveats
-@comment  node-name,  next,  previous,  up
-@section Matching server and clients
-
-In order to make sure that the server and the clients agree about the
-protocol, all @code{RpcRequest}s for a service should be declared in a
-header file and instantiated in a corresponding source file. The header
-file and the compiled source file make the ``library'' that provides the
-service. Thus a server consists of three files: the server executable, a
-header file defining the service that is to be included in client
-sources and an object file which must be linked to the client
-executable.
-
-@c ======================================================================
-
-@node References, Copying, Caveats, Top
-@comment  node-name,  next,  previous,  up
-@unnumbered References
-
-Margaret A. Ellis, @cite{The Annotated C++ Reference Manual},
-Addison-Wesley, 1990.
-
-Stanley B. Lippmann, @cite{A C++ Primer}, Addison-Wesley, 1989.
-
-Bjarne Stroustrup, @cite{The C++ Programming Language}, Addison-Wesley,
-1986.
-
-Sun Microsystems, @cite{Network Programming}, March 1990.
-
-@c ======================================================================
-
-@node Copying, Data Type Index, References, Top
-@appendix GNU LIBRARY GENERAL PUBLIC LICENSE
-@center Version 2, June 1991
-
-@display
-Copyright @copyright{} 1991 Free Software Foundation, Inc.
-675 Mass Ave, Cambridge, MA 02139, USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@unnumberedsec Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software---to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-``work based on the library'' and a ``work that uses the library''.  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-@iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
-
-@enumerate
-@item
-This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called ``this License'').  Each licensee is
-addressed as ``you''.
-
-  A ``library'' means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The ``Library'', below, refers to any such software library or work
-which has been distributed under these terms.  A ``work based on the
-Library'' means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term ``modification''.)
-
-  ``Source code'' for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-@item
-You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-@item
-You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-@enumerate
-@item
-The modified work must itself be a software library.
-
-@item
-You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-
-@item
-You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-
-@item
-If a facility in the modified Library refers to a function or a
-table of data to be supplied by an application program that uses
-the facility, other than as an argument passed when the facility
-is invoked, then you must make a good faith effort to ensure that,
-in the event an application does not supply such function or
-table, the facility still operates, and performs whatever part of
-its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has
-a purpose that is entirely well-defined independent of the
-application.  Therefore, Subsection 2d requires that any
-application-supplied function or table used by this function must
-be optional: if the application does not supply it, the square
-root function must still compute square roots.)
-@end enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-@item
-You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-@item
-You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a ``work that uses the Library''.  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a ``work that uses the Library'' with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a ``work that uses the
-library''.  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a ``work that uses the Library'' uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-@item
-As an exception to the Sections above, you may also compile or
-link a ``work that uses the Library'' with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-@enumerate
-@item
-Accompany the work with the complete corresponding
-machine-readable source code for the Library including whatever
-changes were used in the work (which must be distributed under
-Sections 1 and 2 above); and, if the work is an executable linked
-with the Library, with the complete machine-readable ``work that
-uses the Library'', as object code and/or source code, so that the
-user can modify the Library and then relink to produce a modified
-executable containing the modified Library.  (It is understood
-that the user who changes the contents of definitions files in the
-Library will not necessarily be able to recompile the application
-to use the modified definitions.)
-
-@item
-Accompany the work with a written offer, valid for at
-least three years, to give the same user the materials
-specified in Subsection 6a, above, for a charge no more
-than the cost of performing this distribution.
-
-@item
-If distribution of the work is made by offering access to copy
-from a designated place, offer equivalent access to copy the above
-specified materials from the same place.
-
-@item
-Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
-@end enumerate
-
-  For an executable, the required form of the ``work that uses the
-Library'' must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-@item
-You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-@enumerate
-@item
-Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library
-facilities.  This must be distributed under the terms of the
-Sections above.
-
-@item
-Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
-@end enumerate
-
-@item
-You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-@item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-@item
-Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-@item
-The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-``any later version'', you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-@item
-If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-
-@item
-BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-@item
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-@end enumerate
-
-@iftex
-@heading END OF TERMS AND CONDITIONS
-@end iftex
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
-
-@page
-@unnumberedsec How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the library's name and a brief idea of what it does.}
-Copyright (C) @var{year}  @var{name of author}
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the library, if
-necessary.  Here is a sample; alter the names:
-
-@example
-Yoyodyne, Inc., hereby disclaims all copyright interest in the
-library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-@var{signature of Ty Coon}, 1 April 1990
-Ty Coon, President of Vice
-@end example
-
-That's all there is to it!
-
-@c ========================================================================
-
-@page
-@node    Data Type Index, Function Index, Copying, Top
-@comment node-name,     next, previous,		up
-@unnumbered Data Type Index
-
-@printindex tp
-
-@node  Function Index, Concept Index, Data Type Index, Top
-@comment  node-name,  next,  previous,  up
-@unnumbered Function and Method Index
-
-@printindex fn
-
-@node    Concept Index,  , Function Index, Top
-@comment node-name,     next, previous,      up
-@unnumbered Concept Index
-
-@printindex cp
-
-@contents
-@bye
diff --git a/rpc++/rpc++.toc b/rpc++/rpc++.toc
deleted file mode 100644
index 95eea1fd88c..00000000000
--- a/rpc++/rpc++.toc
+++ /dev/null
@@ -1,23 +0,0 @@
-\chapentry {Overview}{1}{1}
-\chapentry {Installation}{2}{2}
-\chapentry {The classes}{3}{3}
-\secentry {\code {XdrInfo}}{3}{1}{3}
-\secentry {\code {RpcRequest}}{3}{2}{5}
-\secentry {Callbacks}{3}{3}{7}
-\subsecentry {\code {RpcCallback}}{3}{3}{1}{7}
-\subsecentry {\code {RpcMethodCall}}{3}{3}{2}{9}
-\subsecentry {\code {Calling Conventions}}{3}{3}{3}{10}
-\secentry {\code {RpcService}}{3}{4}{12}
-\secentry {\code {RpcStub}}{3}{5}{16}
-\chapentry {Caveats}{4}{19}
-\secentry {Global objects}{4}{1}{19}
-\secentry {Destruction rules}{4}{2}{19}
-\secentry {Matching server and clients}{4}{3}{19}
-\unnumbchapentry {References}{21}
-\chapentry {GNU LIBRARY GENERAL PUBLIC LICENSE}{Appendix \char65}{22}
-\unnumbsecentry{Preamble}{22}
-\unnumbsecentry{TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION}{24}
-\unnumbsecentry{How to Apply These Terms to Your New Libraries}{30}
-\unnumbchapentry {Data Type Index}{31}
-\unnumbchapentry {Function and Method Index}{32}
-\unnumbchapentry {Concept Index}{33}
diff --git a/rpc++/rpc++.tp b/rpc++/rpc++.tp
deleted file mode 100644
index 80265f4d91c..00000000000
--- a/rpc++/rpc++.tp
+++ /dev/null
@@ -1,7 +0,0 @@
-\entry {XdrInfo}{3}{\code {XdrInfo}}
-\entry {RpcRequest}{5}{\code {RpcRequest}}
-\entry {AnyRpcCallback}{7}{\code {AnyRpcCallback}}
-\entry {RpcCallback}{7}{\code {RpcCallback}}
-\entry {RpcMethodCall}{9}{\code {RpcMethodCall}}
-\entry {RpcService}{12}{\code {RpcService}}
-\entry {RpcStub}{16}{\code {RpcStub}}
diff --git a/rpc++/rpc++.vr b/rpc++/rpc++.vr
deleted file mode 100644
index 2ad8f41a633..00000000000
--- a/rpc++/rpc++.vr
+++ /dev/null
@@ -1,13 +0,0 @@
-\entry {Xdr::Xchar}{3}{\code {Xdr::Xchar}}
-\entry {Xdr::Xshort}{3}{\code {Xdr::Xshort}}
-\entry {Xdr::Xint}{4}{\code {Xdr::Xint}}
-\entry {Xdr::Xlong}{4}{\code {Xdr::Xlong}}
-\entry {Xdr::Xuchar}{4}{\code {Xdr::Xuchar}}
-\entry {Xdr::Xushort}{4}{\code {Xdr::Xushort}}
-\entry {Xdr::Xulong}{4}{\code {Xdr::Xulong}}
-\entry {Xdr::Xfloat}{4}{\code {Xdr::Xfloat}}
-\entry {Xdr::Xdouble}{4}{\code {Xdr::Xdouble}}
-\entry {Xdr::Xenum{\_}t}{4}{\code {Xdr::Xenum{\_}t}}
-\entry {Xdr::Xbool{\_}t}{4}{\code {Xdr::Xbool{\_}t}}
-\entry {Xdr::Xvoid}{4}{\code {Xdr::Xvoid}}
-\entry {Xdr::Xnull}{4}{\code {Xdr::Xnull}}
diff --git a/rpc++/rpc++/callback.h b/rpc++/rpc++/callback.h
deleted file mode 100644
index 6200178263f..00000000000
--- a/rpc++/rpc++/callback.h
+++ /dev/null
@@ -1,533 +0,0 @@
-// -*- c++ -*-
-/*
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-#ifndef _RPCCALLBACK_H_
-#define _RPCCALLBACK_H_
-static char _rpcpp_callback_h_[]
-= "callback.h,v 2.3 1992/06/15 19:13:26 mnl Exp";
-
-// callback.h,v
-// Revision 2.3  1992/06/15  19:13:26  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:37  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:43  mnl
-// Initial mnl version.
-//
-
-//
-// The user interface to RpcCallback is quiet simple. The only function
-// needed is the constructor "RpcCallback (T* o, void* m)". Given a class
-// C with a method m and an object o of Type C, a callback to the method
-// can be constructed with "RpcCallback<C> (&O, &C::m)".
-//     As an alternative, an RpcExtCallback may be constructed with
-// "RpcExtCallback (T* o, void* m, RpcService*)". In this case, the method
-// is called with a pointer to the RpcService object as a third argument.
-//
-//     A pointer to a callback can be casted to AnyRpcCallback by
-// whatever routine receives it and the call can be made by applying "Do"
-// to the callback.
-//
-
-class RpcService;
-
-class AnyRpcCallback
-{
-  friend class RpcService;
-
-protected:
-  int params;
-  RpcService* svc;
-  virtual void* Do (void** in) = 0;
-
-public:
-  inline virtual ~AnyRpcCallback () {}
-  inline virtual AnyRpcCallback* CopyToHeap () const = 0;
-  inline int Params () const
-    { return params; }
-  inline void SetService (RpcService* s)
-    { svc = s; }
-};
-
-class RpcCallback : public AnyRpcCallback
-{
-private:
-  typedef void* (*ProcN)(void**);
-  typedef void* (*Proc0)();
-  typedef void* (*Proc1)(void*);
-  typedef void* (*Proc2)(void*, void*);
-  typedef void* (*Proc3)(void*, void*, void*);
-  typedef void* (*Proc4)(void*, void*, void*, void*);
-  typedef void* (*Proc5)(void*, void*, void*, void*, void*);
-  typedef void* (*Proc6)(void*, void*, void*, void*, void*, void*);
-  typedef void* (*Proc7)(void*, void*, void*, void*, void*, void*, void*);
-
-  typedef void (*ProcNv)(void**);
-  typedef void (*Proc0v)();
-  typedef void (*Proc1v)(void*);
-  typedef void (*Proc2v)(void*, void*);
-  typedef void (*Proc3v)(void*, void*, void*);
-  typedef void (*Proc4v)(void*, void*, void*, void*);
-  typedef void (*Proc5v)(void*, void*, void*, void*, void*);
-  typedef void (*Proc6v)(void*, void*, void*, void*, void*, void*);
-  typedef void (*Proc7v)(void*, void*, void*, void*, void*, void*, void*);
-
-  typedef void* (*ProcNs)(void**, RpcService*);
-  typedef void* (*Proc0s)(RpcService*);
-  typedef void* (*Proc1s)(void*, RpcService*);
-  typedef void* (*Proc2s)(void*, void*, RpcService*);
-  typedef void* (*Proc3s)(void*, void*, void*, RpcService*);
-  typedef void* (*Proc4s)(void*, void*, void*, void*, RpcService*);
-  typedef void* (*Proc5s)(void*, void*, void*, void*, void*, RpcService*);
-  typedef void* (*Proc6s)(void*, void*, void*, void*,
-			       void*, void*, RpcService*);
-  typedef void* (*Proc7s)(void*, void*, void*, void*,
-			       void*, void*, void*, RpcService*);
-
-  typedef void (*ProcNvs)(void**, RpcService*);
-  typedef void (*Proc0vs)(RpcService*);
-  typedef void (*Proc1vs)(void*, RpcService*);
-  typedef void (*Proc2vs)(void*, void*, RpcService*);
-  typedef void (*Proc3vs)(void*, void*, void*, RpcService*);
-  typedef void (*Proc4vs)(void*, void*, void*, void*, RpcService*);
-  typedef void (*Proc5vs)(void*, void*, void*, void*, void*, RpcService*);
-  typedef void (*Proc6vs)(void*, void*, void*, void*,
-			       void*, void*, RpcService*);
-  typedef void (*Proc7vs)(void*, void*, void*, void*,
-			       void*, void*, void*, RpcService*);
-
-  typedef void* (RpcCallback::*DoPtr)(void**);
-  DoPtr todo;
-  union
-    {
-      ProcN procN;ProcNv procNv;ProcNs procNs;ProcNvs procNvs;
-      Proc0 proc0;Proc0v proc0v;Proc0s proc0s;Proc0vs proc0vs;
-      Proc1 proc1;Proc1v proc1v;Proc1s proc1s;Proc1vs proc1vs;
-      Proc2 proc2;Proc2v proc2v;Proc2s proc2s;Proc2vs proc2vs;
-      Proc3 proc3;Proc3v proc3v;Proc3s proc3s;Proc3vs proc3vs;
-      Proc4 proc4;Proc4v proc4v;Proc4s proc4s;Proc4vs proc4vs;
-      Proc5 proc5;Proc5v proc5v;Proc5s proc5s;Proc5vs proc5vs;
-      Proc6 proc6;Proc6v proc6v;Proc6s proc6s;Proc6vs proc6vs;
-      Proc7 proc7;Proc7v proc7v;Proc7s proc7s;Proc7vs proc7vs;
-    };
-  inline RpcCallback () {}
-  inline void* Do (void** in)
-    { return (this->*todo)(in); }
-
-  inline void* DoN (void** in)
-    { return (*procN)(in); }
-  inline void* Do0 (void** in)
-    { return (*proc0)(); }
-  inline void* Do1 (void** in)
-    { return (*proc1)(in[0]); }
-  inline void* Do2 (void** in)
-    { return (*proc2)(in[0], in[1]); }
-  inline void* Do3 (void** in)
-    { return (*proc3)(in[0], in[1], in[2]); }
-  inline void* Do4 (void** in)
-    { return (*proc4)(in[0], in[1], in[2], in[3]); }
-  inline void* Do5 (void** in)
-    { return (*proc5)(in[0], in[1], in[2], in[3], in[4]); }
-  inline void* Do6 (void** in)
-    { return (*proc6)(in[0], in[1], in[2], in[3], in[4], in[5]); }
-  inline void* Do7 (void** in)
-    { return (*proc7)(in[0], in[1], in[2], in[3], in[4], in[5], in[6]); }
-  inline void* DoNv (void** in)
-    { (*procNv)(in); return (void*)0; }
-  inline void* Do0v (void** in)
-    { (*proc0v)(); return (void*)0; }
-  inline void* Do1v (void** in)
-    { (*proc1v)(in[0]); return (void*)0; }
-  inline void* Do2v (void** in)
-    { (*proc2v)(in[0], in[1]); return (void*)0; }
-  inline void* Do3v (void** in)
-    { (*proc3v)(in[0], in[1], in[2]); return (void*)0; }
-  inline void* Do4v (void** in)
-    { (*proc4v)(in[0], in[1], in[2], in[3]); return (void*)0; }
-  inline void* Do5v (void** in)
-    { (*proc5v)(in[0], in[1], in[2], in[3], in[4]); return (void*)0; }
-  inline void* Do6v (void** in)
-    { (*proc6v)(in[0], in[1], in[2], in[3], in[4], in[5]); return (void*)0; }
-  inline void* Do7v (void** in)
-    { (*proc7v)(in[0], in[1], in[2], in[3], in[4], in[5], in[6]);
-      return (void*)0; }
-
-  inline void* DoNs (void** in)
-    { return (*procNs)(in, svc); }
-  inline void* Do0s (void** in)
-    { return (*proc0s)(svc); }
-  inline void* Do1s (void** in)
-    { return (*proc1s)(in[0], svc); }
-  inline void* Do2s (void** in)
-    { return (*proc2s)(in[0], in[1], svc); }
-  inline void* Do3s (void** in)
-    { return (*proc3s)(in[0], in[1], in[2], svc); }
-  inline void* Do4s (void** in)
-    { return (*proc4s)(in[0], in[1], in[2], in[3], svc); }
-  inline void* Do5s (void** in)
-    { return (*proc5s)(in[0], in[1], in[2], in[3], in[4], svc); }
-  inline void* Do6s (void** in)
-    { return (*proc6s)(in[0], in[1], in[2], in[3], in[4], in[5], svc); }
-  inline void* Do7s (void** in)
-    { return (*proc7s)(in[0], in[1], in[2], in[3], in[4], in[5], in[6], svc); }
-  inline void* DoNvs (void** in)
-    { (*procNvs)(in, svc); return (void*)0; }
-  inline void* Do0vs (void** in)
-    { (*proc0vs)(svc); return (void*)0; }
-  inline void* Do1vs (void** in)
-    { (*proc1vs)(in[0], svc); return (void*)0; }
-  inline void* Do2vs (void** in)
-    { (*proc2vs)(in[0], in[1], svc); return (void*)0; }
-  inline void* Do3vs (void** in)
-    { (*proc3vs)(in[0], in[1], in[2], svc); return (void*)0; }
-  inline void* Do4vs (void** in)
-    { (*proc4vs)(in[0], in[1], in[2], in[3], svc); return (void*)0; }
-  inline void* Do5vs (void** in)
-    { (*proc5vs)(in[0], in[1], in[2], in[3], in[4], svc); return (void*)0; }
-  inline void* Do6vs (void** in)
-    { (*proc6vs)(in[0], in[1], in[2], in[3], in[4], in[5], svc);
-      return (void*)0; }
-  inline void* Do7vs (void** in)
-    { (*proc7vs)(in[0], in[1], in[2], in[3],
-		   in[4], in[5], in[6], svc); return (void*)0; }
-
-public:
-  inline RpcCallback (ProcN p)
-    { todo = &this->DoN; procN = p; params = -1; }
-  inline RpcCallback (Proc0 p)
-    { todo = &this->Do0; proc0 = p; params = 0; }
-  inline RpcCallback (Proc1 p)
-    { todo = &this->Do1; proc1 = p; params = 1; }
-  inline RpcCallback (Proc2 p)
-    { todo = &this->Do2; proc2 = p; params = 2; }
-  inline RpcCallback (Proc3 p)
-    { todo = &this->Do3; proc3 = p; params = 3; }
-  inline RpcCallback (Proc4 p)
-    { todo = &this->Do4; proc4 = p; params = 4; }
-  inline RpcCallback (Proc5 p)
-    { todo = &this->Do5; proc5 = p; params = 5; }
-  inline RpcCallback (Proc6 p)
-    { todo = &this->Do6; proc6 = p; params = 6; }
-  inline RpcCallback (Proc7 p)
-    { todo = &this->Do7; proc7 = p; params = 7; }
-
-  inline RpcCallback (ProcNv p)
-    { todo = &this->DoNv; procNv = p; params = -1; }
-  inline RpcCallback (Proc0v p)
-    { todo = &this->Do0v; proc0v = p; params = 0; }
-  inline RpcCallback (Proc1v p)
-    { todo = &this->Do1v; proc1v = p; params = 1; }
-  inline RpcCallback (Proc2v p)
-    { todo = &this->Do2v; proc2v = p; params = 2; }
-  inline RpcCallback (Proc3v p)
-    { todo = &this->Do3v; proc3v = p; params = 3; }
-  inline RpcCallback (Proc4v p)
-    { todo = &this->Do4v; proc4v = p; params = 4; }
-  inline RpcCallback (Proc5v p)
-    { todo = &this->Do5v; proc5v = p; params = 5; }
-  inline RpcCallback (Proc6v p)
-    { todo = &this->Do6v; proc6v = p; params = 6; }
-  inline RpcCallback (Proc7v p)
-    { todo = &this->Do7v; proc7v = p; params = 7; }
-
-  inline RpcCallback (ProcNs p)
-    { todo = &this->DoNs; procNs = p; params = -1; }
-  inline RpcCallback (Proc0s p)
-    { todo = &this->Do0s; proc0s = p; params = 0; }
-  inline RpcCallback (Proc1s p)
-    { todo = &this->Do1s; proc1s = p; params = 1; }
-  inline RpcCallback (Proc2s p)
-    { todo = &this->Do2s; proc2s = p; params = 2; }
-  inline RpcCallback (Proc3s p)
-    { todo = &this->Do3s; proc3s = p; params = 3; }
-  inline RpcCallback (Proc4s p)
-    { todo = &this->Do4s; proc4s = p; params = 4; }
-  inline RpcCallback (Proc5s p)
-    { todo = &this->Do5s; proc5s = p; params = 5; }
-  inline RpcCallback (Proc6s p)
-    { todo = &this->Do6s; proc6s = p; params = 6; }
-  inline RpcCallback (Proc7s p)
-    { todo = &this->Do7s; proc7s = p; params = 7; }
-
-  inline RpcCallback (ProcNvs p)
-    { todo = &this->DoNvs; procNvs = p; params = -1; }
-  inline RpcCallback (Proc0vs p)
-    { todo = &this->Do0vs; proc0vs = p; params = 0; }
-  inline RpcCallback (Proc1vs p)
-    { todo = &this->Do1vs; proc1vs = p; params = 1; }
-  inline RpcCallback (Proc2vs p)
-    { todo = &this->Do2vs; proc2vs = p; params = 2; }
-  inline RpcCallback (Proc3vs p)
-    { todo = &this->Do3vs; proc3vs = p; params = 3; }
-  inline RpcCallback (Proc4vs p)
-    { todo = &this->Do4vs; proc4vs = p; params = 4; }
-  inline RpcCallback (Proc5vs p)
-    { todo = &this->Do5vs; proc5vs = p; params = 5; }
-  inline RpcCallback (Proc6vs p)
-    { todo = &this->Do6vs; proc6vs = p; params = 6; }
-  inline RpcCallback (Proc7vs p)
-    { todo = &this->Do7vs; proc7vs = p; params = 7; }
-
-  inline virtual AnyRpcCallback* CopyToHeap () const
-    {
-      RpcCallback* p = new RpcCallback ();
-      *p = *this;
-      return p;
-    }
-};
-
-template<class T> class RpcMethodCall : public AnyRpcCallback
-{
-private:
-  typedef void* (T::*MethodN)(void**);
-  typedef void* (T::*Method0)();
-  typedef void* (T::*Method1)(void*);
-  typedef void* (T::*Method2)(void*, void*);
-  typedef void* (T::*Method3)(void*, void*, void*);
-  typedef void* (T::*Method4)(void*, void*, void*, void*);
-  typedef void* (T::*Method5)(void*, void*, void*, void*, void*);
-  typedef void* (T::*Method6)(void*, void*, void*, void*, void*, void*);
-  typedef void* (T::*Method7)(void*, void*, void*, void*, void*, void*, void*);
-
-  typedef void (T::*MethodNv)(void**);
-  typedef void (T::*Method0v)();
-  typedef void (T::*Method1v)(void*);
-  typedef void (T::*Method2v)(void*, void*);
-  typedef void (T::*Method3v)(void*, void*, void*);
-  typedef void (T::*Method4v)(void*, void*, void*, void*);
-  typedef void (T::*Method5v)(void*, void*, void*, void*, void*);
-  typedef void (T::*Method6v)(void*, void*, void*, void*, void*, void*);
-  typedef void (T::*Method7v)(void*, void*, void*, void*, void*, void*, void*);
-
-  typedef void* (T::*MethodNs)(void**, RpcService*);
-  typedef void* (T::*Method0s)(RpcService*);
-  typedef void* (T::*Method1s)(void*, RpcService*);
-  typedef void* (T::*Method2s)(void*, void*, RpcService*);
-  typedef void* (T::*Method3s)(void*, void*, void*, RpcService*);
-  typedef void* (T::*Method4s)(void*, void*, void*, void*, RpcService*);
-  typedef void* (T::*Method5s)(void*, void*, void*, void*, void*, RpcService*);
-  typedef void* (T::*Method6s)(void*, void*, void*, void*,
-			       void*, void*, RpcService*);
-  typedef void* (T::*Method7s)(void*, void*, void*, void*,
-			       void*, void*, void*, RpcService*);
-
-  typedef void (T::*MethodNvs)(void**, RpcService*);
-  typedef void (T::*Method0vs)(RpcService*);
-  typedef void (T::*Method1vs)(void*, RpcService*);
-  typedef void (T::*Method2vs)(void*, void*, RpcService*);
-  typedef void (T::*Method3vs)(void*, void*, void*, RpcService*);
-  typedef void (T::*Method4vs)(void*, void*, void*, void*, RpcService*);
-  typedef void (T::*Method5vs)(void*, void*, void*, void*, void*, RpcService*);
-  typedef void (T::*Method6vs)(void*, void*, void*, void*,
-			       void*, void*, RpcService*);
-  typedef void (T::*Method7vs)(void*, void*, void*, void*,
-			       void*, void*, void*, RpcService*);
-
-  typedef void* (RpcMethodCall::*DoPtr)(void**);
-  DoPtr todo;
-  T* object;
-  union
-    {
-      MethodN methodN;MethodNv methodNv;MethodNs methodNs;MethodNvs methodNvs;
-      Method0 method0;Method0v method0v;Method0s method0s;Method0vs method0vs;
-      Method1 method1;Method1v method1v;Method1s method1s;Method1vs method1vs;
-      Method2 method2;Method2v method2v;Method2s method2s;Method2vs method2vs;
-      Method3 method3;Method3v method3v;Method3s method3s;Method3vs method3vs;
-      Method4 method4;Method4v method4v;Method4s method4s;Method4vs method4vs;
-      Method5 method5;Method5v method5v;Method5s method5s;Method5vs method5vs;
-      Method6 method6;Method6v method6v;Method6s method6s;Method6vs method6vs;
-      Method7 method7;Method7v method7v;Method7s method7s;Method7vs method7vs;
-    };
-  inline RpcMethodCall () {}
-  inline void* Do (void** in)
-    { return (this->*todo)(in); }
-
-  inline void* DoN (void** in)
-    { return (object->*methodN)(in); }
-  inline void* Do0 (void** in)
-    { return (object->*method0)(); }
-  inline void* Do1 (void** in)
-    { return (object->*method1)(in[0]); }
-  inline void* Do2 (void** in)
-    { return (object->*method2)(in[0], in[1]); }
-  inline void* Do3 (void** in)
-    { return (object->*method3)(in[0], in[1], in[2]); }
-  inline void* Do4 (void** in)
-    { return (object->*method4)(in[0], in[1], in[2], in[3]); }
-  inline void* Do5 (void** in)
-    { return (object->*method5)(in[0], in[1], in[2], in[3], in[4]); }
-  inline void* Do6 (void** in)
-    { return (object->*method6)(in[0], in[1], in[2], in[3], in[4], in[5]); }
-  inline void* Do7 (void** in)
-    { return (object->*method7)(in[0], in[1], in[2],
-				in[3], in[4], in[5], in[6]); }
-  inline void* DoNv (void** in)
-    { (object->*methodNv)(in); return (void*)0; }
-  inline void* Do0v (void** in)
-    { (object->*method0v)(); return (void*)0; }
-  inline void* Do1v (void** in)
-    { (object->*method1v)(in[0]); return (void*)0; }
-  inline void* Do2v (void** in)
-    { (object->*method2v)(in[0], in[1]); return (void*)0; }
-  inline void* Do3v (void** in)
-    { (object->*method3v)(in[0], in[1], in[2]); return (void*)0; }
-  inline void* Do4v (void** in)
-    { (object->*method4v)(in[0], in[1], in[2], in[3]); return (void*)0; }
-  inline void* Do5v (void** in)
-    { (object->*method5v)(in[0], in[1], in[2], in[3], in[4]);
-      return (void*)0; }
-  inline void* Do6v (void** in)
-    { (object->*method6v)(in[0], in[1], in[2], in[3], in[4], in[5]);
-      return (void*)0; }
-  inline void* Do7v (void** in)
-    { (object->*method7v)(in[0], in[1], in[2], in[3], in[4], in[5], in[6]);
-      return (void*)0; }
-
-  inline void* DoNs (void** in)
-    { return (object->*methodNs)(in, svc); }
-  inline void* Do0s (void** in)
-    { return (object->*method0s)(svc); }
-  inline void* Do1s (void** in)
-    { return (object->*method1s)(in[0], svc); }
-  inline void* Do2s (void** in)
-    { return (object->*method2s)(in[0], in[1], svc); }
-  inline void* Do3s (void** in)
-    { return (object->*method3s)(in[0], in[1], in[2], svc); }
-  inline void* Do4s (void** in)
-    { return (object->*method4s)(in[0], in[1], in[2], in[3], svc); }
-  inline void* Do5s (void** in)
-    { return (object->*method5s)(in[0], in[1], in[2], in[3], in[4], svc); }
-  inline void* Do6s (void** in)
-    { return (object->*method6s)(in[0], in[1], in[2],
-				 in[3], in[4], in[5], svc); }
-  inline void* Do7s (void** in)
-    { return (object->*method7s)(in[0], in[1], in[2],
-				 in[3], in[4], in[5], in[6], svc); }
-  inline void* DoNvs (void** in)
-    { (object->*methodNvs)(in, svc); return (void*)0; }
-  inline void* Do0vs (void** in)
-    { (object->*method0vs)(svc); return (void*)0; }
-  inline void* Do1vs (void** in)
-    { (object->*method1vs)(in[0], svc); return (void*)0; }
-  inline void* Do2vs (void** in)
-    { (object->*method2vs)(in[0], in[1], svc); return (void*)0; }
-  inline void* Do3vs (void** in)
-    { (object->*method3vs)(in[0], in[1], in[2], svc); return (void*)0; }
-  inline void* Do4vs (void** in)
-    { (object->*method4vs)(in[0], in[1], in[2], in[3], svc); return (void*)0; }
-  inline void* Do5vs (void** in)
-    { (object->*method5vs)(in[0], in[1], in[2], in[3], in[4], svc);
-      return (void*)0; }
-  inline void* Do6vs (void** in)
-    { (object->*method6vs)(in[0], in[1], in[2], in[3], in[4], in[5], svc);
-      return (void*)0; }
-  inline void* Do7vs (void** in)
-    { (object->*method7vs)(in[0], in[1], in[2], in[3],
-			   in[4], in[5], in[6], svc); return (void*)0; }
-
-public:
-  inline RpcMethodCall (T* o, MethodN m)
-    { todo = &this->DoN; object = o; methodN = m; params = -1; }
-  inline RpcMethodCall (T* o, Method0 m)
-    { todo = &this->Do0; object = o; method0 = m; params = 0; }
-  inline RpcMethodCall (T* o, Method1 m)
-    { todo = &this->Do1; object = o; method1 = m; params = 1; }
-  inline RpcMethodCall (T* o, Method2 m)
-    { todo = &this->Do2; object = o; method2 = m; params = 2; }
-  inline RpcMethodCall (T* o, Method3 m)
-    { todo = &this->Do3; object = o; method3 = m; params = 3; }
-  inline RpcMethodCall (T* o, Method4 m)
-    { todo = &this->Do4; object = o; method4 = m; params = 4; }
-  inline RpcMethodCall (T* o, Method5 m)
-    { todo = &this->Do5; object = o; method5 = m; params = 5; }
-  inline RpcMethodCall (T* o, Method6 m)
-    { todo = &this->Do6; object = o; method6 = m; params = 6; }
-  inline RpcMethodCall (T* o, Method7 m)
-    { todo = &this->Do7; object = o; method7 = m; params = 7; }
-
-  inline RpcMethodCall (T* o, MethodNv m)
-    { todo = &this->DoNv; object = o; methodNv = m; params = -1; }
-  inline RpcMethodCall (T* o, Method0v m)
-    { todo = &this->Do0v; object = o; method0v = m; params = 0; }
-  inline RpcMethodCall (T* o, Method1v m)
-    { todo = &this->Do1v; object = o; method1v = m; params = 1; }
-  inline RpcMethodCall (T* o, Method2v m)
-    { todo = &this->Do2v; object = o; method2v = m; params = 2; }
-  inline RpcMethodCall (T* o, Method3v m)
-    { todo = &this->Do3v; object = o; method3v = m; params = 3; }
-  inline RpcMethodCall (T* o, Method4v m)
-    { todo = &this->Do4v; object = o; method4v = m; params = 4; }
-  inline RpcMethodCall (T* o, Method5v m)
-    { todo = &this->Do5v; object = o; method5v = m; params = 5; }
-  inline RpcMethodCall (T* o, Method6v m)
-    { todo = &this->Do6v; object = o; method6v = m; params = 6; }
-  inline RpcMethodCall (T* o, Method7v m)
-    { todo = &this->Do7v; object = o; method7v = m; params = 7; }
-
-  inline RpcMethodCall (T* o, MethodNs m)
-    { todo = &this->DoNs; object = o; methodNs = m; params = -1; }
-  inline RpcMethodCall (T* o, Method0s m)
-    { todo = &this->Do0s; object = o; method0s = m; params = 0; }
-  inline RpcMethodCall (T* o, Method1s m)
-    { todo = &this->Do1s; object = o; method1s = m; params = 1; }
-  inline RpcMethodCall (T* o, Method2s m)
-    { todo = &this->Do2s; object = o; method2s = m; params = 2; }
-  inline RpcMethodCall (T* o, Method3s m)
-    { todo = &this->Do3s; object = o; method3s = m; params = 3; }
-  inline RpcMethodCall (T* o, Method4s m)
-    { todo = &this->Do4s; object = o; method4s = m; params = 4; }
-  inline RpcMethodCall (T* o, Method5s m)
-    { todo = &this->Do5s; object = o; method5s = m; params = 5; }
-  inline RpcMethodCall (T* o, Method6s m)
-    { todo = &this->Do6s; object = o; method6s = m; params = 6; }
-  inline RpcMethodCall (T* o, Method7s m)
-    { todo = &this->Do7s; object = o; method7s = m; params = 7; }
-
-  inline RpcMethodCall (T* o, MethodNvs m)
-    { todo = &this->DoNvs; object = o; methodNvs = m; params = -1; }
-  inline RpcMethodCall (T* o, Method0vs m)
-    { todo = &this->Do0vs; object = o; method0vs = m; params = 0; }
-  inline RpcMethodCall (T* o, Method1vs m)
-    { todo = &this->Do1vs; object = o; method1vs = m; params = 1; }
-  inline RpcMethodCall (T* o, Method2vs m)
-    { todo = &this->Do2vs; object = o; method2vs = m; params = 2; }
-  inline RpcMethodCall (T* o, Method3vs m)
-    { todo = &this->Do3vs; object = o; method3vs = m; params = 3; }
-  inline RpcMethodCall (T* o, Method4vs m)
-    { todo = &this->Do4vs; object = o; method4vs = m; params = 4; }
-  inline RpcMethodCall (T* o, Method5vs m)
-    { todo = &this->Do5vs; object = o; method5vs = m; params = 5; }
-  inline RpcMethodCall (T* o, Method6vs m)
-    { todo = &this->Do6vs; object = o; method6vs = m; params = 6; }
-  inline RpcMethodCall (T* o, Method7vs m)
-    { todo = &this->Do7vs; object = o; method7vs = m; params = 7; }
-
-  inline virtual AnyRpcCallback* CopyToHeap () const
-    {
-      RpcMethodCall* p = new RpcMethodCall ();
-      *p = *this;
-      return p;
-    }
-};
-
-#endif
diff --git a/rpc++/rpc++/request.h b/rpc++/rpc++/request.h
deleted file mode 100644
index 04250bb3105..00000000000
--- a/rpc++/rpc++/request.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-#ifndef _RPCREQUEST_H_
-#define _RPCREQUEST_H_
-static char _rpcpp_request_h_[]
-= "request.h,v 2.3 1992/06/15 19:13:28 mnl Exp";
-
-// request.h,v
-// Revision 2.3  1992/06/15  19:13:28  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:39  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:43  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "xdr++.h"
-
-// RpcRequest is a class that specifies an individual request that is
-// part of a service. Three parameters are required to specify a request:
-//  - the request number
-//  - the serializer (XdrInfo) for the input to the request
-//  - the serializer (XdrInfo) for the output from the request
-class RpcRequest
-{
-private:
-  void init (u_long req, int pars, int parsz,
-	     const XdrInfo* out, const XdrInfo** in, int rt);
-
-public:
-  // Construct a new request from a request id, the information about
-  // the input data and the information about the output data.
-  // Note that requests that are registered for a service are stored
-  // in an array using the request id as the index, so keep indices
-  // small.
-  typedef enum { normal, batched, async } ReqType;
-  // No input arg:
-  RpcRequest (u_long req, const XdrInfo* out, int t = normal);
-  // One input arg:
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo* in,
-	      int t = normal);
-  // Two input args:
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      int t = normal);
-  // ...
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, int t = normal);
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, const XdrInfo*, int t = normal);
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, const XdrInfo*, const XdrInfo*, int t = normal);
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, const XdrInfo*, const XdrInfo*, const XdrInfo*,
-	      int t = normal);
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, const XdrInfo*, const XdrInfo*, const XdrInfo*,
-	      const XdrInfo*, int t = normal);
-  // N input args, conversion routines given as a NULL terminated array
-  // of XdrInfo*:
-  RpcRequest (u_long req, const XdrInfo* out, const XdrInfo**, int t = normal);
-  ~RpcRequest ();
-  int RequestNumber () const;
-  const XdrInfo** InInfo ();
-  const XdrInfo* OutInfo ();
-  ReqType Type ();
-  int Params () const;
-  int ParamSize ();
-
-protected:
-  int params;
-  int parmsz;
-  u_long reqnum;
-  const XdrInfo** ininfo;
-  const XdrInfo* outinfo;
-  ReqType reqtype;
-};
-
-inline RpcRequest::~RpcRequest ()
-{ delete [] ininfo; }
-
-inline int RpcRequest::Params () const
-{ return params; }
-
-inline int RpcRequest::RequestNumber () const
-{ return reqnum; }
-
-inline const XdrInfo** RpcRequest::InInfo ()
-{ return ininfo; }
-
-inline const XdrInfo* RpcRequest::OutInfo ()
-{ return outinfo; }
-
-inline RpcRequest::ReqType RpcRequest::Type ()
-{ return reqtype; }
-
-#endif
diff --git a/rpc++/rpc++/service.h b/rpc++/rpc++/service.h
deleted file mode 100644
index 327c965ced3..00000000000
--- a/rpc++/rpc++/service.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-#ifndef _RPCSERVICE_H_
-#define _RPCSERVICE_H_
-static char _rpcpp_service_h_[]
-= "service.h,v 2.3 1992/06/15 19:13:30 mnl Exp";
-
-// service.h,v
-// Revision 2.3  1992/06/15  19:13:30  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:41  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:43  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#undef TRUE
-#undef FALSE
-#include <bool.h>
-#include "request.h"
-#include "callback.h"
-
-class RpcRegistered;
-
-class RpcService
-{
-public:
-  typedef enum
-    { noError, reconstructionAttempt, cantCreateTCPService,
-      cantRegisterService, notRegistered, cantGetArgs,
-      invalidResult, cantSendReply, cantFreeArgs, selectError,
-    } errorCode;
-
-  // Get state
-  inline virtual bool OK ()
-    { return errorState == noError; }
-  // Construct a service object for service prog, version vers
-  RpcService (u_long prog, u_long vers);
-  // Construct a transient service object for version vers
-  RpcService (u_long vers);
-  // Destruct the service
-  virtual ~RpcService ();
-
-  // Get the program number (normally used after construction of transient)
-  u_long Program ();
-  
-  // Register an object and its method to be called on request
-  virtual void Register (const RpcRequest&, const AnyRpcCallback&);
-
-  // The link to RPC
-  virtual void Dispatch (svc_req* req, SVCXPRT* transp);
-  // Provide the service. Never returns.
-  void Provide ();
-
-  // Get caller. May be called during execution of a service routine.
-  inline struct sockaddr_in* Caller ()
-    { return svc_getcaller (xprt); }
-  char* CallerName ();
-  // Reply before return
-  void Reply (void* res);
-  void Reply ();
-  // Quit provide loop
-  void Interrupt ();
-
-private:
-  // Save the address of the one and only RpcService in the process.
-  // There may be only one RpcService, because we can register a program
-  // with svc_register (method RpcServiceCallback) but we can't make
-  // the svc function give an argument to this function when doing a
-  // callback, which means that we can't have it distinguish between
-  // various instances of RpcService.
-  static RpcService* me;
-  static inline void RpcServiceCallback (svc_req* req, SVCXPRT* transp)
-    { RpcService::me->Dispatch (req, transp); }
-
-protected:
-  void init ();
-  void HandleError (errorCode e);
-  errorCode errorState;
-  u_long prog;
-  u_long vers;
-  RpcRegistered** handlers;
-  int maxHandlerIndex;
-  SVCXPRT* xprt;
-  RpcRequest* rpcreq;
-  bool quitLoop;
-  char* inbuf;
-  int inmax;
-  bool haveReplied;
-
-  // Default error handling prints a message and exit(2)s.
-  virtual void HandleError ();
-};
-
-inline void RpcService::HandleError (errorCode e)
-{ errorState = e; HandleError (); }
-
-inline u_long RpcService::Program ()
-{ return prog; }
-
-inline void RpcService::Reply ()
-{ Reply (0); }
-
-inline void RpcService::Interrupt ()
-{ quitLoop = TRUE; }
-
-#endif
diff --git a/rpc++/rpc++/stub.h b/rpc++/rpc++/stub.h
deleted file mode 100644
index 22d467f2441..00000000000
--- a/rpc++/rpc++/stub.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-#ifndef _RPCSTUB_H_
-#define _RPCSTUB_H_
-static char _rpcpp_stub_h_[]
-= "stub.h,v 2.3 1992/06/15 19:13:31 mnl Exp";
-
-// stub.h,v
-// Revision 2.3  1992/06/15  19:13:31  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:43  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:43  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#undef TRUE
-#undef FALSE
-#include <bool.h>
-#include <String.h>
-#include <sys/time.h>
-#include "request.h"
-
-class RpcStub 
-{
-protected:
-  static timeval defaultTimeout;
-  static void* res;
-  static size_t resmax;
-  static xdrproc_t resproc;
-  void init (u_long prognum, u_long versnum,
-	     char* hostname, timeval timeout, bool connect);
-
-public:
-  typedef enum
-    { noError, notConnected, cantCreate, cantCall,
-    } errorCode;
-
-  // Construct a new stub
-  RpcStub (u_long prognum, u_long versnum,
-	   char* hostname = "localhost",
-	   timeval timeout = defaultTimeout, bool connect = TRUE);
-  RpcStub (u_long prognum, u_long versnum,
-	   char* hostname = "localhost",
-	   bool connect = TRUE, timeval timeout = defaultTimeout);
-  virtual ~RpcStub ();
-
-  // Reconnect (in case of failure or delayed connection)
-  void Reconnect ();
-
-  // Various inquiries
-  virtual bool OK ();
-  CLIENT* Service ();
-
-  // Get/set timeout
-  timeval GetTimeout () const;
-  void SetTimeout (timeval& timo);
-
-  // Make a call, either with or without an argument. If handle_errors
-  // is true, "Call" will call the error handler in case of an error.
-  // Else, it returns 0 as result and it is up to the client to handle
-  // the error.
-  // Call with one arg:
-  void* Call (RpcRequest&, bool handle_errors = TRUE);
-  // Call with two args:
-  void* Call (RpcRequest&, void* in, bool handle_errors = TRUE);
-  // ...
-  void* Call (RpcRequest& req, void*, void*, bool handle_errors = TRUE);
-  void* Call (RpcRequest& req, void*, void*, void*, bool handle_errors = TRUE);
-  void* Call (RpcRequest& req, void*, void*, void*, void*,
-	      bool handle_errors = TRUE);
-  void* Call (RpcRequest& req, void*, void*, void*, void*, void*,
-	      bool handle_errors = TRUE);
-  void* Call (RpcRequest& req, void*, void*, void*, void*, void*, void*,
-	      bool handle_errors = TRUE);
-  void* Call (RpcRequest& req, void*, void*, void*, void*, void*, void*, void*,
-	      bool handle_errors = TRUE);
-  // Call with N args:
-  void* Call (RpcRequest& req, void**, bool handle_errors = TRUE);
-
-protected:
-  void* HandleError (errorCode e);
-  errorCode errorState;
-  u_long program;
-  u_long version;
-  String server;
-  timeval timeout;
-  CLIENT* svc;
-  // Default error handling prints a message and exit(2)s.
-  virtual void* HandleError ();
-  void* DoCall (RpcRequest& req, void** args, bool handle_errors);
-};
-
-inline RpcStub::RpcStub (u_long prognum, u_long versnum,
-			 char* hostname, timeval timeout, bool connect)
-{ init (prognum, versnum, hostname, timeout, connect); }
-
-inline RpcStub::RpcStub (u_long prognum, u_long versnum,
-			 char* hostname, bool connect, timeval timeout)
-{ init (prognum, versnum, hostname, timeout, connect); }
-
-inline virtual bool RpcStub::OK ()
-{ return errorState == noError; }
-
-inline CLIENT* RpcStub::Service ()
-{ return svc; }
-
-inline timeval RpcStub::GetTimeout () const
-{ return timeout; }
-
-inline void RpcStub::SetTimeout (timeval& timo)
-{ timeout = timo; }
-
-inline void* RpcStub::Call (RpcRequest& req, bool handle_errors = TRUE)
-{ return Call (req, (void*)0, handle_errors); }
-
-inline void* RpcStub::HandleError (errorCode e)
-{ errorState = e; return HandleError (); }
-
-#endif
diff --git a/rpc++/rpc++/xdr++.h b/rpc++/rpc++/xdr++.h
deleted file mode 100644
index 72da1cb1d4c..00000000000
--- a/rpc++/rpc++/xdr++.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-#ifndef _XDRPLPL_H_
-#define _XDRPLPL_H_
-static char _rpcpp_xdrpp_h_[]
-= "xdr++.h,v 2.3 1992/06/15 19:13:33 mnl Exp";
-
-// xdr++.h,v
-// Revision 2.3  1992/06/15  19:13:33  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:44  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:43  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/*
-** Class XdrInfo describes serializers. It combines the xdrproc_t with the
-** size info usually needed if you want to apply a serializer.
-*/
-
-#include <rpc/rpc.h>
-
-class XdrInfo
-{
-protected:
-  xdrproc_t proc;
-  size_t size;
-public:
-  inline XdrInfo (xdrproc_t p, size_t s)
-    { proc = p; size = s; }
-  inline xdrproc_t Proc () const
-    { return proc; }
-  inline size_t Size () const
-    { return size; }
-};
-
-struct XdrSeqInfo
-{
-  XdrInfo** infos;
-  void** data;
-};
-
-/*
-** Class Xdr provides a unique (C++-like) name scope for the predefined
-** xdr routines by defining them as static members of type XdrInfo.
-*/
-
-class Xdr
-{
-public:
-  static XdrInfo Xnull;
-  static XdrInfo Xchar;
-  static XdrInfo Xshort;
-  static XdrInfo Xint;
-  static XdrInfo Xlong;
-  static XdrInfo Xuchar;
-  static XdrInfo Xushort;
-  static XdrInfo Xuint;
-  static XdrInfo Xulong;
-  static XdrInfo Xfloat;
-  static XdrInfo Xdouble;
-
-  static XdrInfo Xenum_t;
-  static XdrInfo Xbool_t;
-  static XdrInfo Xvoid;
-
-  static XdrInfo Xwrapstring;
-
-  static bool_t XdrParams (XDR* xdrs, XdrSeqInfo* xsi);
-};
-
-#endif
diff --git a/rpc++/service.cc b/rpc++/service.cc
deleted file mode 100644
index 8d548397a87..00000000000
--- a/rpc++/service.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-static char _rpcpp_service_cc_[]
-= "service.cc,v 2.3 1992/06/15 19:12:44 mnl Exp";
-
-// service.cc,v
-// Revision 2.3  1992/06/15  19:12:44  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:02  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:42  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <assert.h>
-#include <stream.h>
-#include <memory.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <rpc/rpc.h>
-#include <rpc/svc.h>
-#include "rpc++/service.h"
-#include "rpc++/request.h"
-
-extern "C" {
-  extern int getdtablesize();
-}
-
-//
-// RpcRegistered
-//
-
-class RpcRegistered
-{
-public:
-  RpcRequest request;
-  AnyRpcCallback* callback;
-
-  inline RpcRegistered (const RpcRequest& req, AnyRpcCallback* cb)
-    : request (req), callback (cb) { }
-  inline ~RpcRegistered ()
- { delete callback; }
-};
-
-//
-// RpcService
-//
-
-RpcService* RpcService::me = 0;
-
-RpcService::RpcService (u_long pnum, u_long vnum)
-{
-  init ();
-  prog = pnum;
-  vers = vnum;
-  // find out if we have been started by inetd and set transp accoringly.
-  sockaddr_in sa;
-  int sasz = sizeof (sa);
-  // if started by inetd, stdin is a socket
-  if (! getsockname (0, (sockaddr*)&sa, &sasz))
-    { // yup, inetd is our parent
-      xprt = svctcp_create(0, 0, 0);
-    }
-  else
-    { // we are standalone
-      (void) pmap_unset(prog, vers);
-      xprt = svctcp_create(RPC_ANYSOCK, 0, 0);
-    }
-  if (xprt == NULL)
-    {
-      HandleError (cantCreateTCPService);
-      return;
-    }
-  if (!svc_register(xprt, prog, vers, RpcServiceCallback, IPPROTO_TCP))
-    {
-      HandleError (cantRegisterService);
-      return;
-    }
-}
-
-RpcService::RpcService (u_long vnum)
-{
-  init ();
-  vers = vnum;
-  prog = 0x40000000;
-  xprt = svctcp_create(RPC_ANYSOCK, 0, 0);
-  if (xprt == NULL)
-    {
-      HandleError (cantCreateTCPService);
-      return;
-    }
-  while (! pmap_set (prog, vers, IPPROTO_TCP, xprt->xp_port))
-    prog++;
-  if (!svc_register(xprt, prog, vers, RpcServiceCallback, IPPROTO_TCP))
-    {
-      HandleError (cantRegisterService);
-      return;
-    }
-}
-
-void RpcService::init ()
-{
-  errorState = noError;
-  if (me)
-    {
-      HandleError (reconstructionAttempt);
-      return;
-    }
-  me = this;
-  handlers = 0;
-  maxHandlerIndex = -1;
-  inbuf = 0;
-  inmax = 0;
-}
-
-RpcService::~RpcService ()
-{
-  svc_unregister (prog, vers);
-  for (int i = 0; i <= maxHandlerIndex; i++)
-    delete handlers[i];
-  delete [] handlers;
-  delete [] inbuf;
-  me = 0;
-}
-
-void RpcService::HandleError ()
-{
-  switch (errorState)
-    {
-    case reconstructionAttempt:
-      cerr << "rpc++: Attempt to construct another instance of RpcService.\n";
-      exit (1);
-    case cantCreateTCPService:
-      cerr << "rpc++: can't create tcp service.\n";
-      exit(1);
-    case cantRegisterService:
-      cerr << form ("rpc++: can't register (%d, %d, tcp).", prog, vers);
-      exit(1);
-    case cantSendReply:
-      cerr << "rpc++: can't reply to RPC call.\n";
-      break;
-    case invalidResult:
-      cerr << "rpc++: registered routine has return NULL pointer.\n";
-      abort ();
-    case notRegistered:
-      cerr << "rpc++: requested RPC routine not registered.\n";
-      break;
-    case cantGetArgs:
-      cerr << "rpc++: can't get procedure arguments.\n";
-      break;
-    case cantFreeArgs:
-      cerr << "rpc++: can't free XDR arguments.\n";
-      break;
-    }
-  errorState = noError;
-}
-
-void RpcService::Register (const RpcRequest& req, const AnyRpcCallback& cb)
-{
-  assert (req.Params () == -1 || cb.Params () == -1
-	  || req.Params () == cb.Params ());
-  AnyRpcCallback* cbp = cb.CopyToHeap ();
-  cbp->SetService (this);
-  if (req.RequestNumber () > maxHandlerIndex)
-    {
-      RpcRegistered** reg = new RpcRegistered*[req.RequestNumber () + 10];
-      memcpy (reg, handlers, (maxHandlerIndex + 1) * sizeof (RpcRegistered*));
-      memset (&reg[maxHandlerIndex + 1], 0,
-	      (req.RequestNumber () + 10 - (maxHandlerIndex + 1))
-	      * sizeof (RpcRegistered*));
-      delete handlers;
-      handlers = reg;
-      maxHandlerIndex = req.RequestNumber () + 10 - 1;
-    }
-  handlers[req.RequestNumber ()] = new RpcRegistered (req, cbp);
-}
-
-void RpcService::Dispatch (svc_req* req, SVCXPRT* transp)
-{
-  xprt = transp;
-  if (req->rq_proc == NULLPROC)
-    {
-      if (! svc_sendreply (xprt, xdr_void, 0))
-	{
-	  svcerr_systemerr (xprt);
-	  HandleError (cantSendReply);
-	}
-      return;
-    }
-  RpcRegistered* handler = ((req->rq_proc > maxHandlerIndex)
-			    ? 0
-			    : handlers[req->rq_proc]);
-  if (! handler)
-    {
-      svcerr_noproc (xprt);
-      HandleError (notRegistered);
-      return;
-    }
-  rpcreq = &handler->request;
-
-  int insz = rpcreq->ParamSize ();
-  if (insz > inmax) // does in-data fit in available buffer?
-    { // if not, increase buffer space
-      delete [] inbuf;
-      inbuf = new char[inmax = insz];
-    }
-  void* dataps[rpcreq->Params ()];
-  void** dp = dataps;
-  *dp = inbuf;
-  for (XdrInfo** ip = rpcreq->InInfo(); *ip; ip++, dp++)
-    dp[1] = (char*)dp[0] + (*ip)->Size ();
-
-  memset (inbuf, 0, insz);
-  XdrSeqInfo xsi = { rpcreq->InInfo (), dataps };
-  if (!svc_getargs (xprt, Xdr::XdrParams, &xsi))
-    {
-      if (rpcreq->Type () == RpcRequest::normal) // errors can be reported
-	svcerr_decode (xprt);   // only if the client waits for a result
-      HandleError (cantGetArgs);
-      return;
-    }
-  haveReplied = FALSE;
-  void* res = handler->callback->Do (dataps);
-  if (! haveReplied)
-    Reply (res);
-  if (!svc_freeargs (xprt, Xdr::XdrParams, &xsi))
-    HandleError (cantFreeArgs);
-  xprt = 0;
-}
-
-void RpcService::Reply (void* res)
-{
-  haveReplied = TRUE;
-  if (rpcreq->Type () == RpcRequest::normal) // i.e., result expected
-    {
-      xdrproc_t outproc = rpcreq->OutInfo()->Proc ();
-      if (outproc == (xdrproc_t)0)
-	{
-	  cerr << "rpc++: RpcRequest has invalid xdrproc_t (0) in out-Info";
-	  abort ();
-	}
-      if (res == 0 && outproc != (xdrproc_t)xdr_void)
-	{
-	  svcerr_systemerr (xprt);
-	  HandleError ();
-	}
-      else if (!svc_sendreply
-	       (xprt, rpcreq->OutInfo()->Proc (), res))
-	{
-	  svcerr_systemerr (xprt);
-	  HandleError (cantSendReply);
-	}
-    }
-}
-
-void RpcService::Provide ()
-{
-  int dtbsz = getdtablesize();
-  fd_set readfds;
-
-  quitLoop = FALSE;
-  while (! quitLoop)
-    {
-      readfds = svc_fdset;
-      switch(select (dtbsz, &readfds, 0, 0, 0))
-	{
-	case -1:
-	  if (errno != EBADF)
-	    continue;
-	  cerr << "PRC++: select: " << sys_errlist[errno] << '\n';
-	  return;
-	  break;
-	case 0:
-	  continue;
-	default:
-	  svc_getreqset (&readfds);
-	  break;
-	}
-    }
-}
-
-char* RpcService::CallerName ()
-{
-  struct sockaddr_in *sa = Caller ();
-  struct hostent* he = gethostbyaddr (&sa->sin_addr, sizeof (sa->sin_addr),
-				      sa->sin_family);
-  return he->h_name;
-}
diff --git a/rpc++/stub.cc b/rpc++/stub.cc
deleted file mode 100644
index 38320d06a8a..00000000000
--- a/rpc++/stub.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-static char _rpcpp_stub_cc_[]
-= "stub.cc,v 2.3 1992/06/15 19:12:46 mnl Exp";
-
-// stub.cc,v
-// Revision 2.3  1992/06/15  19:12:46  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:04  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:42  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <stream.h>
-#include <memory.h>
-#include <assert.h>
-#include "rpc++/stub.h"
-
-timeval RpcStub::defaultTimeout = { 25, 0 };
-void* RpcStub::res = 0;
-size_t RpcStub::resmax = 0;
-xdrproc_t RpcStub::resproc = 0;
-
-void RpcStub::init (u_long prog, u_long vers,
-	       char* srv, timeval timo, bool connect)
-{
-  errorState = noError;
-  program = prog;
-  version = vers;
-  server = srv;
-  timeout = timo;
-  svc = 0;
-  if (connect)
-    Reconnect ();
-  else
-    errorState = notConnected;
-}
-
-RpcStub::~RpcStub ()
-{
-  if (resproc) // "Call" has been called at least once,
-    clnt_freeres (svc, resproc, res); // free any data allocated by clnt_call
-  if (svc)
-    clnt_destroy (svc);
-}
-
-void* RpcStub::HandleError ()
-{
-  switch (errorState)
-    {
-    case notConnected:
-      cerr << "rpc++: Stub has not been connected to server.\n";
-    case cantCreate:
-      cerr << clnt_spcreateerror ("rpc++") << '\n';
-      break;
-    case cantCall:
-      cerr << clnt_sperror (svc, "rpc++") << '\n';
-      exit (1);
-    }
-  return 0; // suppress compiler warning
-}
-
-void RpcStub::Reconnect ()
-{
-  if (svc)
-    clnt_destroy (svc);
-  svc = clnt_create (server, program, version, "tcp"); // connect to client
-  if (svc == 0) // failed ?
-    {
-      HandleError (cantCreate);
-      errorState = notConnected;
-      return;
-    }
-  errorState = noError;
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in, bool handle_errors)
-{
-  void* args[] = { in };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, bool handle_errors)
-{
-  void* args[] = { in0, in1 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, void* in2,
-		     bool handle_errors)
-{
-  void* args[] = { in0, in1, in2 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, void* in2,
-		     void* in3, bool handle_errors)
-{
-  void* args[] = { in0, in1, in2, in3 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, void* in2,
-		     void* in3, void* in4, bool handle_errors)
-{
-  void* args[] = { in0, in1, in2, in3, in4 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, void* in2,
-		     void* in3, void* in4, void* in5, bool handle_errors)
-{
-  void* args[] = { in0, in1, in2, in3, in4, in5 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void* in0, void* in1, void* in2,
-		     void* in3, void* in4, void* in5, void* in6,
-		     bool handle_errors)
-{
-  void* args[] = { in0, in1, in2, in3, in4, in5, in6 };
-  return DoCall (req, args, handle_errors);
-}
-
-void* RpcStub::Call (RpcRequest& req, void** ins, bool handle_errors)
-{
-  return DoCall (req, ins, handle_errors);
-}
-
-void* RpcStub::DoCall (RpcRequest& req, void** args, bool handle_errors)
-{
-  static timeval nullTimeout = { 0, 0 };
-
-  if (! OK () )
-    {
-      if (! handle_errors)
-	return 0;
-      return HandleError ();
-    }
-  if (resproc) // "Call" has been called previously,
-    clnt_freeres (svc, resproc, res); // free any data allocated by clnt_call
-  resproc = req.OutInfo()->Proc (); // current output deserializer
-  if (req.OutInfo()->Size () > resmax) // enough space for result?
-    {
-      delete res; // delete old result buffer
-      res = new char[resmax = req.OutInfo()->Size ()]; // get a new one
-    }
-  if (req.OutInfo()->Size () > 0 ) // preset result (everyone does it, why?)
-    memset (res, 0, req.OutInfo()->Size ());
-
-  XdrSeqInfo xsi = { req.InInfo (), args };
-  if (req.Type () == RpcRequest::normal)
-    {
-      if (clnt_call (svc, req.RequestNumber (), // do call
-		     Xdr::XdrParams, &xsi,
-		     req.OutInfo()->Proc (), res,
-		     timeout) != RPC_SUCCESS)
-	{
-	  if (! handle_errors)
-	    return 0;
-	  return HandleError (cantCall);
-	}
-      return res;
-    }
-
-  // req.Type () is batched or async
-  enum clnt_stat callres;
-  callres = clnt_call (svc, req.RequestNumber (), // do call
-		       Xdr::XdrParams, &xsi,
-		       (req.Type () == RpcRequest::batched
-		        ? (xdrproc_t)0 : xdr_void), res,
-		       nullTimeout);
-  if (callres != RPC_SUCCESS && callres != RPC_TIMEDOUT)
-    {
-      if (! handle_errors)
-	return 0;
-      return HandleError (cantCall);
-    }
-  return res;
-}
-
diff --git a/rpc++/version.h b/rpc++/version.h
deleted file mode 100644
index 88a78665b13..00000000000
--- a/rpc++/version.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// version.h,v 2.2 1992/06/15 19:12:47 mnl Exp
-#ifndef _RPCPLPL_VERSION_H_
-static char* version = "rpc++-library, version 2.2"
-#endif
diff --git a/rpc++/xdr++.cc b/rpc++/xdr++.cc
deleted file mode 100644
index 25f54d2e990..00000000000
--- a/rpc++/xdr++.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- c++ -*-
-/* 
-Copyright (C) 1991 Peter Bersen
-
-This file is part of the rpc++ Library.  This library is free
-software; you can redistribute it and/or modify it under the terms of
-the GNU Library General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your
-option) any later version.  This library is distributed in the hope
-that it will be useful, but WITHOUT ANY WARRANTY; without even the
-implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Modified and partially rewritten March 1992 by Michael N. Lipp,
-mnl@dtro.e-technik.th-darmstadt.de. The original copyright terms and
-conditions apply without change to any modified or new parts.
-*/
-
-static char _rpcpp_xdrpp_cc_[]
-= "xdr++.cc,v 2.3 1992/06/15 19:12:49 mnl Exp";
-
-// xdr++.cc,v
-// Revision 2.3  1992/06/15  19:12:49  mnl
-// Fixed a few bugs, clarified interface.
-//
-// Revision 2.2  1992/06/13  14:27:06  mnl
-// Adapted to (patched) gcc-2.2. Fixed several bugs.
-//
-// Revision 2.1.1.1  1992/03/08  13:28:42  mnl
-// Initial mnl version.
-//
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-/*
-** See Xdr.h.
-*/
-
-#include "rpc++/xdr++.h"
-
-XdrInfo Xdr::Xnull ((xdrproc_t)0, 0);
-XdrInfo Xdr::Xchar ((xdrproc_t)xdr_char, sizeof (char));
-XdrInfo Xdr::Xshort ((xdrproc_t)xdr_short, sizeof (short));
-XdrInfo Xdr::Xint ((xdrproc_t)xdr_int, sizeof (int));
-XdrInfo Xdr::Xlong ((xdrproc_t)xdr_long, sizeof (long));
-XdrInfo Xdr::Xuchar ((xdrproc_t)xdr_u_char, sizeof (u_char));
-XdrInfo Xdr::Xushort ((xdrproc_t)xdr_u_short, sizeof (u_short));
-XdrInfo Xdr::Xuint ((xdrproc_t)xdr_u_int, sizeof (u_int));
-XdrInfo Xdr::Xulong ((xdrproc_t)xdr_u_long, sizeof (u_long));
-XdrInfo Xdr::Xfloat ((xdrproc_t)xdr_float, sizeof (float));
-XdrInfo Xdr::Xdouble ((xdrproc_t)xdr_double, sizeof (double));
-
-XdrInfo Xdr::Xenum_t ((xdrproc_t)xdr_enum, sizeof (enum_t));
-XdrInfo Xdr::Xbool_t ((xdrproc_t)xdr_bool, sizeof (bool_t));
-XdrInfo Xdr::Xvoid ((xdrproc_t)xdr_void, 0);
-XdrInfo Xdr::Xwrapstring ((xdrproc_t)xdr_wrapstring, sizeof (char*));
-
-bool_t Xdr::XdrParams (XDR* xdrs, XdrSeqInfo* xsi)
-{
-  XdrInfo** infop = xsi->infos;
-  void** datap = xsi->data;
-
-  while (*infop)
-    {
-      if (! (*infop->Proc ()) (xdrs, *datap))
-	return FALSE;
-      infop++, datap++;
-    }
-  return TRUE;
-}
diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp
deleted file mode 100644
index 4c0bd291a50..00000000000
--- a/tests/CPP_Test.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CPP_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the ACE_SOCK_Acceptor and
-//     AC_SOCK_Connector classes. The test forks two processes or
-//     spawns two threads (depending upon the platform) and then executes
-//     client and server allowing them to connect and exchange
-//     data. No user input is required as far as command line
-//     arguments are concerned.
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/Thread.h"
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"                             
-#include "ace/SOCK_Stream.h"
-#include "ace/INET_Addr.h"
-#include "ace/Handle_Set.h"
-#include "test_config.h"
-
-static void *
-client (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg;
-  ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost");
-  ACE_SOCK_Stream cli_stream;
-  ACE_SOCK_Connector con;
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n"));
-  // Initiate timed, non-blocking connection with server.
-  
-  // Attempt a non-blocking connect to the server, reusing the local
-  // addr if necessary.
-  if (con.connect (cli_stream, server_addr,
-		   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n"));
-
-      // Check if non-blocking connection is in progress, 
-      // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete.
-      ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-
-      if (con.complete (cli_stream, &server_addr, &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0);
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", 
-		    server_addr.get_host_name ()));
-    }
-
-  if (cli_stream.disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable"));    
-
-  // Send data to server (correctly handles "incomplete writes").
-  
-  for (char c = 'a'; c <= 'z'; c++)
-    if (cli_stream.send_n (&c, 1) == -1) 
-      ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-  // Explicitly close the writer-side of the connection.
-  if (cli_stream.close_writer () == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer"));
-
-  char buf[1];
-
-  // Wait for handshake with server.
-  if (cli_stream.recv_n (buf, 1) != 1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n"));
-
-  // Close the connection completely.
-  if (cli_stream.close () == -1) 
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-
-  return 0;
-}
-
-static void *
-server (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg;
-
-  if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable"));
-
-  // Keep these objects out here to prevent excessive constructor
-  // calls...
-  ACE_SOCK_Stream new_stream;                                   
-  ACE_INET_Addr cli_addr;
-  ACE_Handle_Set handle_set;
-  ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-  // Performs the iterative server activities.
-
-  for (;;) 
-    {
-      char buf[BUFSIZ];                                     
-      char t = 'a';
-      
-      handle_set.reset ();
-      handle_set.set_bit (peer_acceptor->get_handle ());
-      
-      int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1,
-				   handle_set,
-				   0, 0, &tv);
-      if (result == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-      else if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n"));
-	  return 0;
-	}
-
-      // Create a new ACE_SOCK_Stream endpoint (note automatic restart
-      // if errno == EINTR).
-      
-      while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", 
-		      cli_addr.get_host_name (), cli_addr.get_port_number ()));
-	  
-	  // Enable non-blocking I/O.
-	  if (new_stream.enable (ACE_NONBLOCK) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0);
-	  
-	  handle_set.reset ();
-	  handle_set.set_bit (new_stream.get_handle ());
-	  
-	  // Read data from client (terminate on error).
-	  
-	  for (ssize_t r_bytes; ;)
-	    {
-	      if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
-				  handle_set,
-				  0, 0, 0) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-	      
-	      while ((r_bytes = new_stream.recv_n (buf, 1)) > 0)
-		{
-		  ACE_ASSERT (t == buf[0]);
-		  t++;
-		}
-	      
-	      if (r_bytes == 0)
-		{
-		  ACE_DEBUG ((LM_DEBUG, 
-			      "(%P|%t) reached end of input, connection closed by client\n"));
-
-		  // Handshake back with client.
-		  if (new_stream.send_n ("", 1) != 1)
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-		  // Close endpoint.
-		  if (new_stream.close () == -1) 
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-		  return 0;
-		}
-	      else if (r_bytes == -1)
-		{
-		  if (errno == EWOULDBLOCK)
-		    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n"));
-		  else
-		    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0);
-		}
-	    }
-	}
-
-      if (result == -1)
-	{
-	  if (errno == EWOULDBLOCK)
-	    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n"));
-	  else
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept"));
-	}
-    }
-  return 0;
-}
-
-static void
-spawn (void)
-{
-  // Acceptor
-  ACE_SOCK_Acceptor peer_acceptor;
-
-  // Create a server address.
-  ACE_INET_Addr server_addr;
-
-  // Bind listener to any port and then find out what the port was.
-  if (peer_acceptor.open (ACE_Addr::sap_any) == -1
-      || peer_acceptor.get_local_addr (server_addr) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open"));
-  else 
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
-		  server_addr.get_port_number ()));
-
-#if !defined (ACE_WIN32) && !defined (VXWORKS)
-      switch (ACE_OS::fork ())
-	{
-	case -1:
-	  ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed"));
-	  exit (-1);
-	case 0: 
-	  ACE_LOG_MSG->sync ("child");
-	  client (&server_addr);
-	default:
-	  server ((void *) &peer_acceptor);
-	  ACE_OS::wait ();
-	}
-#elif defined (ACE_HAS_THREADS)
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      // Wait for the threads to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-#else
-      ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1));
-#endif /* ACE_HAS_THREADS */	
-    }
-}
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("CPP_Test");
-
-  spawn ();
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/Shared_Memory_SV_Test.cpp b/tests/Shared_Memory_SV_Test.cpp
deleted file mode 100644
index a3654a7745b..00000000000
--- a/tests/Shared_Memory_SV_Test.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Shared_Memory_SV_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of ACE_Shared_Memory_SV
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-
-#include "ace/Shared_Memory_SV.h"
-#include "test_config.h"
-
-const int SHMSZ = 27;
-const int SHM_KEY = 5678;
-
-static void
-client (void)
-{
-  char t = 'a';
-  ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ,
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_client.malloc ();
-
-  for (char *s = shm; *s != '\0'; s++)
-    {
-      ACE_ASSERT (t == s[0]);
-      t++;
-    }
-  *shm = '*';
-  ACE_OS::exit (0);
-}
-
-static void
-server (void)
-{
-  ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, 
-				   ACE_Shared_Memory_SV::ACE_CREATE);
-  char *shm = (char *) shm_server.malloc ();
-  char *s   = shm;
-
-  for (char c = 'a'; c <= 'z'; c++)
-    *s++ = c;
-
-  *s = '\0';
-
-  while (*shm != '*')
-    ACE_OS::sleep (1);
-
-  if (shm_server.remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n", "remove"));
-}
-
-int
-main (int, char *argv [])
-{
-  ACE_START_TEST ("Shared_Memory_SV_Test.cpp");
-
-  switch (ACE_OS::fork ())
-    {
-    case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1);
-    case 0: 
-      client ();
-      break;
-    default:
-      server ();
-      break;
-    }
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/run_tests.ksh b/tests/run_tests.ksh
deleted file mode 100755
index a4d7f0d8b17..00000000000
--- a/tests/run_tests.ksh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/ksh -f
-
-. ./run_tests.sh
-
-# EOF
-